pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vcmi: start upgrading
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Wed Dec 14 15:05:11 2022 +0100
Changeset: f4b5743ab2c641977b0e4a7401248e7eaa0501b5
Modified Files:
vcmi/Makefile
vcmi/distinfo
Added Files:
vcmi/TODO
vcmi/patches/patch-CI_get__package__name.sh
Log Message:
vcmi: start upgrading
needs package for tbb
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f4b5743ab2c641977b0e4a7401248e7eaa0501b5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
vcmi/Makefile | 12 ++++++++++--
vcmi/TODO | 1 +
vcmi/distinfo | 7 ++++---
vcmi/patches/patch-CI_get__package__name.sh | 15 +++++++++++++++
4 files changed, 30 insertions(+), 5 deletions(-)
diffs:
diff --git a/vcmi/Makefile b/vcmi/Makefile
index 8559a79936..d8b2b81b29 100644
--- a/vcmi/Makefile
+++ b/vcmi/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= vcmi-0.99
+DISTNAME= vcmi-1.0.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=vcmi/}
@@ -17,12 +17,20 @@ USE_TOOLS+= pkg-config
PTHREAD_OPTS= require native
LDFLAGS+= -lpthread
+SUBST_CLASSES+= prefix
+SUBST_SED.prefix+= -e "s,/usr/local/include,${BUILDLINK_PREFIX.ffmpeg5}/include/ffmpeg5,"
+SUBST_SED.prefix+= -e "s,/usr/local/lib,${BUILDLINK_PREFIX.ffmpeg5}/lib/ffmpeg5,"
+SUBST_FILES.prefix+= cmake_modules/Findffmpeg.cmake
+SUBST_STAGE.prefix= pre-configure
+SUBST_MESSAGE.prefix= Fixing ffmpeg detection.
+
.include "../../audio/SDL2_mixer/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
.include "../../fonts/SDL2_ttf/buildlink3.mk"
.include "../../graphics/SDL2_image/buildlink3.mk"
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/ffmpeg5/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/vcmi/TODO b/vcmi/TODO
new file mode 100644
index 0000000000..a1d970ab61
--- /dev/null
+++ b/vcmi/TODO
@@ -0,0 +1 @@
+Needs package for https://github.com/oneapi-src/oneTBB
diff --git a/vcmi/distinfo b/vcmi/distinfo
index 69d71636ae..ce6439500c 100644
--- a/vcmi/distinfo
+++ b/vcmi/distinfo
@@ -1,5 +1,6 @@
$NetBSD$
-RMD160 (vcmi-0.99.tar.gz) = e91716aed2ea1bdd4aa8fb91a162ab2d3411f72e
-SHA512 (vcmi-0.99.tar.gz) = 7491da9efebb1e8875d00e23d6a2a69e280b90b23b0f2db920bccf4e83df5267aa40cd36e945aa31cb38196744aef61b511d3cf91c2d93f3dc7a156b4c58aabd
-Size (vcmi-0.99.tar.gz) = 7548936 bytes
+BLAKE2s (vcmi-1.0.0.tar.gz) = 12563c2e88bb622ad5f2939ce14461508827c9a8794c5a887414eac104d5cd0c
+SHA512 (vcmi-1.0.0.tar.gz) = c88d307594dc73c2eb22b3c5237b9e37ea1e2f98cac2b10882a040a96fcf903ac6ec140f1cf031417c71c414e271a17d29409d4395402a669737573c6ee09ef0
+Size (vcmi-1.0.0.tar.gz) = 5885358 bytes
+SHA1 (patch-CI_get__package__name.sh) = cfe34215ce642bb65ce77915adb4b13d3018259c
diff --git a/vcmi/patches/patch-CI_get__package__name.sh b/vcmi/patches/patch-CI_get__package__name.sh
new file mode 100644
index 0000000000..a4ecf7b07e
--- /dev/null
+++ b/vcmi/patches/patch-CI_get__package__name.sh
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix unportable test(1) operator.
+
+--- CI/get_package_name.sh.orig 2022-09-11 10:42:21.000000000 +0000
++++ CI/get_package_name.sh
+@@ -27,7 +27,7 @@ fi
+
+ VCMI_PACKAGE_FILE_NAME="${TMP_JOBID}-vcmi"
+ VCMI_PACKAGE_NAME_SUFFIX=""
+-if [ -z "$TMP_PRID" ] || [ "$TMP_PRID" == "false" ];
++if [ -z "$TMP_PRID" ] || [ "$TMP_PRID" = "false" ];
+ then
+ branch_name=$(echo "$TMP_BRANCH" | sed 's/[^[:alnum:]]\+/_/g')
+ VCMI_PACKAGE_FILE_NAME="${VCMI_PACKAGE_FILE_NAME}-branch-${branch_name}-${TMP_COMMIT}"
Home |
Main Index |
Thread Index |
Old Index