summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-21 20:44:59 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-21 20:44:59 +0200
commitb803209ad0f1f198072695109b30a726e0411084 (patch)
tree3d5db865a71f72457d05fbe37cb25e96d67484f8 /package
parentfaf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (diff)
fat commit to add support for firefox on ibm x40 via usb stick
- add support for IBM X40 notebook - add USB boot support - add firefox package - update and add all dependencies for firefox - add xorg intel driver - add dri support for xorg
Diffstat (limited to 'package')
-rw-r--r--package/Config.in18
-rw-r--r--package/MesaLib/Makefile34
-rw-r--r--package/MesaLib/patches/patch-src_glsl_Makefile_template11
-rw-r--r--package/MesaLib/patches/patch-src_glsl_apps_Makefile15
-rw-r--r--package/MesaLib/patches/patch-src_mesa_drivers_dri_savage_savageioctl_c10
-rw-r--r--package/MesaLib/patches/patch-src_mesa_main_imports_c17
-rw-r--r--package/autoconf/Makefile6
-rw-r--r--package/cairo/Makefile4
-rw-r--r--package/dbus-glib/Makefile29
-rw-r--r--package/dbus-glib/patches/patch-Makefile_in13
-rw-r--r--package/dbus-glib/patches/patch-Makefile_in.orig13
-rw-r--r--package/dbus-glib/patches/patch-dbus_Makefile_in11
-rw-r--r--package/dbus/Makefile6
-rw-r--r--package/dri2proto/Makefile15
-rw-r--r--package/firefox/Makefile52
-rw-r--r--package/firefox/patches/patch-configure13
-rw-r--r--package/firefox/patches/patch-gfx_qcms_qcmstypes_h25
-rw-r--r--package/firefox/patches/patch-gfx_qcms_qcmstypes_h.orig18
-rw-r--r--package/firefox/patches/patch-js_src_jsnum_h11
-rw-r--r--package/firefox/patches/patch-security_nss_lib_freebl_stubs_c11
-rw-r--r--package/glproto/Makefile17
-rw-r--r--package/libIDL/Makefile26
-rw-r--r--package/libXdamage/Makefile25
-rw-r--r--package/libXfixes/Makefile24
-rw-r--r--package/libXxf86vm/Makefile26
-rw-r--r--package/libdrm/Makefile25
-rw-r--r--package/libnotify/Makefile24
-rw-r--r--package/libpthread-stubs/Makefile18
-rw-r--r--package/nss/Makefile8
-rw-r--r--package/nss/patches/patch-mozilla_security_coreconf_Linux_mk16
-rw-r--r--package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh13
-rw-r--r--package/pango/Makefile6
-rw-r--r--package/xcb-proto/Makefile15
-rw-r--r--package/xf86-input-keyboard/Makefile2
-rw-r--r--package/xf86-input-mouse/Makefile2
-rw-r--r--package/xf86-video-fbdev/Makefile2
-rw-r--r--package/xf86-video-intel/Makefile27
-rw-r--r--package/xf86-video-intel/patches/patch-configure42
-rw-r--r--package/xf86-video-intel/patches/patch-configure.orig22
-rw-r--r--package/xf86-video-intel/patches/patch-src_i830_h109
-rw-r--r--package/xf86-video-intel/patches/patch-uxa_uxa-priv_h11
-rw-r--r--package/xf86driproto/Makefile18
-rw-r--r--package/xf86vidmodeproto/Makefile14
-rw-r--r--package/xorg-server/Makefile19
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_dri_dri_h11
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c142
-rw-r--r--package/zlib/Makefile18
-rw-r--r--package/zlib/patches/patch-Makefile_in20
-rw-r--r--package/zlib/patches/patch-configure38
49 files changed, 970 insertions, 102 deletions
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 \
+ --disable-gnomeui \
+ --disable-gnomevfs \
+ --disable-optimize \
+ --disable-necko-wifi \
+ --disable-crashreporter
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
+ $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/firefox-3.6.3 \
+ $(IDIR_FIREFOX)/usr/lib/
+ $(CP) $(WRKINST)/usr/bin/firefox \
+ $(IDIR_FIREFOX)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
new file mode 100644
index 000000000..f424b3787
--- /dev/null
+++ b/package/firefox/patches/patch-configure
@@ -0,0 +1,13 @@
+--- mozilla-1.9.2.orig/configure 2010-04-02 18:07:41.000000000 +0200
++++ mozilla-1.9.2/configure 2010-04-11 14:38:39.000000000 +0200
+@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; then
+ HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
+ fi
+ if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
+- HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+- HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
++ HOST_LIBIDL_CFLAGS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --cflags`
++ HOST_LIBIDL_LIBS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --libs`
+ else
+ HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
+ HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
new file mode 100644
index 000000000..436b1a452
--- /dev/null
+++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
@@ -0,0 +1,25 @@
+--- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h 2010-04-02 18:02:27.000000000 +0200
++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-11 14:57:54.000000000 +0200
+@@ -11,22 +11,11 @@
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
+ #else
+-typedef PRInt8 int8_t;
+-typedef PRUint8 uint8_t;
+-typedef PRInt16 int16_t;
+-typedef PRUint16 uint16_t;
+-typedef PRInt32 int32_t;
+-typedef PRUint32 uint32_t;
+-typedef PRInt64 int64_t;
+-typedef PRUint64 uint64_t;
+-
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
+ #elif defined(__FreeBSD__)
+ /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */
+-#else
+-typedef PRUptrdiff uintptr_t;
+ #endif
+ #endif
+
diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h.orig b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h.orig
new file mode 100644
index 000000000..4cf9248f1
--- /dev/null
+++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h.orig
@@ -0,0 +1,18 @@
+--- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h 2010-04-02 18:02:27.000000000 +0200
++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-11 14:48:01.000000000 +0200
+@@ -11,15 +11,6 @@
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
+ #else
+-typedef PRInt8 int8_t;
+-typedef PRUint8 uint8_t;
+-typedef PRInt16 int16_t;
+-typedef PRUint16 uint16_t;
+-typedef PRInt32 int32_t;
+-typedef PRUint32 uint32_t;
+-typedef PRInt64 int64_t;
+-typedef PRUint64 uint64_t;
+-
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
diff --git a/package/firefox/patches/patch-js_src_jsnum_h b/package/firefox/patches/patch-js_src_jsnum_h
new file mode 100644
index 000000000..af999878c
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_jsnum_h
@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/js/src/jsnum.h 2010-04-02 18:02:28.000000000 +0200
++++ mozilla-1.9.2/js/src/jsnum.h 2010-04-11 14:04:14.000000000 +0200
+@@ -98,7 +98,7 @@ JSDOUBLE_IS_FINITE(jsdouble d)
+ #ifdef WIN32
+ return _finite(d);
+ #else
+- return finite(d);
++ return isfinite(d);
+ #endif
+ }
+
diff --git a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
new file mode 100644
index 000000000..233823c91
--- /dev/null
+++ b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/security/nss/lib/freebl/stubs.c 2010-04-02 18:03:06.000000000 +0200
++++ mozilla-1.9.2/security/nss/lib/freebl/stubs.c 2010-04-11 15:37:04.000000000 +0200
+@@ -530,7 +530,7 @@ freebl_InitNSSUtil(void *lib)
+ * fetch the library if it's loaded. For NSS it should already be loaded
+ */
+ #define freebl_getLibrary(libName) \
+- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
++ dlopen (libName, RTLD_LAZY)
+
+ #define freebl_releaseLibrary(lib) \
+ if (lib) dlclose(lib)
diff --git a/package/glproto/Makefile b/package/glproto/Makefile
new file mode 100644
index 000000000..286dadff2
--- /dev/null
+++ b/package/glproto/Makefile
@@ -0,0 +1,17 @@
+# 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:= glproto
+PKG_VERSION:= 1.4.11
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 78e7c4dc7dcb74b1869fee7897e00f59
+PKG_DESCR:= GL proto headers
+PKG_URL:= add project url
+PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
new file mode 100644
index 000000000..d303d2b4a
--- /dev/null
+++ b/package/libIDL/Makefile
@@ -0,0 +1,26 @@
+# 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:= libIDL
+PKG_VERSION:= 0.8.14
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 531fbc1b40b80dd1d6f3b5e76b99067c
+PKG_DESCR:= libraries for Interface Definition Language files
+PKG_SECTION:= libs
+PKG_URL:= http://www.gnome.org
+PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
+
+include $(TOPDIR)/mk/package.mk
+
+CONFIGURE_ENV+= libIDL_cv_long_long_format=ll
+
+$(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libIDL*.so* \
+ $(IDIR_LIBIDL)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile
new file mode 100644
index 000000000..0f2e62e4d
--- /dev/null
+++ b/package/libXdamage/Makefile
@@ -0,0 +1,25 @@
+# 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:= libXdamage
+PKG_VERSION:= 1.1.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= f8f19f747c8445213d5409ae8b8b2f0a
+PKG_DESCR:= add short description
+PKG_SECTION:= libs
+PKG_BUILDDEP+= libXfixes
+PKG_URL:= add project url
+PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXDAMAGE,libxdamage,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_LIBXDAMAGE)/usr/lib
+ $(INSTALL_BIN) $(WRKINST)/usr/lib/libXdamage* \
+ $(IDIR_LIBXDAMAGE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile
new file mode 100644
index 000000000..f03e32303
--- /dev/null
+++ b/package/libXfixes/Makefile
@@ -0,0 +1,24 @@
+# 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:= libXfixes
+PKG_VERSION:= 4.0.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 86eb4b916cd5948c0e20d279107b3331
+PKG_DESCR:= add short description
+PKG_SECTION:= libs
+PKG_URL:= add project url
+PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_LIBXFIXES)/usr/lib
+ $(INSTALL_BIN) $(WRKINST)/usr/lib/libXfixes*.so* \
+ $(IDIR_LIBXFIXES)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile
new file mode 100644
index 000000000..778b74f0b
--- /dev/null
+++ b/package/libXxf86vm/Makefile
@@ -0,0 +1,26 @@
+# 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:= libXxf86vm
+PKG_VERSION:= 1.1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 52b49483eccbdd1566b8c560fe7f76e8
+PKG_DESCR:= add short description
+PKG_SECTION:= libs
+PKG_BUILDDEP+= xf86vidmodeproto
+PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXXF86VM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+= --disable-malloc0returnsnull
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_LIBXXF86VM)/usr/lib
+ $(INSTALL_BIN) $(WRKINST)/usr/lib/libXxf86vm*.so* \
+ $(IDIR_LIBXXF86VM)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile
new file mode 100644
index 000000000..780164b03
--- /dev/null
+++ b/package/libdrm/Makefile
@@ -0,0 +1,25 @@
+# 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:= libdrm
+PKG_VERSION:= 2.4.20
+PKG_RELEASE:= 1
+PKG_MD5SUM:= dcbf9aa0497c84c7e4af15adb0021955
+PKG_DESCR:= DRM library
+PKG_SECTION:= libs
+PKG_BUILDDEP+= libpthread-stubs
+PKG_URL:= http://dri.freedesktop.org/wiki/
+PKG_SITES:= http://dri.freedesktop.org/libdrm/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBDRM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_LIBDRM)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libdrm*.so* \
+ $(IDIR_LIBDRM)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnotify/Makefile b/package/libnotify/Makefile
new file mode 100644
index 000000000..76435074f
--- /dev/null
+++ b/package/libnotify/Makefile
@@ -0,0 +1,24 @@
+# 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:= libnotify
+PKG_VERSION:= 0.4.5
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 472e2c1f808848365572a9b024d9e8f5
+PKG_DESCR:= notify library
+PKG_SECTION:= libs
+PKG_URL:= http://www.galago-project.org/
+PKG_SITES:= http://www.galago-project.org/files/releases/source/libnotify/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBNOTIFY,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_LIBNOTIFY)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libnotify*.so* \
+ $(IDIR_LIBNOTIFY)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile
new file mode 100644
index 000000000..b66060aa9
--- /dev/null
+++ b/package/libpthread-stubs/Makefile
@@ -0,0 +1,18 @@
+# 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:= libpthread-stubs
+PKG_VERSION:= 0.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 774eabaf33440d534efe108ef9130a7d
+PKG_DESCR:= weak aliases for pthread functions
+PKG_SECTION:= libs
+PKG_URL:= http://xcb.freedesktop.org/
+PKG_SITES:= http://xcb.freedesktop.org/dist/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 842bfdeb6..28e4da1f8 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= nss
-PKG_VERSION:= 3.12.4
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 1ee3ed9c1900079319bd1de51388d856
+PKG_VERSION:= 3.12.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= da42596665f226de5eb3ecfc1ec57cd1
PKG_DESCR:= Network Security Services (NSS) library
PKG_SECTION:= libs
PKG_BUILDDEP+= nspr zlib
PKG_NOPARALLEL:= 1
PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/
-PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/
+PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/
PKG_TARGET_DEPENDS:= !foxboard
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
index 68345c404..cfdf4a340 100644
--- a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
+++ b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
@@ -1,5 +1,5 @@
---- nss-3.12.4.orig/mozilla/security/coreconf/Linux.mk 2009-07-30 01:43:41.000000000 +0200
-+++ nss-3.12.4/mozilla/security/coreconf/Linux.mk 2009-12-11 20:45:13.000000000 +0100
+--- nss-3.12.6.orig/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100
++++ nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-04-12 20:18:32.000000000 +0200
@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
IMPL_STRATEGY = _PTH
endif
@@ -13,19 +13,19 @@
DEFAULT_COMPILER = gcc
-@@ -135,7 +135,7 @@ OS_PTHREAD = -lpthread
- endif
-
- OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
+@@ -133,7 +133,7 @@ endif
+ # not build with -ansi.
+ STANDARDS_CFLAGS = -ansi -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
+ OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR
-OS_LIBS = $(OS_PTHREAD) -ldl -lc
+OS_LIBS = $(OS_PTHREAD)
ifdef USE_PTHREADS
DEFINES += -D_REENTRANT
-@@ -151,7 +151,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG)
+@@ -148,7 +148,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG)
+ # we don't use -z defs there.
ZDEFS_FLAG = -Wl,-z,defs
DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
- DSO_LDFLAGS =
-LDFLAGS += $(ARCHFLAG)
+#LDFLAGS += $(ARCHFLAG)
diff --git a/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh b/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh
index 326f958d8..3d993d247 100644
--- a/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh
+++ b/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh
@@ -1,11 +1,10 @@
---- nss-3.12.4.orig/mozilla/security/nss/cmd/shlibsign/sign.sh 2009-06-05 04:30:52.000000000 +0200
-+++ nss-3.12.4/mozilla/security/nss/cmd/shlibsign/sign.sh 2009-11-20 18:51:43.000000000 +0100
-@@ -35,6 +35,7 @@ WIN*)
+--- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/sign.sh 2009-12-08 02:33:37.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/sign.sh 2010-04-12 20:21:23.000000000 +0200
+@@ -35,6 +35,6 @@ WIN*)
ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
export ADDON_PATH
- echo ${2}/shlibsign -v -i ${5}
-- ${2}/shlibsign -v -i ${5}
-+ #disable for cross-compile
-+ #${2}/shlibsign -v -i ${5}
+ echo "${2}"/shlibsign -v -i "${5}"
+- "${2}"/shlibsign -v -i "${5}"
++ #"${2}"/shlibsign -v -i "${5}"
;;
esac
diff --git a/package/pango/Makefile b/package/pango/Makefile
index f974c73c5..3d84ecbb7 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= pango
-PKG_VERSION:= 1.26.1
+PKG_VERSION:= 1.28.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 629f653adfdcfd6e4d89e95f74b8d370
+PKG_MD5SUM:= aa3dee16506275a36c6c9239c9e2dfdd
PKG_DESCR:= pango library
PKG_SECTION:= libs
PKG_URL:= http://www.pango.org
-PKG_SITES:= ${MASTER_SITE_GNOME:=/pango/1.26/}
+PKG_SITES:= ${MASTER_SITE_GNOME:=/pango/1.28/}
ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
new file mode 100644
index 000000000..52f2a67ac
--- /dev/null
+++ b/package/xcb-proto/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:= xcb-proto
+PKG_VERSION:= 1.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 8d29695e8faf5fcdce568c66eaeaa5ee
+PKG_DESCR:= XCB headers
+PKG_URL:= http://xcb.freedesktop.org/
+PKG_SITES:= http://xcb.freedesktop.org/dist/
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index 5ed7240d7..be80953ef 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP+= xorg-server
PKG_DEPENDS:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_TARGET_DEPENDS:= alix1c lemote
+PKG_TARGET_DEPENDS:= alix1c lemote ibmx40 shuttle
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 959a2a071..623364ba6 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_TARGET_DEPENDS:= alix1c lemote
+PKG_TARGET_DEPENDS:= alix1c lemote ibmx40 shuttle
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index c4ab8444f..ba05cf808 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
-PKG_TARGET_DEPENDS:= alix1c lemote
+PKG_TARGET_DEPENDS:= alix1c lemote ibmx40
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
new file mode 100644
index 000000000..b0f4350a8
--- /dev/null
+++ b/package/xf86-video-intel/Makefile
@@ -0,0 +1,27 @@
+# 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:= xf86-video-intel
+PKG_VERSION:= 2.9.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= b1926dc68cc10209fc2200729fb6162b
+PKG_DESCR:= X11 driver for Intel VGA chip
+PKG_SECTION:= x11
+PKG_DEPENDS:= xorg-server libdrm
+PKG_BUILDDEP+= xorg-server libdrm
+PKG_SITES:= http://www.x.org/releases/X11R7.5/src/driver/
+
+PKG_TARGET_DEPENDS:= ibmx40
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_INTEL,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/intel_drv.so \
+ ${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-video-intel/patches/patch-configure b/package/xf86-video-intel/patches/patch-configure
new file mode 100644
index 000000000..ac5f5031c
--- /dev/null
+++ b/package/xf86-video-intel/patches/patch-configure
@@ -0,0 +1,42 @@
+--- xf86-video-intel-2.9.1.orig/configure 2009-10-26 12:53:35.000000000 +0100
++++ xf86-video-intel-2.9.1/configure 2010-04-21 19:57:36.000000000 +0200
+@@ -12283,9 +12283,6 @@ if test x$DRI != xno; then
+ $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+-else
+- test "$cross_compiling" = yes &&
+- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/dri.h"; then
+ eval "$as_ac_File=yes"
+ else
+@@ -12307,9 +12304,6 @@ fi
+ $as_echo_n "checking for ${sdkdir}/sarea.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+-else
+- test "$cross_compiling" = yes &&
+- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/sarea.h"; then
+ eval "$as_ac_File=yes"
+ else
+@@ -12331,9 +12325,6 @@ fi
+ $as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+-else
+- test "$cross_compiling" = yes &&
+- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/dristruct.h"; then
+ eval "$as_ac_File=yes"
+ else
+@@ -12927,9 +12918,6 @@ else
+ $as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+-else
+- test "$cross_compiling" = yes &&
+- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
+ eval "$as_ac_File=yes"
+ else
diff --git a/package/xf86-video-intel/patches/patch-configure.orig b/package/xf86-video-intel/patches/patch-configure.orig
new file mode 100644
index 000000000..fc077ce34
--- /dev/null
+++ b/package/xf86-video-intel/patches/patch-configure.orig
@@ -0,0 +1,22 @@
+--- xf86-video-intel-2.9.1.orig/configure 2009-10-26 12:53:35.000000000 +0100
++++ xf86-video-intel-2.9.1/configure 2010-04-21 19:57:01.000000000 +0200
+@@ -12283,9 +12283,6 @@ if test x$DRI != xno; then
+ $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+-else
+- test "$cross_compiling" = yes &&
+- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/dri.h"; then
+ eval "$as_ac_File=yes"
+ else
+@@ -12331,9 +12328,6 @@ fi
+ $as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+-else
+- test "$cross_compiling" = yes &&
+- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/dristruct.h"; then
+ eval "$as_ac_File=yes"
+ else
diff --git a/package/xf86-video-intel/patches/patch-src_i830_h b/package/xf86-video-intel/patches/patch-src_i830_h
new file mode 100644
index 000000000..c4ed17cf8
--- /dev/null
+++ b/package/xf86-video-intel/patches/patch-src_i830_h
@@ -0,0 +1,109 @@
+--- xf86-video-intel-2.9.1.orig/src/i830.h 2009-10-26 12:48:05.000000000 +0100
++++ xf86-video-intel-2.9.1/src/i830.h 2010-04-19 20:20:51.000000000 +0200
+@@ -61,6 +61,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include "xorg-server.h"
+ #include <pciaccess.h>
+
++#ifdef XF86DRI
+ #include "xf86drm.h"
+ #include "sarea.h"
+ #define _XF86DRI_SERVER_
+@@ -69,16 +70,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include "i830_dri.h"
+ #include "intel_bufmgr.h"
+ #include "i915_drm.h"
++#endif
+
+ #include "uxa.h"
+ Bool i830_uxa_init(ScreenPtr pScreen);
+ void i830_uxa_create_screen_resources(ScreenPtr pScreen);
+ void i830_uxa_block_handler (ScreenPtr pScreen);
++#ifdef XF86DRI
+ Bool i830_get_aperture_space(ScrnInfoPtr pScrn, drm_intel_bo **bo_table,
+ int num_bos);
+
+ dri_bo *i830_get_pixmap_bo (PixmapPtr pixmap);
+ void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo *bo);
++#endif
+
+ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
+
+@@ -168,7 +172,9 @@ struct _i830_memory {
+ i830_memory *prev;
+ /** @} */
+
++#ifdef XF86DRI
+ dri_bo *bo;
++#endif
+ uint32_t alignment;
+ uint32_t gem_name;
+ Bool lifetime_fixed_offset;
+@@ -370,7 +376,9 @@ typedef struct _I830Rec {
+ /** Offset in the ring for the next DWORD emit */
+ uint32_t ring_next;
+
++#ifdef XF86DRI
+ dri_bufmgr *bufmgr;
++#endif
+
+ uint8_t *batch_ptr;
+ /** Byte offset in batch_ptr for the next dword to be emitted. */
+@@ -379,8 +387,10 @@ typedef struct _I830Rec {
+ unsigned int batch_emit_start;
+ /** Number of bytes to be emitted in the current BEGIN_BATCH. */
+ uint32_t batch_emitting;
++#ifdef XF86DRI
+ dri_bo *batch_bo;
+ dri_bo *last_batch_bo;
++#endif
+ /** Whether we're in a section of code that can't tolerate flushing */
+ Bool in_batch_atomic;
+ /** Ending batch_used that was verified by i830_start_batch_atomic() */
+@@ -451,6 +461,7 @@ typedef struct _I830Rec {
+ ScreenBlockHandlerProcPtr BlockHandler;
+ Bool overlayOn;
+
++#ifdef XF86DRI
+ struct {
+ drm_intel_bo *gen4_vs_bo;
+ drm_intel_bo *gen4_sf_bo;
+@@ -461,6 +472,7 @@ typedef struct _I830Rec {
+ drm_intel_bo *gen4_sampler_bo;
+ drm_intel_bo *gen4_sip_kernel_bo;
+ } video;
++#endif
+
+ /* Render accel state */
+ float scale_units[2][2];
+@@ -687,6 +699,7 @@ i830_pipe_a_require_activate (ScrnInfoPt
+ void
+ i830_pipe_a_require_deactivate (ScrnInfoPtr scrn);
+
++#ifdef XF86DRI
+ Bool I830DRI2ScreenInit(ScreenPtr pScreen);
+ void I830DRI2CloseScreen(ScreenPtr pScreen);
+
+@@ -696,6 +709,7 @@ extern void drmmode_closefb(ScrnInfoPtr
+ extern int drmmode_output_dpms_status(xf86OutputPtr output);
+ void
+ drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor);
++#endif
+
+ extern Bool i830_crtc_on(xf86CrtcPtr crtc);
+ extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
+@@ -882,6 +896,7 @@ Bool i830_pixmap_tiled(PixmapPtr p);
+ if (pitch > KB(8)) I830FALLBACK("pitch exceeds 3d limit 8K\n");\
+ } while(0)
+
++#ifdef XF86DRI
+ /**
+ * Little wrapper around drm_intel_bo_reloc to return the initial value you
+ * should stuff into the relocation entry.
+@@ -913,6 +928,7 @@ intel_bo_alloc_for_data(ScrnInfoPtr scrn
+
+ return bo;
+ }
++#endif
+
+ extern const int I830PatternROP[16];
+ extern const int I830CopyROP[16];
diff --git a/package/xf86-video-intel/patches/patch-uxa_uxa-priv_h b/package/xf86-video-intel/patches/patch-uxa_uxa-priv_h
new file mode 100644
index 000000000..205367b55
--- /dev/null
+++ b/package/xf86-video-intel/patches/patch-uxa_uxa-priv_h
@@ -0,0 +1,11 @@
+--- xf86-video-intel-2.9.1.orig/uxa/uxa-priv.h 2009-10-26 12:48:05.000000000 +0100
++++ xf86-video-intel-2.9.1/uxa/uxa-priv.h 2010-04-16 20:13:57.000000000 +0200
+@@ -46,7 +46,7 @@
+ #include <X11/extensions/shm.h>
+ #else
+ #define _XSHM_SERVER_
+-#include <X11/extensions/shmstr.h>
++#include <xorg/shmint.h>
+ #endif
+ #endif
+ #include "scrnintstr.h"
diff --git a/package/xf86driproto/Makefile b/package/xf86driproto/Makefile
new file mode 100644
index 000000000..30430b43c
--- /dev/null
+++ b/package/xf86driproto/Makefile
@@ -0,0 +1,18 @@
+# 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:= xf86driproto
+PKG_VERSION:= 2.1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 309d552732666c3333d7dc63e80d042f
+PKG_DESCR:= DRI protocol headers
+PKG_SECTION:= libs
+PKG_URL:= add project url
+PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86vidmodeproto/Makefile b/package/xf86vidmodeproto/Makefile
new file mode 100644
index 000000000..9ab665f50
--- /dev/null
+++ b/package/xf86vidmodeproto/Makefile
@@ -0,0 +1,14 @@
+# 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:= xf86vidmodeproto
+PKG_VERSION:= 2.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 934b400f2f8d1bcab20bb056e0910291
+PKG_DESCR:= videomode proto headers
+PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index d3fd19175..e81d4b271 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -17,6 +17,10 @@ PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \
scrnsaverproto resourceproto fontsproto videoproto \
compositeproto evieext libxkbfile libXfont pixman \
libpciaccess openssl xf86dgaproto
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+PKG_BUILDDEP+= xf86driproto glproto dri2proto MesaLib
+PKG_DEPENDS+= xf86driproto glproto dri2proto mesalib
+endif
PKG_URL:= http://www.x.org
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/
@@ -24,6 +28,9 @@ PKG_TARGET_DEPENDS:= !foxboard
CFLINE_XORG_SERVER:= depends on ADK_TARGET_WITH_VGA
+PKG_FLAVOURS:= WITH_DRI
+PKGFD_WITH_DRI:= enable DRI/DRI2 support
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -38,8 +45,6 @@ CONFIGURE_ARGS+= \
--disable-aiglx \
--disable-config-hal \
--disable-dpms \
- --disable-dri \
- --disable-dri2 \
--disable-glx \
--disable-xace \
--disable-xephyr \
@@ -58,6 +63,12 @@ CONFIGURE_ARGS+= \
--with-os-vendor=OpenADK \
--with-vendor-web="http://openadk.org"
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+CONFIGURE_ARGS+= --enable-dri --enable-dri2
+else
+CONFIGURE_ARGS+= --disable-dri --disable-dri2
+endif
+
post-install:
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
@@ -78,5 +89,9 @@ post-install:
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \
$(IDIR_XORG_SERVER)/etc/X11
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \
+ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
+endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h
new file mode 100644
index 000000000..0e3d1974a
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h
@@ -0,0 +1,11 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/dri/dri.h 2009-08-11 06:00:23.000000000 +0200
++++ xorg-server-1.7.5/hw/xfree86/dri/dri.h 2010-04-21 19:59:22.000000000 +0200
+@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include <pciaccess.h>
+
+ #include "scrnintstr.h"
+-#include "xf86dri.h"
++#include <X11/dri/xf86dri.h>
+
+ typedef int DRISyncType;
+
diff --git a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
new file mode 100644
index 000000000..8ee439b75
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
@@ -0,0 +1,142 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/loader/sdksyms.c 2010-02-16 02:42:49.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/loader/sdksyms.c 2010-04-21 19:50:58.000000000 +0200
+@@ -429,8 +429,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &AbortDDX,
+ (void *) &ddxGiveUp,
+ (void *) &TimeSinceLastInputEvent,
+- (void *) &strlcpy,
+- (void *) &strlcat,
+ (void *) &LogInit,
+ (void *) &LogClose,
+ (void *) &LogSetParameter,
+@@ -634,7 +632,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &NewCurrentScreen,
+ (void *) &PointerConfinedToScreen,
+ (void *) &GetSpritePosition,
+- (void *) &XineramaGetCursorScreen,
+ (void *) &GEExtensions,
+ (void *) &GERegisterExtension,
+ (void *) &GEInitEvent,
+@@ -724,7 +721,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &PickPointer,
+ (void *) &PickKeyboard,
+ (void *) &IsInterferingGrab,
+- (void *) &ReinitializeRootWindow,
+ (void *) &ScreenRestructured,
+ (void *) &ffs,
+ (void *) &AddCallback,
+@@ -874,8 +870,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &CreateLinearGradientPicture,
+ (void *) &CreateRadialGradientPicture,
+ (void *) &CreateConicalGradientPicture,
+- (void *) &PanoramiXRenderInit,
+- (void *) &PanoramiXRenderReset,
+ (void *) &PictTransform_from_xRenderTransform,
+ (void *) &xRenderTransform_from_PictTransform,
+ (void *) &PictureTransformPoint,
+@@ -977,25 +971,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &ShmSegType,
+ (void *) &ShmCompletionCode,
+ (void *) &BadShmSegCode,
+- (void *) &PanoramiXNumScreens,
+- (void *) &panoramiXdataPtr,
+- (void *) &PanoramiXPixWidth,
+- (void *) &PanoramiXPixHeight,
+- (void *) &PanoramiXTranslateVisualID,
+- (void *) &PanoramiXConsolidate,
+- (void *) &PanoramiXCreateConnectionBlock,
+- (void *) &PanoramiXFindIDByScrnum,
+- (void *) &XineramaRegisterConnectionBlockCallback,
+- (void *) &XineramaDeleteResource,
+- (void *) &XineramaReinitData,
+- (void *) &XineramaScreenRegions,
+- (void *) &XRC_DRAWABLE,
+- (void *) &XRT_WINDOW,
+- (void *) &XRT_PIXMAP,
+- (void *) &XRT_GC,
+- (void *) &XRT_COLORMAP,
+- (void *) &XineramaVisualsEqualPtr,
+- (void *) &XineramaGetImageData,
+ (void *) &xf86CreateI2CBusRec,
+ (void *) &xf86DestroyI2CBusRec,
+ (void *) &xf86I2CBusInit,
+@@ -1034,19 +1009,9 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &noTestExtensions,
+ (void *) &dixScreenOrigins,
+ (void *) &ConnectionInfo,
+- (void *) &DPMSStandbyTime,
+- (void *) &DPMSSuspendTime,
+- (void *) &DPMSOffTime,
+- (void *) &DPMSPowerLevel,
+- (void *) &DPMSEnabled,
+- (void *) &DPMSDisabledSwitch,
+- (void *) &DPMSCapableFlag,
+- (void *) &PanoramiXExtensionDisabledHack,
+ (void *) &noCompositeExtension,
+ (void *) &noDamageExtension,
+ (void *) &noDbeExtension,
+- (void *) &noDPMSExtension,
+- (void *) &noGlxExtension,
+ (void *) &noScreenSaverExtension,
+ (void *) &noMITShmExtension,
+ (void *) &noRRExtension,
+@@ -1054,9 +1019,7 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &noResExtension,
+ (void *) &noXFree86DGAExtension,
+ (void *) &noXFree86DRIExtension,
+- (void *) &noXFree86VidModeExtension,
+ (void *) &noXFixesExtension,
+- (void *) &noPanoramiXExtension,
+ (void *) &noXvExtension,
+ (void *) &noDRI2Extension,
+ (void *) &defaultTextFont,
+@@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &ProcRRQueryOutputProperty,
+ (void *) &ProcRRConfigureOutputProperty,
+ (void *) &ProcRRDeleteOutputProperty,
+- (void *) &RRXineramaExtensionInit,
+ (void *) &ExtensionModuleList,
+ (void *) &LoadSubModule,
+ (void *) &UnloadSubModule,
+@@ -1311,8 +1273,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &xf86ReconfigureLayout,
+ (void *) &xf86CVTMode,
+ (void *) &xf86DPMSInit,
+- (void *) &DPMSSet,
+- (void *) &DPMSSupported,
+ (void *) &DGAInit,
+ (void *) &DGAReInitModes,
+ (void *) &xf86SetDGAMode,
+@@ -1570,8 +1530,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &DMTModes,
+ (void *) &xf86ConfigFile,
+ (void *) &xf86AllowMouseOpenFail,
+- (void *) &xf86VidModeDisabled,
+- (void *) &xf86VidModeAllowNonLocal,
+ (void *) &xf86fpFlag,
+ (void *) &xf86sFlag,
+ (void *) &xf86bsEnableFlag,
+@@ -1935,7 +1893,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &ProcGrabButton,
+ (void *) &ProcUngrabButton,
+ (void *) &ProcRecolorCursor,
+- (void *) &PostSyntheticMotion,
+ (void *) &SetDefaultFont,
+ (void *) &QueueFontWakeup,
+ (void *) &RemoveFontWakeup,
+@@ -2185,15 +2142,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &SProcUngrabButton,
+ (void *) &SProcUngrabKey,
+ (void *) &SProcWarpPointer,
+- (void *) &XaceHooks,
+- (void *) &XaceHook,
+- (void *) &XaceHookDispatch,
+- (void *) &XaceHookPropertyAccess,
+- (void *) &XaceHookSelectionAccess,
+- (void *) &XaceHookAuditEnd,
+- (void *) &XaceGetConnectionNumber,
+- (void *) &XaceIsLocal,
+- (void *) &XaceCensorImage,
+ (void *) &XkbIndentText,
+ (void *) &XkbAtomText,
+ (void *) &XkbKeysymText,
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index e031baf0a..a31ca4af2 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= zlib
-PKG_VERSION:= 1.2.3
-PKG_RELEASE:= 6
-PKG_MD5SUM:= dee233bf288ee795ac96a98cc2e369b6
+PKG_VERSION:= 1.2.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 763c6a0b4ad1cdf5549e3ab3f140f4cb
PKG_DESCR:= implementation of the deflate compression method
PKG_SECTION:= libs
PKG_URL:= http://www.zlib.net
@@ -24,6 +24,10 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_ZLIB_DEV}+= zlib-dev-install
+
CONFIG_STYLE:= manual
ifeq ($(ADK_NATIVE),)
@@ -34,20 +38,22 @@ ifeq ($(ADK_STATIC),)
CONFIGURE_OPTS:= --shared
endif
+#--includedir=$(STAGING_DIR)/usr/include
do-configure:
(cd $(WRKBUILD); $(COPTS) \
CFLAGS="$(TARGET_CFLAGS) -fPIC" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
./configure \
- --prefix=$(STAGING_DIR)/usr \
- --includedir=$(STAGING_DIR)/usr/include \
+ --prefix=/usr \
$(CONFIGURE_OPTS) \
);
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib
+
+zlib-dev-install:
${INSTALL_DIR} ${IDIR_ZLIB_DEV}/usr/include
${CP} ${WRKBUILD}/*.h ${IDIR_ZLIB_DEV}/usr/include
diff --git a/package/zlib/patches/patch-Makefile_in b/package/zlib/patches/patch-Makefile_in
deleted file mode 100644
index c34514a03..000000000
--- a/package/zlib/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- zlib-1.2.3.orig/Makefile.in 2005-07-18 04:25:21.000000000 +0200
-+++ zlib-1.2.3/Makefile.in 2008-12-31 16:32:48.417074167 +0100
-@@ -34,6 +34,7 @@ SHAREDLIBV=libz.so.1.2.3
- SHAREDLIBM=libz.so.1
-
- AR=ar rc
-+ARFLAGS=rc
- RANLIB=ranlib
- TAR=tar
- SHELL=/bin/sh
-@@ -68,7 +69,7 @@ test: all
- fi
-
- libz.a: $(OBJS) $(OBJA)
-- $(AR) $@ $(OBJS) $(OBJA)
-+ $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
- match.o: match.S
diff --git a/package/zlib/patches/patch-configure b/package/zlib/patches/patch-configure
deleted file mode 100644
index 784f624b5..000000000
--- a/package/zlib/patches/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- zlib-1.2.3.orig/configure 2005-07-11 22:11:57.000000000 +0200
-+++ zlib-1.2.3/configure 2008-12-31 16:43:55.922789768 +0100
-@@ -73,32 +73,9 @@ esac
-
- if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
- CC="$cc"
-- SFLAGS=${CFLAGS-"-fPIC -O3"}
-+ SFLAGS=${CFLAGS-"-fPIC -D_REENTRANT"}
- CFLAGS="$cflags"
-- case `(uname -s || echo unknown) 2>/dev/null` in
-- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
-- CYGWIN* | Cygwin* | cygwin* | OS/2* )
-- EXE='.exe';;
-- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
-- # (alain.bonnefoy@icbt.com)
-- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};;
-- HP-UX*)
-- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
-- case `(uname -m || echo unknown) 2>/dev/null` in
-- ia64)
-- shared_ext='.so'
-- SHAREDLIB='libz.so';;
-- *)
-- shared_ext='.sl'
-- SHAREDLIB='libz.sl';;
-- esac;;
-- Darwin*) shared_ext='.dylib'
-- SHAREDLIB=libz$shared_ext
-- SHAREDLIBV=libz.$VER$shared_ext
-- SHAREDLIBM=libz.$VER1$shared_ext
-- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;
-- *) LDSHARED=${LDSHARED-"$cc -shared"};;
-- esac
-+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"}
- else
- # find system name and corresponding cc options
- CC=${CC-cc}