Attachment 236153 Details for Bug 266071 – v1.1 (apply via "git am")

[patch] v1.1 (apply via "git am")

bug266071.diff (text/plain), 3.71 KB, created by Jan Beich on 2022-08-27 16:29:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2022-08-27 16:29:35 UTC

Size: 3.71 KB

patch

obsolete

>From 040bb7cea685d6a34a0edb5d23f0850b63063f6b Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 19 Aug 2022 17:19:16 +0000
>Subject: [PATCH] graphics/sdl2_image: update to 2.6.2
>
>Changes:	https://discourse.libsdl.org/t/announcing-sdl-image-2-6-0
>PR:		266071
>Approved by:	amdmi3 (maintainer)
>---
> graphics/sdl2_image/Makefile  | 35 +++++++++++++++++++++++++++++------
> graphics/sdl2_image/distinfo  |  6 +++---
> graphics/sdl2_image/pkg-plist |  4 +++-
> 3 files changed, 35 insertions(+), 10 deletions(-)
>
>diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile
>index 5e678c08381b..daa671e21d34 100644
>--- a/graphics/sdl2_image/Makefile
>+++ b/graphics/sdl2_image/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	sdl2_image
>-PORTVERSION=	2.0.5
>+PORTVERSION=	2.6.2
> CATEGORIES=	graphics
> MASTER_SITES=	https://www.libsdl.org/projects/SDL_image/release/
> DISTNAME=	SDL2_image-${PORTVERSION}
>@@ -8,21 +8,31 @@ MAINTAINER=	amdmi3@FreeBSD.org
> COMMENT=	Simple library to load images of various formats as SDL surfaces
> 
> LICENSE=	ZLIB
>-LICENSE_FILE=	${WRKSRC}/COPYING.txt
>+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
> USES=		gmake libtool localbase pkgconfig pathfix sdl
> USE_SDL=	sdl2
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--disable-jpg-shared --disable-png-shared \
>-		--disable-tif-shared --disable-webp-shared
>+CONFIGURE_ARGS=	--disable-avif-shared \
>+		--disable-jpg-shared \
>+		--disable-jxl-shared \
>+		--disable-png-shared \
>+		--disable-tif-shared \
>+		--disable-webp-shared \
>+		--disable-stb-image
> INSTALL_TARGET=	install-strip
>+TEST_TARGET=	check
> USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFINE=	JPEG PNG TIFF WEBP
>-OPTIONS_DEFAULT=JPEG PNG TIFF WEBP
>+OPTIONS_DEFINE=	AVIF JPEG JXL PNG TIFF WEBP
>+OPTIONS_DEFAULT=AVIF JPEG JXL PNG TIFF WEBP
> 
>+AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
>+AVIF_CONFIGURE_ENABLE=	avif
> JPEG_USES=		jpeg
> JPEG_CONFIGURE_ENABLE=	jpg
>+JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
>+JXL_CONFIGURE_ENABLE=	jxl
> PNG_LIB_DEPENDS=	libpng.so:graphics/png
> PNG_CONFIGURE_ENABLE=	png
> TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
>@@ -33,4 +43,17 @@ WEBP_CONFIGURE_ENABLE=	webp
> post-extract:
> 	@${RM} -rf ${WRKSRC}/external
> 
>+post-patch:
>+# -lSDL2_test is a static library, so private dependencies leak into consumers
>+# <libunwind.h> is provided by both base and ports, so requires guessing ABI
>+	@${REINPLACE_CMD} -e "s/-lSDL2_test/& `if [ -f ${LOCALBASE}/lib/libunwind.so ]; then echo -lunwind; else echo -lgcc_eh; fi`/" \
>+		${WRKSRC}/test/Makefile.in
>+
>+pre-test:
>+	@if [ ! -e ${WRKDIR}/.autoconf_build_tests ]; then \
>+		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
>+		${MAKE} -C${.CURDIR} build CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-tests"; \
>+		${TOUCH} ${WRKDIR}/.autoconf_build_tests; \
>+	fi
>+
> .include <bsd.port.mk>
>diff --git a/graphics/sdl2_image/distinfo b/graphics/sdl2_image/distinfo
>index 5c8b95f26812..33799c4d8439 100644
>--- a/graphics/sdl2_image/distinfo
>+++ b/graphics/sdl2_image/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562166413
>-SHA256 (SDL2_image-2.0.5.tar.gz) = bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0
>-SIZE (SDL2_image-2.0.5.tar.gz) = 11736518
>+TIMESTAMP = 1660929556
>+SHA256 (SDL2_image-2.6.2.tar.gz) = 48355fb4d8d00bac639cd1c4f4a7661c4afef2c212af60b340e06b7059814777
>+SIZE (SDL2_image-2.6.2.tar.gz) = 9814907
>diff --git a/graphics/sdl2_image/pkg-plist b/graphics/sdl2_image/pkg-plist
>index 1eb3e059fb50..c30695af6af7 100644
>--- a/graphics/sdl2_image/pkg-plist
>+++ b/graphics/sdl2_image/pkg-plist
>@@ -1,6 +1,8 @@
> include/SDL2/SDL_image.h
>+lib/cmake/SDL2_image/sdl2_image-config-version.cmake
>+lib/cmake/SDL2_image/sdl2_image-config.cmake
> lib/libSDL2_image-2.0.so.0
>-lib/libSDL2_image-2.0.so.0.2.3
>+lib/libSDL2_image-2.0.so.0.600.2
> lib/libSDL2_image.a
> lib/libSDL2_image.so
> libdata/pkgconfig/SDL2_image.pc

Actions: View | Diff

Attachments on bug 266071: 236151 | 236152 | 236153