summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/asterisk/Makefile1
-rw-r--r--package/bcm2835-firmware/Makefile4
-rw-r--r--package/bcm2835-vc/Makefile4
-rw-r--r--package/binutils/Makefile1
-rw-r--r--package/bluez/Makefile2
-rw-r--r--package/boost/Makefile12
-rw-r--r--package/bzip2/Makefile10
-rw-r--r--package/bzip2/patches/patch-Makefile-libbz2_so24
-rw-r--r--package/cairo/Makefile3
-rw-r--r--package/ccid/Makefile2
-rw-r--r--package/cifs-utils/Makefile3
-rw-r--r--package/classpath/Makefile2
-rw-r--r--package/conntrack-tools/Makefile1
-rw-r--r--package/cryptsetup/Makefile2
-rw-r--r--package/cxxtools/Makefile2
-rw-r--r--package/dansguardian/Makefile4
-rw-r--r--package/dbus-glib/Makefile2
-rw-r--r--package/dbus/Makefile39
-rw-r--r--package/digitemp/Makefile1
-rw-r--r--package/ebtables/Makefile2
-rw-r--r--package/eudev/Makefile48
-rw-r--r--package/ffmpeg/Makefile2
-rw-r--r--package/fluxbox/Makefile2
-rw-r--r--package/forked-daapd/Makefile2
-rw-r--r--package/gcc/Makefile2
-rw-r--r--package/gcc/patches/4.7.3/musl-cris.patch11
-rw-r--r--package/gconf/Makefile2
-rw-r--r--package/gdb/Makefile2
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c11
-rw-r--r--package/glib/patches/patch-gio_gnetworkmonitor_c11
-rw-r--r--package/glib/patches/patch-gio_gnetworkmonitornetlink_c10
-rw-r--r--package/huawei/Makefile2
-rw-r--r--package/iperf/Makefile2
-rw-r--r--package/iproute2/Makefile5
-rw-r--r--package/ipset/Makefile2
-rw-r--r--package/jamvm/Makefile2
-rw-r--r--package/kexec-tools/Makefile2
-rw-r--r--package/libcap/Makefile1
-rw-r--r--package/libcec/Makefile6
-rw-r--r--package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp11
-rw-r--r--package/libgcc/Makefile3
-rw-r--r--package/libglew/Makefile2
-rw-r--r--package/libssh/Makefile2
-rw-r--r--package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake29
-rw-r--r--package/libssh/patches/patch-include_libssh_libssh_h10
-rw-r--r--package/libstdcxx/Makefile4
-rw-r--r--package/libtorrent/Makefile11
-rw-r--r--package/libvirt/Makefile2
-rw-r--r--package/libvpx/Makefile2
-rw-r--r--package/llvm/Makefile8
-rw-r--r--package/log4cxx/Makefile2
-rw-r--r--package/miax/Makefile2
-rw-r--r--package/moc/Makefile7
-rw-r--r--package/moc/patches/patch-configure20
-rw-r--r--package/moc/patches/patch-ltmain_sh11
-rw-r--r--package/moc/patches/patch-options_c11
-rw-r--r--package/mozjs/Makefile6
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpfr/Makefile1
-rw-r--r--package/mrd6/Makefile2
-rw-r--r--package/nasm/Makefile11
-rw-r--r--package/nspr/Makefile2
-rw-r--r--package/nss/Makefile1
-rw-r--r--package/ntfs-3g/Makefile9
-rw-r--r--package/nut/Makefile2
-rw-r--r--package/obexftp/Makefile2
-rw-r--r--package/omxplayer/Makefile14
-rw-r--r--package/omxplayer/patches/patch-omxplayer29
-rw-r--r--package/openjdk7/Makefile5
-rw-r--r--package/openjdk7/patches/openadk.patch136
-rw-r--r--package/openobex/Makefile2
-rw-r--r--package/opensc/Makefile2
-rw-r--r--package/openswan/Makefile2
-rw-r--r--package/oprofile/Makefile2
-rw-r--r--package/orbit2/Makefile2
-rw-r--r--package/pcc-libs/Makefile2
-rw-r--r--package/pcc/Makefile2
-rw-r--r--package/pcsc-lite/Makefile2
-rw-r--r--package/php/Makefile1
-rw-r--r--package/polkit/Makefile12
-rw-r--r--package/polkit/patches/patch-configure_ac11
-rw-r--r--package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c31
-rw-r--r--package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c38
-rw-r--r--package/rdate/Makefile2
-rw-r--r--package/rdate/patches/patch-rdate_c10
-rw-r--r--package/rtorrent/Makefile11
-rw-r--r--package/rtorrent/patches/patch-configure41
-rw-r--r--package/rtorrent/patches/patch-configure_ac18
-rw-r--r--package/ruby-ldap/Makefile2
-rw-r--r--package/ruby/Makefile1
-rw-r--r--package/rxvt-unicode/Makefile2
-rw-r--r--package/samba/Makefile2
-rw-r--r--package/sane-backends/Makefile2
-rw-r--r--package/scsi-spin/Makefile2
-rw-r--r--package/scsi-spin/src/scsi-spin.c1
-rw-r--r--package/sispmctl/Makefile2
-rw-r--r--package/squid/Makefile2
-rw-r--r--package/strace/Makefile2
-rw-r--r--package/strace/src/linux/crisv10/syscallent.h1
-rw-r--r--package/strace/src/linux/crisv32/ioctlent.h.in1
-rw-r--r--package/strace/src/linux/crisv32/syscallent.h1
-rw-r--r--package/systemd/Makefile35
-rw-r--r--package/taglib/Makefile5
-rw-r--r--package/tntnet/Makefile2
-rw-r--r--package/twm/Makefile2
-rw-r--r--package/uclibc++/Makefile3
-rw-r--r--package/upower/Makefile10
-rw-r--r--package/usbutils/Makefile2
-rw-r--r--package/ussp-push/Makefile2
-rw-r--r--package/vlc/Makefile2
-rw-r--r--package/weechat/Makefile3
-rw-r--r--package/xbmc/Makefile47
-rw-r--r--package/xbmc/files/xbmc.init2
-rw-r--r--package/xbmc/patches/001-simplepm.patch144
-rw-r--r--package/xbmc/patches/002-defaultsutf8.patch42
-rw-r--r--package/xbmc/patches/patch-tools_Linux_xbmc_sh_in25
-rw-r--r--package/xf86-input-evdev/Makefile4
-rw-r--r--package/xf86-input-evtouch/Makefile2
-rw-r--r--package/xf86-input-keyboard/Makefile2
-rw-r--r--package/xf86-input-mouse/Makefile2
-rw-r--r--package/xf86-video-ati/Makefile4
-rw-r--r--package/xf86-video-cirrus/Makefile2
-rw-r--r--package/xf86-video-fbdev/Makefile2
-rw-r--r--package/xf86-video-intel/Makefile2
-rw-r--r--package/xf86-video-siliconmotion/Makefile2
-rw-r--r--package/xinit/Makefile2
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--package/xvinfo/Makefile2
-rw-r--r--package/yajl/Makefile4
-rw-r--r--package/yajl/patches/patch-CMakeLists_txt4
-rw-r--r--package/yajl/patches/patch-configure11
132 files changed, 730 insertions, 462 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 413744638..f436d9ef7 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -17,7 +17,6 @@ PKG_MULTI:= 1
PKG_NOPARALLEL:= 1
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !cris
PKG_LIBC_DEPENDS:= uclibc eglibc glibc
PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-firmware/Makefile
index 18f9a3197..a67d1a3ad 100644
--- a/package/bcm2835-firmware/Makefile
+++ b/package/bcm2835-firmware/Makefile
@@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= bcm2835-firmware
# actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014
-PKG_VERSION:= 0.5
+PKG_VERSION:= 0.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0de84bd4fe70b7767026aef5313dd868
+PKG_MD5SUM:= e4c1b8f3dd13ae8742a7831c19d212b0
PKG_DESCR:= firmware for raspberry pi (bcm2835)
PKG_SECTION:= base
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index f36b241d6..e19ddcc9c 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= bcm2835-vc
# actually f65a4eef05ee436976f9be219d3db841d3d6b8ec from 05.10.2013
PKG_VERSION:= 0.3
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 027d42d1ba803fabdc6bc4ec78d52e67
PKG_DESCR:= vc tools for raspberry pi (bcm2835)
PKG_SECTION:= base
@@ -27,7 +27,7 @@ do-configure:
bcm2835-vc-install:
$(INSTALL_DIR) ${IDIR_BCM2835_VC}/opt/vc/{bin,lib}
- $(CP) ${WRKINST}/opt/vc/lib/* ${IDIR_BCM2835_VC}/opt/vc/lib
+ $(CP) ${WRKINST}/opt/vc/lib/*so* ${IDIR_BCM2835_VC}/opt/vc/lib
$(CP) ${WRKINST}/opt/vc/bin/* ${IDIR_BCM2835_VC}/opt/vc/bin
# required for xbmc
(cd ${IDIR_BCM2835_VC}/opt/vc/lib && ln -sf libEGL.so libEGL.so.1)
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 3abf670cd..19b945f41 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -15,7 +15,6 @@ PKGSD_LIBBFD:= Binary File Descriptor library
PKGSC_LIBBFD:= libs
PKG_HOST_DEPENDS:= !cygwin
-PKG_ARCH_DEPENDS:= !avr32
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index e86eac36a..ec9024d81 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -15,8 +15,6 @@ PKG_URL:= http://www.bluez.org/
PKG_SITES:= http://mirror.anl.gov/pub/linux/bluetooth/
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !avr32
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/boost/Makefile b/package/boost/Makefile
index f204ccebe..d5f4325fc 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= boost
PKG_VERSION:= 1.55.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17
PKG_DESCR:= boost C++ library
PKG_SECTION:= libs
@@ -13,7 +13,7 @@ PKG_URL:= http://www.boost.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/}
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
DISTFILES:= boost_1_55_0.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}_1_55_0
@@ -97,6 +97,12 @@ ifeq (${ADK_PACKAGE_BOOST_WAVE},)
CONFIGURE_ARGS+=--without-wave
endif
+ifeq ($(ARCH),x86_64)
+BOOST_ARCH:= x86
+else
+BOOST_ARCH:= $(ARCH)
+endif
+
# some variables for build
GPP_PATH:= ${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
GPP_VERSION:= "`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
@@ -128,7 +134,7 @@ endif
-sBUILD=release \
-d 2 \
target-os=linux \
- architecture=$(CPU_ARCH) \
+ architecture=$(BOOST_ARCH) \
binary-format=elf \
toolset=gcc-${GPP_VERSION} \
--build-type=minimal \
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index a2cb7a709..5585ae0c1 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -34,8 +34,8 @@ $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_
HOST_STYLE:= manual
MAKE_FILE:= Makefile-libbz2_so
CONFIG_STYLE:= manual
-TARGET_CFLAGS+= -fPIC
-XAKE_FLAGS+= PREFIX=${WRKINST}/usr
+TARGET_CFLAGS+= -fPIC
+XAKE_FLAGS+= PREFIX=${WRKINST}/usr CROSS_COMPILE=1
INSTALL_STYLE:= manual
host-build:
@@ -55,9 +55,9 @@ libbz2-install:
$(CP) ${WRKBUILD}/libbz2.so* \
${IDIR_LIBBZ2}/usr/lib
$(CP) ${WRKBUILD}/libbz2.so* \
- ${STAGING_DIR}/usr/lib
- (cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
- $(CP) $(WRKBUILD)/bzlib.h $(STAGING_DIR)/usr/include
+ ${STAGING_TARGET_DIR}/usr/lib
+ (cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
+ $(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include
${INSTALL_DIR} $(IDIR_LIBBZ2_DEV)/usr/include
$(CP) $(WRKBUILD)/bzlib.h $(IDIR_LIBBZ2_DEV)/usr/include
diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so
index e71dab136..148c7562a 100644
--- a/package/bzip2/patches/patch-Makefile-libbz2_so
+++ b/package/bzip2/patches/patch-Makefile-libbz2_so
@@ -1,15 +1,33 @@
--- bzip2-1.0.6.orig/Makefile-libbz2_so 2010-09-11 01:07:52.000000000 +0200
-+++ bzip2-1.0.6/Makefile-libbz2_so 2013-07-30 14:15:29.000000000 +0200
-@@ -22,9 +22,10 @@
++++ bzip2-1.0.6/Makefile-libbz2_so 2014-01-13 21:51:20.000000000 +0100
+@@ -21,10 +21,18 @@
+ # ------------------------------------------------------------------
- SHELL=/bin/sh
+-SHELL=/bin/sh
-CC=gcc
++SHELL?=/bin/sh
+CC?=gcc
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+CFLAGS?=
+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
++OS=$(shell uname)
++LDOPT=-soname
++ifneq ($(CROSS_COMPILE),1)
++ifeq ($(OS),Darwin)
++LDOPT=-install_name
++endif
++endif
OBJS= blocksort.o \
huffman.o \
+@@ -35,7 +43,7 @@ OBJS= blocksort.o \
+ bzlib.o
+
+ all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
++ $(CC) -shared -Wl,$(LDOPT) -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+ rm -f libbz2.so.1.0
+ ln -s libbz2.so.1.0.6 libbz2.so.1.0
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 30894cab5..8b26cbfdb 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -30,9 +30,6 @@ $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
ifeq (,$(filter arm,$(TARGET_ARCH)))
TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS))
endif
-ifeq (,$(filter cris,$(TARGET_ARCH)))
-TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS))
-endif
CONFIGURE_ARGS+= --enable-ft=yes \
--enable-fc=yes \
--enable-tee=yes \
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
index 55c81fa12..ec48810ea 100644
--- a/package/ccid/Makefile
+++ b/package/ccid/Makefile
@@ -13,8 +13,6 @@ PKG_BUILDDEP:= pcsc-lite
PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html
PKG_SITES:= http://openadk.org/distfiles/
-PKG_ARCH_DEPENDS:= !avr32
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index 1abda4ba1..8c65f3de2 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= cifs-utils
PKG_VERSION:= 6.1
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= f83ef48ab1154aa74dd4cf1c1202bf04
PKG_DESCR:= CIFS utilities
PKG_SECTION:= net/fs
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+= --disable-cifsupcall \
--disable-cifsidmap \
--disable-cifsacl \
--disable-pie \
+ --without-libcap \
--disable-systemd
cifs-utils-install:
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index e63c84e7a..2f133cdef 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= http://www.gnu.org/software/classpath/home.html
PKG_SITES:= ${MASTER_SITE_GNU:=classpath/}
PKG_HOST_DEPENDS:= linux
-PKG_ARCH_DEPENDS:= !cris !arm
+PKG_ARCH_DEPENDS:= !arm
include $(TOPDIR)/mk/package.mk
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index 9032d3f06..22390a0a7 100644
--- a/package/conntrack-tools/Makefile
+++ b/package/conntrack-tools/Makefile
@@ -15,7 +15,6 @@ PKG_URL:= http://conntrack-tools.netfilter.org/
PKG_SITES:= http://www.netfilter.org/projects/conntrack-tools/files/
PKG_LIBC_DEPENDS:= uclibc eglibc glibc
-PKG_ARCH_DEPENDS:= !avr32
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index bf71f5a43..1e0eaca25 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -17,8 +17,6 @@ PKG_URL:= http://cryptsetup.googlecode.com/
PKG_SITES:= http://cryptsetup.googlecode.com/files/
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !cris
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 03a6bc4d3..5bfc15998 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -16,7 +16,7 @@ PKG_NEED_CXX:= 1
PKG_CXX:= CXXTOOLS
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !arm !avr32 !m68k
+PKG_ARCH_DEPENDS:= !arm !m68k
include ${TOPDIR}/mk/package.mk
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index ab62c232f..711bf0edb 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -23,12 +23,8 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
-ifeq ($(ADK_LINUX_AVR32),y)
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
-else
LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s
endif
-endif
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile
index 3ad006afa..6a54abcd9 100644
--- a/package/dbus-glib/Makefile
+++ b/package/dbus-glib/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= ad0920c7e3aad669163bb59171cf138e
PKG_DESCR:= DBUS glib bindings
PKG_SECTION:= libs
-PKG_DEPENDS:= dbus glib
+PKG_DEPENDS:= libdbus glib
PKG_BUILDDEP:= dbus glib
PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings
PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-glib/
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 7f7f5707f..bb06e25d4 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -4,36 +4,45 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dbus
-PKG_VERSION:= 1.6.12
+PKG_VERSION:= 1.6.18
PKG_RELEASE:= 2
-PKG_MD5SUM:= a70edc50524f258eaf5c9a9994ed8748
-PKG_DESCR:= DBUS library and daemon
-PKG_SECTION:= libs
-PKG_DEPENDS:= libexpat libx11 libuuid
-PKG_BUILDDEP:= expat libX11 util-linux
+PKG_MD5SUM:= b02e9c95027a416987b81f9893831061
+PKG_DESCR:= DBUS daemon
+PKG_SECTION:= misc
+PKG_DEPENDS:= libdbus
+PKG_BUILDDEP:= expat util-linux
PKG_URL:= http://dbus.freedesktop.org/
PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/
+PKG_LIBNAME:= libdbus
PKG_OPTS:= dev
+PKG_SUBPKGS:= DBUS LIBDBUS
+PKGSD_LIBDBUS:= DBUS library
+PKGSC_LIBDBUS:= libs
+PKGSS_LIBDBUS:= libexpat libuuid
+
ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
+PKG_OPTS+= libmix
endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBDBUS},${PKGSD_LIBDBUS},${PKGSC_LIBDBUS},${PKG_OPTS}))
TARGET_LDFLAGS+= -luuid
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-tests \
--disable-abstract-sockets \
--enable-checks \
+ --disable-verbose-mode \
--with-xml=expat \
--with-session-socket-dir=/var/tmp \
--disable-dnotify \
--disable-kqueue \
+ --disable-systemd \
--disable-xml-docs \
- --with-x \
+ --without-x \
--disable-doxygen-docs
CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no
@@ -42,11 +51,16 @@ pre-install:
$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
$(STAGING_DIR)/usr/include/dbus-1.0/dbus
+libdbus-install:
+ ${INSTALL_DIR} ${IDIR_LIBDBUS}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_LIBDBUS}/usr/lib
+
dbus-install:
- ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
- ${IDIR_DBUS}/usr/bin
+ ${INSTALL_DIR} ${IDIR_DBUS}/etc \
+ ${IDIR_DBUS}/usr/bin ${IDIR_DBUS}/usr/libexec
+ ${INSTALL_BIN} ${WRKINST}/usr/libexec/dbus-daemon-launch-helper \
+ ${IDIR_DBUS}/usr/libexec/
${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc
- ${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin
@@ -57,5 +71,4 @@ dbus-install:
$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
$(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index a7309e882..c5968a420 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -15,7 +15,6 @@ PKG_URL:= http://www.digitemp.com/software/linux/
PKG_SITES:= http://www.digitemp.com/software/linux/
PKG_LIBC_DEPENDS:= uclibc eglibc glibc
-PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 4e1665196..59f2ea6ba 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:= firewall
PKG_URL:= http://ebtables.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ebtables/}
-PKG_ARCH_DEPENDS:= !avr32
-
DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}-4.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-4
diff --git a/package/eudev/Makefile b/package/eudev/Makefile
new file mode 100644
index 000000000..13f8c1b20
--- /dev/null
+++ b/package/eudev/Makefile
@@ -0,0 +1,48 @@
+# 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:= eudev
+PKG_VERSION:= 1.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 164df78f6f0093578a20bdd00335845f
+PKG_DESCR:= udev device manager
+PKG_SECTION:= utils
+PKG_URL:= http://www.gentoo.org/proj/en/eudev/
+PKG_SITES:= http://dev.gentoo.org/~blueness/eudev/
+PKG_LIBNAME:= libudev
+PKG_OPTS:= dev
+
+PKG_SUBPKGS:= UDEV LIBUDEV LIBGUDEV
+PKGSC_LIBGUDEV:= libs
+PKGSD_LIBGUDEV:= GUDEV library
+PKGSC_LIBUDEV:= libs
+PKGSD_LIBUDEV:= UDEV library
+PKGSD_UDEV:= Dynamic device management subsystem
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_ARGS+= --disable-manpages \
+ --disable-gtk-doc
+
+udev-install:
+ ${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
+ ${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
+ ${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
+ ${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
+ ${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
+
+libudev-install:
+ ${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
+
+libgudev-install:
+ ${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index d8211aedb..d82f9d643 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:= http://www.ffmpeg.org/releases/
PKH_LIBNAME:= libffmpeg
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !avr32 !cris !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG
#PKGSD_FFPLAY:= ffmpeg based video player
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index ea8ee6338..eb0663b99 100644
--- a/package/fluxbox/Makefile
+++ b/package/fluxbox/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:= libXpm libXft
PKG_URL:= http://www.fluxbox.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
-PKG_ARCH_DEPENDS:= !avr32
-
PKG_FLAVOURS_FLUXBOX:= WITH_IMLIB2
PKGFD_WITH_IMLIB2:= enable imlib2 support
PKGFS_WITH_IMLIB2:= imlib2
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index d9a58ce87..5b727c004 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -18,7 +18,7 @@ PKG_SITES:= http://alioth.debian.org/~jblache/forked-daapd/
PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER@
PKG_CFLINE_FORKED_DAAPD+= depends on ADK_BROKEN@
-PKG_ARCH_DEPENDS:= !ppc !avr32
+PKG_ARCH_DEPENDS:= !ppc
# gperf problem
PKG_HOST_DEPENDS:= !freebsd
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index e05f5c060..06a2daf3a 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -11,8 +11,6 @@ PKG_OPTS:= noremove
PKG_DEPENDS:= libmpc libgmp mpfr libgcc
PKG_BUILDDEP:= libmpc gmp mpfr
-PKG_ARCH_DEPENDS:= !avr32
-
PKG_SUBPKGS:= GCC GXX
PKGSD_GXX:= GNU C++ compiler
diff --git a/package/gcc/patches/4.7.3/musl-cris.patch b/package/gcc/patches/4.7.3/musl-cris.patch
deleted file mode 100644
index 4889263a1..000000000
--- a/package/gcc/patches/4.7.3/musl-cris.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur gcc-4.7.3.orig/gcc/config/cris/linux.h gcc-4.7.3/gcc/config/cris/linux.h
---- gcc-4.7.3.orig/gcc/config/cris/linux.h 2011-04-11 20:46:05.000000000 +0200
-+++ gcc-4.7.3/gcc/config/cris/linux.h 2013-10-11 10:01:51.000000000 +0200
-@@ -104,6 +104,7 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-cris.1"
-
- #undef CRIS_LINK_SUBTARGET_SPEC
- #define CRIS_LINK_SUBTARGET_SPEC \
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index dfed4551a..38a14e6c0 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -17,7 +17,7 @@ PKG_SITES:= ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
PKG_LIBNAME:= gconf
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !arm !cris
+PKG_ARCH_DEPENDS:= !arm
include $(TOPDIR)/mk/package.mk
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 61d564be7..8128e8bd5 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -11,7 +11,7 @@ PKG_DEPENDS:= libthread-db libncurses libexpat libgcc zlib
PKG_BUILDDEP:= ncurses readline libiconv-tiny expat zlib
PKG_NOPARALLEL:= 1
-PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
include ${TOPDIR}/mk/package.mk
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 71de5e559..d77558eb6 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -9,7 +9,7 @@ PKG_DESCR:= GNU debugger (small server)
PKG_SECTION:= debug
PKG_DEPENDS:= libthread-db
-PKG_ARCH_DEPENDS:= !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_LIBC_DEPENDS:= uclibc eglibc glibc
PKG_SUBPKGS:= GDBSERVER
diff --git a/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c b/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c
deleted file mode 100644
index e500d6642..000000000
--- a/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdb-7.1.orig/gdb/gdbserver/linux-cris-low.c
-+++ gdb-7.1/gdb/gdbserver/linux-cris-low.c
-@@ -62,7 +62,7 @@
- extern int debug_threads;
-
- static CORE_ADDR
--cris_get_pc (struct regcache *regcache, void)
-+cris_get_pc (struct regcache *regcache)
- {
- unsigned long pc;
- collect_register_by_name (regcache, "pc", &pc);
diff --git a/package/glib/patches/patch-gio_gnetworkmonitor_c b/package/glib/patches/patch-gio_gnetworkmonitor_c
new file mode 100644
index 000000000..dc3964c3e
--- /dev/null
+++ b/package/glib/patches/patch-gio_gnetworkmonitor_c
@@ -0,0 +1,11 @@
+--- glib-2.38.2.orig/gio/gnetworkmonitor.c 2013-10-25 17:58:38.000000000 +0200
++++ glib-2.38.2/gio/gnetworkmonitor.c 2014-01-10 19:31:33.528843420 +0100
+@@ -18,6 +18,8 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include <string.h>
++
+ #include "config.h"
+ #include "glib.h"
+ #include "glibintl.h"
diff --git a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c
new file mode 100644
index 000000000..25cc24711
--- /dev/null
+++ b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c
@@ -0,0 +1,10 @@
+--- glib-2.38.2.orig/gio/gnetworkmonitornetlink.c 2013-11-12 06:30:22.000000000 +0100
++++ glib-2.38.2/gio/gnetworkmonitornetlink.c 2014-01-10 19:31:44.888881617 +0100
+@@ -20,6 +20,7 @@
+
+ #include "config.h"
+
++#include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
+
diff --git a/package/huawei/Makefile b/package/huawei/Makefile
index 4dedad02f..d85bc130d 100644
--- a/package/huawei/Makefile
+++ b/package/huawei/Makefile
@@ -11,8 +11,6 @@ PKG_SECTION:= utils
PKG_DEPENDS:= libusb libusb-compat
PKG_BUILDDEP:= libusb libusb-compat
-PKG_ARCH_DEPENDS:= !avr32
-
NO_DISTFILES:= 1
include $(TOPDIR)/mk/package.mk
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 3fc3b03f5..d867dd210 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -15,8 +15,6 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/}
PKG_NEED_CXX:= 1
PKG_CXX:= IPERF
-PKG_ARCH_DEPENDS:= !avr32
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 33c33f7e7..a20bfd0a6 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= iproute2
PKG_VERSION:= 3.12.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f87386aaaecafab95607fd10e8152c68
PKG_DESCR:= iproute2 routing control utility
PKG_SECTION:= route
@@ -46,8 +46,7 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK
CONFIG_STYLE:= minimal
TARGET_CFLAGS+= -D_GNU_SOURCE
-XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" \
- CFLAGS_FOR_BUILD+="-I${LINUX_DIR}/include"
+XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\""
CONFIGURE_ENV+= CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
ip-install:
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 741f3ab06..34fea7f21 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= firewall
PKG_URL:= http://ipset.netfilter.org/
PKG_SITES:= http://ipset.netfilter.org/
-PKG_ARCH_DEPENDS:= !arm !avr32
+PKG_ARCH_DEPENDS:= !arm
PKG_CFLINE_IPSET:= depends on !ADK_TOOLCHAIN_ONLY
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6cca7f5d8..6d21b6311 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= libffi zlib
PKG_URL:= http://jamvm.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
-PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
include ${TOPDIR}/mk/package.mk
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 7f6332a3f..3ea6904d2 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDEP:= zlib
PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/
PKG_SITES:= http://kernel.org/pub/linux/utils/kernel/kexec/
-PKG_ARCH_DEPENDS:= !cris !avr32 !mips !m68k
+PKG_ARCH_DEPENDS:= !mips !m68k
PKG_CFLINE_KEXEC_TOOLS:= select ADK_KERNEL_KEXEC
include $(TOPDIR)/mk/package.mk
diff --git a/package/libcap/Makefile b/package/libcap/Makefile
index 1d0f8154a..5c5f4edcf 100644
--- a/package/libcap/Makefile
+++ b/package/libcap/Makefile
@@ -20,6 +20,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+CPPFLAGS_FOR_BUILD+= -I$(STAGING_TARGET_DIR)/usr/include
CONFIG_STYLE:= manual
libcap-install:
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index e085df139..dcf6e2580 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -14,7 +14,9 @@ PKG_URL:= http://libcec.pulse-eight.com/
PKG_SITES:= http://www.openadk.org/distfiles
PKG_OPTS:= dev
-PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc
+PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc
+PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40
PKG_LIBC_DEPENDS:= eglibc glibc musl
include $(TOPDIR)/mk/package.mk
@@ -22,9 +24,11 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBCEC,libcec,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
AUTOTOOL_STYLE:= autoreconf
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
CONFIGURE_ARGS+= --enable-rpi \
--with-rpi-include-path=$(STAGING_TARGET_DIR)/opt/vc/include \
--with-rpi-lib-path=$(STAGING_TARGET_DIR)/opt/vc/lib
+endif
libcec-install:
$(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib
diff --git a/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp
new file mode 100644
index 000000000..e677a0d22
--- /dev/null
+++ b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp
@@ -0,0 +1,11 @@
+--- libcec-2.1.4.orig/src/lib/platform/posix/serialport.cpp 2013-12-15 12:48:14.000000000 +0100
++++ libcec-2.1.4/src/lib/platform/posix/serialport.cpp 2014-01-12 22:04:41.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include "lib/platform/util/baudrate.h"
+ #include "lib/platform/posix/os-socket.h"
+
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || !defined(__GLIBC__)
+ #ifndef XCASE
+ #define XCASE 0
+ #endif
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 5f303bd71..28f277f8d 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -7,12 +7,9 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc
PKG_NAME:= libgcc
PKG_DESCR:= GCC library
PKG_SECTION:= libs
-#PKG_DFLT_LIBGCC:= y if !ADK_TOOLCHAIN_ONLY
NO_DISTFILES:= 1
-PKG_ARCH_DEPENDS:= !avr32
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGCC,libgcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libglew/Makefile b/package/libglew/Makefile
index d6aed4f12..8fd346821 100644
--- a/package/libglew/Makefile
+++ b/package/libglew/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBGLEW,libglew,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
-XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr'
+XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr' SYSTEMS=linux
libglew-install:
$(INSTALL_DIR) $(IDIR_LIBGLEW)/usr/lib
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 8d7b455fb..997e78895 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -23,7 +23,7 @@ WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj
CONFIG_STYLE:= manual
do-configure:
- (cd $(WRKBUILD) && PATH='${TARGET_PATH}' \
+ (cd $(WRKBUILD) && PATH='${HOST_PATH}' \
cmake -DCMAKE_SYSTEM_NAME=Linux \
-DCMAKE_INSTALL_PREFIX=/usr \
-DOPENSSL_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' \
diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
new file mode 100644
index 000000000..9a140e652
--- /dev/null
+++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
@@ -0,0 +1,29 @@
+--- 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
+@@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
+ NAMES
+ zlib.h
+ PATHS
++ ${ZLIB_ROOT_DIR}/include
+ /usr/local/include
+ /opt/local/include
+ /sw/include
+ /usr/lib/sfw/include
+- ${ZLIB_ROOT_DIR}/include
+ )
+ mark_as_advanced(ZLIB_INCLUDE_DIR)
+
+@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
+ zlib
+ zlib1
+ PATHS
++ ${ZLIB_ROOT_DIR}/lib
+ /usr/local/lib
+ /opt/local/lib
+ /sw/lib
+ /usr/sfw/lib/64
+ /usr/sfw/lib
+- ${ZLIB_ROOT_DIR}/lib
+ )
+ mark_as_advanced(ZLIB_LIBRARY)
+
diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h
new file mode 100644
index 000000000..8811f79fb
--- /dev/null
+++ b/package/libssh/patches/patch-include_libssh_libssh_h
@@ -0,0 +1,10 @@
+--- 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 @@
+ typedef unsigned long long uint64_t;
+ typedef int mode_t;
+ #else /* _MSC_VER */
++ #include <sys/types.h>
+ #include <unistd.h>
+ #include <inttypes.h>
+ #endif /* _MSC_VER */
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 45c1edfc4..5c6cc2b2f 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -16,15 +16,11 @@ endif
endif
endif
-ifeq ($(ADK_LINUX_AVR32),y)
-LIBSTDCXX_VER:= 13
-else
ifeq ($(ADK_LINUX_MICROBLAZE),y)
LIBSTDCXX_VER:= 18
else
LIBSTDCXX_VER:= 17
endif
-endif
PKG_NAME:= libstdcxx
PKG_DESCR:= C++ support library
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index bbcada2f6..fc4a051a3 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libtorrent
-PKG_VERSION:= 0.13.0
-PKG_RELEASE:= 2
-PKG_MD5SUM:= d499178f72010d5067a77f41fa1a1505
+PKG_VERSION:= 0.13.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 96c0b81501357df402ab592f59ecaeab
PKG_DESCR:= A bittorrent library
PKG_SECTION:= libs
PKG_DEPENDS:= libopenssl libsigc++
@@ -15,13 +15,12 @@ PKG_URL:= http://libtorrent.rakshasa.no/
PKG_SITES:= http://libtorrent.rakshasa.no/downloads/
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !avr32
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-CONFIGURE_ARGS+= --enable-aligned
+CONFIGURE_ARGS+= --enable-aligned \
+ --without-kqueue
libtorrent-install:
${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index a6c593f19..9b76da0b9 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= 3d9f85d586c9aa3d819b626622f3fc97
PKG_DESCR:= virtualization API
PKG_SECTION:= libs
-PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted systemd
+PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted eudev
PKG_DEPENDS:= libxml2 libgnutls python2 libpcap libreadline
PKG_DEPENDS+= dmidecode kmod-netfilter-xt-target-checksum
PKG_DEPENDS+= dnsmasq qemu libnl libudev
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
index 97dec8bcb..5f73e56b9 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -14,7 +14,7 @@ PKG_URL:= http://www.webmproject.org/about/
PKG_SITES:= http://webm.googlecode.com/files/
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}.tar.bz2
WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}
diff --git a/package/llvm/Makefile b/package/llvm/Makefile
index 10a00d7bd..2375e092c 100644
--- a/package/llvm/Makefile
+++ b/package/llvm/Makefile
@@ -4,20 +4,20 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= llvm
-PKG_VERSION:= 3.3
+PKG_VERSION:= 3.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 40564e1dc390f9844f1711c08b08e391
+PKG_MD5SUM:= 46ed668a1ce38985120dbf6344cf6116
PKG_DESCR:= collection of modular and reusable compiler and toolchain technologies
PKG_SECTION:= lang
PKG_URL:= http://llvm.org/
-PKG_SITES:= http://llvm.org/releases/3.3/
+PKG_SITES:= http://llvm.org/releases/3.4/
PKG_LIBC_DEPENDS:= eglibc glibc musl
PKG_HOST_DEPENDS:= !darwin
PKG_ARCH_DEPENDS:= mips x86 x86_64 arm
+PKG_CFLINE_LLVM:= depends on ADK_BROKEN
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.src.tar.gz
-WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.src
include $(TOPDIR)/mk/package.mk
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
index d34d8a2f0..fd2dedb70 100644
--- a/package/log4cxx/Makefile
+++ b/package/log4cxx/Makefile
@@ -18,8 +18,6 @@ PKG_OPTS:= dev
DISTFILES:= apache-${PKG_NAME}-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/apache-${PKG_NAME}-${PKG_VERSION}
-PKG_ARCH_DEPENDS:= !cris
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LOG4CXX,log4cxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/miax/Makefile b/package/miax/Makefile
index bd7c9de30..675c1f6b7 100644
--- a/package/miax/Makefile
+++ b/package/miax/Makefile
@@ -14,8 +14,6 @@ PKG_URL:= http://sourceforge.net/projects/miax
PKG_SITES:= http://mesh.dl.sourceforge.net/sourceforge/miax/
PKG_CFLINE_MIAX:= depends on ADK_BROKEN
-PKG_ARCH_DEPENDS:= !avr32
-
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}
diff --git a/package/moc/Makefile b/package/moc/Makefile
index a5849b1de..11bc9243c 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -4,15 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= moc
-PKG_VERSION:= 2.5.0-alpha4
+PKG_VERSION:= 2.5.0-beta1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0
+PKG_MD5SUM:= 795ecba86847e082aa2f21937cc04804
PKG_DESCR:= console music player
PKG_SECTION:= multimedia
PKG_DEPENDS:= libmad libvorbis libcurl libflac
PKG_DEPENDS+= libncurses libid3tag
PKG_BUILDDEP:= ncurses libvorbis curl libmad flac libiconv-tiny
-PKG_BUILDDEP+= libid3tag db
+PKG_BUILDDEP+= libid3tag db libtool
PKG_URL:= http://moc.daper.net/
PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/unstable/
@@ -22,6 +22,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MOC,moc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_LDFLAGS+= -ltinfo
CONFIGURE_ARGS+= --without-jack \
--without-oss \
--without-musepack \
diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure
deleted file mode 100644
index 2330e0f4c..000000000
--- a/package/moc/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- moc-2.5.0-alpha4.orig/configure 2009-09-25 10:54:41.000000000 +0200
-+++ moc-2.5.0-alpha4/configure 2010-03-06 11:37:45.867276809 +0100
-@@ -17669,7 +17669,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
- PLUGIN_LDFLAGS='-module -avoid-version'
-
-
--OS=`uname 2>/dev/null`
-+OS=Linux
-
- case "$OS" in
- Linux)
-@@ -17688,7 +17688,7 @@ _ACEOF
- ;;
- esac
-
--LDFLAGS="$LDFLAGS -export-dynamic"
-+LDFLAGS="$LDFLAGS"
-
- { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
diff --git a/package/moc/patches/patch-ltmain_sh b/package/moc/patches/patch-ltmain_sh
deleted file mode 100644
index b9a79ecd3..000000000
--- a/package/moc/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- moc-2.5.0-alpha4.orig/ltmain.sh 2009-09-25 10:57:23.000000000 +0200
-+++ moc-2.5.0-alpha4/ltmain.sh 2011-01-16 00:22:15.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/moc/patches/patch-options_c b/package/moc/patches/patch-options_c
deleted file mode 100644
index b5e9ca676..000000000
--- a/package/moc/patches/patch-options_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- moc-2.5.0-alpha4.orig/options.c 2009-09-16 12:04:53.000000000 +0200
-+++ moc-2.5.0-alpha4/options.c 2010-03-06 11:38:50.596035001 +0100
-@@ -327,7 +327,7 @@ static void option_add_symb (const char
- char *val = va_arg (va, char *);
- if (strlen (val) == 0 ||
- strlen (val) != strspn (val, valid) ||
-- index (first, val[0]) != NULL)
-+ strchr (first, val[0]) != NULL)
- fatal ("Invalid symbol in '%s' constraint list.", name);
- ((char **) options[pos].constraints)[ix] = xstrdup (val);
- if (!strcasecmp (val, value))
diff --git a/package/mozjs/Makefile b/package/mozjs/Makefile
index c5e41f489..3d08b64cf 100644
--- a/package/mozjs/Makefile
+++ b/package/mozjs/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= mozjs
PKG_VERSION:= 17.0.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 20b6f8f1140ef6e47daa3b16965c9202
PKG_DESCR:= javascript library
PKG_SECTION:= libs
@@ -21,7 +21,9 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,MOZJS,mozjs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-CONFIGURE_ENV+= HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" HOST_CXX="${CXX_FOR_BUILD}"
+CONFIGURE_ENV+= HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}"
+CONFIGURE_ENV+= HOST_LDFLAGS="${LDFLAGS_FOR_BUILD}"
+CONFIGURE_ENV+= HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" HOST_CXX="${CXX_FOR_BUILD}"
CONFIGURE_ARGS+= --disable-optimize \
--with-system-nspr
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index aa227c4ec..684c08f27 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -16,7 +16,7 @@ PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index 00508ce69..41647e0bf 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -7,6 +7,7 @@ include ${TOPDIR}/toolchain/mpfr/Makefile.inc
PKG_NAME:= mpfr
PKG_DESCR:= multi precision library
PKG_SECTION:= libs
+PKG_BUILDDEP:= gmp
PKG_URL:= http://www.mpfr.org/
PKG_OPTS:= dev
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 909a7359a..46f7595c5 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -14,8 +14,6 @@ PKG_SITES:= http://www.openadk.org/distfiles/
PKG_NEED_CXX:= 1
PKG_CXX:= MRD6
-PKG_ARCH_DEPENDS:= !avr32
-
WRKBUILD= ${WRKSRC}/src
include ${TOPDIR}/mk/package.mk
diff --git a/package/nasm/Makefile b/package/nasm/Makefile
index 93e50f36b..39e451a70 100644
--- a/package/nasm/Makefile
+++ b/package/nasm/Makefile
@@ -4,23 +4,28 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= nasm
-PKG_VERSION:= 2.07
+PKG_VERSION:= 2.11
PKG_RELEASE:= 1
-PKG_MD5SUM:= 84d8e009b3d2565a810ab3ddad1f4f63
+PKG_MD5SUM:= a884450ee65201473af4d270bdc132f8
PKG_DESCR:= the netwide assembler
PKG_SECTION:= lang
+PKG_BUILDDEP:= nasm-host
PKG_URL:= http://sourceforge.net/projects/nasm/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nasm/nasm%20sources/2.07/}
+PKG_SITES:= http://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
FAKE_FLAGS+= INSTALLROOT=${WRKINST}
+HOST_STYLE:= auto
nasm-install:
$(INSTALL_DIR) $(IDIR_NASM)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/nasm \
$(IDIR_NASM)/usr/bin
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index 33063d67f..102b2c017 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -13,8 +13,6 @@ PKG_URL:= http://www.mozilla.org/projects/nspr/
PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKG_VERSION}/src/
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !cris
-
WRKSRC= ${WRKDIST}/nspr
include $(TOPDIR)/mk/package.mk
diff --git a/package/nss/Makefile b/package/nss/Makefile
index ffffc69e1..868dd5d4d 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -20,7 +20,6 @@ PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${P
PKG_NOPARALLEL:= 1
PKG_HOST_DEPENDS:= !cygwin
-PKG_ARCH_DEPENDS:= !cris
WRKSRC= ${WRKDIST}/nss
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 6f65db548..5151bfd21 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -4,16 +4,17 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= ntfs-3g
-PKG_VERSION:= 2010.1.16
+PKG_VERSION:= 2013.1.13
PKG_RELEASE:= 1
-PKG_MD5SUM:= e104c914e8d7d29ee83e63d46afbba25
+PKG_MD5SUM:= 2d6fb47ddf62b51733227126fe9227fe
PKG_DESCR:= ntfs filesystem driver
-PKG_SECTION:= kernel
+PKG_SECTION:= fs
PKG_DEPENDS:= kmod-fuse-fs
PKG_URL:= http://tuxera.com
PKG_SITES:= http://tuxera.com/opensource/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
+DISTFILES:= ${PKG_NAME}_ntfsprogs-${PKG_VERSION}.tgz
+WRKDIST= ${WRKDIR}/${PKG_NAME}_ntfsprogs-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 655b93e51..cfee356fc 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:= net/misc
PKG_URL:= http://www.networkupstools.org/
PKG_SITES:= http://www.networkupstools.org/source/2.4/
-PKG_ARCH_DEPENDS:= !avr32
-
PKG_FLAVOURS_NUT:= WITH_SSL WITH_SNMP WITH_USB
PKGFD_WITH_SNMP:= enable SNMP support
PKGFS_WITH_SNMP:= libnetsnmp
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index 828d73871..0aaff10ff 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -20,8 +20,6 @@ PKG_SUBPKGS:= OBEXFTP LIBOBEXFTP
PKGSC_LIBOBEXFTP:= libs
PKGSD_LIBOBEXFTP:= obex ftp library
-PKG_ARCH_DEPENDS:= !avr32
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
ifeq ($(ADK_STATIC),y)
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index b40db3674..a4da71aef 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -4,14 +4,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= omxplayer
-# actually 5777879e9ee26f3e7c4e8746e07824ade629f152 from 4.10.2013
-PKG_VERSION:= 0.2
+# actually d1a4a0e1030249e40e2e9bb04518f1b786b18488 from 7.01.2014
+PKG_VERSION:= 0.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= c1fddbafb837fe6fa50270d7d1ece6cb
+PKG_MD5SUM:= 1882cac6032baa59291068af30df1702
PKG_DESCR:= video player for raspberry pi
PKG_SECTION:= multimedia
PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre
-PKG_DEPENDS+= librt zlib libpthread libstdcxx libgcc dbus
+PKG_DEPENDS+= librt zlib libpthread libstdcxx libgcc libdbus
PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus
PKG_URL:= https://github.com/popcornmix/omxplayer
PKG_SITES:= http://openadk.org/distfiles/
@@ -25,7 +25,7 @@ $(eval $(call PKG_template,OMXPLAYER,omxplayer,$(PKG_VERSION)-${PKG_RELEASE},${P
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \
+TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_55 \
-I$(STAGING_DIR)/usr/include/freetype2 \
-I$(STAGING_DIR)/usr/include/dbus-1.0 \
-I$(STAGING_DIR)/opt/vc/include \
@@ -35,8 +35,8 @@ TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib
omxplayer-install:
$(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/bin
- $(INSTALL_BIN) $(WRKSRC)/omxplayer{,.bin} \
- $(IDIR_OMXPLAYER)/usr/bin
+ $(INSTALL_BIN) $(WRKSRC)/omxplayer.bin \
+ $(IDIR_OMXPLAYER)/usr/bin/omxplayer
$(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/
$(INSTALL_DATA) $(WRKSRC)/fonts/* \
$(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/
diff --git a/package/omxplayer/patches/patch-omxplayer b/package/omxplayer/patches/patch-omxplayer
deleted file mode 100644
index 10e11243b..000000000
--- a/package/omxplayer/patches/patch-omxplayer
+++ /dev/null
@@ -1,29 +0,0 @@
---- omxplayer-0.2.orig/omxplayer 2013-10-11 15:17:41.000000000 +0200
-+++ omxplayer-0.2/omxplayer 2013-10-11 15:31:23.000000000 +0200
-@@ -3,7 +3,6 @@
- #mount -t nfs -o rsize=32768,wsize=32768,intr 192.168.10.1:/data/video /media
-
- OMXPLAYER="./omxplayer.bin"
--FBSET="/usr/sbin/fbset"
- FONT="fonts/FreeSans.ttf"
-
- if [ -e /usr/share/fonts/truetype/freefont/FreeSans.ttf ]; then
-@@ -36,18 +35,9 @@ YRES=1080
- XRES=1600
- YRES=900
-
--if [ -e $FBSET ]; then
-- echo 0 > /sys/class/vtconsole/vtcon1/bind
-- fbset -xres 1 -yres 1
--fi
--
- if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- eval $(dbus-launch --sh-syntax)
- fi
-
- $OMXPLAYER --font $FONT --italic-font $ITALIC_FONT "$@"
-
--if [ -e $FBSET ]; then
-- fbset -xres ${XRES} -yres ${YRES}
-- echo 1 > /sys/class/vtconsole/vtcon1/bind
--fi
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 2787168bf..ed4fc21b4 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= openjdk7
-PKG_VERSION:= 2.3.9
+PKG_VERSION:= 2.3.12
PKG_RELEASE:= 1
-PKG_MD5SUM:= e96e5e578d442d3ae56cd332e8dbc6b6
+PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11
PKG_DESCR:= OpenJDK 7 Java VM
PKG_SECTION:= lang
PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host
@@ -75,6 +75,7 @@ CONFIGURE_COMMON:= --disable-docs \
--disable-system-jpeg \
--disable-system-lcms \
--disable-system-zlib \
+ --disable-system-kerberos \
--disable-system-png \
--disable-system-gif \
--disable-system-gtk \
diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index 25e979fce..effd32a92 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,16 +1,8 @@
-diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
---- icedtea-2.3.9.orig/Makefile.in 2013-04-21 22:48:31.000000000 +0200
-+++ icedtea-2.3.9/Makefile.in 2013-11-15 12:28:32.000000000 +0100
-@@ -90,7 +90,6 @@
- @WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \
- @WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \
- @WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \
--@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \
- @WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/revert_arm_debug.patch
-
- @WITH_RHINO_TRUE@am__append_9 = \
-@@ -657,7 +656,7 @@
- $(am__append_17) $(am__append_18) $(DISTRIBUTION_PATCHES)
+diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in
+--- icedtea-2.3.11.orig/Makefile.in 2013-07-25 02:39:55.000000000 +0200
++++ icedtea-2.3.11/Makefile.in 2013-12-08 15:43:27.000000000 +0100
+@@ -695,7 +695,7 @@
+ $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
-ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
@@ -18,7 +10,7 @@ diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \
-@@ -2050,7 +2049,7 @@
+@@ -2090,7 +2090,7 @@
# Optional native ecj
stamps/native-ecj.stamp:
mkdir -p stamps
@@ -27,13 +19,13 @@ diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
@BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
touch $@
-diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk.patch
---- icedtea-2.3.9.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.3.9/patches/openadk.patch 2013-11-15 13:52:27.000000000 +0100
+diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/openadk.patch
+--- icedtea-2.3.11.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100
++++ icedtea-2.3.11/patches/openadk.patch 2013-12-08 16:22:41.000000000 +0100
@@ -0,0 +1,493 @@
+diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-03-15 17:33:37.000000000 +0100
-++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-07-17 20:14:46.000000000 +0200
+++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-12-08 15:44:03.000000000 +0100
+@@ -115,7 +115,6 @@
+ # include <string.h>
+ # include <syscall.h>
@@ -42,7 +34,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ # include <sys/ipc.h>
+ # include <sys/shm.h>
+ # include <link.h>
-+@@ -644,9 +643,7 @@
++@@ -649,9 +648,7 @@
+ os::Linux::set_glibc_version(str);
+ } else {
+ // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
@@ -53,7 +45,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ os::Linux::set_glibc_version(_gnu_libc_version);
+ }
+
-+@@ -2640,10 +2637,7 @@
++@@ -2648,10 +2645,7 @@
+ // If we are running with earlier version, which did not have symbol versions,
+ // we should use the base version.
+ void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
@@ -65,7 +57,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ return f;
+ }
+
-+@@ -4908,7 +4902,21 @@
++@@ -4916,7 +4910,21 @@
+ // Linux doesn't yet have a (official) notion of processor sets,
+ // so just return the system wide load average.
+ int os::loadavg(double loadavg[], int nelem) {
@@ -89,8 +81,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+
+ void os::pause() {
+diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
-+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-03-15 17:33:37.000000000 +0100
-++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-11-15 13:51:57.000000000 +0100
++--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-07-17 20:14:46.000000000 +0200
+++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-12-08 15:44:03.000000000 +0100
+@@ -253,7 +253,7 @@
+ #elif defined(__APPLE__)
+ inline int g_isnan(double f) { return isnan(f); }
@@ -112,8 +104,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+
+ // Wide characters
+diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
-+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-12-08 15:44:03.000000000 +0100
+@@ -80,7 +80,7 @@
+ LDDFLAGS += $(ZIPOBJS)
+ endif
@@ -124,8 +116,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ endif
+
+diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
-+--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile 2013-12-08 15:44:03.000000000 +0100
+@@ -64,7 +64,7 @@
+ COMPILER_WARNINGS_FATAL=true
+ endif
@@ -136,8 +128,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ ifeq ($(PLATFORM), solaris)
+ #LIBSCTP = -lsctp
+diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
-+--- openjdk.orig/jdk/make/common/Defs.gmk 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/common/Defs.gmk 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/common/Defs.gmk 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/common/Defs.gmk 2013-12-08 15:44:03.000000000 +0100
+@@ -204,7 +204,7 @@
+ ifeq ($(PLATFORM), macosx)
+ FREETYPE_HEADERS_PATH = /usr/X11R6/include
@@ -148,8 +140,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ endif
+ endif
+diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/common/shared/Platform.gmk 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/common/shared/Platform.gmk 2013-12-08 15:44:03.000000000 +0100
+@@ -160,9 +160,6 @@
+ else
+ mach := $(shell uname -m)
@@ -161,8 +153,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ i[3-9]86) \
+ echo i586 \
+diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
-+--- openjdk.orig/jdk/make/java/instrument/Makefile 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/java/instrument/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/java/instrument/Makefile 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/java/instrument/Makefile 2013-12-08 15:44:04.000000000 +0100
+@@ -140,6 +140,8 @@
+ # We don't want to link against -ljava
+ JAVALIB=
@@ -173,8 +165,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ # Add to ambient vpath so we pick up the library files
+ #
+diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
-+--- openjdk.orig/jdk/make/java/net/Makefile 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/java/net/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/java/net/Makefile 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/java/net/Makefile 2013-12-08 15:44:04.000000000 +0100
+@@ -25,7 +25,7 @@
+
+ BUILDDIR = ../..
@@ -185,8 +177,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ include $(BUILDDIR)/common/Defs.gmk
+
+diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
-+--- openjdk.orig/jdk/make/java/nio/Makefile 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/java/nio/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/java/nio/Makefile 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/java/nio/Makefile 2013-12-08 15:44:04.000000000 +0100
+@@ -369,7 +369,7 @@
+ endif
+
@@ -215,8 +207,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
+ $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
+diff -Nur openjdk.orig/jdk/make/java/npt/Makefile openjdk/jdk/make/java/npt/Makefile
-+--- openjdk.orig/jdk/make/java/npt/Makefile 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/java/npt/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/java/npt/Makefile 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/java/npt/Makefile 2013-12-08 15:44:04.000000000 +0100
+@@ -64,6 +64,8 @@
+ # We don't want to link against -ljava
+ JAVALIB=
@@ -227,8 +219,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ ifeq ($(PLATFORM), windows)
+ OTHER_LCF += -export:nptInitialize -export:nptTerminate
+diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
-+--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-12-08 15:44:04.000000000 +0100
+@@ -151,22 +151,6 @@
+ #endif
+
@@ -286,8 +278,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ ifeq ($(PLATFORM), macosx))
+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+diff -Nur openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
-+--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-12-08 15:44:04.000000000 +0100
+@@ -55,6 +55,8 @@
+
+ JAVALIB=
@@ -298,8 +290,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ # C Flags
+ #
+diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
-+--- openjdk.orig/jdk/make/sun/xawt/Makefile 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/sun/xawt/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/sun/xawt/Makefile 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/sun/xawt/Makefile 2013-12-08 15:44:04.000000000 +0100
+@@ -292,16 +292,10 @@
+ SIZERS = $(SIZER).32
+ SIZERS_C = $(SIZER_32_C)
@@ -340,8 +332,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
+ $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-12-08 15:44:04.000000000 +0100
+@@ -69,7 +69,7 @@
+ */
+ static {
@@ -352,8 +344,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+
+ /**
+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2013-12-08 15:44:04.000000000 +0100
+@@ -78,7 +78,7 @@
+ */
+ static {
@@ -364,8 +356,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+
+ /**
+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2013-12-08 15:44:04.000000000 +0100
+@@ -47,7 +47,7 @@
+ */
+ static {
@@ -376,8 +368,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ }
+
+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2013-12-08 15:44:04.000000000 +0100
+@@ -260,7 +260,7 @@
+ static {
+ preferIPv6Address = java.security.AccessController.doPrivileged(
@@ -388,8 +380,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ }
+
+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2013-12-08 15:44:04.000000000 +0100
+@@ -53,7 +53,7 @@
+ private static final int defaultIndex; /* index of defaultInterface */
+
@@ -400,8 +392,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ defaultInterface = DefaultInterface.getDefault();
+ if (defaultInterface != null) {
+diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
-+--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2013-12-08 15:44:04.000000000 +0100
+@@ -76,6 +76,6 @@
+
+ static {
@@ -411,8 +403,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ }
+ }
+diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
-+--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2013-12-08 15:44:04.000000000 +0100
+@@ -95,7 +95,7 @@
+ }});
+ if (b != null && b.booleanValue()) {
@@ -423,8 +415,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ }
+ }
+diff -Nur openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
-+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2013-12-08 15:44:04.000000000 +0100
+@@ -483,7 +483,7 @@
+ return;
+ loaded = true;
@@ -435,8 +427,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
+ // IOUtil must be initialized; Its native methods are called from
+diff -Nur openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
-+--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-12-08 15:44:04.000000000 +0100
+@@ -247,7 +247,7 @@
+
+ static {
@@ -447,8 +439,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+
+ }
+diff -Nur openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
-+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-12-08 15:44:04.000000000 +0100
+@@ -246,7 +246,8 @@
+ if (wcs == NULL)
+ return NULL;
@@ -460,8 +452,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ mbs = (char *) malloc(n * sizeof(char));
+ if (mbs == NULL) {
+diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
-+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2013-12-08 15:44:04.000000000 +0100
+@@ -27,9 +27,6 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xos.h>
@@ -499,8 +491,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+ Window get_xawt_root_shell(JNIEnv *env) {
+ static jclass classXRootWindow = NULL;
+diff -Nur openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
-+--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-12-08 15:44:04.000000000 +0100
+@@ -159,7 +159,7 @@
+
+ static {
@@ -511,8 +503,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
+
+ // start the address listener thread
+diff -Nur openjdk.orig/Makefile openjdk/Makefile
-+--- openjdk.orig/Makefile 2013-03-08 17:04:19.000000000 +0100
-++++ openjdk/Makefile 2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/Makefile 2013-06-23 17:53:43.000000000 +0200
+++++ openjdk/Makefile 2013-12-08 15:44:04.000000000 +0100
+@@ -53,9 +53,7 @@
+ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
+ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index d0091fe5c..24f3484bb 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -13,8 +13,6 @@ PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart
PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/}
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !avr32
-
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index 21d20c026..ce7fe7d3e 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -16,8 +16,6 @@ PKG_SITES:= http://www.opensc-project.org/files/opensc/
PKG_LIBNAME:= libopensc
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !avr32
-
PKG_SUBPKGS:= OPENSC LIBOPENSC
PKGSD_LIBOPENSC:= opensc library
PKGSC_LIBOPENSC:= libs
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index ae750a2a4..efea0b004 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -20,8 +20,6 @@ PKG_URL:= http://www.openswan.org/
PKG_SITES:= http://www.openswan.org/download/
PKG_NOPARALLEL:= 1
-PKG_ARCH_DEPENDS:= !avr32
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 1d4278fd0..622c246d4 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= popt binutils
PKG_URL:= http://oprofile.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/}
-PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_LIBC_DEPENDS:= uclibc eglibc glibc
PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index 15cc231ee..46da045d1 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -16,8 +16,6 @@ PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
PKG_LIBNAME:= orbit2
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !cris
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile
index 4e04de03c..9860b6805 100644
--- a/package/pcc-libs/Makefile
+++ b/package/pcc-libs/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= lang
PKG_URL:= http://pcc.ludd.ltu.se/
PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
-PKG_ARCH_DEPENDS:= !arm !cris !m68k !mips !ppc !avr32
+PKG_ARCH_DEPENDS:= !arm !m68k !mips !ppc
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include $(TOPDIR)/mk/package.mk
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index 5630157de..c7f3878da 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -14,7 +14,7 @@ PKG_URL:= http://pcc.ludd.ltu.se/
PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
PKG_NOPARALLEL:= 1
-PKG_ARCH_DEPENDS:= !arm !cris !m68k !mips !ppc !avr32
+PKG_ARCH_DEPENDS:= !arm !m68k !mips !ppc
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include $(TOPDIR)/mk/package.mk
diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile
index 8a7f496dd..bc54b608b 100644
--- a/package/pcsc-lite/Makefile
+++ b/package/pcsc-lite/Makefile
@@ -15,8 +15,6 @@ PKG_URL:= http://pcsclite.alioth.debian.org/
PKG_SITES:= http://alioth.debian.org/frs/download.php/file/3598/
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !avr32
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/php/Makefile b/package/php/Makefile
index 43fd6554f..528f5bb11 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -67,7 +67,6 @@ PKGFD_MOD_ZLIB:= ZLIB support
PKGFB_MOD_ZLIB:= zlib
PKGFS_MOD_ZLIB:= zlib
-PKG_ARCH_DEPENDS:= !cris !avr32
PKG_HOST_DEPENDS:= !cygwin
include $(TOPDIR)/mk/package.mk
diff --git a/package/polkit/Makefile b/package/polkit/Makefile
index d4a1934c0..5ed8333e3 100644
--- a/package/polkit/Makefile
+++ b/package/polkit/Makefile
@@ -5,14 +5,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= polkit
PKG_VERSION:= 0.112
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 758d825e25283b201026f1bb3a476144
+PKG_RELEASE:= 3
+PKG_MD5SUM:= 23973dcfd8b92ab2b7db3a925642b76d
PKG_DESCR:= application-level toolkit
PKG_SECTION:= libs
PKG_BUILDDEP:= autotool mozjs
PKG_DEPENDS:= mozjs
PKG_URL:= http://www.freedesktop.org/wiki/Software/polkit/
-PKG_SITES:= http://cgit.freedesktop.org/polkit/snapshot/
+PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
@@ -22,6 +22,9 @@ $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
AUTOTOOL_STYLE:= autogen
CONFIGURE_ARGS+= --disable-man-pages \
--disable-examples \
+ --enable-libsystemd-login=no \
+ --without-systemdsystemunitdir \
+ --with-polkitd-user=root \
--with-authfw=shadow \
--with-os-type=unknown
@@ -34,5 +37,8 @@ polkit-install:
$(CP) $(WRKINST)/usr/lib/polkit-1/* \
$(IDIR_POLKIT)/usr/lib/polkit-1
$(CP) $(WRKINST)/usr/bin/* $(IDIR_POLKIT)/usr/bin
+ $(INSTALL_DIR) $(IDIR_POLKIT)/usr/share/dbus-1
+ $(CP) $(WRKINST)/usr/share/dbus-1/* \
+ $(IDIR_POLKIT)/usr/share/dbus-1
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/polkit/patches/patch-configure_ac b/package/polkit/patches/patch-configure_ac
index 3b258e7f4..65681615d 100644
--- a/package/polkit/patches/patch-configure_ac
+++ b/package/polkit/patches/patch-configure_ac
@@ -1,5 +1,5 @@
--- polkit-0.112.orig/configure.ac 2013-09-18 18:55:09.000000000 +0200
-+++ polkit-0.112/configure.ac 2014-01-09 21:28:57.000000000 +0100
++++ polkit-0.112/configure.ac 2014-01-11 11:22:30.000000000 +0100
@@ -8,9 +8,6 @@ AM_MAINTAINER_MODE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -19,6 +19,15 @@
#### gcc warning flags
if test "x$GCC" = "xyes"; then
+@@ -158,7 +153,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP
+ [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
+ AC_SUBST(EXPAT_LIBS)
+
+-AC_CHECK_FUNCS(clearenv)
++AC_CHECK_FUNCS(clearenv getnetgrent innetgr)
+
+ if test "x$GCC" = "xyes"; then
+ LDFLAGS="-Wl,--as-needed $LDFLAGS"
@@ -476,8 +471,6 @@ case "$host_os" in
;;
esac
diff --git a/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c b/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c
new file mode 100644
index 000000000..64608f5b5
--- /dev/null
+++ b/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c
@@ -0,0 +1,31 @@
+--- polkit-0.112.orig/src/polkitbackend/polkitbackendinteractiveauthority.c 2013-09-18 18:55:09.000000000 +0200
++++ polkit-0.112/src/polkitbackend/polkitbackendinteractiveauthority.c 2014-01-11 11:22:30.000000000 +0100
+@@ -2103,6 +2103,7 @@ get_users_in_group (PolkitIdentity
+ return ret;
+ }
+
++#if defined(HAVE_GETNETGRENT)
+ static GList *
+ get_users_in_net_group (PolkitIdentity *group,
+ gboolean include_root)
+@@ -2154,6 +2155,7 @@ get_users_in_net_group (PolkitIdentity
+ endnetgrent ();
+ return ret;
+ }
++#endif
+
+ /* ---------------------------------------------------------------------------------------------------- */
+
+@@ -2243,10 +2245,12 @@ authentication_agent_initiate_challenge
+ {
+ user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE));
+ }
++#if defined(HAVE_GETNETGRENT)
+ else if (POLKIT_IS_UNIX_NETGROUP (identity))
+ {
+ user_identities = g_list_concat (user_identities, get_users_in_net_group (identity, FALSE));
+ }
++#endif
+ else
+ {
+ g_warning ("Unsupported identity");
diff --git a/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c b/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c
new file mode 100644
index 000000000..14a702dda
--- /dev/null
+++ b/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c
@@ -0,0 +1,38 @@
+--- polkit-0.112.orig/src/polkitbackend/polkitbackendjsauthority.c 2013-09-18 18:55:09.000000000 +0200
++++ polkit-0.112/src/polkitbackend/polkitbackendjsauthority.c 2014-01-11 11:27:02.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <glib/gstdio.h>
+ #include <locale.h>
+ #include <glib/gi18n-lib.h>
++#include <sys/wait.h>
+
+ #include <polkit/polkit.h>
+ #include "polkitbackendjsauthority.h"
+@@ -1450,13 +1451,16 @@ js_polkit_user_is_in_netgroup (JSContext
+ JSBool ret = JS_FALSE;
+ JSString *user_str;
+ JSString *netgroup_str;
+- char *user;
+- char *netgroup;
+ JSBool is_in_netgroup = JS_FALSE;
+
+ if (!JS_ConvertArguments (cx, argc, JS_ARGV (cx, vp), "SS", &user_str, &netgroup_str))
+ goto out;
+
++#if defined(HAVE_INNETGR)
++ {
++ char *user;
++ char *netgroup;
++
+ user = JS_EncodeString (cx, user_str);
+ netgroup = JS_EncodeString (cx, netgroup_str);
+
+@@ -1470,6 +1474,8 @@ js_polkit_user_is_in_netgroup (JSContext
+
+ JS_free (cx, netgroup);
+ JS_free (cx, user);
++ }
++#endif
+
+ ret = JS_TRUE;
+
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index 619b5ad6a..1dd8d0222 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= rdate
PKG_VERSION:= 20070817
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 9a6489d7de4311678a3fab001bb503df
PKG_DESCR:= A small rdate and NTP client
PKG_SECTION:= ntp
diff --git a/package/rdate/patches/patch-rdate_c b/package/rdate/patches/patch-rdate_c
new file mode 100644
index 000000000..f560ca707
--- /dev/null
+++ b/package/rdate/patches/patch-rdate_c
@@ -0,0 +1,10 @@
+--- rdate.orig/rdate.c 2007-08-16 12:38:52.000000000 +0200
++++ rdate/rdate.c 2014-01-14 16:53:03.000000000 +0100
+@@ -45,6 +45,7 @@
+ #include <sys/socket.h>
+ #include <sys/time.h>
+
++#include <stdint.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <err.h>
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index a0659476b..7d709faa3 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -4,21 +4,20 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= rtorrent
-PKG_VERSION:= 0.9.0
+PKG_VERSION:= 0.9.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 9bc258d7a63dd13e3348f310ae26a434
+PKG_MD5SUM:= 72c3e9ab859bda7cc8aa96c0b508b09f
PKG_DESCR:= console torrent application
PKG_SECTION:= p2p
PKG_DEPENDS:= libncurses libtorrent libcurl libstdcxx
-PKG_BUILDDEP:= ncurses libtorrent curl
+PKG_BUILDDEP:= autotool ncurses libtorrent curl
PKG_URL:= http://libtorrent.rakshasa.no/
PKG_SITES:= http://libtorrent.rakshasa.no/downloads/
-PKG_ARCH_DEPENDS:= !avr32
-
include ${TOPDIR}/mk/package.mk
-TARGET_LDFLAGS+= -lpthread
+AUTOTOOL_STYLE:= autoreconf
+TARGET_LDFLAGS+= -lpthread -ltinfo
$(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/rtorrent/patches/patch-configure b/package/rtorrent/patches/patch-configure
deleted file mode 100644
index 833360f24..000000000
--- a/package/rtorrent/patches/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- rtorrent-0.9.0.orig/configure 2011-12-10 13:32:44.000000000 +0100
-+++ rtorrent-0.9.0/configure 2012-03-22 21:14:03.805634594 +0100
-@@ -15442,38 +15442,6 @@ fi
-
-
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for execinfo.h" >&5
--$as_echo_n "checking for execinfo.h... " >&6; }
--
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#include <execinfo.h>
-- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
--
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--$as_echo "#define USE_EXECINFO 1" >>confdefs.h
--
--
--else
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
-
-
diff --git a/package/rtorrent/patches/patch-configure_ac b/package/rtorrent/patches/patch-configure_ac
new file mode 100644
index 000000000..975e059cf
--- /dev/null
+++ b/package/rtorrent/patches/patch-configure_ac
@@ -0,0 +1,18 @@
+--- rtorrent-0.9.2.orig/configure.ac 2012-04-20 08:55:30.000000000 +0200
++++ rtorrent-0.9.2/configure.ac 2014-01-13 12:54:40.000000000 +0100
+@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 6, api version)
+
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+@@ -20,7 +19,6 @@ TORRENT_DISABLE_IPV6
+
+ AC_SYS_LARGEFILE
+
+-TORRENT_CHECK_EXECINFO()
+ TORRENT_OTFD()
+
+ TORRENT_ENABLE_ARCH
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 9d063331a..6289c1cb8 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:= ruby openldap
PKG_URL:= http://ruby-ldap.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/}
-PKG_ARCH_DEPENDS:= !avr32
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index bf25e2236..cc34e7e5d 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -17,7 +17,6 @@ PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/2.0/
PKG_NOPARALLEL:= 1
PKG_HOST_DEPENDS:= !freebsd !cygwin
-PKG_ARCH_DEPENDS:= !avr32
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER}.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER}
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index 0ffe3ad00..df1460a75 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -15,8 +15,6 @@ PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html
PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !avr32
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 794bbb61f..f29bf52e0 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -14,8 +14,6 @@ PKG_DEPENDS:= samba-lib libuuid libpopt
PKG_URL:= http://www.samba.org/
PKG_SITES:= http://samba.org/samba/ftp/stable/
-PKG_ARCH_DEPENDS:= !avr32
-
PKG_SUBPKGS:= SAMBA SAMBA_CLIENT SAMBA_PASSWD SAMBA_LIB
PKGSD_SAMBA_CLIENT:= NetBIOS/SMB client
PKGSS_SAMBA_CLIENT:= libreadline samba-lib
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index 8deca8f19..4bad787ef 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -15,8 +15,6 @@ PKG_URL:= http://www.sane-project.org/
PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/
PKG_MULTI:= 1
-PKG_ARCH_DEPENDS:= !cris !avr32
-
PKG_SUBPKGS:= SANE_BACKENDS SANE_BACKEND_NET SANE_BACKEND_ABATON SANE_BACKEND_AGFAFOCUS
PKG_SUBPKGS+= SANE_BACKEND_APPLE SANE_BACKEND_ARTEC_EPLUS48U SANE_BACKEND_ARTEC SANE_BACKEND_AS6E
PKG_SUBPKGS+= SANE_BACKEND_AVISION SANE_BACKEND_BH SANE_BACKEND_CANON630U SANE_BACKEND_CANON
diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile
index 4d123009f..6ea1f433e 100644
--- a/package/scsi-spin/Makefile
+++ b/package/scsi-spin/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= scsi-spin
PKG_VERSION:= 1.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= d0c32bfc500e94cc1905d9457a99cdbb
PKG_DESCR:= Utility to spin down scsi disks
PKG_SECTION:= misc
diff --git a/package/scsi-spin/src/scsi-spin.c b/package/scsi-spin/src/scsi-spin.c
index b92347ff4..28a890cad 100644
--- a/package/scsi-spin/src/scsi-spin.c
+++ b/package/scsi-spin/src/scsi-spin.c
@@ -16,6 +16,7 @@
*/
#include <stdlib.h>
+#include <stdint.h>
#include <stdio.h>
#include <unistd.h>
#include <getopt.h>
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index 7fffc4c4b..5f1b5929d 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:= libusb libusb-compat
PKG_URL:= http://sispmctl.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/}
-PKG_ARCH_DEPENDS:= !avr32
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/squid/Makefile b/package/squid/Makefile
index a10de02ac..84e8b30f1 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -16,8 +16,6 @@ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.4/
PKG_MULTI:= 1
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !avr32
-
PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA
PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE
PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_FILE_USERIP SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 59f0a997a..1908419af 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:= debug
PKG_DEPENDS:= libgcc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/}
-PKG_ARCH_DEPENDS:= !avr32
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
include ${TOPDIR}/mk/package.mk
diff --git a/package/strace/src/linux/crisv10/syscallent.h b/package/strace/src/linux/crisv10/syscallent.h
deleted file mode 100644
index d8dd9f7ab..000000000
--- a/package/strace/src/linux/crisv10/syscallent.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "i386/syscallent.h"
diff --git a/package/strace/src/linux/crisv32/ioctlent.h.in b/package/strace/src/linux/crisv32/ioctlent.h.in
deleted file mode 100644
index 52ac99ba0..000000000
--- a/package/strace/src/linux/crisv32/ioctlent.h.in
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i386/ioctlent.h.in"
diff --git a/package/strace/src/linux/crisv32/syscallent.h b/package/strace/src/linux/crisv32/syscallent.h
deleted file mode 100644
index d8dd9f7ab..000000000
--- a/package/strace/src/linux/crisv32/syscallent.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "i386/syscallent.h"
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index 11ae586ae..5fe43a086 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= systemd
PKG_VERSION:= 208
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= df64550d92afbffb4f67a434193ee165
PKG_DESCR:= System and Service Manager
PKG_SECTION:= utils
@@ -14,28 +14,13 @@ PKG_BUILDDEP:= autotool usbutils glib kmod util-linux libcap
PKG_BUILDDEP+= libgcrypt gperf-host
PKG_URL:= http://freedesktop.org/wiki/Software/systemd/
PKG_SITES:= http://www.freedesktop.org/software/systemd/
-PKG_LIBNAME:= libudev
-PKG_OPTS:= dev
PKG_LIBC_DEPENDS:= eglibc glibc
-PKG_SUBPKGS:= UDEV LIBUDEV LIBGUDEV
-PKGSC_LIBGUDEV:= libs
-PKGSD_LIBGUDEV:= GUDEV library
-PKGSC_LIBUDEV:= libs
-PKGSD_LIBUDEV:= UDEV library
-PKGSD_UDEV:= Dynamic device management subsystem
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libmix
-endif
-
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,SYSTEMD,systemd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
AUTOTOOL_STYLE:= autoreconf
TARGET_LDFLAGS+= -lrt
@@ -45,19 +30,7 @@ CONFIGURE_ARGS+= --disable-static \
--disable-manpages \
--disable-polkit
-udev-install:
- ${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
- ${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
- ${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
- ${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
- ${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
-
-libudev-install:
- ${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
- $(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
-
-libgudev-install:
- ${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
- $(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+# TODO
+systemd-install:
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/taglib/Makefile b/package/taglib/Makefile
index a71973676..402b89c7f 100644
--- a/package/taglib/Makefile
+++ b/package/taglib/Makefile
@@ -22,7 +22,10 @@ $(eval $(call PKG_template,TAGLIB,taglib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
CONFIG_STYLE:= manual
do-configure:
- (cd ${WRKBUILD} && PATH='${TARGET_PATH}' cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .)
+ (cd ${WRKBUILD} && PATH='${HOST_PATH}' \
+ cmake -DZLIB_ROOT=$(STAGING_TARGET_DIR)/usr \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_SYSTEM_NAME=Linux .)
pre-install:
$(INSTALL_DATA) ./files/taglib.pc $(WRKBUILD)/
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 923f350dc..109f13963 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= http://www.tntnet.org/
PKG_SITES:= http://www.tntnet.org/download/
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !arm !avr32 !m68k
+PKG_ARCH_DEPENDS:= !arm !m68k
PKG_CHOICES_TNTNET:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
PKGCD_WITHOUT_SSL:= use no SSL
diff --git a/package/twm/Makefile b/package/twm/Makefile
index d24a87a44..25688d14f 100644
--- a/package/twm/Makefile
+++ b/package/twm/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
include $(TOPDIR)/mk/package.mk
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 13c153e83..5878f7a70 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -31,9 +31,6 @@ MAKE_FLAGS+= TOPDIR="${WRKBUILD}/" \
${TARGET_CONFIGURE_OPTS} \
ARCH_CFLAGS="${TARGET_CFLAGS}" \
CROSS="${TARGET_CROSS}"
-ifeq ($(ADK_LINUX_AVR32),y)
-MAKE_FLAGS+= check_as_needed=
-endif
TARGET_CONFIGURE_OPTS=
do-configure:
diff --git a/package/upower/Makefile b/package/upower/Makefile
index ea448a693..99c721879 100644
--- a/package/upower/Makefile
+++ b/package/upower/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= upower
PKG_VERSION:= 0.99.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 14f43bc13353e23e7280863f33ac50d2
PKG_DESCR:= powermanagement
PKG_SECTION:= misc
-PKG_BUILDDEP:= glib dbus-glib polkit systemd
+PKG_BUILDDEP:= glib dbus-glib polkit eudev
PKG_DEPENDS:= glib dbus-glib polkit libgudev
PKG_URL:= http://upower.freedesktop.org/
PKG_SITES:= http://upower.freedesktop.org/releases/
@@ -20,6 +20,9 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,UPOWER,upower,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIGURE_ARGS+= --without-systemdutildir \
+ --disable-rpath
+
upower-install:
$(INSTALL_DIR) $(IDIR_UPOWER)/etc
$(CP) $(WRKINST)/etc/* \
@@ -33,5 +36,8 @@ upower-install:
$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
$(IDIR_UPOWER)/usr/bin
+ $(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
+ $(CP) $(WRKINST)/usr/share/dbus-1/* \
+ $(IDIR_UPOWER)/usr/share/dbus-1
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index ce0b0b31e..09a0102ca 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -13,8 +13,6 @@ PKG_DEPENDS:= libusb libusb-compat libpthread zlib librt libgcc
PKG_BUILDDEP:= libusb libusb-compat zlib
PKG_SITES:= http://www.kernel.org/pub/linux/utils/usb/usbutils/
-PKG_ARCH_DEPENDS:= !avr32
-
PKG_SUBPKGS:= LSUSB
include ${TOPDIR}/mk/package.mk
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
index a0302f016..c10b1ee5e 100644
--- a/package/ussp-push/Makefile
+++ b/package/ussp-push/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:= openobex
PKG_SITES:= http://xmailserver.org/
PKG_CFLINE_USSP_PUSH:= depends on ADK_BROKEN
-PKG_ARCH_DEPENDS:= !avr32
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 790b5e210..cab09241a 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -14,7 +14,7 @@ PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt
PKG_URL:= http://www.videolan.org/vlc/
PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
-PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_LIBC_DEPENDS:= eglibc glibc musl
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index e5b67dd00..4f20654c9 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= weechat
PKG_VERSION:= 0.4.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fd584c258aace2aa898f40e1fcf06084
PKG_DESCR:= lightweight IRC client
PKG_SECTION:= chat
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
AUTOTOOL_STYLE:= autoreconf
+TARGET_LDFLAGS+= -ltinfo
CONFIGURE_ARGS+= --with-debug=0 \
--disable-perl \
--disable-python \
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index fe4aa15c2..05026e12b 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -5,31 +5,34 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xbmc
PKG_VERSION:= 12.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 7ae385ebf8e5cfcb917393235e6efbdb
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
-PKG_DEPENDS:= boost libffmpeg python2 libstdcxx bcm2835-vc
-PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad
+PKG_DEPENDS:= boost libffmpeg python2 libstdcxx
+PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad libdbus
PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo
PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng
PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate
PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+= omxplayer libbluray libgpg-error libudev
+PKG_DEPENDS+= libbluray libgpg-error libudev python2-mod-sqlite
PKG_DEPENDS+= libssh libcec libnfs librtmp samba-lib libncurses
PKG_BUILDDEP:= autotool boost ffmpeg python2 MesaLib libglew libass
PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype
PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+= bcm2835-vc libgpg-error libbluray
-PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump systemd
+PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump eudev
+PKG_BUILDDEP+= libgpg-error libbluray dbus
PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host
PKG_URL:= http://xbmc.org/
PKG_SITES:= http://mirrors.xbmc.org/releases/source/
-PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc omxplayer
+PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc omxplayer
+PKG_BUILDDEP_IBM_X40:= nasm-host
+PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40
PKG_LIBC_DEPENDS:= eglibc glibc musl
WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
@@ -40,13 +43,16 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
XAKE_FLAGS+= V=1 TIXML_USE_STL=1
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \
- -DTIXML_USE_STL=1 \
- -I$(STAGING_DIR)/opt/vc/include \
+TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_55 \
+ -DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1
+
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+TARGET_CPPFLAGS+= -I$(STAGING_DIR)/opt/vc/include \
-I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \
-I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static \
- -L$(STAGING_DIR)/usr/lib/samba
+TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static
+endif
+
AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ENV+= DESTDIR='${WRKINST}' \
TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
@@ -58,20 +64,25 @@ CONFIGURE_ARGS+= --disable-optical-drive \
--enable-udev \
--enable-libbluray \
--enable-external-libraries \
- --enable-player=omxplayer \
- --enable-gles \
--enable-rtmp \
--disable-libusb \
--disable-libcap \
--disable-sdl \
--disable-joystick \
--disable-dvdcss \
- --disable-x11 \
- --disable-debug \
- --with-platform=raspberry-pi
+ --disable-debug
+
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+CONFIGURE_ARGS+= --with-platform=raspberry-pi \
+ --enable-player=omxplayer \
+ --enable-gles \
+ --disable-x11
+else
+CONFIGURE_ARGS+= --enable-x11
+endif
pre-configure:
- (cd $(WRKBUILD)/lib/cpluff && ./autogen.sh)
+ (cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
xbmc-install:
$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc
diff --git a/package/xbmc/files/xbmc.init b/package/xbmc/files/xbmc.init
index ed8a49bd6..afb1fd9ac 100644
--- a/package/xbmc/files/xbmc.init
+++ b/package/xbmc/files/xbmc.init
@@ -15,7 +15,7 @@ start)
xbmc &
;;
stop)
- kill $(pgrep -f /usr/bin/xbmc)
+ kill $(pgrep -f /usr/lib/xbmc/xbmc.bin)
;;
restart)
sh $0 stop
diff --git a/package/xbmc/patches/001-simplepm.patch b/package/xbmc/patches/001-simplepm.patch
new file mode 100644
index 000000000..41ded94fa
--- /dev/null
+++ b/package/xbmc/patches/001-simplepm.patch
@@ -0,0 +1,144 @@
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp 1970-01-01 01:00:00.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp 2014-01-10 16:23:32.238217592 +0100
+@@ -0,0 +1,55 @@
++/*
++ * Copyright (C) 2014 Team XBMC
++ * http://www.xbmc.org
++ *
++ * This Program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This Program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with XBMC; see the file COPYING. If not, see
++ * <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#if defined (_LINUX)
++
++#include <stdlib.h>
++#include "LinuxPowerSyscall.h"
++#include "utils/log.h"
++
++CLinuxPowerSyscall::CLinuxPowerSyscall()
++{
++ CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall");
++}
++
++CLinuxPowerSyscall::~CLinuxPowerSyscall()
++{ }
++
++bool CLinuxPowerSyscall::Powerdown()
++{
++ system("/sbin/poweroff -F");
++ return 0;
++}
++
++bool CLinuxPowerSyscall::Reboot()
++{
++ system("/sbin/reboot -F");
++ return 0;
++}
++
++int CLinuxPowerSyscall::BatteryLevel(void)
++{ }
++
++bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
++{
++ return true;
++}
++
++#endif
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h 1970-01-01 01:00:00.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h 2014-01-10 14:57:23.365205874 +0100
+@@ -0,0 +1,44 @@
++#pragma once
++/*
++ * Copyright (C) 2014 Team XBMC
++ * http://www.xbmc.org
++ *
++ * This Program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This Program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with XBMC; see the file COPYING. If not, see
++ * <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#if defined (_LINUX)
++#include "powermanagement/IPowerSyscall.h"
++
++class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents
++{
++public:
++ CLinuxPowerSyscall();
++ ~CLinuxPowerSyscall();
++
++ virtual bool Powerdown();
++ virtual bool Suspend(void) { return false; }
++ virtual bool Hibernate(void) { return false; }
++ virtual bool Reboot();
++
++ virtual bool CanPowerdown(void) { return true; }
++ virtual bool CanSuspend(void) { return false; }
++ virtual bool CanHibernate(void) { return false; }
++ virtual bool CanReboot(void) { return true; }
++ virtual int BatteryLevel(void);
++
++ virtual bool PumpPowerEvents(IPowerEventsCallback *callback);
++};
++#endif
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile 2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile 2014-01-10 14:27:13.411383558 +0100
+@@ -2,7 +2,8 @@
+ ConsoleUPowerSyscall.cpp \
+ HALPowerSyscall.cpp \
+ UPowerSyscall.cpp \
+- SystemdUPowerSyscall.cpp
++ SystemdUPowerSyscall.cpp \
++ LinuxPowerSyscall.cpp
+
+ LIB=powermanagement_linux.a
+
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp 2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp 2014-01-14 11:19:11.558337441 +0100
+@@ -46,6 +46,9 @@
+ #include "linux/ConsoleDeviceKitPowerSyscall.h"
+ #include "linux/SystemdUPowerSyscall.h"
+ #include "linux/UPowerSyscall.h"
++#ifdef HAS_SIMPLEPM
++#include "linux/LinuxPowerSyscall.h"
++#endif
+ #ifdef HAS_HAL
+ #include "linux/HALPowerSyscall.h"
+ #endif
+@@ -83,6 +86,10 @@
+ m_instance = new CSystemdUPowerSyscall();
+ else if (CUPowerSyscall::HasUPower())
+ m_instance = new CUPowerSyscall();
++#ifdef HAS_SIMPLEPM
++ else
++ m_instance = new CLinuxPowerSyscall();
++#endif
+ #ifdef HAS_HAL
+ else
+ m_instance = new CHALPowerSyscall();
diff --git a/package/xbmc/patches/002-defaultsutf8.patch b/package/xbmc/patches/002-defaultsutf8.patch
new file mode 100644
index 000000000..466dc83bb
--- /dev/null
+++ b/package/xbmc/patches/002-defaultsutf8.patch
@@ -0,0 +1,42 @@
+diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/language/English/langinfo.xml
+--- xbmc-12.3-Frodo.orig/language/English/langinfo.xml 2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/English/langinfo.xml 2014-01-14 19:34:44.869490320 +0100
+@@ -48,8 +48,8 @@
+
+ <language locale="en">
+ <charsets>
+- <gui>CP1252</gui>
+- <subtitle>CP1252</subtitle>
++ <gui>UTF-8</gui>
++ <subtitle>UTF-8</subtitle>
+ </charsets>
+
+ <dvd>
+diff -Nur "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml" "xbmc-12.3-Frodo/language/English (US)/langinfo.xml"
+--- "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml" 2013-12-12 22:47:49.000000000 +0100
++++ "xbmc-12.3-Frodo/language/English (US)/langinfo.xml" 2014-01-14 19:35:02.117560629 +0100
+@@ -48,8 +48,8 @@
+
+ <language locale="en">
+ <charsets>
+- <gui>CP1252</gui>
+- <subtitle>CP1252</subtitle>
++ <gui>UTF-8</gui>
++ <subtitle>UTF-8</subtitle>
+ </charsets>
+
+ <dvd>
+diff -Nur xbmc-12.3-Frodo.orig/language/German/langinfo.xml xbmc-12.3-Frodo/language/German/langinfo.xml
+--- xbmc-12.3-Frodo.orig/language/German/langinfo.xml 2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/German/langinfo.xml 2014-01-14 19:34:20.997392956 +0100
+@@ -2,8 +2,8 @@
+ <language locale="de">
+
+ <charsets>
+- <gui unicodefont="false">CP1252</gui>
+- <subtitle>CP1252</subtitle>
++ <gui unicodefont="false">UTF-8</gui>
++ <subtitle>UTF-8</subtitle>
+ </charsets>
+
+ <dvd>
diff --git a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
index a08eb0a94..9b670449b 100644
--- a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
+++ b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
@@ -1,5 +1,26 @@
---- xbmc-12.2.orig/tools/Linux/xbmc.sh.in 2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/tools/Linux/xbmc.sh.in 2013-08-05 16:24:14.000000000 +0200
+--- xbmc-12.3-Frodo.orig/tools/Linux/xbmc.sh.in 2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/tools/Linux/xbmc.sh.in 2014-01-14 09:55:27.409527526 +0100
+@@ -52,7 +52,7 @@ single_stacktrace()
+
+ print_crash_report()
+ {
+- FILE="$HOME/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
++ FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
+ echo "############## XBMC CRASH LOG ###############" >> $FILE
+ echo >> $FILE
+ echo "################ SYSTEM INFO ################" >> $FILE
+@@ -91,9 +91,9 @@ print_crash_report()
+ echo >> $FILE
+ echo "################# LOG FILE ##################" >> $FILE
+ echo >> $FILE
+- if [ -f ~/.xbmc/temp/xbmc.log ]
++ if [ -f /tmp/xbmc/xbmc.log ]
+ then
+- cat ~/.xbmc/temp/xbmc.log >> $FILE
++ cat /tmp/xbmc/xbmc.log >> $FILE
+ echo >> $FILE
+ else
+ echo "Logfile not found in the usual place." >> $FILE
@@ -107,12 +107,6 @@ print_crash_report()
echo "Crash report available at $FILE"
}
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 5e5e35d53..d2b28285b 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -10,11 +10,11 @@ PKG_MD5SUM:= 2d3f7111b8284cec81884023c4bb4a11
PKG_DESCR:= X11 driver for Event driver
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server kmod-input-evdev libudev
-PKG_BUILDDEP:= xorg-server systemd
+PKG_BUILDDEP:= xorg-server eudev
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_LIBC_DEPENDS:= eglibc glibc
-PKG_ARCH_DEPENDS:= !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index e097c77ae..9e9da4f1c 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server
PKG_SITES:= http://www.conan.de/touchscreen/
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !arm !avr32 !m68k
+PKG_ARCH_DEPENDS:= !arm !m68k
PKG_CFLINE_XF86_INPUT_EVTOUCH:= depends on ADK_TARGET_WITH_INPUT
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index ee6a72c83..cca9b2194 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_CFLINE_XF86_INPUT_KEYBOARD:= depends on ADK_TARGET_WITH_INPUT
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index b738e2dd2..f050696f6 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_CFLINE_XF86_INPUT_MOUSE:= depends on ADK_TARGET_WITH_INPUT
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index 32c5178f5..ca025734c 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -9,12 +9,12 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 6bb71cff9ad9c5c7b258b2b6c56fdc95
PKG_DESCR:= X11 driver for ATI VGA chip
PKG_SECTION:= x11/drivers
-PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib systemd
+PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib eudev
PKG_DEPENDS:= xorg-server libdrm mesalib libudev
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !avr32 !arm !m68k
+PKG_ARCH_DEPENDS:= !arm !m68k
PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index b285bba94..22179746e 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server autotool util-macros
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !arm !avr32 !m68k
+PKG_ARCH_DEPENDS:= !arm !m68k
PKG_CFLINE_XF86_VIDEO_CIRRUS:=depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index 74407d4e9..cf24b3358 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_CFLINE_XF86_VIDEO_FBDEV:= depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index dbb22102c..2e68798ae 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !arm !avr32 !m68k
+PKG_ARCH_DEPENDS:= !arm !m68k
PKG_CFLINE_XF86_VIDEO_INTEL:=depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index ad3e50e34..84c73e6bd 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !arm !avr32 !m68k
+PKG_ARCH_DEPENDS:= !arm !m68k
PKG_CFLINE_XF86_VIDEO_SILICONMOTION:=depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index d9988a1e2..bd8d2bf64 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
include $(TOPDIR)/mk/package.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 3305779ab..fef274746 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -23,7 +23,7 @@ PKG_NEED_CXX:= 1
PKG_OPTS:= dev
PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
-PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
+PKG_ARCH_DEPENDS:= !m68k
PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE
PKGFS_WITH_DRI:= mesalib
diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile
index 0ffc44a1d..0e2ee6b2b 100644
--- a/package/xvinfo/Makefile
+++ b/package/xvinfo/Makefile
@@ -13,8 +13,6 @@ PKG_BUILDDEP:= libXv
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_ARCH_DEPENDS:= !cris
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XVINFO,xvinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/yajl/Makefile b/package/yajl/Makefile
index 79248e4d9..ff1537599 100644
--- a/package/yajl/Makefile
+++ b/package/yajl/Makefile
@@ -14,6 +14,8 @@ PKG_URL:= http://lloyd.github.com/yajl/
PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
+PKG_NOPARALLEL:= 1
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -21,7 +23,7 @@ $(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
CONFIG_STYLE:= manual
do-configure:
- (cd ${WRKBUILD} && PATH='${TARGET_PATH}' ./configure --prefix /usr)
+ (cd ${WRKBUILD} && PATH='${HOST_PATH}' ./configure --prefix /usr)
yajl-install:
$(INSTALL_DIR) $(IDIR_YAJL)/usr/lib
diff --git a/package/yajl/patches/patch-CMakeLists_txt b/package/yajl/patches/patch-CMakeLists_txt
index c1405d6c9..4f0b3f936 100644
--- a/package/yajl/patches/patch-CMakeLists_txt
+++ b/package/yajl/patches/patch-CMakeLists_txt
@@ -1,6 +1,6 @@
--- yajl-2.0.1.orig/CMakeLists.txt 2011-04-28 04:48:41.000000000 +0200
-+++ yajl-2.0.1/CMakeLists.txt 2013-07-30 15:20:53.000000000 +0200
-@@ -64,16 +64,5 @@ ENDIF (WIN32)
++++ yajl-2.0.1/CMakeLists.txt 2014-01-11 13:05:10.000000000 +0100
+@@ -64,16 +64,5 @@ ENDIF (WIN32)
ADD_SUBDIRECTORY(src)
diff --git a/package/yajl/patches/patch-configure b/package/yajl/patches/patch-configure
index 8ab73fc1c..1153f407c 100644
--- a/package/yajl/patches/patch-configure
+++ b/package/yajl/patches/patch-configure
@@ -1,5 +1,14 @@
--- yajl-2.0.1.orig/configure 2011-04-28 04:48:41.000000000 +0200
-+++ yajl-2.0.1/configure 2013-07-30 15:34:21.000000000 +0200
++++ yajl-2.0.1/configure 2014-01-11 13:06:37.000000000 +0100
+@@ -38,7 +38,7 @@ FileUtils.rm_f("Makefile")
+ puts "== running CMake in build directory"
+ FileUtils.mkdir("build")
+ FileUtils.cd("build") do
+- if (!system("cmake -DCMAKE_INSTALL_PREFIX='#{prefix}' .."))
++ if (!system("cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_INSTALL_PREFIX='#{prefix}' .."))
+ puts "The \"cmake\" program is required to configure yajl. It's"
+ puts "available from most ports/packaging systems and http://cmake.org"
+ exit 1
@@ -49,7 +49,7 @@ end
puts "== Generating Makefile"
File.open("Makefile", "w+") do |f|