Mercurial > mxe-octave
changeset 6520:56decd595eb7
maint: Merge release to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Wed, 16 Nov 2022 08:27:17 +0100 |
| parents | a8cdb57c6ea6 (diff) 77267b0c5bc8 (current diff) |
| children | fe9ef30a38dd |
| files | src/default-octave.mk |
| diffstat | 317 files changed, 2480 insertions(+), 2149 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed Nov 16 08:25:43 2022 +0100 +++ b/Makefile.in Wed Nov 16 08:27:17 2022 +0100 @@ -203,6 +203,7 @@ dist_html_DATA= \ pkghtml_DATA= \ examples_DATA= \ + dist_examples_DATA= \ dist_examples_SCRIPTS= \ dist_apidoc_DATA= \ INFO_DEPS= @@ -231,6 +232,7 @@ SHELL := @SHELL@ GREP ?= grep +EGREP ?= $(shell egrep --help >/dev/null 2>&1 && echo e)grep INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed @@ -268,13 +270,19 @@ ## They run on the build system. Some, like gcc and binutils may ## generate output that runs on the host system (TARGET in MXE terms). ALL_BUILD_TOOLS := $(shell $(SED) -n 's/^.* class="package">\(build-[^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html') +ALL_MSYS2_PACKAGES := $(shell $(SED) -n 's/^.* class="package">\(msys2-[^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html') +ALL_MSYS1_PACKAGES := $(shell $(SED) -n 's/^.* class="package">\(msys-[^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html') +ALL_MSYS_PACKAGES := $(ALL_MSYS2_PACKAGES) $(ALL_MSYS1_PACKAGES) +ALL_OCTAVE_FORGE_PACKAGES := $(shell $(SED) -n 's/^.* class="package">\(of-[^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html') +ALL_OCTAVE_OTHER_PACKAGES := $(shell $(SED) -n 's/^.* class="package">\(opkg-[^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html') +ALL_OCTAVE_PACKAGES := $(ALL_OCTAVE_FORGE_PACKAGES) $(ALL_OCTAVE_OTHER_PACKAGES) BUILD_COMPILER_TOOLS := build-gcc build-binutils BUILD_TOOLS := $(ALL_BUILD_TOOLS) # some build tools are optional and added as explicit dependencies # to packages that need them BUILD_TOOLS_OPT := \ - build-libffi build-mako build-markupsafe build-meson build-ninja \ + build-libffi build-mako build-markupsafe build-meson build-nasm build-ninja \ build-python build-octave build-setuptools build-scons BUILD_TOOLS := $(filter-out $(BUILD_TOOLS_OPT), $(BUILD_TOOLS)) # Building flex for native mingw fails, so disable it. @@ -482,7 +490,13 @@ MSYS2_SOURCES := $(addprefix src-,$(MSYS2_PACKAGES)) PKGS += $(MSYS2_SOURCES) MSYS2_BASE_URL := https://repo.msys2.org/msys +ifeq ($(MSYS2_ARCH), i686) + MSYS2_URL := https://github.com/jeremyd2019/msys2-build32/releases/download/repo + MSYS2_URL2 := $(MSYS2_BASE_URL)/$(MSYS2_ARCH) +else MSYS2_URL := $(MSYS2_BASE_URL)/$(MSYS2_ARCH) + MSYS2_URL2 := +endif MSYS2_SRC_URL := $(MSYS2_BASE_URL)/sources MSYS2_DIR := $(TOP_BUILD_DIR)/msys2 @@ -536,7 +550,7 @@ ## Packages removed from list because build is broken: ## None. OCTAVE_FORGE_PACKAGES := $(addprefix of-,audio communications control database dataframe data-smoothing dicom financial fits fuzzy-logic-toolkit ga general generate_html geometry gsl image instrument-control interval io linear-algebra lssa ltfat mapping matgeom miscellaneous nan netcdf nurbs ocs octproj optim optiminterp quaternion queueing signal sockets sparsersb splines statistics stk strings struct symbolic tisean tsa video windows zeromq) -OCTAVE_OTHER_PACKAGES := $(addprefix opkg-,biosig) +OCTAVE_OTHER_PACKAGES := $(addprefix opkg-,biosig cfitsio mqtt) # get ALL deps for all of- packages, regardless of whether building the actual forge package in the installer OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_FORGE_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p))) OCTAVE_OTHER_PKG_DEPS:= $(sort $(foreach p,$(addprefix $(TOP_DIR)/src/,$(addsuffix .mk,$(OCTAVE_OTHER_PACKAGES))),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p))) @@ -1004,6 +1018,15 @@ $(wildcard $(PKG_DIR)/*))) .PHONY: update + +define GITHUB_PKG_UPDATE + $(WGET) -q -O- "https://github.com/$(1)/$(2)/tags" | \ + $(SED) -n 's|.*releases/tag/$(3)\([0-9][^"]*\).*|\1|p' | \ + $(GREP) -i -v RC | $(GREP) -i -v BETA | \ + $(SORT) -V | \ + tail -1 +endef + define UPDATE $(if $(2), $(if $(filter $(2),$($(1)_IGNORE)), @@ -1032,7 +1055,7 @@ .PHONY: update-general-pkgs update-general-pkgs: - $(foreach PKG,$(filter-out $(MSYS2_PACKAGES) $(MSYS_BASE_PACKAGES) $(OCTAVE_FORGE_PACKAGES), $(PKGS)),\ + $(foreach PKG,$(filter-out $(ALL_MSYS_PACKAGES) $(ALL_OCTAVE_PACKAGES), $(PKGS)),\ $(if $($(PKG)_UPDATE),$(call UPDATE,$(PKG),$(shell $($(PKG)_UPDATE))),$(info Warning: No update rule for $(PKG)))) update-checksum-%:
--- a/dist-files.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/dist-files.mk Wed Nov 16 08:27:17 2022 +0100 @@ -40,6 +40,7 @@ build-markupsafe.mk \ build-meson.mk \ build-msvctools.mk \ + build-nasm.mk \ build-ninja.mk \ build-octave.mk \ build-perl.mk \ @@ -68,6 +69,7 @@ cminpack.mk \ cppunit.mk \ cunit.mk \ + curl-1-fixes.patch \ curl-test.c \ curl.mk \ damageproto.mk \ @@ -85,24 +87,20 @@ dri2proto.mk \ eigen.mk \ epstool.mk \ - exiv2-issue847.patch \ - exiv2-r2796.patch \ exiv2.mk \ expat.mk \ - faad2-1-fixes.patch \ faad2.mk \ + ffmpeg-1-fixes.patch \ ffmpeg.mk \ fftw.mk \ file-test.c \ file.mk \ fixesproto.mk \ - flac-1-ucrt.patch \ flac.mk \ fltk-2-uuid-mod.patch \ fltk-test.cpp \ fltk.mk \ fontconfig.mk \ - freeglut-1-fixes.patch \ freeglut-test.c \ freeglut.mk \ freeimage-1-fixes.patch \ @@ -122,13 +120,14 @@ gd-1-libpng15.patch \ gd-test.c \ gd.mk \ - gdal-1-gcc11.patch \ gdal-2-ucrt.patch \ gdal.mk \ + gdb-1-readline-8.2.patch \ gdb.mk \ gdcm-1-nosecapi.patch \ gdcm-2-getopt.patch \ gdcm-3-gcc11.patch \ + gdcm-4-iconv.patch \ gdcm.mk \ gdk-pixbuf-1-fixes.patch \ gdk-pixbuf.mk \ @@ -209,8 +208,6 @@ jasper.mk \ jpeg-test.c \ jpeg.mk \ - json-c-1-patch-missingfile.patch \ - json-c-2-patch-remove-rpl.patch \ json-c-test.c \ json-c.mk \ kbproto.mk \ @@ -255,7 +252,6 @@ libgomp.mk \ libgpg_error-1-fixes.patch \ libgpg_error.mk \ - libgsasl-1-fixes.patch \ libgsasl-test.c \ libgsasl.mk \ libgsf-1-fixes.patch \ @@ -267,7 +263,6 @@ libical-test.c \ libical.mk \ libiconv.mk \ - libidn-1-fixes.patch \ libidn-test.c \ libidn.mk \ libidn2.mk \ @@ -322,6 +317,7 @@ libusb.mk \ libvpx-1-fixes.patch \ libvpx.mk \ + libwebp.mk \ libxml++.mk \ libxml2-1-fixes.patch \ libxml2.mk \ @@ -341,7 +337,6 @@ lzo.mk \ matio.mk \ mdbtools.mk \ - mesa-1-meson.patch \ mesa-2-ucrt.patch \ mesa-proto.mk \ mesa.mk \ @@ -362,6 +357,7 @@ mingw-texinfo-1-fixes.patch \ mingw-texinfo-2-makeinfo-non-ASCII-perl.patch \ mingw-utils-1-portability-fix.patch \ + mingw-w64-complex-inverse-trig.patch \ mingw-w64.mk \ mingw-zeromq-1-fixes.patch \ mingwrt.mk \ @@ -369,6 +365,7 @@ mman-win32.mk \ mpc.mk \ mpfr.mk \ + mpg123.mk \ msitools.mk \ msvc-atk-1.patch \ msvc-build-cmake-1.patch \ @@ -456,7 +453,6 @@ mxml-test.c \ mxml.mk \ native-binutils.mk \ - native-gcc-1-canadian-cross.patch \ native-gcc.mk \ ncurses-1-gcc-5-fix.patch \ ncurses.mk \ @@ -509,6 +505,7 @@ of-lssa.mk \ of-ltfat-1-cross-fixes.patch \ of-ltfat-2-LDFLAGS.patch \ + of-ltfat-3-no-cxx11.patch \ of-ltfat.mk \ of-matgeom.mk \ of-mapping.mk \ @@ -539,7 +536,9 @@ of-queueing.mk \ of-signal.mk \ of-sockets.mk \ + of-sparsersb-1-dev.patch \ of-sparsersb-1-no-internal-mex-fcns.patch \ + of-sparsersb-2-no-cxx11.patch \ of-sparsersb-2-tempdir.patch \ of-sparsersb.mk \ of-specfun-1-deprecated.patch \ @@ -572,13 +571,19 @@ opencv.mk \ openexr.mk \ openjpeg.mk \ + openlibm.mk \ openscenegraph-1-fixes.patch \ openscenegraph.mk \ openssl-1-fixes.patch \ openssl.mk \ opkg-biosig-1-skip-test.patch \ opkg-biosig.mk \ + opkg-cfitsio.mk \ + opkg-mqtt.mk \ opus.mk \ + opusfile.mk \ + paho-mqtt-c-1-fixes.patch \ + paho-mqtt-c.mk \ pango-1-fixes.patch \ pango.mk \ pangomm.mk \ @@ -607,6 +612,7 @@ popt.mk \ portaudio-test.c \ portaudio.mk \ + postgresql-1-autoconf.patch \ postgresql.mk \ proj.mk \ protobuf-test.cpp \ @@ -641,7 +647,6 @@ qt.mk \ qt5.mk \ qtbase-1-fixes.patch \ - qtbase-2-gcc11.patch \ qtbase.mk \ qtimageformats.mk \ qtsvg.mk \ @@ -660,6 +665,7 @@ readline-1-input.patch \ readline-1-sigwinch.patch \ readline-2-event-hook.patch \ + readline-3-fd_set.patch \ readline.mk \ release-octave-1-gnulib.patch \ release-octave.mk \ @@ -667,6 +673,10 @@ rtmidi.mk \ s2tc.mk \ sdl2.mk \ + sdl2_image.mk \ + sdl2_mixer.mk \ + sdl2_net.mk \ + sdl2_ttf.mk \ sdl-1-xdata.patch \ sdl-test.c \ sdl.mk \ @@ -768,7 +778,6 @@ winpcap.mk \ wt-1-fixes.patch \ wt.mk \ - wxwidgets-1-fixes.patch \ wxwidgets-test.cpp \ wxwidgets.mk \ x11.mk \ @@ -814,6 +823,7 @@ xz.mk \ yasm.mk \ zenity.mk \ + zeromq-1.patch \ zeromq.mk \ zlib-1-win32-static.patch \ zlib.mk \
--- a/index.html Wed Nov 16 08:25:43 2022 +0100 +++ b/index.html Wed Nov 16 08:27:17 2022 +0100 @@ -1050,6 +1050,10 @@ <td class="website"></td> </tr> <tr> + <td class="package">build-nasm</td> + <td class="website"><a href="https://www.nasm.us/">build-nasm</a></td> + </tr> + <tr> <td class="package">build-ninja</td> <td class="website"><a href="https://ninja-build.org/">build-ninja</a></td> </tr> @@ -1746,6 +1750,10 @@ <td class="website"><a href="http://code.google.com/p/webm/">vpx</a></td> </tr> <tr> + <td class="package">libwebp</td> + <td class="website"><a href="https://developers.google.com/speed/webp/">libwebp</a></td> + </tr> + <tr> <td class="package">libxml++</td> <td class="website"><a href="http://libxmlplusplus.sourceforge.net/">libxml2</a></td> </tr> @@ -1806,6 +1814,10 @@ <td class="website"><a href="http://www.mpfr.org/">mpfr</a></td> </tr> <tr> + <td class="package">mpg123</td> + <td class="website"><a href="https://www.mpg123.de/">mpg123</a></td> + </tr> + <tr> <td class="package">msitools</td> <td class="website"><a href="https://wiki.gnome.org/msitools">msitools</a></td> </tr> @@ -2490,6 +2502,10 @@ <td class="website"><a href="https://www.openjpeg.org/">OpenJPEG</a></td> </tr> <tr> + <td class="package">openlibm</td> + <td class="website"><a href="https://openlibm.org/">OpenLibm</a></td> + </tr> + <tr> <td class="package">openscenegraph</td> <td class="website"><a href="http://www.openscenegraph.org/">OpenSceneGraph</a></td> </tr> @@ -2502,10 +2518,22 @@ <td class="website"><a href="https://biosig.sourceforge.io/">Biosig Octave Package</a></td> </tr> <tr> + <td class="package">opkg-cfitsio</td> + <td class="website"><a href="https://sourceforge.net/projects/octave-cfitsio/">CFITSIO Octave Package</a></td> + </tr> + <tr> + <td class="package">opkg-mqtt</td> + <td class="website"><a href="https://sourceforge.net/projects/octave-mqtt/">MQTT Octave Package</a></td> + </tr> + <tr> <td class="package">opus</td> <td class="website"><a href="https://opus-codec.org/">opus</a></td> </tr> <tr> + <td class="package">opusfile</td> + <td class="website"><a href="https://opus-codec.org/">opusfile</a></td> + </tr> + <tr> <td class="package">mesa</td> <td class="website"><a href="http://www.mesa3d.org/osmesa.html">Mesa</a></td> </tr> @@ -2514,6 +2542,10 @@ <td class="website"><a href="http://www.mesa3d.org/osmesa.html">Mesa</a></td> </tr> <tr> + <td class="package">paho-mqtt-c</td> + <td class="website"><a href="https://www.eclipse.org/paho/">Paho-mqtt-c</a></td> + </tr> + <tr> <td class="package">pango</td> <td class="website"><a href="http://www.pango.org/">Pango</a></td> </tr> @@ -2730,6 +2762,22 @@ <td class="website"><a href="http://www.libsdl.org/">SDL2</a></td> </tr> <tr> + <td class="package">sdl2_image</td> + <td class="website"><a href="http://www.libsdl.org/projects/SDL_image/">SDL2_image</a></td> + </tr> + <tr> + <td class="package">sdl2_net</td> + <td class="website"><a href="http://www.libsdl.org/projects/SDL_net/">SDL2_net</a></td> + </tr> + <tr> + <td class="package">sdl2_mixer</td> + <td class="website"><a href="http://www.libsdl.org/projects/SDL_mixer/">SDL2_mixer</a></td> + </tr> + <tr> + <td class="package">sdl2_ttf</td> + <td class="website"><a href="http://www.libsdl.org/projects/SDL_ttf/">SDL2_ttf</a></td> + </tr> + <tr> <td class="package">sm</td> <td class="website"><a href="http://xorg.freedesktop.org/">sm</a></td> </tr>
--- a/src/a52dec.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/a52dec.mk Wed Nov 16 08:27:17 2022 +0100 @@ -7,11 +7,11 @@ $(PKG)_CHECKSUM := 79b33bd8d89dad7436f85b9154ad35667aa37321 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://liba52.sourceforge.net/files/$(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://liba52.sourceforge.io/files/$(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'http://liba52.sourceforge.net/downloads.html' | \ + $(WGET) -q -O- 'https://liba52.sourceforge.io/downloads.html' | \ $(SED) -n 's,.*files/a52dec-\([0-9][^"]*\)\.tar.*,\1,p' | \ head -1 endef
--- a/src/blas.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/blas.mk Wed Nov 16 08:27:17 2022 +0100 @@ -16,7 +16,7 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- ftp://ftp.eq.uc.pt/pub/software/math/netlib/blas/ | \ + $(WGET) -q -O- 'https://www.netlib.org/blas/' | \ $(SED) -n 's|.*>blas-\([0-9\.]*\).tgz<.*|\1|p' | $(SORT) -V | \ tail -1 endef
--- a/src/blas_switch.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/blas_switch.mk Wed Nov 16 08:27:17 2022 +0100 @@ -23,9 +23,7 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/lostbard/$(PKG)/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,lostbard,blas_switch,v) endef ifneq ($(MXE_NATIVE_BUILD),yes)
--- a/src/build-autoconf.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-autoconf.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-autoconf $(PKG)_IGNORE := -$(PKG)_VERSION := 2.69 -$(PKG)_CHECKSUM := e891c3193029775e83e0534ac0ee0c4c711f6d23 +$(PKG)_VERSION := 2.71 +$(PKG)_CHECKSUM := 1b5b1dbed849c6653be47c56d28d26fcf3f7238a $(PKG)_SUBDIR := autoconf-$($(PKG)_VERSION) $(PKG)_FILE := autoconf-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE)
--- a/src/build-automake.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-automake.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-automake $(PKG)_IGNORE := -$(PKG)_VERSION := 1.16.2 -$(PKG)_CHECKSUM := dbfc7e802a2f4a333cc406abe6f9e4df6260f0e3 +$(PKG)_VERSION := 1.16.5 +$(PKG)_CHECKSUM := efa94f48ba6b058461608cec967194c381d6b600 $(PKG)_SUBDIR := automake-$($(PKG)_VERSION) $(PKG)_FILE := automake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/automake/$($(PKG)_FILE)
--- a/src/build-binutils.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-binutils.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-binutils $(PKG)_IGNORE := -$(PKG)_VERSION := 2.35.1 -$(PKG)_CHECKSUM := 45f7a96a2580a422f44b78317f0abf13935fecb6 +$(PKG)_VERSION := 2.39 +$(PKG)_CHECKSUM := f17653e7b1d1fa5242a408919845da23e8cc5141 $(PKG)_SUBDIR := binutils-$($(PKG)_VERSION) $(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE)
--- a/src/build-bison.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-bison.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-bison $(PKG)_IGNORE := -$(PKG)_VERSION := 3.5.4 -$(PKG)_CHECKSUM := 67279a74698e60093f57e1dec8e6236e0b194bb2 +$(PKG)_VERSION := 3.8.2 +$(PKG)_CHECKSUM := da1522a00f8c23c1abf69dbd2e99078d2a484b96 $(PKG)_SUBDIR := bison-$($(PKG)_VERSION) $(PKG)_FILE := bison-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/bison/$($(PKG)_FILE)
--- a/src/build-cmake.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-cmake.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.22.1 -$(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb +$(PKG)_VERSION := 3.23.3 +$(PKG)_CHECKSUM := 99a7d4586f1a411cd30dfa57438300390396402c $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/build-gawk.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-gawk.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.1 -$(PKG)_CHECKSUM := 4ad1a3e5d016b5484bcbcbf866d73967c4af1b5e +$(PKG)_VERSION := 5.2.0 +$(PKG)_CHECKSUM := 91d7067d043c8a5b484650a2547643faba502aef $(PKG)_SUBDIR := gawk-$($(PKG)_VERSION) $(PKG)_FILE := gawk-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gawk/$($(PKG)_FILE)
--- a/src/build-gcc.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-gcc.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 11.2.0 -$(PKG)_CHECKSUM := f902ccacecf8949978d6261e9f1d034cff73ffdb +$(PKG)_VERSION := 12.2.0 +$(PKG)_CHECKSUM := 5dce6dc0091b8049b530d1587513a07201691760 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -98,6 +98,13 @@ $(MAKE) -C '$(1).pthreads' -j '$(JOBS)' || $(MAKE) -C '$(1).pthreads' -j '$(JOBS)' $(MAKE) -C '$(1).pthreads' -j 1 install endef + + define $(PKG)_POST_BUILD + # overwrite default specs to mimic stack protector handling of glibc + # ./configure above doesn't do this + '$(TARGET)-gcc' -dumpspecs > '$(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/specs' + $(SED) -i 's,-lmingwex,-lmingwex -lssp_nonshared -lssp,' '$(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/specs' + endef endif ifneq ($(MXE_NATIVE_BUILD),yes) @@ -135,6 +142,7 @@ $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-libgomp \ + --enable-default-ssp \ --with-cloog='$(BUILD_TOOLS_PREFIX)' \ --with-gmp='$(BUILD_TOOLS_PREFIX)' \ --with-isl='$(BUILD_TOOLS_PREFIX)' \
--- a/src/build-gettext.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-gettext.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21 -$(PKG)_CHECKSUM := e6c0a0cba5b00a604c9118403a8199c77a538526 +$(PKG)_VERSION := 0.21.1 +$(PKG)_CHECKSUM := 8458f2b0d4a84b27a41cce92cacc09b3e833cedc $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE)
--- a/src/build-libffi.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-libffi.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,8 +4,8 @@ _PKG := libffi PKG := build-$(_PKG) $(PKG)_IGNORE := -$(PKG)_VERSION := 3.4.2 -$(PKG)_CHECKSUM := f5fbf0e8b643c4029a069faca32dd0df2c7dd0a2 +$(PKG)_VERSION := 3.4.3 +$(PKG)_CHECKSUM := 9b0629c8efc70f608afb426c09cafabd2b717f50 $(PKG)_SUBDIR := $(_PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(_PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/$(_PKG)/$(_PKG)/archive/refs/tags/v$($(PKG)_VERSION).tar.gz
--- a/src/build-libtool.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-libtool.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-libtool $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4.6 -$(PKG)_CHECKSUM := 25b6931265230a06f0fc2146df64c04e5ae6ec33 +$(PKG)_VERSION := 2.4.7 +$(PKG)_CHECKSUM := d3f2d5399f4bf5cbd974b812ebaca28d6492ca65 $(PKG)_SUBDIR := libtool-$($(PKG)_VERSION) $(PKG)_FILE := libtool-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/libtool/$($(PKG)_FILE)
--- a/src/build-lzip.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-lzip.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-lzip $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21 -$(PKG)_CHECKSUM := 08bea2f275d639bfe85fe30887d269b96eac34e1 +$(PKG)_VERSION := 1.23 +$(PKG)_CHECKSUM := 9793edc5e4acda46b3ea16a47ea0dca02a6f6e3d $(PKG)_SUBDIR := lzip-$($(PKG)_VERSION) $(PKG)_FILE := lzip-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.savannah.gnu.org/releases/lzip/$($(PKG)_FILE)
--- a/src/build-meson.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-meson.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-meson $(PKG)_IGNORE := -$(PKG)_VERSION := 0.56.2 -$(PKG)_CHECKSUM := 88f30be08c968b0b8b9d2c6d3fe950fecff2658f +$(PKG)_VERSION := 0.62.1 +$(PKG)_CHECKSUM := 4ba6f57629e5f38ea7b82e6edcd2baa2ab9c1edb $(PKG)_SUBDIR := meson-$($(PKG)_VERSION) $(PKG)_FILE := meson-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/mesonbuild/meson/archive/$($(PKG)_VERSION).tar.gz @@ -30,7 +30,7 @@ define $(PKG)_BUILD cd '$(1)' && $(MXE_PYTHON) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)' - + # create file with compilation settings rm -f $(MESON_TOOLCHAIN_FILE) && mkdir -p '$(dir $(MESON_TOOLCHAIN_FILE))' (echo "[binaries]"; \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/build-nasm.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := build-nasm +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.14.02 +$(PKG)_CHECKSUM := 7e9cb20d49ca279c72125b2701b3457c9d1609a5 +$(PKG)_SUBDIR := nasm-$($(PKG)_VERSION) +$(PKG)_FILE := nasm-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := https://www.nasm.us/pub/nasm/releasebuilds/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D' | \ + $(SED) -n 's,.*href="\([0-9\.]*[^a-z]\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(1)/configure' \ + --prefix='$(BUILD_TOOLS_PREFIX)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)' +endef
--- a/src/build-perl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-perl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-perl $(PKG)_IGNORE := -$(PKG)_VERSION := 5.30.2 -$(PKG)_CHECKSUM := e02a31cc8f536b4927d8e018d265cddb790bb4e2 +$(PKG)_VERSION := 5.36.0 +$(PKG)_CHECKSUM := 5fa41c8dffd9700f0c8427de7dd19f06b095fa6d $(PKG)_SUBDIR := perl-$($(PKG)_VERSION) $(PKG)_FILE := perl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cpan.org/src/5.0/$($(PKG)_FILE)
--- a/src/build-pkg-config.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-pkg-config.mk Wed Nov 16 08:27:17 2022 +0100 @@ -24,7 +24,7 @@ define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1)' && autoreconf + cd '$(1)' && autoreconf -fi cd '$(1).build' && '$(1)/configure' \ --with-internal-glib \ $($(PKG)_CONFIG_OPTS) \
--- a/src/build-python.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-python.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.12 -$(PKG)_CHECKSUM := 7643eccc15f5606bd0dc04affc7ea901e417165d +$(PKG)_VERSION := 3.8.13 +$(PKG)_CHECKSUM := fb46587353f092d91caeddb07f82bb66a5115468 $(PKG)_SUBDIR := Python-$($(PKG)_VERSION) $(PKG)_FILE := Python-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://www.python.org/ftp/python/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/build-texinfo.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-texinfo.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7 -$(PKG)_CHECKSUM := 3eb87fe3f4241ba4305255f8a47d867dbc4f96fc +$(PKG)_VERSION := 6.8 +$(PKG)_CHECKSUM := 37f5ff5f748fb11bcbd57b82f3fdb5c365e82d61 $(PKG)_SUBDIR := texinfo-$($(PKG)_VERSION) $(PKG)_FILE := texinfo-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
--- a/src/build-xz.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-xz.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,12 +3,12 @@ PKG := build-xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.5 -$(PKG)_CHECKSUM := 0b9d1e06b59f7fe0796afe1d93851b9306b4a3b6 +$(PKG)_VERSION := 5.2.7 +$(PKG)_CHECKSUM := 9a15569a7a969c03ae621c7ecbb29c187f59355e $(PKG)_SUBDIR := xz-$($(PKG)_VERSION) $(PKG)_FILE := xz-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://tukaani.org/xz/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_DEPS := build-gettext define $(PKG)_UPDATE $(WGET) -q -O- 'http://tukaani.org/xz/' | \ @@ -17,8 +17,9 @@ endef define $(PKG)_BUILD - cd '$(1)' && './configure' \ + cd '$(1)' && autoreconf -fi && './configure' \ --prefix='$(BUILD_TOOLS_PREFIX)' \ + $(ENABLE_SHARED_OR_STATIC) \ --disable-threads \ --disable-nls $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
--- a/src/build-zstd.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/build-zstd.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := build-zstd $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.0 -$(PKG)_CHECKSUM := c53019729e3a595f0104facab6533d78296a2945 +$(PKG)_VERSION := 1.5.2 +$(PKG)_CHECKSUM := c56c8e6d703d14029464b2a1a66164dc5cf80855 $(PKG)_SUBDIR := zstd-$($(PKG)_VERSION) $(PKG)_FILE := zstd-$($(PKG)_VERSION).tar.lz $(PKG)_URL := https://github.com/facebook/zstd/releases/download/v$($(PKG)_VERSION)/zstd-$($(PKG)_VERSION).tar.gz
--- a/src/cfitsio.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/cfitsio.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,10 +3,10 @@ PKG := cfitsio $(PKG)_IGNORE := -$(PKG)_VERSION := 3450 -$(PKG)_CHECKSUM := 85b4adeba79a7691114695e6bafd6d968e68c21f -$(PKG)_SUBDIR := $(PKG) -$(PKG)_FILE := $(PKG)$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION := 4.1.0 +$(PKG)_CHECKSUM := 3c63ceccc4de3495b22d5a92e849d2ce027d07a6 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$($(PKG)_FILE) $(PKG)_DEPS := curl @@ -23,7 +23,7 @@ define $(PKG)_UPDATE $(WGET) -q -O- "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/?C=M;O=D" | \ grep -i '<a href="cfitsio.*tar' | \ - $(SED) -n 's,.*cfitsio\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(SED) -n 's,.*cfitsio-\([0-9\.][^>]*\)\.tar.*,\1,p' | \ head -1 endef
--- a/src/cmake.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/cmake.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.22.1 -$(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb +$(PKG)_VERSION := 3.23.3 +$(PKG)_CHECKSUM := 99a7d4586f1a411cd30dfa57438300390396402c $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/curl-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,25 @@ +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: Tony Theodore <tonyt@logyst.com> +Date: Mon, 31 Oct 2022 18:57:29 +1100 +Subject: [PATCH 1/1] fix shared build with windres + +taken from: +https://github.com/curl/curl/commit/b7260c4fda95196b2fa16f32b5913f25323e5098 + +diff --git a/src/Makefile.in b/src/Makefile.in +index 1111111..2222222 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -2000,7 +2000,7 @@ listhelp: + + # Warning is "normal": libtool: error: ignoring unknown tag RC + @OS_WINDOWS_TRUE@.rc.o: +-@OS_WINDOWS_TRUE@ $(LIBTOOL) --tag=RC --mode=compile $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@ ++@OS_WINDOWS_TRUE@ $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/src/curl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/curl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,12 +3,12 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.80.0 -$(PKG)_CHECKSUM := 5bc5332d0a7f68747d685b3c8681f69447c3498d +$(PKG)_VERSION := 7.86.0 +$(PKG)_CHECKSUM := 289a3aaec47f98a52474cd34243d6b7f51f8e525 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) -$(PKG)_DEPS := gnutls libidn2 libssh2 pthreads +$(PKG)_DEPS := gnutls libgsasl libidn2 libssh2 pthreads $(PKG)_CONFIGURE_OPTS := ifeq ($(MXE_WINDOWS_BUILD),yes) @@ -28,7 +28,6 @@ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ $($(PKG)_CONFIGURE_OPTS) \ - --without-ssl \ --with-gnutls \ --with-libidn2 \ --enable-sspi \
--- a/src/dbus.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/dbus.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.13.20 -$(PKG)_CHECKSUM := 721389d265da7eaa644789efac4bcd848b11e313 +$(PKG)_VERSION := 1.15.2 +$(PKG)_CHECKSUM := 5cb3f74b408f97e91247a8e82366a60028bf2ecb $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) @@ -16,9 +16,8 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \ - $(SED) -n "s,.*<a href='[^']*/tag/?h=dbus-\\([0-9][^']*\\)'.*,\\1,p" | \ - $(SORT) -V | \ + $(WGET) -q -O- https://gitlab.freedesktop.org/dbus/dbus/-/tags | \ + $(SED) -n 's|.*/tags/dbus-\([^"]*\).*|\1|p' | grep -v 'rc' | $(SORT) -V | \ tail -1 endef
--- a/src/default-octave.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/default-octave.mk Wed Nov 16 08:27:17 2022 +0100 @@ -21,7 +21,7 @@ ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig endif -$(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla rapidjson readline sundials-ida suitesparse texinfo zlib +$(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre2 portaudio pstoedit qhull qrupdate qscintilla rapidjson readline sundials-ida suitesparse texinfo zlib ifeq ($(ENABLE_QT5),yes) $(PKG)_DEPS += qt5 @@ -159,10 +159,6 @@ $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no endif -ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - $(PKG)_EXTRA_CONFIGURE_OPTIONS += ac_cv_search_tputs=-ltermcap -endif - # if want binary packages and are cross compiling, then we need cross tools enabled ifeq ($(ENABLE_BINARY_PACKAGES),yes) ifeq ($(MXE_NATIVE_BUILD),no) @@ -201,6 +197,7 @@ --disable-silent-rules \ --enable-install-build-logs \ --enable-relocate-all \ + --enable-std-pmr-polymorphic-allocator \ $($(PKG)_CROSS_CONFIG_OPTIONS) \ $($(PKG)_WITH_BLAS_CONFIGURE_OPTIONS) \ $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
--- a/src/double-conversion.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/double-conversion.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := double-conversion $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.7 -$(PKG)_CHECKSUM := 55732a036a077624b0e6bab48652a1d98d472750 +$(PKG)_VERSION := 3.2.1 +$(PKG)_CHECKSUM := 1739208c8ca88a6073e738a96ebde73ec9bdebe7 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz @@ -13,9 +13,7 @@ $(PKG)_CMAKE_FLAGS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/google/double-conversion/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,google,double-conversion,v) endef define $(PKG)_BUILD
--- a/src/eigen.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/eigen.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,9 +3,9 @@ PKG := eigen $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.7 -$(PKG)_CHECKSUM := f13a31c7ec3b87cf6e58b6fb05aa8b887091b71c -$(PKG)_SUBDIR := $(PKG)-$(PKG)-323c052e1731 +$(PKG)_VERSION := 3.4.0 +$(PKG)_CHECKSUM := e422a63bca97a89d8c1f63d7f47ba96d8dfcdef0 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-3147391d946bb4b6c68edd901f2add6ac1f31f8c $(PKG)_FILE := $($(PKG)_VERSION).tar.gz $(PKG)_URL := https://gitlab.com/libeigen/$(PKG)/-/archive/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/exiv2-issue847.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,268 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -These patches have been taken from: -http://dev.exiv2.org/issues/847 - -From ffb5b66c5b1aeb77c1f95ef69a573030c6370e0c Mon Sep 17 00:00:00 2001 -From: vog <vog@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3> -Date: Fri, 14 Sep 2012 16:06:23 +0000 -Subject: [PATCH 1/4] Issue #847: Add recognition of explicit and implicit - BeginPageSetup - -git-svn-id: svn://dev.exiv2.org/svn/trunk@2869 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3 ---- - src/epsimage.cpp | 28 ++++++++++++++++++++++------ - 1 file changed, 22 insertions(+), 6 deletions(-) - -diff --git a/src/epsimage.cpp b/src/epsimage.cpp -index c937942..51e5bb4 100644 ---- a/src/epsimage.cpp -+++ b/src/epsimage.cpp -@@ -386,6 +386,7 @@ namespace { - size_t posBeginPhotoshop = posEndEps; - size_t posEndPhotoshop = posEndEps; - size_t posPage = posEndEps; -+ size_t posBeginPageSetup = posEndEps; - size_t posEndPageSetup = posEndEps; - size_t posPageTrailer = posEndEps; - size_t posEof = posEndEps; -@@ -397,7 +398,6 @@ namespace { - bool implicitPage = false; - bool implicitPageTrailer = false; - bool inDefaultsPreviewPrologSetup = false; -- bool inPageSetup = false; - bool inRemovableEmbedding = false; - std::string removableEmbeddingEndLine; - unsigned int removableEmbeddingsWithUnmarkedTrailer = 0; -@@ -465,7 +465,7 @@ namespace { - #endif - throw Error(write ? 21 : 14); - } else if (line == "%%BeginPageSetup") { -- inPageSetup = true; -+ posBeginPageSetup = startPos; - } else if (!inRemovableEmbedding && line == "%Exiv2BeginXMP: Before %%EndPageSetup") { - inRemovableEmbedding = true; - removableEmbeddings.push_back(std::make_pair(startPos, startPos)); -@@ -510,18 +510,34 @@ namespace { - if (posPage == posEndEps && posEndComments != posEndEps && !inDefaultsPreviewPrologSetup && !inRemovableEmbedding && !onlyWhitespaces(line)) { - posPage = startPos; - implicitPage = true; -+ posBeginPageSetup = startPos; - posEndPageSetup = startPos; - #ifdef DEBUG -- EXV_DEBUG << "readWriteEpsMetadata: Found implicit Page and EndPageSetup at position: " << startPos << "\n"; -+ EXV_DEBUG << "readWriteEpsMetadata: Found implicit Page, BeginPageSetup and EndPageSetup at position: " << startPos << "\n"; - #endif - } -- if (posEndPageSetup == posEndEps && posPage != posEndEps && !inPageSetup && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%') { -+ if (posBeginPageSetup == posEndEps && posPage != posEndEps && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%') { -+ posBeginPageSetup = startPos; - posEndPageSetup = startPos; - #ifdef DEBUG -- EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n"; -+ EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup and EndPageSetup at position: " << startPos << "\n"; - #endif - } - if (line.size() >= 1 && line[0] != '%') continue; // performance optimization -+ if (line == "%%EOF" || line == "%%Trailer" || line == "%%PageTrailer") { -+ if (posBeginPageSetup == posEndEps) { -+ posBeginPageSetup = startPos; -+ #ifdef DEBUG -+ EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup at position: " << startPos << "\n"; -+ #endif -+ } -+ if (posEndPageSetup == posEndEps) { -+ posEndPageSetup = startPos; -+ #ifdef DEBUG -+ EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n"; -+ #endif -+ } -+ } - if (line == "%%EOF" || line == "%%Trailer") { - if (posPageTrailer == posEndEps) { - posPageTrailer = startPos; -@@ -561,7 +577,6 @@ namespace { - } else if (line == "%%EndSetup") { - inDefaultsPreviewPrologSetup = false; - } else if (posEndPageSetup == posEndEps && line == "%%EndPageSetup") { -- inPageSetup = false; - posEndPageSetup = startPos; - } else if (posPageTrailer == posEndEps && line == "%%PageTrailer") { - posPageTrailer = startPos; -@@ -815,6 +830,7 @@ namespace { - positions.push_back(posExiv2Website); - positions.push_back(posEndComments); - positions.push_back(posPage); -+ positions.push_back(posBeginPageSetup); - positions.push_back(posEndPageSetup); - positions.push_back(posPageTrailer); - positions.push_back(posEof); --- -1.7.10.4 - -From f8c9c6114bf7631bb0dba67582c2666b05b2ff9f Mon Sep 17 00:00:00 2001 -From: vog <vog@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3> -Date: Fri, 14 Sep 2012 16:06:26 +0000 -Subject: [PATCH 2/4] Issue #847: Always insert BeginPageSetup/EndPageSetup - when missing - -git-svn-id: svn://dev.exiv2.org/svn/trunk@2870 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3 ---- - src/epsimage.cpp | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git a/src/epsimage.cpp b/src/epsimage.cpp -index 51e5bb4..9276eb5 100644 ---- a/src/epsimage.cpp -+++ b/src/epsimage.cpp -@@ -935,6 +935,11 @@ namespace { - writeTemp(*tempIo, "%%EndPageComments" + lineEnding); - } - } -+ if (pos == posBeginPageSetup) { -+ if (line != "%%BeginPageSetup") { -+ writeTemp(*tempIo, "%%BeginPageSetup" + lineEnding); -+ } -+ } - if (useFlexibleEmbedding) { - // insert XMP metadata into existing flexible embedding - if (pos == xmpPos) { -@@ -947,7 +952,8 @@ namespace { - EXV_DEBUG << "readWriteEpsMetadata: Skipping to " << skipPos << " at " << __FILE__ << ":" << __LINE__ << "\n"; - #endif - } -- } else { -+ } -+ if (!useFlexibleEmbedding) { - // remove preceding embedding(s) - for (std::vector<std::pair<size_t, size_t> >::const_iterator e = removableEmbeddings.begin(); e != removableEmbeddings.end(); e++) { - if (pos == e->first) { -@@ -960,9 +966,6 @@ namespace { - } - // insert XMP metadata with new flexible embedding, if necessary - if (pos == posEndPageSetup && !deleteXmp) { -- if (line != "%%EndPageSetup") { -- writeTemp(*tempIo, "%%BeginPageSetup" + lineEnding); -- } - writeTemp(*tempIo, "%Exiv2BeginXMP: Before %%EndPageSetup" + lineEnding); - if (corelDraw) { - writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by CorelDRAW." + lineEnding); -@@ -1004,10 +1007,14 @@ namespace { - writeTemp(*tempIo, "@sv" + lineEnding); - } - writeTemp(*tempIo, "%Exiv2EndXMP" + lineEnding); -- if (line != "%%EndPageSetup") { -- writeTemp(*tempIo, "%%EndPageSetup" + lineEnding); -- } - } -+ } -+ if (pos == posEndPageSetup) { -+ if (line != "%%EndPageSetup") { -+ writeTemp(*tempIo, "%%EndPageSetup" + lineEnding); -+ } -+ } -+ if (!useFlexibleEmbedding) { - if (pos == posPageTrailer && !deleteXmp) { - if (!implicitPageTrailer) { - skipPos = posLineEnd; --- -1.7.10.4 - -From b22ff432f0205d77d1b9e0ad2cd314ab6cdf20b0 Mon Sep 17 00:00:00 2001 -From: vog <vog@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3> -Date: Fri, 14 Sep 2012 16:06:29 +0000 -Subject: [PATCH 3/4] Issue #847: Split recognition of implicit Page, - BeginPageSetup and EndPageSetup - -git-svn-id: svn://dev.exiv2.org/svn/trunk@2871 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3 ---- - src/epsimage.cpp | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/epsimage.cpp b/src/epsimage.cpp -index 9276eb5..57051a1 100644 ---- a/src/epsimage.cpp -+++ b/src/epsimage.cpp -@@ -396,6 +396,7 @@ namespace { - bool illustrator8 = false; - bool corelDraw = false; - bool implicitPage = false; -+ bool implicitPageSetup = false; - bool implicitPageTrailer = false; - bool inDefaultsPreviewPrologSetup = false; - bool inRemovableEmbedding = false; -@@ -510,29 +511,35 @@ namespace { - if (posPage == posEndEps && posEndComments != posEndEps && !inDefaultsPreviewPrologSetup && !inRemovableEmbedding && !onlyWhitespaces(line)) { - posPage = startPos; - implicitPage = true; -- posBeginPageSetup = startPos; -- posEndPageSetup = startPos; - #ifdef DEBUG -- EXV_DEBUG << "readWriteEpsMetadata: Found implicit Page, BeginPageSetup and EndPageSetup at position: " << startPos << "\n"; -+ EXV_DEBUG << "readWriteEpsMetadata: Found implicit Page at position: " << startPos << "\n"; - #endif - } -- if (posBeginPageSetup == posEndEps && posPage != posEndEps && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%') { -+ if (posBeginPageSetup == posEndEps && (implicitPage || (posPage != posEndEps && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%'))) { - posBeginPageSetup = startPos; -+ implicitPageSetup = true; -+ #ifdef DEBUG -+ EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup at position: " << startPos << "\n"; -+ #endif -+ } -+ if (posEndPageSetup == posEndEps && implicitPageSetup) { - posEndPageSetup = startPos; - #ifdef DEBUG -- EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup and EndPageSetup at position: " << startPos << "\n"; -+ EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n"; - #endif - } - if (line.size() >= 1 && line[0] != '%') continue; // performance optimization - if (line == "%%EOF" || line == "%%Trailer" || line == "%%PageTrailer") { - if (posBeginPageSetup == posEndEps) { - posBeginPageSetup = startPos; -+ implicitPageSetup = true; - #ifdef DEBUG - EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup at position: " << startPos << "\n"; - #endif - } - if (posEndPageSetup == posEndEps) { - posEndPageSetup = startPos; -+ implicitPageSetup = true; - #ifdef DEBUG - EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n"; - #endif --- -1.7.10.4 - -From 41fb1a2ff54a9377763e4a66544c2234f9b055c8 Mon Sep 17 00:00:00 2001 -From: vog <vog@b7c8b350-86e7-0310-a4b4-de8f6a8f16a3> -Date: Fri, 14 Sep 2012 17:01:36 +0000 -Subject: [PATCH 4/4] Issue #847: Ensure that Photoshop will always recognize - modified Photoshop EPS files - -For a full description of this issue, see: -http://dev.exiv2.org/issues/847 - -git-svn-id: svn://dev.exiv2.org/svn/trunk@2873 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3 ---- - src/epsimage.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/epsimage.cpp b/src/epsimage.cpp -index 57051a1..4a0ca3a 100644 ---- a/src/epsimage.cpp -+++ b/src/epsimage.cpp -@@ -522,7 +522,7 @@ namespace { - EXV_DEBUG << "readWriteEpsMetadata: Found implicit BeginPageSetup at position: " << startPos << "\n"; - #endif - } -- if (posEndPageSetup == posEndEps && implicitPageSetup) { -+ if (posEndPageSetup == posEndEps && implicitPageSetup && !inRemovableEmbedding && line.size() >= 1 && line[0] != '%') { - posEndPageSetup = startPos; - #ifdef DEBUG - EXV_DEBUG << "readWriteEpsMetadata: Found implicit EndPageSetup at position: " << startPos << "\n"; --- -1.7.10.4 -
--- a/src/exiv2-r2796.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -http://dev.exiv2.org/projects/exiv2/repository/revisions/2796 - -Index: trunk/src/basicio.cpp -=================================================================== ---- trunk/src/basicio.cpp (revision 2795) -+++ trunk/src/basicio.cpp (revision 2796) -@@ -61,6 +61,11 @@ - # include <unistd.h> // for getpid, stat - #endif - -+// Platform specific headers for handling extended attributes (xattr) -+#if defined(__APPLE__) -+# include <sys/xattr.h> -+#endif -+ - #if defined WIN32 && !defined __CYGWIN__ - // Windows doesn't provide mode_t, nlink_t - typedef unsigned short mode_t; -@@ -131,6 +136,8 @@ - int switchMode(OpMode opMode); - //! stat wrapper for internal use - int stat(StructStat& buf) const; -+ //! copy extended attributes (xattr) from another file -+ void copyXattrFrom(const FileIo& src); - #if defined WIN32 && !defined __CYGWIN__ - // Windows function to determine the number of hardlinks (on NTFS) - DWORD winNumberOfLinks() const; -@@ -252,6 +259,47 @@ - return ret; - } // FileIo::Impl::stat - -+ void FileIo::Impl::copyXattrFrom(const FileIo& src) -+ { -+#if defined(__APPLE__) -+# if defined(EXV_UNICODE_PATH) -+# error No xattr API for MacOS X with unicode support -+# endif -+ const ssize_t namebufSize = ::listxattr(src.p_->path_.c_str(), 0, 0, 0); -+ if (namebufSize < 0) { -+ throw Error(2, src.p_->path_, strError(), "listxattr"); -+ } -+ if (namebufSize == 0) { -+ // No extended attributes in source file -+ return; -+ } -+ char namebuf[namebufSize]; -+ if (::listxattr(src.p_->path_.c_str(), namebuf, sizeof(namebuf), 0) != namebufSize) { -+ throw Error(2, src.p_->path_, strError(), "listxattr"); -+ } -+ for (ssize_t namebufPos = 0; namebufPos < namebufSize;) { -+ const char *name = namebuf + namebufPos; -+ namebufPos += strlen(name) + 1; -+ const ssize_t valueSize = ::getxattr(src.p_->path_.c_str(), name, 0, 0, 0, 0); -+ if (valueSize < 0) { -+ throw Error(2, src.p_->path_, strError(), "getxattr"); -+ } -+ char value[valueSize]; -+ if (::getxattr(src.p_->path_.c_str(), name, value, sizeof(value), 0, 0) != valueSize) { -+ throw Error(2, src.p_->path_, strError(), "getxattr"); -+ } -+#ifdef DEBUG -+ EXV_DEBUG << "Copying xattr \"" << name << "\" with value size " << valueSize << "\n"; -+#endif -+ if (::setxattr(path_.c_str(), name, value, valueSize, 0, 0) != 0) { -+ throw Error(2, path_, strError(), "setxattr"); -+ } -+ } -+#else -+ // No xattr support for this platform. -+#endif -+ } // FileIo::Impl::copyXattrFrom -+ - #if defined WIN32 && !defined __CYGWIN__ - DWORD FileIo::Impl::winNumberOfLinks() const - { -@@ -521,6 +569,7 @@ - throw Error(10, path(), "w+b", strError()); - } - } -+ fileIo->p_->copyXattrFrom(*this); - basicIo = fileIo; - } - else {
--- a/src/exiv2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/exiv2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,28 +3,29 @@ PKG := exiv2 $(PKG)_IGNORE := -$(PKG)_VERSION := 0.23 -$(PKG)_CHECKSUM := 5f342bf642477526f41add11d6ee7787cdcd639f -$(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION) -$(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.exiv2.org/$($(PKG)_FILE) -$(PKG)_DEPS := libiconv zlib expat +$(PKG)_VERSION := 0.27.5 +$(PKG)_CHECKSUM := 775f9c5ddeb92b682da8b7737f9811009595dc6a +$(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION)-Source +$(PKG)_FILE := exiv2-$($(PKG)_VERSION)-Source.tar.gz +$(PKG)_URL := https://github.com/Exiv2/exiv2/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gettext libiconv zlib expat define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.exiv2.org/archive.html' | \ - grep 'href="/releases/exiv2-' | \ - $(SED) -n 's,.*exiv2-\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- 'https://www.exiv2.org/download.html' | \ + $(SED) -n 's,.*exiv2-\([0-9][^>]*\)-Source\.tar.*,\1,p' | \ head -1 endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - --disable-visibility \ - --disable-nls \ - --with-expat - $(MAKE) -C '$(1)/xmpsdk/src' -j '$(JOBS)' - $(MAKE) -C '$(1)/src' -j '$(JOBS)' install-lib + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_TESTING=no \ + -DEXIV2_BUILD_SAMPLES=OFF \ + $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . + + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install endef
--- a/src/expat.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/expat.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := expat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4.1 -$(PKG)_CHECKSUM := b677b9a1cf3a1424fda183223fae2c58f50151af +$(PKG)_VERSION := 2.5.0 +$(PKG)_CHECKSUM := 36e29d7192ab8c5ce44d09375318a0a81395aab0 $(PKG)_SUBDIR := expat-$($(PKG)_VERSION) $(PKG)_FILE := expat-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/faad2-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -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 */
--- a/src/faad2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/faad2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,25 +3,26 @@ PKG := faad2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.8 -$(PKG)_CHECKSUM := 0d49c516d4a83c39053a9bd214fddba72cbc34ad +$(PKG)_VERSION := 2.10.1 +$(PKG)_CHECKSUM := 47b9d0ad96e1b402d7ee9d72346b9670b2a81085 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/faac/$(PKG)-src/$(PKG)-2.8.0/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/knik0/$(PKG)/archive/refs/tags/$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/' | \ - $(SED) -n 's,.*title=\"faad2-\([0-9\.]*\)\.tar\.gz\".*,\1,p' | $(SORT) -V | \ + $(WGET) -q -O- 'https://github.com/knik0/faad2/tags' | \ + $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SED) 's|_|.|g' | $(SORT) -V | \ tail -1 endef define $(PKG)_BUILD + cd '$(1)' && '$(1)/bootstrap' cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) - $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined' - $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined' + $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined' DESTDIR='$(3)' + $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined' $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) DESTDIR='$(3)' endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ffmpeg-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,45 @@ +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: Tony Theodore <tonyt@logyst.com> +Date: Sun, 25 Apr 2021 19:23:19 +1000 +Subject: [PATCH 1/2] fix windres whitespace handling + + +diff --git a/ffbuild/common.mak b/ffbuild/common.mak +index 1111111..2222222 100644 +--- a/ffbuild/common.mak ++++ b/ffbuild/common.mak +@@ -82,7 +82,7 @@ COMPILE_NVCC = $(call COMPILE,NVCC) + -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) + + %.o: %.rc +- $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $< ++ $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES)" $(addprefix --preprocessor-arg ,-E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)) -o $@ $< + + %.i: %.c + $(CC) $(CCFLAGS) $(CC_E) $< + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 4 Apr 2022 00:33:50 +0200 +Subject: [PATCH 2/2] avoid warning: cast from pointer to integer of different + size [-Wpointer-to-int-cast] + +when checking opus + +diff --git a/configure b/configure +index 1111111..2222222 100755 +--- a/configure ++++ b/configure +@@ -1336,7 +1336,7 @@ check_func_headers(){ + done + echo "#include <stdint.h>" + for func in $funcs; do +- echo "long check_$func(void) { return (long) $func; }" ++ echo "intptr_t check_$func(void) { return (intptr_t) $func; }" + done + echo "int main(void) { int ret = 0;" + # LTO could optimize out the test functions without this
--- a/src/ffmpeg.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/ffmpeg.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 4.2.3 -$(PKG)_CHECKSUM := 7be5114d169e5a1ba73ad1e844e7fb4d0fb93cc6 +$(PKG)_VERSION := 4.2.8 +$(PKG)_CHECKSUM := 9ce0fd730c0c05ae636033828303e2b2eca99171 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) @@ -16,10 +16,16 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \ $(SED) -n 's,.*ffmpeg-\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(GREP) "^4.2" | \ head -1 endef +ifeq ($(TARGET),i686-w64-mingw32) + $(PKG)_CONFIG_OPTS += --disable-optimizations +endif + ifeq ($(MXE_NATIVE_BUILD),no) + define $(PKG)_BUILD '$(SED)' -i "s^[-]lvpx^`'$(MXE_PKG_CONFIG)' --libs-only-l vpx`^g;" $(1)/configure cd '$(1)' && ./configure \ @@ -48,8 +54,9 @@ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ --enable-libx264 \ - --enable-libvpx - $(MAKE) -C '$(1)' -j '$(JOBS)' + --enable-libvpx \ + $($(PKG)_CONFIG_OPTS) + $(MAKE) -C '$(1)' -j '$(JOBS)' V=1 $(MAKE) -C '$(1)' -j 1 install endef else
--- a/src/flac-1-ucrt.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -Don't force MSVCRT version on mingw. - -diff -aur a/configure.ac b/configure.ac ---- a/configure.ac 2019-08-04 10:26:40.680643000 +0200 -+++ b/configure.ac 2021-11-17 18:56:11.962266940 +0100 -@@ -208,7 +208,6 @@ - os_is_windows=no - case "$host" in - *mingw*) -- CPPFLAGS="-D__MSVCRT_VERSION__=0x0601 $CPPFLAGS" - os_is_windows=yes - ;; - esac
--- a/src/flac.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/flac.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,13 +3,13 @@ PKG := flac $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.3 -$(PKG)_CHECKSUM := 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe +$(PKG)_VERSION := 1.4.2 +$(PKG)_CHECKSUM := 4297c4f7c8665705f46886403755061dd0a30289 $(PKG)_SUBDIR := flac-$($(PKG)_VERSION) $(PKG)_FILE := flac-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://downloads.xiph.org/releases/flac/$($(PKG)_FILE) -$(PKG)_DEPS := libiconv ogg +$(PKG)_DEPS := build-nasm libiconv ogg define $(PKG)_UPDATE $(WGET) -q -O- 'http://downloads.xiph.org/releases/flac/' | \ @@ -31,4 +31,8 @@ --disable-oggtest $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) VERBOSE=1 $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' + + if [ "x$(ENABLE_DEP_DOCS)" == "xno" ]; then \ + rm -rf $(3)/$(HOST_PREFIX)/share/doc/flac; \ + fi endef
--- a/src/fontconfig.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/fontconfig.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,18 +3,18 @@ PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_VERSION := 2.13.1 -$(PKG)_CHECKSUM := 75612356ef4f801735b49baf987f8942b4a7a5e1 +$(PKG)_VERSION := 2.14.1 +$(PKG)_CHECKSUM := 1e0c542d35783f25ed3f4d3eb843fd81cb01a81d $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) -$(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) +$(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := https://fontconfig.org/release/$($(PKG)_FILE) $(PKG)_DEPS := freetype expat gettext libiconv ifeq ($(MXE_WINDOWS_BUILD),no) $(PKG)_DEPS += util-linux endif define $(PKG)_UPDATE - $(WGET) -q -O- 'http://fontconfig.org/release/' | \ + $(WGET) -q -O- 'https://fontconfig.org/release/' | \ $(SED) -n 's,.*fontconfig-\([0-9][^>]*\)\.tar.*,\1,p' | \ tail -1 endef
--- a/src/freeglut-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 24 Oct 2011 09:40:10 +0200 -Subject: [PATCH] add pkg-config support - -based on -http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html - -proposed to upstream -https://sourceforge.net/tracker/?func=detail&aid=3511842&group_id=1032&atid=101032 ---- - Makefile.am | 3 +++ - configure.ac | 1 + - glut.pc.in | 12 ++++++++++++ - 3 files changed, 16 insertions(+), 0 deletions(-) - create mode 100644 glut.pc.in - -diff --git a/Makefile.am b/Makefile.am -index 39c5628..b504bc6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -68,3 +68,6 @@ dist-hook: - - libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = glut.pc -diff --git a/configure.ac b/configure.ac -index 15dc997..2f25bcb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,5 +119,6 @@ AC_CONFIG_FILES([ - progs/demos/spaceball/Makefile - progs/demos/subwin/Makefile - src/Makefile -+ glut.pc - ]) - AC_OUTPUT -diff --git a/glut.pc.in b/glut.pc.in -new file mode 100644 -index 0000000..ea57c4a ---- /dev/null -+++ b/glut.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@/@PACKAGE@ -+ -+Name: glut -+Description: A freely licensed alternative to the GLUT library -+Version: @VERSION@ -+Libs: -L${libdir} -lglut -+Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows -+Cflags: -DFREEGLUT_STATIC -I${includedir} -+ --- -1.7.8 -
--- a/src/freeglut.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/freeglut.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,33 +3,35 @@ PKG := freeglut $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.0 -$(PKG)_CHECKSUM := 4debbe559c6c9841ce1abaddc9d461d17c6083b1 +$(PKG)_VERSION := 3.4.0 +$(PKG)_CHECKSUM := 169b069a6c3e7a3ce960887ab3e4a8ee73443bbd $(PKG)_SUBDIR := freeglut-$(word 1,$(subst -, ,$($(PKG)_VERSION))) $(PKG)_FILE := freeglut-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_DEPS := mesa +ifeq ($(USE_SYSTEM_X11_LIBS),no) + $(PKG)_DEPS += xi +endif + +$(PKG)_CMAKE_FLAGS := define $(PKG)_UPDATE - $(WGET) -q -O- 'http://sourceforge.net/projects/freeglut/files/freeglut/' | \ - $(SED) -n 's,.*freeglut-\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- 'https://github.com/FreeGLUTProject/freeglut/tags' | \ + $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \ head -1 endef define $(PKG)_BUILD - cd '$(1)' && ./autogen.sh - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - --enable-replace-glut \ - --disable-debug \ - --without-progs \ - --without-x - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= EXPORT_FLAGS='-DFREEGLUT_STATIC' + mkdir '$(1)/build' + cd '$(1)/build' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DFREEGLUT_REPLACE_GLUT=ON \ + -DFREEGLUT_BUILD_DEMOS=OFF \ + $(if $(filter $(BUILD_STATIC),no),-DFREEGLUT_BUILD_STATIC_LIBS=OFF) \ + $(1) - '$(MXE_CC)' \ - -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_BINDIR)/test-freeglut.exe' \ - `'$(MXE_PKG_CONFIG)' glut --cflags --libs` + cmake --build '$(1)/build' + DESTDIR='$(3)' cmake --install '$(1)/build' endef
--- a/src/freetds.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/freetds.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.6 -$(PKG)_CHECKSUM := 607006f673573bc26b59e2a63492ffe630023655 +$(PKG)_VERSION := 1.3.14 +$(PKG)_CHECKSUM := f73a0d4aebaa540edbcb71a4190fb01e1cdace8d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
--- a/src/freetype.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/freetype.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11.1 -$(PKG)_CHECKSUM := 86bdc98b37efe447cf53420bf2c18402ff905112 +$(PKG)_VERSION := 2.12.1 +$(PKG)_CHECKSUM := 5133eed28a7624ffabbf6d00aa3f68b841d62d80 $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/fribidi.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/fribidi.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := fribidi $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.11 -$(PKG)_CHECKSUM := 326d3f89431b9553f1942ca6814433e4b34611a3 +$(PKG)_VERSION := 1.0.12 +$(PKG)_CHECKSUM := c042d9a6e42d9871ea485bb734df049cc57a7185 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://github.com/fribidi/fribidi/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/gcc-isl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gcc-isl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,11 +3,11 @@ PKG := gcc-isl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.22.1 -$(PKG)_CHECKSUM := ce66c4415906bf2c16a8f09f31383f4fe0991531 -$(PKG)_SUBDIR := isl-isl-$($(PKG)_VERSION)-788faca +$(PKG)_VERSION := 0.24 +$(PKG)_CHECKSUM := b0c46cc1c4fb1658def8d3c4c702a01049ea795e +$(PKG)_SUBDIR := isl-$($(PKG)_VERSION) $(PKG)_FILE := isl-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://repo.or.cz/isl.git/snapshot/$($(PKG)_FILE) +$(PKG)_URL := https://libisl.sourceforge.io/$($(PKG)_FILE) $(PKG)_DEPS := build-libtool gcc-gmp define $(PKG)_UPDATE @@ -16,12 +16,11 @@ endef define $(PKG)_BUILD - cd '$(1)' && ./autogen.sh - mkdir '$(1).build' - cd '$(1).build' && '$(1)/configure' \ + cd '$(1)' && mkdir '$(1)/.build' + cd '$(1)/.build' && '$(1)/configure' \ --prefix='$(BUILD_TOOLS_PREFIX)' \ --disable-shared \ --with-gmp-prefix='$(BUILD_TOOLS_PREFIX)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' - $(MAKE) -C '$(1).build' -j 1 install + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' + $(MAKE) -C '$(1)/.build' -j 1 install endef
--- a/src/gcc-mpc.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gcc-mpc.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := gcc-mpc $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.0 -$(PKG)_CHECKSUM := b019d9e1d27ec5fb99497159d43a3164995de2d0 +$(PKG)_VERSION := 1.2.1 +$(PKG)_CHECKSUM := 2a4919abf445c6eda4e120cd669b8733ce337227 $(PKG)_SUBDIR := mpc-$($(PKG)_VERSION) $(PKG)_FILE := mpc-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://ftp.gnu.org/gnu/mpc/$($(PKG)_FILE)
--- a/src/gdal-1-gcc11.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ ---- ./ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp.orig 2020-01-28 11:13:43.000000000 +0100 -+++ ./ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-08-09 21:20:52.610437353 +0200 -@@ -36,6 +36,7 @@ - #include <cassert> - #include <cstring> - #include <iostream> -+#include <limits> - #include <memory> - #include <string> -
--- a/src/gdal.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gdal.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,30 +3,26 @@ PKG := gdal $(PKG)_IGNORE : -$(PKG)_VERSION := 3.0.4 -$(PKG)_CHECKSUM := 5362ecafb9d06fa9d86beb1ab07b974256b13542 +$(PKG)_VERSION := 3.5.3 +$(PKG)_CHECKSUM := 8ff34bb19570237a73a1de8d1a919f043243a521 $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_URL_2 := ftp://ftp.remotesensing.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := zlib libpng tiff libgeotiff libiconv jpeg jasper giflib expat sqlite curl geos postgresql gta proj pcre qhull +$(PKG)_URL := https://github.com/OSGeo/gdal/archive/refs/tags/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := zlib libpng tiff libgeotiff libiconv jpeg jasper giflib expat sqlite curl postgresql gta proj pcre qhull define $(PKG)_UPDATE - $(WGET) -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \ - $(SED) -n 's,.*gdal-\([0-9][^>]*\)\.tar.*,\1,p' | \ - head -1 + $(WGET) -q -O- 'https://github.com/OSGeo/gdal/tags' | \ + $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(GREP) -v "RC" | $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(1)' && ./autogen.sh && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - --with-bsb \ - --with-grib \ - --with-ogr \ - --with-vfk \ + --with-cpp14 \ --with-pam \ --with-libz='$(HOST_PREFIX)' \ --with-png='$(HOST_PREFIX)' \ @@ -38,12 +34,11 @@ --with-expat='$(HOST_PREFIX)' \ --with-sqlite3='$(HOST_PREFIX)' \ --with-curl='$(HOST_BINDIR)/curl-config' \ - --with-geos='$(HOST_BINDIR)/geos-config' \ - --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config' \ + --without-geos \ + --with-pg \ --with-gta='$(HOST_PREFIX)' \ - --with-xml2='$(HOST_BINDIR)/xml2-config' \ + --with-xml2 \ --without-odbc \ - --without-static-proj4 \ --without-xerces \ --without-grass \ --without-libgrass \ @@ -65,13 +60,9 @@ --without-mysql \ --without-ingres \ --without-dods-root \ - --without-dwgdirect \ --without-idb \ - --without-sde \ --without-epsilon \ --without-perl \ - --without-php \ - --without-ruby \ --without-python \ LIBS="-ljpeg `'$(MXE_PKG_CONFIG)' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' lib-target @@ -82,6 +73,7 @@ $(MAKE) -C '$(1)/alg' -j 1 install $(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST= + $(MAKE) -C '$(1)/generated_headers' -j 1 install $(MAKE) -C '$(1)' -j 1 gdal.pc $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' $(INSTALL) '$(1)/gdal.pc' '$(HOST_LIBDIR)/pkgconfig/'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gdb-1-readline-8.2.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,31 @@ +commit 1add37b567a7dee39d99f37b37802034c3fce9c4 +Author: Andreas Schwab <schwab@linux-m68k.org> +Date: Sun Mar 20 14:01:54 2022 +0100 + + Add support for readline 8.2 + + In readline 8.2 the type of rl_completer_word_break_characters changed to + include const. + +diff --git a/gdb/completer.c b/gdb/completer.c +index d3900ae2014..a51c16ac7f8 100644 +--- a/gdb/completer.c ++++ b/gdb/completer.c +@@ -36,7 +36,7 @@ + calling a hook instead so we eliminate the CLI dependency. */ + #include "gdbcmd.h" + +-/* Needed for rl_completer_word_break_characters() and for ++/* Needed for rl_completer_word_break_characters and for + rl_filename_completion_function. */ + #include "readline/readline.h" + +@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () + rl_basic_quote_characters = NULL; + } + +- return rl_completer_word_break_characters; ++ return (char *) rl_completer_word_break_characters; + } + + char *
--- a/src/gdb.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gdb.mk Wed Nov 16 08:27:17 2022 +0100 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gdb -$(PKG)_VERSION := 11.1 -$(PKG)_CHECKSUM := 6cb3361c7f2b22d6d2c25ab4992264aa41bc2471 +$(PKG)_VERSION := 12.1 +$(PKG)_CHECKSUM := 2edabd9f5766b84889b07b366b4438e93e994005 $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gdcm-4-iconv.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,64 @@ +diff -ur gdcm-3.0.17.orig/Utilities/gdcmext/mec_mr3_io.c gdcm-3.0.17/Utilities/gdcmext/mec_mr3_io.c +--- gdcm-3.0.17.orig/Utilities/gdcmext/mec_mr3_io.c 2022-09-05 10:44:18.058943134 -0400 ++++ gdcm-3.0.17/Utilities/gdcmext/mec_mr3_io.c 2022-09-05 11:28:44.339613356 -0400 +@@ -23,7 +23,7 @@ + #include <stdlib.h> + #include <string.h> + +-#ifndef _MSC_VER ++#if !defined(_MSC_VER) && !defined(__MINGW32__) + #include <iconv.h> + #endif + #if defined(_MSC_VER) && (_MSC_VER < 1900) +@@ -54,7 +54,7 @@ + + struct app { + struct stream *in; +-#ifndef _MSC_VER ++#if !defined(_MSC_VER) && !defined(__MINGW32__) + iconv_t conv; + #endif + void *shift_jis_buffer; +@@ -62,7 +62,7 @@ + + static struct app *create_app(struct app *self, struct stream *in) { + self->in = in; +-#ifndef _MSC_VER ++#if !defined(_MSC_VER) && !defined(__MINGW32__) + self->conv = iconv_open("utf-8", "shift-jis"); + assert(self->conv != (iconv_t)-1); + #endif +@@ -132,7 +132,7 @@ + } + + static void *aligned_alloc_impl(size_t alignment, size_t size) { +-#ifdef _MSC_VER ++#if defined(_MSC_VER) || defined(__MINGW32__) + return _aligned_malloc(size, alignment); + #else + return aligned_alloc(alignment, size); +@@ -352,7 +352,7 @@ + const size_t guesstimate = len < 128 ? 128 : len * 2; + self->shift_jis_buffer = realloc(self->shift_jis_buffer, guesstimate); + char *dest_str = self->shift_jis_buffer; +-#ifndef _MSC_VER ++#if !defined(_MSC_VER) && !defined(__MINGW32__) + char *in_str = str; + char *out_str = dest_str; + size_t inbytes = len; +@@ -831,12 +831,12 @@ + good = good && read_group(self, group, nitems, &info, &data); + } + // release memory: +-#ifdef _MSC_VER ++#if defined(_MSC_VER) || defined(__MINGW32__) + _aligned_free(data.buffer); + #else + free(data.buffer); + #endif +-#ifndef _MSC_VER ++#if !defined(_MSC_VER) && !defined(__MINGW32__) + iconv_close(self->conv); + #endif + free(self->shift_jis_buffer); +Only in gdcm-3.0.17.orig/Utilities/gdcmext: .mec_mr3_io.c.swp
--- a/src/gdcm.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gdcm.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,19 +3,12 @@ PKG := gdcm $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.10 -$(PKG)_CHECKSUM := dd3543fde27351744cd31b2a80b6800d7810047d +$(PKG)_VERSION := 3.0.19 +$(PKG)_CHECKSUM := af9dba375f3265f46b35aab9bffa1759709f539d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG) 3.x/GDCM $($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := expat zlib - -$(PKG)_CMAKE_OPTS := -ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles" - endif -endif +$(PKG)_DEPS := expat zlib build-ninja define $(PKG)_UPDATE $(WGET) -q -O- 'http://sourceforge.net/projects/gdcm/files/gdcm 3.x/' | \ @@ -48,7 +41,7 @@ define $(PKG)_BUILD mkdir '$(1)/../.build' cd '$(1)/../.build' && cmake \ - $($(PKG)_CMAKE_OPTS) \ + -GNinja \ $(CMAKE_CCACHE_FLAGS) \ $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ @@ -58,8 +51,8 @@ -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=FALSE \ ../$($(PKG)_SUBDIR) - make -C $(1)/../.build -j $(JOBS) - make -C $(1)/../.build -j 1 install DESTDIR=$(3) + cmake --build $(1)/../.build -j $(JOBS) + DESTDIR=$(3) cmake --install $(1)/../.build endef endif
--- a/src/geos.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/geos.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := geos $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.1 -$(PKG)_CHECKSUM := 076fda159b29c2c3a04c1674f5cb458dae51eb32 +$(PKG)_VERSION := 3.11.0 +$(PKG)_CHECKSUM := 314c46fa8b311c54274dfcb6879fa04712204bbf $(PKG)_SUBDIR := geos-$($(PKG)_VERSION) $(PKG)_FILE := geos-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.osgeo.org/geos/$($(PKG)_FILE)
--- a/src/gettext.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gettext.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21 -$(PKG)_CHECKSUM := e6c0a0cba5b00a604c9118403a8199c77a538526 +$(PKG)_VERSION := 0.21.1 +$(PKG)_CHECKSUM := 8458f2b0d4a84b27a41cce92cacc09b3e833cedc $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) @@ -19,6 +19,9 @@ endef define $(PKG)_BUILD + # while we are patching stuff, we may need to run reconf + cd '$(1)' && aclocal && libtoolize --automake --copy --force + cd '$(1)' && WANT_AUTOMAKE=latest ./autogen.sh --skip-gnulib cd '$(1)/gettext-runtime' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \
--- a/src/gl2ps-2-docpath.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gl2ps-2-docpath.patch Wed Nov 16 08:27:17 2022 +0100 @@ -6,7 +6,7 @@ endif() -if(WIN32) -+if(WIN32 AND NOT DEFINED ENV{MSYSTEM}) ++if(WIN32 AND NOT DEFINED ENV{MSYSTEM} AND NOT CMAKE_CROSSCOMPILING) set(GL2PS_DOC .) else() set(GL2PS_DOC share/doc/gl2ps)
--- a/src/gl2ps.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gl2ps.mk Wed Nov 16 08:27:17 2022 +0100 @@ -9,7 +9,7 @@ $(PKG)_URL := http://geuz.org/$(PKG)/src/$($(PKG)_FILE) $(PKG)_DEPS := libpng zlib ifeq ($(USE_SYSTEM_OPENGL),no) - $(PKG)_DEPS += mesa glu + $(PKG)_DEPS += mesa glu freeglut endif ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -73,12 +73,6 @@ $(INSTALL) -m644 '$(1)/gl2ps.h' '$(3)$(HOST_INCDIR)'; \ else \ $(MAKE) -C '$(1)' -j 1 VERBOSE=1 DESTDIR='$(3)' install; \ - if [ $(MXE_SYSTEM) = mingw ]; then \ - echo "Install dll"; \ - $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \ - $(INSTALL) '$(3)$(HOST_LIBDIR)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \ - rm -f '$(3)$(HOST_LIBDIR)/libgl2ps.dll'; \ - fi; \ fi endef else
--- a/src/glu.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/glu.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := glu $(PKG)_IGNORE := -$(PKG)_VERSION := 9.0.1 -$(PKG)_CHECKSUM := b6ffef562ba55d3f80146d4238589cb9b1de66f5 +$(PKG)_VERSION := 9.0.2 +$(PKG)_CHECKSUM := d56833045bf49218fbaf6047371c14ff852cecfe $(PKG)_SUBDIR := glu-$($(PKG)_VERSION) $(PKG)_FILE := glu-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/glu/$($(PKG)_FILE)
--- a/src/gnuplot-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gnuplot-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -230,3 +230,35 @@ CAIRO_OBJS := gp_cairo.$(O) gp_cairo_helpers.$(O) TERMFLAGS += $(PANGOCAIRO_CFLAGS) endif +diff -ur gnuplot-5.2.8.orig/src/wxterminal/wxt_gui.cpp gnuplot-5.2.8/src/wxterminal/wxt_gui.cpp +--- gnuplot-5.2.8.orig/src/wxterminal/wxt_gui.cpp 2022-07-07 14:55:37.393547149 -0400 ++++ gnuplot-5.2.8/src/wxterminal/wxt_gui.cpp 2022-07-07 15:00:56.929423748 -0400 +@@ -632,9 +632,9 @@ + + RECT rect; + rect.left = rect.top = 0; +- unsigned dpi = GetDPI(); +- rect.right = MulDiv(panel->plot.device_xmax, dpi, 10); +- rect.bottom = MulDiv(panel->plot.device_ymax, dpi, 10); ++ wxSize dpi = GetDPI(); ++ rect.right = MulDiv(panel->plot.device_xmax, dpi.GetWidth(), 10); ++ rect.bottom = MulDiv(panel->plot.device_ymax, dpi.GetHeight(), 10); + HDC hmf = CreateEnhMetaFileW(NULL, fullpathFilename.wc_str(), &rect, NULL); + // The win32_printing surface makes an effort to use the GDI API wherever possible, + // which should reduce the file size in many cases. +@@ -700,12 +700,12 @@ + panel->plot.cr = cairo_create(surface); + // scale the plot according to the ratio of printer and screen dpi + wxSize ppi = wxdc->GetPPI(); +- unsigned dpi = 96; ++ wxSize dpi(96,96); + #ifdef _WIN32 + dpi = GetDPI(); + #endif +- double scaleX = ppi.GetWidth() / (double) dpi; +- double scaleY = ppi.GetHeight() / (double) dpi; ++ double scaleX = ppi.GetWidth() / (double) dpi.GetWidth(); ++ double scaleY = ppi.GetHeight() / (double) dpi.GetHeight(); + cairo_surface_set_fallback_resolution(surface, ppi.GetWidth(), ppi.GetHeight()); + cairo_scale(panel->plot.cr, + scaleX / panel->plot.oversampling_scale,
--- a/src/gnutls.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gnutls.mk Wed Nov 16 08:27:17 2022 +0100 @@ -29,7 +29,10 @@ define $(PKG)_BUILD mkdir '$(1)/.build' - cd '$(1)' && autoreconf -fi + # If an autoconf script calls GTK_DOC_CHECK, newer versions of autoreconf + # try to call `gtkdocize --copy`, which would require an extra dependency + # on `gtk-doc`, even if documentation is disabled at configure time. + cd '$(1)' && GTKDOCIZE=echo autoreconf -fi cd '$(1)/.build' && ../configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
--- a/src/graphicsmagick.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/graphicsmagick.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := graphicsmagick $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.37 -$(PKG)_CHECKSUM := 94e0103f7d2286d1ba46c633d68ab0e1bfa2b2d3 +$(PKG)_VERSION := 1.3.38 +$(PKG)_CHECKSUM := 9494a31b057a79db27cc909f9ba332cf7aa578f5 $(PKG)_SUBDIR := GraphicsMagick-$($(PKG)_VERSION) $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/gta.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gta.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,27 +3,28 @@ PKG := gta $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.8 -$(PKG)_CHECKSUM := 795832a042be4102321d862246cc4afdb929dc57 -$(PKG)_SUBDIR := libgta-$($(PKG)_VERSION) -$(PKG)_FILE := libgta-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://download.savannah.gnu.org/releases/gta/$($(PKG)_FILE) +$(PKG)_VERSION := 1.2.1 +$(PKG)_CHECKSUM := efaf3e315c6df53ece1ae1dbb23d19f703c6b62e +$(PKG)_SUBDIR := gta-mirror-libgta-$($(PKG)_VERSION)/libgta +$(PKG)_FILE := libgta-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/marlam/gta-mirror/archive/libgta-$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := zlib bzip2 xz define $(PKG)_UPDATE - $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gta.git;a=tags' | \ - grep '<a class="list subject"' | \ - $(SED) -n 's,.*<a[^>]*>libgta-\([0-9.]*\)<.*,\1,p' | \ - head -1 + $(WGET) -q -O- 'https://github.com/marlam/gta-mirror/tags' | \ + $(SED) -n 's|.*releases/tag/libgta-\([^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --disable-reference \ - --prefix='$(HOST_PREFIX)' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_DOCS) DESTDIR='$(3)' + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DGTA_BUILD_DOCUMENTATION=OFF \ + $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . + + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install endef
--- a/src/gtk3.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/gtk3.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,12 +11,15 @@ $(PKG)_DEPS := gettext libpng jpeg tiff jasper glib atk pango cairo gdk-pixbuf define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/GNOME/gtk/tags' | \ - $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \ - grep -v '^3\.9' | \ - grep '^3\.' | \ - $(SORT) -Vr | \ - head -1 + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) + # last version of gtk3 no longer appears on tag list + #$(WGET) -q -O- 'https://github.com/GNOME/gtk/tags' | \ + #$(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \ + #grep -v '^3\.9' | \ + #grep '^3\.' | \ + #$(SORT) -Vr | \ + #head -1 endef define $(PKG)_BUILD
--- a/src/icu4c.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/icu4c.mk Wed Nov 16 08:27:17 2022 +0100 @@ -1,7 +1,7 @@ PKG := icu4c $(PKG)_IGNORE := -$(PKG)_VERSION := 70.1 -$(PKG)_CHECKSUM := f7c1363edee6be7de8b624ffbb801892b3417d4e +$(PKG)_VERSION := 72.1 +$(PKG)_CHECKSUM := a97546f0119c37a3526143bc29fb573a4417ff84 $(PKG)_SUBDIR := icu $(PKG)_FILE := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz $(PKG)_URL := https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$($(PKG)_VERSION))/$($(PKG)_FILE)
--- a/src/isl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/isl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,29 +3,31 @@ PKG := isl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.22.1 -$(PKG)_CHECKSUM := ce66c4415906bf2c16a8f09f31383f4fe0991531 -$(PKG)_SUBDIR := isl-$(PKG)-$($(PKG)_VERSION)-788faca +$(PKG)_VERSION := 0.24 +$(PKG)_CHECKSUM := b0c46cc1c4fb1658def8d3c4c702a01049ea795e +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://repo.or.cz/isl.git/snapshot/$($(PKG)_FILE) +$(PKG)_URL := https://libisl.sourceforge.io/$($(PKG)_FILE) +$(PKG)_URL_2 := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE) $(PKG)_DEPS := build-gcc gmp $(PKG)_EXTRA_MAKE_FLAGS := LDFLAGS='-no-undefined' # stick to tested versions from gcc define $(PKG)_UPDATE - $(WGET) -q -O- 'https://repo.or.cz/isl.git/refs' | \ - $(SED) -n 's,.*>tags/isl-\([0-9][^<]*\).*,\1,p' | \ + $(WGET) -q -O- 'https://gcc.gnu.org/pub/gcc/infrastructure/' | \ + $(SED) -n 's,.*isl-\([0-9][^>]*\)\.tar.*,\1,p' | \ $(SORT) -V | tail -1 endef define $(PKG)_BUILD - cd '$(1)' && ./autogen.sh && ./configure \ + cd '$(1)' && mkdir '$(1)/.build' + cd '$(1)/.build' && '$(1)/configure' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-gmp-prefix='$(HOST_PREFIX)' - $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_EXTRA_MAKE_FLAGS) - $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_EXTRA_MAKE_FLAGS) install + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' $($(PKG)_EXTRA_MAKE_FLAGS) + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' $($(PKG)_EXTRA_MAKE_FLAGS) install endef
--- a/src/jpeg.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/jpeg.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := jpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 9d -$(PKG)_CHECKSUM := 0bf0fbc3f6f1b5f7d5ad4734eae8cbb148517d6f +$(PKG)_VERSION := 9e +$(PKG)_CHECKSUM := ed959b5f3551bc965fe6d0aff6ca48a26f8ce346 $(PKG)_SUBDIR := jpeg-$($(PKG)_VERSION) $(PKG)_FILE := jpegsrc.v$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.ijg.org/files/$($(PKG)_FILE)
--- a/src/json-c-1-patch-missingfile.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains a fix for issue 35 on json-c (https://github.com/json-c/json-c/issues/35) - ---- a/Makefile.am 2012-07-17 22:52:19.000000000 +0200 -+++ b/Makefile.am 2012-07-17 22:54:09.000000000 +0200 -@@ -17,6 +17,7 @@ - json_config.h \ - json_inttypes.h \ - json_object.h \ -+ json_object_iterator.h \ - json_object_private.h \ - json_tokener.h \ - json_util.h \
--- a/src/json-c-2-patch-remove-rpl.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -see http://lists.fedoraproject.org/pipermail/mingw/2009-May/001567.html - ---- a/configure.in 2012-07-12 01:57:09.000000000 +0200 -+++ b/configure.in 2012-07-12 01:59:06.000000000 +0200 -@@ -25,8 +25,6 @@ - # Checks for library functions. - AC_FUNC_VPRINTF - AC_FUNC_MEMCMP --AC_FUNC_MALLOC --AC_FUNC_REALLOC - AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp) - - AM_PROG_LIBTOOL
--- a/src/json-c.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/json-c.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,17 +3,19 @@ PKG := json-c $(PKG)_IGNORE := -$(PKG)_VERSION := 0.10 -$(PKG)_CHECKSUM := f90f643c8455da21d57b3e8866868a944a93c596 +$(PKG)_VERSION := 0.13.1 +$(PKG)_CHECKSUM := a339bae346e58d1737a7909794f432b097dd31cf $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/downloads/$(PKG)/$(PKG)/$($(PKG)_FILE) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-nodoc.tar.gz +$(PKG)_URL := https://$(PKG)_releases.s3.amazonaws.com/releases/$($(PKG)_FILE) $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/json-c/json-c/downloads' | \ - $(SED) -n 's,.*href="/downloads/json-c/json-c/json-c-\([0-9.]*\).tar.gz.*,\1,p' | \ - head -1 + $(WGET) -q -O- 'https://json-c_releases.s3.amazonaws.com' | \ + $(SED) -r 's,<Key>,\n<Key>,g' | \ + $(SED) -n 's,.*releases/json-c-\([0-9.]*\).tar.gz.*,\1,p' | \ + $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD @@ -23,10 +25,5 @@ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) CFLAGS=-Wno-error - $(MAKE) -C '$(1)' -j '$(JOBS)' install - - '$(MXE_CC)' \ - -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_BINDIR)/test-json-c.exe' \ - `'$(MXE_PKG_CONFIG)' json --cflags --libs` + $(MAKE) -C '$(1)' -j '$(JOBS)' install DEST='$(3)' endef
--- a/src/lapack.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/lapack.mk Wed Nov 16 08:27:17 2022 +0100 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := lapack -$(PKG)_VERSION := 3.10.0 -$(PKG)_CHECKSUM := 4a9384523bf236c83568884e8c62d9517e41ac42 +$(PKG)_VERSION := 3.10.1 +$(PKG)_CHECKSUM := c1a566cb91bf1170fb442eb2be9e1fd4005d4640 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/Reference-LAPACK/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz @@ -30,7 +30,7 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.netlib.org/lapack/' | \ + $(WGET) -q -O- 'https://www.netlib.org/lapack/' | \ $(SED) -n 's_.*>lapack-\([0-9.]*\).tar.gz<.*_\1_p' | \ head -1 endef @@ -39,8 +39,7 @@ define $(PKG)_BUILD cd '$(1)' && \ cp INSTALL/make.inc.gfortran make.inc && \ - sed -i -e 's/\(FORTRAN[ ]*\)=.*/\1= $(MXE_F77)/' \ - -e 's/\(LOADER[ ]*\)=.*/\1= $(MXE_F77)/' \ + sed -i -e 's/\(FC[ ]*\)=.*/\1= $(MXE_F77)/' \ -e 's/\(CC[ ]*\)=.*/\1= $(MXE_CC)/' \ -e 's/\(CFLAGS[ ]*\)=.*/\1= -O2/' make.inc @@ -64,13 +63,15 @@ $(CMAKE_CCACHE_FLAGS) \ $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_AR='$(MXE_AR)' \ - -DCMAKE_RANLIB='$(MXE_RANLIB)' \ + -DCMAKE_AR='$(shell which $(MXE_AR))' \ + -DCMAKE_RANLIB='$(shell which $(MXE_RANLIB))' \ -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \ -DBUILD_DEPRECATED=ON \ -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \ $($(PKG)_BLAS_CONFIG_OPTS) \ $(1) - $(MAKE) -C '$(1)/build/SRC' -j '$(JOBS)' VERBOSE=1 install DESTDIR='$(3)' + + cmake --build '$(1)/build' + DESTDIR='$(3)' cmake --install '$(1)/build' endef endif
--- a/src/lcms.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/lcms.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,16 +3,16 @@ PKG := lcms $(PKG)_IGNORE := -$(PKG)_VERSION := 2.12 -$(PKG)_CHECKSUM := 3d0c0276fcd3930b80c424512ec0b1ed54ec1497 +$(PKG)_VERSION := 2.14 +$(PKG)_CHECKSUM := 94350a2638fe58da736e8726048c859b46a69e6f $(PKG)_SUBDIR := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)) -$(PKG)_FILE := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a,,$($(PKG)_VERSION))/$($(PKG)_FILE) +$(PKG)_FILE := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) $(PKG)_DEPS := jpeg tiff zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'http://sourceforge.net/projects/lcms/files/lcms/' | \ - $(SED) -n 's,.*tr title="\([0-9][^"]*\)".*,\1,p' | \ + $(WGET) -q -O- 'https://github.com/mm2/Little-CMS/tags' | \ + $(SED) -n 's|.*releases/tag/lcms\([^"]*\).*|\1|p' | \ head -1 endef
--- a/src/levmar.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/levmar.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,7 +11,7 @@ $(PKG)_DEPS := lapack blas libf2c define $(PKG)_UPDATE - $(WGET) --user-agent=MXE -q -O- "http://www.ics.forth.gr/~lourakis/levmar/" | \ + $(WGET) --user-agent=MXE -q -O- "https://www.ics.forth.gr/~lourakis/levmar/" | \ $(SED) -n 's_.*Latest:.*levmar-\([0-9]\.[0-9]\).*_\1_ip' | \ head -1; endef
--- a/src/libffi.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libffi.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,17 +3,15 @@ PKG := libffi $(PKG)_IGNORE := -$(PKG)_VERSION := 3.4.2 -$(PKG)_CHECKSUM := f5fbf0e8b643c4029a069faca32dd0df2c7dd0a2 +$(PKG)_VERSION := 3.4.4 +$(PKG)_CHECKSUM := a41563cd30ddf8af81aa87f80e673602fc6fd602 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/refs/tags/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/libffi/libffi/tags' | \ - $(SED) -n 's,.*releases/tag/v\([0-9][^"]*\).*,\1,p' | \ - head -1 + $(call GITHUB_PKG_UPDATE,libffi,libffi,v) endef define $(PKG)_BUILD
--- a/src/libgcrypt.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libgcrypt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,17 +3,17 @@ PKG := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9.4 -$(PKG)_CHECKSUM := 1bccc8393482fa1953323ff429c6b5ba5676eb1a +$(PKG)_VERSION := 1.10.1 +$(PKG)_CHECKSUM := de2cc32e7538efa376de7bf5d3eafa85626fb95f $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$($(PKG)_FILE) $(PKG)_DEPS := libgpg_error zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/' | \ + $(WGET) -q -O- 'https://gnupg.org/ftp/gcrypt/libgcrypt/' | \ $(SED) -n 's,.*libgcrypt-\([0-9][^>]*\)\.tar.*,\1,p' | \ - grep -v '^1\.4\.' | \ + $(SORT) -V | \ tail -1 endef
--- a/src/libgeotiff.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libgeotiff.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libgeotiff $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.0 -$(PKG)_CHECKSUM := fa24069938ead4126d77b65a38784e1a9609e65b +$(PKG)_VERSION := 1.7.1 +$(PKG)_CHECKSUM := 75b2bdc9478b9e8b3c684b9ad0e9b154e75bd843 $(PKG)_SUBDIR := libgeotiff-$($(PKG)_VERSION) $(PKG)_FILE := libgeotiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/geotiff/libgeotiff/$($(PKG)_FILE) @@ -12,9 +12,7 @@ $(PKG)_DEPS := zlib jpeg tiff proj define $(PKG)_UPDATE - $(WGET) -q -O- 'http://trac.osgeo.org/geotiff/' | \ - $(SED) -n 's,.*libgeotiff-\([0-9][^>]*\)\.tar.*,\1,p' | \ - head -1 + $(call GITHUB_PKG_UPDATE,OSGeo,libgeotiff,) endef define $(PKG)_BUILD
--- a/src/libgpg_error-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libgpg_error-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -80,6 +80,6 @@ +AM_INIT_AUTOMAKE(serial_tests dist-bzip2) + + - AC_CONFIG_HEADER([config.h]) + AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AM_SILENT_RULES
--- a/src/libgpg_error.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libgpg_error.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libgpg_error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.43 -$(PKG)_CHECKSUM := e71b77e8e32023dfd9cb06504942aa8e028c8795 +$(PKG)_VERSION := 1.46 +$(PKG)_CHECKSUM := a6e5efdd72e848aab4064e5ef4c6835ba344bcf1 $(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION) $(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE) @@ -34,6 +34,6 @@ $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)' if [ $(MXE_NATIVE_BUILD) = no ]; then \ $(INSTALL) -d '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ - $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/gpg-error-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gpg-error-config'; \ + $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/gpgrt-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gpgrt-config'; \ fi endef
--- a/src/libgsasl-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 7 Nov 2011 18:01:56 +0100 -Subject: [PATCH] use memxor from nettle - - -diff --git a/gl/memxor.c b/gl/memxor.c -index 7fec454..d9b62cd 100644 ---- a/gl/memxor.c -+++ b/gl/memxor.c -@@ -22,7 +22,7 @@ - #include "memxor.h" - - void * --memxor (void *restrict dest, const void *restrict src, size_t n) -+gsasl_memxor (void *restrict dest, const void *restrict src, size_t n) - { - char const *s = src; - char *d = dest; -diff --git a/libgsasl.pc.in b/libgsasl.pc.in -index b0c477d..d8d8ccc 100644 ---- a/libgsasl.pc.in -+++ b/libgsasl.pc.in -@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/ - Version: @VERSION@ - Libs: -L${libdir} -lgsasl - Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@ -+Requires.private: nettle - Cflags: -I${includedir} --- -1.7.7 -
--- a/src/libgsasl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libgsasl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,17 +3,16 @@ PKG := libgsasl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.0 -$(PKG)_CHECKSUM := 08fd5dfdd3d88154cf06cb0759a732790c47b4f7 -$(PKG)_SUBDIR := libgsasl-$($(PKG)_VERSION) -$(PKG)_FILE := libgsasl-$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION := 2.2.0 +$(PKG)_CHECKSUM := 903b70ecb4eef304521add85310c2df0a7675bd1 +$(PKG)_SUBDIR := gsasl-$($(PKG)_VERSION) +$(PKG)_FILE := gsasl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE) $(PKG)_DEPS := libiconv libidn libntlm libgcrypt nettle define $(PKG)_UPDATE $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=tags' | \ - grep '<a class="list subject"' | \ - $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ + $(SED) -n 's,.*<a[^>]*>v\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ head -1 endef @@ -24,13 +23,11 @@ --prefix='$(HOST_PREFIX)' \ --disable-nls \ --with-libgcrypt \ + --with-libgcrypt-prefix='$(HOST_PREFIX)' \ --with-libiconv-prefix='$(HOST_PREFIX)' \ --with-libidn-prefix='$(HOST_PREFIX)' \ --with-libntlm-prefix='$(HOST_PREFIX)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(MXE_CC)' \ - -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_BINDIR)/test-libgsasl.exe' \ - `'$(MXE_PKG_CONFIG)' libgsasl --cflags --libs` + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' endef
--- a/src/libiconv.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libiconv.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libiconv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.16 -$(PKG)_CHECKSUM := 2d9d1d8fa9f7859b181de984d60eacd2499a5701 +$(PKG)_VERSION := 1.17 +$(PKG)_CHECKSUM := 409a6a8c07280e02cc33b65ae871311f4b33077b $(PKG)_SUBDIR := libiconv-$($(PKG)_VERSION) $(PKG)_FILE := libiconv-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/libiconv/$($(PKG)_FILE)
--- a/src/libidn-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 2d8680323de1e709bfec5194db0119a7395ab78a Mon Sep 17 00:00:00 2001 -From: MXE -Date: Fri, 25 Nov 2011 15:58:28 +0100 -Subject: [PATCH] fix Libs.private - - -diff --git a/libidn.pc.in b/libidn.pc.in -index a69d5d3..2d36472 100644 ---- a/libidn.pc.in -+++ b/libidn.pc.in -@@ -19,5 +19,5 @@ Description: IETF stringprep, nameprep, punycode, IDNA text processing. - URL: http://www.gnu.org/software/libidn/ - Version: @VERSION@ - Libs: -L${libdir} -lidn --Libs.private: @LTLIBICONV@ -+Libs.private: -lintl -liconv - Cflags: -I${includedir} --- -1.7.8 -
--- a/src/libidn.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libidn.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libidn $(PKG)_IGNORE := -$(PKG)_VERSION := 1.36 -$(PKG)_CHECKSUM := a543823486a1077608f78de187e528a5ea833d5b +$(PKG)_VERSION := 1.41 +$(PKG)_CHECKSUM := 527748471e217c2c3857309df85b50a33ca62ab8 $(PKG)_SUBDIR := libidn-$($(PKG)_VERSION) $(PKG)_FILE := libidn-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE) @@ -13,7 +13,7 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=tags' | \ grep '<a class="list subject"' | \ - $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \ + $(SED) -n 's,.*<a[^>]*>libidn \([0-9][^<]*\)<.*,\1,p' | \ $(SORT) -V | \ tail -1 endef
--- a/src/libidn2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libidn2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libidn2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.2 -$(PKG)_CHECKSUM := 0a01fca61ab09f5ab3f2d7fa968d3276133f03d7 +$(PKG)_VERSION := 2.3.4 +$(PKG)_CHECKSUM := 096e2f170fabdfd7011a1848a43e0fca49e3f2e5 $(PKG)_SUBDIR := libidn2-$($(PKG)_VERSION) $(PKG)_FILE := libidn2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE)
--- a/src/libmodbus.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libmodbus.mk Wed Nov 16 08:27:17 2022 +0100 @@ -1,20 +1,18 @@ PKG := libmodbus $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.7 -$(PKG)_CHECKSUM := 71d0aa223f21ddfacc8a2461f2e3e0c77e128efb +$(PKG)_VERSION := 3.1.8 +$(PKG)_CHECKSUM := 9c18293b78217338cdbf062d3c7c6eeef3bc6822 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz -$(PKG)_URL := https://libmodbus.org/releases/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/stephane/$(PKG)/archive/refs/tags/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/stephane/libmodbus/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,stephane,libmodbus,v) endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(1)' && ./autogen.sh && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \
--- a/src/libpng.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libpng.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.37 -$(PKG)_CHECKSUM := 3ab93fabbf4c27e1c4724371df408d9a1bd3f656 +$(PKG)_VERSION := 1.6.38 +$(PKG)_CHECKSUM := 60960ed110094843e5efa221df6a7d21614a4dba $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/libproxy.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libproxy.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libproxy $(PKG)_IGNORE := -$(PKG)_VERSION := 0.4.17 -$(PKG)_CHECKSUM := cded2be341aa15bb1dc4ba574c0687e2ba8d59b2 +$(PKG)_VERSION := 0.4.18 +$(PKG)_CHECKSUM := bbd709a204b943df0e317e37efa7c3365880ca7b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/libproxy/libproxy/archive/$($(PKG)_VERSION).tar.gz @@ -13,9 +13,7 @@ $(PKG)_CMAKE_FLAGS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/libproxy/libproxy/tags' | \ - $(SED) -n 's|.*releases/tag/\([0-9][^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,libproxy,libproxy,) endef define $(PKG)_BUILD
--- a/src/librsvg.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/librsvg.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,9 +11,7 @@ $(PKG)_DEPS := glib libgsf cairo pango gtk2 libcroco define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/GNOME/librsvg/tags' | \ - $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,GNOME,librsvg,) endef define $(PKG)_BUILD
--- a/src/libsamplerate.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libsamplerate.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libsamplerate $(PKG)_IGNORE := -$(PKG)_VERSION := 0.1.8 -$(PKG)_CHECKSUM := e5fe82c4786be2fa33ca6bd4897db4868347fe70 +$(PKG)_VERSION := 0.1.9 +$(PKG)_CHECKSUM := ed60f957a4ff87aa15cbb1f3dbd886fa7e5e9566 $(PKG)_SUBDIR := libsamplerate-$($(PKG)_VERSION) $(PKG)_FILE := libsamplerate-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.mega-nerd.com/SRC/$($(PKG)_FILE) @@ -23,6 +23,6 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' - $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) + $(MAKE) -C '$(1)' -j 1 $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) endef
--- a/src/libsndfile.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libsndfile.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,17 +3,15 @@ PKG := libsndfile $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.31 -$(PKG)_CHECKSUM := 4ada136ae38b08a7f17160f44ca9f0d85d53da50 +$(PKG)_VERSION := 1.1.0 +$(PKG)_CHECKSUM := dd98ff27fb66fbf1ab1e291bc8938449e90778a2 $(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION) $(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := sqlite flac ogg opus vorbis +$(PKG)_DEPS := sqlite flac mpg123 ogg opus vorbis define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/libsndfile/libsndfile/tags' | \ - $(SED) -n 's|.*releases/tag/[v]*\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,libsndfile,libsndfile,[v]*) endef define $(PKG)_BUILD
--- a/src/libsodium.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libsodium.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,9 +11,7 @@ $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/jedisct1/libsodium/tags' | \ - $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,jedisct1,libsodium,) endef $(PKG)_EXTRA_CONFIGURE_OPTIONS :=
--- a/src/libtasn1.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libtasn1.mk Wed Nov 16 08:27:17 2022 +0100 @@ -1,8 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libtasn1 -$(PKG)_VERSION := 4.18.0 -$(PKG)_CHECKSUM := 1665249ce66e64958e8c61d5bdc6c1e9f3623888 +$(PKG)_VERSION := 4.19.0 +$(PKG)_CHECKSUM := 9c4b6616de65513a0a4d27e0b7f25184391ca8fd $(PKG)_SUBDIR := libtasn1-$($(PKG)_VERSION) $(PKG)_FILE := libtasn1-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://ftp.gnu.org/gnu/libtasn1/$($(PKG)_FILE)
--- a/src/libtool.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libtool.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libtool $(PKG)_IGNORE := -$(PKG)_VERSION := 2.4.6 -$(PKG)_CHECKSUM := 25b6931265230a06f0fc2146df64c04e5ae6ec33 +$(PKG)_VERSION := 2.4.7 +$(PKG)_CHECKSUM := d3f2d5399f4bf5cbd974b812ebaca28d6492ca65 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
--- a/src/libunistring.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libunistring.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libunistring $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.10 -$(PKG)_CHECKSUM := 1e7493a3ad8c4a1e514600b768c7229576fe5125 +$(PKG)_VERSION := 1.1 +$(PKG)_CHECKSUM := 90e0342881184150cceed6f8b12bbd2407273bf2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
--- a/src/libvpx.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libvpx.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := libvpx $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.2 -$(PKG)_CHECKSUM := 7fbc7de47f59431fa2c5b76660f115963e83193d +$(PKG)_VERSION := 1.12.0 +$(PKG)_CHECKSUM := e5f344d28752344d4c6e0c83b055093932b8d2c9 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/webmproject/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz @@ -23,10 +23,7 @@ define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/webmproject/libvpx/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \ - $(SORT) -Vr | \ - head -1 + $(call GITHUB_PKG_UPDATE,webmproject,libvpx,v) endef ifeq ($(MXE_NATIVE_BUILD),no)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libwebp.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,27 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libwebp +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.2.4 +$(PKG)_CHECKSUM := 24586e2a8e01a9cced102d68852661b964502429 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$($(PKG)_FILE) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://developers.google.com/speed/webp/download' | \ + $(SED) -n 's,.*libwebp-\([0-9][0-9\.]*\)\.tar\.gz.*,\1,p' | \ + $(SORT) -V | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + --enable-everything + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man=MANS= +endef
--- a/src/libxml2-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libxml2-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -1,24 +1,11 @@ -This file is part of MXE. -See index.html for further information. - -From 91a883b212d0ea5f1d36618362baeca2f35abb29 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 16 Jun 2012 19:44:21 +0200 -Subject: [PATCH] .pc requires.private liblzma - - -diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index f5f5f03..21b14d1 100644 ---- a/libxml-2.0.pc.in -+++ b/libxml-2.0.pc.in -@@ -8,6 +8,7 @@ Name: libXML +diff -ur libxml2-v2.9.13.orig/libxml-2.0.pc.in libxml2-v2.9.13/libxml-2.0.pc.in +--- libxml2-v2.9.13.orig/libxml-2.0.pc.in 2022-02-23 13:29:48.119724801 -0500 ++++ libxml2-v2.9.13/libxml-2.0.pc.in 2022-02-23 13:42:19.580206424 -0500 +@@ -8,6 +8,7 @@ Version: @VERSION@ Description: libXML library version2. Requires: +Requires.private: liblzma - Libs: -L${libdir} -lxml2 - Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ + Libs: -L${libdir} @XML_LIBS@ + Libs.private: @XML_PRIVATE_LIBS@ @LIBS@ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ --- -1.7.10.4 -
--- a/src/libxml2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/libxml2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,12 +3,12 @@ PKG := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.12 -$(PKG)_CHECKSUM := 339fe5bb2a7d0c13f068c26d8f7cd194c13f9a2a -$(PKG)_SUBDIR := libxml2-$($(PKG)_VERSION) -$(PKG)_FILE := libxml2-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := ftp://xmlsoft.org/libxml2/$($(PKG)_FILE) -$(PKG)_DEPS := zlib libiconv +$(PKG)_VERSION := 2.10.3 +$(PKG)_CHECKSUM := 18aa1ab0caf4ca8b092613acac992a33fa432311 +$(PKG)_SUBDIR := libxml2-v$($(PKG)_VERSION) +$(PKG)_FILE := libxml2-v$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://gitlab.gnome.org/GNOME/$(PKG)/-/archive/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := zlib libiconv xz ifneq ($(MXE_SYSTEM),msvc) $(PKG)_DEPS := xz @@ -21,8 +21,8 @@ endef define $(PKG)_BUILD - $(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in' - cd '$(1)' && ./configure \ + #$(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in' + cd '$(1)' && ./autogen.sh \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ @@ -36,8 +36,8 @@ if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ rm -rf "$(3)$(HOST_PREFIX)/share/gtk-doc"; \ - rm -rf "$(3)$(HOST_PREFIX)/share/doc/$($(PKG)_SUBDIR)/html"; \ - rm -rf "$(3)$(HOST_PREFIX)/share/doc/$($(PKG)_SUBDIR)/examples"; \ + rm -rf "$(3)$(HOST_PREFIX)/share/doc/$($(PKG)_SUBDIR)"; \ + rm -rf "$(3)$(HOST_PREFIX)/share/doc/$(PKG)"; \ fi endef
--- a/src/lua.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/lua.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := lua $(PKG)_IGNORE := -$(PKG)_VERSION := 5.4.3 -$(PKG)_CHECKSUM := 1dda2ef23a9828492b4595c0197766de6e784bc7 +$(PKG)_VERSION := 5.4.4 +$(PKG)_CHECKSUM := 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lua.org/ftp/$($(PKG)_FILE)
--- a/src/mesa-1-meson.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -Don't link to Win32 library libstdc++ - -diff --git "a/meson.build" "b/meson.build" -index eaaca7f..9b9d2d3 100644 ---- "a/meson.build" -+++ "b/meson.build" -@@ -1030,8 +1030,7 @@ if host_machine.system() == 'windows' - add_project_link_arguments( - '-Wl,--nxcompat', - '-Wl,--dynamicbase', - '-static-libgcc', -- '-static-libstdc++', - language : ['c', 'cpp'], - ) - endif
--- a/src/mesa-2-ucrt.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/mesa-2-ucrt.patch Wed Nov 16 08:27:17 2022 +0100 @@ -3,28 +3,6 @@ Date: Sat, 16 Oct 2021 16:50:46 -0700 Subject: [PATCH] mesa: fixes for UCRT. ---- mesa-21.2.4/meson.build.orig 2021-10-16 16:02:38.021997300 -0700 -+++ mesa-21.2.4/meson.build 2021-10-16 16:03:24.287545400 -0700 -@@ -1046,8 +1046,6 @@ - '-D_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions - '-DNOMINMAX', - ] -- else -- pre_args += ['-D__MSVCRT_VERSION__=0x0700'] - endif - elif host_machine.system() == 'openbsd' - pre_args += '-D_ISOC11_SOURCE' ---- mesa-21.2.4/src/compiler/spirv/vtn_private.h.orig 2021-10-16 15:28:02.537761600 -0700 -+++ mesa-21.2.4/src/compiler/spirv/vtn_private.h 2021-10-16 15:28:05.959391400 -0700 -@@ -41,7 +41,7 @@ - struct vtn_decoration; - - /* setjmp/longjmp is broken on MinGW: https://sourceforge.net/p/mingw-w64/bugs/406/ */ --#ifdef __MINGW32__ -+#if defined(__MINGW32__) && !defined(_UCRT) - #define vtn_setjmp __builtin_setjmp - #define vtn_longjmp __builtin_longjmp - #else --- mesa-21.2.4/src/compiler/nir/nir.h.orig 2021-10-14 12:59:05.367845000 -0700 +++ mesa-21.2.4/src/compiler/nir/nir.h 2021-10-16 15:55:09.881268400 -0700 @@ -54,7 +54,7 @@ @@ -36,27 +14,3 @@ #define snprintf _snprintf #endif ---- mesa-21.2.4/src/compiler/nir/nir_lower_atomics_to_ssbo.c.orig 2021-10-14 12:59:05.375845200 -0700 -+++ mesa-21.2.4/src/compiler/nir/nir_lower_atomics_to_ssbo.c 2021-10-16 15:55:30.818804300 -0700 -@@ -27,10 +27,6 @@ - #include "nir.h" - #include "nir_builder.h" - --#if defined(_WIN32) && !defined(snprintf) --#define snprintf _snprintf --#endif -- - /* - * Remap atomic counters to SSBOs, starting from the shader's next SSBO slot - * (info.num_ssbos). ---- mesa-21.2.4/src/gallium/drivers/swr/swr_fence.cpp.orig 2021-10-16 16:29:10.287533700 -0700 -+++ mesa-21.2.4/src/gallium/drivers/swr/swr_fence.cpp 2021-10-16 16:29:45.678206500 -0700 -@@ -29,7 +29,7 @@ - #include "swr_screen.h" - #include "swr_fence.h" - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__MINGW32__) - #include <sched.h> - #endif -
--- a/src/mesa.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/mesa.mk Wed Nov 16 08:27:17 2022 +0100 @@ -2,16 +2,17 @@ # See index.html for further information. PKG := mesa -$(PKG)_VERSION := 21.2.6 -$(PKG)_CHECKSUM := b7057fa4e57ae4155248b38b5085d083689ac94c +$(PKG)_VERSION := 22.2.3 +$(PKG)_CHECKSUM := 4824ad9533bd6fffea7b730d2e5dff10e2747435 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) $(PKG)_DEPS := build-mako build-meson build-ninja expat zlib llvm s2tc define $(PKG)_UPDATE - echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; - echo $($(PKG)_VERSION) + $(WGET) -q -O- https://archive.mesa3d.org | \ + $(SED) -n 's|.*href=\"mesa-\([0-9][0-9\.]*\)\.tar.xz\".*|\1|p' | $(SORT) -V | \ + tail -1 endef # FIXME: Should this be defined in the top-level Makefile? @@ -36,7 +37,7 @@ PKG_CONFIG_LIBDIR=$($(PKG)_PKG_CONFIG_PATH) $(PKG)_X11_FLAGS := -Dplatforms='x11' \ - -Dglx=gallium-xlib \ + -Dglx=xlib \ -Ddri-drivers='' \ $($(PKG)_BUILD_X11_LIBS_FLAGS) endif
--- a/src/mingw-cfitsio-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/mingw-cfitsio-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -1,12 +1,12 @@ -diff -ur cfitsio.orig/configure.in cfitsio/configure.in ---- cfitsio.orig/configure.in 2019-03-05 10:42:18.453397421 -0500 -+++ cfitsio/configure.in 2019-03-05 10:44:29.464686105 -0500 -@@ -452,7 +452,7 @@ - else - AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], [/opt/local/bin/curl-config]) - fi --if test "x$CURLCONFIG" != x; then -+if test "x$CURLCONFIG" != x && test "x$CURLCONFIG" != "xnone" ; then - CURL_LIB=`$CURLCONFIG --libs` - CURL_INC=`$CURLCONFIG --cflags` - # Also reject anaconda curl on Macs until further notice: +diff -ur cfitsio-4.1.0.orig/configure.in cfitsio-4.1.0/configure.in +--- cfitsio-4.1.0.orig/configure.in 2022-05-26 08:43:32.205001801 -0400 ++++ cfitsio-4.1.0/configure.in 2022-05-26 08:44:53.020552448 -0400 +@@ -489,7 +489,7 @@ + if test "x$ADD_CURL" = xyes; then + # Use curl-config to get compiler & linker flags, if available. + AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], []) +- if test "x$CURLCONFIG" != x; then ++ if test "x$CURLCONFIG" != x && test "x$CURLCONFIG" != "xnone"; then + CURL_LIB=`$CURLCONFIG --libs` + CURL_INC=`$CURLCONFIG --cflags` + if test "x$CURL_LIB" != x; then
--- a/src/mingw-libgcrypt-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/mingw-libgcrypt-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -5,7 +5,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 4 Dec 2014 15:07:43 +1100 -Subject: [PATCH 1/3] fix for mingw cross building +Subject: [PATCH 1/1] fix for mingw cross building Taken from: https://aur.archlinux.org/packages/mingw-w64-libgcrypt/ @@ -56,49 +56,3 @@ gcry_check_version @1 gcry_control @2 - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" <rjones@redhat.com> -Date: Sun, 28 Jun 2015 17:17:25 +0200 -Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12 - -Earlier versions of automake complain if they get a configuration -parameter which they don't understand. The error is: - -configure.ac:27: error: option 'serial-tests' not recognized - -Use some m4 hackery to work around this. - -Fix libgcrypt build under x86_64 -See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html - -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION - - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_SRCDIR([src/libgcrypt.vers]) --AM_INIT_AUTOMAKE([serial-tests dist-bzip2]) -+ -+dnl Initialize automake. automake < 1.12 didn't have serial-tests and -+dnl gives an error if it sees this, but for automake >= 1.13 -+dnl serial-tests is required so we have to include it. Solution is to -+dnl test for the version of automake (by running an external command) -+dnl and provide it if necessary. Note we have to do this entirely using -+dnl m4 macros since automake queries this macro by running -+dnl 'autoconf --trace ...'. -+m4_define([serial_tests], [ -+ m4_esyscmd([automake --version | -+ head -1 | -+ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\ -+ 'print "serial-tests" }}' -+ ]) -+]) -+dnl NB: Do not [quote] this parameter. -+AM_INIT_AUTOMAKE(serial_tests dist-bzip2) -+ - AC_CONFIG_HEADER(config.h) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_LIBOBJ_DIR([compat])
--- a/src/mingw-openblas-1-xerbla.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/mingw-openblas-1-xerbla.patch Wed Nov 16 08:27:17 2022 +0100 @@ -1,6 +1,6 @@ -diff -ur OpenBLAS-0.3.13.orig/driver/others/Makefile OpenBLAS-0.3.13/driver/others/Makefile ---- OpenBLAS-0.3.13.orig/driver/others/Makefile 2020-12-27 09:18:47.133825725 -0500 -+++ OpenBLAS-0.3.13/driver/others/Makefile 2020-12-27 09:22:06.676660536 -0500 +diff -ur OpenBLAS-0.3.21.orig/driver/others/Makefile OpenBLAS-0.3.21/driver/others/Makefile +--- OpenBLAS-0.3.21.orig/driver/others/Makefile 2022-08-09 12:41:33.461142658 -0400 ++++ OpenBLAS-0.3.21/driver/others/Makefile 2022-08-09 12:45:19.718440230 -0400 @@ -1,7 +1,7 @@ TOPDIR = ../.. include ../../Makefile.system @@ -10,7 +10,7 @@ #COMMONOBJS += slamch.$(SUFFIX) slamc3.$(SUFFIX) dlamch.$(SUFFIX) dlamc3.$(SUFFIX) -@@ -88,29 +88,26 @@ +@@ -92,33 +92,30 @@ ifeq ($(DYNAMIC_ARCH), 1) ifeq ($(ARCH),arm64) @@ -29,12 +29,17 @@ -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic_mips64.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) dynamic_mips64.$(SUFFIX) else + ifeq ($(ARCH),loongarch64) +-HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic_loongarch64.$(SUFFIX) ++HPLOBJS = memory.$(SUFFIX) dynamic_loongarch64.$(SUFFIX) + else -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) dynamic.$(SUFFIX) endif endif endif endif + endif else -HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) parameter.$(SUFFIX) +HPLOBJS = memory.$(SUFFIX) parameter.$(SUFFIX) @@ -46,7 +51,7 @@ dynamic.$(SUFFIX) : dynamic.c $(CC) $(CFLAGS) -c $< -o $(@F) -@@ -198,9 +195,6 @@ +@@ -206,9 +203,6 @@ mulx.$(SUFFIX) : $(ARCH)/mulx.c $(CC) $(CFLAGS) -c -DXDOUBLE -UCOMPLEX $< -o $(@F)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-w64-complex-inverse-trig.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,333 @@ +From 59fd6e6ab7c93545175fa6ff46532b7a80dbdbfb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Sat, 23 Jul 2022 15:30:46 +0200 +Subject: [PATCH 1/2] casinh: Use approximation for large input. + +--- + mingw-w64-crt/complex/casinh.def.h | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/mingw-w64-crt/complex/casinh.def.h b/mingw-w64-crt/complex/casinh.def.h +index 050d885a0..cce2d864e 100644 +--- a/mingw-w64-crt/complex/casinh.def.h ++++ b/mingw-w64-crt/complex/casinh.def.h +@@ -87,6 +87,27 @@ __FLT_ABI(casinh) (__FLT_TYPE __complex__ z) + if (r_class == FP_ZERO && i_class == FP_ZERO) + return z; + ++ /* casinh(z) = log(z + sqrt(z*z + 1)) */ ++ ++ if (__FLT_ABI(fabs) (__real__ z) >= __FLT_CST(1.0)/__FLT_EPSILON ++ || __FLT_ABI(fabs) (__imag__ z) >= __FLT_CST(1.0)/__FLT_EPSILON) ++ { ++ /* For large z, z + sqrt(z*z + 1) is approximately 2*z. ++ Use that approximation to avoid overflow when squaring. ++ Additionally, use symmetries to perform the calculation in the first ++ quadrant. */ ++ __real__ x = __FLT_ABI(fabs) (__real__ z); ++ __imag__ x = __FLT_ABI(fabs) (__imag__ z); ++ x = __FLT_ABI(clog) (x); ++ __real__ x += M_LN2; ++ ++ /* adjust signs for input quadrant */ ++ __real__ ret = __FLT_ABI(copysign) (__real__ x, __real__ z); ++ __imag__ ret = __FLT_ABI(copysign) (__imag__ x, __imag__ z); ++ ++ return ret; ++ } ++ + __real__ x = (__real__ z - __imag__ z) * (__real__ z + __imag__ z) + __FLT_CST(1.0); + __imag__ x = __FLT_CST(2.0) * __real__ z * __imag__ z; + +-- +2.35.3.windows.1 + +From 4b5a229573ca98a622cc15d20bd561dbaec9bbfc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Sat, 23 Jul 2022 18:01:29 +0200 +Subject: [PATCH 2/2] cacosh: Use approximation for large input. + +--- + mingw-w64-crt/complex/cacosh.def.h | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/mingw-w64-crt/complex/cacosh.def.h b/mingw-w64-crt/complex/cacosh.def.h +index f4ea2da07..a3edd5288 100644 +--- a/mingw-w64-crt/complex/cacosh.def.h ++++ b/mingw-w64-crt/complex/cacosh.def.h +@@ -80,6 +80,27 @@ __FLT_ABI(cacosh) (__FLT_TYPE __complex__ z) + return ret; + } + ++ /* cacosh(z) = log(z + sqrt(z*z - 1)) */ ++ ++ if (__FLT_ABI(fabs) (__real__ z) >= __FLT_CST(1.0)/__FLT_EPSILON ++ || __FLT_ABI(fabs) (__imag__ z) >= __FLT_CST(1.0)/__FLT_EPSILON) ++ { ++ /* For large z, z + sqrt(z*z - 1) is approximately 2*z. ++ Use that approximation to avoid overflow when squaring. ++ Additionally, use symmetries to perform the calculation in the positive ++ half plane. */ ++ __real__ x = __real__ z; ++ __imag__ x = __FLT_ABI(fabs) (__imag__ z); ++ x = __FLT_ABI(clog) (x); ++ __real__ x += M_LN2; ++ ++ /* adjust signs for input */ ++ __real__ ret = __real__ x; ++ __imag__ ret = __FLT_ABI(copysign) (__imag__ x, __imag__ z); ++ ++ return ret; ++ } ++ + __real__ x = (__real__ z - __imag__ z) * (__real__ z + __imag__ z) - __FLT_CST(1.0); + __imag__ x = __FLT_CST(2.0) * __real__ z * __imag__ z; + +-- +2.35.3.windows.1 + +From 9fcac91fc50120a5e6acfa94ba0a917c7faf2306 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Fri, 5 Aug 2022 18:36:49 +0200 +Subject: [PATCH] cacosh: Handle negative zero input + +--- + mingw-w64-crt/complex/cacosh.def.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mingw-w64-crt/complex/cacosh.def.h b/mingw-w64-crt/complex/cacosh.def.h +index 1f03befae..addf2958e 100644 +--- a/mingw-w64-crt/complex/cacosh.def.h ++++ b/mingw-w64-crt/complex/cacosh.def.h +@@ -106,7 +106,7 @@ __FLT_ABI(cacosh) (__FLT_TYPE __complex__ z) + + x = __FLT_ABI(csqrt) (x); + +- if (__real__ z < __FLT_CST(0.0)) ++ if (signbit (__real__ z)) + x = -x; + + __real__ x += __real__ z; +@@ -114,7 +114,7 @@ __FLT_ABI(cacosh) (__FLT_TYPE __complex__ z) + + ret = __FLT_ABI(clog) (x); + +- if (__real__ ret < __FLT_CST(0.0)) ++ if (signbit (__real__ ret)) + ret = -ret; + + return ret; +-- +2.35.3.windows.1 + +From cddd2eb87270f368d18f79a1070a36e4dc5464eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Mon, 8 Aug 2022 18:01:32 +0200 +Subject: [PATCH 1/3] casinh: Use symmetries also for default case. + +--- + mingw-w64-crt/complex/casinh.def.h | 47 +++++++++++++++++------------- + 1 file changed, 26 insertions(+), 21 deletions(-) + +diff --git a/mingw-w64-crt/complex/casinh.def.h b/mingw-w64-crt/complex/casinh.def.h +index cce2d864e..40ff67579 100644 +--- a/mingw-w64-crt/complex/casinh.def.h ++++ b/mingw-w64-crt/complex/casinh.def.h +@@ -47,6 +47,7 @@ __FLT_ABI(casinh) (__FLT_TYPE __complex__ z) + { + __complex__ __FLT_TYPE ret; + __complex__ __FLT_TYPE x; ++ __FLT_TYPE arz, aiz; + int r_class = fpclassify (__real__ z); + int i_class = fpclassify (__imag__ z); + +@@ -89,32 +90,36 @@ __FLT_ABI(casinh) (__FLT_TYPE __complex__ z) + + /* casinh(z) = log(z + sqrt(z*z + 1)) */ + +- if (__FLT_ABI(fabs) (__real__ z) >= __FLT_CST(1.0)/__FLT_EPSILON +- || __FLT_ABI(fabs) (__imag__ z) >= __FLT_CST(1.0)/__FLT_EPSILON) ++ /* Use symmetries to perform the calculation in the first quadrant. */ ++ arz = __FLT_ABI(fabs) (__real__ z); ++ aiz = __FLT_ABI(fabs) (__imag__ z); ++ ++ if (arz >= __FLT_CST(1.0)/__FLT_EPSILON ++ || aiz >= __FLT_CST(1.0)/__FLT_EPSILON) + { + /* For large z, z + sqrt(z*z + 1) is approximately 2*z. +- Use that approximation to avoid overflow when squaring. +- Additionally, use symmetries to perform the calculation in the first +- quadrant. */ +- __real__ x = __FLT_ABI(fabs) (__real__ z); +- __imag__ x = __FLT_ABI(fabs) (__imag__ z); +- x = __FLT_ABI(clog) (x); +- __real__ x += M_LN2; +- +- /* adjust signs for input quadrant */ +- __real__ ret = __FLT_ABI(copysign) (__real__ x, __real__ z); +- __imag__ ret = __FLT_ABI(copysign) (__imag__ x, __imag__ z); +- +- return ret; ++ Use that approximation to avoid overflow when squaring. */ ++ __real__ x = arz; ++ __imag__ x = aiz; ++ ret = __FLT_ABI(clog) (x); ++ __real__ ret += M_LN2; + } ++ else ++ { ++ __real__ x = (arz - aiz) * (arz + aiz) + __FLT_CST(1.0); ++ __imag__ x = __FLT_CST(2.0) * arz * aiz; ++ ++ x = __FLT_ABI(csqrt) (x); + +- __real__ x = (__real__ z - __imag__ z) * (__real__ z + __imag__ z) + __FLT_CST(1.0); +- __imag__ x = __FLT_CST(2.0) * __real__ z * __imag__ z; ++ __real__ x += arz; ++ __imag__ x += aiz; + +- x = __FLT_ABI(csqrt) (x); ++ ret = __FLT_ABI(clog) (x); ++ } + +- __real__ x += __real__ z; +- __imag__ x += __imag__ z; ++ /* adjust signs for input quadrant */ ++ __real__ ret = __FLT_ABI(copysign) (__real__ ret, __real__ z); ++ __imag__ ret = __FLT_ABI(copysign) (__imag__ ret, __imag__ z); + +- return __FLT_ABI(clog) (x); ++ return ret; + } +-- +2.35.3.windows.1 + +From f309692d67674526ec9a87ecae527cb6c207cf93 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Mon, 8 Aug 2022 18:02:40 +0200 +Subject: [PATCH 2/3] casinh: Use approximations for small real part and + absolute imaginary part < 1 + +--- + mingw-w64-crt/complex/casinh.def.h | 31 ++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/mingw-w64-crt/complex/casinh.def.h b/mingw-w64-crt/complex/casinh.def.h +index 40ff67579..8d61b1399 100644 +--- a/mingw-w64-crt/complex/casinh.def.h ++++ b/mingw-w64-crt/complex/casinh.def.h +@@ -104,6 +104,37 @@ __FLT_ABI(casinh) (__FLT_TYPE __complex__ z) + ret = __FLT_ABI(clog) (x); + __real__ ret += M_LN2; + } ++ else if (arz <= __FLT_EPSILON && aiz < __FLT_CST(1.0)) ++ { ++ /* Taylor series expansion around arz=0 for z + sqrt(z*z + 1): ++ c = arz + sqrt(1-aiz^2) + i*(aiz + arz*aiz / sqrt(1-aiz^2)) + O(arz^2) ++ Identity: clog(c) = log(|c|) + i*arg(c) ++ For real part of result: ++ |c| = 1 + arz / sqrt(1-aiz^2) + O(arz^2) (Taylor series expansion) ++ For imaginary part of result: ++ c = (arz + sqrt(1-aiz^2))/sqrt(1-aiz^2) * (sqrt(1-aiz^2) + i*aiz) + O(arz^6) ++ */ ++ __FLT_TYPE s1maiz2 = __FLT_ABI(sqrt) ((__FLT_CST(1.0)+aiz)*(__FLT_CST(1.0)-aiz)); ++ __real__ ret = __FLT_ABI(log1p) (arz / s1maiz2); ++ __imag__ ret = __FLT_ABI(atan2) (aiz, s1maiz2); ++ } ++ else if (arz*arz <= __FLT_EPSILON && aiz < __FLT_CST(1.0)) ++ { ++ /* Taylor series expansion around arz=0 for z + sqrt(z*z + 1): ++ c = arz + sqrt(1-aiz^2) + arz^2 / (2*(1-aiz^2)^(3/2)) + i*(aiz + arz*aiz / sqrt(1-aiz^2)) + O(arz^4) ++ Identity: clog(c) = log(|c|) + i*arg(c) ++ For real part of result: ++ |c| = 1 + arz / sqrt(1-aiz^2) + arz^2/(2*(1-aiz^2)) + O(arz^3) (Taylor series expansion) ++ For imaginary part of result: ++ c = 1/sqrt(1-aiz^2) * ((1-aiz^2) + arz*sqrt(1-aiz^2) + arz^2/(2*(1-aiz^2)) + i*aiz*(sqrt(1-aiz^2)+arz)) + O(arz^3) ++ */ ++ __FLT_TYPE onemaiz2 = (__FLT_CST(1.0)+aiz)*(__FLT_CST(1.0)-aiz); ++ __FLT_TYPE s1maiz2 = __FLT_ABI(sqrt) (onemaiz2); ++ __FLT_TYPE arz2red = arz * arz / __FLT_CST(2.0) / s1maiz2; ++ __real__ ret = __FLT_ABI(log1p) ((arz + arz2red) / s1maiz2); ++ __imag__ ret = __FLT_ABI(atan2) (aiz * (s1maiz2 + arz), ++ onemaiz2 + arz*s1maiz2 + arz2red); ++ } + else + { + __real__ x = (arz - aiz) * (arz + aiz) + __FLT_CST(1.0); +-- +2.35.3.windows.1 + +From b2ad7c96b759e8bc3af504018b70c91c8b0f135c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Mon, 8 Aug 2022 18:03:49 +0200 +Subject: [PATCH 3/3] catanh: Use approximations for small real part + +--- + mingw-w64-crt/complex/catanh.def.h | 37 +++++++++++++++++++++++++----- + 1 file changed, 31 insertions(+), 6 deletions(-) + +From 7589dfe1f5478a3ba7b93ea6dc28fc0ffd271f12 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Mon, 8 Aug 2022 18:26:20 +0200 +Subject: [PATCH 3/3] catanh: Use approximations for small real part + +--- + mingw-w64-crt/complex/catanh.def.h | 37 +++++++++++++++++++++++++----- + 1 file changed, 31 insertions(+), 6 deletions(-) + +diff --git a/mingw-w64-crt/complex/catanh.def.h b/mingw-w64-crt/complex/catanh.def.h +index 68949d139..1d46d4dcd 100644 +--- a/mingw-w64-crt/complex/catanh.def.h ++++ b/mingw-w64-crt/complex/catanh.def.h +@@ -75,17 +75,42 @@ __FLT_ABI(catanh) (__FLT_TYPE __complex__ z) + if (r_class == FP_ZERO && i_class == FP_ZERO) + return z; + ++ /* catanh(z) = 1/2 * clog(1+z) - 1/2 * clog(1-z) = 1/2 * clog((1+z)/(1-z)) */ ++ ++ /* Use identity clog(c) = 1/2*log(|c|^2) + i*arg(c) to calculate real and ++ imaginary parts separately. */ ++ ++ /* real part */ ++ /* |c|^2 = (Im(z)^2 + (1+Re(z))^2)/(Im(z)^2 + (1-Re(z))^2) */ + i2 = __imag__ z * __imag__ z; + +- n = __FLT_CST(1.0) + __real__ z; +- n = i2 + n * n; ++ if (__FLT_ABI(fabs) (__real__ z) <= __FLT_EPSILON) ++ { ++ /* |c|^2 = 1 + 4*Re(z)/(1+Im(z)^2) + O(Re(z)^2) (Taylor series) */ ++ __real__ ret = __FLT_CST(0.25) * ++ __FLT_ABI(log1p) (__FLT_CST(4.0)*(__real__ z) / (__FLT_CST(1.0) + i2)); ++ } ++ else if ((__real__ z)*(__real__ z) <= __FLT_EPSILON) ++ { ++ /* |c|^2 = 1 + 4*Re(z)/(1+Im(z)^2) + 8*Re(z)^2/(1+Im(z)^2)^2 + O(Re(z)^3) (Taylor series) */ ++ d = __real__ z / (__FLT_CST(1.0) + i2); ++ __real__ ret = __FLT_CST(0.25) * ++ __FLT_ABI(log1p) (__FLT_CST(4.0) * d * (__FLT_CST(1.0) + __FLT_CST(2.0) * d)); ++ } ++ else ++ { ++ n = __FLT_CST(1.0) + __real__ z; ++ n = i2 + n * n; + +- d = __FLT_CST(1.0) - __real__ z; +- d = i2 + d * d; ++ d = __FLT_CST(1.0) - __real__ z; ++ d = i2 + d * d; + +- __real__ ret = __FLT_CST(0.25) * (__FLT_ABI(log) (n) - __FLT_ABI(log) (d)); ++ __real__ ret = __FLT_CST(0.25) * (__FLT_ABI(log) (n) - __FLT_ABI(log) (d)); ++ } + +- d = 1 - __real__ z * __real__ z - i2; ++ /* imaginary part */ ++ /* z = (1 - Re(z)^2 - Im(z)^2 + 2i * Im(z) / ((1-Re(z))^2 + Im(z)^2) */ ++ d = __FLT_CST(1.0) - __real__ z * __real__ z - i2; + + __imag__ ret = __FLT_CST(0.5) * __FLT_ABI(atan2) (__FLT_CST(2.0) * __imag__ z, d); + +-- +2.35.3.windows.1 +
--- a/src/mingw-w64.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/mingw-w64.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := mingw-w64 $(PKG)_IGNORE := -$(PKG)_VERSION := 9.0.0 -$(PKG)_CHECKSUM := 9c496ed063e085888d250cc461ec4d31d97b72f1 +$(PKG)_VERSION := 10.0.0 +$(PKG)_CHECKSUM := 56143558d81dae7628a232ca7582b947e65392b1 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)
--- a/src/mpc.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/mpc.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := mpc $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.0 -$(PKG)_CHECKSUM := b019d9e1d27ec5fb99497159d43a3164995de2d0 +$(PKG)_VERSION := 1.2.1 +$(PKG)_CHECKSUM := 2a4919abf445c6eda4e120cd669b8733ce337227 $(PKG)_SUBDIR := mpc-$($(PKG)_VERSION) $(PKG)_FILE := mpc-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://ftp.gnu.org/gnu/mpc/$($(PKG)_FILE)
--- a/src/mpfr.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/mpfr.mk Wed Nov 16 08:27:17 2022 +0100 @@ -26,6 +26,9 @@ --enable-threads=win32 \ --with-gmp-include='$(HOST_INCDIR)' --with-gmp-lib='$(HOST_LIBDIR)' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_DOCS) + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_DOCS) install DESTDIR='$(3)' + if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ + rm -rf "$(3)$(HOST_PREFIX)/share/doc/mpfr"; \ + fi endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mpg123.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,36 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := mpg123 +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.31.1 +$(PKG)_CHECKSUM := ef0e6eb48a13d901ab8b3a7a4526dc5476720da7 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := sdl2 + +$(PKG)_CONFIGURE_OPTIONS := +ifeq ($(MXE_WINDOWS_BUILD),yes) + $(PKG)_CONFIGURE_OPTIONS += \ + --with-default-audio=win32 \ + --with-audio=win32,sdl,dummy \ + --enable-modules=no +endif + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://sourceforge.net/projects/mpg123/files/mpg123/' | \ + $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + $($(PKG)_CONFIGURE_OPTIONS) + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef
--- a/src/msys2-bash.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-bash.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-bash $(PKG)_NAME := bash $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.008-1 -$(PKG)_x86_64_CS := c596a9b3a0e9831df75048f46dbcd955be5965eb -$(PKG)_i686_CS := 7bb03bfb3f5a432e1aaad2971b0896bee90b2ef9 +$(PKG)_VERSION := 5.1.016-2 +$(PKG)_x86_64_CS := 7d05731b613cb408f73eddbbdcf4cfa5d54f4b05 +$(PKG)_i686_CS := 9984791443bc8cd08952f0af972765d546565895 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-ca-certificates.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-ca-certificates.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-ca-certificates $(PKG)_NAME := ca-certificates $(PKG)_IGNORE := -$(PKG)_VERSION := 20210119-1 -$(PKG)_x86_64_CS := 5c1c4a20b87ed27ba87b8a099b246a2eee5be7e8 -$(PKG)_i686_CS := c2b2fe6e9a80c60f564fb50e9db40e88fba80e1c +$(PKG)_VERSION := 20211016-2 +$(PKG)_x86_64_CS := fa44882c856f1f96735c9ae2021eee2a3dc44efe +$(PKG)_i686_CS := cae6ae719a006b7d06fc0f86eb41ee6f99865baa $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_NAME)-$($(PKG)_VERSION)-any.pkg.tar.zst +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS := msys2-openssl
--- a/src/msys2-coreutils.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-coreutils.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-coreutils $(PKG)_NAME := coreutils $(PKG)_IGNORE := -$(PKG)_VERSION := 8.32-1 -$(PKG)_x86_64_CS := 36b081092621b430b19f5280e5f5116875730cbb -$(PKG)_i686_CS := 382b60317c7dcbd9d341de8df2025f1370c25c99 +$(PKG)_VERSION := 8.32-4 +$(PKG)_x86_64_CS := f4e2e8ada6dc88ced30f9449e78a8609a36159c1 +$(PKG)_i686_CS := 0d63128ca9b5408878e017f1a60c18b0cde5e799 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-diffutils.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-diffutils.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-diffutils $(PKG)_NAME := diffutils $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7-1 -$(PKG)_x86_64_CS := 582a128dd21bb642e5dd8953cbb3ac64ca0bc354 -$(PKG)_i686_CS := 5639c10c4afe0b8e0bc39b2bb8fb6efb121e2efe +$(PKG)_VERSION := 3.8-3 +$(PKG)_x86_64_CS := a838ab6e638ab102dac647800c0f8f796c70c342 +$(PKG)_i686_CS := b486290b5f2a0d8d5dbe8273e7a8e25edad437a9 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-dos2unix.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-dos2unix.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-dos2unix $(PKG)_NAME := dos2unix $(PKG)_IGNORE := -$(PKG)_VERSION := 7.4.2-1 -$(PKG)_x86_64_CS := 5fe9bc87b5a547b615a15622a7b95309094c1dda -$(PKG)_i686_CS := 92260b4794003deeb6c6ad37f33a42bb13cd329b +$(PKG)_VERSION := 7.4.3-1 +$(PKG)_x86_64_CS := 0123e1da2849ba22c82b00fff85160215715e90c +$(PKG)_i686_CS := 2a301b038177e8bd77a48f369dc2347e3f2e2057 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-filesystem.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-filesystem.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-filesystem $(PKG)_NAME := filesystem $(PKG)_IGNORE := -$(PKG)_VERSION := 2021.06-1 -$(PKG)_x86_64_CS := 119b065c17f0243e91786c5ae4c33f94f70bafed -$(PKG)_i686_CS := c2139a15abb3c9153201f0f79e6638298f2d65ee +$(PKG)_VERSION := 2022.01-5 +$(PKG)_x86_64_CS := cc9accd0fc874e20a89864407def1d8e3f413c0d +$(PKG)_i686_CS := cee395689352e73f66223badb68e6620bec1dd03 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-findutils.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-findutils.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-findutils $(PKG)_NAME := findutils $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8.0-1 -$(PKG)_x86_64_CS := 4808ef0e69657f1ad08724b16d424b26d0a92f8f -$(PKG)_i686_CS := 08773c5243becd6f4b852fb56e807d7ab6cfff27 +$(PKG)_VERSION := 4.9.0-3 +$(PKG)_x86_64_CS := ae1598dca78411ab7f6ed29611eb13080d8427b1 +$(PKG)_i686_CS := afa94be4015330d0d244b0d75772c44c01ff751a $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-gawk.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-gawk.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-gawk $(PKG)_NAME := gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.0-1 -$(PKG)_x86_64_CS := 52fbcddd3b7dfef5f82e4bf0dd0f30e0309bcd0e -$(PKG)_i686_CS := bdb85b4902f7f84af799e8b7b1266c01aeab36cd +$(PKG)_VERSION := 5.1.1-1 +$(PKG)_x86_64_CS := 9d8d2b79f0e973e7f8990a7ddc5beddddde067b0 +$(PKG)_i686_CS := d9810b73eb5900c21b20a8a85890994dbc830cb0 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-gcc-libs.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-gcc-libs.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-gcc-libs $(PKG)_NAME := gcc-libs $(PKG)_IGNORE := -$(PKG)_VERSION := 10.2.0-1 -$(PKG)_x86_64_CS := 33a43d91c18ab91a0ea61049005309d6351ebe3a -$(PKG)_i686_CS := e4286aa812cf926c72df061cb5100e9424c81857 +$(PKG)_VERSION := 11.3.0-2 +$(PKG)_x86_64_CS := 086f4372c7f55928d3391b71289b1b631a12fe30 +$(PKG)_i686_CS := 815d5209c966e6c0b4db387ebc0faffd0140c9ad $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-glib2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-glib2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-glib2 $(PKG)_NAME := glib2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.68.1-1 -$(PKG)_x86_64_CS := c19bd031bc78eb488f6efefb3abd2caa3c54d34e -$(PKG)_i686_CS := 489f6d1a9a32e2afb63e5a6a8f1d2a139d3f17d9 +$(PKG)_VERSION := 2.72.2-2 +$(PKG)_x86_64_CS := c66ebcbfebd463673e1fd93d6169280dc9d9ba2d +$(PKG)_i686_CS := 2a91c3c1140dbe74919553a31715ad414c80f6b0 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-gmp.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-gmp.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-gmp $(PKG)_NAME := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.1-1 -$(PKG)_x86_64_CS := ae059cef3d83843567401014daaa97ba8be64b79 -$(PKG)_i686_CS := 74eb22780e0df1c4156d23a4988a23aa5087cdc4 +$(PKG)_VERSION := 6.2.1-2 +$(PKG)_x86_64_CS := 3583590c69c3116f1415b54ee47ed75391a40669 +$(PKG)_i686_CS := d3c7d4b6a00d284b3e84773dcbf08d88ed860fa2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-gnupg.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-gnupg.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-gnupg $(PKG)_NAME := gnupg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.28-3 -$(PKG)_x86_64_CS := 52cd46ea2d755812b202027f2536b8f4c5ad991e -$(PKG)_i686_CS := 7152f79b2ffc37c5ceecaf97458e43699f1cb88b +$(PKG)_VERSION := 2.2.40-1 +$(PKG)_x86_64_CS := bfedcb91d77844ab0e7fb4aba5dbfafe7541ca8a +$(PKG)_i686_CS := 40c09083ff95849a2207e6b6837081db674cf73e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS := msys2-libassuan msys2-libgcrypt
--- a/src/msys2-grep.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-grep.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-grep $(PKG)_NAME := grep $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1-1 -$(PKG)_x86_64_CS := 829a127bad77745fb2f742b97e5df33befd5c19f -$(PKG)_i686_CS := 5f77829c93755967ea5e978e56ca137155e032c6 +$(PKG)_VERSION := 3.6-1 +$(PKG)_x86_64_CS := e0a4116c894bd01f41cb28de064127108ddf3aff +$(PKG)_i686_CS := 6ad5a97ac3f224fddbc5636f4b69c0650a2f7635 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-gzip.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-gzip.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-gzip $(PKG)_NAME := gzip $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10-1 -$(PKG)_x86_64_CS := 7c32a7ba188885b81928d2f5ccdf860d7c0658e7 -$(PKG)_i686_CS := 0605b8e46967a3a91749e2b21df4e0fc56474976 +$(PKG)_VERSION := 1.12-2 +$(PKG)_x86_64_CS := c16f31dca96194bbc09690116ed0f5a21abc0843 +$(PKG)_i686_CS := 1c48e95a75392edb9604fe1190cc2225b318c4c6 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-icu.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-icu.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-icu $(PKG)_NAME := icu $(PKG)_IGNORE := -$(PKG)_VERSION := 68.2-1 -$(PKG)_x86_64_CS := 280b019c2f812158c312341daff046f95903393d -$(PKG)_i686_CS := 9ef9a030f9b5c34733b96a7be116bf6fa63fd724 +$(PKG)_VERSION := 71.1-2 +$(PKG)_x86_64_CS := 914807a04f52bae1c79c9ba264da2f6c1ee0d93a +$(PKG)_i686_CS := d1128b7371fed148c785385575e0b1152482cddb $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-info.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-info.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-info $(PKG)_NAME := info $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7-3 -$(PKG)_x86_64_CS := 17fb9d8fa2a81de24460d183435c6019fe87a764 -$(PKG)_i686_CS := ec3607dbe39b31d65cdd150ff1b14fdeba60cc92 +$(PKG)_VERSION := 6.8-5 +$(PKG)_x86_64_CS := 665f51b49945cb7847210eb0e8ee555509644d53 +$(PKG)_i686_CS := 81a6b1a96468dcf38868f6ee21a15b23ef6bb8f8 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-keyring.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-keyring.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,17 @@ PKG := msys2-keyring $(PKG)_NAME := msys2-keyring $(PKG)_IGNORE := -$(PKG)_VERSION := r21.b39fb11-1 -$(PKG)_x86_64_CS := 6660b4536c41554e3a5b2615932ec14ece1cbb13 -$(PKG)_i686_CS := 6660b4536c41554e3a5b2615932ec14ece1cbb13 +$(PKG)_x86_64_VER := 1~20220623-1 +$(PKG)_i686_VER := 1.20220623-1 +$(PKG)_VERSION := $($(PKG)_$(MSYS2_ARCH)_VER) +$(PKG)_x86_64_CS := 96c32c8aa60e1803f74f83d033aea6e5d4f3de82 +$(PKG)_i686_CS := ffca6b2c7f57700c6037c30472bfdf68e273f5d7 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-any.pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-any.pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-less.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-less.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-less $(PKG)_NAME := less $(PKG)_IGNORE := -$(PKG)_VERSION := 581-1 -$(PKG)_x86_64_CS := 7fe25f3161bf82c8cb0c931cbe4e32ccbcbb3aee -$(PKG)_i686_CS := 638279b04dfd72be40e3ba80b6340d5a3f3189cb +$(PKG)_VERSION := 608-2 +$(PKG)_x86_64_CS := cec12d01a0193544121c1280e7eb983487f15277 +$(PKG)_i686_CS := 7195d2a96288b4de5f20480ddef4ab3a301e5c4c $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libassuan.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libassuan.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libassuan $(PKG)_NAME := libassuan $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.5-1 -$(PKG)_x86_64_CS := 3b2e23b33eaeee3f06c046db1f0c5a7b22e0700e -$(PKG)_i686_CS := 942d543c45502515bbb407667daf7ad9f2b8699e +$(PKG)_VERSION := 2.5.5-2 +$(PKG)_x86_64_CS := c9379233cb5721806c90a1b1f75b725f2cac49ae +$(PKG)_i686_CS := 1ad3ca773a9804e0d4b76d33decffa0629174bb9 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libbz2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libbz2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libbz2 $(PKG)_NAME := libbz2 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.8-2 -$(PKG)_x86_64_CS := d0037f4de9682ffa8847aa07ad3f373b71b4ad16 -$(PKG)_i686_CS := 03d5495ec5dc467e94520467f24d418cec450393 +$(PKG)_VERSION := 1.0.8-4 +$(PKG)_x86_64_CS := 4338397490b5166f13e5d63162789efda41bd980 +$(PKG)_i686_CS := 1bf75ffba8d07512c00b1bdd193fdd74751acc9b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libcrypt.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libcrypt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libcrypt $(PKG)_NAME := libcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1-3 -$(PKG)_x86_64_CS := e2da3af731c026a737c39ed042f3e51e9416bab4 -$(PKG)_i686_CS := 6fe9df8e5bfd1636c4ff84809e03047897ff6ab0 +$(PKG)_VERSION := 2.1-4 +$(PKG)_x86_64_CS := 914c92b6fd282a20c64ce54bc3a992b0053327a2 +$(PKG)_i686_CS := 16793c6a7b96cdb30454d38d49d7f3ee2bfe8cad $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libexpat.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libexpat.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libexpat $(PKG)_NAME := libexpat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.0-1 -$(PKG)_x86_64_CS := cfa568fa6957e14103919acd1dbfd6ec1a8b7302 -$(PKG)_i686_CS := a3d2338e6dca58cb881eaa63dea131a04874dd2b +$(PKG)_VERSION := 2.4.9-1 +$(PKG)_x86_64_CS := 958eaa3da2cd5a471de5fd3eb42ae37a8cd1dabe +$(PKG)_i686_CS := 54f126b0064aecb2b70918643a8029fc7170ce9d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libffi.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libffi.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libffi $(PKG)_NAME := libffi $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3-1 -$(PKG)_x86_64_CS := 14e19984f304de251e137f27e66900b546812d90 -$(PKG)_i686_CS := 4904e013c6180ea0c13298082cff9edd39697a61 +$(PKG)_VERSION := 3.4.3-1 +$(PKG)_x86_64_CS := 57ea39c4c7e7571b18e7db26edf94233f4ca6822 +$(PKG)_i686_CS := 7f4f62e24806c1dd373a9bdf3d3cfa6405ce0489 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libgcrypt.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libgcrypt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libgcrypt $(PKG)_NAME := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9.2-1 -$(PKG)_x86_64_CS := 3c8e63d2ca5a63f074422ae7a4c75539e83a4c97 -$(PKG)_i686_CS := 25728e633b68ec3c7d3e296fcf25d59ea7531097 +$(PKG)_VERSION := 1.10.1-5 +$(PKG)_x86_64_CS := 299fd6a19a3bfbffdc370280c0aa8044b635c2a7 +$(PKG)_i686_CS := 28f3736638a523f543d247845906013be3eca01d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libgnutls.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libgnutls.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libgnutls $(PKG)_NAME := libgnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.2-1 -$(PKG)_x86_64_CS := d8c8f7d972b5c7e41d9a8b7261ce75dc1bfb1aab -$(PKG)_i686_CS := 9622f79fe3b66da138e3aef4528ec118820148dd +$(PKG)_VERSION := 3.7.8-1 +$(PKG)_x86_64_CS := 29f8073ef0dda53db98377cf0da9cda85cb21d60 +$(PKG)_i686_CS := 6aa1155504092f9161a4e74199064cc13a8bc9d0 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libgpg-error.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libgpg-error.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libgpg-error $(PKG)_NAME := libgpg-error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.42-1 -$(PKG)_x86_64_CS := 0558048a188d8b9669f53881508195767962cfa2 -$(PKG)_i686_CS := c835b44bb7864b4df8b33021e80d0f4b19b33219 +$(PKG)_VERSION := 1.46-2 +$(PKG)_x86_64_CS := 4e297398e0e5a62f8342f128583f74e51008ce94 +$(PKG)_i686_CS := dab1460466d800fc866e0f3bb2ee64efda034dfa $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libgpgme.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libgpgme.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libgpgme $(PKG)_NAME := libgpgme $(PKG)_IGNORE := -$(PKG)_VERSION := 1.16.0-1 -$(PKG)_x86_64_CS := 40dc3d159f9519a18b46b8eb27707754a2f334b2 -$(PKG)_i686_CS := 8a895f275001cc6296dd3119c627f7d32033e965 +$(PKG)_VERSION := 1.18.0-1 +$(PKG)_x86_64_CS := c820ba7f81617be9e97c09513a7e6468cfe15a37 +$(PKG)_i686_CS := f764a6052868ff2804ac9f39acef68b16e5a42c0 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libhogweed.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libhogweed.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libhogweed $(PKG)_NAME := libhogweed $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.3-1 -$(PKG)_x86_64_CS := d4be4d53c78218a5e7410cdf6776f1928d32cf68 -$(PKG)_i686_CS := e3685738ff2c129f16c18422b7b657c21808745f +$(PKG)_VERSION := 3.8.1-1 +$(PKG)_x86_64_CS := 8f1ac0e6cf38977b9346c68b332fe03dacad8664 +$(PKG)_i686_CS := de0e5edabea456bfee70701705aaf6d324b5ab9b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libiconv.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libiconv.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libiconv $(PKG)_NAME := libiconv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.16-2 -$(PKG)_x86_64_CS := d4fdeb0648bcae7006185af4dca59dbdb1c003eb -$(PKG)_i686_CS := 90db540078910c062abc39007206416619e001d4 +$(PKG)_VERSION := 1.17-1 +$(PKG)_x86_64_CS := 36f85ae203224ad4746c6ebb6c07e8b397db2aff +$(PKG)_i686_CS := da2069f8c0e4e330634d0807219583377a1cd53f $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libidn2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libidn2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libidn2 $(PKG)_NAME := libidn2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.1-2 -$(PKG)_x86_64_CS := c728726c489fc72b5e3fa8204d48040f8259c77e -$(PKG)_i686_CS := dc4e202e40feff4c9bea3095b30e43e679a8fcfb +$(PKG)_VERSION := 2.3.3-1 +$(PKG)_x86_64_CS := 1e2f727c485c6121cbae2c1e56c804d6bd5185de +$(PKG)_i686_CS := ecf8e6a917683102205dfa15fbb6cb043d88ffbf $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) #https://sourceforge.net/projects/msys2/files/REPOS/MSYS2/x86_64/bash-4.4.019-3-x86_64.pkg.tar.xz
--- a/src/msys2-libintl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libintl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libintl $(PKG)_NAME := libintl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.8.1-1 -$(PKG)_x86_64_CS := 9bbb508976ac355b2a6b5afbd4a2ab3d96f61fe2 -$(PKG)_i686_CS := 3012f6f95f6fd5916a14e18060bb10feb237d8ff +$(PKG)_VERSION := 0.21-2 +$(PKG)_x86_64_CS := 53416ede6dc08bde6af0e7986b1103576384b0af +$(PKG)_i686_CS := ecbd6cc2c48f5486961b63c473470f5b0480877b $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libksba.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libksba.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libksba $(PKG)_NAME := libksba $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.0-1 -$(PKG)_x86_64_CS := 210125b66d60d448a6077ebc8d1f0cbcee722f69 -$(PKG)_i686_CS := 90f3c06bc936d204f36ce093b61845ceaf6dd27e +$(PKG)_VERSION := 1.6.2-1 +$(PKG)_x86_64_CS := 85324a77136ac3e8f4656975638de4f1d280abe1 +$(PKG)_i686_CS := cc2a7d0c8b7ab4d3d5abba8729f3270700b8b1e7 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-liblzma.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-liblzma.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-liblzma $(PKG)_NAME := liblzma $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.5-1 -$(PKG)_x86_64_CS := 7b883b8aee58f753b819efc11c087f1ee05d2f05 -$(PKG)_i686_CS := 18cee2a30a1b3e518704c9ced2ebb2a356a1db15 +$(PKG)_VERSION := 5.2.7-1 +$(PKG)_x86_64_CS := 8d02c5d7a6c648eb18efeb3d79c55dca05d8aba0 +$(PKG)_i686_CS := 87de0261dbc8a5e01daea9c9931a8598a4b88cca $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libmetalink.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libmetalink.mk Wed Nov 16 08:27:17 2022 +0100 @@ -12,6 +12,7 @@ $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libnettle.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libnettle.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libnettle $(PKG)_NAME := libnettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.3-1 -$(PKG)_x86_64_CS := bd57cd803522a7c74e26f2af6d445f8d1f5557ad -$(PKG)_i686_CS := cb5639908c639b22bee80f0cc140c3be8f8d93b8 +$(PKG)_VERSION := 3.8.1-1 +$(PKG)_x86_64_CS := 1cca284a206b6c2b30383705ab92a92f52968f71 +$(PKG)_i686_CS := d822bbb4bc5f15b010921a304cfa7b6770a5e812 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libnpth.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libnpth.mk Wed Nov 16 08:27:17 2022 +0100 @@ -12,6 +12,7 @@ $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libopenssl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libopenssl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libopenssl $(PKG)_NAME := libopenssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.k-1 -$(PKG)_x86_64_CS := 1e8c4a206dab9b30d56e89e3d24bce503a3f0823 -$(PKG)_i686_CS := 40ae24afa20efb578a3f3519a6b4844d9e74d85e +$(PKG)_VERSION := 1.1.1.q-1 +$(PKG)_x86_64_CS := 48415d1b2bc6c0d63133cacad2330eacc94713bf +$(PKG)_i686_CS := afae58394063366fd31f45a93c7b79f4c5ae9bb2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libp11-kit.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libp11-kit.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libp11-kit $(PKG)_NAME := libp11-kit $(PKG)_IGNORE := -$(PKG)_VERSION := 0.23.22-2 -$(PKG)_x86_64_CS := 2b7022bbfc30801b7fef674d1d49698fc8003180 -$(PKG)_i686_CS := a00467c7b70e199c5f4fa834a1757be0bb5814a9 +$(PKG)_VERSION := 0.24.1-4 +$(PKG)_x86_64_CS := b919c0e12c8e963e43958bee851a7910f6c5ed87 +$(PKG)_i686_CS := 61e53152f7cc58058b7aa817c157d59b202a2cae $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libpcre.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libpcre.mk Wed Nov 16 08:27:17 2022 +0100 @@ -12,6 +12,7 @@ $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libpcre2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libpcre2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libpcre2 $(PKG)_NAME := libpcre2_8 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.37-1 -$(PKG)_x86_64_CS := caaa50dda77e1ce8ae4b861a2cebeb4b88f66ee8 -$(PKG)_i686_CS := 46e1cf88bfefa689ed3ccda587a9ecfeeb3ed977 +$(PKG)_VERSION := 10.40-1 +$(PKG)_x86_64_CS := ae96bfd39c53823dc06e3f3f58c8ce3e1acf31a2 +$(PKG)_i686_CS := 6ff74c1bb5f5450e8b54c8b111b625d29a458027 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libpsl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libpsl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libpsl $(PKG)_NAME := libpsl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1-2 -$(PKG)_x86_64_CS := 790e9da9b3a7d5b62563946f3da0602bdbac8a75 -$(PKG)_i686_CS := 65e5a1d26d62a4c79e8f67fa8156e646dae379d5 +$(PKG)_VERSION := 0.21.1-4 +$(PKG)_x86_64_CS := 9633ad8fa867138f060e8726493ac3770baa51aa +$(PKG)_i686_CS := 627325e67835d0c5ff7643ea7dcf3a79a807006d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libreadline.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libreadline.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libreadline $(PKG)_NAME := libreadline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.1.0-1 -$(PKG)_x86_64_CS := 58b7a142055b941bc2dd49e073ac2f1d690e681f -$(PKG)_i686_CS := 6b455f4357b09b2dcf74b1a0ce1211570a9891ab +$(PKG)_VERSION := 8.1.002-2 +$(PKG)_x86_64_CS := 5a29a9c5606122c2d2616e17b13e2162ab06ab20 +$(PKG)_i686_CS := 9d19610f8f4b142100a86034799315ccdb9d8a70 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libsqlite.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libsqlite.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libsqlite $(PKG)_NAME := libsqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.36.0-1 -$(PKG)_x86_64_CS := 3433a6a55df9faf128f644c7ff61cc8f14237936 -$(PKG)_i686_CS := b928e6560c8b833d448dd3b814ffd14f66b80702 +$(PKG)_VERSION := 3.39.4-1 +$(PKG)_x86_64_CS := 09568bab88be9bc4cc65a75404d0cb0dfa2c4448 +$(PKG)_i686_CS := ce90b4f46ccc95d3dd9f878385ce948eb86d0686 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libtasn1.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libtasn1.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libtasn1 $(PKG)_NAME := libtasn1 $(PKG)_IGNORE := -$(PKG)_VERSION := 4.17.0-2 -$(PKG)_x86_64_CS := 48261db49ef18271118904fff12501689f252ead -$(PKG)_i686_CS := 1e7c9d2bc1fc0a283890efdaab2cefd14d2043e7 +$(PKG)_VERSION := 4.19.0-1 +$(PKG)_x86_64_CS := 072cc701e1529059ae982aca1c2692516c9f1133 +$(PKG)_i686_CS := f493658c55e830be931c1bec65959abdcc702be5 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libunistring.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libunistring.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libunistring $(PKG)_NAME := libunistring $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.10-1 -$(PKG)_x86_64_CS := 9e0f52dbef4127cd94e6d4ba978b8177f3c1e291 -$(PKG)_i686_CS := a291d33ba496555f17f1da651228ba9448c1f96b +$(PKG)_VERSION := 1.0-1 +$(PKG)_x86_64_CS := 3d623163cd8059f3d339f2fafa7c3bf709f71def +$(PKG)_i686_CS := 28303c1f605d4f53a6707dc424b995738814b542 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libutil-linux.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libutil-linux.mk Wed Nov 16 08:27:17 2022 +0100 @@ -12,6 +12,7 @@ $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libxml2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libxml2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.10-9 -$(PKG)_x86_64_CS := c1124aa1f6fc77d09900f11fb951dd29e53c1f34 -$(PKG)_i686_CS := f97d29e0e2d046fb108691d8579680a2f160d9cd +$(PKG)_VERSION := 2.10.2-1 +$(PKG)_x86_64_CS := f5f66db1b88743c58592a71723b34c45784b8152 +$(PKG)_i686_CS := 1a489698701b62ac01ff9221ee6a700a5b4a85c9 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-libxslt.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-libxslt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-libxslt $(PKG)_NAME := libxslt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.34-4 -$(PKG)_x86_64_CS := f3aa2f91122503d31be5ed64a7c3ed34eda349bf -$(PKG)_i686_CS := 536dcc352aa259df8191262cdbc75de4a24069fc +$(PKG)_VERSION := 1.1.37-1 +$(PKG)_x86_64_CS := dadcd3658a505d3d48a7d01f69367ae220b09af5 +$(PKG)_i686_CS := 3f298bb8a1f382e8d4a604f079af3adc8a60022e $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-make.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-make.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-make $(PKG)_NAME := make $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3-1 -$(PKG)_x86_64_CS := 0714b7d340b1a13a1e5000b67baa36db467bba3f -$(PKG)_i686_CS := face8872af3cc0d0fdcd04f07765d4c874273a21 +$(PKG)_VERSION := 4.3-3 +$(PKG)_x86_64_CS := 9ce15a2a5443a33cf30869e7fb226ec4c60a9f93 +$(PKG)_i686_CS := 9bd1457265153f9a4d3cae1dcbb614e34007d6b3 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-mintty.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-mintty.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,15 +4,18 @@ PKG := msys2-mintty $(PKG)_NAME := mintty $(PKG)_IGNORE := -$(PKG)_VERSION := 1~3.5.0-1 +$(PKG)_x86_64_VER := 1~3.6.1-2 +$(PKG)_i686_VER := 1.3.6.1-2 +$(PKG)_VERSION := $($(PKG)_$(MSYS2_ARCH)_VER) $(PKG)_FILTER := mintty-1~ -$(PKG)_x86_64_CS := 5bed728c6e0cd51d35aaaf3fa83a4b2b6aa89cdb -$(PKG)_i686_CS := 680923ca77fe8896625c1cec8c9062a8ba78ba82 +$(PKG)_x86_64_CS := 541340c39d997077f24ad9a434a8b7e1c3f66954 +$(PKG)_i686_CS := 6312bab7cf1557962c31c7901d819a52ee234bc2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-mpdecimal.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-mpdecimal.mk Wed Nov 16 08:27:17 2022 +0100 @@ -12,6 +12,7 @@ $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-mpfr.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-mpfr.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-mpfr $(PKG)_NAME := mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.0-1 -$(PKG)_x86_64_CS := 8657316342a11ec7027df6fa1f1c86eadb0037a8 -$(PKG)_i686_CS := 976e7007dd3c5013334ec44fc754c389ab4efbd2 +$(PKG)_VERSION := 4.1.0.p13-1 +$(PKG)_x86_64_CS := 64a6891cb7618842011fe64b6d353555135b3e77 +$(PKG)_i686_CS := f070aa6cd3aa99332dfabe8b1e078c32ce045b65 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-ncurses.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-ncurses.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-ncurses $(PKG)_NAME := ncurses $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2-1 -$(PKG)_x86_64_CS := 6b2dc6ab5267f61d5565032d17f6abc24e310f81 -$(PKG)_i686_CS := ee8b6ed2494cbd6154d0c3e2be0dd1d19d6847df +$(PKG)_VERSION := 6.3-3 +$(PKG)_x86_64_CS := 8cf7c2a24d38edfd707e58c58a030be9705cbe1b +$(PKG)_i686_CS := 47e329b3c52879e0ace48a5c2d16535dd639f59f $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-openssl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-openssl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-openssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.k-1 -$(PKG)_x86_64_CS := 8e70b9d37a74435302a26bf651908fbfc2235f4b -$(PKG)_i686_CS := dd95fd3040af7586e345ed49a813af76f099eed3 +$(PKG)_VERSION := 1.1.1.q-1 +$(PKG)_x86_64_CS := 73a39c0086f1a8d499fa7586cd475fa83463ed16 +$(PKG)_i686_CS := da9323940b133dbae4be6a7c76ab6bb3d78a3038 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-p11-kit.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-p11-kit.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-p11-kit $(PKG)_NAME := p11-kit $(PKG)_IGNORE := -$(PKG)_VERSION := 0.23.22-2 -$(PKG)_x86_64_CS := 4f931487b174b7ae2541a095d2b6579eb9c3da86 -$(PKG)_i686_CS := 6d2843f2f3cc3b0077d3bc21eaab982fb9841045 +$(PKG)_VERSION := 0.24.1-4 +$(PKG)_x86_64_CS := f9b76f58892531c02213c46fdcbf8811dfca27fe +$(PKG)_i686_CS := e2032ad8f4512186f535a88c64a89c1f1584b040 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS := msys2-libp11-kit
--- a/src/msys2-pacman-mirrors.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-pacman-mirrors.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := msys2-pacman-mirrors $(PKG)_NAME := pacman-mirrors $(PKG)_IGNORE := -$(PKG)_VERSION := 20210703-1 +$(PKG)_VERSION := 20220205-1 # the mirror package is NOT the same for both systems, but same name -$(PKG)_i686_CS := b625b8c4439b2f5037a05c5e4aff3704c2283408 -$(PKG)_x86_64_CS := 3abd8f937b706ec5f3e17a2a52bb04f8605b6b70 +$(PKG)_i686_CS := 5ed50ba2fb33df2405158b5d4d99f6e6a0a0de31 +$(PKG)_x86_64_CS := db715368ce0652892fa06649229198105e89af27 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR :=
--- a/src/msys2-pacman.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-pacman.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-pacman $(PKG)_NAME := pacman $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.0-4 -$(PKG)_x86_64_CS := d337c026c6b772a6a9783193d9cda7972017cc29 -$(PKG)_i686_CS := 5473f451adbd52818ce4a551c92e3e6475388bc1 +$(PKG)_VERSION := 6.0.1-18 +$(PKG)_x86_64_CS := 019c7e50f0af09a3bf043953baea4d2d2792a410 +$(PKG)_i686_CS := 66bfb5a61d72491da89329ca1edf234e4d08887d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS := msys2-pacman-mirrors msys2-keyring msys2-gnupg
--- a/src/msys2-patch.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-patch.mk Wed Nov 16 08:27:17 2022 +0100 @@ -12,6 +12,7 @@ $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-perl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-perl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-perl $(PKG)_NAME := perl $(PKG)_IGNORE := -$(PKG)_VERSION := 5.32.1-1 -$(PKG)_x86_64_CS := 43140fa9d016b85f0a31dad3b26260310678a336 -$(PKG)_i686_CS := cadc64bd12a67e596686ba954d90a7291fe8fecc +$(PKG)_VERSION := 5.32.1-2 +$(PKG)_x86_64_CS := f66cf270e04f723c6cfa45071217a3e6ba6482e0 +$(PKG)_i686_CS := 6155b94aafaa85439669953d996dbfba1df4d5cd $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-python.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-python.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-python $(PKG)_NAME := python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.9.5-1 -$(PKG)_x86_64_CS := a3a386850b5620c13db9e3744e427e46282cfe4b -$(PKG)_i686_CS := e845f05fd6e6ac793e284a03061db5a74b76b773 +$(PKG)_VERSION := 3.10.6-1 +$(PKG)_x86_64_CS := 3ac7b040a22755c2c6ad9373d10a5488b752413e +$(PKG)_i686_CS := 08f9c0baabb12a8275129d946732d798c57e509f $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-runtime.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-runtime.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-runtime $(PKG)_NAME := msys2-runtime $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.0-14 -$(PKG)_x86_64_CS := e27265d09710681f836b94455f1e57ddf1e7445c -$(PKG)_i686_CS := 6d87f417963ef2dd2ee1f85a6616acdb73693f7f +$(PKG)_VERSION := 3.3.6-2 +$(PKG)_x86_64_CS := bb002d7ad12373b09cde0d619cc2b65b15075fc4 +$(PKG)_i686_CS := 8ce69a118fe6028ae3a39cebba69598a9681575a $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-sed.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-sed.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-sed $(PKG)_NAME := sed $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8-1 -$(PKG)_x86_64_CS := af77e570fabecf7e0902e3b10d9e88d4235729ff -$(PKG)_i686_CS := 637f36f0e79bcdb7587be56e103095267280fd8b +$(PKG)_VERSION := 4.8-3 +$(PKG)_x86_64_CS := 77f52e17cb0c85589b2ec42d3c4a0cafaaa20d88 +$(PKG)_i686_CS := b5411db4f00c77af8b40facf70248e69b511aa76 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-tar.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-tar.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-tar $(PKG)_NAME := tar $(PKG)_IGNORE := -$(PKG)_VERSION := 1.34-1 -$(PKG)_x86_64_CS := b5adc14cc4e5ebcdc3f5c4ae0b3df3e2de844487 -$(PKG)_i686_CS := d3281a465b593e55eb6cc8f58517d3098c024318 +$(PKG)_VERSION := 1.34-3 +$(PKG)_x86_64_CS := b521b9229dea8ef7e1db9aff3925dc3806e9f8bb +$(PKG)_i686_CS := 9e21d72bfa2a7e6510035ba88269a5452df4a06d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-unzip.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-unzip.mk Wed Nov 16 08:27:17 2022 +0100 @@ -12,6 +12,7 @@ $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-wget.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-wget.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-wget $(PKG)_NAME := wget $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21.1-2 -$(PKG)_x86_64_CS := b1cf111e44f2a5bc5f9ffebb65154b951fbbb7e4 -$(PKG)_i686_CS := f33a22e9e2c106b15597e58cc15e5268ed660872 +$(PKG)_VERSION := 1.21.3-1 +$(PKG)_x86_64_CS := a0212a39dc95ef3c70f07a15f331234fc3de578b +$(PKG)_i686_CS := a3b882a64527e0f8c07b59db18c08def751b4e32 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-which.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-which.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-which $(PKG)_NAME := which $(PKG)_IGNORE := -$(PKG)_VERSION := 2.21-2 -$(PKG)_x86_64_CS := c6183ec9734892a55b94978d8b173bbe414e3e37 -$(PKG)_i686_CS := d8fba94924bf7a7015860029e6c48d64ec041c45 +$(PKG)_VERSION := 2.21-4 +$(PKG)_x86_64_CS := 5066769f77b22f80ede00838938c0319b597c6db +$(PKG)_i686_CS := 3b28bb0f947b2895665443168c942364e67b2d24 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-zip.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-zip.mk Wed Nov 16 08:27:17 2022 +0100 @@ -12,6 +12,7 @@ $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/msys2-zlib.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/msys2-zlib.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,14 +4,15 @@ PKG := msys2-zlib $(PKG)_NAME := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.11-1 -$(PKG)_x86_64_CS := 37e185e5ae7d42c8c045d82c31dda58affb8bb5f -$(PKG)_i686_CS := 27fcb9cd872dcc466ce2debcd3c5ebf9e2d82e44 +$(PKG)_VERSION := 1.2.12-2 +$(PKG)_x86_64_CS := a74d3f5f32127a29c9c1623eb9b5c2c3d3c8f330 +$(PKG)_i686_CS := 1a40b6cba69b3d52085a4dce5bb17d0707ca8979 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.xz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION)-$(MSYS2_ARCH).pkg.tar.zst $(PKG)_URL := $(MSYS2_URL)/$($(PKG)_FILE) +$(PKG)_URL2 := $(if $(MSYS2_URL2),$(MSYS2_URL2)/$($(PKG)_FILE),) $(PKG)_DEPS :=
--- a/src/native-binutils.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/native-binutils.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := native-binutils $(PKG)_IGNORE := -$(PKG)_VERSION := 2.35.1 -$(PKG)_CHECKSUM := 45f7a96a2580a422f44b78317f0abf13935fecb6 +$(PKG)_VERSION := 2.39 +$(PKG)_CHECKSUM := f17653e7b1d1fa5242a408919845da23e8cc5141 $(PKG)_SUBDIR := binutils-$($(PKG)_VERSION) $(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE)
--- a/src/native-gcc-1-canadian-cross.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -From 01a70ccd723eb9a479186fe37c972b0d0f8676cf Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely <jwakely@redhat.com> -Date: Fri, 7 Jan 2022 15:21:03 +0000 -Subject: [PATCH 1/1] libstdc++: Add -nostdinc++ for c++17 sources [PR100017] - -When building a build!=host compiler, the just-built gcc can't be used -to build the target libstdc++ (because it is built for the host triplet, -not the build triplet). The top-level configure.ac sets up the build -flags for libstdc++ (and other "raw_cxx" libs) like this: - -GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX, - [gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs], - c++) - -The -nostdinc++ flag is only used for the IN-TREE-TOOL, i.e. when using -the just-built gcc/xgcc compiler. This means that the cross-compiler -used to build libstdc++ will add its own libstdc++ headers to the -include path. That results in the #include <cfenv> in -src/c++17/floating_to_chars.cc and src/c++17/floating_from_chars.cc -doing #include_next <fenv.h> and finding the libstdc++ fenv.h wrapper -from the host compiler. Because that has the same include guard as the -<fenv.h> in the libstdc++ we're trying to build, we never reach the -underlying <fenv.h> from libc. That results in several errors of the -form: - -error: 'fenv_t' has not been declared in '::' - -The most correct fix would be to add -nostdinc++ to the -RAW_CXX_FOR_TARGET variable in configure.ac, or the -RAW_CXX_TARGET_EXPORTS variable in Makefile.tpl. - -Another solution would be to make the libstdc++ <fenv.h> wrapper use -_GLIBCXX_INCLUDE_NEXT_C_HEADERS like our <stdlib.h> and other C header -wrappers. - -For now though, the simplest and safest solution is to just add --nostdinc++ to the CXXFLAGS used for src/c++17/*.cc, which is what this -does. - -libstdc++-v3/ChangeLog: - - PR libstdc++/100017 - * src/c++17/Makefile.am (AM_CXXFLAGS): Add -nostdinc++. - * src/c++17/Makefile.in: Regenerate. - -(cherry picked from commit 4fde88e5dd152fe866a97b12e0f8229970d15cb3) ---- - libstdc++-v3/src/c++17/Makefile.am | 2 +- - libstdc++-v3/src/c++17/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libstdc++-v3/src/c++17/Makefile.am b/libstdc++-v3/src/c++17/Makefile.am -index cb94aff5f1a..2aebc6d5251 100644 ---- a/libstdc++-v3/src/c++17/Makefile.am -+++ b/libstdc++-v3/src/c++17/Makefile.am -@@ -79,7 +79,7 @@ endif - # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden - # as the occasion calls for it. - AM_CXXFLAGS = \ -- -std=gnu++17 \ -+ -std=gnu++17 -nostdinc++ \ - $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ - $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ - $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \ -diff --git a/libstdc++-v3/src/c++17/Makefile.in b/libstdc++-v3/src/c++17/Makefile.in -index 63984ecd52a..8c02be6514f 100644 ---- a/libstdc++-v3/src/c++17/Makefile.in -+++ b/libstdc++-v3/src/c++17/Makefile.in -@@ -455,7 +455,7 @@ libc__17convenience_la_SOURCES = $(sources) $(inst_sources) - # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden - # as the occasion calls for it. - AM_CXXFLAGS = \ -- -std=gnu++17 \ -+ -std=gnu++17 -nostdinc++ \ - $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ - $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ - $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \ --- -2.27.0 - -
--- a/src/native-gcc.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/native-gcc.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := native-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 11.2.0 -$(PKG)_CHECKSUM := f902ccacecf8949978d6261e9f1d034cff73ffdb +$(PKG)_VERSION := 12.2.0 +$(PKG)_CHECKSUM := 5dce6dc0091b8049b530d1587513a07201691760 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -45,8 +45,9 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \ $(SED) -n 's,.*<a href="gcc-\([0-9][^"]*\)/".*,\1,p' | \ + $(SORT) -V | \ grep -v '^4\.[543]\.' | \ - head -1 + tail -1 endef define $(PKG)_BUILD
--- a/src/netcdf.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/netcdf.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,9 +11,7 @@ $(PKG)_DEPS := curl hdf5 define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/Unidata/netcdf-c/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \ - head -1 + $(call GITHUB_PKG_UPDATE,Unidata,netcdf-c,v) endef ifeq ($(MXE_WINDOWS_BUILD),yes)
--- a/src/nettle.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/nettle.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.3 -$(PKG)_CHECKSUM := 9adfadd4ae4104c8aceb38bf16064d65d7edbcce +$(PKG)_VERSION := 3.8.1 +$(PKG)_CHECKSUM := 1be40366f8db2d5bb65e45883d6d76a96b39eb73 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
--- a/src/npp.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/npp.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := npp $(PKG)_IGNORE := -$(PKG)_VERSION := 8.1.9.3 -$(PKG)_CHECKSUM := c864455e096ba9e549eeb16c992bcd3f1f58a047 +$(PKG)_VERSION := 8.4.7 +$(PKG)_CHECKSUM := bf6f9950591d95233598d8c1ff11e25225ed0b2f $(PKG)_SUBDIR := $(PKG)_FILE := $(PKG).$($(PKG)_VERSION).portable.zip $(PKG)_URL := https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/of-fits-1-cross-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/of-fits-1-cross-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -5,7 +5,7 @@ -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio --cflags cfitsio) +MKOCTFILE ?= mkoctfile +PKG_CONFIG ?= pkg-config -+MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio --cflags cfitsio) ++MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio --cflags cfitsio) -lz all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-ltfat-3-no-cxx11.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,27 @@ +From 0b0d59759fd3ef0f3c631047f85a2b87c687d272 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> +Date: Wed, 26 Jan 2022 18:58:46 +0100 +Subject: [PATCH] Don't force std=gnu++11. We prefer a newer standard now. + Ideally, this would check if some switch is necessary to enable C++11 feature + support in the compiler. + +--- + oct/Makefile_unix | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/oct/Makefile_unix b/oct/Makefile_unix +index 8f497297..4ecad22a 100644 +--- a/oct/Makefile_unix ++++ b/oct/Makefile_unix +@@ -33,7 +33,7 @@ ifndef FFTW_LIBS + FFTW_LIBS := $(shell $(MKOCTFILE) -p FFTW_LIBS) + endif + +-export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -std=gnu++11 -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS) ++export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS) + # export is necessary, otherwise LDFLAGS won't have any effect + # at least on Windows and on Mac + export LDFLAGS := $(shell $(MKOCTFILE) -p LDFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) +-- +2.34.1.windows.1 +
--- a/src/of-octproj.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/of-octproj.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,11 +3,11 @@ PKG := of-octproj $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.1 -$(PKG)_CHECKSUM := 898747c494b0d0677cb29b3610378b63fbc98206 +$(PKG)_VERSION := 3.0.2 +$(PKG)_CHECKSUM := d487820de128ce67bf1f50c9b680568490317ebc $(PKG)_SUBDIR := octproj-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz -$(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download' +$(PKG)_URL := https://bitbucket.org/jgpallero/octproj/downloads/$($(PKG)_FILE) $(PKG)_DEPS := proj ifeq ($(ENABLE_BINARY_PACKAGES),yes) @@ -15,7 +15,9 @@ endif define $(PKG)_UPDATE - $(OCTAVE_FORGE_PKG_UPDATE) + $(WGET) -q -O- 'https://bitbucket.org/jgpallero/octproj/downloads/?tab=tags' | \ + $(SED) -n 's|.*>OctPROJ-\([^<]*\).*|\1|p' | $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-sparsersb-1-dev.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,47 @@ +# HG changeset patch +# User John Donoghue <john.donoghue@ieee.org> +# Date 1656010713 14400 +# Thu Jun 23 14:58:33 2022 -0400 +# Node ID d96dbe7f078ca2753533cdea59778ce8468a4906 +# Parent bba813604edfb3d2d50a679d6515a23c482db7c2 +* src/sparsersb.cc: check for version 8 octave changes for __get_type_info__ + +diff -r bba813604edf -r d96dbe7f078c src/sparsersb.cc +--- a/src/sparsersb.cc Thu Jun 23 14:25:16 2022 -0400 ++++ b/src/sparsersb.cc Thu Jun 23 14:58:33 2022 -0400 +@@ -69,6 +69,7 @@ + #define RSBOI_WANT_PRINT_PCT_OCTAVE_STYLE 1 + + #include <octave/oct.h> ++#define RSBOI_USE_PATCH_OCT80 (OCTAVE_MAJOR_VERSION>=8) + #define RSBOI_USE_PATCH_OCT44 (OCTAVE_MAJOR_VERSION>=5) || ( (OCTAVE_MAJOR_VERSION==4) && (OCTAVE_MINOR_VERSION>=4)) + #if RSBOI_USE_PATCH_OCT44 + #include <octave/variables.h> +@@ -2571,6 +2572,19 @@ + } + #endif /* RSBOI_WANT_DOUBLE_COMPLEX */ + ++#if RSBOI_USE_PATCH_OCT80 ++#define RSBOI_INSTALL_BINOP(op, t1, t2, f) { \ ++ octave::type_info& type_info = octave::__get_type_info__ ();\ ++ type_info.register_binary_op(octave_value::op, t1::static_type_id (), t2::static_type_id (), CONCAT2 (oct_binop_, f)); } ++ ++#define RSBOI_INSTALL_ASSIGNOP(op, t1, t2, f) { \ ++ octave::type_info& type_info = octave::__get_type_info__ ();\ ++ type_info.register_assign_op(octave_value::op, t1::static_type_id (), t2::static_type_id (), CONCAT2 (oct_assignop_, f)); } ++ ++#define RSBOI_INSTALL_UNOP(op, t1, f) { \ ++ octave::type_info& type_info = octave::__get_type_info__ ();\ ++ type_info.register_unary_op(octave_value::op, t1::static_type_id (), CONCAT2 (oct_unop_, f)); } ++#else + #if RSBOI_USE_PATCH_OCT44 + #define RSBOI_INSTALL_BINOP(op, t1, t2, f) { \ + octave::type_info& type_info = octave::__get_type_info__ ("");\ +@@ -2593,6 +2607,7 @@ + // deprecated; need a wrapper using octave::typeinfo::register_unary_op + #define RSBOI_INSTALL_UNOP INSTALL_UNOP + #endif /* RSBOI_USE_PATCH_OCT44 */ ++#endif /* RSBOI_USE_PATCH_OCT88 */ + + static void install_sparsersb_ops (void) + {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-sparsersb-2-no-cxx11.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,22 @@ +# HG changeset patch +# User Markus Mützel <markus.muetzel@gmx.de> +# Date 1643220705 -3600 +# Wed Jan 26 19:11:45 2022 +0100 +# Node ID 47e601506819386cc03e9e412c0615cbac02aa8f +# Parent 67a14d968d2db3ffe34474e6be1c7a2d164ad416 +Don't force std=gnu++11. We prefer a newer standard now. +Ideally, this would check if some switch is necessary to enable C++11 feature +support in the compiler. + +diff -r 67a14d968d2d -r 47e601506819 src/configure.ac +--- a/src/configure.ac Tue Sep 21 11:09:59 2021 +0200 ++++ b/src/configure.ac Wed Jan 26 19:11:45 2022 +0100 +@@ -225,7 +225,7 @@ + AC_SUBST(OCTAVE) + AC_SUBST(TARGETS) + AC_SUBST(SPARSERSB_CXXFLAGS) +-AC_SUBST(SPARSERSB_CXX11, ["-std=gnu++11"]) ++AC_SUBST(SPARSERSB_CXX11) + AC_SUBST(SPARSERSB_LDFLAGS) + + AC_CONFIG_FILES([Makeconf])
--- a/src/of-statistics.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/of-statistics.mk Wed Nov 16 08:27:17 2022 +0100 @@ -16,9 +16,7 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/gnu-octave/statistics/tags' | \ - $(SED) -n 's|.*releases/tag/release-\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,gnu-octave,statistics,release-) endef define $(PKG)_BUILD
--- a/src/of-symbolic.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/of-symbolic.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := of-symbolic $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.0 -$(PKG)_CHECKSUM := efdc11c07916b92eebac93128e07806867f6f956 +$(PKG)_VERSION := 3.0.1 +$(PKG)_CHECKSUM := 62442ab7a5919edc3cc4f084236a2ab12a24d130 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := octsympy-$($(PKG)_VERSION) $(PKG)_FILE := symbolic-$($(PKG)_VERSION).tar.gz
--- a/src/openblas.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/openblas.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,17 +3,15 @@ PKG := openblas $(PKG)_IGNORE := -$(PKG)_VERSION := 0.3.18 -$(PKG)_CHECKSUM := a9d5ce86908657f002c6566cd8f35fe882709be4 +$(PKG)_VERSION := 0.3.21 +$(PKG)_CHECKSUM := b052d196ad694b29302e074b3eb8cc66745f6e2f $(PKG)_SUBDIR := OpenBLAS-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := blas define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/xianyi/OpenBLAS/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -Vr | \ - head -1 + $(call GITHUB_PKG_UPDATE,xianyi,OpenBLAS,v) endef ifeq ($(USE_CCACHE),yes)
--- a/src/opencore-amr.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/opencore-amr.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := opencore-amr $(PKG)_IGNORE := -$(PKG)_VERSION := 0.1.5 -$(PKG)_CHECKSUM := bef4d1e3a8a155b47569b6691a223843b33e279e +$(PKG)_VERSION := 0.1.6 +$(PKG)_CHECKSUM := 3c2c618a5a38757a530034f80aa5356789589bcc $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_FILE)
--- a/src/opencv-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -Common subdirectories: opencv-3.4.3.orig/3rdparty and opencv-3.4.3/3rdparty -Common subdirectories: opencv-3.4.3.orig/apps and opencv-3.4.3/apps -Common subdirectories: opencv-3.4.3.orig/cmake and opencv-3.4.3/cmake -diff -ut opencv-3.4.3.orig/CMakeLists.txt opencv-3.4.3/CMakeLists.txt ---- opencv-3.4.3.orig/CMakeLists.txt 2019-10-02 15:01:47.179900886 -0400 -+++ opencv-3.4.3/CMakeLists.txt 2019-10-02 15:19:18.363163935 -0400 -@@ -39,7 +39,7 @@ - if(NOT CMAKE_TOOLCHAIN_FILE) - # it _must_ go before project(OpenCV) in order to work - if(WIN32) -- set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") -+ #set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") - else() - set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") - endif() -@@ -47,7 +47,7 @@ - #Android: set output folder to ${CMAKE_BINARY_DIR} - set(LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "root for library output, set this to change where android libs are compiled to" ) - # any cross-compiling -- set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") -+ #set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") - endif() - endif() - -@@ -377,14 +377,7 @@ - ocv_update(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc) - endif() - --if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) -- if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) -- ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") -- else() -- message(STATUS "Can't detect runtime and/or arch") -- ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") -- endif() --elseif(ANDROID) -+if(ANDROID) - ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "sdk/native/") - else() - ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") -@@ -433,11 +426,8 @@ - ocv_update(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") - - if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) -- if(OpenCV_STATIC) -- ocv_update(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") -- else() -- ocv_update(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}") -- endif() -+ ocv_update(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}") -+ ocv_update(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}") - ocv_update(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") - ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH samples) - ocv_update(OPENCV_JAR_INSTALL_PATH java) -@@ -495,15 +485,9 @@ - set(OPENCV_LIB_ARCHIVE_INSTALL_PATH ${OPENCV_LIB_INSTALL_PATH}) - endif() - --if(WIN32) -- # Postfix of DLLs: -- set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}") -- set(OPENCV_DEBUG_POSTFIX d) --else() -- # Postfix of so's: -- set(OPENCV_DLLVERSION "") -- set(OPENCV_DEBUG_POSTFIX "") --endif() -+# Postfix of so's: -+set(OPENCV_DLLVERSION "") -+set(OPENCV_DEBUG_POSTFIX "") - - if(DEFINED CMAKE_DEBUG_POSTFIX) - set(OPENCV_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") -Common subdirectories: opencv-3.4.3.orig/data and opencv-3.4.3/data -Common subdirectories: opencv-3.4.3.orig/doc and opencv-3.4.3/doc -Common subdirectories: opencv-3.4.3.orig/include and opencv-3.4.3/include -Common subdirectories: opencv-3.4.3.orig/modules and opencv-3.4.3/modules -Common subdirectories: opencv-3.4.3.orig/platforms and opencv-3.4.3/platforms -Common subdirectories: opencv-3.4.3.orig/samples and opencv-3.4.3/samples
--- a/src/opencv.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/opencv.mk Wed Nov 16 08:27:17 2022 +0100 @@ -2,19 +2,16 @@ PKG := opencv $(PKG)_IGNORE := -$(PKG)_VERSION := 3.4.3 -$(PKG)_CHECKSUM := d700348b3251552ccf034e4d7dd16080e4086840 +$(PKG)_VERSION := 4.6.0 +$(PKG)_CHECKSUM := 34394c7e2fc152eee1ce73e326bc19a99879c77c $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := opencv-$($(PKG)_VERSION).zip -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)library/$(PKG)-unix/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_URL_2 := https://distfiles.macports.org/opencv/$($(PKG)_FILE) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/opencv/$(PKG)/archive/$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := eigen ffmpeg jasper jpeg libpng \ openblas openexr tiff xz zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'https://sourceforge.net/projects/opencvlibrary/files/opencv-unix/' | \ - $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \ - head -1 + $(call GITHUB_PKG_UPDATE,opencv,opencv,) endef # -DCMAKE_CXX_STANDARD=98 required for non-posix gcc7 build
--- a/src/openexr.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/openexr.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := openexr $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.2 -$(PKG)_CHECKSUM := e4773b3da36c38052b8172c22000a8bf715808bc +$(PKG)_VERSION := 3.1.5 +$(PKG)_CHECKSUM := 70dc06b7bebab4c0792c902c28b53dd967ec9628 $(PKG)_SUBDIR := openexr-$($(PKG)_VERSION) $(PKG)_FILE := openexr-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
--- a/src/openjpeg.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/openjpeg.mk Wed Nov 16 08:27:17 2022 +0100 @@ -13,9 +13,7 @@ $(PKG)_CMAKE_FLAGS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/uclouvain/openjpeg/tags' | \ - $(SED) -n 's|.*releases/tag/v\([0-9][^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,uclouvain,openjpeg,v) endef define $(PKG)_BUILD
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openlibm.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,33 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := openlibm +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.8.1 +$(PKG)_CHECKSUM := 4b1dffada65215942a31f3266b65b27eadd363cc +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/JuliaMath/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := + +$(PKG)_TARGET_OPTS := + +ifeq ($(MXE_NATIVE_BUILD),no) + ifeq ($(ENABLE_WINDOWS_64),yes) + $(PKG)_TARGET_OPTS := ARCH=x86_64 + else + $(PKG)_TARGET_OPTS := ARCH=i686 + endif + $(PKG)_TARGET_OPTS += OS=WINNT TOOLPREFIX=$(MXE_TOOL_PREFIX) + $(PKG)_TARGET_OPTS += CC=$(MXE_CC) AR=$(MXE_AR) + $(PKG)_TARGET_OPTS += prefix=$(HOST_PREFIX) +endif + +define $(PKG)_UPDATE + $(call GITHUB_PKG_UPDATE,JuliaMath,openlibm,v) +endef + +define $(PKG)_BUILD + $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_TARGET_OPTS) + $(MAKE) -C '$(1)' -j '1' $($(PKG)_TARGET_OPTS) DESTDIR='$(3)' install +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opkg-cfitsio.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := opkg-cfitsio +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.0.4 +$(PKG)_CHECKSUM := 8676194cddbad7d39c0e3356df98a8d670b19979 +$(PKG)_SUBDIR := octave-cfitsio-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://downloads.sourceforge.net/project/octave-cfitsio/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := cfitsio + +ifeq ($(ENABLE_BINARY_PACKAGES),yes) + $(PKG)_DEPS += $(OCTAVE_TARGET) +endif + +define $(PKG)_UPDATE + $(WGET) -q -O- https://sourceforge.net/p/octave-cfitsio/code/ci/default/tree/ | \ + $(SED) -n 's|.*code/ci/v\([0-9][0-9.]*\)/tree.*|\1|p' | $(SORT) -V | \ + tail -1 +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opkg-mqtt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := opkg-mqtt +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.0.3 +$(PKG)_CHECKSUM := b5d4745e7ab56f500ae00c17788843c024475847 +$(PKG)_SUBDIR := octave-mqtt-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://downloads.sourceforge.net/project/octave-mqtt/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := paho-mqtt-c + +ifeq ($(ENABLE_BINARY_PACKAGES),yes) + $(PKG)_DEPS += $(OCTAVE_TARGET) +endif + +define $(PKG)_UPDATE + $(WGET) -q -O- https://sourceforge.net/p/octave-mqtt/code/ci/default/tree/ | \ + $(SED) -n 's|.*code/ci/release-\([0-9][0-9.]*\)/tree.*|\1|p' | $(SORT) -V | \ + tail -1 +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef
--- a/src/opus.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/opus.mk Wed Nov 16 08:27:17 2022 +0100 @@ -31,10 +31,8 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ + --disable-doc --disable-extra-programs \ && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' - #rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/opus_*.3 - #rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/opus.h.3 - #rm -rf '$(PREFIX)/$(TARGET)'/share/doc/opus/html endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opusfile.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,35 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := opusfile +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.11 +$(PKG)_CHECKSUM := fc3bf2a73be16836a16d9e55ff1097de3835dce3 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://archive.mozilla.org/pub/opus/$($(PKG)_FILE) +$(PKG)_DEPS := ogg opus + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://archive.mozilla.org/pub/opus/?C=M;O=D' | \ + $(SED) -n 's,.*opusfile-\([0-9][^>]*\)\.tar.*,\1,p' | \ + grep -v 'alpha' | \ + grep -v 'beta' | \ + $(SORT) -Vr | \ + head -1 +endef + +$(PKG)_EXTRA_CONFIGURE_OPTIONS := + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + --disable-doc \ + --disable-http \ + && $(CONFIGURE_POST_HOOK) + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/paho-mqtt-c-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,24 @@ +diff -ur paho.mqtt.c-1.3.10.orig/src/CMakeLists.txt paho.mqtt.c-1.3.10/src/CMakeLists.txt +--- paho.mqtt.c-1.3.10.orig/src/CMakeLists.txt 2022-06-21 08:35:05.709317901 -0400 ++++ paho.mqtt.c-1.3.10/src/CMakeLists.txt 2022-06-21 08:36:38.005608332 -0400 +@@ -58,7 +58,7 @@ + ENDIF() + + IF (WIN32) +- SET(LIBS_SYSTEM ws2_32 crypt32 RpcRT4) ++ SET(LIBS_SYSTEM ws2_32 crypt32 rpcrt4) + ELSEIF (UNIX) + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(LIBS_SYSTEM c dl pthread rt) +diff -ur paho.mqtt.c-1.3.10.orig/CMakeLists.txt paho.mqtt.c-1.3.10/CMakeLists.txt +--- paho.mqtt.c-1.3.10.orig/CMakeLists.txt 2022-06-21 08:46:04.132058610 -0400 ++++ paho.mqtt.c-1.3.10/CMakeLists.txt 2022-06-21 08:46:40.308132218 -0400 +@@ -37,7 +37,7 @@ + MESSAGE(STATUS "Timestamp is ${BUILD_TIMESTAMP}") + + IF(WIN32) +- ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN) ++ ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN -D_WINDOWS) + ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + ADD_DEFINITIONS(-DOSX) + ENDIF()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/paho-mqtt-c.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,35 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := paho-mqtt-c +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.3.11 +$(PKG)_CHECKSUM := dde58a64eb4fbd19745a5b8adba2fa3f85ecff23 +$(PKG)_SUBDIR := paho.mqtt.c-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := + +$(PKG)_CMAKE_FLAGS := + +define $(PKG)_UPDATE + $(call GITHUB_PKG_UPDATE,eclipse,paho.mqtt.c,v) +endef + +define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + $(CMAKE_CCACHE_FLAGS) \ + $(if $(BUILD_SHARED),-DPAHO_BUILD_SHARED=ON -DPAHO_BUILD_STATIC=OFF,-DPAHO_BUILD_SHARED=OFF -DPAHO_BUILD_STATIC=ON) \ + -DPAHO_BUILD_DOCUMENTATION=OFF \ + -DPAHO_ENABLE_TESTING=OFF \ + -DPAHO_BUILD_SAMPLES=OFF \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . + + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install + if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ + rm -rf "$(3)$(HOST_PREFIX)/share/doc/Eclipse Paho C"; \ + fi +endef
--- a/src/pcre.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/pcre.mk Wed Nov 16 08:27:17 2022 +0100 @@ -35,9 +35,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)' $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) DESTDIR='$(3)' if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ - rm -rf "$(3)$(HOST_PREFIX)/share/doc/pcre/html"; \ - rm -f "$(3)$(HOST_PREFIX)/share/doc/pcre2/*.txt"; \ - rm -f "$(3)$(HOST_PREFIX)/share/doc/pcre2/ChangeLog"; \ + rm -rf "$(3)$(HOST_PREFIX)/share/doc/pcre"; \ rm -rf "$(3)$(HOST_PREFIX)/share/man"; \ fi if [ $(MXE_NATIVE_BUILD) = no ]; then \
--- a/src/pcre2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/pcre2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,17 +3,15 @@ PKG := pcre2 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.39 -$(PKG)_CHECKSUM := 9cf3ec88cd68dc76354eb0568738c47b57377042 +$(PKG)_VERSION := 10.40 +$(PKG)_CHECKSUM := 5a433f92b29083d0d8ccd4ec56e3afbe1fa09863 $(PKG)_SUBDIR := pcre2-$($(PKG)_VERSION) $(PKG)_FILE := pcre2-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := https://github.com/PhilipHazel/$(PKG)/releases/download/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/PCRE2Project/$(PKG)/releases/download/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/PhilipHazel/pcre2/tags' | \ - $(SED) -n 's|.*releases/tag/pcre2-\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,PCRE2Project,pcre2,pcre2-) endef define $(PKG)_BUILD @@ -32,9 +30,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)' $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) DESTDIR='$(3)' if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ - rm -rf "$(3)$(HOST_PREFIX)/share/doc/pcre2/html"; \ - rm -f "$(3)$(HOST_PREFIX)/share/doc/pcre2/*.txt"; \ - rm -f "$(3)$(HOST_PREFIX)/share/doc/pcre2/ChangeLog"; \ + rm -rf "$(3)$(HOST_PREFIX)/share/doc/pcre2"; \ rm -rf "$(3)$(HOST_PREFIX)/share/man"; \ fi if [ $(MXE_NATIVE_BUILD) = no ]; then \
--- a/src/pixman.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/pixman.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := pixman $(PKG)_IGNORE := -$(PKG)_VERSION := 0.40.0 -$(PKG)_CHECKSUM := d7baa6377b6f48e29db011c669788bb1268d08ad +$(PKG)_VERSION := 0.42.2 +$(PKG)_CHECKSUM := 7063429f9952fd8c4fcbc887c3210b35adb6a6c7 $(PKG)_SUBDIR := pixman-$($(PKG)_VERSION) $(PKG)_FILE := pixman-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE)
--- a/src/pkg-config.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/pkg-config.mk Wed Nov 16 08:27:17 2022 +0100 @@ -24,7 +24,7 @@ define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1)' && autoreconf + cd '$(1)' && autoreconf -fi cd '$(1).build' && '$(1)/configure' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(CONFIGURE_CPPFLAGS) \ @@ -35,5 +35,5 @@ --with-pc_path='$(HOST_LIBDIR)/pkgconfig' \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1).build' V=1 -j 1 - $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)' + $(MAKE) -C '$(1).build' -j 1 install $(MXE_DISABLE_DOCS) DESTDIR='$(3)' endef
--- a/src/portaudio.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/portaudio.mk Wed Nov 16 08:27:17 2022 +0100 @@ -19,9 +19,7 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/PortAudio/portaudio/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \ - head -1 + $(call GITHUB_PKG_UPDATE,PortAudio,portaudio,v) endef define $(PKG)_BUILD
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/postgresql-1-autoconf.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,18 @@ +diff -ur postgresql-14.5.orig/configure.ac postgresql-14.5/configure.ac +--- postgresql-14.5.orig/configure.ac 2022-09-24 08:31:28.243846882 -0400 ++++ postgresql-14.5/configure.ac 2022-09-24 08:31:46.952668359 -0400 +@@ -19,10 +19,10 @@ + + AC_INIT([PostgreSQL], [14.5], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.ac' but it is then +-your responsibility whether the result works or not.])]) ++#m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. ++#Untested combinations of 'autoconf' and PostgreSQL versions are not ++#recommended. You can remove the check from 'configure.ac' but it is then ++#your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config)
--- a/src/postgresql.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/postgresql.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := postgresql $(PKG)_IGNORE := -$(PKG)_VERSION := 9.4.26 -$(PKG)_CHECKSUM := 832094c944c57ac19ddcd552ada732a77609de75 +$(PKG)_VERSION := 14.5 +$(PKG)_CHECKSUM := 3f2bb7d0b6d56f985fa5dfd2dd2675e7b6b2fef9 $(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION) $(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -21,11 +21,11 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'http://git.postgresql.org/gitweb?p=postgresql.git;a=tags' | \ - grep 'refs/tags/REL9[0-9_]*"' | \ - $(SED) 's,.*refs/tags/REL\(.*\)".*,\1,g;' | \ + grep 'refs/tags/REL_14[0-9_]*"' | \ + $(SED) 's,.*refs/tags/REL_\(.*\)".*,\1,g;' | \ $(SED) 's,_,.,g' | \ - grep -v '^9\.[01]' | \ - head -1 + $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD @@ -55,11 +55,11 @@ --with-zlib \ --with-system-tzdata=/dev/null \ LIBS="$($(PKG)_LIBS)" - $(MAKE) -C '$(1)'/src/common -j '$(JOBS)' - $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install DESTDIR='$(3)' - $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' - $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install DESTDIR='$(3)' - $(MAKE) -C '$(1)'/src/bin/pg_config -j '$(JOBS)' install DESTDIR='$(3)' + $(MAKE) MAKELEVEL=0 -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install DESTDIR='$(3)' + $(MAKE) MAKELEVEL=0 -C '$(1)'/src/port -j '$(JOBS)' + $(MAKE) MAKELEVEL=0 -C '$(1)'/src/common -j '$(JOBS)' + $(MAKE) MAKELEVEL=0 -C '$(1)'/src/bin/psql -j '$(JOBS)' install DESTDIR='$(3)' + $(MAKE) MAKELEVEL=0 -C '$(1)'/src/bin/pg_config -j '$(JOBS)' install DESTDIR='$(3)' $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(3)$(HOST_INCDIR)' $(INSTALL) -m644 '$(1)/src/include/pg_config_ext.h' '$(3)$(HOST_INCDIR)' $(INSTALL) -m644 '$(1)/src/include/pg_config_os.h' '$(3)$(HOST_INCDIR)' @@ -88,8 +88,8 @@ --without-libxslt \ --without-zlib \ --with-system-tzdata=/dev/null; \ - $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)'; \ - $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install DESTDIR=$(3); \ + $(MAKE) MAKELEVEL=0 -C '$(1).native'/src/port -j '$(JOBS)'; \ + $(MAKE) MAKELEVEL=0 -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install DESTDIR=$(3); \ $(INSTALL) -m755 '$(3)$(BUILD_TOOLS_PREFIX)/bin/pg_config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config'; \ fi endef
--- a/src/qscintilla.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/qscintilla.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := qscintilla $(PKG)_IGNORE := -$(PKG)_VERSION := 2.13.1 -$(PKG)_CHECKSUM := 082cbaa8419ff1911cd9d7fec79ce21ca621eeb6 +$(PKG)_VERSION := 2.13.3 +$(PKG)_CHECKSUM := 336c069d56dc9573ac2c68fd5690b2dffe02daaa $(PKG)_SUBDIR := QScintilla_src-$($(PKG)_VERSION) $(PKG)_FILE := QScintilla_src-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.riverbankcomputing.com/static/Downloads/QScintilla/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/qtbase-2-gcc11.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -Description: include <limits> to fix some GCC 11 build issues -Origin: upstream, commits: - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 -Last-Update: 2021-01-26 - ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -44,6 +44,8 @@ - #include <QtCore/qfloat16.h> - #include <QtCore/qglobal.h> - -+#include <limits> -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include <stdlib.h> - #include <string.h> ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -43,6 +43,7 @@ - - #include <QtCore/qglobal.h> - #include <QtCore/qmetatype.h> -+#include <limits> - #include <string.h> - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include <QtCore/qbytearray.h> - -+#include <limits> -+ - QT_BEGIN_NAMESPACE - - -$ diff -Naup ./src/corelib/tools/qoffsetstringarray_p.h.orig ./src/corelib/tools/qoffsetstringarray_p.h ---- ./src/corelib/tools/qoffsetstringarray_p.h.orig 2020-10-27 09:02:11.000000000 +0100 -+++ ./src/corelib/tools/qoffsetstringarray_p.h 2021-08-11 18:57:24.580782075 +0200 -@@ -55,6 +55,7 @@ - - #include <tuple> - #include <array> -+#include <limits> - - QT_BEGIN_NAMESPACE - -
--- a/src/qtbase.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/qtbase.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,11 +3,11 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.15.2 -$(PKG)_CHECKSUM := b5ad67fc6381ad7fae0296944734198488d096a3 +$(PKG)_VERSION := 5.15.7 +$(PKG)_CHECKSUM := 0fe70abd7be4bf79d8a208614267321efa3ac432 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig endif @@ -114,7 +114,6 @@ $($(PKG)_CONFIGURE_LIBPATH_OPTION) \ -no-strip \ -opensource \ - -c++std c++11 \ -confirm-license \ $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
--- a/src/qtimageformats.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/qtimageformats.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c17b57cec197d721b3c844ff1dd68ab9996f4603 +$(PKG)_CHECKSUM := 95e2e092f27c9021b49b34b058110e76d884207d $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/qtsvg.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 08531b47924078cbde6dfbf56da83651d58f6a13 +$(PKG)_CHECKSUM := b6935e9dd3a3ab4bd9f13f1bd1618bfee8e9eabc $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/qttools.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ae92f651b1b029bd6f55fc8888134d73d8ad19be +$(PKG)_CHECKSUM := 43b1e599b98a934f88198b7fcd91de9696985995 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
--- a/src/qttranslations.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/qttranslations.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 980350bcbf680697bb2903955e2568ee9b5b365f +$(PKG)_CHECKSUM := 7effe55cb0cc3a77b4b9f2632cd3cf926146c35f $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))
--- a/src/rapidjson.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/rapidjson.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,9 +11,7 @@ $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/Tencent/$(PKG)/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,Tencent,rapidjson,v) endef define $(PKG)_BUILD @@ -23,10 +21,13 @@ $(CMAKE_CCACHE_FLAGS) \ $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DRAPIDJSON_BUILD_DOC=Off \ - -DRAPIDJSON_BUILD_EXAMPLES=Off \ - -DRAPIDJSON_BUILD_TESTS=Off \ + -DRAPIDJSON_BUILD_DOC=OFF \ + -DRAPIDJSON_BUILD_EXAMPLES=OFF \ + -DRAPIDJSON_BUILD_TESTS=OFF \ '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' DESTDIR='$(3)' install + if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \ + rm -rf "$(3)$(HOST_PREFIX)/share/doc/RapidJSON"; \ + fi endef
--- a/src/readline-0-001-upstream.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/readline-0-001-upstream.patch Wed Nov 16 08:27:17 2022 +0100 @@ -1,58 +1,30 @@ READLINE PATCH REPORT ===================== -Readline-Release: 8.1 -Patch-ID: readline81-001 +Readline-Release: 8.2 +Patch-ID: readline82-001 -Bug-Reported-by: Tom Tromey <tom@tromey.com> -Bug-Reference-ID: <875z3u9fd0.fsf@tromey.com> -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2021-01/msg00009.html +Bug-Reported-by: Kan-Ru Chen <koster@debian.org> +Bug-Reference-ID: +Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021109 Bug-Description: -The code to check readline versions in an inputrc file had the sense of the -comparisons reversed. +Starting a readline application with an invalid locale specification for +LC_ALL/LANG/LC_CTYPE can cause it crash on the first call to readline. -diff -ur a/input.c b/input.c ---- a/bind.c 2020-10-26 10:03:14.000000000 -0400 -+++ b/bind.c 2021-01-18 16:38:48.000000000 -0500 -@@ -1235,5 +1235,5 @@ - else if (_rl_strnicmp (args, "version", 7) == 0) - { -- int rlversion, versionarg, op, previ, major, minor; -+ int rlversion, versionarg, op, previ, major, minor, opresult; - - _rl_parsing_conditionalized_out = 1; -@@ -1295,22 +1295,23 @@ - { - case OP_EQ: -- _rl_parsing_conditionalized_out = rlversion == versionarg; -+ opresult = rlversion == versionarg; - break; - case OP_NE: -- _rl_parsing_conditionalized_out = rlversion != versionarg; -+ opresult = rlversion != versionarg; - break; - case OP_GT: -- _rl_parsing_conditionalized_out = rlversion > versionarg; -+ opresult = rlversion > versionarg; - break; - case OP_GE: -- _rl_parsing_conditionalized_out = rlversion >= versionarg; -+ opresult = rlversion >= versionarg; - break; - case OP_LT: -- _rl_parsing_conditionalized_out = rlversion < versionarg; -+ opresult = rlversion < versionarg; - break; - case OP_LE: -- _rl_parsing_conditionalized_out = rlversion <= versionarg; -+ opresult = rlversion <= versionarg; - break; - } -+ _rl_parsing_conditionalized_out = 1 - opresult; - } - /* Check to see if the first word in ARGS is the same as the +diff -ur a/nls.c b/nls.c +--- a/nls.c 2022-08-15 09:38:51.000000000 -0400 ++++ b/nls.c 2021-01-18 2022-10-05 09:23:22.000000000 -0400 +@@ -142,4 +142,8 @@ + lspec = ""; + ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ ++ if (ret == 0 || *ret == 0) ++ ret = setlocale (LC_CTYPE, (char *)NULL); ++ if (ret == 0 || *ret == 0) ++ ret = RL_DEFAULT_LOCALE; + #else + ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; diff -ur a/patchlevel b/patchlevel --- a/patchlevel 2013-11-15 08:11:11.000000000 -0500
--- a/src/readline-1-input.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/readline-1-input.patch Wed Nov 16 08:27:17 2022 +0100 @@ -1,11 +1,12 @@ diff -ur readline-8.1.1/input.c readline-8.1.2/input.c --- readline-8.1.1/input.c 2020-12-19 07:54:06.883500144 -0500 +++ readline-8.1.2/input.c 2020-12-19 07:55:29.042995655 -0500 -@@ -538,7 +538,12 @@ +@@ -819,7 +819,12 @@ #if defined (__MINGW32__) - if (isatty (fileno (stream))) +- if (isatty (fd) - return (_getch ()); /* "There is no error return." */ ++ if (isatty (fd)) + { + int c = _getch (); + if (c == 0xe0) @@ -14,4 +15,4 @@ + } #endif result = 0; - #if defined (HAVE_PSELECT) + #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
--- a/src/readline-1-sigwinch.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/readline-1-sigwinch.patch Wed Nov 16 08:27:17 2022 +0100 @@ -1,18 +1,18 @@ diff -ur readline-8.1.2/readline.c readline-8.1.3/readline.c --- readline-8.1.2/readline.c 2020-12-19 07:55:06.477760951 -0500 +++ readline-8.1.3/readline.c 2020-12-19 07:56:17.722659252 -0500 -@@ -1154,8 +1154,12 @@ +@@ -1186,8 +1186,13 @@ RL_SETSTATE(RL_STATE_INITIALIZED); } else -- (void)_rl_init_locale (); /* check current locale */ -- +- _rl_reset_locale (); /* check current locale and set locale variables */ + { -+ (void)_rl_init_locale (); /* check current locale */ ++ _rl_reset_locale (); /* check current locale and set locale variables */ +#if defined (__MINGW32__) + rl_reset_screen_size (); +#endif + } + /* Initialize the current line information. */ _rl_init_line_state (); @@ -41,17 +41,6 @@ int rl_catch_sigwinch = 1; #else int rl_catch_sigwinch = 0; /* for the readline state struct in readline.c */ -@@ -266,8 +271,10 @@ - case SIGQUIT: - #endif - -+#if defined (HAVE_POSIX_SIGNALS) - if (block_sig) - sigprocmask (SIG_BLOCK, &set, &oset); -+#endif - - rl_echo_signal_char (sig); - rl_cleanup_after_signal (); @@ -532,6 +539,21 @@ } #endif /* SIGWINCH */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/readline-3-fd_set.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,29 @@ +Guard functions that use types that aren't available on all platforms with +pre-processor conditions. + +diff -urN readline-8.2/input.c.orig readline-8.2/input.c +--- readline-8.2/input.c.orig 2022-11-12 17:54:14.800371248 +0100 ++++ readline-8.2/input.c 2022-11-12 17:58:13.327167979 +0100 +@@ -151,7 +151,9 @@ + + int _rl_timeout_init (void); + int _rl_timeout_sigalrm_handler (void); ++#if defined (HAVE_PSELECT) || defined (HAVE_SELECT) + int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *); ++#endif + + static void _rl_timeout_handle (void); + #if defined (RL_TIMEOUT_USE_SIGALRM) + +diff -urN readline-8.2/rlprivate.h.orig readline-8.2/rlprivate.h +--- readline-8.2/rlprivate.h.orig 2022-08-12 00:35:16.000000000 +0200 ++++ readline-8.2/rlprivate.h 2022-11-12 17:43:54.266291863 +0100 +@@ -303,7 +303,7 @@ + + extern int _rl_timeout_init (void); + extern int _rl_timeout_handle_sigalrm (void); +-#if defined (_POSIXSELECT_H_) ++#if defined (HAVE_PSELECT) || defined (HAVE_SELECT) + /* use as a sentinel for fd_set, struct timeval, and sigset_t definitions */ + extern int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *); + #endif
--- a/src/readline.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/readline.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := readline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.1 -$(PKG)_CHECKSUM := 48c5e0c3a212449e206e21ba82856accac842c6f +$(PKG)_VERSION := 8.2 +$(PKG)_CHECKSUM := 97ad98be243a857b639c0f3da2fe7d81c6d1d36e $(PKG)_SUBDIR := readline-$($(PKG)_VERSION) $(PKG)_FILE := readline-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/readline/$($(PKG)_FILE)
--- a/src/rtmidi.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/rtmidi.mk Wed Nov 16 08:27:17 2022 +0100 @@ -13,9 +13,7 @@ $(PKG)_CMAKE_FLAGS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/thestk/$(PKG)/tags' | \ - $(SED) -n 's|.*releases/tag/[v]\{0,1\}\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,thestk,rtmidi,[v]*) endef define $(PKG)_BUILD
--- a/src/sdl2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/sdl2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := sdl2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.18 -$(PKG)_CHECKSUM := 419c62567d197a52a2136865c158f894939c1adf +$(PKG)_VERSION := 2.24.2 +$(PKG)_CHECKSUM := 828974badaf1f16f8e3ebe84fb6f7e5d793c1e47 $(PKG)_SUBDIR := SDL2-$($(PKG)_VERSION) $(PKG)_FILE := SDL2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/sdl2_image.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,32 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := sdl2_image +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.6.2 +$(PKG)_CHECKSUM := 955e0a8ee89f22829f4a72e1774e6e3f9225712c +$(PKG)_SUBDIR := SDL2_image-$($(PKG)_VERSION) +$(PKG)_FILE := SDL2_image-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/libsdl-org/SDL_image/releases/download/release-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := sdl2 jpeg libpng libwebp tiff + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://hg.libsdl.org/SDL_image/tags' | \ + $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + $(SED) -i 's,^\(Requires:.*\),\1\nRequires.private: libtiff-4 libpng libwebp,' '$(1)/SDL2_image.pc.in' + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ + --disable-sdltest \ + --disable-jpg-shared \ + --disable-png-shared \ + --disable-tif-shared \ + --disable-webp-shared + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/sdl2_mixer.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,46 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := sdl2_mixer +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.6.2 +$(PKG)_CHECKSUM := 036fc7839a6b8dc1af3dbfed4e2531224bbacdd7 +$(PKG)_SUBDIR := SDL2_mixer-$($(PKG)_VERSION) +$(PKG)_FILE := SDL2_mixer-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/libsdl-org/SDL_mixer/releases/download/release-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := sdl2 mpg123 ogg opusfile vorbis + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \ + $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + $(SED) -i 's,^\(Requires:.*\),\1 opusfile vorbisfile,' '$(1)/SDL2_mixer.pc.in' + echo \ + 'Libs.private:' \ + "`$(TARGET)-pkg-config libmodplug libmpg123 --libs`" \ + "`$(PREFIX)/$(TARGET)/bin/smpeg2-config --libs`" \ + >> '$(1)/SDL2_mixer.pc.in' + $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ + --disable-sdltest \ + --disable-music-mod \ + --enable-music-mod-modplug \ + --enable-music-ogg \ + --disable-music-ogg-shared \ + --disable-music-flac \ + --disable-music-flac-shared \ + --enable-music-mp3 \ + --disable-smpegtest \ + SMPEG_CONFIG='$(HOST_BINDIR)/smpeg2-config' \ + WINDRES='$(TARGET)-windres' \ + LIBS="`$(TARGET)-pkg-config libmodplug libmpg123 opusfile vorbisfile --libs-only-l`" + + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/sdl2_net.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,28 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := sdl2_net +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.2.0 +$(PKG)_CHECKSUM := 9154bd0898399dbe98c4525b0f3fcaf5b15c64fc +$(PKG)_SUBDIR := SDL2_net-$($(PKG)_VERSION) +$(PKG)_FILE := SDL2_net-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://www.libsdl.org/projects/SDL_net/release/$($(PKG)_FILE) +$(PKG)_DEPS := sdl2 + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://hg.libsdl.org/SDL_net/tags' | \ + $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ + --disable-sdltest \ + --disable-gui + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' +endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/sdl2_ttf.mk Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,29 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := sdl2_ttf +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.20.1 +$(PKG)_CHECKSUM := f774ff407915ae4afa3d03e5a9395283d9090f28 +$(PKG)_SUBDIR := SDL2_ttf-$($(PKG)_VERSION) +$(PKG)_FILE := SDL2_ttf-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/libsdl-org/SDL_ttf/releases/download/release-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := sdl2 freetype + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://hg.libsdl.org/SDL_ttf/tags' | \ + $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + echo 'Requires.private: freetype2' >> '$(1)/SDL2_ttf.pc.in' + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + $(ENABLE_SHARED_OR_STATIC) \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ + --disable-sdltest \ + --with-freetype-prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' +endef
--- a/src/sdl_image.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/sdl_image.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,10 +11,8 @@ $(PKG)_DEPS := sdl jpeg libpng tiff define $(PKG)_UPDATE - $(WGET) -q -O- 'http://hg.libsdl.org/SDL_image/tags' | \ - $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \ - $(GREP) "^1" | \ - head -1 + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) endef define $(PKG)_BUILD
--- a/src/sdl_mixer.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/sdl_mixer.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,7 +11,7 @@ $(PKG)_DEPS := sdl libmodplug ogg vorbis smpeg define $(PKG)_UPDATE - $(WGET) -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \ + $(WGET) -q -O- 'https://github.com/libsdl-org/SDL_mixer/tags?after=release-2.0.0' | \ $(SED) -n 's,.*release-\([0-9][^<"]*\).*,\1,p' | \ $(GREP) "^1" | \ head -1
--- a/src/speex.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/speex.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := speex $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.0 -$(PKG)_CHECKSUM := 18ebc3fa3236b4369509e9439acc32d0e864fa7f +$(PKG)_VERSION := 1.2.1 +$(PKG)_CHECKSUM := 7eb11e62c782f99833adc3a37a1b863ea2b28c1b $(PKG)_SUBDIR := speex-$($(PKG)_VERSION) $(PKG)_FILE := speex-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xiph.org/releases/speex/$($(PKG)_FILE)
--- a/src/sqlite.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/sqlite.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,11 +3,11 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3370100 -$(PKG)_CHECKSUM := 328bc8146e15b67752b5249b8ac688c13230c517 +$(PKG)_VERSION := 3390400 +$(PKG)_CHECKSUM := c4c5c39269d1b9bb1487cff580c1f583608229b2 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.sqlite.org/2021/$($(PKG)_FILE) +$(PKG)_URL := http://www.sqlite.org/2022/$($(PKG)_FILE) $(PKG)_DEPS := readline zlib ifeq ($(MXE_SYSTEM),mingw) @@ -30,7 +30,7 @@ if [ $(MXE_WINDOWS_BUILD) = yes ]; then \ $(SED) -i 's/^Cflags/#Cflags/;' '$(1)/sqlite3.pc.in'; \ fi - cd '$(1)' && autoreconf && ./configure \ + cd '$(1)' && autoreconf -fi && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \
--- a/src/src-msys2-bash.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-bash.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-bash $(PKG)_NAME := bash $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.008-1 -$(PKG)_CHECKSUM := e3b145bb312d8415d7a18b6f3a59eb6a474d6923 +$(PKG)_VERSION := 5.1.016-2 +$(PKG)_CHECKSUM := 76c3ebc9a9ba53dcc2bf586f4f3d920a0471839a $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-ca-certificates.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-ca-certificates.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-ca-certificates $(PKG)_NAME := ca-certificates $(PKG)_IGNORE := -$(PKG)_VERSION := 20210119-1 -$(PKG)_CHECKSUM := cad949a1f34c4a2c71021b331b88bde82ead1482 +$(PKG)_VERSION := 20211016-2 +$(PKG)_CHECKSUM := 1cf7b39efd7e605d690c1749b369333661ef23a0 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-coreutils.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-coreutils.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-coreutils $(PKG)_NAME := coreutils $(PKG)_IGNORE := -$(PKG)_VERSION := 8.32-1 -$(PKG)_CHECKSUM := 81058057134411482ea3a983f4302f8e670b5324 +$(PKG)_VERSION := 8.32-4 +$(PKG)_CHECKSUM := f8949c8d0f80c0563d871adb6c80fc9e227f7f3f $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-diffutils.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-diffutils.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-diffutils $(PKG)_NAME := diffutils $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7-1 -$(PKG)_CHECKSUM := fd20765234e40e5ea0275449e8acee50f30b7edf +$(PKG)_VERSION := 3.8-3 +$(PKG)_CHECKSUM := 38705779fad8045181abe63ab53c47bee838fdae $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-dos2unix.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-dos2unix.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-dos2unix $(PKG)_NAME := dos2unix $(PKG)_IGNORE := -$(PKG)_VERSION := 7.4.2-1 -$(PKG)_CHECKSUM := ed5f40a1c113fc85632a093059e0b669345a394a +$(PKG)_VERSION := 7.4.3-1 +$(PKG)_CHECKSUM := ea3ddac0ee38304ae4bc530ab613043e2fc4cc6f $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-filesystem.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-filesystem.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-filesystem $(PKG)_NAME := filesystem $(PKG)_IGNORE := -$(PKG)_VERSION := 2021.06-1 -$(PKG)_CHECKSUM := f07cc0b21b8ed1e4ab65464ec3c0aa6acffd47ea +$(PKG)_VERSION := 2022.01-5 +$(PKG)_CHECKSUM := e1e1956fd7543f097a116d113617a5e63fbd9b07 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-findutils.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-findutils.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-findutils $(PKG)_NAME := findutils $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8.0-1 -$(PKG)_CHECKSUM := 953779d5d626590686afa71de4bdf74839951b59 +$(PKG)_VERSION := 4.9.0-3 +$(PKG)_CHECKSUM := 124b2cd8d9ab56335512360dde91809c400f9590 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-gawk.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-gawk.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-gawk $(PKG)_NAME := gawk $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.0-1 -$(PKG)_CHECKSUM := e20448a9d27125b05f36926db8638cf6b2442d3e +$(PKG)_VERSION := 5.1.1-1 +$(PKG)_CHECKSUM := c6731e5c6047f7eabe927dc0d5a5af3f61d17ab2 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-gcc-libs.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-gcc-libs.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-gcc-libs $(PKG)_NAME := gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 10.2.0-1 -$(PKG)_CHECKSUM := a14669fdb1998c5b08ff78a3d447fa3bf3a492fc +$(PKG)_VERSION := 11.3.0-2 +$(PKG)_CHECKSUM := 1e5ae0316535398bee7bca5e0fdd4080e0391b1c $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-glib2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-glib2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-glib2 $(PKG)_NAME := glib2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.68.1-1 -$(PKG)_CHECKSUM := f3043a67fac49cd12a56b49fb87f760095efa86f +$(PKG)_VERSION := 2.72.2-2 +$(PKG)_CHECKSUM := bfc7bb69bffd7c1de6acb6cffff37b512528195b $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-gmp.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-gmp.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-gmp $(PKG)_NAME := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2.1-1 -$(PKG)_CHECKSUM := 5befe32118a009a7d49c1ed9e2d56e21d60f6e2f +$(PKG)_VERSION := 6.2.1-2 +$(PKG)_CHECKSUM := 21eaefd397b9501abcb2c0337d98691adaa09483 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-gnupg.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-gnupg.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-gnupg $(PKG)_NAME := gnupg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.28-3 -$(PKG)_CHECKSUM := 3dc6c57d1d01bcb2e8e048db6b327bb8dd9dba4c +$(PKG)_VERSION := 2.2.40-1 +$(PKG)_CHECKSUM := 54756aa27874ec173e7da6fec11625214fd2e0a1 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-grep.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-grep.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-grep $(PKG)_NAME := grep $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1-1 -$(PKG)_CHECKSUM := 5c0bb2e218141ea87315891adad3c196e8dd3cd7 +$(PKG)_VERSION := 3.6-1 +$(PKG)_CHECKSUM := f34fb6fb773e4c624913f3cbcb909e10115c60df $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-gzip.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-gzip.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-gzip $(PKG)_NAME := gzip $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10-1 -$(PKG)_CHECKSUM := e1667518b28cdb0ae3999ddb75c5a2f579c43eb2 +$(PKG)_VERSION := 1.12-2 +$(PKG)_CHECKSUM := f83bc7df61d3e243d9d152c29e00635f366d4c6d $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-icu.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-icu.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-icu $(PKG)_NAME := icu $(PKG)_IGNORE := -$(PKG)_VERSION := 68.2-1 -$(PKG)_CHECKSUM := f6db549ca8e4b74350321379cd01a1fb8c410053 +$(PKG)_VERSION := 71.1-2 +$(PKG)_CHECKSUM := 53c88a1f5a9994e6b49e6e0917f6150fb187b761 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-info.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-info.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-info $(PKG)_NAME := texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7-3 -$(PKG)_CHECKSUM := f20e8d34521526b58cfda23da6038513c68e0258 +$(PKG)_VERSION := 6.8-5 +$(PKG)_CHECKSUM := 545ee76c414454b8b175d21b68344dc1c005b043 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-keyring.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-keyring.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-keyring $(PKG)_NAME := msys2-keyring $(PKG)_IGNORE := -$(PKG)_VERSION := r9.397a52e-1 -$(PKG)_CHECKSUM := 9d1078c01686517816f98ab1142bfe5a07103694 +$(PKG)_VERSION := 1~20220623-1 +$(PKG)_CHECKSUM := f53e22863ec84b082105606973417780dab6eff3 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-less.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-less.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-less $(PKG)_NAME := less $(PKG)_IGNORE := -$(PKG)_VERSION := 581-1 -$(PKG)_CHECKSUM := 3265c0e4f42d9bcc8495a6e678857d9dfc03308b +$(PKG)_VERSION := 608-2 +$(PKG)_CHECKSUM := 0ef364cd3b2c25580dafe4c995731dc15e7bab2e $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libassuan.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libassuan.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libassuan $(PKG)_NAME := libassuan $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.5-1 -$(PKG)_CHECKSUM := def7ff35430354e22bcdd3a0cd08cdb98b342186 +$(PKG)_VERSION := 2.5.5-2 +$(PKG)_CHECKSUM := 31be8f746eddf218efcac1c155a964516609f9a5 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libbz2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libbz2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libbz2 $(PKG)_NAME := bzip2 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.8-2 -$(PKG)_CHECKSUM := 495dcb453fbfa290fb20e5056cd5033746fdc9a3 +$(PKG)_VERSION := 1.0.8-4 +$(PKG)_CHECKSUM := 5fe7ee808a834e314f27fdc6d1a86595474449fe $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libcrypt.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libcrypt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libcrypt $(PKG)_NAME := libcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1-3 -$(PKG)_CHECKSUM := cd9b8cb9a3a6f97b5acd84efd85c1b65ef8f40f7 +$(PKG)_VERSION := 2.1-4 +$(PKG)_CHECKSUM := 64e2e2d09f8be857dea75a49680f6f4b44939102 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libexpat.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libexpat.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libexpat $(PKG)_NAME := expat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.0-1 -$(PKG)_CHECKSUM := e3e72749215f2db69b4558fdb7284da08720965c +$(PKG)_VERSION := 2.4.9-1 +$(PKG)_CHECKSUM := 8e25d121d24584538c24fc24879350128bcc0575 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libffi.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libffi.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libffi $(PKG)_NAME := libffi $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3-1 -$(PKG)_CHECKSUM := 803b155adca54e5361c697b2b32fbf1f43ff400d +$(PKG)_VERSION := 3.4.3-1 +$(PKG)_CHECKSUM := 16c37eccbf5e8da048de6f7d18d444144d0b1a7a $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libgcrypt.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libgcrypt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libgcrypt $(PKG)_NAME := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9.2-1 -$(PKG)_CHECKSUM := bd4a4ba87efd902adbc766272c09ba97d50579c7 +$(PKG)_VERSION := 1.10.1-5 +$(PKG)_CHECKSUM := 8bcc3d372a608b90b85946685511fdb9ffb6cb7b $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libgnutls.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libgnutls.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libgnutls $(PKG)_NAME := gnutls $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.2-1 -$(PKG)_CHECKSUM := 76cc5c3ac8e8f9e1636b1b6ac8579c64bc0aa0bf +$(PKG)_VERSION := 3.7.8-1 +$(PKG)_CHECKSUM := a2562743015fec3210d0bbffdb29ce6ca640a00a $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libgpg-error.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libgpg-error.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libgpg-error $(PKG)_NAME := libgpg-error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.42-1 -$(PKG)_CHECKSUM := 581584628071c586109d4c9cf59e23a4cc99e1fe +$(PKG)_VERSION := 1.46-2 +$(PKG)_CHECKSUM := cd1b88fdbd36651d747388e7480690ea2e79df0a $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libgpgme.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libgpgme.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libgpgme $(PKG)_NAME := gpgme $(PKG)_IGNORE := -$(PKG)_VERSION := 1.16.0-1 -$(PKG)_CHECKSUM := 0752ca3bd16567beb6894c24a1876e84c82e14a6 +$(PKG)_VERSION := 1.18.0-1 +$(PKG)_CHECKSUM := d0b87db985c697d0402e608da24fe55d8beaf8b2 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libhogweed.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libhogweed.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libhogweed $(PKG)_NAME := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.3-1 -$(PKG)_CHECKSUM := 87913feed891b81342e6c4c001e064f314e35261 +$(PKG)_VERSION := 3.8.1-1 +$(PKG)_CHECKSUM := cf15540413967bb3e2d10d9b46adcea893dc6403 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libiconv.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libiconv.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libiconv $(PKG)_NAME := libiconv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.16-2 -$(PKG)_CHECKSUM := ca06d6e8e87c726448fa76829415e0f5f6dc4c64 +$(PKG)_VERSION := 1.17-1 +$(PKG)_CHECKSUM := d637f9a3c8774a3644dd5d8b4a8fafd34de1ca86 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libidn2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libidn2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libidn2 $(PKG)_NAME := libidn2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.1-2 -$(PKG)_CHECKSUM := 5ed012b731189c6272b3207bacddd0b3198b2332 +$(PKG)_VERSION := 2.3.3-1 +$(PKG)_CHECKSUM := ac0333f3c40aeec691ccbf09ae35742bd7ecf3a0 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libintl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libintl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libintl $(PKG)_NAME := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.8.1-1 -$(PKG)_CHECKSUM := 2f5333778765ac2c616da3a1f13c327c54b87085 +$(PKG)_VERSION := 0.21-2 +$(PKG)_CHECKSUM := 3eeff5b551951146daeb8d1d7dd68379940d4a58 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libksba.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libksba.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libksba $(PKG)_NAME := libksba $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.0-1 -$(PKG)_CHECKSUM := 35aff45eed190e57956e7abf47194a69c3c83540 +$(PKG)_VERSION := 1.6.2-1 +$(PKG)_CHECKSUM := a57f6992b341fa593883dd24f677bbadc9e984b3 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-liblzma.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-liblzma.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-liblzma $(PKG)_NAME := xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.5-1 -$(PKG)_CHECKSUM := 73208ab9831476e0b14dbf846a01c704beab5f67 +$(PKG)_VERSION := 5.2.7-1 +$(PKG)_CHECKSUM := e511805580e9a6ab42055e0e594088fdc3ce9a08 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libnettle.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libnettle.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libnettle $(PKG)_NAME := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7.3-1 -$(PKG)_CHECKSUM := 87913feed891b81342e6c4c001e064f314e35261 +$(PKG)_VERSION := 3.8.1-1 +$(PKG)_CHECKSUM := cf15540413967bb3e2d10d9b46adcea893dc6403 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libopenssl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libopenssl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libopenssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.k-1 -$(PKG)_CHECKSUM := 5471494f73c19025778809963cd508c3f6af38d7 +$(PKG)_VERSION := 1.1.1.q-1 +$(PKG)_CHECKSUM := 46614def624db74ad8b3713a969bf836209fea90 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libp11-kit.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libp11-kit.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libp11-kit $(PKG)_NAME := p11-kit $(PKG)_IGNORE := -$(PKG)_VERSION := 0.23.22-2 -$(PKG)_CHECKSUM := 156ab765aa07164231629a8d1d161d6dbf9e5e00 +$(PKG)_VERSION := 0.24.1-4 +$(PKG)_CHECKSUM := 1e5c0177c046c5d66088c063723c5df9a36cd7db $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libpcre2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libpcre2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libpcre2 $(PKG)_NAME := pcre2 $(PKG)_IGNORE := -$(PKG)_VERSION := 10.37-1 -$(PKG)_CHECKSUM := b3c9231489becbcf47ba02ab7c1108e0b636e1e7 +$(PKG)_VERSION := 10.40-1 +$(PKG)_CHECKSUM := 943d6387a67d27a1e75e55571e0f6cf74294c011 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libpsl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libpsl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libpsl $(PKG)_NAME := libpsl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1-2 -$(PKG)_CHECKSUM := a7a1626ecf9171b3d90a39140e8405a7813f59c2 +$(PKG)_VERSION := 0.21.1-4 +$(PKG)_CHECKSUM := f31b9076e4bb77b3be98fba3d0cf43aa43e5ee41 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libreadline.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libreadline.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libreadline $(PKG)_NAME := readline $(PKG)_IGNORE := -$(PKG)_VERSION := 8.1.0-1 -$(PKG)_CHECKSUM := 13144f681ae400bb9b06294558a9ca05c8fbf043 +$(PKG)_VERSION := 8.1.002-2 +$(PKG)_CHECKSUM := 9d88b538ab0521e869cec985af5ed568214fa2a5 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libsqlite.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libsqlite.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libsqlite $(PKG)_NAME := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.36.0-1 -$(PKG)_CHECKSUM := 68940fa61e04f3cac5b616282eb4cfb05e6bd408 +$(PKG)_VERSION := 3.39.4-1 +$(PKG)_CHECKSUM := 15df1827b17133bdd82c10cc80e99b67de0852f2 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libtasn1.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libtasn1.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libtasn1 $(PKG)_NAME := libtasn1 $(PKG)_IGNORE := -$(PKG)_VERSION := 4.17.0-2 -$(PKG)_CHECKSUM := 9a617aeea9dc603d96270220ea179c8ad58ca37a +$(PKG)_VERSION := 4.19.0-1 +$(PKG)_CHECKSUM := 6a318395f620c13ed21cbf07a911665311ef9705 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libunistring.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libunistring.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libunistring $(PKG)_NAME := libunistring $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.10-1 -$(PKG)_CHECKSUM := 5add3e7f5ac3c8491908cdd4461b4de1b681b6e5 +$(PKG)_VERSION := 1.0-1 +$(PKG)_CHECKSUM := 51c5ac598e77989162567549f13717445e029f45 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libxml2.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libxml2.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libxml2 $(PKG)_NAME := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.10-9 -$(PKG)_CHECKSUM := 41e864c7f32763dee80891ece64c670d37e039ff +$(PKG)_VERSION := 2.10.2-1 +$(PKG)_CHECKSUM := 94b576e0706341710eb3a84006d630a3158ba393 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-libxslt.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-libxslt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-libxslt $(PKG)_NAME := libxslt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.34-4 -$(PKG)_CHECKSUM := d46c35bede215c76ff0f704790933aef039b6891 +$(PKG)_VERSION := 1.1.37-1 +$(PKG)_CHECKSUM := 8bf383550a1731426fbd374f3f752610a6ba0225 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-make.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-make.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-make $(PKG)_NAME := make $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3-1 -$(PKG)_CHECKSUM := b6ba45538bfecb9ac1848b7ef97b713f103eee4e +$(PKG)_VERSION := 4.3-3 +$(PKG)_CHECKSUM := 71f70d44070576f5896a2b83fe8729d249830bd2 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-mintty.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-mintty.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,11 +4,11 @@ PKG := src-msys2-mintty $(PKG)_NAME := mintty $(PKG)_IGNORE := -$(PKG)_VERSION := 1~3.5.0-1 +$(PKG)_VERSION := 1~3.6.1-2 $(PKG)_FILTER := mintty-1~ -$(PKG)_CHECKSUM := b99e1ece695a09c5c7096f9bc1e053df4b0eb875 +$(PKG)_CHECKSUM := ba749018cd2b0af6b668d9a4ffd016ef2f62ad5c $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-mpfr.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-mpfr.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-mpfr $(PKG)_NAME := mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.0-1 -$(PKG)_CHECKSUM := 40957fdcc2c1da6c09947e2597af236f0bf7a36f +$(PKG)_VERSION := 4.1.0.p13-1 +$(PKG)_CHECKSUM := d76bfa28c4a493749115cf2159e2fa8e3dc4e018 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-ncurses.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-ncurses.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-ncurses $(PKG)_NAME := ncurses $(PKG)_IGNORE := -$(PKG)_VERSION := 6.2-1 -$(PKG)_CHECKSUM := ba76badfafb9dd3e3609b400636bec58c43d08f1 +$(PKG)_VERSION := 6.3-3 +$(PKG)_CHECKSUM := 0f73498b362ef15c5928cf2e1a143a815f9b3779 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-openssl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-openssl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-openssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.k-1 -$(PKG)_CHECKSUM := 5471494f73c19025778809963cd508c3f6af38d7 +$(PKG)_VERSION := 1.1.1.q-1 +$(PKG)_CHECKSUM := 46614def624db74ad8b3713a969bf836209fea90 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-p11-kit.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-p11-kit.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-p11-kit $(PKG)_NAME := p11-kit $(PKG)_IGNORE := -$(PKG)_VERSION := 0.23.22-2 -$(PKG)_CHECKSUM := 156ab765aa07164231629a8d1d161d6dbf9e5e00 +$(PKG)_VERSION := 0.24.1-4 +$(PKG)_CHECKSUM := 1e5c0177c046c5d66088c063723c5df9a36cd7db $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-pacman-mirrors.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-pacman-mirrors.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-pacman-mirrors $(PKG)_NAME := pacman-mirrors $(PKG)_IGNORE := -$(PKG)_VERSION := 20210703-1 -$(PKG)_CHECKSUM := 9a40f5bf7b2ebbc6ac5b6ff53aba3adfa01dd234 +$(PKG)_VERSION := 20220205-1 +$(PKG)_CHECKSUM := 2665c4a8b43fa998dc8025cb7874186fba1bf245 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-pacman.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-pacman.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-pacman $(PKG)_NAME := pacman $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.0-4 -$(PKG)_CHECKSUM := 4d31244edc695a6c91514a4e30c5120be3560486 +$(PKG)_VERSION := 6.0.1-18 +$(PKG)_CHECKSUM := 5e0b9710d5dbfe7bc83448c4146e0ac6d63127ea $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-perl.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-perl.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-perl $(PKG)_NAME := perl $(PKG)_IGNORE := -$(PKG)_VERSION := 5.32.1-1 -$(PKG)_CHECKSUM := da18194800b255080fe85723a1f31a1d32a05faf +$(PKG)_VERSION := 5.32.1-2 +$(PKG)_CHECKSUM := 8b0aa25b9958609978cecac9bdcd9f71e97a41d0 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE)
--- a/src/src-msys2-python.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-python.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-python $(PKG)_NAME := python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.9.5-1 -$(PKG)_CHECKSUM := 1491bb730710db207210148fdb744ddb3ce7719c +$(PKG)_VERSION := 3.10.6-1 +$(PKG)_CHECKSUM := 3ce08a7715c8be89cc32995dc8875ab1a4dce7a6 $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-runtime.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-runtime.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-runtime $(PKG)_NAME := msys2-runtime $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.0-14 -$(PKG)_CHECKSUM := 7cec9abb7889a332730d363611bafc1a6b20dbf3 +$(PKG)_VERSION := 3.3.6-2 +$(PKG)_CHECKSUM := ba16e0d999630456c1cc121f5feb24be2e8efbaa $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-sed.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-sed.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-sed $(PKG)_NAME := sed $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8-1 -$(PKG)_CHECKSUM := 2dd248d922ffde2214b0da4543cc00593ab26932 +$(PKG)_VERSION := 4.8-3 +$(PKG)_CHECKSUM := 638fb77b52d68c9c7f0a3fc2cfc915cad8f7fb5d $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-tar.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-tar.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-tar $(PKG)_NAME := tar $(PKG)_IGNORE := -$(PKG)_VERSION := 1.34-1 -$(PKG)_CHECKSUM := 7b38d42e46e61731db29cef0cb6b4688960017b0 +$(PKG)_VERSION := 1.34-3 +$(PKG)_CHECKSUM := eae38c62fbdc196c3e9f4d3b2f9f57725a7b873b $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-wget.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-wget.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-wget $(PKG)_NAME := wget $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21.1-2 -$(PKG)_CHECKSUM := 9de5090aa3dbdb426723062c9c6164b5f38c971f +$(PKG)_VERSION := 1.21.3-1 +$(PKG)_CHECKSUM := 1efe472e1a166c06fcc9e314c156f5902ac19dce $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-which.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-which.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-which $(PKG)_NAME := which $(PKG)_IGNORE := -$(PKG)_VERSION := 2.21-2 -$(PKG)_CHECKSUM := f18972325d78ab3ca79e3f426ec450de6636c263 +$(PKG)_VERSION := 2.21-4 +$(PKG)_CHECKSUM := 80d15322e8b8b6098e1abc5dce05292a44f314ac $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/src-msys2-zlib.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/src-msys2-zlib.mk Wed Nov 16 08:27:17 2022 +0100 @@ -4,10 +4,10 @@ PKG := src-msys2-zlib $(PKG)_NAME := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.11-1 -$(PKG)_CHECKSUM := 90c0447c65b09549181b90840378305b05a7695b +$(PKG)_VERSION := 1.2.12-2 +$(PKG)_CHECKSUM := 9e59676213634a7b0b65406318d093f05c7d4fbd $(PKG)_SUBDIR := -$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.gz +$(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) $(PKG)_DEPS :=
--- a/src/suitesparse-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/suitesparse-1-fixes.patch Wed Nov 16 08:27:17 2022 +0100 @@ -15,19 +15,15 @@ index 1111111..2222222 100644 --- a/SuiteSparse_config/SuiteSparse_config.mk +++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -429,10 +429,8 @@ SO_OPTS = $(LDFLAGS) +@@ -440,7 +441,7 @@ SO_OPTS = $(LDFLAGS) ifeq ($(UNAME),Windows) - # Cygwin Make on Windows (untested) + # Cygwin Make on Windows - AR_TARGET = $(LIBRARY).lib -- SO_PLAIN = $(LIBRARY).dll -- SO_MAIN = $(LIBRARY).$(SO_VERSION).dll -- SO_TARGET = $(LIBRARY).$(VERSION).dll + AR_TARGET = $(LIBRARY).a -+ SO_TARGET = $(LIBRARY).dll - SO_INSTALL_NAME = echo - else - # Mac or Linux/Unix + SO_TARGET = $(LIBRARY).dll + # The following two links are just garbage copies of the real target + # they aren't actually supported by this OS From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> @@ -592,11 +588,10 @@ $(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h $(RM) $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt ( cd xerbla ; $(MAKE) uninstall ) -diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk -index 1111111..2222222 100644 ---- a/SuiteSparse_config/SuiteSparse_config.mk -+++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -54,6 +54,7 @@ SUITESPARSE_VERSION = 4.5.6 +diff -urN SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk +--- SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig 2022-03-15 00:33:19.000000000 +0100 ++++ SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk 2022-03-20 13:25:30.876107144 +0100 +@@ -73,6 +73,7 @@ # and documentation in /solo/mydox. INSTALL ?= $(SUITESPARSE) INSTALL_LIB ?= $(INSTALL)/lib @@ -604,29 +599,35 @@ INSTALL_INCLUDE ?= $(INSTALL)/include INSTALL_DOC ?= $(INSTALL)/share/doc/suitesparse-$(SUITESPARSE_VERSION) -@@ -339,7 +340,7 @@ SUITESPARSE_VERSION = 4.5.6 - +@@ -349,7 +350,7 @@ ifeq ($(UNAME),Linux) - # add the realtime library, librt, and SuiteSparse/lib -- LDLIBS += -lrt -Wl,-rpath=$(INSTALL_LIB) -+ LDLIBS += -lrt -Wl,-rpath=$(INSTALL_SO) + # add the posix realtime extensions library: librt + LDLIBS += -lrt +- LDFLAGS += -Wl,-rpath=$(INSTALL_LIB) ++ LDFLAGS += -Wl,-rpath=$(INSTALL_SO) endif #--------------------------------------------------------------------------- -@@ -428,10 +429,11 @@ SUITESPARSE_VERSION = 4.5.6 - SO_OPTS = $(LDFLAGS) +@@ -365,7 +366,7 @@ + LAPACK ?= -framework Accelerate + # OpenMP is not yet supported by default in clang + CFOPENMP = +- LDLIBS += -rpath $(INSTALL_LIB) ++ LDLIBS += -rpath $(INSTALL_SO) + endif - ifeq ($(UNAME),Windows) -- # Cygwin Make on Windows (untested) - AR_TARGET = $(LIBRARY).a - SO_TARGET = $(LIBRARY).dll - SO_INSTALL_NAME = echo + #--------------------------------------------------------------------------- +@@ -446,7 +447,8 @@ + # they aren't actually supported by this OS + SO_MAIN = $(LIBRARY).$(SO_VERSION).dll + SO_PLAIN = $(LIBRARY).$(VERSION).dll +- SO_OPTS += -shared + SO_OPTS += -shared -Wl,--out-implib,$(INSTALL_LIB)/$(LIBRARY).dll.a + INSTALL_SO = $(INSTALL)/bin + SO_INSTALL_NAME = echo else # Mac or Linux/Unix - AR_TARGET = $(LIBRARY).a -@@ -550,6 +552,7 @@ config: +@@ -568,6 +570,7 @@ @echo 'System: UNAME= ' '$(UNAME)' @echo 'Install directory: INSTALL= ' '$(INSTALL)' @echo 'Install libraries in: INSTALL_LIB= ' '$(INSTALL_LIB)' @@ -696,34 +697,63 @@ $(RM) $(INSTALL_INCLUDE)/umfpack*.h $(RM) $(INSTALL_DOC)/UMFPACK_UserGuide.pdf $(RM) $(INSTALL_DOC)/UMFPACK_QuickStart.pdf - ---- a/Makefile 2019-12-22 12:17:36.147324000 +0100 -+++ b/Makefile 2019-12-22 12:23:59.027388353 +0100 -@@ -12,7 +12,6 @@ - # Compile the default rules for each package +diff -urN SuiteSparse-5.11.0/Makefile.orig SuiteSparse-5.11.0/Makefile +--- SuiteSparse-5.11.0/Makefile.orig 2022-03-15 00:33:19.000000000 +0100 ++++ SuiteSparse-5.11.0/Makefile 2022-03-20 13:51:19.924606309 +0100 +@@ -16,7 +16,6 @@ + # installs all libraries SuiteSparse/lib. go: metis ( cd SuiteSparse_config && $(MAKE) ) -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) ( cd AMD && $(MAKE) ) ( cd BTF && $(MAKE) ) ( cd CAMD && $(MAKE) ) -@@ -38,7 +37,6 @@ +@@ -34,7 +33,6 @@ + ( cd GPUQREngine && $(MAKE) ) + endif + ( cd SPQR && $(MAKE) ) +- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) + ( cd SLIP_LU && $(MAKE) ) + # ( cd PIRO_BAND && $(MAKE) ) + # ( cd SKYLINE_SVD && $(MAKE) ) +@@ -44,9 +42,8 @@ + # sudo make install INSTALL=/usr/local + # See SuiteSparse/README.md for more details. # (note that CSparse is not installed; CXSparse is installed instead) - install: metisinstall +-install: metisinstall gbinstall moninstall ++install: metisinstall ( cd SuiteSparse_config && $(MAKE) install ) -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) +- # ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) ( cd AMD && $(MAKE) install ) ( cd BTF && $(MAKE) install ) ( cd CAMD && $(MAKE) install ) -@@ -85,7 +83,6 @@ +@@ -63,7 +60,6 @@ + ( cd GPUQREngine && $(MAKE) install ) + endif + ( cd SPQR && $(MAKE) install ) +- # ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) + # ( cd PIRO_BAND && $(MAKE) install ) + # ( cd SKYLINE_SVD && $(MAKE) install ) + ( cd SLIP_LU && $(MAKE) install ) +@@ -76,7 +72,7 @@ + @mkdir -p $(INSTALL_LIB) + @mkdir -p $(INSTALL_INCLUDE) + @mkdir -p $(INSTALL_DOC) +- - $(CP) lib/libmetis.* $(INSTALL_SO) ++ - $(CP) lib/libmetis.* $(INSTALL_SO) + - $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf + - $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt + # the following is needed only on the Mac, so *.dylib is hardcoded: +@@ -93,8 +89,6 @@ + $(RM) $(INSTALL_DOC)/SuiteSparse_README.md ( cd SuiteSparse_config && $(MAKE) uninstall ) - ( cd metis-5.1.0 && $(MAKE) uninstall ) - - ( cd GraphBLAS && $(MAKE) uninstall ) +- - ( cd GraphBLAS && $(MAKE) uninstall ) - - ( cd Mongoose && $(MAKE) uninstall ) ( cd AMD && $(MAKE) uninstall ) ( cd CAMD && $(MAKE) uninstall ) ( cd COLAMD && $(MAKE) uninstall ) -@@ -116,7 +113,6 @@ +@@ -126,7 +120,6 @@ # the static library library: metis ( cd SuiteSparse_config && $(MAKE) ) @@ -731,7 +761,15 @@ ( cd AMD && $(MAKE) library ) ( cd BTF && $(MAKE) library ) ( cd CAMD && $(MAKE) library ) -@@ -143,7 +139,6 @@ +@@ -144,7 +137,6 @@ + ( cd GPUQREngine && $(MAKE) library ) + endif + ( cd SPQR && $(MAKE) library ) +- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) + ( cd SLIP_LU && $(MAKE) library ) + # ( cd PIRO_BAND && $(MAKE) library ) + # ( cd SKYLINE_SVD && $(MAKE) library ) +@@ -154,7 +146,6 @@ # both the dynamic and static libraries. static: metis ( cd SuiteSparse_config && $(MAKE) static ) @@ -739,28 +777,38 @@ ( cd AMD && $(MAKE) static ) ( cd BTF && $(MAKE) static ) ( cd CAMD && $(MAKE) static ) -@@ -171,7 +166,6 @@ +@@ -172,7 +163,6 @@ + ( cd GPUQREngine && $(MAKE) static ) + endif + ( cd SPQR && $(MAKE) static ) +- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) + ( cd SLIP_LU && $(MAKE) static ) + # ( cd PIRO_BAND && $(MAKE) static ) + # ( cd SKYLINE_SVD && $(MAKE) static ) +@@ -182,8 +172,6 @@ + - ( cd SuiteSparse_config && $(MAKE) purge ) - ( cd metis-5.1.0 && $(MAKE) distclean ) - ( cd AMD && $(MAKE) purge ) - - ( cd GraphBLAS && $(MAKE) purge ) +- - ( cd GraphBLAS && $(MAKE) purge ) - - ( cd Mongoose && $(MAKE) purge ) - ( cd CAMD && $(MAKE) purge ) - ( cd COLAMD && $(MAKE) purge ) - ( cd BTF && $(MAKE) purge ) -@@ -198,7 +192,6 @@ +@@ -210,8 +198,6 @@ + clean: - ( cd SuiteSparse_config && $(MAKE) clean ) - ( cd metis-5.1.0 && $(MAKE) clean ) - - ( cd GraphBLAS && $(MAKE) clean ) +- - ( cd GraphBLAS && $(MAKE) clean ) - - ( cd Mongoose && $(MAKE) clean ) - ( cd AMD && $(MAKE) clean ) - ( cd CAMD && $(MAKE) clean ) - ( cd COLAMD && $(MAKE) clean ) -@@ -220,7 +213,6 @@ +@@ -233,8 +219,6 @@ + # Create the PDF documentation docs: - ( cd GraphBLAS && $(MAKE) docs ) +- ( cd GraphBLAS && $(MAKE) docs ) - ( cd Mongoose && $(MAKE) docs ) ( cd AMD && $(MAKE) docs ) ( cd CAMD && $(MAKE) docs ) ( cd KLU && $(MAKE) docs ) -
--- a/src/suitesparse.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/suitesparse.mk Wed Nov 16 08:27:17 2022 +0100 @@ -2,14 +2,14 @@ # See index.html for further information. PKG := suitesparse -$(PKG)_VERSION := 5.7.2 -$(PKG)_CHECKSUM := ccc50177425d0d9bfe878786b8f2729c247efa90 +$(PKG)_VERSION := 5.13.0 +$(PKG)_CHECKSUM := 71963dec82e46226eb329432069a916144fa4d98 $(PKG)_SUBDIR := SuiteSparse-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := blas lapack ifeq ($(USE_SYSTEM_GCC),no) - $(PKG)_DEPS += libgomp + $(PKG)_DEPS += libgomp mpfr endif ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -19,9 +19,7 @@ endif define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/DrTimothyAldenDavis/SuiteSparse/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,DrTimothyAldenDavis,SuiteSparse,v) endef
--- a/src/sundials-ida.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/sundials-ida.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := sundials-ida $(PKG)_IGNORE := -$(PKG)_VERSION := 5.7.0 -$(PKG)_CHECKSUM := c04ecc9102851955b62e626a43ad5f604e890ab0 +$(PKG)_VERSION := 6.4.1 +$(PKG)_CHECKSUM := ce47e85aed90ddf95bf40b70842a29d1255666d2 $(PKG)_SUBDIR := sundials-$($(PKG)_VERSION) $(PKG)_FILE := sundials-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/LLNL/sundials/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -14,8 +14,7 @@ endif define $(PKG)_UPDATE - echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; - echo $($(PKG)_VERSION) + $(call GITHUB_PKG_UPDATE,LLNL,sundials,v) endef ifeq ($(MXE_WINDOWS_BUILD),yes)
--- a/src/texinfo.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/texinfo.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := texinfo $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7 -$(PKG)_CHECKSUM := 3eb87fe3f4241ba4305255f8a47d867dbc4f96fc +$(PKG)_VERSION := 6.8 +$(PKG)_CHECKSUM := 37f5ff5f748fb11bcbd57b82f3fdb5c365e82d61 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
--- a/src/tiff.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/tiff.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := tiff $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3.0 -$(PKG)_CHECKSUM := c03f6cb05b64ff496b3a5c733a0af6296aead051 +$(PKG)_VERSION := 4.4.0 +$(PKG)_CHECKSUM := e11d05db71d243a62800b4bf4479eb4859714405 $(PKG)_SUBDIR := tiff-$($(PKG)_VERSION) $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/libtiff/$($(PKG)_FILE)
--- a/src/units.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/units.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := units $(PKG)_IGNORE := -$(PKG)_VERSION := 2.21 -$(PKG)_CHECKSUM := a897e639111c9400737b68ec22e5f70eaf5d7253 +$(PKG)_VERSION := 2.22 +$(PKG)_CHECKSUM := 586f71c3e51e0bed77cf7751de333c43e347f78e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
--- a/src/vorbis.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/vorbis.mk Wed Nov 16 08:27:17 2022 +0100 @@ -21,6 +21,7 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ + --disable-docs --disable-examples \ PKG_CONFIG='$(MXE_PKG_CONFIG)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' endef
--- a/src/wt.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/wt.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,10 +11,7 @@ $(PKG)_DEPS := boost openssl libharu graphicsmagick pango postgresql sqlite define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/emweb/wt/tags' | \ - $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \ - $(SORT) -Vr | \ - head -1 + $(call GITHUB_PKG_UPDATE,emweb,wt,) endef define $(PKG)_BUILD
--- a/src/wxwidgets-1-fixes.patch Wed Nov 16 08:25:43 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,192 +0,0 @@ -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: darealshinji <djcj@gmx.de> -Date: Fri, 26 May 2017 09:33:22 +0200 -Subject: [PATCH 1/2] make it possible to install DLLs into $(libdir)/../bin - - -diff --git a/Makefile.in b/Makefile.in -index 1111111..2222222 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -15523,7 +15523,7 @@ distclean: clean - @COND_MONOLITHIC_1_SHARED_1@install_monodll: $(__monodll___depname) - @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_1_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_1_SHARED_1@uninstall_monodll: -@@ -15558,7 +15558,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1@install_basedll: $(__basedll___depname) - @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1@uninstall_basedll: -@@ -15595,7 +15595,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1@install_netdll: $(__netdll___depname) - @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1@uninstall_netdll: -@@ -15632,7 +15632,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: $(__coredll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_coredll: -@@ -15669,7 +15669,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: $(__advdll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_advdll: -@@ -15706,7 +15706,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll: $(__mediadll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@uninstall_mediadll: -@@ -15743,7 +15743,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll: $(__htmldll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@uninstall_htmldll: -@@ -15780,7 +15780,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@install_webviewdll: $(__webviewdll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ (cd $(DESTDIR)$(libdir) ; $(__webviewdll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@uninstall_webviewdll: -@@ -15817,7 +15817,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll: $(__qadll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@uninstall_qadll: -@@ -15854,7 +15854,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1@install_xmldll: $(__xmldll___depname) - @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1@uninstall_xmldll: -@@ -15891,7 +15891,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll: $(__xrcdll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@uninstall_xrcdll: -@@ -15928,7 +15928,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll: $(__auidll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@uninstall_auidll: -@@ -15965,7 +15965,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@install_ribbondll: $(__ribbondll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ (cd $(DESTDIR)$(libdir) ; $(__ribbondll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@uninstall_ribbondll: -@@ -16002,7 +16002,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@install_propgriddll: $(__propgriddll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ (cd $(DESTDIR)$(libdir) ; $(__propgriddll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@uninstall_propgriddll: -@@ -16039,7 +16039,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll: $(__richtextdll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@uninstall_richtextdll: -@@ -16076,7 +16076,7 @@ distclean: clean - @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll: $(__stcdll___depname) - @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) - - @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@uninstall_stcdll: -@@ -16113,7 +16113,7 @@ distclean: clean - @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: $(__gldll___depname) - @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) - @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) --@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) -+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)$(DLLDEST) - @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd)) - - @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@uninstall_gldll: - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Maarten Bent <MaartenBent@users.noreply.github.com> -Date: Thu, 16 Aug 2018 20:08:56 +0200 -Subject: [PATCH 2/2] Fix c++11-narrowing error when using clang on Windows - -Case value 0xfffffd9f results in the following error: -error: case value evaluates to 4294966687, which cannot be narrowed to type -'DISPID' (aka 'long') [-Wc++11-narrowing] - -diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp -index 1111111..2222222 100644 ---- a/src/msw/mediactrl_am.cpp -+++ b/src/msw/mediactrl_am.cpp -@@ -2179,7 +2179,9 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y), - //--------------------------------------------------------------------------- - void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event) - { -- switch(event.GetDispatchId()) -+ // cast to unsigned long to fix narrowing error with case 0xfffffd9f -+ // when using clang -+ switch (static_cast<unsigned long>(event.GetDispatchId())) - { - #ifndef __WXWINCE__ - case 0x00000001: // statechange in IActiveMovie
--- a/src/wxwidgets.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/wxwidgets.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,17 +3,15 @@ PKG := wxwidgets $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.5.1 -$(PKG)_CHECKSUM := 406ac736f61d88a3a866aa501e01e408a642c6e7 +$(PKG)_VERSION := 3.2.1 +$(PKG)_CHECKSUM := b5299275abddc7cb5fa92f75c17475ade3bc0532 $(PKG)_SUBDIR := wxWidgets-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 $(PKG)_URL := https://github.com/wxWidgets/wxWidgets/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := libiconv libpng jpeg tiff sdl2 zlib expat define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com//wxWidgets/wxWidgets/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | grep -v '^3\.1' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,wxWidgets,wxWidgets,v) endef define $(PKG)_BUILD @@ -21,10 +19,9 @@ # build the wxWidgets variant without unicode support cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - $(ENABLE_SHARED_OR_STATIC) \ + $(if $(BUILD_SHARED),,--disable-shared) \ --prefix='$(HOST_PREFIX)' \ - --enable-compat24 \ - --enable-compat26 \ + --enable-compat28 \ --enable-gui \ --disable-stl \ --enable-threads \ @@ -41,20 +38,11 @@ --with-expat=sys \ --with-sdl \ --without-gtk \ - --without-motif \ - --without-mac \ --without-macosx-sdk \ - --without-cocoa \ - --without-wine \ - --without-pm \ - --without-microwin \ --without-libxpm \ --without-libmspack \ - --without-gnomeprint \ --without-gnomevfs \ - --without-hildon \ --without-dmalloc \ - --without-odbc \ LIBS=" `'$(MXE_PKG_CONFIG)' --libs-only-l libtiff-4`" \ CXXFLAGS='-std=gnu++11' \ CXXCPP='$(MXE_CXX) -E -std=gnu++11' @@ -64,7 +52,5 @@ $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) __install_wxrc___depname= $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)wx-config' - mv $(HOST_LIBDIR)/wxbase30*.dll $(HOST_BINDIR)/ - mv $(HOST_LIBDIR)/wxmsw30*.dll $(HOST_BINDIR)/ endef
--- a/src/x264.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/x264.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := x264 $(PKG)_IGNORE := -$(PKG)_VERSION := 20141130-2245 -$(PKG)_CHECKSUM := e2a4f5dd0a773a3e89f7c5cf1b3d2efc95f282b8 +$(PKG)_VERSION := 20191217-2245 +$(PKG)_CHECKSUM := f2c36c5a2e81eb0456af4e1f06b827d98ccc6c18 $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE)
--- a/src/xkbcommon.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/xkbcommon.mk Wed Nov 16 08:27:17 2022 +0100 @@ -22,6 +22,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ + --disable-selective-werror \ && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/xvidcore.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/xvidcore.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,16 +3,17 @@ PKG := xvidcore $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.3 -$(PKG)_CHECKSUM := 465763c92679ca230526d4890d17dbf6d6974b08 +$(PKG)_VERSION := 1.3.7 +$(PKG)_CHECKSUM := e6f2f5a65bccdf8d2413557df7ba6d31b7ac9be3 $(PKG)_SUBDIR := xvidcore/build/generic $(PKG)_FILE := xvidcore-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://downloads.xvid.org/downloads/$($(PKG)_FILE) +$(PKG)_URL := https://downloads.xvid.com/downloads/$($(PKG)_FILE) $(PKG)_DEPS := pthreads define $(PKG)_UPDATE - echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; - echo $($(PKG)_VERSION) + $(WGET) -q -O- 'https://labs.xvid.com/source/' | \ + $(SED) -n 's,.*xvidcore-\([0-9][^ ]*\)\.tar.*,\1,p' | \ + head -1 endef ifeq ($(MXE_NATIVE_BUILD),no)
--- a/src/xz.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/xz.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := xz $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.5 -$(PKG)_CHECKSUM := 0b9d1e06b59f7fe0796afe1d93851b9306b4a3b6 +$(PKG)_VERSION := 5.2.7 +$(PKG)_CHECKSUM := 9a15569a7a969c03ae621c7ecbb29c187f59355e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://tukaani.org/xz/$($(PKG)_FILE) @@ -17,7 +17,7 @@ endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(1)' && autoreconf -fi && EGREP=$(EGREP) ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \
--- a/src/yasm.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/yasm.mk Wed Nov 16 08:27:17 2022 +0100 @@ -10,9 +10,7 @@ $(PKG)_DEPS := define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/yasm/yasm/tags' | \ - $(SED) -n 's,.*href="/yasm/yasm/archive/v\([0-9][^"]*\)\.tar.*,\1,p' | \ - head -1 + $(call GITHUB_PKG_UPDATE,yasm,yasm,v) endef define $(PKG)_BUILD
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/zeromq-1.patch Wed Nov 16 08:27:17 2022 +0100 @@ -0,0 +1,132 @@ +Patch for GCC12 +diff --git a/doc/zmq_socket_monitor_versioned.txt b/doc/zmq_socket_monitor_versioned.txt +index 5339f404a4..e71dd3544d 100644 +--- a/doc/zmq_socket_monitor_versioned.txt ++++ b/doc/zmq_socket_monitor_versioned.txt +@@ -244,7 +244,7 @@ EXAMPLE + // in case of error. + + static uint64_t +-get_monitor_event (void *monitor, uint64_t *value, char **local_address, char **remote_address) ++get_monitor_event (void *monitor, uint64_t **value, char **local_address, char **remote_address) + { + // First frame in message contains event number + zmq_msg_t msg; +@@ -267,6 +267,11 @@ get_monitor_event (void *monitor, uint64_t *value, char **local_address, char ** + memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count)); + zmq_msg_close (&msg); + ++ if (value) { ++ *value = (uint64_t *) malloc (value_count * sizeof (uint64_t)); ++ assert (*value); ++ } ++ + for (uint64_t i = 0; i < value_count; ++i) { + // Subsequent frames in message contain event values + zmq_msg_init (&msg); +@@ -274,8 +279,8 @@ get_monitor_event (void *monitor, uint64_t *value, char **local_address, char ** + return -1; // Interrupted, presumably + assert (zmq_msg_more (&msg)); + +- if (value_ && value_ + i) +- memcpy (value_ + i, zmq_msg_data (&msg), sizeof (*value_)); ++ if (value && *value) ++ memcpy (&(*value)[i], zmq_msg_data (&msg), sizeof (uint64_t)); + zmq_msg_close (&msg); + } + +diff --git a/tests/test_monitor.cpp b/tests/test_monitor.cpp +index b9309e6df3..7398dbd8d0 100644 +--- a/tests/test_monitor.cpp ++++ b/tests/test_monitor.cpp +@@ -396,17 +396,19 @@ void test_monitor_versioned_stats (bind_function_t bind_function_, + for (int i = 0; i < pulls_count; ++i) { + char *push_local_address = NULL; + char *push_remote_address = NULL; +- uint64_t queue_stat[2]; ++ uint64_t *queue_stat = NULL; + int64_t event = get_monitor_event_v2 ( +- push_mon, queue_stat, &push_local_address, &push_remote_address); ++ push_mon, &queue_stat, &push_local_address, &push_remote_address); + TEST_ASSERT_EQUAL_STRING (server_endpoint, push_local_address); + TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, push_remote_address, + strlen (expected_prefix_)); + TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_PIPES_STATS, event); ++ TEST_ASSERT_NOT_NULL (queue_stat); + TEST_ASSERT_EQUAL_INT (i == 0 ? 0 : send_hwm, queue_stat[0]); + TEST_ASSERT_EQUAL_INT (0, queue_stat[1]); + free (push_local_address); + free (push_remote_address); ++ free (queue_stat); + } + + // Close client and server +diff --git a/tests/testutil_monitoring.cpp b/tests/testutil_monitoring.cpp +index 06406270a0..8668caee83 100644 +--- a/tests/testutil_monitoring.cpp ++++ b/tests/testutil_monitoring.cpp +@@ -207,7 +207,7 @@ int expect_monitor_event_multiple (void *server_mon_, + } + + static int64_t get_monitor_event_internal_v2 (void *monitor_, +- uint64_t *value_, ++ uint64_t **value_, + char **local_address_, + char **remote_address_, + int recv_flag_) +@@ -239,6 +239,12 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_, + memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count)); + zmq_msg_close (&msg); + ++ if (value_) { ++ *value_ = ++ (uint64_t *) malloc ((size_t) value_count * sizeof (uint64_t)); ++ TEST_ASSERT_NOT_NULL (*value_); ++ } ++ + for (uint64_t i = 0; i < value_count; ++i) { + // Subsequent frames in message contain event values + zmq_msg_init (&msg); +@@ -249,8 +255,8 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_, + TEST_ASSERT_TRUE (zmq_msg_more (&msg)); + TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg)); + +- if (value_ && value_ + i) +- memcpy (value_ + i, zmq_msg_data (&msg), sizeof (*value_)); ++ if (value_ && *value_) ++ memcpy (&(*value_)[i], zmq_msg_data (&msg), sizeof (uint64_t)); + zmq_msg_close (&msg); + } + +@@ -266,7 +272,7 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_, + } + + static int64_t get_monitor_event_with_timeout_v2 (void *monitor_, +- uint64_t *value_, ++ uint64_t **value_, + char **local_address_, + char **remote_address_, + int timeout_) +@@ -299,7 +305,7 @@ static int64_t get_monitor_event_with_timeout_v2 (void *monitor_, + } + + int64_t get_monitor_event_v2 (void *monitor_, +- uint64_t *value_, ++ uint64_t **value_, + char **local_address_, + char **remote_address_) + { +diff --git a/tests/testutil_monitoring.hpp b/tests/testutil_monitoring.hpp +index a69db29015..eb6817d3c1 100644 +--- a/tests/testutil_monitoring.hpp ++++ b/tests/testutil_monitoring.hpp +@@ -67,7 +67,7 @@ int expect_monitor_event_multiple (void *server_mon_, + bool optional_ = false); + + int64_t get_monitor_event_v2 (void *monitor_, +- uint64_t *value_, ++ uint64_t **value_, + char **local_address_, + char **remote_address_); + +
--- a/src/zeromq.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/zeromq.mk Wed Nov 16 08:27:17 2022 +0100 @@ -11,9 +11,7 @@ $(PKG)_DEPS := pthreads libsodium define $(PKG)_UPDATE - $(WGET) -q -O- 'https://github.com/zeromq/libzmq/tags' | \ - $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -V | \ - tail -1 + $(call GITHUB_PKG_UPDATE,zeromq,libzmq,v) endef define $(PKG)_BUILD
--- a/src/zlib-1-win32-static.patch Wed Nov 16 08:25:43 2022 +0100 +++ b/src/zlib-1-win32-static.patch Wed Nov 16 08:27:17 2022 +0100 @@ -25,21 +25,3 @@ echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ -diff --git a/configure b/configure -index e974d1f..f023947 100755 ---- a/configure -+++ b/configure -@@ -215,10 +215,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then - CYGWIN* | Cygwin* | cygwin* | OS/2*) - EXE='.exe' ;; - MINGW* | mingw*) --# temporary bypass - rm -f $test.[co] $test $test$shared_ext -- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log -- leave 1 - LDSHARED=${LDSHARED-"$cc -shared"} - LDSHAREDLIBC="" - EXE='.exe' ;; --- -2.9.3 -
--- a/src/zlib.mk Wed Nov 16 08:25:43 2022 +0100 +++ b/src/zlib.mk Wed Nov 16 08:27:17 2022 +0100 @@ -3,8 +3,8 @@ PKG := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.11 -$(PKG)_CHECKSUM := e1cb0d5c92da8e9a8c2635dfa249c341dfd00322 +$(PKG)_VERSION := 1.2.13 +$(PKG)_CHECKSUM := b459b42aa533968ae403c0002a255d62d3136954 $(PKG)_SUBDIR := zlib-$($(PKG)_VERSION) $(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://zlib.net/$($(PKG)_FILE)
--- a/tools/makeinst-script.sh.in Wed Nov 16 08:25:43 2022 +0100 +++ b/tools/makeinst-script.sh.in Wed Nov 16 08:27:17 2022 +0100 @@ -276,6 +276,97 @@ FunctionEnd ###################################################################### +# function based on code from http://forums.winamp.com/attachment.php?attachmentid=31680&d=1112381115 + +!macro VersionCompare_ un +Function \${un}VersionCompare_ + Exch \$1 + Exch + Exch \$0 + Exch + Push \$2 + Push \$3 + Push \$4 + Push \$5 + Push \$6 + Push \$7 + +begin: + StrCpy \$2 -1 + IntOp \$2 \$2 + 1 + StrCpy \$3 \$0 1 \$2 + StrCmp \$3 '' +2 + StrCmp \$3 '.' 0 -3 + StrCpy \$4 \$0 \$2 + IntOp \$2 \$2 + 1 + StrCpy \$0 \$0 '' \$2 + + StrCpy \$2 -1 + IntOp \$2 \$2 + 1 + StrCpy \$3 \$1 1 \$2 + StrCmp \$3 '' +2 + StrCmp \$3 '.' 0 -3 + StrCpy \$5 \$1 \$2 + IntOp \$2 \$2 + 1 + StrCpy \$1 \$1 '' \$2 + + StrCmp \$4\$5 '' equal + + StrCpy \$6 -1 + IntOp \$6 \$6 + 1 + StrCpy \$3 \$4 1 \$6 + StrCmp \$3 '0' -2 + StrCmp \$3 '' 0 +2 + StrCpy \$4 0 + + StrCpy \$7 -1 + IntOp \$7 \$7 + 1 + StrCpy \$3 \$5 1 \$7 + StrCmp \$3 '0' -2 + StrCmp \$3 '' 0 +2 + StrCpy \$5 0 + + StrCmp \$4 0 0 +2 + StrCmp \$5 0 begin newer2 + StrCmp \$5 0 newer1 + IntCmp \$6 \$7 0 newer1 newer2 + + StrCpy \$4 '1\$4' + StrCpy \$5 '1\$5' + IntCmp \$4 \$5 begin newer2 newer1 + +equal: + StrCpy \$0 0 + goto end +newer1: + StrCpy \$0 1 + goto end +newer2: + StrCpy \$0 2 + +end: + Pop \$7 + Pop \$6 + Pop \$5 + Pop \$4 + Pop \$3 + Pop \$2 + Pop \$1 + Exch \$0 +FunctionEnd +!macroend + +!insertmacro VersionCompare_ "un." +!insertmacro VersionCompare_ "" + +!macro VersionCompare un _VER1 _VER2 _RESULT + Push '\${_VER1}' + Push '\${_VER2}' + Call \${un}VersionCompare_ + Pop '\${_RESULT}' +!macroend + +###################################################################### ; custom options page functions Var InstallShortcuts @@ -841,7 +932,9 @@ Push \$R1 Push \$R2 Push \$R3 + Push \$R4 + StrCpy \$R4 "" StrCpy \$R0 "" StrCpy \$R1 0 @@ -871,11 +964,21 @@ StrCpy \$R0 \$R2 "" 7 \${EndIf} +!insertmacro VersionCompare "\${un}" \$R4 \$R0 \$R2 +\${If} \$R2 == 2 + # new one if bigger - save it + StrCpy \$R4 \$R0 +\${EndIf} + \${un}next_ver_loop: IntOp \$R1 \$R1 + 1 GoTo \${un}octave_ver_loop \${un}latest_octave_done: + # put result in r0 + StrCpy \$R0 \$R4 + + Pop \$R4 Pop \$R3 Pop \$R2 Pop \$R1