mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-02 19:02:57 +02:00
0ad: update to 0.27.1.
This commit is contained in:
Helmut Pozimski
parent
fb6ace9c25
commit
a7ebfa5ae6
6 changed files with 23 additions and 282 deletions
|
|
@ -1,64 +1,52 @@
|
|||
diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh
|
||||
index 0dc66e01847..edbe032b525 100755
|
||||
--- a/libraries/source/spidermonkey/build.sh
|
||||
+++ b/libraries/source/spidermonkey/build.sh
|
||||
@@ -46,8 +46,9 @@ if [ ! -e "${FOLDER}.tar.xz" ]; then
|
||||
--- a/libraries/source/spidermonkey/build.sh 2025-07-20 09:04:51.166563011 +0200
|
||||
+++ b/libraries/source/spidermonkey/build.sh 2025-07-20 09:05:05.010183649 +0200
|
||||
@@ -48,8 +48,8 @@
|
||||
fi
|
||||
|
||||
# unpack
|
||||
-rm -Rf "${FOLDER}"
|
||||
-tar xfJ "${FOLDER}.tar.xz"
|
||||
+# done via xbps-src extract
|
||||
-"${TAR}" xfJ "${FOLDER}.tar.xz"
|
||||
+#rm -Rf "${FOLDER}"
|
||||
+#tar xfJ "${FOLDER}.tar.xz"
|
||||
+#"${TAR}" xfJ "${FOLDER}.tar.xz"
|
||||
|
||||
# patch
|
||||
(
|
||||
diff --git a/libraries/source/cxxtest-4.4/build.sh b/libraries/source/cxxtest-4.4/build.sh
|
||||
index 3243836ecb1..1ab6e46fff5 100755
|
||||
--- a/libraries/source/cxxtest-4.4/build.sh1
|
||||
+++ b/libraries/source/cxxtest-4.4/build.sh
|
||||
@@ -39,8 +39,9 @@ if [ ! -e "cxxtest-${PV}.tar.gz" ]; then
|
||||
--- a/libraries/source/cxxtest-4.4/build.sh 2025-07-20 09:05:54.328960135 +0200
|
||||
+++ b/libraries/source/cxxtest-4.4/build.sh 2025-07-20 09:06:06.904645296 +0200
|
||||
@@ -41,8 +41,8 @@
|
||||
fi
|
||||
|
||||
# unpack
|
||||
-rm -Rf "cxxtest-${PV}"
|
||||
-tar -xf "cxxtest-${PV}.tar.gz"
|
||||
+# done via xbps-src extract
|
||||
-"${TAR}" -xf "cxxtest-${PV}.tar.gz"
|
||||
+#rm -Rf "cxxtest-${PV}"
|
||||
+#tar -xf "cxxtest-${PV}.tar.gz"
|
||||
+#"${TAR}" -xf "cxxtest-${PV}.tar.gz"
|
||||
|
||||
# patch
|
||||
patch -d "cxxtest-${PV}" -p1 <patches/0001-Add-Debian-python3-patch.patch
|
||||
diff --git a/libraries/source/fcollada/build.sh b/libraries/source/fcollada/build.sh
|
||||
index 4ba98b9d2a8..4edc51846fe 100755
|
||||
--- a/libraries/source/fcollada/build.sh
|
||||
+++ b/libraries/source/fcollada/build.sh
|
||||
@@ -41,8 +41,9 @@ if [ ! -e "fcollada-${PV}.tar.xz" ]; then
|
||||
--- a/libraries/source/fcollada/build.sh 2025-07-20 09:06:43.431724677 +0200
|
||||
+++ b/libraries/source/fcollada/build.sh 2025-07-20 09:06:54.919433333 +0200
|
||||
@@ -43,8 +43,8 @@
|
||||
fi
|
||||
|
||||
# unpack
|
||||
-rm -Rf fcollada-${PV}
|
||||
-tar xf fcollada-${PV}.tar.xz
|
||||
+# done via xbps-src extract
|
||||
-"${TAR}" xf fcollada-${PV}.tar.xz
|
||||
+#rm -Rf fcollada-${PV}
|
||||
+#tar xf fcollada-${PV}.tar.xz
|
||||
+#"${TAR}" xf fcollada-${PV}.tar.xz
|
||||
|
||||
# build
|
||||
(
|
||||
diff --git a/libraries/source/nvtt/build.sh b/libraries/source/nvtt/build.sh
|
||||
index 80f29566e23..a5c5b0b7e66 100755
|
||||
--- a/libraries/source/nvtt/build.sh
|
||||
+++ b/libraries/source/nvtt/build.sh
|
||||
@@ -41,8 +41,9 @@ if [ ! -e "nvtt-${PV}.tar.xz" ]; then
|
||||
--- a/libraries/source/nvtt/build.sh 2025-07-20 09:07:03.352218930 +0200
|
||||
+++ b/libraries/source/nvtt/build.sh 2025-07-20 09:07:16.270889606 +0200
|
||||
@@ -43,8 +43,8 @@
|
||||
fi
|
||||
|
||||
# unpack
|
||||
-rm -Rf nvtt-${PV}
|
||||
-tar xf nvtt-${PV}.tar.xz
|
||||
+# done via xbps-src extract
|
||||
-"${TAR}" xf nvtt-${PV}.tar.xz
|
||||
+#rm -Rf nvtt-${PV}
|
||||
+#tar xf nvtt-${PV}.tar.xz
|
||||
+#"${TAR}" xf nvtt-${PV}.tar.xz
|
||||
|
||||
# patch
|
||||
patch -d nvtt-${PV} -p1 <patches/0001-Don-t-overspecify-flags.patch
|
||||
|
|
|
|||
|
|
@ -1,158 +0,0 @@
|
|||
From 263b481442ccf51f8588828c8bce7a2843299864 Mon Sep 17 00:00:00 2001
|
||||
From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
Date: Sun, 27 Apr 2025 08:33:11 +0200
|
||||
Subject: [PATCH] Cmake-4 support for nvtt
|
||||
|
||||
Fix nvtt build to support cmake-4, while at it also fix other
|
||||
related outstanding cmake issues in nvtt.
|
||||
|
||||
Fixes: #7538
|
||||
Fixes: #7764
|
||||
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
---
|
||||
libraries/source/nvtt/build.sh | 7 +++-
|
||||
.../0001-Don-t-overspecify-flags.patch | 41 +++++++++++++++++++
|
||||
.../0002-Bump-cmake-min-version-to-3.10.patch | 27 ++++++++++++
|
||||
...ecute_process-insted-of-exec_program.patch | 26 ++++++++++++
|
||||
4 files changed, 100 insertions(+), 1 deletion(-)
|
||||
create mode 100644 libraries/source/nvtt/patches/0001-Don-t-overspecify-flags.patch
|
||||
create mode 100644 libraries/source/nvtt/patches/0002-Bump-cmake-min-version-to-3.10.patch
|
||||
create mode 100644 libraries/source/nvtt/patches/0003-Use-execute_process-insted-of-exec_program.patch
|
||||
|
||||
diff --git a/libraries/source/nvtt/build.sh b/libraries/source/nvtt/build.sh
|
||||
index 8a00df89f3..a855940d90 100755
|
||||
--- a/libraries/source/nvtt/build.sh
|
||||
+++ b/libraries/source/nvtt/build.sh
|
||||
@@ -6,7 +6,7 @@ set -e
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
PV=28209
|
||||
-LIB_VERSION=${PV}
|
||||
+LIB_VERSION=${PV}+wfg1
|
||||
|
||||
fetch()
|
||||
{
|
||||
@@ -46,6 +46,11 @@ fi
|
||||
rm -Rf nvtt-${PV}
|
||||
"${TAR}" xf nvtt-${PV}.tar.xz
|
||||
|
||||
+# patch
|
||||
+patch -d nvtt-${PV} -p1 <patches/0001-Don-t-overspecify-flags.patch
|
||||
+patch -d nvtt-${PV} -p1 <patches/0002-Bump-cmake-min-version-to-3.10.patch
|
||||
+patch -d nvtt-${PV} -p1 <patches/0003-Use-execute_process-insted-of-exec_program.patch
|
||||
+
|
||||
# build
|
||||
(
|
||||
cd nvtt-${PV}
|
||||
diff --git a/libraries/source/nvtt/patches/0001-Don-t-overspecify-flags.patch b/libraries/source/nvtt/patches/0001-Don-t-overspecify-flags.patch
|
||||
new file mode 100644
|
||||
index 0000000000..4cc8e83d11
|
||||
--- /dev/null
|
||||
+++ b/libraries/source/nvtt/patches/0001-Don-t-overspecify-flags.patch
|
||||
@@ -0,0 +1,41 @@
|
||||
+From fee966a8d44afc26005df9b539b16a5ee7f99107 Mon Sep 17 00:00:00 2001
|
||||
+From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
+Date: Sun, 27 Apr 2025 07:53:42 +0200
|
||||
+Subject: [PATCH] Don't overspecify flags
|
||||
+
|
||||
+Cmake picks flags like CFALGS CXXFLAGS and LDFLAGS from environment. The
|
||||
+use of CMAKE_LINK_FLAGS even triggers a warning.
|
||||
+
|
||||
+Fixes: #7538
|
||||
+Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
+---
|
||||
+ build.sh | 6 ------
|
||||
+ 1 file changed, 6 deletions(-)
|
||||
+
|
||||
+diff --git a/build.sh b/build.sh
|
||||
+index dae3bcf..935c6ff 100755
|
||||
+--- a/build.sh
|
||||
++++ b/build.sh
|
||||
+@@ -29,9 +29,6 @@ if [ "$(uname -s)" = "Darwin" ]; then
|
||||
+ # but they're not as flexible for cross-compiling
|
||||
+ # Disable png support (avoids some conflicts with MacPorts)
|
||||
+ cmake .. \
|
||||
+- -DCMAKE_LINK_FLAGS="$LDFLAGS" \
|
||||
+- -DCMAKE_C_FLAGS="$CFLAGS" \
|
||||
+- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
|
||||
+ -DCMAKE_BUILD_TYPE=Release \
|
||||
+ $CMAKE_FLAGS \
|
||||
+ -DBINDIR=bin \
|
||||
+@@ -40,9 +37,6 @@ if [ "$(uname -s)" = "Darwin" ]; then
|
||||
+ -G "Unix Makefiles"
|
||||
+ else
|
||||
+ cmake .. \
|
||||
+- -DCMAKE_LINK_FLAGS="$LDFLAGS" \
|
||||
+- -DCMAKE_C_FLAGS="$CFLAGS" \
|
||||
+- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
|
||||
+ -DCMAKE_BUILD_TYPE=Release \
|
||||
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
|
||||
+ $CMAKE_FLAGS \
|
||||
+--
|
||||
+2.49.0
|
||||
+
|
||||
diff --git a/libraries/source/nvtt/patches/0002-Bump-cmake-min-version-to-3.10.patch b/libraries/source/nvtt/patches/0002-Bump-cmake-min-version-to-3.10.patch
|
||||
new file mode 100644
|
||||
index 0000000000..64fcfce75e
|
||||
--- /dev/null
|
||||
+++ b/libraries/source/nvtt/patches/0002-Bump-cmake-min-version-to-3.10.patch
|
||||
@@ -0,0 +1,27 @@
|
||||
+From cc07839eff9be49e2c3df4e68ce18f3134caafd2 Mon Sep 17 00:00:00 2001
|
||||
+From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
+Date: Sun, 27 Apr 2025 07:57:10 +0200
|
||||
+Subject: [PATCH] Bump cmake min version to 3.10
|
||||
+
|
||||
+Cmake-4 removes support for cmake < cmake-3.5 and deprecates cmake <
|
||||
+cmake-3.10
|
||||
+
|
||||
+Fixes: #7764
|
||||
+Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
+---
|
||||
+ src/CMakeLists.txt | 2 +-
|
||||
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
+
|
||||
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
+index b18b791..b517b52 100644
|
||||
+--- a/src/CMakeLists.txt
|
||||
++++ b/src/CMakeLists.txt
|
||||
+@@ -1,4 +1,4 @@
|
||||
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
|
||||
++CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
|
||||
+ PROJECT(NV)
|
||||
+ ENABLE_TESTING()
|
||||
+
|
||||
+--
|
||||
+2.49.0
|
||||
+
|
||||
diff --git a/libraries/source/nvtt/patches/0003-Use-execute_process-insted-of-exec_program.patch b/libraries/source/nvtt/patches/0003-Use-execute_process-insted-of-exec_program.patch
|
||||
new file mode 100644
|
||||
index 0000000000..faf94c6ff3
|
||||
--- /dev/null
|
||||
+++ b/libraries/source/nvtt/patches/0003-Use-execute_process-insted-of-exec_program.patch
|
||||
@@ -0,0 +1,26 @@
|
||||
+From 324f50d1ccf5ca38e0f3817c8d18208bd72e01f2 Mon Sep 17 00:00:00 2001
|
||||
+From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
+Date: Sun, 27 Apr 2025 08:05:59 +0200
|
||||
+Subject: [PATCH] Use execute_process insted of exec_program
|
||||
+
|
||||
+Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
+---
|
||||
+ src/cmake/DetermineProcessor.cmake | 2 +-
|
||||
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
+
|
||||
+diff --git a/src/cmake/DetermineProcessor.cmake b/src/cmake/DetermineProcessor.cmake
|
||||
+index 7db7a95..13d39de 100644
|
||||
+--- a/src/cmake/DetermineProcessor.cmake
|
||||
++++ b/src/cmake/DetermineProcessor.cmake
|
||||
+@@ -8,7 +8,7 @@ IF(UNIX)
|
||||
+ #EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE NV_SYSTEM_PROCESSOR RETURN_VALUE val)
|
||||
+
|
||||
+ #IF("${val}" GREATER 0 OR NV_SYSTEM_PROCESSOR STREQUAL "unknown")
|
||||
+- EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE NV_SYSTEM_PROCESSOR RETURN_VALUE val)
|
||||
++ execute_process(COMMAND uname -m OUTPUT_VARIABLE NV_SYSTEM_PROCESSOR ERROR_VARIABLE val)
|
||||
+ #ENDIF("${val}" GREATER 0 OR NV_SYSTEM_PROCESSOR STREQUAL "unknown")
|
||||
+
|
||||
+ IF(NV_SYSTEM_PROCESSOR STREQUAL "Power Macintosh")
|
||||
+--
|
||||
+2.49.0
|
||||
+
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From 06d4f83dc8e4f3d610b939024a848b8ef0aac19b Mon Sep 17 00:00:00 2001
|
||||
From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
Date: Fri, 27 Jun 2025 08:24:34 +0200
|
||||
Subject: [PATCH] Add support for specifying pkg-config via env
|
||||
|
||||
For cross compiling there is a need to specify an alternative binary for
|
||||
pkg-config. It's customary to use the environment variable PKG_CONFIG for
|
||||
this.
|
||||
|
||||
Ref: #8135
|
||||
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
||||
---
|
||||
build/premake/pkgconfig/pkgconfig.lua | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/build/premake/pkgconfig/pkgconfig.lua b/build/premake/pkgconfig/pkgconfig.lua
|
||||
index 1f06c8b0ad..d1523c2de5 100644
|
||||
--- a/build/premake/pkgconfig/pkgconfig.lua
|
||||
+++ b/build/premake/pkgconfig/pkgconfig.lua
|
||||
@@ -1,9 +1,14 @@
|
||||
local m = {}
|
||||
-m._VERSION = "1.2.0-dev"
|
||||
+m._VERSION = "1.3.0-dev"
|
||||
|
||||
m.additional_pc_path = nil
|
||||
m.static_link_libs = false
|
||||
|
||||
+local pkg_config_command = "pkg-config"
|
||||
+if os.getenv("PKG_CONFIG") then
|
||||
+ pkg_config_command = os.getenv("PKG_CONFIG")
|
||||
+end
|
||||
+
|
||||
local function os_capture(cmd)
|
||||
return io.popen(cmd, 'r'):read('*a'):gsub("\n", " ")
|
||||
end
|
||||
@@ -12,7 +17,7 @@ local function parse_pkg_config_includes(lib, alternative_cmd, alternative_flags
|
||||
local result
|
||||
if not alternative_cmd then
|
||||
local pc_path = m.additional_pc_path and "PKG_CONFIG_PATH="..m.additional_pc_path or ""
|
||||
- result = os_capture(pc_path.." pkg-config --cflags "..lib)
|
||||
+ result = os_capture(pc_path .. " " .. pkg_config_command .. " --cflags " .. lib)
|
||||
else
|
||||
if not alternative_flags then
|
||||
result = os_capture(alternative_cmd.." --cflags")
|
||||
@@ -65,7 +70,7 @@ function m.add_links(lib, alternative_cmd, alternative_flags)
|
||||
if not alternative_cmd then
|
||||
local pc_path = m.additional_pc_path and "PKG_CONFIG_PATH="..m.additional_pc_path or ""
|
||||
local static = m.static_link_libs and " --static " or ""
|
||||
- result = os_capture(pc_path.." pkg-config --libs "..static..lib)
|
||||
+ result = os_capture(pc_path .. " " .. pkg_config_command .. " --libs " .. static .. lib)
|
||||
else
|
||||
if not alternative_flags then
|
||||
result = os_capture(alternative_cmd.." --libs")
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/build/workspaces/update-workspaces.sh1 b/build/workspaces/update-workspaces.sh
|
||||
index fe3da6a5241..763c64dc479 100755
|
||||
--- a/build/workspaces/update-workspaces.sh1
|
||||
+++ b/build/workspaces/update-workspaces.sh
|
||||
@@ -47,8 +47,6 @@ fi
|
||||
|
||||
echo
|
||||
|
||||
-# If we're in bash then make HOSTTYPE available to Premake, for primitive arch-detection
|
||||
-export HOSTTYPE="$HOSTTYPE"
|
||||
# Now run Premake to create the makefiles
|
||||
echo "Premake args: ${premake_args}"
|
||||
if [ "$OS" != "Darwin" ]; then
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From 3ff3f728900b89c4e00bddb03fc1aeb0bf7baad0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
|
||||
Date: Fri, 31 Jan 2025 13:01:40 +0100
|
||||
Subject: [PATCH] build-source-libs.sh: fix "--with-system-premake"
|
||||
|
||||
---
|
||||
libraries/build-source-libs.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libraries/build-source-libs.sh b/libraries/build-source-libs.sh
|
||||
index 323260a51e..da67b293cb 100755
|
||||
--- a/libraries/build-source-libs.sh
|
||||
+++ b/libraries/build-source-libs.sh
|
||||
@@ -62,7 +62,7 @@ while [ "$#" -gt 0 ]; do
|
||||
--with-system-cxxtest) with_system_cxxtest=true ;;
|
||||
--with-system-nvtt) with_system_nvtt=true ;;
|
||||
--with-system-mozjs) with_system_mozjs=true ;;
|
||||
- --with-system-premake) with_system_mozjs=true ;;
|
||||
+ --with-system-premake) with_system_premake=true ;;
|
||||
--with-spirv-reflect) with_spirv_reflect=true ;;
|
||||
-j*) JOBS="$1" ;;
|
||||
*)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for '0ad'
|
||||
pkgname=0ad
|
||||
version=0.27.0
|
||||
version=0.27.1
|
||||
revision=1
|
||||
archs="x86_64* i686* aarch64* armv7l* ppc64le* riscv64*"
|
||||
# Unclear whether ppc64le and riscv64 will work, though upstream seems to support them
|
||||
|
|
@ -22,8 +22,7 @@ homepage="https://play0ad.com"
|
|||
distfiles="
|
||||
https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.xz
|
||||
https://github.com/CxxTest/cxxtest/archive/refs/tags/${_cxxtest_version}.tar.gz>cxxtest-${_cxxtest_version}.tar.gz"
|
||||
checksum="
|
||||
aa94857009750d5f61dbf016bc150e3bdcbdb3acdfc8ad20b73ab8b43e9a1ba6
|
||||
checksum="a0a5355eeb5968d24f283770736150d974dafecba07754d4662707dc17016bfb
|
||||
1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8"
|
||||
skip_extraction="cxxtest-${_cxxtest_version}.tar.gz"
|
||||
lib32disabled=yes
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue