From nobody Wed Aug 31 10:16:22 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MHg7V2TrJz4ZvNC; Wed, 31 Aug 2022 10:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MHg7V1qPkz46KN; Wed, 31 Aug 2022 10:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661940982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gg/8V2xhSkfYXB0GPGxmztZWohr3Rl/3xKpK98g/cMc=; b=OT9HXE3s1sqpDPlDw1muNS5azGvUYYpeuo2C8MpKAlgcACbdx10d17hXZpcV1I36rkMbDj 5gV+PoTPsXANsBfE135kDxBIK8HmulgvZ2sienFwbEpmFq6GnLJP51RUp0AGeAO7r+lh1q BZuSkeBDWfNPbbXZOVROSY56iZmsNf8O18qs9frGuyjcSDOeadVi2PNRe5SgwYQje+0qEA 5jXuTbQn+bQPfZjl5jHDJUTOjsqTDNipoNorzVDSyyf+BSoE6KqEGWTlQ3CnS41ye2mlsr CUgh/M38hAu6hvRrD22homhJpVhpj9MZOp0dMy3d/+b+3FIVnUEqgoPo00cKMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MHg7V0vhqz15PV; Wed, 31 Aug 2022 10:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27VAGMef080103; Wed, 31 Aug 2022 10:16:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VAGMCL080102; Wed, 31 Aug 2022 10:16:22 GMT (envelope-from git) Date: Wed, 31 Aug 2022 10:16:22 GMT Message-Id: <202208311016.27VAGMCL080102@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: a55f03d90f6b - main - =?utf-8?Q?graphics/sdl2_image:=20update=202.0.5=20=E2=86=92=202.6.2?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a55f03d90f6bf5a5da822a6e7e68e89814c60b9d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661940982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gg/8V2xhSkfYXB0GPGxmztZWohr3Rl/3xKpK98g/cMc=; b=N4XYzYmEO3ok8WyMwP2sfrwd0BaNLHOSLoUahNpwzmF0oo/XiIPfQeNgE9/5quuBabP/gy 1ogJ5blG1KSsL3ZEHc/A+0duz/rnZQiRuYO8xCo16mpotqqPP6RZN1KP6I5pTQOqsJqeXO tRpGInySGbrb+kWprX9o/E56cSf8jZj6RcWQYFgHx0TIGgGcjdvhgqCFxiqTk8Ox2lAo3G DfdTtom2UUgU3eAp8lgQqqphbzgPKnnI0gP8o2uDaNxC7YHLobDwauxB9ra3n0GbyLGEfn oJnaJI7b9iIbRbGt4V+jss/DspWavf8DzVaflwREiAlFAHzRpWuYbCg+osFskg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661940982; a=rsa-sha256; cv=none; b=co+qZOvjqYC5aUgkC9pv+SZH+hI2EOqK+oWaxisOjA6zB1zNBnmNtfTCiJaIRnsHVmeegB yld5NkY9fqFWeQ3THVxmgms2nos7yUg546NBjHj0ZOIglEgA8BpyAskTolTc37jlaOe6+R 0VSOCVweBSbN673oztlvpguwOBPm7VU8CI6h2nZNSAwzAqONdWEF+YXsQBZ/GGIRC6OeNn dEU0UWODmNZx5oSc2wrqw3wOM7jOpGvcfygstxN+juyeGjHU/iwnf4fblW/tXTDjonzPqu UzHL/XfjMHfHowQMQyXIeb8hmuxcWeOP3M/3r+kokDBFo4riZ/oLwxB3EpIonQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=a55f03d90f6bf5a5da822a6e7e68e89814c60b9d commit a55f03d90f6bf5a5da822a6e7e68e89814c60b9d Author: Dmitry Marakasov AuthorDate: 2022-08-30 18:17:46 +0000 Commit: Dmitry Marakasov CommitDate: 2022-08-31 10:15:29 +0000 graphics/sdl2_image: update 2.0.5 → 2.6.2 --- graphics/sdl2_image/Makefile | 41 ++++++++++++++-------- graphics/sdl2_image/distinfo | 6 ++-- .../files/patch-cmake_FindSDL2test.cmake | 10 ++++++ graphics/sdl2_image/pkg-descr | 20 +++-------- graphics/sdl2_image/pkg-plist | 10 ++++-- 5 files changed, 51 insertions(+), 36 deletions(-) diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile index 5e678c08381b..d21458271cf7 100644 --- a/graphics/sdl2_image/Makefile +++ b/graphics/sdl2_image/Makefile @@ -1,34 +1,45 @@ PORTNAME= sdl2_image -PORTVERSION= 2.0.5 +DISTVERSIONPREFIX= release- +DISTVERSION= 2.6.2 CATEGORIES= graphics -MASTER_SITES= https://www.libsdl.org/projects/SDL_image/release/ -DISTNAME= SDL2_image-${PORTVERSION} 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 +USES= cmake sdl +USE_GITHUB= yes +GH_ACCOUNT= libsdl-org +GH_PROJECT= SDL_image USE_SDL= sdl2 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-jpg-shared --disable-png-shared \ - --disable-tif-shared --disable-webp-shared -INSTALL_TARGET= install-strip +CMAKE_OFF= SDL2IMAGE_DEPS_SHARED \ + SDL2IMAGE_SAMPLES \ + SDL2IMAGE_BACKEND_STB +CMAKE_ARGS= -DSDL2IMAGE_DEBUG_POSTFIX:STRING= USE_LDCONFIG= yes -OPTIONS_DEFINE= JPEG PNG TIFF WEBP -OPTIONS_DEFAULT=JPEG PNG TIFF WEBP +OPTIONS_DEFINE= AVIF JPEG JXL PNG TIFF WEBP TEST +OPTIONS_DEFAULT=JPEG PNG JPEG_USES= jpeg -JPEG_CONFIGURE_ENABLE= jpg +JPEG_CMAKE_BOOL= SDL2IMAGE_JPG PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CONFIGURE_ENABLE= png +PNG_CMAKE_BOOL= SDL2IMAGE_PNG TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_CONFIGURE_ENABLE= tif +TIFF_CMAKE_BOOL= SDL2IMAGE_TIF WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -WEBP_CONFIGURE_ENABLE= webp +WEBP_CMAKE_BOOL= SDL2IMAGE_WEBP +AVIF_LIB_DEPENDS= libavif.so:graphics/libavif +AVIF_CMAKE_BOOL= SDL2IMAGE_AVIF +JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl +JXL_CMAKE_BOOL= SDL2IMAGE_JXL +TEST_CMAKE_BOOL= SDL2IMAGE_TESTS +TEST_CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" +TEST_LIB_DEPENDS= libunwind.so:devel/libunwind +TEST_TEST_TARGET= test +TEST_IMPLIES= PNG JPEG # does not build otherwise post-extract: @${RM} -rf ${WRKSRC}/external diff --git a/graphics/sdl2_image/distinfo b/graphics/sdl2_image/distinfo index 5c8b95f26812..67a5883e2b4f 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 = 1661883495 +SHA256 (libsdl-org-SDL_image-release-2.6.2_GH0.tar.gz) = 5d91ea72b449a161821ef51464d0767efb6fedf7a773f923c43e483dc137e362 +SIZE (libsdl-org-SDL_image-release-2.6.2_GH0.tar.gz) = 9789569 diff --git a/graphics/sdl2_image/files/patch-cmake_FindSDL2test.cmake b/graphics/sdl2_image/files/patch-cmake_FindSDL2test.cmake new file mode 100644 index 000000000000..bfc11a9f79fe --- /dev/null +++ b/graphics/sdl2_image/files/patch-cmake_FindSDL2test.cmake @@ -0,0 +1,10 @@ +--- cmake/FindSDL2test.cmake.orig 2022-07-08 13:31:48 UTC ++++ cmake/FindSDL2test.cmake +@@ -16,6 +16,7 @@ find_package_handle_standard_args(SDL2test + if(SDL2test_FOUND) + if(NOT TARGET SDL2::SDL2test) + add_library(SDL2::SDL2test UNKNOWN IMPORTED) ++ target_link_libraries(SDL2::SDL2test INTERFACE $ENV{LOCALBASE}/lib/libunwind.so) + set_target_properties(SDL2::SDL2test PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${SDL2_TEST_LIBRARY}" diff --git a/graphics/sdl2_image/pkg-descr b/graphics/sdl2_image/pkg-descr index 4988823c3fab..7223deef241f 100644 --- a/graphics/sdl2_image/pkg-descr +++ b/graphics/sdl2_image/pkg-descr @@ -1,18 +1,6 @@ This is a simple library to load images of various formats as SDL surfaces. -This library supports BMP, PPM, PCX, GIF, JPEG, PNG, TGA, and TIFF formats. +It can load BMP, GIF, JPEG, LBM, PCX, PNG, PNM (PPM/PGM/PBM), QOI, +TGA, XCF, XPM, and simple SVG format images. It can also load AVIF, +JPEG-XL, TIFF, and WebP images, depending on build options -API: -#include "SDL_image.h" - - SDL_Surface *IMG_Load(const char *file); -or - SDL_Surface *IMG_Load_RW(SDL_RWops *src, int freesrc); -or - SDL_Surface *IMG_Load_RW(SDL_RWops *src, int freesrc, char *type); - -where type is a string specifying the format (i.e. "PNG" or "pcx"). -Note that IMG_Load_RW cannot load TGA images. - -An example program 'showimage' is included, with source in showimage.c - -WWW: https://www.libsdl.org/projects/SDL_image/ +WWW: https://github.com/libsdl-org/SDL_image diff --git a/graphics/sdl2_image/pkg-plist b/graphics/sdl2_image/pkg-plist index 1eb3e059fb50..98c15a3a7cf6 100644 --- a/graphics/sdl2_image/pkg-plist +++ b/graphics/sdl2_image/pkg-plist @@ -1,6 +1,12 @@ include/SDL2/SDL_image.h +lib/cmake/SDL2_image/Findlibjxl.cmake +lib/cmake/SDL2_image/Findwebp.cmake +lib/cmake/SDL2_image/SDL2_image-shared-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/SDL2_image/SDL2_image-shared-targets.cmake +lib/cmake/SDL2_image/SDL2_imageConfig.cmake +lib/cmake/SDL2_image/SDL2_imageConfigVersion.cmake +lib/libSDL2_image-2.0.so lib/libSDL2_image-2.0.so.0 -lib/libSDL2_image-2.0.so.0.2.3 -lib/libSDL2_image.a +lib/libSDL2_image-2.0.so.0.600.2 lib/libSDL2_image.so libdata/pkgconfig/SDL2_image.pc