diff options
Diffstat (limited to 'package')
99 files changed, 1525 insertions, 1881 deletions
diff --git a/package/Config.in b/package/Config.in index cb8356311..ba3418fe8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -133,6 +133,7 @@ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS source "package/boa/Config.in" endif source "package/bind/Config.in" +source "package/bmon/Config.in" source "package/bridge-utils/Config.in" if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS source "package/dhcp/Config.in" @@ -155,6 +156,7 @@ source "package/libcgicc/Config.in" source "package/libcurl/Config.in" source "package/libdnet/Config.in" source "package/libeXosip2/Config.in" +source "package/libnl/Config.in" source "package/libosip2/Config.in" source "package/libpcap/Config.in" source "package/libsoup/Config.in" @@ -181,6 +183,7 @@ source "package/netkitbase/Config.in" source "package/netkittelnet/Config.in" source "package/netplug/Config.in" source "package/netsnmp/Config.in" +source "package/netstat-nat/Config.in" source "package/nfs-utils/Config.in" source "package/ntp/Config.in" source "package/olsr/Config.in" @@ -306,6 +309,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" @@ -314,46 +318,13 @@ source "package/fbv/Config.in" source "package/fbset/Config.in" comment "other GUIs" -source "package/qtopia4/Config.in" +source "package/qt/Config.in" #source "package/microwin/Config.in" - -choice - prompt "X Window System server" - default BR2_PACKAGE_XSERVER_none - help - Select the X Window System server to use - -config BR2_PACKAGE_XSERVER_none - bool "none" -config BR2_PACKAGE_XSERVER_xorg - bool "modular xorg" - depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE -# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus -config BR2_PACKAGE_XSERVER_tinyx - bool "tinyx" - depends on BR2_USE_WCHAR -endchoice - -comment "xorg requires a toolchain with C++, LOCALE, LARGEFILE and WCHAR support" - depends on !(BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE) -comment "tinyx requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR - -config BR2_X11_PREFIX - string - default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg - default "/usr" if BR2_PACKAGE_XSERVER_tinyx - help - X11 apps root location - -if !BR2_PACKAGE_XSERVER_none source "package/x11r7/Config.in" -endif comment "X libraries and helper libraries" -#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none source "package/atk/Config.in" source "package/cairo/Config.in" source "package/pango/Config.in" diff --git a/package/Makefile.in b/package/Makefile.in index 7daa3b404..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)) #") @@ -380,23 +381,8 @@ else ENABLE_DEBUG:= endif - # X Windowing system -XSERVER:= -ifeq ($(BR2_PACKAGE_TINYX),y) -XSERVER+=tinyx -endif -ifeq ($(BR2_PACKAGE_XORG),y) -XSERVER+=xorg -endif -ifeq ($(BR2_PACKAGE_XORG7),y) -XSERVER+=xserver_xorg-server -endif -ifeq ($(BR2_PACKAGE_XGGI),y) -XSERVER+=xggi -endif - X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX))) #")) diff --git a/package/atk/atk.mk b/package/atk/atk.mk index 199ec7d5c..2d3a4e5af 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -45,7 +45,7 @@ ATK_CONF_OPT = --enable-shared \ --disable-glibtest --enable-explicit-deps=no \ --disable-debug -ifneq ($(BR2_PACKAGE_XSERVER_none),y) +ifeq ($(BR2_PACKAGE_XORG7),y) ATK_CONF_OPT += --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in index d6819b44c..bf237c53a 100644 --- a/package/blackbox/Config.in +++ b/package/blackbox/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_BLACKBOX bool "blackbox" - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XORG7 depends on BR2_INSTALL_LIBSTDCPP help Blackbox is a fast, lightweight window manager for the X diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk index a85c7535b..371a4a44d 100644 --- a/package/blackbox/blackbox.mk +++ b/package/blackbox/blackbox.mk @@ -14,6 +14,6 @@ BLACKBOX_INSTALL_TARGET:=YES BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib -BLACKBOX_DEPENDENCIES:=uclibc $(XSERVER) +BLACKBOX_DEPENDENCIES:=uclibc xserver_xorg-server $(eval $(call AUTOTARGETS,package,blackbox)) diff --git a/package/bmon/Config.in b/package/bmon/Config.in new file mode 100644 index 000000000..f42d19ad6 --- /dev/null +++ b/package/bmon/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_BMON + bool "bmon" + select BR2_PACKAGE_NCURSES + help + Linux bandwidth monitor diff --git a/package/bmon/bmon-gcc4.patch b/package/bmon/bmon-gcc4.patch new file mode 100644 index 000000000..23c12b538 --- /dev/null +++ b/package/bmon/bmon-gcc4.patch @@ -0,0 +1,36 @@ +diff -ru bmon-2.1.0~/src/out_audio.c bmon-2.1.0/src/out_audio.c +--- bmon-2.1.0~/src/out_audio.c 2008-07-26 20:06:24.000000000 +0200 ++++ bmon-2.1.0/src/out_audio.c 2008-07-26 20:09:42.000000000 +0200 +@@ -141,7 +141,7 @@ + .om_draw = audio_draw, + .om_set_opts = audio_set_opts, + .om_probe = audio_probe, +- .om_shutdown audio_shutdown, ++ .om_shutdown = audio_shutdown + }; + + static void __init audio_init(void) +diff -ru bmon-2.1.0~/src/out_db.c bmon-2.1.0/src/out_db.c +--- bmon-2.1.0~/src/out_db.c 2008-07-26 20:06:24.000000000 +0200 ++++ bmon-2.1.0/src/out_db.c 2008-07-26 20:07:44.000000000 +0200 +@@ -679,7 +679,7 @@ + .om_draw = db_draw, + .om_set_opts = db_set_opts, + .om_probe = db_probe, +- .om_shutdown db_shutdown, ++ .om_shutdown = db_shutdown, + }; + + static void __init db_init(void) +diff -ru bmon-2.1.0~/src/out_xml_event.c bmon-2.1.0/src/out_xml_event.c +--- bmon-2.1.0~/src/out_xml_event.c 2008-07-26 20:06:24.000000000 +0200 ++++ bmon-2.1.0/src/out_xml_event.c 2008-07-26 20:09:42.000000000 +0200 +@@ -127,7 +127,7 @@ + .om_draw = xml_event_draw, + .om_set_opts = xml_event_set_opts, + .om_probe = xml_event_probe, +- .om_shutdown xml_event_shutdown, ++ .om_shutdown = xml_event_shutdown + }; + + static void __init xml_event_init(void) diff --git a/package/bmon/bmon-nolibnl.patch b/package/bmon/bmon-nolibnl.patch new file mode 100644 index 000000000..4925cd4c9 --- /dev/null +++ b/package/bmon/bmon-nolibnl.patch @@ -0,0 +1,24 @@ +diff -Nura bmon/configure bmon.libnl/configure +--- bmon/configure 2005-04-05 12:01:33.000000000 -0300 ++++ bmon.libnl/configure 2009-06-10 16:10:52.000000000 -0300 +@@ -7327,13 +7327,13 @@ + echo "${ECHO_T}$ac_cv_lib_nl_nl_connect" >&6 + if test $ac_cv_lib_nl_nl_connect = yes; then + +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_NL "1" +-_ACEOF +- +- LIBNL="-lnl" +- NL="Yes" ++ case ${target_os} in ++ *linux*) ++ echo ++ echo "*** Warning: Building bmon on Linux w/o libnl ***" ++ echo ++ ;; ++ esac + + else + diff --git a/package/bmon/bmon-nostrip.patch b/package/bmon/bmon-nostrip.patch new file mode 100644 index 000000000..d457e84a2 --- /dev/null +++ b/package/bmon/bmon-nostrip.patch @@ -0,0 +1,12 @@ +diff -Nura bmon/GNUmakefile bmon.nostrip/GNUmakefile +--- bmon/GNUmakefile 2005-04-05 12:01:33.000000000 -0300 ++++ bmon.nostrip/GNUmakefile 2009-06-10 16:12:04.000000000 -0300 +@@ -50,7 +50,7 @@ + install: + ./install-sh -d -m 0755 $(DESTDIR)$(prefix)/bin + ./install-sh -d -m 0755 $(DESTDIR)$(mandir)/man1 +- ./install-sh -c -s -m 0755 src/bmon $(DESTDIR)$(prefix)/bin ++ ./install-sh -c -m 0755 src/bmon $(DESTDIR)$(prefix)/bin + ./install-sh -c -m 0644 man/bmon.1 $(DESTDIR)$(mandir)/man1 + + show: Makefile.opts diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk new file mode 100644 index 000000000..0b60ad420 --- /dev/null +++ b/package/bmon/bmon.mk @@ -0,0 +1,18 @@ +############################################################# +# +# bmon +# +############################################################# + +BMON_VERSION = 2.1.0 +BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz +BMON_SITE = http://distfiles.gentoo.org/distfiles +BMON_DEPENDENCIES = ncurses uclibc +BMON_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install + +$(eval $(call AUTOTARGETS,package,bmon)) + +$(BMON_TARGET_UNINSTALL): + $(call MESSAGE,"Uninstalling") + rm -f $(TARGET_DIR)/usr/bin/bmon + rm -f $(BMON_TARGET_INSTALL_TARGET) $(BMON_HOOK_POST_INSTALL) 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/cairo/cairo.mk b/package/cairo/cairo.mk index 048351e50..a0840834f 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -48,9 +48,9 @@ else CAIRO_CONF_OPT += --disable-directfb endif -ifneq ($(BR2_PACKAGE_XSERVER_none),y) +ifeq ($(BR2_PACKAGE_XORG7),y) CAIRO_CONF_OPT += --enable-xlib --with-x - CAIRO_DEPENDENCIES += $(XSERVER) + CAIRO_DEPENDENCIES += xserver_xorg-server else CAIRO_CONF_OPT += --disable-xlib --without-x endif diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 9051e0d0f..a22651fc7 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -18,7 +18,7 @@ else CUPS_CONF_OPT += --disable-dbus endif -ifneq ($(BR2_PACKAGE_XSERVER_none),y) +ifeq ($(BR2_PACKAGE_XORG7),y) CUPS_DEPENDENCIES += xlib_libX11 endif diff --git a/package/dillo/Config.in b/package/dillo/Config.in index f0682d9fd..87418d297 100644 --- a/package/dillo/Config.in +++ b/package/dillo/Config.in @@ -1,15 +1,12 @@ config BR2_PACKAGE_DILLO bool "dillo" - depends on BR2_PACKAGE_JPEG - depends on BR2_PACKAGE_LIBGLIB12 - depends on BR2_PACKAGE_LIBGTK12 - depends on BR2_PACKAGE_ZLIB - depends on BR2_PACKAGE_LIBPNG - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBGLIB12 + select BR2_PACKAGE_LIBGTK12 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBPNG + depends on BR2_PACKAGE_XORG7 help Dillo is a small GTK+ based web browser written in C. http://www.dillo.org/ - -comment "dillo - disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))" - depends on !BR2_PACKAGE_JPEG || !BR2_PACKAGE_LIBGLIB12 || !BR2_PACKAGE_LIBGTK12 || !BR2_PACKAGE_ZLIB || !BR2_PACKAGE_LIBPNG || !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7) diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index 12d9a5ce1..1dcfd5557 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -39,7 +39,7 @@ $(DILLO_DIR)/.installed: $(DILLO_DIR)/src/dillo $(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install touch $(DILLO_DIR)/.installed -dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed +dillo: uclibc xserver_xorg-server libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed dillo-source: $(DL_DIR)/$(DILLO_SOURCE) diff --git a/package/directfb/Config.in b/package/directfb/Config.in index 1f081744a..fce9ed46c 100644 --- a/package/directfb/Config.in +++ b/package/directfb/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_DIRECTFB_MULTI config BR2_PACKAGE_DIRECTFB_XSERVER bool "build with X server backend" depends on BR2_PACKAGE_DIRECTFB - depends on !BR2_PACKAGE_XSERVER_none + depends on BR2_PACKAGE_XORG7 config BR2_PACKAGE_DIRECTFB_UNIQUE bool "enable unique window manager" 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/docker/Config.in b/package/docker/Config.in index 1c89a79c8..02ef83c2e 100644 --- a/package/docker/Config.in +++ b/package/docker/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_DOCKER bool "docker" - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGLIB2 help a system tray dock for X diff --git a/package/docker/docker.mk b/package/docker/docker.mk index 860cd7e81..3b8c25cfe 100644 --- a/package/docker/docker.mk +++ b/package/docker/docker.mk @@ -19,7 +19,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \ DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install -DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 $(XSERVER) +DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 xserver_xorg-server $(eval $(call AUTOTARGETS,package,docker)) 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/fltk/Config.in b/package/fltk/Config.in index 120ee680a..b0ffb4e7e 100644 --- a/package/fltk/Config.in +++ b/package/fltk/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_FLTK bool "fltk" - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XORG7 help A cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk index f4a04986e..9574cb84a 100644 --- a/package/fltk/fltk.mk +++ b/package/fltk/fltk.mk @@ -18,6 +18,6 @@ FLTK_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) --prefix=/usr \ --sysconfdir=/etc --enable-shared --enable-threads --with-x -FLTK_DEPENDENCIES = uclibc $(XSERVER) +FLTK_DEPENDENCIES = uclibc xserver_xorg-server $(eval $(call AUTOTARGETS,package,fltk))
\ No newline at end of file diff --git a/package/games/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in index 3e1a9db2f..edbaf26ce 100644 --- a/package/games/ace_of_penguins/Config.in +++ b/package/games/ace_of_penguins/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ACE_OF_PENGUINS bool "ace_of_penguins" select BR2_PACKAGE_LIBPNG - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XORG7 help The Ace of Penguins is a set of Unix/X solitaire games based on the ones available for Windows but with a number of diff --git a/package/games/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk index 2aaf7aac8..2e4fda6e9 100644 --- a/package/games/ace_of_penguins/ace_of_penguins.mk +++ b/package/games/ace_of_penguins/ace_of_penguins.mk @@ -10,6 +10,6 @@ ACE_OF_PENGUINS_AUTORECONF = YES ACE_OF_PENGUINS_STAGING = NO ACE_OF_PENGUINS_TARGET = YES -ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng $(XSERVER) +ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng xserver_xorg-server $(eval $(call AUTOTARGETS,package/games,ace_of_penguins)) diff --git a/package/games/lxdoom/Config.in b/package/games/lxdoom/Config.in index 8eb7d5280..ebef9f5e6 100644 --- a/package/games/lxdoom/Config.in +++ b/package/games/lxdoom/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_LXDOOM bool "lxdoom" - depends on !BR2_PACKAGE_XSERVER_none + depends on BR2_PACKAGE_XORG7 help This is the linux version of the popular doom game. 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/patches/config.xtensa.glob.patch b/package/gnuconfig/patches/config.xtensa.glob.patch new file mode 100644 index 000000000..4b37aa77f --- /dev/null +++ b/package/gnuconfig/patches/config.xtensa.glob.patch @@ -0,0 +1,44 @@ +diff -rNdup config-orig/config.guess config/config.guess +--- config-orig/config.guess 2007-11-13 16:31:20.000000000 -0800 ++++ config/config.guess 2007-11-14 00:26:39.000000000 -0800 +@@ -954,8 +954,8 @@ EOF + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; +- xtensa:Linux:*:*) +- echo xtensa-unknown-linux-gnu ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so +diff -rNdup config-orig/config.sub config/config.sub +--- config-orig/config.sub 2007-11-13 16:31:20.000000000 -0800 ++++ config/config.sub 2007-11-14 00:48:37.000000000 -0800 +@@ -369,10 +369,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 -rNdup config-orig/testsuite/config-sub.data config/testsuite/config-sub.data +--- config-orig/testsuite/config-sub.data 2007-11-13 15:56:17.000000000 -0800 ++++ config/testsuite/config-sub.data 2007-11-14 00:31:22.000000000 -0800 +@@ -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/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/java/classpath/classpath.mk b/package/java/classpath/classpath.mk index 71c18a045..d037adfe6 100644 --- a/package/java/classpath/classpath.mk +++ b/package/java/classpath/classpath.mk @@ -77,8 +77,8 @@ else CLASSPATH_CONF_OPT+= --disable-gtk-peer endif -ifneq ($(BR2_PACKAGE_XSERVER_none),y) - CLASSPATH_DEPENDENCIES+= $(XSERVER) +ifeq ($(BR2_PACKAGE_XORG7),y) + CLASSPATH_DEPENDENCIES+= xserver_xorg-server CLASSPATH_CONF_OPT+= --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk index dff089af4..750bfae23 100644 --- a/package/java/jamvm/jamvm.mk +++ b/package/java/jamvm/jamvm.mk @@ -52,8 +52,8 @@ JAMVM_CONF_OPT = \ JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath #Include X libraries when we have an X server -ifneq ($(BR2_PACKAGE_XSERVER_none),y) - JAMVM_DEPENDENCIES+= $(XSERVER) +ifeq ($(BR2_PACKAGE_XORG7),y) + JAMVM_DEPENDENCIES+= xserver_xorg-server JAMVM_CONF_OPT+= --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib 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/libgtk12/Config.in b/package/libgtk12/Config.in index e0f643ff2..01393f96f 100644 --- a/package/libgtk12/Config.in +++ b/package/libgtk12/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBGTK12 bool "libgtk12" select BR2_PACKAGE_LIBGLIB12 - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX + depends on BR2_PACKAGE_XORG7 help The GTK+ graphical user interface library diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk index a578ae8ae..bb121f01d 100644 --- a/package/libgtk12/libgtk12.mk +++ b/package/libgtk12/libgtk12.mk @@ -86,7 +86,7 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1 touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 -libgtk12: uclibc libglib12 $(XSERVER) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 +libgtk12: uclibc libglib12 xserver_xorg-server $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1 libgtk12-clean: rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk* diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index 19809f26e..5c0482d61 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB + depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB help The GTK+ version 2 graphical user interface library diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 7db0067bb..3b85f6346 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -85,13 +85,13 @@ ifeq ($(BR2_PACKAGE_DIRECTFB),y) LIBGTK2_DEPENDENCIES += directfb endif -ifneq ($(BR2_PACKAGE_XSERVER_none),y) +ifeq ($(BR2_PACKAGE_XORG7),y) LIBGTK2_CONF_OPT += \ --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib \ --with-gdktarget=x11 - LIBGTK2_DEPENDENCIES += xlib_libXcomposite $(XSERVER) + LIBGTK2_DEPENDENCIES += xlib_libXcomposite xserver_xorg-server else LIBGTK2_CONF_OPT += --without-x endif diff --git a/package/libnl/Config.in b/package/libnl/Config.in new file mode 100644 index 000000000..24e481361 --- /dev/null +++ b/package/libnl/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBNL + bool "libnl" + help + A library for applications dealing with netlink socket. + + http://people.suug.ch/~tgr/libnl/ diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk new file mode 100644 index 000000000..1a667468d --- /dev/null +++ b/package/libnl/libnl.mk @@ -0,0 +1,22 @@ +############################################################# +# +# libnl +# +############################################################# + +LIBNL_VERSION = 1.1 +LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz +LIBNL_SITE = http://distfiles.gentoo.org/distfiles +LIBNL_INSTALL_STAGING = YES +LIBNL_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install + +$(eval $(call AUTOTARGETS,package,libnl)) + +$(LIBNL_HOOK_POST_INSTALL): $(LIBNL_TARGET_INSTALL_TARGET) + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnl.so* + touch $@ + +$(LIBNL_TARGET_UNINSTALL): + $(call MESSAGE,"Uninstalling") + rm -f $(TARGET_DIR)/usr/lib/libnl.so* + rm -f $(LIBNL_TARGET_INSTALL_TARGET) $(LIBNL_HOOK_POST_INSTALL) 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/matchbox/Config.in b/package/matchbox/Config.in index b57a4a29f..afa568412 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_MATCHBOX bool "MatchBox Window Manager" - select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XORG7 select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBXDAMAGE 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/metacity/Config.in b/package/metacity/Config.in index b552f67ac..12c54d117 100644 --- a/package/metacity/Config.in +++ b/package/metacity/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_METACITY bool "metacity" select BR2_PACKAGE_LIBGTK2 - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XORG7 help Metacity is a window manager for the X Window System. diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index d5d5bb7b0..6861165e4 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -16,7 +16,7 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \ --disable-dependency-tracking \ --disable-sm --disable-startup-notification -METACITY_DEPENDENCIES = uclibc libgtk2 $(XSERVER) +METACITY_DEPENDENCIES = uclibc libgtk2 xserver_xorg-server $(eval $(call AUTOTARGETS,package,metacity)) diff --git a/package/midori/Config.in b/package/midori/Config.in index eb960d4eb..80b7f772d 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -2,11 +2,8 @@ config BR2_PACKAGE_MIDORI bool "midori" select BR2_PACKAGE_WEBKIT select BR2_PACKAGE_LIBSEXY - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XORG7 help Midori is a lightweight web browser based on WebKit http://software.twotoasts.de/?page=midori - -comment "midori - disabled (requires Xorg(7))" - depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7) diff --git a/package/midori/midori.mk b/package/midori/midori.mk index 805b0287a..6861d4c29 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -11,6 +11,6 @@ MIDORI_AUTORECONF = YES MIDORI_INSTALL_STAGING = NO MIDORI_INSTALL_TARGET = YES -MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy $(XSERVER) +MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy xserver_xorg-server $(eval $(call AUTOTARGETS,package,midori)) 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/multimedia/mplayer/mplayer-1.0rc1-fix-alsa-output.patch b/package/multimedia/mplayer/mplayer-1.0rc1-fix-alsa-output.patch deleted file mode 100644 index d7b8f89e9..000000000 --- a/package/multimedia/mplayer/mplayer-1.0rc1-fix-alsa-output.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- a/libao2/ao_alsa.c -+++ b/libao2/ao_alsa.c -@@ -263,48 +263,49 @@ static int str_maxlen(strarg_t *str) { - return 1; - } - --/* change a PCM definition for correct AC-3 playback */ --static void set_non_audio(snd_config_t *root, const char *name_with_args) -+static int try_open_device(const char *device, int open_mode, int try_ac3) - { -- char *name, *colon, *old_value_str; -- snd_config_t *config, *args, *aes0, *old_def, *def; -- int value, err; -- -- /* strip the parameters from the PCM name */ -- if ((name = strdup(name_with_args)) != NULL) { -- if ((colon = strchr(name, ':')) != NULL) -- *colon = '\0'; -- /* search the PCM definition that we'll later use */ -- if (snd_config_search_alias_hooks(root, strchr(name, '.') ? NULL : "pcm", -- name, &config) >= 0) { -- /* does this definition have an "AES0" parameter? */ -- if (snd_config_search(config, "@args", &args) >= 0 && -- snd_config_search(args, "AES0", &aes0) >= 0) { -- /* read the old default value */ -- value = IEC958_AES0_CON_NOT_COPYRIGHT | -- IEC958_AES0_CON_EMPHASIS_NONE; -- if (snd_config_search(aes0, "default", &old_def) >= 0) { -- /* don't use snd_config_get_integer() because alsa-lib <= 1.0.12 -- * parses hex numbers as strings */ -- if (snd_config_get_ascii(old_def, &old_value_str) >= 0) { -- sscanf(old_value_str, "%i", &value); -- free(old_value_str); -- } -- } else -- old_def = NULL; -- /* set the non-audio bit */ -- value |= IEC958_AES0_NONAUDIO; -- /* set the new default value */ -- if (snd_config_imake_integer(&def, "default", value) >= 0) { -- if (old_def) -- snd_config_substitute(old_def, def); -- else -- snd_config_add(aes0, def); -- } -+ int err, len; -+ char *ac3_device, *args; -+ -+ if (try_ac3) { -+ /* to set the non-audio bit, use AES0=6 */ -+ len = strlen(device); -+ ac3_device = malloc(len + 7 + 1); -+ if (!ac3_device) -+ return -ENOMEM; -+ strcpy(ac3_device, device); -+ args = strchr(ac3_device, ':'); -+ if (!args) { -+ /* no existing parameters: add it behind device name */ -+ strcat(ac3_device, ":AES0=6"); -+ } else { -+ do -+ ++args; -+ while (isspace(*args)); -+ if (*args == '\0') { -+ /* ":" but no parameters */ -+ strcat(ac3_device, "AES0=6"); -+ } else if (*args != '{') { -+ /* a simple list of parameters: add it at the end of the list */ -+ strcat(ac3_device, ",AES0=6"); -+ } else { -+ /* parameters in config syntax: add it inside the { } block */ -+ do -+ --len; -+ while (len > 0 && isspace(ac3_device[len])); -+ if (ac3_device[len] == '}') -+ strcpy(ac3_device + len, " AES0=6}"); - } - } -- free(name); -+ err = snd_pcm_open(&alsa_handler, ac3_device, SND_PCM_STREAM_PLAYBACK, -+ open_mode); -+ free(ac3_device); - } -+ if (!try_ac3 || err < 0) -+ err = snd_pcm_open(&alsa_handler, device, SND_PCM_STREAM_PLAYBACK, -+ open_mode); -+ return err; - } - - /* -@@ -316,7 +317,6 @@ static int init(int rate_hz, int channel - int err; - int block; - strarg_t device; -- snd_config_t *my_config; - snd_pcm_uframes_t bufsize; - snd_pcm_uframes_t boundary; - opt_t subopts[] = { -@@ -496,24 +496,12 @@ static int init(int rate_hz, int channel - } - - if (!alsa_handler) { -- if ((err = snd_config_update()) < 0) { -- mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: cannot read ALSA configuration: %s\n", snd_strerror(err)); -- return 0; -- } -- if ((err = snd_config_copy(&my_config, snd_config)) < 0) { -- mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: cannot copy configuration: %s\n", snd_strerror(err)); -- return 0; -- } -- if (format == AF_FORMAT_AC3) -- set_non_audio(my_config, alsa_device); - //modes = 0, SND_PCM_NONBLOCK, SND_PCM_ASYNC -- if ((err = snd_pcm_open_lconf(&alsa_handler, alsa_device, -- SND_PCM_STREAM_PLAYBACK, open_mode, my_config)) < 0) -+ if ((err = try_open_device(alsa_device, open_mode, format == AF_FORMAT_AC3)) < 0) - { - if (err != -EBUSY && ao_noblock) { - mp_msg(MSGT_AO,MSGL_INFO,"alsa-init: open in nonblock-mode failed, trying to open in block-mode\n"); -- if ((err = snd_pcm_open_lconf(&alsa_handler, alsa_device, -- SND_PCM_STREAM_PLAYBACK, 0, my_config)) < 0) { -+ if ((err = try_open_device(alsa_device, 0, format == AF_FORMAT_AC3)) < 0) { - mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: playback open error: %s\n", snd_strerror(err)); - return(0); - } -@@ -522,12 +510,11 @@ static int init(int rate_hz, int channel - return(0); - } - } -- snd_config_delete(my_config); - - if ((err = snd_pcm_nonblock(alsa_handler, 0)) < 0) { - mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: error set block-mode %s\n", snd_strerror(err)); - } else { -- mp_msg(MSGT_AO,MSGL_V,"alsa-init: pcm opend in blocking mode\n"); -+ mp_msg(MSGT_AO,MSGL_V,"alsa-init: pcm opened in blocking mode\n"); - } - - snd_pcm_hw_params_alloca(&alsa_hwparams); -@@ -879,8 +866,8 @@ static int get_space(void) - } - - ret = snd_pcm_status_get_avail(status) * bytes_per_sample; -- if (ret > MAX_OUTBURST) -- ret = MAX_OUTBURST; -+ if (ret > ao_data.buffersize) // Buffer underrun? -+ ret = ao_data.buffersize; - return(ret); - } - diff --git a/package/multimedia/mplayer/mplayer-1.0rc1-index.patch b/package/multimedia/mplayer/mplayer-1.0rc1-index.patch deleted file mode 100644 index 44ae4b05b..000000000 --- a/package/multimedia/mplayer/mplayer-1.0rc1-index.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/stream/stream_dvb.c -+++ b/stream/stream_dvb.c -@@ -37,9 +37,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg - #include <sys/poll.h> - #include <unistd.h> - #include <fcntl.h> --#include <string.h> - #include <errno.h> --#include <fcntl.h> - - #include "stream.h" - #include "libmpdemux/demuxer.h" -@@ -168,7 +166,7 @@ static dvb_channels_list *dvb_get_channe - if((line[0] == '#') || (strlen(line) == 0)) - continue; - -- colon = index(line, ':'); -+ colon = strchr(line, ':'); - if(colon) - { - k = colon - line; diff --git a/package/multimedia/mplayer/mplayer-1.0rc1-ppc-configure.patch b/package/multimedia/mplayer/mplayer-1.0rc1-ppc-configure.patch deleted file mode 100644 index 053655dc4..000000000 --- a/package/multimedia/mplayer/mplayer-1.0rc1-ppc-configure.patch +++ /dev/null @@ -1,27 +0,0 @@ -mplayer: configure: handle target=powerpc-linux as well as ppc-linux ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: MPlayer-1.0rc1/configure -=================================================================== ---- MPlayer-1.0rc1.orig/configure -+++ MPlayer-1.0rc1/configure -@@ -133,7 +133,7 @@ - - ppc() { - case "$host_arch" in -- ppc) return 0;; -+ ppc|powerpc) return 0;; - *) return 1;; - esac - } -@@ -1213,7 +1213,7 @@ - _optimizing='' - ;; - -- ppc) -+ ppc|powerpc) - _def_arch='#define ARCH_POWERPC 1' - _def_dcbzl='#define NO_DCBZL 1' - _target_arch='TARGET_ARCH_POWERPC = yes' diff --git a/package/multimedia/mplayer/mplayer-1.0rc1-atmel.3.patch b/package/multimedia/mplayer/mplayer-1.0rc2-100-atmel.1.patch index 740298cb6..0de695f81 100644..100755 --- a/package/multimedia/mplayer/mplayer-1.0rc1-atmel.3.patch +++ b/package/multimedia/mplayer/mplayer-1.0rc2-100-atmel.1.patch @@ -1,42 +1,7 @@ - cfg-common.h | 4 + - cfg-mencoder.h | 4 + - cfg-mplayer.h | 4 + - configure | 13 +- - libaf/af_format.c | 7 + - libavcodec/Makefile | 7 + - libavcodec/avr32/dsputil_avr32.c | 2678 ++++++++++++++++++++++++++++++++++++++ - libavcodec/avr32/fdct.S | 541 ++++++++ - libavcodec/avr32/h264idct.S | 451 +++++++ - libavcodec/avr32/idct.S | 829 ++++++++++++ - libavcodec/avr32/mc.S | 434 ++++++ - libavcodec/avr32/pico.h | 260 ++++ - libavcodec/bitstream.h | 77 +- - libavcodec/dsputil.c | 3 + - libavcodec/h264.c | 15 + - libavutil/common.h | 16 + - libavutil/internal.h | 9 + - libfaad2/common.h | 2 +- - libmpcodecs/ad_libmad.c | 5 + - libswscale/pico-avr32.h | 137 ++ - libswscale/swscale_internal.h | 2 +- - libswscale/yuv2rgb.c | 14 + - libswscale/yuv2rgb_avr32.c | 416 ++++++ - libvo/vo_fbdev2.c | 101 ++- - version.sh | 2 +- - 25 files changed, 6011 insertions(+), 20 deletions(-) - create mode 100644 libavcodec/avr32/dsputil_avr32.c - create mode 100644 libavcodec/avr32/fdct.S - create mode 100644 libavcodec/avr32/h264idct.S - create mode 100644 libavcodec/avr32/idct.S - create mode 100644 libavcodec/avr32/mc.S - create mode 100644 libavcodec/avr32/pico.h - create mode 100644 libswscale/pico-avr32.h - create mode 100644 libswscale/yuv2rgb_avr32.c - --- a/cfg-common.h +++ b/cfg-common.h -@@ -235,6 +235,10 @@ - {"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, +@@ -240,6 +240,10 @@ + {"psprobe", &ps_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, {"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL}, +#ifdef ARCH_AVR32 @@ -61,96 +26,70 @@ #endif --- a/cfg-mplayer.h +++ b/cfg-mplayer.h -@@ -4,6 +4,10 @@ - - #include "cfg-common.h" +@@ -7,6 +7,10 @@ + extern int key_fifo_size; + extern unsigned doubleclick_time; +#ifdef ARCH_AVR32 +extern int avr32_use_pico; +#endif + - extern int noconsolecontrols; - - #if defined(HAVE_FBDEV)||defined(HAVE_VESA) + #ifdef HAVE_FBDEV + extern char *fb_mode_cfgfile; + extern char *fb_mode_name; --- a/configure +++ b/configure -@@ -1203,6 +1203,15 @@ EOF +@@ -1631,7 +1631,7 @@ EOF + fi + + +-_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM ARMV4L SH3 POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN GENERIC' ++_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM ARMV4L AVR32 SH3 POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN GENERIC' + case "$host_arch" in + i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) + _arch='X86 X86_32' +@@ -1994,6 +1994,16 @@ EOF _optimizing="$proc" ;; + avr32) -+ _def_arch='#define ARCH_AVR32' -+ _target_arch='TARGET_ARCH_AVR32 = yes' ++ _arch='AVR32' ++ _target_arch='ARCH_AVR32 = yes' + iproc='avr32' + proc='' + _march='' + _mcpu='' + _optimizing='' + ;; - arm|armv4l|armv5tel) - _def_arch='#define ARCH_ARMV4L 1' - _target_arch='TARGET_ARCH_ARMV4L = yes' -@@ -1533,7 +1542,7 @@ echores $_named_asm_args - # Checking for CFLAGS - _stripbinaries=yes - if test "$_profile" != "" || test "$_debug" != "" ; then -- CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile" -+ CFLAGS="-W -Wall -O4 $_march $_mcpu $_debug $_profile" - if test "$_cc_major" -ge "3" ; then - CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'` - fi -@@ -3794,7 +3803,7 @@ fi - - - echocheck "X11 headers presence" -- for I in `echo $_inc_extra | sed s/-I//g` /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do -+ for I in `echo $_inc_extra | sed s/-I//g`; do - if test -f "$I/X11/Xlib.h" ; then - _inc_x11="-I$I" - _x11_headers="yes" ---- a/libaf/af_format.c -+++ b/libaf/af_format.c -@@ -20,7 +20,14 @@ - // Integer to float conversion through lrintf() - #ifdef HAVE_LRINTF - #include <math.h> + -+#ifdef ARCH_AVR32 -+#define lrintf(x) rint(x) -+#define llrint(x) (long long)rint(x) -+#else - long int lrintf(float); -+#endif -+ - #else - #define lrintf(x) ((int)(x)) - #endif + arm|armv4l|armv5tel) + _arch='ARM ARMV4L' + _target_arch='ARCH_ARMV4L = yes' --- a/libavcodec/Makefile +++ b/libavcodec/Makefile -@@ -360,6 +360,12 @@ OBJS-$(TARGET_ARCH_SPARC) + - - sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc +@@ -372,6 +372,11 @@ ASM_OBJS-$(ARCH_ARMV4L) + + OBJS-$(ARCH_ARMV4L) += armv4l/dsputil_arm.o \ + armv4l/mpegvideo_arm.o \ -+# avr32 specific stuff -+ifeq ($(TARGET_ARCH_AVR32),yes) -+ASM_OBJS += avr32/idct.o avr32/fdct.o avr32/mc.o avr32/h264idct.o -+OBJS += avr32/dsputil_avr32.o -+endif -+ - # sun mediaLib specific stuff - OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \ ++ASM_OBJS-$(ARCH_AVR32) += avr32/idct.o avr32/fdct.o \ ++ avr32/mc.o avr32/h264idct.o ++ ++OBJS-$(ARCH_AVR32) += avr32/dsputil_avr32.o ++ + OBJS-$(HAVE_IWMMXT) += armv4l/dsputil_iwmmxt.o \ + armv4l/mpegvideo_iwmmxt.o \ -@@ -419,6 +425,7 @@ tests: apiexample $(TESTS) - clean:: +@@ -445,6 +450,7 @@ clean:: rm -f \ - i386/*.o i386/*~ \ -+ avr32/*.o avr32/*~ \ + alpha/*.o alpha/*~ \ armv4l/*.o armv4l/*~ \ ++ avr32/*.o avr32/*~ \ + bfin/*.o bfin/*~ \ + i386/*.o i386/*~ \ mlib/*.o mlib/*~ \ - alpha/*.o alpha/*~ \ --- /dev/null +++ b/libavcodec/avr32/dsputil_avr32.c -@@ -0,0 +1,2678 @@ +@@ -0,0 +1,2638 @@ +/* + * Copyright (c) 2007 Atmel Corporation. All rights reserved. + * @@ -189,8 +128,6 @@ + +int avr32_use_pico = 1; + -+//#define CHECK_DSP_FUNCS_AGAINST_C -+ +#ifdef CHECK_DSP_FUNCS_AGAINST_C +#define DSP_FUNC_NAME(name) test_ ## name +#else @@ -431,17 +368,6 @@ + + + -+static inline void copy_block4(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h) -+{ -+ int i; -+ for(i=0; i<h; i++) -+ { -+ ST32(dst , LD32(src )); -+ dst+=dstStride; -+ src+=srcStride; -+ } -+} -+ +static void clear_blocks_avr32(DCTELEM *blocks) +{ + int n = 12; @@ -463,33 +389,6 @@ +} + + -+static inline void copy_block8(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h) -+{ -+ int i; -+ for(i=0; i<h; i++) -+ { -+ ST32(dst , LD32(src )); -+ ST32(dst+4 , LD32(src+4 )); -+ dst+=dstStride; -+ src+=srcStride; -+ } -+} -+ -+static inline void copy_block16(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h) -+{ -+ int i; -+ for(i=0; i<h; i++) -+ { -+ ST32(dst , LD32(src )); -+ ST32(dst+4 , LD32(src+4 )); -+ ST32(dst+8 , LD32(src+8 )); -+ ST32(dst+12, LD32(src+12)); -+ dst+=dstStride; -+ src+=srcStride; -+ } -+} -+ -+ +static void put_h264_chroma_mc2_pico(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y){ + const int A=(8-x)*(8-y); + const int B=( x)*(8-y); @@ -938,6 +837,16 @@ + int src5= LD32(src + 5 *srcStride); + int src6= LD32(src + 6 *srcStride); + ++ union wordbytes { ++ int word; ++ struct { ++ unsigned int t:8; ++ unsigned int u:8; ++ unsigned int l:8; ++ unsigned int b:8; ++ } bytes; ++ } tmp1, tmp2, tmp3; ++ + /* First compute the leftmost three colums */ + PICO_MVRC_W(PICO_INPIX0, srcB); + PICO_MVRC_W(PICO_INPIX1, srcA); @@ -980,16 +889,6 @@ + ST32(dst, PICO_GET_W(PICO_OUTPIX0)); + /* Now compute the last column */ + -+ union wordbytes { -+ int word; -+ struct { -+ unsigned int t:8; -+ unsigned int u:8; -+ unsigned int l:8; -+ unsigned int b:8; -+ } bytes; } tmp1, tmp2, tmp3; -+ -+ + tmp1.bytes.t = srcB; + tmp1.bytes.u = src1; + tmp1.bytes.l = src4; @@ -5361,16 +5260,16 @@ + --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h -@@ -171,7 +171,7 @@ typedef struct RL_VLC_ELEM { +@@ -178,7 +178,7 @@ typedef struct RL_VLC_ELEM { #endif - /* used to avoid missaligned exceptions on some archs (alpha, ...) */ --#if defined(ARCH_X86) || defined(ARCH_X86_64) -+#if defined(ARCH_X86) || defined(ARCH_X86_64) || defined(ARCH_AVR32) + /* used to avoid misaligned exceptions on some archs (alpha, ...) */ +-#if defined(ARCH_X86) ++#if defined(ARCH_X86) || defined(ARCH_AVR32) # define unaligned16(a) (*(const uint16_t*)(a)) # define unaligned32(a) (*(const uint32_t*)(a)) # define unaligned64(a) (*(const uint64_t*)(a)) -@@ -813,6 +813,44 @@ void free_vlc(VLC *vlc); +@@ -810,6 +810,44 @@ void free_vlc(VLC *vlc); * if the vlc code is invalid and max_depth>1 than the number of bits removed * is undefined */ @@ -5415,7 +5314,7 @@ #define GET_VLC(code, name, gb, table, bits, max_depth)\ {\ int n, index, nb_bits;\ -@@ -821,7 +859,7 @@ void free_vlc(VLC *vlc); +@@ -818,7 +856,7 @@ void free_vlc(VLC *vlc); code = table[index][0];\ n = table[index][1];\ \ @@ -5424,7 +5323,7 @@ LAST_SKIP_BITS(name, gb, bits)\ UPDATE_CACHE(name, gb)\ \ -@@ -843,7 +881,38 @@ void free_vlc(VLC *vlc); +@@ -840,7 +878,38 @@ void free_vlc(VLC *vlc); }\ SKIP_BITS(name, gb, n)\ } @@ -5463,7 +5362,7 @@ #define GET_RL_VLC(level, run, name, gb, table, bits, max_depth, need_update)\ {\ int n, index, nb_bits;\ -@@ -852,7 +921,7 @@ void free_vlc(VLC *vlc); +@@ -849,7 +918,7 @@ void free_vlc(VLC *vlc); level = table[index].level;\ n = table[index].len;\ \ @@ -5472,7 +5371,7 @@ SKIP_BITS(name, gb, bits)\ if(need_update){\ UPDATE_CACHE(name, gb)\ -@@ -867,7 +936,7 @@ void free_vlc(VLC *vlc); +@@ -864,7 +933,7 @@ void free_vlc(VLC *vlc); run= table[index].run;\ SKIP_BITS(name, gb, n)\ } @@ -5483,19 +5382,17 @@ * parses a vlc code, faster then get_vlc() --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c -@@ -4197,6 +4197,9 @@ void dsputil_init(DSPContext* c, AVCodec - #ifdef ARCH_BFIN - dsputil_init_bfin(c,avctx); - #endif -+#ifdef ARCH_AVR32 -+ dsputil_init_avr32(c,avctx); -+#endif +@@ -4155,6 +4155,7 @@ void dsputil_init(DSPContext* c, AVCodec - for(i=0; i<64; i++){ - if(!c->put_2tap_qpel_pixels_tab[0][i]) + if (ENABLE_MMX) dsputil_init_mmx (c, avctx); + if (ENABLE_ARMV4L) dsputil_init_armv4l(c, avctx); ++ if (ENABLE_AVR32) dsputil_init_avr32 (c, avctx); + if (ENABLE_MLIB) dsputil_init_mlib (c, avctx); + if (ENABLE_VIS) dsputil_init_vis (c, avctx); + if (ENABLE_ALPHA) dsputil_init_alpha (c, avctx); --- a/libavcodec/h264.c +++ b/libavcodec/h264.c -@@ -3258,7 +3258,12 @@ static void free_tables(H264Context *h){ +@@ -2043,7 +2043,12 @@ static void free_tables(H264Context *h){ static void init_dequant8_coeff_table(H264Context *h){ int i,q,x; @@ -5508,7 +5405,7 @@ h->dequant8_coeff[0] = h->dequant8_buffer[0]; h->dequant8_coeff[1] = h->dequant8_buffer[1]; -@@ -3281,7 +3286,13 @@ static void init_dequant8_coeff_table(H2 +@@ -2066,7 +2071,13 @@ static void init_dequant8_coeff_table(H2 static void init_dequant4_coeff_table(H264Context *h){ int i,j,q,x; @@ -5522,33 +5419,33 @@ for(i=0; i<6; i++ ){ h->dequant4_coeff[i] = h->dequant4_buffer[i]; for(j=0; j<i; j++){ -@@ -4663,7 +4674,11 @@ static int decode_slice_header(H264Conte - if (MPV_common_init(s) < 0) - return -1; - +@@ -3710,7 +3721,11 @@ static int init_poc(H264Context *h){ + static void init_scan_tables(H264Context *h){ + MpegEncContext * const s = &h->s; + int i; +#ifdef ARCH_AVR32 -+ if ( 1 ){ ++ if(1){ +#else - if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly + if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly +#endif - memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t)); - memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t)); - }else{ + memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t)); + memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t)); + }else{ --- a/libavutil/common.h +++ b/libavutil/common.h -@@ -283,23 +283,39 @@ static inline int mid_pred(int a, int b, +@@ -174,23 +174,39 @@ static inline int mid_pred(int a, int b, * @param amax maximum value of the clip range - * @return cliped value + * @return clipped value */ +#if defined(ARCH_AVR32) -+#define clip(a, amin, amax) \ ++#define av_clip(a, amin, amax) \ + ({ int __tmp__; \ + asm ("min\t%0, %1, %2\n" \ + "max\t%0, %0, %3\n" \ + : "=&r"(__tmp__) : "r"(a), "r"(amax), "r"(amin)); \ + __tmp__; }) +#else - static inline int clip(int a, int amin, int amax) + static inline int av_clip(int a, int amin, int amax) { if (a < amin) return amin; else if (a > amax) return amax; @@ -5559,44 +5456,26 @@ /** * clip a signed integer value into the 0-255 range * @param a value to clip - * @return cliped value + * @return clipped value */ +#if defined(ARCH_AVR32) -+#define clip_uint8(a) \ ++#define av_clip_uint8(a) \ + ({ int __tmp__ = a; \ + asm ("satu\t%0 >> 0, 8" : "+r"(__tmp__)); \ + __tmp__; }) +#else - static inline uint8_t clip_uint8(int a) + static inline uint8_t av_clip_uint8(int a) { if (a&(~255)) return (-a)>>31; else return a; } +#endif - /* math */ - int64_t ff_gcd(int64_t a, int64_t b); ---- a/libavutil/internal.h -+++ b/libavutil/internal.h -@@ -210,6 +210,15 @@ if((y)<(x)){\ - }\ - } - -+/* XXX: Hack for uclibc which declares lrintf but does not implement it... */ -+#ifdef ARCH_AVR32 -+#undef HAVE_LRINTF -+#define HAVE_LRINTF 1 -+#define lrintf(x) rint(x) -+#define llrint(x) (long long)rint(x) -+#endif -+ -+ - #ifndef HAVE_LRINTF - /* XXX: add ISOC specific test to avoid specific BSD testing. */ - /* better than nothing implementation. */ + /** + * clip a signed integer value into the -32768,32767 range --- a/libfaad2/common.h +++ b/libfaad2/common.h -@@ -67,7 +67,7 @@ extern "C" { +@@ -69,7 +69,7 @@ extern "C" { /* Use if target platform has address generators with autoincrement */ //#define PREFER_POINTERS @@ -5761,7 +5640,7 @@ + --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h -@@ -173,7 +173,7 @@ typedef struct SwsContext{ +@@ -181,7 +181,7 @@ typedef struct SwsContext{ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c); int yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation); @@ -5769,10 +5648,10 @@ +char *sws_format_name(enum PixelFormat format); //FIXME replace this with something faster - #define isPlanarYUV(x) ((x)==PIX_FMT_YUV410P || (x)==PIX_FMT_YUV420P \ + #define isPlanarYUV(x) ( \ --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c -@@ -44,6 +44,10 @@ +@@ -47,6 +47,10 @@ #include "yuv2rgb_mlib.c" #endif @@ -5783,8 +5662,8 @@ #define DITHER1XBPP // only for mmx const uint8_t __attribute__((aligned(8))) dither_2x2_4[2][8]={ -@@ -601,6 +605,12 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext - if(t) return t; +@@ -646,6 +650,12 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext + if (t) return t; } #endif +#ifdef ARCH_AVR32 @@ -5796,7 +5675,7 @@ #ifdef HAVE_ALTIVEC if (c->flags & SWS_CPU_CAPS_ALTIVEC) { -@@ -678,6 +688,10 @@ int yuv2rgb_c_init_tables (SwsContext *c +@@ -736,6 +746,10 @@ int yuv2rgb_c_init_tables (SwsContext *c //printf("%lld %lld %lld %lld %lld\n", cy, crv, cbu, cgu, cgv); oy -= 256*brightness; @@ -5805,11 +5684,11 @@ +#endif + for (i = 0; i < 1024; i++) { - int j; + int j; --- /dev/null +++ b/libswscale/yuv2rgb_avr32.c -@@ -0,0 +1,416 @@ +@@ -0,0 +1,411 @@ +/* + * Copyright (c) 2007 Atmel Corporation. All rights reserved. + * @@ -5843,7 +5722,7 @@ + * DAMAGE. + */ +#include "pico-avr32.h" -+ ++#include "log.h" + +#define RGB(uv_part) \ + __asm__ volatile ( \ @@ -5856,7 +5735,6 @@ + : "r" (&c->table_gV[0]), "r" (&c->table_gU[0]),"r" (&c->table_bU[0]), \ + "r" (&c->table_rV[0]), "r" (V), "r" (U)); + -+ +#undef YUV2RGB1 +#define YUV2RGB1(dst, src, y, idx) \ + { int tmp2; __asm__ volatile ( \ @@ -5876,7 +5754,7 @@ + "st.b\t%7[6*%8 + 5], %1" /* dst_1[3] = tmp; */ \ + : "=&r" (y), "=&r" (tmp), "=&r" (tmp2) \ + : "r" (src), "r" (r), "r" (g), "r" (b), "r" (dst), "i" (idx)); } -+ ++ +#undef YUV2RGB2 +#define YUV2RGB2(dst, src, y, idx) \ + { int tmp2; __asm__ volatile ( \ @@ -5917,7 +5795,7 @@ + "st.b\t%7[6*%8 + 3], %1" /* dst_1[3] = tmp; */ \ + : "=&r" (y), "=&r" (tmp), "=&r" (tmp2) \ + : "r" (src), "r" (r), "r" (g), "r" (b), "r" (dst), "i" (idx)); } -+ ++ +#undef YUV2BGR2 +#define YUV2BGR2(dst, src, y, idx) \ + { int tmp2; __asm__ volatile ( \ @@ -5938,14 +5816,12 @@ + : "=&r" (y), "=&r" (tmp), "=&r" (tmp2) \ + : "r" (src), "r" (r), "r" (g), "r" (b), "r" (dst), "i" (idx)); } + -+ -+ -+int yuv2bgr24_avr32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, ++int yuv2bgr24_avr32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, + int srcSliceH, uint8_t* dst[], int dstStride[]){ + int y; -+ ++ + if(c->srcFormat == PIX_FMT_YUV422P){ -+ srcStride[1] *= 2; ++ srcStride[1] *= 2; + srcStride[2] *= 2; + } + @@ -5963,24 +5839,22 @@ + uint32_t U, V, Y1, Y2, tmp; + U = ((uint32_t*)pu)[0]; + V = ((uint32_t*)pv)[0]; -+ ++ + RGB("t") -+ YUV2BGR1(dst_1, py_1, Y1, 0) -+ YUV2BGR1(dst_2, py_2, Y2, 0) ++ YUV2BGR1(dst_1, py_1, Y1, 0) ++ YUV2BGR1(dst_2, py_2, Y2, 0) + + RGB("u") -+ YUV2BGR2(dst_1, py_1, Y1, 1) ++ YUV2BGR2(dst_1, py_1, Y1, 1) + YUV2BGR2(dst_2, py_2, Y2, 1) + + RGB("l") -+ YUV2BGR1(dst_1, py_1, Y1, 2) ++ YUV2BGR1(dst_1, py_1, Y1, 2) + YUV2BGR1(dst_2, py_2, Y2, 2) + + RGB("b") -+ YUV2BGR2(dst_1, py_1, Y1, 3) ++ YUV2BGR2(dst_1, py_1, Y1, 3) + YUV2BGR2(dst_2, py_2, Y2, 3) -+ -+ + + pu += 4; + pv += 4; @@ -5995,10 +5869,10 @@ + + + -+static int yuv2rgb24_avr32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, ++static int yuv2rgb24_avr32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, + int srcSliceH, uint8_t* dst[], int dstStride[]){ + int y; -+ ++ + if(c->srcFormat == PIX_FMT_YUV422P){ + srcStride[1] *= 2; + srcStride[2] *= 2; @@ -6016,23 +5890,23 @@ + uint32_t U, V, Y1, Y2, tmp; + U = ((uint32_t*)pu)[0]; + V = ((uint32_t*)pv)[0]; -+ ++ + RGB("t") -+ YUV2RGB1(dst_1, py_1, Y1, 0) -+ YUV2RGB1(dst_2, py_2, Y2, 0) ++ YUV2RGB1(dst_1, py_1, Y1, 0) ++ YUV2RGB1(dst_2, py_2, Y2, 0) + + RGB("u") -+ YUV2RGB2(dst_1, py_1, Y1, 1) ++ YUV2RGB2(dst_1, py_1, Y1, 1) + YUV2RGB2(dst_2, py_2, Y2, 1) + + RGB("l") -+ YUV2RGB1(dst_1, py_1, Y1, 2) ++ YUV2RGB1(dst_1, py_1, Y1, 2) + YUV2RGB1(dst_2, py_2, Y2, 2) + + RGB("b") -+ YUV2RGB2(dst_1, py_1, Y1, 3) ++ YUV2RGB2(dst_1, py_1, Y1, 3) + YUV2RGB2(dst_2, py_2, Y2, 3) -+ ++ + pu += 4; + pv += 4; + py_1 += 8; @@ -6065,20 +5939,20 @@ +} pico_coeff; + + -+static int yuv2bgr24_avr32_pico(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, ++static int yuv2bgr24_avr32_pico(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, + int srcSliceH, uint8_t* dst[], int dstStride[]){ + int y; + static int first_time = 1; + + /* Initialize pico */ -+ PICO_LDCM_D(&pico_coeff, -+ PICO_REGVECT_COEFF0_A, PICO_REGVECT_COEFF0_B, ++ PICO_LDCM_D(&pico_coeff, ++ PICO_REGVECT_COEFF0_A, PICO_REGVECT_COEFF0_B, + PICO_REGVECT_COEFF1_A, PICO_REGVECT_COEFF1_B, -+ PICO_REGVECT_COEFF2_A, PICO_REGVECT_COEFF2_B); -+ -+ PICO_PUT_W(PICO_CONFIG, -+ (PICO_PACKED_MODE << PICO_OUTPUT_MODE -+ | PICO_TRANSFORMATION_MODE << PICO_INPUT_MODE ++ PICO_REGVECT_COEFF2_A, PICO_REGVECT_COEFF2_B); ++ ++ PICO_PUT_W(PICO_CONFIG, ++ (PICO_PACKED_MODE << PICO_OUTPUT_MODE ++ | PICO_TRANSFORMATION_MODE << PICO_INPUT_MODE + | OFFSET_FRAC_BITS << PICO_OFFSET_FRAC_BITS + | COEFF_FRAC_BITS << PICO_COEFF_FRAC_BITS)); + @@ -6117,7 +5991,7 @@ + PICO_OP(0, 3, 3, 7, 11); + PICO_PUT_W(PICO_INPIX0, *py_2_int++); + PICO_STCM_W(dst_1 + 12, PICO_REGVECT_OUTPIX2, PICO_REGVECT_OUTPIX1, PICO_REGVECT_OUTPIX0); -+ ++ + PICO_OP(0, 0, 0, 4, 8); + PICO_OP(0, 1, 1, 4, 8); + PICO_OP(0, 2, 2, 5, 9); @@ -6144,23 +6018,23 @@ + case PIX_FMT_BGR24: + { + if ( avr32_use_pico ){ -+ MSG_ERR("AVR32 BGR24: Using PICO for color space conversion\n"); ++ av_log(c, AV_LOG_INFO, "AVR32 BGR24: Using PICO for color space conversion\n"); + return yuv2bgr24_avr32_pico; + } else { -+ MSG_ERR("AVR32 BGR24: Using optimized color space conversion\n"); ++ av_log(c, AV_LOG_INFO, "AVR32 BGR24: Using optimized color space conversion\n"); + return yuv2bgr24_avr32; + } + } + break; + case PIX_FMT_RGB24: -+ { ++ { + if ( avr32_use_pico ){ -+ MSG_ERR("AVR32 RGB24: Using PICO for color space conversion\n"); ++ av_log(c, AV_LOG_INFO, "AVR32 RGB24: Using PICO for color space conversion\n"); + return yuv2bgr24_avr32_pico; + } else { -+ MSG_ERR("AVR32 RGB24: Using optimized color space conversion\n"); ++ av_log(c, AV_LOG_INFO, "AVR32 RGB24: Using optimized color space conversion\n"); + return yuv2rgb24_avr32; -+ } ++ } + } + } + return NULL; @@ -6169,19 +6043,19 @@ + +int yuv2rgb_c_init_tables_avr32 (SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation){ + const int isRgb = (c->dstFormat == PIX_FMT_RGB24); -+ ++ + int64_t crv = inv_table[0]; + int64_t cbu = inv_table[1]; + int64_t cgu = -inv_table[2]; + int64_t cgv = -inv_table[3]; + int64_t cy = 1<<16; + int64_t oy = 0; -+ ++ + if(!fullRange){ + cy= (cy*255) / 219; + oy= 16<<16; + } -+ ++ + cy = (cy *contrast )>>16; + crv= (crv*contrast * saturation)>>32; + cbu= (cbu*contrast * saturation)>>32; @@ -6189,37 +6063,37 @@ + cgv= (cgv*contrast * saturation)>>32; + + oy -= 256*brightness; -+ ++ + pico_coeff.coeff1_0 = SCALE(cy, 16 - COEFF_FRAC_BITS); /* G <- Y */ + pico_coeff.coeff1_1 = SCALE(cgu, 16 - COEFF_FRAC_BITS); /* G <- U */ -+ pico_coeff.coeff1_2 = SCALE(cgv, 16 - COEFF_FRAC_BITS); /* G <- V */ ++ pico_coeff.coeff1_2 = SCALE(cgv, 16 - COEFF_FRAC_BITS); /* G <- V */ + pico_coeff.coeff1_3 = (SCALE(-128*cgu - 128*cgv - 16*cy, 16 - OFFSET_FRAC_BITS) -+ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1))); /* G offset */ -+ ++ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1))); /* G offset */ ++ + if ( isRgb ){ + pico_coeff.coeff0_0 = SCALE(cy, 16 - COEFF_FRAC_BITS); /* R <- Y */ + pico_coeff.coeff0_1 = 0; /* R <- U */ -+ pico_coeff.coeff0_2 = SCALE(crv, 16 - COEFF_FRAC_BITS); /* R <- V */ ++ pico_coeff.coeff0_2 = SCALE(crv, 16 - COEFF_FRAC_BITS); /* R <- V */ + pico_coeff.coeff0_3 = (SCALE(-128*crv - 16*cy, 16 - OFFSET_FRAC_BITS) -+ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1))); /* R offset */ -+ ++ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1))); /* R offset */ ++ + pico_coeff.coeff2_0 = SCALE(cy, 16 - COEFF_FRAC_BITS); /* B <- Y */ + pico_coeff.coeff2_1 = SCALE(cbu, 16 - COEFF_FRAC_BITS); /* B <- U */ -+ pico_coeff.coeff2_2 = 0; /* B <- V */ -+ pico_coeff.coeff2_3 = (SCALE(-128*cbu - 16*cy, 16 - OFFSET_FRAC_BITS) -+ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1)));/* B offset */ ++ pico_coeff.coeff2_2 = 0; /* B <- V */ ++ pico_coeff.coeff2_3 = (SCALE(-128*cbu - 16*cy, 16 - OFFSET_FRAC_BITS) ++ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1)));/* B offset */ + } else { + pico_coeff.coeff2_0 = SCALE(cy, 16 - COEFF_FRAC_BITS); /* R <- Y */ + pico_coeff.coeff2_1 = 0; /* R <- U */ -+ pico_coeff.coeff2_2 = SCALE(crv, 16 - COEFF_FRAC_BITS); /* R <- V */ ++ pico_coeff.coeff2_2 = SCALE(crv, 16 - COEFF_FRAC_BITS); /* R <- V */ + pico_coeff.coeff2_3 = (SCALE(-128*crv - 16*cy, 16 - OFFSET_FRAC_BITS) -+ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1))); /* R offset */ -+ ++ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1))); /* R offset */ ++ + pico_coeff.coeff0_0 = SCALE(cy, 16 - COEFF_FRAC_BITS); /* B <- Y */ + pico_coeff.coeff0_1 = SCALE(cbu, 16 - COEFF_FRAC_BITS); /* B <- U */ -+ pico_coeff.coeff0_2 = 0; /* B <- V */ ++ pico_coeff.coeff0_2 = 0; /* B <- V */ + pico_coeff.coeff0_3 = (SCALE(-128*cbu - 16*cy, 16 - OFFSET_FRAC_BITS) -+ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1))); /* B offset */ ++ + /*0.5*/(1 << (OFFSET_FRAC_BITS-1))); /* B offset */ + } + +} @@ -6300,7 +6174,7 @@ int i, out_offset = 0, in_offset = 0; - for (i = 0; i < in_height; i++) { -- memcpy(center + out_offset, next_frame + in_offset, +- fast_memcpy(center + out_offset, next_frame + in_offset, - in_width * fb_pixel_size); - out_offset += fb_line_len; - in_offset += in_width * fb_pixel_size; @@ -6311,7 +6185,7 @@ + if (fb_vinfo.yres_virtual == fb_vinfo.yres) { #endif + for (i = 0; i < in_height; i++) { -+ memcpy(center + out_offset, next_frame + in_offset, ++ fast_memcpy(center + out_offset, next_frame + in_offset, + in_width * fb_pixel_size); + out_offset += fb_line_len; + in_offset += in_width * fb_pixel_size; @@ -6336,10 +6210,10 @@ +static uint32_t get_image(mp_image_t *mpi) +{ + if(mpi->flags&MP_IMGFLAG_READABLE) -+ return VO_FALSE; // slow video ram ++ return VO_FALSE; // slow video ram + if(mpi->type==MP_IMGTYPE_STATIC) + return VO_FALSE; // it is not static -+ ++ + if (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) { + // we're lucky or codec accepts stride => ok, let's go! + @@ -6380,7 +6254,9 @@ } --- a/version.sh +++ b/version.sh -@@ -1,2 +1,2 @@ +@@ -1,3 +1,3 @@ #!/bin/sh --echo "#define VERSION \"1.0rc1-$1\"" > version.h -+echo "#define VERSION \"1.0rc1.atmel.2-$1\"" > version.h +-echo "#define VERSION \"1.0rc2-$1\"" > version.h +-echo "#define MP_TITLE \"MPlayer 1.0rc2-$1 (C) 2000-2007 MPlayer Team\"" >> version.h ++echo "#define VERSION \"1.0rc2.atmel.1-$1\"" > version.h ++echo "#define MP_TITLE \"MPlayer 1.0rc2.atmel.1-$1 (C) 2000-2007 MPlayer Team\"" >> version.h diff --git a/package/multimedia/mplayer/mplayer-1.0rc1-largefile.patch b/package/multimedia/mplayer/mplayer-1.0rc2-largefile.patch index bcba2fffa..bcba2fffa 100644 --- a/package/multimedia/mplayer/mplayer-1.0rc1-largefile.patch +++ b/package/multimedia/mplayer/mplayer-1.0rc2-largefile.patch diff --git a/package/multimedia/mplayer/mplayer-1.0rc1-remove-sys-timeb.patch b/package/multimedia/mplayer/mplayer-1.0rc2-remove-sys-timeb.patch index 369aa70ea..369aa70ea 100644 --- a/package/multimedia/mplayer/mplayer-1.0rc1-remove-sys-timeb.patch +++ b/package/multimedia/mplayer/mplayer-1.0rc2-remove-sys-timeb.patch diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index d9aad0494..dd0d0abec 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -3,7 +3,7 @@ # mplayer # ############################################################# -MPLAYER_VERSION:=1.0rc1 +MPLAYER_VERSION:=1.0rc2 MPLAYER_SOURCE:=MPlayer-$(MPLAYER_VERSION).tar.bz2 MPLAYER_SITE:=http://www7.mplayerhq.hu/MPlayer/releases MPLAYER_DIR:=$(BUILD_DIR)/MPlayer-$(MPLAYER_VERSION) @@ -60,7 +60,6 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked $(MPLAYER_ENDIAN) \ $(MPLAYER_LARGEFILE) \ --enable-cross-compile \ - --disable-mpdvdkit \ --disable-ivtv \ --disable-tv \ --disable-live \ diff --git a/package/netstat-nat/Config.in b/package/netstat-nat/Config.in new file mode 100644 index 000000000..6afcf89e3 --- /dev/null +++ b/package/netstat-nat/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_NETSTAT_NAT + bool "netstat-nat" + help + Displays NAT connections + + http://tweegy.nl/projects/netstat-nat/ diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk new file mode 100644 index 000000000..4847283f7 --- /dev/null +++ b/package/netstat-nat/netstat-nat.mk @@ -0,0 +1,12 @@ +############################################################# +# +# netstat-nat +# +############################################################# + +NETSTAT_NAT_VERSION = 1.4.9 +NETSTAT_NAT_SOURCE = netstat-nat-$(NETSTAT_NAT_VERSION).tar.gz +NETSTAT_NAT_SITE = http://tweegy.nl/download +NETSTAT_NAT_DEPENDENCIES = uclibc + +$(eval $(call AUTOTARGETS,package,netstat-nat)) diff --git a/package/pango/pango.mk b/package/pango/pango.mk index c1aac86bd..2bcebf3b7 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -40,20 +40,20 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_use_included_regex=no gl_cv_c_restrict=no \ ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config -ifneq ($(BR2_PACKAGE_XSERVER_none),y) - PANGO_CONF_OPT_X = --with-x \ +PANGO_CONF_OPT = --enable-shared --enable-static \ + --enable-explicit-deps=no --disable-debug + +PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 cairo + +ifeq ($(BR2_PACKAGE_XORG7),y) + PANGO_CONF_OPT += --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest + PANGO_DEPENDENCIES += xserver_xorg-server else - PANGO_CONF_OPT_X = --without-x + PANGO_CONF_OPT += --without-x endif -PANGO_CONF_OPT = --enable-shared --enable-static \ - $(PANGO_CONF_OPT_X) \ - --enable-explicit-deps=no --disable-debug - -PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 $(XSERVER) cairo - $(eval $(call AUTOTARGETS,package,pango)) $(PANGO_HOOK_POST_INSTALL): @@ -85,7 +85,7 @@ $(STAMP_DIR)/host_pango_configured: $(STAMP_DIR)/host_pango_unpacked $(STAMP_DIR --prefix="$(HOST_DIR)/usr" \ --sysconfdir="$(HOST_DIR)/etc" \ --disable-static \ - $(if $(BR2_PACKAGE_XSERVER_none),--without-x,--with-x) \ + $(if $(BR2_PACKAGE_XORG7),--with-x,--without-x) \ --disable-debug \ ) touch $@ diff --git a/package/qt/Config.gfx.in b/package/qt/Config.gfx.in new file mode 100644 index 000000000..0e222dd03 --- /dev/null +++ b/package/qt/Config.gfx.in @@ -0,0 +1,19 @@ +menu "Graphics drivers" + +config BR2_PACKAGE_QT_GFX_LINUXFB + bool "Linux Framebuffer" + default y + +config BR2_PACKAGE_QT_GFX_TRANSFORMED + bool "Transformed" + +config BR2_PACKAGE_QT_GFX_QVFB + bool "Qt Virtual Framebuffer" + +config BR2_PACKAGE_QT_GFX_VNC + bool "VNC" + +config BR2_PACKAGE_QT_GFX_MULTISCREEN + bool "multiscreen" + +endmenu diff --git a/package/qtopia4/Config.in b/package/qt/Config.in index 052431257..b7fe0f939 100644 --- a/package/qtopia4/Config.in +++ b/package/qt/Config.in @@ -1,35 +1,35 @@ -config BR2_PACKAGE_QTOPIA4 - bool "qtopia4" +comment "qt requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP + +menuconfig BR2_PACKAGE_QT + bool "Qt" depends on BR2_INSTALL_LIBSTDCPP help - Qtopia core 4. + Qt for Embedded Linux. - http://www.trolltech.com/ - -comment "qtopia4 requires a toolchain with C++ support enabled" - depends on !BR2_INSTALL_LIBSTDCPP + http://www.qtsoftware.com/products/platform/qt-for-embedded-linux -if BR2_PACKAGE_QTOPIA4 +if BR2_PACKAGE_QT -config BR2_PACKAGE_QTOPIA4_DEBUG +config BR2_PACKAGE_QT_DEBUG bool "Compile with debug support" help If unsure, say N. choice prompt "Library type" - default BR2_PACKAGE_QTOPIA4_SHARED + default BR2_PACKAGE_QT_SHARED help Selects the library type: Shared or Static -config BR2_PACKAGE_QTOPIA4_SHARED +config BR2_PACKAGE_QT_SHARED bool "Shared library" help Create and use shared Qt libraries. If you have multiple programs that depend on Qt or intend to use plugins, say Y. -config BR2_PACKAGE_QTOPIA4_STATIC +config BR2_PACKAGE_QT_STATIC bool "Static Library" help Create and use static Qt libraries. @@ -39,12 +39,12 @@ config BR2_PACKAGE_QTOPIA4_STATIC endchoice -config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL +config BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL bool "Use commercial license" -config BR2_PACKAGE_QTOPIA4_LICENSE_APPROVED +config BR2_PACKAGE_QT_LICENSE_APPROVED bool "Approve free license" - depends on !BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL + depends on !BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL help Select this if you approve one of the available free licenses for the Qt4 library. @@ -54,70 +54,71 @@ config BR2_PACKAGE_QTOPIA4_LICENSE_APPROVED LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html GPL v3.0: http://doc.trolltech.com/4.5/gpl.html -config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME - string "Qtopia Core 4 Commercial License Username" - depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL +config BR2_PACKAGE_QT_COMMERCIAL_USERNAME + string "Qt 4 Commercial License Username" + depends on BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL help Commercial users can download their source directly by providing a username. -config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD - string "Qtopia Core 4 Commercial License Password" - depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL +config BR2_PACKAGE_QT_COMMERCIAL_PASSWORD + string "Qt 4 Commercial License Password" + depends on BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL help Commercial users can download their source directly by providing a password. -config BR2_PACKAGE_QTOPIA4_QT3SUPPORT +config BR2_PACKAGE_QT_QT3SUPPORT bool "Compatibility with Qt3" help Turns on support for older Qt3. This will create an additional library with proxy code and increase the space required on target. If unsure say n. -config BR2_PACKAGE_QTOPIA4_GUI_MODULE +config BR2_PACKAGE_QT_GUI_MODULE bool "Gui Module" + select BR2_PACKAGE_QT_NETWORK default y help Turns on support to Gui applications. If your board don't have video output, or you don't require Qt GUI, say n. -if BR2_PACKAGE_QTOPIA4_GUI_MODULE +if BR2_PACKAGE_QT_GUI_MODULE menu "Pixel depths" comment "Deselecting each option leads to Qt's default (8,16,32)" -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL +config BR2_PACKAGE_QT_PIXEL_DEPTH_ALL bool "All supported depths" -if !BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL +if !BR2_PACKAGE_QT_PIXEL_DEPTH_ALL -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1 +config BR2_PACKAGE_QT_PIXEL_DEPTH_1 bool "1 bpp, black/white" -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4 +config BR2_PACKAGE_QT_PIXEL_DEPTH_4 bool "4 bpp, grayscale" -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8 +config BR2_PACKAGE_QT_PIXEL_DEPTH_8 bool "8 bpp, paletted" default y -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12 +config BR2_PACKAGE_QT_PIXEL_DEPTH_12 bool "12 bpp, rgb 4-4-4" -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15 +config BR2_PACKAGE_QT_PIXEL_DEPTH_15 bool "15 bpp, rgb 5-5-5" -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16 +config BR2_PACKAGE_QT_PIXEL_DEPTH_16 bool "16 bpp, rgb 5-6-5" default y -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18 +config BR2_PACKAGE_QT_PIXEL_DEPTH_18 bool "18 bpp, rgb 6-6-6" -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24 +config BR2_PACKAGE_QT_PIXEL_DEPTH_24 bool "24 bpp, rgb 8-8-8" -config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32 +config BR2_PACKAGE_QT_PIXEL_DEPTH_32 bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8" default y @@ -125,37 +126,37 @@ endif endmenu endif -config BR2_PACKAGE_QTOPIA4_GIF +config BR2_PACKAGE_QT_GIF bool "Enable GIF support" - depends on BR2_PACKAGE_QTOPIA4_GUI_MODULE + depends on BR2_PACKAGE_QT_GUI_MODULE help This compiles and installs the plugin for GIF reading support. -config BR2_PACKAGE_QTOPIA4_LIBMNG +config BR2_PACKAGE_QT_LIBMNG bool "Enable libmng support" - depends on BR2_PACKAGE_QTOPIA4_GUI_MODULE + depends on BR2_PACKAGE_QT_GUI_MODULE help This compiles and installs the plugin for MNG support. choice prompt "JPEG support" - depends on BR2_PACKAGE_QTOPIA4_GUI_MODULE - default BR2_PACKAGE_QTOPIA4_NOJPEG + depends on BR2_PACKAGE_QT_GUI_MODULE + default BR2_PACKAGE_QT_NOJPEG help Select libjpeg support. -config BR2_PACKAGE_QTOPIA4_NOJPEG +config BR2_PACKAGE_QT_NOJPEG bool "No jpeg support" help Disable JPEG support -config BR2_PACKAGE_QTOPIA4_SYSTEMJPEG +config BR2_PACKAGE_QT_SYSTEMJPEG select BR2_PACKAGE_JPEG bool "System libjpeg" help Link against system libjpeg -config BR2_PACKAGE_QTOPIA4_QTJPEG +config BR2_PACKAGE_QT_QTJPEG bool "Use Qt bundled libjpeg" help Link against libjpeg proveded with Qt @@ -163,52 +164,52 @@ endchoice choice prompt "PNG support" - depends on BR2_PACKAGE_QTOPIA4_GUI_MODULE - default BR2_PACKAGE_QTOPIA4_NOPNG + depends on BR2_PACKAGE_QT_GUI_MODULE + default BR2_PACKAGE_QT_NOPNG help Select which library to use if PNG support should be enabled. -config BR2_PACKAGE_QTOPIA4_NOPNG +config BR2_PACKAGE_QT_NOPNG bool "No PNG support" -config BR2_PACKAGE_QTOPIA4_SYSTEMPNG +config BR2_PACKAGE_QT_SYSTEMPNG bool "System libpng" select BR2_PACKAGE_LIBPNG -config BR2_PACKAGE_QTOPIA4_QTPNG +config BR2_PACKAGE_QT_QTPNG bool "Use Qt bundled libpng" endchoice choice prompt "TIFF support" - depends on BR2_PACKAGE_QTOPIA4_GUI_MODULE - default BR2_PACKAGE_QTOPIA4_NOTIFF + depends on BR2_PACKAGE_QT_GUI_MODULE + default BR2_PACKAGE_QT_NOTIFF help Select which library to use if TIFF support should be enabled. -config BR2_PACKAGE_QTOPIA4_NOTIFF +config BR2_PACKAGE_QT_NOTIFF bool "No TIFF support" -config BR2_PACKAGE_QTOPIA4_SYSTEMTIFF +config BR2_PACKAGE_QT_SYSTEMTIFF bool "System libtiff" select BR2_PACKAGE_TIFF -config BR2_PACKAGE_QTOPIA4_QTTIFF +config BR2_PACKAGE_QT_QTTIFF bool "Use Qt bundled libtiff" endchoice choice prompt "zlib support" - default BR2_PACKAGE_QTOPIA4_QTZLIB + default BR2_PACKAGE_QT_QTZLIB help Select zlib support. -config BR2_PACKAGE_QTOPIA4_QTZLIB +config BR2_PACKAGE_QT_QTZLIB bool "Qt zlib" help Use the zlib bundled with Qt. -config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB +config BR2_PACKAGE_QT_SYSTEMZLIB bool "System zlib" select BR2_PACKAGE_ZLIB help @@ -217,23 +218,23 @@ endchoice choice prompt "freetype2 support" - depends on BR2_PACKAGE_QTOPIA4_GUI_MODULE - default BR2_PACKAGE_QTOPIA4_NOFREETYPE + depends on BR2_PACKAGE_QT_GUI_MODULE + default BR2_PACKAGE_QT_NOFREETYPE help Select freetype2 support. -config BR2_PACKAGE_QTOPIA4_NOFREETYPE +config BR2_PACKAGE_QT_NOFREETYPE bool "no freetype2 support" help Do not compile in Freetype2 support. -config BR2_PACKAGE_QTOPIA4_QTFREETYPE +config BR2_PACKAGE_QT_QTFREETYPE bool "Qt freetype2" help Use the libfreetype bundled with Qt. -config BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE +config BR2_PACKAGE_QT_SYSTEMFREETYPE bool "System freetype2" select BR2_PACKAGE_FREETYPE help @@ -241,8 +242,8 @@ config BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE See http://www.freetype.org/ endchoice -config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM - string "The embedded platform we are making Qtopia4 for" +config BR2_PACKAGE_QT_EMB_PLATFORM + string "The embedded platform we are making Qt for" default "arm" if BR2_arm default "arm" if BR2_armeb default "avr32" if BR2_avr32 @@ -262,13 +263,13 @@ config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM help The target platform. -source "package/qtopia4/Config.sql.in" -if BR2_PACKAGE_QTOPIA4_GUI_MODULE -source "package/qtopia4/Config.gfx.in" -source "package/qtopia4/Config.mouse.in" +source "package/qt/Config.sql.in" +if BR2_PACKAGE_QT_GUI_MODULE +source "package/qt/Config.gfx.in" +source "package/qt/Config.mouse.in" endif -config BR2_PACKAGE_QTOPIA4_PHONON +config BR2_PACKAGE_QT_PHONON bool "Phonon Module" select BR2_PACKAGE_GSTREAMER select BR2_PACKAGE_GST_PLUGINS_BASE @@ -277,42 +278,48 @@ config BR2_PACKAGE_QTOPIA4_PHONON formats can be configured at the GStreamer package. If unsure, say n. -config BR2_PACKAGE_QTOPIA4_XML +config BR2_PACKAGE_QT_XML bool "XML Module" default y help Build the XML module. -config BR2_PACKAGE_QTOPIA4_XMLPATTERNS +config BR2_PACKAGE_QT_XMLPATTERNS bool "XML Patterns Module" - depends on BR2_PACKAGE_QTOPIA4_XML + depends on BR2_PACKAGE_QT_XML help Build QtXmlPatterns module. If unsure, say n -config BR2_PACKAGE_QTOPIA4_SVG +config BR2_PACKAGE_QT_SVG bool "SVG Module" help Build the SVG module. If unsure, say n -config BR2_PACKAGE_QTOPIA4_NETWORK +config BR2_PACKAGE_QT_NETWORK bool "Network Module" default y help Install the Network module. if unsure, say y -config BR2_PACKAGE_QTOPIA4_WEBKIT +config BR2_PACKAGE_QT_WEBKIT bool "WebKit Module" - depends on BR2_PACKAGE_QTOPIA4_NETWORK + depends on BR2_PACKAGE_QT_NETWORK help Build the WebKit module. If unsure, say n. -config BR2_PACKAGE_QTOPIA4_OPENSSL +config BR2_PACKAGE_QT_STL + bool "STL support" + help + Compile STL support. + If unsure, say n. + +config BR2_PACKAGE_QT_OPENSSL bool "Enable OpenSSL support" - depends on BR2_PACKAGE_QTOPIA4_NETWORK + depends on BR2_PACKAGE_QT_NETWORK select BR2_PACKAGE_OPENSSL help Enable support for the OpenSSL encryption library. If you use @@ -320,18 +327,18 @@ config BR2_PACKAGE_QTOPIA4_OPENSSL target. If unsure, say n. -config BR2_PACKAGE_QTOPIA4_SCRIPT +config BR2_PACKAGE_QT_SCRIPT bool "Script Module" default y help Build the Qt Script module. if unsure, say y. -config BR2_PACKAGE_QTOPIA4_SCRIPTTOOLS +config BR2_PACKAGE_QT_SCRIPTTOOLS bool "Script Tools Module" - depends on BR2_PACKAGE_QTOPIA4_SCRIPT + depends on BR2_PACKAGE_QT_SCRIPT help Build the Qt Script Tools module. if unsure, say n. -endif # BR2_PACKAGE_QTOPIA4 +endif # BR2_PACKAGE_QT diff --git a/package/qt/Config.mouse.in b/package/qt/Config.mouse.in new file mode 100644 index 000000000..708597428 --- /dev/null +++ b/package/qt/Config.mouse.in @@ -0,0 +1,24 @@ +menu "Mouse drivers" + +config BR2_PACKAGE_QT_MOUSE_PC + bool "pc" + +config BR2_PACKAGE_QT_MOUSE_BUS + bool "bus" + +config BR2_PACKAGE_QT_MOUSE_LINUXTP + bool "linuxtp" + +config BR2_PACKAGE_QT_MOUSE_YOPY + bool "yopy" + +config BR2_PACKAGE_QT_MOUSE_VR41XX + bool "vr41xx" + +config BR2_PACKAGE_QT_MOUSE_TSLIB + bool "tslib" + +config BR2_PACKAGE_QT_MOUSE_QVFB + bool "qvfb" + +endmenu diff --git a/package/qtopia4/Config.sql.in b/package/qt/Config.sql.in index 4c5f405e2..2ce8d7964 100644 --- a/package/qtopia4/Config.sql.in +++ b/package/qt/Config.sql.in @@ -1,40 +1,40 @@ -menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE +menuconfig BR2_PACKAGE_QT_SQL_MODULE bool "SQL Module" help - Compile Qtopia SQL Module + Compile Qt SQL Module -if BR2_PACKAGE_QTOPIA4_SQL_MODULE -config BR2_PACKAGE_QTOPIA4_MYSQL +if BR2_PACKAGE_QT_SQL_MODULE +config BR2_PACKAGE_QT_MYSQL bool "MySQL Driver" help Build MySQL driver If unsure, say n. -config BR2_PACKAGE_QTOPIA4_IBASE +config BR2_PACKAGE_QT_IBASE bool "iBase Driver" help Build iBase driver If unsure, say n. -config BR2_PACKAGE_QTOPIA4_ODBC +config BR2_PACKAGE_QT_ODBC bool "ODBC Driver" help Build ODBC driver If unsure, say n. -config BR2_PACKAGE_QTOPIA4_PSQL +config BR2_PACKAGE_QT_PSQL bool "PostgreSQL Driver" help Build PostgreSQL driver If unsure, say n. -config BR2_PACKAGE_QTOPIA4_SQLITE +config BR2_PACKAGE_QT_SQLITE bool "SQLite 3 Driver" help Build SQLite driver If unsure, say n. -config BR2_PACKAGE_QTOPIA4_SQLITE2 +config BR2_PACKAGE_QT_SQLITE2 bool "SQLite 2 Driver" help Build SQLite 2 driver diff --git a/package/qtopia4/qtopia-4.5.2-fix-qt-zlib-build.patch b/package/qt/qt-4.5.2-fix-qt-zlib-build.patch index b191cc751..b191cc751 100644 --- a/package/qtopia4/qtopia-4.5.2-fix-qt-zlib-build.patch +++ b/package/qt/qt-4.5.2-fix-qt-zlib-build.patch diff --git a/package/qt/qt.mk b/package/qt/qt.mk new file mode 100644 index 000000000..ea59b0764 --- /dev/null +++ b/package/qt/qt.mk @@ -0,0 +1,583 @@ +###################################################################### +# +# Qt Embedded for Linux 4.5 +# http://www.qtsoftware.com/ +# +# This makefile was originally composed by Thomas Lundquist <thomasez@zelow.no> +# Later heavily modified by buildroot developers +# +# BTW, this uses alot of FPU calls and it's pretty slow if you use +# the kernels FPU emulation so it's better to choose soft float in the +# buildroot config (and uClibc.config of course, if you have your own.) +# +###################################################################### + +# BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h +# instead of at "dbus/dbus.h" +# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus) +# to fix + +# BUG: There is a workaround below (search for x86x86fix) for +# x86 crosscompiling under linux x86. Please remove it when the workaround +# is no longer necessary. + +QT_VERSION:=4.5.2 +QT_CAT:=$(BZCAT) + +BR2_PACKAGE_QT_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QT_COMMERCIAL_USERNAME))) +#")) +BR2_PACKAGE_QT_COMMERCIAL_PASSWORD:=$(strip $(subst ",, $(BR2_PACKAGE_QT_COMMERCIAL_PASSWORD))) +#")) + +QT_CONFIGURE:=#empty + +# What to download, free or commercial version. +ifneq ($(BR2_PACKAGE_QT_COMMERCIAL_USERNAME),) +QT_SITE:=http://$(BR2_PACKAGE_QT_COMMERCIAL_USERNAME):$(BR2_QT_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QT_COMMERCIAL_USERNAME) +QT_SOURCE:=qt-embedded-linux-commercial-src-$(QT_VERSION).tar.bz2 +QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QT_VERSION) +QT_CONFIGURE+= -commercial +else # Good, good, we are free: +QT_SITE=http://get.qtsoftware.com/qt/source +QT_SOURCE:=qt-embedded-linux-opensource-src-$(QT_VERSION).tar.bz2 +QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION) +QT_CONFIGURE+= -opensource +ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y) +QT_CONFIGURE+= -confirm-license +endif +endif + +# If you want extra tweaking you can copy +# $(QT_TARGET_DIR)/src/corelib/global/qconfig-myfile.h +# to the qt packages directory (where this .mk file is) and +# remove the comment. +# QT_QCONFIG_COMMAND:=-qconfig myfile +# +# For the options you can set in this file, look at +# $(QT_TARGET_DIR)/src/corelib/global/qfeatures.txt +# +QT_QCONFIG_FILE:=package/qt/qconfig-myfile.h +QT_QCONFIG_FILE_LOCATION:=/src/corelib/global/ + +ifeq ($(BR2_LARGEFILE),y) +QT_CONFIGURE+= -largefile +else +QT_CONFIGURE+= -no-largefile +endif + +ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y) +QT_CONFIGURE+= -qt3support +else +QT_CONFIGURE+= -no-qt3support +endif + + +### Pixel depths +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_ALL),y) +QT_PIXEL_DEPTHS = all +else +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y) +QT_PIXEL_DEPTHS += 1 +endif +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_4),y) +QT_PIXEL_DEPTHS += 4 +endif +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_8),y) +QT_PIXEL_DEPTHS += 8 +endif +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_12),y) +QT_PIXEL_DEPTHS += 12 +endif +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_15),y) +QT_PIXEL_DEPTHS += 15 +endif +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_16),y) +QT_PIXEL_DEPTHS += 16 +endif +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_18),y) +QT_PIXEL_DEPTHS += 18 +endif +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_24),y) +QT_PIXEL_DEPTHS += 24 +endif +ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y) +QT_PIXEL_DEPTHS += 32 +endif +endif +ifneq ($(QT_PIXEL_DEPTHS),) +QT_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS))) +endif + +### Display drivers +ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y) +QT_CONFIGURE += -qt-gfx-linuxfb +else +QT_CONFIGURE += -no-gfx-linuxfb +endif +ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y) +QT_CONFIGURE += -qt-gfx-transformed +else +QT_CONFIGURE += -no-gfx-transformed +endif +ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y) +QT_CONFIGURE += -qt-gfx-qvfb +else +QT_CONFIGURE += -no-gfx-qvfb +endif +ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y) +QT_CONFIGURE += -qt-gfx-vnc +else +QT_CONFIGURE += -no-gfx-vnc +endif +ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y) +QT_CONFIGURE += -qt-gfx-multiscreen +else +QT_CONFIGURE += -no-gfx-multiscreen +endif + +### Mouse drivers +ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y) +QT_CONFIGURE += -qt-mouse-pc +else +QT_CONFIGURE += -no-mouse-pc +endif +ifeq ($(BR2_PACKAGE_QT_MOUSE_BUS),y) +QT_CONFIGURE += -qt-mouse-bus +else +QT_CONFIGURE += -no-mouse-bus +endif +ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y) +QT_CONFIGURE += -qt-mouse-linuxtp +else +QT_CONFIGURE += -no-mouse-linuxtp +endif +ifeq ($(BR2_PACKAGE_QT_MOUSE_YOPY),y) +QT_CONFIGURE += -qt-mouse-yopy +else +QT_CONFIGURE += -no-mouse-yopy +endif +ifeq ($(BR2_PACKAGE_QT_MOUSE_VR41XX),y) +QT_CONFIGURE += -qt-mouse-vr41xx +else +QT_CONFIGURE += -no-mouse-vr41xx +endif +ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y) +QT_CONFIGURE += -qt-mouse-tslib +QT_DEP_LIBS+=tslib +QT_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG" +QT_TSLIB_DEB:=$(strip $(subst ",, $(QT_TSLIB_DEB))) +#")) +else +QT_CONFIGURE += -no-mouse-tslib +endif +ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y) +QT_CONFIGURE += -qt-mouse-qvfb +else +QT_CONFIGURE += -no-mouse-qvfb +endif + +ifeq ($(BR2_PACKAGE_QT_DEBUG),y) +QT_CONFIGURE+= "-debug $(QT_TSLIB_DEB)" +else +QT_CONFIGURE+= -release +endif + +ifeq ($(BR2_PACKAGE_QT_SHARED),y) +QT_CONFIGURE+= -shared +else +QT_CONFIGURE+= -static +endif + +ifeq ($(BR2_ENDIAN),"LITTLE") +QT_CONFIGURE+= -little-endian +else +QT_CONFIGURE+= -big-endian +endif + +ifeq ($(BR2_PACKAGE_QT_GIF),y) +QT_CONFIGURE+= -qt-gif +else +QT_CONFIGURE+= -no-gif +endif + +ifeq ($(BR2_PACKAGE_QT_LIBMNG),y) +QT_CONFIGURE+= -qt-libmng +else +QT_CONFIGURE+= -no-libmng +endif + +ifeq ($(BR2_PACKAGE_QT_QTZLIB),y) +QT_CONFIGURE+= -qt-zlib +else +ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y) +QT_CONFIGURE+= -system-zlib +QT_DEP_LIBS+=zlib +endif +endif + +ifeq ($(BR2_PACKAGE_QT_QTJPEG),y) +QT_CONFIGURE+= -qt-libjpeg +else +ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y) +QT_CONFIGURE+= -system-libjpeg +QT_DEP_LIBS+=jpeg +else +QT_CONFIGURE+= -no-libjpeg +endif +endif + +ifeq ($(BR2_PACKAGE_QT_QTPNG),y) +QT_CONFIGURE+= -qt-libpng +else +ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y) +QT_CONFIGURE+= -system-libpng +QT_DEP_LIBS+=libpng +else +QT_CONFIGURE+= -no-libpng +endif +endif + +ifeq ($(BR2_PACKAGE_QT_QTTIFF),y) +QT_CONFIGURE+= -qt-libtiff +else +ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y) +QT_CONFIGURE+= -system-libtiff +QT_DEP_LIBS+=tiff +else +QT_CONFIGURE+= -no-libtiff +endif +endif + + +ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y) +QT_CONFIGURE+= -qt-freetype +else +ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y) +QT_CONFIGURE+= -system-freetype +QT_CONFIGURE+= -I $(STAGING_DIR)/usr/include/freetype2/ +QT_DEP_LIBS+=freetype +else +QT_CONFIGURE+= -no-freetype +endif +endif + + +ifeq ($(BR2_PACKAGE_QT_OPENSSL),y) +QT_CONFIGURE+= -openssl +QT_DEP_LIBS+=openssl +else +QT_CONFIGURE+= -no-openssl +endif + +# Qt SQL Drivers +ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y) +ifeq ($(BR2_PACKAGE_QT_IBASE),y) +QT_CONFIGURE+= -qt-sql-ibase +endif +ifeq ($(BR2_PACKAGE_QT_MYSQL),y) +QT_CONFIGURE+= -qt-sql-mysql +endif +ifeq ($(BR2_PACKAGE_QT_ODBC),y) +QT_CONFIGURE+= -qt-sql-odbc +endif +ifeq ($(BR2_PACKAGE_QT_PSQL),y) +QT_CONFIGURE+= -qt-sql-psql +endif +ifeq ($(BR2_PACKAGE_QT_SQLITE),y) +QT_CONFIGURE+= -qt-sql-sqlite +else +QT_CONFIGURE+= -no-sql-sqlite +endif +ifeq ($(BR2_PACKAGE_QT_SQLITE2),y) +QT_CONFIGURE+= -qt-sql-sqlite2 +endif +else +# By default, no SQL driver is turned on by configure. +# but it seams sqlite isn't disabled despite what says +# configure --help +QT_CONFIGURE+= -no-sql-sqlite +endif + +ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y) +QT_CONFIGURE+= -xmlpatterns -exceptions +else +QT_CONFIGURE+= -no-xmlpatterns +endif + +ifeq ($(BR2_PACKAGE_QT_PHONON),y) +QT_CONFIGURE+= -phonon +QT_DEP_LIBS+=gstreamer gst-plugins-base +else +QT_CONFIGURE+= -no-phonon +endif + +ifeq ($(BR2_PACKAGE_QT_SVG),y) +QT_CONFIGURE+= -svg +else +QT_CONFIGURE+= -no-svg +endif + +ifeq ($(BR2_PACKAGE_QT_WEBKIT),y) +QT_CONFIGURE+= -webkit +else +QT_CONFIGURE+= -no-webkit +endif + +ifeq ($(BR2_PACKAGE_QT_STL),y) +QT_CONFIGURE+= -stl +else +QT_CONFIGURE+= -no-stl +endif + +QT_CONFIGURE:=$(strip $(subst ",, $(QT_CONFIGURE))) +#")) +BR2_PACKAGE_QT_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QT_EMB_PLATFORM))) +#")) + +# x86x86fix +# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux +# host. It's unclear if this would happen on other hosts. +ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),) +ifeq ($(BR2_PACKAGE_QT_EMB_PLATFORM),x86) +QT_CONFIGURE+= -platform linux-g++ +QT_CONFIGURE:=$(strip $(subst ",, $(QT_CONFIGURE))) +#")) +endif +endif +# End of workaround. + +# Figure out what libs to install in the target +QT_LIBS=#empty +ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) +QT_LIBS+= qt-gui +endif +ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y) +QT_LIBS+= qt-sql +endif +ifeq ($(BR2_PACKAGE_QT_PHONON),y) +QT_LIBS+= qt-phonon +endif +ifeq ($(BR2_PACKAGE_QT_SVG),y) +QT_LIBS+= qt-svg +endif +ifeq ($(BR2_PACKAGE_QT_NETWORK),y) +QT_LIBS+= qt-network +endif +ifeq ($(BR2_PACKAGE_QT_WEBKIT),y) +QT_LIBS+= qt-webkit +endif +ifeq ($(BR2_PACKAGE_QT_XML),y) +QT_LIBS+= qt-xml +endif +ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y) +QT_LIBS+= qt-xmlpatterns +endif +ifeq ($(BR2_PACKAGE_QT_SCRIPT),y) +QT_LIBS+= qt-script +endif +ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y) +QT_LIBS+= qt-scripttools +endif + +QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++/qmake.conf + +QT_QMAKE_AR:=$(TARGET_AR) cqs + +# Variable for other Qt applications to use +QT_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++ + +################################################################################ +# QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in +# QT_QMAKE_CONF. Will remove existing variable declaration if available. +# +# Argument 1 is the variable name (without QMAKE_) +# Argument 2 is the value to set variable to +# +# E.G. use like this: +# $(call QT_QMAKE_SET,variable,value) +################################################################################ +define QT_QMAKE_SET + $(SED) '/QMAKE_$(1)/d' $(QT_QMAKE_CONF) + $(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(QT_QMAKE_CONF) +endef + +################################################################################ +# QT_INSTALL_PLUGINS -- helper macro to install Qt plugins to target and +# strip them +# +# Argument 1 is the plugin folder +# +# E.G. use like this to install plugins/sqldrivers: +# $(call QT_INSTALL_PLUGINS,sqldrivers) +# ################################################################################ +define QT_INSTALL_PLUGINS + if [ -d $(STAGING_DIR)/usr/plugins/$(1) ]; then \ + mkdir -p $(TARGET_DIR)/usr/plugins; \ + cp -dpfr $(STAGING_DIR)/usr/plugins/$(1) $(TARGET_DIR)/usr/plugins/; \ + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/$(1)/*; \ + fi +endef + +$(DL_DIR)/$(QT_SOURCE): + $(call DOWNLOAD,$(QT_SITE),$(QT_SOURCE)) + +qt-source: $(DL_DIR)/$(QT_SOURCE) + + +$(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE) + $(QT_CAT) $(DL_DIR)/$(QT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(QT_TARGET_DIR) package/qt/ \ + qt-$(QT_VERSION)-\*.patch \ + qt-$(QT_VERSION)-\*.patch.$(ARCH) + touch $@ + +$(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked +ifneq ($(BR2_INET_IPV6),y) + $(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure + $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure +endif + $(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QT_TARGET_DIR)/configure + # Fix compiler path + $(call QT_QMAKE_SET,CC,$(TARGET_CC)) + $(call QT_QMAKE_SET,CXX,$(TARGET_CXX)) + $(call QT_QMAKE_SET,LINK,$(TARGET_CXX)) + $(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX)) + $(call QT_QMAKE_SET,AR,$(QT_QMAKE_AR)) + $(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY)) + $(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB)) + $(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP)) + $(call QT_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS)) + $(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS)) + $(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS)) + -[ -f $(QT_QCONFIG_FILE) ] && cp $(QT_QCONFIG_FILE) \ + $(QT_TARGET_DIR)/$(QT_QCONFIG_FILE_LOCATION) +# Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'. +# PKG_CONFIG_SYSROOT is only used to avoid a warning from Qt's configure system +# when cross compiling, Qt 4.4.3 is wrong here. +# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target +# instead of the host then. + (cd $(QT_TARGET_DIR); rm -rf config.cache; \ + PATH=$(TARGET_PATH) \ + PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ + PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \ + ./configure \ + $(if $(VERBOSE),-verbose,-silent) \ + -force-pkg-config \ + -embedded $(BR2_PACKAGE_QT_EMB_PLATFORM) \ + $(QT_QCONFIG_COMMAND) \ + $(QT_CONFIGURE) \ + -no-cups \ + -no-nis \ + -no-accessibility \ + -no-separate-debug-info \ + -prefix /usr \ + -hostprefix $(STAGING_DIR)/usr \ + -fast \ + -no-rpath \ + -nomake examples \ + -nomake demos \ + ) + touch $@ + +$(QT_TARGET_DIR)/.compiled: $(QT_TARGET_DIR)/.configured + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QT_TARGET_DIR) + touch $@ + +$(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QT_TARGET_DIR) install + +qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la + mkdir -p $(TARGET_DIR)/usr/lib/fonts + touch $(TARGET_DIR)/usr/lib/fonts/fontdir + cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts + cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts + cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts + # Install image plugins if they are built + $(call QT_INSTALL_PLUGINS,imageformats) +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtGui.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-sql: $(STAGING_DIR)/usr/lib/libQtCore.la + $(call QT_INSTALL_PLUGINS,sqldrivers) +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtSql.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-phonon: $(STAGING_DIR)/usr/lib/libQtCore.la + $(call QT_INSTALL_PLUGINS,phonon_backend) +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libphonon.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-svg: $(STAGING_DIR)/usr/lib/libQtCore.la + $(call QT_INSTALL_PLUGINS,iconengines) +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtSvg.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-network: $(STAGING_DIR)/usr/lib/libQtCore.la +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtNetwork.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-webkit: $(STAGING_DIR)/usr/lib/libQtCore.la +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtWebKit.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-xml: $(STAGING_DIR)/usr/lib/libQtCore.la +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtXml.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-xmlpatterns: $(STAGING_DIR)/usr/lib/libQtCore.la +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtXmlPatterns.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-script: $(STAGING_DIR)/usr/lib/libQtCore.la +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtScript.so.* $(TARGET_DIR)/usr/lib/ +endif + +qt-scripttools: $(STAGING_DIR)/usr/lib/libQtCore.la +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/ +endif + + +$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) + # Strip all installed libs +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/ + -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.* +endif + +qt: uclibc $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4 + +qt-clean: + -$(MAKE) -C $(QT_TARGET_DIR) clean + -rm -rf $(TARGET_DIR)/usr/lib/fonts +ifeq ($(BR2_PACKAGE_QT_SHARED),y) + -rm $(TARGET_DIR)/usr/lib/libQt*.so.* + -rm $(TARGET_DIR)/usr/lib/libphonon.so.* +endif + +qt-dirclean: + rm -rf $(QT_TARGET_DIR) + +qt-status: + @echo "QT_QMAKE: " $(QT_QMAKE) + @echo "QT_DEP_LIBS: " $(QT_DEP_LIBS) + @echo "FREETYPE_DIR: " $(FREETYPE_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(BR2_PACKAGE_QT),y) +TARGETS+=qt +endif diff --git a/package/qtopia4/Config.gfx.in b/package/qtopia4/Config.gfx.in deleted file mode 100644 index 814788619..000000000 --- a/package/qtopia4/Config.gfx.in +++ /dev/null @@ -1,19 +0,0 @@ -menu "Graphics drivers" - -config BR2_PACKAGE_QTOPIA4_GFX_LINUXFB - bool "Linux Framebuffer" - default y - -config BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED - bool "Transformed" - -config BR2_PACKAGE_QTOPIA4_GFX_QVFB - bool "Qt Virtual Framebuffer" - -config BR2_PACKAGE_QTOPIA4_GFX_VNC - bool "VNC" - -config BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN - bool "multiscreen" - -endmenu diff --git a/package/qtopia4/Config.mouse.in b/package/qtopia4/Config.mouse.in deleted file mode 100644 index 7b3946009..000000000 --- a/package/qtopia4/Config.mouse.in +++ /dev/null @@ -1,24 +0,0 @@ -menu "Mouse drivers" - -config BR2_PACKAGE_QTOPIA4_MOUSE_PC - bool "pc" - -config BR2_PACKAGE_QTOPIA4_MOUSE_BUS - bool "bus" - -config BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP - bool "linuxtp" - -config BR2_PACKAGE_QTOPIA4_MOUSE_YOPY - bool "yopy" - -config BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX - bool "vr41xx" - -config BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB - bool "tslib" - -config BR2_PACKAGE_QTOPIA4_MOUSE_QVFB - bool "qvfb" - -endmenu diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk deleted file mode 100644 index f7196f476..000000000 --- a/package/qtopia4/qtopia4.mk +++ /dev/null @@ -1,577 +0,0 @@ -###################################################################### -# -# qtopia4 (Qt Embedded for Linux 4.5) -# http://www.qtsoftware.com/ -# -# This makefile was originally composed by Thomas Lundquist <thomasez@zelow.no> -# Later heavily modified by buildroot developers -# -# BTW, this uses alot of FPU calls and it's pretty slow if you use -# the kernels FPU emulation so it's better to choose soft float in the -# buildroot config (and uClibc.config of course, if you have your own.) -# -###################################################################### - -# BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h -# instead of at "dbus/dbus.h" -# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus) -# to fix - -# BUG: There is a workaround below (search for x86x86fix) for -# x86 crosscompiling under linux x86. Please remove it when the workaround -# is no longer necessary. - -QTOPIA4_VERSION:=4.5.2 -QTOPIA4_CAT:=$(BZCAT) - -BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME))) -#")) -BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD))) -#")) - -QTOPIA4_CONFIGURE:=#empty - -# What to download, free or commercial version. -ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),) -QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME) -QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.bz2 -QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION) -QTOPIA4_CONFIGURE+= -commercial -else # Good, good, we are free: -QTOPIA4_SITE=http://get.qtsoftware.com/qt/source -QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.bz2 -QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION) -QTOPIA4_CONFIGURE+= -opensource -ifeq ($(BR2_PACKAGE_QTOPIA4_LICENSE_APPROVED),y) -QTOPIA4_CONFIGURE+= -confirm-license -endif -endif - -# If you want extra tweaking you can copy -# $(QTOPIA4_TARGET_DIR)/src/corelib/global/qconfig-myfile.h -# to the qtopia4 packages directory (where this .mk file is) and -# remove the comment. -# QTOPIA4_QCONFIG_COMMAND:=-qconfig myfile -# -# For the options you can set in this file, look at -# $(QTOPIA4_TARGET_DIR)/src/corelib/global/qfeatures.txt -# -QTOPIA4_QCONFIG_FILE:=package/qtopia4/qconfig-myfile.h -QTOPIA4_QCONFIG_FILE_LOCATION:=/src/corelib/global/ - -ifeq ($(BR2_LARGEFILE),y) -QTOPIA4_CONFIGURE+= -largefile -else -QTOPIA4_CONFIGURE+= -no-largefile -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y) -QTOPIA4_CONFIGURE+= -qt3support -else -QTOPIA4_CONFIGURE+= -no-qt3support -endif - - -### Pixel depths -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL),y) -QTOPIA4_PIXEL_DEPTHS = all -else -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1),y) -QTOPIA4_PIXEL_DEPTHS += 1 -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4),y) -QTOPIA4_PIXEL_DEPTHS += 4 -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8),y) -QTOPIA4_PIXEL_DEPTHS += 8 -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12),y) -QTOPIA4_PIXEL_DEPTHS += 12 -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15),y) -QTOPIA4_PIXEL_DEPTHS += 15 -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16),y) -QTOPIA4_PIXEL_DEPTHS += 16 -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18),y) -QTOPIA4_PIXEL_DEPTHS += 18 -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24),y) -QTOPIA4_PIXEL_DEPTHS += 24 -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32),y) -QTOPIA4_PIXEL_DEPTHS += 32 -endif -endif -ifneq ($(QTOPIA4_PIXEL_DEPTHS),) -QTOPIA4_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QTOPIA4_PIXEL_DEPTHS))) -endif - -### Display drivers -ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_LINUXFB),y) -QTOPIA4_CONFIGURE += -qt-gfx-linuxfb -else -QTOPIA4_CONFIGURE += -no-gfx-linuxfb -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED),y) -QTOPIA4_CONFIGURE += -qt-gfx-transformed -else -QTOPIA4_CONFIGURE += -no-gfx-transformed -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_QVFB),y) -QTOPIA4_CONFIGURE += -qt-gfx-qvfb -else -QTOPIA4_CONFIGURE += -no-gfx-qvfb -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_VNC),y) -QTOPIA4_CONFIGURE += -qt-gfx-vnc -else -QTOPIA4_CONFIGURE += -no-gfx-vnc -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN),y) -QTOPIA4_CONFIGURE += -qt-gfx-multiscreen -else -QTOPIA4_CONFIGURE += -no-gfx-multiscreen -endif - -### Mouse drivers -ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_PC),y) -QTOPIA4_CONFIGURE += -qt-mouse-pc -else -QTOPIA4_CONFIGURE += -no-mouse-pc -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_BUS),y) -QTOPIA4_CONFIGURE += -qt-mouse-bus -else -QTOPIA4_CONFIGURE += -no-mouse-bus -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP),y) -QTOPIA4_CONFIGURE += -qt-mouse-linuxtp -else -QTOPIA4_CONFIGURE += -no-mouse-linuxtp -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_YOPY),y) -QTOPIA4_CONFIGURE += -qt-mouse-yopy -else -QTOPIA4_CONFIGURE += -no-mouse-yopy -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX),y) -QTOPIA4_CONFIGURE += -qt-mouse-vr41xx -else -QTOPIA4_CONFIGURE += -no-mouse-vr41xx -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB),y) -QTOPIA4_CONFIGURE += -qt-mouse-tslib -QTOPIA4_DEP_LIBS+=tslib -QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG" -QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB))) -#")) -else -QTOPIA4_CONFIGURE += -no-mouse-tslib -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_QVFB),y) -QTOPIA4_CONFIGURE += -qt-mouse-qvfb -else -QTOPIA4_CONFIGURE += -no-mouse-qvfb -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y) -QTOPIA4_CONFIGURE+= "-debug $(QTOPIA4_TSLIB_DEB)" -else -QTOPIA4_CONFIGURE+= -release -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) -QTOPIA4_CONFIGURE+= -shared -else -QTOPIA4_CONFIGURE+= -static -endif - -ifeq ($(BR2_ENDIAN),"LITTLE") -QTOPIA4_CONFIGURE+= -little-endian -else -QTOPIA4_CONFIGURE+= -big-endian -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_GIF),y) -QTOPIA4_CONFIGURE+= -qt-gif -else -QTOPIA4_CONFIGURE+= -no-gif -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_LIBMNG),y) -QTOPIA4_CONFIGURE+= -qt-libmng -else -QTOPIA4_CONFIGURE+= -no-libmng -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_QTZLIB),y) -QTOPIA4_CONFIGURE+= -qt-zlib -else -ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMZLIB),y) -QTOPIA4_CONFIGURE+= -system-zlib -QTOPIA4_DEP_LIBS+=zlib -endif -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_QTJPEG),y) -QTOPIA4_CONFIGURE+= -qt-libjpeg -else -ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMJPEG),y) -QTOPIA4_CONFIGURE+= -system-libjpeg -QTOPIA4_DEP_LIBS+=jpeg -else -QTOPIA4_CONFIGURE+= -no-libjpeg -endif -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_QTPNG),y) -QTOPIA4_CONFIGURE+= -qt-libpng -else -ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMPNG),y) -QTOPIA4_CONFIGURE+= -system-libpng -QTOPIA4_DEP_LIBS+=libpng -else -QTOPIA4_CONFIGURE+= -no-libpng -endif -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_QTTIFF),y) -QTOPIA4_CONFIGURE+= -qt-libtiff -else -ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMTIFF),y) -QTOPIA4_CONFIGURE+= -system-libtiff -QTOPIA4_DEP_LIBS+=tiff -else -QTOPIA4_CONFIGURE+= -no-libtiff -endif -endif - - -ifeq ($(BR2_PACKAGE_QTOPIA4_QTFREETYPE),y) -QTOPIA4_CONFIGURE+= -qt-freetype -else -ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE),y) -QTOPIA4_CONFIGURE+= -system-freetype -QTOPIA4_CONFIGURE+= -I $(STAGING_DIR)/usr/include/freetype2/ -QTOPIA4_DEP_LIBS+=freetype -else -QTOPIA4_CONFIGURE+= -no-freetype -endif -endif - - -ifeq ($(BR2_PACKAGE_QTOPIA4_OPENSSL),y) -QTOPIA4_CONFIGURE+= -openssl -QTOPIA4_DEP_LIBS+=openssl -else -QTOPIA4_CONFIGURE+= -no-openssl -endif - -# Qt SQL Drivers -ifeq ($(BR2_PACKAGE_QTOPIA4_SQL_MODULE),y) -ifeq ($(BR2_PACKAGE_QTOPIA4_IBASE),y) -QTOPIA4_CONFIGURE+= -qt-sql-ibase -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_MYSQL),y) -QTOPIA4_CONFIGURE+= -qt-sql-mysql -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_ODBC),y) -QTOPIA4_CONFIGURE+= -qt-sql-odbc -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PSQL),y) -QTOPIA4_CONFIGURE+= -qt-sql-psql -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_SQLITE),y) -QTOPIA4_CONFIGURE+= -qt-sql-sqlite -else -QTOPIA4_CONFIGURE+= -no-sql-sqlite -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_SQLITE2),y) -QTOPIA4_CONFIGURE+= -qt-sql-sqlite2 -endif -else -# By default, no SQL driver is turned on by configure. -# but it seams sqlite isn't disabled despite what says -# configure --help -QTOPIA4_CONFIGURE+= -no-sql-sqlite -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_XMLPATTERNS),y) -QTOPIA4_CONFIGURE+= -xmlpatterns -exceptions -else -QTOPIA4_CONFIGURE+= -no-xmlpatterns -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_PHONON),y) -QTOPIA4_CONFIGURE+= -phonon -QTOPIA4_DEP_LIBS+=gstreamer gst-plugins-base -else -QTOPIA4_CONFIGURE+= -no-phonon -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_SVG),y) -QTOPIA4_CONFIGURE+= -svg -else -QTOPIA4_CONFIGURE+= -no-svg -endif - -ifeq ($(BR2_PACKAGE_QTOPIA4_WEBKIT),y) -QTOPIA4_CONFIGURE+= -webkit -else -QTOPIA4_CONFIGURE+= -no-webkit -endif - -QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE))) -#")) -BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM))) -#")) - -# x86x86fix -# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux -# host. It's unclear if this would happen on other hosts. -ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),) -ifeq ($(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM),x86) -QTOPIA4_CONFIGURE+= -platform linux-g++ -QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE))) -#")) -endif -endif -# End of workaround. - -# Figure out what libs to install in the target -QTOPIA4_LIBS=#empty -ifeq ($(BR2_PACKAGE_QTOPIA4_GUI_MODULE),y) -QTOPIA4_LIBS+= qtopia4-gui -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_SQL_MODULE),y) -QTOPIA4_LIBS+= qtopia4-sql -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_PHONON),y) -QTOPIA4_LIBS+= qtopia4-phonon -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_SVG),y) -QTOPIA4_LIBS+= qtopia4-svg -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_NETWORK),y) -QTOPIA4_LIBS+= qtopia4-network -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_WEBKIT),y) -QTOPIA4_LIBS+= qtopia4-webkit -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_XML),y) -QTOPIA4_LIBS+= qtopia4-xml -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_XMLPATTERNS),y) -QTOPIA4_LIBS+= qtopia4-xmlpatterns -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_SCRIPT),y) -QTOPIA4_LIBS+= qtopia4-script -endif -ifeq ($(BR2_PACKAGE_QTOPIA4_SCRIPTTOOLS),y) -QTOPIA4_LIBS+= qtopia4-scripttools -endif - -QTOPIA4_QMAKE_CONF:=$(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf - -QTOPIA4_QMAKE_AR:=$(TARGET_AR) cqs - -# Variable for other Qt applications to use -QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ - -################################################################################ -# QTOPIA4_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in -# QTOPIA_QMAKE_CONF. Will remove existing variable declaration if available. -# -# Argument 1 is the variable name (without QMAKE_) -# Argument 2 is the value to set variable to -# -# E.G. use like this: -# $(call QTOPIA4_QMAKE_SET,variable,value) -################################################################################ -define QTOPIA4_QMAKE_SET - $(SED) '/QMAKE_$(1)/d' $(QTOPIA4_QMAKE_CONF) - $(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(QTOPIA4_QMAKE_CONF) -endef - -################################################################################ -# QTOPIA4_INSTALL_PLUGINS -- helper macro to install Qt plugins to target and -# strip them -# -# Argument 1 is the plugin folder -# -# E.G. use like this to install plugins/sqldrivers: -# $(call QTOPIA4_INSTALL_PLUGINS,sqldrivers) -# ################################################################################ -define QTOPIA4_INSTALL_PLUGINS - if [ -d $(STAGING_DIR)/usr/plugins/$(1) ]; then \ - mkdir -p $(TARGET_DIR)/usr/plugins; \ - cp -dpfr $(STAGING_DIR)/usr/plugins/$(1) $(TARGET_DIR)/usr/plugins/; \ - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/$(1)/*; \ - fi -endef - -$(DL_DIR)/$(QTOPIA4_SOURCE): - $(call DOWNLOAD,$(QTOPIA4_SITE),$(QTOPIA4_SOURCE)) - -qtopia4-source: $(DL_DIR)/$(QTOPIA4_SOURCE) - - -$(QTOPIA4_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QTOPIA4_SOURCE) - $(QTOPIA4_CAT) $(DL_DIR)/$(QTOPIA4_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(QTOPIA4_TARGET_DIR) package/qtopia4/ \ - qtopia-$(QTOPIA4_VERSION)-\*.patch \ - qtopia-$(QTOPIA4_VERSION)-\*.patch.$(ARCH) - touch $@ - -$(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked -ifneq ($(BR2_INET_IPV6),y) - $(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_TARGET_DIR)/configure - $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure -endif - $(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure - # Fix compiler path - $(call QTOPIA4_QMAKE_SET,CC,$(TARGET_CC)) - $(call QTOPIA4_QMAKE_SET,CXX,$(TARGET_CXX)) - $(call QTOPIA4_QMAKE_SET,LINK,$(TARGET_CXX)) - $(call QTOPIA4_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX)) - $(call QTOPIA4_QMAKE_SET,AR,$(QTOPIA4_QMAKE_AR)) - $(call QTOPIA4_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY)) - $(call QTOPIA4_QMAKE_SET,RANLIB,$(TARGET_RANLIB)) - $(call QTOPIA4_QMAKE_SET,STRIP,$(TARGET_STRIP)) - $(call QTOPIA4_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS)) - $(call QTOPIA4_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS)) - -[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \ - $(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION) -# Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'. -# PKG_CONFIG_SYSROOT is only used to avoid a warning from Qt's configure system -# when cross compiling, Qt 4.4.3 is wrong here. -# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target -# instead of the host then. - (cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \ - PATH=$(TARGET_PATH) \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ - PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \ - ./configure \ - $(if $(VERBOSE),-verbose,-silent) \ - -force-pkg-config \ - -embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \ - $(QTOPIA4_QCONFIG_COMMAND) \ - $(QTOPIA4_CONFIGURE) \ - -no-stl \ - -no-cups \ - -no-nis \ - -no-accessibility \ - -no-separate-debug-info \ - -prefix /usr \ - -hostprefix $(STAGING_DIR)/usr \ - -fast \ - -no-rpath \ - -nomake examples \ - -nomake demos \ - ) - touch $@ - -$(QTOPIA4_TARGET_DIR)/.compiled: $(QTOPIA4_TARGET_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR) - touch $@ - -$(STAGING_DIR)/usr/lib/libQtCore.la: $(QTOPIA4_TARGET_DIR)/.compiled - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR) install - -qtopia4-gui: $(STAGING_DIR)/usr/lib/libQtCore.la - mkdir -p $(TARGET_DIR)/usr/lib/fonts - touch $(TARGET_DIR)/usr/lib/fonts/fontdir - cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts - cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts - cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts - # Install image plugins if they are built - $(call QTOPIA4_INSTALL_PLUGINS,imageformats) -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtGui.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-sql: $(STAGING_DIR)/usr/lib/libQtCore.la - $(call QTOPIA4_INSTALL_PLUGINS,sqldrivers) -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtSql.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-phonon: $(STAGING_DIR)/usr/lib/libQtCore.la - $(call QTOPIA4_INSTALL_PLUGINS,phonon_backend) -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libphonon.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-svg: $(STAGING_DIR)/usr/lib/libQtCore.la - $(call QTOPIA4_INSTALL_PLUGINS,iconengines) -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtSvg.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-network: $(STAGING_DIR)/usr/lib/libQtCore.la -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtNetwork.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-webkit: $(STAGING_DIR)/usr/lib/libQtCore.la -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtWebKit.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-xml: $(STAGING_DIR)/usr/lib/libQtCore.la -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtXml.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-xmlpatterns: $(STAGING_DIR)/usr/lib/libQtCore.la -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtXmlPatterns.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-script: $(STAGING_DIR)/usr/lib/libQtCore.la -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtScript.so.* $(TARGET_DIR)/usr/lib/ -endif - -qtopia4-scripttools: $(STAGING_DIR)/usr/lib/libQtCore.la -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/ -endif - - -$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QTOPIA4_LIBS) - # Strip all installed libs -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/ - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.* -endif - -qtopia4: uclibc $(QTOPIA4_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4 - -qtopia4-clean: - -$(MAKE) -C $(QTOPIA4_TARGET_DIR) clean - -rm -rf $(TARGET_DIR)/usr/lib/fonts -ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y) - -rm $(TARGET_DIR)/usr/lib/libQt*.so.* - -rm $(TARGET_DIR)/usr/lib/libphonon.so.* -endif - -qtopia4-dirclean: - rm -rf $(QTOPIA4_TARGET_DIR) - -qtopia4-status: - @echo "QTOPIA4_QMAKE: " $(QTOPIA4_QMAKE) - @echo "QTOPIA4_DEP_LIBS: " $(QTOPIA4_DEP_LIBS) - @echo "FREETYPE_DIR: " $(FREETYPE_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_QTOPIA4),y) -TARGETS+=qtopia4 -endif diff --git a/package/rdesktop/Config.in b/package/rdesktop/Config.in index 9e0be5c87..9ec6f8a73 100644 --- a/package/rdesktop/Config.in +++ b/package/rdesktop/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RDESKTOP bool "rdesktop" select BR2_PACKAGE_OPENSSL - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XORG7 help rdesktop is an open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index 63be0b8b5..e94fd77ed 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -38,7 +38,7 @@ $(RDESKTOP_DIR)/rdesktop: $(RDESKTOP_DIR)/.configured $(TARGET_DIR)/usr/bin/rdesktop: $(RDESKTOP_DIR)/rdesktop cp $^ $@ -rdesktop: uclibc openssl $(XSERVER) $(TARGET_DIR)/usr/bin/rdesktop +rdesktop: uclibc openssl xserver_xorg-server $(TARGET_DIR)/usr/bin/rdesktop rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE) diff --git a/package/rxvt/Config.in b/package/rxvt/Config.in index 80aa717e0..f7196e747 100644 --- a/package/rxvt/Config.in +++ b/package/rxvt/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_RXVT bool "rxvt" - depends on BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx || BR2_PACKAGE_XSERVER_x11r7 + depends on BR2_PACKAGE_XORG7 help A nice small colour vt102 X terminal emulator. diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index 1a0a82636..14d08d213 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -65,7 +65,7 @@ $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt: $(RXVT_BINARY) $(INSTALL) -m 0755 -D $^ $@ (cd $(@D); ln -fs rxvt xterm) -rxvt: $(XSERVER) $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt +rxvt: xserver_xorg-server $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt rxvt-clean: rm -f $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt 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/synergy/synergy.mk b/package/synergy/synergy.mk index b89f3cd40..763e57b0c 100644 --- a/package/synergy/synergy.mk +++ b/package/synergy/synergy.mk @@ -14,6 +14,6 @@ SYNERGY_INSTALL_TARGET = YES SYNERGY_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc -SYNERGY_DEPENDENCIES = uclibc $(XSERVER) +SYNERGY_DEPENDENCIES = uclibc xserver_xorg-server $(eval $(call AUTOTARGETS,package,synergy)) 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/Config.in b/package/x11r7/Config.in index 0720e3fac..ace438a21 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -1,18 +1,42 @@ menuconfig BR2_PACKAGE_XORG7 -bool "X.org X Window System, X11R7, release 7.4" -default y if BR2_PACKAGE_XSERVER_x11r7 -select BR2_PACKAGE_ZLIB -select BR2_PACKAGE_LIBPNG -select BR2_PACKAGE_EXPAT -select BR2_PACKAGE_FONTCONFIG -help - Support for X11R7 libraries, servers, drivers, and/or - applications in the target. + bool "X.org X Window System, X11R7, release 7.4" + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_FONTCONFIG + help + Support for X11R7 libraries, servers, drivers, and/or + applications in the target. if BR2_PACKAGE_XORG7 - menu "X11R7 Servers" - source package/x11r7/xserver_xorg-server/Config.in - endmenu + +choice + prompt "X Window System server type" + default BR2_PACKAGE_XSERVER_tinyx + help + Select the X Window System server to use + +config BR2_PACKAGE_XSERVER_xorg + bool "Modular X.org" + # depending on BR2_ENABLE_LOCALE gives a recursion error with dbus + depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE + +config BR2_PACKAGE_XSERVER_tinyx + bool "TinyX" + depends on BR2_USE_WCHAR + +endchoice + +config BR2_X11_PREFIX + string + default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg + default "/usr" if BR2_PACKAGE_XSERVER_tinyx + help + X11 apps root location + +menu "X11R7 Servers" + source package/x11r7/xserver_xorg-server/Config.in +endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in source package/x11r7/mesa3d/Config.in @@ -303,7 +327,3 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xkeyboard-config/Config.in endmenu endif - -comment "X11R7 X Window System disabled" - depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG - 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/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch index ff476bd0e..ecf1571a0 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch @@ -1,30 +1,26 @@ ---- xf86-video-intel-2.4.2/configure.ac.orig 2007-06-10 20:59:27.000000000 +0200 -+++ xf86-video-intel-2.4.2/configure.ac 2007-06-10 20:59:50.000000000 +0200 -@@ -92,13 +92,14 @@ AC_HEADER_STDC +diff -ruN xf86-video-intel-2.4.2/configure.ac xf86-video-intel-2.4.2-patched/configure.ac +--- xf86-video-intel-2.4.2/configure.ac 2008-08-26 03:28:31.000000000 +0200 ++++ xf86-video-intel-2.4.2-patched/configure.ac 2009-07-27 13:39:49.000000000 +0200 +@@ -91,6 +91,7 @@ + # Checks for header files. + AC_HEADER_STDC - AC_MSG_CHECKING([whether to include DRI support]) - if test x$DRI = xauto; then -+ if test "$cross_compiling" = "no" ; then ++if test "$cross_compiling" = "no" ; then + if test x$DRI != xno; then AC_CHECK_FILE([${sdkdir}/dri.h], [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -- AC_CHECK_FILE([${sdkdir}/damage.h], -+ AC_CHECK_FILE([${sdkdir}/damage.h], - [have_damage_h="yes"], [have_damage_h="no"]) - - if test "$have_dri_h" = yes -a \ -@@ -108,6 +109,12 @@ if test x$DRI = xauto; then - else +@@ -111,6 +112,14 @@ DRI="no" fi -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ DRI="yes" -+ fi fi ++else ++if test x$DRI != xno; then ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ DRI="yes" ++fi ++fi AC_MSG_RESULT([$DRI]) + + save_CFLAGS="$CFLAGS" 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/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 58bd8d2b4..105c79069 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XLIB_LIBXKBUI select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_XPROTO_COMPOSITEPROTO select BR2_PACKAGE_XPROTO_DAMAGEPROTO @@ -15,13 +14,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU - select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXPM select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXRES select BR2_PACKAGE_XLIB_LIBXXF86MISC diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 77c8208da..e2af32459 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -12,19 +12,55 @@ XSERVER_XORG_SERVER_INSTALL_STAGING = YES XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data -XSERVER_XORG_SERVER_DEPENDENCIES = xutil_util-macros xlib_libXfont libdrm xlib_libxkbui openssl \ - xproto_compositeproto xproto_damageproto xproto_fixesproto \ - xproto_glproto xproto_kbproto xproto_randrproto \ - xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \ - xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm \ - xlib_libXrender xlib_libXres xlib_libXft xlib_libXcursor \ - xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm \ - xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto \ - xproto_evieext xproto_fontsproto xproto_inputproto xproto_renderproto \ - xproto_resourceproto xproto_videoproto xproto_xcmiscproto \ - xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \ - xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \ - pixman mcookie +XSERVER_XORG_SERVER_DEPENDENCIES = \ + xutil_util-macros \ + xlib_libXfont \ + xlib_libX11 \ + xlib_libXau \ + xlib_libXdmcp \ + xlib_libXScrnSaver \ + xlib_libXext \ + xlib_libXfixes \ + xlib_libXi \ + xlib_libXrender \ + xlib_libXres \ + xlib_libXft \ + xlib_libXcursor \ + xlib_libXinerama \ + xlib_libXrandr \ + xlib_libXdamage \ + xlib_libXxf86misc \ + xlib_libXxf86vm \ + xlib_liblbxutil \ + xlib_libxkbfile \ + xlib_xtrans \ + xdata_xbitmaps \ + xproto_bigreqsproto \ + xproto_compositeproto \ + xproto_damageproto \ + xproto_evieext \ + xproto_fixesproto \ + xproto_fontsproto \ + xproto_glproto \ + xproto_inputproto \ + xproto_kbproto \ + xproto_randrproto \ + xproto_renderproto \ + xproto_resourceproto \ + xproto_videoproto \ + xproto_xcmiscproto \ + xproto_xextproto \ + xproto_xf86bigfontproto \ + xproto_xf86dgaproto \ + xproto_xf86driproto \ + xproto_xf86miscproto \ + xproto_xf86rushproto \ + xproto_xf86vidmodeproto \ + xproto_xproto \ + libdrm \ + pixman \ + openssl \ + mcookie XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ --disable-xnest --disable-xephyr --disable-xvfb \ 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) diff --git a/package/xpdf/xpdf.mk b/package/xpdf/xpdf.mk index 1fbe7110e..ab60b2be5 100644 --- a/package/xpdf/xpdf.mk +++ b/package/xpdf/xpdf.mk @@ -17,8 +17,8 @@ ifeq ($(BR2_SOFT_FLOAT),y) XPDF_CONF_OPT += --enable-fixedpoint endif -ifneq ($(BR2_PACKAGE_XSERVER_none),y) - XPDF_DEPENDENCIES += $(XSERVER) openmotif +ifeq ($(BR2_PACKAGE_XORG7),y) + XPDF_DEPENDENCIES += xserver_xorg-server openmotif XPDF_CONF_OPT += --with-Xm-library=$(STAGING_DIR)/usr/lib --with-Xm-includes=$(STAGING_DIR)/usr/include/Xm \ --with-x --with-freetype2-includes=$(STAGING_DIR)/usr/include \ --with-freetype2-library=$(STAGING_DIR)/usr/lib CFLAGS="-I$(STAGING_DIR)/usr/include/freetype2" \ diff --git a/package/xvkbd/Config.in b/package/xvkbd/Config.in index eeef152cb..888367a2d 100644 --- a/package/xvkbd/Config.in +++ b/package/xvkbd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XVKBD bool "xvkbd" + depends on BR2_PACKAGE_XORG7 help on-screen keyboard for X diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index 510e3c402..d28780969 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -15,7 +15,7 @@ XVKBD_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_CC) \ XVKBD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -XVKBD_DEPENDENCIES = uclibc $(XSERVER) +XVKBD_DEPENDENCIES = uclibc xserver_xorg-server $(eval $(call AUTOTARGETS,package,xvkbd)) |