diff --git a/srcpkgs/stockfish/patches/makefile-nnue-download.patch b/srcpkgs/stockfish/patches/makefile-nnue-download.patch deleted file mode 100644 index 55a38c51ec1..00000000000 --- a/srcpkgs/stockfish/patches/makefile-nnue-download.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 61ea1534ff7026009a3435575c7beee91534db83 Mon Sep 17 00:00:00 2001 -From: Joost VandeVondele -Date: Mon, 19 Dec 2022 17:54:36 +0100 -Subject: [PATCH] No error if net available but wget/curl missing - -do not error out on missing wget/curl if these tools are not needed later on, -i.e. if the net is available already. - -closes https://github.com/official-stockfish/Stockfish/pull/4291 -closes https://github.com/official-stockfish/Stockfish/pull/4253 - -No functional change ---- - src/Makefile | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index da81ceb4a0..bcf0abdf5e 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -853,7 +853,7 @@ net: - $(eval nnuedownloadurl2 := https://github.com/official-stockfish/networks/raw/master/$(nnuenet)) - $(eval curl_or_wget := $(shell if hash curl 2>/dev/null; then echo "curl -skL"; elif hash wget 2>/dev/null; then echo "wget -qO-"; fi)) - @if [ "x$(curl_or_wget)" = "x" ]; then \ -- echo "Automatic download failed: neither curl nor wget is installed. Install one of these tools or download the net manually"; exit 1; \ -+ echo "Neither curl nor wget is installed. Install one of these tools unless the net has been downloaded manually"; \ - fi - $(eval shasum_command := $(shell if hash shasum 2>/dev/null; then echo "shasum -a 256 "; elif hash sha256sum 2>/dev/null; then echo "sha256sum "; fi)) - @if [ "x$(shasum_command)" = "x" ]; then \ -@@ -864,7 +864,9 @@ net: - echo "$(nnuenet) available."; \ - else \ - if [ "x$(curl_or_wget)" != "x" ]; then \ -- echo "Downloading $${nnuedownloadurl}"; $(curl_or_wget) $${nnuedownloadurl} > $(nnuenet);\ -+ echo "Downloading $${nnuedownloadurl}"; $(curl_or_wget) $${nnuedownloadurl} > $(nnuenet);\ -+ else \ -+ echo "No net found and download not possible"; exit 1;\ - fi; \ - fi; \ - if [ "x$(shasum_command)" != "x" ]; then \ diff --git a/srcpkgs/stockfish/patches/makefile.patch b/srcpkgs/stockfish/patches/makefile.patch index 87aa039c722..62b436ed5fd 100644 --- a/srcpkgs/stockfish/patches/makefile.patch +++ b/srcpkgs/stockfish/patches/makefile.patch @@ -1,10 +1,11 @@ ---- a/src/Makefile 2022-12-04 14:17:15.000000000 +0100 -+++ b/src/Makefile 2022-12-05 16:52:13.648959706 +0100 -@@ -366,27 +366,5 @@ endif +--- a/src/Makefile 2023-07-02 17:28:33.297238434 +0200 ++++ b/src/Makefile 2023-07-02 17:28:50.820207636 +0200 +@@ -377,29 +377,7 @@ + ifeq ($(COMP),gcc) comp=gcc - CXX=g++ - CXXFLAGS += -pedantic -Wextra -Wshadow + CXXFLAGS += -pedantic -Wextra -Wshadow -Wmissing-declarations - - ifeq ($(arch),$(filter $(arch),armv7 armv8 riscv64)) - ifeq ($(OS),Android) @@ -28,3 +29,4 @@ - endif endif + ifeq ($(target_windows),yes) diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template index c04e296027f..363603f83d5 100644 --- a/srcpkgs/stockfish/template +++ b/srcpkgs/stockfish/template @@ -1,8 +1,8 @@ # Template file for 'stockfish' pkgname=stockfish -version=15.1 +version=16 revision=1 -_net_file=nn-ad9b42354671.nnue +_net_file=nn-5af11540bbfe.nnue build_wrksrc=src build_style=gnu-makefile make_build_target=build @@ -14,8 +14,8 @@ license="GPL-3.0-or-later" homepage="http://stockfishchess.org/" distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz https://tests.stockfishchess.org/api/nn/${_net_file}" -checksum="d4272657905319328294355973faee40a8c28e3eecb0e7b266ed34ff33383b76 - ad9b423546714137916bd38978af6fd68d7b8951bef25ff76bf43da72d6cb786" +checksum="a1600ebdaf4e324ba3e10cec2e0c9a810dc64c6f0db5cc955b2fd5e1eefa1cc6 + 5af11540bbfefcb54e38c5dd000cab4b469dfa7599a1d55be5d2722c20a8929b" skip_extraction="${_net_file}" LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"