diff options
Diffstat (limited to 'package')
71 files changed, 331 insertions, 451 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index c6e1811a5..97bbee79b 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -4,17 +4,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:= MesaLib -PKG_VERSION:= 9.2.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= df801a975045150790e10e2ccf32193f +PKG_VERSION:= 10.1.0 +PKG_SUBVER:= 10.1 +PKG_RELEASE:= 3 +PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315 PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat PKG_DEPENDS+= libxml2 libxml2-python -PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes libXxf86vm libdrm -PKG_BUILDDEP+= dri2proto glproto expat libXext +PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes +PKG_BUILDDEP+= libXxf86vm libdrm dri2proto glproto expat libXext +PKG_BUILDDEP+= eudev dri3proto presentproto xcb-proto libxcb +PKG_BUILDDEP+= libxshmfence PKG_URL:= http://www.mesa3d.org/ -PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/ +PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_SUBVER}/ PKG_NEED_CXX:= 1 PKG_LIBNAME:= mesalib PKG_OPTS:= dev @@ -58,6 +61,8 @@ mesalib-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ $(IDIR_MESALIB)/usr/lib + $(CP) $(WRKINST)/usr/lib/libglapi.so* \ + $(IDIR_MESALIB)/usr/lib ${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \ ${IDIR_MESALIB}/usr/lib/dri/ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) diff --git a/package/MesaLib/patches/patch-configure_ac b/package/MesaLib/patches/patch-configure_ac index c788ea1cd..32b3d8053 100644 --- a/package/MesaLib/patches/patch-configure_ac +++ b/package/MesaLib/patches/patch-configure_ac @@ -1,6 +1,6 @@ ---- Mesa-9.2.2.orig/configure.ac 2013-10-19 01:36:09.000000000 +0200 -+++ Mesa-9.2.2/configure.ac 2013-12-01 14:08:00.000000000 +0100 -@@ -69,7 +69,7 @@ AC_PATH_PROG([PERL], [perl]) +--- Mesa-10.1.0.orig/configure.ac 2014-02-27 02:56:39.000000000 +0100 ++++ Mesa-10.1.0/configure.ac 2014-03-14 21:36:14.000000000 +0100 +@@ -65,7 +65,7 @@ AC_PATH_PROG([PERL], [perl]) AC_CHECK_PROG(INDENT, indent, indent, cat) if test "x$INDENT" != "xcat"; then diff --git a/package/MesaLib/patches/patch-include_c11_threads_posix_h b/package/MesaLib/patches/patch-include_c11_threads_posix_h new file mode 100644 index 000000000..2e79238f7 --- /dev/null +++ b/package/MesaLib/patches/patch-include_c11_threads_posix_h @@ -0,0 +1,11 @@ +--- Mesa-10.1.0.orig/include/c11/threads_posix.h 2014-02-27 02:56:39.000000000 +0100 ++++ Mesa-10.1.0/include/c11/threads_posix.h 2014-03-14 21:54:55.000000000 +0100 +@@ -176,7 +176,7 @@ mtx_init(mtx_t *mtx, int type) + return thrd_error; + pthread_mutexattr_init(&attr); + if ((type & mtx_recursive) != 0) { +-#if defined(__linux__) || defined(__linux) ++#if defined(__GLIBC__) + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); + #else + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h index 021601b7f..b929e8758 100644 --- a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h +++ b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h @@ -1,6 +1,6 @@ ---- Mesa-9.2.2.orig/src/gallium/include/pipe/p_config.h 2013-10-18 00:26:23.000000000 +0200 -+++ Mesa-9.2.2/src/gallium/include/pipe/p_config.h 2014-01-06 12:26:04.042469119 +0100 -@@ -126,7 +126,7 @@ +--- Mesa-10.1.0.orig/src/gallium/include/pipe/p_config.h 2014-02-27 02:56:39.000000000 +0100 ++++ Mesa-10.1.0/src/gallium/include/pipe/p_config.h 2014-03-14 21:36:14.000000000 +0100 +@@ -130,7 +130,7 @@ * Endian detection. */ diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c index 4ca3a2708..db87901d3 100644 --- a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c +++ b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c @@ -1,6 +1,6 @@ ---- Mesa-9.2.2.orig/src/mesa/main/querymatrix.c 2013-04-08 20:21:04.000000000 +0200 -+++ Mesa-9.2.2/src/mesa/main/querymatrix.c 2013-10-24 17:06:31.000000000 +0200 -@@ -74,7 +74,7 @@ fpclassify(double x) +--- Mesa-10.1.0.orig/src/mesa/main/querymatrix.c 2014-02-27 02:56:40.000000000 +0100 ++++ Mesa-10.1.0/src/mesa/main/querymatrix.c 2014-03-14 21:36:14.000000000 +0100 +@@ -76,7 +76,7 @@ fpclassify(double x) #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \ diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile index bc2624fe9..0a60c5056 100644 --- a/package/adk-test-tools/Makefile +++ b/package/adk-test-tools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= adk-test-tools PKG_VERSION:= 0.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_DESCR:= helper tools and scripts for adk-test-framework PKG_SECTION:= misc PKG_URL:= http://openadk.org/ diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init index 81095fa39..bb8fca527 100755 --- a/package/adk-test-tools/files/test.init +++ b/package/adk-test-tools/files/test.init @@ -4,8 +4,9 @@ [[ $1 = autostart ]] || exit 0 echo "Starting test script ..." if [ -x /run.sh ];then - exec /run.sh + /run.sh + quit else echo "no run.sh found" + quit fi -quit diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 32730f11d..c1294c368 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= arpd PKG_VERSION:= 0.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d PKG_DESCR:= Generates ARP responses for IP address ranges PKG_SECTION:= route diff --git a/package/arpd/patches/patch-arpd_c b/package/arpd/patches/patch-arpd_c index 857396d76..84dd457aa 100644 --- a/package/arpd/patches/patch-arpd_c +++ b/package/arpd/patches/patch-arpd_c @@ -1,5 +1,5 @@ --- arpd.orig/arpd.c 2003-02-09 05:20:40.000000000 +0100 -+++ arpd/arpd.c 2007-01-21 00:39:05.000000000 +0100 ++++ arpd/arpd.c 2014-03-16 08:11:53.000000000 +0100 @@ -70,7 +70,7 @@ static int arpd_sig; static void usage(void) @@ -74,10 +74,21 @@ addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha)); /* This address is claimed */ -@@ -465,14 +469,14 @@ main(int argc, char *argv[]) +@@ -445,9 +449,6 @@ arpd_recv(int fd, short type, void *ev) + void + terminate_handler(int sig) + { +- extern int event_gotsig; +- +- event_gotsig = 1; + arpd_sig = sig; + } + +@@ -464,15 +465,14 @@ int + main(int argc, char *argv[]) { struct event recv_ev; - extern int (*event_sigcb)(void); +- extern int (*event_sigcb)(void); - char *dev; + char *dev, *and_pcap_exp; int c, debug; @@ -91,7 +102,7 @@ switch (c) { case 'd': debug = 1; -@@ -480,6 +484,9 @@ main(int argc, char *argv[]) +@@ -480,6 +480,9 @@ main(int argc, char *argv[]) case 'i': dev = optarg; break; @@ -101,7 +112,7 @@ default: usage(); break; -@@ -489,9 +496,9 @@ main(int argc, char *argv[]) +@@ -489,9 +492,9 @@ main(int argc, char *argv[]) argv += optind; if (argc == 0) @@ -113,3 +124,11 @@ if ((fp = fopen(PIDFILE, "w")) == NULL) err(1, "fopen"); +@@ -524,7 +527,6 @@ main(int argc, char *argv[]) + perror("signal"); + return (-1); + } +- event_sigcb = arpd_signal; + + event_dispatch(); + diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 81fb1f6df..11fb4f507 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 70 +PKG_RELEASE:= 72 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/fstab b/package/base-files/src/etc/fstab index 5c09c2510..d5f900202 100644 --- a/package/base-files/src/etc/fstab +++ b/package/base-files/src/etc/fstab @@ -6,3 +6,5 @@ devpts /dev/pts devpts defaults,gid=5,mode=620 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /tmp tmpfs mode=1777 0 0 sysfs /sys sysfs defaults 0 0 +# example for cifs +#//192.168.1.1/music /music/test cifs ro,password=linux123,username=adk,iocharset=utf8,sec=ntlm 0 0 diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index fc2f79ac2..f52e8dc78 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -4,6 +4,10 @@ . /etc/functions.sh +if [ -f /proc/sys/kernel/printk ];then + echo 0 > /proc/sys/kernel/printk +fi + # remount /dev with smaller size mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev @@ -15,7 +19,6 @@ mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp # start mdev dynamic device node management echo >/dev/mdev.seq echo "/sbin/mdev" >/proc/sys/kernel/hotplug -mdev -s # seed some random cat /etc/.rnd >/dev/urandom 2>&1 diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs index 75ae760e0..8f4397897 100644 --- a/package/base-files/src/etc/init.d/fs +++ b/package/base-files/src/etc/init.d/fs @@ -1,20 +1,53 @@ #!/bin/sh -#INIT 60 +#INIT 20 [[ $1 = autostart ]] || exit 0 -# mount net filesystems (nfs/cifs) -grep nfs /proc/filesystems >/dev/null 2>&1 +# activate swap +[ -x /sbin/swapon ] && { swapon -a; } + +# activate any logical volumes +[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; } + +# filesystem checks +[ -x /sbin/fsck.ext2 ] && { + for i in $(grep -v "^#" /etc/fstab|grep ext2|awk '{ print $1}');do fsck.ext2 $i;done; +} +[ -x /sbin/fsck.ext3 ] && { + for i in $(grep -v "^#" /etc/fstab|grep ext3|awk '{ print $1}');do fsck.ext3 $i;done; +} +[ -x /sbin/fsck.ext4 ] && { + for i in $(grep -v "^#" /etc/fstab|grep ext4|awk '{ print $1}');do fsck.ext4 $i;done; +} +[ -x /sbin/fsck.xfs ] && { + for i in $(grep -v "^#" /etc/fstab|grep xfs|awk '{ print $1}');do xfs_repair $i;done; +} +# local filesystems +grep ext2 /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep -v "^#" /etc/fstab |grep ext2 >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t ext2 + fi +fi +grep ext3 /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep -v "^#" /etc/fstab |grep ext3 >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t ext3 + fi +fi +grep ext4 /proc/filesystems >/dev/null 2>&1 if [ $? -eq 0 ];then - grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1 + grep -v "^#" /etc/fstab |grep ext4 >/dev/null 2>&1 if [ $? -eq 0 ];then - mount -a -t nfs + mount -a -t ext4 fi fi -grep cifs /proc/filesystems >/dev/null 2>&1 +grep xfs /proc/filesystems >/dev/null 2>&1 if [ $? -eq 0 ];then - grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1 + grep -v "^#" /etc/fstab |grep xfs >/dev/null 2>&1 if [ $? -eq 0 ];then - mount -a -t cifs + mount -a -t xfs fi fi exit 0 diff --git a/package/base-files/src/etc/init.d/fsnet b/package/base-files/src/etc/init.d/fsnet index 8f4397897..75ae760e0 100644 --- a/package/base-files/src/etc/init.d/fsnet +++ b/package/base-files/src/etc/init.d/fsnet @@ -1,53 +1,20 @@ #!/bin/sh -#INIT 20 +#INIT 60 [[ $1 = autostart ]] || exit 0 -# activate swap -[ -x /sbin/swapon ] && { swapon -a; } - -# activate any logical volumes -[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; } - -# filesystem checks -[ -x /sbin/fsck.ext2 ] && { - for i in $(grep -v "^#" /etc/fstab|grep ext2|awk '{ print $1}');do fsck.ext2 $i;done; -} -[ -x /sbin/fsck.ext3 ] && { - for i in $(grep -v "^#" /etc/fstab|grep ext3|awk '{ print $1}');do fsck.ext3 $i;done; -} -[ -x /sbin/fsck.ext4 ] && { - for i in $(grep -v "^#" /etc/fstab|grep ext4|awk '{ print $1}');do fsck.ext4 $i;done; -} -[ -x /sbin/fsck.xfs ] && { - for i in $(grep -v "^#" /etc/fstab|grep xfs|awk '{ print $1}');do xfs_repair $i;done; -} -# local filesystems -grep ext2 /proc/filesystems >/dev/null 2>&1 -if [ $? -eq 0 ];then - grep -v "^#" /etc/fstab |grep ext2 >/dev/null 2>&1 - if [ $? -eq 0 ];then - mount -a -t ext2 - fi -fi -grep ext3 /proc/filesystems >/dev/null 2>&1 -if [ $? -eq 0 ];then - grep -v "^#" /etc/fstab |grep ext3 >/dev/null 2>&1 - if [ $? -eq 0 ];then - mount -a -t ext3 - fi -fi -grep ext4 /proc/filesystems >/dev/null 2>&1 +# mount net filesystems (nfs/cifs) +grep nfs /proc/filesystems >/dev/null 2>&1 if [ $? -eq 0 ];then - grep -v "^#" /etc/fstab |grep ext4 >/dev/null 2>&1 + grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1 if [ $? -eq 0 ];then - mount -a -t ext4 + mount -a -t nfs fi fi -grep xfs /proc/filesystems >/dev/null 2>&1 +grep cifs /proc/filesystems >/dev/null 2>&1 if [ $? -eq 0 ];then - grep -v "^#" /etc/fstab |grep xfs >/dev/null 2>&1 + grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1 if [ $? -eq 0 ];then - mount -a -t xfs + mount -a -t cifs fi fi exit 0 diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK index 9d0e06440..938882ae5 100755 --- a/package/base-files/src/etc/init.d/rcK +++ b/package/base-files/src/etc/init.d/rcK @@ -4,15 +4,6 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin grep '^#INIT ' /etc/init.d/* | \ sort -rnk2 | \ while read line; do - shebang=$(sed -n '1s/^#![ ]*//p' ${line%%:*}) - case $shebang in - *[\ \ ]*) shebang=\'$(echo X"$shebang" | sed \ - -e 's/^X//' -e "s/'/'\\\\''/g" \ - -e 's/^\([^ ][^ ]*\)[ ]*$/\1/' \ - -e 's/^\([^ ][^ ]*\)[ ][ ]*\(..*\)$/\1 \2/' \ - -e 's/^\([^ ][^ ]*\) /\1'\'' '\''/')\' ;; - esac - ${shebang:-/bin/sh} ${line%%:*} autostop 2>&1 + sh ${line%%:*} autostop done - test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1 } | logger -s -p 6 -t '' diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS index 9daa8f5cd..e27bc9eb5 100755 --- a/package/base-files/src/etc/init.d/rcS +++ b/package/base-files/src/etc/init.d/rcS @@ -3,13 +3,13 @@ if [ -f /proc/sys/kernel/printk ];then echo 0 > /proc/sys/kernel/printk fi +ln -s /proc/self/fd/2 /dev/stderr echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin -ln -s /proc/self/fd/2 /dev/stderr { grep '^#INIT ' /etc/init.d/* | \ sort -nk2 | \ while read line; do sh ${line%%:*} autostart done -} | tee /dev/stderr |logger -p 6 -t '' +} |tee /dev/stderr |logger -p 6 -t '' diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile index ce425b54c..eb3015d46 100644 --- a/package/base-files/src/etc/profile +++ b/package/base-files/src/etc/profile @@ -12,3 +12,5 @@ cat /etc/banner 2>&- alias l='ls -lF' alias la='ls -A' alias ll='ls -alF' +alias ro='mount -o remount,ro /' +alias rw='mount -o remount,rw /' diff --git a/package/base-files/src/etc/rc.shutdown b/package/base-files/src/etc/rc.shutdown deleted file mode 100644 index 5a1a0aa78..000000000 --- a/package/base-files/src/etc/rc.shutdown +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -# add code for shutdown routine diff --git a/package/base-files/src/init b/package/base-files/src/init deleted file mode 100755 index a27548217..000000000 --- a/package/base-files/src/init +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# devtmpfs does not get automounted for initramfs -/bin/mount -t devtmpfs devtmpfs /dev -exec 0</dev/console -exec 1>/dev/console -exec 2>/dev/console -exec /sbin/init $* diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index aafc795b1..026146662 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -572,7 +572,7 @@ config BUSYBOX_FEATURE_MOUNT_NFS config BUSYBOX_FEATURE_MOUNT_CIFS bool "Support mounting CIFS/SMB file systems" - default y + default n depends on BUSYBOX_MOUNT help Enable support for samba mounts. diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index a79bd73ca..70b323a76 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -16,7 +16,7 @@ PKG_CFLINE_CFGFS+= select BUSYBOX_MD5SUM@ PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS && !ADK_TARGET_ROOTFS_JFFS2 && !ADK_TARGET_ROOTFS_SQUASHFS -PKG_DFLT_CFGFS:= y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE) +PKG_DFLT_CFGFS:= y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_PKG_TEST) WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile index 402144bfd..f42ef212e 100644 --- a/package/dri2proto/Makefile +++ b/package/dri2proto/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dri2proto -PKG_VERSION:= 2.6 +PKG_VERSION:= 2.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 873142af5db695537cfe05e01d13541f -PKG_DESCR:= DRI protocol headers +PKG_MD5SUM:= 19ea18f63d8ae8053c9fa84b60365b77 +PKG_DESCR:= DRI2 protocol headers PKG_SECTION:= devel PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly diff --git a/package/dri3proto/Makefile b/package/dri3proto/Makefile new file mode 100644 index 000000000..7aaac7ac5 --- /dev/null +++ b/package/dri3proto/Makefile @@ -0,0 +1,19 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= dri3proto +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 25e84a49a076862277ee12aebd49ff5f +PKG_DESCR:= DRI protocol headers +PKG_SECTION:= devel +PKG_SITES:= ${MASTER_SITE_XORG} +PKG_OPTS:= dev devonly + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DRI3PROTO,dri3proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gdb/Makefile b/package/gdb/Makefile index d8b9a26bd..9fc0b48fa 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -11,8 +11,6 @@ PKG_DEPENDS:= libthread-db libncurses libexpat libgcc zlib PKG_BUILDDEP:= ncurses readline libiconv-tiny expat zlib PKG_NOPARALLEL:= 1 -PKG_ARCH_DEPENDS:= !m68k - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/glib/Makefile b/package/glib/Makefile index e1ce6bca4..2c82f8a53 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.38.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_EXTRAVER:= 2.38 PKG_MD5SUM:= 26d1d08e478fc48c181ca8be44f5b69f PKG_DESCR:= low-level core library that forms the basis of GTK+ @@ -44,6 +44,7 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getgrgid_r=yes HOST_CONFIGURE_ARGS+= --disable-fam \ + --enable-static \ --disable-compile-warnings glib-install: diff --git a/package/glproto/Makefile b/package/glproto/Makefile index 6c3e5e715..437d208e6 100644 --- a/package/glproto/Makefile +++ b/package/glproto/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= glproto -PKG_VERSION:= 1.4.15 +PKG_VERSION:= 1.4.17 PKG_RELEASE:= 1 PKG_DESCR:= OpenGL headers PKG_SECTION:= devel -PKG_MD5SUM:= be7c4e3c289db480b9e1238c03637eb7 +PKG_MD5SUM:= d69554c1b51a83f2c6976a640819911b PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index a161d860f..04547a9eb 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpsd PKG_VERSION:= 3.10 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= fc5b03aae38b9b5b6880b31924d0ace3 PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= misc diff --git a/package/gpsd/patches/patch-gpsmon_c b/package/gpsd/patches/patch-gpsmon_c new file mode 100644 index 000000000..ac52866d0 --- /dev/null +++ b/package/gpsd/patches/patch-gpsmon_c @@ -0,0 +1,13 @@ +--- gpsd-3.10.orig/gpsmon.c 2013-11-21 09:57:44.000000000 +0100 ++++ gpsd-3.10/gpsmon.c 2014-03-16 09:08:34.000000000 +0100 +@@ -505,6 +505,10 @@ static /*@null@*/ char *curses_get_comma + static char line[80]; + int c; + ++#ifndef __GLIBC__ ++#define CTRL(x) (x&037) ++#endif ++ + c = wgetch(cmdwin); + if (c == CTRL('L')) { + (void)clearok(stdscr, true); diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index 53180cfbe..6f873ba0b 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= inputproto -PKG_VERSION:= 2.2 +PKG_VERSION:= 2.3 PKG_RELEASE:= 1 PKG_DESCR:= X Input Extension headers PKG_SECTION:= devel PKG_BUILDDEP:= inputproto-host -PKG_MD5SUM:= e0047823230413e67d74e92af77fbe58 +PKG_MD5SUM:= 5ea366d32a9a78d6204a47ea35d9dc5c PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 89c9994c9..d9fa9fd2a 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables PKG_VERSION:= 1.4.21 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall diff --git a/package/iptables/patches/patch-include_linux_netfilter_xt_osf_h b/package/iptables/patches/patch-include_linux_netfilter_xt_osf_h deleted file mode 100644 index 00dd62ca8..000000000 --- a/package/iptables/patches/patch-include_linux_netfilter_xt_osf_h +++ /dev/null @@ -1,12 +0,0 @@ ---- iptables-1.4.20.orig/include/linux/netfilter/xt_osf.h 2013-08-06 17:48:43.000000000 +0200 -+++ iptables-1.4.20/include/linux/netfilter/xt_osf.h 2013-09-04 11:34:30.000000000 +0200 -@@ -21,6 +21,9 @@ - #define _XT_OSF_H - - #include <linux/types.h> -+#if !defined(__GLIBC__) -+#include <linux/tcp.h> -+#endif - - #define MAXGENRELEN 32 - diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile index 9ef7660d7..dac18add6 100644 --- a/package/libdrm/Makefile +++ b/package/libdrm/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libdrm -PKG_VERSION:= 2.4.44 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 205fbaedfab827a874265420d38547f0 +PKG_VERSION:= 2.4.52 +PKG_RELEASE:= 1 +PKG_MD5SUM:= cb3547ccb435be6d80df68840da6b2ee PKG_DESCR:= DRM library PKG_SECTION:= libs PKG_BUILDDEP:= libpthread-stubs cairo libpciaccess diff --git a/package/libssh/Makefile b/package/libssh/Makefile index 6a49c346a..2543a7863 100644 --- a/package/libssh/Makefile +++ b/package/libssh/Makefile @@ -4,17 +4,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libssh -PKG_VERSION:= 0.5.3 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 9ad01838d3b89d98e900e0f6260a88cc +PKG_VERSION:= 0.6.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 66cf16e77f60913b4d54f18c92cdbf71 PKG_DESCR:= SSH library PKG_SECTION:= libs PKG_DEPENDS:= libopenssl zlib PKG_BUILDDEP:= cmake-host openssl zlib PKG_URL:= http://www.libssh.org/ -PKG_SITES:= http://www.libssh.org/files/0.5/ +PKG_SITES:= https://red.libssh.org/attachments/download/87/ PKG_OPTS:= dev +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake index a67998250..b8e077b94 100644 --- a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake +++ b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake @@ -1,6 +1,6 @@ ---- libssh-0.5.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2012-11-20 12:41:49.000000000 +0100 -+++ libssh-0.5.3/cmake/Modules/DefineCompilerFlags.cmake 2013-12-17 13:20:04.073723090 +0100 -@@ -20,11 +20,6 @@ if (UNIX AND NOT WIN32) +--- libssh-0.6.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2014-02-06 10:20:57.000000000 +0100 ++++ libssh-0.6.3/cmake/Modules/DefineCompilerFlags.cmake 2014-03-14 09:10:56.621673326 +0100 +@@ -21,11 +21,6 @@ if (UNIX AND NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") endif (WITH_FPIC) @@ -9,6 +9,6 @@ - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") - endif (WITH_STACK_PROTECTOR) - - check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) - if (WITH_FORTIFY_SOURCE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") + if (CMAKE_BUILD_TYPE) + string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) + if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel)) diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake index 9a140e652..e7fcdfd2d 100644 --- a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake +++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake @@ -1,5 +1,5 @@ ---- libssh-0.5.3.orig/cmake/Modules/FindZLIB.cmake 2012-11-20 12:41:49.000000000 +0100 -+++ libssh-0.5.3/cmake/Modules/FindZLIB.cmake 2014-01-11 12:11:52.000000000 +0100 +--- libssh-0.6.3.orig/cmake/Modules/FindZLIB.cmake 2013-12-21 18:37:12.000000000 +0100 ++++ libssh-0.6.3/cmake/Modules/FindZLIB.cmake 2014-03-14 09:07:03.296701809 +0100 @@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI NAMES zlib.h @@ -13,9 +13,9 @@ ) mark_as_advanced(ZLIB_INCLUDE_DIR) -@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI - zlib +@@ -99,12 +99,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI zlib1 + zlibd PATHS + ${ZLIB_ROOT_DIR}/lib /usr/local/lib diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h index 8811f79fb..dc60939bf 100644 --- a/package/libssh/patches/patch-include_libssh_libssh_h +++ b/package/libssh/patches/patch-include_libssh_libssh_h @@ -1,6 +1,6 @@ ---- libssh-0.5.3.orig/include/libssh/libssh.h 2012-11-20 12:41:49.000000000 +0100 -+++ libssh-0.5.3/include/libssh/libssh.h 2014-01-11 12:04:00.000000000 +0100 -@@ -57,6 +57,7 @@ +--- libssh-0.6.3.orig/include/libssh/libssh.h 2014-03-04 13:20:48.000000000 +0100 ++++ libssh-0.6.3/include/libssh/libssh.h 2014-03-14 09:07:03.304701842 +0100 +@@ -56,6 +56,7 @@ typedef unsigned long long uint64_t; typedef int mode_t; #else /* _MSC_VER */ diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index a2e14cd10..773c4c8f2 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -19,8 +19,6 @@ PKG_SECTION:= libs PKG_CFLINE_LIBTHREAD_DB:=depends on ADK_PACKAGE_GDB || ADK_PACKAGE_GDBSERVER -PKG_ARCH_DEPENDS:= !m68k - NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 713a6c3a3..c126b66ac 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libxcb -PKG_VERSION:= 1.9.1 +PKG_VERSION:= 1.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 324c76024a73dba8a902638696ba87de +PKG_MD5SUM:= a484793fbfb974b09d54fa1ebf44b2e4 PKG_DESCR:= X11 keyboard library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXau-host libpthread-stubs-host xcb-proto-host diff --git a/package/libxshmfence/Makefile b/package/libxshmfence/Makefile new file mode 100644 index 000000000..d81b9c679 --- /dev/null +++ b/package/libxshmfence/Makefile @@ -0,0 +1,23 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libxshmfence +PKG_VERSION:= 1.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 323bb06c70765a2395df1d9c7ec3d14a +PKG_DESCR:= X11 xshmfence library +PKG_SECTION:= x11/libs +PKG_SITES:= ${MASTER_SITE_XORG} +PKG_OPTS:= dev + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBXSHMFENCE,libxshmfence,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +libxshmfence-install: + ${INSTALL_DIR} ${IDIR_LIBXSHMFENCE}/usr/lib + ${CP} ${WRKINST}/usr/lib/libxshmfence.so* ${IDIR_LIBXSHMFENCE}/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mpd/Makefile b/package/mpd/Makefile index c1ad710dc..4c8ab359a 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -16,8 +16,6 @@ PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !m68k - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 2453064f5..779ebfbdd 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ncurses PKG_VERSION:= 5.9 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 8cb9c412e5f2d96bc6f459aa8c6282a1 PKG_DESCR:= a terminal handling library PKG_SECTION:= libs @@ -81,18 +81,13 @@ libncurses-install: ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib ${CP} ${WRKINST}/usr/lib/lib{tinfo,form,menu,ncurses,panel}.so* \ ${IDIR_LIBNCURSES}/usr/lib - for ti in rxvt rxvt-unicode; do \ - TERMINFO=${WRKINST}/usr/share/terminfo \ - PATH=$(HOST_PATH) \ - tic$(EXEEXT) -x ./files/$$ti.ti; \ - done ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y) ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share ${CP} ${WRKINST}/usr/share/terminfo ${IDIR_LIBNCURSES}/usr/share/ else ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/ for f in ansi dumb linux screen vt100 vt102 \ - rxvt rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \ + vt220 xterm xterm-color xterm-xfree86; do \ ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \ ${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \ ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \ diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 20cb90ee2..5a6b1c9e7 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= olsrd -PKG_VERSION:= 0.6.0 +PKG_VERSION:= 0.6.6.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 84e9295457cab50539f776118939b343 +PKG_MD5SUM:= 65181a5280391d69411908c186fd0c1f PKG_DESCR:= Optimized Link State Routing protocol PKG_SECTION:= wifi PKG_URL:= http://www.olsr.org/ @@ -33,19 +33,17 @@ $(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_mod_template,OLSRD_MOD_DYN_GW,dyn_gw)) $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo)) $(eval $(call PKG_mod_template,OLSRD_MOD_NAMESERVICE,nameservice)) -$(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas)) CONFIG_STYLE:= manual -TARGET_CFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC -D_GNU_SOURCE ALL_TARGET+= libs INSTALL_TARGET+= install_libs -MAKE_ENV+= OS="linux" NODEBUG=1 STRIP="true" OFLAGS="${TARGET_CFLAGS}" +MAKE_ENV+= OS="linux" DEBUG=0 STRIP="true" OFLAGS="${TARGET_CFLAGS}" prefix="/usr" post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_OLSRD}/usr/sbin ${IDIR_OLSRD}/etc diff --git a/package/olsrd/patches/patch-Makefile b/package/olsrd/patches/patch-Makefile deleted file mode 100644 index 1e0318707..000000000 --- a/package/olsrd/patches/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- olsrd-0.6.0.orig/Makefile 2010-05-13 12:52:55.000000000 +0200 -+++ olsrd-0.6.0/Makefile 2010-10-10 14:34:11.000000000 +0200 -@@ -144,7 +144,7 @@ rpm: - - # This is quite ugly but at least it works - ifeq ($(OS),linux) --SUBDIRS = $(notdir $(shell find lib -maxdepth 2 -name Makefile -not -path lib/Makefile -printf "%h\n"|sort)) -+SUBDIRS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo mini nameservice pgraph quagga secure tas txtinfo - else - ifeq ($(OS),win32) - SUBDIRS := dot_draw httpinfo mini pgraph secure txtinfo diff --git a/package/olsrd/patches/patch-make_Makefile_linux b/package/olsrd/patches/patch-make_Makefile_linux deleted file mode 100644 index d3ca1cdee..000000000 --- a/package/olsrd/patches/patch-make_Makefile_linux +++ /dev/null @@ -1,23 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- olsrd-0.6.0.orig/make/Makefile.linux 2010-03-31 19:03:53.000000000 +0200 -+++ olsrd-0.6.0/make/Makefile.linux 2010-10-10 14:34:11.000000000 +0200 -@@ -4,7 +4,7 @@ - - ARCH := $(shell uname -m) - DESTDIR ?= --LIBDIR = $(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) -+LIBDIR = $(DESTDIR)/usr/lib - - SRCS += $(wildcard src/linux/*.c src/unix/*.c) - HDRS += $(wildcard src/linux/*.h src/unix/*.h) -@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux -DLINUX_NETLINK_ROU - LIBS += - - PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) --INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig -n $(LIBDIR) -+INSTALL_LIB = install -d -m 755 $(LIBDIR); \ -+ install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); - - ifdef OLSRD_PLUGIN - GENERATE_PIC = true diff --git a/package/olsrd/patches/patch-src_unix_ifnet_c b/package/olsrd/patches/patch-src_unix_ifnet_c deleted file mode 100644 index 67705012b..000000000 --- a/package/olsrd/patches/patch-src_unix_ifnet_c +++ /dev/null @@ -1,13 +0,0 @@ ---- olsrd-0.6.0.orig/src/unix/ifnet.c 2010-04-22 17:11:11.000000000 +0200 -+++ olsrd-0.6.0/src/unix/ifnet.c 2010-10-10 14:34:54.000000000 +0200 -@@ -547,10 +547,8 @@ chk_if_up(struct olsr_if *iface, int deb - struct ifreq ifr; - union olsr_ip_addr null_addr; - size_t name_size; --#ifdef linux - int precedence = IPTOS_PREC(olsr_cnf->tos); - int tos_bits = IPTOS_TOS(olsr_cnf->tos); --#endif - - if (iface->host_emul) - return -1; diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index e3a5e4ac0..5f4073100 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openvpn PKG_VERSION:= 2.3.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 06e5f93dbf13f2c19647ca15ffc23ac1 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net/security @@ -14,9 +14,7 @@ PKG_DEPENDS:= kmod-tun ip PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ -PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS SERVER CLIENT -PKGFD_SERVER:= deliver server example configuration -PKGFD_CLIENT:= deliver client example configuration +PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS PKGFD_WITH_LZO:= enable LZO compression support PKGFS_WITH_LZO:= liblzo PKGFB_WITH_LZO:= liblzo @@ -77,13 +75,7 @@ CONFIGURE_ARGS+= --disable-plugins \ openvpn-install: ${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn ${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ -ifeq ($(ADK_PACKAGE_OPENVPN_SERVER),y) - $(CP) ./files/server.conf $(IDIR_OPENVPN)/etc/openvpn/ - echo "/etc/openvpn/server.conf" > ./files/openvpn.conffiles -endif -ifeq ($(ADK_PACKAGE_OPENVPN_CLIENT),y) - $(CP) ./files/client.conf $(IDIR_OPENVPN)/etc/openvpn/ - echo "/etc/openvpn/client.conf" > ./files/openvpn.conffiles -endif + $(CP) ./files/server.conf $(IDIR_OPENVPN)/etc/openvpn/server.conf.example + $(CP) ./files/client.conf $(IDIR_OPENVPN)/etc/openvpn/client.conf.example include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 4f656ea59..d256095f8 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ORBit2 PKG_VERSION:= 2.14.19 PKG_EXTRAVER:= 2.14 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9 PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker PKG_SECTION:= libs -PKG_BUILDDEP:= gettext-tiny glib-host libIDL-host libIDL +PKG_BUILDDEP:= gettext-tiny glib-host libIDL-host glib libIDL PKG_URL:= http://projects.gnome.org/ORBit2/ PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/ PKG_LIBNAME:= orbit2 @@ -21,8 +21,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CFLAGS_FOR_BUILD+= $(shell PATH=$(HOST_PATH) libIDL-config-2 --cflags) -LDFLAGS_FOR_BUILD+= $(shell PATH=$(HOST_PATH) libIDL-config-2 --libs) -LDFLAGS_FOR_BUILD+= -lgmodule-2.0 +LDFLAGS_FOR_BUILD+= -static +LIBS_FOR_BUILD:= $(shell PATH=$(HOST_PATH) libIDL-config-2 --libs) +LIBS_FOR_BUILD+= -lgmodule-2.0 -ldl -lpthread -lrt -lglib-2.0 +XAKE_FLAGS+= LIBS_FOR_BUILD="${LIBS_FOR_BUILD}" CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ ac_cv_alignof_CORBA_boolean=1 \ ac_cv_alignof_CORBA_char=1 \ diff --git a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in index ec73ef4f3..f46b6169b 100644 --- a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in +++ b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in @@ -1,5 +1,5 @@ --- ORBit2-2.14.19.orig/src/idl-compiler/Makefile.in 2010-09-28 11:39:39.000000000 +0200 -+++ ORBit2-2.14.19/src/idl-compiler/Makefile.in 2011-03-25 20:28:46.000000000 +0100 ++++ ORBit2-2.14.19/src/idl-compiler/Makefile.in 2014-03-15 20:45:12.000000000 +0100 @@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -43,3 +43,12 @@ orbit_idl_2_LDADD = \ $(ORBIT_IDL_LIBS) \ +@@ -383,7 +380,7 @@ clean-binPROGRAMS: + rm -f $$list + orbit-idl-2$(EXEEXT): $(orbit_idl_2_OBJECTS) $(orbit_idl_2_DEPENDENCIES) + @rm -f orbit-idl-2$(EXEEXT) +- $(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS) ++ $(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS) $(LIBS_FOR_BUILD) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/package/parted/Makefile b/package/parted/Makefile index 8223abe7b..97ea55df3 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= parted PKG_VERSION:= 3.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 5d89d64d94bcfefa9ce8f59f4b81bdcb PKG_DESCR:= partition table editor PKG_SECTION:= fs -PKG_DEPENDS:= libuuid libreadline libpthread libgcc +PKG_DEPENDS:= libblkid libuuid libreadline libpthread libgcc PKG_BUILDDEP:= util-linux readline PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} diff --git a/package/presentproto/Makefile b/package/presentproto/Makefile new file mode 100644 index 000000000..f3bb3b9ff --- /dev/null +++ b/package/presentproto/Makefile @@ -0,0 +1,19 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= presentproto +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 57eaf4bb58e86476ec89cfb42d675961 +PKG_DESCR:= present protocol headers +PKG_SECTION:= devel +PKG_SITES:= ${MASTER_SITE_XORG} +PKG_OPTS:= dev devonly + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PRESENTPROTO,presentproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile index 407f27fbf..fbd6341e5 100644 --- a/package/randrproto/Makefile +++ b/package/randrproto/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= randrproto -PKG_VERSION:= 1.3.2 +PKG_VERSION:= 1.4.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= b8fd2f75cf156c9f6e6771addd07ef59 +PKG_MD5SUM:= af44f250b89783eb4967f1dc5b32ef68 PKG_DESCR:= Xrandr protcol headers PKG_SECTION:= devel PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 9e5d2b3b1..e4d2bfe97 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xcb-proto -PKG_VERSION:= 1.8 +PKG_VERSION:= 1.10 PKG_RELEASE:= 1 PKG_DESCR:= XML-XCB protocol descriptions PKG_SECTION:= devel -PKG_MD5SUM:= 8d2cdb770129cef563088a90c5bec768 +PKG_MD5SUM:= 2b9dc6442156aba2bfb4133cb9d7cf46 PKG_BUILDDEP:= autotool bzip2-host python2-host xcb-proto-host PKG_SITES:= http://xcb.freedesktop.org/dist/ PKG_OPTS:= dev devonly diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile index 1c70d3956..368e75037 100644 --- a/package/xextproto/Makefile +++ b/package/xextproto/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xextproto -PKG_VERSION:= 7.2.1 +PKG_VERSION:= 7.3.0 PKG_RELEASE:= 1 PKG_DESCR:= X Protocol Extensions headers PKG_SECTION:= devel PKG_BUILDDEP:= xextproto-host -PKG_MD5SUM:= 9062d689f422fad1b8774c967d730f09 +PKG_MD5SUM:= 37b700baa8c8ea7964702d948dd13821 PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index cca9b2194..9b46c8f2f 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86-input-keyboard -PKG_VERSION:= 1.6.1 +PKG_VERSION:= 1.8.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= c2188611990880f06f7d6c2a7672af1b +PKG_MD5SUM:= 4f3e135e04939916f37f91a111c6f70b PKG_DESCR:= X11 driver for keyboard PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index f050696f6..0f1267fb4 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86-input-mouse -PKG_VERSION:= 1.7.2 +PKG_VERSION:= 1.9.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0f2f2dfb7b769544f04b3469803098a5 +PKG_MD5SUM:= 125402066940ef30737721243bb1b77e PKG_DESCR:= X11 driver for mouse PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile index 84c73e6bd..69540fc99 100644 --- a/package/xf86-video-siliconmotion/Makefile +++ b/package/xf86-video-siliconmotion/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86-video-siliconmotion -PKG_VERSION:= 1.7.6 +PKG_VERSION:= 1.7.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= b71859e15fc62563d346c7bccc0ef82e +PKG_MD5SUM:= 94c44123d8d0a46a7f6bace8508763d8 PKG_DESCR:= X11 driver for Silicon Motion VGA chips PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server @@ -21,6 +21,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,xf86-video-siliconmotion,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --disable-xaa + xf86-video-siliconmotion-install: ${INSTALL_DIR} ${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/siliconmotion_*.so \ diff --git a/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in b/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in new file mode 100644 index 000000000..141955000 --- /dev/null +++ b/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in @@ -0,0 +1,11 @@ +--- xf86-video-siliconmotion-1.7.7.orig/src/Makefile.in 2012-07-17 08:28:17.000000000 +0200 ++++ xf86-video-siliconmotion-1.7.7/src/Makefile.in 2014-03-14 18:09:06.901850694 +0100 +@@ -288,7 +288,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(PCIACCESS_CFLAGS) ++AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) + siliconmotion_drv_la_LTLIBRARIES = siliconmotion_drv.la + siliconmotion_drv_la_LDFLAGS = -module -avoid-version + siliconmotion_drv_ladir = @moduledir@/drivers diff --git a/package/xf86-video-siliconmotion/patches/patch-src_smi_driver_c b/package/xf86-video-siliconmotion/patches/patch-src_smi_driver_c new file mode 100644 index 000000000..eedd62fcc --- /dev/null +++ b/package/xf86-video-siliconmotion/patches/patch-src_smi_driver_c @@ -0,0 +1,11 @@ +--- xf86-video-siliconmotion-1.7.7.orig/src/smi_driver.c 2012-07-17 06:53:21.000000000 +0200 ++++ xf86-video-siliconmotion-1.7.7/src/smi_driver.c 2014-03-14 18:39:37.307139846 +0100 +@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL) + "Done writing mode. Register dump:\n"); + SMI_PrintRegs(pScrn); + +- miInitializeBackingStore(pScreen); +- + #ifdef HAVE_XMODES + xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset)); + #endif diff --git a/package/xf86-video-siliconmotion/patches/loongson.patch b/package/xf86-video-siliconmotion/patches/patch-src_smi_video_c index 2b9041516..e12a74839 100644 --- a/package/xf86-video-siliconmotion/patches/loongson.patch +++ b/package/xf86-video-siliconmotion/patches/patch-src_smi_video_c @@ -1,7 +1,6 @@ -diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotion-1.7.4-loongson/src/smi_video.c ---- xf86-video-siliconmotion-1.7.4/src/smi_video.c 2010-02-25 08:33:07.000000000 +0100 -+++ xf86-video-siliconmotion-1.7.4-loongson/src/smi_video.c 2012-03-13 04:18:18.634989344 +0100 -@@ -276,6 +276,7 @@ +--- xf86-video-siliconmotion-1.7.7.orig/src/smi_video.c 2012-07-17 06:53:21.000000000 +0200 ++++ xf86-video-siliconmotion-1.7.7/src/smi_video.c 2014-03-14 18:35:37.546382342 +0100 +@@ -275,6 +275,7 @@ static XF86ImageRec SMI_VideoImages[] = XVIMAGE_YUY2, XVIMAGE_YV12, XVIMAGE_I420, @@ -9,7 +8,7 @@ diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotio { FOURCC_RV15, /* id */ XvRGB, /* type */ -@@ -1464,6 +1465,117 @@ +@@ -1461,6 +1462,117 @@ SMI_QueryBestSize( LEAVE(); } @@ -127,7 +126,7 @@ diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotio static int SMI_PutImage( -@@ -1592,7 +1704,7 @@ +@@ -1592,7 +1704,7 @@ SMI_PutImage( offset3 = tmp; } nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top; diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index fef274746..4e3a33c91 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,19 +4,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 1.12.2 -PKG_RELEASE:= 3 -PKG_MD5SUM:= a95c896fbe8322c3c8d518a13eb74c7a +PKG_VERSION:= 1.15.0 +PKG_RELEASE:= 2 +PKG_MD5SUM:= faf04f1213f9a476997a774254b3abce PKG_DESCR:= Xorg server PKG_SECTION:= x11/server PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libgcc librt +PKG_DEPENDS+= libxshmfence libfreetype libfontenc PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto +PKG_BUILDDEP+= xineramaproto PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 @@ -28,7 +30,7 @@ PKG_ARCH_DEPENDS:= !m68k PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support -PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib +PKGFB_WITH_DRI:= xf86driproto glproto MesaLib PKGFD_WITH_KDRIVE:= Build Kdrive Xfbdev server PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO @@ -43,7 +45,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CPPFLAGS+= -D_GNU_SOURCE +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt @@ -57,9 +59,10 @@ CONFIGURE_ENV+= V=1 CONFIGURE_ARGS+= --enable-dga \ --enable-xorg \ --enable-xv \ - --enable-xaa \ --enable-vgahw \ --enable-dpms \ + --enable-xinerama \ + --disable-docs \ --disable-aiglx \ --disable-config-hal \ --disable-config-udev \ @@ -68,7 +71,6 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xf86bigfont \ --disable-xf86vidmode \ --disable-xfake \ - --disable-xinerama \ --disable-xnest \ --disable-xselinux \ --disable-xcsecurity \ @@ -85,9 +87,9 @@ CONFIGURE_ARGS+= --disable-kdrive --disable-xfbdev endif ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) -CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-glx +CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-dri3 --enable-glx else -CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-glx +CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-dri3 --disable-glx endif ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) @@ -117,10 +119,6 @@ ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y) ${CP} ./files/xorg.conf.sharp-zaurus \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf endif -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) - ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \ - $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions -endif # add m4 file to host directory $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal $(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \ diff --git a/package/xorg-server/files/xorg.conf.lemote-yeelong b/package/xorg-server/files/xorg.conf.lemote-yeelong index 042471020..c6204c590 100644 --- a/package/xorg-server/files/xorg.conf.lemote-yeelong +++ b/package/xorg-server/files/xorg.conf.lemote-yeelong @@ -12,13 +12,10 @@ Section "Module" Load "vgahw" Load "fb" Load "exa" - Load "xaa" Load "int10" Load "ddc" Load "i2c" Load "vbe" - Disable "glx" - Disable "dri" EndSection Section "Device" @@ -27,7 +24,7 @@ Section "Device" VendorName "Silicon Motion, Inc." BoardName "SM712 LynxEM+" BusID "PCI:0:8:0" - Option "AccelMethod" "XAA" + Option "AccelMethod" "EXA" Option "pci_burst" "true" Option "PanelSize" "1024x600" EndSection diff --git a/package/xorg-server/patches/patch-fb_fb_h b/package/xorg-server/patches/patch-fb_fb_h deleted file mode 100644 index 9118bec68..000000000 --- a/package/xorg-server/patches/patch-fb_fb_h +++ /dev/null @@ -1,13 +0,0 @@ - Fix for xf86-video-siliconmotion in 16bpp with XAA, see: - http://groups.google.com/group/loongson-dev/browse_thread/thread/570549e3d7894fef/5f04b3d9370adfd2 ---- xorg-server-1.12.2.orig/fb/fb.h 2012-05-29 22:04:19.000000000 +0200 -+++ xorg-server-1.12.2/fb/fb.h 2013-04-30 10:33:00.000000000 +0200 -@@ -70,7 +70,7 @@ - #define FBPREFIX(x) fb##x - #define WRITE(ptr, val) (*(ptr) = (val)) - #define READ(ptr) (*(ptr)) --#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size)) -+#define MEMCPY_WRAPPED(dst, src, size) memmove((dst), (src), (size)) - #define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size)) - - #endif diff --git a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c deleted file mode 100644 index 2a8477cb8..000000000 --- a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c +++ /dev/null @@ -1,13 +0,0 @@ ---- xorg-server-1.12.2.orig/hw/kdrive/linux/linux.c 2012-05-17 19:09:03.000000000 +0200 -+++ xorg-server-1.12.2/hw/kdrive/linux/linux.c 2013-12-22 20:10:03.000000000 +0100 -@@ -66,8 +66,8 @@ static void - LinuxCheckChown(char *file) - { - struct stat st; -- __uid_t u; -- __gid_t g; -+ uid_t u; -+ gid_t g; - - if (stat(file, &st) < 0) - return; diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h index 8a5f29ebd..3a0eb0dbb 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h +++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h @@ -1,58 +1,13 @@ ---- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h 2012-05-17 19:09:03.000000000 +0200 -+++ xorg-server-1.12.2/hw/xfree86/common/compiler.h 2013-04-30 10:52:21.000000000 +0200 -@@ -710,26 +710,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b - #define PORT_SIZE short - #endif - --_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ -+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */ - - static __inline__ void - outb(unsigned PORT_SIZE port, unsigned char val) - { -- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outw(unsigned PORT_SIZE port, unsigned short val) - { -- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outl(unsigned PORT_SIZE port, unsigned int val) - { -- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; +from alpinelinux + +--- xorg-server-1.15.0.orig/hw/xfree86/common/compiler.h 2013-12-15 08:48:09.000000000 +0100 ++++ xorg-server-1.15.0/hw/xfree86/common/compiler.h 2014-03-14 23:25:52.000000000 +0100 +@@ -995,7 +995,7 @@ inl(unsigned short port) + return xf86ReadMmio32Le((void *) ioBase, port); } -@@ -737,21 +737,21 @@ static __inline__ unsigned int - inb(unsigned PORT_SIZE port) - { - return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inw(unsigned PORT_SIZE port) - { - return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inl(unsigned PORT_SIZE port) - { - return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } +-#elif defined(__arm__) && defined(__linux__) ++#elif defined(__arm__) && defined(__GLIBC__) - #if defined(__mips__) + /* for Linux on ARM, we use the LIBC inx/outx routines */ + /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h deleted file mode 100644 index 0e3d1974a..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.7.5.orig/hw/xfree86/dri/dri.h 2009-08-11 06:00:23.000000000 +0200 -+++ xorg-server-1.7.5/hw/xfree86/dri/dri.h 2010-04-21 19:59:22.000000000 +0200 -@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include <pciaccess.h> - - #include "scrnintstr.h" --#include "xf86dri.h" -+#include <X11/dri/xf86dri.h> - - typedef int DRISyncType; - diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h deleted file mode 100644 index 6f45382eb..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.12.2.orig/hw/xfree86/dri/sarea.h 2012-05-17 19:09:03.000000000 +0200 -+++ xorg-server-1.12.2/hw/xfree86/dri/sarea.h 2013-04-30 10:33:00.000000000 +0200 -@@ -41,6 +41,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c deleted file mode 100644 index fd8fcfced..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c +++ /dev/null @@ -1,13 +0,0 @@ ---- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_init.c 2012-05-17 19:09:03.000000000 +0200 -+++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_init.c 2013-04-30 10:33:00.000000000 +0200 -@@ -75,8 +75,8 @@ xf86OpenConsole(void) - struct vt_mode VT; - struct vt_stat vts; - MessageType from = X_PROBED; -- char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL }; -- char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL }; -+ char *tty0[] = { "/dev/tty0", NULL }; -+ char *vcs[] = { "/dev/tty%d", NULL }; - - if (serverGeneration == 1) { - 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 deleted file mode 100644 index 4dbf01589..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ /dev/null @@ -1,56 +0,0 @@ ---- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-17 19:09:03.000000000 +0200 -+++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_video.c 2013-04-30 10:49:01.000000000 +0200 -@@ -472,7 +472,7 @@ unmapVidMem(int ScreenNum, pointer Base, - /* I/O Permissions section */ - /***************************************************************************/ - --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - volatile unsigned char *ioBase = NULL; - - #ifndef __NR_pciconfig_iobase -@@ -484,7 +484,7 @@ volatile unsigned char *ioBase = NULL; - Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; - #endif -@@ -492,8 +492,12 @@ xf86EnableIO(void) - if (ExtendedEnabled) - return TRUE; - --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) -+#ifdef __powerpc__ - ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0); -+#else -+ ioBase_phys = 0x1fd00000; -+#endif - - fd = open("/dev/mem", O_RDWR); - if (ioBase == NULL) { -@@ -511,7 +515,7 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); -@@ -537,10 +541,10 @@ xf86DisableIO(void) - { - if (!ExtendedEnabled) - return; --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - munmap(ioBase, 0x20000); - ioBase = NULL; --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) - iopl(0); - ioperm(0, 1024, 0); - #endif diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h index cd1c5c15c..2fa3bed60 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h @@ -1,14 +1,16 @@ ---- xorg-server-1.12.2.orig/hw/xfree86/os-support/xf86_OSlib.h 2012-05-17 19:09:03.000000000 +0200 -+++ xorg-server-1.12.2/hw/xfree86/os-support/xf86_OSlib.h 2013-10-29 15:23:18.000000000 +0100 -@@ -178,11 +178,7 @@ +--- xorg-server-1.15.0.orig/hw/xfree86/os-support/xf86_OSlib.h 2013-12-15 08:48:09.000000000 +0100 ++++ xorg-server-1.15.0/hw/xfree86/os-support/xf86_OSlib.h 2014-03-14 22:59:25.000000000 +0100 +@@ -177,12 +177,8 @@ + #include <stdlib.h> #include <sys/types.h> #include <assert.h> - +- -#ifdef __linux__ -#include <termio.h> -#else /* __GLIBC__ */ #include <termios.h> -#endif ++ #ifdef __sparc__ #include <sys/param.h> #endif diff --git a/package/xorg-server/patches/patch-ltmain_sh b/package/xorg-server/patches/patch-ltmain_sh deleted file mode 100644 index eedadf67e..000000000 --- a/package/xorg-server/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.12.2.orig/ltmain.sh 2012-05-29 22:06:05.000000000 +0200 -+++ xorg-server-1.12.2/ltmain.sh 2013-04-30 10:33:00.000000000 +0200 -@@ -5853,7 +5853,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile index fbbd16857..103ca9e7f 100644 --- a/package/xtrans/Makefile +++ b/package/xtrans/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xtrans -PKG_VERSION:= 1.2.6 +PKG_VERSION:= 1.3.3 PKG_RELEASE:= 1 PKG_DESCR:= X11 network protocol transport library PKG_SECTION:= devel PKG_BUILDDEP:= xtrans-host -PKG_MD5SUM:= b91dd22b77a350d129a81175cd8c58cc +PKG_MD5SUM:= c83d04cd878f1e51a44d132aa1d5b932 PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly |