diff options
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 |