diff options
68 files changed, 1006 insertions, 474 deletions
@@ -657,7 +657,7 @@ ifeq ($(findstring darwin,$(BUILD)),) else NONET_LIB := $(PREFIX)/$(BUILD)/lib/nonetwork.dylib PRELOAD := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES='$(NONET_LIB)' - NONET_CFLAGS := -arch i386 -arch x86_64 + NONET_CFLAGS := -arch x86_64 endif $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c | $(PREFIX)/$(BUILD)/lib/.gitkeep diff --git a/docs/build-matrix.html b/docs/build-matrix.html index 0e9d97e..e62bd83 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -229,7 +229,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> cairo </th> - <td>1.15.4 </td> + <td>1.15.12 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -381,9 +381,9 @@ feel free to submit a pull request. <th class="row" title=""> cminpack </th> <td>1.3.4 </td> <td class="supported">✓</td> - <td class="unsupported">×</td> <td class="supported">✓</td> - <td class="unsupported">×</td> + <td class="supported">✓</td> + <td class="supported">✓</td> <td></td> </tr> @@ -469,7 +469,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> curl </th> - <td>7.61.1 </td> + <td>7.62.0 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -569,7 +569,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> faad2 </th> - <td>2.7 </td> + <td>2.8.8 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -599,7 +599,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> fftw </th> - <td>3.3.6-pl1 </td> + <td>3.3.8 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -619,7 +619,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> flac </th> - <td>1.3.1 </td> + <td>1.3.2 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -639,7 +639,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> fltk </th> - <td>1.3.3 </td> + <td>1.3.4-2 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -671,15 +671,15 @@ feel free to submit a pull request. <th class="row" title=""> freeimage </th> <td>3.15.4 </td> <td class="supported">✓</td> - <td class="unsupported">×</td> <td class="supported">✓</td> - <td class="unsupported">×</td> + <td class="supported">✓</td> + <td class="supported">✓</td> <td></td> </tr> <tr> <th class="row" title=""> freetds </th> - <td>1.00.97 </td> + <td>1.00.108 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -799,7 +799,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> gendef </th> - <td>5.0.4 </td> + <td>6.0.0 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -999,7 +999,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> gst-libav </th> - <td>1.14.0 </td> + <td>1.14.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1009,7 +1009,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> gst-plugins-bad </th> - <td>1.14.0 </td> + <td>1.14.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1019,7 +1019,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> gst-plugins-base </th> - <td>1.14.0 </td> + <td>1.14.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1029,7 +1029,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> gst-plugins-good </th> - <td>1.14.0 </td> + <td>1.14.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1039,7 +1039,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> gst-plugins-ugly </th> - <td>1.14.0 </td> + <td>1.14.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1049,7 +1049,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> gstreamer </th> - <td>1.14.0 </td> + <td>1.14.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1199,7 +1199,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> harfbuzz </th> - <td>1.9.0 </td> + <td>2.1.1 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1579,7 +1579,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> libcdio </th> - <td>0.93 </td> + <td>0.94 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1749,7 +1749,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> libgcrypt </th> - <td>1.8.3 </td> + <td>1.8.4 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1919,7 +1919,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> libidn2 </th> - <td>2.0.2 </td> + <td>2.0.5 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -1949,7 +1949,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> libjpeg-turbo </th> - <td>1.5.3 </td> + <td>2.0.1 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -2609,7 +2609,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> lzo </th> - <td>2.09 </td> + <td>2.10 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -2649,7 +2649,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> mingw-w64 [script-pkg] </th> - <td>5.0.4 </td> + <td>6.0.0 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -2679,7 +2679,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> mman-win32 </th> - <td>b7ec370 </td> + <td>9f115ad </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -2949,7 +2949,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> ogg </th> - <td>1.3.2 </td> + <td>1.3.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -3049,7 +3049,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> openscenegraph </th> - <td>3.4.1 </td> + <td>3.6.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -3069,7 +3069,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> openthreads </th> - <td>3.4.1 </td> + <td>3.6.3 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -3079,7 +3079,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> opus </th> - <td>1.1.1 </td> + <td>1.2.1 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -3089,7 +3089,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> opusfile </th> - <td>0.6 </td> + <td>0.11 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -3399,7 +3399,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> proj </th> - <td>5.0.0 </td> + <td>5.1.0 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -3608,6 +3608,16 @@ feel free to submit a pull request. </tr> <tr> + <th class="row" title=""> qtifw </th> + <td>3.0.4 </td> + <td></td> + <td></td> + <td></td> + <td></td> + <td class="supported">✓</td> + </tr> + +<tr> <th class="row" title=""> qtimageformats </th> <td>5.11.2 </td> <td class="supported">✓</td> @@ -4219,7 +4229,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> speex </th> - <td>1.2rc2 </td> + <td>1.2.0 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -4249,7 +4259,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> sqlite </th> - <td>3250100 </td> + <td>3250300 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -4359,7 +4369,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> tiff </th> - <td>4.0.9 </td> + <td>4.0.10 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -4499,7 +4509,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> vmime </th> - <td>df135b5 </td> + <td>0368ada </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -4559,7 +4569,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> wavpack </th> - <td>4.75.2 </td> + <td>5.1.0 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -4579,7 +4589,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> widl </th> - <td>5.0.4 </td> + <td>6.0.0 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -4709,7 +4719,7 @@ feel free to submit a pull request. <tr> <th class="row" title=""> xxhash </th> - <td>0.6.4 </td> + <td>0.6.5 </td> <td class="supported">✓</td> <td class="supported">✓</td> <td class="supported">✓</td> @@ -4789,15 +4799,15 @@ feel free to submit a pull request. <tr> <th class="row" colspan="2"> -Total: 460 +Total: 461 <br>(+7 virtual +8 native-only) </th> <th>455</th> -<th>387</th> +<th>389</th> <th>441</th> -<th>386</th> -<th>32</th> +<th>388</th> +<th>33</th> </tr> </tbody> </table> diff --git a/docs/packages.json b/docs/packages.json index 755406d..faab9fe 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -18,7 +18,7 @@ "box2d": {"version": "2.3.1", "website": "https://www.box2d.org/", "description": ""}, "bullet": {"version": "2.82-r2704", "website": "http://bulletphysics.org/", "description": "Bullet physics, version 2"}, "bzip2": {"version": "1.0.6", "website": "https://en.wikipedia.org/wiki/Bzip2", "description": ""}, - "cairo": {"version": "1.15.4", "website": "https://cairographics.org/", "description": ""}, + "cairo": {"version": "1.15.12", "website": "https://cairographics.org/", "description": ""}, "cairomm": {"version": "1.11.2", "website": "https://cairographics.org/cairomm/", "description": ""}, "cblas": {"version": "3.8.0", "website": "https://www.netlib.org/blas/", "description": "C interface to Reference BLAS"}, "cc": {"version": "1", "website": "https://mxe.cc/", "description": "Dependency package for cross libraries"}, @@ -42,7 +42,7 @@ "cryptopp": {"version": "5.6.3", "website": "https://www.cryptopp.com/", "description": "Crypto++ Library"}, "crystalhd": {"version": "1", "website": "https://www.broadcom.com/support/crystal_hd/", "description": "Broadcom Crystal HD Headers"}, "cunit": {"version": "2.1-3", "website": "https://cunit.sourceforge.io/", "description": ""}, - "curl": {"version": "7.61.1", "website": "https://curl.haxx.se/libcurl/", "description": "cURL"}, + "curl": {"version": "7.62.0", "website": "https://curl.haxx.se/libcurl/", "description": "cURL"}, "db": {"version": "6.1.26", "website": "https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html", "description": "Oracle Berkeley DB"}, "dbus": {"version": "1.13.6", "website": "https://dbus.freedesktop.org/", "description": ""}, "dcmtk": {"version": "3.6.0", "website": "https://dicom.offis.de/dcmtk.php.en", "description": "DCMTK"}, @@ -52,18 +52,18 @@ "eigen": {"version": "3.2.5", "website": "https://eigen.tuxfamily.org/", "description": ""}, "exiv2": {"version": "0.25", "website": "http://www.exiv2.org/", "description": "Exiv2"}, "expat": {"version": "2.2.6", "website": "https://github.com/libexpat/libexpat", "description": "Expat XML Parser"}, - "faad2": {"version": "2.7", "website": "http://www.audiocoding.com/", "description": ""}, + "faad2": {"version": "2.8.8", "website": "http://www.audiocoding.com/", "description": ""}, "fdk-aac": {"version": "0.1.4", "website": "https://github.com/mstorsjo/fdk-aac", "description": "FDK-AAC"}, "ffmpeg": {"version": "4.0.2", "website": "https://ffmpeg.org/", "description": ""}, - "fftw": {"version": "3.3.6-pl1", "website": "http://www.fftw.org/", "description": ""}, + "fftw": {"version": "3.3.8", "website": "http://www.fftw.org/", "description": ""}, "file": {"version": "5.24", "website": "https://www.darwinsys.com/file/", "description": ""}, - "flac": {"version": "1.3.1", "website": "https://www.xiph.org/flac/", "description": "FLAC"}, + "flac": {"version": "1.3.2", "website": "https://www.xiph.org/flac/", "description": "FLAC"}, "flann": {"version": "1.8.4", "website": "https://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN", "description": "FLANN"}, - "fltk": {"version": "1.3.3", "website": "http://www.fltk.org/", "description": "FLTK"}, + "fltk": {"version": "1.3.4-2", "website": "http://www.fltk.org/", "description": "FLTK"}, "fontconfig": {"version": "2.13.1", "website": "https://fontconfig.org/", "description": ""}, "freeglut": {"version": "3.0.0", "website": "https://freeglut.sourceforge.io/", "description": ""}, "freeimage": {"version": "3.15.4", "website": "https://freeimage.sourceforge.io/", "description": "FreeImage"}, - "freetds": {"version": "1.00.97", "website": "http://www.freetds.org/", "description": "FreeTDS"}, + "freetds": {"version": "1.00.108", "website": "http://www.freetds.org/", "description": "FreeTDS"}, "freetype": {"version": "2.9.1", "website": "https://www.freetype.org/", "description": ""}, "freetype-bootstrap": {"version": "2.9.1", "website": "https://www.freetype.org/", "description": "freetype (without harfbuzz)"}, "freexl": {"version": "1.0.3", "website": "https://www.gaia-gis.it/fossil/freexl/index", "description": "FreeXL"}, @@ -75,7 +75,7 @@ "gdal": {"version": "2.2.3", "website": "https://www.gdal.org/", "description": "GDAL"}, "gdb": {"version": "8.2", "website": "https://www.gnu.org/software/gdb/", "description": ""}, "gdk-pixbuf": {"version": "2.32.3", "website": "https://gtk.org/", "description": "GDK-pixbuf"}, - "gendef": {"version": "5.0.4", "website": "https://sourceforge.net/p/mingw-w64/wiki2/gendef/", "description": ""}, + "gendef": {"version": "6.0.0", "website": "https://sourceforge.net/p/mingw-w64/wiki2/gendef/", "description": ""}, "geoip-database": {"version": "20150317-1", "website": "https://www.maxmind.com/", "description": "GeoIP Legacy Database"}, "geos": {"version": "3.6.2", "website": "https://trac.osgeo.org/geos/", "description": "GEOS"}, "gettext": {"version": "0.19.8.1", "website": "https://www.gnu.org/software/gettext/", "description": ""}, @@ -95,12 +95,12 @@ "graphicsmagick": {"version": "1.3.21", "website": "http://www.graphicsmagick.org/", "description": "GraphicsMagick"}, "gsl": {"version": "2.3", "website": "https://www.gnu.org/software/gsl/", "description": "GSL"}, "gsoap": {"version": "2.8.63", "website": "https://www.genivia.com/dev.html", "description": "gSOAP"}, - "gst-libav": {"version": "1.14.0", "website": "https://gstreamer.freedesktop.org/modules/gst-libav.html", "description": ""}, - "gst-plugins-bad": {"version": "1.14.0", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html", "description": ""}, - "gst-plugins-base": {"version": "1.14.0", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-base.html", "description": ""}, - "gst-plugins-good": {"version": "1.14.0", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-good.html", "description": ""}, - "gst-plugins-ugly": {"version": "1.14.0", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html", "description": ""}, - "gstreamer": {"version": "1.14.0", "website": "https://gstreamer.freedesktop.org/modules/gstreamer.html", "description": ""}, + "gst-libav": {"version": "1.14.3", "website": "https://gstreamer.freedesktop.org/modules/gst-libav.html", "description": ""}, + "gst-plugins-bad": {"version": "1.14.3", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html", "description": ""}, + "gst-plugins-base": {"version": "1.14.3", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-base.html", "description": ""}, + "gst-plugins-good": {"version": "1.14.3", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-good.html", "description": ""}, + "gst-plugins-ugly": {"version": "1.14.3", "website": "https://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html", "description": ""}, + "gstreamer": {"version": "1.14.3", "website": "https://gstreamer.freedesktop.org/modules/gstreamer.html", "description": ""}, "gta": {"version": "1.0.8", "website": "https://www.nongnu.org/gta/", "description": ""}, "gtk2": {"version": "2.24.29", "website": "https://gtk.org/", "description": "GTK+"}, "gtk3": {"version": "3.22.7", "website": "https://gtk.org/", "description": "GTK+"}, @@ -115,7 +115,7 @@ "guile": {"version": "1.8.8", "website": "https://www.gnu.org/software/guile/", "description": "GNU Guile"}, "gumbo": {"version": "0.10.1", "website": "https://github.com/google/gumbo-parser", "description": "Gumbo, an HTML5 parsing library"}, "hamlib": {"version": "3.3", "website": "http://www.hamlib.org/", "description": "HamLib"}, - "harfbuzz": {"version": "1.9.0", "website": "https://wiki.freedesktop.org/www/Software/HarfBuzz/", "description": "HarfBuzz"}, + "harfbuzz": {"version": "2.1.1", "website": "https://wiki.freedesktop.org/www/Software/HarfBuzz/", "description": "HarfBuzz"}, "hdf-eos2": {"version": "19v1.00", "website": "https://hdfeos.org/software/library.php", "description": "HDF-EOS2"}, "hdf-eos5": {"version": "1.15", "website": "https://hdfeos.org/software/library.php", "description": "HDF-EOS5"}, "hdf4": {"version": "4.2.10", "website": "https://www.hdfgroup.org/hdf4/", "description": "HDF4"}, @@ -153,7 +153,7 @@ "libbs2b": {"version": "3.1.0", "website": "https://bs2b.sourceforge.io/", "description": "Bauer Stereophonic-to-Binaural library"}, "libcaca": {"version": "0.99.beta19", "website": "http://caca.zoy.org/wiki/libcaca", "description": ""}, "libcddb": {"version": "1.3.2", "website": "https://sourceforge.net/projects/libcddb/", "description": "Access data on a CDDB"}, - "libcdio": {"version": "0.93", "website": "https://www.gnu.org/software/libcdio/", "description": "Libcdio"}, + "libcdio": {"version": "0.94", "website": "https://www.gnu.org/software/libcdio/", "description": "Libcdio"}, "libcdio-paranoia": {"version": "10.2+0.93+1", "website": "https://www.gnu.org/software/libcdio/", "description": "Libcdio-paranoia"}, "libcomm14cux": {"version": "2.1.1", "website": "https://github.com/colinbourassa/libcomm14cux/", "description": ""}, "libcroco": {"version": "0.6.2", "website": "http://www.linuxfromscratch.org/blfs/view/svn/general/libcroco.html", "description": "Libcroco"}, @@ -170,7 +170,7 @@ "libffi": {"version": "3.2.1", "website": "https://sourceware.org/libffi/", "description": ""}, "libftdi": {"version": "0.20", "website": "https://www.intra2net.com/en/developer/libftdi/index.php", "description": "LibFTDI"}, "libftdi1": {"version": "1.2", "website": "https://www.intra2net.com/en/developer/libftdi/index.php", "description": "LibFTDI1"}, - "libgcrypt": {"version": "1.8.3", "website": "https://directory.fsf.org/wiki/Libgcrypt", "description": ""}, + "libgcrypt": {"version": "1.8.4", "website": "https://directory.fsf.org/wiki/Libgcrypt", "description": ""}, "libgda": {"version": "4.2.13", "website": "http://www.gnome-db.org/", "description": ""}, "libgdamm": {"version": "4.1.3", "website": "https://launchpad.net/libgdamm", "description": ""}, "libgee": {"version": "0.20.1", "website": "https://wiki.gnome.org/Projects/Libgee", "description": ""}, @@ -187,10 +187,10 @@ "libiconv": {"version": "1.15", "website": "https://www.gnu.org/software/libiconv/", "description": ""}, "libid3tag": {"version": "0.15.1b", "website": "https://sourceforge.net/projects/mad/files/libid3tag/", "description": ""}, "libidn": {"version": "1.33", "website": "https://www.gnu.org/software/libidn/", "description": "Libidn"}, - "libidn2": {"version": "2.0.2", "website": "https://www.gnu.org/software/libidn/#libidn2", "description": "implementation of IDNA2008/TR46 internationalized domain names"}, + "libidn2": {"version": "2.0.5", "website": "https://www.gnu.org/software/libidn/#libidn2", "description": "implementation of IDNA2008/TR46 internationalized domain names"}, "libieee1284": {"version": "0.2.11", "website": "http://cyberelk.net/tim/software/libieee1284/", "description": ""}, "libircclient": {"version": "1.8", "website": "https://sourceforge.net/projects/libircclient/", "description": ""}, - "libjpeg-turbo": {"version": "1.5.3", "website": "https://libjpeg-turbo.virtualgl.org/", "description": ""}, + "libjpeg-turbo": {"version": "2.0.1", "website": "https://libjpeg-turbo.virtualgl.org/", "description": ""}, "liblastfm": {"version": "1.0.9", "website": "https://github.com/lastfm/liblastfm", "description": "A Qt C++ library for the Last.fm webservices"}, "liblastfm_qt4": {"version": "1.0.9", "website": "https://github.com/lastfm/liblastfm", "description": "A Qt C++ library for the Last.fm webservices"}, "liblaxjson": {"version": "1.0.5", "website": "https://github.com/andrewrk/liblaxjson", "description": ""}, @@ -256,14 +256,14 @@ "luajit": {"version": "2.0.4", "website": "https://luajit.org/luajit.html", "description": "LuaJIT"}, "lz4": {"version": "1.8.0", "website": "https://github.com/lz4/lz4", "description": "lossless compression algorithm optimized for speed"}, "lzma": {"version": "1805", "website": "https://www.7-zip.org/sdk.html", "description": "LZMA SDK"}, - "lzo": {"version": "2.09", "website": "https://www.oberhumer.com/opensource/lzo/", "description": ""}, + "lzo": {"version": "2.10", "website": "https://www.oberhumer.com/opensource/lzo/", "description": ""}, "matio": {"version": "1.5.2", "website": "https://sourceforge.net/projects/matio/", "description": ""}, "mdbtools": {"version": "0.7.1", "website": "https://sourceforge.net/projects/mdbtools/", "description": ""}, "metis": {"version": "5.1.0", "website": "glaros.dtc.umn.edu", "description": "metis"}, - "mingw-w64": {"version": "5.0.4", "website": "https://mingw-w64.sourceforge.io/", "description": "MinGW-w64 Runtime"}, + "mingw-w64": {"version": "6.0.0", "website": "https://mingw-w64.sourceforge.io/", "description": "MinGW-w64 Runtime"}, "miniupnpc": {"version": "2.0", "website": "http://miniupnp.free.fr/", "description": ""}, "minizip": {"version": "68a48aa", "website": "http://www.winimage.com/zLibDll/minizip.html", "description": ""}, - "mman-win32": {"version": "b7ec370", "website": "https://code.google.com/p/mman-win32/", "description": "MMA-Win32"}, + "mman-win32": {"version": "9f115ad", "website": "https://code.google.com/p/mman-win32/", "description": "MMA-Win32"}, "mpc": {"version": "1.1.0", "website": "http://www.multiprecision.org/", "description": "GNU MPC"}, "mpfr": {"version": "3.1.5", "website": "https://www.mpfr.org/", "description": ""}, "mpg123": {"version": "1.22.4", "website": "https://www.mpg123.de/", "description": ""}, @@ -290,7 +290,7 @@ "ocaml-native": {"version": "4.00.1", "website": "https://caml.inria.fr/", "description": "ocaml"}, "ocaml-xml-light": {"version": "2.2", "website": "http://tech.motion-twin.com/xmllight.html", "description": "xml-light"}, "oce": {"version": "0.18.2", "website": "https://github.com/tpaviot/oce", "description": "Open CASCADE Community Edition"}, - "ogg": {"version": "1.3.2", "website": "https://www.xiph.org/ogg/", "description": "OGG"}, + "ogg": {"version": "1.3.3", "website": "https://www.xiph.org/ogg/", "description": "OGG"}, "old": {"version": "0.17", "website": "https://blitiri.com.ar/p/old/", "description": ""}, "openal": {"version": "1.16.0", "website": "http://kcat.strangesoft.net/openal.html", "description": ""}, "openblas": {"version": "0.2.20", "website": "https://www.openblas.net/", "description": "OpenBLAS"}, @@ -300,11 +300,11 @@ "openexr": {"version": "2.2.0", "website": "https://www.openexr.com/", "description": "OpenEXR"}, "openjpeg": {"version": "2.3.0", "website": "https://www.openjpeg.org/", "description": "OpenJPEG"}, "openmp-validation": {"version": "ff8cf0c", "website": "https://github.com/uhhpctools/omp-validation", "description": "OpenMP Validation Suite"}, - "openscenegraph": {"version": "3.4.1", "website": "http://www.openscenegraph.org/", "description": "OpenSceneGraph"}, + "openscenegraph": {"version": "3.6.3", "website": "http://www.openscenegraph.org/", "description": "OpenSceneGraph"}, "openssl": {"version": "1.1.1", "website": "https://www.openssl.org/", "description": ""}, - "openthreads": {"version": "3.4.1", "website": "http://www.openscenegraph.org/", "description": "OpenThreads"}, - "opus": {"version": "1.1.1", "website": "https://opus-codec.org/", "description": ""}, - "opusfile": {"version": "0.6", "website": "https://opus-codec.org/", "description": ""}, + "openthreads": {"version": "3.6.3", "website": "http://www.openscenegraph.org/", "description": "OpenThreads"}, + "opus": {"version": "1.2.1", "website": "https://opus-codec.org/", "description": ""}, + "opusfile": {"version": "0.11", "website": "https://opus-codec.org/", "description": ""}, "osgearth": {"version": "2.9", "website": "http://osgearth.org/", "description": "Geospatial SDK for OpenSceneGraph"}, "ossim": {"version": "43a071a", "website": "https://trac.osgeo.org/ossim", "description": "OSSIM"}, "pango": {"version": "1.37.4", "website": "https://www.pango.org/", "description": "Pango"}, @@ -335,7 +335,7 @@ "portmidi": {"version": "217", "website": "https://portmedia.sourceforge.io/portmidi/", "description": ""}, "postgresql": {"version": "9.2.4", "website": "https://www.postgresql.org/", "description": "PostgreSQL"}, "primesieve": {"version": "5.5.0", "website": "https://primesieve.org/", "description": "Primesieve"}, - "proj": {"version": "5.0.0", "website": "https://trac.osgeo.org/proj/", "description": ""}, + "proj": {"version": "5.1.0", "website": "https://trac.osgeo.org/proj/", "description": ""}, "protobuf": {"version": "3.5.2", "website": "https://github.com/google/protobuf", "description": ""}, "pthreads": {"version": "POSIX 1003.1-2001", "website": "https://en.wikipedia.org/wiki/POSIX_Threads", "description": "POSIX Threads"}, "pugixml": {"version": "1.8", "website": "https://pugixml.org/", "description": "Light-weight, simple, and fast XML parser for C++ with XPath support"}, @@ -356,6 +356,7 @@ "qtdeclarative": {"version": "5.11.2", "website": "https://www.qt.io/", "description": "Qt"}, "qtgamepad": {"version": "5.11.2", "website": "https://www.qt.io/", "description": "Qt"}, "qtgraphicaleffects": {"version": "5.11.2", "website": "https://www.qt.io/", "description": "Qt"}, + "qtifw": {"version": "3.0.4", "website": "https://doc.qt.io/qtinstallerframework/index.html", "description": "Qt Installer Framework"}, "qtimageformats": {"version": "5.11.2", "website": "https://www.qt.io/", "description": "Qt"}, "qtkeychain": {"version": "0.9.1", "website": "https://github.com/frankosterfeld/qtkeychain", "description": "QtKeychain"}, "qtlocation": {"version": "5.11.2", "website": "https://www.qt.io/", "description": "Qt"}, @@ -417,10 +418,10 @@ "sox": {"version": "14.4.2", "website": "https://sox.sourceforge.io/", "description": "SoX"}, "sparsehash": {"version": "2.0.3", "website": "https://github.com/sparsehash/sparsehash", "description": ""}, "spatialite": {"version": "4.4.0-RC1", "website": "https://www.gaia-gis.it/fossil/libspatialite/index", "description": "SpatiaLite"}, - "speex": {"version": "1.2rc2", "website": "https://speex.org/", "description": "Speex"}, + "speex": {"version": "1.2.0", "website": "https://speex.org/", "description": "Speex"}, "speexdsp": {"version": "1.2rc3", "website": "https://speex.org/", "description": "SpeexDSP"}, "sqlcipher": {"version": "3.4.2", "website": "https://www.zetetic.net/sqlcipher/", "description": "SQLite extension that provides 256 bit AES encryption of database files"}, - "sqlite": {"version": "3250100", "website": "https://www.sqlite.org/", "description": "SQLite"}, + "sqlite": {"version": "3250300", "website": "https://www.sqlite.org/", "description": "SQLite"}, "subversion": {"version": "1.9.7", "website": "https://subversion.apache.org/", "description": ""}, "suitesparse": {"version": "4.5.6", "website": "http://faculty.cse.tamu.edu/davis/suitesparse.html", "description": "SuiteSparse"}, "t4k_common": {"version": "0.1.1", "website": "https://tux4kids.alioth.debian.org/", "description": ""}, @@ -431,7 +432,7 @@ "termcap": {"version": "1.3.1", "website": "https://www.gnu.org/software/termutils/", "description": "Termcap"}, "theora": {"version": "1.1.1", "website": "https://theora.org/", "description": "Theora"}, "tidy-html5": {"version": "5.6.0", "website": "https://www.html-tidy.org/", "description": "HTML/XML syntax checker and reformatter"}, - "tiff": {"version": "4.0.9", "website": "http://simplesystems.org/libtiff/", "description": "LibTIFF"}, + "tiff": {"version": "4.0.10", "website": "http://simplesystems.org/libtiff/", "description": "LibTIFF"}, "tinyxml": {"version": "2.6.2", "website": "https://sourceforge.net/projects/tinyxml/", "description": ""}, "tinyxml2": {"version": "6.0.0", "website": "http://grinninglizard.com/tinyxml2/", "description": ""}, "tre": {"version": "0.8.0", "website": "https://laurikari.net/tre/", "description": "TRE"}, @@ -445,15 +446,15 @@ "vcdimager": {"version": "0.7.24", "website": "https://www.gnu.org/software/vcdimager/", "description": ""}, "vidstab": {"version": "1.1.0", "website": "http://public.hronopik.de/vid.stab/features.php?lang=en", "description": "vid.stab video stablizer"}, "vigra": {"version": "1.9.0", "website": "https://ukoethe.github.io/vigra/", "description": ""}, - "vmime": {"version": "df135b5", "website": "https://www.vmime.org/", "description": "VMime"}, + "vmime": {"version": "0368ada", "website": "https://www.vmime.org/", "description": "VMime"}, "vo-aacenc": {"version": "0.1.3", "website": "https://github.com/mstorsjo/vo-aacenc", "description": "VO-AACENC"}, "vo-amrwbenc": {"version": "0.1.3", "website": "https://github.com/mstorsjo/vo-amrwbenc", "description": "VO-AMRWBENC"}, "vorbis": {"version": "1.3.5", "website": "https://xiph.org/vorbis/", "description": "Vorbis"}, "vtk": {"version": "8.0.0", "website": "", "description": ""}, "waf": {"version": "1.8.17", "website": "https://waf.io/", "description": "Waf: the meta build system"}, - "wavpack": {"version": "4.75.2", "website": "http://www.wavpack.com/", "description": "WavPack"}, + "wavpack": {"version": "5.1.0", "website": "http://www.wavpack.com/", "description": "WavPack"}, "wget": {"version": "1.19.5", "website": "https://www.gnu.org/software/wget/", "description": ""}, - "widl": {"version": "5.0.4", "website": "https://www.winehq.org/docs/widl/", "description": "Wine IDL Compiler"}, + "widl": {"version": "6.0.0", "website": "https://www.winehq.org/docs/widl/", "description": "Wine IDL Compiler"}, "winpcap": {"version": "4_1_3", "website": "https://www.winpcap.org/", "description": "WinPcap"}, "wt": {"version": "3.3.7", "website": "https://www.webtoolkit.eu/", "description": "Wt"}, "wxwidgets": {"version": "3.0.2", "website": "https://www.wxwidgets.org/", "description": "wxWidgets"}, @@ -466,7 +467,7 @@ "xmlwrapp": {"version": "0.7.0", "website": "https://sourceforge.net/projects/xmlwrapp/", "description": ""}, "xorg-macros": {"version": "1.19.0", "website": "https://cgit.freedesktop.org/xorg/util/macros/", "description": "X.org utility macros"}, "xvidcore": {"version": "1.3.4", "website": "https://www.xvid.com/", "description": ""}, - "xxhash": {"version": "0.6.4", "website": "https://cyan4973.github.io/xxHash/", "description": "xxHash"}, + "xxhash": {"version": "0.6.5", "website": "https://cyan4973.github.io/xxHash/", "description": "xxHash"}, "xz": {"version": "5.2.4", "website": "https://tukaani.org/xz/", "description": "XZ"}, "yaml-cpp": {"version": "0.6.1", "website": "https://github.com/jbeder/yaml-cpp", "description": "A YAML parser and emitter for C++"}, "yasm": {"version": "1.3.0", "website": "https://yasm.tortall.net/", "description": "Yasm"}, diff --git a/plugins/gcc6/gcc6-overlay.mk b/plugins/gcc6/gcc6-overlay.mk index 5687ef6..8416d46 100644 --- a/plugins/gcc6/gcc6-overlay.mk +++ b/plugins/gcc6/gcc6-overlay.mk @@ -17,8 +17,8 @@ $(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE) $(PKG)_URL_2 := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE) PKG := gcc -$(PKG)_VERSION := 6.4.0 -$(PKG)_CHECKSUM := 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 +$(PKG)_VERSION := 6.5.0 +$(PKG)_CHECKSUM := 7ef1796ce497e89479183702635b14bb7a46b53249209a5e0f999bebf4740945 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/aubio-1-fixes.patch b/src/aubio-1-fixes.patch index 674df76..4da99c2 100644 --- a/src/aubio-1-fixes.patch +++ b/src/aubio-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paul Brossier <piem@piem.org> Date: Tue, 5 Jan 2016 21:28:06 -0500 -Subject: [PATCH 1/7] wscript: check HAVE_AV* from ctx.env +Subject: [PATCH 1/8] wscript: check HAVE_AV* from ctx.env From https://github.com/aubio/aubio/commit/eb6899125ac83900710180c02b94bc593a1426d2 @@ -26,7 +26,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Tue, 5 Jan 2016 21:47:01 -0500 -Subject: [PATCH 2/7] wscript: check more variables from ctx.env +Subject: [PATCH 2/8] wscript: check more variables from ctx.env diff --git a/wscript b/wscript @@ -52,7 +52,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Tue, 5 Jan 2016 22:48:20 -0500 -Subject: [PATCH 3/7] wscript: fftw3 support requires pthreads +Subject: [PATCH 3/8] wscript: fftw3 support requires pthreads diff --git a/wscript b/wscript @@ -74,7 +74,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Tue, 5 Jan 2016 22:18:21 -0500 -Subject: [PATCH 4/7] wscript: Install static library +Subject: [PATCH 4/8] wscript: Install static library diff --git a/src/wscript_build b/src/wscript_build @@ -93,7 +93,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Tue, 5 Jan 2016 21:15:37 -0500 -Subject: [PATCH 5/7] Add options for enabling shared and/or static libraries +Subject: [PATCH 5/8] Add options for enabling shared and/or static libraries diff --git a/src/wscript_build b/src/wscript_build @@ -153,7 +153,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Tue, 5 Jan 2016 21:25:46 -0500 -Subject: [PATCH 6/7] Add static deps to pkgconfig file +Subject: [PATCH 6/8] Add static deps to pkgconfig file diff --git a/aubio.pc.in b/aubio.pc.in @@ -236,7 +236,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Tue, 5 Jan 2016 21:27:05 -0500 -Subject: [PATCH 7/7] disable tests and examples +Subject: [PATCH 7/8] disable tests and examples diff --git a/wscript b/wscript @@ -256,3 +256,26 @@ index 1111111..2222222 100644 bld( source = 'aubio.pc.in' ) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: James Cowgill <jcowgill@jcowgill.uk> +Date: Sun, 25 Feb 2018 14:23:25 +0000 +Subject: [PATCH 8/8] Fix build with FFmpeg 4.0 + + +diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c +index 1111111..2222222 100644 +--- a/src/io/source_avcodec.c ++++ b/src/io/source_avcodec.c +@@ -34,7 +34,11 @@ + #include "fmat.h" + #include "source_avcodec.h" + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) + #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE ++#else ++#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE ++#endif + + struct _aubio_source_avcodec_t { + uint_t hop_size; diff --git a/src/boost.mk b/src/boost.mk index 692e882..83fe2c9 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -108,6 +108,7 @@ define $(PKG)_BUILD_$(BUILD) -a \ -q \ -j '$(JOBS)' \ + --ignore-site-config \ variant=release \ link=static \ threading=multi \ diff --git a/src/cairo.mk b/src/cairo.mk index 9734765..5ebfd99 100644 --- a/src/cairo.mk +++ b/src/cairo.mk @@ -3,8 +3,8 @@ PKG := cairo $(PKG)_WEBSITE := https://cairographics.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.15.4 -$(PKG)_CHECKSUM := deddf31e196e826e7790bbbf7d0f4b3fd15df243aa48511b349f1791b96be291 +$(PKG)_VERSION := 1.15.12 +$(PKG)_CHECKSUM := 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9 $(PKG)_SUBDIR := cairo-$($(PKG)_VERSION) $(PKG)_FILE := cairo-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://cairographics.org/snapshots/$($(PKG)_FILE) diff --git a/src/cimg.mk b/src/cimg.mk index 17c3701..91aac1f 100644 --- a/src/cimg.mk +++ b/src/cimg.mk @@ -45,8 +45,8 @@ define $(PKG)_BUILD 'CIMG_EXR_LIBS=`$(TARGET)-pkg-config --libs OpenEXR`' \ 'CIMG_PNG_INCDIR=`$(TARGET)-pkg-config --cflags libpng`' \ 'CIMG_PNG_LIBS=`$(TARGET)-pkg-config --libs libpng`' \ - 'CIMG_JPEG_INCDIR=`$(TARGET)-pkg-config --cflags jpeg`' \ - 'CIMG_JPEG_LIBS=`$(TARGET)-pkg-config --libs jpeg`' \ + 'CIMG_JPEG_INCDIR=`$(TARGET)-pkg-config --cflags libjpeg`' \ + 'CIMG_JPEG_LIBS=`$(TARGET)-pkg-config --libs libjpeg`' \ 'CIMG_ZLIB_INCDIR=`$(TARGET)-pkg-config --cflags zlib`' \ 'CIMG_ZLIB_LIBS=`$(TARGET)-pkg-config --libs zlib`' \ 'CIMG_OPENCV_INCDIR=`$(TARGET)-pkg-config --cflags opencv`' \ diff --git a/src/cminpack.mk b/src/cminpack.mk index eefd18c..4c5b3cd 100644 --- a/src/cminpack.mk +++ b/src/cminpack.mk @@ -16,7 +16,7 @@ define $(PKG)_UPDATE head -1 endef -define $(PKG)_BUILD +define $(PKG)_BUILD_STATIC cd '$(1)' && '$(TARGET)-cmake' $(MAKE) -C '$(1)' -j $(JOBS) @@ -26,4 +26,14 @@ define $(PKG)_BUILD $(INSTALL) -m644 '$(1)/cminpack.h' '$(PREFIX)/$(TARGET)/include/' endef -$(PKG)_BUILD_SHARED = +define $(PKG)_BUILD_SHARED + cd '$(1)' && '$(TARGET)-cmake' -DUSE_FPIC=ON -DSHARED_LIBS=ON -DBUILD_EXAMPLES=OFF + $(MAKE) -C '$(1)' -j $(JOBS) + + $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin' + $(INSTALL) -m644 '$(1)/libcminpack.dll' '$(PREFIX)/$(TARGET)/bin/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/libcminpack.dll.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m644 '$(1)/cminpack.h' '$(PREFIX)/$(TARGET)/include/' +endef diff --git a/src/curl.mk b/src/curl.mk index ed3a0c6..44d20d7 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -4,8 +4,8 @@ PKG := curl $(PKG)_WEBSITE := https://curl.haxx.se/libcurl/ $(PKG)_DESCR := cURL $(PKG)_IGNORE := -$(PKG)_VERSION := 7.61.1 -$(PKG)_CHECKSUM := 3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891 +$(PKG)_VERSION := 7.62.0 +$(PKG)_CHECKSUM := dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://curl.haxx.se/download/$($(PKG)_FILE) diff --git a/src/faad2-1-fixes.patch b/src/faad2-1-fixes.patch new file mode 100644 index 0000000..aa3c9b1 --- /dev/null +++ b/src/faad2-1-fixes.patch @@ -0,0 +1,12 @@ +diff -ruN faad2-2.8.8.orig/libfaad/decoder.c faad2-2.8.8/libfaad/decoder.c +--- faad2-2.8.8.orig/libfaad/decoder.c 2017-12-17 17:17:36.000000000 +0100 ++++ faad2-2.8.8/libfaad/decoder.c 2018-07-14 04:46:07.058232749 +0200 +@@ -54,7 +54,7 @@ + #endif + + #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64 +-#include "win32_ver.h" ++//#include "win32_ver.h" + #endif + + /* static function declarations */ diff --git a/src/faad2-1-uint.patch b/src/faad2-1-uint.patch deleted file mode 100644 index 179001c..0000000 --- a/src/faad2-1-uint.patch +++ /dev/null @@ -1,12 +0,0 @@ -# This file is part of MXE. See LICENSE.md for licensing information. - ---- ./frontend/main.c.backup 2010-07-01 16:53:48.563042615 +0200 -+++ ./frontend/main.c 2010-07-01 16:54:03.379043126 +0200 -@@ -31,7 +31,6 @@ - #ifdef _WIN32 - #define WIN32_LEAN_AND_MEAN - #include <windows.h> --#define off_t __int64 - #else - #include <time.h> - #endif diff --git a/src/faad2.mk b/src/faad2.mk index 9500925..e13d989 100644 --- a/src/faad2.mk +++ b/src/faad2.mk @@ -3,11 +3,11 @@ PKG := faad2 $(PKG)_WEBSITE := http://www.audiocoding.com/ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7 -$(PKG)_CHECKSUM := ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 +$(PKG)_VERSION := 2.8.8 +$(PKG)_CHECKSUM := 985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/faac/$(PKG)-src/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/faac/$(PKG)-src/$(PKG)-2.8.0/$($(PKG)_FILE) $(PKG)_DEPS := cc define $(PKG)_UPDATE diff --git a/src/fftw.mk b/src/fftw.mk index 9fbe963..f2d7ab7 100644 --- a/src/fftw.mk +++ b/src/fftw.mk @@ -3,8 +3,8 @@ PKG := fftw $(PKG)_WEBSITE := http://www.fftw.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.6-pl1 -$(PKG)_CHECKSUM := 1ef4aa8427d9785839bc767f3eb6a84fcb5e9a37c31ed77a04e7e047519a183d +$(PKG)_VERSION := 3.3.8 +$(PKG)_CHECKSUM := 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 $(PKG)_SUBDIR := fftw-$($(PKG)_VERSION) $(PKG)_FILE := fftw-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.fftw.org/$($(PKG)_FILE) diff --git a/src/flac.mk b/src/flac.mk index 1c7b0c0..3c21495 100644 --- a/src/flac.mk +++ b/src/flac.mk @@ -4,8 +4,8 @@ PKG := flac $(PKG)_WEBSITE := https://www.xiph.org/flac/ $(PKG)_DESCR := FLAC $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.1 -$(PKG)_CHECKSUM := 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c +$(PKG)_VERSION := 1.3.2 +$(PKG)_CHECKSUM := 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f $(PKG)_SUBDIR := flac-$($(PKG)_VERSION) $(PKG)_FILE := flac-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://downloads.xiph.org/releases/flac/$($(PKG)_FILE) diff --git a/src/fltk.mk b/src/fltk.mk index 55cd49c..17b11b6 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -4,16 +4,17 @@ PKG := fltk $(PKG)_WEBSITE := http://www.fltk.org/ $(PKG)_DESCR := FLTK $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.3 -$(PKG)_CHECKSUM := f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 +$(PKG)_VERSION := 1.3.4-2 +$(PKG)_CHECKSUM := 25d349c18c99508737d48f225a2eb26a43338f9247551cab72a317fa42cda910 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_MAJOR := $(word 1,$(subst -, ,$($(PKG)_VERSION))) $(PKG)_FILE := $($(PKG)_SUBDIR)-source.tar.gz -$(PKG)_URL := http://fltk.org/pub/fltk/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://fltk.org/pub/fltk/$($(PKG)_MAJOR)/$($(PKG)_FILE) $(PKG)_DEPS := cc jpeg libpng pthreads zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.fltk.org/' | \ - $(SED) -n 's,.*>v\([0-9][^<]*\)<.*,\1,p' | \ + $(WGET) -q -O- 'http://www.fltk.org/software.php' | \ + $(SED) -n 's,.*>fltk-\([0-9]\+\([\.\-][0-9]\+\)\+\)-source\.tar\.gz<.*,\1,p' | \ grep -v '^1\.1\.' | \ head -1 endef diff --git a/src/freeimage.mk b/src/freeimage.mk index 4e279be..1316eda 100644 --- a/src/freeimage.mk +++ b/src/freeimage.mk @@ -17,7 +17,7 @@ define $(PKG)_UPDATE head -1 endef -define $(PKG)_BUILD +define $(PKG)_BUILD_STATIC $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.mingw \ CXX='$(TARGET)-g++' \ CC='$(TARGET)-gcc' \ @@ -66,4 +66,36 @@ define $(PKG)_BUILD `'$(TARGET)-pkg-config' freeimageplus --cflags --libs` endef -$(PKG)_BUILD_SHARED = +define $(PKG)_BUILD_SHARED + $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.mingw \ + CXX='$(TARGET)-g++' \ + CC='$(TARGET)-gcc' \ + AR='$(TARGET)-ar' \ + RC='$(TARGET)-windres' \ + DLLTOOL='$(TARGET)-dlltool' \ + LD='$(TARGET)-g++' \ + FREEIMAGE_LIBRARY_TYPE=SHARED \ + SHAREDLIB=libfreeimage.dll \ + IMPORTLIB=libfreeimage.dll.a \ + TARGET=freeimage + + + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/libfreeimage.dll.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin' + $(INSTALL) -m644 '$(1)/libfreeimage.dll' '$(PREFIX)/$(TARGET)/bin/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m644 '$(1)/Source/FreeImage.h' '$(PREFIX)/$(TARGET)/include/' + + # create pkg-config files + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + (echo 'Name: freeimage'; \ + echo 'Version: $(freeimage_VERSION)'; \ + echo 'Description: FreeImage'; \ + echo 'Libs: -lfreeimage -lws2_32 -lstdc++';) \ + > '$(PREFIX)/$(TARGET)/lib/pkgconfig/freeimage.pc' + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-freeimage.exe' \ + `'$(TARGET)-pkg-config' freeimage --cflags --libs` +endef diff --git a/src/freetds.mk b/src/freetds.mk index 80a489d..53e2ad0 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -4,8 +4,8 @@ PKG := freetds $(PKG)_WEBSITE := http://www.freetds.org/ $(PKG)_DESCR := FreeTDS $(PKG)_IGNORE := -$(PKG)_VERSION := 1.00.97 -$(PKG)_CHECKSUM := 0d030d0aa3aafca1c018395e14a4fff2f6663732dfb2620c991492356048ab1c +$(PKG)_VERSION := 1.00.108 +$(PKG)_CHECKSUM := 964ea116cf7b62c66f0076fd80f9be74c90c6aed280405f0502a5bcbe65ab46b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) diff --git a/src/gcc-1-fixes.patch b/src/gcc-1-fixes.patch index 9c14652..df84ad8 100644 --- a/src/gcc-1-fixes.patch +++ b/src/gcc-1-fixes.patch @@ -58,3 +58,24 @@ index 1111111..2222222 100644 /* Output STRING, a string representing a filename, to FILE. We canonicalize it to be in Unix format (backslashes are replaced + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cameron Kaiser <classilla@floodgap.com> +Date: Sat, 13 Oct 2018 18:59:18 -0700 +Subject: [PATCH 1/1] fix gcc compile error on ppc64le + +https://gcc.gnu.org/viewcvs/gcc/branches/gcc-6-branch/libcpp/lex.c?view=log&pathrev=261621 + +diff --git a/libcpp/lex.c b/libcpp/lex.c +index 1111111..2222222 100644 +--- a/libcpp/lex.c 2015-04-06 10:01:50.000000000 -0700 ++++ b/libcpp/lex.c 2018-10-13 18:55:33.693558942 -0700 +@@ -550,7 +550,7 @@ + { + vc m_nl, m_cr, m_bs, m_qm; + +- data = *((const vc *)s); ++ data = __builtin_vec_vsx_ld (0, s); + s += 16; + + m_nl = (vc) __builtin_vec_cmpeq(data, repl_nl); @@ -76,6 +76,7 @@ define $(PKG)_BUILD_mingw-w64 cd '$(BUILD_DIR).crt' && '$(BUILD_DIR)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ + --with-default-msvcrt=msvcrt \ @gcc-crt-config-opts@ $(MAKE) -C '$(BUILD_DIR).crt' -j '$(JOBS)' || $(MAKE) -C '$(BUILD_DIR).crt' -j '$(JOBS)' $(MAKE) -C '$(BUILD_DIR).crt' -j 1 $(INSTALL_STRIP_TOOLCHAIN) diff --git a/src/ghostscript.mk b/src/ghostscript.mk index 10d6bbe..45e411c 100644 --- a/src/ghostscript.mk +++ b/src/ghostscript.mk @@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 1fcedc27d4d6081105cdf35606cb3f809523423a6cf9e3c23cead3525d6ae $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$($(PKG)_NODOTVER)/$($(PKG)_FILE) -$(PKG)_DEPS := cc dbus fontconfig freetype lcms libiconv libidn libjpeg-turbo libpaper libpng openjpeg tiff zlib +$(PKG)_DEPS := cc dbus fontconfig freetype lcms libiconv libidn libpaper libpng openjpeg tiff zlib define $(PKG)_UPDATE $(WGET) -q -O- 'https://ghostscript.com/Releases.html' | \ @@ -57,7 +57,7 @@ define $(PKG)_BUILD echo 'Description: Ghostscript library'; \ echo 'Cflags: -I"$(PREFIX)/$(TARGET)/include/ghostscript"'; \ echo 'Libs: -L"$(PREFIX)/$(TARGET)/lib" -lgs'; \ - echo 'Requires: fontconfig freetype2 libidn libtiff-4 libpng libopenjp2 jpeg lcms2 zlib'; \ + echo 'Requires: fontconfig freetype2 libidn libtiff-4 libpng libopenjp2 libjpeg lcms2 zlib'; \ echo '# https://github.com/mxe/mxe/issues/1446'; \ echo 'Libs.private: -lm -liconv -lpaper -lwinspool';) \ > '$(PREFIX)/$(TARGET)/lib/pkgconfig/ghostscript.pc' diff --git a/src/gst-libav.mk b/src/gst-libav.mk index c940a32..7effd68 100644 --- a/src/gst-libav.mk +++ b/src/gst-libav.mk @@ -3,8 +3,8 @@ PKG := gst-libav $(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-libav.html $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.0 -$(PKG)_CHECKSUM := fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89 +$(PKG)_VERSION := 1.14.3 +$(PKG)_CHECKSUM := 9b03529bb45785ad1b6b1f4856c52a832ad5fc472285ce49174439e8015ab677 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) diff --git a/src/gst-plugins-bad.mk b/src/gst-plugins-bad.mk index 6c2119a..97f8b76 100644 --- a/src/gst-plugins-bad.mk +++ b/src/gst-plugins-bad.mk @@ -3,8 +3,8 @@ PKG := gst-plugins-bad $(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.0 -$(PKG)_CHECKSUM := ed5e2badb6f2858f60017b93334d91fe58a0e3f85ed2f37f2e931416fafb4f9f +$(PKG)_VERSION := 1.14.3 +$(PKG)_CHECKSUM := b2224e5d9c1b85ad51233f6135524bb9e16a9172d395edc79c73b89094659fd5 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk index 1d1a036..aeac237 100644 --- a/src/gst-plugins-base.mk +++ b/src/gst-plugins-base.mk @@ -3,8 +3,8 @@ PKG := gst-plugins-base $(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-base.html $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.0 -$(PKG)_CHECKSUM := 7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940 +$(PKG)_VERSION := 1.14.3 +$(PKG)_CHECKSUM := f0b319c36be0ffc2a00380c77ba269cdf04e2b39bbc49d30b641fc35aa0b7952 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk index 5a8f8b8..2744f45 100644 --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -3,8 +3,8 @@ PKG := gst-plugins-good $(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-good.html $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.0 -$(PKG)_CHECKSUM := 6afa35747d528d3ab4ed8f5eac13f7235d7d28100d6a24dd78f81ec7c0d04688 +$(PKG)_VERSION := 1.14.3 +$(PKG)_CHECKSUM := 5112bce6af0be62760687ca47873c90ce4d65d3fe920a3adf8145db7b07bff5d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) diff --git a/src/gst-plugins-ugly.mk b/src/gst-plugins-ugly.mk index dbc7a51..617a8f2 100644 --- a/src/gst-plugins-ugly.mk +++ b/src/gst-plugins-ugly.mk @@ -3,8 +3,8 @@ PKG := gst-plugins-ugly $(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.0 -$(PKG)_CHECKSUM := 3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1 +$(PKG)_VERSION := 1.14.3 +$(PKG)_CHECKSUM := 43847fc4d1eae26dd48a6a93d0460146f5f0802582a7e8a9cc66f09dcb0b2306 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) diff --git a/src/gstreamer.mk b/src/gstreamer.mk index 2016a63..125b0fa 100644 --- a/src/gstreamer.mk +++ b/src/gstreamer.mk @@ -3,8 +3,8 @@ PKG := gstreamer $(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gstreamer.html $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.0 -$(PKG)_CHECKSUM := fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e +$(PKG)_VERSION := 1.14.3 +$(PKG)_CHECKSUM := 13ae530eb1d4566c3aa0cff1bbb8e64c643065bb12e2e7c707f311ab4a390456 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index 6ea5005..323d55d 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -4,8 +4,8 @@ PKG := harfbuzz $(PKG)_WEBSITE := https://wiki.freedesktop.org/www/Software/HarfBuzz/ $(PKG)_DESCR := HarfBuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9.0 -$(PKG)_CHECKSUM := 11eca62bf0ac549b8d6be55f4e130946399939cdfe7a562fdaee711190248b00 +$(PKG)_VERSION := 2.1.1 +$(PKG)_CHECKSUM := 83bf5d552df72c52969332f294cd97d8f6b46b77b41b61346ca56ebb81884e14 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) diff --git a/src/jpeg.mk b/src/jpeg.mk index 142af16..695f4cf 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -21,16 +21,8 @@ define $(PKG)_BUILD $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - # create pkg-config file - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' - (echo 'Name: jpeg'; \ - echo 'Version: 0'; \ - echo 'Description: jpeg'; \ - echo 'Libs: -ljpeg';) \ - > '$(PREFIX)/$(TARGET)/lib/pkgconfig/jpeg.pc' - '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-jpeg.exe' \ - `'$(TARGET)-pkg-config' jpeg --libs` + `'$(TARGET)-pkg-config' libjpeg --libs` endef diff --git a/src/libcdio.mk b/src/libcdio.mk index dfe3a7f..00c4213 100644 --- a/src/libcdio.mk +++ b/src/libcdio.mk @@ -4,11 +4,11 @@ PKG := libcdio $(PKG)_WEBSITE := https://www.gnu.org/software/libcdio/ $(PKG)_DESCR := Libcdio $(PKG)_IGNORE := -$(PKG)_VERSION := 0.93 -$(PKG)_CHECKSUM := f8276629226c7e1e74209b66ca421d09d6aec87f72f60ae9b1d3debd0a13dda8 +$(PKG)_VERSION := 0.94 +$(PKG)_CHECKSUM := 96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := https://ftp.gnu.org/gnu/libcdio/$(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://ftp.gnu.org/gnu/libcdio/$(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := cc define $(PKG)_UPDATE diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 63aa9b9..0fbfb2e 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_WEBSITE := https://directory.fsf.org/wiki/Libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.3 -$(PKG)_CHECKSUM := 66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c +$(PKG)_VERSION := 1.8.4 +$(PKG)_CHECKSUM := f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227 $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://gnupg.org/ftp/gcrypt/libgcrypt/$($(PKG)_FILE) diff --git a/src/libidn2.mk b/src/libidn2.mk index cc478e4..1820a9b 100644 --- a/src/libidn2.mk +++ b/src/libidn2.mk @@ -4,8 +4,8 @@ PKG := libidn2 $(PKG)_WEBSITE := https://www.gnu.org/software/libidn/\#libidn2 $(PKG)_DESCR := implementation of IDNA2008/TR46 internationalized domain names $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.2 -$(PKG)_CHECKSUM := 8cd62828b2ab0171e0f35a302f3ad60c3a3fffb45733318b3a8205f9d187eeab +$(PKG)_VERSION := 2.0.5 +$(PKG)_CHECKSUM := 53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8 $(PKG)_SUBDIR := libidn2-$($(PKG)_VERSION) $(PKG)_FILE := libidn2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE) diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk index 3177292..c354601 100644 --- a/src/libjpeg-turbo.mk +++ b/src/libjpeg-turbo.mk @@ -3,8 +3,8 @@ PKG := libjpeg-turbo $(PKG)_WEBSITE := https://libjpeg-turbo.virtualgl.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.3 -$(PKG)_CHECKSUM := b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523 +$(PKG)_VERSION := 2.0.1 +$(PKG)_CHECKSUM := e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -17,25 +17,18 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) \ - --libdir='$(PREFIX)/$(TARGET)/lib/$(PKG)' \ - --includedir='$(PREFIX)/$(TARGET)/include/$(PKG)' \ - NASM=$(TARGET)-yasm - $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j 1 - $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT) - - # create pkg-config file - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' - (echo 'Name: jpeg-turbo'; \ - echo 'Version: $($(PKG)_VERSION)'; \ - echo 'Description: jpeg-turbo'; \ - echo 'Cflags: -I$(PREFIX)/$(TARGET)/include/$(PKG)'; \ - echo 'Libs: -L$(PREFIX)/$(TARGET)/lib/$(PKG) -ljpeg';) \ - > '$(PREFIX)/$(TARGET)/lib/pkgconfig/jpeg-turbo.pc' + cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \ + -DENABLE_SHARED=$(CMAKE_SHARED_BOOL) \ + -DENABLE_STATIC=$(CMAKE_STATIC_BOOL) \ + -DCMAKE_INSTALL_BINDIR='$(PREFIX)/$(TARGET)/bin/$(PKG)' \ + -DCMAKE_INSTALL_INCLUDEDIR='$(PREFIX)/$(TARGET)/include/$(PKG)' \ + -DCMAKE_INSTALL_LIBDIR='$(PREFIX)/$(TARGET)/lib/$(PKG)' \ + -DCMAKE_ASM_NASM_COMPILER=$(TARGET)-yasm + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(TOP_DIR)/src/jpeg-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ - `'$(TARGET)-pkg-config' jpeg-turbo --cflags --libs` + `'$(TARGET)-pkg-config' '$(PREFIX)/$(TARGET)/lib/$(PKG)/pkgconfig/libjpeg.pc' --cflags --libs` endef diff --git a/src/libmng.mk b/src/libmng.mk index 58e4bbe..65c4fef 100644 --- a/src/libmng.mk +++ b/src/libmng.mk @@ -17,7 +17,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - echo 'Requires: zlib lcms2 jpeg' >> '$(1)/libmng.pc.in' + echo 'Requires: zlib lcms2 libjpeg' >> '$(1)/libmng.pc.in' cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined' diff --git a/src/libmysqlclient-1-fixes.patch b/src/libmysqlclient-1-fixes.patch index 298cdd4..1f736c9 100644 --- a/src/libmysqlclient-1-fixes.patch +++ b/src/libmysqlclient-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Sun, 6 Sep 2015 22:34:47 +0100 -Subject: [PATCH 01/11] use comp_err tool built in native build +Subject: [PATCH 01/12] use comp_err tool built in native build See http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build @@ -47,7 +47,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Sun, 6 Sep 2015 22:53:33 +0100 -Subject: [PATCH 02/11] fix extra qualification 'Handshake::' +Subject: [PATCH 02/12] fix extra qualification 'Handshake::' Compilation error. @@ -68,7 +68,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Mon, 7 Sep 2015 22:59:18 +0100 -Subject: [PATCH 03/11] fix case in headers and libs (should be lowercase) +Subject: [PATCH 03/12] fix case in headers and libs (should be lowercase) diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp @@ -127,7 +127,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Mon, 7 Sep 2015 23:01:35 +0100 -Subject: [PATCH 04/11] define missing types +Subject: [PATCH 04/12] define missing types We do not use types CERT_NAME_BLOB and CRYPT_HASH_BLOB, though they are used in mprapi.h. And are not defined! @@ -150,7 +150,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Mon, 7 Sep 2015 23:04:23 +0100 -Subject: [PATCH 05/11] macro NATIVE_WIN32 for stuff we don't have here +Subject: [PATCH 05/12] macro NATIVE_WIN32 for stuff we don't have here Macro NATIVE_WIN32 is undefined in MXE. It is used instead of _WIN32 in #ifdef's where working variant is Unix and not Win32: @@ -261,7 +261,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Thu, 8 Oct 2015 13:30:53 +1100 -Subject: [PATCH 06/11] fix shared lib names +Subject: [PATCH 06/12] fix shared lib names diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt @@ -299,7 +299,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Thu, 8 Oct 2015 19:36:35 +1100 -Subject: [PATCH 07/11] allow install of mysql_config +Subject: [PATCH 07/12] allow install of mysql_config diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt @@ -319,7 +319,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev <bnagaev@gmail.com> Date: Wed, 11 Nov 2015 07:44:44 +0000 -Subject: [PATCH 08/11] add 'static' to some inline functions +Subject: [PATCH 08/12] add 'static' to some inline functions Fix https://gist.github.com/starius/71d5f276d62e58f36d2f See also http://stackoverflow.com/a/8502046 @@ -350,7 +350,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev <bnagaev@gmail.com> Date: Wed, 16 Dec 2015 17:39:28 +0100 -Subject: [PATCH 09/11] fix CMake error if dir contains special regex char +Subject: [PATCH 09/12] fix CMake error if dir contains special regex char See https://github.com/mxe/mxe/issues/1030 @@ -374,7 +374,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Fri, 13 Nov 2015 10:22:12 -0500 -Subject: [PATCH 10/11] For Windows, check if POSIX thread model or win32 +Subject: [PATCH 10/12] For Windows, check if POSIX thread model or win32 thread model is being used. @@ -454,7 +454,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Wed, 8 Feb 2017 11:51:42 +1100 -Subject: [PATCH 11/11] only define localtime_r and gmtime_r when pthreads +Subject: [PATCH 11/12] only define localtime_r and gmtime_r when pthreads isn't used @@ -471,3 +471,26 @@ index 1111111..2222222 100644 /**************************************************************************** ** Replacements for localtime_r and gmtime_r ****************************************************************************/ + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 17 Sep 2018 11:04:30 +0200 +Subject: [PATCH 12/12] mingw-w64 6 fix + + +diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c +index 1111111..2222222 100644 +--- a/mysys/my_gethwaddr.c ++++ b/mysys/my_gethwaddr.c +@@ -137,9 +137,11 @@ my_bool my_gethwaddr(uchar *to) + #define VOID void + #endif + ++#if __MINGW64_VERSION_MAJOR < 6 + // mprapi.h uses these undefined types + #define CERT_NAME_BLOB int + #define CRYPT_HASH_BLOB int ++#endif + #include <iphlpapi.h> + + /* @@ -3,8 +3,8 @@ PKG := lzo $(PKG)_WEBSITE := https://www.oberhumer.com/opensource/lzo/ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.09 -$(PKG)_CHECKSUM := f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c +$(PKG)_VERSION := 2.10 +$(PKG)_CHECKSUM := c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 $(PKG)_SUBDIR := lzo-$($(PKG)_VERSION) $(PKG)_FILE := lzo-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.oberhumer.com/opensource/lzo/download/$($(PKG)_FILE) diff --git a/src/mingw-w64-1.patch b/src/mingw-w64-1.patch index ff55a57..8a25cef 100644 --- a/src/mingw-w64-1.patch +++ b/src/mingw-w64-1.patch @@ -39,136 +39,23 @@ Signed-off-by: Jonathan Yong <10walls@gmail.com> Taken from: https://sourceforge.net/p/mingw-w64/mailman/message/36166386/ -diff --git a/mingw-w64-crt/lib32/dwmapi.def b/mingw-w64-crt/lib32/dwmapi.def -index 1111111..2222222 100644 ---- a/mingw-w64-crt/lib32/dwmapi.def -+++ b/mingw-w64-crt/lib32/dwmapi.def -@@ -5,47 +5,29 @@ - ; - LIBRARY "dwmapi.dll" - EXPORTS --;ord_100@32 @100 --;ord_101@24 @101 -+DwmpDxGetWindowSharedSurface@32 -+DwmpDxUpdateWindowSharedSurface@24 - DwmEnableComposition@4 --;ord_103@0 @103 --;ord_104@12 @104 --;ord_105@0 @105 --;ord_106@8 @106 --;ord_107@4 @107 --;ord_108@4 @108 --;ord_109@8 @109 --;ord_110@0 @110 - DwmAttachMilContent@4 --;ord_112@4 @112 --;ord_113@16 @113 --;ord_114@8 @114 --;ord_115@4 @115 - DwmDefWindowProc@20 - DwmDetachMilContent@4 --;ord_118@8 @118 --;ord_119@8 @119 --;ord_120@8 @120 --;ord_121@8 @121 - DwmEnableBlurBehindWindow@8 - DwmEnableMMCSS@4 --;ord_124@20 @124 --;ord_125@12 @125 --;ord_126@8 @126 --;ord_127@4 @127 --;ord_128@4 @128 --;ord_129@4 @129 --;ord_130@0 @130 --;ord_131@8 @131 --;ord_132@8 @132 --;ord_133@36 @133 --;ord_134@8 @134 - DwmExtendFrameIntoClientArea@8 - DwmFlush@0 - DwmGetColorizationColor@8 -+DwmpDxBindSwapChain@12 -+DwmpDxUnbindSwapChain@8 -+DwmpDxgiIsThreadDesktopComposited@4 - DwmGetCompositionTimingInfo@8 - DwmGetGraphicsStreamClient@8 -+DwmpDxUpdateWindowRedirectionBltSurface@36 -+DwmpRenderFlick@12 -+DwmpAllocateSecurityDescriptor@8 -+DwmpFreeSecurityDescriptor@4 -+DwmpEnableDDASupport@0 - DwmGetGraphicsStreamTransformHint@8 -+DwmTetherTextContact@20 - DwmGetTransportAttributes@12 - DwmGetWindowAttribute@16 - DwmInvalidateIconicBitmaps@4 -@@ -53,10 +35,14 @@ DwmIsCompositionEnabled@4 - DwmModifyPreviousDxFrameDuration@12 - DwmQueryThumbnailSourceSize@8 - DwmRegisterThumbnail@12 -+DwmRenderGesture@16 - DwmSetDxFrameDuration@8 - DwmSetIconicLivePreviewBitmap@16 - DwmSetIconicThumbnail@12 - DwmSetPresentParameters@8 - DwmSetWindowAttribute@16 -+DwmShowContact@8 -+DwmTetherContact@16 -+DwmTransitionOwnedWindow@8 - DwmUnregisterThumbnail@4 - DwmUpdateThumbnailProperties@8 -diff --git a/mingw-w64-crt/lib64/dwmapi.def b/mingw-w64-crt/lib64/dwmapi.def +diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h index 1111111..2222222 100644 ---- a/mingw-w64-crt/lib64/dwmapi.def -+++ b/mingw-w64-crt/lib64/dwmapi.def -@@ -1,8 +1,13 @@ - ; --; Exports of file dwmapi.dll -+; Definition file of dwmapi.dll -+; Automatic generated by gendef -+; written by Kai Tietz 2008 - ; --LIBRARY dwmapi.dll -+LIBRARY "dwmapi.dll" - EXPORTS -+DwmpDxGetWindowSharedSurface -+DwmpDxUpdateWindowSharedSurface -+DwmEnableComposition - DwmAttachMilContent - DwmDefWindowProc - DwmDetachMilContent -@@ -12,18 +17,33 @@ DwmEnableMMCSS - DwmExtendFrameIntoClientArea - DwmFlush - DwmGetColorizationColor -+DwmpDxBindSwapChain -+DwmpDxUnbindSwapChain -+DwmpDxgiIsThreadDesktopComposited - DwmGetCompositionTimingInfo - DwmGetGraphicsStreamClient -+DwmpDxUpdateWindowRedirectionBltSurface -+DwmpRenderFlick -+DwmpAllocateSecurityDescriptor -+DwmpFreeSecurityDescriptor -+DwmpEnableDDASupport - DwmGetGraphicsStreamTransformHint -+DwmTetherTextContact - DwmGetTransportAttributes - DwmGetWindowAttribute -+DwmInvalidateIconicBitmaps - DwmIsCompositionEnabled - DwmModifyPreviousDxFrameDuration - DwmQueryThumbnailSourceSize - DwmRegisterThumbnail -+DwmRenderGesture - DwmSetDxFrameDuration -+DwmSetIconicLivePreviewBitmap -+DwmSetIconicThumbnail - DwmSetPresentParameters - DwmSetWindowAttribute -+DwmShowContact -+DwmTetherContact -+DwmTransitionOwnedWindow - DwmUnregisterThumbnail - DwmUpdateThumbnailProperties -- +--- a/mingw-w64-headers/crt/float.h ++++ b/mingw-w64-headers/crt/float.h +@@ -114,6 +114,15 @@ + #define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ + #define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ + ++ /* The difference between 1 and the least value greater than 1 that is ++ representable in the given floating point type, b**1-p. */ ++ #undef FLT_EPSILON ++ #undef DBL_EPSILON ++ #undef LDBL_EPSILON ++ #define FLT_EPSILON __FLT_EPSILON__ ++ #define DBL_EPSILON __DBL_EPSILON__ ++ #define LDBL_EPSILON __LDBL_EPSILON__ ++ + /* The difference between 1 and the least value greater than 1 that is + representable in the given floating point type, b**1-p. */ + #undef FLT_EPSILON diff --git a/src/mingw-w64.mk b/src/mingw-w64.mk index ebb933e..3fc5205 100644 --- a/src/mingw-w64.mk +++ b/src/mingw-w64.mk @@ -4,8 +4,8 @@ PKG := mingw-w64 $(PKG)_WEBSITE := https://mingw-w64.sourceforge.io/ $(PKG)_DESCR := MinGW-w64 Runtime $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.4 -$(PKG)_CHECKSUM := 5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803 +$(PKG)_VERSION := 6.0.0 +$(PKG)_CHECKSUM := 805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE) diff --git a/src/mman-win32.mk b/src/mman-win32.mk index b89f50c..d776de4 100644 --- a/src/mman-win32.mk +++ b/src/mman-win32.mk @@ -4,8 +4,8 @@ PKG := mman-win32 $(PKG)_WEBSITE := https://code.google.com/p/mman-win32/ $(PKG)_DESCR := MMA-Win32 $(PKG)_IGNORE := -$(PKG)_VERSION := b7ec370 -$(PKG)_CHECKSUM := 6f94db28ddf30711c7b227e97c5142f72f77aca2c5cc034a7d012db242cc2f7b +$(PKG)_VERSION := 9f115ad +$(PKG)_CHECKSUM := 8ef745c80ab2b0ea52eba4830c45b20926fd9dcbc16c3da31f66607316dd7751 $(PKG)_GH_CONF := witwall/mman-win32/branches/master $(PKG)_DEPS := cc diff --git a/src/netcdf-cxx4.mk b/src/netcdf-cxx4.mk index bd66d10..ccb8395 100644 --- a/src/netcdf-cxx4.mk +++ b/src/netcdf-cxx4.mk @@ -21,5 +21,5 @@ define $(PKG)_BUILD '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ '$(SOURCE_DIR)/examples/simple_xy_rd.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ - -l$(PKG) `'$(TARGET)-pkg-config' netcdf jpeg libcurl --cflags --libs` -lportablexdr + -l$(PKG) `'$(TARGET)-pkg-config' netcdf libjpeg libcurl --cflags --libs` -lportablexdr endef diff --git a/src/netcdf.mk b/src/netcdf.mk index ca1182d..f912629 100644 --- a/src/netcdf.mk +++ b/src/netcdf.mk @@ -28,5 +28,5 @@ define $(PKG)_BUILD '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(SOURCE_DIR)/examples/C/simple.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ - `'$(TARGET)-pkg-config' $(PKG) jpeg libcurl --cflags --libs` -lportablexdr + `'$(TARGET)-pkg-config' $(PKG) libjpeg libcurl --cflags --libs` -lportablexdr endef @@ -4,8 +4,8 @@ PKG := ogg $(PKG)_WEBSITE := https://www.xiph.org/ogg/ $(PKG)_DESCR := OGG $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.2 -$(PKG)_CHECKSUM := e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 +$(PKG)_VERSION := 1.3.3 +$(PKG)_CHECKSUM := c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 $(PKG)_SUBDIR := libogg-$($(PKG)_VERSION) $(PKG)_FILE := libogg-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://downloads.xiph.org/releases/ogg/$($(PKG)_FILE) diff --git a/src/openblas-1-fixes.patch b/src/openblas-1-fixes.patch index ca0ee2c..e4ede63 100644 --- a/src/openblas-1-fixes.patch +++ b/src/openblas-1-fixes.patch @@ -3,9 +3,239 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de> +Date: Thu, 31 May 2018 13:26:00 +0200 +Subject: [PATCH 1/2] Work around name clash with Windows10's winnt.h + +fixes #1503 + +https://github.com/xianyi/OpenBLAS/pull/1584/ + +diff --git a/driver/level3/Makefile b/driver/level3/Makefile +index 1111111..2222222 100644 +--- a/driver/level3/Makefile ++++ b/driver/level3/Makefile +@@ -362,7 +362,7 @@ cgemm_ct.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + cgemm_cr.$(SUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + cgemm_cc.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -410,7 +410,7 @@ zgemm_ct.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + zgemm_cr.$(SUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + zgemm_cc.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -458,7 +458,7 @@ xgemm_ct.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + xgemm_cr.$(SUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + xgemm_cc.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -558,7 +558,7 @@ cgemm_thread_ct.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + cgemm_thread_cr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + cgemm_thread_cc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -606,7 +606,7 @@ zgemm_thread_ct.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + zgemm_thread_cr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + zgemm_thread_cc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -654,7 +654,7 @@ xgemm_thread_ct.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + xgemm_thread_cr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + xgemm_thread_cc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -1821,7 +1821,7 @@ cgemm3m_ct.$(SUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + cgemm3m_cr.$(SUFFIX) : gemm3m.c gemm3m_level3.c +- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + cgemm3m_cc.$(SUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -1869,7 +1869,7 @@ zgemm3m_ct.$(SUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + zgemm3m_cr.$(SUFFIX) : gemm3m.c gemm3m_level3.c +- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + zgemm3m_cc.$(SUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -1917,7 +1917,7 @@ xgemm3m_ct.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + xgemm3m_cr.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + xgemm3m_cc.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -1974,7 +1974,7 @@ cgemm3m_thread_ct.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + cgemm3m_thread_cr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + cgemm3m_thread_cc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -2022,7 +2022,7 @@ zgemm3m_thread_ct.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + zgemm3m_thread_cr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + zgemm3m_thread_cc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -2070,7 +2070,7 @@ xgemm3m_thread_ct.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + xgemm3m_thread_cr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + xgemm3m_thread_cc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -2731,7 +2731,7 @@ cgemm_ct.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + cgemm_cr.$(PSUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + cgemm_cc.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -2779,7 +2779,7 @@ zgemm_ct.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + zgemm_cr.$(PSUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + zgemm_cc.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -2827,7 +2827,7 @@ xgemm_ct.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + xgemm_cr.$(PSUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + xgemm_cc.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -2927,7 +2927,7 @@ cgemm_thread_ct.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + cgemm_thread_cr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + cgemm_thread_cc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -2975,7 +2975,7 @@ zgemm_thread_ct.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + zgemm_thread_cr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + zgemm_thread_cc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -3023,7 +3023,7 @@ xgemm_thread_ct.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + xgemm_thread_cr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + xgemm_thread_cc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -4190,7 +4190,7 @@ cgemm3m_ct.$(PSUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + cgemm3m_cr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c +- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + cgemm3m_cc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -4238,7 +4238,7 @@ zgemm3m_ct.$(PSUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + zgemm3m_cr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c +- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + zgemm3m_cc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -4286,7 +4286,7 @@ xgemm3m_ct.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + xgemm3m_cr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + xgemm3m_cc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -4343,7 +4343,7 @@ cgemm3m_thread_ct.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + cgemm3m_thread_cr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + cgemm3m_thread_cc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -4391,7 +4391,7 @@ zgemm3m_thread_ct.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + zgemm3m_thread_cr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + zgemm3m_thread_cc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCC $< -o $(@F) +@@ -4439,7 +4439,7 @@ xgemm3m_thread_ct.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F) + + xgemm3m_thread_cr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F) + + xgemm3m_thread_cc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Mon, 20 Nov 2017 16:20:03 +1100 -Subject: [PATCH 1/1] ARCH from openblas build conflicts with lapack +Subject: [PATCH 2/2] ARCH from openblas build conflicts with lapack diff --git a/Makefile b/Makefile diff --git a/src/openscenegraph-1-fixes.patch b/src/openscenegraph-1-fixes.patch index f4e47e3..d49540c 100644 --- a/src/openscenegraph-1-fixes.patch +++ b/src/openscenegraph-1-fixes.patch @@ -57,29 +57,9 @@ index 1111111..2222222 100644 osgUtil From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Sun, 10 Jan 2016 14:19:57 +1100 -Subject: [PATCH 3/6] use pkg-config for gstreamer detection in mingw - - -diff --git a/CMakeModules/FindGStreamer.cmake b/CMakeModules/FindGStreamer.cmake -index 1111111..2222222 100644 ---- a/CMakeModules/FindGStreamer.cmake -+++ b/CMakeModules/FindGStreamer.cmake -@@ -65,7 +65,7 @@ - # ) - #endmacro() - --if (WIN32) -+if (WIN32 AND NOT MINGW) - macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) - find_path(${_component_prefix}_INCLUDE_DIRS - NAMES ${_header} - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev <bnagaev@gmail.com> Date: Mon, 22 Feb 2016 03:35:28 +0300 -Subject: [PATCH 4/6] disable ffmpeg +Subject: [PATCH 3/6] disable ffmpeg OpenSceneGraph is using removed features of ffmpeg, which have been deprecated for 3+ years. @@ -88,48 +68,25 @@ See https://github.com/mxe/mxe/issues/1230#issuecomment-186936198 Source of patch: http://forum.openscenegraph.org/viewtopic.php?t=10485 diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt -index 1111111..2222222 100644 +index 77d66f8..1c8398e 100644 --- a/src/osgPlugins/CMakeLists.txt +++ b/src/osgPlugins/CMakeLists.txt -@@ -199,10 +199,6 @@ IF(XINE_FOUND) - ADD_SUBDIRECTORY(xine) +@@ -213,10 +213,6 @@ IF(OSG_CPP_EXCEPTIONS_AVAILABLE) + ADD_PLUGIN_DIRECTORY(txp) ENDIF() -IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE) -- ADD_SUBDIRECTORY(ffmpeg) +- ADD_PLUGIN_DIRECTORY(ffmpeg) -ENDIF() - IF(GSTREAMER_FOUND AND GLIB_FOUND) - ADD_SUBDIRECTORY(gstreamer) + ADD_PLUGIN_DIRECTORY(gstreamer) ENDIF() From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Saikrishna Arcot <saiarcot895@gmail.com> -Date: Mon, 6 Jun 2016 19:06:00 -0500 -Subject: [PATCH 5/6] Require the presence of either qt5 or qt4. - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111111..2222222 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -708,9 +708,9 @@ IF(OSG_USE_QT AND NOT ANDROID) - - IF (DESIRED_QT_VERSION) - IF (DESIRED_QT_VERSION MATCHES 5) -- FIND_PACKAGE(Qt5Widgets) -+ FIND_PACKAGE(Qt5Widgets REQUIRED) - ELSEIF (DESIRED_QT_VERSION MATCHES 4) -- FIND_PACKAGE(Qt4) -+ FIND_PACKAGE(Qt4 REQUIRED) - ELSE() - FIND_PACKAGE(Qt3) - ENDIF() - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Pek <tehnick-8@yandex.ru> Date: Thu, 14 Dec 2017 15:29:38 +0300 -Subject: [PATCH 6/6] fix case in library ws2_32 +Subject: [PATCH 4/6] fix case in library ws2_32 diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt @@ -158,3 +115,69 @@ index 1111111..2222222 100644 ELSE() SET(TARGET_LIBRARIES_VARS OPENVRML_LIBRARY) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Pek <tehnick-8@yandex.ru> +Date: Wed, 10 Oct 2018 00:56:37 +0300 +Subject: [PATCH 5/6] fix build with GCC < 6.x + + +diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp +index 91e6c8f..d11347e 100644 +--- a/src/osgViewer/GraphicsWindowWin32.cpp ++++ b/src/osgViewer/GraphicsWindowWin32.cpp +@@ -799,7 +799,7 @@ Win32WindowingSystem::Win32WindowingSystem() + if (hModuleShore) { + setProcessDpiAwareness = (SetProcessDpiAwarenessFunc *) GetProcAddress(hModuleShore, "SetProcessDpiAwareness"); + if (setProcessDpiAwareness) { +- (*setProcessDpiAwareness)(PROCESS_DPI_AWARENESS::PROCESS_PER_MONITOR_DPI_AWARE); ++ (*setProcessDpiAwareness)(PROCESS_PER_MONITOR_DPI_AWARE); + } + } + // #endif + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Pek <tehnick-8@yandex.ru> +Date: Wed, 10 Oct 2018 01:48:22 +0300 +Subject: [PATCH 6/6] fix build of gta plugin when pkg-config is used + + update related variable for build without pkg-config. + + +diff --git a/CMakeModules/FindGTA.cmake b/CMakeModules/FindGTA.cmake +index 086069c..e483ad3 100644 +--- a/CMakeModules/FindGTA.cmake ++++ b/CMakeModules/FindGTA.cmake +@@ -33,7 +33,7 @@ IF(NOT GTA_FOUND) + /usr/freeware/include + ) + +- FIND_LIBRARY(GTA_LIBRARY ++ FIND_LIBRARY(GTA_LIBRARIES + NAMES gta libgta + PATHS + $ENV{GTA_DIR}/lib +@@ -50,8 +50,8 @@ IF(NOT GTA_FOUND) + ) + + SET(GTA_FOUND "NO") +- IF(GTA_LIBRARY AND GTA_INCLUDE_DIRS) ++ IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) + SET(GTA_FOUND "YES") +- ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS) ++ ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) + + ENDIF(NOT GTA_FOUND) +\ No newline at end of file +diff --git a/src/osgPlugins/gta/CMakeLists.txt b/src/osgPlugins/gta/CMakeLists.txt +index 2b910a6..16466fe 100644 +--- a/src/osgPlugins/gta/CMakeLists.txt ++++ b/src/osgPlugins/gta/CMakeLists.txt +@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${GTA_INCLUDE_DIRS} ) + + SET(TARGET_SRC ReaderWriterGTA.cpp ) + +-SET(TARGET_LIBRARIES_VARS GTA_LIBRARY) ++SET(TARGET_LIBRARIES_VARS GTA_LIBRARIES) + + #### end var setup ### + SETUP_PLUGIN(gta) diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index a0dc52b..9a70ad9 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -4,15 +4,12 @@ PKG := openscenegraph $(PKG)_WEBSITE := http://www.openscenegraph.org/ $(PKG)_DESCR := OpenSceneGraph $(PKG)_IGNORE := -$(PKG)_VERSION := 3.4.1 -$(PKG)_CHECKSUM := 930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5 -#$(PKG)_GH_CONF := openscenegraph/OpenSceneGraph/tags, OpenSceneGraph- -$(PKG)_SUBDIR := OpenSceneGraph-OpenSceneGraph-$($(PKG)_VERSION) -$(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/openscenegraph/OpenSceneGraph/archive/$($(PKG)_FILE) +$(PKG)_VERSION := 3.6.3 +$(PKG)_CHECKSUM := 51bbc79aa73ca602cd1518e4e25bd71d41a10abd296e18093a8acfebd3c62696 +$(PKG)_GH_CONF := openscenegraph/OpenSceneGraph/tags, OpenSceneGraph- $(PKG)_DEPS := cc boost curl dcmtk freetype gdal giflib gstreamer \ gta jasper jpeg libpng openal openexr openthreads poppler \ - qtbase tiff zlib + tiff zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.openscenegraph.org/index.php/download-section/stable-releases' | \ @@ -25,16 +22,15 @@ define $(PKG)_BUILD cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \ -DCMAKE_CXX_FLAGS='-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS' \ -DCMAKE_HAVE_PTHREAD_H=OFF \ + -DOSG_DETERMINE_WIN_VERSION=OFF \ -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \ -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \ -DDYNAMIC_OPENSCENEGRAPH=$(CMAKE_SHARED_BOOL) \ -DBUILD_OSG_APPLICATIONS=OFF \ -DPOPPLER_HAS_CAIRO_EXITCODE=0 \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ - -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ - $(if $(filter qtbase,$($(PKG)_DEPS)), \ - -DDESIRED_QT_VERSION=5, \ - -DDESIRED_QT_VERSION=4) + -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1 endef diff --git a/src/openthreads.mk b/src/openthreads.mk index e924d0c..b1c1c64 100644 --- a/src/openthreads.mk +++ b/src/openthreads.mk @@ -12,19 +12,19 @@ $(PKG)_URL = $(openscenegraph_URL) $(PKG)_DEPS := cc define $(PKG)_UPDATE - echo $openscenegraph_VERSION) + echo $(openscenegraph_VERSION) endef define $(PKG)_BUILD - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' \ + cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \ -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \ + -DOSG_DETERMINE_WIN_VERSION=OFF \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DOSG_USE_QT=FALSE \ -DPOPPLER_HAS_CAIRO_EXITCODE=0 \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ '$(1)' - $(MAKE) -C '$(1).build/src/OpenThreads' -j '$(JOBS)' install VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)/src/OpenThreads' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)/src/OpenThreads' -j 1 install VERBOSE=1 endef diff --git a/src/opus.mk b/src/opus.mk index 97a0d9f..6942ba9 100644 --- a/src/opus.mk +++ b/src/opus.mk @@ -3,8 +3,8 @@ PKG := opus $(PKG)_WEBSITE := https://opus-codec.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1 -$(PKG)_CHECKSUM := 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e +$(PKG)_VERSION := 1.2.1 +$(PKG)_CHECKSUM := cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://archive.mozilla.org/pub/$(PKG)/$($(PKG)_FILE) diff --git a/src/opusfile.mk b/src/opusfile.mk index 2af41cc..5fd5cea 100644 --- a/src/opusfile.mk +++ b/src/opusfile.mk @@ -3,8 +3,8 @@ PKG := opusfile $(PKG)_WEBSITE := https://opus-codec.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 0.6 -$(PKG)_CHECKSUM := 2428717b356e139f18ed2fdb5ad990b5654a238907a0058200b39c46a7d03ea6 +$(PKG)_VERSION := 0.11 +$(PKG)_CHECKSUM := 74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://archive.mozilla.org/pub/opus/$($(PKG)_FILE) diff --git a/src/osgearth-1-fixes.patch b/src/osgearth-1-fixes.patch index 72f2282..1070d64 100644 --- a/src/osgearth-1-fixes.patch +++ b/src/osgearth-1-fixes.patch @@ -42,3 +42,26 @@ index 1111111..2222222 100644 ADD_SUBDIRECTORY( tests ) ENDIF() +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Pek <tehnick-8@yandex.ru> +Date: Mon, 18 Jun 2018 18:49:40 +0300 +Subject: Fix build with OpenSceneGraph >= 3.6.1 + + +diff --git a/src/osgEarth/ScreenSpaceLayout.cpp b/src/osgEarth/ScreenSpaceLayout.cpp +index 346d7bcae..760d26fa8 100644 +--- a/src/osgEarth/ScreenSpaceLayout.cpp ++++ b/src/osgEarth/ScreenSpaceLayout.cpp +@@ -106,7 +106,11 @@ namespace + return diff < 0.0f; + + // then fallback on traversal order. ++#if OSG_VERSION_GREATER_THAN(3,6,1) ++ diff = float(lhs->_traversalOrderNumber) - float(rhs->_traversalOrderNumber); ++#else + diff = float(lhs->_traversalNumber) - float(rhs->_traversalNumber); ++#endif + return diff < 0.0f; + } + } + diff --git a/src/osgearth.mk b/src/osgearth.mk index 17b3c54..9095b02 100644 --- a/src/osgearth.mk +++ b/src/osgearth.mk @@ -7,7 +7,7 @@ $(PKG)_IGNORE := $(PKG)_VERSION := 2.9 $(PKG)_CHECKSUM := 22aeef42bb700c1e669d9ba57ce4155c0668caf86cc738750a6b9d34c1eaf2a4 $(PKG)_GH_CONF := gwaldron/osgearth/releases/latest, osgearth- -$(PKG)_DEPS := curl cc gdal openscenegraph poco sqlite zlib +$(PKG)_DEPS := curl cc gdal openscenegraph sqlite zlib define $(PKG)_BUILD cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \ diff --git a/src/plibc.mk b/src/plibc.mk index 16e4261..8b35f6c 100644 --- a/src/plibc.mk +++ b/src/plibc.mk @@ -13,7 +13,13 @@ define $(PKG)_BUILD cd '$(SOURCE_DIR)' && autoreconf -fi cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \ $(MXE_CONFIGURE_OPTS) \ - --includedir='$(PREFIX)/$(TARGET)/include/plibc' + --includedir='$(PREFIX)/$(TARGET)/include/plibc' \ + CFLAGS='-DEHOSTDOWN=WSAEHOSTDOWN \ + -DESOCKTNOSUPPORT=WSAESOCKTNOSUPPORT \ + -DEPROCLIM=WSAEPROCLIM \ + -DEDQUOT=WSAEDQUOT \ + -DESTALE=WSAESTALE \ + -DECASECLASH=2137' $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MAKE) -C '$(BUILD_DIR)' -j 1 install diff --git a/src/poco-1-fixes.patch b/src/poco-1-fixes.patch index 65b2588..52060c4 100644 --- a/src/poco-1-fixes.patch +++ b/src/poco-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Mon, 8 Sep 2014 16:52:55 -0700 -Subject: [PATCH 1/3] configure: Define POCO_STATIC when --static is requested +Subject: [PATCH 1/6] configure: Define POCO_STATIC when --static is requested diff --git a/configure b/configure @@ -24,7 +24,7 @@ index 1111111..2222222 100755 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Mon, 8 Sep 2014 17:09:19 -0700 -Subject: [PATCH 2/3] Config.h: Add prototype for POCO_STATIC +Subject: [PATCH 2/6] Config.h: Add prototype for POCO_STATIC diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h @@ -46,7 +46,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Mon, 8 Sep 2014 16:27:42 -0700 -Subject: [PATCH 3/3] Types.h: Fix Win64 on MinGW +Subject: [PATCH 3/6] Types.h: Fix Win64 on MinGW diff --git a/Foundation/include/Poco/Types.h b/Foundation/include/Poco/Types.h @@ -85,3 +85,97 @@ index 1111111..2222222 100644 #endif #define POCO_HAVE_INT64 1 #elif defined(__DECCXX) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Timothy Gu <timothygu99@gmail.com> +Date: Sun, 16 Nov 2014 09:14:22 -0800 +Subject: [PATCH 4/6] Environment: Fix winsock2.h include + +Signed-off-by: Timothy Gu <timothygu99@gmail.com> + +diff --git a/Foundation/src/Environment_WIN32.cpp b/Foundation/src/Environment_WIN32.cpp +index 1111111..2222222 100644 +--- a/Foundation/src/Environment_WIN32.cpp ++++ b/Foundation/src/Environment_WIN32.cpp +@@ -39,6 +39,7 @@ + #include <sstream> + #include <cstring> + #include "Poco/UnWindows.h" ++#include <winsock2.h> + #include <iphlpapi.h> + + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 17 Sep 2018 16:56:11 +0200 +Subject: [PATCH 5/6] build fix related to pcre + + +diff --git a/Foundation/include/Poco/RegularExpression.h b/Foundation/include/Poco/RegularExpression.h +index 1111111..2222222 100644 +--- a/Foundation/include/Poco/RegularExpression.h ++++ b/Foundation/include/Poco/RegularExpression.h +@@ -47,6 +47,9 @@ + #include <vector> + + ++#if defined(POCO_UNBUNDLED) ++#include <pcre.h> ++#else + // + // Copy these definitions from pcre.h + // to avoid pulling in the entire header file +@@ -57,7 +60,7 @@ extern "C" + typedef struct real_pcre pcre; + struct pcre_extra; + } +- ++#endif + + namespace Poco { + +diff --git a/Foundation/src/RegularExpression.cpp b/Foundation/src/RegularExpression.cpp +index 1111111..2222222 100644 +--- a/Foundation/src/RegularExpression.cpp ++++ b/Foundation/src/RegularExpression.cpp +@@ -37,9 +37,7 @@ + #include "Poco/RegularExpression.h" + #include "Poco/Exception.h" + #include <sstream> +-#if defined(POCO_UNBUNDLED) +-#include <pcre.h> +-#else ++#ifndef POCO_UNBUNDLED + #include "pcre.h" + #endif + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 17 Sep 2018 17:05:03 +0200 +Subject: [PATCH 6/6] drop obsolete -mno-cygwin + + +diff --git a/build/config/MinGW-CrossEnv b/build/config/MinGW-CrossEnv +index 1111111..2222222 100644 +--- a/build/config/MinGW-CrossEnv ++++ b/build/config/MinGW-CrossEnv +@@ -23,7 +23,7 @@ CXX = $(CROSSENV)-g++ + LINK = $(CXX) + LIB = $(CROSSENV)-ar -cr + RANLIB = $(CROSSENV)-ranlib +-SHLIB = $(CXX) -shared -mno-cygwin -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a ++SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a + SHLIBLN = $(POCO_BASE)/build/script/shlibln + STRIP = + DEP = $(POCO_BASE)/build/script/makedepend.gcc +@@ -68,7 +68,7 @@ RELEASEOPT_LINK = -O2 + # + # System Specific Flags + # +-SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED ++SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED + + # + # System Specific Libraries diff --git a/src/poco-2-fix-mno-cygwin.patch b/src/poco-2-fix-mno-cygwin.patch deleted file mode 100644 index 0331ef1..0000000 --- a/src/poco-2-fix-mno-cygwin.patch +++ /dev/null @@ -1,22 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - ---- a/build/config/MinGW-CrossEnv -+++ b/build/config/MinGW-CrossEnv -@@ -23,7 +23,7 @@ CXX = $(CROSSENV)-g++ - LINK = $(CXX) - LIB = $(CROSSENV)-ar -cr - RANLIB = $(CROSSENV)-ranlib --SHLIB = $(CXX) -shared -mno-cygwin -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a -+SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a - SHLIBLN = $(POCO_BASE)/build/script/shlibln - STRIP = - DEP = $(POCO_BASE)/build/script/makedepend.gcc -@@ -68,7 +68,7 @@ RELEASEOPT_LINK = -O2 - # - # System Specific Flags - # --SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED -+SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED - - # - # System Specific Libraries diff --git a/src/poco-3-winsock2.patch b/src/poco-3-winsock2.patch deleted file mode 100644 index 3213cf4..0000000 --- a/src/poco-3-winsock2.patch +++ /dev/null @@ -1,24 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 25b2fc9af331fe6add75fb108bec590f8d467b20 Mon Sep 17 00:00:00 2001 -From: Timothy Gu <timothygu99@gmail.com> -Date: Sun, 16 Nov 2014 09:14:22 -0800 -Subject: [PATCH] Environment: Fix winsock2.h include - -Signed-off-by: Timothy Gu <timothygu99@gmail.com> - -diff --git a/Foundation/src/Environment_WIN32.cpp b/Foundation/src/Environment_WIN32.cpp -index 9443c32..e251da1 100644 ---- a/Foundation/src/Environment_WIN32.cpp -+++ b/Foundation/src/Environment_WIN32.cpp -@@ -39,6 +39,7 @@ - #include <sstream> - #include <cstring> - #include "Poco/UnWindows.h" -+#include <winsock2.h> - #include <iphlpapi.h> - - --- -1.9.1 - diff --git a/src/proj.mk b/src/proj.mk index 44a102d..667955b 100644 --- a/src/proj.mk +++ b/src/proj.mk @@ -3,8 +3,8 @@ PKG := proj $(PKG)_WEBSITE := https://trac.osgeo.org/proj/ $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.0 -$(PKG)_CHECKSUM := b30df08d736e69744cb255828721abb545b494d6032c13a96520f3219a444cd2 +$(PKG)_VERSION := 5.1.0 +$(PKG)_CHECKSUM := 6b1379a53317d9b5b8c723c1dc7bf2e3a8eb22ceb46b8807a1ce48ef65685bb3 $(PKG)_SUBDIR := proj-$($(PKG)_VERSION) $(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://download.osgeo.org/proj/$($(PKG)_FILE) diff --git a/src/qtifw-1-fixes.patch b/src/qtifw-1-fixes.patch new file mode 100644 index 0000000..5ac58c6 --- /dev/null +++ b/src/qtifw-1-fixes.patch @@ -0,0 +1,76 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +diff --git a/installerfw.pro b/installerfw.pro +index 10414ad5..1cec9c6a 100644 +--- a/installerfw.pro ++++ b/installerfw.pro +@@ -2,8 +2,6 @@ TEMPLATE = subdirs
+ SUBDIRS += src tools
+ tools.depends = src
+
+-requires(!cross_compile)
+-
+ include (installerfw.pri)
+ include (doc/doc.pri)
+
+diff --git a/src/libs/7zip/win/CPP/Windows/SecurityUtils.h b/src/libs/7zip/win/CPP/Windows/SecurityUtils.h +index 715de250..bfb65a34 100644 +--- a/src/libs/7zip/win/CPP/Windows/SecurityUtils.h ++++ b/src/libs/7zip/win/CPP/Windows/SecurityUtils.h +@@ -3,7 +3,7 @@ + #ifndef __WINDOWS_SECURITY_UTILS_H
+ #define __WINDOWS_SECURITY_UTILS_H
+
+-#include <NTSecAPI.h>
++#include <ntsecapi.h>
+
+ #include "Defs.h"
+
+diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp +index 2c2e96ef..36f97b0c 100644 +--- a/src/libs/installer/createshortcutoperation.cpp ++++ b/src/libs/installer/createshortcutoperation.cpp +@@ -41,7 +41,7 @@ using namespace QInstaller;
+ #ifdef Q_OS_WIN
+ #include <qt_windows.h>
+ #include <shlobj.h>
+-#include <Intshcut.h>
++#include <intshcut.h>
+
+ #ifndef PIDLIST_ABSOLUTE
+ typedef ITEMIDLIST *PIDLIST_ABSOLUTE;
+diff --git a/src/libs/installer/binaryformat.h b/src/libs/installer/binaryformat.h +index 3bd8a6aa..87d5e323 100644 +--- a/src/libs/installer/binaryformat.h ++++ b/src/libs/installer/binaryformat.h +@@ -33,7 +33,7 @@
+ #include "range.h"
+
+ #include <QCoreApplication>
+-#include <QtCore/private/qfsfileengine_p.h>
++#include <QtCore/QFile>
+ #include <QList>
+ #include <QSharedPointer>
+
+@@ -81,7 +81,7 @@ private:
+ void setOpenMode(OpenMode mode) { QIODevice::setOpenMode(mode); }
+
+ private:
+- QFSFileEngine m_file;
++ QFile m_file;
+ QByteArray m_name;
+ Range<qint64> m_segment;
+ };
+diff --git a/src/libs/installer/extractarchiveoperation_p.h b/src/libs/installer/extractarchiveoperation_p.h +index f333da36..9f528b6a 100644 +--- a/src/libs/installer/extractarchiveoperation_p.h ++++ b/src/libs/installer/extractarchiveoperation_p.h +@@ -37,6 +37,8 @@
+
+ #include <QRunnable>
+ #include <QThread>
++#include <QFileInfo>
++#include <QDir>
+
+ namespace QInstaller {
+
diff --git a/src/qtifw.mk b/src/qtifw.mk new file mode 100644 index 0000000..e763c47 --- /dev/null +++ b/src/qtifw.mk @@ -0,0 +1,30 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := qtifw +$(PKG)_WEBSITE := https://doc.qt.io/qtinstallerframework/index.html +$(PKG)_DESCR := Qt Installer Framework +$(PKG)_IGNORE := +$(PKG)_VERSION := 3.0.4 +$(PKG)_CHECKSUM := a4ecafc37086f96a833463214f873caac977199e64f0b1453aa49bdd6f24f32e +$(PKG)_SUBDIR = qt-installer-framework-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).zip +$(PKG)_URL := https://download.qt.io/official_releases/qt-installer-framework/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := cc qtwinextras +$(PKG)_DEPS_$(BUILD) := +$(PKG)_TARGETS := $(BUILD) i686-w64-mingw32.static.posix + +define $(PKG)_BUILD_$(BUILD) + cd '$(1)' && qmake + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(INSTALL) -m755 '$(1)/bin/binarycreator' '$(PREFIX)/bin/$(TARGET)-binarycreator' + $(INSTALL) -m755 '$(1)/bin/repogen' '$(PREFIX)/bin/$(TARGET)-repogen' + $(INSTALL) -m755 '$(1)/bin/archivegen' '$(PREFIX)/bin/$(TARGET)-archivegen' + $(INSTALL) -m755 '$(1)/bin/devtool' '$(PREFIX)/bin/$(TARGET)-devtool' +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j 1 + $(MAKE) -C '$(1)' -j 1 install +endef + diff --git a/src/qtmultimedia-1-fixes.patch b/src/qtmultimedia-1-fixes.patch new file mode 100644 index 0000000..d16c1c8 --- /dev/null +++ b/src/qtmultimedia-1-fixes.patch @@ -0,0 +1,30 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 17 Sep 2018 12:38:35 +0200 +Subject: [PATCH 1/1] mingw-w64 6 fix + + +diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h +index 1111111..2222222 100644 +--- a/src/plugins/common/evr/evrdefs.h ++++ b/src/plugins/common/evr/evrdefs.h +@@ -83,6 +83,7 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**); + #define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L) + #endif + ++#if __MINGW64_VERSION_MAJOR < 6 + #ifdef __GNUC__ + typedef struct MFVideoNormalizedRect { + float left; +@@ -91,6 +92,7 @@ typedef struct MFVideoNormalizedRect { + float bottom; + } MFVideoNormalizedRect; + #endif ++#endif + + #include <initguid.h> + diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index 6bec160..3b16acc 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -16,7 +16,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' \ + -after \ + 'LIBS_PRIVATE += -lamstrmid' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/speex.mk b/src/speex.mk index df5d049..56cd767 100644 --- a/src/speex.mk +++ b/src/speex.mk @@ -4,8 +4,8 @@ PKG := speex $(PKG)_WEBSITE := https://speex.org/ $(PKG)_DESCR := Speex $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2rc2 -$(PKG)_CHECKSUM := caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891 +$(PKG)_VERSION := 1.2.0 +$(PKG)_CHECKSUM := eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094 $(PKG)_SUBDIR := speex-$($(PKG)_VERSION) $(PKG)_FILE := speex-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://downloads.xiph.org/releases/speex/$($(PKG)_FILE) diff --git a/src/sqlite.mk b/src/sqlite.mk index 56f73a5..e2e2c73 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -4,8 +4,8 @@ PKG := sqlite $(PKG)_WEBSITE := https://www.sqlite.org/ $(PKG)_DESCR := SQLite $(PKG)_IGNORE := -$(PKG)_VERSION := 3250100 -$(PKG)_CHECKSUM := 96ed46bd87f093073ca8afd613020def847009b611c89f397bc24bd932ec6fd1 +$(PKG)_VERSION := 3250300 +$(PKG)_CHECKSUM := 00ebf97be13928941940cc71de3d67e9f852698233cd98ce2d178fd08092f3dd $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.sqlite.org/2018/$($(PKG)_FILE) diff --git a/src/tiff.mk b/src/tiff.mk index 3b3a530..abe979d 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -4,8 +4,8 @@ PKG := tiff $(PKG)_WEBSITE := http://simplesystems.org/libtiff/ $(PKG)_DESCR := LibTIFF $(PKG)_IGNORE := -$(PKG)_VERSION := 4.0.9 -$(PKG)_CHECKSUM := 6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd +$(PKG)_VERSION := 4.0.10 +$(PKG)_CHECKSUM := 2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4 $(PKG)_SUBDIR := tiff-$($(PKG)_VERSION) $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://download.osgeo.org/libtiff/$($(PKG)_FILE) diff --git a/src/vmime.mk b/src/vmime.mk index 31cda1d..b6ace7e 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -4,8 +4,8 @@ PKG := vmime $(PKG)_WEBSITE := https://www.vmime.org/ $(PKG)_DESCR := VMime $(PKG)_IGNORE := -$(PKG)_VERSION := df135b5 -$(PKG)_CHECKSUM := edcb57ac2ed90904c89fae9bd417d3ae3ca13902a8afa9ee5c82e76f82af7481 +$(PKG)_VERSION := 0368ada +$(PKG)_CHECKSUM := 1c2f442b3ac34c2643fd4db35d536422b55adc2f79089455c02df4d45cf5a089 $(PKG)_GH_CONF := kisli/vmime/branches/master $(PKG)_DEPS := cc gnutls libgsasl libiconv pthreads zlib diff --git a/src/wavpack.mk b/src/wavpack.mk index 3b0709a..2611ff0 100644 --- a/src/wavpack.mk +++ b/src/wavpack.mk @@ -4,8 +4,8 @@ PKG := wavpack $(PKG)_WEBSITE := http://www.wavpack.com/ $(PKG)_DESCR := WavPack $(PKG)_IGNORE := -$(PKG)_VERSION := 4.75.2 -$(PKG)_CHECKSUM := 7d31b34166c33c3109b45c6e4579b472fd05e3ee8ec6d728352961c5cdd1d6b0 +$(PKG)_VERSION := 5.1.0 +$(PKG)_CHECKSUM := 1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944 $(PKG)_SUBDIR := wavpack-$($(PKG)_VERSION) $(PKG)_FILE := wavpack-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.wavpack.com/$($(PKG)_FILE) diff --git a/src/widl-1-fixes.patch b/src/widl-1-fixes.patch index 1ed2e6b..97724f6 100644 --- a/src/widl-1-fixes.patch +++ b/src/widl-1-fixes.patch @@ -9,15 +9,18 @@ Subject: [PATCH 1/1] fixes diff --git a/mingw-w64-tools/widl/include/windef.h b/mingw-w64-tools/widl/include/windef.h -index 1111111..2222222 100644 +index 8e8a08a..3d50e13 100644 --- a/mingw-w64-tools/widl/include/windef.h +++ b/mingw-w64-tools/widl/include/windef.h -@@ -85,7 +85,7 @@ extern "C" { +@@ -101,7 +101,7 @@ extern "C" { #endif /* __cdecl */ #ifndef __ms_va_list --# if defined(__x86_64__) && defined (__GNUC__) -+# if defined(__x86_64__) && defined (__GNUC__) && defined(__builtin_ms_va_list) +-# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) ++# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) && defined(__builtin_ms_va_list) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) +-- +2.17.1 + diff --git a/src/wt-1-fixes.patch b/src/wt-1-fixes.patch index 23894db..8f358d6 100644 --- a/src/wt-1-fixes.patch +++ b/src/wt-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev <bnagaev@gmail.com> Date: Sat, 1 Apr 2017 15:17:43 +0200 -Subject: [PATCH 1/2] Wt fixes +Subject: [PATCH 1/3] Wt fixes diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt @@ -86,7 +86,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Wed, 15 Aug 2018 13:28:31 +1000 -Subject: [PATCH 2/2] fix w32 build posix threads enabled +Subject: [PATCH 2/3] fix w32 build posix threads enabled diff --git a/src/http/Reply.C b/src/http/Reply.C @@ -102,3 +102,22 @@ index 1111111..2222222 100644 // gmtime_r can be defined by mingw #ifndef gmtime_r static struct tm* gmtime_r(const time_t* t, struct tm* r) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 17 Sep 2018 23:31:42 +0200 +Subject: [PATCH 3/3] fix missing gmtime_r definition + + +diff --git a/src/http/Reply.C b/src/http/Reply.C +index 1111111..2222222 100644 +--- a/src/http/Reply.C ++++ b/src/http/Reply.C +@@ -13,6 +13,7 @@ + // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + // + ++#include <unistd.h> + #include "Configuration.h" + #include "Connection.h" + #include "Reply.h" diff --git a/src/xxhash.mk b/src/xxhash.mk index 6d82e41..98e34da 100644 --- a/src/xxhash.mk +++ b/src/xxhash.mk @@ -4,8 +4,8 @@ PKG := xxhash $(PKG)_WEBSITE := https://cyan4973.github.io/xxHash/ $(PKG)_DESCR := xxHash $(PKG)_IGNORE := -$(PKG)_VERSION := 0.6.4 -$(PKG)_CHECKSUM := 4570ccd111df6b6386502791397906bf69b7371eb209af7d41debc2f074cdb22 +$(PKG)_VERSION := 0.6.5 +$(PKG)_CHECKSUM := 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95 $(PKG)_GH_CONF := Cyan4973/xxHash/tags,v $(PKG)_DEPS := cc diff --git a/src/zip-1-fixes.patch b/src/zip-1-fixes.patch index 9dd15eb..daa5583 100644 --- a/src/zip-1-fixes.patch +++ b/src/zip-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 27 Feb 2018 16:22:41 +0100 -Subject: [PATCH 1/1] MXE build fixes +Subject: [PATCH 1/2] MXE build fixes diff --git a/win32/makefile.gcc b/win32/makefile.gcc @@ -42,3 +42,54 @@ index 1111111..2222222 100644 # if (defined(__MINGW32__) && !defined(MB_CUR_MAX)) # ifdef __MSVCRT__ IZ_IMP extern int *__p___mb_cur_max(void); + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 17 Sep 2018 22:10:32 +0200 +Subject: [PATCH 2/2] avoid define clash on CR + + +diff --git a/zip.h b/zip.h +index 1111111..2222222 100644 +--- a/zip.h ++++ b/zip.h +@@ -262,7 +262,7 @@ struct plist { + + /* ASCII definitions for line terminators in text files: */ + #define LF 10 /* '\n' on ASCII machines; must be 10 due to EBCDIC */ +-#define CR 13 /* '\r' on ASCII machines; must be 13 due to EBCDIC */ ++#define ZIPCR 13 /* '\r' on ASCII machines; must be 13 due to EBCDIC */ + #define CTRLZ 26 /* DOS & OS/2 EOF marker (used in fileio.c, vms.c) */ + + /* return codes of password fetches (negative: user abort; positive: error) */ +diff --git a/zipup.c b/zipup.c +index 1111111..2222222 100644 +--- a/zipup.c ++++ b/zipup.c +@@ -1207,7 +1207,7 @@ local unsigned file_read(buf, size) + char c; + + if ((c = *b++) == '\n') { +- *buf++ = CR; *buf++ = LF; len++; ++ *buf++ = ZIPCR; *buf++ = LF; len++; + } else { + *buf++ = (char)ascii[(uch)c]; + } +@@ -1217,7 +1217,7 @@ local unsigned file_read(buf, size) + #endif /* EBCDIC */ + { + do { +- if ((*buf++ = *b++) == '\n') *(buf-1) = CR, *buf++ = LF, len++; ++ if ((*buf++ = *b++) == '\n') *(buf-1) = ZIPCR, *buf++ = LF, len++; + } while (--size != 0); + } + buf -= len; +@@ -1257,7 +1257,7 @@ local unsigned file_read(buf, size) + #endif /* EBCDIC */ + { + do { +- if (( *buf++ = *b++) == CR && *b == LF) buf--, len--; ++ if (( *buf++ = *b++) == ZIPCR && *b == LF) buf--, len--; + } while (--size != 0); + } + if (len == 0) { |