diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-03 21:04:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-03 21:04:43 +0100 |
| commit | 4fcc7439fb4e203f510e133a21e1bf9150b79368 (patch) | |
| tree | 32eedf8ba00bb4ec35b196205bc9356a8ae5f5a8 | |
| parent | 5dd0e62fa8d9366998288e7f384e48dad02949e1 (diff) | |
update X11, kerberos, samba, bluez
- fix some ipkg issues with ubuntu
- use grub2 for alix1c, no grub1 dependency on host
- boots up on alix1c
- fix some bcm203x problems
74 files changed, 475 insertions, 609 deletions
diff --git a/mk/mirrors.mk b/mk/mirrors.mk index 341ed486a..c7e0ac623 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -17,8 +17,9 @@ MASTER_SITE_KERNEL?= \ http://www.kernel.org/pub/linux/ \ MASTER_SITE_XORG?= \ - http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.4/src/everything/ \ - http://xorg.freedesktop.org/releases/X11R7.4/src/everything/ \ + http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.5/src/everything/ \ + http://www.x.org/releases/X11R7.5/src/everything/ \ + http://xorg.freedesktop.org/releases/X11R7.5/src/everything/ \ http://xorg.freedesktop.org/releases/individual/lib/ \ MASTER_SITE_GNU?= \ diff --git a/mk/modules.mk b/mk/modules.mk index 409278015..fb69470aa 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1032,6 +1032,10 @@ $(eval $(call KMOD_template,$(BLUETOOTH_PREFIX),bluetooth,\ $(MODULES_DIR)/kernel/net/bluetooth/$(BLUETOOTH) \ ,70)) +$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIBCM203X,bluetooth-hci-bcm203x,\ + $(MODULES_DIR)/kernel/drivers/bluetooth/bcm203x \ +,75)) + $(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIUSB,bluetooth-hci-usb,\ $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb \ ,75)) diff --git a/package/Depends.mk b/package/Depends.mk index db7aaeb4d..3b4e03f49 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -180,6 +180,7 @@ oprofile-compile: popt-compile osiris-compile: openssl-compile palantir-compile: jpeg-compile pciutils-compile: zlib-compile +popt-compile: libiconv-compile ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),) portmap-compile: tcp_wrappers-compile endif @@ -249,7 +250,7 @@ xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixes damageproto-compile scrnsaverproto-compile resourceproto-compile \ fontsproto-compile videoproto-compile compositeproto-compile \ evieext-compile libxkbfile-compile libXfont-compile pixman-compile \ - libpciaccess-compile openssl-compile xf86dga-compile + libpciaccess-compile openssl-compile ifeq ($(ADK_PACKAGE_APR_THREADING),y) apr-compile: libpthread-compile diff --git a/package/base-files/extra/etc/functions.sh b/package/base-files/extra/etc/functions.sh index 6563c1d0e..5d76f4843 100644 --- a/package/base-files/extra/etc/functions.sh +++ b/package/base-files/extra/etc/functions.sh @@ -64,7 +64,7 @@ get_next_uid() { uid=1 while grep "^[^:]*:[^:]*:$uid:" $IPKG_INSTROOT/etc/passwd \ >/dev/null 2>&1; do - let uid++ + uid=$(($uid+1)) done echo $uid } @@ -73,7 +73,7 @@ get_next_gid() { gid=1 while grep "^[^:]*:[^:]*:$gid:" $IPKG_INSTROOT/etc/group \ >/dev/null 2>&1; do - let gid++ + gid=$(($gid+1)) done echo $gid } diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index d6add2e20..b5dad3a5b 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= bigreqsproto -PKG_VERSION:= 1.0.2 +PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= d43f7faa2aac2f0206ea19f031494af1 +PKG_MD5SUM:= 882d49cc3bb591dbdccdf9e680bd2e4b PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bluez/Makefile b/package/bluez/Makefile index d0c652c7b..667ccc56e 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 4.56 +PKG_VERSION:= 4.57 PKG_RELEASE:= 1 -PKG_MD5SUM:= 92ea2e86a5489f0d16567920f2ec9b36 +PKG_MD5SUM:= dc29e54f1204ac4215caeeee062b26f6 PKG_DESCR:= bluetooth libraries and applications PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bluetooth @@ -36,7 +36,7 @@ BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: -ifeq ($(ADK_STATIC),n) +ifneq ($(ADK_STATIC),y) ${INSTALL_DIR} ${IDIR_BLUEZ}/usr/lib ${CP} ${WRKINST}/usr/lib/libbluetooth.so.* ${IDIR_BLUEZ}/usr/lib/ endif diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile index def37e738..b22dc08d3 100644 --- a/package/compositeproto/Makefile +++ b/package/compositeproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= compositeproto -PKG_VERSION:= 0.4 +PKG_VERSION:= 0.4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 33a79f6ba950bc5b41e077c951871bd5 +PKG_MD5SUM:= 6994a209774fe7877fd8e0c9fafe2466 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile index 507592593..3b63e93e7 100644 --- a/package/damageproto/Makefile +++ b/package/damageproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= damageproto -PKG_VERSION:= 1.1.0 +PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= bce4477a6edd774dfca175ea46e1ba76 +PKG_MD5SUM:= 423516fd64e43e8671120056b0d9f597 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/evieext/Makefile b/package/evieext/Makefile index adc4f0002..de5796c1b 100644 --- a/package/evieext/Makefile +++ b/package/evieext/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= evieext -PKG_VERSION:= 1.0.2 +PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= cff7b68b228d255f582cb64879619a44 -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_MD5SUM:= 68e61ce53caa495a3ad4085f66010eb8 +PKG_SITES:= ftp://ftp.x.org/pub/individual/proto/ include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile index b45ed4fe1..4900aee48 100644 --- a/package/fixesproto/Makefile +++ b/package/fixesproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= fixesproto -PKG_VERSION:= 4.0 +PKG_VERSION:= 4.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= ed4af7fbf04a51aca684c259784520f3 +PKG_MD5SUM:= 95806b9b648639d4c3e5b226d10927c0 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile index 2ab26d96a..34f567d0b 100644 --- a/package/fontcacheproto/Makefile +++ b/package/fontcacheproto/Makefile @@ -11,8 +11,8 @@ PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile index c42c8c10e..82c2ebe6a 100644 --- a/package/fontsproto/Makefile +++ b/package/fontsproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= fontsproto -PKG_VERSION:= 2.0.2 +PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6c1efa12ae50262b45c91e9a120632b7 +PKG_MD5SUM:= 6819fc82585daac68cec17938b659bf0 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/grub-bin/Config.in b/package/grub-bin/Config.in index bb2d85550..31042cf60 100644 --- a/package/grub-bin/Config.in +++ b/package/grub-bin/Config.in @@ -1,8 +1,9 @@ config ADK_PACKAGE_GRUB_BIN prompt "grub-bin............................. GRUB 2 bootloader (binary)" tristate - depends on ADK_LINUX_X86_64_SHUTTLE + depends on ADK_LINUX_X86_64_SHUTTLE || ADK_LINUX_X86_ALIX1C select BUSYBOX_FEATURE_STAT_FORMAT default y if ADK_LINUX_X86_64_SHUTTLE + default y if ADK_LINUX_X86_ALIX1C help diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 6e0a42817..83ca6bdb9 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= grub-bin PKG_VERSION:= 1.97 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0b975ea2f0c0cbad6a130d4614fbf399 +PKG_MD5SUM:= db8dff73e119b51529d2a087c9d7d527 PKG_DESCR:= GRUB bootloader PKG_SECTION:= sys PKG_SITES:= http://openadk.org/distfiles/ diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index 84a321b87..c61a053f4 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= inputproto -PKG_VERSION:= 1.4.4 +PKG_VERSION:= 2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 55c67c1f42d70458a3e4d153c8c07cf7 +PKG_MD5SUM:= 13d91739cf70a781f1db24d8d3677574 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile index bee278c3a..62da57203 100644 --- a/package/kbproto/Makefile +++ b/package/kbproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= kbproto -PKG_VERSION:= 1.0.3 +PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1efc6a4d97acb3ec3f34c4b2508478dc +PKG_MD5SUM:= 4deef518a03bc94a7a25902bb7c98dd6 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 38dff7af3..7ffef2877 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -4,17 +4,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= krb5 -PKG_VERSION:= 1.6.3 +PKG_VERSION:= 1.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2dc1307686eb1c2bf1ab08ea805dad46 +PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564 PKG_DESCR:= MIT kerberos server PKG_SECTION:= net PKG_DEPENDS:= krb5-libs PKG_URL:= http://web.mit.edu/kerberos -PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.6/ +PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/ -PKG_DESCR_1:= MIT kerberos libraries -PKG_SECTION_1:= libs +PKG_DESCR_LIB:= MIT kerberos libraries +PKG_SECTION_LIB:= libs DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar WRKSRC= ${WRKDIST}/src @@ -22,17 +22,17 @@ WRKSRC= ${WRKDIST}/src include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) +$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB})) -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --without-krb4 --disable-static --without-tcl +CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS+= --disable-static --without-tcl CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \ ac_cv_func_regcomp=yes \ ac_cv_printf_positional=yes \ ac_cv_file__etc_environment=no \ ac_cv_file__etc_TIMEZONE=no -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-extract: (cd ${WRKDIR}; tar xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz) @@ -44,11 +44,13 @@ post-install: ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb ${INSTALL_DATA} ./files/kdc.conf ${IDIR_KRB5_SERVER}/etc/krb5kdc - ${INSTALL_BIN} ${WRKINST}/usr/sbin/{ktutil,kdb5_util,krb5kdc,kadmind,kadmin.local,kadmin} \ + ${INSTALL_BIN} ${WRKINST}/usr/bin/{ktutil,kadmin} \ + ${IDIR_KRB5_SERVER}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/{kdb5_util,krb5kdc,kadmind,kadmin.local} \ ${IDIR_KRB5_SERVER}/usr/sbin ${INSTALL_DATA} ${WRKINST}/usr/lib/krb5/plugins/kdb/db2.so \ ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb - ${CP} ${WRKINST}/usr/lib/lib{des425,gssrpc,kadm5clnt,kadm5srv,kdb5}.so* \ + ${CP} ${WRKINST}/usr/lib/lib{gssrpc,kadm5clnt,kadm5srv,kdb5}.so* \ ${IDIR_KRB5_SERVER}/usr/lib # krb5-libs ${INSTALL_DIR} ${IDIR_KRB5_LIBS}/etc diff --git a/package/krb5/patches/patch-src_Makefile_in b/package/krb5/patches/patch-src_Makefile_in deleted file mode 100644 index 01533ad39..000000000 --- a/package/krb5/patches/patch-src_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- krb5-1.6.3.orig/src/Makefile.in 2007-09-18 05:38:17.000000000 +0200 -+++ krb5-1.6.3/src/Makefile.in 2009-01-29 11:50:21.000000000 +0100 -@@ -7,7 +7,6 @@ mydir=. - SUBDIRS=util include lib @krb524@ kdc kadmin @ldap_plugin_dir@ slave clients \ - plugins/kdb/db2 \ - plugins/preauth/pkinit \ -- appl tests \ - config-files gen-manpages - BUILDTOP=$(REL)$(C) - LOCALINCLUDES = -I$(srcdir) diff --git a/package/krb5/patches/patch-src_include_stock_osconf_h b/package/krb5/patches/patch-src_include_osconf_hin index b774623fa..834f28292 100644 --- a/package/krb5/patches/patch-src_include_stock_osconf_h +++ b/package/krb5/patches/patch-src_include_osconf_hin @@ -1,7 +1,6 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- krb5-1.6.3.orig/src/include/stock/osconf.h 2006-05-26 01:37:33.000000000 +0200 -+++ krb5-1.6.3/src/include/stock/osconf.h 2009-02-03 19:13:37.508177540 +0100 -@@ -60,14 +60,14 @@ +--- krb5-1.7.orig/src/include/osconf.hin 2009-01-31 04:57:20.000000000 +0100 ++++ krb5-1.7/src/include/osconf.hin 2009-11-01 11:41:43.171362928 +0100 +@@ -61,14 +61,14 @@ #define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname" #endif /* _WINDOWS */ @@ -21,7 +20,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE" #if TARGET_OS_MAC -@@ -96,8 +96,8 @@ +@@ -97,8 +97,8 @@ /* * Defaults for the KADM5 admin system. */ @@ -31,4 +30,21 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +#define DEFAULT_KADM5_ACL_FILE "@SYSCONFDIR/krb5kdc/kadm5.acl" #define DEFAULT_KADM5_PORT 749 /* assigned by IANA */ - #define MAX_DGRAM_SIZE 4096 + #define KRB5_DEFAULT_SUPPORTED_ENCTYPES \ +@@ -123,13 +123,13 @@ + * krb5 slave support follows + */ + +-#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans" +-#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master" ++#define KPROP_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/slave_datatrans" ++#define KPROPD_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/from_master" + #define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util" + #define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit" + #define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop" + #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE +-#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl" ++#define KPROPD_ACL_FILE "@SYSCONFDIR/krb5kdc/kpropd.acl" + + /* + * GSS mechglue diff --git a/package/krb5/patches/patch-src_lib_kadm5_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_Makefile_in deleted file mode 100644 index dfcae989b..000000000 --- a/package/krb5/patches/patch-src_lib_kadm5_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- krb5-1.6.3.orig/src/lib/kadm5/Makefile.in 2007-09-18 06:22:24.000000000 +0200 -+++ krb5-1.6.3/src/lib/kadm5/Makefile.in 2009-01-29 12:42:33.000000000 +0100 -@@ -2,7 +2,7 @@ thisconfigdir=../.. - myfulldir=lib/kadm5 - mydir=lib/kadm5 - BUILDTOP=$(REL)..$(S).. --LOCAL_SUBDIRS = clnt srv unit-test -+LOCAL_SUBDIRS = clnt srv - DEFS= - - ##DOSBUILDTOP = ..\.. diff --git a/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in deleted file mode 100644 index 601506c83..000000000 --- a/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- krb5-1.6.3.orig/src/lib/kadm5/clnt/Makefile.in 2007-09-18 06:22:24.000000000 +0200 -+++ krb5-1.6.3/src/lib/kadm5/clnt/Makefile.in 2009-01-30 18:38:15.000000000 +0100 -@@ -15,7 +15,7 @@ SHLIB_EXPDEPS=\ - $(TOPLIBD)/libkrb5$(SHLIBEXT) \ - $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(COM_ERR_DEPLIB) --SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -+SHLIB_EXPLIBS=-pthread -lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err - SHLIB_DIRS=-L$(TOPLIBD) - SHLIB_RDIRS=$(KRB5_LIBDIR) - RELDIR=kadm5/clnt diff --git a/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in deleted file mode 100644 index d33470c8f..000000000 --- a/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- krb5-1.6.3.orig/src/lib/kadm5/srv/Makefile.in 2007-09-18 06:22:24.000000000 +0200 -+++ krb5-1.6.3/src/lib/kadm5/srv/Makefile.in 2009-01-30 18:31:56.000000000 +0100 -@@ -23,7 +23,7 @@ SHLIB_EXPDEPS=\ - $(TOPLIBD)/libkrb5$(SHLIBEXT) \ - $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(COM_ERR_DEPLIB) --SHLIB_EXPLIBS = -lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \ -+SHLIB_EXPLIBS = -pthread -lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \ - -lkrb5 -lk5crypto -lcom_err @GEN_LIB@ - SHLIB_DIRS=-L$(TOPLIBD) - SHLIB_RDIRS=$(KRB5_LIBDIR) diff --git a/package/krb5/patches/patch-src_lib_kdb_Makefile_in b/package/krb5/patches/patch-src_lib_kdb_Makefile_in deleted file mode 100644 index 50e184e73..000000000 --- a/package/krb5/patches/patch-src_lib_kdb_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- krb5-1.6.3.orig/src/lib/kdb/Makefile.in 2007-09-18 06:22:24.000000000 +0200 -+++ krb5-1.6.3/src/lib/kdb/Makefile.in 2009-01-30 18:35:24.000000000 +0100 -@@ -21,7 +21,7 @@ RELDIR=kdb - SHLIB_EXPDEPS = \ - $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(TOPLIBD)/libkrb5$(SHLIBEXT) --SHLIB_EXPLIBS=-lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(DL_LIB) $(LIBS) -+SHLIB_EXPLIBS=-pthread -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(DL_LIB) $(LIBS) - SHLIB_DIRS=-L$(TOPLIBD) - SHLIB_RDIRS=$(KRB5_LIBDIR) - diff --git a/package/krb5/patches/patch-src_lib_krb5_Makefile_in b/package/krb5/patches/patch-src_lib_krb5_Makefile_in deleted file mode 100644 index e844e8750..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- krb5-1.6.3.orig/src/lib/krb5/Makefile.in 2007-09-18 06:22:24.000000000 +0200 -+++ krb5-1.6.3/src/lib/krb5/Makefile.in 2009-01-30 18:41:20.000000000 +0100 -@@ -55,7 +55,7 @@ RELDIR=krb5 - SHLIB_EXPDEPS = \ - $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) --SHLIB_EXPLIBS=-lk5crypto -lcom_err $(SUPPORT_LIB) @GEN_LIB@ $(LIBS) -+SHLIB_EXPLIBS=-pthread -lk5crypto -lcom_err $(SUPPORT_LIB) @GEN_LIB@ $(LIBS) - SHLIB_DIRS=-L$(TOPLIBD) - SHLIB_RDIRS=$(KRB5_LIBDIR) - diff --git a/package/krb5/patches/patch-src_lib_rpc_Makefile_in b/package/krb5/patches/patch-src_lib_rpc_Makefile_in deleted file mode 100644 index 6276dc4e3..000000000 --- a/package/krb5/patches/patch-src_lib_rpc_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- krb5-1.6.3.orig/src/lib/rpc/Makefile.in 2006-10-05 16:05:40.000000000 +0200 -+++ krb5-1.6.3/src/lib/rpc/Makefile.in 2009-01-29 12:39:25.000000000 +0100 -@@ -5,7 +5,7 @@ BUILDTOP=$(REL)..$(S).. - DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL - DEFS= - --SUBDIRS=unit-test -+#SUBDIRS=unit-test - - ##DOSBUILDTOP = ..\.. - ##DOSLIBNAME=libgssrpc.lib diff --git a/package/libICE/Makefile b/package/libICE/Makefile index 9db94cf91..75931d4f2 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libICE -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= d80aab5b32434251cf4732f0e760e9d8 +PKG_MD5SUM:= 4a8f09f15fc92196b91d61e2dc9afcea PKG_DESCR:= Inter-Client Exchange library PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib diff --git a/package/libSM/Makefile b/package/libSM/Makefile index 86fc53b1c..e7114af7b 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libSM -PKG_VERSION:= 1.1.0 +PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 39ee8e9dfbb2c1788629066ce796df22 +PKG_MD5SUM:= 1ee90d479298e48df7bb86a7ccbe00c9 PKG_DESCR:= X11 Session Management library PKG_SECTION:= x11 PKG_DEPENDS:= libuuid @@ -16,9 +16,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 34278be6c..64983af3c 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libX11 -PKG_VERSION:= 1.1.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 2feb39a0de6f05b25c308268691d960c +PKG_VERSION:= 1.3.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b68aebbfcac1174c4c95d260e9369766 PKG_DESCR:= X11 client-side library PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -16,13 +16,13 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-xlocale \ --disable-xf86bigfont \ --disable-malloc0returnsnull \ --without-xcb -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in deleted file mode 100644 index 3478fa640..000000000 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ /dev/null @@ -1,68 +0,0 @@ ---- libX11-1.1.5.orig/src/util/Makefile.in 2008-09-04 23:48:56.000000000 +0200 -+++ libX11-1.1.5/src/util/Makefile.in 2009-06-13 11:20:48.000000000 +0200 -@@ -52,7 +52,7 @@ makekeys_OBJECTS = makekeys-makekeys.$(O - makekeys_LDADD = $(LDADD) - makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+ $(HOSTLDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -82,7 +82,7 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ - BIGFONT_LIBS = @BIGFONT_LIBS@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ -@@ -114,9 +114,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - KEYSYMDEF = @KEYSYMDEF@ - LAUNCHD = @LAUNCHD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = - LIBTOOL = @LIBTOOL@ - LIB_MAN_DIR = @LIB_MAN_DIR@ - LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ -@@ -227,9 +227,10 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --makekeys_CFLAGS = $(X11_CFLAGS) -+makekeys_CFLAGS = $(HOSTCFLAGS) -+makekeys_CPPFLAGS = $(HOSTCPPFLAGS) - --#override CC = gcc -+override CC = gcc - LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - EXTRA_DIST = mkks.sh - -@@ -311,18 +312,18 @@ distclean-compile: - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - makekeys-makekeys.o: makekeys.c --@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c - @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c - - makekeys-makekeys.obj: makekeys.c --@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` - @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` - - mostlyclean-libtool: - -rm -f *.lo diff --git a/package/libXau/Makefile b/package/libXau/Makefile index d0f43c7bc..a992177e3 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXau -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 77c3de874155456c857b331063ad2fd9 +PKG_MD5SUM:= 1a421d9376f43596fe068ce209a70b84 PKG_DESCR:= X11 authorisation library PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index 52c444ced..15beb5fdb 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXaw -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= d27375737f323849cf7ca2fa8566afa5 +PKG_MD5SUM:= 67662e6b2dceb2907159215c83364c5a PKG_DESCR:= X11 Athena Widget library PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,9 +15,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS+= --disable-docs +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index 8b52dc91e..e41595ea3 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXdmcp -PKG_VERSION:= 1.0.2 +PKG_VERSION:= 1.0.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= a7e23f356a2b4fe8668f9ff4a2b0413a +PKG_MD5SUM:= c3f1bce1affc7dfbc222145e00e1310e PKG_DESCR:= X11 display manager control protocol library PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib diff --git a/package/libXext/Makefile b/package/libXext/Makefile index bf3648798..fb4732d5e 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXext -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= b7749174f9b3c3227bcbabc9ffb7d1a9 -PKG_DESCR:= X Window System client interface to several extensions to the X protocol +PKG_MD5SUM:= 6b61b3f657befded8ae66e04085c413e +PKG_DESCR:= X client interface to extensions of the X protocol PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,10 +15,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index 8ebf1d199..8276aa6c2 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXfont -PKG_VERSION:= 1.3.3 +PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= cb202f7b1af5fc95a7f35f0a62e52e6e +PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412 PKG_DESCR:= X font Library PKG_SECTION:= x11 PKG_DEPENDS:= libfreetype @@ -16,9 +16,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXFONT}/usr/lib diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index 28af7968d..21d42aa38 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXmu -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 48b432e84035c664ece80a33695d5254 -PKG_DESCR:= a set of miscellaneous utility convenience functions for X libraries +PKG_MD5SUM:= f49e3587cdc299707da0786a681f9c05 +PKG_DESCR:= miscellaneous utility functions for X libraries PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,10 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -#CONFIGURE_ARGS+= --disable-malloc0returnsnull -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXMU}/usr/lib diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile index d57f8094a..da5a647fe 100644 --- a/package/libXpm/Makefile +++ b/package/libXpm/Makefile @@ -4,11 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXpm -PKG_VERSION:= 3.5.7 +PKG_VERSION:= 3.5.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7bbc8f112f7143ed6961a58ce4e14558 -PKG_DESCR:= common operation for the XPM pixmap format -PKG_SECTION:= x11 +PKG_MD5SUM:= 2d81d6633e67ac5562e2fbee126b2897 PKG_DESCR:= common operation for the XPM pixmap format PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -17,10 +15,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_search_gettext=no -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXPM}/usr/lib diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 7d953056a..e004885a3 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXt -PKG_VERSION:= 1.0.5 +PKG_VERSION:= 1.0.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 666305c8a2b825b276b3412d8c0d2273 +PKG_MD5SUM:= 28f627c7a5ca08c2413ce91d21c177d8 PKG_DESCR:= X Toolkit Intrinsics PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -16,11 +16,11 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull \ --disable-install-makestrs -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in deleted file mode 100644 index b8340c2fe..000000000 --- a/package/libXt/patches/patch-util_Makefile_in +++ /dev/null @@ -1,61 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libXt-1.0.5.orig/util/Makefile.in 2007-01-28 07:31:13.000000000 +0100 -+++ libXt-1.0.5/util/Makefile.in 2009-06-13 11:34:25.000000000 +0200 -@@ -92,11 +92,11 @@ AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ --CC = @CC@ -+CC = $(HOSTCC) - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = $(HOSTCFLAGS) - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = $(HOSTCPPFLAGS) - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -123,7 +123,7 @@ INSTALL_MAKESTRS_TRUE = @INSTALL_MAKESTR - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = $(HOSTLDFLAGS) - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ -@@ -209,8 +209,9 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE) --makestrs_CFLAGS = $(XT_CFLAGS) -+makestrs_CFLAGS = $(CFLAGS) - makestrs_SOURCES = makestrs.c -+makestrs_CPPFLAGS = $(HOSTCPPFLAGS) - - # Man page - appmandir = $(APP_MAN_DIR) -@@ -329,18 +330,18 @@ distclean-compile: - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - makestrs-makestrs.o: makestrs.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \ -+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c - - makestrs-makestrs.obj: makestrs.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \ -+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi` -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi` - - mostlyclean-libtool: - -rm -f *.lo diff --git a/package/libXv/Makefile b/package/libXv/Makefile index b09a39d37..025f52bc1 100644 --- a/package/libXv/Makefile +++ b/package/libXv/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXv -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= c2ce7e6651b3a8fdfefb2c53dea431fc +PKG_MD5SUM:= 6ee98790de6b3cd470074e60057d5c5c PKG_DESCR:= X11 Xvideo extensions PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,10 +15,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXV,libxv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXV}/usr/lib diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile index e8f7b62c2..4259e7735 100644 --- a/package/libXxf86dga/Makefile +++ b/package/libXxf86dga/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXxf86dga -PKG_VERSION:= 1.0.2 +PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 704501402a277258ffc878e821357ad4 +PKG_MD5SUM:= ecb81708157e1a1eeaba0e124f0ade08 PKG_DESCR:= client library for the XFree86-DGA extension PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,10 +15,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXXF86DGA}/usr/lib diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile index a6f883d90..5776c67f3 100644 --- a/package/libfontenc/Makefile +++ b/package/libfontenc/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libfontenc -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= b7bb0887b702ab03251fd9fc361d0c58 -PKG_DESCR:= helps font libraries portably determine and deal with different encodings of fonts +PKG_MD5SUM:= 0fa1988d08021225d18ced519a30d2b1 +PKG_DESCR:= helps to deal with different encodings of fonts PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBFONTENC}/usr/lib diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index 7c6c70682..9d9d0413a 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -29,6 +29,6 @@ INSTALL_TARGET= install-lib post-install: ${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib - ${CP} ${WRKINST}/usr/lib/libiconv.so.* ${IDIR_LIBICONV}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libiconv.so* ${IDIR_LIBICONV}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index ccf80e9a1..fdc2da826 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libpciaccess -PKG_VERSION:= 0.10.3 +PKG_VERSION:= 0.10.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3c4a7578cb63c63ccb1ebca87e10407f +PKG_MD5SUM:= 5dad6221c2766d5a727ef32e83a0a878 PKG_DESCR:= X.org libpciaccess library PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= autotool gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBPCIACCESS}/usr/lib diff --git a/package/libpciaccess/patches/patch-configure_ac b/package/libpciaccess/patches/patch-configure_ac deleted file mode 100644 index 11571fda3..000000000 --- a/package/libpciaccess/patches/patch-configure_ac +++ /dev/null @@ -1,16 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libpciaccess-0.10.3.orig/configure.ac 2008-06-10 21:24:44.000000000 +0200 -+++ libpciaccess-0.10.3/configure.ac 2009-05-10 17:22:54.000000000 +0200 -@@ -91,12 +91,6 @@ AM_CONDITIONAL(FREEBSD, [test "x$freebsd - AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes]) - AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes]) - --AC_CHECK_FILE([/usr/include/asm/mtrr.h], -- [have_mtrr_h="yes"], [have_mtrr_h="no"]) --if test "x$have_mtrr_h" = xyes; then -- AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings]) --fi -- - AC_SUBST(PCIACCESS_CFLAGS) - AC_SUBST(PCIACCESS_LIBS) - diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index eeaa4c051..00f85b570 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libxkbfile -PKG_VERSION:= 1.0.5 +PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8be68d830d227cbd52cbafe24cb4fa78 -PKG_DESCR:= an interface to read and manipulate description files the X11 keyboard configuration extension +PKG_MD5SUM:= a1384a9a48430397aff236f97e26ed05 +PKG_DESCR:= X11 keyboard configuration extension library PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXKBFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib diff --git a/package/pixman/Makefile b/package/pixman/Makefile index f25739f67..1f33acb30 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pixman -PKG_VERSION:= 0.13.2 +PKG_VERSION:= 0.16.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 837df4a02c61a60a880644393b57faed +PKG_MD5SUM:= 02bd3669f53c404c19980d5efb6f86fb PKG_DESCR:= Pixel manipulation library PKG_SECTION:= x11 PKG_SITES:= http://www.cairographics.org/releases/ @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PIXMAN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib diff --git a/package/popt/Config.in b/package/popt/Config.in index a16ba04d5..6dbcf714e 100644 --- a/package/popt/Config.in +++ b/package/popt/Config.in @@ -6,6 +6,7 @@ config ADK_PACKAGE_LIBPOPT prompt "libpopt........................... Command line option parsing library" tristate default n + select ADK_PACKAGE_LIBICONV select ADK_COMPILE_POPT help A command line option parsing library diff --git a/package/popt/Makefile b/package/popt/Makefile index 0aa970c08..d08c20801 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= c61ef795fa450eb692602a661ec8d7f1 PKG_DESCR:= a command line option parsing library PKG_SECTION:= libs +PKG_DEPENDS:= libiconv PKG_URL:= http://rpm5.org PKG_SITES:= http://rpm5.org/files/popt/ @@ -17,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= am_cv_func_iconv=no +#CONFIGURE_ENV+= am_cv_func_iconv=no BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/popt/patches/patch-Makefile_in b/package/popt/patches/patch-Makefile_in new file mode 100644 index 000000000..6b66fe02f --- /dev/null +++ b/package/popt/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- popt-1.15.orig/Makefile.in 2009-04-12 21:31:13.000000000 +0200 ++++ popt-1.15/Makefile.in 2009-10-31 23:17:36.793465302 +0100 +@@ -80,7 +80,7 @@ libpopt_la_OBJECTS = $(am_libpopt_la_OBJ + libpopt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libpopt_la_LDFLAGS) $(LDFLAGS) -o $@ +-PROGRAMS = $(noinst_PROGRAMS) ++PROGRAMS = + am_test1_OBJECTS = test1.$(OBJEXT) + test1_OBJECTS = $(am_test1_OBJECTS) + test1_DEPENDENCIES = $(usrlib_LTLIBRARIES) diff --git a/package/popt/patches/patch-po_Makefile_in b/package/popt/patches/patch-po_Makefile_in new file mode 100644 index 000000000..6a4819b3c --- /dev/null +++ b/package/popt/patches/patch-po_Makefile_in @@ -0,0 +1,100 @@ +--- popt-1.15.orig/po/Makefile.in 2009-04-12 21:31:23.000000000 +0200 ++++ popt-1.15/po/Makefile.in 2009-10-31 23:15:58.617450982 +0100 +@@ -22,42 +22,42 @@ srcdir = . + top_srcdir = .. + + +-prefix = /usr/local ++prefix = /usr + exec_prefix = ${prefix} + datarootdir = ${prefix}/share +-datadir = ${datarootdir} ++datadir = /usr/share + localedir = ${datarootdir}/locale + gettextsrcdir = $(datadir)/gettext/po + +-INSTALL = /usr/opkg/bin/ginstall -c ++INSTALL = /usr/bin/install -c + INSTALL_DATA = ${INSTALL} -m 644 + + # We use $(mkdir_p). + # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as + # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +-# $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh does not start with $(SHELL), so we add it. +-# In automake >= 1.10, /usr/opkg/bin/gmkdir -p is derived from ${MKDIR_P}, which is defined ++# $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh does not start with $(SHELL), so we add it. ++# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined + # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake + # versions, $(mkinstalldirs) and $(install_sh) are unused. +-mkinstalldirs = $(SHELL) $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh -d +-install_sh = $(SHELL) $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh +-MKDIR_P = /usr/opkg/bin/gmkdir -p +-mkdir_p = /usr/opkg/bin/gmkdir -p ++mkinstalldirs = $(SHELL) $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh -d ++install_sh = $(SHELL) $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh ++MKDIR_P = /bin/mkdir -p ++mkdir_p = /bin/mkdir -p + +-GMSGFMT_ = /usr/opkg/bin/msgfmt +-GMSGFMT_no = /usr/opkg/bin/msgfmt +-GMSGFMT_yes = /usr/opkg/bin/msgfmt ++GMSGFMT_ = /usr/bin/msgfmt ++GMSGFMT_no = /usr/bin/msgfmt ++GMSGFMT_yes = /usr/bin/msgfmt + GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) +-MSGFMT_ = /usr/opkg/bin/msgfmt +-MSGFMT_no = /usr/opkg/bin/msgfmt +-MSGFMT_yes = /usr/opkg/bin/msgfmt ++MSGFMT_ = /usr/bin/msgfmt ++MSGFMT_no = /usr/bin/msgfmt ++MSGFMT_yes = /usr/bin/msgfmt + MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) +-XGETTEXT_ = /usr/opkg/bin/xgettext +-XGETTEXT_no = /usr/opkg/bin/xgettext +-XGETTEXT_yes = /usr/opkg/bin/xgettext ++XGETTEXT_ = /usr/bin/xgettext ++XGETTEXT_no = /usr/bin/xgettext ++XGETTEXT_yes = /usr/bin/xgettext + XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) + MSGMERGE = msgmerge +-MSGMERGE_UPDATE = /usr/opkg/bin/msgmerge --update ++MSGMERGE_UPDATE = /usr/bin/msgmerge --update + MSGINIT = msginit + MSGCONV = msgconv + MSGFILTER = msgfilter +@@ -96,7 +96,7 @@ CATALOGS = @CATALOGS@ + mv t-$@ $@ + + +-all: check-macro-version all-yes ++all: check-macro-version all-no + + all-yes: stamp-po + all-no: +@@ -202,7 +202,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot + + install: install-exec install-data + install-exec: +-install-data: install-data-yes ++install-data: install-data-no + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ +@@ -261,7 +261,7 @@ install-strip: install + + installdirs: installdirs-exec installdirs-data + installdirs-exec: +-installdirs-data: installdirs-data-yes ++installdirs-data: installdirs-data-no + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + else \ +@@ -306,7 +306,7 @@ installcheck: + + uninstall: uninstall-exec uninstall-data + uninstall-exec: +-uninstall-data: uninstall-data-yes ++uninstall-data: uninstall-data-no + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile index 13ff30a01..ec7da9684 100644 --- a/package/randrproto/Makefile +++ b/package/randrproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= randrproto -PKG_VERSION:= 1.2.1 +PKG_VERSION:= 1.3.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= d6b6b024d71b689628bcaf27fd491f5b +PKG_MD5SUM:= 15266124b9e2dfcfb25ce6cba24cdd66 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile index cdf37cf11..afb008a2f 100644 --- a/package/renderproto/Makefile +++ b/package/renderproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= renderproto -PKG_VERSION:= 0.9.3 +PKG_VERSION:= 0.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= ab8f3e356973d9c99810a8f092db3a2e +PKG_MD5SUM:= 57216f25b9a5edc561b83a7484cb17e8 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/resourceproto/Makefile b/package/resourceproto/Makefile index f53312ebf..768c8d332 100644 --- a/package/resourceproto/Makefile +++ b/package/resourceproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= resourceproto -PKG_VERSION:= 1.0.2 +PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 198252b76e8082958cc2228d8dcc7c2f +PKG_MD5SUM:= 587333b4995a3e11ebe4c8ba2742efaf PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/samba/Makefile b/package/samba/Makefile index 5a915413a..c964c5e14 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,16 +4,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= samba -PKG_VERSION:= 3.3.4 +PKG_VERSION:= 3.4.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1443165edb7cb3f56f1e77aec1ee3266 +PKG_MD5SUM:= 322379680c12057f57685652a35a6b05 PKG_DESCR:= NetBIOS/SMB file and print server PKG_SECTION:= net PKG_URL:= http://www.samba.org PKG_SITES:= ftp://se.samba.org/pub/samba/stable/ \ ftp://ftp.easynet.be/samba/stable/ -WRKSRC= ${WRKDIST}/source +WRKSRC= ${WRKDIST}/source3 include ${TOPDIR}/mk/package.mk diff --git a/package/samba/patches/patch-source3_client_mtab_c b/package/samba/patches/patch-source3_client_mtab_c new file mode 100644 index 000000000..d6cac2914 --- /dev/null +++ b/package/samba/patches/patch-source3_client_mtab_c @@ -0,0 +1,10 @@ +--- samba-3.4.3.orig/source3/client/mtab.c 2009-10-29 08:47:16.000000000 +0100 ++++ samba-3.4.3/source3/client/mtab.c 2009-11-01 15:45:07.303242285 +0100 +@@ -32,6 +32,7 @@ + #include <errno.h> + #include <stdio.h> + #include <sys/time.h> ++#include <sys/stat.h> + #include <time.h> + #include <fcntl.h> + #include <mntent.h> diff --git a/package/samba/patches/patch-source_configure b/package/samba/patches/patch-source3_configure index c41ed21e7..b99b66528 100644 --- a/package/samba/patches/patch-source_configure +++ b/package/samba/patches/patch-source3_configure @@ -1,14 +1,14 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- samba-3.3.3.orig/source/configure 2009-04-01 14:19:36.000000000 +0200 -+++ samba-3.3.3/source/configure 2009-04-18 22:56:27.047962181 +0200 -@@ -44062,194 +44062,6 @@ fi +--- samba-3.4.3.orig/source3/configure 2009-10-29 09:18:27.000000000 +0100 ++++ samba-3.4.3/source3/configure 2009-11-01 14:23:21.339243541 +0100 +@@ -45625,193 +45625,6 @@ fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # +-# -# -# -case "$host_os" in -- *linux*) +- *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) - # glibc <= 2.3.2 has a broken getgrouplist - if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 @@ -191,8 +191,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - - ;; -esac -- --# - # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX - # + # + # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX diff --git a/package/samba/patches/patch-source_client_mtab_c b/package/samba/patches/patch-source_client_mtab_c deleted file mode 100644 index 7dedcd065..000000000 --- a/package/samba/patches/patch-source_client_mtab_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- samba-3.3.3.orig/source/client/mtab.c 2009-04-01 13:48:54.000000000 +0200 -+++ samba-3.3.3/source/client/mtab.c 2009-04-18 23:27:50.522604765 +0200 -@@ -32,6 +32,7 @@ - #include <errno.h> - #include <stdio.h> - #include <sys/time.h> -+#include <sys/stat.h> - #include <time.h> - #include <fcntl.h> - #include <mntent.h> diff --git a/package/samba/patches/patch-source_registry_reg_perfcount_c b/package/samba/patches/patch-source_registry_reg_perfcount_c deleted file mode 100644 index a06b713d4..000000000 --- a/package/samba/patches/patch-source_registry_reg_perfcount_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- samba-3.3.4.orig/source/registry/reg_perfcount.c 2009-04-28 08:46:16.000000000 +0200 -+++ samba-3.3.4/source/registry/reg_perfcount.c 2009-05-10 23:52:42.000000000 +0200 -@@ -616,14 +616,14 @@ static bool _reg_perfcount_add_counter(P - obj = NULL; - memset(buf, 0, PERFCOUNT_MAX_LEN); - memcpy(buf, data.dptr, data.dsize); -- begin = index(buf, '['); -- end = index(buf, ']'); -+ begin = strchr(buf, '['); -+ end = strchr(buf, ']'); - if(begin == NULL || end == NULL) - return False; - start = begin+1; - - while(start < end) { -- stop = index(start, ','); -+ stop = strchr(start, ','); - if(stop == NULL) - stop = end; - *stop = '\0'; diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile index 8a0eade8a..5171f2f62 100644 --- a/package/scrnsaverproto/Makefile +++ b/package/scrnsaverproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= scrnsaverproto -PKG_VERSION:= 1.1.0 +PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 616ae17acad2b6033c981b8b526d5e67 +PKG_MD5SUM:= 0ed88bdd6945ba207c4f734af48e7e25 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile index f85cc43d2..ebda348e4 100644 --- a/package/videoproto/Makefile +++ b/package/videoproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= videoproto -PKG_VERSION:= 2.2.2 +PKG_VERSION:= 2.3.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= ace6f55cd4dcebf4b191c0c31755ed92 +PKG_MD5SUM:= 888543493cd69c6c78002ac59c3f077f PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile index e2d03147c..f4e299044 100644 --- a/package/xcmiscproto/Makefile +++ b/package/xcmiscproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xcmiscproto -PKG_VERSION:= 1.1.2 +PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3c380a728697ded97a39addfe1acf2cb +PKG_MD5SUM:= bacfb0f3cb4d6e1a71770307bfdba129 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile index 2b64e48c6..50780b44c 100644 --- a/package/xextproto/Makefile +++ b/package/xextproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xextproto -PKG_VERSION:= 7.0.3 +PKG_VERSION:= 7.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6a8f9f9559e9065858905043c17e05a1 +PKG_MD5SUM:= 6c55283718dbeb826bcf899b9e89faba PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index bc5d87473..083c15703 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86-video-geode -PKG_VERSION:= 2.10.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 4e331f6f608f23b64f0a5354908af09a +PKG_VERSION:= 2.11.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a673c0f88037d12fbb96d9fefc82785b PKG_DESCR:= X11 driver for AMD Geode VGA chip PKG_SECTION:= x11 PKG_DEPENDS:= xorg-server diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile index d3187b0ac..88979a522 100644 --- a/package/xf86dgaproto/Makefile +++ b/package/xf86dgaproto/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86dgaproto -PKG_VERSION:= 2.0.3 +PKG_VERSION:= 2.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= f73c1d99b557249662bc75b9b872b61b +PKG_MD5SUM:= 1fe79dc07857ad3e1fb8b8f2bdd70d1b PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 41f4fa786..710dd1eb6 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 1.6 +PKG_VERSION:= 1.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 889e6e10eb7449bf33a5423c40369da5 +PKG_MD5SUM:= c024a6e2a5b8c4ce3d9d1f1286466163 PKG_DESCR:= X keyboard config PKG_SECTION:= x11 PKG_SITES:= http://xlibs.freedesktop.org/xkbdesc/ @@ -15,9 +15,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XKEYBOARD_CONFIG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 935195bdb..34b77a158 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.5.1 +PKG_VERSION:= 1.7.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7aca5d0dc8b824d3dff6140e381e03df +PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 PKG_DEPENDS:= libopenssl @@ -17,36 +17,25 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= \ - --enable-builtin-fonts \ --enable-dga \ --enable-xorg \ --enable-xv \ - --disable-afb \ --disable-aiglx \ - --disable-cfb \ --disable-config-hal \ - --disable-cup \ - --disable-evi \ --disable-dpms \ --disable-dri \ --disable-dri2 \ - --disable-freetype \ --disable-glx \ - --disable-kdrive-vesa \ - --disable-mfb \ --disable-xace \ --disable-xephyr \ - --disable-xevie \ --disable-xf86bigfont \ - --disable-xf86misc \ --disable-xf86vidmode \ --disable-xfake \ --disable-xfbdev \ --disable-xinerama \ --disable-xnest \ - --disable-xprint \ --disable-xsdl \ --disable-xselinux \ --disable-xcsecurity \ @@ -55,8 +44,8 @@ CONFIGURE_ARGS+= \ --with-xkb-output=/tmp \ --with-os-vendor=OpenADK \ --with-vendor-web="http://www.openadk.org" -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin @@ -66,8 +55,6 @@ post-install: $(IDIR_XORG_SERVER)/usr/lib/xorg/modules ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions - ${CP} ${WRKINST}/usr/lib/xorg/modules/fonts/*.so \ - $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts ${CP} ${WRKINST}/usr/lib/xorg/modules/linux/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux ${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \ diff --git a/package/xproto/Makefile b/package/xproto/Makefile index 0b4cb74d0..9f8207fca 100644 --- a/package/xproto/Makefile +++ b/package/xproto/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xproto -PKG_VERSION:= 7.0.13 +PKG_VERSION:= 7.0.16 PKG_RELEASE:= 1 -PKG_MD5SUM:= 4c736a7ba52beddaea87964047adf209 +PKG_MD5SUM:= 6e6b6510ccd568f82093ebd7ae58700b PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto # workaround for makekeys compile on non-Linux systems post-install: diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile index 7c9da8b86..b71477dfb 100644 --- a/package/xtrans/Makefile +++ b/package/xtrans/Makefile @@ -4,15 +4,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xtrans -PKG_VERSION:= 1.2.1 +PKG_VERSION:= 1.2.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 5b7f447f6fe92cbc4f17441aaee0bf55 -PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_MD5SUM:= b2f47d49faf1f24e8294b624b21b9b93 +PKG_DESCR:= X transport library +PKG_SECTION:= x11 +PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +#$(eval $(call PKG_template,XTRANS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS+= --datadir=/usr/lib +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/scripts/install.sh b/scripts/install.sh index 5cb5e01f4..54887b6be 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -4,16 +4,6 @@ if [ $(id -u) -ne 0 ];then exit 1 fi -printf "Checking if grub is installed" -grub=$(which grub) - -if [ ! -z $grub -a -x $grub ];then - printf "...okay\n" -else - printf "...failed\n" - exit 1 -fi - printf "Checking if sfdisk is installed" sfdisk=$(which sfdisk) @@ -79,7 +69,7 @@ if [ -z $1 ];then exit 1 else if [ -z $2 ];then - printf "Please give your install tar as second parameter\n" + printf "Please give your install tar archive as second parameter\n" exit 2 fi if [ -f $2 ];then @@ -135,7 +125,7 @@ if [ $($sfdisk -l $1 2>/dev/null|grep Empty|wc -l) -ne 4 ];then read y if [ $y = "y" ];then printf "Wiping existing partitions\n" - dd if=/dev/zero of=$1 bs=512 count=1 + dd if=/dev/zero of=$1 bs=512 count=1 >/dev/null 2>&1 else printf "Exiting.\n" exit 1 @@ -147,7 +137,7 @@ if [ $rb532 -ne 0 ];then rootpart=${1}2 $parted -s $1 mklabel msdos sleep 2 - maxsize=$(parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') + maxsize=$(env LC_ALL=C $parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') rootsize=$(($maxsize-2)) $parted -s $1 unit cyl mkpart primary ext2 0 1 @@ -174,8 +164,8 @@ EOF else $parted -s $1 mklabel msdos sleep 2 - maxsize=$(parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') - rootsize=$(($maxsize-1)) + maxsize=$(env LC_ALL=C $parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') + rootsize=$(($maxsize-2)) $parted -s $1 unit cyl mkpartfs primary ext2 0 $rootsize $parted -s $1 unit cyl mkpart primary fat32 $rootsize $maxsize @@ -209,30 +199,28 @@ chmod 1777 $tmp/tmp chmod 4755 $tmp/bin/busybox if [ $rb532 -eq 0 ];then - printf "Copying grub files\n" - mkdir $tmp/boot/grub - cp /boot/grub/stage1 $tmp/boot/grub - cp /boot/grub/stage2 $tmp/boot/grub - cp /boot/grub/e2fs_stage1_5 $tmp/boot/grub - -cat << EOF > $tmp/boot/grub/menu.lst -serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 -terminal --timeout=2 serial console -timeout 2 -default 0 -hiddenmenu -title linux -root (hd0,0) -kernel /boot/kernel root=/dev/sda1 init=/init console=ttyS0,115200 console=tty0 panic=10 rw -EOF - - printf "Installing Grub bootloader\n" -$grub --batch --no-curses --no-floppy --device-map=/dev/null >/dev/null << EOF -device (hd0) $1 -root (hd0,0) -setup (hd0) -quit + mkdir -p $tmp/boot/grub + mount -o bind /dev $tmp/dev + chroot $tmp mount -t proc /proc /proc + chroot $tmp mount -t sysfs /sys /sys +cat << EOF > $tmp/boot/grub/grub.cfg +set default=0 +set timeout=5 +insmod terminal +insmod serial +serial --unit=0 --speed=115200 +terminal serial + +menuentry "GNU/Linux (OpenADK)" { + insmod ext2 + set root=(hd0,1) + linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init console=ttyS0,115200 console=tty0 panic=10 +} EOF + chroot $tmp grub-install $1 + umount $tmp/proc + umount $tmp/sys + umount $tmp/dev fi printf "Creating device nodes\n" diff --git a/scripts/ipkg b/scripts/ipkg index 39520094f..cfa1cfe97 100644 --- a/scripts/ipkg +++ b/scripts/ipkg @@ -777,7 +777,7 @@ ipkg_install_file_dest() { mkdir -p $IPKG_TMP/$pkg/data mkdir -p $info_dir - if ! $pkg_extract_stdout $filename ./control.tar.gz | (cd $IPKG_TMP/$pkg/control; tar -xzf - ) ; then + if ! $pkg_extract_stdout $filename ./control.tar.gz|gzip -dc|tar -xf - -C $IPKG_TMP/$pkg/control ; then echo "ipkg_install_file: ERROR unpacking control.tar.gz from $filename" return 1 fi @@ -807,7 +807,7 @@ Status: install ok pending" | ipkg_status_update_sd $sd $pkg set -o noglob rm -r $IPKG_TMP/$pkg/control - if ! $pkg_extract_stdout $filename ./data.tar.gz | (cd $IPKG_TMP/$pkg/data; tar -xzf - ) ; then + if ! $pkg_extract_stdout $filename ./data.tar.gz|gzip -dc|tar -xf - -C $IPKG_TMP/$pkg/data ; then echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename" return 1 fi @@ -879,7 +879,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile" rm -rf $IPKG_TMP/$pkg/data rmdir $IPKG_TMP/$pkg rm -f $info_dir/$pkg.list - $pkg_extract_stdout $filename ./data.tar.gz | tar tzf - | sed -e 's/^\.//' > $info_dir/$pkg.list + $pkg_extract_stdout $filename ./data.tar.gz | gzip -dc | tar tf - | sed -e 's/^\.//' > $info_dir/$pkg.list if [ -x "$info_dir/$pkg.postinst" ]; then IPKG_INSTROOT="$IPKG_INSTROOT" $info_dir/$pkg.postinst configure diff --git a/target/Config.in b/target/Config.in index 88f0343a0..824deba03 100644 --- a/target/Config.in +++ b/target/Config.in @@ -133,6 +133,7 @@ config ADK_LINUX_X86_ALIX1C bool "PC Engines Alix1C" select ADK_alix1c select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA select ADK_KERNEL_EXT2_FS select ADK_KERNEL_NET_PCI select ADK_KERNEL_NETDEVICES diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index 69b9e8020..539a1fdba 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/kernel + cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk ifeq ($(FS),ext2-cf) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) diff --git a/target/alix1c/kernel.config b/target/alix1c/kernel.config index fca9e80ce..b8c548eff 100644 --- a/target/alix1c/kernel.config +++ b/target/alix1c/kernel.config @@ -1,12 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.30 -# Sun Jun 14 12:41:50 2009 +# Linux kernel version: 2.6.31.4 +# Tue Nov 3 19:13:15 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y # CONFIG_X86_64 is not set CONFIG_X86=y +CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CMOS_UPDATE=y @@ -48,6 +49,7 @@ CONFIG_GENERIC_IRQ_PROBE=y CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y # # General setup @@ -95,7 +97,6 @@ CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set -CONFIG_STRIP_ASM_SYMS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -109,8 +110,15 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y # CONFIG_AIO is not set +CONFIG_HAVE_PERF_COUNTERS=y + +# +# Performance Counters +# +# CONFIG_PERF_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_PCI_QUIRKS is not set +CONFIG_STRIP_ASM_SYMS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set @@ -123,7 +131,12 @@ CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y @@ -136,7 +149,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y -# CONFIG_LBD is not set +CONFIG_LBDAF=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -225,6 +238,7 @@ CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT is not set # CONFIG_X86_UP_APIC is not set # CONFIG_X86_MCE is not set +# CONFIG_X86_ANCIENT_MCE is not set CONFIG_VM86=y # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set @@ -260,8 +274,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y -# CONFIG_UNEVICTABLE_LRU is not set CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_X86_CHECK_BIOS_CORRUPTION=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_RESERVE_LOW_64K=y @@ -413,6 +428,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set @@ -482,10 +498,6 @@ CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set @@ -573,14 +585,17 @@ CONFIG_PATA_AMD=y # # -# Enable only one of the two stacks, unless you know what you are doing +# You can enable one or both FireWire driver stacks. +# + +# +# See the help texts for more information. # # CONFIG_FIREWIRE is not set # CONFIG_IEEE1394 is not set # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y -CONFIG_COMPAT_NET_DEV_OPS=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set @@ -644,6 +659,7 @@ CONFIG_NET_PCI=y # CONFIG_SMSC9420 is not set # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set +# CONFIG_KS8842 is not set CONFIG_VIA_RHINE=y CONFIG_VIA_RHINE_MMIO=y # CONFIG_SC92031 is not set @@ -696,12 +712,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_MATRIX is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set @@ -769,6 +786,11 @@ CONFIG_UNIX98_PTYS=y CONFIG_DEVPORT=y # CONFIG_I2C is not set # CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y @@ -810,22 +832,7 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set # CONFIG_REGULATOR is not set - -# -# Multimedia devices -# - -# -# Multimedia core support -# -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# -# CONFIG_DAB is not set +# CONFIG_MEDIA_SUPPORT is not set # # Graphics support @@ -993,6 +1000,10 @@ CONFIG_RTC_DRV_CMOS=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set + +# +# TI VLYNQ +# # CONFIG_STAGING is not set CONFIG_X86_PLATFORM_DEVICES=y @@ -1016,12 +1027,15 @@ CONFIG_EXT2_FS=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY is not set +CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -1077,6 +1091,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set @@ -1133,39 +1148,24 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FTRACE_SYSCALLS=y CONFIG_TRACING_SUPPORT=y - -# -# Tracers -# -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_CONTEXT_SWITCH_TRACER is not set -# CONFIG_EVENT_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set -# CONFIG_TRACE_BRANCH_PROFILING is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_MMIOTRACE is not set +# CONFIG_FTRACE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_STRICT_DEVMEM is not set # CONFIG_X86_VERBOSE_BOOTUP is not set # CONFIG_EARLY_PRINTK is not set # CONFIG_4KSTACKS is not set # CONFIG_DOUBLEFAULT is not set +# CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index 7342a0f52..800ec9829 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -101,6 +101,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIBCM203X prompt "kmod-bluetooth-hci-bcm203x........ HCI BCM203x USB driver" tristate default n + select ADK_KPACKAGE_KMOD_FW_LOADER depends on ADK_KPACKAGE_KMOD_BT help Bluetooth HCI BCM203x USB driver. |