Merge branch 'master' of git+ssh://openadk.org/git/openadk

12 files changed, 40 insertions, 157 deletions

diff --git a/package/boost/Makefile b/package/boost/Makefile
index 75d66d069..1a648c04f 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -20,7 +20,7 @@ PKG_ARCH_DEPENDS:=	!m68k !xtensa
 DISTFILES:=		boost_$(PKG_EXTRAVER)_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_$(PKG_EXTRAVER)_0
 
-PKG_FLAVOURS_BOOST:=	DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION SIGNALS SYSTEM TEST THREAD WAVE
+PKG_FLAVOURS_BOOST:=	DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION SIGNALS TEST WAVE
 
 PKGFD_DATE_TIME:=	with date-time
 PKGFD_PYTHON:=		with python
@@ -34,9 +34,7 @@ PKGFD_PROGRAM_OPTIONS:=	with program_options
 PKGFD_REGEX:=		with regex
 PKGFD_SERIALIZATION:=	with serialization
 PKGFD_SIGNALS:=		with signals
-PKGFD_SYSTEM:=		with system
 PKGFD_TEST:=		with test
-PKGFD_THREAD:=		with thread
 PKGFD_WAVE:=		with wave
 
 include ${ADK_TOPDIR}/mk/package.mk
@@ -53,6 +51,7 @@ CONFIGURE_ARGS+=	--target=$(GNU_TARGET_NAME) \
 			--host=$(GNU_TARGET_NAME) \
 			--build=$(GNU_HOST_NAME) \
 			--prefix=${WRKINST}/usr \
+			--ignore-site-config \
 			--without-locale
 
 ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},)
@@ -84,15 +83,9 @@ endif
 ifeq (${ADK_PACKAGE_BOOST_SIGNALS},)
 CONFIGURE_ARGS+=	--without-signals
 endif
-ifeq (${ADK_PACKAGE_BOOST_SYSTEM},)
-CONFIGURE_ARGS+=	--without-system
-endif
 ifeq (${ADK_PACKAGE_BOOST_TEST},)
 CONFIGURE_ARGS+=	--without-test
 endif
-ifeq (${ADK_PACKAGE_BOOST_THREAD},)
-CONFIGURE_ARGS+=	--without-thread
-endif
 ifeq (${ADK_PACKAGE_BOOST_WAVE},)
 CONFIGURE_ARGS+=	--without-wave
 endif
@@ -137,10 +130,8 @@ endif
 			binary-format=elf \
 			toolset=gcc-${GPP_VERSION} \
 			--user-config=${USER_JAM} \
-			--build-type=minimal \
-			--layout=versioned \
+			--layout=system \
 			--disable-long-double \
-			--without-mpi \
 			${CONFIGURE_ARGS} \
 			install \
 	)
@@ -148,9 +139,5 @@ endif
 boost-install:
 	${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
 	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
-	# make symlink for simpler access to include files
-	(cd $(STAGING_TARGET_DIR)/usr/include/ ; \
-		ln -sf boost-$(PKG_EXTRAVER)/boost .)
-		
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp b/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp
new file mode 100644
index 000000000..8a0f617da
--- /dev/null
+++ b/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp
@@ -0,0 +1,12 @@
+--- boost_1_56_0.orig/boost/atomic/detail/caps_gcc_atomic.hpp	2014-07-07 20:40:41.000000000 +0200
++++ boost_1_56_0/boost/atomic/detail/caps_gcc_atomic.hpp	2014-09-20 11:44:49.000000000 +0200
+@@ -128,7 +128,7 @@
+ #define BOOST_ATOMIC_INT64_LOCK_FREE 0
+ #endif
+ 
+-#define BOOST_ATOMIC_THREAD_FENCE 2
+-#define BOOST_ATOMIC_SIGNAL_FENCE 2
++#define BOOST_ATOMIC_THREAD_FENCE 0
++#define BOOST_ATOMIC_SIGNAL_FENCE 0
+ 
+ #endif // BOOST_ATOMIC_DETAIL_CAPS_GCC_ATOMIC_HPP_INCLUDED_
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
index 8d07b8fdc..9856a709e 100644
--- a/package/ccid/Makefile
+++ b/package/ccid/Makefile
@@ -4,7 +4,7 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		ccid
-PKG_VERSION:=		1.4.4
+PKG_VERSION:=		1.4.17
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		79ef91103bcdd99a3b31cb5c5721a829
 PKG_DESCR:=		generic usb ccid and iccd driver
@@ -19,7 +19,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CCID,ccid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--enable-twinserial
 
 ccid-install:
diff --git a/package/esound/Makefile b/package/esound/Makefile
deleted file mode 100644
index b5303f30f..000000000
--- a/package/esound/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-PKG_NAME:=		esound
-PKG_VERSION:=		0.2.41
-PKG_RELEASE:=		8
-PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
-PKG_DESCR:=		enlightened sound daemon
-PKG_SECTION:=		mm/audio
-PKG_DEPENDS:=		libaudiofile libesd
-PKG_BUILDDEP:=		libaudiofile
-PKG_URL:=		http://www.tux.org/~ricdude/EsounD.html
-PKG_SITES:=		ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/
-PKG_LIBNAME:=		libesd
-PKG_OPTS:=		dev
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-PKG_SUBPKGS:=		ESOUND LIBESD
-PKGSC_LIBESD:=		libs/audio
-PKGSD_LIBESD:=		esound library
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBESD,libesd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBESD},${PKGSC_LIBESD},${PKG_OPTS}))
-
-AUTOTOOL_STYLE:=	autoreconf
-CONFIGURE_ARGS+=	--disable-alsa \
-			--disable-arts \
-			--enable-oss
-
-esound-install:
-	${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/
-
-libesd-install:
-	${INSTALL_DIR} ${IDIR_LIBESD}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libesd.so* $(IDIR_LIBESD)/usr/lib/
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/esound/files/esd.init b/package/esound/files/esd.init
deleted file mode 100644
index 336ec9bfe..000000000
--- a/package/esound/files/esd.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#PKG esound
-#INIT 75
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${esd:-NO}" = x"NO" && exit 0
-	test x"$esd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
-	exec sh $0 start
-	;;
-start)
-	# start as another user via: su - mpd -c 'esd ..'
-	/usr/bin/esd -public -tcp -nobeeps -noterminate &
-	;;
-stop)
-	kill $(pgrep -f /usr/bin/esd)
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start | stop | restart}"
-	;;
-esac
-exit 0
diff --git a/package/esound/files/esound.postinst b/package/esound/files/esound.postinst
deleted file mode 100644
index ecf2ec8da..000000000
--- a/package/esound/files/esound.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf esd NO
diff --git a/package/esound/patches/patch-esd_c b/package/esound/patches/patch-esd_c
deleted file mode 100644
index 2af302a63..000000000
--- a/package/esound/patches/patch-esd_c
+++ /dev/null
@@ -1,23 +0,0 @@
-$Id$
-
- cast to double, to avoid sinf, patch from Sven Gugges
-
---- esound-0.2.41.orig/esd.c	2008-11-18 21:35:19.000000000 +0100
-+++ esound-0.2.41/esd.c	2011-01-14 23:15:33.000000000 +0100
-@@ -134,14 +134,14 @@ void set_audio_buffer( void *buf, esd_fo
-     {
-     case ESD_BITS8:
- 	for ( i = 0 ; i < length ; i+=2 ) {
--	    sample = sin( (float)(i+offset) * kf );
-+	    sample = sin( (double)(i+offset) * kf );
- 	    uc_buf[i] = 127 + magl * sample;
- 	    uc_buf[i+1] = 127 + magr * sample;
- 	}
- 	break;
-     case ESD_BITS16:	/* assume same endianness */
- 	for ( i = 0 ; i < length ; i+=2 ) {
--	    sample = sin( (float)(i+offset) * kf );
-+	    sample = sin( (double)(i+offset) * kf );
- 	    ss_buf[i] = magl * sample;
- 	    ss_buf[i+1] = magr * sample;
- 	}
diff --git a/package/esound/patches/patch-esddsp_c b/package/esound/patches/patch-esddsp_c
deleted file mode 100644
index 3b774f403..000000000
--- a/package/esound/patches/patch-esddsp_c
+++ /dev/null
@@ -1,38 +0,0 @@
---- esound-0.2.41.orig/esddsp.c	2008-11-18 21:35:19.000000000 +0100
-+++ esound-0.2.41/esddsp.c	2013-12-23 16:08:43.000000000 +0100
-@@ -264,7 +264,7 @@ open_wrapper (int (*func) (const char *,
- }
- 
- int
--open (const char *pathname, int flags, ...)
-+esd_open (const char *pathname, int flags, ...)
- {
-   static int (*func) (const char *, int, mode_t) = NULL;
-   va_list args;
-@@ -291,7 +291,7 @@ open (const char *pathname, int flags, .
- }
- 
- int
--open64 (const char *pathname, int flags, ...)
-+esd_open64 (const char *pathname, int flags, ...)
- {
-   static int (*func) (const char *, int, mode_t) = NULL;
-   va_list args;
-@@ -355,7 +355,7 @@ fopen_wrapper (FILE * (*func) (const cha
- }
- 
- FILE *
--fopen (const char *path, const char *mode)
-+esd_fopen (const char *path, const char *mode)
- {
-   static FILE * (*func) (const char *, const char *) = NULL;
- 
-@@ -375,7 +375,7 @@ fopen (const char *path, const char *mod
- }
- 
- FILE *
--fopen64 (const char *path, const char *mode)
-+esd_fopen64 (const char *path, const char *mode)
- {
-   static FILE * (*func) (const char *, const char *) = NULL;
- 
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index af3423612..a2727cc53 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		kodi
 PKG_VERSION:=		14.0alpha4
 PKG_RELEASE:=		3
-PKG_MD5SUM:=		3329b7503846ea3ced64d71bdbd1f442
+PKG_MD5SUM:=		5bd39942150249d9eccf792d77b92554
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		boost python2 libstdcxx glibc-gconv
@@ -84,7 +84,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/opt/vc/include \
 			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \
 			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/opt/vc/lib -lkhrn_static
+TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/opt/vc/lib
 endif
 
 AUTOTOOL_STYLE:=	autoreconf
@@ -108,7 +108,8 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-alsa \
 			--enable-libvorbisenc \
 			--enable-debug \
-			--enable-udev
+			--enable-udev \
+			--with-ffmpeg=shared
 
 ifneq ($(ADK_PACKAGE_KODI_WITH_BLURAY),)
 CONFIGURE_ARGS+=	--enable-libbluray
diff --git a/package/kodi/patches/patch-configure_in b/package/kodi/patches/patch-configure_in
new file mode 100644
index 000000000..bfe90410a
--- /dev/null
+++ b/package/kodi/patches/patch-configure_in
@@ -0,0 +1,11 @@
+--- kodi-14.0alpha4.orig/configure.in	2014-09-05 14:09:58.000000000 +0200
++++ kodi-14.0alpha4/configure.in	2014-09-21 10:23:38.000000000 +0200
+@@ -1004,7 +1004,7 @@ if test "$use_gles" = "yes"; then
+       AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
+       AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
+       AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
+-      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
++      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lkhrn_static -lpthread -lm"
+     else
+       AC_CHECK_LIB([EGL],   [main],, AC_MSG_ERROR($missing_library))
+       AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index 1c426fb3e..1d4a66b1f 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -4,7 +4,7 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-ati
-PKG_VERSION:=		6.14.4
+PKG_VERSION:=		7.4.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		6bb71cff9ad9c5c7b258b2b6c56fdc95
 PKG_DESCR:=		x11 driver for ati vga chip
@@ -13,6 +13,8 @@ PKG_DEPENDS:=		xorg-server libdrm mesalib libudev libstdcxx
 PKG_BUILDDEP:=		xorg-server libdrm xf86driproto mesalib eudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_ARCH_DEPENDS:=      !arm !m68k
 PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA
 
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 129ce77d6..39fc3efc9 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -7,9 +7,15 @@ include Makefile.inc
 
 # disable SSP for libstdc++
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
+TARGET_CFLAGS:=		$(filter-out -fstack-protector-all,$(TARGET_CFLAGS))
 TARGET_CXXFLAGS:=	$(filter-out -fstack-protector-all,$(TARGET_CXXFLAGS))
 endif
 
+ifeq ($(ADK_LINUX_XTENSA),y)
+TARGET_CFLAGS:=		$(filter-out -mtext-section-literals,$(TARGET_CFLAGS))
+TARGET_CXXFLAGS:=	$(filter-out -mtext-section-literals,$(TARGET_CXXFLAGS))
+endif
+
 # for multilib m68k uClinux, we need to filter out some flags
 ifeq ($(ADK_TARGET_UCLINUX),y)
 TARGET_CFLAGS:=		$(filter-out -mcpu=5208,$(TARGET_CFLAGS))