Attachment 232640 Details for Bug 262725 – Patch for squish

[patch] Patch for squish

squish-115.patch (text/plain), 3.10 KB, created by Daniel Engberg on 2022-03-22 20:45:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2022-03-22 20:45:37 UTC

Size: 3.10 KB

patch

obsolete

>diff --git a/graphics/squish/Makefile b/graphics/squish/Makefile
>index 6e3ff3cbe9b1..78aa30505954 100644
>--- a/graphics/squish/Makefile
>+++ b/graphics/squish/Makefile
>@@ -1,30 +1,29 @@
> # Created by: Reinier de Blois <rddeblois@gmail.com>
> 
> 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
> COMMENT=	Open source DXT compression library
> 
> 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
>-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..9094e3e29e20 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 = 1647813241
>+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..55b92f772896
>--- /dev/null
>+++ b/graphics/squish/files/patch-CMakeLists.txt
>@@ -0,0 +1,14 @@
>+--- CMakeLists.txt.orig	2022-03-21 07:19:59 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)

Actions: View | Diff

Attachments on bug 262725: 232640