diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-02 18:42:33 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-02 18:42:33 +0100 |
commit | 62cf4f1ab7f29f156dd399516e2301dc78fc9bb6 (patch) | |
tree | f3481a17dbdf7a5bb659efe0a40474873cf03092 | |
parent | 52a49601ba47b77d93d4856f2ee01e55755905f1 (diff) |
update mpdbox package collection, new lighttpd, kernel, php, mpd, mpc, libmpd, ffmpeg
81 files changed, 1170 insertions, 358 deletions
@@ -106,8 +106,8 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_3_11_5 - prompt "3.11.5" +config ADK_KERNEL_VERSION_3_11_10 + prompt "3.11.10" boolean config ADK_KERNEL_VERSION_3_9_11 @@ -122,7 +122,7 @@ endchoice config ADK_KERNEL_VERSION string - default "3.11.5" if ADK_KERNEL_VERSION_3_11_5 + default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 default "3.9.11" if ADK_KERNEL_VERSION_3_9_11 default "3.4.65" if ADK_KERNEL_VERSION_3_4_65 help diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index d4587aa7d..7c95d671d 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= edbf88eb7f7d34dbd5d3887726790755 endif -ifeq ($(ADK_KERNEL_VERSION_3_11_5),y) -KERNEL_VERSION:= 3.11.5 +ifeq ($(ADK_KERNEL_VERSION_3_11_10),y) +KERNEL_VERSION:= 3.11.10 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 05ae2366c942d116a821fd4c7e6ffa75 +KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 endif ifeq ($(ADK_KERNEL_VERSION_3_9_11),y) KERNEL_VERSION:= 3.9.11 diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 782a91284..0358c0382 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -17,11 +17,14 @@ pre-configure: do-configure: post-configure: ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} +ifneq (,$(filter autogen,${AUTOTOOL_STYLE})) + cd ${WRKSRC}; env ${AUTOTOOL_ENV} $(BASH) autogen.sh $(MAKE_TRACE) +endif ifneq (,$(filter autoconf,${AUTOTOOL_STYLE})) cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoconf $(MAKE_TRACE) endif ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) - cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if $(MAKE_TRACE) + cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -vif $(MAKE_TRACE) @rm -rf ${WRKSRC}/autom4te.cache @touch ${WRKDIR}/.autoreconf_done endif diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 8c1eeb317..923e7cb73 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -60,17 +60,20 @@ config BUSYBOX_FEATURE_DATE_COMPAT With this option off, 'date DATE' is 'date -s DATE' support the same format. With it on, 'date DATE' additionally supports MMDDhhmm[[YY]YY][.ss] format. + config BUSYBOX_HOSTID bool "hostid" default y help hostid prints the numeric identifier (in hexadecimal) for the current host. + config BUSYBOX_ID bool "id" default y help id displays the current user and group ID names. + config BUSYBOX_GROUPS bool "groups" default y @@ -128,17 +131,20 @@ config BUSYBOX_FEATURE_TR_EQUIV replace all instances of 'a' with 'xyz'. This option is mainly useful for cases when no other way of expressing a character is possible. + config BUSYBOX_BASE64 bool "base64" default y help Base64 encode and decode + config BUSYBOX_WHO bool "who" default y depends on BUSYBOX_FEATURE_UTMP help who is used to show who is logged on. + config BUSYBOX_USERS bool "users" default y diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 0a837cb64..4c05e5dae 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -747,7 +747,7 @@ config BUSYBOX_WALL config BUSYBOX_WATCHDOG bool "watchdog" - default n + default y depends on !BUSYBOX_DISABLE_WATCHDOG select BUSYBOX_PLATFORM_LINUX help diff --git a/package/glib/Makefile b/package/glib/Makefile index ac93c981a..6c7d113e6 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,14 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.28.1 -PKG_RELEASE:= 5 -PKG_EXTRAVER:= 2.28 -PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e +PKG_VERSION:= 2.36.4 +PKG_RELEASE:= 1 +PKG_EXTRAVER:= 2.36 +PKG_MD5SUM:= 2f4b15f7ef43d8702d067ab987bf7aba PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= libpthread -PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host zlib +PKG_BUILDDEP:= libffi gettext-tiny libiconv-tiny glib-host zlib PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ PKG_NOPARALLEL:= 1 @@ -21,6 +21,8 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk @@ -28,6 +30,7 @@ $(eval $(call HOST_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) HOST_STYLE:= auto +TARGET_CPPFLAGS+= -D_GNU_SOURCE TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-mem-pools \ --disable-rebuilds \ diff --git a/package/glib/patches/patch-Makefile_in b/package/glib/patches/patch-Makefile_in index b53217f1e..92e1eb072 100644 --- a/package/glib/patches/patch-Makefile_in +++ b/package/glib/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- glib-2.28.1.orig/Makefile.in 2011-02-18 16:22:03.000000000 +0100 -+++ glib-2.28.1/Makefile.in 2013-10-31 19:55:48.000000000 +0100 -@@ -422,7 +422,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo - gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in +--- glib-2.36.4.orig/Makefile.in 2013-08-07 16:43:05.000000000 +0200 ++++ glib-2.36.4/Makefile.in 2013-11-19 11:35:29.000000000 +0100 +@@ -686,7 +686,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo + gio-unix-2.0.pc.in gio-windows-2.0.pc.in check-abis.sh TEST_PROGS = ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} --SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs -+SUBDIRS = . m4macros glib gmodule gthread gobject gio po - DIST_SUBDIRS = $(SUBDIRS) build +-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs \ ++SUBDIRS = . m4macros glib gmodule gthread gobject gio po \ + $(am__append_1) + DIST_SUBDIRS = $(SUBDIRS) build $(am__append_2) bin_SCRIPTS = glib-gettextize - AM_CPPFLAGS = \ diff --git a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py new file mode 100644 index 000000000..e7df26bee --- /dev/null +++ b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py @@ -0,0 +1,9 @@ +--- glib-2.36.4.orig/gio/gdbus-2.0/codegen/config.py 2013-08-07 16:43:20.000000000 +0200 ++++ glib-2.36.4/gio/gdbus-2.0/codegen/config.py 2013-11-29 16:50:05.000000000 +0100 +@@ -23,5 +23,5 @@ + + DATADIR = "${prefix}/share" + DATADIR = DATADIR.replace( +- "${prefix}", "/usr/local") ++ "${prefix}", "/usr") + VERSION = "2.36.4" diff --git a/package/glib/patches/patch-gio_gnetworkmonitor_c b/package/glib/patches/patch-gio_gnetworkmonitor_c new file mode 100644 index 000000000..8147a2247 --- /dev/null +++ b/package/glib/patches/patch-gio_gnetworkmonitor_c @@ -0,0 +1,11 @@ +--- glib-2.36.4.orig/gio/gnetworkmonitor.c 2013-05-07 20:26:07.000000000 +0200 ++++ glib-2.36.4/gio/gnetworkmonitor.c 2013-11-29 16:58:28.000000000 +0100 +@@ -18,6 +18,8 @@ + * Boston, MA 02111-1307, USA. + */ + ++#include <string.h> ++ + #include "config.h" + #include "glib.h" + #include "glibintl.h" diff --git a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c new file mode 100644 index 000000000..a3cac9834 --- /dev/null +++ b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c @@ -0,0 +1,10 @@ +--- glib-2.36.4.orig/gio/gnetworkmonitornetlink.c 2013-08-07 16:36:32.000000000 +0200 ++++ glib-2.36.4/gio/gnetworkmonitornetlink.c 2013-11-29 17:14:56.000000000 +0100 +@@ -22,6 +22,7 @@ + + #include <errno.h> + #include <unistd.h> ++#include <string.h> + + #include "gnetworkmonitornetlink.h" + #include "gcredentials.h" diff --git a/package/glib/patches/patch-glib_gstrfuncs_c b/package/glib/patches/patch-glib_gstrfuncs_c deleted file mode 100644 index ec0543675..000000000 --- a/package/glib/patches/patch-glib_gstrfuncs_c +++ /dev/null @@ -1,15 +0,0 @@ ---- glib-2.28.1.orig/glib/gstrfuncs.c 2011-02-16 03:55:33.000000000 +0100 -+++ glib-2.28.1/glib/gstrfuncs.c 2013-11-06 18:24:29.973270200 +0100 -@@ -1423,12 +1423,6 @@ g_strsignal (gint signum) - #ifdef HAVE_STRSIGNAL - const char *msg_locale; - --#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN) --extern const char *strsignal(int); --#else -- /* this is declared differently (const) in string.h on BeOS */ -- extern char *strsignal (int sig); --#endif /* !G_OS_BEOS && !G_WITH_CYGWIN */ - msg_locale = strsignal (signum); - if (g_get_charset (NULL)) - return msg_locale; diff --git a/package/glib/patches/patch-gmodule-2_0_pc_in b/package/glib/patches/patch-gmodule-2_0_pc_in deleted file mode 100644 index db8446fed..000000000 --- a/package/glib/patches/patch-gmodule-2_0_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-2.28.1.orig/gmodule-2.0.pc.in 2010-04-13 15:33:16.000000000 +0200 -+++ glib-2.28.1/gmodule-2.0.pc.in 2011-03-25 19:49:39.000000000 +0100 -@@ -9,6 +9,6 @@ Name: GModule - Description: Dynamic module loader for GLib - Requires: glib-2.0 - Version: @VERSION@ --Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@ -+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@ - Libs.private: @G_MODULE_LIBS@ - Cflags: @G_THREAD_CFLAGS@ diff --git a/package/glib/patches/patch-gmodule-export-2_0_pc_in b/package/glib/patches/patch-gmodule-export-2_0_pc_in deleted file mode 100644 index bf61551fd..000000000 --- a/package/glib/patches/patch-gmodule-export-2_0_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-2.28.1.orig/gmodule-export-2.0.pc.in 2010-04-13 15:33:16.000000000 +0200 -+++ glib-2.28.1/gmodule-export-2.0.pc.in 2011-03-25 19:49:59.000000000 +0100 -@@ -9,6 +9,6 @@ Name: GModule - Description: Dynamic module loader for GLib - Requires: glib-2.0 - Version: @VERSION@ --Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@ -+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@ - Libs.private: @G_MODULE_LIBS@ - Cflags: @G_THREAD_CFLAGS@ diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh deleted file mode 100644 index b69b349d4..000000000 --- a/package/glib/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- glib-2.28.1.orig/ltmain.sh 2011-02-08 13:25:07.000000000 +0100 -+++ glib-2.28.1/ltmain.sh 2013-10-31 19:37:51.000000000 +0100 -@@ -5840,7 +5840,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index 32ee2216a..7973627ab 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -4,14 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= audiofile -PKG_VERSION:= 0.2.7 -PKG_RELEASE:= 3 -PKG_MD5SUM:= a39be317a7b1971b408805dc5e371862 +PKG_VERSION:= 0.3.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2731d79bec0acef3d30d2fc86b0b72fd PKG_DESCR:= audiofile library PKG_SECTION:= libs -PKG_BUILDDEP:= autotool -PKG_URL:= http://www.68k.org/~michael/audiofile/ -PKG_SITES:= http://www.68k.org/~michael/audiofile/ +PKG_URL:= http://audiofile.68k.org/ +PKG_SITES:= http://audiofile.68k.org/ PKG_LIBNAME:= libaudiofile PKG_OPTS:= dev @@ -19,8 +18,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= ac_cv_linux_vers=2 |