kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

misc/cuttlefish: Update 2.6.2 -> 2.7.0

Browse source 
Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2022-09-26 23:30:07 -07:00
parent bc41800a17
commit a71668512c
5 changed files with 26 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
misc/cuttlefish/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= cuttlefish
DISTVERSIONPREFIX= v
DISTVERSION= 2.6.2
DISTVERSION= 2.7.0
CATEGORIES= misc
PKGNAMESUFFIX= -texture-compressor
@ -11,6 +11,7 @@ WWW= https://github.com/akb825/Cuttlefish
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libfreeimage.so:graphics/freeimage
TEST_DEPENDS= ispc:devel/ispc
USES= cmake:testing compiler:c++11-lang dos2unix
@ -18,21 +19,19 @@ USES= cmake:testing compiler:c++11-lang dos2unix
USE_GITHUB= yes
GH_ACCOUNT= akb825
GH_PROJECT= Cuttlefish
GH_TUPLE= akb825:freeimage:dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076:akb825_freeimage/lib/FreeImage \
GH_TUPLE= akb825:freeimage:f213e48116964f273412dbd7337b03a32d52ec29:akb825_freeimage/lib/FreeImage \
akb825:etc2comp:10ec1fc4987c5a81c48c6bf6319bb77389a5f23a:akb825_etc2comp/lib/etc2comp \
ARM-software:astc-encoder:f48cc27b2528286126c116f42f2792ed2fa13755:ARM_software_astc_encoder/lib/astc-encoder \
ARM-software:astc-encoder:43d5f57babf0904f9e4222dc3644790d8e41aab4:ARM_software_astc_encoder/lib/astc-encoder \
g-truc:glm:bf71a834948186f4097caa076cd2663c69a10e1e:g_truc_glm/lib/glm \
akb825:PVRTexToolLib:ea50a1c0fb4d8eed2f06ecc47eea80ef291b63b9:akb825_PVRTexToolLib/lib/PVRTexToolLib \
richgel999:bc7enc_rdo:f965c3fd8a39ef91f8bf8cddb7d2eee83a95a1c2:richgel999_bc7enc_rdo/lib/bc7enc_rdo \
GPUOpen-Tools:compressonator:a429164726337b83fd8e20871eb74f5be1d6ef1c:GPUOpen_Tools_compressonator/lib/compressonator \
GameTechDev:ISPCTextureCompressor:14d998c02b71c356ff3a1ec1adc9243a517bbf38:GameTechDev_ISPCTextureCompressor/lib/ISPCTextureCompressor \
richgel999:bc7enc_rdo:e6990bc11829c072d9f9e37296f3335072aab4e4:richgel999_bc7enc_rdo/lib/bc7enc_rdo \
GPUOpen-Tools:compressonator:bab59d4330e64612a1bb0c18dce0f70b48fef395:GPUOpen_Tools_compressonator/lib/compressonator \
GameTechDev:ISPCTextureCompressor:cd0ef2cf78a80db293d7609100f027960f9e7205:GameTechDev_ISPCTextureCompressor/lib/ISPCTextureCompressor \
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
DOS2UNIX_FILES= lib/FreeImage/Source/FreeImage/PluginDDS.cpp \
lib/FreeImage/Source/FreeImage/PluginBMP.cpp
.include <bsd.port.mk>

26
misc/cuttlefish/distinfo
View file

@ -1,22 +1,22 @@
TIMESTAMP = 1658197364
SHA256 (akb825-Cuttlefish-v2.6.2_GH0.tar.gz) = 841ca1f7dcf678f8b93e8b354d72cd18559a179bd51cb2a1719d9b89fcf0dc0a
SIZE (akb825-Cuttlefish-v2.6.2_GH0.tar.gz) = 112752
SHA256 (akb825-freeimage-dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076_GH0.tar.gz) = d0648ffca8a71ff988344285f2c7f29c709b6e62c6fcb8edaaad4a189d9de8dc
SIZE (akb825-freeimage-dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076_GH0.tar.gz) = 7248018
TIMESTAMP = 1664258713
SHA256 (akb825-Cuttlefish-v2.7.0_GH0.tar.gz) = ea28cba1b64ed3413c47a36443fe79ddb1bb2b9b6730bfba2b33b3d962ae6ecb
SIZE (akb825-Cuttlefish-v2.7.0_GH0.tar.gz) = 113003
SHA256 (akb825-freeimage-f213e48116964f273412dbd7337b03a32d52ec29_GH0.tar.gz) = 27298578fec1214a471f521c71b61d5c8a684a050c881a792e4b085ca4c09b0c
SIZE (akb825-freeimage-f213e48116964f273412dbd7337b03a32d52ec29_GH0.tar.gz) = 7031262
SHA256 (akb825-etc2comp-10ec1fc4987c5a81c48c6bf6319bb77389a5f23a_GH0.tar.gz) = 8aae8f87e0f1e79c2bde57254e0b85273d0d036f381f549ce148bc3fbd785b02
SIZE (akb825-etc2comp-10ec1fc4987c5a81c48c6bf6319bb77389a5f23a_GH0.tar.gz) = 152493
SHA256 (ARM-software-astc-encoder-f48cc27b2528286126c116f42f2792ed2fa13755_GH0.tar.gz) = f77d7b966dbb8b6029ab5b5b152b42f2ace4474a82e551dbcdaa49647b8782d9
SIZE (ARM-software-astc-encoder-f48cc27b2528286126c116f42f2792ed2fa13755_GH0.tar.gz) = 36637218
SHA256 (ARM-software-astc-encoder-43d5f57babf0904f9e4222dc3644790d8e41aab4_GH0.tar.gz) = 6d453c5a144bbb1c17e637a540a640f5b57b2e19ff9495223a4266a5181cfcb8
SIZE (ARM-software-astc-encoder-43d5f57babf0904f9e4222dc3644790d8e41aab4_GH0.tar.gz) = 35779296
SHA256 (g-truc-glm-bf71a834948186f4097caa076cd2663c69a10e1e_GH0.tar.gz) = 70ad78e872c145f0164d54da833b651914c184edc65958906937b9739fb8fb1b
SIZE (g-truc-glm-bf71a834948186f4097caa076cd2663c69a10e1e_GH0.tar.gz) = 4369431
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 (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 (richgel999-bc7enc_rdo-e6990bc11829c072d9f9e37296f3335072aab4e4_GH0.tar.gz) = cba9fddbf045a0fd9f2118b894bb2a2731e88f728c5717b3b1d4771fb3bd6528
SIZE (richgel999-bc7enc_rdo-e6990bc11829c072d9f9e37296f3335072aab4e4_GH0.tar.gz) = 15084810
SHA256 (GPUOpen-Tools-compressonator-bab59d4330e64612a1bb0c18dce0f70b48fef395_GH0.tar.gz) = 48d4d1fce17e4dda2f5b9b389e5812e7a476b7a02e0d27297ab69dc27de40fa1
SIZE (GPUOpen-Tools-compressonator-bab59d4330e64612a1bb0c18dce0f70b48fef395_GH0.tar.gz) = 24368120
SHA256 (GameTechDev-ISPCTextureCompressor-cd0ef2cf78a80db293d7609100f027960f9e7205_GH0.tar.gz) = 85ab589c6ad2862d4faec9dc18a1c2d2308eb2d60666e243201b29450f90cf72
SIZE (GameTechDev-ISPCTextureCompressor-cd0ef2cf78a80db293d7609100f027960f9e7205_GH0.tar.gz) = 6436876
SHA256 (akb825-libsquish-a9087786ced42a1a4ee137c1ad5bf197dd2d6b72_GH0.tar.gz) = 68d43e6cbc9ab1c05497e76ced54e87f8574986f671befaad06712dcda55eb08
SIZE (akb825-libsquish-a9087786ced42a1a4ee137c1ad5bf197dd2d6b72_GH0.tar.gz) = 59435
SHA256 (google-googletest-703bd9caab50b139428cea1aaff9974ebee5742e_GH0.tar.gz) = d17b1b83a57b3933565a6d0616fe261107326d47de20288d0949ed038e1c342d

29
misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginBMP.cpp
View file

@ -1,29 +0,0 @@
--- lib/FreeImage/Source/FreeImage/PluginBMP.cpp.orig 2022-09-12 21:40:45 UTC
+++ lib/FreeImage/Source/FreeImage/PluginBMP.cpp
@@ -1419,7 +1419,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
free(buffer);
#ifdef FREEIMAGE_BIGENDIAN
- } else if (bpp == 16) {
+ } else if (dst_bpp == 16) {
int padding = dst_pitch - dst_width * sizeof(WORD);
WORD pad = 0;
WORD pixel;
@@ -1440,7 +1440,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
}
#endif
#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
- } else if (bpp == 24) {
+ } else if (dst_bpp == 24) {
int padding = dst_pitch - dst_width * sizeof(FILE_BGR);
DWORD pad = 0;
FILE_BGR bgr;
@@ -1461,7 +1461,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
}
}
}
- } else if (bpp == 32) {
+ } else if (dst_bpp == 32) {
FILE_BGRA bgra;
for(unsigned y = 0; y < dst_height; y++) {
BYTE *line = FreeImage_GetScanLine(dib, y);

25
misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginDDS.cpp
View file

@ -1,25 +0,0 @@
--- lib/FreeImage/Source/FreeImage/PluginDDS.cpp.orig 2022-09-12 21:40:59 UTC
+++ lib/FreeImage/Source/FreeImage/PluginDDS.cpp
@@ -356,14 +356,14 @@ SwapHeader(DDSHEADER *header) {
for(int i=0; i<11; i++) {
SwapLong(&header->surfaceDesc.dwReserved1[i]);
}
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwSize);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFlags);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFourCC);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBBitCount);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRBitMask);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwGBitMask);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwBBitMask);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask);
+ SwapLong(&header->surfaceDesc.ddspf.dwSize);
+ SwapLong(&header->surfaceDesc.ddspf.dwFlags);
+ SwapLong(&header->surfaceDesc.ddspf.dwFourCC);
+ SwapLong(&header->surfaceDesc.ddspf.dwRGBBitCount);
+ SwapLong(&header->surfaceDesc.ddspf.dwRBitMask);
+ SwapLong(&header->surfaceDesc.ddspf.dwGBitMask);
+ SwapLong(&header->surfaceDesc.ddspf.dwBBitMask);
+ SwapLong(&header->surfaceDesc.ddspf.dwRGBAlphaBitMask);
SwapLong(&header->surfaceDesc.ddsCaps.dwCaps1);
SwapLong(&header->surfaceDesc.ddsCaps.dwCaps2);
SwapLong(&header->surfaceDesc.ddsCaps.dwReserved[0]);

9
misc/cuttlefish/pkg-plist
View file

@ -6,7 +6,10 @@ include/cuttlefish/Image.h
include/cuttlefish/Texture.h
lib/cmake/Cuttlefish/CuttlefishConfig.cmake
lib/cmake/Cuttlefish/CuttlefishConfigVersion.cmake
lib/cmake/Cuttlefish/CuttlefishTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Cuttlefish/CuttlefishTargets.cmake
lib/cmake/Cuttlefish/cuttlefish-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Cuttlefish/cuttlefish-targets.cmake
lib/cmake/Cuttlefish/cuttlefish_lib-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Cuttlefish/cuttlefish_lib-targets.cmake
lib/libcuttlefish.so
lib/libcuttlefish.so.2.6.2
lib/libcuttlefish.so.2.7
lib/libcuttlefish.so.2.7.0