summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/avahi/Makefile6
-rw-r--r--package/bison/patches/patch-Makefile_in.orig13
-rw-r--r--package/cairo/Makefile14
-rw-r--r--package/daq/Makefile4
-rw-r--r--package/fontconfig/Makefile6
-rw-r--r--package/freetype/Makefile6
-rw-r--r--package/freetype/patches/patch-builds_unix_freetype-config_in16
-rw-r--r--package/freetype/patches/patch-builds_unix_freetype2_in13
-rw-r--r--package/freetype/patches/patch-builds_unix_ltmain_sh11
-rw-r--r--package/freetype/patches/patch-builds_unix_unix-cc_in11
-rw-r--r--package/glib/Makefile2
-rw-r--r--package/lame/Makefile4
-rw-r--r--package/lame/patches/patch-ltmain_sh11
-rw-r--r--package/libXft/patches/patch-src_xftglyphs_c16
-rw-r--r--package/libaio/patches/patch-src_Makefile.orig12
-rw-r--r--package/libaudiofile/Makefile2
-rw-r--r--package/libbluray/patches/patch-src_libbluray_decoders_textst_render_c11
-rw-r--r--package/libgd/Makefile12
-rw-r--r--package/libgd/patches/patch-gd_io_h10
-rw-r--r--package/libgd/patches/patch-src_gd_bmp_c11
-rw-r--r--package/libglew/patches/patch-Makefile133
-rw-r--r--package/libglew/patches/patch-Makefile.orig11
-rw-r--r--package/libglew/patches/patch-config_Makefile_linux.orig26
-rw-r--r--package/libx264/patches/patch-configure.orig23
-rw-r--r--package/libxml2/Makefile4
-rw-r--r--package/m4/Makefile2
-rw-r--r--package/orbit2/patches/patch-configure11
-rw-r--r--package/orbit2/patches/patch-linc2_src_Makefile_in11
-rw-r--r--package/pango/Makefile18
-rw-r--r--package/poppler/Makefile10
-rw-r--r--package/pycurl/Makefile4
-rw-r--r--package/python2/Makefile5
-rw-r--r--package/python2/patches/patch-Lib_distutils_sysconfig_py (renamed from package/python2/files/patch-Lib_distutils_sysconfig_py)0
-rw-r--r--package/rxvt-unicode/Makefile1
-rw-r--r--package/taglib/patches/patch-taglib_pc_cmake.orig19
-rw-r--r--package/tinyxml/patches/patch-Makefile.orig60
-rw-r--r--package/transproxy/patches/patch-Makefile.orig26
-rw-r--r--package/urlgrabber/patches/patch-setup_py.orig24
-rw-r--r--package/vlc/Makefile5
-rw-r--r--package/vlc/patches/patch-configure20
-rw-r--r--package/vlc/patches/patch-modules_misc_inhibit_xdg_c8
-rw-r--r--package/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c10
-rw-r--r--package/vlc/patches/patch-src_posix_linux_specific_c30
-rw-r--r--package/weechat/patches/patch-configure_ac.orig11
-rw-r--r--package/wget/Makefile6
-rw-r--r--package/wget/patches/patch-Makefile_am11
-rw-r--r--package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile.orig25
-rw-r--r--package/yajl/patches/patch-CMakeLists_txt.orig14
48 files changed, 299 insertions, 420 deletions
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index e5a910fac..a857cb6e2 100644
--- a/package/avahi/Makefile
+++ b/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
diff --git a/package/bison/patches/patch-Makefile_in.orig b/package/bison/patches/patch-Makefile_in.orig
deleted file mode 100644
index c427a7033..000000000
--- a/package/bison/patches/patch-Makefile_in.orig
+++ /dev/null
@@ -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.
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index a1015c603..30894cab5 100644
--- a/package/cairo/Makefile
+++ b/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
diff --git a/package/daq/Makefile b/package/daq/Makefile
index be48531c6..15a2648af 100644
--- a/package/daq/Makefile
+++ b/package/daq/Makefile
@@ -9,8 +9,8 @@ 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
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 902f1ae82..6c7f119a8 100644
--- a/package/fontconfig/Makefile
+++ b/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
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 7db8a879e..b5d239569 100644
--- a/package/freetype/Makefile
+++ b/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
diff --git a/package/freetype/patches/patch-builds_unix_freetype-config_in b/package/freetype/patches/patch-builds_unix_freetype-config_in
new file mode 100644
index 000000000..0348c4f56
--- /dev/null
+++ b/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()
diff --git a/package/freetype/patches/patch-builds_unix_freetype2_in b/package/freetype/patches/patch-builds_unix_freetype2_in
new file mode 100644
index 000000000..9abb5afd9
--- /dev/null
+++ b/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.
diff --git a/package/freetype/patches/patch-builds_unix_ltmain_sh b/package/freetype/patches/patch-builds_unix_ltmain_sh
deleted file mode 100644
index 89bf461e4..000000000
--- a/package/freetype/patches/patch-builds_unix_ltmain_sh
+++ /dev/null
@@ -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"
diff --git a/package/freetype/patches/patch-builds_unix_unix-cc_in b/package/freetype/patches/patch-builds_unix_unix-cc_in
deleted file mode 100644
index b4b1df60d..000000000
--- a/package/freetype/patches/patch-builds_unix_unix-cc_in
+++ /dev/null
@@ -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
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 6c7d113e6..41edca441 100644
--- a/package/glib/Makefile
+++ b/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
diff --git a/package/lame/Makefile b/package/lame/Makefile
index 1e0a086b1..261ffe840 100644
--- a/package/lame/Makefile
+++ b/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
diff --git a/package/lame/patches/patch-ltmain_sh b/package/lame/patches/patch-ltmain_sh
deleted file mode 100644
index 04a015282..000000000
--- a/package/lame/patches/patch-ltmain_sh
+++ /dev/null
@@ -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.
diff --git a/package/libXft/patches/patch-src_xftglyphs_c b/package/libXft/patches/patch-src_xftglyphs_c
new file mode 100644
index 000000000..54457857f
--- /dev/null
+++ b/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
diff --git a/package/libaio/patches/patch-src_Makefile.orig b/package/libaio/patches/patch-src_Makefile.orig
deleted file mode 100644
index 8e6a08179..000000000
--- a/package/libaio/patches/patch-src_Makefile.orig
+++ /dev/null
@@ -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=
diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile
index 7973627ab..2d01191fa 100644
--- a/package/libaudiofile/Makefile
+++ b/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
diff --git a/package/libbluray/patches/patch-src_libbluray_decoders_textst_render_c b/package/libbluray/patches/patch-src_libbluray_decoders_textst_render_c
new file mode 100644
index 000000000..bafee7c1c
--- /dev/null
+++ b/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"
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 4e6105e70..e4d913beb 100644
--- a/package/libgd/Makefile
+++ b/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}))
diff --git a/package/libgd/patches/patch-gd_io_h b/package/libgd/patches/patch-gd_io_h
deleted file mode 100644
index 1d083673c..000000000
--- a/package/libgd/patches/patch-gd_io_h
+++ /dev/null
@@ -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;
-
diff --git a/package/libgd/patches/patch-src_gd_bmp_c b/package/libgd/patches/patch-src_gd_bmp_c
new file mode 100644
index 000000000..cfbffca74
--- /dev/null
+++ b/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;
+ }
diff --git a/package/libglew/patches/patch-Makefile b/package/libglew/patches/patch-Makefile
index 9223c9ae8..51cabbe77 100644
--- a/package/libglew/patches/patch-Makefile
+++ b/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)
diff --git a/package/libglew/patches/patch-Makefile.orig b/package/libglew/patches/patch-Makefile.orig
deleted file mode 100644
index c31216b42..000000000
--- a/package/libglew/patches/patch-Makefile.orig
+++ /dev/null
@@ -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
-
diff --git a/package/libglew/patches/patch-config_Makefile_linux.orig b/package/libglew/patches/patch-config_Makefile_linux.orig
deleted file mode 100644
index 75adbb36e..000000000
--- a/package/libglew/patches/patch-config_Makefile_linux.orig
+++ /dev/null
@@ -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
diff --git a/package/libx264/patches/patch-configure.orig b/package/libx264/patches/patch-configure.orig
deleted file mode 100644
index b480bd661..000000000
--- a/package/libx264/patches/patch-configure.orig
+++ /dev/null
@@ -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
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 624ffdb26..7157a0705 100644
--- a/package/libxml2/Makefile
+++ b/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
diff --git a/package/m4/Makefile b/package/m4/Makefile
index 53a082b4d..8cb482904 100644
--- a/package/m4/Makefile
+++ b/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
diff --git a/package/orbit2/patches/patch-configure b/package/orbit2/patches/patch-configure
index e2a4d02c9..696d1b9ac 100644
--- a/package/orbit2/patches/patch-configure
+++ b/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
+
diff --git a/package/orbit2/patches/patch-linc2_src_Makefile_in b/package/orbit2/patches/patch-linc2_src_Makefile_in
index 6b17078e6..19b776ba2 100644
--- a/package/orbit2/patches/patch-linc2_src_Makefile_in
+++ b/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 \
diff --git a/package/pango/Makefile b/package/pango/Makefile
index a5e2aca9f..799348390 100644
--- a/package/pango/Makefile
+++ b/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
diff --git a/package/poppler/Makefile b/package/poppler/Makefile
index 1e15a4340..415cf8adc 100644
--- a/package/poppler/Makefile
+++ b/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}))
diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile
index c71552044..05dcb49d8 100644
--- a/package/pycurl/Makefile
+++ b/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
diff --git a/package/python2/Makefile b/package/python2/Makefile
index a0fa499a8..f176a8337 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= python2
PKG_VERSION:= 2.7.5
-PKG_RELEASE:= 8
+PKG_RELEASE:= 9
PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df
PKG_DESCR:= Python scripting language (Version 2)
PKG_SECTION:= lang
@@ -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
@@ -109,8 +110,6 @@ hostpost-install:
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
diff --git a/package/python2/files/patch-Lib_distutils_sysconfig_py b/package/python2/patches/patch-Lib_distutils_sysconfig_py
index 30aae0816..30aae0816 100644
--- a/package/python2/files/patch-Lib_distutils_sysconfig_py
+++ b/package/python2/patches/patch-Lib_distutils_sysconfig_py
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index e3a7f1ff4..0ffe3ad00 100644
--- a/package/rxvt-unicode/Makefile
+++ b/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
diff --git a/package/taglib/patches/patch-taglib_pc_cmake.orig b/package/taglib/patches/patch-taglib_pc_cmake.orig
deleted file mode 100644
index b626622b1..000000000
--- a/package/taglib/patches/patch-taglib_pc_cmake.orig
+++ /dev/null
@@ -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
diff --git a/package/tinyxml/patches/patch-Makefile.orig b/package/tinyxml/patches/patch-Makefile.orig
deleted file mode 100644
index 78372e7e5..000000000
--- a/package/tinyxml/patches/patch-Makefile.orig
+++ /dev/null
@@ -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
diff --git a/package/transproxy/patches/patch-Makefile.orig b/package/transproxy/patches/patch-Makefile.orig
deleted file mode 100644
index e0353c691..000000000
--- a/package/transproxy/patches/patch-Makefile.orig
+++ /dev/null
@@ -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.
diff --git a/package/urlgrabber/patches/patch-setup_py.orig b/package/urlgrabber/patches/patch-setup_py.orig
deleted file mode 100644
index a3ce96dc4..000000000
--- a/package/urlgrabber/patches/patch-setup_py.orig
+++ /dev/null
@@ -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'}
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 6c73f3fb9..4ea5f47c6 100644
--- a/package/vlc/Makefile
+++ b/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
diff --git a/package/vlc/patches/patch-configure b/package/vlc/patches/patch-configure
deleted file mode 100644
index 0989f6776..000000000
--- a/package/vlc/patches/patch-configure
+++ /dev/null
@@ -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}"
diff --git a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c b/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
index 74a5b7675..59643a5b3 100644
--- a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
+++ b/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>
diff --git a/package/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c b/package/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c
deleted file mode 100644
index 00f1a5f77..000000000
--- a/package/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c
+++ /dev/null
@@ -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
diff --git a/package/vlc/patches/patch-src_posix_linux_specific_c b/package/vlc/patches/patch-src_posix_linux_specific_c
deleted file mode 100644
index a5cdc1534..000000000
--- a/package/vlc/patches/patch-src_posix_linux_specific_c
+++ /dev/null
@@ -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 ();
diff --git a/package/weechat/patches/patch-configure_ac.orig b/package/weechat/patches/patch-configure_ac.orig
deleted file mode 100644
index 99b187ce6..000000000
--- a/package/weechat/patches/patch-configure_ac.orig
+++ /dev/null
@@ -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");
diff --git a/package/wget/Makefile b/package/wget/Makefile
index b03019bc3..30b074096 100644
--- a/package/wget/Makefile
+++ b/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
diff --git a/package/wget/patches/patch-Makefile_am b/package/wget/patches/patch-Makefile_am
new file mode 100644
index 000000000..dcb930fcf
--- /dev/null
+++ b/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 \
diff --git a/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile.orig b/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile.orig
deleted file mode 100644
index 9bea219d6..000000000
--- a/package/wpa_supplicant/patches/patch-wpa_supplicant_Makefile.orig
+++ /dev/null
@@ -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 " $@
-
diff --git a/package/yajl/patches/patch-CMakeLists_txt.orig b/package/yajl/patches/patch-CMakeLists_txt.orig
deleted file mode 100644
index 6d1a3f75a..000000000
--- a/package/yajl/patches/patch-CMakeLists_txt.orig
+++ /dev/null
@@ -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)
-