aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2022-06-21 20:11:33 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2022-06-21 20:14:56 +0000
commitb44b5547ee3c34430e180453e6fb0ef4d68bcc60 (patch)
tree63ae7d1a9800bf33f2e8b51796c05d5378015fa4
parent9fe392f00280364fe1a7af8262c2963659c5ae0c (diff)
downloadports-b44b5547ee3c34430e180453e6fb0ef4d68bcc60.tar.gz
ports-b44b5547ee3c34430e180453e6fb0ef4d68bcc60.zip
misc/astc-encoder: Update 3.7 -> 3.7-92
-rw-r--r--misc/astc-encoder/Makefile14
-rw-r--r--misc/astc-encoder/distinfo6
-rw-r--r--misc/astc-encoder/files/patch-CMakeLists.txt13
3 files changed, 6 insertions, 27 deletions
diff --git a/misc/astc-encoder/Makefile b/misc/astc-encoder/Makefile
index 83df59eec6bc..8b802a815ce6 100644
--- a/misc/astc-encoder/Makefile
+++ b/misc/astc-encoder/Makefile
@@ -1,5 +1,6 @@
PORTNAME= astc-encoder
-DISTVERSION= 3.7
+DISTVERSION= 3.7-92
+DISTVERSIONSUFFIX= -g50f5f8f
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org
@@ -15,19 +16,10 @@ GH_ACCOUNT= ARM-software
GH_TUPLE= google:googletest:703bd9c:googletest/Source/GoogleTest
CMAKE_OFF= UNITTEST
-CMAKE_TESTING_ON= UNITTEST # tests fail to build, see https://github.com/ARM-software/astc-encoder/issues/346
+CMAKE_TESTING_ON= UNITTEST # tests fail to build, see https://github.com/ARM-software/astc-encoder/issues/349
LDFLAGS+= -pthread
PLIST_FILES= bin/astcenc-native
-post-patch: # workaround for https://github.com/ARM-software/astc-encoder/issues/345
- @cd ${WRKSRC} && \
- ${REINPLACE_CMD} -e 's|astcenc/|bin/|' \
- Test/testlib/encoder.py \
- Test/astc_minify_test.sh \
- Test/astc_update_ref.sh \
- Test/astc_minify_test.sh \
- Test/astc_test_competitive.py
-
.include <bsd.port.mk>
diff --git a/misc/astc-encoder/distinfo b/misc/astc-encoder/distinfo
index de6cc0404882..9a0c58be65e4 100644
--- a/misc/astc-encoder/distinfo
+++ b/misc/astc-encoder/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1655696515
-SHA256 (ARM-software-astc-encoder-3.7_GH0.tar.gz) = f66c38de17e4f212d9f263016a3b68184d6860f724b849d61be904bbfd77be31
-SIZE (ARM-software-astc-encoder-3.7_GH0.tar.gz) = 36638557
+TIMESTAMP = 1655841306
+SHA256 (ARM-software-astc-encoder-3.7-92-g50f5f8f_GH0.tar.gz) = d8633cd0486b38b62a356ce5a383b0016349111dda73d535f49158aae5c59b70
+SIZE (ARM-software-astc-encoder-3.7-92-g50f5f8f_GH0.tar.gz) = 36649917
SHA256 (google-googletest-703bd9c_GH0.tar.gz) = 54bef85b53a02b21ed1e784848ea05cbfd78134f8976a7831a956cfebcef7204
SIZE (google-googletest-703bd9c_GH0.tar.gz) = 904257
diff --git a/misc/astc-encoder/files/patch-CMakeLists.txt b/misc/astc-encoder/files/patch-CMakeLists.txt
deleted file mode 100644
index 1838a5580827..000000000000
--- a/misc/astc-encoder/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-- workaround for https://github.com/ARM-software/astc-encoder/issues/345
-
---- CMakeLists.txt.orig 2022-06-20 03:49:47 UTC
-+++ CMakeLists.txt
-@@ -30,7 +30,7 @@ set(CMAKE_CXX_STANDARD 14)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- set(CMAKE_CXX_EXTENSIONS OFF)
- set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
--set(PACKAGE_ROOT astcenc)
-+set(PACKAGE_ROOT bin)
-
- include(CTest)
-