Hi,
This diff below is based on a suggested update that Brad sent me. One
issue is that it looks based on `make port-lib-depends-check` like the
library now links to c++ libs:
Missing: c++.9 (/usr/local/lib/libSDL2_image.so.1.0) (system lib)
Missing: c++abi.6 (/usr/local/lib/libSDL2_image.so.1.0) (system lib)
WANTLIB += ${COMPILER_LIBCXX}
However, the build log doesn't have any use of c++ in it. I'm a little
puzzled by this, and would like to double-check if I'm missing
something here before committing an update that will add a need for
C++ libs to this port.
? buildlog.txt
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2-image/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 31 Mar 2022 16:10:30 -0000 1.15
+++ Makefile 13 May 2023 19:43:24 -0000
@@ -1,11 +1,10 @@
-V = 2.0.5
+V = 2.6.3
COMMENT = SDL2 image library
DISTNAME = SDL2_image-${V}
PKGNAME = sdl2-image-${V}
CATEGORIES = devel graphics
-REVISION = 0
-SHARED_LIBS += SDL2_image 0.1 # 0.4
+SHARED_LIBS += SDL2_image 1.0 # 2.6.3
HOMEPAGE = https://www.libsdl.org/projects/SDL_image/
@@ -14,25 +13,25 @@ MAINTAINER = Thomas Frohwein <thfr@openb
# zlib
PERMIT_PACKAGE = Yes
-WANTLIB += SDL2 jpeg m png pthread samplerate sndio tiff usbhid webp z
-WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm
-WANTLIB += lzma xcb zstd
+WANTLIB += ${COMPILER_LIBCXX} SDL2 X11 Xcursor Xext Xfixes Xi Xrandr Xrender
+WANTLIB += Xss aom avif brotlicommon brotlidec brotlienc dav1d hwy jpeg jxl
+WANTLIB += lcms2 lzma m pthread samplerate sndio tiff usbhid webp xcb z zstd
MASTER_SITES = https://www.libsdl.org/projects/SDL_image/release/
-LIB_DEPENDS = devel/sdl2>=2.0.8 \
- graphics/jpeg \
+LIB_DEPENDS = archivers/brotli \
+ devel/highway \
+ devel/sdl2 \
+ graphics/lcms2 \
+ graphics/libavif \
+ graphics/libjxl \
graphics/libwebp \
- graphics/png \
graphics/tiff
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --disable-jpg-shared \
- --disable-png-shared \
+CONFIGURE_ARGS += --disable-avif-shared \
--disable-tif-shared \
--disable-webp-shared
-CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- OBJC="${CC}"
+CONFIGURE_ENV += OBJC="${CC}"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2-image/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 12 Jul 2019 02:49:57 -0000 1.5
+++ distinfo 13 May 2023 19:43:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2_image-2.0.5.tar.gz) = vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA=
-SIZE (SDL2_image-2.0.5.tar.gz) = 11736518
+SHA256 (SDL2_image-2.6.3.tar.gz) = kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=
+SIZE (SDL2_image-2.6.3.tar.gz) = 9816720
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl2-image/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 18:53:25 -0000 1.4
+++ patches/patch-Makefile_in 13 May 2023 19:43:24 -0000
@@ -1,16 +1,11 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -463,12 +463,10 @@ EXTRA_DIST = \
+@@ -571,7 +571,6 @@ EXTRA_DIST = \
- @USE_VERSION_RC_FALSE@libSDL2_image_la_LDFLAGS = \
- @USE_VERSION_RC_FALSE@ -no-undefined \
--@USE_VERSION_RC_FALSE@ -release $(LT_RELEASE) \
- @USE_VERSION_RC_FALSE@ -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libSDL2_image_la_LDFLAGS = \
+ -no-undefined \
+- -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
- @USE_VERSION_RC_TRUE@libSDL2_image_la_LDFLAGS = \
- @USE_VERSION_RC_TRUE@ -no-undefined \
--@USE_VERSION_RC_TRUE@ -release $(LT_RELEASE) \
- @USE_VERSION_RC_TRUE@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Wl,version.o
-
- @USE_VERSION_RC_FALSE@libSDL2_image_la_LIBADD = $(IMG_LIBS)
+ libSDL2_image_la_LIBADD = $(IMG_LIBS)
Index: patches/patch-SDL2_image_pc_in
===================================================================
RCS file: patches/patch-SDL2_image_pc_in
diff -N patches/patch-SDL2_image_pc_in
--- patches/patch-SDL2_image_pc_in 11 Mar 2022 18:53:25 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
---- SDL2_image.pc.in.orig Sat Aug 10 13:38:36 2013
-+++ SDL2_image.pc.in Fri Nov 15 18:57:27 2013
-@@ -8,5 +8,6 @@ Description: image loading library for Simple DirectMe
- Version: @VERSION@
- Requires: sdl2 >= @SDL_VERSION@
- Libs: -L${libdir} -lSDL2_image
-+Libs.private: @IMG_LIBS@
- Cflags: -I${includedir}/SDL2
-
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 11 Mar 2022 18:53:25 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: configure
---- configure.orig
-+++ configure
-@@ -13124,7 +13124,7 @@ if ${ac_cv_lib_tiff_TIFFClientOpen+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltiff -lz $LIBS"
-+LIBS="-ltiff -ljpeg -lz $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -13463,7 +13463,7 @@ _ACEOF
- # Disable dynamic jpeg since we're linking it explicitly
- jpg_lib=''
- fi
-- IMG_LIBS="-ltiff -lz $IMG_LIBS"
-+ IMG_LIBS="-ltiff -ljpeg -lz $IMG_LIBS"
- fi
- fi
- if test x$enable_jpg = xyes -a x$have_jpg_hdr = xyes -a x$have_jpg_lib =
xyes; then
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/sdl2-image/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 11 Mar 2022 18:53:25 -0000 1.4
+++ pkg/PLIST 13 May 2023 19:43:24 -0000
@@ -1,5 +1,8 @@
include/SDL2/SDL_image.h
-lib/libSDL2_image.a
+lib/cmake/SDL2_image/
+lib/cmake/SDL2_image/sdl2_image-config-version.cmake
+lib/cmake/SDL2_image/sdl2_image-config.cmake
+@static-lib lib/libSDL2_image.a
lib/libSDL2_image.la
@lib lib/libSDL2_image.so.${LIBSDL2_image_VERSION}
lib/pkgconfig/SDL2_image.pc
