diff options
Diffstat (limited to 'package')
36 files changed, 309 insertions, 526 deletions
diff --git a/package/Config.in b/package/Config.in index e7550d00d..d27c01792 100644 --- a/package/Config.in +++ b/package/Config.in @@ -306,6 +306,7 @@ source "package/sdl_image/Config.in" source "package/sdl_mixer/Config.in" source "package/sdl_net/Config.in" source "package/sdl_ttf/Config.in" +source "package/sdl_gfx/Config.in" source "package/tiff/Config.in" comment "busybox graphic applications" diff --git a/package/Makefile.in b/package/Makefile.in index 351124410..f0dc47a36 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -130,7 +130,7 @@ TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH))) #")) #TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) -TARGET_PATH="$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" +TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX) IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX) @@ -205,6 +205,7 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ -e 's/mipsel-.*/mipsel/' \ -e 's/cris.*/cris/' \ -e 's/i[3-9]86/i386/' \ + -e 's/xtensa.*/xtensa/' \ ) GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX)) #") diff --git a/package/busybox/busybox-1.14.2-test.patch b/package/busybox/busybox-1.14.2-test.patch new file mode 100644 index 000000000..ce0d9a77e --- /dev/null +++ b/package/busybox/busybox-1.14.2-test.patch @@ -0,0 +1,64 @@ +diff -urpN busybox-1.14.2/coreutils/test.c busybox-1.14.2-test/coreutils/test.c +--- busybox-1.14.2/coreutils/test.c 2009-07-05 22:59:28.000000000 +0200 ++++ busybox-1.14.2-test/coreutils/test.c 2009-07-17 01:46:28.000000000 +0200 +@@ -571,7 +571,14 @@ static number_t nexpr(enum token n) + + nest_msg(">nexpr(%s)\n", TOKSTR[n]); + if (n == UNOT) { +- res = !nexpr(check_operator(*++args)); ++ n = check_operator(*++args); ++ if (n == EOI) { ++ /* special case: [ ! ], [ a -a ! ] are valid */ ++ /* IOW, "! ARG" may miss ARG */ ++ unnest_msg("<nexpr:1 (!EOI)\n"); ++ return 1; ++ } ++ res = !nexpr(n); + unnest_msg("<nexpr:%lld\n", res); + return res; + } +@@ -742,7 +749,7 @@ int test_main(int argc, char **argv) + check_operator(argv[1]); + if (last_operator->op_type == BINOP) { + /* "test [!] arg1 <binary_op> arg2" */ +- args = &argv[0]; ++ args = argv; + res = (binop() == 0); + goto ret; + } +@@ -755,7 +762,7 @@ int test_main(int argc, char **argv) + argv--; + } + #endif +- args = &argv[0]; ++ args = argv; + res = !oexpr(check_operator(*args)); + + if (*args != NULL && *++args != NULL) { +diff -urpN busybox-1.14.2/testsuite/test.tests busybox-1.14.2-test/testsuite/test.tests +--- busybox-1.14.2/testsuite/test.tests 2009-07-05 22:59:22.000000000 +0200 ++++ busybox-1.14.2-test/testsuite/test.tests 2009-07-17 01:46:28.000000000 +0200 +@@ -21,6 +21,11 @@ testing "test '': should be false (1)" \ + "1\n" \ + "" "" + ++testing "test !: should be true (0)" \ ++ "busybox test !; echo \$?" \ ++ "0\n" \ ++ "" "" ++ + testing "test a: should be true (0)" \ + "busybox test a; echo \$?" \ + "0\n" \ +@@ -51,6 +56,11 @@ testing "test -lt = -gt: should be false + "1\n" \ + "" "" + ++testing "test a -a !: should be true (0)" \ ++ "busybox test a -a !; echo \$?" \ ++ "0\n" \ ++ "" "" ++ + testing "test -f = a -o b: should be true (0)" \ + "busybox test -f = a -o b; echo \$?" \ + "0\n" \ diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 282661591..93b45938d 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -4,7 +4,7 @@ # ############################################################# DIRECTFB_VERSION_MAJOR:=1.4 -DIRECTFB_VERSION:=1.4.0 +DIRECTFB_VERSION:=1.4.1 DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_AUTORECONF = NO diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 88a7f1674..6706716b7 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -55,7 +55,7 @@ $(STAMP_DIR)/host_expat_installed: $(STAMP_DIR)/host_expat_compiled $(MAKE) -C $(EXPAT_HOST_DIR) installlib touch $@ -host-expat: $(STAM_DIR)/host_expat_installed +host-expat: $(STAMP_DIR)/host_expat_installed host-expat-source: expat-source diff --git a/package/gnuconfig/config.guess b/package/gnuconfig/config.guess index ebf353e3d..ced32b63a 100755 --- a/package/gnuconfig/config.guess +++ b/package/gnuconfig/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-07-22' +timestamp='2009-07-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -971,8 +971,8 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-${LIBC} exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-${LIBC} + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so diff --git a/package/gnuconfig/config.sub b/package/gnuconfig/config.sub index 392e21fc2..efbb230f4 100755 --- a/package/gnuconfig/config.sub +++ b/package/gnuconfig/config.sub @@ -370,10 +370,14 @@ case $basic_machine in | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) diff --git a/package/gnuconfig/testsuite/config-sub.data b/package/gnuconfig/testsuite/config-sub.data index 0f2272a14..2a5e1f1eb 100644 --- a/package/gnuconfig/testsuite/config-sub.data +++ b/package/gnuconfig/testsuite/config-sub.data @@ -109,6 +109,7 @@ fido-elf fido-unknown-elf fido fido-unknown-none xtensa-elf xtensa-unknown-elf xtensa-linux xtensa-unknown-linux-gnu +xtensa_dc232b-linux xtensa_dc232b-unknown-linux-gnu i386-drops1.0 i386-pc-drops1.0 mep mep-unknown-elf mep-elf mep-unknown-elf diff --git a/package/haserl/haserl-0.9.25/haserl-0.9.25-array-vars-fix.patch b/package/haserl/haserl-0.9.25/haserl-0.9.25-array-vars-fix.patch new file mode 100644 index 000000000..e6c959a66 --- /dev/null +++ b/package/haserl/haserl-0.9.25/haserl-0.9.25-array-vars-fix.patch @@ -0,0 +1,19 @@ +haserl: array vars fix + +Fix buffer overflow error. Len is the length of the name= part of the +name=value string, not the value part. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +Index: haserl-0.9.25/src/haserl.c +=================================================================== +--- haserl-0.9.25.orig/src/haserl.c 2009-07-20 15:05:26.000000000 +0200 ++++ haserl-0.9.25/src/haserl.c 2009-07-20 15:06:05.000000000 +0200 +@@ -269,7 +269,7 @@ + /* if an array, create a new string with this + * value added to the end of the old value(s) + */ +- temp = xmalloc (strlen (cur->buf) + len + 1); ++ temp = xmalloc (strlen (cur->buf) + strlen(entry) - len + 1); + memmove (temp, cur->buf, strlen (cur->buf) + 1); + strcat (temp, "\n"); + strcat (temp, str + keylen + 3); diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 75f0cfc6c..b2738b012 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,7 +4,7 @@ # ############################################################# LIBGLIB2_VERSION_MAJOR = 2.20 -LIBGLIB2_VERSION_MINOR = 1 +LIBGLIB2_VERSION_MINOR = 4 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2 LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/$(LIBGLIB2_VERSION_MAJOR) diff --git a/package/libpng/libpng-remove-setjmp-error.patch b/package/libpng/libpng-remove-setjmp-error.patch deleted file mode 100644 index 6d0d8f7f2..000000000 --- a/package/libpng/libpng-remove-setjmp-error.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur libpng-1.2.25/pngconf.h libpng-1.2.25-patched/pngconf.h ---- libpng-1.2.25/pngconf.h 2008-02-18 16:31:05.000000000 -0600 -+++ libpng-1.2.25-patched/pngconf.h 2008-03-05 07:30:22.900478085 -0600 -@@ -319,13 +319,6 @@ - # define PNG_SAVE_BSD_SOURCE - # undef _BSD_SOURCE - # endif --# ifdef _SETJMP_H -- /* If you encounter a compiler error here, see the explanation -- * near the end of INSTALL. -- */ -- __pngconf.h__ already includes setjmp.h; -- __dont__ include it again.; --# endif - # endif /* __linux__ */ - - /* include setjmp.h for error handling */ diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 8ed1b1a21..b1cb2209d 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -3,7 +3,7 @@ # libpng (Portable Network Graphic library) # ############################################################# -LIBPNG_VERSION:=1.2.35 +LIBPNG_VERSION:=1.2.38 LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2 LIBPNG_LIBTOOL_PATCH = NO diff --git a/package/memstat/memstat.mk b/package/memstat/memstat.mk index 7220aeeeb..a54509ac1 100644 --- a/package/memstat/memstat.mk +++ b/package/memstat/memstat.mk @@ -21,15 +21,17 @@ $(MEMSTAT_DIR)/.configured: $(MEMSTAT_DIR)/.unpacked touch $@ $(MEMSTAT_DIR)/memstat: $(MEMSTAT_DIR)/.configured - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(@D)/memstat.c -o $@ + $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + $(CFLAGS_WHOLE_PROGRAM) $(@D)/memstat.c -o $@ $(TARGET_DIR)/usr/bin/memstat: $(MEMSTAT_DIR)/memstat [ -e $(TARGET_DIR)/etc/memstat.conf ] || \ - $(INSTALL) -m 0644 -D $(^D)/memstat.conf $(TARGET_DIR)/etc + $(INSTALL) -m 0644 -D $(^D)/memstat.conf \ + $(TARGET_DIR)/etc/memstat.conf $(INSTALL) -m 0755 -D $^ $@ $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -memstat: uclibc $(TARGET_DIR)/usr/bin/memstat +memstat: $(TARGET_DIR)/usr/bin/memstat memstat-source: $(DL_DIR)/$(MEMSTAT_SOURCE) diff --git a/package/mtd/20050122/mtd.mk b/package/mtd/20050122/mtd.mk deleted file mode 100644 index b5a9d5c50..000000000 --- a/package/mtd/20050122/mtd.mk +++ /dev/null @@ -1,138 +0,0 @@ -############################################################# -# -# mtd provides jffs2 utilities -# -############################################################# -MTD_SOURCE:=mtd_20050122.orig.tar.gz -MTD_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mtd -MTD_HOST_DIR := $(TOOL_BUILD_DIR)/mtd_orig -MTD_DIR:=$(BUILD_DIR)/mtd_orig -MTD_CAT:=$(ZCAT) - - - -############################################################# -# -# Build mkfs.jffs2 and sumtool for use on the local host system if -# needed by target/jffs2root. -# -############################################################# -MKFS_JFFS2 := $(MTD_HOST_DIR)/util/mkfs.jffs2 -SUMTOOL := $(MTD_HOST_DIR)/util/sumtool - -ifneq ($(MTD_SOURCE),) -$(DL_DIR)/$(MTD_SOURCE): - $(call DOWNLOAD,$(MTD_SITE),$(MTD_SOURCE)) -endif - -$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) - $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - - mv $(TOOL_BUILD_DIR)/$(shell tar tzf $(DL_DIR)/$(MTD_SOURCE) | head -n 1 \ - | xargs basename) $(MTD_HOST_DIR) - toolchain/patch-kernel.sh $(MTD_HOST_DIR) package/mtd/20050122 \*.patch - touch $@ - -$(MKFS_JFFS2): $(MTD_HOST_DIR)/.unpacked - CFLAGS=-I$(LINUX_HEADERS_DIR)/include $(MAKE) CC="$(HOSTCC)" CROSS= \ - LINUXDIR=$(LINUX_DIR) -C $(MTD_HOST_DIR)/util mkfs.jffs2 - -$(SUMTOOL): $(MTD_HOST_DIR)/.unpacked - CFLAGS=-I$(LINUX_HEADERS_DIR)/include $(MAKE) CC="$(HOSTCC)" CROSS= \ - LINUXDIR=$(LINUX_DIR) -C $(MTD_HOST_DIR)/util sumtool - -mtd-host: $(MKFS_JFFS2) $(SUMTOOL) - -mtd-host-source: $(DL_DIR)/$(MTD_SOURCE) - -mtd-host-clean: - -$(MAKE) -C $(MTD_HOST_DIR) clean - -mtd-host-dirclean: - rm -rf $(MTD_HOST_DIR) - -############################################################# -# -# build mtd for use on the target system -# -############################################################# -$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) - $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - mv $(BUILD_DIR)/$(shell tar tzf $(DL_DIR)/$(MTD_SOURCE) \ - | head -n 1 | xargs basename) $(MTD_DIR) - toolchain/patch-kernel.sh $(MTD_DIR) \ - package/mtd/20050122 \*.patch - touch $@ - -MTD_TARGETS_n := -MTD_TARGETS_y := - -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS) += mkfs.jffs -MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump -MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS3DUMP) += jffs3dump -MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite -MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios - -MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/util/, $(MTD_TARGETS_y)) - -$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS+="-I$(MTD_DIR)/include" \ - CFLAGS+="-I$(LINUX_HEADERS_DIR)/include" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util - -MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y)) - -$(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/util/% - mkdir -p $(TARGET_DIR)/usr/sbin - cp -f $< $@ - $(STRIPCMD) $@ -ifneq ($(BR2_PACKAGE_MTD_FLASHCP),) - -ln -sf flashcp $(TARGET_DIR)/usr/sbin/fcp -endif -ifneq ($(BR2_PACKAGE_MTD_ERASE),) - -ln -sf flash_erase $(TARGET_DIR)/usr/sbin/erase - -ln -sf flash_eraseall $(TARGET_DIR)/usr/sbin/eraseall -endif - -mtd: zlib $(MTD_TARGETS) - -mtd-source: $(DL_DIR)/$(MTD_SOURCE) - -mtd-clean: - -$(MAKE) -C $(MTD_DIR) clean -ifneq ($(BR2_PACKAGE_MTD_FLASHCP),) - -rm -f $(MTD_TARGETS) $(TARGET_DIR)/usr/sbin/fcp -endif -ifneq ($(BR2_PACKAGE_MTD_ERASE),) - -rm -f $(MTD_TARGETS) $(TARGET_DIR)/usr/sbin/erase - -rm -f $(MTD_TARGETS) $(TARGET_DIR)/usr/sbin/eraseall -endif - -mtd-dirclean: - rm -rf $(MTD_DIR) - - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_MTD),y) -TARGETS+=mtd -endif diff --git a/package/mtd/20050122/mtd.patch b/package/mtd/20050122/mtd.patch deleted file mode 100644 index 40d6865cc..000000000 --- a/package/mtd/20050122/mtd.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ur mtd-20050122.orig/util/flash_eraseall.c mtd-20050122.orig-patched/util/flash_eraseall.c ---- mtd-20050122.orig/util/flash_eraseall.c 2004-12-09 17:00:52.000000000 -0600 -+++ mtd-20050122.orig-patched/util/flash_eraseall.c 2007-01-13 22:56:51.864233154 -0600 -@@ -54,7 +54,7 @@ - static void display_help (void); - static void display_version (void); - static struct jffs2_unknown_node cleanmarker; --static int target_endian = __BYTE_ORDER; -+int target_endian = __BYTE_ORDER; - - int main (int argc, char *argv[]) - { -@@ -134,7 +134,7 @@ - if (!quiet) - printf ("\nSkipping bad block at 0x%08x\n", erase.start); - continue; -- } else if (ret == -EOPNOTSUPP) { -+ } else if (errno == EOPNOTSUPP) { - fprintf(stderr, "%s: %s: Bad block check not available\n", exe_name, mtd_device); - bbtest = 0; - } else if (ret < 0) { -diff -ur mtd-20050122.orig/util/mkfs.jffs2.c mtd-20050122.orig-patched/util/mkfs.jffs2.c ---- mtd-20050122.orig/util/mkfs.jffs2.c 2004-11-26 17:00:13.000000000 -0600 -+++ mtd-20050122.orig-patched/util/mkfs.jffs2.c 2007-01-13 22:55:53.627687214 -0600 -@@ -101,7 +101,7 @@ - static int squash_uids = 0; - static int squash_perms = 0; - static int fake_times = 0; --static int target_endian = __BYTE_ORDER; -+int target_endian = __BYTE_ORDER; - static const char *const app_name = "mkfs.jffs2"; - static const char *const memory_exhausted = "memory exhausted"; - -diff -ur mtd-20050122.orig/util/sumtool.c mtd-20050122.orig-patched/util/sumtool.c ---- mtd-20050122.orig/util/sumtool.c 2005-01-05 17:00:16.000000000 -0600 -+++ mtd-20050122.orig-patched/util/sumtool.c 2007-01-13 22:56:05.528616125 -0600 -@@ -68,7 +68,7 @@ - static int cleanmarker_size = sizeof(cleanmarker); - static const char *short_options = "o:i:e:hvVblnc:p"; - static int erase_block_size = 65536; --static int target_endian = __BYTE_ORDER; -+int target_endian = __BYTE_ORDER; - static int out_fd = -1; - static int in_fd = -1; - diff --git a/package/mtd/20061007/mtd-20061007-mkfs.jffs2.patch b/package/mtd/20061007/mtd-20061007-mkfs.jffs2.patch deleted file mode 100644 index 3c4d6bad6..000000000 --- a/package/mtd/20061007/mtd-20061007-mkfs.jffs2.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN mtd-20061007.orig-0rig/mkfs.jffs2.c mtd-20061007.orig/mkfs.jffs2.c ---- mtd-20061007.orig-0rig/mkfs.jffs2.c 2006-10-07 17:33:37.000000000 +0200 -+++ mtd-20061007.orig/mkfs.jffs2.c 2007-04-09 02:16:06.000000000 +0200 -@@ -240,6 +242,15 @@ - { - struct filesystem_entry *e = dir; - -+ if((strlen(fullname) == 1) && (fullname[0] == '/')) { -+ /* Looking for "root" */ -+ if(e != NULL) { -+ if((strlen(e->fullname) == 1) && (e->fullname[0] == '/')) { -+ return (e); -+ } -+ } -+ } -+ - if (S_ISDIR(dir->sb.st_mode)) { - e = dir->files; - } diff --git a/package/mtd/20061007/mtd.mk b/package/mtd/20061007/mtd.mk deleted file mode 100644 index dfd348579..000000000 --- a/package/mtd/20061007/mtd.mk +++ /dev/null @@ -1,120 +0,0 @@ -############################################################# -# -# mtd provides jffs2 utilities -# -############################################################# -MTD_SOURCE=mtd_20061007.orig.tar.gz -MTD_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mtd -MTD_HOST_DIR := $(TOOL_BUILD_DIR)/mtd_orig -MTD_DIR:=$(BUILD_DIR)/mtd_orig -MTD_CAT:=$(ZCAT) -MTD_DATE:=20061007 - -############################################################# -# -# Build mkfs.jffs2 and sumtool for use on the local host system if -# needed by target/jffs2root. -# -############################################################# -MKFS_JFFS2 := $(MTD_HOST_DIR)/mkfs.jffs2 -SUMTOOL := $(MTD_HOST_DIR)/sumtool - -$(DL_DIR)/$(MTD_SOURCE): - $(call DOWNLOAD,$(MTD_SITE),$(MTD_SOURCE)) - -$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) - $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - - mv $(TOOL_BUILD_DIR)/$(shell tar tzf $(DL_DIR)/$(MTD_SOURCE) | head -n 1 \ - | xargs basename) $(MTD_HOST_DIR) - toolchain/patch-kernel.sh $(MTD_HOST_DIR) \ - package/mtd/$(MTD_DATE) \*.patch - touch $@ - -$(MKFS_JFFS2): $(MTD_HOST_DIR)/.unpacked - CC="$(HOSTCC)" CROSS= CFLAGS=-I$(LINUX_HEADERS_DIR)/include \ - $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_HOST_DIR) mkfs.jffs2 - -$(SUMTOOL): $(MTD_HOST_DIR)/.unpacked - CC="$(HOSTCC)" CROSS= CFLAGS=-I$(LINUX_HEADERS_DIR)/include \ - $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_HOST_DIR) sumtool - -mtd-host: $(MKFS_JFFS2) $(SUMTOOL) - -mtd-host-source: $(DL_DIR)/$(MTD_SOURCE) - -mtd-host-clean: - -$(MAKE) -C $(MTD_HOST_DIR) clean - -mtd-host-dirclean: - rm -rf $(MTD_HOST_DIR) - -############################################################# -# -# build mtd for use on the target system -# -############################################################# -$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) - $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - mv $(BUILD_DIR)/$(shell tar tzf $(DL_DIR)/$(MTD_SOURCE) \ - | head -n 1 | xargs basename) $(MTD_DIR) - toolchain/patch-kernel.sh $(MTD_DIR) \ - package/mtd/$(MTD_DATE) \*.patch - touch $@ - -MTD_TARGETS_n := -MTD_TARGETS_y := - -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS) += mkfs.jffs -MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump -#MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS3DUMP) += jffs3dump -MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite -MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios - -MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y)) - -$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked - mkdir -p $(TARGET_DIR)/usr/sbin - $(MAKE) CFLAGS="-I. -I./include -I$(LINUX_HEADERS_DIR)/include -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - CROSS= CC=$(TARGET_CC) LINUXDIR=$(LINUX26_DIR) WITHOUT_XATTR=1 -C $(MTD_DIR) - -MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y)) - -$(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/% - cp -f $< $@ - $(STRIPCMD) $@ - -mtd: zlib $(MTD_TARGETS) - -mtd-source: $(DL_DIR)/$(MTD_SOURCE) - -mtd-clean: - -$(MAKE) -C $(MTD_DIR) clean - -mtd-dirclean: - rm -rf $(MTD_DIR) - - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_MTD),y) -TARGETS+=mtd -endif diff --git a/package/mtd/20061007/mtd_20061007.patch b/package/mtd/20061007/mtd_20061007.patch deleted file mode 100644 index 23654fea6..000000000 --- a/package/mtd/20061007/mtd_20061007.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -urN mtd-20061007.orig/Makefile mtd-20061007.orig.patch/Makefile ---- mtd-20061007.orig/Makefile 2006-10-07 16:33:37.000000000 +0100 -+++ mtd-20061007.orig.patch/Makefile 2007-01-09 14:06:22.000000000 +0000 -@@ -9,12 +9,10 @@ - #CROSS=arm-linux- - CC := $(CROSS)gcc - CFLAGS := -I./include -O2 -Wall -+BUILDDIR := . - --ifeq ($(origin CROSS),undefined) -- BUILDDIR := . --else --# Remove the trailing slash to make the directory name -- BUILDDIR := $(CROSS:-=) -+ifeq ($(WITHOUT_XATTR), 1) -+ CFLAGS += -DWITHOUT_XATTR - endif - - RAWTARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ -diff -urN mtd-20061007.orig/mkfs.jffs2.c mtd-20061007.orig.patch/mkfs.jffs2.c ---- mtd-20061007.orig/mkfs.jffs2.c 2006-10-07 16:33:37.000000000 +0100 -+++ mtd-20061007.orig.patch/mkfs.jffs2.c 2007-01-09 11:18:33.000000000 +0000 -@@ -64,8 +64,10 @@ - #include <ctype.h> - #include <time.h> - #include <getopt.h> --#include <sys/xattr.h> --#include <sys/acl.h> -+#ifndef WITHOUT_XATTR -+ #include <sys/xattr.h> -+ #include <sys/acl.h> -+#endif - #include <byteswap.h> - #define crc32 __complete_crap - #include <zlib.h> -@@ -1030,6 +1032,7 @@ - padword(); - } - -+#ifndef WITHOUT_XATTR - typedef struct xattr_entry { - struct xattr_entry *next; - uint32_t xid; -@@ -1258,6 +1261,9 @@ - padword(); - } - } -+#else /* WITHOUT_XATTR */ -+#define write_xattr_entry(x) -+#endif - - static void recursive_populate_directory(struct filesystem_entry *dir) - { -@@ -1416,9 +1422,11 @@ - {"test-compression", 0, NULL, 't'}, - {"compressor-priority", 1, NULL, 'y'}, - {"incremental", 1, NULL, 'i'}, -+#ifndef WITHOUT_XATTR - {"with-xattr", 0, NULL, 1000 }, - {"with-selinux", 0, NULL, 1001 }, - {"with-posix-acl", 0, NULL, 1002 }, -+#endif - {NULL, 0, NULL, 0} - }; - -@@ -1451,9 +1459,11 @@ - " -q, --squash Squash permissions and owners making all files be owned by root\n" - " -U, --squash-uids Squash owners making all files be owned by root\n" - " -P, --squash-perms Squash permissions on all files\n" -+#ifndef WITHOUT_XATTR - " --with-xattr stuff all xattr entries into image\n" - " --with-selinux stuff only SELinux Labels into jffs2 image\n" - " --with-posix-acl stuff only POSIX ACL entries into jffs2 image\n" -+#endif - " -h, --help Display this help text\n" - " -v, --verbose Verbose operation\n" - " -V, --version Display version information\n" -@@ -1772,6 +1782,7 @@ - perror_msg_and_die("cannot open (incremental) file"); - } - break; -+#ifndef WITHOUT_XATTR - case 1000: /* --with-xattr */ - enable_xattr |= (1 << JFFS2_XPREFIX_USER) - | (1 << JFFS2_XPREFIX_SECURITY) -@@ -1786,6 +1797,7 @@ - enable_xattr |= (1 << JFFS2_XPREFIX_ACL_ACCESS) - | (1 << JFFS2_XPREFIX_ACL_DEFAULT); - break; -+#endif - } - } - if (out_fd == -1) { diff --git a/package/mtd/20061007/mtd_acl.patch b/package/mtd/20061007/mtd_acl.patch deleted file mode 100644 index 953786eb1..000000000 --- a/package/mtd/20061007/mtd_acl.patch +++ /dev/null @@ -1,48 +0,0 @@ -Author: Ulf Samuelsson -Date: 2007-01-25 - -Log: -Patch adding "sys/acl.h" needed to compile mtd. - -Modified: - package/mtd/mtd_acl.patch - -Changeset - package/mtd/mtd_acl.patch - -diff -urN mtd_orig-0rig/include/sys/acl.h mtd_orig/include/sys/acl.h ---- mtd_orig-0rig/include/sys/acl.h 1970-01-01 01:00:00.000000000 +0100 -+++ mtd_orig/include/sys/acl.h 2007-01-17 20:11:22.000000000 +0100 -@@ -0,0 +1,32 @@ -+/* -+ File: linux/posix_acl.h -+ -+ (C) 2002 Andreas Gruenbacher, <a.gruenbacher@computer.org> -+*/ -+ -+ -+#ifndef __LINUX_POSIX_ACL_H -+#define __LINUX_POSIX_ACL_H -+ -+#define ACL_UNDEFINED_ID (-1) -+ -+/* a_type field in acl_user_posix_entry_t */ -+#define ACL_TYPE_ACCESS (0x8000) -+#define ACL_TYPE_DEFAULT (0x4000) -+ -+/* e_tag entry in struct posix_acl_entry */ -+#define ACL_USER_OBJ (0x01) -+#define ACL_USER (0x02) -+#define ACL_GROUP_OBJ (0x04) -+#define ACL_GROUP (0x08) -+#define ACL_MASK (0x10) -+#define ACL_OTHER (0x20) -+ -+/* permissions in the e_perm field */ -+#define ACL_READ (0x04) -+#define ACL_WRITE (0x02) -+#define ACL_EXECUTE (0x01) -+//#define ACL_ADD (0x08) -+//#define ACL_DELETE (0x10) -+ -+#endif /* __LINUX_POSIX_ACL_H */ diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 2dd41bebb..125175f39 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -15,18 +15,6 @@ config BR2_PACKAGE_MTD_UTILS help Build mtd/jffs utilities with Dataflash support -config BR2_PACKAGE_MTD_20061007 - bool "Use MTD snapshot from 20061007" - depends on BR2_DEPRECATED || BR2_RECENT - help - Build mtd/jffs utilities with Dataflash support - -config BR2_PACKAGE_MTD_20050122 - bool "Use MTD snapshot from 20050122" - depends on BR2_DEPRECATED - help - Use the stable release. - config BR2_PACKAGE_MTD_UTILS_GIT bool "Use MTD-utils from GIT" help diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index c7774fdb1..f81ea1888 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -1,12 +1,6 @@ ifeq ($(BR2_PACKAGE_MTD_UTILS),y) include package/mtd/mtd-utils/mtd.mk endif -ifeq ($(BR2_PACKAGE_MTD_20061007),y) -include package/mtd/20061007/mtd.mk -endif -ifeq ($(BR2_PACKAGE_MTD_20050122),y) -include package/mtd/20050122/mtd.mk -endif ifeq ($(BR2_PACKAGE_MTD_UTILS_GIT),y) include package/mtd/mtd-utils.git/mtd.mk endif diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in index 02a35b827..c7160a663 100644 --- a/package/multimedia/Config.in +++ b/package/multimedia/Config.in @@ -11,6 +11,7 @@ source "package/multimedia/gst-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in" source "package/multimedia/libid3tag/Config.in" source "package/multimedia/libmad/Config.in" +source "package/multimedia/libmms/Config.in" source "package/multimedia/libmpd/Config.in" source "package/multimedia/libogg/Config.in" source "package/multimedia/libsndfile/Config.in" diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk index 88c68e15d..63f23cd5c 100644 --- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk +++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk @@ -9,6 +9,11 @@ GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base GST_PLUGINS_BASE_INSTALL_STAGING = YES GST_PLUGINS_BASE_LIBTOOL_PATCH = NO +# freetype is only used by examples, but if it is not found +# and the host has a freetype-config script, then the host +# include dirs are added to the search path causing trouble +GST_PLUGINS_BASE_CONF_ENV = FT2_CONFIG=/bin/false + GST_PLUGINS_BASE_CONF_OPT = \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk index 75d25c88d..bd0cb7808 100644 --- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk +++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk @@ -20,11 +20,12 @@ GST_PLUGINS_GOOD_CONF_OPT = \ --disable-x \ --disable-xshm \ --disable-xvideo \ + --disable-aalib \ --disable-aalibtest \ + --disable-esd \ --disable-esdtest \ --disable-shout2 \ - --disable-shout2test \ - --disable-esd + --disable-shout2test GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base diff --git a/package/multimedia/libmms/Config.in b/package/multimedia/libmms/Config.in new file mode 100644 index 000000000..02055c4c2 --- /dev/null +++ b/package/multimedia/libmms/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBMMS + bool "libmms" + select BR2_PACKAGE_LIBGLIB2 + help + LibMMS is a common library for parsing mms:// and mmsh:// + type network streams. These are commonly used to stream + Windows Media Video content over the web. LibMMS itself is + only for receiving MMS stream, it doesn't handle sending at + all. + + http://launchpad.net/libmms diff --git a/package/multimedia/libmms/libmms.mk b/package/multimedia/libmms/libmms.mk new file mode 100644 index 000000000..a866fadd6 --- /dev/null +++ b/package/multimedia/libmms/libmms.mk @@ -0,0 +1,17 @@ +############################################################# +# +# libmms +# +############################################################# +LIBMMS_VERSION = 0.4 +LIBMMS_SOURCE = libmms-$(LIBMMS_VERSION).tar.gz +LIBMMS_SITE = http://launchpad.net/libmms/trunk/$(LIBMMS_VERSION)/+download + +LIBMMS_AUTORECONF = NO +LIBMMS_LIBTOOL_PATCH = NO +LIBMMS_INSTALL_STAGING = YES +LIBMMS_INSTALL_TARGET = YES + +LIBMMS_DEPENDENCIES = uclibc host-pkgconfig libglib2 + +$(eval $(call AUTOTARGETS,package/multimedia,libmms)) diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk index e7399e038..a8817268f 100644 --- a/package/multimedia/libvorbis/libvorbis.mk +++ b/package/multimedia/libvorbis/libvorbis.mk @@ -4,6 +4,8 @@ # ############################################################# +ifneq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y) + LIBVORBIS_VERSION = 1.2.3 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE) @@ -17,6 +19,7 @@ LIBVORBIS_DEPENDENCIES = uclibc host-pkgconfig libogg $(eval $(call AUTOTARGETS,package/multimedia,libvorbis)) +else ############################################################ # @@ -67,7 +70,11 @@ $(TREMOR_DIR)/.libs: $(TREMOR_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(TREMOR_DIR) touch $@ -$(TARGET_DIR)/usr/lib/tremor.so: $(TREMOR_DIR)/.libs +$(STAGING_DIR)/usr/lib/tremor.so: $(TREMOR_DIR)/.libs + $(MAKE) prefix=$(STAGING_DIR)/usr -C $(TREMOR_DIR) install + touch $@ + +$(TARGET_DIR)/usr/lib/tremor.so: $(STAGING_DIR)/usr/lib/tremor.so $(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) \ $(if $(BR2_STRIP_none),install,install-strip) touch $@ @@ -76,15 +83,15 @@ $(TARGET_DIR)/usr/lib/tremor.a: $(TARGET_DIR)/usr/lib/tremor.so cp -dpf $(TREMOR_DIR)/lib/tremor.a $(TARGET_DIR)/usr/lib/ touch $@ -tremor: uclibc host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so +tremor libvorbis: uclibc host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so -tremor-source: $(DL_DIR)/$(TREMOR_SOURCE) +tremor-source libvorbis-source: $(DL_DIR)/$(TREMOR_SOURCE) -tremor-clean: +tremor-clean libvorbis-clean: $(MAKE) prefix=$(STAGING_DIR)/usr -C $(TREMOR_DIR) uninstall -$(MAKE) -C $(TREMOR_DIR) clean -tremor-dirclean: +tremor-dirclean libvorbis-dirclean: rm -rf $(TREMOR_DIR) @@ -93,9 +100,6 @@ tremor-dirclean: # Toplevel Makefile options # ############################################################ -ifeq ($(BR2_PACKAGE_LIBVORBIS),y) -ifeq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y) TARGETS+=tremor -endif -TARGETS+=libvorbis + endif diff --git a/package/qtopia4/Config.in b/package/qtopia4/Config.in index 052431257..457b9399a 100644 --- a/package/qtopia4/Config.in +++ b/package/qtopia4/Config.in @@ -310,6 +310,12 @@ config BR2_PACKAGE_QTOPIA4_WEBKIT Build the WebKit module. If unsure, say n. +config BR2_PACKAGE_QTOPIA4_STL + bool "STL support" + help + Compile STL support. + If unsure, say n. + config BR2_PACKAGE_QTOPIA4_OPENSSL bool "Enable OpenSSL support" depends on BR2_PACKAGE_QTOPIA4_NETWORK diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index f7196f476..0d2b980e9 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -323,6 +323,12 @@ else QTOPIA4_CONFIGURE+= -no-webkit endif +ifeq ($(BR2_PACKAGE_QTOPIA4_STL),y) +QTOPIA4_CONFIGURE+= -stl +else +QTOPIA4_CONFIGURE+= -no-stl +endif + QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE))) #")) BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM))) @@ -460,7 +466,6 @@ endif -embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \ $(QTOPIA4_QCONFIG_COMMAND) \ $(QTOPIA4_CONFIGURE) \ - -no-stl \ -no-cups \ -no-nis \ -no-accessibility \ diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk index 1e525ace3..76e599a2b 100644 --- a/package/sawman/sawman.mk +++ b/package/sawman/sawman.mk @@ -3,7 +3,7 @@ # SAWMAN # ############################################################# -SAWMAN_VERSION:=1.2.0-rc1 +SAWMAN_VERSION:=1.4.1 SAWMAN_SOURCE:=SaWMan-$(SAWMAN_VERSION).tar.gz SAWMAN_SITE:=http://www.directfb.org/downloads/Extras SAWMAN_INSTALL_STAGING = YES diff --git a/package/sdl_gfx/Config.in b/package/sdl_gfx/Config.in new file mode 100644 index 000000000..4910b2d64 --- /dev/null +++ b/package/sdl_gfx/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_SDL_GFX + bool "SDL_gfx" + depends on BR2_PACKAGE_SDL + help + The SDL_gfx library is an extension to the SDL library which + provides basic antialiased drawing routines such as lines, + circles or polygons, an interpolating rotozoomer for SDL + surfaces, framerate control and MMX image filters. + + http://www.ferzkopp.net/joomla/content/view/19/14/ diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk new file mode 100644 index 000000000..bd4e3f154 --- /dev/null +++ b/package/sdl_gfx/sdl_gfx.mk @@ -0,0 +1,26 @@ +############################################################# +# +# SDL_gfx addon for SDL +# +############################################################# +SDL_GFX_VERSION:=2.0.19 +SDL_GFX_SOURCE:=SDL_gfx-$(SDL_GFX_VERSION).tar.gz +SDL_GFX_SITE:=http://www.ferzkopp.net/Software/SDL_gfx-2.0/ +SDL_GFX_LIBTOOL_PATCH:=NO +SDL_GFX_INSTALL_STAGING:=YES +SDL_GFX_INSTALL_TARGET:=YES + +SDL_GFX_DEPENDENCIES:=sdl + +SDL_GFX_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \ + --disable-sdltest \ + --enable-static + +# enable mmx for newer x86's +ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y) +SDL_GFX_CONF_OPT += --enable-mmx +else +SDL_GFX_CONF_OPT += --disable-mmx +endif + +$(eval $(call AUTOTARGETS,package,sdl_gfx)) diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 2cceeb3c1..eaa6ab42e 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -13,10 +13,14 @@ WPA_SUPPLICANT_DEPENDENCIES = uclibc WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant WPA_SUPPLICANT_TARGET_BINS = wpa_cli wpa_supplicant wpa_passphrase +WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL),y) WPA_SUPPLICANT_DEPENDENCIES += openssl endif +ifeq ($(BR2_PACKAGE_DBUS),y) + WPA_SUPPLICANT_DEPENDENCIES += dbus +endif $(eval $(call AUTOTARGETS,package,wpa_supplicant)) @@ -36,6 +40,9 @@ else echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG) endif endif +ifeq ($(BR2_PACKAGE_DBUS),y) + echo "CONFIG_CTRL_IFACE_DBUS=y" >>$(WPA_SUPPLICANT_CONFIG) +endif touch $@ $(WPA_SUPPLICANT_HOOK_POST_INSTALL): @@ -45,9 +52,19 @@ endif ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE),y) rm -f $(TARGET_DIR)/usr/sbin/wpa_passphrase endif +ifeq ($(BR2_PACKAGE_DBUS),y) + $(INSTALL) -D \ + $(WPA_SUPPLICANT_DIR)/wpa_supplicant/dbus-wpa_supplicant.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf + $(INSTALL) -D \ + $(WPA_SUPPLICANT_DIR)/wpa_supplicant/dbus-wpa_supplicant.service \ + $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service +endif $(WPA_SUPPLICANT_TARGET_UNINSTALL): $(call MESSAGE,"Uninstalling") rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(WPA_SUPPLICANT_TARGET_BINS)) + rm -f $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf + rm -f $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service rm -f $(WPA_SUPPLICANT_TARGET_INSTALL_TARGET) $(WPA_SUPPLICANT_HOOK_POST_INSTALL) diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk index 644c1bcf2..945765f9c 100644 --- a/package/x11r7/mesa3d/mesa3d.mk +++ b/package/x11r7/mesa3d/mesa3d.mk @@ -72,7 +72,7 @@ $(MESA3D_DIR)/.installed: $(MESA3D_DIR)/.built rm -Rf $(TARGET_DIR)/usr/include/GL touch $@ -mesa3d-depends: xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm xlib_libpciaccess +mesa3d-depends: xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm xlib_libpciaccess host-makedepend mesa3d-source: $(DL_DIR)/$(MESA3D_SOURCE) mesa3d-configure: $(MESA3D_DIR)/.configured mesa3d-build: $(MESA3D_DIR)/.built diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk index 9d4faf4f6..d46743e09 100644 --- a/package/x11r7/xproto_xproto/xproto_xproto.mk +++ b/package/x11r7/xproto_xproto/xproto_xproto.mk @@ -12,3 +12,46 @@ XPROTO_XPROTO_INSTALL_STAGING = YES XPROTO_XPROTO_INSTALL_TARGET = NO $(eval $(call AUTOTARGETS,package/x11r7,xproto_xproto)) + +# xproto_xproto for the host +XPROTO_XPROTO_HOST_DIR:=$(BUILD_DIR)/xproto_xproto-$(XPROTO_XPROTO_VERSION)-host + +$(DL_DIR)/$(XPROTO_XPROTO_SOURCE): + $(call DOWNLOAD,$(XPROTO_XPROTO_SITE),$(XPROTO_XPROTO_SOURCE)) + +$(STAMP_DIR)/host_xproto_xproto_unpacked: $(DL_DIR)/$(XPROTO_XPROTO_SOURCE) + mkdir -p $(XPROTO_XPROTO_HOST_DIR) + $(INFLATE$(suffix $(XPROTO_XPROTO_SOURCE))) $< | \ + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(XPROTO_XPROTO_HOST_DIR) $(TAR_OPTIONS) - + touch $@ + +$(STAMP_DIR)/host_xproto_xproto_configured: $(STAMP_DIR)/host_xproto_xproto_unpacked + (cd $(XPROTO_XPROTO_HOST_DIR); rm -rf config.cache; \ + $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ + ) + touch $@ + +$(STAMP_DIR)/host_xproto_xproto_compiled: $(STAMP_DIR)/host_xproto_xproto_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(XPROTO_XPROTO_HOST_DIR) + touch $@ + +$(STAMP_DIR)/host_xproto_xproto_installed: $(STAMP_DIR)/host_xproto_xproto_compiled + $(MAKE) -C $(XPROTO_XPROTO_HOST_DIR) install + touch $@ + +host-xproto_xproto: $(STAMP_DIR)/host_xproto_xproto_installed + +host-xproto_xproto-source: xproto_xproto-source + +host-xproto_xproto-clean: + rm -f $(addprefix $(STAMP_DIR)/host_xproto_xproto_,unpacked configured compiled installed) + -$(MAKE) -C $(XPROTO_XPROTO_HOST_DIR) uninstall + -$(MAKE) -C $(XPROTO_XPROTO_HOST_DIR) clean + +host-xproto_xproto-dirclean: + rm -rf $(XPROTO_XPROTO_HOST_DIR) diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index b69878386..88754d8a7 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -8,7 +8,50 @@ XUTIL_MAKEDEPEND_VERSION = 1.0.1 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2 XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util XUTIL_MAKEDEPEND_AUTORECONF = NO -XUTIL_MAKEDEPEND_INSTALL_STAGING = YES -XUTIL_MAKEDEPEND_INSTALL_TARGET = NO +XUTIL_MAKEDEPEND_INSTALL_STAGING = NO +XUTIL_MAKEDEPEND_INSTALL_TARGET = YES $(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend)) + +# makedepend for the host +MAKEDEPEND_HOST_DIR:=$(BUILD_DIR)/makedepend-$(XUTIL_MAKEDEPEND_VERSION)-host + +$(DL_DIR)/$(XUTIL_MAKEDEPEND_SOURCE): + $(call DOWNLOAD,$(XUTIL_MAKEDEPEND_SITE),$(XUTIL_MAKEDEPEND_SOURCE)) + +$(STAMP_DIR)/host_makedepend_unpacked: $(DL_DIR)/$(XUTIL_MAKEDEPEND_SOURCE) + mkdir -p $(MAKEDEPEND_HOST_DIR) + $(INFLATE$(suffix $(XUTIL_MAKEDEPEND_SOURCE))) $< | \ + $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(MAKEDEPEND_HOST_DIR) $(TAR_OPTIONS) - + touch $@ + +$(STAMP_DIR)/host_makedepend_configured: $(STAMP_DIR)/host_makedepend_unpacked $(STAMP_DIR)/host_xproto_xproto_installed + (cd $(MAKEDEPEND_HOST_DIR); rm -rf config.cache; \ + $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" \ + ./configure \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ + ) + touch $@ + +$(STAMP_DIR)/host_makedepend_compiled: $(STAMP_DIR)/host_makedepend_configured + $(HOST_MAKE_ENV) $(MAKE) -C $(MAKEDEPEND_HOST_DIR) + touch $@ + +$(STAMP_DIR)/host_makedepend_installed: $(STAMP_DIR)/host_makedepend_compiled + $(MAKE) -C $(MAKEDEPEND_HOST_DIR) install + touch $@ + +host-makedepend: $(STAMP_DIR)/host_makedepend_installed + +host-makedepend-source: makedepend-source + +host-makedepend-clean: + rm -f $(addprefix $(STAMP_DIR)/host_makedepend_,unpacked configured compiled installed) + -$(MAKE) -C $(MAKEDEPEND_HOST_DIR) uninstall + -$(MAKE) -C $(MAKEDEPEND_HOST_DIR) clean + +host-makedepend-dirclean: + rm -rf $(MAKEDEPEND_HOST_DIR) |