# HG changeset patch # User Markus Mützel # Date 1673278536 -3600 # Node ID c3bc7f5d42fbca8761b5c49fae73c2b78a89bc5c # Parent 6498b13b6de56c064097f1c50d3c16d36c83ebd5# Parent 3fc250463558ad05aba3aeeef63720ce4f08a6b6 maint: Merge default to release. diff -r 6498b13b6de5 -r c3bc7f5d42fb installer-files/README.html --- a/installer-files/README.html Fri Dec 30 10:02:01 2022 +0100 +++ b/installer-files/README.html Mon Jan 09 16:35:36 2023 +0100 @@ -33,17 +33,9 @@ the default installation location is inside %LOCALAPPDATA%\Programs\GNU Octave.

-

BLAS Library Selection

-

During the installation, a default BLAS library was selected. The installer -contains two BLAS implementations, -the NetLib reference BLAS -and OpenBLAS.

-

The used implementation can be changed after installation with the "BLAS -Switcher" in the Start menu.

- -

Included Octave Forge Packages

+

Included Octave Packages

A -number of Octave-Forge packages has been included with Octave for Windows. +number of Octave packages has been included with Octave for Windows. However, the packages must be loaded in order to use them.

-

Other packages are available from -Octave-Forge.

+

More packages are available from +Octave Packages.

+ +

BLAS Library Selection

+

During the installation, a default BLAS library was selected. The installer +contains two BLAS implementations, +the NetLib reference BLAS +and OpenBLAS.

+

The implementation by OpenBLAS tries to use the CPU features available on the +system. That means that it might perform faster than the reference +implementation. On the other hand, using it might result in higher round-off +errors.

+

The used implementation can be changed after installation with the "BLAS +Switcher" in the Start menu.

+ +

OpenGL Renderer Selection

+

During installation, an OpenGL renderer was selected. Octave for Windows +includes a software OpenGL renderer (llvmpipe by +Mesa 3D). That renderer can be used if the +OpenGL renderer drivers installed on the system aren't working as expected.

+

Note that the OpenGL renderer installed on the system might be hardware +accelerated. That means it might perform much faster than the software OpenGL +renderer.

+

The OpenGL renderer used by Octave can be changed after installation with the +"OpenGL Switcher" in the Start menu.

General information for Octave on Windows

Octave is developed primarily on GNU/Linux. The programs and wrapper scripts diff -r 6498b13b6de5 -r c3bc7f5d42fb src/gdal.mk --- a/src/gdal.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/gdal.mk Mon Jan 09 16:35:36 2023 +0100 @@ -3,8 +3,8 @@ PKG := gdal $(PKG)_IGNORE : -$(PKG)_VERSION := 3.6.1 -$(PKG)_CHECKSUM := d1d71e11cd4d9dd7a46c451a1cde6d37ece6c4a1 +$(PKG)_VERSION := 3.6.2 +$(PKG)_CHECKSUM := 6ab39f56f8214b5ee943756e82dc23377cb7a713 $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/OSGeo/gdal/archive/refs/tags/v$($(PKG)_VERSION).tar.gz diff -r 6498b13b6de5 -r c3bc7f5d42fb src/mesa.mk --- a/src/mesa.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/mesa.mk Mon Jan 09 16:35:36 2023 +0100 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := mesa -$(PKG)_VERSION := 22.3.1 -$(PKG)_CHECKSUM := 3c996af7e8f82f1afe19fc5769424769f79df9d3 +$(PKG)_VERSION := 22.3.2 +$(PKG)_CHECKSUM := 3074a9fba66f4d3788384721c0089f93d5afa1b3 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/msys2-glib2.mk --- a/src/msys2-glib2.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/msys2-glib2.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,9 +4,9 @@ PKG := msys2-glib2 $(PKG)_NAME := glib2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.74.3-1 -$(PKG)_x86_64_CS := 150648859fff6eb3a1ce3fc9b1e98c106a6ec088 -$(PKG)_i686_CS := 5b33ba2e8c0e1790636a57f00a890ed257a2f1ee +$(PKG)_VERSION := 2.74.4-1 +$(PKG)_x86_64_CS := 5cfee297f46d57a95c00fae7b3e0ba255ae0739b +$(PKG)_i686_CS := bbdbde5a7a622cc3a80eb5c56dd780468990d424 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6498b13b6de5 -r c3bc7f5d42fb src/msys2-libksba.mk --- a/src/msys2-libksba.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/msys2-libksba.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libksba $(PKG)_NAME := libksba $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.2-1 -$(PKG)_x86_64_CS := 85324a77136ac3e8f4656975638de4f1d280abe1 -$(PKG)_i686_CS := cc2a7d0c8b7ab4d3d5abba8729f3270700b8b1e7 +$(PKG)_VERSION := 1.6.3-1 +$(PKG)_x86_64_CS := 8a6cd861dfa73c175c659498ba18ae835b714df5 +$(PKG)_i686_CS := 8e28fcbf86c4e49039cad4e017e136a00177ef4f $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6498b13b6de5 -r c3bc7f5d42fb src/msys2-libopenssl.mk --- a/src/msys2-libopenssl.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/msys2-libopenssl.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libopenssl $(PKG)_NAME := libopenssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.s-2 -$(PKG)_x86_64_CS := f65467b26d1048ca8c297919f90ef6525d9776e7 -$(PKG)_i686_CS := a71ff10072c6b4545c808799f4ce93ecda51bcd7 +$(PKG)_VERSION := 3.0.7-2 +$(PKG)_x86_64_CS := e150c365f62401a61bbc0d9f91aa4a9defb26477 +$(PKG)_i686_CS := 31e2234c431c349fb7bfe129a8759eb0c3daf79a $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6498b13b6de5 -r c3bc7f5d42fb src/msys2-libpsl.mk --- a/src/msys2-libpsl.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/msys2-libpsl.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libpsl $(PKG)_NAME := libpsl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1-5 -$(PKG)_x86_64_CS := a26c71e38c3a2af3b59d3967fb4e8dd8b080eef7 -$(PKG)_i686_CS := 163f937bf58ca343162a9366d2f689f762535ca8 +$(PKG)_VERSION := 0.21.2-1 +$(PKG)_x86_64_CS := 60cdaa2af1047a28fefc823244366411e5eb8dab +$(PKG)_i686_CS := c44adcfc828bfa3d425c94df77e85476c4c956e0 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6498b13b6de5 -r c3bc7f5d42fb src/msys2-libsqlite.mk --- a/src/msys2-libsqlite.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/msys2-libsqlite.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,9 +4,9 @@ PKG := msys2-libsqlite $(PKG)_NAME := libsqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.40.0-1 -$(PKG)_x86_64_CS := da9b8397ea4a5c8aae2f0e93da1553bcf3e4d7eb -$(PKG)_i686_CS := be2ab1117143b4f903343b795b39bce2f4d8411f +$(PKG)_VERSION := 3.40.1-1 +$(PKG)_x86_64_CS := 951a5c809c618d56842f5b9a01bc69a83456306d +$(PKG)_i686_CS := 2bd1e53df837ff2ba5854dc7dd7bec1b5954a193 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6498b13b6de5 -r c3bc7f5d42fb src/msys2-openssl.mk --- a/src/msys2-openssl.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/msys2-openssl.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,9 +4,9 @@ PKG := msys2-openssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.s-2 -$(PKG)_x86_64_CS := b83eed9ebfcfa3fddda41de8273576fe1960d060 -$(PKG)_i686_CS := c13867605858f7b47fcf51ccc2722a8dcd8f5ded +$(PKG)_VERSION := 3.0.7-2 +$(PKG)_x86_64_CS := 3e9c9ee6d40b3f967308a050ac4cf628c467e2df +$(PKG)_i686_CS := 599097cb7f655440c39db87fa59c8a318ed04af2 $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6498b13b6de5 -r c3bc7f5d42fb src/msys2-pacman.mk --- a/src/msys2-pacman.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/msys2-pacman.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,9 +4,9 @@ PKG := msys2-pacman $(PKG)_NAME := pacman $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.1-25 -$(PKG)_x86_64_CS := 42c624c1b541ebc43a5b095e22c0e48c961428c3 -$(PKG)_i686_CS := dc2dccb28c40a8e712728af7c46e79d793cebd5e +$(PKG)_VERSION := 6.0.1-28 +$(PKG)_x86_64_CS := 440a43fa7ee14e2ecc8413f2fe834f7d214cde70 +$(PKG)_i686_CS := bf312fd49cadab9efa4b922e7a73332cfd800e7d $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6498b13b6de5 -r c3bc7f5d42fb src/msys2-python.mk --- a/src/msys2-python.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/msys2-python.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,9 +4,9 @@ PKG := msys2-python $(PKG)_NAME := python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.9-1 -$(PKG)_x86_64_CS := 269c9a7ebce56521f7b1f1ced308506adab6bed5 -$(PKG)_i686_CS := d87fecc12e7b61191a14a6efe81ed72936e94bc6 +$(PKG)_VERSION := 3.10.9-2 +$(PKG)_x86_64_CS := 409f3da8098d8c31bc184d1922de3bc889e1a6f4 +$(PKG)_i686_CS := a0026f4572fb5bbf336947f1134e07ff0aa47dac $(PKG)_CS := $($(PKG)_$(MSYS2_ARCH)_CS) $(PKG)_CHECKSUM := $($(PKG)_CS) $(PKG)_SUBDIR := diff -r 6498b13b6de5 -r c3bc7f5d42fb src/of-stk.mk --- a/src/of-stk.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/of-stk.mk Mon Jan 09 16:35:36 2023 +0100 @@ -3,20 +3,22 @@ PKG := of-stk $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7.0 -$(PKG)_CHECKSUM := f8063a77b2cc7e79cda3623a412cbbff5471bd38 +$(PKG)_VERSION := 2.8.0 +$(PKG)_CHECKSUM := d186472c78578d0d6dc2f35327b77f7dd2836819 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := stk $(PKG)_FILE := stk-$($(PKG)_VERSION).tar.gz $(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download' +$(PKG)_URL := https://github.com/stk-kriging/stk/releases/download/$($(PKG)_VERSION)/stk-$($(PKG)_VERSION)-octpkg.tar.gz $(PKG)_DEPS := +https://github.com/stk-kriging/stk ifeq ($(ENABLE_BINARY_PACKAGES),yes) $(PKG)_DEPS += $(OCTAVE_TARGET) endif define $(PKG)_UPDATE - $(OCTAVE_FORGE_PKG_UPDATE) + $(call GITHUB_PKG_UPDATE,stk-kriging,stk,) endef define $(PKG)_BUILD diff -r 6498b13b6de5 -r c3bc7f5d42fb src/qtbase.mk --- a/src/qtbase.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/qtbase.mk Mon Jan 09 16:35:36 2023 +0100 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.15.7 -$(PKG)_CHECKSUM := 0fe70abd7be4bf79d8a208614267321efa3ac432 +$(PKG)_VERSION := 5.15.8 +$(PKG)_CHECKSUM := da6b4c7b39baf3b2659ec46ef9a6ea81485fa62f $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(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) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/qtimageformats.mk --- a/src/qtimageformats.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/qtimageformats.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 95e2e092f27c9021b49b34b058110e76d884207d +$(PKG)_CHECKSUM := 20123da62eb387fefb100b78ecb2eecb9be2be12 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL)) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/qtsvg.mk --- a/src/qtsvg.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/qtsvg.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b6935e9dd3a3ab4bd9f13f1bd1618bfee8e9eabc +$(PKG)_CHECKSUM := df1dc97f78b04705354f14896d6d4474274ffb6c $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL)) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/qttools.mk --- a/src/qttools.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/qttools.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 43b1e599b98a934f88198b7fcd91de9696985995 +$(PKG)_CHECKSUM := a8684f602124f9d66a0028f2c048a32c1a467d00 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL)) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/qttranslations.mk --- a/src/qttranslations.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/qttranslations.mk Mon Jan 09 16:35:36 2023 +0100 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7effe55cb0cc3a77b4b9f2632cd3cf926146c35f +$(PKG)_CHECKSUM := d8a8f43838c5e953005c714c9b822408cd38d478 $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL)) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/sdl2.mk --- a/src/sdl2.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/sdl2.mk Mon Jan 09 16:35:36 2023 +0100 @@ -3,8 +3,8 @@ PKG := sdl2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.26.1 -$(PKG)_CHECKSUM := 08a8cec21ffcebf44e4633a786d594a7811100d2 +$(PKG)_VERSION := 2.26.2 +$(PKG)_CHECKSUM := 2a1415a201ac07c353c6d8e4daaa11c8910fb879 $(PKG)_SUBDIR := SDL2-$($(PKG)_VERSION) $(PKG)_FILE := SDL2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/sqlite.mk --- a/src/sqlite.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/sqlite.mk Mon Jan 09 16:35:36 2023 +0100 @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3400000 -$(PKG)_CHECKSUM := 2aa5df983dc2d7e6b096b49e579bcc1e7b80667e +$(PKG)_VERSION := 3400100 +$(PKG)_CHECKSUM := b8c2d4bc0094f5c0ce985dc0e237dfcbaa1f6275 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2022/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/src-msys2-glib2.mk --- a/src/src-msys2-glib2.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/src-msys2-glib2.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-glib2 $(PKG)_NAME := glib2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.74.3-1 -$(PKG)_CHECKSUM := 5b979868ce67f20bdac678158f264f93e1180d3c +$(PKG)_VERSION := 2.74.4-1 +$(PKG)_CHECKSUM := a3ec5b68732a1f65f030e55503db940f033d3a41 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/src-msys2-libksba.mk --- a/src/src-msys2-libksba.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/src-msys2-libksba.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libksba $(PKG)_NAME := libksba $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.2-1 -$(PKG)_CHECKSUM := a57f6992b341fa593883dd24f677bbadc9e984b3 +$(PKG)_VERSION := 1.6.3-1 +$(PKG)_CHECKSUM := 05dafb08e05107d98f728c5f980e4c99b77aae9f $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/src-msys2-libopenssl.mk --- a/src/src-msys2-libopenssl.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/src-msys2-libopenssl.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libopenssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.s-2 -$(PKG)_CHECKSUM := 355f36ac5741887a66ec3d2ce2d15ef6a23024b4 +$(PKG)_VERSION := 3.0.7-2 +$(PKG)_CHECKSUM := 45735dd4323009a6cb60c10bfe6191ad48a1e01d $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/src-msys2-libpsl.mk --- a/src/src-msys2-libpsl.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/src-msys2-libpsl.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libpsl $(PKG)_NAME := libpsl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1-5 -$(PKG)_CHECKSUM := 429a15c89843c4415f10f25e5fcc43e5e8223fe4 +$(PKG)_VERSION := 0.21.2-1 +$(PKG)_CHECKSUM := f00cd0bde687de1fab9a287d6204acdde6e54a1c $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/src-msys2-libsqlite.mk --- a/src/src-msys2-libsqlite.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/src-msys2-libsqlite.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-libsqlite $(PKG)_NAME := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3.40.0-1 -$(PKG)_CHECKSUM := 00eb4775cda1cd74784a827576d8706e0dec6fb5 +$(PKG)_VERSION := 3.40.1-1 +$(PKG)_CHECKSUM := 1391f6f117e4e9151187af3da8efd120080df08a $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/src-msys2-openssl.mk --- a/src/src-msys2-openssl.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/src-msys2-openssl.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-openssl $(PKG)_NAME := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.1.s-2 -$(PKG)_CHECKSUM := 355f36ac5741887a66ec3d2ce2d15ef6a23024b4 +$(PKG)_VERSION := 3.0.7-2 +$(PKG)_CHECKSUM := 45735dd4323009a6cb60c10bfe6191ad48a1e01d $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/src-msys2-pacman.mk --- a/src/src-msys2-pacman.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/src-msys2-pacman.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-pacman $(PKG)_NAME := pacman $(PKG)_IGNORE := -$(PKG)_VERSION := 6.0.1-25 -$(PKG)_CHECKSUM := 76d5dcadcd5e0542a41a3cbe608131c95551f723 +$(PKG)_VERSION := 6.0.1-28 +$(PKG)_CHECKSUM := b55152d05fc29a9feb6aae5ad91fc290d0029e2b $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb src/src-msys2-python.mk --- a/src/src-msys2-python.mk Fri Dec 30 10:02:01 2022 +0100 +++ b/src/src-msys2-python.mk Mon Jan 09 16:35:36 2023 +0100 @@ -4,8 +4,8 @@ PKG := src-msys2-python $(PKG)_NAME := python $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.9-1 -$(PKG)_CHECKSUM := 0d2c1caf6f04e795004365827c658d4b45fb367c +$(PKG)_VERSION := 3.10.9-2 +$(PKG)_CHECKSUM := 15e2989c5df009b2e4cb8985bfe26dd40ad26ab7 $(PKG)_SUBDIR := $(PKG)_FILE := $($(PKG)_NAME)-$($(PKG)_VERSION).src.tar.zst $(PKG)_URL := $(MSYS2_SRC_URL)/$($(PKG)_FILE) diff -r 6498b13b6de5 -r c3bc7f5d42fb tools/makeinst-script.sh.in --- a/tools/makeinst-script.sh.in Fri Dec 30 10:02:01 2022 +0100 +++ b/tools/makeinst-script.sh.in Mon Jan 09 16:35:36 2023 +0100 @@ -375,6 +375,8 @@ Var RegisterOctaveFileTypeCtrl Var InstallBlasLibCtrl Var InstallBlasLib +Var InstallOpenGLCtrl +Var InstallOpenGL Function octaveOptionsPage @@ -410,6 +412,12 @@ \${NSD_CreateDropList} 100u 70u 100u 80u "" Pop \$InstallBlasLibCtrl + + \${NSD_CreateLabel} 0 90u 110u 12u "OpenGL implementation:" + Pop \$0 + + \${NSD_CreateDropList} 100u 110u 100u 80u "" + Pop \$InstallOpenGLCtrl EOF # add option to install libopenblas if we have the dll present if [ -e $OCTAVE_SOURCE/$OCTAVE_SUBDIR/bin/libopenblas.dll ]; then @@ -424,6 +432,11 @@ cat >> $OUTFILE << EOF \${NSD_CB_SelectString} \$InstallBlasLibCtrl "$DEFAULT_BLAS" + ; add option for opengl + \${NSD_CB_AddString} \$InstallOpenGLCtrl "System OpenGL" + \${NSD_CB_AddString} \$InstallOpenGLCtrl "Software OpenGL" + \${NSD_CB_SelectString} \$InstallOpenGLCtrl "System OpenGL" + !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing" nsDialogs::Show Pop \$0 @@ -433,6 +446,7 @@ \${NSD_GetState} \$InstallShortcutsCtrl \$InstallShortcuts \${NSD_GetState} \$RegisterOctaveFileTypeCtrl \$RegisterOctaveFileType \${DropList_GetCurSel} \$InstallBlasLibCtrl \$InstallBlasLib + \${DropList_GetCurSel} \$InstallOpenGLCtrl \$InstallOpenGL FunctionEnd ###################################################################### @@ -567,6 +581,7 @@ StrCpy \$InstallShortcuts \${BST_CHECKED} StrCpy \$RegisterOctaveFileType \${BST_CHECKED} StrCpy \$InstallBlasLib 0 + StrCpy \$InstallOpenGL 0 ; process command line options \${GetParameters} \$R0 @@ -777,6 +792,13 @@ CopyFiles /SILENT "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\libopenblas.dll" "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\libblas.dll" \${EndIf} + ; OpenGL set up + \${If} \$InstallOpenGL == 0 + ; use system opengl - move opengl to backup + CopyFiles /SILENT "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\opengl32.dll" "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\opengl32.bak" + Delete "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\opengl32.dll" + \${EndIf} + SectionEnd Section "FileTypeRego"