diff options
| -rw-r--r-- | package/alsa-lib/Makefile | 4 | ||||
| -rw-r--r-- | package/alsa-lib/patches/patch-configure | 17 | ||||
| -rw-r--r-- | package/alsa-lib/patches/patch-libtool | 337 | ||||
| -rw-r--r-- | package/alsa-utils/Makefile | 4 | ||||
| -rw-r--r-- | package/alsa-utils/patches/alsa-utils-exp10-workaround.patch | 33 | ||||
| -rw-r--r-- | package/ffmpeg/Makefile | 6 | ||||
| -rw-r--r-- | package/file/Makefile | 4 | ||||
| -rw-r--r-- | package/file/patches/autotool.patch | 65701 | ||||
| -rw-r--r-- | package/file/patches/patch-magic_Makefile_in | 11 | ||||
| -rw-r--r-- | package/forked-daapd/Makefile | 4 | ||||
| -rw-r--r-- | package/libmpdclient/Makefile | 4 | ||||
| -rw-r--r-- | package/libmpdclient/patches/patch-build_ltmain_sh | 11 | ||||
| -rw-r--r-- | package/mpc/Makefile | 4 | ||||
| -rw-r--r-- | package/mpd/Makefile | 6 | ||||
| -rw-r--r-- | package/rsync/Makefile | 4 |
15 files changed, 385 insertions, 65765 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index cddbb0e69..a82b57b24 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-lib -PKG_VERSION:= 1.0.24.1 +PKG_VERSION:= 1.0.25 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7cc05f25e1d5b65da8fb3fdcd540f226 +PKG_MD5SUM:= 06fe5819020c6684b991dcffc5471304 PKG_DESCR:= ALSA sound library PKG_SECTION:= libs PKG_URL:= http://www.alsa-project.org/ diff --git a/package/alsa-lib/patches/patch-configure b/package/alsa-lib/patches/patch-configure new file mode 100644 index 000000000..86124e79f --- /dev/null +++ b/package/alsa-lib/patches/patch-configure @@ -0,0 +1,17 @@ +--- alsa-lib-1.0.25.orig/configure 2012-01-25 10:29:38.000000000 +0100 ++++ alsa-lib-1.0.25/configure 2012-03-02 17:37:04.000000000 +0100 +@@ -19111,14 +19111,6 @@ $as_echo "major $SND_LIB_MAJOR minor $SN + + test "x$prefix" = xNONE && prefix=$ac_default_prefix + +-if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then +-cat <<EOF +- Please, do not try to compile static and shared libraries together. +- See INSTALL file for more details (do not use --enable-shared=yes with +- --enable-static=yes). +-EOF +- exit 1 +-fi + + + # Check whether --with-configdir was given. diff --git a/package/alsa-lib/patches/patch-libtool b/package/alsa-lib/patches/patch-libtool new file mode 100644 index 000000000..cc1146cb1 --- /dev/null +++ b/package/alsa-lib/patches/patch-libtool @@ -0,0 +1,337 @@ +--- alsa-lib-1.0.25.orig/libtool 2012-01-25 10:29:43.000000000 +0100 ++++ alsa-lib-1.0.25/libtool 2012-03-02 17:35:55.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + + # libtoolT - Provide generalized library-building support services. + # Generated automatically by (GNU alsa-lib 1.0.25) +@@ -30,10 +30,10 @@ + # the same distribution terms that you use for the rest of that program. + + # A sed program that does not truncate output. +-SED="/usr/bin/sed" ++SED="/Volumes/adk/openadk/scripts/sed" + + # Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="/usr/bin/sed -e 1s/^X//" ++Xsed="/Volumes/adk/openadk/scripts/sed -e 1s/^X//" + + # The HP-UX ksh and POSIX shell print the target directory to stdout + # if CDPATH is set. +@@ -44,16 +44,16 @@ available_tags=" CXX" + + # ### BEGIN LIBTOOL CONFIG + +-# Libtool was configured on host alsa0: ++# Libtool was configured on host neon.foo.bar: + + # Shell to use when invoking shell scripts. +-SHELL="/bin/sh" ++SHELL="/bin/bash" + + # Whether or not to build shared libraries. + build_libtool_libs=yes + + # Whether or not to build static libraries. +-build_old_libs=no ++build_old_libs=yes + + # Whether or not to add -lc for building shared libraries. + build_libtool_need_lc=no +@@ -65,30 +65,30 @@ allow_libtool_libs_with_static_runtimes= + fast_install=yes + + # The host system. +-host_alias= +-host=x86_64-suse-linux-gnu ++host_alias=i586-openadk-linux ++host=i586-openadk-linux-gnu + host_os=linux-gnu + + # The build system. +-build_alias= +-build=x86_64-suse-linux-gnu +-build_os=linux-gnu ++build_alias=i686-apple-darwin10 ++build=i686-apple-darwin10 ++build_os=darwin10 + + # An echo program that does not interpret backslashes. + echo="echo" + + # The archiver. +-AR="ar" ++AR="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ar" + AR_FLAGS="cru" + + # A C compiler. +-LTCC="gcc" ++LTCC="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-gcc" + + # LTCC compiler flags. +-LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE" ++LTCFLAGS="-march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -D_GNU_SOURCE" + + # A language-specific compiler. +-CC="gcc" ++CC="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-gcc" + + # Is the compiler the GNU C compiler? + with_gcc=yes +@@ -97,16 +97,16 @@ with_gcc=yes + EGREP="/usr/bin/grep -E" + + # The linker used to build libraries. +-LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64" ++LD="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ld" + + # Whether we need hard or soft links. + LN_S="ln -s" + + # A BSD-compatible nm program. +-NM="/usr/bin/nm -B" ++NM="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-nm" + + # A symbol stripping program +-STRIP="strip" ++STRIP="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip" + + # Used to examine libraries when file_magic_cmd begins "file" + MAGIC_CMD=file +@@ -118,7 +118,7 @@ DLLTOOL="dlltool" + OBJDUMP="objdump" + + # Used on cygwin: assembler. +-AS="as" ++AS="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-as" + + # The name of the directory that contains temporary libtool files. + objdir=.libs +@@ -147,7 +147,7 @@ pic_flag=" -fPIC -DPIC" + pic_mode=default + + # What is the maximum length of a command? +-max_cmd_len=32768 ++max_cmd_len=196608 + + # Does compiler simultaneously support -c and -o options? + compiler_c_o="yes" +@@ -165,10 +165,10 @@ need_version=no + dlopen_support=yes + + # Whether dlopen of programs is supported. +-dlopen_self=yes ++dlopen_self=unknown + + # Whether dlopen of statically linked programs is supported. +-dlopen_self_static=no ++dlopen_self_static=unknown + + # Compiler flag to prevent dynamic linking. + link_static_flag="-static" +@@ -199,7 +199,7 @@ library_names_spec="\${libname}\${releas + soname_spec="\${libname}\${release}\${shared_ext}\$major" + + # Commands used to build and install an old-style archive. +-RANLIB="ranlib" ++RANLIB="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ranlib" + old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" + old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" + old_postuninstall_cmds="" +@@ -224,8 +224,8 @@ module_cmds="" + module_expsym_cmds="" + + # Commands to strip libraries. +-old_striplib="strip --strip-debug" +-striplib="strip --strip-unneeded" ++old_striplib="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip --strip-debug" ++striplib="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip --strip-unneeded" + + # Dependencies to place before the objects being linked to create a + # shared library. +@@ -325,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBR + link_all_deplibs=unknown + + # Compile-time system search path for libraries +-sys_lib_search_path_spec=" /usr/lib64/gcc/x86_64-suse-linux/4.1.2/ /usr/lib/gcc/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/ /lib/x86_64-suse-linux/4.1.2/ /lib/../lib64/ /usr/lib/x86_64-suse-linux/4.1.2/ /usr/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../ /lib/ /usr/lib/" ++sys_lib_search_path_spec=" /Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/ /Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/../../../../i586-openadk-linux-gnu/lib/i586-openadk-linux-gnu/4.5.3/ /Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/../../../../i586-openadk-linux-gnu/lib/ /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/lib/i586-openadk-linux-gnu/4.5.3/ /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/lib/ /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/usr/lib/i586-openadk-linux-gnu/4.5.3/ /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/usr/lib/" + + # Run-time system search path for libraries +-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/lib64/Xaw3d /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/lib/Xaw3d /usr/x86_64-suse-linux/lib /usr/local/lib /opt/kde3/lib /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /usr/local/lib64 /opt/kde3/lib64 /opt/gnome/lib64 " ++sys_lib_dlsearch_path_spec="/lib /usr/lib" + + # Fix the shell variable $srcfile for the compiler. + fix_srcfile_path="" +@@ -1975,7 +1975,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto*) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +@@ -7215,16 +7215,16 @@ disable_libs=static + # End: + # ### BEGIN LIBTOOL TAG CONFIG: CXX + +-# Libtool was configured on host alsa0: ++# Libtool was configured on host neon.foo.bar: + + # Shell to use when invoking shell scripts. +-SHELL="/bin/sh" ++SHELL="/bin/bash" + + # Whether or not to build shared libraries. + build_libtool_libs=yes + + # Whether or not to build static libraries. +-build_old_libs=no ++build_old_libs=yes + + # Whether or not to add -lc for building shared libraries. + build_libtool_need_lc=no +@@ -7236,30 +7236,30 @@ allow_libtool_libs_with_static_runtimes= + fast_install=yes + + # The host system. +-host_alias= +-host=x86_64-suse-linux-gnu ++host_alias=i586-openadk-linux ++host=i586-openadk-linux-gnu + host_os=linux-gnu + + # The build system. +-build_alias= +-build=x86_64-suse-linux-gnu +-build_os=linux-gnu ++build_alias=i686-apple-darwin10 ++build=i686-apple-darwin10 ++build_os=darwin10 + + # An echo program that does not interpret backslashes. + echo="echo" + + # The archiver. +-AR="ar" ++AR="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ar" + AR_FLAGS="cru" + + # A C compiler. +-LTCC="gcc" ++LTCC="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-gcc" + + # LTCC compiler flags. +-LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE" ++LTCFLAGS="-march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -D_GNU_SOURCE" + + # A language-specific compiler. +-CC="g++" ++CC="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-g++" + + # Is the compiler the GNU C compiler? + with_gcc=yes +@@ -7268,16 +7268,16 @@ with_gcc=yes + EGREP="/usr/bin/grep -E" + + # The linker used to build libraries. +-LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64" ++LD="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ld" + + # Whether we need hard or soft links. + LN_S="ln -s" + + # A BSD-compatible nm program. +-NM="/usr/bin/nm -B" ++NM="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-nm" + + # A symbol stripping program +-STRIP="strip" ++STRIP="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip" + + # Used to examine libraries when file_magic_cmd begins "file" + MAGIC_CMD=file +@@ -7289,7 +7289,7 @@ DLLTOOL="dlltool" + OBJDUMP="objdump" + + # Used on cygwin: assembler. +-AS="as" ++AS="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-as" + + # The name of the directory that contains temporary libtool files. + objdir=.libs +@@ -7318,7 +7318,7 @@ pic_flag=" -fPIC -DPIC" + pic_mode=default + + # What is the maximum length of a command? +-max_cmd_len=32768 ++max_cmd_len=196608 + + # Does compiler simultaneously support -c and -o options? + compiler_c_o="yes" +@@ -7336,10 +7336,10 @@ need_version=no + dlopen_support=yes + + # Whether dlopen of programs is supported. +-dlopen_self=yes ++dlopen_self=unknown + + # Whether dlopen of statically linked programs is supported. +-dlopen_self_static=no ++dlopen_self_static=unknown + + # Compiler flag to prevent dynamic linking. + link_static_flag="-static" +@@ -7370,7 +7370,7 @@ library_names_spec="\${libname}\${releas + soname_spec="\${libname}\${release}\${shared_ext}\$major" + + # Commands used to build and install an old-style archive. +-RANLIB="ranlib" ++RANLIB="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ranlib" + old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" + old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" + old_postuninstall_cmds="" +@@ -7392,16 +7392,16 @@ module_cmds="" + module_expsym_cmds="" + + # Commands to strip libraries. +-old_striplib="strip --strip-debug" +-striplib="strip --strip-unneeded" ++old_striplib="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip --strip-debug" ++striplib="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip --strip-unneeded" + + # Dependencies to place before the objects being linked to create a + # shared library. +-predep_objects="/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/crti.o /usr/lib64/gcc/x86_64-suse-linux/4.1.2/crtbeginS.o" ++predep_objects="/Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/usr/lib/crti.o /Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/crtbeginS.o" + + # Dependencies to place after the objects being linked to create a + # shared library. +-postdep_objects="/usr/lib64/gcc/x86_64-suse-linux/4.1.2/crtendS.o /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/crtn.o" ++postdep_objects="/Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/crtendS.o /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/usr/lib/crtn.o" + + # Dependencies to place before the objects being linked to create a + # shared library. +@@ -7413,7 +7413,7 @@ postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc + + # The library search path used internally by the compiler when linking + # a shared library. +-compiler_lib_search_path="-L/usr/lib64/gcc/x86_64-suse-linux/4.1.2 -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../.." ++compiler_lib_search_path="-L/Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3 -L/Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/../../../../i586-openadk-linux-gnu/lib -L/Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/lib -L/Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/usr/lib" + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method="pass_all" +@@ -7493,10 +7493,10 @@ variables_saved_for_relink="PATH LD_LIBR + link_all_deplibs=unknown + + # Compile-time system search path for libraries +-sys_lib_search_path_spec=" /usr/lib64/gcc/x86_64-suse-linux/4.1.2/ /usr/lib/gcc/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/ /lib/x86_64-suse-linux/4.1.2/ /lib/../lib64/ /usr/lib/x86_64-suse-linux/4.1.2/ /usr/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../ /lib/ /usr/lib/" ++sys_lib_search_path_spec=" /Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/ /Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/../../../../i586-openadk-linux-gnu/lib/i586-openadk-linux-gnu/4.5.3/ /Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3/../../../../i586-openadk-linux-gnu/lib/ /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/lib/i586-openadk-linux-gnu/4.5.3/ /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/lib/ /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/usr/lib/i586-openadk-linux-gnu/4.5.3/ /Volumes/adk/openadk/host_i586_eglibc/../target_i586_eglibc/usr/lib/" + + # Run-time system search path for libraries +-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/lib64/Xaw3d /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/lib/Xaw3d /usr/x86_64-suse-linux/lib /usr/local/lib /opt/kde3/lib /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /usr/local/lib64 /opt/kde3/lib64 /opt/gnome/lib64 " ++sys_lib_dlsearch_path_spec="/lib /usr/lib" + + # Fix the shell variable $srcfile for the compiler. + fix_srcfile_path="" diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 972228cc2..e5e157d0c 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils -PKG_VERSION:= 1.0.24.2 +PKG_VERSION:= 1.0.25 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8238cd57cb301d1c36bcf0ecb59ce6b2 +PKG_MD5SUM:= f81f9dcb9a014fd32cb3a70066a5b9a9 PKG_DESCR:= ALSA mixer utility PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libpthread diff --git a/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch b/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch deleted file mode 100644 index f4a520a5c..000000000 --- a/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch +++ /dev/null @@ -1,33 +0,0 @@ -From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <jacmet@sunsite.dk> -Date: Mon, 14 Mar 2011 09:19:18 +0100 -Subject: [PATCH] alsamixer: fix build on uClibc - -exp10 is a glibc extension, which isn't supported on uClibc. Luckily, -exp10() is trivial to compute based on exp(), so add a wrapper for -the uClibc case. - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - alsamixer/volume_mapping.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c -index 9cacad8..1c0d7c4 100644 ---- a/alsamixer/volume_mapping.c -+++ b/alsamixer/volume_mapping.c -@@ -37,6 +37,11 @@ - #include <stdbool.h> - #include "volume_mapping.h" - -+#ifdef __UCLIBC__ -+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ -+#define exp10(x) (exp((x) * log(10))) -+#endif /* __UCLIBC__ */ -+ - #define MAX_LINEAR_DB_SCALE 24 - - static inline bool use_linear_dB_scale(long dBmin, long dBmax) --- -1.7.2.3 - diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 0bf164017..c4ecdc037 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 0.8.3 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 556870ccfd6c9c0426c7dd86dd5beb62 +PKG_VERSION:= 0.10 +PKG_RELEASE:= 1 +PKG_MD5SUM:= dc665cc599a739e3c5262ccdac13d129 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_FDEPENDS:= libpthread diff --git a/package/file/Makefile b/package/file/Makefile index 86147ed4e..c855f41f8 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= file -PKG_VERSION:= 5.04 +PKG_VERSION:= 5.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= accade81ff1cc774904b47c72c8aeea0 +PKG_MD5SUM:= 16a407bd66d6c7a832f3a5c0d609c27b PKG_DESCR:= a file type guesser PKG_SECTION:= utils PKG_DEPENDS:= libmagic diff --git a/package/file/patches/autotool.patch b/package/file/patches/autotool.patch deleted file mode 100644 index 296506ea7..000000000 --- a/package/file/patches/autotool.patch +++ /dev/null @@ -1,65701 +0,0 @@ -diff -Nur file-5.04.orig/aclocal.m4 file-5.04/aclocal.m4 ---- file-5.04.orig/aclocal.m4 2010-01-22 22:09:20.000000000 +0100 -+++ file-5.04/aclocal.m4 2011-02-24 20:54:40.083551736 +0100 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.10 -*- Autoconf -*- -+# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,107 +11,196 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --m4_if(m4_PACKAGE_VERSION, [2.61],, --[m4_fatal([this file was generated for autoconf 2.61. --You have another version of autoconf. If you want to use that, --you should regenerate the build system entirely.], [63])]) -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -+[m4_warning([this file was generated for autoconf 2.65. -+You have another version of autoconf. It may work, but is not guaranteed to. -+If you have problems, you may need to regenerate the build system entirely. -+To do so, use the procedure documented by the package, typically `autoreconf'.])]) - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+m4_define([_LT_COPYING], [dnl -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is part of GNU Libtool. -+# -+# GNU Libtool 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. -+# -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -+# obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+]) - --# serial 52 AC_PROG_LIBTOOL -+# serial 56 LT_INIT - - --# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) --# ----------------------------------------------------------- --# If this macro is not defined by Autoconf, define it here. --m4_ifdef([AC_PROVIDE_IFELSE], -- [], -- [m4_define([AC_PROVIDE_IFELSE], -- [m4_ifdef([AC_PROVIDE_$1], -- [$2], [$3])])]) -+# LT_PREREQ(VERSION) -+# ------------------ -+# Complain and exit if this libtool version is less that VERSION. -+m4_defun([LT_PREREQ], -+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, -+ [m4_default([$3], -+ [m4_fatal([Libtool version $1 or higher is required], -+ 63)])], -+ [$2])]) - - --# AC_PROG_LIBTOOL --# --------------- --AC_DEFUN([AC_PROG_LIBTOOL], --[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl --dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX --dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -- AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [AC_LIBTOOL_CXX], -- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -- ])]) --dnl And a similar setup for Fortran 77 support -- AC_PROVIDE_IFELSE([AC_PROG_F77], -- [AC_LIBTOOL_F77], -- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 --])]) -- --dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. --dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run --dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -- AC_PROVIDE_IFELSE([AC_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [ifdef([AC_PROG_GCJ], -- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -- ifdef([A][M_PROG_GCJ], -- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -- ifdef([LT_AC_PROG_GCJ], -- [define([LT_AC_PROG_GCJ], -- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) --])])# AC_PROG_LIBTOOL -+# _LT_CHECK_BUILDDIR -+# ------------------ -+# Complain if the absolute build directory name contains unusual characters -+m4_defun([_LT_CHECK_BUILDDIR], -+[case `pwd` in -+ *\ * | *\ *) -+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -+esac -+]) - - --# _AC_PROG_LIBTOOL --# ---------------- --AC_DEFUN([_AC_PROG_LIBTOOL], --[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl --AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl --AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl --AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -+# LT_INIT([OPTIONS]) -+# ------------------ -+AC_DEFUN([LT_INIT], -+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -+AC_BEFORE([$0], [LT_LANG])dnl -+AC_BEFORE([$0], [LT_OUTPUT])dnl -+AC_BEFORE([$0], [LTDL_INIT])dnl -+m4_require([_LT_CHECK_BUILDDIR])dnl -+ -+dnl Autoconf doesn't catch unexpanded LT_ macros by default: -+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -+dnl unless we require an AC_DEFUNed macro: -+AC_REQUIRE([LTOPTIONS_VERSION])dnl -+AC_REQUIRE([LTSUGAR_VERSION])dnl -+AC_REQUIRE([LTVERSION_VERSION])dnl -+AC_REQUIRE([LTOBSOLETE_VERSION])dnl -+m4_require([_LT_PROG_LTMAIN])dnl -+ -+dnl Parse OPTIONS -+_LT_SET_OPTIONS([$0], [$1]) - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - AC_SUBST(LIBTOOL)dnl - --# Prevent multiple expansion --define([AC_PROG_LIBTOOL], []) --])# _AC_PROG_LIBTOOL -+_LT_SETUP - -+# Only expand once: -+m4_define([LT_INIT]) -+])# LT_INIT -+ -+# Old names: -+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -+dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - --# AC_LIBTOOL_SETUP --# ---------------- --AC_DEFUN([AC_LIBTOOL_SETUP], --[AC_PREREQ(2.50)dnl --AC_REQUIRE([AC_ENABLE_SHARED])dnl --AC_REQUIRE([AC_ENABLE_STATIC])dnl --AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+m4_defun([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) -+ -+ -+# _LT_FILEUTILS_DEFAULTS -+# ---------------------- -+# It is okay to use these file commands and assume they have been set -+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -+m4_defun([_LT_FILEUTILS_DEFAULTS], -+[: ${CP="cp -f"} -+: ${MV="mv -f"} -+: ${RM="rm -f"} -+])# _LT_FILEUTILS_DEFAULTS -+ -+ -+# _LT_SETUP -+# --------- -+m4_defun([_LT_SETUP], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+_LT_DECL([], [host_alias], [0], [The host system])dnl -+_LT_DECL([], [host], [0])dnl -+_LT_DECL([], [host_os], [0])dnl -+dnl -+_LT_DECL([], [build_alias], [0], [The build system])dnl -+_LT_DECL([], [build], [0])dnl -+_LT_DECL([], [build_os], [0])dnl -+dnl - AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_PROG_LD])dnl --AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl --AC_REQUIRE([AC_PROG_NM])dnl -- -+AC_REQUIRE([LT_PATH_LD])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+dnl - AC_REQUIRE([AC_PROG_LN_S])dnl --AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl --# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! --AC_REQUIRE([AC_OBJEXT])dnl --AC_REQUIRE([AC_EXEEXT])dnl -+test -z "$LN_S" && LN_S="ln -s" -+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl - dnl --AC_LIBTOOL_SYS_MAX_CMD_LEN --AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --AC_LIBTOOL_OBJDIR -+AC_REQUIRE([LT_CMD_MAX_LEN])dnl -+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -+dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_CMD_RELOAD])dnl -+m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CMD_OLD_ARCHIVE])dnl -+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+ -+_LT_CONFIG_LIBTOOL_INIT([ -+# See if we are running on zsh, and set the options which allow our -+# commands through without removal of \ escapes INIT. -+if test -n "\${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+]) -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi - --AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl --_LT_AC_PROG_ECHO_BACKSLASH -+_LT_CHECK_OBJDIR -+ -+m4_require([_LT_TAG_COMPILER])dnl -+_LT_PROG_ECHO_BACKSLASH - - case $host_os in - aix3*) -@@ -127,116 +216,653 @@ - - # 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'] -+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - - # Same as above, but do not quote variable references. --[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] -+double_quote_subst='s/\([["`\\]]\)/\\\1/g' - - # Sed substitution to delay expansion of an escaped shell variable in a - # double_quote_subst'ed string. - delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ - # Sed substitution to avoid accidental globbing in evaled expressions - no_glob_subst='s/\*/\\\*/g' - --# Constants: --rm="rm -f" -- - # Global variables: --default_ofile=libtool -+ofile=libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, - # which needs '.lib'). - libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" - --AC_CHECK_TOOL(AR, ar, false) --AC_CHECK_TOOL(RANLIB, ranlib, :) --AC_CHECK_TOOL(STRIP, strip, :) -+with_gnu_ld="$lt_cv_prog_gnu_ld" - - old_CC="$CC" - old_CFLAGS="$CFLAGS" - - # Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --test -z "$AS" && AS=as - test -z "$CC" && CC=cc - test -z "$LTCC" && LTCC=$CC - test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS --test -z "$DLLTOOL" && DLLTOOL=dlltool - test -z "$LD" && LD=ld --test -z "$LN_S" && LN_S="ln -s" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$SED" && SED=sed --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: - test -z "$ac_objext" && ac_objext=o - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -- --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -- ;; -- *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -- ;; -- esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" --fi -- - _LT_CC_BASENAME([$compiler]) - - # Only perform the check for file, if the check method requires it -+test -z "$MAGIC_CMD" && MAGIC_CMD=file - case $deplibs_check_method in - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- AC_PATH_MAGIC -+ _LT_PATH_MAGIC - fi - ;; - esac - --_LT_REQUIRED_DARWIN_CHECKS -+# Use C for the default configuration in the libtool script -+LT_SUPPORTED_TAG([CC]) -+_LT_LANG_C_CONFIG -+_LT_LANG_DEFAULT_CONFIG -+_LT_CONFIG_COMMANDS -+])# _LT_SETUP -+ - --AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) --AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], --enable_win32_dll=yes, enable_win32_dll=no) -- --AC_ARG_ENABLE([libtool-lock], -- [AC_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+# _LT_PROG_LTMAIN -+# --------------- -+# Note that this code is called both from `configure', and `config.status' -+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -+# `config.status' has no value for ac_aux_dir unless we are using Automake, -+# so we pass a copy along to make sure it has a sensible val |