# HG changeset patch # User Aleksej Bobylev # Date 1521641719 -7200 # Node ID 6477d7f704813da0b1e5085eb5740abd1b26b426 # Parent d43bf7aae9219849f48a4d0870b0c57c1cd650b0 ardour, gdal, icu, js, jsoncpp, libvpx, llvm, mesa, minetest, opencv, qt5, scilab, webkit2gtk, webkitgtk, xalan-c: remove std.patch, use `fix math`. diff -r d43bf7aae921 -r 6477d7f70481 ardour/receipt --- a/ardour/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/ardour/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -18,6 +18,7 @@ sord-dev sratom lilv gtkmm-dev dbus-dev readline-dev gettext" compile_rules() { + fix math python2 waf configure \ --prefix=/usr \ --configdir=/etc \ diff -r d43bf7aae921 -r 6477d7f70481 ardour/stuff/patches/series --- a/ardour/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -std.patch diff -r d43bf7aae921 -r 6477d7f70481 ardour/stuff/patches/std.patch --- a/ardour/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ ---- a/libs/vamp-plugins/SpectralCentroid.cpp -+++ b/libs/vamp-plugins/SpectralCentroid.cpp -@@ -43,8 +43,8 @@ - #define isinf_local(val) !((bool)_finite((double)val)) - #define isnan_local(val) (bool)_isnan((double)val) - #else --#define isinf_local std::isinf --#define isnan_local std::isnan -+#define isinf_local isinf -+#define isnan_local isnan - #endif - - #include "SpectralCentroid.h" ---- a/libs/ardour/dsp_filter.cc -+++ b/libs/ardour/dsp_filter.cc -@@ -28,7 +28,7 @@ - #include - #define isfinite_local(val) (bool)_finite((double)val) - #else --#define isfinite_local std::isfinite -+#define isfinite_local isfinite - #endif - - #ifndef M_PI ---- a/libs/ardour/midi_track.cc -+++ b/libs/ardour/midi_track.cc -@@ -25,8 +25,8 @@ - #define isinf_local(val) !((bool)_finite((double)val)) - #define isnan_local(val) (bool)_isnan((double)val) - #else --#define isinf_local std::isinf --#define isnan_local std::isnan -+#define isinf_local isinf -+#define isnan_local isnan - #endif - - #include "pbd/enumwriter.h" ---- a/gtk2_ardour/automation_line.cc -+++ b/gtk2_ardour/automation_line.cc -@@ -25,7 +25,7 @@ - // 'std::isnan()' is not available in MSVC. - #define isnan_local(val) (bool)_isnan((double)val) - #else --#define isnan_local std::isnan -+#define isnan_local isnan - #endif - - #include ---- a/libs/evoral/src/ControlList.cpp -+++ b/libs/evoral/src/ControlList.cpp -@@ -24,7 +24,7 @@ - // 'std::isnan()' is not available in MSVC. - #define isnan_local(val) (bool)_isnan((double)val) - #else --#define isnan_local std::isnan -+#define isnan_local isnan - #endif - - #define GUARD_POINT_DELTA 64 diff -r d43bf7aae921 -r 6477d7f70481 gdal/receipt --- a/gdal/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/gdal/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -16,6 +16,7 @@ SPLIT="gdal gdal-dev gdal-bin gdal-datas libgdal" compile_rules() { + fix math ./configure \ --sysconfdir=/etc \ --localstatedir=/var \ diff -r d43bf7aae921 -r 6477d7f70481 icu/receipt --- a/icu/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/icu/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -22,6 +22,7 @@ SPLIT="libicu icu icu-dev libicu-full:full icu-full:full icu-full-dev:full" compile_rules() { + fix math cd $src/icu4c/source sed -i.orig 's/xlocale/locale/' i18n/digitlst.cpp if [ -z "$SET" ]; then diff -r d43bf7aae921 -r 6477d7f70481 icu/stuff/patches/series --- a/icu/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -std.patch diff -r d43bf7aae921 -r 6477d7f70481 icu/stuff/patches/std.patch --- a/icu/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ ---- a/icu4c/source/i18n/number_decimalquantity.cpp -+++ b/icu4c/source/i18n/number_decimalquantity.cpp -@@ -330,13 +330,13 @@ - setBcdToZero(); - flags = 0; - // signbit() from handles +0.0 vs -0.0 -- if (std::signbit(n) != 0) { -+ if (signbit(n) != 0) { - flags |= NEGATIVE_FLAG; - n = -n; - } -- if (std::isnan(n) != 0) { -+ if (isnan(n) != 0) { - flags |= NAN_FLAG; -- } else if (std::isfinite(n) == 0) { -+ } else if (isfinite(n) == 0) { - flags |= INFINITY_FLAG; - } else if (n != 0) { - _setToDoubleFast(n); diff -r d43bf7aae921 -r 6477d7f70481 js/receipt --- a/js/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/js/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -21,6 +21,7 @@ SPLIT="js-dev" compile_rules() { + fix math cd js/src autoconf-2.13 && diff -r d43bf7aae921 -r 6477d7f70481 js/stuff/patches/series --- a/js/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 +++ b/js/stuff/patches/series Wed Mar 21 16:15:19 2018 +0200 @@ -1,4 +1,2 @@ # http://www.linuxfromscratch.org/patches/blfs/8.1/js38-38.2.1-upstream_fixes-2.patch js38-38.2.1-upstream_fixes-2.patch - -std.patch diff -r d43bf7aae921 -r 6477d7f70481 js/stuff/patches/std.patch --- a/js/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ---- a/mfbt/decimal/Decimal.cpp -+++ b/mfbt/decimal/Decimal.cpp -@@ -686,10 +686,10 @@ - - Decimal Decimal::fromDouble(double doubleValue) - { -- if (std::isfinite(doubleValue)) -+ if (isfinite(doubleValue)) - return fromString(mozToString(doubleValue)); - -- if (std::isinf(doubleValue)) -+ if (isinf(doubleValue)) - return infinity(doubleValue < 0 ? Negative : Positive); - - return nan(); diff -r d43bf7aae921 -r 6477d7f70481 jsoncpp/receipt --- a/jsoncpp/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/jsoncpp/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -14,6 +14,7 @@ BUILD_DEPENDS="cmake" compile_rules() { + fix math mkdir build cd build cmake \ diff -r d43bf7aae921 -r 6477d7f70481 libvpx/receipt --- a/libvpx/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/libvpx/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -16,6 +16,7 @@ SPLIT="libvpx-dev" compile_rules() { + fix math sed -i 's/cp -p/cp/' build/make/Makefile mkdir libvpx-build diff -r d43bf7aae921 -r 6477d7f70481 libvpx/stuff/patches/series --- a/libvpx/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -std.patch diff -r d43bf7aae921 -r 6477d7f70481 libvpx/stuff/patches/std.patch --- a/libvpx/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ ---- a/third_party/libwebm/mkvparser/mkvparser.cc -+++ b/third_party/libwebm/mkvparser/mkvparser.cc -@@ -36,8 +36,8 @@ - inline bool isnan(double val) { return !!_isnan(val); } - inline bool isinf(double val) { return !_finite(val); } - #else --inline bool isnan(double val) { return std::isnan(val); } --inline bool isinf(double val) { return std::isinf(val); } -+inline bool isnan(double val) { return isnan(val); } -+inline bool isinf(double val) { return isinf(val); } - #endif // MSC_COMPAT - - IMkvReader::~IMkvReader() {} diff -r d43bf7aae921 -r 6477d7f70481 llvm/receipt --- a/llvm/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/llvm/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -3,7 +3,8 @@ PACKAGE="llvm" VERSION="5.0.0" CATEGORY="development" -SHORT_DESC="LLVM (Low Level Virtual Machine): collection of modular and reusable compiler and toolchain technologies" +SHORT_DESC="LLVM (Low Level Virtual Machine): collection of modular and \ +reusable compiler and toolchain technologies" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="MIT" WEB_SITE="http://llvm.org/" @@ -15,7 +16,10 @@ SPLIT="llvm-dev llvm-libs" compile_rules() { - mkdir build && cd build && + fix math + mkdir build + cd build + CC=gcc CXX=g++ \ cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -23,7 +27,8 @@ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=ON \ -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \ - -Wno-dev .. && + -Wno-dev \ + .. && make && make install } diff -r d43bf7aae921 -r 6477d7f70481 llvm/stuff/patches/series --- a/llvm/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -std.patch diff -r d43bf7aae921 -r 6477d7f70481 llvm/stuff/patches/std.patch --- a/llvm/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -${src}/lib/Support/NativeFormatting.cpp: In function 'void llvm::write_double(llvm::raw_ostream&, double, llvm::FloatStyle, llvm::Optional)': -${src}/lib/Support/NativeFormatting.cpp:166:12: error: '__builtin_isnan' is not a member of 'std' - if (std::isnan(N)) { - ^ -${src}/lib/Support/NativeFormatting.cpp:166:12: note: suggested alternative: -: note: '__builtin_isnan' -${src}/lib/Support/NativeFormatting.cpp:169:19: error: '__builtin_isinf_sign' is not a member of 'std' - } else if (std::isinf(N)) { - ^ -${src}/lib/Support/NativeFormatting.cpp:169:19: note: suggested alternative: -: note: '__builtin_isinf_sign' -make[2]: *** [lib/Support/CMakeFiles/LLVMSupport.dir/build.make:1263: lib/Support/CMakeFiles/LLVMSupport.dir/NativeFormatting.cpp.o] Error 1 -make[1]: *** [CMakeFiles/Makefile2:545: lib/Support/CMakeFiles/LLVMSupport.dir/all] Error 2 - ---- a/lib/Support/NativeFormatting.cpp -+++ b/lib/Support/NativeFormatting.cpp -@@ -163,10 +163,10 @@ - Optional Precision) { - size_t Prec = Precision.getValueOr(getDefaultPrecision(Style)); - -- if (std::isnan(N)) { -+ if (isnan(N)) { - S << "nan"; - return; -- } else if (std::isinf(N)) { -+ } else if (isinf(N)) { - S << "INF"; - return; - } diff -r d43bf7aae921 -r 6477d7f70481 mesa/receipt --- a/mesa/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/mesa/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -23,6 +23,7 @@ mesa-libwayland-egl mesa-libxatracker mesa-vdpau mesa mesa-dev" compile_rules() { + fix math # Removed from the full list: freedreno,vc4 # because we haven't appropriate libdrm-* packages (they are only for ARM) GLL_DRV="i915,nouveau,r300,r600,radeonsi,svga,swrast,swr,virgl,etnaviv,imx" diff -r d43bf7aae921 -r 6477d7f70481 mesa/stuff/patches/series --- a/mesa/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -std.patch diff -r d43bf7aae921 -r 6477d7f70481 mesa/stuff/patches/std.patch --- a/mesa/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ ---- a/include/c99_math.h -+++ b/include/c99_math.h -@@ -192,19 +192,6 @@ - */ - #if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23)) - #include -- --using std::fpclassify; --using std::isfinite; --using std::isinf; --using std::isnan; --using std::isnormal; --using std::signbit; --using std::isgreater; --using std::isgreaterequal; --using std::isless; --using std::islessequal; --using std::islessgreater; --using std::isunordered; - #endif - - ---- a/src/gallium/drivers/swr/rasterizer/memory/Convert.h -+++ b/src/gallium/drivers/swr/rasterizer/memory/Convert.h -@@ -169,13 +169,13 @@ - mant = uf & 0x007FFFFF; - - // Check for out of range -- if (std::isnan(val)) -+ if (isnan(val)) - { - exp = 0x1F; - mant = 0x200; - sign = 1; // set the sign bit for NANs - } -- else if (std::isinf(val)) -+ else if (isinf(val)) - { - exp = 0x1f; - mant = 0x0; ---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp -+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp -@@ -54,13 +54,13 @@ - mant = uf & 0x007FFFFF; - - // Check for out of range -- if (std::isnan(val)) -+ if (isnan(val)) - { - exp = 0x1F; - mant = 0x200; - sign = 1; // set the sign bit for NANs - } -- else if (std::isinf(val)) -+ else if (isinf(val)) - { - exp = 0x1f; - mant = 0x0; diff -r d43bf7aae921 -r 6477d7f70481 minetest/receipt --- a/minetest/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/minetest/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -22,6 +22,7 @@ # Rules to configure and make the package. compile_rules() { + fix math [ -s "$SRC/$TARBALL2" ] || wget --no-check-certificate \ -O "$SRC/$TARBALL2" $WGET_URL2 cd games/ diff -r d43bf7aae921 -r 6477d7f70481 opencv/receipt --- a/opencv/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/opencv/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -6,37 +6,34 @@ SHORT_DESC="Open source computer vision library" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" +WEB_SITE="http://opencv.org/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://opencv.org/" WGET_URL="https://github.com/Itseez/opencv/archive/$VERSION.tar.gz" -BUILD_DEPENDS="wget cmake gtk+-dev ffmpeg-dev jpeg-dev tiff-dev libpng16-dev" +BUILD_DEPENDS="cmake gtk+-dev ffmpeg-dev libjpeg-turbo-dev tiff-dev \ +libpng16-dev" SPLIT="opencv opencv-dev" -# Rules to configure and make the package. -compile_rules() -{ - mkdir build && cd build && - cmake .. -DCMAKE_INSTALL_PREFIX=/usr && +compile_rules() { + fix math + mkdir build + cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + .. && make && make DESTDIR=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib +genpkg_rules() { case $PACKAGE in - opencv) - DEPENDS="gtk+ ffmpeg jpeg tiff libpng16" - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/share $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib - ;; - opencv-dev) - #cp -a $install/usr/lib/*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/include $fs/usr - ;; + opencv) + copy @std + DEPENDS="gtk+ ffmpeg jpeg tiff libpng16" + ;; + opencv-dev) + copy @dev + ;; esac } diff -r d43bf7aae921 -r 6477d7f70481 qt5/receipt --- a/qt5/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/qt5/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -45,6 +45,7 @@ qt5-doc qt5-dev" compile_rules() { + fix math export QT5PREFIX=/usr # or /opt/qt5 if [ "$QT5PREFIX" == '/usr' ]; then QT5OPTS="\ diff -r d43bf7aae921 -r 6477d7f70481 qt5/stuff/patches/series --- a/qt5/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -std.patch diff -r d43bf7aae921 -r 6477d7f70481 qt5/stuff/patches/std.patch --- a/qt5/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ ---- a/qtbase/src/corelib/global/qnumeric_p.h -+++ b/qtbase/src/corelib/global/qnumeric_p.h -@@ -101,12 +101,12 @@ - static inline bool isinf(float f) { return math_h_isinf(f); } - static inline bool isfinite(float f) { return math_h_isfinite(f); } - #else --static inline bool isnan(double d) { return std::isnan(d); } --static inline bool isinf(double d) { return std::isinf(d); } --static inline bool isfinite(double d) { return std::isfinite(d); } --static inline bool isnan(float f) { return std::isnan(f); } --static inline bool isinf(float f) { return std::isinf(f); } --static inline bool isfinite(float f) { return std::isfinite(f); } -+static inline bool isnan(double d) { return isnan(d); } -+static inline bool isinf(double d) { return isinf(d); } -+static inline bool isfinite(double d) { return isfinite(d); } -+static inline bool isnan(float f) { return isnan(f); } -+static inline bool isinf(float f) { return isinf(f); } -+static inline bool isfinite(float f) { return isfinite(f); } - #endif - } - ---- a/qtbase/src/corelib/kernel/qvariant.cpp -+++ b/qtbase/src/corelib/kernel/qvariant.cpp -@@ -3486,8 +3486,8 @@ - return 0; - - // only do fuzzy comparisons for finite, non-zero numbers -- int c1 = std::fpclassify(r1); -- int c2 = std::fpclassify(r2); -+ int c1 = fpclassify(r1); -+ int c2 = fpclassify(r2); - if ((c1 == FP_NORMAL || c1 == FP_SUBNORMAL) && (c2 == FP_NORMAL || c2 == FP_SUBNORMAL)) { - if (qFuzzyCompare(r1, r2)) - return 0; diff -r d43bf7aae921 -r 6477d7f70481 scilab/receipt --- a/scilab/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/scilab/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -19,6 +19,7 @@ # Rules to configure and make the package. compile_rules() { + fix math ./configure --prefix=/usr \ --without-javasci --without-gui --disable-build-help \ --without-umfpack \ diff -r d43bf7aae921 -r 6477d7f70481 webkit2gtk/receipt --- a/webkit2gtk/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/webkit2gtk/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -19,8 +19,9 @@ SPLIT="webkit2gtk-dev" compile_rules() { - mkdir -p build && - cd build && + fix math + mkdir build + cd build CFLAGS=-Wno-expansion-to-defined \ CXXFLAGS=-Wno-expansion-to-defined \ diff -r d43bf7aae921 -r 6477d7f70481 webkitgtk/receipt --- a/webkitgtk/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/webkitgtk/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -24,11 +24,12 @@ harfbuzz-icu-dev libxslt-dev gst1-plugins-base-dev gettext" compile_rules() { + fix math CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" - mkdir -p build && - cd build && + mkdir build + cd build ../configure \ --enable-introspection \ diff -r d43bf7aae921 -r 6477d7f70481 xalan-c/receipt --- a/xalan-c/receipt Wed Mar 21 15:58:17 2018 +0200 +++ b/xalan-c/receipt Wed Mar 21 16:15:19 2018 +0200 @@ -18,6 +18,7 @@ SPLIT="xalan-c-dev" compile_rules() { + fix math mv c/* . && rm -r c sed -i 's/isnan/std::&/' src/xalanc/PlatformSupport/DoubleSupport.hpp sed -i 's/mutable MemoryManager/MemoryManager/' src/xalanc/*/*.hpp