From 2effe272df6e19ef3f07f83485739dced23bb43d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:12:04 +0100 Subject: [PATCH 01/12] lame: update to lame-3.99 Signed-off-by: Stephan Raue --- packages/audio/lame/build | 10 ++++------ packages/audio/lame/meta | 2 +- ...4-am_path_gtk.patch => lame-3.99-am_path_gtk.patch} | 9 --------- 3 files changed, 5 insertions(+), 16 deletions(-) rename packages/audio/lame/patches/{lame-3.98.4-am_path_gtk.patch => lame-3.99-am_path_gtk.patch} (96%) diff --git a/packages/audio/lame/build b/packages/audio/lame/build index c15a9b21b5..0971bc4fbe 100755 --- a/packages/audio/lame/build +++ b/packages/audio/lame/build @@ -26,27 +26,25 @@ MAKEFLAGS=-j1 cd $PKG_BUILD +#ac_cv_c_stack_direction=-1 \ +#alex_cv_ieee854_float80=no \ GTK_CONFIG='no' \ -ac_cv_c_stack_direction=-1 \ -alex_cv_ieee854_float80=no \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ --disable-static \ --enable-shared \ --enable-nasm \ + --disable-rpath \ --disable-cpml \ --disable-gtktest \ --disable-efence \ --disable-analyzer-hooks \ --enable-decoder \ - --enable-decode-layer1 \ - --enable-decode-layer2 \ --disable-frontend \ --disable-mp3x \ --disable-mp3rtp \ - --disable-brhist \ - --disable-all-float \ + --disable-dynamic-frontends \ --enable-expopt=no \ --enable-debug=no \ --with-gnu-ld \ diff --git a/packages/audio/lame/meta b/packages/audio/lame/meta index f628144811..1f5ba7e132 100644 --- a/packages/audio/lame/meta +++ b/packages/audio/lame/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="lame" -PKG_VERSION="3.98.4" +PKG_VERSION="3.99" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/audio/lame/patches/lame-3.98.4-am_path_gtk.patch b/packages/audio/lame/patches/lame-3.99-am_path_gtk.patch similarity index 96% rename from packages/audio/lame/patches/lame-3.98.4-am_path_gtk.patch rename to packages/audio/lame/patches/lame-3.99-am_path_gtk.patch index 12d1a2463c..e49b7dedae 100644 --- a/packages/audio/lame/patches/lame-3.98.4-am_path_gtk.patch +++ b/packages/audio/lame/patches/lame-3.99-am_path_gtk.patch @@ -231,12 +231,3 @@ diff -Naur lame-3.98.4/Makefile.am lame-3.98.4.patch/Makefile.am .PHONY: test SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \ -diff -Naur lame-3.98.4/Makefile.am.global lame-3.98.4.patch/Makefile.am.global ---- lame-3.98.4/Makefile.am.global 2006-06-03 15:07:36.000000000 +0200 -+++ lame-3.98.4.patch/Makefile.am.global 2011-03-25 12:15:25.020333213 +0100 -@@ -3,5 +3,4 @@ - # global section for every Makefile.am - - AUTOMAKE_OPTIONS = 1.9 foreign $(top_srcdir)/ansi2knr -- - # end global section From ac4d1f8ee5797fcbdd787d5a3ef54ede8258ddbd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:12:40 +0100 Subject: [PATCH 02/12] distribute: update to distribute-0.6.24 Signed-off-by: Stephan Raue --- packages/python/devel/distribute/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/devel/distribute/meta b/packages/python/devel/distribute/meta index 46caf31a52..5a39d66524 100644 --- a/packages/python/devel/distribute/meta +++ b/packages/python/devel/distribute/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="distribute" -PKG_VERSION="0.6.21" +PKG_VERSION="0.6.24" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 49693f07e1633f7d1ef9528f51879da824f3aee5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:13:15 +0100 Subject: [PATCH 03/12] intltool: update to intltool-0.50.0 Signed-off-by: Stephan Raue --- packages/toolchain/devel/autotools/intltool/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/toolchain/devel/autotools/intltool/meta b/packages/toolchain/devel/autotools/intltool/meta index 0d1eb79aad..34a0514527 100644 --- a/packages/toolchain/devel/autotools/intltool/meta +++ b/packages/toolchain/devel/autotools/intltool/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="intltool" -PKG_VERSION="0.40.6" +PKG_VERSION="0.50.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.gnome.org" -PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://launchpad.net/intltool/trunk/$PKG_VERSION/+download/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="" PKG_BUILD_DEPENDS="ccache" PKG_PRIORITY="optional" From 46cfd3968660b668f6601e452e554d8cb658f7e2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:13:44 +0100 Subject: [PATCH 04/12] mpfr: update upstream patches Signed-off-by: Stephan Raue --- .../mpfr-3.1.0-allpatches_20111005.patch | 50 --- .../mpfr-3.1.0-allpatches_20111103.patch | 393 ++++++++++++++++++ 2 files changed, 393 insertions(+), 50 deletions(-) delete mode 100644 packages/toolchain/math/mpfr/patches/mpfr-3.1.0-allpatches_20111005.patch create mode 100644 packages/toolchain/math/mpfr/patches/mpfr-3.1.0-allpatches_20111103.patch diff --git a/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-allpatches_20111005.patch b/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-allpatches_20111005.patch deleted file mode 100644 index 437b1a278a..0000000000 --- a/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-allpatches_20111005.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_unlikely -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 -@@ -1 +1 @@ --3.1.0 -+3.1.0-p1 -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 -@@ -988,10 +988,11 @@ - ******************************************************/ - - /* Theses macros help the compiler to determine if a test is -- * likely or unlikely. */ -+ likely or unlikely. The !! is necessary in case x is larger -+ than a long. */ - #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) - # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) --# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) -+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) - #else - # define MPFR_LIKELY(x) (x) - # define MPFR_UNLIKELY(x) (x) -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0" -+#define MPFR_VERSION_STRING "3.1.0-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0"; -+ return "3.1.0-p1"; - } diff --git a/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-allpatches_20111103.patch b/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-allpatches_20111103.patch new file mode 100644 index 0000000000..16d9440470 --- /dev/null +++ b/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-allpatches_20111103.patch @@ -0,0 +1,393 @@ +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 +@@ -0,0 +1 @@ ++mpfr_unlikely +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 +@@ -1 +1 @@ +-3.1.0 ++3.1.0-p1 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 +@@ -988,10 +988,11 @@ + ******************************************************/ + + /* Theses macros help the compiler to determine if a test is +- * likely or unlikely. */ ++ likely or unlikely. The !! is necessary in case x is larger ++ than a long. */ + #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) + # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) +-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) ++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) + #else + # define MPFR_LIKELY(x) (x) + # define MPFR_UNLIKELY(x) (x) +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0" ++#define MPFR_VERSION_STRING "3.1.0-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0"; ++ return "3.1.0-p1"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000 +@@ -0,0 +1 @@ ++lib-search-path +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p1 ++3.1.0-p2 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p1" ++#define MPFR_VERSION_STRING "3.1.0-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p1"; ++ return "3.1.0-p2"; + } +diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am +--- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 +@@ -65,8 +65,24 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs +diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in +--- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 +@@ -1124,11 +1124,27 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs + all: all-am + + .SUFFIXES: +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000 +@@ -0,0 +1 @@ ++vasprintf +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p2 ++3.1.0-p3 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p2" ++#define MPFR_VERSION_STRING "3.1.0-p3" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c +--- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -1178,7 +1178,7 @@ + mpfr_exp_t exp; + char * str; + const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); +- const int keep_trailing_zeros = spec_g && spec.alt; ++ const int keep_trailing_zeros = !spec_g || spec.alt; + + /* WARNING: an empty precision field is forbidden (it means precision = 6 + and it should have been changed to 6 before the function call) */ +@@ -1356,7 +1356,7 @@ + else + /* 1 <= |p| */ + { +- size_t nsd; /* Number of significant digits */ ++ size_t str_len; + + /* Determine the position of the most significant decimal digit. */ + exp = floor_log10 (p); +@@ -1365,12 +1365,10 @@ + /* P is too large to print all its integral part digits */ + return -1; + +- np->ip_size = exp + 1; +- +- nsd = spec.prec + np->ip_size; + if (dec_info == NULL) +- { +- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); ++ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ ++ str = ++ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); + register_string (np->sl, str); + } + else +@@ -1379,81 +1377,60 @@ + str = dec_info->str; + } + np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ ++ str_len = strlen (str); ++ ++ /* integral part */ ++ if (exp > str_len) ++ /* mpfr_get_str gives no trailing zero when p is rounded up to the next ++ power of 10 (p integer, so no fractional part) */ ++ { ++ np->ip_trailing_zeros = exp - str_len; ++ np->ip_size = str_len; ++ } ++ else ++ np->ip_size = exp; + + if (spec.group) + /* thousands separator in integral part */ + np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; + +- if (nsd == 0 || (spec_g && !spec.alt)) +- /* compute how much non-zero digits in integral and fractional +- parts */ ++ /* fractional part */ ++ str += np->ip_size; ++ str_len -= np->ip_size; ++ if (!keep_trailing_zeros) ++ /* remove trailing zeros, if any */ + { +- size_t str_len; +- str_len = strlen (str); /* note: the sign has been skipped */ +- +- if (exp > str_len) +- /* mpfr_get_str doesn't give the trailing zeros when p is a +- multiple of 10 (p integer, so no fractional part) */ +- { +- np->ip_trailing_zeros = exp - str_len; +- np->ip_size = str_len; +- if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; +- } +- else +- /* str may contain some digits which are in fractional part */ ++ char *ptr = str + str_len - 1; /* pointer to the last digit of ++ str */ ++ while ((*ptr == '0') && (str_len != 0)) + { +- char *ptr; +- +- ptr = str + str_len - 1; /* points to the end of str */ +- str_len -= np->ip_size; /* number of digits in fractional +- part */ +- +- if (!keep_trailing_zeros) +- /* remove trailing zeros, if any */ +- { +- while ((*ptr == '0') && (str_len != 0)) +- { +- --ptr; +- --str_len; +- } +- } +- +- if (str_len > INT_MAX) +- /* too many digits in fractional part */ +- return -1; +- +- if (str_len != 0) +- /* some digits in fractional part */ +- { +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = str_len; +- } ++ --ptr; ++ --str_len; + } + } +- else +- /* spec.prec digits in fractional part */ ++ ++ if (str_len > 0) ++ /* some nonzero digits in fractional part */ + { +- if (np->ip_size == exp - 1) +- /* the absolute value of the number has been rounded up to a power +- of ten. +- Insert an additional zero in integral part and put the rest of +- them in fractional part. */ +- np->ip_trailing_zeros = 1; ++ if (str_len > INT_MAX) ++ /* too many digits in fractional part */ ++ return -1; + +- if (spec.prec != 0) +- { +- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); +- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_ptr = str; ++ np->fp_size = str_len; ++ } + +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = spec.prec; +- } +- else if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; ++ if (keep_trailing_zeros && str_len < spec.prec) ++ /* add missing trailing zeros */ ++ { ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_trailing_zeros = spec.prec - np->fp_size; + } ++ ++ if (spec.alt) ++ /* add decimal point even if no digits follow it */ ++ np->point = MPFR_DECIMAL_POINT; + } + + return 0; +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p2"; ++ return "3.1.0-p3"; + } +diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c +--- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -475,6 +475,18 @@ + check_sprintf ("-1.", "%- #0.1RG", x); + + /* precision zero */ ++ mpfr_set_d (x, 9.5, MPFR_RNDN); ++ check_sprintf ("9", "%.0RDf", x); ++ check_sprintf ("10", "%.0RUf", x); ++ ++ mpfr_set_d (x, 19.5, MPFR_RNDN); ++ check_sprintf ("19", "%.0RDf", x); ++ check_sprintf ("20", "%.0RUf", x); ++ ++ mpfr_set_d (x, 99.5, MPFR_RNDN); ++ check_sprintf ("99", "%.0RDf", x); ++ check_sprintf ("100", "%.0RUf", x); ++ + mpfr_set_d (x, -9.5, MPFR_RNDN); + check_sprintf ("-10", "%.0RDf", x); + check_sprintf ("-10", "%.0RYf", x); +@@ -1078,6 +1090,23 @@ + mpfr_clear (x); + } + ++static void ++bug20111102 (void) ++{ ++ mpfr_t t; ++ char s[100]; ++ ++ mpfr_init2 (t, 84); ++ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); ++ mpfr_sprintf (s, "%.20RNg", t); ++ if (strcmp (s, "1000") != 0) ++ { ++ printf ("Error in bug20111102, expected 1000, got %s\n", s); ++ exit (1); ++ } ++ mpfr_clear (t); ++} ++ + /* In particular, the following test makes sure that the rounding + * for %Ra and %Rb is not done on the MPFR number itself (as it + * would overflow). Note: it has been reported on comp.std.c that +@@ -1161,6 +1190,7 @@ + locale = setlocale (LC_ALL, "C"); + #endif + ++ bug20111102 (); + native_types (); + hexadecimal (); + binary (); From 1b4406772fbfc08eea2de9834ab839ec013c2f4a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:14:29 +0100 Subject: [PATCH 05/12] pixman: update to pixman-0.24.0 Signed-off-by: Stephan Raue --- packages/x11/lib/pixman/build | 2 +- packages/x11/lib/pixman/meta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/lib/pixman/build b/packages/x11/lib/pixman/build index 6ad2fe3d5a..3de6f2716d 100755 --- a/packages/x11/lib/pixman/build +++ b/packages/x11/lib/pixman/build @@ -28,7 +28,7 @@ if [ "$TARGET_ARCH" = arm ]; then else CFG_NEON="--disable-arm-neon" fi - ARCH_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $CFG_NEON" + ARCH_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $CFG_NEON --disable-arm-iwmmxt" elif [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then ARCH_CONFIG="--enable-mmx --enable-sse2 --disable-vmx --disable-arm-simd --disable-arm-neon" fi diff --git a/packages/x11/lib/pixman/meta b/packages/x11/lib/pixman/meta index 5fa5c66500..e6b15a7031 100644 --- a/packages/x11/lib/pixman/meta +++ b/packages/x11/lib/pixman/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="pixman" -PKG_VERSION="0.23.8" +PKG_VERSION="0.24.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 683141a85662ea0f02dd3805433b325f71b8d1e3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:15:21 +0100 Subject: [PATCH 06/12] Python: fix build Signed-off-by: Stephan Raue --- packages/lang/Python/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lang/Python/build b/packages/lang/Python/build index f0786dd0ae..3e34f53241 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -63,7 +63,7 @@ make -j1 CC="$TARGET_CC" \ HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \ HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \ BLDSHARED="$CC -shared" \ - RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/:$LD_LIBRARY_PATH" \ + RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ CROSS_COMPILE="$TARGET_NAME" \ CROSS_COMPILE_TARGET="yes" \ @@ -75,7 +75,7 @@ make -j1 CC="$TARGET_CC" \ HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \ HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \ BLDSHARED="$CC -shared" \ - RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/:$LD_LIBRARY_PATH" \ + RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH" \ PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \ CROSS_COMPILE="$TARGET_NAME" \ CROSS_COMPILE_TARGET="yes" \ From 27cf007f5b0a17102d8e3d9e911d9e38f962511a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:16:14 +0100 Subject: [PATCH 07/12] binutils: add default lib search path Signed-off-by: Stephan Raue --- packages/toolchain/devel/binutils/build | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/toolchain/devel/binutils/build b/packages/toolchain/devel/binutils/build index ebe6e469e1..96ec95ed65 100755 --- a/packages/toolchain/devel/binutils/build +++ b/packages/toolchain/devel/binutils/build @@ -40,6 +40,7 @@ mkdir -p objdir && cd objdir --target=$TARGET_NAME \ --prefix=$ROOT/$TOOLCHAIN \ --with-sysroot=$SYSROOT_PREFIX \ + --with-lib-path="$SYSROOT_PREFIX/lib:$SYSROOT_PREFIX/usr/lib" \ --with-gmp=$ROOT/$TOOLCHAIN \ --with-mpfr=$ROOT/$TOOLCHAIN \ --with-ppl=$ROOT/$TOOLCHAIN \ From 029c3f46eeb4fe7a83bacaa546f682cb294844aa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:18:23 +0100 Subject: [PATCH 08/12] eglibc: add '-fgnu89-inline' to $CFLAGS, dont build parallel Signed-off-by: Stephan Raue --- packages/toolchain/devel/eglibc/build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build index a363bd03ab..9575465928 100755 --- a/packages/toolchain/devel/eglibc/build +++ b/packages/toolchain/devel/eglibc/build @@ -37,7 +37,10 @@ strip_gold # Fails to compile using the gold linker. LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` # set some CFLAGS we need - CFLAGS="$CFLAGS -g -fno-stack-protector" + CFLAGS="$CFLAGS -g -fno-stack-protector -fgnu89-inline" + +# dont build parallel + MAKEFLAGS=-j1 export BUILD_CC=$HOST_CC export OBJDUMP_FOR_HOST=objdump From dd168e69514d082628891442a50a6aaf2afcb354 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Nov 2011 23:41:12 +0100 Subject: [PATCH 09/12] samba: build without winbind support Signed-off-by: Stephan Raue --- packages/network/samba/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/samba/build b/packages/network/samba/build index 0eb2cf2d27..4e768e1641 100755 --- a/packages/network/samba/build +++ b/packages/network/samba/build @@ -98,7 +98,7 @@ sh autogen.sh --without-aio-support \ --with-sendfile-support \ --without-wbclient \ - --with-winbind \ + --without-winbind \ --with-static-modules=charset_CP437,charset_CP850 \ --with-included-popt \ --with-included-iniparser \ From 4bcfb72a82db394aa9979ce0d7bd2b7dae02e9d1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Nov 2011 07:05:00 +0100 Subject: [PATCH 10/12] mysql: update to mysql-5.1.60 Signed-off-by: Stephan Raue --- packages/databases/mysql/meta | 2 +- ...osscompiling.patch => mysql-5.1.60-010_crosscompiling.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/databases/mysql/patches/{mysql-5.1.59-010_crosscompiling.patch => mysql-5.1.60-010_crosscompiling.patch} (100%) diff --git a/packages/databases/mysql/meta b/packages/databases/mysql/meta index 68ec7e1020..9c5b9a527b 100644 --- a/packages/databases/mysql/meta +++ b/packages/databases/mysql/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="mysql" -PKG_VERSION="5.1.59" +PKG_VERSION="5.1.60" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/databases/mysql/patches/mysql-5.1.59-010_crosscompiling.patch b/packages/databases/mysql/patches/mysql-5.1.60-010_crosscompiling.patch similarity index 100% rename from packages/databases/mysql/patches/mysql-5.1.59-010_crosscompiling.patch rename to packages/databases/mysql/patches/mysql-5.1.60-010_crosscompiling.patch From f8f7972e0054c8a235bd868f9c9c236b2571c60a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Nov 2011 07:05:36 +0100 Subject: [PATCH 11/12] grep: update to grep-2.10 Signed-off-by: Stephan Raue --- packages/sysutils/grep/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/grep/meta b/packages/sysutils/grep/meta index e5e0ce118a..d0e9a3940c 100644 --- a/packages/sysutils/grep/meta +++ b/packages/sysutils/grep/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="grep" -PKG_VERSION="2.9" +PKG_VERSION="2.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/grep/" -PKG_URL="ftp://sunsite.cnlab-switch.ch/mirror/gnu/grep/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="ftp://sunsite.cnlab-switch.ch/mirror/gnu/grep/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="libiconv pcre" PKG_BUILD_DEPENDS="toolchain libiconv pcre" PKG_PRIORITY="optional" From c1505f3d16d13597a63f1b19b32cbade6760d576 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Nov 2011 07:15:44 +0100 Subject: [PATCH 12/12] libbluray: update to libbluray-99ebfa3 Signed-off-by: Stephan Raue --- packages/multimedia/libbluray/build | 1 - packages/multimedia/libbluray/meta | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/multimedia/libbluray/build b/packages/multimedia/libbluray/build index cd2e3ce616..cb9ae6b809 100755 --- a/packages/multimedia/libbluray/build +++ b/packages/multimedia/libbluray/build @@ -44,7 +44,6 @@ cd $PKG_BUILD --disable-doxygen-html \ --disable-doxygen-ps \ --disable-doxygen-pdf \ - --with-dlopen-crypto-libs \ --with-gnu-ld make diff --git a/packages/multimedia/libbluray/meta b/packages/multimedia/libbluray/meta index 4a94f52634..27184abda4 100644 --- a/packages/multimedia/libbluray/meta +++ b/packages/multimedia/libbluray/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libbluray" -PKG_VERSION="51d7d60" +PKG_VERSION="99ebfa3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL"