summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-05-20 19:06:51 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-05-20 19:06:51 +0200
commit7259636f477c3f1e6330ee57cf064b3afd0a778c (patch)
tree28a8a33a0079980c2115be307dc60b1b5183f5fa /package
parent5f5e6da9afeb1684fe484ead00894866ebfbde7b (diff)
parent10668d53167c49eefbbac043db5f1c183ac8f21c (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/MesaLib/Makefile9
-rw-r--r--package/adkinstall/Makefile8
-rwxr-xr-xpackage/base-files/src/sbin/adkupdate4
-rw-r--r--package/cfgfs/Makefile2
-rw-r--r--package/davfs2/Config.in.kernel4
-rw-r--r--package/davfs2/Makefile4
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/firefox/patches/patch-gfx_qcms_iccread_c18
-rw-r--r--package/firefox/patches/patch-gfx_qcms_qcmstypes_h5
-rw-r--r--package/gdb/Makefile8
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/krb5/Makefile2
-rw-r--r--package/nand/Makefile2
-rw-r--r--package/nspr/Makefile7
-rw-r--r--package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in4
-rw-r--r--package/nspr/patches/patch-mozilla_nsprpub_configure21
-rw-r--r--package/nss/Makefile6
-rw-r--r--package/openswan/Makefile2
-rw-r--r--package/openvpn/Makefile4
-rw-r--r--package/xorg-server/Makefile5
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c17
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c35
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c17
23 files changed, 117 insertions, 71 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 41506092d..9d673613f 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -9,14 +9,15 @@ 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_DEPENDS:= libxdamage libxfixes libdrm
+PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm
+PKG_BUILDDEP+= dri2proto glproto
+PKG_URL:= http://www.mesa3d.org/
PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/
WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION}
-PKG_TARGET_DEPENDS:= x86 x86_64
+PKG_TARGET_DEPENDS:= ibmx40
include $(TOPDIR)/mk/package.mk
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
index 5a1823cc3..944c073fb 100644
--- a/package/adkinstall/Makefile
+++ b/package/adkinstall/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:= installer for cf, mmc, sd or mtd devices
PKG_SECTION:= base
PKG_DEPENDS:= parted sfdisk e2fsprogs
-PKG_TARGET_DEPENDS:= alix wrap rb532 foxg20
+PKG_TARGET_DEPENDS:= alix wrap rb532 foxg20 rb411 rb433
WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
NO_DISTFILES:= 1
@@ -34,6 +34,12 @@ ifeq ($(ADK_LINUX_MIPS_RB532),y)
else ifeq ($(ADK_LINUX_ARM_FOXBOARD),y)
${INSTALL_BIN} ./src/adkinstall.foxg20 \
$(IDIR_ADKINSTALL)/sbin/adkinstall
+else ifeq ($(ADK_LINUX_MIPS_RB433),y)
+ ${INSTALL_BIN} ./src/adkinstall.rb4xx \
+ $(IDIR_ADKINSTALL)/sbin/adkinstall
+else ifeq ($(ADK_LINUX_MIPS_RB411),y)
+ ${INSTALL_BIN} ./src/adkinstall.rb4xx \
+ $(IDIR_ADKINSTALL)/sbin/adkinstall
else
${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin
endif
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
index 1af188b41..dd8d3ecec 100755
--- a/package/base-files/src/sbin/adkupdate
+++ b/package/base-files/src/sbin/adkupdate
@@ -34,6 +34,8 @@ prepare() {
mount -o remount,rw /
if [ "$system" == "RB532" ];then
mount -t yaffs2 /dev/mtdblock0 /boot
+ elif [ "$system" == "AR7130" ];then
+ mount -t yaffs2 /dev/mtdblock1 /boot
elif [ "$system" == "FOXG20" ];then
mount -t vfat /dev/mmcblk0p1 /boot
fi
@@ -89,6 +91,8 @@ if [ -x /sbin/cfgfs ];then
fi
if [ "$system" == "RB532" ];then
umount -f /boot
+elif [ "$system" == "AR7130" ];then
+ umount -f /boot
elif [ "$system" == "FOXG20" ];then
umount -f /boot
fi
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 1b9897807..4eb72170e 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_DESCR:= compressed config filesystem
PKG_SECTION:= base
-PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 foxg20
+PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 foxg20 rb411 rb433
WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
NO_DISTFILES:= 1
diff --git a/package/davfs2/Config.in.kernel b/package/davfs2/Config.in.kernel
index 3ef8e77d7..70e3c3ea4 100644
--- a/package/davfs2/Config.in.kernel
+++ b/package/davfs2/Config.in.kernel
@@ -4,13 +4,9 @@ depends on ADK_PACKAGE_DAVFS2
config ADK_PACKAGE_DAVFS2_FUSE
bool "use the FUSE filesystem interface"
- select ADK_PACKAGE_FUSE_UTILS
config ADK_PACKAGE_DAVFS2_CODA
bool "use the CODA filesystem interface"
- select ADK_KPACKAGE_KMOD_CODA_FS
config ADK_PACKAGE_DAVFS2_BOTH
bool "use both filesystem interfaces"
- select ADK_PACKAGE_FUSE_UTILS
- select ADK_KPACKAGE_KMOD_CODA_FS
endchoice
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index b3e63f2c9..b6c026739 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -16,8 +16,6 @@ endif
PKG_URL:= http://savannah.nongnu.org/projects/davfs2
PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/}
-include ${TOPDIR}/mk/package.mk
-
ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon
else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
@@ -26,6 +24,8 @@ else
PKG_DEPENDS:= kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon
endif
+include ${TOPDIR}/mk/package.mk
+
$(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-neon
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 8c6db24be..b8d667241 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -19,7 +19,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
WRKDIST= ${WRKDIR}/mozilla-1.9.2
-PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle
+PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40
include $(TOPDIR)/mk/package.mk
diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c
new file mode 100644
index 000000000..ea9ab6234
--- /dev/null
+++ b/package/firefox/patches/patch-gfx_qcms_iccread_c
@@ -0,0 +1,18 @@
+--- mozilla-1.9.2.orig/gfx/qcms/iccread.c 2010-04-02 18:02:27.000000000 +0200
++++ mozilla-1.9.2/gfx/qcms/iccread.c 2010-04-30 14:00:52.430967966 +0200
+@@ -23,6 +23,7 @@
+ #include <math.h>
+ #include <assert.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include "qcmsint.h"
+
+ //XXX: use a better typename
+@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile *
+ qcms_profile_fini(profile);
+ }
+
+-#include <stdio.h>
+ qcms_profile* qcms_profile_from_file(FILE *file)
+ {
+ uint32_t length, remaining_length;
diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
index 436b1a452..80f68661a 100644
--- a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
+++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
@@ -1,6 +1,6 @@
--- 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 @@
++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-30 17:58:33.490975825 +0200
+@@ -11,22 +11,12 @@
/* int_types.h gets included somehow, so avoid redefining the types differently */
#include <sys/int_types.h>
#else
@@ -13,6 +13,7 @@
-typedef PRInt64 int64_t;
-typedef PRUint64 uint64_t;
-
++#include <stdint.h>
#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/gdb/Makefile b/package/gdb/Makefile
index e01721222..1438ac0b7 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -6,10 +6,12 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_DESCR:= GNU debugger
PKG_SECTION:= comp
-PKG_DEPENDS:= libthread-db libncurses libiconv
-PKG_BUILDDEP+= ncurses readline libiconv
+PKG_DEPENDS:= libthread-db libncurses libiconv libexpat
+PKG_BUILDDEP+= ncurses readline libiconv expat
PKG_TARGET_DEPENDS:= !foxboard !ag241
+PKG_NOPARALLEL:= 1
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -19,7 +21,7 @@ CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \
--disable-tui --disable-gdbtk --without-x \
--without-included-gettext --disable-sim \
--enable-threads --with-curses --disable-werror \
- --enable-static
+ --enable-static --without-python
XAKE_FLAGS+= LDFLAGS='${TLDFLAGS}'
post-install:
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index cfbed5260..32ce9fd59 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -8,6 +8,8 @@ PKG_DESCR:= GNU debugger (small server)
PKG_SECTION:= comp
PKG_DEPENDS:= libthread-db
+PKG_TARGET_DEPENDS:= !foxboard
+
include ${TOPDIR}/mk/package.mk
WRKSRC= ${WRKDIST}/gdb/gdbserver
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 6b553f35f..b9efa2b2c 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP+= ncurses e2fsprogs
PKG_URL:= http://web.mit.edu/kerberos
PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/
+PKG_NOPARALLEL:= 1
+
PKG_DESCR_LIB:= MIT kerberos libraries
PKG_SECTION_LIB:= libs
diff --git a/package/nand/Makefile b/package/nand/Makefile
index f904bc910..dc6292c01 100644
--- a/package/nand/Makefile
+++ b/package/nand/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 3
PKG_DESCR:= NAND utility
PKG_SECTION:= base
-PKG_TARGET_DEPENDS:= rb532
+PKG_TARGET_DEPENDS:= rb532 rb411 rb433
NO_DISTFILES:= 1
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index 9072977a1..9383c8c5f 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -20,7 +20,12 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}"
+CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
+ cross_compiling=yes
+
+ifeq (${ADK_LINUX_64},y)
+CONFIGURE_ARGS+= --enable-64bit
+endif
post-install:
$(INSTALL_DIR) $(IDIR_NSPR)/usr/lib
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
index 40d15376f..f667eeb61 100644
--- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
+++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
@@ -1,11 +1,11 @@
--- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in 2009-03-03 23:04:23.000000000 +0100
-+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-02-06 02:01:27.321836181 +0100
++++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-05-02 12:25:27.673464050 +0200
@@ -145,7 +145,7 @@ endif
$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
- $(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
-+ $(CC_FOR_BUILD) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
++ $(CC_FOR_BUILD) $(HOSTCFLAGS) $< $(HOSTLDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
install:: nspr.m4
$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure
new file mode 100644
index 000000000..3d048970b
--- /dev/null
+++ b/package/nspr/patches/patch-mozilla_nsprpub_configure
@@ -0,0 +1,21 @@
+--- nspr-4.8.2.orig/mozilla/nsprpub/configure 2009-10-04 02:57:00.000000000 +0200
++++ nspr-4.8.2/mozilla/nsprpub/configure 2010-05-02 12:55:21.842224375 +0200
+@@ -1129,8 +1129,8 @@ EOF
+ fi
+
+ if test -z "$SKIP_COMPILER_CHECKS"; then
+-if test "$target" != "$host"; then
+- echo "cross compiling from $host to $target"
++if test "$target" != "$build"; then
++ echo "cross compiling from $build to $target"
+ cross_compiling=yes
+
+ _SAVE_CC="$CC"
+@@ -2593,6 +2593,7 @@ case "$build:$target" in
+ ;;
+ esac
+
++cross_compiling=yes
+ if test "$cross_compiling" = "yes"; then
+ CROSS_COMPILE=1
+ else
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 28e4da1f8..7acbacbe4 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -26,7 +26,7 @@ CONFIG_STYLE:= manual
ifeq ($(ADK_LINUX_64),y)
TCFLAGS+= -DUSE_64
-MAKE_FLAGS+= USE_64=1
+XAKE_FLAGS+= USE_64=1
endif
MAKE_FLAGS+= NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}"
@@ -34,10 +34,10 @@ TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr
TCFLAGS+= -I${STAGING_DIR}/usr/include/nspr
TLDFLAGS:= ''
-MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \
+XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \
ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl"
ALL_TARGET:= build_coreconf all
-XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6
+XAKE_FLAGS+= OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6
post-install:
$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index c5588f549..6c0adce62 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -15,6 +15,8 @@ PKG_URL:= http://www.openswan.org
PKG_SITES:= http://www.openswan.org/download/ \
ftp://ftp.openswan.org/openswan/
+PKG_NOPARALLEL:= 1
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index e8af513fe..330b25124 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= openvpn
-PKG_VERSION:= 2.1.0
+PKG_VERSION:= 2.1.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 452a83326ae198cf961e9ae02539c8fb
+PKG_MD5SUM:= b273ed2b5ec8616fb9834cde8634bce7
PKG_DESCR:= Open Source VPN solution using SSL
PKG_SECTION:= net
PKG_DEPENDS:= kmod-tun
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index e81d4b271..16cbe0359 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xorg-server
-PKG_VERSION:= 1.7.5
+PKG_VERSION:= 1.7.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 866917789c71e7616a016ad256fe9b8f
+PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2
PKG_DESCR:= Xorg server
PKG_SECTION:= x11
PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \
@@ -42,6 +42,7 @@ CONFIGURE_ARGS+= \
--enable-xorg \
--enable-xv \
--enable-xaa \
+ --enable-vgahw \
--disable-aiglx \
--disable-config-hal \
--disable-dpms \
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c
deleted file mode 100644
index 411d7b2e2..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- xorg-server-1.7.1.orig/hw/xfree86/common/xf86VGAarbiter.c 2009-10-09 06:08:28.000000000 +0200
-+++ xorg-server-1.7.1/hw/xfree86/common/xf86VGAarbiter.c 2009-12-10 17:14:01.000000000 +0100
-@@ -38,14 +38,8 @@
- #include "xf86Priv.h"
- #include "pciaccess.h"
-
--#ifdef DEBUG
--#error "no, really, you dont want to do this"
--#define DPRINT_S(x,y) ErrorF(x ": %i\n",y);
--#define DPRINT(x) ErrorF(x "\n");
--#else
- #define DPRINT_S(x,y)
- #define DPRINT(x)
--#endif
-
- static GCFuncs VGAarbiterGCFuncs = {
- VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,
diff --git a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
index 8ee439b75..771d3a1e6 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
+++ b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
@@ -1,15 +1,6 @@
---- 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[] = {
+--- xorg-server-1.7.6.orig/hw/xfree86/loader/sdksyms.c 2010-03-17 01:56:04.000000000 +0100
++++ xorg-server-1.7.6/hw/xfree86/loader/sdksyms.c 2010-05-14 15:54:56.232212764 +0200
+@@ -634,7 +634,6 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &NewCurrentScreen,
(void *) &PointerConfinedToScreen,
(void *) &GetSpritePosition,
@@ -17,7 +8,7 @@
(void *) &GEExtensions,
(void *) &GERegisterExtension,
(void *) &GEInitEvent,
-@@ -724,7 +721,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -724,7 +723,6 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &PickPointer,
(void *) &PickKeyboard,
(void *) &IsInterferingGrab,
@@ -25,7 +16,7 @@
(void *) &ScreenRestructured,
(void *) &ffs,
(void *) &AddCallback,
-@@ -874,8 +870,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -874,8 +872,6 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &CreateLinearGradientPicture,
(void *) &CreateRadialGradientPicture,
(void *) &CreateConicalGradientPicture,
@@ -34,7 +25,7 @@
(void *) &PictTransform_from_xRenderTransform,
(void *) &xRenderTransform_from_PictTransform,
(void *) &PictureTransformPoint,
-@@ -977,25 +971,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -977,25 +973,6 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &ShmSegType,
(void *) &ShmCompletionCode,
(void *) &BadShmSegCode,
@@ -60,7 +51,7 @@
(void *) &xf86CreateI2CBusRec,
(void *) &xf86DestroyI2CBusRec,
(void *) &xf86I2CBusInit,
-@@ -1034,19 +1009,9 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -1034,31 +1011,17 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &noTestExtensions,
(void *) &dixScreenOrigins,
(void *) &ConnectionInfo,
@@ -80,16 +71,18 @@
(void *) &noScreenSaverExtension,
(void *) &noMITShmExtension,
(void *) &noRRExtension,
-@@ -1054,9 +1019,7 @@ _X_HIDDEN void *xorg_symbols[] = {
+ (void *) &noRenderExtension,
(void *) &noResExtension,
(void *) &noXFree86DGAExtension,
- (void *) &noXFree86DRIExtension,
+- (void *) &noXFree86DRIExtension,
- (void *) &noXFree86VidModeExtension,
(void *) &noXFixesExtension,
- (void *) &noPanoramiXExtension,
(void *) &noXvExtension,
- (void *) &noDRI2Extension,
+- (void *) &noDRI2Extension,
(void *) &defaultTextFont,
+ (void *) &defaultCursorFont,
+ (void *) &MaxClients,
@@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &ProcRRQueryOutputProperty,
(void *) &ProcRRConfigureOutputProperty,
@@ -116,7 +109,7 @@
(void *) &xf86fpFlag,
(void *) &xf86sFlag,
(void *) &xf86bsEnableFlag,
-@@ -1935,7 +1893,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -1937,7 +1895,6 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &ProcGrabButton,
(void *) &ProcUngrabButton,
(void *) &ProcRecolorCursor,
@@ -124,7 +117,7 @@
(void *) &SetDefaultFont,
(void *) &QueueFontWakeup,
(void *) &RemoveFontWakeup,
-@@ -2185,15 +2142,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -2187,15 +2144,6 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &SProcUngrabButton,
(void *) &SProcUngrabKey,
(void *) &SProcWarpPointer,
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
index 8c93131b1..d0c187169 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -1,6 +1,15 @@
---- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-02-16 01:24:23.000000000 +0100
-+++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c 2010-03-08 21:31:20.000000000 +0100
-@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL;
+--- xorg-server-1.7.6.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-03-12 05:38:22.000000000 +0100
++++ xorg-server-1.7.6/hw/xfree86/os-support/linux/lnx_video.c 2010-05-14 19:06:06.873473002 +0200
+@@ -64,6 +64,8 @@ static Bool ExtendedEnabled = FALSE;
+ !defined(__mips__) && \
+ !defined(__arm__)
+
++#include "compiler.h"
++
+ /*
+ * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
+ * these.
+@@ -497,7 +499,7 @@ volatile unsigned char *ioBase = NULL;
Bool
xf86EnableIO(void)
{
@@ -9,7 +18,7 @@
int fd;
unsigned int ioBase_phys;
#endif
-@@ -524,6 +524,20 @@ xf86EnableIO(void)
+@@ -524,6 +526,20 @@ xf86EnableIO(void)
#endif
}
close(fd);