summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Makefile.cmake.in4
-rw-r--r--package/busybox/Config.in2
-rw-r--r--package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch12
-rw-r--r--package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch11
-rw-r--r--package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch10
-rw-r--r--package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch29
-rw-r--r--package/customize/Config.in1
-rw-r--r--package/dropbear/dropbear-2011.54-no-ipv6.patch18
-rw-r--r--package/dropbear/dropbear.mk2
-rw-r--r--package/efl/libecore/libecore.mk13
-rw-r--r--package/libpng/libpng.mk3
-rw-r--r--package/libvncserver/libvncserver.mk1
-rw-r--r--package/multimedia/ffmpeg/ffmpeg.mk4
-rw-r--r--package/multimedia/gst-dsp/gst-dsp.mk2
-rw-r--r--package/mxml/mxml.mk4
-rw-r--r--package/python/python.mk9
16 files changed, 33 insertions, 92 deletions
diff --git a/package/Makefile.cmake.in b/package/Makefile.cmake.in
index aea118519..1cd65e46f 100644
--- a/package/Makefile.cmake.in
+++ b/package/Makefile.cmake.in
@@ -96,6 +96,10 @@ endef
endif
endif
+# This must be repeated from GENTARGETS_INNER, otherwise we only get
+# host-cmake in _DEPENDENCIES because of the following line
+$(2)_DEPENDENCIES ?= $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
+
$(2)_DEPENDENCIES += host-cmake
#
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 4176020d3..c20650964 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -41,7 +41,7 @@ config BR2_BUSYBOX_VERSION
default "1.16.2" if BR2_BUSYBOX_VERSION_1_16_X
default "1.17.4" if BR2_BUSYBOX_VERSION_1_17_X
default "1.18.5" if BR2_BUSYBOX_VERSION_1_18_X
- default "1.19.3" if BR2_BUSYBOX_VERSION_1_19_X
+ default "1.19.4" if BR2_BUSYBOX_VERSION_1_19_X
config BR2_PACKAGE_BUSYBOX_CONFIG
string "BusyBox configuration file to use?"
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
deleted file mode 100644
index 84dad6f1b..000000000
--- a/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- busybox-1.19.3/loginutils/getty.c
-+++ busybox-1.19.3-getty/loginutils/getty.c
-@@ -271,7 +271,9 @@ static void termios_init(int speed)
- #ifdef CMSPAR
- | CMSPAR /* mark or space parity */
- #endif
-+#ifdef CBAUD
- | CBAUD /* (output) baud rate */
-+#endif
- #ifdef CBAUDEX
- | CBAUDEX /* (output) baud rate */
- #endif
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch
deleted file mode 100644
index 653ac35c5..000000000
--- a/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.19.3/util-linux/mdev.c
-+++ busybox-1.19.3-mdev/util-linux/mdev.c
-@@ -610,7 +610,7 @@ int mdev_main(int argc UNUSED_PARAM, cha
- int seqlen;
- char seqbuf[sizeof(int)*3 + 2];
-
-- seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1));
-+ seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
- if (seqlen < 0) {
- seq = NULL;
- break;
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch
deleted file mode 100644
index 9dd5c103a..000000000
--- a/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.19.3/modutils/modinfo.c
-+++ busybox-1.19.3-modinfo/modutils/modinfo.c
-@@ -13,6 +13,7 @@
- //config:config MODINFO
- //config: bool "modinfo"
- //config: default y
-+//config: select PLATFORM_LINUX
- //config: help
- //config: Show information about a Linux Kernel module
-
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch
deleted file mode 100644
index e98a506cb..000000000
--- a/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- busybox-1.19.3/networking/wget.c
-+++ busybox-1.19.3-wget/networking/wget.c
-@@ -552,6 +552,7 @@ static void download_one_url(const char
- FILE *dfp; /* socket to ftp server (data) */
- char *proxy = NULL;
- char *fname_out_alloc;
-+ char *redirected_path = NULL;
- struct host_info server;
- struct host_info target;
-
-@@ -794,8 +795,8 @@ However, in real world it was observed t
- bb_error_msg_and_die("too many redirections");
- fclose(sfp);
- if (str[0] == '/') {
-- free(target.allocated);
-- target.path = target.allocated = xstrdup(str+1);
-+ free(redirected_path);
-+ target.path = redirected_path = xstrdup(str+1);
- /* lsa stays the same: it's on the same server */
- } else {
- parse_url(str, &target);
-@@ -850,6 +851,7 @@ However, in real world it was observed t
- free(server.allocated);
- free(target.allocated);
- free(fname_out_alloc);
-+ free(redirected_path);
- }
-
- int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/package/customize/Config.in b/package/customize/Config.in
index 97f864668..8f8aaa21b 100644
--- a/package/customize/Config.in
+++ b/package/customize/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_CUSTOMIZE
bool "customize"
+ depends on BR2_DEPRECATED
help
Add custom stuff to your buildroot.
diff --git a/package/dropbear/dropbear-2011.54-no-ipv6.patch b/package/dropbear/dropbear-2011.54-no-ipv6.patch
deleted file mode 100644
index 4ee9aaa66..000000000
--- a/package/dropbear/dropbear-2011.54-no-ipv6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Check for IPV6_TCLASS instead of IPPROTO_IPV6 since
-it's present on non-IPv6 enabled toolchains too.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-
-diff -Nura dropbear-2011.54.orig/dbutil.c dropbear-2011.54/dbutil.c
---- dropbear-2011.54.orig/dbutil.c 2011-11-08 09:48:15.000000000 -0300
-+++ dropbear-2011.54/dbutil.c 2011-11-09 12:14:59.430074138 -0300
-@@ -164,7 +164,7 @@
- /* set the TOS bit for either ipv4 or ipv6 */
- #ifdef IPTOS_LOWDELAY
- val = IPTOS_LOWDELAY;
--#ifdef IPPROTO_IPV6
-+#ifdef IPV6_TCLASS
- setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&val, sizeof(val));
- #endif
- setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val));
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 5fa50bafa..fea96d6aa 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
#
#############################################################
-DROPBEAR_VERSION = 2011.54
+DROPBEAR_VERSION = 2012.55
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 2b668ab94..c76b3ffa2 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -12,7 +12,13 @@ LIBECORE_INSTALL_STAGING = YES
LIBECORE_DEPENDENCIES = host-pkg-config libeina
HOST_LIBECORE_DEPENDENCIES = host-pkg-config host-libeina host-libevas
-HOST_LIBECORE_CONF_OPT += --enable-ecore-evas
+HOST_LIBECORE_CONF_OPT += \
+ --enable-ecore-evas \
+ --disable-simple-x11 \
+ --disable-ecore-directfb \
+ --disable-ecore-x \
+ --disable-ecore-x-xcb \
+ --disable-ecore-imf-xim
# default options
LIBECORE_CONF_OPT = --disable-simple-x11
@@ -76,11 +82,10 @@ LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util
# teach it about CC_FOR_BUILD, but for now simply build makekeys by
# hand in advance
define LIBECORE_BUILD_MAKEKEYS_FOR_HOST
- cd $(@D)/src/util && $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
- -o makekeys makekeys.c
+ $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/src/util makekeys.o makekeys
endef
-LIBECORE_POST_CONFIGURE_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
+LIBECORE_POST_EXTRACT_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
else
LIBECORE_CONF_OPT += --disable-ecore-x-xcb
endif
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index f78b61d87..4017871da 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -3,7 +3,8 @@
# libpng (Portable Network Graphic library)
#
#############################################################
-LIBPNG_VERSION = 1.4.8
+
+LIBPNG_VERSION = 1.4.9
LIBPNG_SERIES = 14
LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index c98fba3db..90c021d9c 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -24,6 +24,7 @@ LIBVNCSERVER_CONF_OPT += --without-crypto
endif
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+LIBVNCSERVER_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
LIBVNCSERVER_DEPENDENCIES += libgcrypt
else
LIBVNCSERVER_CONF_OPT += --without-gcrypt
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index dc572de90..92eb14f77 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
#
#############################################################
-FFMPEG_VERSION = 0.8.8
+FFMPEG_VERSION = 0.8.10
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
@@ -150,7 +150,7 @@ endif
# Set powerpc altivec appropriately
ifeq ($(BR2_powerpc),y)
ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y)
-FFMPEG_CONF_OPT -= --enable-altivec
+FFMPEG_CONF_OPT += --enable-altivec
else
FFMPEG_CONF_OPT += --disable-altivec
endif
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index b79ccf171..96829627d 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -1,4 +1,4 @@
-GST_DSP_VERSION = 0.10.1
+GST_DSP_VERSION = 0.10.2
GST_DSP_SITE = http://gst-dsp.googlecode.com/files/
define GST_DSP_BUILD_CMDS
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index fb736706a..c05c3a706 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -7,9 +7,9 @@ MXML_VERSION = 2.6
MXML_SITE = http://ftp.easysw.com/pub/mxml/2.6
MXML_INSTALL_STAGING = YES
-MXML_INSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) install
+MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
-MXML_UNINSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) uninstall
+MXML_UNINSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) uninstall
MXML_UNINSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) uninstall
$(eval $(call AUTOTARGETS))
diff --git a/package/python/python.mk b/package/python/python.mk
index 78895d412..28e215c58 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -131,6 +131,15 @@ PYTHON_MAKE_ENV = \
PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \
PYTHON_MODULES_LIB="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib"
+# python distutils adds -L$LIBDIR when linking binary extensions, causing
+# trouble for cross compilation
+define PYTHON_FIXUP_LIBDIR
+ $(SED) 's|^LIBDIR=.*|LIBDIR= $(STAGING_DIR)/usr/lib|' \
+ $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/Makefile
+endef
+
+PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_FIXUP_LIBDIR
+
#
# Development files removal
#
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 12:10:12 +0000