* [PR PATCH] stockfish: update to 15.1
@ 2022-12-20 18:20 shtayerc
2022-12-20 18:21 ` [PR PATCH] [Updated] " shtayerc
2022-12-20 19:34 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 2 replies; 3+ messages in thread
From: shtayerc @ 2022-12-20 18:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is a new pull request by shtayerc against master on the void-packages repository
https://github.com/shtayerc/void-packages stockfish-15-1
https://github.com/void-linux/void-packages/pull/41205
stockfish: update to 15.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41205.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stockfish-15-1-41205.patch --]
[-- Type: text/x-diff, Size: 4809 bytes --]
From 85e783be5a787d1baeabe31ef92692cb095c5eaf Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Tue, 20 Dec 2022 19:16:45 +0100
Subject: [PATCH] stockfish: update to 15.1
---
.../patches/makefile-nnue-download.patch | 40 +++++++++++++++++++
srcpkgs/stockfish/patches/makefile.patch | 13 +++---
srcpkgs/stockfish/template | 8 ++--
3 files changed, 51 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/stockfish/patches/makefile-nnue-download.patch
diff --git a/srcpkgs/stockfish/patches/makefile-nnue-download.patch b/srcpkgs/stockfish/patches/makefile-nnue-download.patch
new file mode 100644
index 000000000000..55a38c51ec11
--- /dev/null
+++ b/srcpkgs/stockfish/patches/makefile-nnue-download.patch
@@ -0,0 +1,40 @@
+From 61ea1534ff7026009a3435575c7beee91534db83 Mon Sep 17 00:00:00 2001
+From: Joost VandeVondele <Joost.VandeVondele@gmail.com>
+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 b822443bc118..87aa039c722f 100644
--- a/srcpkgs/stockfish/patches/makefile.patch
+++ b/srcpkgs/stockfish/patches/makefile.patch
@@ -1,17 +1,19 @@
---- a/src/Makefile 2020-09-02 21:19:30.000000000 +0700
-+++ b/src/Makefile 2021-01-14 18:51:25.852600109 +0700
-@@ -306,26 +306,7 @@
-
+--- 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
ifeq ($(COMP),gcc)
comp=gcc
- CXX=g++
CXXFLAGS += -pedantic -Wextra -Wshadow
-
-- ifeq ($(arch),$(filter $(arch),armv7 armv8))
+- ifeq ($(arch),$(filter $(arch),armv7 armv8 riscv64))
- ifeq ($(OS),Android)
- CXXFLAGS += -m$(bits)
- LDFLAGS += -m$(bits)
- endif
+- ifeq ($(ARCH),riscv64)
+- CXXFLAGS += -latomic
+- endif
- else
- CXXFLAGS += -m$(bits)
- LDFLAGS += -m$(bits)
@@ -26,4 +28,3 @@
- endif
endif
- ifeq ($(COMP),mingw)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 804db400681b..c04e296027f5 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
# Template file for 'stockfish'
pkgname=stockfish
-version=15
+version=15.1
revision=1
-_net_file=nn-6877cd24400e.nnue
+_net_file=nn-ad9b42354671.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="0553fe53ea57ce6641048049d1a17d4807db67eecd3531a3749401362a27c983
- 6877cd24400e01b19ff12ae3068ae242152802bdd330e66f7b6703865251d6e3"
+checksum="d4272657905319328294355973faee40a8c28e3eecb0e7b266ed34ff33383b76
+ ad9b423546714137916bd38978af6fd68d7b8951bef25ff76bf43da72d6cb786"
skip_extraction="${_net_file}"
LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] stockfish: update to 15.1
2022-12-20 18:20 [PR PATCH] stockfish: update to 15.1 shtayerc
@ 2022-12-20 18:21 ` shtayerc
2022-12-20 19:34 ` [PR PATCH] [Merged]: " leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: shtayerc @ 2022-12-20 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is an updated pull request by shtayerc against master on the void-packages repository
https://github.com/shtayerc/void-packages stockfish-15-1
https://github.com/void-linux/void-packages/pull/41205
stockfish: update to 15.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41205.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stockfish-15-1-41205.patch --]
[-- Type: text/x-diff, Size: 4809 bytes --]
From 0f4cc2ec04d3bc819ad1475accd41e9c08aa757e Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Tue, 20 Dec 2022 19:16:45 +0100
Subject: [PATCH] stockfish: update to 15.1
---
.../patches/makefile-nnue-download.patch | 40 +++++++++++++++++++
srcpkgs/stockfish/patches/makefile.patch | 13 +++---
srcpkgs/stockfish/template | 8 ++--
3 files changed, 51 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/stockfish/patches/makefile-nnue-download.patch
diff --git a/srcpkgs/stockfish/patches/makefile-nnue-download.patch b/srcpkgs/stockfish/patches/makefile-nnue-download.patch
new file mode 100644
index 000000000000..55a38c51ec11
--- /dev/null
+++ b/srcpkgs/stockfish/patches/makefile-nnue-download.patch
@@ -0,0 +1,40 @@
+From 61ea1534ff7026009a3435575c7beee91534db83 Mon Sep 17 00:00:00 2001
+From: Joost VandeVondele <Joost.VandeVondele@gmail.com>
+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 b822443bc118..87aa039c722f 100644
--- a/srcpkgs/stockfish/patches/makefile.patch
+++ b/srcpkgs/stockfish/patches/makefile.patch
@@ -1,17 +1,19 @@
---- a/src/Makefile 2020-09-02 21:19:30.000000000 +0700
-+++ b/src/Makefile 2021-01-14 18:51:25.852600109 +0700
-@@ -306,26 +306,7 @@
-
+--- 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
ifeq ($(COMP),gcc)
comp=gcc
- CXX=g++
CXXFLAGS += -pedantic -Wextra -Wshadow
-
-- ifeq ($(arch),$(filter $(arch),armv7 armv8))
+- ifeq ($(arch),$(filter $(arch),armv7 armv8 riscv64))
- ifeq ($(OS),Android)
- CXXFLAGS += -m$(bits)
- LDFLAGS += -m$(bits)
- endif
+- ifeq ($(ARCH),riscv64)
+- CXXFLAGS += -latomic
+- endif
- else
- CXXFLAGS += -m$(bits)
- LDFLAGS += -m$(bits)
@@ -26,4 +28,3 @@
- endif
endif
- ifeq ($(COMP),mingw)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 804db400681b..c04e296027f5 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
# Template file for 'stockfish'
pkgname=stockfish
-version=15
+version=15.1
revision=1
-_net_file=nn-6877cd24400e.nnue
+_net_file=nn-ad9b42354671.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="0553fe53ea57ce6641048049d1a17d4807db67eecd3531a3749401362a27c983
- 6877cd24400e01b19ff12ae3068ae242152802bdd330e66f7b6703865251d6e3"
+checksum="d4272657905319328294355973faee40a8c28e3eecb0e7b266ed34ff33383b76
+ ad9b423546714137916bd38978af6fd68d7b8951bef25ff76bf43da72d6cb786"
skip_extraction="${_net_file}"
LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: stockfish: update to 15.1
2022-12-20 18:20 [PR PATCH] stockfish: update to 15.1 shtayerc
2022-12-20 18:21 ` [PR PATCH] [Updated] " shtayerc
@ 2022-12-20 19:34 ` leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2022-12-20 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
There's a merged pull request on the void-packages repository
stockfish: update to 15.1
https://github.com/void-linux/void-packages/pull/41205
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-20 19:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-20 18:20 [PR PATCH] stockfish: update to 15.1 shtayerc
2022-12-20 18:21 ` [PR PATCH] [Updated] " shtayerc
2022-12-20 19:34 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).