misc/cuttlefish: Update 2.5.6 -> 2.6.0; Remove powerpc* check

... since this shouldn't be needed any more, see akb825/Cuttlefish#14 (comment) Reported by: portscout
freebsd · Jul 5, 2022 · 0229917 · 0229917
1 parent 8cb30fc
commit 0229917
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/misc/cuttlefish/Makefile b/misc/cuttlefish/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cuttlefish
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.6
+DISTVERSION=	2.6.0
 CATEGORIES=	misc
 PKGNAMESUFFIX=	-texture-compressor
 
@@ -21,21 +21,15 @@ GH_TUPLE=	akb825:freeimage:dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076:akb825_freei
 		akb825:etc2comp:10ec1fc4987c5a81c48c6bf6319bb77389a5f23a:akb825_etc2comp/lib/etc2comp \
 		ARM-software:astc-encoder:f48cc27b2528286126c116f42f2792ed2fa13755:ARM_software_astc_encoder/lib/astc-encoder \
 		g-truc:glm:bf71a834948186f4097caa076cd2663c69a10e1e:g_truc_glm/lib/glm \
-		akb825:PVRTexToolLib:015a0f7b125394d7628e5d562fb8d3e5cb7cac08:akb825_PVRTexToolLib/lib/PVRTexToolLib \
+		akb825:PVRTexToolLib:ea50a1c0fb4d8eed2f06ecc47eea80ef291b63b9:akb825_PVRTexToolLib/lib/PVRTexToolLib \
 		richgel999:bc7enc_rdo:f965c3fd8a39ef91f8bf8cddb7d2eee83a95a1c2:richgel999_bc7enc_rdo/lib/bc7enc_rdo \
-		akb825:compressonator:a4d078359f74053564a9b7a9bd0b5bb2fa0a65a7:akb825_compressonator/lib/compressonator \
+		GPUOpen-Tools:compressonator:a429164726337b83fd8e20871eb74f5be1d6ef1c:GPUOpen_Tools_compressonator/lib/compressonator \
 		GameTechDev:ISPCTextureCompressor:14d998c02b71c356ff3a1ec1adc9243a517bbf38:GameTechDev_ISPCTextureCompressor/lib/ISPCTextureCompressor \
-		KonajuGames:libsquish:7543ea155b475f129d3733b98b7f17f1fa274cf1:KonajuGames_libsquish/lib/libsquish \
+		akb825:libsquish:a9087786ced42a1a4ee137c1ad5bf197dd2d6b72:akb825_libsquish/lib/libsquish \
 		google:googletest:703bd9caab50b139428cea1aaff9974ebee5742e:google_googletest/lib/astc-encoder/Source/GoogleTest
 
 CMAKE_OFF=	CUTTLEFISH_BUILD_DOCS CUTTLEFISH_BUILD_TESTS
 CMAKE_ON=	CUTTLEFISH_SHARED
 CMAKE_TESTING_ON=	CUTTLEFISH_BUILD_TESTS
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
-CXXFLAGS+=	-DSQUISH_USE_ALTIVEC -DSQUISH_USE_SSE=0
-.endif
-
 .include <bsd.port.mk>
diff --git a/misc/cuttlefish/distinfo b/misc/cuttlefish/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1655766592
-SHA256 (akb825-Cuttlefish-v2.5.6_GH0.tar.gz) = cd63c6be4c289db3b66500ce2f9693850af2c432e969f9ed2ca2a5000d2e8725
-SIZE (akb825-Cuttlefish-v2.5.6_GH0.tar.gz) = 110791
+TIMESTAMP = 1656988090
+SHA256 (akb825-Cuttlefish-v2.6.0_GH0.tar.gz) = 9056fb27629a7bb1dd9300200ad9fa6428c219b18c24e5e8aca68777280a3fe2
+SIZE (akb825-Cuttlefish-v2.6.0_GH0.tar.gz) = 112786
 SHA256 (akb825-freeimage-dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076_GH0.tar.gz) = d0648ffca8a71ff988344285f2c7f29c709b6e62c6fcb8edaaad4a189d9de8dc
 SIZE (akb825-freeimage-dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076_GH0.tar.gz) = 7248018
 SHA256 (akb825-etc2comp-10ec1fc4987c5a81c48c6bf6319bb77389a5f23a_GH0.tar.gz) = 8aae8f87e0f1e79c2bde57254e0b85273d0d036f381f549ce148bc3fbd785b02
@@ -9,15 +9,15 @@ SHA256 (ARM-software-astc-encoder-f48cc27b2528286126c116f42f2792ed2fa13755_GH0.t
 SIZE (ARM-software-astc-encoder-f48cc27b2528286126c116f42f2792ed2fa13755_GH0.tar.gz) = 36637218
 SHA256 (g-truc-glm-bf71a834948186f4097caa076cd2663c69a10e1e_GH0.tar.gz) = 70ad78e872c145f0164d54da833b651914c184edc65958906937b9739fb8fb1b
 SIZE (g-truc-glm-bf71a834948186f4097caa076cd2663c69a10e1e_GH0.tar.gz) = 4369431
-SHA256 (akb825-PVRTexToolLib-015a0f7b125394d7628e5d562fb8d3e5cb7cac08_GH0.tar.gz) = 2198525c3cb3058f68f6cd90121c5b0f3233d937148d197c731c0bd1e3e1a3ba
-SIZE (akb825-PVRTexToolLib-015a0f7b125394d7628e5d562fb8d3e5cb7cac08_GH0.tar.gz) = 19155157
+SHA256 (akb825-PVRTexToolLib-ea50a1c0fb4d8eed2f06ecc47eea80ef291b63b9_GH0.tar.gz) = 7a9e03dcacb8708bd6ab4f853562a8fc49b9ecd2602373f21ba2b54ee2b11c6b
+SIZE (akb825-PVRTexToolLib-ea50a1c0fb4d8eed2f06ecc47eea80ef291b63b9_GH0.tar.gz) = 38251894
 SHA256 (richgel999-bc7enc_rdo-f965c3fd8a39ef91f8bf8cddb7d2eee83a95a1c2_GH0.tar.gz) = 0a9ee5571ebcc63f1da901dbd6d6d5ec072ae3ff8e074efae166f776d5ddc7fa
 SIZE (richgel999-bc7enc_rdo-f965c3fd8a39ef91f8bf8cddb7d2eee83a95a1c2_GH0.tar.gz) = 15084973
-SHA256 (akb825-compressonator-a4d078359f74053564a9b7a9bd0b5bb2fa0a65a7_GH0.tar.gz) = 5f69f22753f283a9e52afa518f151d222a1d6684150e4c5f028e24e15add7c70
-SIZE (akb825-compressonator-a4d078359f74053564a9b7a9bd0b5bb2fa0a65a7_GH0.tar.gz) = 24367769
+SHA256 (GPUOpen-Tools-compressonator-a429164726337b83fd8e20871eb74f5be1d6ef1c_GH0.tar.gz) = 7eec1130d4695593a0baacb08f6d62d815c505369df0c94dba2f025a2983e9a0
+SIZE (GPUOpen-Tools-compressonator-a429164726337b83fd8e20871eb74f5be1d6ef1c_GH0.tar.gz) = 24369618
 SHA256 (GameTechDev-ISPCTextureCompressor-14d998c02b71c356ff3a1ec1adc9243a517bbf38_GH0.tar.gz) = a0f6f0537650295b0df66fd55dc888e53b9a6cf5aea576e2c99f2f7959a9931f
 SIZE (GameTechDev-ISPCTextureCompressor-14d998c02b71c356ff3a1ec1adc9243a517bbf38_GH0.tar.gz) = 6435886
-SHA256 (KonajuGames-libsquish-7543ea155b475f129d3733b98b7f17f1fa274cf1_GH0.tar.gz) = 5fa333d02ba94d466ce17a4ab33b16b5c518f52ea7a2063db51808d849d35d79
-SIZE (KonajuGames-libsquish-7543ea155b475f129d3733b98b7f17f1fa274cf1_GH0.tar.gz) = 57348
+SHA256 (akb825-libsquish-a9087786ced42a1a4ee137c1ad5bf197dd2d6b72_GH0.tar.gz) = 68d43e6cbc9ab1c05497e76ced54e87f8574986f671befaad06712dcda55eb08
+SIZE (akb825-libsquish-a9087786ced42a1a4ee137c1ad5bf197dd2d6b72_GH0.tar.gz) = 59435
 SHA256 (google-googletest-703bd9caab50b139428cea1aaff9974ebee5742e_GH0.tar.gz) = d17b1b83a57b3933565a6d0616fe261107326d47de20288d0949ed038e1c342d
 SIZE (google-googletest-703bd9caab50b139428cea1aaff9974ebee5742e_GH0.tar.gz) = 905359
diff --git a/misc/cuttlefish/pkg-plist b/misc/cuttlefish/pkg-plist
@@ -9,4 +9,4 @@ lib/cmake/Cuttlefish/CuttlefishConfigVersion.cmake
 lib/cmake/Cuttlefish/CuttlefishTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Cuttlefish/CuttlefishTargets.cmake
 lib/libcuttlefish.so
-lib/libcuttlefish.so.2.5.6
+lib/libcuttlefish.so.2.6.0