diff options
76 files changed, 69540 insertions, 108 deletions
@@ -208,6 +208,8 @@ NO_ERROR=0 )" >>prereq.mk @echo 'HOSTCC:=${CC}' >>prereq.mk @echo 'HOSTCFLAGS:=-O2' >>prereq.mk + @echo 'HOSTCXX:=${CXX}' >>prereq.mk + @echo 'HOSTCXXFLAGS:=-O2' >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk diff --git a/mk/build.mk b/mk/build.mk index 53f0ff5bf..5cd9a1458 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -236,7 +236,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),) include ${TOPDIR}/mk/vars.mk else include $(TOPDIR)/prereq.mk -export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH +export BASH HOSTCC HOSTCFLAGS HOSTCXX HOSTCXXFLAGS MAKE LANGUAGE LC_ALL OStype PATH endif all: menuconfig diff --git a/mk/rootfs.mk b/mk/rootfs.mk index ef6fb031b..b91a58629 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -17,6 +17,7 @@ ROOTFS:= root=/dev/mmcblk0p2 rootwait endif $(eval $(call rootfs_template,ext2-block,EXT2_BLOCK,$(ROOTFS))) +$(eval $(call rootfs_template,usb,USB,root=/dev/sdb1 rootdelay=10)) $(eval $(call rootfs_template,archive,ARCHIVE)) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) diff --git a/package/Config.in b/package/Config.in index e5ffd2e07..0537a7646 100644 --- a/package/Config.in +++ b/package/Config.in @@ -157,6 +157,8 @@ source "package/cgilib/Config.in" source "package/curl/Config.in.lib" source "package/cxxtools/Config.in" source "package/dbus/Config.in" +source "package/dbus-glib/Config.in" +source "package/dbus-glib/Config.in.lib" source "package/e2fsprogs/Config.in.lib" source "package/fontconfig/Config.in" source "package/gettext/Config.in" @@ -213,6 +215,8 @@ source "package/libiconv/Config.in" source "package/libiconv/Config.in.lib" source "package/libid3tag/Config.in" source "package/libid3tag/Config.in.lib" +source "package/libIDL/Config.in" +source "package/libIDL/Config.in.lib" source "package/jpeg/Config.in" source "package/jpeg/Config.in.lib" source "package/krb5/Config.in.lib" @@ -220,6 +224,8 @@ source "package/lame/Config.in.lib" source "package/mpfr/Config.in" source "package/mysql/Config.in" source "package/mysql/Config.in.lib" +source "package/libnotify/Config.in" +source "package/libnotify/Config.in.lib" source "package/nspr/Config.in" source "package/nss/Config.in" source "package/libtool/Config.in.lib" @@ -587,6 +593,7 @@ source "package/xorg-server/Config.in" source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" source "package/xf86-video-fbdev/Config.in" +source "package/xf86-video-intel/Config.in" source "package/xf86-video-siliconmotion/Config.in" source "package/xf86-input-mouse/Config.in" source "package/xf86-input-keyboard/Config.in" @@ -595,6 +602,7 @@ endmenu menu "X applications" source "package/evilwm/Config.in" +source "package/firefox/Config.in" source "package/font-util/Config.in" source "package/rxvt-unicode/Config.in" source "package/xauth/Config.in" @@ -618,6 +626,8 @@ source "package/font-xfree86-type1/Config.in" endmenu menu "X libraries" +source "package/libdrm/Config.in" +source "package/libdrm/Config.in.lib" source "package/libICE/Config.in" source "package/libICE/Config.in.lib" source "package/libSM/Config.in" @@ -642,6 +652,10 @@ source "package/libXau/Config.in" source "package/libXau/Config.in.lib" source "package/libXaw/Config.in" source "package/libXaw/Config.in.lib" +source "package/libXdamage/Config.in" +source "package/libXdamage/Config.in.lib" +source "package/libXfixes/Config.in" +source "package/libXfixes/Config.in.lib" source "package/libXmu/Config.in" source "package/libXmu/Config.in.lib" source "package/libXpm/Config.in" @@ -654,6 +668,10 @@ source "package/libXft/Config.in" source "package/libXft/Config.in.lib" source "package/libXxf86dga/Config.in" source "package/libXxf86dga/Config.in.lib" +source "package/libXxf86vm/Config.in" +source "package/libXxf86vm/Config.in.lib" +source "package/MesaLib/Config.in" +source "package/MesaLib/Config.in.lib" source "package/pixman/Config.in" source "package/xkbcomp/Config.in" source "package/xkeyboard-config/Config.in" diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile new file mode 100644 index 000000000..097331cde --- /dev/null +++ b/package/MesaLib/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= MesaLib +PKG_VERSION:= 7.8.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 62e8e47cbd63741b4bbe634dcdc8a56a +PKG_DESCR:= MESA library +PKG_SECTION:= libs +PKG_DEPENDS:= libxdamage libxfixes +PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm +PKG_URL:= add project url +PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ + +WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-static \ + --disable-gallium \ + --without-demos + +XAKE_FLAGS+= APP_CC=${HOSTCC} HOST_CC=${HOSTCC} + +post-install: + $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib + $(INSTALL_BIN) $(WRKINST)/usr/lib/libGL*.so* \ + $(IDIR_MESALIB)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile_template b/package/MesaLib/patches/patch-src_glsl_Makefile_template new file mode 100644 index 000000000..bcb3256d6 --- /dev/null +++ b/package/MesaLib/patches/patch-src_glsl_Makefile_template @@ -0,0 +1,11 @@ +--- Mesa-7.8.1.orig/src/glsl/Makefile.template 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/glsl/Makefile.template 2010-04-19 21:18:45.000000000 +0200 +@@ -44,7 +44,7 @@ install: + ##### RULES ##### + + .c.o: +- $(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ ++ $(HOST_CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ + + -include depend + diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile new file mode 100644 index 000000000..175965dc5 --- /dev/null +++ b/package/MesaLib/patches/patch-src_glsl_apps_Makefile @@ -0,0 +1,15 @@ +--- Mesa-7.8.1.orig/src/glsl/apps/Makefile 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/glsl/apps/Makefile 2010-04-19 21:20:55.000000000 +0200 +@@ -26,10 +26,10 @@ INCLUDES = -I. + .SUFFIXES: .c + + .c: +- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ ++ $(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@ + + .c.o: +- $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ ++ $(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@ + + + ##### TARGETS ##### diff --git a/package/MesaLib/patches/patch-src_mesa_drivers_dri_savage_savageioctl_c b/package/MesaLib/patches/patch-src_mesa_drivers_dri_savage_savageioctl_c new file mode 100644 index 000000000..1d72208c7 --- /dev/null +++ b/package/MesaLib/patches/patch-src_mesa_drivers_dri_savage_savageioctl_c @@ -0,0 +1,10 @@ +--- Mesa-7.8.1.orig/src/mesa/drivers/dri/savage/savageioctl.c 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/mesa/drivers/dri/savage/savageioctl.c 2010-04-19 21:26:28.000000000 +0200 +@@ -41,7 +41,6 @@ + #include "savagespan.h" + + #include "drm.h" +-#include <sys/timeb.h> + + #define DEPTH_SCALE_16 ((1<<16)-1) + #define DEPTH_SCALE_24 ((1<<24)-1) diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_c b/package/MesaLib/patches/patch-src_mesa_main_imports_c new file mode 100644 index 000000000..71c832adf --- /dev/null +++ b/package/MesaLib/patches/patch-src_mesa_main_imports_c @@ -0,0 +1,17 @@ +--- Mesa-7.8.1.orig/src/mesa/main/imports.c 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/mesa/main/imports.c 2010-04-19 21:22:52.000000000 +0200 +@@ -799,13 +799,7 @@ _mesa_strdup( const char *s ) + float + _mesa_strtof( const char *s, char **end ) + { +-#ifdef _GNU_SOURCE +- static locale_t loc = NULL; +- if (!loc) { +- loc = newlocale(LC_CTYPE_MASK, "C", NULL); +- } +- return strtof_l(s, end, loc); +-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) ++#if defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) + return strtof(s, end); + #else + return (float)strtod(s, end); diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile index b7517b3b3..3e40e7a15 100644 --- a/package/autoconf/Makefile +++ b/package/autoconf/Makefile @@ -4,15 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= autoconf -<<<<<<< HEAD -PKG_VERSION:= 2.64 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 30a198cef839471dd4926e92ab485361 -======= PKG_VERSION:= 2.65 PKG_RELEASE:= 1 PKG_MD5SUM:= 46cfb40e0babf4c64f8325f03da81c9b ->>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a PKG_DESCR:= GNU autoconf PKG_SECTION:= utils PKG_URL:= http://www.gnu.org/software/autoconf/ diff --git a/package/cairo/Makefile b/package/cairo/Makefile index b15c9280e..4b6f40c7b 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.8.8 +PKG_VERSION:= 1.8.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= d3e1a1035ae563812d4dd44a74fb0dd0 +PKG_MD5SUM:= b60a82f405f9400bbfdcf850b1728d25 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile new file mode 100644 index 000000000..33461c7c4 --- /dev/null +++ b/package/dbus-glib/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= dbus-glib +PKG_VERSION:= 0.86 +PKG_RELEASE:= 1 +PKG_MD5SUM:= cd0ab148fb0c786fc88be49d19971f50 +PKG_DESCR:= DBUS glib bindings +PKG_SECTION:= libs +PKG_DEPENDS:= dbus +PKG_BUILDDEP+= dbus +PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings +PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-glib/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DBUS_GLIB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-checks +CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no + +post-install: + $(INSTALL_DIR) $(IDIR_DBUS_GLIB)/usr/lib + $(CP) $(WRKINST)/usr/lib/libdbus-glib-1.so* \ + $(IDIR_DBUS_GLIB)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dbus-glib/patches/patch-Makefile_in b/package/dbus-glib/patches/patch-Makefile_in new file mode 100644 index 000000000..b42b1d3ba --- /dev/null +++ b/package/dbus-glib/patches/patch-Makefile_in @@ -0,0 +1,13 @@ +--- dbus-glib-0.86.orig/Makefile.in 2010-03-25 01:20:00.000000000 +0100 ++++ dbus-glib-0.86/Makefile.in 2010-04-11 12:29:52.000000000 +0200 +@@ -312,8 +312,8 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 + GLIB_PC = dbus-glib-1.pc +-SUBDIRS = dbus tools test doc +-DIST_SUBDIRS = dbus tools test doc m4 ++SUBDIRS = dbus ++DIST_SUBDIRS = dbus tools m4 + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = $(GLIB_PC) + DISTCLEANFILES = \ diff --git a/package/dbus-glib/patches/patch-Makefile_in.orig b/package/dbus-glib/patches/patch-Makefile_in.orig new file mode 100644 index 000000000..9fce518e0 --- /dev/null +++ b/package/dbus-glib/patches/patch-Makefile_in.orig @@ -0,0 +1,13 @@ +--- dbus-glib-0.86.orig/Makefile.in 2010-03-25 01:20:00.000000000 +0100 ++++ dbus-glib-0.86/Makefile.in 2010-04-11 12:14:22.000000000 +0200 +@@ -312,8 +312,8 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 + GLIB_PC = dbus-glib-1.pc +-SUBDIRS = dbus tools test doc +-DIST_SUBDIRS = dbus tools test doc m4 ++SUBDIRS = dbus tools ++DIST_SUBDIRS = dbus tools m4 + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = $(GLIB_PC) + DISTCLEANFILES = \ diff --git a/package/dbus-glib/patches/patch-dbus_Makefile_in b/package/dbus-glib/patches/patch-dbus_Makefile_in new file mode 100644 index 000000000..161f53563 --- /dev/null +++ b/package/dbus-glib/patches/patch-dbus_Makefile_in @@ -0,0 +1,11 @@ +--- dbus-glib-0.86.orig/dbus/Makefile.in 2010-03-25 01:19:59.000000000 +0100 ++++ dbus-glib-0.86/dbus/Makefile.in 2010-04-11 12:15:19.000000000 +0200 +@@ -369,7 +369,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = . examples ++SUBDIRS = . + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 0e40fe548..66121441a 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus -PKG_VERSION:= 1.2.16 +PKG_VERSION:= 1.2.24 PKG_RELEASE:= 1 -PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b +PKG_MD5SUM:= 565346cecd9cfecf1463540c6086cc2c PKG_DESCR:= DBUS library PKG_SECTION:= net PKG_DEPENDS:= libexpat @@ -42,7 +42,7 @@ post-install: ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \ ${IDIR_DBUS}/usr/bin ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/ - ${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/ diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile new file mode 100644 index 000000000..7ec9aba54 --- /dev/null +++ b/package/dri2proto/Makefile @@ -0,0 +1,15 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= dri2proto +PKG_VERSION:= 2.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2087269416782cff56f9b22d1449c192 +PKG_DESCR:= DRI2 proto headers +PKG_URL:= add project url +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/ + +include $(TOPDIR)/mk/package.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/firefox/Makefile b/package/firefox/Makefile new file mode 100644 index 000000000..6a7091723 --- /dev/null +++ b/package/firefox/Makefile @@ -0,0 +1,52 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= firefox +PKG_VERSION:= 3.6.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 5e4541ab23084b7b14ba228291ce2688 +PKG_DESCR:= graphical webbrowser +PKG_SECTION:= x11 +PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib gtk+ libnotify libidl +PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx +PKG_BUILDDEP+= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 libXt +PKG_BUILDDEP+= nspr nss jpeg +PKG_URL:= http://www.mozilla.org/ +PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/source/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 + +WRKDIST= ${WRKDIR}/mozilla-1.9.2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ + HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \ + HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" +CONFIGURE_ARGS+= --enable-application=browser \ + --with-system-zlib \ + --with-system-jpeg \ + --with-system-nss \ + --with-system-nspr \ + --disable-tests \ + --disable-static \ + --enable-libxul |