diff options
| author | Rene Wagner <rw@handhelds.org> | 2005-08-17 18:22:44 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-17 18:22:44 +0000 |
| commit | b2f3f8cc7f674402dae1e325a44d44615295fd0d (patch) | |
| tree | b26814fa84abd7bc7a1e9fedec2c7e947b2a0dd3 /packages | |
| parent | a098af2fcdd0a2cdefd7049cdc12a5fda8e46638 (diff) | |
| parent | c355755e38003a906085114be463792fd9de4ff8 (diff) | |
merge of 885d90470dc44f85332ae3b62f38a1f1cf91b4c5
and c9530ced58773f4fa9498d173533e73615774c22
Diffstat (limited to 'packages')
173 files changed, 3108 insertions, 8071 deletions
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb index a0b5996d6c..a322dacdd9 100644 --- a/packages/altboot/altboot.bb +++ b/packages/altboot/altboot.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PR = "r7" +PR = "r8" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/akita/altboot.cfg b/packages/altboot/files/akita/altboot.cfg index 254aac95a2..8361b28f2a 100644 --- a/packages/altboot/files/akita/altboot.cfg +++ b/packages/altboot/files/akita/altboot.cfg @@ -6,6 +6,7 @@ TIMEOUT="3" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" FSCK_IMAGES="yes" SD_DEVICE="/dev/mmcda1" SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index feedfc769b..33e869bbe1 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -29,7 +29,7 @@ run_module() { /etc/init.d/portmap start >/dev/tty1 2>&1 || die "/etc/init.d/portmap start failed!" # For some reason NFS mounts hang if /e/i/networking is not run. - # For the time beeing I'm to lazy to investigate ;) + # For the time beeing I'm too lazy to investigate ;) /etc/init.d/networking start || die "/etc/init.d/networking start failed!" sleep 2 @@ -37,14 +37,44 @@ run_module() { # After the PCMCIA service is started, an inserted WLAN card should automatically # activate itself. /etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!" - - # Give WLAN time to login into the network - echo "Waiting for WLAN..." - sleep 8 - + + nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" + + # WLAN with DHCP needs some time to get a lease, set up the routing, etc. + echo -n "Waiting for WLAN" + cnt=0 + while true + do + if (ping -c 1 $nfs_host) >/dev/null 2>&1 + then + echo " found" + break + else + if test "$cnt" = 30 -o "$cnt" = 60 + then + echo "" + echo "WARNING: WLAN didn't activate in $cnt seconds!" + + if test "$cnt" = 30 + then + echo "Restarting udhcpc" + killall udhcpc + udhcpc -i wlan0 -H `cat /etc/hostname` + else + die "Failed to activate WLAN!" + break + fi + else + echo -n "." + let cnt=$cnt+1 + fi + fi + sleep 1 + done + if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 then echo -e "Please select your NFS root:\n" diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 642587b630..0598c8ce93 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -151,8 +151,9 @@ pivot_image() { if [ "$IMAGE_TYPE" = "" ]; then IMAGE_TYPE="auto" fi - mount -t $IMAGE_TYPE /dev/loop0 /media/image || die "mount /dev/loop0 /media/image failed!" - + # If mount fails it has the tendency to spew out a _lot_ of error messages. + # We direct the output to /dev/null so the user can see which step actually failed. + mount -t $IMAGE_TYPE /dev/loop0 /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!" mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed" diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg index 5b979e7ae4..9d2560f76b 100644 --- a/packages/altboot/files/collie/altboot.cfg +++ b/packages/altboot/files/collie/altboot.cfg @@ -7,6 +7,7 @@ TIMEOUT="3" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" FSCK_IMAGES="no" SD_DEVICE="/dev/mmcda1" SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot.cfg index 5b979e7ae4..9d2560f76b 100644 --- a/packages/altboot/files/poodle/altboot.cfg +++ b/packages/altboot/files/poodle/altboot.cfg @@ -7,6 +7,7 @@ TIMEOUT="3" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" FSCK_IMAGES="no" SD_DEVICE="/dev/mmcda1" SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" diff --git a/packages/asterisk/asterisk-1.0.7/.mtn2git_empty b/packages/asterisk/asterisk-1.0.9/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/asterisk/asterisk-1.0.7/.mtn2git_empty +++ b/packages/asterisk/asterisk-1.0.9/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.0.9/gsm.patch b/packages/asterisk/asterisk-1.0.9/gsm.patch new file mode 100644 index 0000000000..c59aa80bba --- /dev/null +++ b/packages/asterisk/asterisk-1.0.9/gsm.patch @@ -0,0 +1,71 @@ +--- asterisk-1.0.9.org/codecs/gsm/Makefile 2005-06-21 16:27:28.000000000 +0200 ++++ asterisk-1.0.9/codecs/gsm/Makefile 2005-08-14 21:47:10.000000000 +0200 +@@ -37,26 +37,6 @@ + ######### ppro's, etc, as well as the AMD K6 and K7. The compile will + ######### probably require gcc. + +-ifneq (${OSARCH},Darwin) +-ifneq (${PROC},x86_64) +-ifneq (${PROC},ultrasparc) +-ifneq ($(shell uname -m),ppc) +-ifneq ($(shell uname -m),alpha) +-ifneq ($(shell uname -m),armv4l) +-ifneq (${PROC},sparc64) +-ifneq (${PROC},ppc) +-ifneq (${PROC},ppc64) +-OPTIMIZE+=-march=$(PROC) +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- + #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. + #This works for even old (2.96) versions of gcc and provides a small boost either way. + #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. +@@ -218,19 +198,6 @@ + $(SRC)/gsm_option.c \ + $(SRC)/short_term.c \ + $(SRC)/table.c +-ifeq (${OSARCH},Linux) +-ifneq ($(shell uname -m),x86_64) +-ifneq ($(shell uname -m),ppc) +-ifneq ($(shell uname -m),alpha) +-ifneq ($(shell uname -m),armv4l) +-ifneq ($(shell uname -m),sparc64) +-GSM_SOURCES+= $(SRC)/k6opt.s +-endif +-endif +-endif +-endif +-endif +-endif + + TOAST_SOURCES = $(SRC)/toast.c \ + $(SRC)/toast_lin.c \ +@@ -276,20 +243,6 @@ + $(SRC)/short_term.o \ + $(SRC)/table.o + +-ifeq (${OSARCH},Linux) +-ifneq ($(shell uname -m), x86_64) +-ifneq ($(shell uname -m), ppc) +-ifneq ($(shell uname -m), alpha) +-ifneq ($(shell uname -m), armv4l) +-ifneq ($(shell uname -m), sparc64) +-GSM_OBJECTS+= $(SRC)/k6opt.o +-endif +-endif +-endif +-endif +-endif +-endif +- + TOAST_OBJECTS = $(SRC)/toast.o \ + $(SRC)/toast_lin.o \ + $(SRC)/toast_ulaw.o \ + diff --git a/packages/asterisk/asterisk-1.0.7/makefile.patch b/packages/asterisk/asterisk-1.0.9/makefile.patch index 2eea89636d..066fb677dc 100644 --- a/packages/asterisk/asterisk-1.0.7/makefile.patch +++ b/packages/asterisk/asterisk-1.0.9/makefile.patch @@ -212,66 +212,6 @@ # Add KDE Console if appropriate #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") ---- asterisk-1.0.7/codecs/gsm/Makefile~makefile.patch -+++ asterisk-1.0.7/codecs/gsm/Makefile -@@ -37,20 +37,6 @@ - ######### ppro's, etc, as well as the AMD K6 and K7. The compile will - ######### probably require gcc. - --ifneq (${OSARCH},Darwin) --ifneq (${PROC},x86_64) --ifneq (${PROC},ultrasparc) --ifneq ($(shell uname -m),ppc) --ifneq ($(shell uname -m),alpha) --ifneq (${PROC},sparc64) --OPTIMIZE+=-march=$(PROC) --endif --endif --endif --endif --endif --endif -- - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. - #This works for even old (2.96) versions of gcc and provides a small boost either way. - #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. -@@ -212,17 +198,6 @@ - $(SRC)/gsm_option.c \ - $(SRC)/short_term.c \ - $(SRC)/table.c --ifeq (${OSARCH},Linux) --ifneq ($(shell uname -m),x86_64) --ifneq ($(shell uname -m),ppc) --ifneq ($(shell uname -m),alpha) --ifneq ($(shell uname -m),sparc64) --GSM_SOURCES+= $(SRC)/k6opt.s --endif --endif --endif --endif --endif - - TOAST_SOURCES = $(SRC)/toast.c \ - $(SRC)/toast_lin.c \ -@@ -268,18 +243,6 @@ - $(SRC)/short_term.o \ - $(SRC)/table.o - --ifeq (${OSARCH},Linux) --ifneq ($(shell uname -m), x86_64) --ifneq ($(shell uname -m), ppc) --ifneq ($(shell uname -m), alpha) --ifneq ($(shell uname -m), sparc64) --GSM_OBJECTS+= $(SRC)/k6opt.o --endif --endif --endif --endif --endif -- - TOAST_OBJECTS = $(SRC)/toast.o \ - $(SRC)/toast_lin.o \ - $(SRC)/toast_ulaw.o \ --- asterisk-1.0.7/codecs/lpc10/Makefile~makefile.patch +++ asterisk-1.0.7/codecs/lpc10/Makefile @@ -25,28 +25,6 @@ diff --git a/packages/asterisk/asterisk_1.0.7.bb b/packages/asterisk/asterisk_1.0.9.bb index 1116849592..ccb6fe518f 100644 --- a/packages/asterisk/asterisk_1.0.7.bb +++ b/packages/asterisk/asterisk_1.0.9.bb @@ -2,6 +2,7 @@ DESCRIPTION="The Astersisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" SRC_URI="http://www.asterisk.org/html/downloads/asterisk-${PV}.tar.gz \ + file://gsm.patch;patch=1 \ file://makefile.patch;patch=1" DEPENDS="ncurses zlib openssl" diff --git a/packages/atk/atk_1.10.1.bb b/packages/atk/atk_1.10.1.bb new file mode 100644 index 0000000000..6424167ca2 --- /dev/null +++ b/packages/atk/atk_1.10.1.bb @@ -0,0 +1,21 @@ +DEPENDS = "glib-2.0 gtk-doc" +DESCRIPTION = "An accessibility toolkit for GNOME." +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +LICENSE = "LGPL" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/atk-${PV}.tar.bz2" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-glibtest" + +CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ + -I${STAGING_INCDIR}/glib-2.0/glib \ + -I${STAGING_INCDIR}/glib-2.0/gobject" + +do_stage () { + oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} + autotools_stage_includes +} diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb index 26c620e013..81cc0949a9 100644 --- a/packages/bwmon/bwmon_1.3.bb +++ b/packages/bwmon/bwmon_1.3.bb @@ -1,8 +1,8 @@ DESCRIPTION = "The Linux bandwidth monitor" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" DEPENDS = "ncurses" - LICENSE = "Unspecified" + PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \ diff --git a/packages/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb new file mode 100644 index 0000000000..1e61594ba3 --- /dev/null +++ b/packages/cairo/cairo_0.9.2.bb @@ -0,0 +1,15 @@ +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@debian.org>" +DEPENDS = "x11 libpng fontconfig libxrender" +DESCRIPTION = "Cairo graphics library" +LICENSE = "MPL LGPL" +PR = "r1" + +SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/cairo/libsvg-cairo_0.1.6.bb b/packages/cairo/libsvg-cairo_0.1.6.bb new file mode 100644 index 0000000000..83c4428a2f --- /dev/null +++ b/packages/cairo/libsvg-cairo_0.1.6.bb @@ -0,0 +1,14 @@ +SECTION = "libs" +LICENSE = "LGPL" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@debian.org>" +DEPENDS = "libsvg cairo" +DESCRIPTION = "SVG rendering library" + +SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/e17/e-wm/add-menu-autoscroll-options.patch b/packages/e17/e-wm/add-menu-autoscroll-options.patch new file mode 100644 index 0000000000..79bcad8e44 --- /dev/null +++ b/packages/e17/e-wm/add-menu-autoscroll-options.patch @@ -0,0 +1,207 @@ +diff -Nur e~/src/bin/e_config.c e/src/bin/e_config.c +--- e~/src/bin/e_config.c 2005-08-05 21:12:17.000000000 -0700 ++++ e/src/bin/e_config.c 2005-08-16 13:55:06.000000000 -0700 +@@ -298,6 +298,8 @@ + E_CONFIG_VAL(D, T, resize_info_follows, INT); /**/ + E_CONFIG_VAL(D, T, focus_last_focused_per_desktop, INT); /**/ + E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/ ++ E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/ ++ E_CONFIG_VAL(D, T, menu_autoscroll_cursor_margin, INT); /**/ + + e_config = e_config_domain_load("e", _e_config_edd); + if (e_config) +@@ -403,6 +405,8 @@ + e_config->resize_info_follows = 1; + e_config->focus_last_focused_per_desktop = 1; + e_config->focus_revert_on_hide_or_close = 1; ++ e_config->menu_autoscroll_margin = 10; ++ e_config->menu_autoscroll_cursor_margin = 15; + + { + E_Config_Module *em; +@@ -959,6 +963,8 @@ + E_CONFIG_LIMIT(e_config->resize_info_follows, 0, 1); + E_CONFIG_LIMIT(e_config->focus_last_focused_per_desktop, 0, 1); + E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1); ++ E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50); ++ E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50); + + /* apply lang config - exception because config is loaded after intl setup */ + +diff -Nur e~/src/bin/e_config.h e/src/bin/e_config.h +--- e~/src/bin/e_config.h 2005-08-05 21:12:18.000000000 -0700 ++++ e/src/bin/e_config.h 2005-08-16 13:55:06.000000000 -0700 +@@ -142,6 +142,8 @@ + int resize_info_follows; + int focus_last_focused_per_desktop; + int focus_revert_on_hide_or_close; ++ int menu_autoscroll_margin; ++ int menu_autoscroll_cursor_margin; + }; + + struct _E_Config_Module +diff -Nur e~/src/bin/e_ipc_handlers.h e/src/bin/e_ipc_handlers.h +--- e~/src/bin/e_ipc_handlers.h 2005-08-09 21:52:07.000000000 -0700 ++++ e/src/bin/e_ipc_handlers.h 2005-08-16 14:01:38.000000000 -0700 +@@ -4592,3 +4592,84 @@ + #if 0 + } + #endif ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_SET ++#if (TYPE == E_REMOTE_OPTIONS) ++ OP("-menu-autoscroll-margin-set", 1, "Set the distance from the edge of the screen the menu will autoscroll to", 0, HDL) ++#elif (TYPE == E_REMOTE_OUT) ++ REQ_INT(atoi(params[0]), HDL); ++#elif (TYPE == E_WM_IN) ++ START_INT(value, HDL); ++ e_config->menu_autoscroll_margin = value; ++ E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50); ++ SAVE; ++ END_INT; ++#elif (TYPE == E_REMOTE_IN) ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET ++#if (TYPE == E_REMOTE_OPTIONS) ++ OP("-menu-autoscroll-margin-get", 0, "Get the distance from the edge of the screen the menu will autoscroll to", 1, HDL) ++#elif (TYPE == E_REMOTE_OUT) ++ REQ_NULL(HDL) ++#elif (TYPE == E_WM_IN) ++ SEND_INT(e_config->menu_autoscroll_margin, E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY, HDL); ++#elif (TYPE == E_REMOTE_IN) ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY ++#if (TYPE == E_REMOTE_OPTIONS) ++#elif (TYPE == E_REMOTE_OUT) ++#elif (TYPE == E_WM_IN) ++#elif (TYPE == E_REMOTE_IN) ++ START_INT(val, HDL) ++ printf("REPLY: %i\n", val); ++ END_INT; ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_SET ++#if (TYPE == E_REMOTE_OPTIONS) ++ OP("-menu-autoscroll-cursor-margin-set", 1, "Set the distance from the edge of the screen the cursor needs to be to start menu autoscrolling", 0, HDL) ++#elif (TYPE == E_REMOTE_OUT) ++ REQ_INT(atoi(params[0]), HDL); ++#elif (TYPE == E_WM_IN) ++ START_INT(value, HDL); ++ e_config->menu_autoscroll_cursor_margin = value; ++ E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50); ++ // e_zone_update_flip_all(); ++ SAVE; ++ END_INT; ++#elif (TYPE == E_REMOTE_IN) ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET ++#if (TYPE == E_REMOTE_OPTIONS) ++ OP("-menu-autoscroll-cursor-margin-get", 0, "Get the distance from the edge of the screen the cursor needs to be to start menu autoscrolling", 1, HDL) ++#elif (TYPE == E_REMOTE_OUT) ++ REQ_NULL(HDL) ++#elif (TYPE == E_WM_IN) ++ SEND_INT(e_config->menu_autoscroll_cursor_margin, E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY, HDL); ++#elif (TYPE == E_REMOTE_IN) ++#endif ++#undef HDL ++ ++/****************************************************************************/ ++#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY ++#if (TYPE == E_REMOTE_OPTIONS) ++#elif (TYPE == E_REMOTE_OUT) ++#elif (TYPE == E_WM_IN) ++#elif (TYPE == E_REMOTE_IN) ++ START_INT(val, HDL) ++ printf("REPLY: %i\n", val); ++ END_INT; ++#endif ++#undef HDL +diff -Nur e~/src/bin/e_ipc_handlers_list.h e/src/bin/e_ipc_handlers_list.h +--- e~/src/bin/e_ipc_handlers_list.h 2005-08-05 21:00:03.000000000 -0700 ++++ e/src/bin/e_ipc_handlers_list.h 2005-08-16 13:55:06.000000000 -0700 +@@ -222,3 +222,9 @@ + #define E_IPC_OP_DESKTOP_NAME_DEL 222 + #define E_IPC_OP_DESKTOP_NAME_LIST 223 + #define E_IPC_OP_DESKTOP_NAME_LIST_REPLY 224 ++#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_SET 225 ++#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET 226 ++#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY 227 ++#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_SET 228 ++#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET 229 ++#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY 230 +diff -Nur e~/src/bin/e_menu.c e/src/bin/e_menu.c +--- e~/src/bin/e_menu.c 2005-07-25 02:55:44.000000000 -0700 ++++ e/src/bin/e_menu.c 2005-08-16 13:55:06.000000000 -0700 +@@ -1968,24 +1968,24 @@ + E_Menu *m; + + m = l->data; +- if (m->cur.x < m->zone->x) ++ if (m->cur.x < m->zone->x + e_config->menu_autoscroll_margin) + { +- i = m->zone->x - m->cur.x; ++ i = m->zone->x - m->cur.x + e_config->menu_autoscroll_margin; + if (i > outl) outl = i; + } +- if (m->cur.y < m->zone->y) ++ if (m->cur.y < m->zone->y + e_config->menu_autoscroll_margin) + { +- i = m->zone->y - m->cur.y; ++ i = m->zone->y - m->cur.y + e_config->menu_autoscroll_margin; + if (i > outt) outt = i; + } +- if ((m->cur.x + m->cur.w) > (m->zone->w)) ++ if ((m->cur.x + m->cur.w) > (m->zone->w - e_config->menu_autoscroll_margin)) + { +- i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w); ++ i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w - e_config->menu_autoscroll_margin); + if (i > outr) outr = i; + } +- if ((m->cur.y + m->cur.h) > (m->zone->h)) ++ if ((m->cur.y + m->cur.h) > (m->zone->h - e_config->menu_autoscroll_margin)) + { +- i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h); ++ i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h - e_config->menu_autoscroll_margin); + if (i > outb) outb = i; + } + } +@@ -2029,11 +2029,11 @@ + int autoscroll_x = 0; + int autoscroll_y = 0; + +- if (_e_menu_x == 0) ++ if (_e_menu_x - e_config->menu_autoscroll_cursor_margin <= 0) + { + if (_e_menu_outside_bounds_get(-1, 0)) autoscroll_x = -1; + } +- if (_e_menu_y == 0) ++ if (_e_menu_y - e_config->menu_autoscroll_cursor_margin <= 0) + { + if (_e_menu_outside_bounds_get(0, -1)) autoscroll_y = -1; + } +@@ -2044,11 +2044,11 @@ + E_Menu *m; + + m = _e_active_menus->data; +- if (_e_menu_x == (m->zone->w - 1)) ++ if (_e_menu_x + e_config->menu_autoscroll_cursor_margin >= (m->zone->w - 1)) + { + if (_e_menu_outside_bounds_get(1, 0)) autoscroll_x = 1; + } +- if (_e_menu_y == (m->zone->h - 1)) ++ if (_e_menu_y + e_config->menu_autoscroll_cursor_margin >= (m->zone->h - 1)) + { + if (_e_menu_outside_bounds_get(0, 1)) autoscroll_y = 1; + } diff --git a/packages/e17/e-wm/fudge_screen_edges_for_menu.patch b/packages/e17/e-wm/fudge_screen_edges_for_menu.patch deleted file mode 100644 index c203fd4ae0..0000000000 --- a/packages/e17/e-wm/fudge_screen_edges_for_menu.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- e/src/bin/e_menu.c.~1.38.~ 2005-07-25 02:55:44.000000000 -0700 -+++ e/src/bin/e_menu.c 2005-08-11 15:36:23.000000000 -0700 -@@ -1968,22 +1968,22 @@ - E_Menu *m; - - m = l->data; -- if (m->cur.x < m->zone->x) -+ if (m->cur.x < m->zone->x + 5) - { - i = m->zone->x - m->cur.x; - if (i > outl) outl = i; - } -- if (m->cur.y < m->zone->y) -+ if (m->cur.y < m->zone->y + 5) - { - i = m->zone->y - m->cur.y; - if (i > outt) outt = i; - } -- if ((m->cur.x + m->cur.w) > (m->zone->w)) -+ if ((m->cur.x + m->cur.w) > (m->zone->w - 5)) - { - i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w); - if (i > outr) outr = i; - } -- if ((m->cur.y + m->cur.h) > (m->zone->h)) -+ if ((m->cur.y + m->cur.h) > (m->zone->h - 5)) - { - i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h); - if (i > outb) outb = i; diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb index 180f2f8c86..7929f1a807 100644 --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@ -4,11 +4,11 @@ LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ file://fix-configure.patch;patch=1 \ - file://fudge_screen_edges_for_menu.patch;patch=1" + file://add-menu-autoscroll-options.patch;patch=1" S = "${WORKDIR}/e" inherit autotools diff --git a/packages/e17/e17genmenu_2.0.2.bb b/packages/e17/e17genmenu_2.0.2.bb new file mode 100644 index 0000000000..39a12319f8 --- /dev/null +++ b/packages/e17/e17genmenu_2.0.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Convert Gnome or KDE menus to e17 menus" +SECTION = "e/utils" +DEPENDS = "e virtual/ecore virtual/evas eet engrave" +LICENSE = "MIT" +HOMEPAGE = "http://sourceforge.net/projects/e17genmenu" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +PR = "r0" + +export EET_CONFIG = "${STAGING_BINDIR}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" +export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config" +export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config" + +SRC_URI = "${SOURCEFORGE_MIRROR}/e17genmenu/e17genmenu-2.0.2.tar.gz" + +do_configure_prepend() { + find -type f | xargs sed -i 's:share/icons/%s/48x48/apps:share/pixmaps:' + find -type f | xargs sed -i 's:share/icons/hicolor/48x48/apps:share/pixmaps:' +} + +inherit autotools diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050810.bb index ba1e8fb10d..62385e141c 100644 --- a/packages/e17/eclair_20050810.bb +++ b/packages/e17/eclair_20050810.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Eclair is the E17 multi media player" SECTION = "e/apps" -DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native edje emotion libxml2 sqlite3 taglibc" +DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart libxml2 sqlite3 taglibc" LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" @@ -12,8 +12,6 @@ S = "${WORKDIR}/eclair" inherit autotools -BROKEN = "1" - EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/libxine/libxine-1.0.0-beta12/.mtn2git_empty b/packages/e17/engage/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libxine/libxine-1.0.0-beta12/.mtn2git_empty +++ b/packages/e17/engage/.mtn2git_empty diff --git a/packages/e17/engage/no-local-includes.patch b/packages/e17/engage/no-local-includes.patch new file mode 100644 index 0000000000..09cc8da98d --- /dev/null +++ b/packages/e17/engage/no-local-includes.patch @@ -0,0 +1,17 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- engage/src/module/Makefile.am~no-local-includes ++++ engage/src/module/Makefile.am +@@ -10,8 +10,7 @@ + + # the module .so file + INCLUDES = -I. \ +- -I$(top_srcdir) \ +- -I$(includedir) \ ++ -I$(top_srcdir) \ + @e_cflags@ + pkgdir = @e_modules@/engage/$(MODULE_ARCH) + pkg_LTLIBRARIES = module.la diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb index e8f9467239..f12d7d2605 100644 --- a/packages/e17/engage_20050810.bb +++ b/packages/e17/engage_20050810.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Engage is the E17 icon dock" -DEPENDS = "esmart virtual/imlib2 edje virtual/ecore virtual/evas ewl e-wm" +DEPENDS = "evas-x11 ecore-x11 esmart imlib2-x11 edje ewl e" LICENSE = "MIT" -SECTION = "e" +SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -PR = "r0" +PR = "r1" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage \ + file://no-local-includes.patch;patch=1" S = "${WORKDIR}/engage" inherit autotools pkgconfig binconfig diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb index 667d3f4da8..094944ead4 100644 --- a/packages/e17/entice_20050810.bb +++ b/packages/e17/entice_20050810.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Entice is the E17 picture viewer" SECTION = "e/apps" # can also depend on GIMP for editing -DEPENDS = "virtual/evas edb virtual/ecore edje" +DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart" LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice" S = "${WORKDIR}/entice" diff --git a/packages/libxine/libxine-1.0.0-rc5/.mtn2git_empty b/packages/e17/entrance/Sessions/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libxine/libxine-1.0.0-rc5/.mtn2git_empty +++ b/packages/e17/entrance/Sessions/.mtn2git_empty diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Sessions/Enlightenment new file mode 100644 index 0000000000..4d33bbb2e9 --- /dev/null +++ b/packages/e17/entrance/Sessions/Enlightenment @@ -0,0 +1,4 @@ +#!/bin/sh + +enlightenment + diff --git a/packages/e17/entrance/Sessions/Failsafe b/packages/e17/entrance/Sessions/Failsafe new file mode 100644 index 0000000000..cf4fcced12 --- /dev/null +++ b/packages/e17/entrance/Sessions/Failsafe @@ -0,0 +1,3 @@ +#!/bin/sh + +rxvt
\ No newline at end of file diff --git a/packages/libxine/libxine-1.0/.mtn2git_empty b/packages/e17/entrance/Xinit.d/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libxine/libxine-1.0/.mtn2git_empty +++ b/packages/e17/entrance/Xinit.d/.mtn2git_empty diff --git a/packages/e17/entrance/Xinit.d/50-calibrate b/packages/e17/entrance/Xinit.d/50-calibrate new file mode 100644 index 0000000000..922b335c85 --- /dev/null +++ b/packages/e17/entrance/Xinit.d/50-calibrate @@ -0,0 +1,7 @@ +#!/bin/sh + +if ! test -e /etc/pointercal +then + xtscal +fi + diff --git a/packages/e17/entrance/Xinit.d/99-Entrance b/packages/e17/entrance/Xinit.d/99-Entrance new file mode 100644 index 0000000000..297cc909fe --- /dev/null +++ b/packages/e17/entrance/Xinit.d/99-Entrance @@ -0,0 +1,4 @@ +#!/bin/sh + +entrance + diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch index 5e965057ba..874231b95b 100644 --- a/packages/e17/entrance/config-db.patch +++ b/packages/e17/entrance/config-db.patch @@ -1,5 +1,5 @@ ---- entrance/data/config/build_config.sh.in~ 2005-08-13 02:56:11.000000000 -0700 -+++ entrance/data/config/build_config.sh.in 2005-08-13 02:56:35.000000000 -0700 +--- entrance/data/config/build_config.sh.in~ 2005-08-15 23:24:39.000000000 -0700 ++++ entrance/data/config/build_config.sh.in 2005-08-15 23:25:15.000000000 -0700 @@ -3,7 +3,7 @@ rm -f $DB @@ -9,7 +9,16 @@ # uncomment the below to enable experimental OpenGL hardware acceleration #edb_ed $DB add /entrance/engine int 1 -@@ -25,25 +25,25 @@ +@@ -18,30 +18,30 @@ + #edb_ed $DB add /entrance/fonts/0/str str "/usr/share/fonts/truetype/" + #edb_ed $DB add /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/" + edb_ed $DB add /entrance/greeting/before str "Welcome to " +-edb_ed $DB add /entrance/greeting/after str "" ++edb_ed $DB add /entrance/greeting/after str " e17/OE" + edb_ed $DB add /entrance/session/count int 8 +-edb_ed $DB add /entrance/session/0/session str "default" ++edb_ed $DB add /entrance/session/0/session str "/etc/X11/Sessions/Default" + edb_ed $DB add /entrance/session/0/title str "Default" edb_ed $DB add /entrance/session/0/icon str "default.png" edb_ed $DB add /entrance/session/1/icon str "enlightenment.png" edb_ed $DB add /entrance/session/1/title str "Enlightenment" @@ -30,27 +39,23 @@ -edb_ed $DB add /entrance/session/6/title str "XFce" -edb_ed $DB add /entrance/session/6/icon str "xfce.png" -edb_ed $DB add /entrance/session/7/session str "failsafe" --edb_ed $DB add /entrance/session/7/title str "Failsafe" --edb_ed $DB add /entrance/session/7/icon str "failsafe.png" -+edb_ed $DB add /entrance/session/1/session str "/etc/X11/Session/Enlightenment" -+#edb_ed $DB add /entrance/session/2/session str "kde" -+#edb_ed $DB add /entrance/session/2/title str "KDE" -+#edb_ed $DB add /entrance/session/2/icon str "kde.png" -+edb_ed $DB add /entrance/session/2/session str "/etc/X11/Session/GPE" -+edb_ed $DB add /entrance/session/2/title str "GPE" -+edb_ed $DB add /entrance/session/2/icon str "gnome.png" -+#edb_ed $DB add /entrance/session/4/session str "blackbox" -+#edb_ed $DB add /entrance/session/4/title str "Blackbox" -+#edb_ed $DB add /entrance/session/4/icon str "blackbox.png" -+#edb_ed $DB add /entrance/session/5/session str "sawfish" -+#edb_ed $DB add /entrance/session/5/title str "Sawfish" -+#edb_ed $DB add /entrance/session/5/icon str "default.png" -+#edb_ed $DB add /entrance/session/6/session str "xfce" -+#edb_ed $DB add /entrance/session/6/title str "XFce" -+#edb_ed $DB add /entrance/session/6/icon str "xfce.png" -+edb_ed $DB add /entrance/session/3/session str "/etc/X11/Session/Failsafe" -+edb_ed $DB add /entrance/session/3/title str "Failsafe" -+edb_ed $DB add /entrance/session/3/icon str "failsafe.png" ++edb_ed $DB add /entrance/session/2/session str "/etc/X11/Sessions/Enlightenment" ++edb_ed $DB add /entrance/session/2/icon str "enlightenment.png" ++edb_ed $DB add /entrance/session/2/title str "Enlightenment" ++edb_ed $DB add /entrance/session/3/session str "/etc/X11/Sessions/Enlightenment" ++edb_ed $DB add /entrance/session/3/icon str "enlightenment.png" ++edb_ed $DB add /entrance/session/3/title str "Enlightenment" ++edb_ed $DB add /entrance/session/4/session str "/etc/X11/Sessions/Enlightenment" ++edb_ed $DB add /entrance/session/4/icon str "enlightenment.png" ++edb_ed $DB add /entrance/session/4/title str "Enlightenment" ++edb_ed $DB add /entrance/session/5/session str "/etc/X11/Sessions/Enlightenment" ++edb_ed $DB add /entrance/session/5/icon str "enlightenment.png" ++edb_ed $DB add /entrance/session/5/title str "Enlightenment" ++edb_ed $DB add /entrance/session/6/session str "/etc/X11/Sessions/Enlightenment" ++edb_ed $DB add /entrance/session/6/icon str "enlightenment.png" ++edb_ed $DB add /entrance/session/6/title str "Enlightenment" ++edb_ed $DB add /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment" ++edb_ed $DB add /entrance/session/7/session str "/etc/X11/Sessions/Failsafe" + edb_ed $DB add /entrance/session/7/title str "Failsafe" + edb_ed $DB add /entrance/session/7/icon str "failsafe.png" edb_ed $DB add /entrance/system/reboot int 1 - edb_ed $DB add /entrance/system/halt int 1 - edb_ed $DB add /entrance/user/remember int 1 diff --git a/packages/e17/entrance/longer-sleep.patch b/packages/e17/entrance/longer-sleep.patch deleted file mode 100644 index 66ad220de2..0000000000 --- a/packages/e17/entrance/longer-sleep.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- entrance/src/client/entrance_session.c.~1.71.~ 2005-05-28 02:31:14.000000000 -0700 -+++ entrance/src/client/entrance_session.c 2005-08-07 13:39:35.000000000 -0700 -@@ -454,7 +454,7 @@ - shell = strdup("/bin/sh"); - /* this bypasses a race condition where entrance loses its x - connection before the wm gets it and x goes and resets itself */ -- sleep(10); -+ sleep(60); - /* - * FIXME These should be called! - ecore_x_shutdown(); diff --git a/packages/e17/entrance/run-Xinit.patch b/packages/e17/entrance/run-Xinit.patch new file mode 100644 index 0000000000..1d6c2307f7 --- /dev/null +++ b/packages/e17/entrance/run-Xinit.patch @@ -0,0 +1,17 @@ +--- entrance/src/daemon/entrance_wrapper.in.~1.1.~ 2003-01-31 13:57:06.000000000 -0800 ++++ entrance/src/daemon/entrance_wrapper.in 2005-08-15 20:13:57.000000000 -0700 +@@ -5,8 +5,13 @@ + + test -f /etc/profile && . /etc/profile + ++if [ -x /etc/X11/Xinit.d/99gpe-login ]; then ++ chmod -x /etc/X11/Xinit.d/99gpe-login ++fi ++ ++/etc/X11/Xinit ++ + exec @prefix@/bin/entrance "$@" + + #fallback + exec entrance "$@" +- diff --git a/packages/e17/entrance/use-bash.patch b/packages/e17/entrance/use-bash.patch new file mode 100644 index 0000000000..4d3b2f4aae --- /dev/null +++ b/packages/e17/entrance/use-bash.patch @@ -0,0 +1,11 @@ +--- entrance/src/client/entrance_session.c.~1.71.~ 2005-05-28 02:31:14.000000000 -0700 ++++ entrance/src/client/entrance_session.c 2005-08-15 21:45:53.000000000 -0700 +@@ -451,7 +451,7 @@ + (int) pid); + } + _entrance_session_user_list_fix(e); +- shell = strdup("/bin/sh"); ++ shell = strdup("/bin/bash"); + /* this bypasses a race condition where entrance loses its x + connection before the wm gets it and x goes and resets itself */ + sleep(10); diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index 251698c233..af11e07fd5 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -2,18 +2,22 @@ DESCRIPTION = "Entrace is the Enlightenment login manager" SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt -DEPENDS = "edb evas-x11 ecore-x11 edje esmart" -RDEPENDS += "bash" +DEPENDS = "edb evas-x11 ecore-x11 edje esmart gpe-dm" +RDEPENDS += "bash gpe-dm" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r0" +PR = "r2" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ - file://longer-sleep.patch;patch=1 \ file://Xserver.patch;patch=1 \ file://config-db.patch;patch=1 \ - file://allow-missing-xsession.patch;patch=1" + file://allow-missing-xsession.patch;patch=1 \ + file://run-Xinit.patch;patch=1 \ + file://use-bash.patch;patch=1 \ + file://Xinit.d \ + file://Sessions" + S = "${WORKDIR}/entrance" inherit autotools @@ -21,4 +25,14 @@ inherit autotools EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ --with-xsession=/etc/X11/Xsession" -FILES += "${datadir}"
\ No newline at end of file +FILES += "${datadir}" + +do_install_append() { + install -d ${D}/etc/X11/Xinit.d + install -d ${D}/etc/X11/Xsession.d + install -d ${D}/etc/X11/Sessions + + install -m 755 ${WORKDIR}/Xinit.d/* ${D}/etc/X11/Xinit.d + install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions + +} diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050810.bb index 6e79fd946f..244bf2bcaf 100644 --- a/packages/e17/examine_20050810.bb +++ b/packages/e17/examine_20050810.bb @@ -1,7 +1,7 @@ DESCRIPTION = "examine, the program configurator" DEPENDS = "virtual/ecore ewl" LICENSE = "MIT" -SECTION = "e" +SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r0" CVSDATE = "${PV}" diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb index ff55d47360..b017a56b69 100644 --- a/packages/efl/e_20050810.bb +++ b/packages/efl/e_20050810.bb @@ -25,7 +25,7 @@ do_compile() { oe_runmake -C src/lib } -headers = "E_Lib.h ../bin/e_*.h" +headers = "E_Lib.h ../bin/e*.h" do_install() { oe_runmake -C src/lib install DESTDIR=${D} diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb index 5ca5214b94..0d87e6b394 100644 --- a/packages/efl/emotion_0.0.1.004.bb +++ b/packages/efl/emotion_0.0.1.004.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Emotion is a multimedia library based on libxine" LICENSE = "MIT" -DEPENDS = "eet virtual/evas edje virtual/ecore embryo libxine" +DEPENDS = "eet virtual/evas edje virtual/ecore embryo virtual/libxine" inherit efl diff --git a/packages/glib-2.0/glib-2.0_2.8.0.bb b/packages/glib-2.0/glib-2.0_2.8.0.bb new file mode 100644 index 0000000000..d377a0aeae --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.8.0.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "GLib is a general-purpose utility library, \ +which provides many useful data types, macros, \ +type conversions, string utilities, file utilities, a main \ +loop abstraction, and so on. It works on many \ +UNIX-like platforms, Windows, OS/2 and BeOS." +LICENSE = "LGPL" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +DEPENDS += "glib-2.0-native gtk-doc" +DEPENDS += "virtual/libiconv virtual/libintl" +PACKAGES =+ "glib-2.0-utils " +PR = "r0" + +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" + +EXTRA_OECONF = "--disable-debug" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig gettext + +python () { + if bb.data.getVar("USE_NLS", d, 1) == "no": + raise bb.parse.SkipPackage("${PN} requires native language support.") +} + +acpaths = "" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_stage () { + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} + autotools_stage_includes + install -d ${STAGING_INCDIR}/glib-2.0/glib + install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 +} diff --git a/packages/libxine/libxine-opie-1.0/.mtn2git_empty b/packages/gnet/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libxine/libxine-opie-1.0/.mtn2git_empty +++ b/packages/gnet/.mtn2git_empty diff --git a/packages/gnet/gnet_2.0.7.bb b/packages/gnet/gnet_2.0.7.bb new file mode 100644 index 0000000000..d5e93c4000 --- /dev/null +++ b/packages/gnet/gnet_2.0.7.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib." +LICENSE = "LGPL" +HOMEPAGE = "http://www.gnetlibrary.org/" + +SRC_URI = "http://www.gnetlibrary.org/src/gnet-2.0.7.tar.gz" +DEPENDS = "glib-2.0" + +EXTRA_OECONF = "--disable-pthreads" + +inherit pkgconfig autotools diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb index d385068c59..f3eca5d574 100644 --- a/packages/gnome/gnome-desktop_2.10.2.bb +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" SECTION = "x11/gnome" PR = "r0" DESCRIPTION = "GNOME library for reading .desktop files" -inherit gnome +inherit gnome pkgconfig DEPENDS = "gnome-common libgnomeui" diff --git a/packages/gqview/gqview_2.1.1.bb b/packages/gqview/gqview_2.1.1.bb index 83f9de44e2..eb51955cb7 100644 --- a/packages/gqview/gqview_2.1.1.bb +++ b/packages/gqview/gqview_2.1.1.bb @@ -4,6 +4,8 @@ DEPENDS = "gtk+" LICENSE = "GPL" HOMEPAGE = "http://gqview.sourceforge.net/" MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" +RRECOMMENDS = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png gdk-pixbuf-loader-gif" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.1.tar.gz \ file://include-path-fix.patch;patch=1" diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb index ef68a314de..b171d1e9a9 100644 --- a/packages/gxine/gxine_0.4.1.bb +++ b/packages/gxine/gxine_0.4.1.bb @@ -2,8 +2,8 @@ DESCRIPTION = "gxine is a front-end for libxine." SECTION = "x11/multimedia" LICENSE = "GPL" MAINTAINER = "Chris Lord <cwiiis@handhelds.org>" -DEPENDS = "gtk+ libxine" -PR = "r1" +DEPENDS = "gtk+ libxine-x11" +PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb index 2ad90c789c..189eccdd02 100644 --- a/packages/gxine/gxine_0.4.1enhanced.bb +++ b/packages/gxine/gxine_0.4.1enhanced.bb @@ -2,7 +2,8 @@ DESCRIPTION = "gxine is a front-end for libxine." SECTION = "x11/multimedia" LICENSE = "GPL" MAINTAINER = "Chris Lord <cwiiis@handhelds.org>" -DEPENDS = "gtk+ libxine" +DEPENDS = "gtk+ libxine-x11" +PR = "r1" # Long list of RDEPENDS required to playback mp3/ogg audio and mpeg/mpeg4 video RDEPENDS = "libxine-plugin-vo-out-xshm \ diff --git a/packages/icecast/icecast_2.2.0.bb b/packages/icecast/icecast_2.2.0.bb index 1511f6dcfc..f184ad78c1 100644 --- a/packages/icecast/icecast_2.2.0.bb +++ b/packages/icecast/icecast_2.2.0.bb @@ -1,6 +1,7 @@ DEPENDS = "libxslt" PR = "r1" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +LICENCE = "GPL-2" DEPENDS = "libvorbis libogg" diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh index ed46b222d2..814dba676c 100755 --- a/packages/initscripts/initscripts-1.0/bootmisc.sh +++ b/packages/initscripts/initscripts-1.0/bootmisc.sh @@ -23,6 +23,20 @@ then fi # +# Apply /proc settings if defined +# +SYSCTL_CONF="/etc/sysctl.conf" +if [ -f "${SYSCTL_CONF}" ] +then + if [ -x "/sbin/sysctl" ] + then + /sbin/sysctl -p "${SYSCTL_CONF}" + else + echo "To have ${SYSCTL_CONF} applied during boot, install package <procps>." + fi +fi + +# # Update /etc/motd. # if test "$EDITMOTD" != no diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 99b2a7dfbd..d2160c0e29 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r54" +PR = "r55" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb new file mode 100644 index 0000000000..ab9fecc85c --- /dev/null +++ b/packages/iptables/iptables_1.3.3.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "iptables network filtering tools" +HOMEPAGE = "http://www.netfilter.org/" +SECTION = "console/utils" +LICENSE = "GPL" +RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter" +PR = "r3" + + + +PACKAGES =+ "${PN}-utils" +FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore" + +SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2" + +S = "${WORKDIR}/iptables-${PV}" + +PARALLEL_MAKE="" + +export COPT_FLAGS = "${CFLAGS}" +export KERNEL_DIR = "${STAGING_INCDIR}" + +do_compile () { + unset CFLAGS + oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1 +} + +do_install () { + oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1 +} + +FILES_${PN}-doc += "${mandir}" + diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index f10d7173f0..1843f21301 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa file://intdriven.patch;patch=1 \ file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" -PR = "r7" +PR = "r8" S = "${WORKDIR}" diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb index 0526374e96..91856a855a 100644 --- a/packages/ixp4xx/ixp4xx-csr_1.4.bb +++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb @@ -7,7 +7,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.zip file://badpaths.patch;patch=1 \ file://build-timing-annoyance.patch;patch=1" S = "${WORKDIR}/ixp400_xscale_sw" -PR = "r3" +PR = "r4" COMPATIBLE_HOST = "^armeb-linux.*" diff --git a/packages/nonworking/emotion/.mtn2git_empty b/packages/libcroco/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/emotion/.mtn2git_empty +++ b/packages/libcroco/.mtn2git_empty diff --git a/packages/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb new file mode 100644 index 0000000000..bbed9e4fb3 --- /dev/null +++ b/packages/libcroco/libcroco_0.6.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit" +SECTION = "x11/utils" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +DEPENDS = "glib-2.0 libxml2" +LICENSE = "LGPL" +PR = "r1" + +inherit autotools pkgconfig gnome + +do_stage() { + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/libcroco + install -m 644 src/*.h ${STAGING_INCDIR}/libcroco/ + install -m 755 src/.libs/*so* ${STAGING_LIBDIR}/ +} diff --git a/packages/libgpewidget/libgpewidget_0.103.bb b/packages/libgpewidget/libgpewidget_0.103.bb new file mode 100644 index 0000000000..0d8dcf23cf --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.103.bb @@ -0,0 +1,19 @@ +LICENSE = "LGPL" +PR = "r2" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + +inherit pkgconfig autotools + +EXTRA_OECONF = "--enable-cairo" + +do_stage () { + oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR} + autotools_stage_includes +} + diff --git a/packages/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb new file mode 100644 index 0000000000..2d69d14381 --- /dev/null +++ b/packages/libpixman/libpixman_0.1.6.bb @@ -0,0 +1,13 @@ +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@debian.org>" +DEPENDS = "x11" +DESCRIPTION = "Cairo support library" +LICENSE = "X11" +SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/librsvg/librsvg_2.9.5.bb b/packages/librsvg/librsvg_2.9.5.bb new file mode 100644 index 0000000000..3fd4581453 --- /dev/null +++ b/packages/librsvg/librsvg_2.9.5.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Library for rendering SVG files" +SECTION = "x11/utils" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" +DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt" +LICENSE = "LGPL" +PR = "r3" + +inherit autotools pkgconfig gnome + +PACKAGES =+ "librsvg-gtk librsvg-gtk-dev rsvg" +FILES_${PN} = "${libdir}/*.so.*" +FILES_rsvg = "${bindir}/rsvg" +FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so" +FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0" + +do_stage() { + install -d ${STAGING_INCDIR}/librsvg-2/librsvg/ + install -m 0644 rsvg.h ${STAGING_INCDIR}/librsvg-2/librsvg/ + install -m 0644 librsvg-features.h ${STAGING_INCDIR}/librsvg-2/librsvg/ + oe_libinstall -so -a librsvg-2 ${STAGING_LIBDIR} +} diff --git a/packages/libxine/libxine-1.0.0-beta12/configure.ac.patch b/packages/libxine/libxine-1.0.0-beta12/configure.ac.patch deleted file mode 100644 index 7eda48ab25..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/configure.ac.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- xine-lib/configure.ac 2003-08-10 15:20:01.000000000 +0200 -+++ xine-lib/configure.ac.patched 2003-08-10 15:23:42.000000000 +0200 -@@ -506,10 +506,10 @@ - dnl --------------------------------------------- - dnl check for SDL - dnl --------------------------------------------- --AM_PATH_SDL(1.1.5, -- AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]), -- []) --AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"]) -+dnl AM_PATH_SDL(1.1.5, -+dnl AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]), -+dnl []) -+dnl AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"]) - - - dnl --------------------------------------------- -@@ -608,19 +608,19 @@ - dnl Ogg/Theora libs. - dnl --------------------------------------------- - --AM_PATH_OGG( -- [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]), -- AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***])) -- ], -- AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"]) -+dnl AM_PATH_OGG( -+dnl [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]), -+dnl AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***])) -+dnl ], -+dnl AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***])) -+dnl AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"]) - - dnl --------------------------------------------- - dnl check for libFLAC - dnl --------------------------------------------- --AM_PATH_LIBFLAC([], -- AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"]) -+dnl AM_PATH_LIBFLAC([], -+dnl AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***])) -+dnl AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"]) - - dnl --------------------------------------------- - dnl XviD libs. -@@ -668,90 +668,7 @@ - AC_SUBST(PNG_LIBS) - - dnl --------------------------------------------- --dnl freetype2 lib. --dnl --------------------------------------------- --AC_PATH_PROG(FREETYPE_CONFIG, moooooooooooo_putain_de_script_freetype-config, no) --if test "$FREETYPE_CONFIG" = "no" ; then -- AC_MSG_RESULT([*** freetype-config not found, freetype2 support disabled ***]) --else -- FT2_CFLAGS=`$FREETYPE_CONFIG --cflags` -- FT2_LIBS=`$FREETYPE_CONFIG --libs` -- have_ft2="yes" -- AC_DEFINE(HAVE_FT2,1,[Define this if you have freetype2 library]) --fi -- --AM_CONDITIONAL(HAVE_FT2, test x"$have_ft2" = "xyes" ) --AC_SUBST(FT2_CFLAGS) --AC_SUBST(FT2_LIBS) -- --dnl --------------------------------------------- --dnl OSS style audio interface --dnl --------------------------------------------- --AC_MSG_CHECKING(for OSS audio support) --have_ossaudio=no --AC_TRY_COMPILE([ -- #ifdef __NetBSD__ -- #include <soundcard.h> -- #else -- #include <sys/soundcard.h> -- #endif -- ],[ -- int arg = SNDCTL_DSP_SETFRAGMENT; -- ],[ -- have_ossaudio=yes -- ]) --AC_MSG_RESULT($have_ossaudio) --AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes") -- -- --dnl --------------------------------------------- --dnl Alsa support --dnl --------------------------------------------- --AM_PATH_ALSA(0.9.0, -- [ AC_DEFINE(HAVE_ALSA,1,[Define this if you have Alsa (libasound) installed]) -- if test x"$have_alsa09" = "xyes"; then -- AC_DEFINE(HAVE_ALSA09,1,[Define this if you have alsa 0.9.x and more installed]) -- fi -- ], -- AC_MSG_RESULT(*** All of ALSA dependent parts will be disabled ***)) --AM_CONDITIONAL(HAVE_ALSA, test x"$no_alsa" != "xyes") --AM_CONDITIONAL(HAVE_ALSA09, test x"$have_alsa09" = "xyes") -- -- --dnl --------------------------------------------- --dnl ESD support --dnl --------------------------------------------- --AM_PATH_ESD(0.2.8, -- AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]), -- AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***)) --AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes") -- --dnl --------------------------------------------- --dnl ARTS support --dnl --------------------------------------------- --AM_PATH_ARTS(0.9.5, -- AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]), -- AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***)) --AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes") -- --dnl --------------------------------------------- --dnl gnome-vfs support --dnl --------------------------------------------- --PKG_CHECK_MODULES(GNOME_VFS, putain_de_module_gnome-vfs-2.0, -- no_gnome_vfs=no, -- no_gnome_vfs=yes) --AC_SUBST(GNOME_VFS_CFLAGS) --AC_SUBST(GNOME_VFS_LIBS) --if test x"$no_gnome_vfs" != "xyes"; then --AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed]) --else --AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***) --fi --AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes") -- -- --dnl --------------------------------------------- --dnl SUN style audio interface -+dnl freetype2 lib.snterface - dnl --------------------------------------------- - AC_MSG_CHECKING(for Sun audio support) - have_sunaudio=no ---- xine-lib/configure.ac Sat Aug 23 21:22:05 2003 -+++ xine-lib/configure.ac.aalib Sat Aug 23 21:22:31 2003 -@@ -456,8 +456,10 @@ - dnl --------------------------------------------- - dnl Checks for Ascii-Art library - dnl --------------------------------------------- -+AC_ARG_ENABLE(aalib, [ --disable-aalib Disable AAlib support], -+ enable_aalib=no, enable_aalib=yes) - AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes") -+AM_CONDITIONAL(HAVE_AA, [test x"$enable_aalib" = "xyes" && test x"$no_aalib" != "xyes" ]) - - dnl --------------------------------------------- - dnl Check solaris framebuffer device support diff --git a/packages/libxine/libxine-1.0.0-beta12/demux_ogg.patch b/packages/libxine/libxine-1.0.0-beta12/demux_ogg.patch deleted file mode 100644 index 9faa3ba06d..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/demux_ogg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xine-lib/src/demuxers/demux_ogg.c 2003-08-10 13:55:26.000000000 +0200 -+++ xine-lib/src/demuxers/demux_ogg.c.patched 2003-08-10 02:20:10.000000000 +0200 -@@ -36,7 +36,7 @@ - #include <stdlib.h> - - #include <ogg/ogg.h> --#include <vorbis/codec.h> -+#include <tremor/ivorbiscodec.h> - - #ifdef HAVE_THEORA - #include <theora/theora.h> diff --git a/packages/libxine/libxine-1.0.0-beta12/fftscope-static-inlining.patch b/packages/libxine/libxine-1.0.0-beta12/fftscope-static-inlining.patch deleted file mode 100644 index 42b3caead2..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/fftscope-static-inlining.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../libxine-1.0.0-beta12-r0/xine-lib/src/post/visualizations/fftscope.c 2003-04-30 07:58:51.000000000 +0100 -+++ xine-lib/src/post/visualizations/fftscope.c 2004-08-17 17:40:56.000000000 +0100 -@@ -103,7 +103,7 @@ - * Bit reverser for unsigned ints - * Reverses 'bits' bits. - */ --inline const unsigned int -+static inline const unsigned int - reverse (unsigned int val, int bits) - { - unsigned int retn = 0; diff --git a/packages/libxine/libxine-1.0.0-beta12/fix-oss-plugin.patch b/packages/libxine/libxine-1.0.0-beta12/fix-oss-plugin.patch deleted file mode 100644 index be44ad3486..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/fix-oss-plugin.patch +++ /dev/null @@ -1,29 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xine-lib-1-beta12/src/audio_out/audio_oss_out.c~fix-oss-plugin -+++ xine-lib-1-beta12/src/audio_out/audio_oss_out.c -@@ -46,20 +46,7 @@ - #include <fcntl.h> - #include <math.h> - #include <unistd.h> --#if defined(__OpenBSD__) --# include <soundcard.h> --#elif defined (__FreeBSD__) --# if __FreeBSD__ < 4 --# include <machine/soundcard.h> --# else --# include <sys/soundcard.h> --# endif --#else --# if defined(__linux__) --# include <linux/config.h> /* Check for DEVFS */ --# endif --# include <sys/soundcard.h> --#endif -+#include <sys/soundcard.h> - #include <sys/ioctl.h> - #include <inttypes.h> - diff --git a/packages/libxine/libxine-1.0.0-beta12/fix-syntax-xine-vorbis-decoder.patch b/packages/libxine/libxine-1.0.0-beta12/fix-syntax-xine-vorbis-decoder.patch deleted file mode 100644 index 6803d82e05..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/fix-syntax-xine-vorbis-decoder.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../libxine-1.0.0-beta12-r0/xine-lib/src/libvorbis/xine_decoder.c 2004-08-17 16:07:31.000000000 +0100 -+++ xine-lib/src/libvorbis/xine_decoder.c 2004-08-17 17:08:21.000000000 +0100 -@@ -208,7 +208,7 @@ - int **pcm; - int samples; - -- if(vorbis_synthesis(&this->vb,op)==0) -+ if(vorbis_synthesis(&this->vb,op,1)==0) - vorbis_synthesis_blockin(&this->vd,&this->vb); - - if (buf->pts!=0) diff --git a/packages/libxine/libxine-1.0.0-beta12/full.patch b/packages/libxine/libxine-1.0.0-beta12/full.patch deleted file mode 100644 index d36dc39417..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/full.patch +++ /dev/null @@ -1,5601 +0,0 @@ -Copyright (C) 2003, Fred Boulay <dilb@handhelds.org> -Licensed under GPL v2 - -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/autogen.sh xine-lib-1-beta12/autogen.sh -*** xine-lib-1-beta12_orig/autogen.sh Sun Mar 2 06:47:39 2003 ---- xine-lib-1-beta12/autogen.sh Sun May 18 13:32:51 2003 -*************** -*** 140,145 **** ---- 140,149 ---- - echo $_echo_n " + Running libtoolize: $_echo_c"; - libtoolize --force --copy >/dev/null 2>&1; - echo "done." -+ echo $_echo_n " + copying patched ltmain.sh solving DESTDIR issues: $_echo_c"; -+ cp -f ltmain_patched.sh ltmain.sh; -+ echo "done." -+ - } - - #-------------------- -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/configure.ac xine-lib-1-beta12/configure.ac -*** xine-lib-1-beta12_orig/configure.ac Sun May 11 13:11:06 2003 ---- xine-lib-1-beta12/configure.ac Sun May 18 15:59:50 2003 -*************** -*** 670,676 **** - dnl --------------------------------------------- - dnl freetype2 lib. - dnl --------------------------------------------- -! AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) - if test "$FREETYPE_CONFIG" = "no" ; then - AC_MSG_RESULT([*** freetype-config not found, freetype2 support disabled ***]) - else ---- 670,676 ---- - dnl --------------------------------------------- - dnl freetype2 lib. - dnl --------------------------------------------- -! AC_PATH_PROG(FREETYPE_CONFIG, moooooooooooo_putain_de_script_freetype-config, no) - if test "$FREETYPE_CONFIG" = "no" ; then - AC_MSG_RESULT([*** freetype-config not found, freetype2 support disabled ***]) - else -*************** -*** 737,743 **** - dnl --------------------------------------------- - dnl gnome-vfs support - dnl --------------------------------------------- -! PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, - no_gnome_vfs=no, - no_gnome_vfs=yes) - AC_SUBST(GNOME_VFS_CFLAGS) ---- 737,743 ---- - dnl --------------------------------------------- - dnl gnome-vfs support - dnl --------------------------------------------- -! PKG_CHECK_MODULES(GNOME_VFS, putain_de_module_gnome-vfs-2.0, - no_gnome_vfs=no, - no_gnome_vfs=yes) - AC_SUBST(GNOME_VFS_CFLAGS) -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/ltmain_patched.sh xine-lib-1-beta12/ltmain_patched.sh -*** xine-lib-1-beta12_orig/ltmain_patched.sh Wed Dec 31 19:00:00 1969 ---- xine-lib-1-beta12/ltmain_patched.sh Sun May 18 13:31:34 2003 -*************** -*** 0 **** ---- 1,5044 ---- -+ # ltmain.sh - Provide generalized library-building support services. -+ # NOTE: Changing this file will not affect anything until you rerun configure. -+ # -+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+ # Free Software Foundation, Inc. -+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -+ # -+ # This program is free software; you can redistribute it and/or modify -+ # it under the terms of the GNU General Public License as published by -+ # the Free Software Foundation; either version 2 of the License, or -+ # (at your option) any later version. -+ # -+ # This program is distributed in the hope that it will be useful, but -+ # WITHOUT ANY WARRANTY; without even the implied warranty of -+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ # General Public License for more details. -+ # -+ # You should have received a copy of the GNU General Public License -+ # along with this program; if not, write to the Free Software -+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ # -+ # As a special exception to the GNU General Public License, if you -+ # distribute this file as part of a program that contains a -+ # configuration script generated by Autoconf, you may include it under -+ # the same distribution terms that you use for the rest of that program. -+ -+ # Check that we have a working $echo. -+ if test "X$1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+ elif test "X$1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -+ # Yippee, $echo works! -+ : -+ else -+ # Restart under the correct shell, and then maybe $echo will work. -+ exec $SHELL "$0" --no-reexec ${1+"$@"} -+ fi -+ -+ if test "X$1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat <<EOF -+ $* -+ EOF -+ exit 0 -+ fi -+ -+ # The name of this program. -+ progname=`$echo "$0" | sed 's%^.*/%%'` -+ modename="$progname" -+ -+ # Constants. -+ PROGRAM=ltmain.sh -+ PACKAGE=libtool -+ VERSION=1.4.2a -+ TIMESTAMP=" (1.922.2.79 2001/11/28 21:50:31)" -+ -+ default_mode= -+ help="Try \`$progname --help' for more information." -+ magic="%%%MAGIC variable%%%" -+ mkdir="mkdir" -+ mv="mv -f" -+ rm="rm -f" -+ -+ # Sed substitution that helps us do robust quoting. It backslashifies -+ # metacharacters that are still active within double-quoted strings. -+ Xsed='sed -e 1s/^X//' -+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' -+ SP2NL='tr \040 \012' -+ NL2SP='tr \015\012 \040\040' -+ -+ # NLS nuisances. -+ # Only set LANG and LC_ALL to C if already set. -+ # These must not be set unconditionally because not all systems understand -+ # e.g. LANG=C (notably SCO). -+ # We save the old values to restore during execute mode. -+ if test "${LC_ALL+set}" = set; then -+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL -+ fi -+ if test "${LANG+set}" = set; then -+ save_LANG="$LANG"; LANG=C; export LANG -+ fi -+ -+ # Make sure IFS has a sensible default -+ : ${IFS=" "} -+ -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ echo "$modename: not configured to build any kind of library" 1>&2 -+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit 1 -+ fi -+ -+ # Global variables. -+ mode=$default_mode -+ nonopt= -+ prev= -+ prevopt= -+ run= -+ show="$echo" -+ show_help= -+ execute_dlfiles= -+ lo2o="s/\\.lo\$/.${objext}/" -+ o2lo="s/\\.${objext}\$/.lo/" -+ -+ # Parse our command line options once, thoroughly. -+ while test $# -gt 0 -+ do -+ arg="$1" -+ shift -+ -+ case $arg in -+ -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) optarg= ;; -+ esac -+ -+ # If the previous option needs an argument, assign it. -+ if test -n "$prev"; then -+ case $prev in -+ execute_dlfiles) -+ execute_dlfiles="$execute_dlfiles $arg" -+ ;; -+ *) -+ eval "$prev=\$arg" -+ ;; -+ esac -+ -+ prev= -+ prevopt= -+ continue -+ fi -+ -+ # Have we seen a non-optional argument yet? -+ case $arg in -+ --help) -+ show_help=yes -+ ;; -+ -+ --version) -+ echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" -+ exit 0 -+ ;; -+ -+ --config) -+ sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 -+ exit 0 -+ ;; -+ -+ --debug) -+ echo "$progname: enabling shell trace mode" -+ set -x -+ ;; -+ -+ --dry-run | -n) -+ run=: -+ ;; -+ -+ --features) -+ echo "host: $host" -+ if test "$build_libtool_libs" = yes; then -+ echo "enable shared libraries" -+ else -+ echo "disable shared libraries" -+ fi -+ if test "$build_old_libs" = yes; then -+ echo "enable static libraries" -+ else -+ echo "disable static libraries" -+ fi -+ exit 0 -+ ;; -+ -+ --finish) mode="finish" ;; -+ -+ --mode) prevopt="--mode" prev=mode ;; -+ --mode=*) mode="$optarg" ;; -+ -+ --preserve-dup-deps) duplicate_deps="yes" ;; -+ -+ --quiet | --silent) -+ show=: -+ ;; -+ -+ -dlopen) -+ prevopt="-dlopen" -+ prev=execute_dlfiles -+ ;; -+ -+ -*) -+ $echo "$modename: unrecognized option \`$arg'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ ;; -+ -+ *) -+ nonopt="$arg" -+ break -+ ;; -+ esac -+ done -+ -+ if test -n "$prevopt"; then -+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ # If this variable is set in any of the actions, the command in it -+ # will be execed at the end. This prevents here-documents from being -+ # left over by shells. -+ exec_cmd= -+ -+ if test -z "$show_help"; then -+ -+ # Infer the operation mode. -+ if test -z "$mode"; then -+ case $nonopt in -+ *cc | *++ | gcc* | *-gcc*) -+ mode=link -+ for arg -+ do -+ case $arg in -+ -c) -+ mode=compile -+ break -+ ;; -+ esac -+ done -+ ;; -+ *db | *dbx | *strace | *truss) -+ mode=execute -+ ;; -+ *install*|cp|mv) -+ mode=install -+ ;; -+ *rm) -+ mode=uninstall -+ ;; -+ *) -+ # If we have no mode, but dlfiles were specified, then do execute mode. -+ test -n "$execute_dlfiles" && mode=execute -+ -+ # Just use the default operation mode. -+ if test -z "$mode"; then -+ if test -n "$nonopt"; then -+ $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 -+ else -+ $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 -+ fi -+ fi -+ ;; -+ esac -+ fi -+ -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$execute_dlfiles" && test "$mode" != execute; then -+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$modename --help --mode=$mode' for more information." -+ -+ # These modes are in order of execution frequency so that they run quickly. -+ case $mode in -+ # libtool compile mode -+ compile) -+ modename="$modename: compile" -+ # Get the compilation command and the source file. -+ base_compile= -+ prev= -+ lastarg= -+ srcfile="$nonopt" -+ suppress_output= -+ -+ user_target=no -+ for arg -+ do -+ case $prev in -+ "") ;; -+ xcompiler) -+ # Aesthetically quote the previous argument. -+ prev= -+ lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ -+ case $arg in -+ # Double-quote args containing other shell metacharacters. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ -+ # Add the previous argument to base_compile. -+ if test -z "$base_compile"; then -+ base_compile="$lastarg" -+ else -+ base_compile="$base_compile $lastarg" -+ fi -+ continue -+ ;; -+ esac -+ -+ # Accept any command-line options. -+ case $arg in -+ -o) -+ if test "$user_target" != "no"; then -+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -+ exit 1 -+ fi -+ user_target=next -+ ;; -+ -+ -static) -+ build_old_libs=yes -+ continue -+ ;; -+ -+ -prefer-pic) -+ pic_mode=yes -+ continue -+ ;; -+ -+ -prefer-non-pic) -+ pic_mode=no -+ continue -+ ;; -+ -+ -Xcompiler) -+ prev=xcompiler -+ continue -+ ;; -+ -+ -Wc,*) -+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` -+ lastarg= -+ save_ifs="$IFS"; IFS=',' -+ for arg in $args; do -+ IFS="$save_ifs" -+ -+ # Double-quote args containing other shell metacharacters. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ lastarg="$lastarg $arg" -+ done -+ IFS="$save_ifs" -+ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` -+ -+ # Add the arguments to base_compile. -+ if test -z "$base_compile"; then -+ base_compile="$lastarg" -+ else -+ base_compile="$base_compile $lastarg" -+ fi -+ continue -+ ;; -+ esac -+ -+ case $user_target in -+ next) -+ # The next one is the -o target name -+ user_target=yes -+ continue -+ ;; -+ yes) -+ # We got the output file -+ user_target=set -+ libobj="$arg" -+ continue -+ ;; -+ esac -+ -+ # Accept the current argument as the source file. -+ lastarg="$srcfile" -+ srcfile="$arg" -+ -+ # Aesthetically quote the previous argument. -+ -+ # Backslashify any backslashes, double quotes, and dollar signs. -+ # These are the only characters that are still specially -+ # interpreted inside of double-quoted scrings. -+ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` -+ -+ # Double-quote args containing other shell metacharacters. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ case $lastarg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ lastarg="\"$lastarg\"" -+ ;; -+ esac -+ -+ # Add the previous argument to base_compile. -+ if test -z "$base_compile"; then -+ base_compile="$lastarg" -+ else -+ base_compile="$base_compile $lastarg" -+ fi -+ done -+ -+ case $user_target in -+ set) -+ ;; -+ no) -+ # Get the name of the library object. -+ libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` -+ ;; -+ *) -+ $echo "$modename: you must specify a target with \`-o'" 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ # Recognize several different file suffixes. -+ # If the user specifies -o file.o, it is replaced with file.lo -+ xform='[cCFSfmso]' -+ case $libobj in -+ *.ada) xform=ada ;; -+ *.adb) xform=adb ;; -+ *.ads) xform=ads ;; -+ *.asm) xform=asm ;; -+ *.c++) xform=c++ ;; -+ *.cc) xform=cc ;; -+ *.cpp) xform=cpp ;; -+ *.cxx) xform=cxx ;; -+ *.f90) xform=f90 ;; -+ *.for) xform=for ;; -+ esac -+ -+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -+ -+ case $libobj in -+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; -+ *) -+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ if test -z "$base_compile"; then -+ $echo "$modename: you must specify a compilation command" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ # Delete any leftover library objects. -+ if test "$build_old_libs" = yes; then -+ removelist="$obj $libobj" -+ else -+ removelist="$libobj" -+ fi -+ -+ $run $rm $removelist -+ trap "$run $rm $removelist; exit 1" 1 2 15 -+ -+ # On Cygwin there's no "real" PIC flag so we must build both object types -+ case $host_os in -+ cygwin* | mingw* | pw32* | os2*) -+ pic_mode=default -+ ;; -+ esac -+ if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then -+ # non-PIC code in shared libraries is not supported -+ pic_mode=default -+ fi -+ -+ # Calculate the filename of the output object if compiler does -+ # not support -o with -c -+ if test "$compiler_c_o" = no; then -+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} -+ lockfile="$output_obj.lock" -+ removelist="$removelist $output_obj $lockfile" -+ trap "$run $rm $removelist; exit 1" 1 2 15 -+ else -+ need_locks=no -+ lockfile= -+ fi -+ -+ # Lock this critical section if it is needed -+ # We use this script file to make the link, it avoids creating a new file -+ if test "$need_locks" = yes; then -+ until $run ln "$0" "$lockfile" 2>/dev/null; do -+ $show "Waiting for $lockfile to be removed" -+ sleep 2 -+ done -+ elif test "$need_locks" = warn; then -+ if test -f "$lockfile"; then -+ echo "\ -+ *** ERROR, $lockfile exists and contains: -+ `cat $lockfile 2>/dev/null` -+ -+ This indicates that another process is trying to use the same -+ temporary object file, and libtool could not work around it because -+ your compiler does not support \`-c' and \`-o' together. If you -+ repeat this compilation, it may succeed, by chance, but you had better -+ avoid parallel builds (make -j) in this platform, or get a better -+ compiler." -+ -+ $run $rm $removelist -+ exit 1 -+ fi -+ echo $srcfile > "$lockfile" -+ fi -+ -+ if test -n "$fix_srcfile_path"; then -+ eval srcfile=\"$fix_srcfile_path\" -+ fi -+ -+ # Only build a PIC object if we are building libtool libraries. -+ if test "$build_libtool_libs" = yes; then -+ # Without this assignment, base_compile gets emptied. -+ fbsd_hideous_sh_bug=$base_compile -+ -+ if test "$pic_mode" != no; then -+ # All platforms use -DPIC, to notify preprocessed assembler code. -+ command="$base_compile $srcfile $pic_flag -DPIC" -+ else -+ # Don't build PIC code -+ command="$base_compile $srcfile" -+ fi -+ if test "$build_old_libs" = yes; then -+ lo_libobj="$libobj" -+ dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$dir" = "X$libobj"; then -+ dir="$objdir" -+ else -+ dir="$dir/$objdir" -+ fi -+ libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` -+ -+ if test -d "$dir"; then -+ $show "$rm $libobj" -+ $run $rm $libobj -+ else -+ $show "$mkdir $dir" -+ $run $mkdir $dir -+ status=$? -+ if test $status -ne 0 && test ! -d $dir; then -+ exit $status -+ fi -+ fi -+ fi -+ if test "$compiler_o_lo" = yes; then -+ output_obj="$libobj" -+ command="$command -o $output_obj" -+ elif test "$compiler_c_o" = yes; then -+ output_obj="$obj" -+ command="$command -o $output_obj" -+ fi -+ -+ $run $rm "$output_obj" -+ $show "$command" -+ if $run eval "$command"; then : -+ else -+ test -n "$output_obj" && $run $rm $removelist -+ exit 1 -+ fi -+ -+ if test "$need_locks" = warn && -+ test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then -+ echo "\ -+ *** ERROR, $lockfile contains: -+ `cat $lockfile 2>/dev/null` -+ -+ but it should contain: -+ $srcfile -+ -+ This indicates that another process is trying to use the same -+ temporary object file, and libtool could not work around it because -+ your compiler does not support \`-c' and \`-o' together. If you -+ repeat this compilation, it may succeed, by chance, but you had better -+ avoid parallel builds (make -j) in this platform, or get a better -+ compiler." -+ -+ $run $rm $removelist -+ exit 1 -+ fi -+ -+ # Just move the object if needed, then go on to compile the next one -+ if test x"$output_obj" != x"$libobj"; then -+ $show "$mv $output_obj $libobj" -+ if $run $mv $output_obj $libobj; then : -+ else -+ error=$? -+ $run $rm $removelist -+ exit $error -+ fi -+ fi -+ -+ # If we have no pic_flag, then copy the object into place and finish. -+ if (test -z "$pic_flag" || test "$pic_mode" != default) && -+ test "$build_old_libs" = yes; then -+ # Rename the .lo from within objdir to obj -+ if test -f $obj; then -+ $show $rm $obj -+ $run $rm $obj -+ fi -+ -+ $show "$mv $libobj $obj" -+ if $run $mv $libobj $obj; then : -+ else -+ error=$? -+ $run $rm $removelist -+ exit $error -+ fi -+ -+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$obj"; then -+ xdir="." -+ else -+ xdir="$xdir" -+ fi -+ baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"` -+ libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` -+ # Now arrange that obj and lo_libobj become the same file -+ $show "(cd $xdir && $LN_S $baseobj $libobj)" -+ if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then -+ # Unlock the critical section if it was locked -+ if test "$need_locks" != no; then -+ $run $rm "$lockfile" -+ fi -+ exit 0 -+ else -+ error=$? -+ $run $rm $removelist -+ exit $error -+ fi -+ fi -+ -+ # Allow error messages only from the first compilation. -+ suppress_output=' >/dev/null 2>&1' -+ fi -+ -+ # Only build a position-dependent object if we build old libraries. -+ if test "$build_old_libs" = yes; then -+ if test "$pic_mode" != yes; then -+ # Don't build PIC code -+ command="$base_compile $srcfile" -+ else -+ # All platforms use -DPIC, to notify preprocessed assembler code. -+ command="$base_compile $srcfile $pic_flag -DPIC" -+ fi -+ if test "$compiler_c_o" = yes; then -+ command="$command -o $obj" -+ output_obj="$obj" -+ fi -+ -+ # Suppress compiler output if we already did a PIC compilation. -+ command="$command$suppress_output" -+ $run $rm "$output_obj" -+ $show "$command" -+ if $run eval "$command"; then : -+ else -+ $run $rm $removelist -+ exit 1 -+ fi -+ -+ if test "$need_locks" = warn && -+ test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then -+ echo "\ -+ *** ERROR, $lockfile contains: -+ `cat $lockfile 2>/dev/null` -+ -+ but it should contain: -+ $srcfile -+ -+ This indicates that another process is trying to use the same -+ temporary object file, and libtool could not work around it because -+ your compiler does not support \`-c' and \`-o' together. If you -+ repeat this compilation, it may succeed, by chance, but you had better -+ avoid parallel builds (make -j) in this platform, or get a better -+ compiler." -+ -+ $run $rm $removelist -+ exit 1 -+ fi -+ -+ # Just move the object if needed -+ if test x"$output_obj" != x"$obj"; then -+ $show "$mv $output_obj $obj" -+ if $run $mv $output_obj $obj; then : -+ else -+ error=$? -+ $run $rm $removelist -+ exit $error -+ fi -+ fi -+ -+ # Create an invalid libtool object if no PIC, so that we do not -+ # accidentally link it into a program. -+ if test "$build_libtool_libs" != yes; then -+ $show "echo timestamp > $libobj" -+ $run eval "echo timestamp > \$libobj" || exit $? -+ else -+ # Move the .lo from within objdir -+ $show "$mv $libobj $lo_libobj" -+ if $run $mv $libobj $lo_libobj; then : -+ else -+ error=$? -+ $run $rm $removelist -+ exit $error -+ fi -+ fi -+ fi -+ -+ # Unlock the critical section if it was locked -+ if test "$need_locks" != no; then -+ $run $rm "$lockfile" -+ fi -+ -+ exit 0 -+ ;; -+ -+ # libtool link mode -+ link | relink) -+ modename="$modename: link" -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ # It is impossible to link a dll without this setting, and -+ # we shouldn't force the makefile maintainer to figure out -+ # which system we are compiling for in order to pass an extra -+ # flag for every libtool invokation. -+ # allow_undefined=no -+ -+ # FIXME: Unfortunately, there are problems with the above when trying -+ # to make a dll which has undefined symbols, in which case not -+ # even a static library is built. For now, we need to specify -+ # -no-undefined on the libtool link line when we can be certain -+ # that all symbols are satisfied, otherwise we get a static library. -+ allow_undefined=yes -+ ;; -+ *) -+ allow_undefined=yes -+ ;; -+ esac -+ libtool_args="$nonopt" -+ compile_command="$nonopt" -+ finalize_command="$nonopt" -+ -+ compile_rpath= -+ finalize_rpath= -+ compile_shlibpath= -+ finalize_shlibpath= -+ convenience= -+ old_convenience= -+ deplibs= -+ old_deplibs= -+ compiler_flags= -+ linker_flags= -+ dllsearchpath= -+ lib_search_path=`pwd` -+ -+ avoid_version=no -+ dlfiles= -+ dlprefiles= -+ dlself=no -+ export_dynamic=no -+ export_symbols= -+ export_symbols_regex= -+ generated= -+ libobjs= -+ ltlibs= -+ module=no -+ no_install=no -+ objs= -+ prefer_static_libs=no -+ preload=no -+ prev= -+ prevarg= -+ release= -+ rpath= -+ xrpath= -+ perm_rpath= -+ temp_rpath= -+ thread_safe=no -+ vinfo= -+ -+ # We need to know -static, to get the right output filenames. -+ for arg -+ do -+ case $arg in -+ -all-static | -static) -+ if test "X$arg" = "X-all-static"; then -+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then -+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 -+ fi -+ if test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ else -+ if test -z "$pic_flag" && test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ fi -+ build_libtool_libs=no -+ build_old_libs=yes -+ prefer_static_libs=yes -+ break -+ ;; -+ esac -+ done -+ -+ # See if our shared archives depend on static archives. -+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes -+ -+ # Go through the arguments, transforming them on the way. -+ while test $# -gt 0; do -+ arg="$1" -+ shift -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test -+ ;; -+ *) qarg=$arg ;; -+ esac -+ libtool_args="$libtool_args $qarg" -+ -+ # If the previous option needs an argument, assign it. -+ if test -n "$prev"; then -+ case $prev in -+ output) -+ compile_command="$compile_command @OUTPUT@" -+ finalize_command="$finalize_command @OUTPUT@" -+ ;; -+ esac -+ -+ case $prev in -+ dlfiles|dlprefiles) -+ if test "$preload" = no; then -+ # Add the symbol object into the linking commands. -+ compile_command="$compile_command @SYMFILE@" -+ finalize_command="$finalize_command @SYMFILE@" -+ preload=yes -+ fi -+ case $arg in -+ *.la | *.lo) ;; # We handle these cases below. -+ force) -+ if test "$dlself" = no; then -+ dlself=needless -+ export_dynamic=yes -+ fi -+ prev= -+ continue -+ ;; -+ self) -+ if test "$prev" = dlprefiles; then -+ dlself=yes -+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then -+ dlself=yes -+ else -+ dlself=needless -+ export_dynamic=yes -+ fi -+ prev= -+ continue -+ ;; -+ *) -+ if test "$prev" = dlfiles; then -+ dlfiles="$dlfiles $arg" -+ else -+ dlprefiles="$dlprefiles $arg" -+ fi -+ prev= -+ continue -+ ;; -+ esac -+ ;; -+ expsyms) -+ export_symbols="$arg" -+ if test ! -f "$arg"; then -+ $echo "$modename: symbol file \`$arg' does not exist" -+ exit 1 -+ fi -+ prev= -+ continue -+ ;; -+ expsyms_regex) -+ export_symbols_regex="$arg" -+ prev= -+ continue -+ ;; -+ release) -+ release="-$arg" -+ prev= -+ continue -+ ;; -+ rpath | xrpath) -+ # We need an absolute path. -+ case $arg in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ $echo "$modename: only absolute run-paths are allowed" 1>&2 -+ exit 1 -+ ;; -+ esac -+ if test "$prev" = rpath; then -+ case "$rpath " in -+ *" $arg "*) ;; -+ *) rpath="$rpath $arg" ;; -+ esac -+ else -+ case "$xrpath " in -+ *" $arg "*) ;; -+ *) xrpath="$xrpath $arg" ;; -+ esac -+ fi -+ prev= -+ continue -+ ;; -+ xcompiler) -+ compiler_flags="$compiler_flags $qarg" -+ prev= -+ compile_command="$compile_command $qarg" -+ finalize_command="$finalize_command $qarg" -+ continue -+ ;; -+ xlinker) -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $wl$qarg" -+ prev= -+ compile_command="$compile_command $wl$qarg" -+ finalize_command="$finalize_command $wl$qarg" -+ continue -+ ;; -+ *) -+ eval "$prev=\"\$arg\"" -+ prev= -+ continue -+ ;; -+ esac -+ fi # test -n $prev -+ -+ prevarg="$arg" -+ -+ case $arg in -+ -all-static) -+ if test -n "$link_static_flag"; then -+ compile_command="$compile_command $link_static_flag" -+ finalize_command="$finalize_command $link_static_flag" -+ fi -+ continue -+ ;; -+ -+ -allow-undefined) -+ # FIXME: remove this flag sometime in the future. -+ $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 -+ continue -+ ;; -+ -+ -avoid-version) -+ avoid_version=yes -+ continue -+ ;; -+ -+ -dlopen) -+ prev=dlfiles -+ continue -+ ;; -+ -+ -dlpreopen) -+ prev=dlprefiles -+ continue -+ ;; -+ -+ -export-dynamic) -+ export_dynamic=yes -+ continue -+ ;; -+ -+ -export-symbols | -export-symbols-regex) -+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -+ $echo "$modename: more than one -exported-symbols argument is not allowed" -+ exit 1 -+ fi -+ if test "X$arg" = "X-export-symbols"; then -+ prev=expsyms -+ else -+ prev=expsyms_regex -+ fi -+ continue -+ ;; -+ -+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* -+ # so, if we see these flags be careful not to treat them like -L -+ -L[A-Z][A-Z]*:*) -+ case $with_gcc/$host in -+ no/*-*-irix* | no/*-*-nonstopux*) -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ ;; -+ esac -+ continue -+ ;; -+ -+ -L*) -+ dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ absdir=`cd "$dir" && pwd` -+ if test -z "$absdir"; then -+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 -+ exit 1 -+ fi -+ dir="$absdir" -+ ;; -+ esac -+ case "$deplibs " in -+ *" -L$dir "*) ;; -+ *) -+ deplibs="$deplibs -L$dir" -+ lib_search_path="$lib_search_path $dir" -+ ;; -+ esac -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ case :$dllsearchpath: in -+ *":$dir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$dir";; -+ esac -+ ;; -+ esac -+ continue -+ ;; -+ -+ -l*) -+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then -+ case $host in -+ *-*-cygwin* | *-*-pw32* | *-*-beos*) -+ # These systems don't actually have a C or math library (as such) -+ continue -+ ;; -+ *-*-mingw* | *-*-os2*) -+ # These systems don't actually have a C library (as such) -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-openbsd* | *-*-freebsd*) -+ # Do not include libc due to us having libc/libc_r. -+ test "X$arg" = "X-lc" && continue -+ ;; -+ esac -+ elif test "X$arg" = "X-lc_r"; then -+ case $host in -+ *-*-openbsd* | *-*-freebsd*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac -+ fi -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ -+ -module) -+ module=yes -+ continue -+ ;; -+ -+ -no-fast-install) -+ fast_install=no -+ continue -+ ;; -+ -+ -no-install) -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ # The PATH hackery in wrapper scripts is required on Windows -+ # in order for the loader to find any dlls it needs. -+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 -+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 -+ fast_install=no -+ ;; -+ *) no_install=yes ;; -+ esac -+ continue -+ ;; -+ -+ -no-undefined) -+ allow_undefined=no -+ continue -+ ;; -+ -+ -o) prev=output ;; -+ -+ -release) -+ prev=release -+ continue -+ ;; -+ -+ -rpath) -+ prev=rpath -+ continue -+ ;; -+ -+ -R) -+ prev=xrpath -+ continue -+ ;; -+ -+ -R*) -+ dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ $echo "$modename: only absolute run-paths are allowed" 1>&2 -+ exit 1 -+ ;; -+ esac -+ case "$xrpath " in -+ *" $dir "*) ;; -+ *) xrpath="$xrpath $dir" ;; -+ esac -+ continue -+ ;; -+ -+ -static) -+ # The effects of -static are defined in a previous loop. -+ # We used to do the same as -all-static on platforms that -+ # didn't have a PIC flag, but the assumption that the effects -+ # would be equivalent was wrong. It would break on at least -+ # Digital Unix and AIX. -+ continue -+ ;; -+ -+ -thread-safe) -+ thread_safe=yes -+ continue -+ ;; -+ -+ -version-info) -+ prev=vinfo -+ continue -+ ;; -+ -+ -Wc,*) -+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` -+ arg= -+ save_ifs="$IFS"; IFS=',' -+ for flag in $args; do -+ IFS="$save_ifs" -+ case $flag in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ flag="\"$flag\"" -+ ;; -+ esac -+ arg="$arg $wl$flag" -+ compiler_flags="$compiler_flags $flag" -+ done -+ IFS="$save_ifs" -+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` -+ ;; -+ -+ -Wl,*) -+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` -+ arg= -+ save_ifs="$IFS"; IFS=',' -+ for flag in $args; do -+ IFS="$save_ifs" -+ case $flag in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ flag="\"$flag\"" -+ ;; -+ esac -+ arg="$arg $wl$flag" -+ compiler_flags="$compiler_flags $wl$flag" -+ linker_flags="$linker_flags $flag" -+ done -+ IFS="$save_ifs" -+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` -+ ;; -+ -+ -Xcompiler) -+ prev=xcompiler -+ continue -+ ;; -+ -+ -Xlinker) -+ prev=xlinker -+ continue -+ ;; -+ -+ # Some other compiler flag. -+ -* | +*) -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ ;; -+ -+ *.lo | *.$objext) -+ # A library or standard object. -+ if test "$prev" = dlfiles; then -+ # This file was specified with -dlopen. -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $arg" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi -+ -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` -+ prev= -+ else -+ case $arg in -+ *.lo) libobjs="$libobjs $arg" ;; -+ *) objs="$objs $arg" ;; -+ esac -+ fi -+ ;; -+ -+ *.$libext) -+ # An archive. -+ deplibs="$deplibs $arg" -+ old_deplibs="$old_deplibs $arg" -+ continue -+ ;; -+ -+ *.la) -+ # A libtool-controlled library. -+ -+ if test "$prev" = dlfiles; then -+ # This library was specified with -dlopen. -+ dlfiles="$dlfiles $arg" -+ prev= -+ elif test "$prev" = dlprefiles; then -+ # The library was specified with -dlpreopen. -+ dlprefiles="$dlprefiles $arg" -+ prev= -+ else -+ deplibs="$deplibs $arg" -+ fi -+ continue -+ ;; -+ -+ # Some other compiler argument. -+ *) -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ ;; -+ esac # arg -+ -+ # Now actually substitute the argument into the commands. -+ if test -n "$arg"; then -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ fi -+ done # argument parsing loop -+ -+ if test -n "$prev"; then -+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -+ eval arg=\"$export_dynamic_flag_spec\" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ fi -+ -+ # calculate the name of the file, without its directory -+ outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` -+ libobjs_save="$libobjs" -+ -+ if test -n "$shlibpath_var"; then -+ # get the directories listed in $shlibpath_var -+ eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -+ else -+ shlib_search_path= -+ fi -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" -+ -+ output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$output_objdir" = "X$output"; then -+ output_objdir="$objdir" -+ else -+ output_objdir="$output_objdir/$objdir" -+ fi -+ # Create the object directory. -+ if test ! -d $output_objdir; then -+ $show "$mkdir $output_objdir" -+ $run $mkdir $output_objdir -+ status=$? -+ if test $status -ne 0 && test ! -d $output_objdir; then -+ exit $status -+ fi -+ fi -+ -+ # Determine the type of output -+ case $output in -+ "") -+ $echo "$modename: you must specify an output file" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ ;; -+ *.$libext) linkmode=oldlib ;; -+ *.lo | *.$objext) linkmode=obj ;; -+ *.la) linkmode=lib ;; -+ *) linkmode=prog ;; # Anything else should be a program. -+ esac -+ -+ specialdeplibs= -+ libs= -+ # Find all interdependent deplibs by searching for libraries -+ # that are linked more than once (e.g. -la -lb -la) -+ for deplib in $deplibs; do -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ libs="$libs $deplib" -+ done -+ deplibs= -+ newdependency_libs= -+ newlib_search_path= -+ need_relink=no # whether we're linking any uninstalled libtool libraries -+ notinst_deplibs= # not-installed libtool libraries -+ notinst_path= # paths that contain not-installed libtool libraries -+ case $linkmode in -+ lib) -+ passes="conv link" -+ for file in $dlfiles $dlprefiles; do -+ case $file in -+ *.la) ;; -+ *) -+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ ;; -+ prog) -+ compile_deplibs= -+ finalize_deplibs= -+ alldeplibs=no -+ newdlfiles= -+ newdlprefiles= -+ passes="conv scan dlopen dlpreopen link" -+ ;; -+ *) passes="conv" -+ ;; -+ esac -+ for pass in $passes; do -+ if test $linkmode = prog; then -+ # Determine which files to process -+ case $pass in -+ dlopen) -+ libs="$dlfiles" -+ save_deplibs="$deplibs" # Collect dlpreopened libraries -+ deplibs= -+ ;; -+ dlpreopen) libs="$dlprefiles" ;; -+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -+ esac -+ fi -+ for deplib in $libs; do -+ lib= -+ found=no -+ case $deplib in -+ -l*) -+ if test $linkmode = oldlib && test $linkmode = obj; then -+ $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 -+ continue -+ fi -+ if test $pass = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` -+ for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ # Search the libtool library -+ lib="$searchdir/lib${name}.la" -+ if test -f "$lib"; then -+ found=yes -+ break -+ fi -+ done -+ if test "$found" != yes; then -+ # deplib doesn't seem to be a libtool library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ fi -+ ;; # -l -+ -L*) -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ test $pass = conv && continue -+ newdependency_libs="$deplib $newdependency_libs" -+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` -+ ;; -+ prog) -+ if test $pass = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ if test $pass = scan; then -+ deplibs="$deplib $deplibs" -+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ ;; -+ *) -+ $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2 -+ ;; -+ esac # linkmode -+ continue -+ ;; # -L -+ -R*) -+ if test $pass = link; then -+ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` -+ # Make sure the xrpath contains only unique directories. -+ case "$xrpath " in -+ *" $dir "*) ;; -+ *) xrpath="$xrpath $dir" ;; -+ esac -+ fi -+ deplibs="$deplib $deplibs" -+ continue -+ ;; -+ *.la) lib="$deplib" ;; -+ *.$libext) -+ if test $pass = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ case $linkmode in -+ lib) -+ if test "$deplibs_check_method" != pass_all; then -+ echo -+ echo "*** Warning: Trying to link with static lib archive $deplib." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because the file extensions .$libext of this argument makes me believe" -+ echo "*** that it is just a static archive that I should not used here." -+ else -+ echo -+ echo "*** Warning: Linking the shared library $output against the" -+ echo "*** static library $deplib is not portable!" -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; -+ prog) -+ if test $pass != link; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ continue -+ ;; -+ esac # linkmode -+ ;; # *.$libext -+ *.lo | *.$objext) -+ if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ # If there is no dlopen support or we're linking statically, -+ # we need to preload. -+ newdlprefiles="$newdlprefiles $deplib" -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ newdlfiles="$newdlfiles $deplib" -+ fi -+ continue -+ ;; -+ %DEPLIBS%) -+ alldeplibs=yes -+ continue -+ ;; -+ esac # case $deplib -+ if test $found = yes || test -f "$lib"; then : -+ else -+ $echo "$modename: cannot find the library \`$lib'" 1>&2 -+ exit 1 -+ fi -+ -+ # Check to see that this really is a libtool archive. -+ if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ else -+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -+ exit 1 -+ fi -+ -+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$ladir" = "X$lib" && ladir="." -+ -+ dlname= -+ dlopen= -+ dlpreopen= -+ libdir= -+ library_names= -+ old_library= -+ # If the library was installed with an old release of libtool, -+ # it will not redefine variable installed. -+ installed=yes -+ -+ # Read the .la file -+ case $lib in -+ */* | *\\*) . $lib ;; -+ *) . ./$lib ;; -+ esac -+ -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan" || -+ { test $linkmode = oldlib && test $linkmode = obj; }; then -+ # Add dl[pre]opened files of deplib -+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ fi -+ -+ if test $pass = conv; then -+ # Only check for convenience libraries -+ deplibs="$lib $deplibs" -+ if test -z "$libdir"; then -+ if test -z "$old_library"; then -+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -+ exit 1 -+ fi -+ # It is a libtool convenience library, so add in its objects. -+ convenience="$convenience $ladir/$objdir/$old_library" -+ old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done -+ elif test $linkmode != prog && test $linkmode != lib; then -+ $echo "$modename: \`$lib' is not a convenience library" 1>&2 -+ exit 1 -+ fi -+ continue -+ fi # $pass = conv -+ -+ # Get the name of the library we link against. -+ linklib= -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ if test -z "$linklib"; then -+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -+ exit 1 -+ fi -+ -+ # This library was specified with -dlopen. -+ if test $pass = dlopen; then -+ if test -z "$libdir"; then -+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 -+ exit 1 -+ fi -+ if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ # If there is no dlname, no dlopen support or we're linking -+ # statically, we need to preload. -+ dlprefiles="$dlprefiles $lib" -+ else -+ newdlfiles="$newdlfiles $lib" -+ fi -+ continue -+ fi # $pass = dlopen -+ -+ # We need an absolute path. -+ case $ladir in -+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; -+ *) -+ abs_ladir=`cd "$ladir" && pwd` -+ if test -z "$abs_ladir"; then -+ $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 -+ $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 -+ abs_ladir="$ladir" -+ fi -+ ;; -+ esac -+ laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -+ -+ # Find the relevant object directory and library name. -+ if test "X$installed" = Xyes; then -+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ $echo "$modename: warning: library \`$lib' was moved." 1>&2 -+ dir="$ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ else -+ dir="$libdir" -+ absdir="$libdir" -+ fi -+ else -+ dir="$ladir/$objdir" -+ absdir="$abs_ladir/$objdir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ fi # $installed = yes -+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -+ -+ # This library was specified with -dlpreopen. -+ if test $pass = dlpreopen; then -+ if test -z "$libdir"; then -+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 -+ exit 1 -+ fi -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ newdlprefiles="$newdlprefiles $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ newdlprefiles="$newdlprefiles $dir/$dlname" -+ else -+ newdlprefiles="$newdlprefiles $dir/$linklib" -+ fi -+ fi # $pass = dlpreopen -+ -+ if test -z "$libdir"; then -+ # Link the convenience library -+ if test $linkmode = lib; then -+ deplibs="$dir/$old_library $deplibs" -+ elif test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$dir/$old_library $compile_deplibs" -+ finalize_deplibs="$dir/$old_library $finalize_deplibs" -+ else -+ deplibs="$lib $deplibs" -+ fi -+ continue -+ fi -+ -+ if test $linkmode = prog && test $pass != link; then -+ newlib_search_path="$newlib_search_path $ladir" -+ deplibs="$lib $deplibs" -+ -+ linkalldeplibs=no -+ if test "$link_all_deplibs" != no || test -z "$library_names" || -+ test "$build_libtool_libs" = no; then -+ linkalldeplibs=yes -+ fi -+ -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ case $deplib in -+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test -+ esac -+ # Need to link against all dependency_libs? -+ if test $linkalldeplibs = yes; then -+ deplibs="$deplib $deplibs" -+ else -+ # Need to hardcode shared library paths -+ # or/and link against static libraries -+ newdependency_libs="$deplib $newdependency_libs" -+ fi -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done # for deplib -+ continue -+ fi # $linkmode = prog... -+ -+ link_static=no # Whether the deplib will be linked statically -+ if test -n "$library_names" && -+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -+ # Link against this shared library -+ -+ if test "$linkmode,$pass" = "prog,link" || -+ { test $linkmode = lib && test $hardcode_into_libs = yes; }; then -+ # Hardcode the library path. -+ # Skip directories that are in the system default run-time -+ # search path. -+ case " $sys_lib_dlsearch_path " in -+ *" $absdir "*) ;; -+ *) -+ case "$compile_rpath " in -+ *" $absdir "*) ;; -+ *) compile_rpath="$compile_rpath $absdir" -+ esac -+ ;; -+ esac -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" -+ esac -+ ;; -+ esac -+ if test $linkmode = prog; then -+ # We need to hardcode the library path -+ if test -n "$shlibpath_var"; then -+ # Make sure the rpath contains only unique directories. -+ case "$temp_rpath " in -+ *" $dir "*) ;; -+ *" $absdir "*) ;; -+ *) temp_rpath="$temp_rpath $dir" ;; -+ esac -+ fi -+ fi -+ fi # $linkmode,$pass = prog,link... -+ -+ if test "$alldeplibs" = yes && -+ { test "$deplibs_check_method" = pass_all || -+ { test "$build_libtool_libs" = yes && -+ test -n "$library_names"; }; }; then -+ # We only need to search for static libraries -+ continue -+ fi -+ -+ if test "$installed" = no; then -+ notinst_deplibs="$notinst_deplibs $lib" -+ need_relink=yes -+ fi -+ -+ if test -n "$old_archive_from_expsyms_cmds"; then -+ # figure out the soname -+ set dummy $library_names -+ realname="$2" -+ shift; shift -+ libname=`eval \\$echo \"$libname_spec\"` -+ # use dlname if we got it. it's perfectly good, no? -+ if test -n "$dlname"; then -+ soname="$dlname" -+ elif test -n "$soname_spec"; then -+ # bleh windows -+ case $host in -+ *cygwin*) -+ major=`expr $current - $age` -+ versuffix="-$major" -+ ;; -+ esac -+ eval soname=\"$soname_spec\" -+ else -+ soname="$realname" -+ fi -+ -+ # Make a new name for the extract_expsyms_cmds to use -+ soroot="$soname" -+ soname=`echo $soroot | sed -e 's/^.*\///'` -+ newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" -+ -+ # If the library has no export list, then create one now -+ if test -f "$output_objdir/$soname-def"; then : -+ else -+ $show "extracting exported symbol list from \`$soname'" -+ save_ifs="$IFS"; IFS='~' -+ eval cmds=\"$extract_expsyms_cmds\" -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ fi -+ -+ # Create $newlib -+ if test -f "$output_objdir/$newlib"; then :; else -+ $show "generating import library for \`$soname'" -+ save_ifs="$IFS"; IFS='~' -+ eval cmds=\"$old_archive_from_expsyms_cmds\" -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ fi -+ # make sure the library variables are pointing to the new library -+ dir=$output_objdir -+ linklib=$newlib -+ fi # test -n $old_archive_from_expsyms_cmds -+ -+ if test $linkmode = prog || test "$mode" != relink; then -+ add_shlibpath= -+ add_dir= -+ add= -+ lib_linked=yes -+ case $hardcode_action in -+ immediate | unsupported) -+ if test "$hardcode_direct" = no; then -+ add="$dir/$linklib" -+ elif test "$hardcode_minus_L" = no; then -+ case $host in -+ *-*-sunos*) add_shlibpath="$dir" ;; -+ esac -+ add_dir="-L$dir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = no; then -+ add_shlibpath="$dir" -+ add="-l$name" -+ else -+ lib_linked=no -+ fi -+ ;; -+ relink) -+ if test "$hardcode_direct" = yes; then -+ add="$dir/$linklib" -+ elif test "$hardcode_minus_L" = yes; then -+ add_dir="-L$dir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = yes; then -+ add_shlibpath="$dir" -+ add="-l$name" -+ else -+ lib_linked=no -+ fi -+ ;; -+ *) lib_linked=no ;; -+ esac -+ -+ if test "$lib_linked" != yes; then -+ $echo "$modename: configuration error: unsupported hardcode properties" -+ exit 1 -+ fi -+ -+ if test -n "$add_shlibpath"; then -+ case :$compile_shlibpath: in -+ *":$add_shlibpath:"*) ;; -+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ esac -+ fi -+ if test $linkmode = prog; then -+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" -+ test -n "$add" && compile_deplibs="$add $compile_deplibs" -+ else -+ test -n "$add_dir" && deplibs="$add_dir $deplibs" -+ test -n "$add" && deplibs="$add $deplibs" -+ if test "$hardcode_direct" != yes && \ -+ test "$hardcode_minus_L" != yes && \ -+ test "$hardcode_shlibpath_var" = yes; then -+ case :$finalize_shlibpath: in -+ *":$libdir:"*) ;; -+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ esac -+ fi -+ fi -+ fi -+ -+ if test $linkmode = prog || test "$mode" = relink; then -+ add_shlibpath= -+ add_dir= -+ add= -+ # Finalize command for both is simple: just hardcode it. -+ if test "$hardcode_direct" = yes; then -+ add="$libdir/$linklib" -+ elif test "$hardcode_minus_L" = yes; then -+ add_dir="-L$libdir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = yes; then -+ case :$finalize_shlibpath: in -+ *":$libdir:"*) ;; -+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ esac -+ add="-l$name" -+ else -+ # We cannot seem to hardcode it, guess we'll fake it. -+ if test "X$installed" = Xyes; then -+ add_dir="-L$libdir" -+ else -+ add_dir="-L$DESTDIR$libdir" -+ fi -+ add="-l$name" -+ fi -+ -+ if test $linkmode = prog; then -+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" -+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" -+ else -+ test -n "$add_dir" && deplibs="$add_dir $deplibs" -+ test -n "$add" && deplibs="$add $deplibs" -+ fi -+ fi -+ elif test $linkmode = prog; then -+ if test "$alldeplibs" = yes && -+ { test "$deplibs_check_method" = pass_all || -+ { test "$build_libtool_libs" = yes && -+ test -n "$library_names"; }; }; then -+ # We only need to search for static libraries -+ continue -+ fi -+ -+ # Try to link the static library -+ # Here we assume that one of hardcode_direct or hardcode_minus_L -+ # is not unsupported. This is valid on all known static and -+ # shared platforms. -+ if test "$hardcode_direct" != unsupported; then -+ test -n "$old_library" && linklib="$old_library" -+ compile_deplibs="$dir/$linklib $compile_deplibs" -+ finalize_deplibs="$dir/$linklib $finalize_deplibs" -+ else -+ compile_deplibs="-l$name -L$dir $compile_deplibs" -+ finalize_deplibs="-l$name -L$dir $finalize_deplibs" -+ fi -+ elif test "$build_libtool_libs" = yes; then -+ # Not a shared library -+ if test "$deplibs_check_method" != pass_all; then -+ # We're trying link a shared library against a static one -+ # but the system doesn't support it. -+ -+ # Just print a warning and add the library to dependency_libs so -+ # that the program can be linked against the static library. -+ echo -+ echo "*** Warning: This system can not link to static lib archive $lib." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have." -+ if test "$module" = yes; then -+ echo "*** But as you try to build a module library, libtool will still create " -+ echo "*** a static module, that should work as long as the dlopening application" -+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime." -+ if test -z "$global_symbol_pipe"; then -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ fi -+ if test "$build_old_libs" = no; then -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ fi -+ else -+ convenience="$convenience $dir/$old_library" -+ old_convenience="$old_convenience $dir/$old_library" -+ deplibs="$dir/$old_library $deplibs" -+ link_static=yes -+ fi -+ fi # link shared/static library? -+ -+ if test $linkmode = lib; then -+ if test -n "$dependency_libs" && -+ { test $hardcode_into_libs != yes || test $build_old_libs = yes || -+ test $link_static = yes; }; then -+ # Extract -R from dependency_libs -+ temp_deplibs= -+ for libdir in $dependency_libs; do -+ case $libdir in -+ -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` -+ case " $xrpath " in -+ *" $temp_xrpath "*) ;; -+ *) xrpath="$xrpath $temp_xrpath";; -+ esac;; -+ *) temp_deplibs="$temp_deplibs $libdir";; -+ esac -+ done -+ dependency_libs="$temp_deplibs" -+ fi -+ -+ newlib_search_path="$newlib_search_path $absdir" -+ # Link against this library -+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" -+ # ... and its dependency_libs -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ newdependency_libs="$deplib $newdependency_libs" -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done -+ -+ if test $link_all_deplibs != no; then -+ # Add the search paths of all dependency libraries -+ for deplib in $dependency_libs; do -+ case $deplib in -+ -L*) path="$deplib" ;; -+ *.la) -+ dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$dir" = "X$deplib" && dir="." -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -+ *) -+ absdir=`cd "$dir" && pwd` -+ if test -z "$absdir"; then -+ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 -+ absdir="$dir" -+ fi -+ ;; -+ esac -+ if grep "^installed=no" $deplib > /dev/null; then -+ path="-L$absdir/$objdir" -+ else -+ eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ if test -z "$libdir"; then -+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -+ exit 1 -+ fi -+ if test "$absdir" != "$libdir"; then -+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -+ fi -+ path="-L$absdir" -+ fi -+ ;; -+ *) continue ;; -+ esac -+ case " $deplibs " in -+ *" $path "*) ;; -+ *) deplibs="$deplibs $path" ;; -+ esac -+ done -+ fi # link_all_deplibs != no -+ fi # linkmode = lib -+ done # for deplib in $libs -+ if test $pass = dlpreopen; then -+ # Link the dlpreopened libraries before other libraries -+ for deplib in $save_deplibs; do -+ deplibs="$deplib $deplibs" -+ done -+ fi -+ if test $pass != dlopen; then -+ test $pass != scan && dependency_libs="$newdependency_libs" -+ if test $pass != conv; then -+ # Make sure lib_search_path contains only unique directories. -+ lib_search_path= -+ for dir in $newlib_search_path; do -+ case "$lib_search_path " in -+ *" $dir "*) ;; -+ *) lib_search_path="$lib_search_path $dir" ;; -+ esac -+ done -+ newlib_search_path= -+ fi -+ -+ if test "$linkmode,$pass" != "prog,link"; then -+ vars="deplibs" -+ else -+ vars="compile_deplibs finalize_deplibs" -+ fi -+ for var in $vars dependency_libs; do -+ # Add libraries to $var in reverse order -+ eval tmp_libs=\"\$$var\" -+ new_libs= -+ for deplib in $tmp_libs; do -+ case $deplib in -+ -L*) new_libs="$deplib $new_libs" ;; -+ *) -+ case " $specialdeplibs " in -+ *" $deplib "*) new_libs="$deplib $new_libs" ;; -+ *) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$deplib $new_libs" ;; -+ esac -+ ;; -+ esac -+ ;; -+ esac -+ done -+ tmp_libs= -+ for deplib in $new_libs; do -+ case $deplib in -+ -L*) -+ case " $tmp_libs " in -+ *" $deplib "*) ;; -+ *) tmp_libs="$tmp_libs $deplib" ;; -+ esac -+ ;; -+ *) tmp_libs="$tmp_libs $deplib" ;; -+ esac -+ done -+ eval $var=\"$tmp_libs\" -+ done # for var -+ fi -+ if test "$pass" = "conv" && -+ { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then -+ libs="$deplibs" # reset libs -+ deplibs= -+ fi -+ done # for pass -+ if test $linkmode = prog; then -+ dlfiles="$newdlfiles" -+ dlprefiles="$newdlprefiles" -+ fi -+ -+ case $linkmode in -+ oldlib) -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 -+ fi -+ -+ if test -n "$rpath"; then -+ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 -+ fi -+ -+ if test -n "$xrpath"; then -+ $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 -+ fi -+ -+ if test -n "$vinfo"; then -+ $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 -+ fi -+ -+ if test -n "$release"; then -+ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 -+ fi -+ -+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -+ $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 -+ fi -+ -+ # Now set the variables for building old libraries. -+ build_libtool_libs=no -+ oldlibs="$output" -+ objs="$objs$old_deplibs" -+ ;; -+ -+ lib) -+ # Make sure we only generate libraries of the form `libNAME.la'. -+ case $outputname in -+ lib*) -+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -+ eval libname=\"$libname_spec\" -+ ;; -+ *) -+ if test "$module" = no; then -+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ if test "$need_lib_prefix" != no; then -+ # Add the "lib" prefix for modules if required -+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -+ eval libname=\"$libname_spec\" -+ else -+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -+ fi -+ ;; -+ esac -+ -+ if test -n "$objs"; then -+ if test "$deplibs_check_method" != pass_all; then -+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 -+ exit 1 -+ else -+ echo -+ echo "*** Warning: Linking the shared library $output against the non-libtool" -+ echo "*** objects $objs is not portable!" -+ libobjs="$libobjs $objs" -+ fi -+ fi -+ -+ if test "$dlself" != no; then -+ $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 -+ fi -+ -+ set dummy $rpath -+ if test $# -gt 2; then -+ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 -+ fi -+ install_libdir="$2" -+ -+ oldlibs= -+ if test -z "$rpath"; then -+ if test "$build_libtool_libs" = yes; then -+ # Building a libtool convenience library. -+ libext=al -+ oldlibs="$output_objdir/$libname.$libext $oldlibs" -+ build_libtool_libs=convenience -+ build_old_libs=yes -+ fi -+ -+ if test -n "$vinfo"; then -+ $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 -+ fi -+ -+ if test -n "$release"; then -+ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 -+ fi -+ else -+ -+ # Parse the version information argument. -+ save_ifs="$IFS"; IFS=':' -+ set dummy $vinfo 0 0 0 -+ IFS="$save_ifs" -+ -+ if test -n "$8"; then -+ $echo "$modename: too many parameters to \`-version-info'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ current="$2" -+ revision="$3" -+ age="$4" -+ -+ # Check that each of the things are valid numbers. -+ case $current in -+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -+ *) -+ $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ case $revision in -+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -+ *) -+ $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ case $age in -+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -+ *) -+ $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ if test $age -gt $current; then -+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit 1 -+ fi -+ -+ # Calculate the version variables. -+ major= -+ versuffix= -+ verstring= -+ case $version_type in -+ none) ;; -+ -+ darwin) -+ # Like Linux, but with the current version available in -+ # verstring for coding it into the library header -+ major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" -+ # Darwin ld doesn't like 0 for these options... -+ minor_current=`expr $current + 1` -+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -+ ;; -+ -+ freebsd-aout) -+ major=".$current" -+ versuffix=".$current.$revision"; -+ ;; -+ -+ freebsd-elf) -+ major=".$current" -+ versuffix=".$current"; -+ ;; -+ -+ irix | nonstopux) -+ case $version_type in -+ nonstopux) verstring_prefix=nonstopux ;; -+ *) verstring_prefix=sgi ;; -+ esac -+ verstring="$verstring_prefix$major.$revision" -+ -+ major=`expr $current - $age + 1` -+ -+ # Add in all the interfaces that we are compatible with. -+ loop=$revision -+ while test $loop != 0; do -+ iface=`expr $revision - $loop` -+ loop=`expr $loop - 1` -+ verstring="$verstring_prefix$major.$iface:$verstring" -+ done -+ -+ # Before this point, $major must not contain `.'. -+ major=.$major -+ versuffix="$major.$revision" -+ ;; -+ -+ linux) -+ major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" -+ ;; -+ -+ osf) -+ major=`expr $current - $age` -+ versuffix=".$current.$age.$revision" -+ verstring="$current.$age.$revision" -+ -+ # Add in all the interfaces that we are compatible with. -+ loop=$age -+ while test $loop != 0; do -+ iface=`expr $current - $loop` -+ loop=`expr $loop - 1` -+ verstring="$verstring:${iface}.0" -+ done -+ -+ # Make executables depend on our current version. -+ verstring="$verstring:${current}.0" -+ ;; -+ -+ sunos) -+ major=".$current" -+ versuffix=".$current.$revision" -+ ;; -+ -+ windows) -+ # Use '-' rather than '.', since we only want one -+ # extension on DOS 8.3 filesystems. -+ major=`expr $current - $age` -+ versuffix="-$major" -+ ;; -+ -+ *) -+ $echo "$modename: unknown library version type \`$version_type'" 1>&2 -+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ # Clear the version info if we defaulted, and they specified a release. -+ if test -z "$vinfo" && test -n "$release"; then -+ major= -+ verstring="0.0" -+ case $version_type in -+ darwin) -+ # we can't check for "0.0" in archive_cmds due to quoting -+ # problems, so we reset it completely -+ verstring="" -+ ;; -+ *) -+ verstring="0.0" -+ ;; -+ esac -+ if test "$need_version" = no; then -+ versuffix= -+ else -+ versuffix=".0.0" -+ fi -+ fi -+ -+ # Remove version info from name if versioning should be avoided -+ if test "$avoid_version" = yes && test "$need_version" = no; then -+ major= -+ versuffix= -+ verstring="" -+ fi -+ -+ # Check to see if the archive will have undefined symbols. -+ if test "$allow_undefined" = yes; then -+ if test "$allow_undefined_flag" = unsupported; then -+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 -+ build_libtool_libs=no -+ build_old_libs=yes -+ fi -+ else -+ # Don't allow undefined symbols. -+ allow_undefined_flag="$no_undefined_flag" -+ fi -+ fi -+ -+ if test "$mode" != relink; then -+ # Remove our outputs. -+ $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -+ $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* -+ fi -+ -+ # Now set the variables for building old libraries. -+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ -+ # Transform .lo files to .o files. -+ oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -+ fi -+ -+ # Eliminate all temporary directories. -+ for path in $notinst_path; do -+ lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` -+ deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` -+ dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` -+ done -+ -+ if test -n "$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ temp_xrpath= -+ for libdir in $xrpath; do -+ temp_xrpath="$temp_xrpath -R$libdir" -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ if test $hardcode_into_libs != yes || test $build_old_libs = yes; then -+ dependency_libs="$temp_xrpath $dependency_libs" -+ fi -+ fi -+ -+ # Make sure dlfiles contains only unique files that won't be dlpreopened -+ old_dlfiles="$dlfiles" -+ dlfiles= -+ for lib in $old_dlfiles; do -+ case " $dlprefiles $dlfiles " in -+ *" $lib "*) ;; -+ *) dlfiles="$dlfiles $lib" ;; -+ esac -+ done -+ -+ # Make sure dlprefiles contains only unique files -+ old_dlprefiles="$dlprefiles" -+ dlprefiles= -+ for lib in $old_dlprefiles; do -+ case "$dlprefiles " in -+ *" $lib "*) ;; -+ *) dlprefiles="$dlprefiles $lib" ;; -+ esac -+ done -+ -+ if test "$build_libtool_libs" = yes; then -+ if test -n "$rpath"; then -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) -+ # these systems don't actually have a c library (as such)! -+ ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C library is in the System framework -+ deplibs="$deplibs -framework System" -+ ;; -+ *-*-netbsd*) -+ # Don't link with libc until the a.out ld.so is fixed. -+ ;; -+ *-*-openbsd* | *-*-freebsd*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; -+ *) -+ # Add libc to deplibs on all other systems if necessary. -+ if test $build_libtool_need_lc = "yes"; then -+ deplibs="$deplibs -lc" -+ fi -+ ;; -+ esac -+ fi -+ -+ # Transform deplibs into only deplibs that can be linked in shared. -+ name_save=$name -+ libname_save=$libname -+ release_save=$release -+ versuffix_save=$versuffix -+ major_save=$major -+ # I'm not sure if I'm treating the release correctly. I think -+ # release should show up in the -l (ie -lgmp5) so we don't want to -+ # add it in twice. Is that correct? -+ release="" -+ versuffix="" -+ major="" -+ newdeplibs= -+ droppeddeps=no -+ case $deplibs_check_method in -+ pass_all) -+ # Don't check for shared/static. Everything works. -+ # This might be a little naive. We might want to check -+ # whether the library exists or not. But this is on -+ # osf3 & osf4 and I'm not really sure... Just -+ # implementing what was already the behaviour. -+ newdeplibs=$deplibs -+ ;; -+ test_compile) -+ # This code stresses the "libraries are programs" paradigm to its -+ # limits. Maybe even breaks it. We compile a program, linking it -+ # against the deplibs as a proxy for the library. Then we can check -+ # whether they linked in statically or dynamically with ldd. -+ $rm conftest.c -+ cat > conftest.c <<EOF -+ int main() { return 0; } -+ EOF -+ $rm conftest -+ $CC -o conftest conftest.c $deplibs -+ if test $? -eq 0 ; then -+ ldd_output=`ldd conftest` -+ for i in $deplibs; do -+ name="`expr $i : '-l\(.*\)'`" -+ # If $name is empty we are operating on a -L argument. -+ if test -n "$name" && test "$name" != "0"; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ deplib_matches=`eval \\$echo \"$library_names_spec\"` -+ set dummy $deplib_matches -+ deplib_match=$2 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ echo -+ echo "*** Warning: dynamic linker does not accept needed library $i." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which I believe you do not have" -+ echo "*** because a test_compile did reveal that the linker did not use it for" -+ echo "*** its dynamic dependency list that programs get resolved with at runtime." -+ fi -+ else -+ newdeplibs="$newdeplibs $i" -+ fi -+ done -+ else -+ # Error occured in the first compile. Let's try to salvage -+ # the situation: Compile a separate program for each library. -+ for i in $deplibs; do -+ name="`expr $i : '-l\(.*\)'`" -+ # If $name is empty we are operating on a -L argument. -+ if test -n "$name" && test "$name" != "0"; then -+ $rm conftest -+ $CC -o conftest conftest.c $i -+ # Did it work? -+ if test $? -eq 0 ; then -+ ldd_output=`ldd conftest` -+ libname=`eval \\$echo \"$libname_spec\"` -+ deplib_matches=`eval \\$echo \"$library_names_spec\"` -+ set dummy $deplib_matches -+ deplib_match=$2 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ echo -+ echo "*** Warning: dynamic linker does not accept needed library $i." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because a test_compile did reveal that the linker did not use this one" -+ echo "*** as a dynamic dependency that programs can get resolved with at runtime." -+ fi -+ else -+ droppeddeps=yes -+ echo -+ echo "*** Warning! Library $i is needed by this library but I was not able to" -+ echo "*** make it link in! You will probably need to install it or some" -+ echo "*** library that it depends on before this library will be fully" -+ echo "*** functional. Installing it before continuing would be even better." -+ fi -+ else -+ newdeplibs="$newdeplibs $i" -+ fi -+ done -+ fi -+ ;; -+ file_magic*) -+ set dummy $deplibs_check_method -+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ for a_deplib in $deplibs; do -+ name="`expr $a_deplib : '-l\(.*\)'`" -+ # If $name is empty we are operating on a -L argument. -+ if test -n "$name" && test "$name" != "0"; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ # Follow soft links. -+ if ls -lLd "$potent_lib" 2>/dev/null \ -+ | grep " -> " >/dev/null; then -+ continue -+ fi -+ # The statement above tries to avoid entering an -+ # endless loop below, in case of cyclic links. -+ # We might still enter an endless loop, since a link -+ # loop can be closed while we follow links, -+ # but so what? -+ potlib="$potent_lib" -+ while test -h "$potlib" 2>/dev/null; do -+ potliblink=`ls -ld $potlib | sed 's/.* -> //'` -+ case $potliblink in -+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -+ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; -+ esac -+ done -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ -+ | sed 10q \ -+ | egrep "$file_magic_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done -+ done -+ if test -n "$a_deplib" ; then -+ droppeddeps=yes -+ echo -+ echo "*** Warning: linker path does not have real file for library $a_deplib." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ echo "*** with $libname but no candidates were found. (...for file magic test)" -+ else -+ echo "*** with $libname and none of the candidates passed a file format test" -+ echo "*** using a file magic. Last file checked: $potlib" -+ fi -+ fi -+ else -+ # Add a -L argument. -+ newdeplibs="$newdeplibs $a_deplib" -+ fi -+ done # Gone through all deplibs. -+ ;; -+ match_pattern*) -+ set dummy $deplibs_check_method -+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ for a_deplib in $deplibs; do -+ name="`expr $a_deplib : '-l\(.*\)'`" -+ # If $name is empty we are operating on a -L argument. -+ if test -n "$name" && test "$name" != "0"; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ potlib="$potent_lib" # see symlink-check below in file_magic test -+ if eval echo \"$potent_lib\" 2>/dev/null \ -+ | sed 10q \ -+ | egrep "$match_pattern_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done -+ done -+ if test -n "$a_deplib" ; then -+ droppeddeps=yes -+ echo -+ echo "*** Warning: linker path does not have real file for library $a_deplib." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ echo "*** with $libname but no candidates were found. (...for regex pattern test)" -+ else -+ echo "*** with $libname and none of the candidates passed a file format test" -+ echo "*** using a regex pattern. Last file checked: $potlib" -+ fi -+ fi -+ else -+ # Add a -L argument. -+ newdeplibs="$newdeplibs $a_deplib" -+ fi -+ done # Gone through all deplibs. -+ ;; -+ none | unknown | *) -+ newdeplibs="" -+ if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -+ -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | -+ grep . >/dev/null; then -+ echo -+ if test "X$deplibs_check_method" = "Xnone"; then -+ echo "*** Warning: inter-library dependencies are not supported in this platform." -+ else -+ echo "*** Warning: inter-library dependencies are not known to be supported." -+ fi -+ echo "*** All declared inter-library dependencies are being dropped." -+ droppeddeps=yes -+ fi -+ ;; -+ esac -+ versuffix=$versuffix_save -+ major=$major_save -+ release=$release_save -+ libname=$libname_save -+ name=$name_save -+ -+ case $host in -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # On Rhapsody replace the C library is the System framework -+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` -+ ;; -+ esac -+ -+ if test "$droppeddeps" = yes; then -+ if test "$module" = yes; then -+ echo -+ echo "*** Warning: libtool could not satisfy all declared inter-library" -+ echo "*** dependencies of module $libname. Therefore, libtool will create" -+ echo "*** a static module, that should work as long as the dlopening" -+ echo "*** application is linked with the -dlopen flag." -+ if test -z "$global_symbol_pipe"; then -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ fi -+ if test "$build_old_libs" = no; then -+ oldlibs="$output_objdir/$libname.$libext" -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ else -+ echo "*** The inter-library dependencies that have been dropped here will be" -+ echo "*** automatically added whenever a program is linked with this library" -+ echo "*** or is declared to -dlopen it." -+ -+ if test $allow_undefined = no; then -+ echo -+ echo "*** Since this library must not contain undefined symbols," -+ echo "*** because either the platform does not support them or" -+ echo "*** it was explicitly requested with -no-undefined," -+ echo "*** libtool will only create a static version of it." -+ if test "$build_old_libs" = no; then -+ oldlibs="$output_objdir/$libname.$libext" -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ fi -+ fi -+ fi -+ # Done checking deplibs! -+ deplibs=$newdeplibs -+ fi -+ -+ # All the library-specific variables (install_libdir is set above). -+ library_names= -+ old_library= -+ dlname= -+ -+ # Test again, we may have decided not to build it any more -+ if test "$build_libtool_libs" = yes; then -+ if test $hardcode_into_libs = yes; then -+ # Hardcode the library paths -+ hardcode_libdirs= -+ dep_rpath= -+ rpath="$finalize_rpath" -+ test "$mode" != relink && rpath="$compile_rpath$rpath" -+ for libdir in $rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ dep_rpath="$dep_rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" -+ fi -+ if test -n "$runpath_var" && test -n "$perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" -+ fi -+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" -+ fi -+ -+ shlibpath="$finalize_shlibpath" -+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ if test -n "$shlibpath"; then -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" -+ fi -+ -+ # Get the real and link names of the library. -+ eval library_names=\"$library_names_spec\" -+ set dummy $library_names -+ realname="$2" -+ shift; shift -+ -+ if test -n "$soname_spec"; then -+ eval soname=\"$soname_spec\" -+ else -+ soname="$realname" -+ fi -+ test -z "$dlname" && dlname=$soname -+ -+ lib="$output_objdir/$realname" -+ for link -+ do -+ linknames="$linknames $link" -+ done -+ -+ # Ensure that we have .o objects for linkers which dislike .lo -+ # (e.g. aix) in case we are running --disable-static -+ for obj in $libobjs; do -+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$obj"; then -+ xdir="." -+ else -+ xdir="$xdir" -+ fi -+ baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -+ oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` -+ if test ! -f $xdir/$oldobj; then -+ $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" -+ $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? -+ fi -+ done -+ -+ # Use standard objects if they are pic -+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ -+ # Prepare the list of exported symbols -+ if test -z "$export_symbols"; then -+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then -+ $show "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $run $rm $export_symbols -+ eval cmds=\"$export_symbols_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ if test -n "$export_symbols_regex"; then -+ $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" -+ $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -+ $show "$mv \"${export_symbols}T\" \"$export_symbols\"" -+ $run eval '$mv "${export_symbols}T" "$export_symbols"' -+ fi -+ fi -+ fi -+ -+ if test -n "$export_symbols" && test -n "$include_expsyms"; then -+ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' -+ fi -+ -+ if test -n "$convenience"; then -+ if test -n "$whole_archive_flag_spec"; then -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -+ else -+ gentop="$output_objdir/${outputname}x" -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ $show "mkdir $gentop" -+ $run mkdir "$gentop" -+ status=$? -+ if test $status -ne 0 && test ! -d "$gentop"; then -+ exit $status -+ fi -+ generated="$generated $gentop" -+ -+ for xlib in $convenience; do -+ # Extract the objects. -+ case $xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -+ *) xabs=`pwd`"/$xlib" ;; -+ esac -+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -+ xdir="$gentop/$xlib" -+ -+ $show "${rm}r $xdir" -+ $run ${rm}r "$xdir" -+ $show "mkdir $xdir" -+ $run mkdir "$xdir" -+ status=$? -+ if test $status -ne 0 && test ! -d "$xdir"; then -+ exit $status -+ fi -+ $show "(cd $xdir && $AR x $xabs)" -+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -+ -+ libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` -+ done -+ fi -+ fi -+ -+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -+ eval flag=\"$thread_safe_flag_spec\" -+ linker_flags="$linker_flags $flag" -+ fi -+ -+ # Make a backup of the uninstalled library when relinking -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? -+ fi -+ -+ # Do each of the archive commands. -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ eval cmds=\"$archive_expsym_cmds\" -+ else -+ eval cmds=\"$archive_cmds\" -+ fi -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? -+ exit 0 -+ fi -+ -+ # Create links to the real library. -+ for linkname in $linknames; do -+ if test "$realname" != "$linkname"; then -+ $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" -+ $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? -+ fi -+ done -+ -+ # If -module or -export-dynamic was specified, set the dlname. -+ if test "$module" = yes || test "$export_dynamic" = yes; then -+ # On all known operating systems, these are identical. -+ dlname="$soname" -+ fi -+ fi -+ ;; -+ -+ obj) -+ if test -n "$deplibs"; then -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 -+ fi -+ -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 -+ fi -+ -+ if test -n "$rpath"; then -+ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 -+ fi -+ -+ if test -n "$xrpath"; then -+ $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 -+ fi -+ -+ if test -n "$vinfo"; then -+ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 -+ fi -+ -+ if test -n "$release"; then -+ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 -+ fi -+ -+ case $output in -+ *.lo) -+ if test -n "$objs$old_deplibs"; then -+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 -+ exit 1 -+ fi -+ libobj="$output" -+ obj=`$echo "X$output" | $Xsed -e "$lo2o"` -+ ;; -+ *) -+ libobj= -+ obj="$output" -+ ;; -+ esac -+ -+ # Delete the old objects. -+ $run $rm $obj $libobj -+ -+ # Objects from convenience libraries. This assumes -+ # single-version convenience libraries. Whenever we create -+ # different ones for PIC/non-PIC, this we'll have to duplicate -+ # the extraction. -+ reload_conv_objs= -+ gentop= -+ # reload_cmds runs $LD directly, so let us get rid of -+ # -Wl from whole_archive_flag_spec -+ wl= -+ -+ if test -n "$convenience"; then -+ if test -n "$whole_archive_flag_spec"; then -+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" -+ else -+ gentop="$output_objdir/${obj}x" -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ $show "mkdir $gentop" -+ $run mkdir "$gentop" -+ status=$? -+ if test $status -ne 0 && test ! -d "$gentop"; then -+ exit $status -+ fi -+ generated="$generated $gentop" -+ -+ for xlib in $convenience; do -+ # Extract the objects. -+ case $xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -+ *) xabs=`pwd`"/$xlib" ;; -+ esac -+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -+ xdir="$gentop/$xlib" -+ -+ $show "${rm}r $xdir" -+ $run ${rm}r "$xdir" -+ $show "mkdir $xdir" -+ $run mkdir "$xdir" -+ status=$? -+ if test $status -ne 0 && test ! -d "$xdir"; then -+ exit $status -+ fi -+ $show "(cd $xdir && $AR x $xabs)" -+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -+ -+ reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` -+ done -+ fi -+ fi -+ -+ # Create the old-style object. -+ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ -+ output="$obj" -+ eval cmds=\"$reload_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ -+ # Exit if we aren't doing a library object file. -+ if test -z "$libobj"; then -+ if test -n "$gentop"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r $gentop -+ fi -+ -+ exit 0 -+ fi -+ -+ if test "$build_libtool_libs" != yes; then -+ if test -n "$gentop"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r $gentop -+ fi -+ -+ # Create an invalid libtool object if no PIC, so that we don't -+ # accidentally link it into a program. -+ $show "echo timestamp > $libobj" -+ $run eval "echo timestamp > $libobj" || exit $? -+ exit 0 -+ fi -+ -+ if test -n "$pic_flag" || test "$pic_mode" != default; then -+ # Only do commands if we really have different PIC objects. -+ reload_objs="$libobjs $reload_conv_objs" -+ output="$libobj" -+ eval cmds=\"$reload_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ else -+ # Just create a symlink. -+ $show $rm $libobj -+ $run $rm $libobj -+ xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$libobj"; then -+ xdir="." -+ else -+ xdir="$xdir" -+ fi -+ baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` -+ oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` -+ $show "(cd $xdir && $LN_S $oldobj $baseobj)" -+ $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? -+ fi -+ -+ if test -n "$gentop"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r $gentop -+ fi -+ -+ exit 0 -+ ;; -+ -+ prog) -+ case $host in -+ *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; -+ esac -+ if test -n "$vinfo"; then -+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 -+ fi -+ -+ if test -n "$release"; then -+ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 -+ fi -+ -+ if test "$preload" = yes; then -+ if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && -+ test "$dlopen_self_static" = unknown; then -+ $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." -+ fi -+ fi -+ -+ case $host in -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # On Rhapsody replace the C library is the System framework -+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` -+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` -+ ;; -+ esac -+ -+ compile_command="$compile_command $compile_deplibs" -+ finalize_command="$finalize_command $finalize_deplibs" -+ -+ if test -n "$rpath$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ for libdir in $rpath $xrpath; do -+ # This is the magic to use -rpath. -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ fi -+ -+ # Now hardcode the library paths -+ rpath= -+ hardcode_libdirs= -+ for libdir in $compile_rpath $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ case :$dllsearchpath: in -+ *":$libdir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$libdir";; -+ esac -+ ;; -+ esac -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ compile_rpath="$rpath" -+ -+ rpath= -+ hardcode_libdirs= -+ for libdir in $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$finalize_perm_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ finalize_rpath="$rpath" -+ -+ if test -n "$libobjs" && test "$build_old_libs" = yes; then -+ # Transform all the library objects into standard objects. -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ fi -+ -+ dlsyms= -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ if test -n "$NM" && test -n "$global_symbol_pipe"; then -+ dlsyms="${outputname}S.c" -+ else -+ $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 -+ fi -+ fi -+ -+ if test -n "$dlsyms"; then -+ case $dlsyms in -+ "") ;; -+ *.c) -+ # Discover the nlist of each of the dlfiles. -+ nlist="$output_objdir/${outputname}.nm" -+ -+ $show "$rm $nlist ${nlist}S ${nlist}T" -+ $run $rm "$nlist" "${nlist}S" "${nlist}T" -+ -+ # Parse the name list into a source file. -+ $show "creating $output_objdir/$dlsyms" -+ -+ test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -+ /* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -+ /* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ -+ -+ #ifdef __cplusplus -+ extern \"C\" { -+ #endif -+ -+ /* Prevent the only kind of declaration conflicts we can make. */ -+ #define lt_preloaded_symbols some_other_symbol -+ -+ /* External symbol declarations for the compiler. */\ -+ " -+ -+ if test "$dlself" = yes; then -+ $show "generating symbol list for \`$output'" -+ -+ test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" -+ -+ # Add our own program objects to the symbol list. -+ progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ for arg in $progfiles; do -+ $show "extracting global C symbols from \`$arg'" -+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" -+ done -+ -+ if test -n "$exclude_expsyms"; then -+ $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ $run eval '$mv "$nlist"T "$nlist"' -+ fi -+ -+ if test -n "$export_symbols_regex"; then -+ $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ $run eval '$mv "$nlist"T "$nlist"' -+ fi -+ -+ # Prepare the list of exported symbols -+ if test -z "$export_symbols"; then -+ export_symbols="$output_objdir/$output.exp" -+ $run $rm $export_symbols -+ $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ else -+ $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' -+ $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' -+ $run eval 'mv "$nlist"T "$nlist"' -+ fi -+ fi -+ -+ for arg in $dlprefiles; do -+ $show "extracting global C symbols from \`$arg'" -+ name=`echo "$arg" | sed -e 's%^.*/%%'` -+ $run eval 'echo ": $name " >> "$nlist"' -+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" -+ done -+ -+ if test -z "$run"; then -+ # Make sure we have at least an empty file. -+ test -f "$nlist" || : > "$nlist" -+ -+ if test -n "$exclude_expsyms"; then -+ egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -+ $mv "$nlist"T "$nlist" -+ fi -+ -+ # Try sorting and uniquifying the output. -+ if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then -+ : -+ else -+ grep -v "^: " < "$nlist" > "$nlist"S -+ fi -+ -+ if test -f "$nlist"S; then -+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' -+ else -+ echo '/* NONE */' >> "$output_objdir/$dlsyms" -+ fi -+ -+ $echo >> "$output_objdir/$dlsyms" "\ -+ -+ #undef lt_preloaded_symbols -+ -+ #if defined (__STDC__) && __STDC__ -+ # define lt_ptr void * -+ #else -+ # define lt_ptr char * -+ # define const -+ #endif -+ -+ /* The mapping between symbol names and symbols. */ -+ const struct { -+ const char *name; -+ lt_ptr address; -+ } -+ lt_preloaded_symbols[] = -+ {\ -+ " -+ -+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" -+ -+ $echo >> "$output_objdir/$dlsyms" "\ -+ {0, (lt_ptr) 0} -+ }; -+ -+ /* This works around a problem in FreeBSD linker */ -+ #ifdef FREEBSD_WORKAROUND -+ static const void *lt_preloaded_setup() { -+ return lt_preloaded_symbols; -+ } -+ #endif -+ -+ #ifdef __cplusplus -+ } -+ #endif\ -+ " -+ fi -+ -+ pic_flag_for_symtable= -+ case $host in -+ # compiling the symbol table file with pic_flag works around -+ # a FreeBSD bug that causes programs to crash when -lm is -+ # linked before any other PIC object. But we must not use -+ # pic_flag when linking with -static. The problem exists in -+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -+ case "$compile_command " in -+ *" -static "*) ;; -+ *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; -+ esac;; -+ *-*-hpux*) -+ case "$compile_command " in -+ *" -static "*) ;; -+ *) pic_flag_for_symtable=" $pic_flag -DPIC";; -+ esac -+ esac -+ -+ # Now compile the dynamic symbol file. -+ $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -+ $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? -+ -+ # Clean up the generated files. -+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" -+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" -+ -+ # Transform the symbol file into the correct name. -+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -+ ;; -+ *) -+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 -+ exit 1 -+ ;; -+ esac -+ else -+ # We keep going just in case the user didn't refer to -+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe -+ # really was required. -+ -+ # Nullify the symbol file. -+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -+ fi -+ -+ if test $need_relink = no || test "$build_libtool_libs" != yes; then -+ # Replace the output file specification. -+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ link_command="$compile_command$compile_rpath" -+ -+ # We have no uninstalled library dependencies, so finalize right now. -+ $show "$link_command" -+ $run eval "$link_command" -+ status=$? -+ -+ # Delete the generated files. -+ if test -n "$dlsyms"; then -+ $show "$rm $output_objdir/${outputname}S.${objext}" -+ $run $rm "$output_objdir/${outputname}S.${objext}" -+ fi -+ -+ exit $status -+ fi -+ -+ if test -n "$shlibpath_var"; then -+ # We should set the shlibpath_var -+ rpath= -+ for dir in $temp_rpath; do -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) -+ # Absolute path. -+ rpath="$rpath$dir:" -+ ;; -+ *) -+ # Relative path: add a thisdir entry. -+ rpath="$rpath\$thisdir/$dir:" -+ ;; -+ esac -+ done -+ temp_rpath="$rpath" -+ fi -+ -+ if test -n "$compile_shlibpath$finalize_shlibpath"; then -+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" -+ fi -+ if test -n "$finalize_shlibpath"; then -+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" -+ fi -+ -+ compile_var= -+ finalize_var= -+ if test -n "$runpath_var"; then -+ if test -n "$perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" " -+ fi -+ if test -n "$finalize_perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $finalize_perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " -+ fi -+ fi -+ -+ if test "$no_install" = yes; then -+ # We don't need to create a wrapper script. -+ link_command="$compile_var$compile_command$compile_rpath" -+ # Replace the output file specification. -+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ # Delete the old output file. -+ $run $rm $output -+ # Link the executable and exit -+ $show "$link_command" -+ $run eval "$link_command" || exit $? -+ exit 0 -+ fi -+ -+ if test "$hardcode_action" = relink; then -+ # Fast installation is not supported -+ link_command="$compile_var$compile_command$compile_rpath" -+ relink_command="$finalize_var$finalize_command$finalize_rpath" -+ -+ $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 -+ $echo "$modename: \`$output' will be relinked during installation" 1>&2 -+ else -+ if test "$fast_install" != no; then -+ link_command="$finalize_var$compile_command$finalize_rpath" -+ if test "$fast_install" = yes; then -+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` -+ else -+ # fast_install is set to needless -+ relink_command= -+ fi -+ else -+ link_command="$compile_var$compile_command$compile_rpath" -+ relink_command="$finalize_var$finalize_command$finalize_rpath" -+ fi -+ fi -+ -+ # Replace the output file specification. -+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ -+ # Delete the old output files. -+ $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname -+ -+ $show "$link_command" -+ $run eval "$link_command" || exit $? -+ -+ # Now create the wrapper script. -+ $show "creating $output" -+ -+ # Quote the relink command for shipping. -+ if test -n "$relink_command"; then -+ # Preserve any variables that may affect compiler behavior -+ for var in $variables_saved_for_relink; do -+ if eval test -z \"\${$var+set}\"; then -+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" -+ elif eval var_value=\$$var; test -z "$var_value"; then -+ relink_command="$var=; export $var; $relink_command" -+ else -+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` -+ relink_command="$var=\"$var_value\"; export $var; $relink_command" -+ fi -+ done -+ relink_command="(cd `pwd`; $relink_command)" -+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ fi -+ -+ # Quote $echo for shipping. -+ if test "X$echo" = "X$SHELL $0 --fallback-echo"; then -+ case $0 in -+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; -+ *) qecho="$SHELL `pwd`/$0 --fallback-echo";; -+ esac -+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` -+ else -+ qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` -+ fi -+ -+ # Only actually do things if our run command is non-null. -+ if test -z "$run"; then -+ # win32 will think the script is a binary if it has -+ # a .exe suffix, so we strip it off here. -+ case $output in -+ *.exe) output=`echo $output|sed 's,.exe$,,'` ;; -+ esac -+ # test for cygwin because mv fails w/o .exe extensions -+ case $host in -+ *cygwin*) exeext=.exe ;; -+ *) exeext= ;; -+ esac -+ $rm $output -+ trap "$rm $output; exit 1" 1 2 15 -+ -+ $echo > $output "\ -+ #! $SHELL -+ -+ # $output - temporary wrapper script for $objdir/$outputname -+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -+ # -+ # The $output program cannot be directly executed until all the libtool -+ # libraries that it depends on are installed. -+ # -+ # This wrapper script should never be moved out of the build directory. -+ # If it is, it will not operate correctly. -+ -+ # Sed substitution that helps us do robust quoting. It backslashifies -+ # metacharacters that are still active within double-quoted strings. -+ Xsed='sed -e 1s/^X//' -+ sed_quote_subst='$sed_quote_subst' -+ -+ # The HP-UX ksh and POSIX shell print the target directory to stdout -+ # if CDPATH is set. -+ if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi -+ -+ relink_command=\"$relink_command\" -+ -+ # This environment variable determines our operation mode. -+ if test \"\$libtool_install_magic\" = \"$magic\"; then -+ # install mode needs the following variable: -+ notinst_deplibs='$notinst_deplibs' -+ else -+ # When we are sourced in execute mode, \$file and \$echo are already set. -+ if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ echo=\"$qecho\" -+ file=\"\$0\" -+ # Make sure echo works. -+ if test \"X\$1\" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then -+ # Yippee, \$echo works! -+ : -+ else -+ # Restart under the correct shell, and then maybe \$echo will work. -+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -+ fi -+ fi\ -+ " -+ $echo >> $output "\ -+ -+ # Find the directory that this script lives in. -+ thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -+ test \"x\$thisdir\" = \"x\$file\" && thisdir=. -+ -+ # Follow symbolic links until we get to the real thisdir. -+ file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` -+ while test -n \"\$file\"; do -+ destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` -+ -+ # If there was a directory component, then change thisdir. -+ if test \"x\$destdir\" != \"x\$file\"; then -+ case \"\$destdir\" in -+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; -+ *) thisdir=\"\$thisdir/\$destdir\" ;; -+ esac -+ fi -+ -+ file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` -+ done -+ -+ # Try to get the absolute directory name. -+ absdir=\`cd \"\$thisdir\" && pwd\` -+ test -n \"\$absdir\" && thisdir=\"\$absdir\" -+ " -+ -+ if test "$fast_install" = yes; then -+ echo >> $output "\ -+ program=lt-'$outputname'$exeext -+ progdir=\"\$thisdir/$objdir\" -+ -+ if test ! -f \"\$progdir/\$program\" || \\ -+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ -+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then -+ -+ file=\"\$\$-\$program\" -+ -+ if test ! -d \"\$progdir\"; then -+ $mkdir \"\$progdir\" -+ else -+ $rm \"\$progdir/\$file\" -+ fi" -+ -+ echo >> $output "\ -+ -+ # relink executable if necessary -+ if test -n \"\$relink_command\"; then -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : -+ else -+ $echo \"\$relink_command_output\" >&2 -+ $rm \"\$progdir/\$file\" -+ exit 1 -+ fi -+ fi -+ -+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || -+ { $rm \"\$progdir/\$program\"; -+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } -+ $rm \"\$progdir/\$file\" -+ fi" -+ else -+ echo >> $output "\ -+ program='$outputname' -+ progdir=\"\$thisdir/$objdir\" -+ " -+ fi -+ -+ echo >> $output "\ -+ -+ if test -f \"\$progdir/\$program\"; then" -+ -+ # Export our shlibpath_var if we have one. -+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -+ $echo >> $output "\ -+ # Add our own library path to $shlibpath_var -+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -+ -+ # Some systems cannot cope with colon-terminated $shlibpath_var -+ # The second colon is a workaround for a bug in BeOS R4 sed -+ $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` -+ -+ export $shlibpath_var -+ " -+ fi -+ -+ # fixup the dll searchpath if we need to. -+ if test -n "$dllsearchpath"; then -+ $echo >> $output "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+ " -+ fi -+ -+ $echo >> $output "\ -+ if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ # Run the actual program with our arguments. -+ " -+ case $host in -+ # win32 systems need to use the prog path for dll -+ # lookup to work -+ *-*-cygwin* | *-*-pw32*) -+ $echo >> $output "\ -+ exec \$progdir/\$program \${1+\"\$@\"} -+ " -+ ;; -+ -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2*) -+ $echo >> $output "\ -+ exec \$progdir\\\\\$program \${1+\"\$@\"} -+ " -+ ;; -+ -+ *) -+ $echo >> $output "\ -+ # Export the path to the program. -+ PATH=\"\$progdir:\$PATH\" -+ export PATH -+ -+ exec \$program \${1+\"\$@\"} -+ " -+ ;; -+ esac -+ $echo >> $output "\ -+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" -+ exit 1 -+ fi -+ else -+ # The program doesn't exist. -+ \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 -+ \$echo \"This script is just a wrapper for \$program.\" 1>&2 -+ echo \"See the $PACKAGE documentation for more information.\" 1>&2 -+ exit 1 -+ fi -+ fi\ -+ " -+ chmod +x $output -+ fi -+ exit 0 -+ ;; -+ esac -+ -+ # See if we need to build an old-fashioned archive. -+ for oldlib in $oldlibs; do -+ -+ if test "$build_libtool_libs" = convenience; then -+ oldobjs="$libobjs_save" -+ addlibs="$convenience" -+ build_libtool_libs=no -+ else -+ if test "$build_libtool_libs" = module; then -+ oldobjs="$libobjs_save" -+ build_libtool_libs=no -+ else -+ oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` -+ fi -+ addlibs="$old_convenience" -+ fi -+ -+ if test -n "$addlibs"; then -+ gentop="$output_objdir/${outputname}x" -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ $show "mkdir $gentop" -+ $run mkdir "$gentop" -+ status=$? -+ if test $status -ne 0 && test ! -d "$gentop"; then -+ exit $status -+ fi -+ generated="$generated $gentop" -+ -+ # Add in members from convenience archives. -+ for xlib in $addlibs; do -+ # Extract the objects. -+ case $xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -+ *) xabs=`pwd`"/$xlib" ;; -+ esac -+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -+ xdir="$gentop/$xlib" -+ -+ $show "${rm}r $xdir" -+ $run ${rm}r "$xdir" -+ $show "mkdir $xdir" -+ $run mkdir "$xdir" -+ status=$? -+ if test $status -ne 0 && test ! -d "$xdir"; then -+ exit $status -+ fi -+ $show "(cd $xdir && $AR x $xabs)" -+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -+ -+ oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` -+ done -+ fi -+ -+ # Do each command in the archive commands. -+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -+ eval cmds=\"$old_archive_from_new_cmds\" -+ else -+ # Ensure that we have .o objects in place in case we decided -+ # not to build a shared library, and have fallen back to building -+ # static libs even though --disable-static was passed! -+ for oldobj in $oldobjs; do -+ if test ! -f $oldobj; then -+ xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$oldobj"; then -+ xdir="." -+ else -+ xdir="$xdir" -+ fi -+ baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` -+ obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` -+ $show "(cd $xdir && ${LN_S} $obj $baseobj)" -+ $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? -+ fi -+ done -+ -+ eval cmds=\"$old_archive_cmds\" -+ fi -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ done -+ -+ if test -n "$generated"; then -+ $show "${rm}r$generated" -+ $run ${rm}r$generated -+ fi -+ -+ # Now create the libtool archive. -+ case $output in -+ *.la) -+ old_library= -+ test "$build_old_libs" = yes && old_library="$libname.$libext" -+ $show "creating $output" -+ -+ # Preserve any variables that may affect compiler behavior -+ for var in $variables_saved_for_relink; do -+ if eval test -z \"\${$var+set}\"; then -+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" -+ elif eval var_value=\$$var; test -z "$var_value"; then -+ relink_command="$var=; export $var; $relink_command" -+ else -+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` -+ relink_command="$var=\"$var_value\"; export $var; $relink_command" -+ fi -+ done -+ # Quote the link command for shipping. -+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" -+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ -+ # Only create the output if not a dry run. -+ if test -z "$run"; then -+ for installed in no yes; do -+ if test "$installed" = yes; then -+ if test -z "$install_libdir"; then -+ break -+ fi -+ output="$output_objdir/$outputname"i -+ # Replace all uninstalled libtool libraries with the installed ones -+ newdependency_libs= -+ for deplib in $dependency_libs; do -+ case $deplib in -+ *.la) -+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -+ eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ if test -z "$libdir"; then -+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -+ exit 1 -+ fi -+ newdependency_libs="$newdependency_libs $libdir/$name" -+ ;; -+ *) newdependency_libs="$newdependency_libs $deplib" ;; -+ esac -+ done -+ dependency_libs="$newdependency_libs" -+ newdlfiles= -+ for lib in $dlfiles; do -+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -+ eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ if test -z "$libdir"; then -+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -+ exit 1 -+ fi -+ newdlfiles="$newdlfiles $libdir/$name" -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -+ eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ if test -z "$libdir"; then -+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -+ exit 1 -+ fi -+ newdlprefiles="$newdlprefiles $libdir/$name" -+ done -+ dlprefiles="$newdlprefiles" -+ fi -+ $rm $output -+ # place dlname in correct position for cygwin -+ tdlname=$dlname -+ case $host,$output,$installed,$module,$dlname in -+ *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ esac -+ $echo > $output "\ -+ # $outputname - a libtool library file -+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -+ # -+ # Please DO NOT delete this file! -+ # It is necessary for linking the library. -+ -+ # The name that we can dlopen(3). -+ dlname='$tdlname' -+ -+ # Names of this library. -+ library_names='$library_names' -+ -+ # The name of the static archive. -+ old_library='$old_library' -+ -+ # Libraries that this one depends upon. -+ dependency_libs='$dependency_libs' -+ -+ # Version information for $libname. -+ current=$current -+ age=$age -+ revision=$revision -+ -+ # Is this an already installed library? -+ installed=$installed -+ -+ # Files to dlopen/dlpreopen -+ dlopen='$dlfiles' -+ dlpreopen='$dlprefiles' -+ -+ # Directory that this library needs to be installed in: -+ libdir='$install_libdir'" -+ if test "$installed" = no && test $need_relink = yes; then -+ $echo >> $output "\ -+ relink_command=\"$relink_command\"" -+ fi -+ done -+ fi -+ -+ # Do a symbolic link so that the libtool archive can be found in -+ # LD_LIBRARY_PATH before the program is installed. -+ $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" -+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? -+ ;; -+ esac -+ exit 0 -+ ;; -+ -+ # libtool install mode -+ install) -+ modename="$modename: install" -+ -+ # There may be an optional sh(1) argument at the beginning of -+ # install_prog (especially on Windows NT). -+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || -+ # Allow the use of GNU shtool's install command. -+ $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then -+ # Aesthetically quote it. -+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ arg="\"$arg\"" -+ ;; -+ esac -+ install_prog="$arg " -+ arg="$1" -+ shift -+ else -+ install_prog= -+ arg="$nonopt" -+ fi -+ -+ # The real first argument should be the name of the installation program. -+ # Aesthetically quote it. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ arg="\"$arg\"" -+ ;; -+ esac -+ install_prog="$install_prog$arg" -+ -+ # We need to accept at least all the BSD install flags. -+ dest= -+ files= -+ opts= -+ prev= -+ install_type= -+ isdir=no -+ stripme= -+ for arg -+ do -+ if test -n "$dest"; then -+ files="$files $dest" -+ dest="$arg" -+ continue -+ fi -+ -+ case $arg in -+ -d) isdir=yes ;; -+ -f) prev="-f" ;; -+ -g) prev="-g" ;; -+ -m) prev="-m" ;; -+ -o) prev="-o" ;; -+ -s) -+ stripme=" -s" -+ continue -+ ;; -+ -*) ;; -+ -+ *) -+ # If the previous option needed an argument, then skip it. -+ if test -n "$prev"; then -+ prev= -+ else -+ dest="$arg" -+ continue -+ fi -+ ;; -+ esac -+ -+ # Aesthetically quote the argument. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ arg="\"$arg\"" -+ ;; -+ esac -+ install_prog="$install_prog $arg" -+ done -+ -+ if test -z "$install_prog"; then -+ $echo "$modename: you must specify an install program" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ if test -n "$prev"; then -+ $echo "$modename: the \`$prev' option requires an argument" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ if test -z "$files"; then -+ if test -z "$dest"; then -+ $echo "$modename: no file or destination specified" 1>&2 -+ else -+ $echo "$modename: you must specify a destination" 1>&2 -+ fi -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ # Strip any trailing slash from the destination. -+ dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` -+ -+ # Check to see that the destination is a directory. -+ test -d "$dest" && isdir=yes -+ if test "$isdir" = yes; then -+ destdir="$dest" -+ destname= -+ else -+ destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$destdir" = "X$dest" && destdir=. -+ destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` -+ -+ # Not a directory, so check to see that there is only one file specified. -+ set dummy $files -+ if test $# -gt 2; then -+ $echo "$modename: \`$dest' is not a directory" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ fi -+ case $destdir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ for file in $files; do -+ case $file in -+ *.lo) ;; -+ *) -+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ ;; -+ esac -+ -+ # This variable tells wrapper scripts just to set variables rather -+ # than running their programs. -+ libtool_install_magic="$magic" -+ -+ staticlibs= -+ future_libdirs= -+ current_libdirs= -+ for file in $files; do -+ -+ # Do each installation. -+ case $file in -+ *.$libext) -+ # Do the static libraries later. -+ staticlibs="$staticlibs $file" -+ ;; -+ -+ *.la) -+ # Check to see that this really is a libtool archive. -+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ else -+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ library_names= -+ old_library= -+ relink_command= -+ # If there is no directory component, then add one. -+ case $file in -+ */* | *\\*) . $file ;; -+ *) . ./$file ;; -+ esac -+ -+ # Add the libdir to current_libdirs if it is the destination. -+ DESTDIR= -+ if test "X$destdir" = "X$libdir"; then -+ case "$current_libdirs " in -+ *" $libdir "*) ;; -+ *) current_libdirs="$current_libdirs $libdir" ;; -+ esac -+ else -+ case "$destdir" in -+ *"$libdir") -+ DESTDIR=`$echo "$destdir" | sed -e 's!'"$libdir"'$!!'` -+ if test "X$destdir" != "X$DESTDIR$libdir"; then -+ DESTDIR= -+ fi -+ ;; -+ esac -+ # Note the libdir as a future libdir. -+ case "$future_libdirs " in -+ *" $libdir "*) ;; -+ *) future_libdirs="$future_libdirs $libdir" ;; -+ esac -+ fi -+ -+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ -+ test "X$dir" = "X$file/" && dir= -+ dir="$dir$objdir" -+ -+ if test -n "$relink_command"; then -+ $echo "$modename: warning: relinking \`$file'" 1>&2 -+ export DESTDIR -+ $show "$relink_command" -+ if $run eval "$relink_command"; then : -+ else -+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -+ continue -+ fi -+ fi -+ unset DESTDIR -+ -+ # See the names of the shared library. -+ set dummy $library_names -+ if test -n "$2"; then -+ realname="$2" -+ shift -+ shift -+ -+ srcname="$realname" -+ test -n "$relink_command" && srcname="$realname"T -+ -+ # Install the shared library and build the symlinks. -+ $show "$install_prog $dir/$srcname $destdir/$realname" -+ $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? -+ if test -n "$stripme" && test -n "$striplib"; then -+ $show "$striplib $destdir/$realname" -+ $run eval "$striplib $destdir/$realname" || exit $? -+ fi -+ -+ if test $# -gt 0; then -+ # Delete the old symlinks, and create new ones. -+ for linkname -+ do -+ if test "$linkname" != "$realname"; then -+ $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -+ $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -+ fi -+ done -+ fi -+ -+ # Do each command in the postinstall commands. -+ lib="$destdir/$realname" -+ eval cmds=\"$postinstall_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ fi -+ -+ # Install the pseudo-library for information purposes. -+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ instname="$dir/$name"i -+ $show "$install_prog $instname $destdir/$name" -+ $run eval "$install_prog $instname $destdir/$name" || exit $? -+ -+ # Maybe install the static library, too. -+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ ;; -+ -+ *.lo) -+ # Install (i.e. copy) a libtool object. -+ -+ # Figure out destination file name, if it wasn't already specified. -+ if test -n "$destname"; then -+ destfile="$destdir/$destname" -+ else -+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ destfile="$destdir/$destfile" -+ fi -+ -+ # Deduce the name of the destination old-style object file. -+ case $destfile in -+ *.lo) -+ staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` -+ ;; -+ *.$objext) -+ staticdest="$destfile" -+ destfile= -+ ;; -+ *) -+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ # Install the libtool object if requested. -+ if test -n "$destfile"; then -+ $show "$install_prog $file $destfile" -+ $run eval "$install_prog $file $destfile" || exit $? -+ fi -+ -+ # Install the old object if enabled. -+ if test "$build_old_libs" = yes; then -+ # Deduce the name of the old-style object file. -+ staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` -+ -+ $show "$install_prog $staticobj $staticdest" -+ $run eval "$install_prog \$staticobj \$staticdest" || exit $? -+ fi -+ exit 0 -+ ;; -+ -+ *) -+ # Figure out destination file name, if it wasn't already specified. -+ if test -n "$destname"; then -+ destfile="$destdir/$destname" -+ else -+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ destfile="$destdir/$destfile" -+ fi -+ -+ # Do a test to see if this is really a libtool program. -+ case $host in -+ *cygwin*|*mingw*) -+ wrapper=`echo $file | sed -e 's,.exe$,,'` -+ ;; -+ *) -+ wrapper=$file -+ ;; -+ esac -+ if (sed -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then -+ notinst_deplibs= -+ relink_command= -+ -+ # If there is no directory component, then add one. -+ case $file in -+ */* | *\\*) . $wrapper ;; -+ *) . ./$wrapper ;; -+ esac -+ -+ # Check the variables that should have been set. -+ if test -z "$notinst_deplibs"; then -+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 -+ exit 1 -+ fi -+ -+ finalize=yes -+ for lib in $notinst_deplibs; do -+ # Check to see that each library is installed. -+ libdir= -+ if test -f "$lib"; then -+ # If there is no directory component, then add one. -+ case $lib in -+ */* | *\\*) . $lib ;; -+ *) . ./$lib ;; -+ esac -+ fi -+ libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ if test -n "$libdir" && test ! -f "$libfile"; then -+ $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 -+ finalize=no -+ fi -+ done -+ -+ relink_command= -+ # If there is no directory component, then add one. -+ case $file in -+ */* | *\\*) . $wrapper ;; -+ *) . ./$wrapper ;; -+ esac -+ -+ outputname= -+ if test "$fast_install" = no && test -n "$relink_command"; then -+ if test "$finalize" = yes && test -z "$run"; then -+ tmpdir="/tmp" -+ test -n "$TMPDIR" && tmpdir="$TMPDIR" -+ tmpdir="$tmpdir/libtool-$$" -+ if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : -+ else -+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 -+ continue -+ fi -+ file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ outputname="$tmpdir/$file" -+ # Replace the output file specification. -+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ -+ $show "$relink_command" -+ if $run eval "$relink_command"; then : -+ else -+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -+ ${rm}r "$tmpdir" -+ continue -+ fi -+ file="$outputname" -+ else -+ $echo "$modename: warning: cannot relink \`$file'" 1>&2 -+ fi -+ else -+ # Install the binary that we compiled earlier. -+ file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -+ fi -+ fi -+ -+ # remove .exe since cygwin /usr/bin/install will append another -+ # one anyways -+ case $install_prog,$host in -+ /usr/bin/install*,*cygwin*) -+ case $file:$destfile in -+ *.exe:*.exe) -+ # this is ok -+ ;; -+ *.exe:*) -+ destfile=$destfile.exe -+ ;; -+ *:*.exe) -+ destfile=`echo $destfile | sed -e 's,.exe$,,'` -+ ;; -+ esac -+ ;; -+ esac -+ $show "$install_prog$stripme $file $destfile" -+ $run eval "$install_prog\$stripme \$file \$destfile" || exit $? -+ test -n "$outputname" && ${rm}r "$tmpdir" -+ ;; -+ esac -+ done -+ -+ for file in $staticlibs; do -+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ -+ # Set up the ranlib parameters. -+ oldlib="$destdir/$name" -+ -+ $show "$install_prog $file $oldlib" -+ $run eval "$install_prog \$file \$oldlib" || exit $? -+ -+ if test -n "$stripme" && test -n "$striplib"; then -+ $show "$old_striplib $oldlib" -+ $run eval "$old_striplib $oldlib" || exit $? -+ fi -+ -+ # Do each command in the postinstall commands. -+ eval cmds=\"$old_postinstall_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ done -+ -+ if test -n "$future_libdirs"; then -+ $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 -+ fi -+ -+ if test -n "$current_libdirs"; then -+ # Maybe just do a dry run. -+ test -n "$run" && current_libdirs=" -n$current_libdirs" -+ exec_cmd='$SHELL $0 --finish$current_libdirs' -+ else -+ exit 0 -+ fi -+ ;; -+ -+ # libtool finish mode -+ finish) -+ modename="$modename: finish" -+ libdirs="$nonopt" -+ admincmds= -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ for dir -+ do -+ libdirs="$libdirs $dir" -+ done -+ -+ for libdir in $libdirs; do -+ if test -n "$finish_cmds"; then -+ # Do each command in the finish commands. -+ eval cmds=\"$finish_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || admincmds="$admincmds -+ $cmd" -+ done -+ IFS="$save_ifs" -+ fi -+ if test -n "$finish_eval"; then -+ # Do the single finish_eval. -+ eval cmds=\"$finish_eval\" -+ $run eval "$cmds" || admincmds="$admincmds -+ $cmds" -+ fi -+ done -+ fi -+ -+ # Exit here if they wanted silent mode. -+ test "$show" = ":" && exit 0 -+ -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ echo " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ -+ echo " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ echo " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo -+ echo "See any operating system documentation about shared libraries for" -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ echo "----------------------------------------------------------------------" -+ exit 0 -+ ;; -+ -+ # libtool execute mode -+ execute) -+ modename="$modename: execute" -+ -+ # The first argument is the command name. -+ cmd="$nonopt" -+ if test -z "$cmd"; then -+ $echo "$modename: you must specify a COMMAND" 1>&2 -+ $echo "$help" -+ exit 1 -+ fi -+ -+ # Handle -dlopen flags immediately. -+ for file in $execute_dlfiles; do -+ if test ! -f "$file"; then -+ $echo "$modename: \`$file' is not a file" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ dir= -+ case $file in -+ *.la) -+ # Check to see that this really is a libtool archive. -+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ else -+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ # Read the libtool library. -+ dlname= -+ library_names= -+ -+ # If there is no directory component, then add one. -+ case $file in -+ */* | *\\*) . $file ;; -+ *) . ./$file ;; -+ esac -+ -+ # Skip this library if it cannot be dlopened. -+ if test -z "$dlname"; then -+ # Warn if it was a shared library. -+ test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" -+ continue -+ fi -+ -+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$dir" = "X$file" && dir=. -+ -+ if test -f "$dir/$objdir/$dlname"; then -+ dir="$dir/$objdir" -+ else -+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -+ *.lo) -+ # Just add the directory containing the .lo file. -+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$dir" = "X$file" && dir=. -+ ;; -+ -+ *) -+ $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 -+ continue -+ ;; -+ esac -+ -+ # Get the absolute pathname. -+ absdir=`cd "$dir" && pwd` -+ test -n "$absdir" && dir="$absdir" -+ -+ # Now add the directory to shlibpath_var. -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" -+ else -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" -+ fi -+ done -+ -+ # This variable tells wrapper scripts just to set shlibpath_var -+ # rather than running their programs. -+ libtool_execute_magic="$magic" -+ -+ # Check if any of the arguments is a wrapper script. -+ args= -+ for file -+ do -+ case $file in -+ -*) ;; -+ *) -+ # Do a test to see if this is really a libtool program. -+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ # If there is no directory component, then add one. -+ case $file in -+ */* | *\\*) . $file ;; -+ *) . ./$file ;; -+ esac -+ -+ # Transform arg to wrapped name. -+ file="$progdir/$program" -+ fi -+ ;; -+ esac -+ # Quote arguments (to preserve shell metacharacters). -+ file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` -+ args="$args \"$file\"" -+ done -+ -+ if test -z "$run"; then -+ if test -n "$shlibpath_var"; then -+ # Export the shlibpath_var. -+ eval "export $shlibpath_var" -+ fi -+ -+ # Restore saved enviroment variables -+ if test "${save_LC_ALL+set}" = set; then -+ LC_ALL="$save_LC_ALL"; export LC_ALL -+ fi -+ if test "${save_LANG+set}" = set; then -+ LANG="$save_LANG"; export LANG -+ fi -+ -+ # Now prepare to actually exec the command. -+ exec_cmd="\$cmd$args" -+ else -+ # Display what would be done. -+ if test -n "$shlibpath_var"; then -+ eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" -+ $echo "export $shlibpath_var" -+ fi -+ $echo "$cmd$args" -+ exit 0 -+ fi -+ ;; -+ -+ # libtool clean and uninstall mode -+ clean | uninstall) -+ modename="$modename: $mode" -+ rm="$nonopt" -+ files= -+ rmforce= -+ exit_status=0 -+ -+ # This variable tells wrapper scripts just to set variables rather -+ # than running their programs. -+ libtool_install_magic="$magic" -+ -+ for arg -+ do -+ case $arg in -+ -f) rm="$rm $arg"; rmforce=yes ;; -+ -*) rm="$rm $arg" ;; -+ *) files="$files $arg" ;; -+ esac -+ done -+ -+ if test -z "$rm"; then -+ $echo "$modename: you must specify an RM program" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ rmdirs= -+ -+ for file in $files; do -+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$dir" = "X$file"; then -+ dir=. -+ objdir="$objdir" -+ else -+ objdir="$dir/$objdir" -+ fi -+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ test $mode = uninstall && objdir="$dir" -+ -+ # Remember objdir for removal later, being careful to avoid duplicates -+ if test $mode = clean; then -+ case " $rmdirs " in -+ *" $objdir "*) ;; -+ *) rmdirs="$rmdirs $objdir" ;; -+ esac -+ fi -+ -+ # Don't error if the file doesn't exist and rm -f was used. -+ if (test -L "$file") >/dev/null 2>&1 \ -+ || (test -h "$file") >/dev/null 2>&1 \ -+ || test -f "$file"; then -+ : -+ elif test -d "$file"; then -+ exit_status=1 -+ continue -+ elif test "$rmforce" = yes; then -+ continue -+ fi -+ -+ rmfiles="$file" -+ -+ case $name in -+ *.la) -+ # Possibly a libtool archive, so verify it. -+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ . $dir/$name -+ -+ # Delete the libtool libraries and symlinks. -+ for n in $library_names; do -+ rmfiles="$rmfiles $objdir/$n" -+ done -+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ -+ if test $mode = uninstall; then -+ if test -n "$library_names"; then -+ # Do each command in the postuninstall commands. -+ eval cmds=\"$postuninstall_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" -+ if test $? != 0 && test "$rmforce" != yes; then -+ exit_status=1 -+ fi -+ done -+ IFS="$save_ifs" -+ fi -+ -+ if test -n "$old_library"; then -+ # Do each command in the old_postuninstall commands. -+ eval cmds=\"$old_postuninstall_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" -+ if test $? != 0 && test "$rmforce" != yes; then -+ exit_status=1 -+ fi -+ done -+ IFS="$save_ifs" -+ fi -+ # FIXME: should reinstall the best remaining shared library. -+ fi -+ fi -+ ;; -+ -+ *.lo) -+ if test "$build_old_libs" = yes; then -+ oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` -+ rmfiles="$rmfiles $dir/$oldobj" -+ fi -+ ;; -+ -+ *) -+ # Do a test to see if this is a libtool program. -+ if test $mode = clean && -+ (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ relink_command= -+ . $dir/$file -+ -+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ if test "$fast_install" = yes && test -n "$relink_command"; then -+ rmfiles="$rmfiles $objdir/lt-$name" -+ fi -+ fi -+ ;; -+ esac -+ $show "$rm $rmfiles" -+ $run $rm $rmfiles || exit_status=1 -+ done -+ -+ # Try to remove the ${objdir}s in the directories where we deleted files -+ for dir in $rmdirs; do -+ if test -d "$dir"; then -+ $show "rmdir $dir" -+ $run rmdir $dir >/dev/null 2>&1 -+ fi -+ done -+ -+ exit $exit_status -+ ;; -+ -+ "") -+ $echo "$modename: you must specify a MODE" 1>&2 -+ $echo "$generic_help" 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ if test -z "$exec_cmd"; then -+ $echo "$modename: invalid operation mode \`$mode'" 1>&2 -+ $echo "$generic_help" 1>&2 -+ exit 1 -+ fi -+ fi # test -z "$show_help" -+ -+ if test -n "$exec_cmd"; then -+ eval exec $exec_cmd -+ exit 1 -+ fi -+ -+ # We need to display help for each of the modes. -+ case $mode in -+ "") $echo \ -+ "Usage: $modename [OPTION]... [MODE-ARG]... -+ -+ Provide generalized library-building support services. -+ -+ --config show all configuration variables -+ --debug enable verbose shell tracing -+ -n, --dry-run display commands without modifying any files -+ --features display basic configuration information and exit -+ --finish same as \`--mode=finish' -+ --help display this help message and exit -+ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] -+ --quiet same as \`--silent' -+ --silent don't print informational messages -+ --version print version information -+ -+ MODE must be one of the following: -+ -+ clean remove files from the build directory -+ compile compile a source file into a libtool object -+ execute automatically set library path, then run a program -+ finish complete the installation of libtool libraries -+ install install libraries or executables -+ link create a library or an executable -+ uninstall remove libraries from an installed directory -+ -+ MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -+ a more detailed description of MODE." -+ exit 0 -+ ;; -+ -+ clean) -+ $echo \ -+ "Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... -+ -+ Remove files from the build directory. -+ -+ RM is the name of the program to use to delete files associated with each FILE -+ (typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+ to RM. -+ -+ If FILE is a libtool library, object or program, all the files associated -+ with it are deleted. Otherwise, only FILE itself is deleted using RM." -+ ;; -+ -+ compile) -+ $echo \ -+ "Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE -+ -+ Compile a source file into a libtool library object. -+ -+ This mode accepts the following additional options: -+ -+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -+ -prefer-pic try to building PIC objects only -+ -prefer-non-pic try to building non-PIC objects only -+ -static always build a \`.o' file suitable for static linking -+ -+ COMPILE-COMMAND is a command to be used in creating a \`standard' object file -+ from the given SOURCEFILE. -+ -+ The output file name is determined by removing the directory component from -+ SOURCEFILE, then substituting the C source code suffix \`.c' with the -+ library object suffix, \`.lo'." -+ ;; -+ -+ execute) -+ $echo \ -+ "Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... -+ -+ Automatically set library path, then run a program. -+ -+ This mode accepts the following additional options: -+ -+ -dlopen FILE add the directory containing FILE to the library path -+ -+ This mode sets the library path environment variable according to \`-dlopen' -+ flags. -+ -+ If any of the ARGS are libtool executable wrappers, then they are translated -+ into their corresponding uninstalled binary, and any of their required library -+ directories are added to the library path. -+ -+ Then, COMMAND is executed, with ARGS as arguments." -+ ;; -+ -+ finish) -+ $echo \ -+ "Usage: $modename [OPTION]... --mode=finish [LIBDIR]... -+ -+ Complete the installation of libtool libraries. -+ -+ Each LIBDIR is a directory that contains libtool libraries. -+ -+ The commands that this mode executes may require superuser privileges. Use -+ the \`--dry-run' option if you just want to see what would be executed." -+ ;; -+ -+ install) -+ $echo \ -+ "Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... -+ -+ Install executables or libraries. -+ -+ INSTALL-COMMAND is the installation command. The first component should be -+ either the \`install' or \`cp' program. -+ -+ The rest of the components are interpreted as arguments to that command (only -+ BSD-compatible install options are recognized)." -+ ;; -+ -+ link) -+ $echo \ -+ "Usage: $modename [OPTION]... --mode=link LINK-COMMAND... -+ -+ Link object files or libraries together to form another library, or to -+ create an executable program. -+ -+ LINK-COMMAND is a command using the C compiler that you would use to create -+ a program from several object files. -+ -+ The following components of LINK-COMMAND are treated specially: -+ -+ -all-static do not do any dynamic linking at all -+ -avoid-version do not add a version suffix if possible -+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -+ -export-symbols SYMFILE -+ try to export only the symbols listed in SYMFILE -+ -export-symbols-regex REGEX -+ try to export only the symbols matching REGEX -+ -LLIBDIR search LIBDIR for required installed libraries -+ -lNAME OUTPUT-FILE requires the installed library libNAME -+ -module build a library that can dlopened -+ -no-fast-install disable the fast-install mode -+ -no-install link a not-installable executable -+ -no-undefined declare that a library does not refer to external symbols -+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -+ -release RELEASE specify package release information -+ -rpath LIBDIR the created library will eventually be installed in LIBDIR -+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -+ -static do not do any dynamic linking of libtool libraries -+ -version-info CURRENT[:REVISION[:AGE]] -+ specify library version info [each variable defaults to 0] -+ -+ All other options (arguments beginning with \`-') are ignored. -+ -+ Every other argument is treated as a filename. Files ending in \`.la' are -+ treated as uninstalled libtool libraries, other files are standard or library -+ object files. -+ -+ If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -+ only library objects (\`.lo' files) may be specified, and \`-rpath' is -+ required, except when creating a convenience library. -+ -+ If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -+ using \`ar' and \`ranlib', or on Windows using \`lib'. -+ -+ If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -+ is created, otherwise an executable program is created." -+ ;; -+ -+ uninstall) -+ $echo \ -+ "Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... -+ -+ Remove libraries from an installation directory. -+ -+ RM is the name of the program to use to delete files associated with each FILE -+ (typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+ to RM. -+ -+ If FILE is a libtool library, all the files associated with it are deleted. -+ Otherwise, only FILE itself is deleted using RM." -+ ;; -+ -+ *) -+ $echo "$modename: invalid operation mode \`$mode'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ ;; -+ esac -+ -+ echo -+ $echo "Try \`$modename --help' for more information about other modes." -+ -+ exit 0 -+ -+ # Local Variables: -+ # mode:shell-script -+ # sh-indentation:2 -+ # End: -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/m4/vorbis.m4 xine-lib-1-beta12/m4/vorbis.m4 -*** xine-lib-1-beta12_orig/m4/vorbis.m4 Mon Nov 26 16:07:49 2001 ---- xine-lib-1-beta12/m4/vorbis.m4 Sun May 18 14:52:51 2003 -*************** -*** 18,24 **** - VORBIS_LIBDIR="-L$vorbis_prefix/lib" - fi - -! VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" - ---- 18,24 ---- - VORBIS_LIBDIR="-L$vorbis_prefix/lib" - fi - -! VORBIS_LIBS="$VORBIS_LIBDIR -lvorbisidec -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" - -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/demuxers/Makefile.am xine-lib-1-beta12/src/demuxers/Makefile.am -*** xine-lib-1-beta12_orig/src/demuxers/Makefile.am Thu May 1 15:46:11 2003 ---- xine-lib-1-beta12/src/demuxers/Makefile.am Sun May 18 14:43:33 2003 -*************** -*** 1,4 **** -! AM_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) @ANSI_FLAGS@ - - LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - ---- 1,4 ---- -! AM_CFLAGS = $(THEORA_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) @ANSI_FLAGS@ - - LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/Makefile.am xine-lib-1-beta12/src/libffmpeg/libavcodec/Makefile.am -*** xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/Makefile.am Sat May 10 09:04:37 2003 ---- xine-lib-1-beta12/src/libffmpeg/libavcodec/Makefile.am Sun May 18 13:36:25 2003 -*************** -*** 10,18 **** - ppc/dsputil_altivec.c ppc/fft_altivec.c ppc/Makefile.am ppc/mpegvideo_ppc.c \ - ppc/dsputil_altivec.h ppc/idct_altivec.c - -! AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -DCONFIG_RISKY - ASFLAGS = - - LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - - noinst_LTLIBRARIES = libavcodec.la ---- 10,25 ---- - ppc/dsputil_altivec.c ppc/fft_altivec.c ppc/Makefile.am ppc/mpegvideo_ppc.c \ - ppc/dsputil_altivec.h ppc/idct_altivec.c - -! #AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -DCONFIG_RISKY - ASFLAGS = - -+ if HAVE_ARMV4L -+ AM_CFLAGS = -DARCH_ARMV4L $(LIBFFMPEG_CFLAGS) -+ else -+ AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -+ endif -+ -+ - LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - - noinst_LTLIBRARIES = libavcodec.la -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/armv4l/Makefile.am xine-lib-1-beta12/src/libffmpeg/libavcodec/armv4l/Makefile.am -*** xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/armv4l/Makefile.am Wed Oct 9 01:13:39 2002 ---- xine-lib-1-beta12/src/libffmpeg/libavcodec/armv4l/Makefile.am Sun May 18 13:38:26 2003 -*************** -*** 9,22 **** - - noinst_LTLIBRARIES = libavcodec_armv4l.la - -! libavcodec_armv4l_src = dsputil_arm.c jrevdct_arm.S - libavcodec_armv4l_dummy = libavcodec_armv4l_dummy.c - EXTRA_DIST = $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy) - -! #if HAVE_ARMV4L -! #armv4l_modules = $(libavcodec_armv4l_src) -! #endif -! armv4l_modules = - - libavcodec_armv4l_la_SOURCES = $(armv4l_modules) $(libavcodec_armv4l_dummy) - ---- 9,22 ---- - - noinst_LTLIBRARIES = libavcodec_armv4l.la - -! libavcodec_armv4l_src = mpegvideo_arm.c dsputil_arm.c jrevdct_arm.S - libavcodec_armv4l_dummy = libavcodec_armv4l_dummy.c - EXTRA_DIST = $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy) - -! if HAVE_ARMV4L -! armv4l_modules = $(libavcodec_armv4l_src) -! endif -! #armv4l_modules = - - libavcodec_armv4l_la_SOURCES = $(armv4l_modules) $(libavcodec_armv4l_dummy) - -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/armv4l/dsputil_arm.c xine-lib-1-beta12/src/libffmpeg/libavcodec/armv4l/dsputil_arm.c -*** xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/armv4l/dsputil_arm.c Fri Mar 28 16:38:06 2003 ---- xine-lib-1-beta12/src/libffmpeg/libavcodec/armv4l/dsputil_arm.c Wed Jul 2 19:51:29 2003 -*************** -*** 48,53 **** ---- 48,54 ---- - if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_ARM){ - c->idct_put= arm_idct_put; - c->idct_add= arm_idct_add; -+ /* c->idct = j_rev_dct_ARM; */ - c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */ - } - } -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c xine-lib-1-beta12/src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c -*** xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c Wed Dec 31 19:00:00 1969 ---- xine-lib-1-beta12/src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c Sun May 18 13:44:55 2003 -*************** -*** 0 **** ---- 1,26 ---- -+ /* -+ * Copyright (c) 2002 Michael Niedermayer -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ */ -+ -+ #include "../dsputil.h" -+ #include "../mpegvideo.h" -+ #include "../avcodec.h" -+ -+ void MPV_common_init_armv4l(MpegEncContext *s) -+ { -+ } -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/dsputil.h xine-lib-1-beta12/src/libffmpeg/libavcodec/dsputil.h -*** xine-lib-1-beta12_orig/src/libffmpeg/libavcodec/dsputil.h Sat May 10 09:04:38 2003 ---- xine-lib-1-beta12/src/libffmpeg/libavcodec/dsputil.h Sun May 18 13:45:56 2003 -*************** -*** 48,53 **** ---- 48,54 ---- - void ff_jpeg_fdct_islow (DCTELEM *data); - - void j_rev_dct (DCTELEM *data); -+ void j_rev_dct_ARM (DCTELEM *data); - - void ff_fdct_mmx(DCTELEM *block); - -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/libffmpeg/xine_decoder.c xine-lib-1-beta12/src/libffmpeg/xine_decoder.c -*** xine-lib-1-beta12_orig/src/libffmpeg/xine_decoder.c Sat May 10 09:04:37 2003 ---- xine-lib-1-beta12/src/libffmpeg/xine_decoder.c Mon May 19 18:59:11 2003 -*************** -*** 334,340 **** - this->pp_available = 0; - break; - } -! - /* Detect what cpu accel we have */ - cpu_caps = xine_mm_accel(); - this->pp_flags = PP_FORMAT_420; ---- 334,344 ---- - this->pp_available = 0; - break; - } -! -! #if 0 -! this->pp_available = 0; /* remove post processing shit, probably a bug in the functions checking the quality value!!*/ -! #endif /* if 0 */ -! - /* Detect what cpu accel we have */ - cpu_caps = xine_mm_accel(); - this->pp_flags = PP_FORMAT_420; -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/libvorbis/xine_decoder.c xine-lib-1-beta12/src/libvorbis/xine_decoder.c -*** xine-lib-1-beta12_orig/src/libvorbis/xine_decoder.c Thu May 1 17:39:28 2003 ---- xine-lib-1-beta12/src/libvorbis/xine_decoder.c Sun May 18 13:49:30 2003 -*************** -*** 205,211 **** - - } else if (this->output_open) { - -! float **pcm; - int samples; - - if(vorbis_synthesis(&this->vb,op)==0) ---- 205,211 ---- - - } else if (this->output_open) { - -! int **pcm; - int samples; - - if(vorbis_synthesis(&this->vb,op)==0) -*************** -*** 227,235 **** - interleave */ - for(i=0;i<this->vi.channels;i++){ - ogg_int16_t *ptr=audio_buffer->mem+i; -! float *mono=pcm[i]; - for(j=0;j<bout;j++){ -! int val=mono[j]*32767.f; - /* might as well guard against clipping */ - if(val>32767){ - val=32767; ---- 227,235 ---- - interleave */ - for(i=0;i<this->vi.channels;i++){ - ogg_int16_t *ptr=audio_buffer->mem+i; -! int *mono=pcm[i]; - for(j=0;j<bout;j++){ -! int val=mono[j]>>9; - /* might as well guard against clipping */ - if(val>32767){ - val=32767; -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/xine-engine/audio_decoder.c xine-lib-1-beta12/src/xine-engine/audio_decoder.c -*** xine-lib-1-beta12_orig/src/xine-engine/audio_decoder.c Sun Apr 6 19:15:05 2003 ---- xine-lib-1-beta12/src/xine-engine/audio_decoder.c Sun May 18 14:16:05 2003 -*************** -*** 354,360 **** - - pthread_attr_t pth_attrs; - struct sched_param pth_params; -! int err; - - if (stream->audio_out == NULL) { - stream->audio_fifo = NULL; ---- 354,360 ---- - - pthread_attr_t pth_attrs; - struct sched_param pth_params; -! int err, num_audio_buffers, size_audio_buffers; - - if (stream->audio_out == NULL) { - stream->audio_fifo = NULL; -*************** -*** 368,374 **** ---- 368,399 ---- - * We provide buffers of 8k size instead of 2k for demuxers sending - * larger chunks. - */ -+ /* changed the allocation method for the buffer, using the same trick as for the video part, -+ i.e. it will give better possibilities to customize the size. - stream->audio_fifo = fifo_buffer_new (230, 8192); -+ */ -+ -+ num_audio_buffers = stream->xine->config->register_num (stream->xine->config, -+ "audio.num_buffers", -+ 50, -+ "number of audio buffers to allocate (higher values mean smoother playback but higher latency)", -+ NULL, 20, -+ NULL, NULL); -+ -+ -+ size_audio_buffers = stream->xine->config->register_num (stream->xine->config, -+ "audio.size_buffers", -+ 8192, -+ "size of the audio buffers to allocate", -+ NULL, 20, -+ NULL, NULL); -+ -+ -+ /* LOGGING INFO ABOUT THE CURRENT SIZE OF THE BUFFERS: */ -+ fprintf (stderr, "************************* %s:function %s, number of buffers:%d (%d B) [default:50 (400 kB)]\n", __FILE__, __FUNCTION__, num_audio_buffers, num_audio_buffers*size_audio_buffers); -+ stream->audio_fifo = fifo_buffer_new (num_audio_buffers, size_audio_buffers); -+ -+ - stream->audio_channel_user = -1; - stream->audio_channel_auto = -1; - stream->audio_track_map_entries = 0; -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/xine-engine/audio_out.c xine-lib-1-beta12/src/xine-engine/audio_out.c -*** xine-lib-1-beta12_orig/src/xine-engine/audio_out.c Fri Apr 25 18:06:27 2003 ---- xine-lib-1-beta12/src/xine-engine/audio_out.c Sun May 18 14:29:29 2003 -*************** -*** 89,98 **** ---- 89,103 ---- - #define LOG_RESAMPLE_SYNC - */ - -+ /* -+ REPLACED BY CONFIG ENTRIES - #define NUM_AUDIO_BUFFERS 32 - #define AUDIO_BUF_SIZE 32768 - - #define ZERO_BUF_SIZE 5000 -+ */ -+ -+ static int iNumAudioBuffers, iAudioBufSize, iZeroBufSize; - - /* By adding gap errors (difference between reported and expected - * sound card clock) into metronom's vpts_offset we can use its -*************** -*** 117,123 **** ---- 122,133 ---- - * buffers may be dropped or gaps filled with silence. - */ - #define SYNC_TIME_INVERVAL (1 * 90000) -+ -+ /* -+ REPLACED BY CONFIG_ENTRIES - #define SYNC_BUF_INTERVAL NUM_AUDIO_BUFFERS / 2 -+ */ -+ - #define SYNC_GAP_RATE 4 - - /* Alternative for metronom feedback: fix sound card clock drift -*************** -*** 430,440 **** - } - - while (num_frames > 0 && !this->discard_buffers) { -! if (num_frames > ZERO_BUF_SIZE) { - pthread_mutex_lock( &this->driver_lock ); - if(this->driver_open) { -! this->driver->write(this->driver, this->zero_space, ZERO_BUF_SIZE); -! num_frames -= ZERO_BUF_SIZE; - } else - num_frames = 0; - pthread_mutex_unlock( &this->driver_lock ); ---- 440,450 ---- - } - - while (num_frames > 0 && !this->discard_buffers) { -! if (num_frames > iZeroBufSize) { - pthread_mutex_lock( &this->driver_lock ); - if(this->driver_open) { -! this->driver->write(this->driver, this->zero_space, iZeroBufSize); -! num_frames -= iZeroBufSize; - } else - num_frames = 0; - pthread_mutex_unlock( &this->driver_lock ); -*************** -*** 1059,1065 **** - */ - } else if ( abs(gap) < AO_MAX_GAP && abs(gap) > this->gap_tolerance && - cur_time > (last_sync_time + SYNC_TIME_INVERVAL) && -! bufs_since_sync >= SYNC_BUF_INTERVAL && - !this->resample_sync_method ) { - xine_stream_t *stream; - #ifdef LOG ---- 1069,1075 ---- - */ - } else if ( abs(gap) < AO_MAX_GAP && abs(gap) > this->gap_tolerance && - cur_time > (last_sync_time + SYNC_TIME_INVERVAL) && -! bufs_since_sync >= (iNumAudioBuffers/2) && - !this->resample_sync_method ) { - xine_stream_t *stream; - #ifdef LOG -*************** -*** 1786,1791 **** ---- 1796,1826 ---- - static char *resample_modes[] = {"auto", "off", "on", NULL}; - static char *av_sync_methods[] = {"metronom_feedback", "resample", NULL}; - -+ -+ -+ iNumAudioBuffers = config->register_num (config, -+ "audio.out_num_audio_buf", -+ 16, -+ "number of audio buffer on the output side", -+ NULL, 20, -+ NULL, NULL); -+ -+ iAudioBufSize = config->register_num (config, -+ "audio.out_size_audio_buf", -+ 8192, -+ "size of the audio buffers to allocate on the output side", -+ NULL, 20, -+ NULL, NULL); -+ -+ iZeroBufSize = config->register_num (config, -+ "audio.out_size_zero_buf", -+ 2048, -+ "size of the zero buffers to allocate on the output side", -+ NULL, 20, -+ NULL, NULL); -+ -+ -+ - this = xine_xmalloc (sizeof (aos_t)) ; - - this->driver = driver; -*************** -*** 1813,1819 **** - this->audio_paused = 0; - this->flush_audio_driver = 0; - this->discard_buffers = 0; -! this->zero_space = xine_xmalloc (ZERO_BUF_SIZE * 2 * 6); - if (!grab_only) - this->gap_tolerance = driver->get_gap_tolerance (this->driver); - ---- 1848,1854 ---- - this->audio_paused = 0; - this->flush_audio_driver = 0; - this->discard_buffers = 0; -! this->zero_space = xine_xmalloc (iZeroBufSize * 2 * 6); - if (!grab_only) - this->gap_tolerance = driver->get_gap_tolerance (this->driver); - -*************** -*** 1871,1883 **** - this->free_fifo = fifo_new (); - this->out_fifo = fifo_new (); - -! for (i=0; i<NUM_AUDIO_BUFFERS; i++) { - - audio_buffer_t *buf; - - buf = (audio_buffer_t *) xine_xmalloc (sizeof (audio_buffer_t)); -! buf->mem = xine_xmalloc (AUDIO_BUF_SIZE); -! buf->mem_size = AUDIO_BUF_SIZE; - buf->extra_info = malloc(sizeof(extra_info_t)); - - fifo_append (this->free_fifo, buf); ---- 1906,1919 ---- - this->free_fifo = fifo_new (); - this->out_fifo = fifo_new (); - -! -! for (i=0; i<iNumAudioBuffers; i++) { - - audio_buffer_t *buf; - - buf = (audio_buffer_t *) xine_xmalloc (sizeof (audio_buffer_t)); -! buf->mem = xine_xmalloc (iAudioBufSize); -! buf->mem_size = iAudioBufSize; - buf->extra_info = malloc(sizeof(extra_info_t)); - - fifo_append (this->free_fifo, buf); -*************** -*** 1889,1896 **** - audio_buffer_t *buf; - - buf = (audio_buffer_t *) xine_xmalloc (sizeof (audio_buffer_t)); -! buf->mem = xine_xmalloc (4*AUDIO_BUF_SIZE); -! buf->mem_size = 4*AUDIO_BUF_SIZE; - buf->extra_info = malloc(sizeof(extra_info_t)); - - this->frame_buf[i] = buf; ---- 1925,1932 ---- - audio_buffer_t *buf; - - buf = (audio_buffer_t *) xine_xmalloc (sizeof (audio_buffer_t)); -! buf->mem = xine_xmalloc (4*iAudioBufSize); -! buf->mem_size = 4*iAudioBufSize; - buf->extra_info = malloc(sizeof(extra_info_t)); - - this->frame_buf[i] = buf; -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/xine-engine/video_overlay.h xine-lib-1-beta12/src/xine-engine/video_overlay.h -*** xine-lib-1-beta12_orig/src/xine-engine/video_overlay.h Wed Nov 20 08:51:36 2002 ---- xine-lib-1-beta12/src/xine-engine/video_overlay.h Sun May 18 14:39:47 2003 -*************** -*** 32,40 **** - #define CLUT_Y_CR_CB_INIT(_y,_cr,_cb) { (_cb), (_cr), (_y) } - #endif - -! #define MAX_OBJECTS 50 -! #define MAX_EVENTS 50 -! #define MAX_SHOWING 5 - - #define OVERLAY_EVENT_NULL 0 - #define OVERLAY_EVENT_SHOW 1 ---- 32,40 ---- - #define CLUT_Y_CR_CB_INIT(_y,_cr,_cb) { (_cb), (_cr), (_y) } - #endif - -! #define MAX_OBJECTS 3 -! #define MAX_EVENTS 3 -! #define MAX_SHOWING 3 - - #define OVERLAY_EVENT_NULL 0 - #define OVERLAY_EVENT_SHOW 1 -diff -rcN -x Makefile.in -x POTFILES -x libxine.pc -x relchk.sh -x xine-config -x dsputil_arm.c_dilb -x jrevdct_arm.S_dilb -x libdha -x vidix -x demux_ogg.c_before_test_song_length -x config.log -x config.status -x autom4te.cache -x aclocal.m4 -x xine.c_orig -x libtool-nofpic -x config.sub -x config.guess -x configure -x SlackBuild -x stamp-h1 -x config.h -x libtool -x ltmain.sh xine-lib-1-beta12_orig/src/xine-engine/xine.c xine-lib-1-beta12/src/xine-engine/xine.c -*** xine-lib-1-beta12_orig/src/xine-engine/xine.c Sat Apr 26 10:43:33 2003 ---- xine-lib-1-beta12/src/xine-engine/xine.c Sat Aug 9 16:44:20 2003 -*************** -*** 1209,1214 **** ---- 1209,1218 ---- - static char *demux_strategies[] = {"default", "reverse", "content", - "extension", NULL}; - -+ /* specific information: who did compile that: */ -+ printf("\n/!\\ This is xine-lib 1.0beta12 compiled by buildroot and patched by Dilb (don't forget to give this information when reporting a bug) /!\\\n"); -+ -+ - /* initialize color conversion tables and functions */ - init_yuv_conversion(); - diff --git a/packages/libxine/libxine-1.0.0-beta12/libvorbis.patch b/packages/libxine/libxine-1.0.0-beta12/libvorbis.patch deleted file mode 100644 index e206a0b742..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/libvorbis.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xine-lib/src/libvorbis/xine_decoder.c 2003-08-10 14:48:38.000000000 +0200 -+++ xine-lib/src/libvorbis/xine_decoder.c.patched 2003-08-10 14:48:17.000000000 +0200 -@@ -34,7 +34,7 @@ - #include "buffer.h" - - #include <ogg/ogg.h> --#include <vorbis/codec.h> -+#include <tremor/ivorbiscodec.h> - - #define MAX_NUM_SAMPLES 4096 - diff --git a/packages/libxine/libxine-1.0.0-beta12/libxine-autoconf.patch b/packages/libxine/libxine-1.0.0-beta12/libxine-autoconf.patch deleted file mode 100644 index 3a5ad89387..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/libxine-autoconf.patch +++ /dev/null @@ -1,180 +0,0 @@ ---- configure.ac.orig 2003-02-12 12:43:36.000000000 +0100 -+++ configure.ac 2003-02-12 12:44:24.000000000 +0100 -@@ -281,10 +281,26 @@ dnl ------------------------------------ - dnl zlib - dnl --------------------------------------------- - dnl Test for libz -+AC_ARG_WITH(zlib-path,[ --with-xlib-path=path Where zlib is installed], -+ zlib_path="$withval", zlib_path="") -+ -+save_LDFLAGS="$LDFLAGS" -+save_CPPFLAGS="$CPPFLAGS" -+if test ! -z "$zlib_path"; then -+ LDFLAGS="$LDFLAGS -L$zlib_path/lib" -+ CPPFLAGS="$CPPFLAGS -I$zlib_path/include" -+ CFLAGS="$CFLAGS -I$zlib_path/include" -+fi - AC_CHECK_LIB(z, gzsetparams, - [ AC_CHECK_HEADER(zlib.h, - have_zlib=yes - ZLIB_LIBS="-lz",)], AC_MSG_ERROR(zlib needed)) -+LDFLAGS="$save_LDFLAGS" -+CPPFLAGS="$save_CPPFLAGS" -+ -+if test ! -z "$zlib_path"; then -+ ZLIB_LIBS="-L$zlib_path/lib $ZLIB_LIBS" -+fi - - AM_CONDITIONAL(HAVE_ZLIB, [test x"$have_zlib" = "xyes"]) - AC_SUBST(ZLIB_LIBS) -@@ -437,8 +453,8 @@ AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_ - dnl --------------------------------------------- - dnl Checks for Ascii-Art library - dnl --------------------------------------------- --AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes") -+dnl AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***])) -+AM_CONDITIONAL(HAVE_AA, /bin/false) - - dnl --------------------------------------------- - dnl Check solaris framebuffer device support -@@ -450,7 +466,7 @@ dnl ------------------------------------ - dnl Check linux framebuffer device support - dnl --------------------------------------------- - AC_CHECK_HEADER(linux/fb.h, have_fb=yes,) --AM_CONDITIONAL(HAVE_FB, [test x"$have_fb" = "xyes"]) -+AM_CONDITIONAL(HAVE_FB, /bin/false) - - dnl --------------------------------------------- - dnl Find pkg-config -@@ -480,15 +496,16 @@ fi - - AC_SUBST(DIRECTFB_CFLAGS) - AC_SUBST(DIRECTFB_LIBS) --AM_CONDITIONAL(HAVE_DIRECTFB, test x$have_directfb = "xyes" ) -+AM_CONDITIONAL(HAVE_DIRECTFB, /bin/false) - - dnl --------------------------------------------- - dnl check for SDL - dnl --------------------------------------------- --AM_PATH_SDL(1.1.5, -- AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]), -- []) --AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"]) -+dnl AM_PATH_SDL(1.1.5, -+dnl AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]), -+dnl []) -+AC_DEFINE(HAVE_SDL,0,[Define this if you have SDL library installed]) -+AM_CONDITIONAL(HAVE_SDL, /bin/false) - - - dnl --------------------------------------------- -@@ -574,15 +591,17 @@ AM_CONDITIONAL(HAVE_VORBIS, [test x"$no_ - dnl --------------------------------------------- - dnl check for libFLAC - dnl --------------------------------------------- --AM_PATH_LIBFLAC([], -- AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"]) -+dnl AM_PATH_LIBFLAC([], -+dnl AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***])) -+dnl AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"]) -+AM_CONDITIONAL(HAVE_FLAC, /bin/false) - - dnl --------------------------------------------- - dnl XviD libs. - dnl --------------------------------------------- --AM_PATH_XVID([], AC_MSG_RESULT([*** All XviD dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_XVID, [test x"$no_xvid" != "xyes"]) -+dnl AM_PATH_XVID([], AC_MSG_RESULT([*** All XviD dependent parts will be disabled ***])) -+dnl AM_CONDITIONAL(HAVE_XVID, [test x"$no_xvid" != "xyes"]) -+AM_CONDITIONAL(HAVE_XVID, /bin/false) - - - dnl --------------------------------------------- -@@ -635,18 +654,21 @@ AM_CONDITIONAL(HAVE_ALSA09, test x"$have - dnl --------------------------------------------- - dnl ESD support - dnl --------------------------------------------- --AM_PATH_ESD(0.2.8, -- AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]), -- AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***)) --AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes") -+dnl AM_PATH_ESD(0.2.8, -+dnl AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]), -+dnl AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***)) -+AC_DEFINE(HAVE_ESD,0,[Define this if you have ESD (libesd) installed]), -+AM_CONDITIONAL(HAVE_ESD, /bin/false) - - dnl --------------------------------------------- - dnl ARTS support - dnl --------------------------------------------- --AM_PATH_ARTS(0.9.5, -- AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]), -- AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***)) --AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes") -+dnl AM_PATH_ARTS(0.9.5, -+dnl AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]), -+dnl AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***)) -+dnl AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes") -+AC_DEFINE(HAVE_ARTS,0,[blubb],[]) -+AM_CONDITIONAL(HAVE_ARTS, /bin/false) - - dnl --------------------------------------------- - dnl gnome-vfs support -@@ -700,26 +722,30 @@ AC_SUBST(KSTAT_LIBS) - dnl --------------------------------------------- - dnl cdrom ioctls - dnl --------------------------------------------- --AC_CHECK_HEADERS(sys/cdio.h linux/cdrom.h) --AM_CHECK_CDROM_IOCTLS( -- [AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])], -- [AC_MSG_RESULT([*** DVD and (S)VCD support will be disabled ***])]) --AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"]) -+dnl AC_CHECK_HEADERS(sys/cdio.h linux/cdrom.h) -+dnl AM_CHECK_CDROM_IOCTLS( -+dnl [AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])], -+dnl [AC_MSG_RESULT([*** DVD and (S)VCD support will be disabled ***])]) -+dnl AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"]) -+AC_DEFINE([HAVE_CDROM_IOCTLS],0,[][blah]) -+AM_CONDITIONAL(HAVE_CDROM_IOCTLS, /bin/false) - - dnl --------------------------------------------- - dnl check for a usable version of libdvdnav - dnl --------------------------------------------- --AC_ARG_WITH(included-dvdnav,[ --with-included-dvdnav Use included dvdnav library [recommended]], -- included_dvdnav="yes"; no_dvdnav="yes", included_dvdnav="no") -- --if test x"$included_dvdnav" = "xno"; then -- AM_PATH_DVDNAV(0.1.4, -- AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]), -- [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) --else -- AC_MSG_RESULT([Use included DVDNAV/DVDREAD support]) --fi --AM_CONDITIONAL(HAVE_DVDNAV, [test x"$no_dvdnav" != "xyes"]) -+dnl AC_ARG_WITH(included-dvdnav,[ --with-included-dvdnav Use included dvdnav library [recommended]], -+dnl included_dvdnav="yes"; no_dvdnav="yes", included_dvdnav="no") -+dnl -+dnl if test x"$included_dvdnav" = "xno"; then -+dnl AM_PATH_DVDNAV(0.1.4, -+dnl AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]), -+dnl [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) -+dnl else -+dnl AC_MSG_RESULT([Use included DVDNAV/DVDREAD support]) -+dnl fi -+dnl AM_CONDITIONAL(HAVE_DVDNAV, [test x"$no_dvdnav" != "xyes"]) -+AC_DEFINE(HAVE_DVDNAV,0,[blah]) -+AM_CONDITIONAL(HAVE_DVDNAV, /bin/false) - - dnl --------------------------------------------- - dnl ASF build can be optional -@@ -1050,7 +1076,7 @@ case "$host_or_hostalias" in - AC_DEFINE_UNQUOTED(FPM_DEFAULT,,[Define to select libmad fixed point arithmetic implementation]) - ;; - -- armv4l-*-linux*) -+ arm-*-linux*) - CFLAGS="$CFLAGS -O2 -fsigned-char -ffast-math -mcpu=strongarm1100 -fomit-frame-pointer -fthread-jumps -fregmove" - dnl CFLAGS="$CFLAGS -O1 -fforce-mem -fforce-addr -fthread-jumps -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fregmove -fschedule-insns2 -finline-functions -fsigned-char -fomit-frame-pointer -march=armv4 -mtune=strongarm" - DEBUG_CFLAGS="$DEBUG_CFLAGS -O2" diff --git a/packages/libxine/libxine-1.0.0-beta12/libxine-cut-memusage.patch b/packages/libxine/libxine-1.0.0-beta12/libxine-cut-memusage.patch deleted file mode 100644 index e4deadad1f..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/libxine-cut-memusage.patch +++ /dev/null @@ -1,52 +0,0 @@ -Copyright (C) 2002, Fred Boulay <dilb@handhelds.org> -Licensed under GPL v2 - ---- src/xine-engine/audio_out.c.orig 2002-12-18 02:42:43.000000000 +0100 -+++ src/xine-engine/audio_out.c 2002-12-18 02:43:19.000000000 +0100 -@@ -75,10 +75,10 @@ - #define LOG - */ - --#define NUM_AUDIO_BUFFERS 32 --#define AUDIO_BUF_SIZE 32768 -+#define NUM_AUDIO_BUFFERS 16 -+#define AUDIO_BUF_SIZE 8192 - --#define ZERO_BUF_SIZE 5000 -+#define ZERO_BUF_SIZE 2048 - - /* By adding gap errors (difference between reported and expected - * sound card clock) into metronom's vpts_offset we can use its ---- src/xine-engine/video_decoder.c.orig 2003-01-14 01:10:29.000000000 +0100 -+++ src/xine-engine/video_decoder.c 2003-02-12 12:10:33.000000000 +0100 -@@ -373,7 +373,7 @@ void video_decoder_init (xine_stream_t * - * We provide buffers of 8k size instead of 2k for demuxers sending - * larger chunks. - */ -- stream->video_fifo = fifo_buffer_new (500, 8192); -+ stream->video_fifo = fifo_buffer_new (250, 4096); - stream->spu_track_map_entries = 0; - - pthread_attr_init(&pth_attrs); ---- src/xine-engine/video_overlay.h.orig 2002-12-18 02:44:08.000000000 +0100 -+++ src/xine-engine/video_overlay.h 2002-12-18 02:44:21.000000000 +0100 -@@ -32,7 +32,7 @@ - #define CLUT_Y_CR_CB_INIT(_y,_cr,_cb) { (_cb), (_cr), (_y) } - #endif - --#define MAX_OBJECTS 50 -+#define MAX_OBJECTS 5 - #define MAX_EVENTS 50 - #define MAX_SHOWING 5 - ---- src/xine-engine/audio_decoder.c.orig 2002-12-19 17:16:11.000000000 +0100 -+++ src/xine-engine/audio_decoder.c 2002-12-19 17:16:25.000000000 +0100 -@@ -322,7 +322,7 @@ void audio_decoder_init (xine_stream_t * - * We provide buffers of 8k size instead of 2k for demuxers sending - * larger chunks. - */ -- stream->audio_fifo = fifo_buffer_new (230, 8192); -+ stream->audio_fifo = fifo_buffer_new (100, 8192); - stream->audio_channel_user = -1; - stream->audio_channel_auto = 0; - stream->audio_track_map_entries = 0; diff --git a/packages/libxine/libxine-1.0.0-beta12/libxine-ffmpeg-enable-arm-modules.patch b/packages/libxine/libxine-1.0.0-beta12/libxine-ffmpeg-enable-arm-modules.patch deleted file mode 100644 index 222235ea44..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/libxine-ffmpeg-enable-arm-modules.patch +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (C) 2002, Fred Boulay <dilb@handhelds.org> -Licensed under GPL v2 - ---- src/libffmpeg/libavcodec/armv4l/Makefile.am.orig 2002-12-17 10:27:00.000000000 +0100 -+++ src/libffmpeg/libavcodec/armv4l/Makefile.am 2002-12-17 10:27:08.000000000 +0100 -@@ -13,10 +13,9 @@ libavcodec_armv4l_src = dsputil_arm.c jr - libavcodec_armv4l_dummy = libavcodec_armv4l_dummy.c - EXTRA_DIST = $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy) - --#if HAVE_ARMV4L --#armv4l_modules = $(libavcodec_armv4l_src) --#endif --armv4l_modules = -+if HAVE_ARMV4L -+armv4l_modules = $(libavcodec_armv4l_src) -+endif - - libavcodec_armv4l_la_SOURCES = $(armv4l_modules) $(libavcodec_armv4l_dummy) - diff --git a/packages/libxine/libxine-1.0.0-beta12/libxine-libavcodec.patch b/packages/libxine/libxine-1.0.0-beta12/libxine-libavcodec.patch deleted file mode 100644 index 287c7b6fd7..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/libxine-libavcodec.patch +++ /dev/null @@ -1,941 +0,0 @@ -Copyright (C) 2002, Fred Boulay <dilb@handhelds.org> -Licensed under GPL v2 - ---- src/libffmpeg/libavcodec/Makefile.am.orig 2002-11-04 01:31:49.000000000 +0100 -+++ src/libffmpeg/libavcodec/Makefile.am 2002-12-19 17:00:59.000000000 +0100 -@@ -6,9 +6,16 @@ SUBDIRS = armv4l i386 mlib alpha - - EXTRA_DIST = fdctref.c imgresample.c - --AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -+#AM_CFLAGS = $(LIBFFMPEG_CFLAGS) - ASFLAGS = - -+if HAVE_ARMV4L -+AM_CFLAGS = -DARCH_ARMV4L $(LIBFFMPEG_CFLAGS) -+else -+AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -+endif -+ -+ - LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - - noinst_LTLIBRARIES = libavcodec.la ---- src/libffmpeg/libavcodec/dsputil.h.orig 2002-12-19 17:02:39.000000000 +0100 -+++ src/libffmpeg/libavcodec/dsputil.h 2002-12-19 17:03:15.000000000 +0100 -@@ -35,6 +35,7 @@ void fdct_ifast (DCTELEM *data); - void ff_jpeg_fdct_islow (DCTELEM *data); - - void j_rev_dct (DCTELEM *data); -+void j_rev_dct_ARM ( DCTELEM *data ); - - void ff_fdct_mmx(DCTELEM *block); - ---- src/libffmpeg/libavcodec/mpegvideo.c.orig 2002-12-19 17:03:28.000000000 +0100 -+++ src/libffmpeg/libavcodec/mpegvideo.c 2002-12-19 17:05:50.000000000 +0100 -@@ -186,6 +186,23 @@ static void ff_jref_idct_add(UINT8 *dest - ff_add_pixels_clamped(block, dest, line_size); - } - -+#ifdef ARCH_ARMV4L -+ -+static void ff_jref_idct_put_armv4l(UINT8 *dest, int line_size, DCTELEM *block) -+{ -+// fprintf(stderr, "src/libffmpeg/libavcodec/mpegvideo.c : ff_jref_idct_put_armv4l utilisant l'iDCT ARMv4l en ASM\n"); -+ j_rev_dct_ARM (block); -+ ff_put_pixels_clamped(block, dest, line_size); -+} -+static void ff_jref_idct_add_armv4l(UINT8 *dest, int line_size, DCTELEM *block) -+{ -+// fprintf(stderr, "src/libffmpeg/libavcodec/mpegvideo.c : ff_jref_idct_add_armv4l utilisant l'iDCT ARMv4l en ASM\n"); -+ j_rev_dct_ARM (block); -+ ff_add_pixels_clamped(block, dest, line_size); -+} -+ -+#endif -+ - /* init common dct for both encoder and decoder */ - int DCT_common_init(MpegEncContext *s) - { -@@ -227,7 +244,11 @@ int DCT_common_init(MpegEncContext *s) - MPV_common_init_mmi(s); - #endif - #ifdef ARCH_ARMV4L -- MPV_common_init_armv4l(s); -+ /* MPV_common_init_armv4l(s); */ -+ /* Methode bourrine, mais bon, c'est pour pas trop se prendre la tete a tout changer ce soir, a ameliorer plus tard*/ -+ s->idct_put= ff_jref_idct_put_armv4l; -+ s->idct_add= ff_jref_idct_add_armv4l; -+ s->idct_permutation_type= FF_NO_IDCT_PERM; - #endif - #ifdef ARCH_POWERPC - MPV_common_init_ppc(s); ---- src/libffmpeg/libavcodec/armv4l/jrevdct_arm.S 2001-12-27 21:02:23.000000000 +0100 -+++ src/libffmpeg/libavcodec/armv4l/jrevdct_arm.S 2002-12-17 23:38:13.000000000 +0100 -@@ -1,386 +1,491 @@ - /* -- C-like prototype : -- void j_rev_dct_ARM(DCTBLOCK data) -+ * jrevdct_arm.S -+ * Copyright (C) 2002 Frederic 'dilb' Boulay. -+ * All Rights Reserved. -+ * -+ * Author: Frederic Boulay <dilb@handhelds.org> -+ * -+ * you can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License (version 2) -+ * as published by the Free Software Foundation. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * -+ * The function defined in this file, is derived from the simple_idct function from -+ * the libavcodec library part of the ffmpeg project. -+ */ - -- With DCTBLOCK being a pointer to an array of 64 'signed shorts' - -- Copyright (c) 2001 Lionel Ulmer (lionel.ulmer@free.fr / bbrox@bbrox.org) - -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and associated documentation files (the "Software"), to deal -- in the Software without restriction, including without limitation the rights -- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -- copies of the Software, and to permit persons to whom the Software is -- furnished to do so, subject to the following conditions: -- -- The above copyright notice and this permission notice shall be included in -- all copies or substantial portions of the Software. -- -- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -- COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- --*/ --#define FIX_0_298631336 2446 --#define FIX_0_541196100 4433 --#define FIX_0_765366865 6270 --#define FIX_1_175875602 9633 --#define FIX_1_501321110 12299 --#define FIX_2_053119869 16819 --#define FIX_3_072711026 25172 --#define FIX_M_0_390180644 -3196 --#define FIX_M_0_899976223 -7373 --#define FIX_M_1_847759065 -15137 --#define FIX_M_1_961570560 -16069 --#define FIX_M_2_562915447 -20995 --#define FIX_0xFFFF 0xFFFF -- --#define FIX_0_298631336_ID 0 --#define FIX_0_541196100_ID 4 --#define FIX_0_765366865_ID 8 --#define FIX_1_175875602_ID 12 --#define FIX_1_501321110_ID 16 --#define FIX_2_053119869_ID 20 --#define FIX_3_072711026_ID 24 --#define FIX_M_0_390180644_ID 28 --#define FIX_M_0_899976223_ID 32 --#define FIX_M_1_847759065_ID 36 --#define FIX_M_1_961570560_ID 40 --#define FIX_M_2_562915447_ID 44 --#define FIX_0xFFFF_ID 48 -+ -+/* useful constants for the algorithm, they are save in __constant_ptr__ at the end of the source code.*/ -+#define W1 22725 -+#define W2 21407 -+#define W3 19266 -+#define W4 16383 -+#define W5 12873 -+#define W6 8867 -+#define W7 4520 -+#define MASK_MSHW 0xFFFF0000 -+ -+/* offsets of the constants in the vector*/ -+#define offW1 0 -+#define offW2 4 -+#define offW3 8 -+#define offW4 12 -+#define offW5 16 -+#define offW6 20 -+#define offW7 24 -+#define offMASK_MSHW 28 -+ -+#define ROW_SHIFT 11 -+#define ROW_SHIFT2MSHW (16-11) -+#define COL_SHIFT 20 -+#define ROW_SHIFTED_1 1024 /* 1<< (ROW_SHIFT-1)*/ -+#define COL_SHIFTED_1 524288 /* 1<< (COL_SHIFT-1)*/ -+ -+ - .text - .align -- - .global j_rev_dct_ARM --j_rev_dct_ARM: -- stmdb sp!, { r4 - r12, lr } @ all callee saved regs - -- sub sp, sp, #4 @ reserve some space on the stack -- str r0, [ sp ] @ save the DCT pointer to the stack -+j_rev_dct_ARM: -+simple_idct3: -+simple_idct_ARM: -+ @@ void simple_idct_ARM(int16_t *block) -+ @@ save stack for reg needed (take all of them), -+ @@ R0-R3 are scratch regs, so no need to save them, but R0 contains the pointer to block -+ @@ so it must not be overwritten, if it is not saved!! -+ @@ R12 is another scratch register, so it should not be saved too -+ @@ save all registers -+ stmfd sp!, {r4-r11, r14} @ R14 is also called LR -+ @@ at this point, R0=block, other registers are free. -+ add r14, r0, #112 @ R14=&block[8*7], better start from the last row, and decrease the value until row=0, i.e. R12=block. -+ add r12, pc, #(__constant_ptr__-.-8) @ R12=__constant_ptr__, the vector containing the constants, probably not necessary to reserve a register for it -+ @@ add 2 temporary variables in the stack: R0 and R14 -+ sub sp, sp, #8 @ allow 2 local variables -+ str r0, [sp, #0] @ save block in sp[0] -+ @@ stack status -+ @@ sp+4 free -+ @@ sp+0 R0 (block) -+ -+ -+ @@ at this point, R0=block, R14=&block[56], R12=__const_ptr_, R1-R11 free -+ -+ -+__row_loop: -+ @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimise ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :) -+ ldr r1, [r14, #0] @ R1=(int32)(R12)[0]=ROWr32[0] (relative row cast to a 32b pointer) -+ ldr r2, [r14, #4] @ R2=(int32)(R12)[1]=ROWr32[1] -+ ldr r3, [r14, #8] @ R3=ROWr32[2] -+ ldr r4, [r14, #12] @ R4=ROWr32[3] -+ @@ check if the words are null, if all of them are null, then proceed with next row (branch __end_row_loop), -+ @@ if ROWr16[0] is the only one not null, then proceed with this special case (branch __almost_empty_row) -+ @@ else follow the complete algorithm. -+ @@ at this point, R0=block, R14=&block[n], R12=__const_ptr_, R1=ROWr32[0], R2=ROWr32[1], -+ @@ R3=ROWr32[2], R4=ROWr32[3], R5-R11 free -+ orr r5, r4, r3 @ R5=R4 | R3 -+ orr r5, r5, r2 @ R5=R4 | R3 | R2 -+ orrs r6, r5, r1 @ Test R5 | R1 (the aim is to check if everything is null) -+ beq __end_row_loop -+ mov r7, r1, asr #16 @ R7=R1>>16=ROWr16[1] (evaluate it now, as it could be useful later) -+ ldrsh r6, [r14, #0] @ R6=ROWr16[0] -+ orrs r5, r5, r7 @ R5=R4 | R3 | R2 | R7 -+ beq __almost_empty_row -+ -+__b_evaluation: -+ @@ at this point, R0=block (temp), R1(free), R2=ROWr32[1], R3=ROWr32[2], R4=ROWr32[3], -+ @@ R5=(temp), R6=ROWr16[0], R7=ROWr16[1], R8-R11 free, -+ @@ R12=__const_ptr_, R14=&block[n] -+ @@ to save some registers/calls, proceed with b0-b3 first, followed by a0-a3 -+ -+ @@ MUL16(b0, W1, row[1]); -+ @@ MUL16(b1, W3, row[1]); -+ @@ MUL16(b2, W5, row[1]); -+ @@ MUL16(b3, W7, row[1]); -+ @@ MAC16(b0, W3, row[3]); -+ @@ MAC16(b1, -W7, row[3]); -+ @@ MAC16(b2, -W1, row[3]); -+ @@ MAC16(b3, -W5, row[3]); -+ ldr r8, [r12, #offW1] @ R8=W1 -+ mov r2, r2, asr #16 @ R2=ROWr16[3] -+ mul r0, r8, r7 @ R0=W1*ROWr16[1]=b0 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle) -+ ldr r9, [r12, #offW3] @ R9=W3 -+ ldr r10, [r12, #offW5] @ R10=W5 -+ mul r1, r9, r7 @ R1=W3*ROWr16[1]=b1 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle) -+ ldr r11, [r12, #offW7] @ R11=W7 -+ mul r5, r10, r7 @ R5=W5*ROWr16[1]=b2 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle) -+ mul r7, r11, r7 @ R7=W7*ROWr16[1]=b3 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle) -+ teq r2, #0 @ if null avoid muls -+ mlane r0, r9, r2, r0 @ R0+=W3*ROWr16[3]=b0 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle) -+ rsbne r2, r2, #0 @ R2=-ROWr16[3] -+ mlane r1, r11, r2, r1 @ R1-=W7*ROWr16[3]=b1 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle) -+ mlane r5, r8, r2, r5 @ R5-=W1*ROWr16[3]=b2 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle) -+ mlane r7, r10, r2, r7 @ R7-=W5*ROWr16[3]=b3 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle) -+ -+ @@ at this point, R0=b0, R1=b1, R2 (free), R3=ROWr32[2], R4=ROWr32[3], -+ @@ R5=b2, R6=ROWr16[0], R7=b3, R8=W1, R9=W3, R10=W5, R11=W7, -+ @@ R12=__const_ptr_, R14=&block[n] -+ @@ temp = ((uint32_t*)row)[2] | ((uint32_t*)row)[3]; -+ @@ if (temp != 0) {} -+ orrs r2, r3, r4 @ R2=ROWr32[2] | ROWr32[3] -+ beq __end_b_evaluation -+ -+ @@ at this point, R0=b0, R1=b1, R2 (free), R3=ROWr32[2], R4=ROWr32[3], -+ @@ R5=b2, R6=ROWr16[0], R7=b3, R8=W1, R9=W3, R10=W5, R11=W7, -+ @@ R12=__const_ptr_, R14=&block[n] -+ @@ MAC16(b0, W5, row[5]); -+ @@ MAC16(b2, W7, row[5]); -+ @@ MAC16(b3, W3, row[5]); -+ @@ MAC16(b1, -W1, row[5]); -+ @@ MAC16(b0, W7, row[7]); -+ @@ MAC16(b2, W3, row[7]); -+ @@ MAC16(b3, -W1, row[7]); -+ @@ MAC16(b1, -W5, row[7]); -+ mov r3, r3, asr #16 @ R3=ROWr16[5] -+ teq r3, #0 @ if null avoid muls -+ mlane r0, r10, r3, r0 @ R0+=W5*ROWr16[5]=b0 -+ mov r4, r4, asr #16 @ R4=ROWr16[7] -+ mlane r5, r11, r3, r5 @ R5+=W7*ROWr16[5]=b2 -+ mlane r7, r9, r3, r7 @ R7+=W3*ROWr16[5]=b3 -+ rsbne r3, r3, #0 @ R3=-ROWr16[5] -+ mlane r1, r8, r3, r1 @ R7-=W1*ROWr16[5]=b1 -+ @@ R3 is free now -+ teq r4, #0 @ if null avoid muls -+ mlane r0, r11, r4, r0 @ R0+=W7*ROWr16[7]=b0 -+ mlane r5, r9, r4, r5 @ R5+=W3*ROWr16[7]=b2 -+ rsbne r4, r4, #0 @ R4=-ROWr16[7] -+ mlane r7, r8, r4, r7 @ R7-=W1*ROWr16[7]=b3 -+ mlane r1, r10, r4, r1 @ R1-=W5*ROWr16[7]=b1 -+ @@ R4 is free now -+__end_b_evaluation: -+ @@ at this point, R0=b0, R1=b1, R2=ROWr32[2] | ROWr32[3] (tmp), R3 (free), R4 (free), -+ @@ R5=b2, R6=ROWr16[0], R7=b3, R8 (free), R9 (free), R10 (free), R11 (free), -+ @@ R12=__const_ptr_, R14=&block[n] -+ -+__a_evaluation: -+ @@ a0 = (W4 * row[0]) + (1 << (ROW_SHIFT - 1)); -+ @@ a1 = a0 + W6 * row[2]; -+ @@ a2 = a0 - W6 * row[2]; -+ @@ a3 = a0 - W2 * row[2]; -+ @@ a0 = a0 + W2 * row[2]; -+ ldr r9, [r12, #offW4] @ R9=W4 -+ mul r6, r9, r6 @ R6=W4*ROWr16[0] -+ ldr r10, [r12, #offW6] @ R10=W6 -+ ldrsh r4, [r14, #4] @ R4=ROWr16[2] (a3 not defined yet) -+ add r6, r6, #ROW_SHIFTED_1 @ R6=W4*ROWr16[0] + 1<<(ROW_SHIFT-1) (a0) -+ -+ mul r11, r10, r4 @ R11=W6*ROWr16[2] -+ ldr r8, [r12, #offW2] @ R8=W2 -+ sub r3, r6, r11 @ R3=a0-W6*ROWr16[2] (a2) -+ @@ temp = ((uint32_t*)row)[2] | ((uint32_t*)row)[3]; -+ @@ if (temp != 0) {} -+ teq r2, #0 -+ beq __end_bef_a_evaluation -+ -+ add r2, r6, r11 @ R2=a0+W6*ROWr16[2] (a1) -+ mul r11, r8, r4 @ R11=W2*ROWr16[2] -+ sub r4, r6, r11 @ R4=a0-W2*ROWr16[2] (a3) -+ add r6, r6, r11 @ R6=a0+W2*ROWr16[2] (a0) -+ -+ -+ @@ at this point, R0=b0, R1=b1, R2=a1, R3=a2, R4=a3, -+ @@ R5=b2, R6=a0, R7=b3, R8=W2, R9=W4, R10=W6, R11 (free), -+ @@ R12=__const_ptr_, R14=&block[n] -+ -+ -+ @@ a0 += W4*row[4] -+ @@ a1 -= W4*row[4] -+ @@ a2 -= W4*row[4] -+ @@ a3 += W4*row[4] -+ ldrsh r11, [r14, #8] @ R11=ROWr16[4] -+ teq r11, #0 @ if null avoid muls -+ mulne r11, r9, r11 @ R11=W4*ROWr16[4] -+ @@ R9 is free now -+ ldrsh r9, [r14, #12] @ R9=ROWr16[6] -+ addne r6, r6, r11 @ R6+=W4*ROWr16[4] (a0) -+ subne r2, r2, r11 @ R2-=W4*ROWr16[4] (a1) -+ subne r3, r3, r11 @ R3-=W4*ROWr16[4] (a2) -+ addne r4, r4, r11 @ R4+=W4*ROWr16[4] (a3) -+ @@ W6 alone is no more useful, save W2*ROWr16[6] in it instead -+ teq r9, #0 @ if null avoid muls -+ mulne r11, r10, r9 @ R11=W6*ROWr16[6] -+ addne r6, r6, r11 @ R6+=W6*ROWr16[6] (a0) -+ mulne r10, r8, r9 @ R10=W2*ROWr16[6] -+ @@ a0 += W6*row[6]; -+ @@ a3 -= W6*row[6]; -+ @@ a1 -= W2*row[6]; -+ @@ a2 += W2*row[6]; -+ subne r4, r4, r11 @ R4-=W6*ROWr16[6] (a3) -+ subne r2, r2, r10 @ R2-=W2*ROWr16[6] (a1) -+ addne r3, r3, r10 @ R3+=W2*ROWr16[6] (a2) -+ -+__end_a_evaluation: -+ @@ at this point, R0=b0, R1=b1, R2=a1, R3=a2, R4=a3, -+ @@ R5=b2, R6=a0, R7=b3, R8 (free), R9 (free), R10 (free), R11 (free), -+ @@ R12=__const_ptr_, R14=&block[n] -+ @@ row[0] = (a0 + b0) >> ROW_SHIFT; -+ @@ row[1] = (a1 + b1) >> ROW_SHIFT; -+ @@ row[2] = (a2 + b2) >> ROW_SHIFT; -+ @@ row[3] = (a3 + b3) >> ROW_SHIFT; -+ @@ row[4] = (a3 - b3) >> ROW_SHIFT; -+ @@ row[5] = (a2 - b2) >> ROW_SHIFT; -+ @@ row[6] = (a1 - b1) >> ROW_SHIFT; -+ @@ row[7] = (a0 - b0) >> ROW_SHIFT; -+ add r8, r6, r0 @ R8=a0+b0 -+ add r9, r2, r1 @ R9=a1+b1 -+ @@ put 2 16 bits half-words in a 32bits word -+ @@ ROWr32[0]=ROWr16[0] | (ROWr16[1]<<16) (only Little Endian compliant then!!!) -+ ldr r10, [r12, #offMASK_MSHW] @ R10=0xFFFF0000 -+ and r9, r10, r9, lsl #ROW_SHIFT2MSHW @ R9=0xFFFF0000 & ((a1+b1)<<5) -+ mvn r11, r10 @ R11= NOT R10= 0x0000FFFF -+ and r8, r11, r8, asr #ROW_SHIFT @ R8=0x0000FFFF & ((a0+b0)>>11) -+ orr r8, r8, r9 -+ str r8, [r14, #0] -+ -+ add r8, r3, r5 @ R8=a2+b2 -+ add r9, r4, r7 @ R9=a3+b3 -+ and r9, r10, r9, lsl #ROW_SHIFT2MSHW @ R9=0xFFFF0000 & ((a3+b3)<<5) -+ and r8, r11, r8, asr #ROW_SHIFT @ R8=0x0000FFFF & ((a2+b2)>>11) -+ orr r8, r8, r9 -+ str r8, [r14, #4] -+ -+ sub r8, r4, r7 @ R8=a3-b3 -+ sub r9, r3, r5 @ R9=a2-b2 -+ and r9, r10, r9, lsl #ROW_SHIFT2MSHW @ R9=0xFFFF0000 & ((a2-b2)<<5) -+ and r8, r11, r8, asr #ROW_SHIFT @ R8=0x0000FFFF & ((a3-b3)>>11) -+ orr r8, r8, r9 -+ str r8, [r14, #8] -+ -+ sub r8, r2, r1 @ R8=a1-b1 -+ sub r9, r6, r0 @ R9=a0-b0 -+ and r9, r10, r9, lsl #ROW_SHIFT2MSHW @ R9=0xFFFF0000 & ((a0-b0)<<5) -+ and r8, r11, r8, asr #ROW_SHIFT @ R8=0x0000FFFF & ((a1-b1)>>11) -+ orr r8, r8, r9 -+ str r8, [r14, #12] -+ -+ bal __end_row_loop -+ -+__almost_empty_row: -+ @@ the row was empty, except ROWr16[0], now, management of this special case -+ @@ at this point, R0=block, R14=&block[n], R12=__const_ptr_, R1=ROWr32[0], R2=ROWr32[1], -+ @@ R3=ROWr32[2], R4=ROWr32[3], R5=(temp), R6=ROWr16[0], R7=ROWr16[1], -+ @@ R8=0xFFFF (temp), R9-R11 free -+ mov r8, #0x10000 @ R8=0xFFFF (2 steps needed!) it saves a ldr call (because of delay run). -+ sub r8, r8, #1 @ R8 is now ready. -+ and r5, r8, r6, lsl #3 @ R5=R8 & (R6<<3)= (ROWr16[0]<<3) & 0xFFFF -+ orr r5, r5, r5, lsl #16 @ R5=R5 | (R5<<16) -+ str r5, [r14, #0] @ R14[0]=ROWr32[0]=R5 -+ str r5, [r14, #4] @ R14[4]=ROWr32[1]=R5 -+ str r5, [r14, #8] @ R14[8]=ROWr32[2]=R5 -+ str r5, [r14, #12] @ R14[12]=ROWr32[3]=R5 -+ -+__end_row_loop: -+ @@ at this point, R0-R11 (free) -+ @@ R12=__const_ptr_, R14=&block[n] -+ ldr r0, [sp, #0] @ R0=block -+ teq r0, r14 @ compare current &block[8*n] to block, when block is reached, the loop is finished. -+ sub r14, r14, #16 -+ bne __row_loop -+ -+ -+ -+ @@ at this point, R0=block, R1-R11 (free) -+ @@ R12=__const_ptr_, R14=&block[n] -+ add r14, r0, #14 @ R14=&block[7], better start from the last col, and decrease the value until col=0, i.e. R14=block. -+__col_loop: -+ -+__b_evaluation2: -+ @@ at this point, R0=block (temp), R1-R11 (free) -+ @@ R12=__const_ptr_, R14=&block[n] -+ @@ proceed with b0-b3 first, followed by a0-a3 -+ @@ MUL16(b0, W1, col[8x1]); -+ @@ MUL16(b1, W3, col[8x1]); -+ @@ MUL16(b2, W5, col[8x1]); -+ @@ MUL16(b3, W7, col[8x1]); -+ @@ MAC16(b0, W3, col[8x3]); -+ @@ MAC16(b1, -W7, col[8x3]); -+ @@ MAC16(b2, -W1, col[8x3]); -+ @@ MAC16(b3, -W5, col[8x3]); -+ ldr r8, [r12, #offW1] @ R8=W1 -+ ldrsh r7, [r14, #16] -+ mul r0, r8, r7 @ R0=W1*ROWr16[1]=b0 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle) -+ ldr r9, [r12, #offW3] @ R9=W3 -+ ldr r10, [r12, #offW5] @ R10=W5 -+ mul r1, r9, r7 @ R1=W3*ROWr16[1]=b1 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle) -+ ldr r11, [r12, #offW7] @ R11=W7 -+ mul r5, r10, r7 @ R5=W5*ROWr16[1]=b2 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle) -+ ldrsh r2, [r14, #48] -+ mul r7, r11, r7 @ R7=W7*ROWr16[1]=b3 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle) -+ teq r2, #0 @ if 0, then avoid muls -+ mlane r0, r9, r2, r0 @ R0+=W3*ROWr16[3]=b0 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle) -+ rsbne r2, r2, #0 @ R2=-ROWr16[3] -+ mlane r1, r11, r2, r1 @ R1-=W7*ROWr16[3]=b1 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle) -+ mlane r5, r8, r2, r5 @ R5-=W1*ROWr16[3]=b2 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle) -+ mlane r7, r10, r2, r7 @ R7-=W5*ROWr16[3]=b3 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle) -+ -+ @@ at this point, R0=b0, R1=b1, R2 (free), R3 (free), R4 (free), -+ @@ R5=b2, R6 (free), R7=b3, R8=W1, R9=W3, R10=W5, R11=W7, -+ @@ R12=__const_ptr_, R14=&block[n] -+ @@ MAC16(b0, W5, col[5x8]); -+ @@ MAC16(b2, W7, col[5x8]); -+ @@ MAC16(b3, W3, col[5x8]); -+ @@ MAC16(b1, -W1, col[5x8]); -+ @@ MAC16(b0, W7, col[7x8]); -+ @@ MAC16(b2, W3, col[7x8]); -+ @@ MAC16(b3, -W1, col[7x8]); -+ @@ MAC16(b1, -W5, col[7x8]); -+ ldrsh r3, [r14, #80] @ R3=COLr16[5x8] -+ teq r3, #0 @ if 0 then avoid muls -+ mlane r0, r10, r3, r0 @ R0+=W5*ROWr16[5x8]=b0 -+ mlane r5, r11, r3, r5 @ R5+=W7*ROWr16[5x8]=b2 -+ mlane r7, r9, r3, r7 @ R7+=W3*ROWr16[5x8]=b3 -+ rsbne r3, r3, #0 @ R3=-ROWr16[5x8] -+ ldrsh r4, [r14, #112] @ R4=COLr16[7x8] -+ mlane r1, r8, r3, r1 @ R7-=W1*ROWr16[5x8]=b1 -+ @@ R3 is free now -+ teq r4, #0 @ if 0 then avoid muls -+ mlane r0, r11, r4, r0 @ R0+=W7*ROWr16[7x8]=b0 -+ mlane r5, r9, r4, r5 @ R5+=W3*ROWr16[7x8]=b2 -+ rsbne r4, r4, #0 @ R4=-ROWr16[7x8] -+ mlane r7, r8, r4, r7 @ R7-=W1*ROWr16[7x8]=b3 -+ mlane r1, r10, r4, r1 @ R1-=W5*ROWr16[7x8]=b1 -+ @@ R4 is free now -+__end_b_evaluation2: -+ @@ at this point, R0=b0, R1=b1, R2 (free), R3 (free), R4 (free), -+ @@ R5=b2, R6 (free), R7=b3, R8 (free), R9 (free), R10 (free), R11 (free), -+ @@ R12=__const_ptr_, R14=&block[n] -+ -+__a_evaluation2: -+ @@ a0 = (W4 * col[8x0]) + (1 << (COL_SHIFT - 1)); -+ @@ a1 = a0 + W6 * row[2]; -+ @@ a2 = a0 - W6 * row[2]; -+ @@ a3 = a0 - W2 * row[2]; -+ @@ a0 = a0 + W2 * row[2]; -+ ldrsh r6, [r14, #0] -+ ldr r9, [r12, #offW4] @ R9=W4 -+ mul r6, r9, r6 @ R6=W4*ROWr16[0] -+ ldr r10, [r12, #offW6] @ R10=W6 -+ ldrsh r4, [r14, #32] @ R4=ROWr16[2] (a3 not defined yet) -+ add r6, r6, #COL_SHIFTED_1 @ R6=W4*ROWr16[0] + 1<<(COL_SHIFT-1) (a0) -+ mul r11, r10, r4 @ R11=W6*ROWr16[2] -+ ldr r8, [r12, #offW2] @ R8=W2 -+ add r2, r6, r11 @ R2=a0+W6*ROWr16[2] (a1) -+ sub r3, r6, r11 @ R3=a0-W6*ROWr16[2] (a2) -+ mul r11, r8, r4 @ R11=W2*ROWr16[2] -+ sub r4, r6, r11 @ R4=a0-W2*ROWr16[2] (a3) -+ add r6, r6, r11 @ R6=a0+W2*ROWr16[2] (a0) -+ -+ @@ at this point, R0=b0, R1=b1, R2=a1, R3=a2, R4=a3, -+ @@ R5=b2, R6=a0, R7=b3, R8=W2, R9=W4, R10=W6, R11 (free), -+ @@ R12=__const_ptr_, R14=&block[n] -+ @@ a0 += W4*row[4] -+ @@ a1 -= W4*row[4] -+ @@ a2 -= W4*row[4] -+ @@ a3 += W4*row[4] -+ ldrsh r11, [r14, #64] @ R11=ROWr16[4] -+ teq r11, #0 @ if null avoid muls -+ mulne r11, r9, r11 @ R11=W4*ROWr16[4] -+ @@ R9 is free now -+ addne r6, r6, r11 @ R6+=W4*ROWr16[4] (a0) -+ subne r2, r2, r11 @ R2-=W4*ROWr16[4] (a1) -+ subne r3, r3, r11 @ R3-=W4*ROWr16[4] (a2) -+ ldrsh r9, [r14, #96] @ R9=ROWr16[6] -+ addne r4, r4, r11 @ R4+=W4*ROWr16[4] (a3) -+ @@ W6 alone is no more useful, save W2*ROWr16[6] in it instead -+ teq r9, #0 @ if null avoid muls -+ mulne r11, r10, r9 @ R11=W6*ROWr16[6] -+ addne r6, r6, r11 @ R6+=W6*ROWr16[6] (a0) -+ mulne r10, r8, r9 @ R10=W2*ROWr16[6] -+ @@ a0 += W6*row[6]; -+ @@ a3 -= W6*row[6]; -+ @@ a1 -= W2*row[6]; -+ @@ a2 += W2*row[6]; -+ subne r4, r4, r11 @ R4-=W6*ROWr16[6] (a3) -+ subne r2, r2, r10 @ R2-=W2*ROWr16[6] (a1) -+ addne r3, r3, r10 @ R3+=W2*ROWr16[6] (a2) -+__end_a_evaluation2: -+ @@ at this point, R0=b0, R1=b1, R2=a1, R3=a2, R4=a3, -+ @@ R5=b2, R6=a0, R7=b3, R8 (free), R9 (free), R10 (free), R11 (free), -+ @@ R12=__const_ptr_, R14=&block[n] -+ @@ col[0 ] = ((a0 + b0) >> COL_SHIFT); -+ @@ col[8 ] = ((a1 + b1) >> COL_SHIFT); -+ @@ col[16] = ((a2 + b2) >> COL_SHIFT); -+ @@ col[24] = ((a3 + b3) >> COL_SHIFT); -+ @@ col[32] = ((a3 - b3) >> COL_SHIFT); -+ @@ col[40] = ((a2 - b2) >> COL_SHIFT); -+ @@ col[48] = ((a1 - b1) >> COL_SHIFT); -+ @@ col[56] = ((a0 - b0) >> COL_SHIFT); -+ @@@@@ no optimisation here @@@@@ -+ add r8, r6, r0 @ R8=a0+b0 -+ add r9, r2, r1 @ R9=a1+b1 -+ mov r8, r8, asr #COL_SHIFT -+ mov r9, r9, asr #COL_SHIFT -+ strh r8, [r14, #0] -+ strh r9, [r14, #16] -+ add r8, r3, r5 @ R8=a2+b2 -+ add r9, r4, r7 @ R9=a3+b3 -+ mov r8, r8, asr #COL_SHIFT -+ mov r9, r9, asr #COL_SHIFT -+ strh r8, [r14, #32] -+ strh r9, [r14, #48] -+ sub r8, r4, r7 @ R8=a3-b3 -+ sub r9, r3, r5 @ R9=a2-b2 -+ mov r8, r8, asr #COL_SHIFT -+ mov r9, r9, asr #COL_SHIFT -+ strh r8, [r14, #64] -+ strh r9, [r14, #80] -+ sub r8, r2, r1 @ R8=a1-b1 -+ sub r9, r6, r0 @ R9=a0-b0 -+ mov r8, r8, asr #COL_SHIFT -+ mov r9, r9, asr #COL_SHIFT -+ strh r8, [r14, #96] -+ strh r9, [r14, #112] -+ -+__end_col_loop: -+ @@ at this point, R0-R11 (free) -+ @@ R12=__const_ptr_, R14=&block[n] -+ ldr r0, [sp, #0] @ R0=block -+ teq r0, r14 @ compare current &block[n] to block, when block is reached, the loop is finished. -+ sub r14, r14, #2 -+ bne __col_loop -+ -+ -+ -+ -+__end_simple_idct_ARM: -+ @@ restore registers to previous status! -+ add sp, sp, #8 @@ the local variables! -+ ldmfd sp!, {r4-r11, r15} @@ update PC with LR content. -+ -+ -+ -+@@ kind of sub-function, here not to overload the common case. -+__end_bef_a_evaluation: -+ add r2, r6, r11 @ R2=a0+W6*ROWr16[2] (a1) -+ mul r11, r8, r4 @ R11=W2*ROWr16[2] -+ sub r4, r6, r11 @ R4=a0-W2*ROWr16[2] (a3) -+ add r6, r6, r11 @ R6=a0+W2*ROWr16[2] (a0) -+ bal __end_a_evaluation - -- mov lr, r0 @ lr = pointer to the current row -- mov r12, #8 @ r12 = row-counter -- add r11, pc, #(const_array-.-8) @ r11 = base pointer to the constants array --row_loop: -- ldrsh r0, [lr, # 0] @ r0 = 'd0' -- ldrsh r1, [lr, # 8] @ r1 = 'd1' -- -- @ Optimization for row that have all items except the first set to 0 -- @ (this works as the DCTELEMS are always 4-byte aligned) -- ldr r5, [lr, # 0] -- ldr r2, [lr, # 4] -- ldr r3, [lr, # 8] -- ldr r4, [lr, #12] -- orr r3, r3, r4 -- orr r3, r3, r2 -- orrs r5, r3, r5 -- beq end_of_row_loop @ nothing to be done as ALL of them are '0' -- orrs r2, r3, r1 -- beq empty_row -- -- ldrsh r2, [lr, # 2] @ r2 = 'd2' -- ldrsh r4, [lr, # 4] @ r4 = 'd4' -- ldrsh r6, [lr, # 6] @ r6 = 'd6' -- -- ldr r3, [r11, #FIX_0_541196100_ID] -- add r7, r2, r6 -- ldr r5, [r11, #FIX_M_1_847759065_ID] -- mul r7, r3, r7 @ r7 = z1 -- ldr r3, [r11, #FIX_0_765366865_ID] -- mla r6, r5, r6, r7 @ r6 = tmp2 -- add r5, r0, r4 @ r5 = tmp0 -- mla r2, r3, r2, r7 @ r2 = tmp3 -- sub r3, r0, r4 @ r3 = tmp1 -- -- add r0, r2, r5, lsl #13 @ r0 = tmp10 -- rsb r2, r2, r5, lsl #13 @ r2 = tmp13 -- add r4, r6, r3, lsl #13 @ r4 = tmp11 -- rsb r3, r6, r3, lsl #13 @ r3 = tmp12 -- -- stmdb sp!, { r0, r2, r3, r4 } @ save on the stack tmp10, tmp13, tmp12, tmp11 -- -- ldrsh r3, [lr, #10] @ r3 = 'd3' -- ldrsh r5, [lr, #12] @ r5 = 'd5' -- ldrsh r7, [lr, #14] @ r7 = 'd7' -- -- add r0, r3, r5 @ r0 = 'z2' -- add r2, r1, r7 @ r2 = 'z1' -- add r4, r3, r7 @ r4 = 'z3' -- add r6, r1, r5 @ r6 = 'z4' -- ldr r9, [r11, #FIX_1_175875602_ID] -- add r8, r4, r6 @ r8 = z3 + z4 -- ldr r10, [r11, #FIX_M_0_899976223_ID] -- mul r8, r9, r8 @ r8 = 'z5' -- ldr r9, [r11, #FIX_M_2_562915447_ID] -- mul r2, r10, r2 @ r2 = 'z1' -- ldr r10, [r11, #FIX_M_1_961570560_ID] -- mul r0, r9, r0 @ r0 = 'z2' -- ldr r9, [r11, #FIX_M_0_390180644_ID] -- mla r4, r10, r4, r8 @ r4 = 'z3' -- ldr r10, [r11, #FIX_0_298631336_ID] -- mla r6, r9, r6, r8 @ r6 = 'z4' -- ldr r9, [r11, #FIX_2_053119869_ID] -- mla r7, r10, r7, r2 @ r7 = tmp0 + z1 -- ldr r10, [r11, #FIX_3_072711026_ID] -- mla r5, r9, r5, r0 @ r5 = tmp1 + z2 -- ldr r9, [r11, #FIX_1_501321110_ID] -- mla r3, r10, r3, r0 @ r3 = tmp2 + z2 -- add r7, r7, r4 @ r7 = tmp0 -- mla r1, r9, r1, r2 @ r1 = tmp3 + z1 -- add r5, r5, r6 @ r5 = tmp1 -- add r3, r3, r4 @ r3 = tmp2 -- add r1, r1, r6 @ r1 = tmp3 -- -- ldmia sp!, { r0, r2, r4, r6 } @ r0 = tmp10 / r2 = tmp13 / r4 = tmp12 / r6 = tmp11 -- @ r1 = tmp3 / r3 = tmp2 / r5 = tmp1 / r7 = tmp0 -- -- @ Compute DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) -- add r8, r0, r1 -- add r8, r8, #(1<<10) -- mov r8, r8, asr #11 -- strh r8, [lr, # 0] -- -- @ Compute DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) -- sub r8, r0, r1 -- add r8, r8, #(1<<10) -- mov r8, r8, asr #11 -- strh r8, [lr, #14] -- -- @ Compute DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) -- add r8, r6, r3 -- add r8, r8, #(1<<10) -- mov r8, r8, asr #11 -- strh r8, [lr, # 2] -- -- @ Compute DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) -- sub r8, r6, r3 -- add r8, r8, #(1<<10) -- mov r8, r8, asr #11 -- strh r8, [lr, #12] -- -- @ Compute DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) -- add r8, r4, r5 -- add r8, r8, #(1<<10) -- mov r8, r8, asr #11 -- strh r8, [lr, # 4] -- -- @ Compute DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) -- sub r8, r4, r5 -- add r8, r8, #(1<<10) -- mov r8, r8, asr #11 -- strh r8, [lr, #10] -- -- @ Compute DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) -- add r8, r2, r7 -- add r8, r8, #(1<<10) -- mov r8, r8, asr #11 -- strh r8, [lr, # 6] -- -- @ Compute DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) -- sub r8, r2, r7 -- add r8, r8, #(1<<10) -- mov r8, r8, asr #11 -- strh r8, [lr, # 8] -- -- @ End of row loop -- add lr, lr, #16 -- subs r12, r12, #1 -- bne row_loop -- beq start_column_loop -- --empty_row: -- ldr r1, [r11, #FIX_0xFFFF_ID] -- mov r0, r0, lsl #2 -- and r0, r0, r1 -- add r0, r0, r0, lsl #16 -- str r0, [lr, # 0] -- str r0, [lr, # 4] -- str r0, [lr, # 8] -- str r0, [lr, #12] -- --end_of_row_loop: -- @ End of loop -- add lr, lr, #16 -- subs r12, r12, #1 -- bne row_loop -- --start_column_loop: -- @ Start of column loop -- ldr lr, [ sp ] -- mov r12, #8 --column_loop: -- ldrsh r0, [lr, #( 0*8)] @ r0 = 'd0' -- ldrsh r2, [lr, #( 4*8)] @ r2 = 'd2' -- ldrsh r4, [lr, #( 8*8)] @ r4 = 'd4' -- ldrsh r6, [lr, #(12*8)] @ r6 = 'd6' -- -- ldr r3, [r11, #FIX_0_541196100_ID] -- add r1, r2, r6 -- ldr r5, [r11, #FIX_M_1_847759065_ID] -- mul r1, r3, r1 @ r1 = z1 -- ldr r3, [r11, #FIX_0_765366865_ID] -- mla r6, r5, r6, r1 @ r6 = tmp2 -- add r5, r0, r4 @ r5 = tmp0 -- mla r2, r3, r2, r1 @ r2 = tmp3 -- sub r3, r0, r4 @ r3 = tmp1 -- -- add r0, r2, r5, lsl #13 @ r0 = tmp10 -- rsb r2, r2, r5, lsl #13 @ r2 = tmp13 -- add r4, r6, r3, lsl #13 @ r4 = tmp11 -- rsb r6, r6, r3, lsl #13 @ r6 = tmp12 -- -- ldrsh r1, [lr, #( 2*8)] @ r1 = 'd1' -- ldrsh r3, [lr, #( 6*8)] @ r3 = 'd3' -- ldrsh r5, [lr, #(10*8)] @ r5 = 'd5' -- ldrsh r7, [lr, #(14*8)] @ r7 = 'd7' -- -- @ Check for empty odd column (happens about 20 to 25 % of the time according to my stats) -- orr r9, r1, r3 -- orr r10, r5, r7 -- orrs r10, r9, r10 -- beq empty_odd_column -- -- stmdb sp!, { r0, r2, r4, r6 } @ save on the stack tmp10, tmp13, tmp12, tmp11 -- -- add r0, r3, r5 @ r0 = 'z2' -- add r2, r1, r7 @ r2 = 'z1' -- add r4, r3, r7 @ r4 = 'z3' -- add r6, r1, r5 @ r6 = 'z4' -- ldr r9, [r11, #FIX_1_175875602_ID] -- add r8, r4, r6 -- ldr r10, [r11, #FIX_M_0_899976223_ID] -- mul r8, r9, r8 @ r8 = 'z5' -- ldr r9, [r11, #FIX_M_2_562915447_ID] -- mul r2, r10, r2 @ r2 = 'z1' -- ldr r10, [r11, #FIX_M_1_961570560_ID] -- mul r0, r9, r0 @ r0 = 'z2' -- ldr r9, [r11, #FIX_M_0_390180644_ID] -- mla r4, r10, r4, r8 @ r4 = 'z3' -- ldr r10, [r11, #FIX_0_298631336_ID] -- mla r6, r9, r6, r8 @ r6 = 'z4' -- ldr r9, [r11, #FIX_2_053119869_ID] -- mla r7, r10, r7, r2 @ r7 = tmp0 + z1 -- ldr r10, [r11, #FIX_3_072711026_ID] -- mla r5, r9, r5, r0 @ r5 = tmp1 + z2 -- ldr r9, [r11, #FIX_1_501321110_ID] -- mla r3, r10, r3, r0 @ r3 = tmp2 + z2 -- add r7, r7, r4 @ r7 = tmp0 -- mla r1, r9, r1, r2 @ r1 = tmp3 + z1 -- add r5, r5, r6 @ r5 = tmp1 -- add r3, r3, r4 @ r3 = tmp2 -- add r1, r1, r6 @ r1 = tmp3 -- -- ldmia sp!, { r0, r2, r4, r6 } @ r0 = tmp10 / r2 = tmp13 / r4 = tmp11 / r6 = tmp12 -- @ r1 = tmp3 / r3 = tmp2 / r5 = tmp1 / r7 = tmp0 -- -- @ Compute DESCALE(tmp10 + tmp3, CONST_BITS+PASS1_BITS+3) -- add r8, r0, r1 -- add r8, r8, #(1<<17) -- mov r8, r8, asr #18 -- strh r8, [lr, #( 0*8)] -- -- @ Compute DESCALE(tmp10 - tmp3, CONST_BITS+PASS1_BITS+3) -- sub r8, r0, r1 -- add r8, r8, #(1<<17) -- mov r8, r8, asr #18 -- strh r8, [lr, #(14*8)] -- -- @ Compute DESCALE(tmp11 + tmp2, CONST_BITS+PASS1_BITS+3) -- add r8, r4, r3 -- add r8, r8, #(1<<17) -- mov r8, r8, asr #18 -- strh r8, [lr, #( 2*8)] -- -- @ Compute DESCALE(tmp11 - tmp2, CONST_BITS+PASS1_BITS+3) -- sub r8, r4, r3 -- add r8, r8, #(1<<17) -- mov r8, r8, asr #18 -- strh r8, [lr, #(12*8)] -- -- @ Compute DESCALE(tmp12 + tmp1, CONST_BITS+PASS1_BITS+3) -- add r8, r6, r5 -- add r8, r8, #(1<<17) -- mov r8, r8, asr #18 -- strh r8, [lr, #( 4*8)] -- -- @ Compute DESCALE(tmp12 - tmp1, CONST_BITS+PASS1_BITS+3) -- sub r8, r6, r5 -- add r8, r8, #(1<<17) -- mov r8, r8, asr #18 -- strh r8, [lr, #(10*8)] -- -- @ Compute DESCALE(tmp13 + tmp0, CONST_BITS+PASS1_BITS+3) -- add r8, r2, r7 -- add r8, r8, #(1<<17) -- mov r8, r8, asr #18 -- strh r8, [lr, #( 6*8)] -- -- @ Compute DESCALE(tmp13 - tmp0, CONST_BITS+PASS1_BITS+3) -- sub r8, r2, r7 -- add r8, r8, #(1<<17) -- mov r8, r8, asr #18 -- strh r8, [lr, #( 8*8)] -- -- @ End of row loop -- add lr, lr, #2 -- subs r12, r12, #1 -- bne column_loop -- beq the_end -- --empty_odd_column: -- @ Compute DESCALE(tmp10 + tmp3, CONST_BITS+PASS1_BITS+3) -- @ Compute DESCALE(tmp10 - tmp3, CONST_BITS+PASS1_BITS+3) -- add r0, r0, #(1<<17) -- mov r0, r0, asr #18 -- strh r0, [lr, #( 0*8)] -- strh r0, [lr, #(14*8)] -- -- @ Compute DESCALE(tmp11 + tmp2, CONST_BITS+PASS1_BITS+3) -- @ Compute DESCALE(tmp11 - tmp2, CONST_BITS+PASS1_BITS+3) -- add r4, r4, #(1<<17) -- mov r4, r4, asr #18 -- strh r4, [lr, #( 2*8)] -- strh r4, [lr, #(12*8)] -- -- @ Compute DESCALE(tmp12 + tmp1, CONST_BITS+PASS1_BITS+3) -- @ Compute DESCALE(tmp12 - tmp1, CONST_BITS+PASS1_BITS+3) -- add r6, r6, #(1<<17) -- mov r6, r6, asr #18 -- strh r6, [lr, #( 4*8)] -- strh r6, [lr, #(10*8)] -- -- @ Compute DESCALE(tmp13 + tmp0, CONST_BITS+PASS1_BITS+3) -- @ Compute DESCALE(tmp13 - tmp0, CONST_BITS+PASS1_BITS+3) -- add r2, r2, #(1<<17) -- mov r2, r2, asr #18 -- strh r2, [lr, #( 6*8)] -- strh r2, [lr, #( 8*8)] -- -- @ End of row loop -- add lr, lr, #2 -- subs r12, r12, #1 -- bne column_loop -- --the_end: -- @ The end.... -- add sp, sp, #4 -- ldmia sp!, { r4 - r12, pc } @ restore callee saved regs and return - --const_array: -+__constant_ptr__: @@ see #defines at the beginning of the source code for values. - .align -- .word FIX_0_298631336 -- .word FIX_0_541196100 -- .word FIX_0_765366865 -- .word FIX_1_175875602 -- .word FIX_1_501321110 -- .word FIX_2_053119869 -- .word FIX_3_072711026 -- .word FIX_M_0_390180644 -- .word FIX_M_0_899976223 -- .word FIX_M_1_847759065 -- .word FIX_M_1_961570560 -- .word FIX_M_2_562915447 -- .word FIX_0xFFFF -+ .word W1 -+ .word W2 -+ .word W3 -+ .word W4 -+ .word W5 -+ .word W6 -+ .word W7 -+ .word MASK_MSHW -+ -+ diff --git a/packages/libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch b/packages/libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch deleted file mode 100644 index f52754d6a7..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch +++ /dev/null @@ -1,37 +0,0 @@ -Copyright (C) 2002, Fred Boulay <dilb@handhelds.org> -Licensed under GPL v2 - ---- src/libvorbis/xine_decoder.c.orig 2002-12-18 01:35:37.000000000 +0100 -+++ src/libvorbis/xine_decoder.c 2002-12-18 01:35:48.000000000 +0100 -@@ -34,7 +34,7 @@ - #include "buffer.h" - - #include <ogg/ogg.h> --#include <vorbis/codec.h> -+#include <tremor/ivorbiscodec.h> - - #define MAX_NUM_SAMPLES 4096 - ---- src/libvorbis/xine_decoder.c.orig 2002-12-19 17:09:30.000000000 +0100 -+++ src/libvorbis/xine_decoder.c 2002-12-19 17:09:35.000000000 +0100 -@@ -202,7 +202,7 @@ static void vorbis_decode_data (audio_de - - } else if (this->output_open) { - -- float **pcm; -+ int **pcm; - int samples; - - if(vorbis_synthesis(&this->vb,op)==0) -@@ -221,9 +221,9 @@ static void vorbis_decode_data (audio_de - interleave */ - for(i=0;i<this->vi.channels;i++){ - ogg_int16_t *ptr=audio_buffer->mem+i; -- float *mono=pcm[i]; -+ int *mono=pcm[i]; - for(j=0;j<bout;j++){ -- int val=mono[j]*32767.f; -+ int val=mono[j]>>9; - /* might as well guard against clipping */ - if(val>32767){ - val=32767; diff --git a/packages/libxine/libxine-1.0.0-beta12/libxine-ogg-demux.patch b/packages/libxine/libxine-1.0.0-beta12/libxine-ogg-demux.patch deleted file mode 100644 index 15cdab68d1..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/libxine-ogg-demux.patch +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (C) 2002, Fred Boulay <dilb@handhelds.org> -Licensed under GPL v2 - ---- src/demuxers/demux_ogg.c.orig 2002-12-17 18:46:48.000000000 +0100 -+++ src/demuxers/demux_ogg.c 2002-12-17 18:47:26.000000000 +0100 -@@ -35,7 +35,7 @@ - #include <stdlib.h> - - #include <ogg/ogg.h> --#include <vorbis/codec.h> -+#include <tremor/ivorbiscodec.h> - - #include "xine_internal.h" - #include "xineutils.h" ---- src/demuxers/Makefile.am.orig 2002-12-19 17:18:12.000000000 +0100 -+++ src/demuxers/Makefile.am 2002-12-19 17:18:32.000000000 +0100 -@@ -1,4 +1,4 @@ --AM_CFLAGS = $(OGG_CFLAGS) @ANSI_FLAGS@ -+AM_CFLAGS = $(OGG_CFLAGS) $(VORBIS_CFLAGS) @ANSI_FLAGS@ - - LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - diff --git a/packages/libxine/libxine-1.0.0-beta12/libxine-tremor-autoconf.patch b/packages/libxine/libxine-1.0.0-beta12/libxine-tremor-autoconf.patch deleted file mode 100644 index a01aab20c2..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/libxine-tremor-autoconf.patch +++ /dev/null @@ -1,14 +0,0 @@ -Copyright (C) 2002, Fred Boulay <dilb@handhelds.org> -Licensed under GPL v2 - ---- m4/vorbis.m4.orig 2002-12-17 10:21:44.000000000 +0100 -+++ m4/vorbis.m4 2002-12-17 10:21:54.000000000 +0100 -@@ -18,7 +18,7 @@ AC_ARG_ENABLE(vorbistest, [ --disable-v - VORBIS_LIBDIR="-L$vorbis_prefix/lib" - fi - -- VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm" -+ VORBIS_LIBS="$VORBIS_LIBDIR -lvorbisidec -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" - diff --git a/packages/libxine/libxine-1.0.0-beta12/mpegvideo-static-inlining.patch b/packages/libxine/libxine-1.0.0-beta12/mpegvideo-static-inlining.patch deleted file mode 100644 index 8d627feace..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/mpegvideo-static-inlining.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../libxine-1.0.0-beta12-r0/xine-lib/src/libffmpeg/libavcodec/mpegvideo.c 2003-05-10 00:54:05.000000000 +0100 -+++ xine-lib/src/libffmpeg/libavcodec/mpegvideo.c 2004-08-17 16:05:41.000000000 +0100 -@@ -1860,7 +1860,7 @@ - pix_op[1][dxy](dest_cr + (dest_offset >> 1), ptr, uvlinesize, h >> 1); - } - --inline int ff_h263_round_chroma(int x){ -+static inline int ff_h263_round_chroma(int x){ - if (x >= 0) - return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); - else { diff --git a/packages/libxine/libxine-1.0.0-beta12/oss.patch b/packages/libxine/libxine-1.0.0-beta12/oss.patch deleted file mode 100644 index 12ea1b4b60..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/oss.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/audio_out/Makefile.am.patched 2003-12-07 14:59:19.466805328 -0600 -+++ src/audio_out/Makefile.am 2003-12-07 14:59:43.083215088 -0600 -@@ -6,9 +6,9 @@ - - libdir = $(XINE_PLUGINDIR) - --if HAVE_OSS -+#if HAVE_OSS - oss_module = xineplug_ao_out_oss.la --endif -+#endif - - if HAVE_ALSA - if HAVE_ALSA09 - diff --git a/packages/libxine/libxine-1.0.0-beta12/uclibc.patch b/packages/libxine/libxine-1.0.0-beta12/uclibc.patch deleted file mode 100644 index 787e46a081..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/uclibc.patch +++ /dev/null @@ -1,55 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- xine-lib/configure.ac~uclibc 2003-09-28 16:42:13.000000000 +0200 -+++ xine-lib/configure.ac 2003-09-28 16:42:13.000000000 +0200 -@@ -190,7 +190,7 @@ - *) - AC_CHECK_LIB(pthread, pthread_create, - [THREAD_LIBS="-lpthread"], -- [AC_MSG_ERROR(pthread needed)]) -+ [AC_MSG_WARN(pthread needed)]) - ;; - esac - AC_SUBST(THREAD_LIBS) ---- xine-lib/src/xine-engine/osd.c~uclibc 2003-04-27 17:57:54.000000000 +0200 -+++ xine-lib/src/xine-engine/osd.c 2003-09-28 16:42:13.000000000 +0200 -@@ -34,10 +34,6 @@ - #include <dirent.h> - #include <errno.h> - --#ifndef _MSC_VER --#include <iconv.h> --#endif /* _MSC_VER */ -- - #ifdef HAVE_LANGINFO_CODESET - #include <langinfo.h> - #endif -@@ -98,6 +94,8 @@ - }; - #endif - -+#define _MSC_VER -+ - /* - * open a new osd object. this will allocated an empty (all zero) drawing - * area where graphic primitives may be used. -@@ -1220,3 +1218,6 @@ - - return this; - } -+ -+#undef _MSC_VER -+ ---- xine-lib/src/video_out/video_out_fb.c~uclibc 2003-03-19 16:29:27.000000000 +0100 -+++ xine-lib/src/video_out/video_out_fb.c 2003-09-28 17:16:05.000000000 +0200 -@@ -71,7 +71,6 @@ - #include <netinet/in.h> - - #include <linux/fb.h> --#include <linux/kd.h> - #include <linux/vt.h> - - #include "xine_internal.h" diff --git a/packages/libxine/libxine-1.0.0-beta12/vo_scale.patch b/packages/libxine/libxine-1.0.0-beta12/vo_scale.patch deleted file mode 100644 index e1ca00ef99..0000000000 --- a/packages/libxine/libxine-1.0.0-beta12/vo_scale.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xine-lib/src/xine-engine/vo_scale.h 2003-04-25 17:34:48.000000000 +0200 -+++ xine-lib/src/xine-engine/vo_scale.h.patched 2003-08-10 19:40:37.000000000 +0200 -@@ -36,7 +36,7 @@ - #endif - - /* Added during _MSC_VER port */ --#include <configfile.h> -+#include "configfile.h" - - typedef struct { - int x, y; diff --git a/packages/libxine/libxine-1.0.0-rc5/configure.patch b/packages/libxine/libxine-1.0.0-rc5/configure.patch deleted file mode 100644 index 155027efac..0000000000 --- a/packages/libxine/libxine-1.0.0-rc5/configure.patch +++ /dev/null @@ -1,95 +0,0 @@ -Xine is stupid in that they don't have --with or --without comments for -all of their items. That should be fixed, but until then, this configure -script should avoid some of the pain and or suffering - ---- xine-lib-1-rc5/configure.ac 2004-06-20 16:39:04.000000000 -0700 -+++ xine-lib-1-rc5.new/configure.ac 2004-06-29 15:06:26.057570960 -0700 -@@ -887,46 +887,28 @@ - dnl Ogg/Theora libs. - dnl --------------------------------------------- - --AM_PATH_OGG( -- [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]), -- AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***])) -- ], -- AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"]) -+AM_CONDITIONAL(HAVE_THEORA, 0) - - - dnl --------------------------------------------- - dnl Ogg/Speex libs. - dnl --------------------------------------------- - --AM_PATH_OGG( -- [ AM_PATH_SPEEX(AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex]), -- AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])) -- ], -- AC_MSG_RESULT([*** All of OGG/Speex dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"]) -- -+AM_CONDITIONAL(HAVE_SPEEX, 0) - - dnl --------------------------------------------- - dnl check for libFLAC - dnl --------------------------------------------- - --AM_PATH_LIBFLAC([], -- AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"]) -+AM_CONDITIONAL(HAVE_FLAC, 0) - - - dnl --------------------------------------------- - dnl MNG libs. - dnl --------------------------------------------- - --AC_CHECK_LIB(mng, mng_initialize, -- [ AC_CHECK_HEADER(libmng.h, -- [ have_libmng=yes -- MNG_LIBS="-lmng" ], -- AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))], -- AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes") -+MNG_LIBS="" -+AM_CONDITIONAL(HAVE_LIBMNG, 0) - AC_SUBST(MNG_LIBS) - - -@@ -1204,35 +1186,7 @@ - ],ISOC99_PRAGMA=no) - AC_MSG_RESULT($ISOC99_PRAGMA) - -- dnl bitfield order -- AC_MSG_CHECKING(bitfield ordering in structs) -- AC_TRY_RUN([ --int -- main() { -- struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; } --#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -- __attribute__((packed)) --#endif -- bf = { 1,1,1,1 }; -- if (sizeof (bf) != 1) return 1; -- return *((unsigned char*) &bf) != 0x4b; } --], bf_lsbf=1, AC_TRY_RUN([ --int --main() { -- struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; } --#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -- __attribute__((packed)) --#endif -- bf = { 1,1,1,1 }; -- if (sizeof (bf) != 1) return 1; -- return *((unsigned char*) &bf) != 0xa5; } --], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering]))) -- if test "x$bf_lsbf" = "x1"; then -- AC_MSG_RESULT(LSBF) -- AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields]) -- else -- AC_MSG_RESULT(MSBF) -- fi -+ AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields]) - - AC_HAVE_HEADERS( errno.h fcntl.h \ - stdbool.h stdlib.h stdint.h stdio.h string.h \ diff --git a/packages/libxine/libxine-1.0.0-rc5/cpu.patch b/packages/libxine/libxine-1.0.0-rc5/cpu.patch deleted file mode 100644 index a2444d9ed3..0000000000 --- a/packages/libxine/libxine-1.0.0-rc5/cpu.patch +++ /dev/null @@ -1,75 +0,0 @@ -For those x86 folks - ebx is used by PIC and shouldn't be used by -anyone else - ---- xine-lib-1-rc5/src/post/goom/zoom_filter_xmmx.c 2003-09-15 15:53:53.000000000 -0700 -+++ xine-lib-1-rc5.new/src/post/goom/zoom_filter_xmmx.c 2004-06-29 15:25:45.763268896 -0700 -@@ -108,23 +108,23 @@ - * post : mm3 & mm4 : coefs for this position - * mm1 : X vector [0|X] - * -- * modif : eax,ebx -+ * modif : eax,ecx - */ - __asm__ __volatile__ ( -- "movd %%mm0,%%ebx\n" -+ "movd %%mm0,%%ecx\n" - "movq %%mm0,%%mm1\n" - -- "andl $15,%%ebx\n" -+ "andl $15,%%ecx\n" - "psrlq $32,%%mm1\n" - -- "shll $6,%%ebx\n" -+ "shll $6,%%ecx\n" - "movd %%mm1,%%eax\n" - -- "addl %0,%%ebx\n" -+ "addl %0,%%ecx\n" - "andl $15,%%eax\n" - -- "movd (%%ebx,%%eax,4),%%mm3\n" -- ::"X"(precalCoef):"eax","ebx"); -+ "movd (%%ecx,%%eax,4),%%mm3\n" -+ ::"X"(precalCoef):"eax","ecx"); - - /* - * extraction des coefficients... -@@ -152,7 +152,7 @@ - * post : mm0 : expix1[position] - * mm2 : expix1[position+largeur] - * -- * modif : eax,ebx -+ * modif : eax,ecx - */ - psrld_i2r (PERTEDEC,mm0); - psrld_i2r (PERTEDEC,mm1); -@@ -161,23 +161,23 @@ - /*^*/ "movq %%mm3,%%mm5\n" /*^*/ - - "mull %1\n" -- "movd %%mm0,%%ebx\n" -+ "movd %%mm0,%%ecx\n" - /*^*/ "punpcklbw %%mm5, %%mm3\n" /*^*/ - -- "addl %%ebx,%%eax\n" -+ "addl %%ecx,%%eax\n" - /*^*/ "movq %%mm3,%%mm4\n" /*^*/ - /*^*/ "movq %%mm3,%%mm5\n" /*^*/ - -- "movl %0,%%ebx\n" -+ "movl %0,%%ecx\n" - /*^*/ "punpcklbw %%mm5,%%mm3\n" /*^*/ - -- "movq (%%ebx,%%eax,4),%%mm0\n" -+ "movq (%%ecx,%%eax,4),%%mm0\n" - /*^*/ "punpckhbw %%mm5,%%mm4\n" /*^*/ - - "addl %1,%%eax\n" -- "movq (%%ebx,%%eax,4),%%mm2\n" -+ "movq (%%ecx,%%eax,4),%%mm2\n" - -- : : "X"(expix1), "X"(prevX):"eax","ebx" -+ : : "X"(expix1), "X"(prevX):"eax","ecx" - ); - - /* diff --git a/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch b/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch deleted file mode 100644 index 81bcbd5468..0000000000 --- a/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch +++ /dev/null @@ -1,39 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: xine-lib-1.0/src/libvorbis/xine_decoder.c -=================================================================== ---- xine-lib-1.0.orig/src/libvorbis/xine_decoder.c 2005-02-20 18:21:57.924625900 +0100 -+++ xine-lib-1.0/src/libvorbis/xine_decoder.c 2005-02-20 18:52:02.016033646 +0100 -@@ -40,7 +40,7 @@ - #include "buffer.h" - - #include <ogg/ogg.h> --#include <vorbis/codec.h> -+#include <tremor/ivorbiscodec.h> - - #define MAX_NUM_SAMPLES 4096 - -@@ -216,7 +216,7 @@ - - } else if (this->output_open) { - -- float **pcm; -+ int **pcm; - int samples; - - if(vorbis_synthesis(&this->vb,&this->op,1)==0) -@@ -245,9 +245,9 @@ - interleave */ - for(i=0;i<this->vi.channels;i++){ - ogg_int16_t *ptr=audio_buffer->mem+i; -- float *mono=pcm[i]; -+ int *mono=pcm[i]; - for(j=0;j<bout;j++){ -- int val=mono[j]*32767.f; -+ int val=mono[j]>>9; - /* might as well guard against clipping */ - if(val>32767){ - val=32767; diff --git a/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch b/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch deleted file mode 100644 index bbedc81de3..0000000000 --- a/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xine-lib-1-rc7/m4/vorbis.m4~libxine-tremor-autoconf -+++ xine-lib-1-rc7/m4/vorbis.m4 -@@ -18,7 +18,7 @@ - VORBIS_LIBDIR="-L$vorbis_prefix/$XINE_LIBNAME" - fi - -- VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm" -+ VORBIS_LIBS="$VORBIS_LIBDIR -lvorbisidec -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" - diff --git a/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch b/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch deleted file mode 100644 index 2269b3b14e..0000000000 --- a/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urNd ../libxine-1.0.0-rc5-r0.old/xine-lib-1-rc5/configure.ac xine-lib-1-rc5/configure.ac ---- ../libxine-1.0.0-rc5-r0.old/xine-lib-1-rc5/configure.ac 2004-06-21 00:39:04 +01:00 -+++ xine-lib-1-rc5/configure.ac 2005-04-08 02:47:53 +01:00 -@@ -607,16 +607,16 @@ - dnl Checks for Ascii-Art library - dnl --------------------------------------------- - --AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes") -+dnl AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***])) -+AM_CONDITIONAL(HAVE_AA, 0) - - - dnl --------------------------------------------- - dnl Checks for Color AsCii Art library - dnl --------------------------------------------- - --AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***])) --AM_CONDITIONAL(HAVE_CACA, test x$no_caca != "xyes") -+dnl AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***])) -+AM_CONDITIONAL(HAVE_CACA, 0) - - - dnl --------------------------------------------- diff --git a/packages/nonworking/esmart/.mtn2git_empty b/packages/libxine/libxine-fb/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/esmart/.mtn2git_empty +++ b/packages/libxine/libxine-fb/.mtn2git_empty diff --git a/packages/libxine/libxine-opie-1.0/configure-1.0.patch b/packages/libxine/libxine-fb/configure-1.0.patch index 015f2fc1ca..015f2fc1ca 100644 --- a/packages/libxine/libxine-opie-1.0/configure-1.0.patch +++ b/packages/libxine/libxine-fb/configure-1.0.patch diff --git a/packages/libxine/libxine-opie-1.0/demuxogg.patch b/packages/libxine/libxine-fb/demuxogg.patch index 55f239cfad..55f239cfad 100644 --- a/packages/libxine/libxine-opie-1.0/demuxogg.patch +++ b/packages/libxine/libxine-fb/demuxogg.patch diff --git a/packages/libxine/libxine-opie-1.0/fix-syntax.patch b/packages/libxine/libxine-fb/fix-syntax.patch index b129dec36c..b129dec36c 100644 --- a/packages/libxine/libxine-opie-1.0/fix-syntax.patch +++ b/packages/libxine/libxine-fb/fix-syntax.patch diff --git a/packages/libxine/libxine-opie-1.0/libxine-arm-configure.patch b/packages/libxine/libxine-fb/libxine-arm-configure.patch index fa80ea6b13..fa80ea6b13 100644 --- a/packages/libxine/libxine-opie-1.0/libxine-arm-configure.patch +++ b/packages/libxine/libxine-fb/libxine-arm-configure.patch diff --git a/packages/libxine/libxine-opie-1.0/no-caca.patch b/packages/libxine/libxine-fb/no-caca.patch index 978c4fc38a..978c4fc38a 100644 --- a/packages/libxine/libxine-opie-1.0/no-caca.patch +++ b/packages/libxine/libxine-fb/no-caca.patch diff --git a/packages/libxine/libxine-opie_1.0.bb b/packages/libxine/libxine-fb_1.0.bb index 58fc07b8ba..762eee27db 100644 --- a/packages/libxine/libxine-opie_1.0.bb +++ b/packages/libxine/libxine-fb_1.0.bb @@ -1,18 +1,14 @@ -LICENSE = "GPL" -# libxine OE build file -# Modified by Advanced Micro Devices, Inc. - -DESCRIPTION = "libxine compiled for Opie" +DESCRIPTION = "libxine is a multimedia library with support for many common audio and video formats \ +This version is configured for the usage with framebuffer based environments" SECTION = "libs" PRIORITY = "optional" -MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" -DEPENDS = "zlib libogg tremor libmad" +LICENSE = "GPL" +DEPENDS = "zlib libogg tremor libmad libmodplug" PROVIDES = "virtual/libxine" +PR = "r0" inherit autotools pkgconfig gettext -S = "${WORKDIR}/xine-lib-${PV}" - SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \ file://cpu-${PV}.patch;patch=1 \ file://configure-${PV}.patch;patch=1 \ @@ -25,17 +21,10 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar. file://mpegvideo-static-inlinine.patch;patch=1 \ file://libxine-arm-configure.patch;patch=1 \ file://no-caca.patch;patch=1 " - - +S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -# Omit the annoying xine-config in ${bindir} -FILES_${PN}="${libdir}/*.so*" - -# And include it in the dev package -FILES_${PN}-dev += " ${bindir}" - EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ --disable-oggtest \ @@ -96,3 +85,10 @@ python populate_packages_prepend () { fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d) do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' ) } + +# Omit the annoying xine-config in ${bindir} +FILES_${PN}="${libdir}/*.so*" + +# And include it in the dev package +FILES_${PN}-dev += " ${bindir}" + diff --git a/packages/libxine/libxine-x11-1.0/.mtn2git_empty b/packages/libxine/libxine-x11-1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-x11-1.0/.mtn2git_empty diff --git a/packages/libxine/libxine-1.0/dont-have-xv.patch b/packages/libxine/libxine-x11-1.0/dont-have-xv.patch index 674e0e3852..674e0e3852 100644 --- a/packages/libxine/libxine-1.0/dont-have-xv.patch +++ b/packages/libxine/libxine-x11-1.0/dont-have-xv.patch diff --git a/packages/libxine/libxine-1.0/fix-syntax-xine-vorbis-decoder.patch b/packages/libxine/libxine-x11-1.0/fix-syntax-xine-vorbis-decoder.patch index a191280e2b..a191280e2b 100644 --- a/packages/libxine/libxine-1.0/fix-syntax-xine-vorbis-decoder.patch +++ b/packages/libxine/libxine-x11-1.0/fix-syntax-xine-vorbis-decoder.patch diff --git a/packages/libxine/libxine-1.0/no-caca-no-aalib.patch b/packages/libxine/libxine-x11-1.0/no-caca-no-aalib.patch index ffdda0c2ca..ffdda0c2ca 100644 --- a/packages/libxine/libxine-1.0/no-caca-no-aalib.patch +++ b/packages/libxine/libxine-x11-1.0/no-caca-no-aalib.patch diff --git a/packages/libxine/libxine-1.0/restore-esd.patch b/packages/libxine/libxine-x11-1.0/restore-esd.patch index 26a74adb80..26a74adb80 100644 --- a/packages/libxine/libxine-1.0/restore-esd.patch +++ b/packages/libxine/libxine-x11-1.0/restore-esd.patch diff --git a/packages/libxine/libxine_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index 5df28de0da..5acd9b93f5 100644 --- a/packages/libxine/libxine_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -1,17 +1,14 @@ -LICENSE = "GPL" - -DESCRIPTION = "libxine" +DESCRIPTION = "libxine is a versatile multimedia library decoding a lot of common audio and video formats. \ +This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" -MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" -DEPENDS = "zlib libogg libvorbis tremor libmad esound-gpe" +LICENSE = "GPL" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe x11 xext" PROVIDES = "virtual/libxine" -PR = "r5" +PR = "r0" inherit autotools pkgconfig gettext binconfig -S = "${WORKDIR}/xine-lib-${PV}" - SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \ file://cpu-${PV}.patch;patch=1 \ file://configure-${PV}.patch;patch=1 \ @@ -25,15 +22,10 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar. file://libxine-cut-memusage.patch;patch=1 \ file://mpegvideo-static-inlinine.patch;patch=1 \ file://libxine-libavcodec.patch;patch=1" +S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -# Omit the annoying xine-config in ${bindir} -FILES_${PN}="${libdir}/*.so*" - -# And include it in the dev package -FILES_${PN}-dev += " ${bindir}" - EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ --disable-oggtest \ @@ -41,7 +33,9 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ --disable-altivec --disable-vis --disable-mlib \ --disable-fb --disable-alsa --disable-vcd \ --disable-asf --disable-faad --disable-iconv \ - --without-v4l --without-arts --without-sdl" + --without-v4l --without-arts --without-sdl \ + --without-xv --without-xxmc --without-xvmc \ + --with-x --x-includes=${STAGING_INCDIR}/X11 --x-libraries=${STAGING_LIBDIR}" do_compile() { oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool @@ -94,3 +88,9 @@ python populate_packages_prepend () { fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d) do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' ) } + +# Omit the annoying xine-config in ${bindir} +FILES_${PN}="${libdir}/*.so*" + +# And include it in the dev package +FILES_${PN}-dev += " ${bindir}" diff --git a/packages/libxine/libxine_1.0.0-beta12.bb b/packages/libxine/libxine_1.0.0-beta12.bb deleted file mode 100644 index 8227130e6f..0000000000 --- a/packages/libxine/libxine_1.0.0-beta12.bb +++ /dev/null @@ -1,92 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "libxine is a library for multimedia players. \ -It plays back CDs, DVDs, and VCDs. It also decodes multimedia \ -files like AVI, MOV, WMV, and MP3 from local disk drives, \ -and displays multimedia streamed over the Internet. It interprets \ -many of the most common multimedia formats available - \ -and some of the most uncommon formats, too." -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "zlib libogg tremor libmad" -PR = "r4" - -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig binconfig gettext - -SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-1-beta12.tar.gz \ - file://full.patch;patch=1 \ - file://libvorbis.patch;patch=1 \ - file://demux_ogg.patch;patch=1 \ - file://configure.ac.patch;patch=1 \ - file://vo_scale.patch;patch=1 \ - file://oss.patch;patch=1;pnum=0 \ - file://fix-oss-plugin.patch;patch=1 \ - file://mpegvideo-static-inlining.patch;patch=1 \ - file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \ - file://fftscope-static-inlining.patch;patch=1" -S = "${WORKDIR}/xine-lib-1-beta12" - -SOV = "1.0.6" - -do_configure() { - ./autogen.sh --host ${TARGET_SYS} --build ${BUILD_SYS} \ - --enable-shared --disable-static --prefix=${prefix} \ - --with-zlib-path=${STAGING_DIR}/${HOST_SYS} --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ - --disable-oggtest --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} --without-x \ - --disable-iconv --without-arts --without-sdl \ - --disable-aalib -} - -do_compile() { - oe_runmake LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool OGG_LIBS=${STAGING_LIBDIR}/libogg.so -} - -do_stage() { - oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \ - -C src install-data \ - 'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \ - 'libdir=${STAGING_LIBDIR}' \ - 'includedir=${STAGING_INCDIR}' - - oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \ - -C include install-data \ - 'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \ - 'libdir=${STAGING_LIBDIR}' \ - 'includedir=${STAGING_INCDIR}' - - for plugin in `find ${S}/src -type f -name xineplug*.la`; do - dir=`dirname $plugin` - libname=`basename $plugin|sed -e's,\.la,,'` - oe_libinstall -so -C $dir $libname ${STAGING_LIBDIR}/xine/plugins/1.0.0 - done - - oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR} -} - -do_install() { - oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \ - -C src install-data \ - 'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}${libdir}' \ - 'includedir=${D}${includedir}' - - oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \ - -C include install-data \ - 'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}${libdir}' \ - 'includedir=${D}${includedir}' - - for plugin in `find ${S}/src -type f -name xineplug*.la`; do - dir=`dirname $plugin` - libname=`basename $plugin|sed -e's,\.la,,'` - oe_libinstall -so -C $dir $libname ${D}${libdir}/xine/plugins/1.0.0 - done - - oe_libinstall -so -C src/xine-engine libxine ${D}${libdir} -} - -python populate_packages_prepend () { - plugins_dir = bb.data.expand('${libdir}/xine/plugins/1.0.0/', d) - - do_split_packages(d, plugins_dir, file_regex='^xineplug_(.*).so$', output_pattern='libxine-plugin-%s', description='Xine plugin - %s') -} - diff --git a/packages/libxine/libxine_1.0.0-rc5.bb b/packages/libxine/libxine_1.0.0-rc5.bb deleted file mode 100644 index dc6cea1b0f..0000000000 --- a/packages/libxine/libxine_1.0.0-rc5.bb +++ /dev/null @@ -1,77 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "libxine" -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" -DEPENDS = "zlib libogg tremor libmad esound-gpe" -PROVIDES = "virtual/libxine" -PR = "r1" - -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig gettext - -S = "${WORKDIR}/xine-lib-1-rc5" - -SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc5.tar.gz \ - file://cpu.patch;patch=1 \ - file://configure.patch;patch=1 \ - file://no-caca-no-aalib.patch;patch=1 \ - file://libxine-tremor-autoconf.patch;patch=1 \ - file://libxine-libvorbis.patch;patch=1" - -SOV = "1.0.6" - -# Omit the annoying xine-config in ${bindir} -FILES_${PN}="${libdir}/*.so*" - -# And include it in the dev package -FILES_${PN}-dev += " ${bindir}" - -EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ - --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ - --disable-oggtest \ - --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \ - --disable-altivec --disable-vis --disable-mlib \ - --disable-fb --disable-alsa --disable-vcd \ - --disable-asf --disable-faad --disable-iconv \ - --without-v4l --without-arts --without-sdl" - -do_compile() { - oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool -} - -do_install() { - oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install -} - -HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h \ - src/xine-engine/xine_internal.h src/xine-engine/xine_plugin.h \ - src/xine-utils/xine_buffer.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xine - - install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR} - - for file in ${HEADERS}; do - cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file` - done - - install -m 0644 ${S}/m4/xine.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR} -} - -python populate_packages_prepend () { - bb.data.setVar('PKG_libxine', 'libxine', d) - - plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d) - do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s') - - postdir = bb.data.expand('${libdir}/xine/plugins/1.0.0/post', d) - do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s') - - fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d) - do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s') -} diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz index 02437440c5..a388797b6e 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.13-rc5-mm1 -# Fri Aug 12 08:40:57 2005 +# Sun Aug 14 22:04:01 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -160,7 +160,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug " +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" # CONFIG_XIP_KERNEL is not set # @@ -519,12 +519,46 @@ CONFIG_NETDEVICES=y # # Wireless LAN (non-hamradio) # -# CONFIG_NET_RADIO is not set +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set +CONFIG_NET_WIRELESS=y # # PCMCIA network device support # -# CONFIG_NET_PCMCIA is not set +CONFIG_NET_PCMCIA=y +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +# CONFIG_PCMCIA_PCNET is not set +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_PCMCIA_AXNET is not set # # Wan interfaces @@ -714,7 +748,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_DEVICE=y -# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_CORGI=y # # Speakup console speech diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index fd6dd9ee37..e624b8a1d5 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r3" +PR = "r8" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -43,9 +43,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc5/2.6.13-rc5-mm1/2.6.13-rc5-mm1.bz2;patch=1 \ ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \ ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \ + ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r2.patch;patch=1 \ - ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ + ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \ @@ -78,11 +79,16 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \ - ${RPSRC}/spitzbase-r0.patch;patch=1 \ + ${RPSRC}/pxa27x_extraregs-r1.patch;patch=1 \ + ${RPSRC}/spitzbase-r3.patch;patch=1 \ ${RPSRC}/spitzkbd-r0.patch;patch=1 \ - ${RPSRC}/spitzssp-r0.patch;patch=1 \ - ${RPSRC}/spitzlcd-r0.patch;patch=1 \ + ${RPSRC}/spitzssp-r4.patch;patch=1 \ + ${RPSRC}/spitzbl-r1.patch;patch=1 \ + ${RPSRC}/spitzts-r1.patch;patch=1 \ + ${RPSRC}/spitzcf-r1.patch;patch=1 \ + ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ + ${RPSRC}/pxa_cf_initorder_hack-r0.patch;patch=1 \ + ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -109,8 +115,6 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ ${DOSRC}/wm9712-ts-r2.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \ ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 " -SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \ - ${RPSRC}/spitzts-r0.patch;patch=1 " S = "${WORKDIR}/linux-2.6.12" diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index a536e866e6..f15fc998a3 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r9" +PR = "r11" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 2e60b1f22a..15f2fecdb1 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -401,11 +401,13 @@ CONFIG_SCSI_QLA2XXX=y # # CONFIG_I2O is not set + # # Networking support # CONFIG_NET=y + # # Networking options # @@ -427,6 +429,11 @@ CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m CONFIG_IP_TCPDIAG=m CONFIG_IP_TCPDIAG_IPV6=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set CONFIG_INET6_AH=m @@ -434,7 +441,82 @@ CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_INET6_TUNNEL=m CONFIG_IPV6_TUNNEL=m -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_MAC=m +CONFIG_IP_NF_MATCH_PKTTYPE=m +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +CONFIG_IP_NF_MATCH_HELPER=m +CONFIG_IP_NF_MATCH_STATE=m +CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_REALM=m +# CONFIG_IP_NF_MATCH_SCTP is not set +CONFIG_IP_NF_MATCH_COMMENT=m +CONFIG_IP_NF_MATCH_HASHLIMIT=m +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_IP_NF_NAT_SNMP_BASIC=m +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m +CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_CLASSIFY=m +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set CONFIG_XFRM=y # CONFIG_XFRM_USER is not set @@ -443,7 +525,7 @@ CONFIG_XFRM=y # # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set -# CONFIG_BRIDGE is not set +CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set CONFIG_LLC=m @@ -487,6 +569,7 @@ CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y # CONFIG_BT_HIDP is not set + # # Bluetooth device drivers # diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 7e380b08cf..01d6ab7e4e 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -388,8 +388,19 @@ CONFIG_IP_PNP_BOOTP=y # # IP: Netfilter Configuration # -# CONFIG_IP_NF_CONNTRACK is not set -# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_FTP is not set +# CONFIG_IP_NF_H323 is not set +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_NF_IRC is not set +# CONFIG_IP_NF_CT_PROTO_GRE is not set +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_MATCH_HELPER is not set +# CONFIG_IP_NF_MATCH_STATE is not set +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_NAT is not set +CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_LIMIT=m CONFIG_IP_NF_MATCH_MAC=m diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb index 604dbd21ba..c02b45505e 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" -PR = "r2" +PR = "r4" KERNEL_SUFFIX = "unslung" diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb new file mode 100644 index 0000000000..0a7a8f3dd2 --- /dev/null +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -0,0 +1,55 @@ +SECTION = "kernel" + +include nslu2-linksys-kernel_2.4.22.bb + +DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" +MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" +PR = "r2" + +KERNEL_SUFFIX = "unslung" + +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" + +UNSLUNG_KERNEL_EXTRA_SRC_URI ?= + +SRC_URI += "file://limit1gb.patch;patch=1 \ + file://gl811e.patch;patch=1 \ + file://ext3flash-on-disk1.patch;patch=1 \ + file://usbnet.patch;patch=1 \ + file://missing-usb-ioctls.patch;patch=1 \ + file://anonymiser.patch;patch=1 \ + file://ppp_mppe.patch;patch=1 \ + file://nfs-blocksize.patch;patch=1 \ + file://pl2303.patch;patch=1 \ + file://linux-kernel-R25_to_R29.patch;patch=1 \ + ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +python () { + # Don't build unslung kernel unless we're targeting an nslu2 + mach = bb.data.getVar("MACHINE", d, 1) + if mach != 'nslu2': + raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") +} + +DEPENDS += "nslu2-linksys-firmware" + +do_deploy_append() { + cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz ${WORKDIR}/vmlinuz + dd if=${WORKDIR}/vmlinuz bs=1 count=11732 > ${WORKDIR}/vmlinuh + dd if=${WORKDIR}/vmlinuz bs=1 skip=11732 count=975109 | gzip -dc > ${WORKDIR}/vmlinux + dd if=${WORKDIR}/vmlinuz bs=1 skip=986841 > ${WORKDIR}/vmlinut + cat ${WORKDIR}/vmlinux | sed \ + -e 's/ram0/slug/' \ + -e 's/\x01\x31\x2c\xff/\x00\x1e\x84\x7f/' \ + | gzip -9 -c > ${WORKDIR}/vmlinux.gz +# -e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \ +# -e 's/flash_\x00/hdd_\x00\x00\x00/' \ +# -e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \ + cat ${WORKDIR}/vmlinuh ${WORKDIR}/vmlinux.gz ${WORKDIR}/vmlinut > ${WORKDIR}/vmlinuz +# dd if=/dev/zero of=${WORKDIR}/padding bs=1 count=9 +# cat ${WORKDIR}/vmlinuh ${WORKDIR}/vmlinux.gz ${WORKDIR}/padding ${WORKDIR}/vmlinut > ${WORKDIR}/vmlinuz + install -d ${DEPLOY_DIR}/images + install -m 0644 ${WORKDIR}/vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX} +} diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png b/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png Binary files differindex e1f529022d..08cd476e8a 100644 --- a/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png +++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb index 31d8241aef..f51d96dd5f 100644 --- a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb +++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb @@ -5,7 +5,7 @@ SRC_URI = "file://xrandr-panelapp.sh \ file://xrandr.png" SECTION = "x11/wm" PRIORITY = "optional" -PR = "r1" +PR = "r2" LICENSE = "MIT" do_install() { diff --git a/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb b/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb index 5fc6cce279..885177de01 100644 --- a/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb +++ b/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" HOMEPAGE = "http://projects.o-hand.com/matchbox/" SRC_URI="http://projects.o-hand.com/matchbox/sources/mb-desktop-xine/0.4/mb-desktop-xine-${PV}.tar.bz2" -DEPENDS = "matchbox-desktop libxine" +DEPENDS = "matchbox-desktop libxine-x11" RDEPENDS = "libxine-plugin-vo-out-xshm \ libxine-plugin-vo-out-none \ libxine-plugin-ao-out-esd \ diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 8c2729dabe..b4f3558e93 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" LICENSE = "MIT" PACKAGES = "task-enlightenment-x11" -PR = "r1" +PR = "r2" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ e##http://openzaurus.org/official/unstable/3.5.2/feed/e" @@ -11,12 +11,14 @@ ALLOW_EMPTY = 1 # # X # -DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig ttf-bitstream-vera" -RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo ttf-bitstream-vera" +DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ + ttf-bitstream-vera bash" +RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera" # # E # -DEPENDS += "entrance e-wm entice" -RDEPENDS += "entrance e-wm entice" +DEPENDS += "entrance e-wm entice eclair examine " +RDEPENDS += "entrance e-wm entice eclair examine " diff --git a/packages/meta/meta-opie-dynamic.bb b/packages/meta/meta-opie-dynamic.bb deleted file mode 100644 index a1a2bb262d..0000000000 --- a/packages/meta/meta-opie-dynamic.bb +++ /dev/null @@ -1,19 +0,0 @@ -BROKEN = 1 -# -# FIXME: -# we need to get the necessary support from the OE infrastructure -# to allow the dynamic package to work -# -DESCRIPTION = "Meta-package for Opie" - -def opie_packages(d): - import bb, os - files = os.listdir( bb.data.getVar( "TOPDIR", d, True ) ) - pkgs = [ f for f in files if f.startswith( "opie-" ) and f != "opie-3rdparty" ] - return " ".join( pkgs ) - -OPIE_PACKAGES := "${@opie_packages(d)}" - -DEPENDS = "qte libqpe-opie libopie2 manufacturers ${OPIE_PACKAGES}" - -LICENSE = MIT diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 6672dd7a18..065a109251 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Opie and QPE" SECTION = "opie/base" ALLOW_EMPTY = 1 -PR = "r24" +PR = "r25" PACKAGE_ARCH = "all" LICENSE = "MIT" @@ -273,7 +273,6 @@ opie-mediaplayer2-skin-default \ opie-mediaplayer2-skin-default-landscape \ opie-mediaplayer2-skin-pod \ opie-mediaplayer2-skin-techno \ -opie-mediaplayer2-divx \ opie-powerchord \ opie-recorder \ opie-tonleiter \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index db150f7972..d8526fb64b 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -44,6 +44,8 @@ OPENSLUG_PACKAGES = "\ gzip \ iperf \ ipkg-utils \ + iptables \ + joe \ jpeg \ less \ libpam \ @@ -107,13 +109,17 @@ OPENSLUG_PACKAGES = "\ tiff \ timezones \ unionfs-modules unionfs-utils \ + usbutils \ util-linux \ vlan \ + vsftpd \ wakelan \ watchdog \ + wireless-tools \ wget \ xinetd \ yp-tools ypbind ypserv \ + zd1211 \ zlib \ " diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index 60cc77356a..052ddac474 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -77,10 +77,10 @@ OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-sec OPIE_DEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \ qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix \ - opie-irc " + opie-irc opie-mediaplayer2" OPIE_RDEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \ qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix \ - opie-irc " + opie-irc opie-mediaplayer2 libxine-plugin-decode-ff libxine-plugin-dmx-avi" # # diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb new file mode 100644 index 0000000000..dfe2ec029e --- /dev/null +++ b/packages/meta/unslung-binary-kernel-packages.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware" +LICENSE = MIT +PR = "r0" + +ALLOW_EMPTY = 1 +PACKAGES = "${PN}" + +UNSLUNG_PACKAGES = "\ + " + +BROKEN_PACKAGES = "\ + " + +DEPENDS = 'unslung-image \ + ${UNSLUNG_PACKAGES} \ + package-index' diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb index a6277afcf7..7fa1b1cd4c 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/meta/unslung-image.bb @@ -47,7 +47,6 @@ unslung_clean_image () { python () { # Don't build unslung images unless we're targeting an nslu2 mach = bb.data.getVar("MACHINE", d, 1) - dist = bb.data.getVar("DISTRO", d, 1) - if mach != 'nslu2' or dist != 'unslung': + if mach != 'nslu2': raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") } diff --git a/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty b/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty diff --git a/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch b/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch new file mode 100644 index 0000000000..b3906b2be6 --- /dev/null +++ b/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch @@ -0,0 +1,10 @@ +--- mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in.old 2004-08-03 11:45:51.000000000 +0100 ++++ mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in 2004-08-03 11:46:04.000000000 +0100 +@@ -1429,6 +1429,7 @@ + win.close(); + + } ++ needsRestart = false; + return needsRestart; + }, + diff --git a/packages/mozilla/thunderbird-1.0.6/mozconfig b/packages/mozilla/thunderbird-1.0.6/mozconfig new file mode 100644 index 0000000000..b48cb7398d --- /dev/null +++ b/packages/mozilla/thunderbird-1.0.6/mozconfig @@ -0,0 +1,49 @@ +ac_add_options --with-pthreads +ac_add_options --disable-freetype2 +ac_add_options --disable-xprint +ac_add_options --enable-crypto +ac_add_options --disable-jsd +ac_add_options --disable-oji +ac_add_options --disable-accessibility +ac_add_options --enable-single-profile +ac_add_options --disable-composer +ac_add_options --enable-extensions=pref,spellcheck,universalchardet,wallet +ac_add_options --disable-ldap +ac_add_options --disable-mathml +ac_add_options --disable-installer +ac_add_options --disable-activex +ac_add_options --disable-activex-scripting +ac_add_options --disable-tests +ac_add_options --disable-logging +ac_add_options --enable-reorder +ac_add_options --enable-strip +ac_add_options --enable-elf-dynstr-gc +ac_add_options --enable-xterm-updates +ac_add_options --with-default-mozilla-five-home=/usr/lib/thunderbird-0.7.3 +ac_add_options --disable-pedantic +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --disable-necko-disk-cache +ac_add_options --enable-necko-small-buffers + +# use GTK+-2 widget set with XFT font rendering +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-png + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,jar,viewsource + +# build minimal set of image decoders +ac_add_options --enable-image-decoders=png,gif,jpeg + +export MOZ_THUNDERBIRD=1 +mk_add_options MOZ_THUNDERBIRD=1 +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/packages/mozilla/thunderbird_1.0.6.bb b/packages/mozilla/thunderbird_1.0.6.bb new file mode 100644 index 0000000000..52d68ef481 --- /dev/null +++ b/packages/mozilla/thunderbird_1.0.6.bb @@ -0,0 +1,63 @@ +SECTION = "x11/utils" +DEPENDS += "gnupg" +RRECOMMENDS += "gnupg" +PR = "r0" + +EMVER="0.92.0" +IPCVER="1.1.3" +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2 \ + http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz \ +http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz \ + file://xptcstubs.patch;patch=1 \ + file://no-xmb.patch;patch=1 \ + file://extensions-hack.patch;patch=1 \ + file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop" +S = "${WORKDIR}/mozilla" + +FILES_${PN} += "${libdir}/thunderbird-${PV} ${datadir}/idl" + +inherit mozilla + +export MOZ_THUNDERBIRD=1 + +do_configure() { + for x in ipc enigmail; do + if [ ! -e ${WORKDIR}/mozilla/extensions/$x ]; then + mv ${WORKDIR}/$x ${WORKDIR}/mozilla/extensions/ + cd ${WORKDIR}/mozilla/extensions/$x + makemake + fi + done + cd ${S} + mozilla_do_configure +} + +do_compile() { + mozilla_do_compile + oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc + oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail +} + +do_install() { + mozilla_do_install + oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc DESTDIR="${D}" install + oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail DESTDIR="${D}" install + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/mozilla-thunderbird.desktop ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/mozilla-thunderbird.png ${D}${datadir}/pixmaps/ +} + +pkg_postinst_thunderbird() { + chmod -R a+w ${libdir}/thunderbird* +} + +# Simulate the silly csh makemake script +makemake() { + typeset m topdir + for m in $(find . -name Makefile.in); do + topdir=$(echo "$m" | sed -r 's:[^/]+:..:g') + sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \ + < ${m} > ${m%.in} || die "sed ${m} failed" + done +} diff --git a/packages/mtd/mtd-utils-native_20050715.bb b/packages/mtd/mtd-utils-native_20050801.bb index cd1fb7d11b..cd1fb7d11b 100644 --- a/packages/mtd/mtd-utils-native_20050715.bb +++ b/packages/mtd/mtd-utils-native_20050801.bb diff --git a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch index b63868cbb2..3ac41280bb 100644 --- a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch +++ b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch @@ -1,10 +1,10 @@ # -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# Patch managed by http://www.holgerschurig.de/patcher.html # ---- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2 2004-11-27 00:00:13.000000000 +0100 -+++ mtd/util/mkfs.jffs2.c 2005-01-31 22:52:33.830141174 +0100 +--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch ++++ mtd/util/mkfs.jffs2.c @@ -92,7 +92,12 @@ struct filesystem_entry *files; /* Only relevant to directories */ }; diff --git a/packages/mtd/mtd-utils/more-verbosity.patch b/packages/mtd/mtd-utils/more-verbosity.patch index 25b98d35bb..cdc842a8f9 100644 --- a/packages/mtd/mtd-utils/more-verbosity.patch +++ b/packages/mtd/mtd-utils/more-verbosity.patch @@ -1,10 +1,10 @@ # -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# Patch managed by http://www.holgerschurig.de/patcher.html # ---- mtd/util/mkfs.jffs2.c~add-progress 2005-01-31 22:55:34.662944000 +0100 -+++ mtd/util/mkfs.jffs2.c 2005-01-31 23:45:50.604511261 +0100 +--- mtd/util/mkfs.jffs2.c~more-verbosity.patch ++++ mtd/util/mkfs.jffs2.c @@ -374,6 +374,9 @@ struct filesystem_entry *entry; struct ignorepath_entry* element = ignorepath; diff --git a/packages/mtd/mtd-utils/removelinuxinc.patch b/packages/mtd/mtd-utils/removelinuxinc.patch deleted file mode 100644 index 984d1af514..0000000000 --- a/packages/mtd/mtd-utils/removelinuxinc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urN mtd.orig/fs/jffs2/compr_rtime.c mtd/fs/jffs2/compr_rtime.c ---- mtd.orig/fs/jffs2/compr_rtime.c 2004-04-02 20:36:01.000000000 -0500 -+++ mtd/fs/jffs2/compr_rtime.c 2004-04-02 20:35:37.000000000 -0500 -@@ -21,11 +21,7 @@ - * - */ - --#include <linux/kernel.h> --#include <linux/types.h> --#include <linux/errno.h> --#include <linux/string.h> -- -+#include <string.h> - #include <stdint.h> - - /* _compress returns the compressed size, -1 if bigger */ diff --git a/packages/mtd/mtd-utils/stdint.patch b/packages/mtd/mtd-utils/stdint.patch deleted file mode 100644 index ba171fcfde..0000000000 --- a/packages/mtd/mtd-utils/stdint.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fs/jffs2/compr_rtime.c 2004-04-01 00:07:53.000000000 +0100 -+++ fs/jffs2/compr_rtime.c 2004-04-01 00:07:53.000000000 +0100 -@@ -26,6 +26,8 @@ - #include <linux/errno.h> - #include <linux/string.h> - -+#include <stdint.h> -+ - /* _compress returns the compressed size, -1 if bigger */ - int jffs2_rtime_compress(unsigned char *data_in, unsigned char *cpage_out, - uint32_t *sourcelen, uint32_t *dstlen) diff --git a/packages/mtd/mtd-utils_20050715.bb b/packages/mtd/mtd-utils_20050801.bb index 6b457d52d7..bfc78c19ea 100644 --- a/packages/mtd/mtd-utils_20050715.bb +++ b/packages/mtd/mtd-utils_20050801.bb @@ -3,10 +3,7 @@ SECTION = "base" DEPENDS = "zlib" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ - mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ - flashcp nandwrite jffs2dump" -PR = "r2" +PR = "r0" SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \ file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \ @@ -26,6 +23,10 @@ do_stage () { done } +mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ + mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ + flashcp nandwrite jffs2dump" + do_install () { install -d ${D}${bindir} for binary in ${mtd_utils}; do diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb index 7da09d2715..3162fb50b3 100644 --- a/packages/nail/nail_11.21.bb +++ b/packages/nail/nail_11.21.bb @@ -13,9 +13,6 @@ S = "${WORKDIR}/nail-11.21/" inherit autotools -# INITSCRIPT_NAME = "mt-daapd" -# INITSCRIPT_PARAMS = "defaults 84" - # EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes" do_install() { diff --git a/packages/nonworking/emotion/emotion_cvs.bb b/packages/nonworking/emotion/emotion_cvs.bb deleted file mode 100644 index 1f4143478b..0000000000 --- a/packages/nonworking/emotion/emotion_cvs.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Emotion is an Evas smart-object library providing video capabilities. \ -Emotion leverages libxine 1.0 and integrates seemlessly with the rest of the EFL. \ -Because its based on libxine, any format that it supports (Theora, DiVX, MPEG2, etc) \ -is avalible using Emotion." -SECTION = "libs" -DEPENDS = "libxine edb eet evas ecore embryo edje" -PV = "${CVSDATE}" -PR = "r0" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/emotion" -S = "${WORKDIR}/emotion" - -inherit autotools binconfig - -do_stage () { - oe_libinstall -C src libemotion ${STAGING_LIBDIR}/ - install -m 0644 ${S}/src/Emotion.h ${STAGING_INCDIR}/ -} - -PACKAGES += "emotion-examples" - -FILES_${PN} = "${libdir}/libemotion*.so*" -FILES_${PN}-dev += "${bindir}/emotion-config ${libdir}/pkgconfig" -FILES_${PN}-examples = "${bindir}/emotion* ${datadir}" - diff --git a/packages/nonworking/esmart/esmart_cvs.bb b/packages/nonworking/esmart/esmart_cvs.bb deleted file mode 100644 index d12048e82b..0000000000 --- a/packages/nonworking/esmart/esmart_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "A collection of smart Evas objects" -SECTION = "libs" -DEPENDS = "evas evas-x11 ecore imlib2 edje libtool" -PV = "${CVSDATE}" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/esmart" -S = "${WORKDIR}/esmart" - -inherit autotools pkgconfig binconfig - -do_stage () { - oe_libinstall -C src/lib libesmart ${STAGING_LIBDIR}/ - install -m 0644 ${S}/src/lib/Esmart.h ${STAGING_INCDIR}/ -} diff --git a/packages/nonworking/meta/.mtn2git_empty b/packages/nonworking/meta/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nonworking/meta/.mtn2git_empty diff --git a/packages/meta/e-image.bb b/packages/nonworking/meta/e-image.bb index f16f61c795..d58215d3a7 100644 --- a/packages/meta/e-image.bb +++ b/packages/nonworking/meta/e-image.bb @@ -1,4 +1,9 @@ +DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" +LICENSE = "MIT" +PR = "r1" + export IMAGE_BASENAME = "e-image" +export IMAGE_LINGUAS = "" DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive" @@ -6,8 +11,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/evas = "evas-x11" PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" +PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev" inherit image_ipk -LICENSE = MIT diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb new file mode 100644 index 0000000000..b8db38d3db --- /dev/null +++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb @@ -0,0 +1,22 @@ +SECTION = "base" +PACKAGES = "" +LICENSE = "GPL" +INHIBIT_DEFAULT_DEPS = "1" +PR = "r1" + +SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2" +S = "${WORKDIR}/${PN}-${PV}" + +python () { + # Don't build unless we're targeting an nslu2 + if bb.data.getVar("MACHINE", d, 1) != "nslu2": + raise bb.parse.SkipPackage("NSLU2 firmware only builds for the Linksys NSLU2") +} + +do_compile () { + install -d ${STAGING_LIBDIR}/nslu2-binaries + install -m 0755 ${S}/RedBoot ${STAGING_LIBDIR}/nslu2-binaries/ + install -m 0755 ${S}/SysConf ${STAGING_LIBDIR}/nslu2-binaries/ + install -m 0755 ${S}/vmlinuz ${STAGING_LIBDIR}/nslu2-binaries/ + install -m 0755 ${S}/Trailer ${STAGING_LIBDIR}/nslu2-binaries/ +} diff --git a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb new file mode 100644 index 0000000000..2955f19ad0 --- /dev/null +++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Linksys NSLU2 Stock Firmware Libraries." +PACKAGE_ARCH = "nslu2" +SECTION = "base" +PRIORITY = "required" +PR = "r1" + +SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63.tar.bz2" + +S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" + +do_install () { + ( cd ${S} ; rm -rf bin dev etc home mnt proc sbin share tmp upload usr var ) + ( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - ) +} + +PACKAGES = "${PN}" +FILES_${PN} = "/lib" + +python () { + # Don't build unless we're targeting an nslu2 + if bb.data.getVar("MACHINE", d, 1) != "nslu2": + raise bb.parse.SkipPackage("NSLU2 stock firmware libraries only builds for the Linksys NSLU2") +} diff --git a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb new file mode 100644 index 0000000000..0fa7d69d54 --- /dev/null +++ b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Linksys NSLU2 Stock Firmware Ramdisk." +PACKAGE_ARCH = "nslu2" +SECTION = "base" +PRIORITY = "required" +PR = "r1" + +SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63.tar.bz2" + +do_install () { + ( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - ) +} + +PACKAGES = "${PN}" +FILES_${PN} = "/" + +python () { + # Don't build unless we're targeting an nslu2 + if bb.data.getVar("MACHINE", d, 1) != "nslu2": + raise bb.parse.SkipPackage("NSLU2 ramdisk only builds for the Linksys NSLU2") +} diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/.mtn2git_empty b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/.mtn2git_empty diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES new file mode 100644 index 0000000000..4e09b459c2 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES @@ -0,0 +1,453 @@ +Unslung-6.x Family Release Notes + +Unslung is a replacement firmware image for the Linksys NSLU2 which is designed +to allow you to make changes to the root filesystem (including the installation +of downloadable packages) while still providing all the standard product +functionality. + +If, at any time, you have any questions concerning the installation or +operation of Unslung firmware, your first port of call should be the +NSLU2-Linux wiki at: + + http://www.nslu2-linux.org + +Specifically, check the HowTos and the Frequently Asked Questions before +posting to the mailing list or asking a question in the IRC channel +[#nslu2-general @ irc.freenode.net]. + +OK! Now that that's out of the way... + +This file is provided to give general information and usage notes for the +Unslung 6.x firmware. If you are looking for installation instructions, please +stop now and go to the README file. Follow the README instructions WORD for +WORD to keep from turning your NSLU2 into a brick. The information contained +in this file will make more sense if you have already "unslung" your NSLU2. + +-------------------------------------------------------------------------------- + +These "Notes" are divided into four sections: + + 1 - GENERAL INFORMATION + 2 - IPKG PACKAGES + 3 - DIVERSION SCRIPTS + 4 - CHANGELOG + + +GENERAL INFORMATION + +As stated above, Unslung firmware is a replacement firmware image for the +Linksys NSLU2. The Unslung firmware is intended to be used for loading new +packages (giving enhanced or additional functionality) with minimal changes +to the standard user interface and firmware. The differences in the Unslung 6.x +firmware from the standard Linksys 2.3R63 firmware can be found at: + + http://www.nslu2-linux.org/wiki/Unslung/UnslungFeatures + +For more information about the Unslung firmware, including details on how to +build it from source code yourself, look at: + + http://www.nslu2-linux.org/wiki/Unslung + +There are several assumptions made in this Notes. One, you've successfully +unslung your NSLU2, and can verify the basic Linksys functionality (samba +users, groups, and shares setup with the Linksys interface). Two, that you can +get telnet or ssh shell access to your NSLU2 from any computer on the same +network as the NSLU2. Three, that you have read and understand the NSLU2-linux +community rules at: + + http://www.nslu2-linux.org/wiki/Main/HomePage + +If you understand the third assumption, then you also understand that there is +an emphasis on using and developing the NSLU2-Linux wiki. Clarifications and +further documentation is always welcomed on the wiki. + +If you are experienced with the Linux operating system, then you can make +changes directly to the root filesystem - changes which are persistent across +reboot. If you want to get involved, then check the NSLU2-linux wiki at: + + http://www.nslu2-linux.org/wiki/Main/HowToGetInvolved + + +IPKG PACKAGES + +Packages require you to be running Unslung firmware (as you may have already +guessed!) In general, ipkg packages are commonly available software packages +that have been ported to the NSLU2 - giving enhanced or additional +functionality. If you run into problems or have specific question with a +certain package, you should look on the Internet for the general documentation +about the package first. If your problem is specific to the NSLU2 port, then +check for further documentation for the corresponding package on the +NSLU2-Linux wiki at: + + http://www.nslu2-linux.org/wiki/Unslung/Packages + +When you "unsling" an external disk (check the README for instructions), +downloaded packages will be installed onto that external disk. The number of +packages that you can install is only limited by the size of the "data" +partition on the external disk. Note that you *must* *not* install any +packages before you have booted with an external "Unslung" disk. To do so will +almost certainly cause your internal jffs2 flash memory become full, and cause +you to have to reflash your NSLU2. + +Package Installation Details + + 1) Check for network connectivity to the package repository from the NSLU2 + first: "ping ipkg.nslu2-linux.org" + + - If this does not work, then please check the NSLU2 DNS settings in + the web interface (under "Administration", "LAN"). + + 3) Update the list of available packages from new feeds: "ipkg update" + + 4) Check the list of available packages for ones that you want on your + NSLU2: "ipkg list" + + 5) Install the packages: "ipkg install <package-name>" + +Most packages put their startup scripts into /opt/etc/init.d - which the +Unslung firmware automatically runs at boot. Some other packages are run from +the cron or xinetd daemons. + +You can also check the ipkg command arguments simply by typing "ipkg" at the +prompt. + + +DIVERSION SCRIPTS + +Diversion scripts are used to start packages, set variables or function +definitions at the time of the NSLU2 boot. The diversion mechanism allows you +to add to, or even replace the Linksys script functionality. They "divert" the +normal boot scripts to perform the needed action(s) and then can either "return +1" to continue normal factory script progress or "return 0" to abort the +diverted factory script. The diversion of startup scripts is done at the +lowest granularity, so you can just divert the rc.xinetd script and leave all +others unchanged. You are advised to use diversion scripts rather than editing +system files directly (as this will allow you to upgrade the Unslung firmware +in the future without having to make all of your changes again). + + - Note: If you do need to edit the system files directly, you can use the + "resling" script to save and load your modified system files. See + the NSLU2-Linux wiki at: + + http://www.nslu2-linux.org/wiki/Unslung/ReSling + +Diversion scripts go in the /unslung directory (you may have to create that +directory first). Note that after you have unslung to an external disk, then +the diversion scripts will be stored on that external disk (along with the rest +of the root filesystem). This means that recovering from an incorrect +diversion script is as simple as powering off, unplugging the disk, powering +on, hot-plugging the disk (note that the diversion scripts will only run if the +disk is attached at boot), and fix or remove the diversion script. + +You may divert as many or as few scripts as you like. Simply add the name of +the standard rc script into the appropriate /unslung directory and it will be +run. + +For example, I have a script /unslung/rc.local: + +#! /bin/sh +/opt/bin/do_foo +return 1 + +That will run at the beginning of the normal /etc/rc.d/rc.local, and then +the rest of the factory rc.local will be executed. If I do NOT want to run +the factory rc.local, my script would be: + +#!/bin/sh +/opt/bin/do_foo +return 0 + +That is, if the diversion script returns with something other than 0, it will +run the rest of the factory script. + +Note that any variable definitions or function declarations are allowed to +happen before the diversion script is called. This allows you to use the +variables and functions defined by the factory script. + +Also not that telnet is not enabled by default - there is an openssh package +and a dropbear package that either can replace telnet access with secure shell +access. + + - Dropbear package details on NSLU2-Linux wiki at: + + http://www.nslu2-linux.org/wiki/HowTo/UseDropBearForRemoteAccess + +The rationale behind not enabling telnet by default is ensure that an Unslung +NSLU2 has the same network footprint as a stock NSLU2 with Linksys firmware. +That said, if you want to enable telnet on boot, then install the xinetd +package (which enables telnet by default). + + +CHANGELOG + +1.11: + +First public release + +1.12: + +Added a symlink to slingbox for gzip. Added flashfs (as simple utility for +preserving user files across hard disk formats during beta testing). + +1.13: + +Added LD_LIBRARY_PATH to /etc/profile (only works for telnet and ssh access, +not for serial or diversion scripts). + +1.14: + +Added Unslung Doc link to the User Guide page. + +2.3: + +Moved development to OpenEmbedded. + +2.4: + +Updated to the latest ipk binary instead of the simple script. + +2.5: + +Added the real wget (instead of using the busybox version). This is so we can +support .netrc files for commercial packages. + +2.6: + +Fixed the unsling script so it removes conflicting files on an upgrade. + +2.7: + +Began development of the -able variant. + +2.8: + +Added the patch for genesys enclosures. + +2.9: + +Reorganized the various variants into a more consistent scheme. + +2.10: + +Added the ext3flash-on-disk1 functionality. + +2.11: + +Added the README to /opt/doc. + +2.12: + +First public release of 2.x firmware. + +3.1: + +Added jffs2 functionality. + +3.2: + +Incorporated switchbox functionality. + +3.3: + +Added ramdisks for /dev and /var to reduce internal flash writes. + +3.4: + +Replaced flashfs script with new resling script. + +3.5: + +Added code to reinitialize /etc/mtab on boot. + +3.6: + +Mounted /dev and /var jffs2 directories as /dev.state and /var.state so that +they can be used for persistent changes which are used to populate the ramdisks +on the next boot. + +3.7: + +Added "Pluggable Personalities" - now runs diversion scripts from both the +internal jffs2 area and also from an external drive attached at boot time. + +3.8: + +Enabled mounting of external drives earlier in the boot process, so that the +rc, rc.sysinit, and rc.1 scripts can be diverted by external diversion scripts +on an attached drive. + +3.9: + +Moved a number of -able kernel features (such as USB devfs support) into +-standard. + +3.10: + +Added support for unslung-start and unslung-stop diversion scripts, and package +shutdown scripts (K??foo). + +3.11: + +Added NFS kernel support (both client and server, and both V2 and V3 +protocols). + +3.12: + +Added basic maintenance mode support. If /.ramdisk exists in the jffs2 +filesystem, then the jffs2 filesystem is copied into a ramdisk on boot, and run +from there. This allows for updating firmware using the web interface. + +3.13: + +Added recovery mode support. If a viable root filesystem cannot be found, then +switchbox drops into a basic recovery shell, with a telnet daemon running as +192.168.1.77 with no password. This behavior can also be forced with a +/.recovery file in the jffs2 filesystem. + +3.14: + +Added web control of maintenance mode. You have to enable maintenance mode and +reboot before the firmware upgrade page allows you to enter a filename for the +new firmware. + +3.15: + +Added confirmation dialog boxes to the maintenance mode web control. + +3.16: + +First public release of 3.x firmware. + +3.17: + +Fixed syslog issue. Added FP patches. + +3.18: + +Fixed a number of minor issues regarding file permissions. +Added support for unslinging to the data partition. + +4.1: + +Split from 3.x stream to allow parallel development. + +4.2: + +New switchbox implementation with NFS and external USB disk root filesystem support. + +4.3: + +Enabled devfs. + +4.4: + +Changed slingbox program locations to match those of OpenSlug so that +we can use the same switchbox for both. + +4.5: + +Enabled RAID support modules and USB camera support modules. + +4.6: + +Merged unslung-standard and unslung-able, and created the oe feed for +downloadable kernel modules. Updated the unsling script to support +external rootfs. + +4.7: + +Enabled lots of traffic shaping modules. Enabled support for external +disks on sda1, sda2, sdb1 and sdb2. + +4.8: + +Made Unslung *not* create ramdisk for /var and /dev when you've +unslung to an external disk. Fixed nsswitch.conf. Updated the feed +locations. Added /dev/st devices for tape drive support. + +4.9: + +Updated the unslung script to give feedback on the rootfs transfer, +and to preserve an existing upkg database on the target disk. Added +more device nodes to support the new downloadable kernel modules. + +4.10: + +Made Unslung wait until quota checking is complete before running +package startup scripts. Simplified unsling to support disk1 and +disk2 (data partitions) only. + +4.11: + +Removed /tmp ramdisk if unslung to an external disk. Now clears /tmp +and /mnt/backup on each boot. + +4.12: + +Updated to the latest ipkg version. + +4.13: + +Added /dev/sdd and /dev/sde device nodes. +Added support for alternate rootfs under expert user control. + +4.14: + +Added audio support to the kernel. Increased the USB disk startup +wait to 10 seconds, and added the ability to divert rc.bootbin to the +startup scripts. + +4.15: + +Added /dev/dsp and updated the README and NOTES files. + +4.16: + +Added the /sbin/slingover script for migrating packages from the 3.x locations. + +4.17: + +Developer-only release booting straight from jffs2 instead of using switchbox. + +4.18: + +A number of /linuxrc fixes. Removed support for alternate rootfs under expert +user control (expert users can now just edit the /linuxrc in jffs2 directly). + +4.19: + +Removed all trace of switchbox from the firmware. This saves 128Kb of flash, +and about 1MB of RAM. + +4.20: + +First public release of 4.x firmware. + +5.1: + +Upgraded to Linksys firmware V2.3R29, but kept telnetd. + +5.2: + +Removed the ipkg link, and made unsling put it back on an external disk. + +5.3: + +Replaced maintenance mode with code to allow entry into RedBoot Upgrade Mode. + +5.4: + +Removed all maintenance mode support, and also removed support for rootfs on +jffs2 but packages on external disk (it's either all or nothing). +Removed unused /mnt/sda1, /mnt/sda2, /mnt/sdb1, and /mnt/sdb2. +Disabled the download process (superceded by upgrade mode). +Disabled the generation of the "ourtelnetrescue" user (too insecure). +Added disk auto-wait countdown to /linuxrc (courtesy of glc). + +5.5: + +First public release of 5.x firmware. + +6.0: + +First alpha release of 6.x Unslung firmware, based on Linksys V2.3R63 firmware. diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README new file mode 100644 index 0000000000..f4ffe4d29b --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README @@ -0,0 +1,284 @@ +Unslung-6.x Family Release README INSTALLATION + +You must follow the steps in this README *exactly*. Do not skip any steps, and +do not skip ahead thinking you know what you are doing and don't need to follow +instructions step by step. + +If at any time you have any questions concerning the installation or operation +of Unslung firmware, your first port of call should be the NSLU2-Linux wiki at: + + http://www.nslu2-linux.org + +If you are looking for further Unslung notes - including ipkg usage, diversion +script details, or ChangeLog information, please consult the associated NOTES +file. + +------------------------------------------------------------------------------- + +There are three parts to completing the installation of the Unslung firmware: + + 1 - PRE-INSTALLATION CONSIDERATIONS + 2 - FIRMWARE INSTALLATION DETAILS + 3 - UNSLINGING DETAILS + + +PRE-INSTALLATION CONSIDERATIONS + +1) You *must* test telnet Redboot access first before you flash the Unslung + firmware. Failure to do so will mean you get no sympathy at all if you + can't access Redboot when you need to recover from a bad flash. See + + http://www.nslu2-linux.org/wiki/HowTo/TelnetIntoRedBoot + + - Redboot is the bootloader that runs when the device is first started, + loading things into memory and starting Linux. By testing your + ability to telnet into Redboot, you are ensuring that if you injure + your NSLU2 with a bad flash you should be able to follow the "How + To Recover From A Bad Flash" instructions at + + http://www.nslu2-linux.org/wiki/HowTo/RecoverFromABadFlash + +2) If you want to install any packages, then you must have an external disk. + It is possible to make changes to the root filesystem in the internal + flash storage, but the space is very limited. In fact, just running + "ipkg update" on an NSLU2 which does not have an external disk attached + will most likely render the NSLU2 unusable due to filling up the flash (if + this happens then you will need to follow the recovery instructions in + the previous step). So unless you are an expert, then use an external + disk. + +3) The external disk that you use as the target for package installation must + be (or have previously been) formatted by the NSLU2. It is possible to + upgrade from all previous Unslung versions without reformatting your disk. + The unsling script will not touch anything in /unslung or /opt on your + disk, so make sure all your file modifications are in those directories, + as you were warned in the README file in all previous Unslung versions :-) + +4) If you want to use a flash disk as the target for package installation, + ensure that it is at least 256MB, plugged into port 1, and formatted + via the Linksys web interface. + +5) Please verify that any disks you are going to connect to the NSLU2 are + recognized and working properly *before* updating your firmware (including + any shares and data you had previously stored.) If not, DO NOT CONTINUE. + You may want to check out "How To Troubleshoot A Drive Missing Condition" + at: + + http://www.nslu2-linux.org/wiki/HowTo/TroubleshootADriveMissingCondition + + - The only exception to this, of course, are those enclosures that the + stock firmware does not support, but the Unslung firmware does + support. + +6) If you are upgrading your firmware, you should make a configuration backup + via the Linksys web interface. The configuration backup can be found + under "Administration", "Advanced", and then "Backup." The top section of + that webpage is titled "Config Backup" and "Download" should be used to + save your NSLU2 Users, Groups and Shares setup to a disk file. + + +FIRMWARE INSTALLATION DETAILS + +1) Shutdown the NSLU2, and remove any disks that you may have plugged into the + NSLU2. Power back up the NSLU2. + + - Firmware upgrades must always be performed with *no* hard disks or flash + disks attached. This CANNOT be emphasized enough. Are you sure you + unplugged the disks before powering up? If so, you may continue. + +2) Access the Web interface. Note that you should use the username "admin" and + password "admin" for the web interface at this point (as no disks are + attached, the default username and password is the only way to access the + Management web pages). + + 2-a) If you are installing Unslung 6.x onto an NSLU2 unit with Linksys + standard firmware *or* Unslung version 1.x or version 2.x already + installed, flash unslung-6.x.bin as you normally would flash new + firmware (using the web interface "Upgrade Firmware" page). + + 2-b) If you are installing Unslung 6.x onto an NSLU2 unit with Unslung + version 3.x already installed, you must put the NSLU2 into + maintenance mode before you can use the web interface to flash a new + version. Just click the "Enter Maintenance Mode" link on the web + interface "Upgrade Firmware" page, wait for the NSLU2 to reboot, and + then flash the new firmware in the normal manner (using the web + interface "Upgrade Firmware" page). + + 2-c) If you are installing Unslung 6.x onto an NSLU2 unit with Unslung + version 4.x already installed, you must put the NSLU2 into RedBoot + Upgrade Mode before you can upload new firmware. Note that Unslung + version 4.x has an "Enter Maintenance Mode" link on the web interface + "Upgrade Firmware" page, but it does not work, so you will need to + use the instructions at + + http://www.nslu2-linux.org/wiki/HowTo/TelnetIntoRedBoot + + to access the RedBoot command line, and then type "upgrade" to put + the NSLU2 into RedBoot Upgrade Mode. Then you will need to use the + Linux UpSlug tool or the Windows SerComm Upgrade tool to upload the + new firmware. + + 2-d) If you are installing Unslung 6.x onto an NSLU2 unit with version 5.x + or version 6.x already installed, you must first put the NSLU2 into + RedBoot Upgrade Mode. Just click the "Enter Upgrade Mode" link on the + web interface "Upgrade Firmware" page, wait for the NSLU2 to reboot, + and for the Ready/Status LED to begin flashing red and green, and then + use either the Linux UpSlug tool or the Windows SerComm Upgrade tool + to upload the new firmware. + + - During firmware flashing, the top LED - Ready/Status - flashes red and + green (approximately 5 minutes, but can be much longer). + + - The NSLU2 will reboot after the flashing is complete. + +3) Shutdown the NSLU2 (again), attach disk(s), and power it back up. + +4) Verify your NSLU2 is working normally again at this point in the web + interface. In particular, you should ensure that all your disks are still + recognized as they were before you updated the firmware (including any + shares and data you had previously stored.) If not, DO NOT CONTINUE. + You may want to check out "How To Troubleshoot A Drive Missing Condition" + at: + + http://www.nslu2-linux.org/wiki/HowTo/TroubleshootADriveMissingCondition + + - If you are not "unslinging", you can stop at this point. *HOWEVER!*, + the only reason for not unslinging would be in the case of a re-flash + of the SAME firmware. Even if this is a point firmware upgrade, you + will need to unsling. + + ***** If you do not choose to do the unslinging procedure described below, + DO NOT install packages unless you are SURE you know what you are + doing! "Bricking" your NSLU2 by not unslinging and then running ipkg + is not just a possibility, it is a certainty. + +5) Shutdown the NSLU2 and unplug *ALL* attached disks. + + - You must NOT have any disk plugged into the NSLU2 when you reboot to + perform the next part of installation - the "Unslinging". + + +'UNSLINGING' DETAILS + +"Unslinging" is the process of copying the root filesystem of your NSLU2 onto +an external disk, and configuring that external disk for installation of +packages. Basically it's a script (stored in /sbin/unsling) which copies all +the files from the internal jffs2 filesystem onto the external disk and tells +the internal firmware to load the root filesystem from the external disk when +booting in the future. + +To run the unsling-script you have to be logged in as root (with a telnet +session). + +NOTE: There are two root-passwords. One is saved in a internal file called +/usr/local/passwd (we know this one - it's "uNSLUng" and used when you boot +without a attached harddisk) the other is stored in a external file called +/share/hdd/conf/passwd (we don't know this one - it's used when you boot with a +external harddisk attached). Later in the process you can change both of +them. That means: Everytime you boot WITHOUT a attached harddisk you gain +root-access with the "uNSLUng" password. If you boot WITH an attached harddisk, +you won't have access until you change the file /share/hdd/conf/passwd. + +1) Power up the NSLU2 without any disks connected. + + - This only has to be done when you update the firmware. + + ***** To reiterate, you should not have a disk plugged in at this stage. + If you powered up your NSLU2 with a disk attached, shutdown the + NSLU2, unplug the disks, and power up again. + +2) Enable telnet by going to "http://192.168.1.77/Management/telnet.cgi", and + press the enable button. + + - If you had previously changed the IP address of your NSLU2 from + 192.168.1.77 to something else, then you should use that new IP + address to enable telnet. Again note that you should use the username + "admin" and password "admin" for the web interface at this point (as + no disks are attached, the default username and password is the only + way to access the Management web pages). + + - Make sure you have **** NO DISKS ATTACHED AT THIS TIME **** + + - If you plug a disk in before you complete the telnet connection, then + the NSLU2 will pick up the Linksys password from the disk, and you + will not be able to telnet into it. So don't have any disks attached + at this point. + + - Make sure you have **** NO DISKS ATTACHED AT THIS TIME **** + +3) OK, now that you don't have any disks attached, you can proceed and telnet + into the NSLU2 using the username root and password uNSLUng. + +4) Identify which drive you wish you "unsling", and plug it in. Wait a minute + or two while the disk is mounted. Check the web interface to make sure + that the disk has been recognised by the Linksys software. + + - If the disk has not been previously formatted on the NSLU2, then now is + the time to do that. Make sure that the drive is recognized in the + web interface. + +5) In the telnet session, run "/sbin/unsling disk1" or "/sbin/unsling disk2" + (depending upon whether you want to unsling to a disk connected to the + Disk1 port or the Disk2 port). + + - Once you "unsling" to an external disk on a particular port (Disk 1 or + Disk 2), it is important that you keep that disk continually plugged + into that same port whenever the NSLU2 is turned on. + + ***** Unsling will not change the password on your disk, so if you had + previously changed the password on a disk, then your password will + not be changed. Also note that simply editing the /etc/passwd file + is not enough to permanently change a password. See: + + http://www.nslu2-linux.org/wiki/HowTo/ChangePasswordsFromTheCommandLine + + NOTE: There are two root-passwords. One is saved in a internal + file called /usr/local/passwd (we know this one - it's "uNSLUng" + and used when you boot without a attached harddisk) the other is + stored in a external file called /share/hdd/conf/passwd (we don't + know this one - it's used when you boot with a external harddisk + attached). That means: Everytime you boot WITHOUT a attached harddisk + you gain root-access with the "uNSLUng" password. If you boot + WITH an attached harddisk, you won't have access until you change + the file /share/hdd/conf/passwd. So you should change this file + as soon as you unsling to an external disk, before you exit the + telnet session that you are using to unsling to the disk. + +6) If you wish to migrate your packages from the old Unslung 3.x location in + the /share/hdd/conf (disk1) or /share/flash/conf (disk2) partitions to the + new Unslung 4.x, 5.x and 6.x location on the data partition, then run: + "/sbin/slingover disk1" (if your packages were previously on disk1 and you + ran "/sbin/unsling disk1" in step 5) or "/sbin/slingover disk2" (if your + packages were previously on disk2 and you ran "/sbin/unsling disk2" in + step 5). + + - If your packages were not stored in /share/hdd/conf or /share/flash/conf + (e.g. you had previously moved your packages from the conf partition + to the data partition), then all bets are off and you will need to + read the /sbin/slingover script and perform the appropriate steps + manually. + +7) Reboot. + + ***** DO NOT RUN ipkg BEFORE YOU REBOOT AND CONFIRM EXTERNAL ROOTFS ***** + + - If you were to run ipkg when the root filesystem is loaded from the + internal jffs2 filesystem, then you would fill the flash and cause + your NSLU2 to no longer boot and require reflashing to recover. + +8) Wait for the NSLU2 to boot, telnet in, and confirm that the root filesystem + is being loaded from the external disk. + +***** Congratulations, you're now Unslung! ***** + +Make sure you add an entry to the "The Unslung 6.x" table in the Yahoo group. +Just use the next free integer for your Unslung number. + +If you make no further changes, your NSLU2 will continue to operate normally. +But to customize things, you'll be downloading packages and adding stuff to the +/unslung directory using diversion scripts. + +Read the NOTES file to expand the capabilities of your Unslung NSLU2! + +Enjoy! + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/linuxrc b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/linuxrc new file mode 100755 index 0000000000..cc53d447c3 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/linuxrc @@ -0,0 +1,70 @@ +#!/bin/sh + +# **** DO NOT EVEN THINK OF EDITING OR REMOVING THIS FILE **** +# **** UNLESS YOU REALLY KNOW *EXACTLY* WHAT YOU ARE DOING. **** + + +# Perform prepatory tasks, and determine whether an alternate rootfs is viable. + +/bin/mount -t proc proc /proc + +echo "1" > /proc/sys/kernel/panic + +/bin/echo "Sleeping while waiting for disk..." +cnt=20 +while [ $cnt -gt 0 ] ; do + echo -ne "\r$cnt " + sleep 1 + [ -f /proc/hdd_sdb ] && cnt=0 + [ -f /proc/hdd_sda ] && cnt=0 + cnt=`expr $cnt - 1` +done +echo + +sleep 5 + +mounted= + +for prefroot in sdb1 sda1 ; do + if [ -z "$mounted" ] ; then + if /bin/mount -rt ext3 /dev/$prefroot /mnt ; then + if [ -x /mnt/bin/init ] ; then + /bin/echo "Root filesystem will be mounted from /dev/$prefroot ..." + mounted=/mnt + else + /bin/umount /mnt + /bin/echo "Can't find valid rootfs on /dev/$prefroot ..." + fi + fi + fi +done + +if [ -z "$mounted" ] ; then + /bin/echo "Can't find valid rootfs, using ramdisk ..." + mounted= +fi + +/bin/umount /proc + +# Pivot to the desired rootfs and run the initial executable. + +if [ -n "$mounted" ] ; then + + cd $mounted + + /bin/echo "Pivoting to external rootfs ..." + /sbin/pivot_root . initrd + + exec /usr/sbin/chroot . /bin/init < /dev/console 1> /dev/console 2> /dev/console + +else + + exec /bin/init + +fi + +/bin/echo "Can't pivot to external rootfs, using ramdisk ..." +exec /bin/init + +# Last-resort fall-back - this should never be reached. +/bin/sh diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/rc.modules-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/rc.modules-diversion.patch new file mode 100644 index 0000000000..fa7532401d --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/rc.modules-diversion.patch @@ -0,0 +1,8 @@ +--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules.orig 2004-07-27 23:37:55.000000000 -0400 ++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules 2004-09-01 21:57:34.000000000 -0400 +@@ -1,2 +1,5 @@ ++ ++if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi ++ + insmod rbuttons &>/dev/null + insmod x1226-rtc &>/dev/null diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/security-fixes.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/security-fixes.patch new file mode 100644 index 0000000000..8517e7d06b --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/security-fixes.patch @@ -0,0 +1,11 @@ +--- nslu2-linksys-ramdisk-2.3r29/etc/rc.d/rc.1.orig 2005-06-12 21:43:26.940523728 +0930 ++++ nslu2-linksys-ramdisk-2.3r29/etc/rc.d/rc.1 2005-06-12 21:43:36.910008136 +0930 +@@ -19,7 +19,7 @@ + #/bin/echo "Generating telnet password:"; /usr/sbin/TelnetPassword; check_status + /bin/echo "Starting WEB Server:"; . /etc/rc.d/rc.thttpd;check_status + /bin/echo "Starting samba:"; . /etc/rc.d/rc.samba +-/bin/echo "Starting download:"; /usr/sbin/download ++#/bin/echo "Starting download:"; /usr/sbin/download + /bin/echo "Starting INET Server:"; . /etc/rc.d/rc.xinetd; check_status + if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then + /bin/echo "Creating ramfs for /tmp:"; mount -t ramfs none /tmp -o maxsize=512 diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling new file mode 100755 index 0000000000..ce2e528c92 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling @@ -0,0 +1,73 @@ +#!/bin/sh + +usage="Usage: $0 disk1|disk2" + +# Set target disk + +if [ $# -gt 1 ] ; then + echo $usage + exit 1 +fi + +if [ $# -eq 1 ] ; then + if [ "$1" = "disk1" ] ; then + targ=/share/hdd/data + flag=.sda1root + elif [ "$1" = "disk2" ] ; then + targ=/share/flash/data + flag=.sdb1root + else + echo $usage + exit 1 + fi +else + echo $usage + exit 1 +fi + +# Check it's a real mount point + +if grep $targ /proc/mounts >/dev/null 2>&1 ; then + echo "Target disk is $targ" +else + echo "Error: $targ is not a mounted disk" + exit 1 +fi + +# Start at the root directory + +cd / + +# Save the existing ipkg database. + +rm -rf $targ/usr/lib/ipkg.old +if [ -f $targ/usr/lib/ipkg/status ] ; then + mv $targ/usr/lib/ipkg $targ/usr/lib/ipkg.old +fi + +# Copy the complete rootfs to the target. + +echo "Copying the complete rootfs from / to $targ." +/usr/bin/find / -print0 -mount | /usr/bin/cpio -p -0 -d -m -u $targ +rm -rf $targ/dev ; mv $targ/dev.state $targ/dev +rm -rf $targ/var ; mv $targ/var.state $targ/var + +# Copy over the existing ipkg database. + +if [ -f $targ/usr/lib/ipkg.old/status ] ; then + echo "Preserving existing ipkg database on target disk." + ( cd $targ/usr/lib/ipkg.old ; tar cf - . ) | ( cd $targ/usr/lib/ipkg ; tar xf - ) +fi + +echo "Linking /usr/bin/ipkg executable on target disk." +rm -f $targ/usr/bin/ipkg ; ln -s /usr/bin/ipkg-cl $targ/usr/bin/ipkg + +# Create the boot flag file. + +rm -f /.sd??root $targ/.sd??root + +echo "Creating /$flag to direct switchbox to boot from $targ." +echo > /$flag +echo > $targ/$flag + +exit 0 diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/upgrade.htm b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/upgrade.htm new file mode 100644 index 0000000000..88644e305e --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/upgrade.htm @@ -0,0 +1,129 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html><head><title>Upgrade Firmware</title> +<LINK REL="stylesheet" TYPE="text/css" HREF="../ig_n.css"> +<meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> +<script language="JavaScript" type="text/javascript" src="../stdlib.js"></script> +<script language="JavaScript" type="text/javascript" src="../message.js"></script> +<script language="JavaScript" type="text/javascript"> +<!-- Start Script + +function checkUpgrade() +{ + var cf=document.upgrade; + + if(!confirm("Your NSLU2 will now enter RedBoot Upgrade Mode\n(Ready/Status LED will be flashing red and green).\nYou will require either the Linux UpSlug tool or the\nWindows SerComm Upgrade tool to upload firmware.\nNote that you will not be able to access your NSLU2\nuntil you have successfully uploaded new firmware.\nClick OK to continue, Cancel to abort.")) + return; + cf.submit(); + return; +} + +// end script --> +</script> +</head> + +<body bgcolor="white" onLoad="showMsg()" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<FORM name="upgrade" method="post" action="upgrade.cgi" ENCTYPE="multipart/form-data"> +<DIV align="center"> +<table border="0" cellpadding="0" cellspacing="0" width="750" align="center"> +<tr> + <td width="165"><img border="0" src="../linksys.gif" width="165" height="57"></td> + <td width="585" colspan="2" bgcolor="#6666CC" valign="bottom" align="right"><span class="fwversion">Firmware + Version: @ds_sw_version#</span> </td> +</tr> + +<tr> + <td colspan="3" height="11" bgcolor="black"><img src="../tborder.gif" width="750" height="11" alt="" border="0"></td> +</tr> + +<TR> + <TD width="165" bgcolor="black" align="center"><h3>Upgrade</h3></td> + <td width="585" colspan="2" bgcolor="#6666cc" valign="top"> + <table border="0" cellspacing="0" cellpadding="0" width="100%"> + <tr> + <td align="right" class="pname" height="25" colspan="5">Network Storage Link for USB 2.0 Disks </td> + <td align="center" width="100" class="mname">NSLU2</td> + </tr> + <tr bgcolor="black"> + <td colspan="6" height="3"><img src="TRANSPAR.GIF" width="1" height="3" alt="" border="0"></td> + </tr> + <tr> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="8" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> + </tr> + + <tr> + <td align="center" height="25" bgcolor="black" width="100"><a href="/index.cgi" class="mainmenu">Home</a></td> + <td align="center" height="25" bgcolor="black" width="100"><a href="/user_pass.cgi" class="mainmenu">User<br> password</a></td> + <td align="center" height="25" width="100"><span class="mainmenu">Administration</span></td> + <td align="center" height="25" bgcolor="black" width="100"><a href="/userman_fs.htm" class="mainmenu">User Guide</a></td> + <td align="center" height="25" bgcolor="black" width="120"><a href="http://www.linksys.com" class="mainmenu" target="new_win">Linksys Web</a></td> + <td align="center" height="25" bgcolor="black"> </td> + </tr> + <tr> + <td height="25" width="130"> </td> + <td height="25" colspan="5"> + <a href="/Management/file_sharing.cgi?next_file=groups.htm" class="submenu">Groups</a> <span class="divider"> | </span> + <a href="/Management/file_sharing.cgi?next_file=shares.htm" class="submenu">Shares</a> <span class="divider"> | </span> + <a href="/Management/sh_backup.cgi?next_file=backup.htm" class="submenu">Backup</a> <span class="divider"> | </span> + <a href="/Management/disk_fs.htm" class="submenu">Disk</a> <span class="divider"> | </span> + <span class="tabtitle">Upgrade</span> <span class="divider"> | </span> + <a href="/Management/setup.cgi?next_file=lan.htm" class="submenu">Setup</a></td> + </tr> + </table> + + </td> +</tr> + +<tr> + <td colspan="3" bgcolor="#e7e7e7" height="6"><img src="TRANSPAR.GIF" width="1" height="6" alt="" border="0"></td> +</tr> + + +<tr> + <th width="165" height="24">Current Firmware </th> + <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> +</tr> +<tr> + <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="80"></td> + <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> + <tr> + <td nowrap>Current Firmware Version:</td> + <td nowrap>@ds_sw_version# </td></tr> + <tr><td> + <div align="left"><a href="http://www.linksys.com" target="new_win"><img src="button_checkupdate.jpg" width="107" height="20" alt="" border="0"></a></div> + </td> + </tr> + </table></div> </td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="80" width="15"></td> +</tr> + +<tr> + <td bgcolor="#e7e7e7" height="30" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="30"></td> + <td height="30"> </td> + <td rowspan="2" valign="bottom" bgcolor="#6666cc" height="64"><img src="../cisco.gif" hspace="0" vspace="0"></td> +</tr> + +<tr> + <td bgcolor="black" height="34"> </td> + <td bgcolor="#6666cc" align="right" height="33" valign="middle"><a class="textbutton" href="javascript:checkUpgrade();" style="{padding:3px}"> + Enter Upgrade Mode </a> <a class="textbutton" href="javascript:openHelpWin('help/util_upg.htm')" style="{padding:3px}"> + Help </a> </td> +</tr> + + +</table> +</div> +<input type="Hidden" name="message" value="@message#"> +<input type="Hidden" name="this_file" value="upgrade.htm"> +<input type="Hidden" name="todo" value="@todo#"> +<input type="Hidden" name="finish" value="@finish#"> +</form> + +</body> + +</html> diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/wait-for-quotacheck.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/wait-for-quotacheck.patch new file mode 100644 index 0000000000..71c8e9caec --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/wait-for-quotacheck.patch @@ -0,0 +1,10 @@ +--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local~ 2005-04-03 10:14:51.000000000 +0930 ++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local 2005-04-03 10:14:59.000000000 +0930 +@@ -14,6 +14,6 @@ + /bin/chmod 775 /share 2>/dev/null + /bin/chown admin.everyone /share/hdd/ 2>/dev/null + /bin/chown admin.everyone /share 2>/dev/null +-/etc/rc.d/rc.quota &>/dev/null ++/etc/rc.d/rc.quota 2>/dev/null + /usr/sbin/init_media 2>/dev/null + /bin/echo "$HOSTNAME: boot complete!"; check_status diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb new file mode 100644 index 0000000000..398d934a52 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -0,0 +1,103 @@ +SECTION = "base" + +PR = "r1" + +DEPENDS = "nslu2-linksys-libs" + +SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63.tar.bz2 \ + file://README \ + file://NOTES \ + file://unsling \ + file://resling \ + file://slingover \ + file://linuxrc \ + file://nsswitch.conf \ + file://rc.unslung-start \ + file://rc.unslung-stop \ + file://rc-diversion.patch;patch=1 \ + file://rc.1-diversion.patch;patch=1 \ + file://rc.crond-diversion.patch;patch=1 \ + file://rc.halt-diversion.patch;patch=1 \ + file://rc.local-diversion.patch;patch=1 \ + file://rc.modules-diversion.patch;patch=1 \ + file://rc.network-diversion.patch;patch=1 \ + file://rc.quickset-diversion.patch;patch=1 \ + file://rc.quota-diversion.patch;patch=1 \ + file://rc.reboot-diversion.patch;patch=1 \ + file://rc.reset_usrgrpshare-diversion.patch;patch=1 \ + file://rc.rstimezone-diversion.patch;patch=1 \ + file://rc.samba-diversion.patch;patch=1 \ + file://rc.sysinit-diversion.patch;patch=1 \ + file://rc.thttpd-diversion.patch;patch=1 \ + file://rc.xinetd-diversion.patch;patch=1 \ + file://root-passwd.patch;patch=1 \ + file://tmp-handling.patch;patch=1 \ + file://create-ramdisks.patch;patch=1 \ + file://remount-noatime.patch;patch=1 \ + file://initialise-mtab.patch;patch=1 \ + file://wait-for-quotacheck.patch;patch=1 \ + file://mount_usbdevfs.patch;patch=1 \ + file://security-fixes.patch;patch=1 \ + file://upgrade.htm file://upgrade.cgi \ + file://rc.bootbin \ + " + +S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" + +python () { + # Don't build unslung images unless we're targeting an nslu2 + mach = bb.data.getVar("MACHINE", d, 1) + if mach != 'nslu2': + raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") +} + +do_compile () { + echo "V2.3R63-uNSLUng-${DISTRO_VERSION}" > ${S}/.unslung + + sed -i -e s/@version#/@version#-uNSLUng-${DISTRO_VERSION}/ ${S}/home/httpd/html/home.htm + sed -i -e 's|> <|><a href="Unslung" class="mainmenu" target="_top">Unslung Doco</a><|' \ + ${S}/home/httpd/html/manhead.htm + + install -m 755 ${WORKDIR}/linuxrc ${S}/linuxrc + + # Allow rc.bootbin to be diverted. + mv ${S}/etc/rc.d/rc.bootbin ${S}/sbin/rc.bootbin + install -m 755 ${WORKDIR}/rc.bootbin ${S}/etc/rc.d/rc.bootbin + + install -d ${S}/initrd + + install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling + install -m 755 ${WORKDIR}/resling ${S}/sbin/resling + install -m 755 ${WORKDIR}/slingover ${S}/sbin/slingover + install -m 755 ${WORKDIR}/rc.unslung-start ${S}/etc/rc.d/rc.unslung-start + install -m 755 ${WORKDIR}/rc.unslung-stop ${S}/etc/rc.d/rc.unslung-stop + + install -m 644 ${WORKDIR}/nsswitch.conf ${S}/etc/nsswitch.conf + + install -d ${S}/opt/doc + install -m 755 ${WORKDIR}/README ${S}/opt/doc/README + install -m 755 ${WORKDIR}/NOTES ${S}/opt/doc/NOTES + ln -s /opt/doc ${S}/home/httpd/html/Unslung + + # Add the diversion script directory + install -d ${S}/unslung + + # Remove the libraries, because they are in nslu2-linksys-libs now + rm -rf ${S}/lib + + # Install upgrade mode files + mv ${S}/home/httpd/html/Management/upgrade.htm ${S}/home/httpd/html/Management/upgrade-old.htm + mv ${S}/home/httpd/html/Management/upgrade.cgi ${S}/home/httpd/html/Management/upgrade-old.cgi + install -m 644 ${WORKDIR}/upgrade.htm ${S}/home/httpd/html/Management + install -m 755 ${WORKDIR}/upgrade.cgi ${S}/home/httpd/html/Management + sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${DISTRO_VERSION}/ \ + ${S}/home/httpd/html/Management/upgrade.htm +} + +do_install () { + ( cd ${S} ; tar -c -v -f - --exclude '.pc' . ) | ( cd ${D} ; tar xvf - ) +} + +PACKAGES = "${PN}" +FILES_${PN} = "/" +RDEPENDS_${PN} = "nslu2-linksys-libs" diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb index 3ca809f002..c83cf1b7a3 100644 --- a/packages/openntpd/openntpd_3.7p1.bb +++ b/packages/openntpd/openntpd_3.7p1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD" SECTION = "console/network" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "timezones" -PR="r7" +PR="r10" SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -22,7 +22,7 @@ INITSCRIPT_PARAMS = "defaults" inherit autotools update-rc.d EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \ - --sysconfdir=/etc --with-privsep-path=/var/shared/empty \ + --sysconfdir=/etc --with-privsep-path=/${localstatedir}/shared/empty \ --with-privsep-user=ntpd" do_install_prepend() { @@ -34,11 +34,12 @@ do_install_append() { } pkg_postrm () { - grep ntpd /etc/passwd && deluser ntpd + grep ntpd ${sysconfdir}/passwd && deluser ntpd } pkg_postinst () { - grep ntpd /etc/passwd || adduser --disabled-password --home=/var/shared/empty --ingroup nogroup ntpd - chown root:root /var/shared/empty + [ ! -d ${localstatedir}/shared ] && mkdir -p ${localstatedir}/shared + grep ntpd ${sysconfdir}/passwd || adduser --disabled-password --home=${localstatedir}/shared/empty --ingroup nogroup ntpd + chown root:root ${localstatedir}/shared/empty } diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/zleds b/packages/openslug-init/openslug-init-0.10/initscripts/zleds index c3ad3d2d64..c4e2b37219 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/zleds +++ b/packages/openslug-init/openslug-init-0.10/initscripts/zleds @@ -30,8 +30,8 @@ colour() { # leds syntax is -A +<init state> /<new state> case "$1" in -start) leds -A +"$(colour "$runlevel")";; -stop) leds -A +"$(colour "$previous")" /"$(colour "$runlevel")";; +start) leds -gr +"$(colour "$runlevel")";; +stop) leds -gr +"$(colour "$previous")" /"$(colour "$runlevel")";; *) echo "led change: $1: command ignored" >&2;; esac diff --git a/packages/opie-i18n/opie-lrelease-native.inc b/packages/opie-i18n/opie-lrelease-native.inc new file mode 100644 index 0000000000..16d983693b --- /dev/null +++ b/packages/opie-i18n/opie-lrelease-native.inc @@ -0,0 +1,17 @@ +DESCRIPTION = "Opie native i18n tool lrelease" +SECTION = "opie/base" +PRIORITY = "optional" +MAINTAINER = "Holger Freyther <zecke@handhelds.org>" +LICENSE = "GPL" +DEPENDS = "uicmoc3-native" + +S = "${WORKDIR}/opie-lrelease" + +inherit native qmake qt3e + +export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl" + +do_stage() { + install -m 0755 opie-lrelease ${STAGING_BINDIR}/ +} diff --git a/packages/opie-i18n/opie-lrelease-native_1.2.0.bb b/packages/opie-i18n/opie-lrelease-native_1.2.0.bb index 17a662d957..699a72256c 100644 --- a/packages/opie-i18n/opie-lrelease-native_1.2.0.bb +++ b/packages/opie-i18n/opie-lrelease-native_1.2.0.bb @@ -1,21 +1,5 @@ -DESCRIPTION = "Opie native i18n tool lrelease" -SECTION = "opie/base" -PRIORITY = "optional" -MAINTAINER = "Holger Freyther <zecke@handhelds.org>" -LICENSE = "GPL" -DEPENDS = "uicmoc3-native" +include ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lrelease \ ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared" - -S = "${WORKDIR}/opie-lrelease" - -inherit native qmake - -export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl" - -do_stage() { - install -m 0755 opie-lrelease ${STAGING_BINDIR}/ -} diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb index 637746bdf3..e6809cc9da 100644 --- a/packages/opie-i18n/opie-lrelease-native_cvs.bb +++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb @@ -1,21 +1,5 @@ -DESCRIPTION = "Opie native i18n tool lrelease" -SECTION = "opie/base" -PRIORITY = "optional" -MAINTAINER = "Holger Freyther <zecke@handhelds.org>" -LICENSE = "GPL" -DEPENDS = "uicmoc3-native" -PV = "1.2.0+cvs-${CVSDATE}" +include ${PN}.inc +PV = "1.2.0+cvs-${CVSDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \ ${HANDHELDS_CVS};module=opie/development/translation/shared" - -S = "${WORKDIR}/opie-lrelease" - -inherit native qmake - -export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl" - -do_stage() { - install -m 0755 opie-lrelease ${STAGING_BINDIR}/ -} diff --git a/packages/opie-i18n/opie-lupdate-native.inc b/packages/opie-i18n/opie-lupdate-native.inc new file mode 100644 index 0000000000..98eb30a864 --- /dev/null +++ b/packages/opie-i18n/opie-lupdate-native.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "Opie native i18n tool lupdate" +SECTION = "opie/base" +PRIORITY = "optional" +MAINTAINER = "Holger Freyther <zecke@handhelds.org>" +LICENSE = "GPL" +DEPENDS = "uicmoc3-native" + +S = "${WORKDIR}/opie-lupdate" + +inherit native qmake qt3e + +export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " +EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " + +do_stage() { + install -m 0755 opie-lupdate ${STAGING_BINDIR}/ +} diff --git a/packages/opie-i18n/opie-lupdate-native_1.2.0.bb b/packages/opie-i18n/opie-lupdate-native_1.2.0.bb index 29076a4bd7..d4e7f18284 100644 --- a/packages/opie-i18n/opie-lupdate-native_1.2.0.bb +++ b/packages/opie-i18n/opie-lupdate-native_1.2.0.bb @@ -1,22 +1,6 @@ -DESCRIPTION = "Opie native i18n tool lupdate" -SECTION = "opie/base" -PRIORITY = "optional" -MAINTAINER = "Holger Freyther <zecke@handhelds.org>" -LICENSE = "GPL" -DEPENDS = "uicmoc3-native" +include ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lupdate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared" -S = "${WORKDIR}/opie-lupdate" - -inherit native qmake - -export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " -EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " - -do_stage() { - install -m 0755 opie-lupdate ${STAGING_BINDIR}/ -} diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb index acc15176d0..57fba3893e 100644 --- a/packages/opie-i18n/opie-lupdate-native_cvs.bb +++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb @@ -1,22 +1,5 @@ -DESCRIPTION = "Opie native i18n tool lupdate" -SECTION = "opie/base" -PRIORITY = "optional" -MAINTAINER = "Holger Freyther <zecke@handhelds.org>" -LICENSE = "GPL" -DEPENDS = "uicmoc3-native" -PV = "1.2.0+cvs-${CVSDATE}" +include ${PN}.inc +PV = "1.2.0+cvs-${CVSDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \ ${HANDHELDS_CVS};module=opie/development/translation/shared" - -S = "${WORKDIR}/opie-lupdate" - -inherit native qmake - -export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " -EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " - -do_stage() { - install -m 0755 opie-lupdate ${STAGING_BINDIR}/ -} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb deleted file mode 100644 index bae5e14af5..0000000000 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "OPIE Mediaplayer DIVX pseudo package." -MAINTAINER = "Werner Schulte <w1@schulte-ac.de>" -LICENSE = "GPL" -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" -PACKAGE_ARCH = "all" - -DEPENDS = "opie-mediaplayer2 \ - opie-mediaplayer2-skin-default \ - libxine-opie " - -RDEPENDS = "opie-mediaplayer2 \ - opie-mediaplayer2-skin-default \ - libxine-plugin-ao-out-oss \ - libxine-plugin-decode-ff \ - libxine-plugin-decode-mad \ - libxine-plugin-dmx-audio \ - libxine-plugin-dmx-avi \ - libxine-plugin-dmx-mpeg \ - libxine-plugin-inp-file \ - libxine1" - diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2.inc b/packages/opie-mediaplayer2/opie-mediaplayer2.inc index e4323461cb..00247fe6ad 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2.inc +++ b/packages/opie-mediaplayer2/opie-mediaplayer2.inc @@ -1,13 +1,15 @@ -DESCRIPTION = "The next generation mediaplayer for Opie - based libxine. \ +DESCRIPTION = "The next generation mediaplayer for Opie - based on libxine. \ It plays mp3, mpeg, wav, ogg, quicktime, divx, etc. and is capable of streaming." SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -DEPENDS = "libxine-opie libqtaux2 opie-mediaplayer2-skin-default" +DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default" RDEPENDS = "opie-mediaplayer2-skin" -RRECOMMENDS = "opie-mediaplayer2-skin-default libxine-plugin-ao-out-oss libxine-plugin-decode-mad \ -libxine-plugin-dmx-audio libxine-plugin-dmx-mpeg libxine-plugin-inp-file " +RRECOMMENDS = "opie-mediaplayer2-skin-default \ +libxine-plugin-ao-out-oss libxine-plugin-inp-file \ +libxine-plugin-decode-ff libxine-plugin-decode-mad \ +libxine-plugin-dmx-audio libxine-plugin-dmx-avi libxine-plugin-dmx-mpeg" APPNAME = "opieplayer2" S = "${WORKDIR}/${APPNAME}" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb index 780ddab84b..c94efb35ec 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb @@ -1,7 +1,6 @@ include ${PN}.inc - - -PR = "r0" + +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb index 3f393ff48a..cc6d9b43c1 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r1" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb new file mode 100644 index 0000000000..bc7698c592 --- /dev/null +++ b/packages/pango/pango_1.9.1.bb @@ -0,0 +1,47 @@ +LICENSE = "LGPL" +SECTION = "x11/libs" +# Xt needed to keep autoconf's check for X11 happy +DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc" +DESCRIPTION = "The goal of the Pango project is to provide an \ +Open Source framework for the layout and rendering of \ +internationalized text." +PR = "r0" + +# seems to go wrong with default cflags +FULL_OPTIMIZATION_arm = "-O2" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.7/pango-${PV}.tar.bz2 \ + file://no-tests.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-glibtest \ + --enable-explicit-deps=no \ + --disable-debug" + +FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*" + +LIBV = "1.4.0" + +do_stage () { + for lib in pango pangox pangoft2 pangoxft; do + oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ + done + install -d ${STAGING_INCDIR}/pango + install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ +} + +postinst_prologue() { +if [ "x$D" != "x" ]; then + exit 1 +fi + +} + +python populate_packages_prepend () { + prologue = bb.data.getVar("postinst_prologue", d, 1) + + modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) + + do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') +} diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb index 187b996439..73e349d576 100644 --- a/packages/sane-backends/sane-backends_1.0.15.bb +++ b/packages/sane-backends/sane-backends_1.0.15.bb @@ -1,15 +1,16 @@ -MAINTAINER="Oyvind Repvik <nail@nslu2-linux.org>" -DESCRIPTION="Scanner drivers for SANE" -PR="r4" -DEPENDS="jpeg libusb" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +DESCRIPTION = "Scanner drivers for SANE" +PR = "r4" +DEPENDS = "jpeg libusb" +LICENCE = "LGPL" -SRC_URI="ftp://ftp.sane-project.org/pub/sane/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ +SRC_URI = "ftp://ftp.sane-project.org/pub/sane/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ file://sane-plustek.patch;patch=1 \ file://Makefile.in.patch;patch=1 \ file://saned.xinetd \ " -EXTRA_OECONF="--disable-translations" +EXTRA_OECONF = "--disable-translations" inherit autotools diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index ddf7d13d19..c48c48ae56 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -1,8 +1,9 @@ SECTION = "console/network" - +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "openssl" DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub." -PR = "r3" +LICENCE = "GPL" +PR = "r4" SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ldflags.patch;patch=1 \ @@ -11,7 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ssmtp.conf" S = "${WORKDIR}/${PN}-2.61" LICENSE = "GPL" -CONFFILE = "${sysconfdir}/ssmtp/ssmtp.conf" +#CONFFILES = "${sysconfdir}/ssmtp/ssmtp.conf ${sysconfdir}/ssmtp/revaliases" inherit autotools EXTRA_OECONF = "--enable-ssl" @@ -28,7 +29,7 @@ do_install () { } pkg_postinst () { - update-alternatives --install ${sbindir}/sendmail sendmail ${bindir}/ssmtp 90 + update-alternatives --install ${sbindir}/sendmail sendmail ${bindir}/ssmtp 30 } pkg_postrm () { diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc index 279d1e61ee..7251bcdb4a 100644 --- a/packages/sudo/sudo.inc +++ b/packages/sudo/sudo.inc @@ -18,3 +18,7 @@ do_configure_prepend () { cat aclocal.m4 > acinclude.m4 fi } + +pkg_postinst() { + chmod 0440 ${sysconfdir}/sudoers +} diff --git a/packages/sudo/sudo_1.6.8p8.bb b/packages/sudo/sudo_1.6.8p8.bb index 087bcee541..cc8ae4081c 100644 --- a/packages/sudo/sudo_1.6.8p8.bb +++ b/packages/sudo/sudo_1.6.8p8.bb @@ -5,4 +5,4 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ file://noexec-link.patch;patch=1" include sudo.inc -PR = "r3" +PR = "r4" diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb index 2fbd4dc334..48aa375048 100644 --- a/packages/taglib/taglib_1.4.bb +++ b/packages/taglib/taglib_1.4.bb @@ -2,16 +2,19 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of seve SECTION = "libs" HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" LICENSE = "LGPL" +PR = "r1" SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz" S = "${WORKDIR}/taglib-${PV}" inherit autotools qmake-base pkgconfig binconfig +export OE_QMAKE_LINK="${CXX}" + do_configure() { # calling oe_runconf to generate pkgconfig and binconfig files oe_runconf - cd ${S}/taglib && rm -f Makefile* && qmake -project -t lib && \ + cd ${S}/taglib && rm -f Makefile* && qmake -project -o tag.pro -t lib && \ qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${S} } @@ -29,10 +32,10 @@ do_stage_append() { do install $i ${STAGING_INCDIR}/taglib/ done - oe_libinstall -so -C taglib libtaglib ${STAGING_LIBDIR} + oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR} } do_install() { install -d ${D}${libdir} - oe_libinstall -so -C taglib libtaglib ${D}${libdir} + oe_libinstall -so -C taglib libtag ${D}${libdir} } diff --git a/packages/totem/totem_0.101.bb b/packages/totem/totem_0.101.bb index e78ce09043..cf62fdc62c 100644 --- a/packages/totem/totem_0.101.bb +++ b/packages/totem/totem_0.101.bb @@ -15,7 +15,7 @@ SRC_URI="http://www.hadess.net/files/software/totem/totem-${PV}.tar.gz \ file://include.patch;patch=1 \ file://omf.patch;patch=1" -DEPENDS="gtk+ libglade gnome-vfs gconf libxine libgnomeui" +DEPENDS="gtk+ libglade gnome-vfs gconf libxine-x11 libgnomeui" RDEPENDS += " libgnomeui" inherit autotools diff --git a/packages/totem/totem_0.99.15.bb b/packages/totem/totem_0.99.15.bb index 807eee4023..028a0d66fe 100644 --- a/packages/totem/totem_0.99.15.bb +++ b/packages/totem/totem_0.99.15.bb @@ -11,7 +11,7 @@ SRC_URI="http://ftp.acc.umu.se/pub/GNOME/sources/totem/0.99/totem-${PV}.tar.gz \ file://include.patch;patch=1 \ file://omf.patch;patch=1" -DEPENDS="gtk+ libglade gnome-vfs gconf libxine libgnomeui" +DEPENDS="gtk+ libglade gnome-vfs gconf libxine-x11 libgnomeui" RDEPENDS += " libgnomeui" inherit autotools diff --git a/packages/treecc/.mtn2git_empty b/packages/treecc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/treecc/.mtn2git_empty diff --git a/packages/treecc/treecc-0.3.6/.mtn2git_empty b/packages/treecc/treecc-0.3.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/treecc/treecc-0.3.6/.mtn2git_empty diff --git a/packages/treecc/treecc-0.3.6/dont-make-in-examples.patch b/packages/treecc/treecc-0.3.6/dont-make-in-examples.patch new file mode 100644 index 0000000000..b722552565 --- /dev/null +++ b/packages/treecc/treecc-0.3.6/dont-make-in-examples.patch @@ -0,0 +1,12 @@ +diff -Nurd treecc-0.3.6.orig/Makefile.in treecc-0.3.6/Makefile.in +--- treecc-0.3.6.orig/Makefile.in 2005-01-15 15:16:06.000000000 -0800 ++++ treecc-0.3.6/Makefile.in 2005-08-12 15:36:24.481697542 -0700 +@@ -77,7 +77,7 @@ + VERSION = @VERSION@ + YACC = @YACC@ + +-SUBDIRS = . etc doc tests examples ++SUBDIRS = . etc doc tests + + bin_PROGRAMS = treecc + noinst_LIBRARIES = libtreecc.a diff --git a/packages/treecc/treecc-native_0.3.6.bb b/packages/treecc/treecc-native_0.3.6.bb new file mode 100644 index 0000000000..06524f1cb7 --- /dev/null +++ b/packages/treecc/treecc-native_0.3.6.bb @@ -0,0 +1,12 @@ +include treecc_${PV}.bb +SECTION = "devel" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/treecc-${PV}" +MAINTAINER = "Kirill Kononenko <krokas@aport.ru" +S = "${WORKDIR}/treecc-${PV}" + +inherit native autotools + +do_stage() { + rm -f ${STAGING_BINDIR}/treecc + install -m 0755 treecc ${STAGING_BINDIR}/ +} diff --git a/packages/treecc/treecc_0.3.6.bb b/packages/treecc/treecc_0.3.6.bb new file mode 100644 index 0000000000..bd8e992724 --- /dev/null +++ b/packages/treecc/treecc_0.3.6.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Tree Compiler-Compiler from dotGNU" +SECTION = "devel" +LICENSE = "GPL-2" +HOMEPAGE = "http://www.southern-storm.com.au/treecc.html" +MAINTAINER = "Kirill Kononenko <krokas@aport.ru>" +PRIORITY = "optional" + +SRC_URI = "http://www.southern-storm.com.au/download/treecc-${PV}.tar.gz \ + file://dont-make-in-examples.patch;patch=1" + +inherit autotools + diff --git a/packages/uclibc/uclibc-0.9.27/thumb-interwork-asm.patch b/packages/uclibc/uclibc-0.9.27/thumb-interwork-asm.patch new file mode 100644 index 0000000000..bc99f9a5db --- /dev/null +++ b/packages/uclibc/uclibc-0.9.27/thumb-interwork-asm.patch @@ -0,0 +1,326 @@ +--- uClibc-0.9.27/ldso/include/dl-elf.h 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/ldso/include/dl-elf.h 2005-08-12 18:24:43.000000000 -0700 +@@ -112,6 +112,13 @@ + # define ELF_RTYPE_CLASS_COPY (0x2) + #endif + #define ELF_RTYPE_CLASS_PLT (0x1) ++/* The type class can be qualified by a list (mask) of the acceptable ++ * STT_ symbol types, if not given the default is everything numerically ++ * <= STT_FUNC (from the original code...) ++ */ ++#define ELF_RTYPE_CLASS_OF(type) ((1<<2) << (type)) ++#define ELF_RTYPE_CLASS_ALL (0xffff << 2) ++#define ELF_RTYPE_CLASS_DEFAULT (((ELF_RTYPE_CLASS_OF(STT_FUNC) << 1) - 1)&ELF_RTYPE_CLASS_ALL) + + + /* Convert between the Linux flags for page protections and the +--- uClibc-0.9.27/ldso/ldso/arm/resolve.S 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/ldso/ldso/arm/resolve.S 2005-08-13 15:08:27.523344709 -0700 +@@ -1,43 +1,117 @@ + /* +- * This function is _not_ called directly. It is jumped to (so no return +- * address is on the stack) when attempting to use a symbol that has not yet +- * been resolved. The first time a jump symbol (such as a function call inside +- * a shared library) is used (before it gets resolved) it will jump here to +- * _dl_linux_resolve. When we get called the stack looks like this: +- * reloc_entry +- * tpnt +- * +- * This function saves all the registers, puts a copy of reloc_entry and tpnt +- * on the stack (as function arguments) then make the function call +- * _dl_linux_resolver(tpnt, reloc_entry). _dl_linux_resolver() figures out +- * where the jump symbol is _really_ supposed to have jumped to and returns +- * that to us. Once we have that, we overwrite tpnt with this fixed up +- * address. We then clean up after ourselves, put all the registers back how we +- * found them, then we jump to the fixed up address, which is where the jump +- * symbol that got us here really wanted to jump to in the first place. +- * -Erik Andersen ++ * On ARM the PLT contains the following three instructions (for ARM calls): ++ * ++ * add ip, pc, #0xNN00000 ++ * add ip, ip, #0xNN000 ++ * ldr pc, [ip, #0xNNN]! ++ * ++ * So that, effectively, causes the following to happen: ++ * ++ * ip := pc+0x0NNNNNNN ++ * pc := *ip ++ * ++ * For thumb the above fragment is preceded by "bx pc, nop" to switch to ARM ++ * mode and the thumb 'bl' must go to PLT-4 - the PLT entry is expanded by ++ * four bytes to accomodate the trampoline code. ++ * ++ * 0x0NNNNNNN is the offset of the GOT entry for this function relative to ++ * the PLT entry for this function (where the code is). So the code in the ++ * PLT causes a branch to whatever is in the GOT, leaving the actual address ++ * of the GOT entry in ip. (Note that the GOT must follow the PLT - the ++ * added value is 28 bit unsigned). ++ * ++ * ip is a pointer to the GOT entry for this function, the first time round ++ * *ip points to this code: ++ * ++ * str lr, [sp, #-4]! @ save lr ++ * ldr lr, [pc, #4] @ lr := *dat (&GOT_TABLE[0]-.) ++ * add lr, pc, lr @ lr += &dat (so lr == &GOT_TABLE[0]) ++ * ldr pc, [lr, #8]! @ pc := GOT_TABLE[2] ++ *dat: .long &GOT_TABLE[0] - . ++ * ++ * (this code is actually held in the first entry of the PLT). The code ++ * preserves lr then uses it as a scratch register (this preserves the ip ++ * value calculated above). GOT_TABLE[2] is initialized by INIT_GOT in ++ * dl-sysdep.h to point to _dl_linux_resolve - this function. The first ++ * three entries in the GOT are reserved, then they are followed by the ++ * entries for the PLT entries, in order. ++ * ++ * The linker initialises the following (non-reserved) GOT entries to ++ * the offset of the PLT with an associated relocation so that on load ++ * the entry is relocated to point to the PLT - the above code. ++ * ++ * The net effect of all this is that on the first call to an external (as ++ * yet unresolved) function all seven of the above instructions are ++ * executed in sequence and the program ends up executing _dl_linux_resolve ++ * with the following important values in registers: ++ * ++ * ip - a pointer to the GOT entry for the as yet unresolved function ++ * lr - &GOT_TABLE[2] ++ * ++ * GOT_TABLE[2] has already been initialised to _dl_linux_resolve, and ++ * GOT_TABLE[1] is a pointer to the (elf_resolve*) from INIT_GOT. ++ * _dl_linux_resolve unfrobnicates the ip and lr values to obtain arguments ++ * for a call to _dl_linux_resolver (not the additional 'r' on the end) - ++ * this is in elfinterp.c in this directory. The call takes arguments: ++ * ++ * _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry) ++ * ++ * And returns the address of the function, it also overwrites the GOT ++ * table entry so that the next time round only the first code fragment will ++ * be executed - it will call the function directly. ++ * ++ * [[Of course, this simply doesn't work on ARM 4T with a thumb target - because ++ * 4T did not do the thumb/arm change on ldr pc! It can be made to work by ++ * changing _dl_linux_resolver to return __%s_from_arm for an STT_TFUNC, but ++ * this hasn't been done, and there is no guarantee that the linker generated ++ * that glue anyway.]] ++ * ++ * _dl_linux_resolve gets the arguments to call the resolver as follows: ++ * ++ * tpnt GOT_TABLE[1], [lr-4] ++ * reloc-entry &GOT-&GOT_TABLE[3], (ip - lr - 4)/4 ++ * ++ * (I.e. 'GOT' means the table entry for this function, the thing for which ++ * ip holds the address.) The reloc-entry is passed as an index, since ++ * since the GOT table has 4 byte entries the code needs to divide this by 4 ++ * to get the actual index. ++ * ++ * John Bowler, August 13, 2005 - determined by experiment and examination ++ * of generated ARM code (there was no documentation...) ++ * ++ * This code is all ARM code - not thumb - _dl_linux_resolver may, itself, ++ * be thumb, in which case the linker will insert the appropriate glue. A ++ * call from thumb to the PLT hits the trampoline code described above. ++ * This code (now) builds a proper stack frame. ++ * ++ * The code does *not* set sb (r9,v6) - to do that the basic PLT instructions ++ * would need to save sb and load the new value and that would require ++ * support in the linker since it generates those instructions. (Also note ++ * that linux/uclibc seems to be using r10 - sl - as a PIC base register - see ++ * dl-startup.c). + */ + +-#define sl r10 +-#define fp r11 +-#define ip r12 +- + .text + .globl _dl_linux_resolve + .type _dl_linux_resolve,%function + .align 4; + + _dl_linux_resolve: +- stmdb sp!, {r0, r1, r2, r3, sl, fp} +- sub r1, ip, lr +- sub r1, r1, #4 +- add r1, r1, r1 +- ldr r0, [lr, #-4] +- mov r3,r0 ++ @ _dl_linux_resolver is a standard subroutine call, therefore it ++ @ preserves everything except r0-r3 (a1-a4), ip and lr. This ++ @ function must branch to the real function, and that expects ++ @ r0-r3 and lr to be as they were before the whole PLT stuff - ++ @ ip can be trashed. ++ stmdb sp!, {r0-r3} ++ ldr r0, [lr, #-4] @ r0 := [lr-4] (GOT_TABLE[1]) ++ sub r1, lr, ip @ r1 := (lr-ip) (a multple of 4) ++ mvn r1, r1, ASR #2 @ r1 := ~((lr-ip)>>2), since -x = (1+~x) ++ @ ~x = -x-1, therefore ~(r1>>2) = (-((lr-ip)>>2)-1) ++ @ = - ((lr-ip)/4) - 1 = (ip - lr - 4)/4, as required + + bl _dl_linux_resolver + +- mov ip, r0 +- ldmia sp!, {r0, r1, r2, r3, sl, fp, lr} +- mov pc,ip ++ mov ip, r0 ++ ldmia sp!, {r0-r3, lr} ++ bx ip + .size _dl_linux_resolve, .-_dl_linux_resolve +--- uClibc-0.9.27/ldso/ldso/arm/elfinterp.c 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/ldso/ldso/arm/elfinterp.c 2005-08-13 16:08:19.061345947 -0700 +@@ -128,7 +128,7 @@ + + rel_addr = (ELF_RELOC *) (tpnt->dynamic_info[DT_JMPREL] + tpnt->loadaddr); + +- this_reloc = rel_addr + (reloc_entry >> 3); ++ this_reloc = rel_addr + reloc_entry; + reloc_type = ELF32_R_TYPE(this_reloc->r_info); + symtab_index = ELF32_R_SYM(this_reloc->r_info); + +@@ -149,13 +149,20 @@ + got_addr = (char **) instr_addr; + + /* Get the address of the GOT entry */ +- new_addr = _dl_find_hash(symname, tpnt->symbol_scope, +- tpnt, ELF_RTYPE_CLASS_PLT); +- if (unlikely(!new_addr)) { +- _dl_dprintf(2, "%s: can't resolve symbol '%s'\n", +- _dl_progname, symname); +- _dl_exit(1); +- }; ++ new_addr = _dl_find_hash(symname, tpnt->symbol_scope, tpnt, ++ ELF_RTYPE_CLASS_PLT+ELF_RTYPE_CLASS_OF(STT_FUNC)); ++ if (!new_addr) { ++ new_addr = _dl_find_hash(symname, tpnt->symbol_scope, tpnt, ++ ELF_RTYPE_CLASS_PLT+ELF_RTYPE_CLASS_OF(STT_ARM_TFUNC)); ++ if (new_addr) { ++ /* Fix up the address for thumb. */ ++ new_addr = (char*)((unsigned long)new_addr | 1); ++ } else { ++ _dl_dprintf(2, "%s: can't resolve symbol '%s'\n", ++ _dl_progname, symname); ++ _dl_exit(1); ++ } ++ } + #if defined (__SUPPORT_LD_DEBUG__) + if ((unsigned long) got_addr < 0x40000000) + { +@@ -278,7 +285,8 @@ + if (symtab_index) { + + symbol_addr = (unsigned long) _dl_find_hash(strtab + symtab[symtab_index].st_name, +- scope, tpnt, elf_machine_type_class(reloc_type)); ++ scope, tpnt, elf_machine_type_class(reloc_type) + ++ ELF_RTYPE_CLASS_DEFAULT + ELF_RTYPE_CLASS_OF(STT_ARM_TFUNC)); + + /* + * We want to allow undefined references to weak symbols - this might +--- uClibc-0.9.27/ldso/ldso/dl-hash.c 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/ldso/ldso/dl-hash.c 2005-08-12 18:28:05.000000000 -0700 +@@ -148,7 +148,11 @@ + char *weak_result = NULL; + + elf_hash_number = _dl_elf_hash(name); +- ++ /* The type class argument may specify the valid symbol types, if not ++ * any type <= STT_FUNC is permitted. ++ */ ++ if ((type_class & ELF_RTYPE_CLASS_ALL) == 0) ++ type_class += ELF_RTYPE_CLASS_DEFAULT; + for (; rpnt; rpnt = rpnt->next) { + tpnt = rpnt->dyn; + +@@ -178,13 +182,16 @@ + for (si = tpnt->elf_buckets[hn]; si != STN_UNDEF; si = tpnt->chains[si]) { + sym = &symtab[si]; + ++ /*... nb, ELF_RTYPE_CLASS_PLT is, must be, "1" - at least ++ * it must be for the following to work. ++ */ + if (type_class & (sym->st_shndx == SHN_UNDEF)) + continue; +- if (_dl_strcmp(strtab + sym->st_name, name) != 0) +- continue; + if (sym->st_value == 0) + continue; +- if (ELF32_ST_TYPE(sym->st_info) > STT_FUNC) ++ if ((ELF_RTYPE_CLASS_OF(ELF32_ST_TYPE(sym->st_info)) & type_class) == 0) ++ continue; ++ if (_dl_strcmp(strtab + sym->st_name, name) != 0) + continue; + + switch (ELF32_ST_BIND(sym->st_info)) { +--- uClibc-0.9.27/libc/sysdeps/linux/arm/clone.S 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/libc/sysdeps/linux/arm/clone.S 2005-08-13 11:56:47.275679748 -0700 +@@ -49,12 +49,13 @@ + swi __NR_clone + movs a1, a1 + blt __syscall_error (PLT) +- movne pc, lr ++ bxne lr + + @ pick the function arg and call address off the stack and execute + ldr r0, [sp, #4] ++ ldr ip, [sp] + mov lr, pc +- ldr pc, [sp] ++ bx ip + + @ and we are done, passing the return value through r0 + b _exit (PLT) +@@ -70,7 +71,7 @@ + + /* return -1 */ + mvn r0, $0 +- mov pc, lr ++ bx lr + .size __clone,.-__clone; + + .L4: .word errno +--- uClibc-0.9.27/libc/sysdeps/linux/arm/mmap64.S 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/libc/sysdeps/linux/arm/mmap64.S 2005-08-13 12:20:35.633560643 -0700 +@@ -44,7 +44,7 @@ + mov ip, r0 + swi __NR_mmap2 + cmn r0, $4096 +- ldmccfd sp!, {r4, r5, pc} ++ ldmccfd sp!, {r4, r5, pc} @ requires >=5T + cmn r0, $ENOSYS + ldmnefd sp!, {r4, r5, lr} + bne __syscall_error (PLT) +@@ -71,7 +71,7 @@ + + /* return -1 */ + mvn r0, $0 +- mov pc, lr ++ bx lr + .size mmap64,.-mmap64; + + .L4: .word errno +--- uClibc-0.9.27/libc/sysdeps/linux/arm/vfork.S 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/libc/sysdeps/linux/arm/vfork.S 2005-08-13 12:23:27.500375540 -0700 +@@ -37,7 +37,7 @@ + #ifdef __NR_vfork + swi __NR_vfork + cmn r0, #4096 +- movcc pc, lr ++ bxcc lr + + /* Check if vfork even exists. */ + ldr r1, =-ENOSYS +@@ -50,7 +50,7 @@ + cmn r0, #4096 + + /* Syscal worked. Return to child/parent */ +- movcc pc, lr ++ bxcc lr + + __syscall_error: + +@@ -64,7 +64,7 @@ + + /* return -1 */ + mvn r0, $0 +- mov pc, lr ++ bx lr + + .L4: .word errno + diff --git a/packages/uclibc/uclibc-0.9.27/thumb-ldso-dlboot.patch b/packages/uclibc/uclibc-0.9.27/thumb-ldso-dlboot.patch new file mode 100644 index 0000000000..9d3cb6bbab --- /dev/null +++ b/packages/uclibc/uclibc-0.9.27/thumb-ldso-dlboot.patch @@ -0,0 +1,21 @@ +--- /home/work-tmp/jbowler/nslu2/ucslugc.0807/work/uclibc-0.9.27-r5/uClibc-0.9.27/ldso/ldso/arm/dl-startup.h 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/ldso/ldso/arm/dl-startup.h 2005-08-11 23:40:01.393797745 -0700 +@@ -7,6 +7,9 @@ + + /* Overrive the default _dl_boot function, and replace it with a bit of asm. + * Then call the real _dl_boot function, which is now named _dl_boot2. */ ++/*NOTE: the 'bx' instruction at the end replaces mov pc, r6 - which is not ++ * compatible with thumb interworking. The instruction should be supported ++ * on all modern ARM architectures (because they all support thumb). */ + asm("" \ + " .text\n" \ + " .globl _dl_boot\n" \ +@@ -17,7 +20,7 @@ + " bl _dl_boot2\n" \ + " mov r6, r0\n" \ + " mov r0, r7\n" \ +-" mov pc, r6\n" \ ++" bx r6\n" \ + ); + + #define DL_BOOT(X) static __attribute_used__ void* _dl_boot2 (X) diff --git a/packages/uclibc/uclibc-0.9.27/thumb-static-main.patch b/packages/uclibc/uclibc-0.9.27/thumb-static-main.patch new file mode 100644 index 0000000000..5b82f39bbf --- /dev/null +++ b/packages/uclibc/uclibc-0.9.27/thumb-static-main.patch @@ -0,0 +1,60 @@ +# This patch almost works, it allows a statically linked application +# to be compiled with a thumb main and to have this work from a +# non-thumb uClibc build. However it stops the same thing working +# in the dynamically linked case (because the value of 'main' doesn't +# have the low bit set when loaded - something must be wrong with the +# relocation for STT_ARM_TFUNC?) At present it is not included for +# this reason. +--- uClibc-0.9.27/libc/misc/internals/__uClibc_main.c 2005-08-13 18:04:09.078682965 -0700 ++++ uClibc-0.9.27/libc/misc/internals/__uClibc_main.c 2005-08-13 18:07:38.159839613 -0700 +@@ -32,6 +32,13 @@ + /* + * Prototypes. + */ ++#if (defined __arm__ || defined __thumb__) && defined __THUMB_INTERWORK__ && defined __linux__ ++/* Because when linking statically the GNU linker provides no glue for ++ * main, so if main is thumb and we are arm or vice versa the static ++ * link fails. ++ */ ++# define main __arm_main ++#endif + extern int main(int argc, char **argv, char **envp); + extern void weak_function _stdio_init(void); + extern int *weak_const_function __errno_location(void); +--- uClibc-0.9.27/libc/sysdeps/linux/arm/Makefile 2005-01-11 23:59:21.000000000 -0800 ++++ uClibc-0.9.27/libc/sysdeps/linux/arm/Makefile 2005-08-13 18:08:08.953777353 -0700 +@@ -25,7 +25,7 @@ + CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o + + SSRC=__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ +- bsd-_setjmp.S sigrestorer.S mmap64.S ++ bsd-_setjmp.S sigrestorer.S mmap64.S mainglue.S + SOBJS=$(patsubst %.S,%.o, $(SSRC)) + + CSRC=brk.c syscall.c ioperm.c sigaction.c +--- uClibc-0.9.27/.pc/thumb-static-main.patch/libc/sysdeps/linux/arm/mainglue.S 2005-08-13 18:20:44.181300825 -0700 ++++ uClibc-0.9.27/libc/sysdeps/linux/arm/mainglue.S 2005-08-13 19:11:05.031390937 -0700 +@@ -0,0 +1,23 @@ ++/* ++ * Apparently the GNU linker doesn't generate the 'glue' code ++ * required for ARM/thumb interwork for the 'main' function - ++ * presumably glibc doesn't need it, but uClibc does. ++ * ++ * We can't provide this stuff, because the linker expects to ++ * have generated the glue code itself and asserts if the code ++ * is not in memory (because it has been read from a pre-existing ++ * definition), therefore we must avoid the glue - so we make ++ * __uClibc_main call __arm_main and define it here (in arm ++ * code). ++ */ ++#if defined __THUMB_INTERWORK__ ++ .text ++ .arm ++ .global __arm_main ++ .type __arm_main, %function ++__arm_main: ++ ldr ip, [pc] ++ bx ip ++ .word main ++ .size __arm_main,.-__arm_main ++#endif diff --git a/packages/uclibc/uclibc-0.9.27/ucslugc/.mtn2git_empty b/packages/uclibc/uclibc-0.9.27/ucslugc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.27/ucslugc/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.27/ucslugc/uClibc.config b/packages/uclibc/uclibc-0.9.27/ucslugc/uClibc.config new file mode 100644 index 0000000000..7c8196e93b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.27/ucslugc/uClibc.config @@ -0,0 +1,160 @@ +# +# Automatically generated make config: don't edit +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sparc is not set +# TARGET_v850 is not set + +# +# Target Architecture Features and Options +# +HAVE_ELF=y +ARCH_SUPPORTS_LITTLE_ENDIAN=y +TARGET_ARCH="arm" +ARCH_SUPPORTS_BIG_ENDIAN=y +CONFIG_GENERIC_ARM=y +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# ARCH_LITTLE_ENDIAN is not set +ARCH_BIG_ENDIAN=y +# ARCH_HAS_NO_MMU is not set +ARCH_HAS_MMU=y +UCLIBC_HAS_FLOATS=y +# HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +WARNINGS="-Wall" +KERNEL_SOURCE="/home/work-tmp/jbowler/nslu2/ucslugc/cross/armeb-linux-uclibc/include" +C_SYMBOL_PREFIX="" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +HAVE_SHARED=y +# ARCH_HAS_NO_LDSO is not set +BUILD_UCLIBC_LDSO=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +UCLIBC_HAS_LFS=y +# UCLIBC_STATIC_LDCONFIG is not set +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +HAS_SHADOW=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y + +# +# String and Stdio Support +# +# UCLIBC_HAS_STRING_GENERIC_OPT is not set +# UCLIBC_HAS_STRING_ARCH_OPT is not set +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# uClibc security related options +# +# UCLIBC_SECURITY is not set + +# +# uClibc development/debugging options +# +# DODEBUG is not set +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index 7ae11507c6..89f1b80831 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r6" +PR = "r7" include uclibc.inc @@ -19,4 +19,21 @@ SRC_URI += "${PATCH_ipc_h}" SRC_URI += " file://thumb-swi.patch;patch=1" SRC_URI += " file://thumb-swp.patch;patch=1" SRC_URI += " file://arm-thumb-defined.patch;patch=1" + +# ARM thumb interworking - these changes fix various bugs in the +# uclibc implementation of thumb interwork support, but they are +# insufficient on their own - it is also necessary (at present) +# to *disable* the uClibc ARM specific string code (the assembler +# doesn't support interworking). Since these patches do actually +# change the non-interwork case and make things incompatible with +# older (pre armv4t) ARMs they are condition on the thumb-interwork +# override (i.e. the *distro* has to add this to OVERRIDES). +ARM_THUMB_INTERWORK_PATCHES = "" +ARM_THUMB_INTERWORK_PATCHES_thumb-interwork = "" +ARM_THUMB_INTERWORK_PATCHES_thumb-interwork += " file://thumb-ldso-dlboot.patch;patch=1" +ARM_THUMB_INTERWORK_PATCHES_thumb-interwork += " file://thumb-interwork-asm.patch;patch=1" +# See the comments in the patch - this doesn't work. +#ARM_THUMB_INTERWORK_PATCHES_thumb-interwork += " file://thumb-static-main.patch;patch=1" +SRC_URI += "${ARM_THUMB_INTERWORK_PATCHES}" + S = "${WORKDIR}/uClibc-${PV}" diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb index 582fbe80ef..3871c80c04 100644 --- a/packages/uicmoc/uicmoc3-native_3.3.2.bb +++ b/packages/uicmoc/uicmoc3-native_3.3.2.bb @@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \ S = "${WORKDIR}/qt-embedded-free-3.3.2" -inherit native qmake-base +inherit native qmake-base qt3e export QTDIR = "${S}" export OE_QMAKE_LINK="${CXX}" @@ -28,6 +28,15 @@ do_configure() { } do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc3 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic3 + install -d ${OE_QMAKE_INCDIR_QT} + install -d ${OE_QMAKE_LIBDIR_QT} + + install -m 0755 bin/moc ${OE_QMAKE_UIC} + install -m 0755 bin/uic ${OE_QMAKE_MOC} + install -m 0655 lib/*.a ${OE_QMAKE_LIBDIR_QT} + + for f in include/*.h + do + install -m 0644 $f ${OE_QMAKE_INCDIR_QT}/ + done } diff --git a/packages/vsftpd/vsftpd_2.0.3.bb b/packages/vsftpd/vsftpd_2.0.3.bb index 52be1d6285..1cb4c55534 100644 --- a/packages/vsftpd/vsftpd_2.0.3.bb +++ b/packages/vsftpd/vsftpd_2.0.3.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Secure ftp daemon" SECTION = "console/network" DEPENDS = "openssl" -PR = "r2" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +PR = "r3" LICENSE = "GPL" SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \ file://makefile.patch;patch=1 \ @@ -9,6 +10,13 @@ SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \ file://init \ file://vsftpd.conf" +do_configure() { + # Fix hardcoded /usr, /etc, /var mess. + cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \ + |sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new + mv tunables.c.new tunables.c +} + do_compile() { oe_runmake "LIBS=-lssl -lcrypto -lcrypt -L${STAGING_LIBDIR}" } @@ -32,4 +40,5 @@ INITSCRIPT_PARAMS = "defaults" pkg_postinst() { addgroup ftp adduser --system --home /var/tmp/ftp --no-create-home --ingroup ftp --disabled-password -s /bin/false ftp -}
\ No newline at end of file + mkdir -p ${localstatedir}/share/empty +} diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb index 1d62b5ae8f..1bd7258b84 100644 --- a/packages/watchdog/watchdog_5.2.bb +++ b/packages/watchdog/watchdog_5.2.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Software watchdog" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" PR = "r2" +LICENCE = "GPL" SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz" FILES = "${sysconfdir}/watchdog.conf ${sbindir}/watchdog" diff --git a/packages/zd1211/zd1211-20050315/Makefile.patch b/packages/zd1211/zd1211-20050315/Makefile.patch index ac49d0b18f..76e422d476 100644 --- a/packages/zd1211/zd1211-20050315/Makefile.patch +++ b/packages/zd1211/zd1211-20050315/Makefile.patch @@ -1,15 +1,15 @@ ---- zd1211/Makefile 2005-03-15 00:23:52.000000000 -1000 -+++ zd1211-new/Makefile 2005-05-30 02:39:34.447198051 -1000 +--- zd1211/Makefile.orig 2005-08-14 04:50:45.898802688 +0200 ++++ zd1211/Makefile 2005-08-14 04:50:53.134702664 +0200 @@ -4,9 +4,9 @@ - # - - # Some commands --CC=gcc --CPP=g++ --LD=ld -+#CC=gcc -+#CPP=g++ -+#LD=ld - RM=rm -f -r - CVS=cvs - TAR=tar + #
+
+ # Some commands
+-CC=gcc
+-CPP=g++
+-LD=ld
++#CC=gcc
++#CPP=g++
++#LD=ld
+ RM=rm -f -r
+ CVS=cvs
+ TAR=tar
|
