diff options
author | Daniel Engberg <diizzy@FreeBSD.org> | 2022-09-25 22:43:40 +0000 |
---|---|---|
committer | Daniel Engberg <diizzy@FreeBSD.org> | 2022-09-25 22:47:29 +0000 |
commit | 49356d672e07206e281ac8de43894d63b3369f45 (patch) | |
tree | 4ce9a85809a36ccbbb61d181acd29c07883f3568 /graphics/squish | |
parent | 3593a1ea44a6f1fed6022e48dc2381af55bdf883 (diff) | |
download | ports-49356d672e07206e281ac8de43894d63b3369f45.tar.gz ports-49356d672e07206e281ac8de43894d63b3369f45.zip |
graphics/squish: Update to 1.5 and release back to pool
Enable OpenMP support on amd64 and aarch64
Release port back to pool as maintainer has trouble finding time
to maintain it. Thanks for all your time and effort!
PR: 262725
Approved by: portmgr (maintainer timeout, 2+ weeks)
Diffstat (limited to 'graphics/squish')
-rw-r--r-- | graphics/squish/Makefile | 35 | ||||
-rw-r--r-- | graphics/squish/distinfo | 5 | ||||
-rw-r--r-- | graphics/squish/files/BSDmakefile | 15 | ||||
-rw-r--r-- | graphics/squish/files/patch-CMakeLists.txt | 14 |
4 files changed, 33 insertions, 36 deletions
diff --git a/graphics/squish/Makefile b/graphics/squish/Makefile index d6d0765dc9a1..9bc93caabf71 100644 --- a/graphics/squish/Makefile +++ b/graphics/squish/Makefile @@ -1,31 +1,28 @@ PORTNAME= squish -PORTVERSION= 1.10 -PORTREVISION= 2 +DISTVERSION= 1.15 CATEGORIES= graphics -MASTER_SITES= https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libsquish/ +MASTER_SITES= SF/lib${PORTNAME} +DISTNAME= lib${PORTNAME}-${DISTVERSION} -MAINTAINER= rddeblois@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Open source DXT compression library -WWW= https://code.google.com/p/libsquish/ +WWW= https://sourceforge.net/projects/libsquish/ LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= uidfix -MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX} -PLIST_FILES= include/squish.h \ - lib/libsquish.a lib/libsquish.so.1 lib/libsquish.so -MAKEFILE= ${FILESDIR}/BSDmakefile +USES= cmake tar:tgz USE_LDCONFIG= yes -OPTIONS_RADIO= RG1 -OPTIONS_RADIO_RG1= ALTIVEC SSE -OPTIONS_DEFAULT_amd64= SSE -OPTIONS_DEFAULT_powerpc64= ALTIVEC -OPTIONS_DEFAULT_powerpc64le= ALTIVEC -ALTIVEC_DESC= Use Altivec instructions -RG1_DESC= Optimizations Selection +NO_WRKSUBDIR= yes -ALTIVEC_CXXFLAGS= -DSQUISH_USE_ALTIVEC=1 -maltivec -SSE_CXXFLAGS= -DSQUISH_USE_SSE=2 -msse2 +PLIST_FILES= lib/libsquish.so.0.0 \ + lib/libsquish.so \ + include/squish.h + +CMAKE_ON_aarch64= BUILD_SQUISH_WITH_OPENMP +CMAKE_ON_amd64= BUILD_SQUISH_WITH_OPENMP BUILD_SQUISH_WITH_SSE2 +CMAKE_ON_i386= BUILD_SQUISH_WITH_OPENMP +CMAKE_ON= BUILD_SHARED_LIBS ${CMAKE_ON_${ARCH}} .include <bsd.port.mk> diff --git a/graphics/squish/distinfo b/graphics/squish/distinfo index ca001ca2af33..47c19608dd7b 100644 --- a/graphics/squish/distinfo +++ b/graphics/squish/distinfo @@ -1,2 +1,3 @@ -SHA256 (squish-1.10.tar.gz) = aec3428badafdbb3b0ed1ea3a385a8029e65694282459f61b4a538963e8cada3 -SIZE (squish-1.10.tar.gz) = 45009 +TIMESTAMP = 1664129303 +SHA256 (libsquish-1.15.tgz) = 628796eeba608866183a61d080d46967c9dda6723bc0a3ec52324c85d2147269 +SIZE (libsquish-1.15.tgz) = 59199 diff --git a/graphics/squish/files/BSDmakefile b/graphics/squish/files/BSDmakefile deleted file mode 100644 index 0f165e1c91b2..000000000000 --- a/graphics/squish/files/BSDmakefile +++ /dev/null @@ -1,15 +0,0 @@ -LIB= squish -SHLIB_MAJOR= 1 -SRCS!= echo *.cpp -MK_PROFILE= no - -CXXFLAGS+= -include limits.h -I${.CURDIR} - -LIBDIR= ${PREFIX}/lib -INCSDIR= ${PREFIX}/include -INCS= squish.h -# The below two are needed until PR 206126 is resolved -INCSOWN= ${LIBOWN} -INCSGRP= ${LIBGRP} - -.include <bsd.lib.mk> diff --git a/graphics/squish/files/patch-CMakeLists.txt b/graphics/squish/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e18b6ec9a148 --- /dev/null +++ b/graphics/squish/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2022-09-25 18:09:06 UTC ++++ CMakeLists.txt +@@ -13,9 +13,9 @@ PROJECT(squish) + + CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3) + +-OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." ON) ++OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." OFF) + +-OPTION(BUILD_SQUISH_WITH_SSE2 "Build with SSE2." ON) ++OPTION(BUILD_SQUISH_WITH_SSE2 "Build with SSE2." OFF) + OPTION(BUILD_SQUISH_WITH_ALTIVEC "Build with Altivec." OFF) + + OPTION(BUILD_SHARED_LIBS "Build shared libraries." OFF) |