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

mk/build.mk

@@ -36,6 +36,7 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_URLGRABBER=n \
 			ADK_PACKAGE_PERL=n \
 			ADK_PACKAGE_LIBSSP=n \
+			ADK_PACKAGE_OPENAFS=n \
 			ADK_PKG_XORG=n \
 			ADK_PKG_MPDBOX=n \
 			ADK_PKG_DEVELOPMENT=n \
@@ -572,8 +573,9 @@ release:
 			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 			rm .config; \
 		) 2>&1 | tee $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc/build.log; \
-		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \
+		if [ -f .exit ];then echo "Bulk build failed!"; break;fi \
 	done
+	if [ -f .exit ];then rm .exit;exit 1;fi
 
 # build all target architecture, target systems and libc combinations
 bulk:

mk/image.mk

@@ -121,12 +121,14 @@ INITRAMFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
 ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
+ROOTFSISO=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
 else
 TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel
 INITRAMFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
 ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
+ROOTFSISO=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
 endif
 
 ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
@@ -197,5 +199,16 @@ endif
 	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
 
+${BIN_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
+	mkdir -p ${TARGET_DIR}/boot/syslinux
+	cp ${STAGING_HOST_DIR}/usr/share/syslinux/{isolinux.bin,ldlinux.c32} \
+		${TARGET_DIR}/boot/syslinux
+	echo 'DEFAULT /boot/kernel root=/dev/sr0 init=/init' > \
+		${TARGET_DIR}/boot/syslinux/isolinux.cfg
+	${TOOLS_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \
+		-b boot/syslinux/isolinux.bin \
+		-c boot/syslinux/boot.cat -no-emul-boot \
+		-boot-load-size 4 -boot-info-table ${TARGET_DIR}
+
 imageclean:
 	rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-*

mk/rootfs.mk

@@ -52,5 +52,6 @@ $(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS)))
 $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3))
 $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init))
 $(eval $(call rootfs_template,encrypted,ENCRYPTED))
+$(eval $(call rootfs_template,iso,ISO))
 
 export ADK_TARGET_FS

package/avahi/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		avahi
-PKG_VERSION:=		0.6.30
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		e4db89a2a403ff4c47d66ac66fad1f43
+PKG_VERSION:=		0.6.31
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2f22745b8f7368ad5a0a3fddac343f2d
 PKG_DESCR:=		mDNS daemon
 PKG_SECTION:=		dhcp
 PKG_BUILDDEP:=		libdaemon expat gdbm glib gettext-tiny gtk+ dbus

package/binutils/patches/musl.patch

@@ -1,20 +0,0 @@
-diff -Nur binutils-2.22.orig/config.sub binutils-2.22/config.sub
---- binutils-2.22.orig/config.sub	2011-06-06 12:36:06.000000000 +0200
-+++ binutils-2.22/config.sub	2013-08-11 14:40:22.308115171 +0200
-@@ -126,6 +126,7 @@
- case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-   linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+  linux-musl* | \
-   knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1334,7 +1335,7 @@
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-android* \
--	      | -linux-newlib* | -linux-uclibc* \
-+	      | -linux-newlib* | -linux-uclibc* | -linux-musl* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

package/binutils/patches/patch-ld_Makefile_in

@@ -1,20 +0,0 @@
---- binutils-2.21.orig/ld/Makefile.in	2010-11-05 11:34:22.000000000 +0100
-+++ binutils-2.21/ld/Makefile.in	2011-01-10 21:57:49.000000000 +0100
-@@ -422,7 +422,7 @@ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BF
- 		    -I $(top_srcdir)/../libiberty
- 
- AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
--	@INCINTL@ $(HDEFINES) $(CFLAGS) $(PLUGIN_CFLAGS) \
-+	@INCINTL@ $(HDEFINES) $(PLUGIN_CFLAGS) \
- 	-DLOCALEDIR="\"$(datadir)/locale\""
- 
- BFDLIB = ../bfd/libbfd.la
-@@ -850,7 +850,7 @@ ld_new_LDADD = $(EMULATION_OFILES) $(EMU
- #
- @ENABLE_PLUGINS_TRUE@noinst_LTLIBRARIES = libldtestplug.la
- @ENABLE_PLUGINS_TRUE@libldtestplug_la_SOURCES = testplug.c
--@ENABLE_PLUGINS_TRUE@libldtestplug_la_CFLAGS = -g -O2
-+@ENABLE_PLUGINS_TRUE@libldtestplug_la_CFLAGS =
- @ENABLE_PLUGINS_TRUE@libldtestplug_la_LDFLAGS = -no-undefined -rpath /nowhere
- MAINTAINERCLEANFILES = configdoc.texi ld.1 ld.info
- 

package/binutils/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- binutils-2.21.orig/ltmain.sh	2010-01-09 22:11:32.000000000 +0100
-+++ binutils-2.21/ltmain.sh	2011-01-14 19:07:08.000000000 +0100
-@@ -4980,7 +4980,7 @@ func_mode_link ()
-       # @file GCC response files
-       # -tp=* Portland pgcc target processor selection
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

package/bison/patches/patch-Makefile_in.orig

@@ -1,13 +0,0 @@
---- bison-3.0.1.orig/Makefile.in	2013-11-12 14:57:09.000000000 +0100
-+++ bison-3.0.1/Makefile.in	2013-11-27 18:39:58.000000000 +0100
-@@ -5134,8 +5134,8 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $(
- doc/refcard.pdf: doc/refcard.tex
- 	$(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex
- $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
--	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
--	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
-+	bison$(EXEEXT) --version >doc/bison.help.tmp
-+	bison$(EXEEXT) --help   >>doc/bison.help.tmp
- 	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
- 
- # Depend on configure to get version number changes.

package/cairo/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
-PKG_VERSION:=		1.10.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
+PKG_VERSION:=		1.12.16
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a1304edcdc99282f478b995ee5f8f854
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
@@ -17,7 +17,7 @@ PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 PKG_OPTS:=		dev
 
-#DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
@@ -34,11 +34,13 @@ ifeq (,$(filter cris,$(TARGET_ARCH)))
 TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
 endif
 CONFIGURE_ARGS+=	--enable-ft=yes \
+			--enable-fc=yes \
 			--enable-tee=yes \
 			--enable-xlib=yes
 
 cairo-install:
-	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcairo.so* ${IDIR_CAIRO}/usr/lib
+	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo
+	${CP} ${WRKINST}/usr/lib/libcairo*.so* ${IDIR_CAIRO}/usr/lib
+	${CP} ${WRKINST}/usr/lib/cairo/*.so* ${IDIR_CAIRO}/usr/lib/cairo
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/daq/Makefile

@@ -9,11 +9,12 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		a00855a153647df76d47f1ea454f74ae
 PKG_DESCR:=		daq
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libpcap
-PKG_BUILDDEP:=		libpcap autotool
+PKG_DEPENDS:=		libpcap libdnet
+PKG_BUILDDEP:=		libpcap libdnet autotool
 PKG_URL:=		http://www.snort.org
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
+PKG_NOPARALLEL:=	1
 
 include $(TOPDIR)/mk/package.mk
 

package/dbus-python/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dbus-python
 PKG_VERSION:=		1.2.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b09cd2d1a057cc432ce944de3fc06bf7
 PKG_DESCR:=		DBUS python bindings
 PKG_SECTION:=		libs

package/dbus-python/patches/patch-configure

@@ -0,0 +1,11 @@
+--- dbus-python-1.2.0.orig/configure	2013-05-08 09:48:42.000000000 +0200
++++ dbus-python-1.2.0/configure	2013-12-13 12:52:44.522656370 +0100
+@@ -11762,7 +11762,7 @@ $as_echo "$as_me: PYTHON_INCLUDES overri
+ else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python headers using $PYTHON-config --includes" >&5
+ $as_echo_n "checking for Python headers using $PYTHON-config --includes... " >&6; }
+-  PYTHON_INCLUDES=`$PYTHON-config --includes`
++  PYTHON_INCLUDES=`python-config --includes`
+   if test $? = 0; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5
+ $as_echo "$PYTHON_INCLUDES" >&6; }

package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c

@@ -1,11 +1,11 @@
 --- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-09-11 01:15:16.000000000 +0200
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-10-23 16:28:38.000000000 +0200
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-10 13:18:17.000000000 +0100
 @@ -59,7 +59,7 @@ static char *RCSSTRING __UNUSED__="$Id:
  #include <net/if_dl.h>
  #include <net/if_types.h>
  #include <sys/sockio.h>
 -#else
-+#elif 0
++#elif __GLIBC__
  #include <linux/if.h>
  #endif
  #include <net/route.h>

package/fontconfig/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		fontconfig
-PKG_VERSION:=		2.10.91
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		0a8edc63aa79377b2bf44e469d5bbbb7
+PKG_VERSION:=		2.11.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		84278204cd7f36adbea7ad8094e039ac
 PKG_DESCR:=		library for configuring and customizing font access
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxml2

package/freetype/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		freetype
-PKG_VERSION:=		2.4.4
+PKG_VERSION:=		2.5.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9273efacffb683483e58a9e113efae9f
+PKG_MD5SUM:=		a359993ad0dc23323c676b04fdb57110
 PKG_DESCR:=		A free, high-quality and portable font engine
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
@@ -24,6 +24,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIGURE_ARGS+=	--without-png
+
 libfreetype-install:
 	${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib

package/freetype/patches/patch-builds_unix_freetype-config_in

@@ -0,0 +1,16 @@
+--- freetype-2.5.1.orig/builds/unix/freetype-config.in	2013-11-12 13:33:36.000000000 +0100
++++ freetype-2.5.1/builds/unix/freetype-config.in	2013-12-06 15:56:16.000000000 +0100
+@@ -13,10 +13,10 @@ LC_ALL=C
+ export LC_ALL
+ 
+ prefix="%prefix%"
+-exec_prefix="%exec_prefix%"
++exec_prefix="${prefix}/bin"
+ exec_prefix_set="no"
+-includedir="%includedir%"
+-libdir="%libdir%"
++includedir="${prefix}/include"
++libdir="${prefix}/lib"
+ enable_shared="%build_libtool_libs%"
+ 
+ usage()

package/freetype/patches/patch-builds_unix_freetype2_in

@@ -0,0 +1,13 @@
+--- freetype-2.5.1.orig/builds/unix/freetype2.in	2013-11-12 13:53:44.000000000 +0100
++++ freetype-2.5.1/builds/unix/freetype2.in	2013-12-06 16:08:11.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix="%prefix%"
+-exec_prefix="%exec_prefix%"
+-libdir="%libdir%"
+-includedir="%includedir%/freetype2"
++exec_prefix="${prefix}"
++libdir="${prefix}/lib"
++includedir="${prefix}/include/freetype2"
+ 
+ Name: FreeType 2
+ Description: A free, high-quality, and portable font engine.

package/freetype/patches/patch-builds_unix_ltmain_sh

@@ -1,11 +0,0 @@
---- freetype-2.3.11.orig/builds/unix/ltmain.sh	2009-10-10 20:37:53.000000000 +0200
-+++ freetype-2.3.11/builds/unix/ltmain.sh	2011-01-14 00:21:25.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"

package/freetype/patches/patch-builds_unix_unix-cc_in

@@ -1,11 +0,0 @@
---- freetype-2.4.4.orig/builds/unix/unix-cc.in	2010-08-31 13:04:28.000000000 +0200
-+++ freetype-2.4.4/builds/unix/unix-cc.in	2011-02-05 18:05:59.000000000 +0100
-@@ -101,7 +101,7 @@ LDFLAGS := @LDFLAGS@
- CCraw_build  := @CC_BUILD@	# native CC of building system
- E_BUILD      := @EXEEXT_BUILD@	# extension for exexutable on building system
- EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
--CCexe        := $(CCraw_build)	# used to compile `apinames' only
-+CCexe        := $(CCraw_build) $(CFLAGS_FOR_BUILD)	# used to compile `apinames' only
- 
- 
- # Library linking

package/glib/Makefile

@@ -11,7 +11,7 @@ PKG_MD5SUM:=		2f4b15f7ef43d8702d067ab987bf7aba
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpthread
-PKG_BUILDDEP:=		libffi gettext-tiny libiconv-tiny glib-host zlib
+PKG_BUILDDEP:=		libffi gettext-tiny libiconv-tiny glib-host zlib libelf dbus
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
 PKG_NOPARALLEL:=	1

package/kmod/Makefile

@@ -4,13 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		kmod
-PKG_VERSION:=		5
+PKG_VERSION:=		15
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b271c2ec54aba1c67bda63c8579d8c15
+PKG_MD5SUM:=		d03372179ed2cfa0c52b6672cf438901
 PKG_DESCR:=		kernel module loading library
 PKG_SECTION:=		libs
 PKG_URL:=		http://profusion.mobi/index.php
-PKG_SITES:=		http://packages.profusion.mobi/kmod/
+PKG_SITES:=		https://www.kernel.org/pub/linux/utils/kernel/kmod/
 PKG_OPTS:=		dev
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
@@ -19,6 +19,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KMOD,kmod,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIG_STYLE:=		minimal
+CONFIGURE_ARGS+=	--host=${REAL_GNU_TARGET_NAME}
+
 kmod-install:
 	$(INSTALL_DIR) $(IDIR_KMOD)/usr/bin
 	$(INSTALL_DIR) $(IDIR_KMOD)/usr/lib

package/kmod/patches/patch-libkmod_libkmod_pc_in

@@ -0,0 +1,13 @@
+--- kmod-15.orig/libkmod/libkmod.pc.in	2013-04-24 22:02:37.000000000 +0200
++++ kmod-15/libkmod/libkmod.pc.in	2013-12-09 12:32:04.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: libkmod
+ Description: Library to deal with kernel modules

package/lame/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		lame
-PKG_VERSION:=		3.98.4
+PKG_VERSION:=		3.99
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8e9866ad6b570c6c95c8cba48060473f
+PKG_MD5SUM:=		7abacd1d0a65a63733335786015626db
 PKG_DESCR:=		LAME MP3 encoder
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libncurses

package/lame/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- lame-398-2.orig/ltmain.sh	2008-01-03 01:00:01.000000000 +0100
-+++ lame-398-2/ltmain.sh	2011-01-15 22:13:38.000000000 +0100
-@@ -1693,7 +1693,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @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)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.

package/libXft/patches/patch-src_xftglyphs_c

@@ -0,0 +1,16 @@
+--- libXft-2.3.1.orig/src/xftglyphs.c	2012-06-02 18:36:35.000000000 +0200
++++ libXft-2.3.1/src/xftglyphs.c	2013-12-07 12:17:23.000000000 +0100
+@@ -21,10 +21,10 @@
+  */
+ 
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
++#include <ftoutln.h>
++#include <ftlcdfil.h>
+ 
+-#include <freetype/ftsynth.h>
++#include <ftsynth.h>
+ 
+ /*
+  * Validate the memory info for a font

package/libaio/patches/patch-src_Makefile.orig

@@ -1,12 +0,0 @@
---- libaio-0.3.109.orig/src/Makefile	2009-10-09 20:17:02.000000000 +0200
-+++ libaio-0.3.109/src/Makefile	2012-08-18 12:46:43.000000000 +0200
-@@ -3,7 +3,8 @@ includedir=$(prefix)/include
- libdir=$(prefix)/lib
- 
- ARCH := $(shell uname -m | sed -e s/i.86/i386/)
--CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
-+CFLAGS ?= -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
-+CFLAGS += -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
- SO_CFLAGS=-shared $(CFLAGS)
- L_CFLAGS=$(CFLAGS)
- LINK_FLAGS=

package/libaudiofile/Makefile

@@ -10,6 +10,8 @@ PKG_MD5SUM:=		2731d79bec0acef3d30d2fc86b0b72fd
 PKG_DESCR:=		audiofile library
 PKG_SECTION:=		libs
 PKG_URL:=		http://audiofile.68k.org/
+PKG_BUILDDEP:=		flac
+PKG_DEPENDS:=		libflac
 PKG_SITES:=		http://audiofile.68k.org/
 PKG_LIBNAME:=		libaudiofile
 PKG_OPTS:=		dev

package/libbluray/patches/patch-src_libbluray_decoders_textst_render_c

@@ -0,0 +1,11 @@
+--- libbluray-0.4.0.orig/src/libbluray/decoders/textst_render.c	2013-09-18 10:52:01.000000000 +0200
++++ libbluray-0.4.0/src/libbluray/decoders/textst_render.c	2013-12-08 15:47:03.000000000 +0100
+@@ -30,7 +30,7 @@
+ #ifdef HAVE_FT2
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/ftsynth.h>
++#include <ftsynth.h>
+ #endif
+ 
+ #include "textst_render.h"

package/libgd/Makefile

@@ -3,19 +3,21 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME:=		gd
-PKG_VERSION:=		2.0.35
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		982963448dc36f20cb79b6e9ba6fdede
+PKG_NAME:=		libgd
+PKG_VERSION:=		2.1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		03588159bf4faab9079849c8d709acc6
 PKG_DESCR:=		A library for the dynamic creation of images
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libjpeg libpng
 PKG_BUILDDEP:=		libpng jpeg
 PKG_URL:=		http://www.libgd.org/
-PKG_SITES:=		http://www.libgd.org/releases/
+PKG_SITES:=		https://bitbucket.org/libgd/gd-libgd/downloads/
 PKG_LIBNAME:=		libgd
 PKG_OPTS:=		dev
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))

package/libgd/patches/patch-gd_io_h

@@ -1,10 +0,0 @@
---- gd-2.0.36.orig/gd_io.h	2007-11-27 09:30:34.000000000 +0100
-+++ gd-2.0.36/gd_io.h	2012-10-14 16:10:30.000000000 +0200
-@@ -26,6 +26,7 @@ typedef struct gdIOCtx
- 
-   void (*gd_free) (struct gdIOCtx *);
- 
-+  void    *data;
- }
- gdIOCtx;
- 

package/libgd/patches/patch-src_gd_bmp_c

@@ -0,0 +1,11 @@
+--- libgd-2.1.0.orig/src/gd_bmp.c	2013-06-25 11:58:23.000000000 +0200
++++ libgd-2.1.0/src/gd_bmp.c	2013-12-08 16:23:11.000000000 +0100
+@@ -792,7 +792,7 @@ static int bmp_read_1bit(gdImagePtr im,
+ 	}
+ 
+ 	/* The line must be divisible by 4, else its padded with NULLs */
+-	padding = ((int)ceill(0.1 * info->width)) % 4;
++	padding = ((int)ceil(0.1 * info->width)) % 4;
+ 	if (padding) {
+ 		padding = 4 - padding;
+ 	}

package/libglew/patches/patch-Makefile

@@ -1,5 +1,23 @@
 --- glew-1.10.0.orig/Makefile	2013-07-22 16:11:22.000000000 +0200
-+++ glew-1.10.0/Makefile	2013-07-30 13:16:20.000000000 +0200
++++ glew-1.10.0/Makefile	2013-12-08 15:26:15.000000000 +0100
+@@ -31,13 +31,13 @@
+ include config/version
+ 
+ SHELL = /bin/sh
+-SYSTEM ?= $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;')
+-SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEM) && echo 1)
++SYSTEMS ?= $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;')
++SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEMS) && echo 1)
+ 
+ ifeq ($(SYSTEM.SUPPORTED), 1)
+-include config/Makefile.$(SYSTEM)
++include config/Makefile.$(SYSTEMS)
+ else
+-$(error "Platform '$(SYSTEM)' not supported")
++$(error "Platform '$(SYSTEMS)' not supported")
+ endif
+ 
+ GLEW_DEST ?= /usr
 @@ -71,7 +71,8 @@ else
  OPT = $(POPT)
  endif
@@ -10,3 +28,116 @@
  
  all debug: glew.lib glew.lib.mx glew.bin
  
+@@ -83,14 +84,14 @@ LIB.LIBS           := $(GL_LDFLAGS)
+ LIB.SRCS           := src/glew.c
+ LIB.SRCS.NAMES     := $(notdir $(LIB.SRCS))
+ 
+-LIB.OBJS           := $(addprefix tmp/$(SYSTEM)/default/static/,$(LIB.SRCS.NAMES))
++LIB.OBJS           := $(addprefix tmp/$(SYSTEMS)/default/static/,$(LIB.SRCS.NAMES))
+ LIB.OBJS           := $(LIB.OBJS:.c=.o)
+-LIB.SOBJS          := $(addprefix tmp/$(SYSTEM)/default/shared/,$(LIB.SRCS.NAMES))
++LIB.SOBJS          := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(LIB.SRCS.NAMES))
+ LIB.SOBJS          := $(LIB.SOBJS:.c=.o)
+ 
+-LIB.OBJS.MX        := $(addprefix tmp/$(SYSTEM)/mx/static/,$(LIB.SRCS.NAMES))
++LIB.OBJS.MX        := $(addprefix tmp/$(SYSTEMS)/mx/static/,$(LIB.SRCS.NAMES))
+ LIB.OBJS.MX        := $(LIB.OBJS.MX:.c=.o)
+-LIB.SOBJS.MX       := $(addprefix tmp/$(SYSTEM)/mx/shared/,$(LIB.SRCS.NAMES))
++LIB.SOBJS.MX       := $(addprefix tmp/$(SYSTEMS)/mx/shared/,$(LIB.SRCS.NAMES))
+ LIB.SOBJS.MX       := $(LIB.SOBJS.MX:.c=.o)
+ 
+ glew.lib: lib lib/$(LIB.SHARED) lib/$(LIB.STATIC) glew.pc
+@@ -114,11 +115,11 @@ ifneq ($(STRIP),)
+ 	$(STRIP) -x $@
+ endif
+ 
+-tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++tmp/$(SYSTEMS)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
+-tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++tmp/$(SYSTEMS)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
+@@ -154,11 +155,11 @@ ifneq ($(STRIP),)
+ 	$(STRIP) -x $@
+ endif
+ 
+-tmp/$(SYSTEM)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++tmp/$(SYSTEMS)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU -DGLEW_MX -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
+-tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++tmp/$(SYSTEMS)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
+@@ -183,17 +184,17 @@ BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(
+ 
+ GLEWINFO.BIN       := glewinfo$(BIN.SUFFIX)
+ GLEWINFO.BIN.SRC   := src/glewinfo.c
+-GLEWINFO.BIN.OBJ   := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC)))
++GLEWINFO.BIN.OBJ   := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC)))
+ GLEWINFO.BIN.OBJ   := $(GLEWINFO.BIN.OBJ:.c=.o)
+ 
+ VISUALINFO.BIN     := visualinfo$(BIN.SUFFIX)
+ VISUALINFO.BIN.SRC := src/visualinfo.c
+-VISUALINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(VISUALINFO.BIN.SRC)))
++VISUALINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(notdir $(VISUALINFO.BIN.SRC)))
+ VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o)
+ 
+ # Don't build glewinfo or visualinfo for NaCL, yet.
+ 
+-ifneq ($(filter nacl%,$(SYSTEM)),)
++ifneq ($(filter nacl%,$(SYSTEMS)),)
+ glew.bin: glew.lib bin
+ else
+ glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) 
+@@ -233,7 +234,7 @@ install.mx:  install.include install.lib
+ install.lib: glew.lib
+ 	$(INSTALL) -d -m 0755 $(LIBDIR)
+ # runtime
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(INSTALL) -d -m 0755 $(BINDIR)
+ 	$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
+ else
+@@ -244,7 +245,7 @@ ifneq ($(LN),)
+ endif
+ 
+ # development files
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
+ endif
+ ifneq ($(LN),)
+@@ -255,7 +256,7 @@ endif
+ install.lib.mx: glew.lib.mx
+ 	$(INSTALL) -d -m 0755 $(LIBDIR)
+ # runtime
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(INSTALL) -d -m 0755 $(BINDIR)
+ 	$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
+ else
+@@ -265,7 +266,7 @@ ifneq ($(LN),)
+ 	$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX)
+ endif
+ # development files
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/
+ endif
+ ifneq ($(LN),)
+@@ -298,7 +299,7 @@ uninstall:
+ 	$(RM) $(INCDIR)/glew.h
+ 	$(RM) $(INCDIR)/glxew.h
+ 	$(RM) $(LIBDIR)/$(LIB.DEVLNK) $(LIBDIR)/$(LIB.DEVLNK.MX)
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(RM) $(BINDIR)/$(LIB.SHARED) $(BINDIR)/$(LIB.SHARED.MX)
+ else
+ 	$(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX)

package/libglew/patches/patch-Makefile.orig

@@ -1,11 +0,0 @@
---- glew-1.10.0.orig/Makefile	2013-07-22 16:11:22.000000000 +0200
-+++ glew-1.10.0/Makefile	2013-07-30 13:15:41.000000000 +0200
-@@ -71,7 +71,7 @@ else
- OPT = $(POPT)
- endif
- INCLUDE = -Iinclude
--CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
-+CFLAGS ?= $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
- 
- all debug: glew.lib glew.lib.mx glew.bin
- 

package/libglew/patches/patch-config_Makefile_linux.orig

@@ -1,26 +0,0 @@
---- glew-1.10.0.orig/config/Makefile.linux	2013-07-22 16:11:22.000000000 +0200
-+++ glew-1.10.0/config/Makefile.linux	2013-07-30 13:14:42.000000000 +0200
-@@ -1,21 +1,7 @@
- NAME = $(GLEW_NAME)
--CC = cc
--LD = cc
-+CC ?= cc
-+LD ?= cc
- M_ARCH ?= $(shell uname -m)
--ARCH64 = false
--ifeq (x86_64,${M_ARCH})
--  ARCH64 = true
--endif
--ifeq (ppc64,${M_ARCH})
--  ARCH64 = true
--endif
--ifeq (${ARCH64},true)
--  LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
--  LIBDIR = $(GLEW_DEST)/lib64
--else
--  LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
--  LIBDIR = $(GLEW_DEST)/lib
--endif
- LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic

package/libx264/patches/patch-configure.orig

@@ -1,23 +0,0 @@
---- libx264-1.0.orig/configure	2013-10-10 22:45:04.000000000 +0200
-+++ libx264-1.0/configure	2013-10-11 11:33:39.000000000 +0200
-@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then
- elif [ $ARCH = ARM ]; then
-     # arm-gcc-4.2 produces incorrect output with -ffast-math
-     # and it doesn't save any speed anyway on 4.4, so disable it
--    CFLAGS="-O3 -fno-fast-math $CFLAGS"
-+    CFLAGS="-fno-fast-math $CFLAGS"
- else
--    CFLAGS="-O3 -ffast-math $CFLAGS"
-+    CFLAGS="-ffast-math $CFLAGS"
- fi
- 
- if cc_check '' -fno-tree-vectorize ; then
-@@ -1136,7 +1136,7 @@ LIBX264=$LIBX264
- AR=$AR
- RANLIB=$RANLIB
- STRIP=$STRIP
--AS=$AS
-+AS=$CC
- ASFLAGS=$ASFLAGS
- RC=$RC
- RCFLAGS=$RCFLAGS

package/libxml2/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libxml2
 PKG_VERSION:=		2.9.1
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		9c0cfef285d5c4a5c80d00904ddab380
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
@@ -45,7 +45,7 @@ AUTOTOOL_STYLE:=	autoreconf
 TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_LDFLAGS+=	-lpthread
 ifneq ($(ADK_PACKAGE_LIBXML2_PYTHON),)
-CONFIGURE_ARGS+=	--with-python=$(STAGING_TARGET_DIR)/usr
+CONFIGURE_ARGS+=	--with-python
 else
 CONFIGURE_ARGS+=	--without-python
 endif

package/m4/Makefile

@@ -13,6 +13,8 @@ PKG_BUILDDEP:=		m4-host
 PKG_URL:=		http://www.gnu.org/software/m4/
 PKG_SITES:=		${MASTER_SITE_GNU:=m4/}
 
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
+
 include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 

package/orbit2/patches/patch-configure

@@ -1,5 +1,5 @@
 --- ORBit2-2.14.19.orig/configure	2010-09-28 11:39:37.000000000 +0200
-+++ ORBit2-2.14.19/configure	2011-03-25 19:39:53.000000000 +0100
++++ ORBit2-2.14.19/configure	2013-12-08 19:30:23.000000000 +0100
 @@ -8373,7 +8373,7 @@ $as_echo_n "checking whether the $compil
      # here allows them to be overridden if necessary.
      runpath_var=LD_RUN_PATH
@@ -9,3 +9,12 @@
      # ancient GNU ld didn't support --whole-archive et. al.
      if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+@@ -12950,7 +12950,7 @@ $as_echo "$WARN_CFLAGS" >&6; }
+ 
+ if test "$enable_maintainer_mode" = "yes"; then
+ 	DISABLE_DEPRECATED_CFLAGS=" \
+-		-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
++		-DG_DISABLE_SINGLE_INCLUDES"
+ 
+ fi
+ 

package/orbit2/patches/patch-linc2_src_Makefile_in

@@ -1,5 +1,5 @@
 --- ORBit2-2.14.19.orig/linc2/src/Makefile.in	2010-09-28 11:39:39.000000000 +0200
-+++ ORBit2-2.14.19/linc2/src/Makefile.in	2011-05-17 11:54:33.596610948 +0200
++++ ORBit2-2.14.19/linc2/src/Makefile.in	2013-12-08 19:32:44.000000000 +0100
 @@ -54,7 +54,7 @@ am_liblinc_la_OBJECTS = linc.lo linc-con
  liblinc_la_OBJECTS = $(am_liblinc_la_OBJECTS)
  liblinc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -18,3 +18,12 @@
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
+@@ -244,7 +244,7 @@ noinst_LTLIBRARIES = liblinc.la
+ #	-I$(top_srcdir)/include    
+ INCLUDES = -I$(top_builddir)/linc2/include \
+ 	-I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \
+-	-DG_DISABLE_DEPRECATED $(am__append_1)
++	$(am__append_1)
+ liblinc_la_SOURCES = \
+ 	linc.c			\
+ 	linc-connection.c	\

package/pam/Makefile

@@ -24,6 +24,10 @@ XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ARGS+=	--disable-nis \
 			--enable-db=no
 
+post-install:
+	# /lib is not automatically installed to staging area
+	$(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_TARGET_DIR)/usr/lib
+
 pam-install:
 	$(INSTALL_DIR) $(IDIR_PAM)/etc/security
 	$(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security
@@ -31,7 +35,5 @@ pam-install:
 	$(CP) $(WRKINST)/lib/libpam*.so* $(IDIR_PAM)/lib
 	$(CP) $(WRKINST)/lib/security/*.so* $(IDIR_PAM)/lib/security
 	$(CP) ./files/pam.conf $(IDIR_PAM)/etc
-	# /lib is not automatically installed to staging area
-	$(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_DIR)/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/pango/Makefile

@@ -4,17 +4,19 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		pango
-PKG_VERSION:=		1.28.3
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		22ad1c8d3fda7e73b0798035f3dd96bc
+PKG_VERSION:=		1.36.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9e0d3a1ea395172f8c39ba98a4d2081a
 PKG_DESCR:=		pango library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		libXft glib cairo libstdcxx fontconfig
+PKG_BUILDDEP:=		libXft glib cairo harfbuzz libstdcxx fontconfig
 PKG_URL:=		http://www.pango.org/
-PKG_SITES:=		${MASTER_SITE_GNOME:=pango/1.28/}
+PKG_SITES:=		${MASTER_SITE_GNOME:=pango/1.36/}
 PKG_NEED_CXX:=		1
 PKG_OPTS:=		dev
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
@@ -28,10 +30,10 @@ CONFIGURE_ENV+=		ac_cv_path_EGREP="grep -E"
 
 pango-install:
 	$(INSTALL_DIR) $(IDIR_PANGO)/etc/pango
-	$(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.6.0/modules
+	$(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.8.0/modules
 	$(INSTALL_DATA) ./files/pango.modules $(IDIR_PANGO)/etc/pango
 	$(CP) $(WRKINST)/usr/lib/libpango*.so* $(IDIR_PANGO)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/pango/1.6.0/modules/*.so \
-		$(IDIR_PANGO)/usr/lib/pango/1.6.0/modules
+	$(CP) $(WRKINST)/usr/lib/pango/1.8.0/modules/*.so \
+		$(IDIR_PANGO)/usr/lib/pango/1.8.0/modules
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/poppler/Makefile

@@ -4,17 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		poppler
-PKG_VERSION:=		0.22.1
+PKG_VERSION:=		0.24.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		50c259fdda538c1ba94b62aa25f7ec87
+PKG_MD5SUM:=		2da22b966cf7a2f8da5bf021e68188ce
 PKG_DESCR:=		pdf rendering library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		fontconfig libstdcxx
-PKG_DEPENDS:=		fontconfig libstdcxx
+PKG_BUILDDEP:=		fontconfig libstdcxx libpng cairo
+PKG_DEPENDS:=		fontconfig libstdcxx libpng cairo
 PKG_URL:=		http://poppler.freedesktop.org/
 PKG_SITES:=		http://poppler.freedesktop.org/
 PKG_OPTS:=		dev
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,POPPLER,poppler,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))

package/pycurl/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pycurl
-PKG_VERSION:=		7.19.0
+PKG_VERSION:=		7.19.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		919d58fe37e69fe87ce4534d8b6a1c7b
+PKG_MD5SUM:=		518be33976dbc6838e42495ada64b43f
 PKG_DESCR:=		Python module for fetching of files
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		python2 curl

package/python2/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
 PKG_VERSION:=		2.7.5
-PKG_RELEASE:=		8
+PKG_RELEASE:=		10
 PKG_MD5SUM:=		b4f01a1d0ba0b46b05c73b2ac909b1df
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang
@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		autotool libffi python2-host
 PKG_DEPENDS:=		libpthread libffi libgcc
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
-PKG_OPTS:=		dev noscripts
+PKG_OPTS:=		dev
 
 PKG_HOST_DEPENDS:=	!netbsd !openbsd
 
@@ -97,6 +97,7 @@ CONFIGURE_ARGS:=	--with-threads \
 
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS:=	--with-threads \
+			--disable-ipv6 \
 			--disable-shared \
 			--disable-toolbox-glue \
 			--without-cxx-main
@@ -105,12 +106,10 @@ CFLAGS_FOR_BUILD+=	-fPIC
 hostpost-install:
 	$(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
 		$(STAGING_HOST_DIR)/usr/bin/pgen
+	(cd $(STAGING_HOST_DIR)/usr/bin && \
+		patch -p0 < $(TOPDIR)/package/python2/files/python-config.patch)
 
 pre-configure:
-	(cd $(WRKBUILD) && patch -p1 < \
-		$(TOPDIR)/package/python2/files/patch-Misc_python-config_in )
-	(cd $(WRKBUILD) && patch -p1 < \
-		$(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py )
 	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
 		$(WRKBUILD)/Misc/python-config.in
 

package/python2/files/patch-Misc_python-config_in → package/python2/files/python-config.patch

@@ -1,5 +1,5 @@
---- Python-2.7.5.orig/Misc/python-config.in	2013-05-12 05:32:49.000000000 +0200
-+++ Python-2.7.5/Misc/python-config.in	2013-10-30 21:29:47.000000000 +0100
+--- python2.7-config.orig	2013-12-11 12:40:37.244519764 +0100
++++ python2.7-config	2013-12-11 12:41:43.279093075 +0100
 @@ -3,6 +3,7 @@
  import sys
  import os
@@ -8,14 +8,14 @@
  from distutils import sysconfig
  
  valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
-@@ -37,8 +38,8 @@ for opt in opt_flags:
+@@ -37,8 +38,8 @@
          print sysconfig.EXEC_PREFIX
  
      elif opt in ('--includes', '--cflags'):
 -        flags = ['-I' + sysconfig.get_python_inc(),
 -                 '-I' + sysconfig.get_python_inc(plat_specific=True)]
-+        flags = ['-I' + re.sub('host_', 'target_', sysconfig.get_python_inc()),
-+                 '-I' + re.sub('host_', 'target_', sysconfig.get_python_inc(plat_specific=True))]
++        flags = ['-I' + re.sub('target_', 'host_', sysconfig.get_python_inc()),
++                 '-I' + re.sub('target_', 'host_', sysconfig.get_python_inc(plat_specific=True))]
          if opt == '--cflags':
              flags.extend(getvar('CFLAGS').split())
          print ' '.join(flags)

package/rxvt-unicode/Makefile

@@ -23,6 +23,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RXVT_UNICODE,rxvt-unicode,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-lpthread
 CONFIGURE_ARGS+=	--disable-perl \
 			--disable-utmp \
 			--disable-afterimage

package/systemd/Makefile

@@ -5,12 +5,13 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		systemd
 PKG_VERSION:=		208
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		df64550d92afbffb4f67a434193ee165
 PKG_DESCR:=		System and Service Manager
 PKG_SECTION:=		utils
-PKG_DEPENDS:=		libblkid
-PKG_BUILDDEP:=		usbutils glib kmod util-linux
+PKG_DEPENDS:=		libblkid libcap
+PKG_BUILDDEP:=		autotool usbutils glib kmod util-linux libcap
+PKG_BUILDDEP+=		libgcrypt
 PKG_URL:=		http://freedesktop.org/wiki/Software/systemd/
 PKG_SITES:=		http://www.freedesktop.org/software/systemd/
 PKG_LIBNAME:=		libudev
@@ -33,12 +34,12 @@ 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}))
 
+AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-lrt
-CONFIGURE_ARGS+=	--disable-logging \
-			--disable-static \
+CONFIGURE_ARGS+=	--disable-static \
 			--without-python \
-			--with-pci-ids-path=/usr/share/pci.ids \
-			--disable-introspection
+			--disable-manpages \
+			--disable-polkit
 
 udev-install:
 	${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev

package/systemd/patches/patch-Makefile_am

@@ -0,0 +1,20 @@
+--- systemd-208.orig/Makefile.am	2013-10-02 04:57:09.000000000 +0200
++++ systemd-208/Makefile.am	2013-12-14 16:18:32.000000000 +0100
+@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ AM_MAKEFLAGS = --no-print-directory
+ AUTOMAKE_OPTIONS = color-tests parallel-tests
+ 
+-SUBDIRS = . po
++SUBDIRS = .
+ 
+ # remove targets if the command fails
+ .DELETE_ON_ERROR:
+@@ -537,8 +537,6 @@ dist_doc_DATA = \
+ 	LICENSE.MIT \
+ 	DISTRO_PORTING
+ 
+-@INTLTOOL_POLICY_RULE@
+-
+ # ------------------------------------------------------------------------------
+ 
+ MANPAGES =

package/systemd/patches/patch-configure_ac

@@ -0,0 +1,12 @@
+--- systemd-208.orig/configure.ac	2013-10-02 01:54:26.000000000 +0200
++++ systemd-208/configure.ac	2013-12-13 16:37:55.000000000 +0100
+@@ -47,9 +47,6 @@ LT_INIT([disable-static])
+ AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by systemd])])
+ AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])])
+ 
+-# i18n stuff for the PolicyKit policy files
+-IT_PROG_INTLTOOL([0.40.0])
+-
+ GETTEXT_PACKAGE=systemd
+ AC_SUBST(GETTEXT_PACKAGE)
+ 

package/taglib/patches/patch-taglib_pc_cmake.orig

@@ -1,19 +0,0 @@
---- taglib-1.8.orig/taglib.pc.cmake	2012-09-06 20:03:15.000000000 +0200
-+++ taglib-1.8/taglib.pc.cmake	2013-07-31 11:54:55.000000000 +0200
-@@ -1,11 +1,11 @@
- prefix=${CMAKE_INSTALL_PREFIX}
--exec_prefix=${CMAKE_INSTALL_PREFIX}
--libdir=${LIB_INSTALL_DIR}
--includedir=${INCLUDE_INSTALL_DIR}
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: TagLib
- Description: Audio meta-data library
- Requires: 
- Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
--Libs: -L${LIB_INSTALL_DIR} -ltag
--Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 
-+Libs: -L${libdir} -ltag
-+Cflags: -I${includedir}/taglib 

package/tinyxml/patches/patch-Makefile.orig

@@ -1,60 +0,0 @@
---- tinyxml.orig/Makefile	2013-07-30 15:47:27.000000000 +0200
-+++ tinyxml/Makefile	2013-07-30 15:47:25.000000000 +0200
-@@ -15,13 +15,13 @@ PROFILE        := NO
- 
- # TINYXML_USE_STL can be used to turn on STL support. NO, then STL
- # will not be used. YES will include the STL files.
--TINYXML_USE_STL := NO
-+TINYXML_USE_STL := YES
- 
- #****************************************************************************
- 
--CC     := gcc
--CXX    := g++
--LD     := g++
-+CC     ?= gcc
-+CXX    ?= g++
-+LD     := $(CXX)
- AR     := ar rc
- RANLIB := ranlib
- 
-@@ -41,9 +41,9 @@ ifeq (YES, ${DEBUG})
-    CXXFLAGS     := ${DEBUG_CXXFLAGS}
-    LDFLAGS      := ${DEBUG_LDFLAGS}
- else
--   CFLAGS       := ${RELEASE_CFLAGS}
--   CXXFLAGS     := ${RELEASE_CXXFLAGS}
--   LDFLAGS      := ${RELEASE_LDFLAGS}
-+   CFLAGS       ?= ${RELEASE_CFLAGS}
-+   CXXFLAGS     ?= ${RELEASE_CXXFLAGS}
-+   LDFLAGS      ?= ${RELEASE_LDFLAGS}
- endif
- 
- ifeq (YES, ${PROFILE})
-@@ -81,7 +81,7 @@ CXXFLAGS := ${CXXFLAGS} ${DEFS}
- # Targets of the build
- #****************************************************************************
- 
--OUTPUT := xmltest
-+OUTPUT := libtinyxml.so.2.6.2
- 
- all: ${OUTPUT}
- 
-@@ -90,7 +90,7 @@ all: ${OUTPUT}
- # Source files
- #****************************************************************************
- 
--SRCS := tinyxml.cpp tinyxmlparser.cpp xmltest.cpp tinyxmlerror.cpp tinystr.cpp
-+SRCS := tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp tinystr.cpp
- 
- # Add on the sources for libraries
- SRCS := ${SRCS}
-@@ -103,6 +103,8 @@ OBJS := $(addsuffix .o,$(basename ${SRCS
- 
- ${OUTPUT}: ${OBJS}
- 	${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
-+	${CXX} -shared -Wl,-soname,libtinyxml.so.2.6.2 -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${EXTRA_LIBS}
-+	ln -sf libtinyxml.so.2.6.2 libtinyxml.so
- 
- #****************************************************************************
- # common rules

package/transproxy/patches/patch-Makefile.orig

@@ -1,26 +0,0 @@
---- transproxy-1.6.orig/Makefile	2004-03-31 14:19:34.000000000 +0200
-+++ transproxy-1.6/Makefile	2012-10-23 11:07:54.000000000 +0200
-@@ -64,17 +64,17 @@ OPTIONS += -DIPTABLES
- #OPTIONS += -DHAVE_GETOPT_H
- 
- # You may need to touch PREFIX, CC and CFLAGS.
--PREFIX = /usr/local
--INSTALL_PROGRAM = install -c -m 555 -o bin -g bin
--INSTALL_MAN = install -c -m 444 -o bin -g bin
-+PREFIX ?= $(DESTDIR)/usr
-+INSTALL_PROGRAM = install -c -m 555
-+INSTALL_MAN = install -c -m 444
- 
- # Some make's don't define this.
- RM      = rm -f
- 
- # Should be OK for GNU gcc.
--CC      = gcc
--CFLAGS  = -O2 -Wall
--LDFLAGS = -s
-+CC      ?= gcc
-+CFLAGS  ?= -O2 -Wall
-+LDFLAGS ?= -s
- 
- # For using BIND resolver instead of system resolver.
- #LIBS    += -lresolv	# Really old Linux has this.

package/urlgrabber/patches/patch-setup_py.orig

@@ -1,24 +0,0 @@
---- urlgrabber-3.9.1.orig/setup.py	2009-02-23 22:37:16.000000000 +0100
-+++ urlgrabber-3.9.1/setup.py	2013-02-11 13:46:24.000000000 +0100
-@@ -1,16 +1,16 @@
- # urlgrabber distutils setup
- import re as _re
--import urlgrabber as _urlgrabber
-+#import urlgrabber as _urlgrabber
- 
- name = "urlgrabber"
- description = "A high-level cross-protocol url-grabber"
--long_description = _urlgrabber.__doc__
-+long_description = "A high-level cross-protocol url-grabber"
- license = "LGPL"
--version = _urlgrabber.__version__
--_authors = _re.split(r',\s+', _urlgrabber.__author__)
-+version = 3.9.1
-+_authors = _re.split(r',\s+', 'Michael D. Stenner, Ryan Tomayko')
- author       = ', '.join([_re.sub(r'\s+<.*',        r'', _) for _ in _authors])
- author_email = ', '.join([_re.sub(r'(^.*<)|(>.*$)', r'', _) for _ in _authors])
--url = _urlgrabber.__url__
-+url = "http://linux.duke.edu/projects/urlgrabber/"
- 
- packages = ['urlgrabber']
- package_dir = {'urlgrabber':'urlgrabber'}

package/vlc/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		vlc
-PKG_VERSION:=		2.0.7
+PKG_VERSION:=		2.1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3b0e465b0990097b65abaf3e25589957
+PKG_MD5SUM:=		1331cd853d56762c96afcb92dd498348
 PKG_DESCR:=		Media Player
 PKG_SECTION:=		multimedia
 PKG_BUILDDEP:=		ffmpeg xcb-util libtheora libgcrypt libmad
@@ -15,6 +15,7 @@ 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_LIBC_DEPENDS:=	eglibc glibc musl
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
@@ -39,6 +40,7 @@ CONFIGURE_ARGS+=	--disable-lua \
 			--enable-libgcrypt \
 			--enable-mad \
 			--enable-theora \
+			--disable-static \
 			--disable-avcodec
 
 vlc-install:

package/vlc/patches/patch-configure

@@ -1,20 +0,0 @@
---- vlc-2.0.3.orig/configure	2012-07-04 17:43:18.000000000 +0200
-+++ vlc-2.0.3/configure	2012-07-26 16:16:15.000000000 +0200
-@@ -24739,7 +24739,7 @@ fi
-   LIBS="${LIBS_save}"
- 
- 
-- for a in all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration; do
-+ for a in all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var; do
- 
- 
-   CFLAGS_save="${CFLAGS}"
-@@ -46952,7 +46952,7 @@ fi
- 
- 
- VERSION_MESSAGE="${VERSION} ${CODENAME}"
--COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
-+COPYRIGHT_MESSAGE="Copyright ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
- 
- cat >>confdefs.h <<_ACEOF
- #define VERSION_MESSAGE "${VERSION_MESSAGE}"

package/vlc/patches/patch-modules_misc_inhibit_xdg_c

@@ -1,8 +1,8 @@
---- vlc-2.0.3.orig/modules/misc/inhibit/xdg.c	2011-12-08 19:00:26.000000000 +0100
-+++ vlc-2.0.3/modules/misc/inhibit/xdg.c	2012-07-26 16:36:07.000000000 +0200
-@@ -27,7 +27,6 @@
- #include <vlc_inhibit.h>
+--- vlc-2.1.1.orig/modules/misc/inhibit/xdg.c	2013-06-24 20:00:38.000000000 +0200
++++ vlc-2.1.1/modules/misc/inhibit/xdg.c	2013-12-06 19:42:43.000000000 +0100
+@@ -28,7 +28,6 @@
  #include <assert.h>
+ #include <errno.h>
  #include <signal.h>
 -#include <spawn.h>
  #include <sys/wait.h>

package/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c

@@ -1,10 +0,0 @@
---- vlc-2.0.3.orig/modules/misc/inhibit/xscreensaver.c	2011-12-08 19:00:26.000000000 +0100
-+++ vlc-2.0.3/modules/misc/inhibit/xscreensaver.c	2012-07-26 16:36:21.000000000 +0200
-@@ -39,7 +39,6 @@
- #include <sys/wait.h>
- #include <fcntl.h>
- #include <signal.h>
--#include <spawn.h>
- 
- /*****************************************************************************
-  * Local prototypes

package/vlc/patches/patch-modules_text_renderer_freetype_c

@@ -0,0 +1,11 @@
+--- vlc-2.1.1.orig/modules/text_renderer/freetype.c	2013-09-12 17:18:34.000000000 +0200
++++ vlc-2.1.1/modules/text_renderer/freetype.c	2013-12-10 10:13:38.000000000 +0100
+@@ -90,7 +90,7 @@
+ #endif
+ 
+ /* Freetype */
+-#include <freetype/ftsynth.h>
++#include <ftsynth.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_STROKER_H

package/vlc/patches/patch-src_posix_linux_specific_c

@@ -1,30 +0,0 @@
---- vlc-2.0.3.orig/src/posix/linux_specific.c	2011-12-08 19:00:28.000000000 +0100
-+++ vlc-2.0.3/src/posix/linux_specific.c	2012-07-26 16:08:31.000000000 +0200
-@@ -83,27 +83,8 @@ static struct
-     unsigned refs;
- } once = { VLC_STATIC_MUTEX, 0 };
- 
--#ifdef __GLIBC__
--# include <gnu/libc-version.h>
--# include <stdlib.h>
--#endif
--
- void system_Init (void)
- {
--#ifdef __GLIBC__
--    const char *glcv = gnu_get_libc_version ();
--
--    /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
--     * especially in sterror_r(). Even if we have NLS disabled, the calling
--     * process might have called setlocale(). */
--    if (strverscmp (glcv, "2.5") >= 0 && strverscmp (glcv, "2.8") < 0)
--    {
--        fputs ("LibVLC has detected an unusable buggy GNU/libc version.\n"
--               "Please update to version 2.8 or newer.\n", stderr);
--        fflush (stderr);
--    }
--#endif
--
-     vlc_mutex_lock (&once.lock);
-     if (once.refs++ == 0)
-         set_libvlc_path ();

package/weechat/patches/patch-configure_ac.orig

@@ -1,11 +0,0 @@
---- weechat-0.4.2.orig/configure.ac	2013-10-06 08:58:14.000000000 +0200
-+++ weechat-0.4.2/configure.ac	2013-11-07 10:05:15.000000000 +0100
-@@ -242,7 +242,7 @@ if test "x$ac_found_iconv_header" = "xye
-       LIBS="$LIBS $ICONV_LFLAGS"
-    fi
-    AC_MSG_CHECKING(for iconv usability in programs)
--   AC_TRY_RUN([
-+   AC_TRY_LINK([
-         #include <iconv.h>
-         int main(int argc, char **argv) {
-             iconv_t conv = iconv_open("ISO8859-1", "UTF-8");

package/wget/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		12edc291dba8127f2e9696e69f36299e
 PKG_DESCR:=		retrieving files using HTTP(S) and FTP
 PKG_SECTION:=		www
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.gnu.org/software/wget/
 PKG_SITES:=		${MASTER_SITE_GNU:=wget/}
 
@@ -36,9 +37,12 @@ CONFIGURE_ARGS+=	--with-ssl=gnutls \
 			--with-libgnutls-prefix="$(STAGING_DIR)/usr"
 endif
 
+AUTOTOOL_STYLE:=	autoreconf
+
 wget-install:
 	${INSTALL_DIR} ${IDIR_WGET}/etc ${IDIR_WGET}/usr/bin
-	${INSTALL_DATA} ${WRKINST}/etc/wgetrc ${IDIR_WGET}/etc/
+	${INSTALL_DATA} ${WRKBUILD}/doc/sample.wgetrc \
+		${IDIR_WGET}/etc/wgetrc
 	${INSTALL_BIN} ${WRKINST}/usr/bin/wget ${IDIR_WGET}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/wget/patches/patch-Makefile_am

@@ -0,0 +1,11 @@
+--- wget-1.14.orig/Makefile.am	2012-05-13 16:44:48.000000000 +0200
++++ wget-1.14/Makefile.am	2013-12-06 17:00:51.000000000 +0100
+@@ -41,7 +41,7 @@ distuninstallcheck_listfiles = find . -t
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ # subdirectories in the distribution
+-SUBDIRS = lib src doc po tests util
++SUBDIRS = lib src po tests util
+ 
+ EXTRA_DIST = ChangeLog.README MAILING-LIST \
+              msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \

package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile.orig

@@ -1,25 +0,0 @@
---- wpa_supplicant-2.0.orig/wpa_supplicant/Makefile	2013-01-12 16:42:53.000000000 +0100
-+++ wpa_supplicant-2.0/wpa_supplicant/Makefile	2013-08-20 17:30:19.132133775 +0200
-@@ -999,9 +999,6 @@ CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
- ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST
- CFLAGS += -DLTM_FAST
- endif
--else
--LIBS += -ltommath
--LIBS_p += -ltommath
- endif
- CONFIG_INTERNAL_AES=y
- CONFIG_INTERNAL_DES=y
-@@ -1519,10 +1516,12 @@ preauth_test: $(OBJS_t2)
- 	@$(E) "  LD " $@
- 
- wpa_passphrase: $(OBJS_p)
-+	echo crypto: $(CONFIG_CRYPTO)
- 	$(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p)
- 	@$(E) "  LD " $@
- 
- wpa_cli: $(OBJS_c)
-+	echo crypto: $(CONFIG_CRYPTO)
- 	$(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
- 	@$(E) "  LD " $@
- 

package/yajl/patches/patch-CMakeLists_txt.orig

@@ -1,14 +0,0 @@
---- 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:13:12.000000000 +0200
-@@ -64,11 +64,6 @@ ENDIF (WIN32)
- 
- 
- ADD_SUBDIRECTORY(src)
--ADD_SUBDIRECTORY(test)
--ADD_SUBDIRECTORY(reformatter)
--ADD_SUBDIRECTORY(verify)
--ADD_SUBDIRECTORY(example)
--ADD_SUBDIRECTORY(perf)
- 
- INCLUDE(YAJLDoc.cmake)
- 

target/config/Config.in

@@ -669,7 +669,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_NATIVE
 	depends on !ADK_HARDWARE_VBOX
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_KERNEL_EXT2_FS
 	help
 	  create an read-only initramfs system.
@@ -749,6 +748,16 @@ config ADK_TARGET_ROOTFS_MMC
 	  Use this option if you have a MMC/SDCARD based system.
 	  (ext2 filesystem is used.)
 
+config ADK_TARGET_ROOTFS_ISO
+	bool "ISO image"
+	select ADK_KERNEL_ISO9660_FS
+	select ADK_KERNEL_JOLIET
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_BLK_DEV_SR
+	depends on ADK_HOST_LINUX
+	help
+	  Use this option to create a bootable ISO image.
+
 config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
 	select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU

target/linux/config/Config.in.block

@@ -28,6 +28,9 @@ config ADK_KERNEL_SCSI
 config ADK_KERNEL_BLK_DEV_SD
 	boolean
 
+config ADK_KERNEL_BLK_DEV_SR
+	boolean
+
 config ADK_KERNEL_ISCSI_TCP
 	boolean
 
@@ -324,6 +327,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD
 config ADK_KPACKAGE_KMOD_BLK_DEV_SR
 	prompt "kmod-scsi-cdrom................... SCSI CDROM support"
 	depends on !ADK_KERNEL_SCSI
+	depends on !ADK_KERNEL_BLK_DEV_SR
 	depends on ADK_KPACKAGE_KMOD_SCSI
 	tristate
 	help

target/linux/config/Config.in.fs

@@ -227,7 +227,11 @@ config ADK_KPACKAGE_KMOD_FUSE_FS
 	  fuse-utils.
 
 config ADK_KERNEL_JOLIET
-	bool 
+	boolean 
+	default n
+
+config ADK_KERNEL_ISO9660_FS
+	boolean
 	default n
 
 config ADK_KPACKAGE_KMOD_ISO9660_FS

target/x86/Makefile

@@ -65,4 +65,8 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 endif
+ifeq (${ADK_TARGET_FS},iso)
+imageinstall: ${BIN_DIR}/${ROOTFSISO}
+	@echo 'ISO image is at $<'
+endif
 endif

tools/Makefile

@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio mkimage genext2fs
+TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools syslinux
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

tools/cdrtools/Makefile

@@ -0,0 +1,25 @@
+# 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:=		cdrtools
+PKG_VERSION:=		3.00
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		bb21cefefcfbb76cf249120e8978ffdd
+PKG_SITES:=		ftp://ftp.berlios.de/pub/cdrecord/
+
+include ../rules.mk
+
+install: ${TOOLS_DIR}/mkisofs
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	#(cd ${WRKBUILD}; ./configure)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${TOOLS_DIR}/mkisofs: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/mkisofs/OBJ/*/mkisofs \
+		${TOOLS_DIR}
+
+include $(TOPDIR)/mk/tools.mk

tools/syslinux/Makefile

@@ -0,0 +1,37 @@
+# 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:=		syslinux
+PKG_VERSION:=		6.02
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		086ac1c569d226a5e2ae3d605de09a1d
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/boot/syslinux/
+
+include ../rules.mk
+WRKINST:=		${WRKBUILD}/openadk_installroot
+
+install: ${TOOLS_DIR}/extlinux ${STAGING_HOST_DIR}/usr/share/syslinux/.installed
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	#(cd ${WRKBUILD}; ./configure)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' bios installer
+	touch $@
+
+$(WRKBUILD)/.installed: ${WRKBUILD}/.compiled
+	mkdir -p ${WRKINST}
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' \
+		INSTALLROOT='${WRKINST}' \
+		bios install
+
+${TOOLS_DIR}/extlinux: $(WRKBUILD)/.installed
+	$(INSTALL_BIN) ${WRKINST}/sbin/extlinux \
+		${TOOLS_DIR}
+
+${STAGING_HOST_DIR}/usr/share/syslinux/.installed: ${WRKBUILD}/.installed
+	mkdir -p ${STAGING_HOST_DIR}/usr/share
+	${CP} ${WRKINST}/usr/share/syslinux ${STAGING_HOST_DIR}/usr/share
+	touch ${STAGING_HOST_DIR}/usr/share/syslinux/.installed
+
+include $(TOPDIR)/mk/tools.mk