diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/MesaLib/Makefile | 9 | ||||
| -rw-r--r-- | package/davfs2/Config.in.kernel | 4 | ||||
| -rw-r--r-- | package/davfs2/Makefile | 4 | ||||
| -rw-r--r-- | package/firefox/Makefile | 2 | ||||
| -rw-r--r-- | package/firefox/patches/patch-gfx_qcms_iccread_c | 18 | ||||
| -rw-r--r-- | package/firefox/patches/patch-gfx_qcms_qcmstypes_h | 5 | ||||
| -rw-r--r-- | package/openvpn/Makefile | 4 |
7 files changed, 31 insertions, 15 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/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/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 |