pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics
Module Name: pkgsrc
Committed By: nia
Date: Mon May 6 18:05:32 UTC 2024
Modified Files:
pkgsrc/graphics: Makefile
pkgsrc/graphics/SDL2_image: buildlink3.mk
Added Files:
pkgsrc/graphics/SDL2_image-legacy: ALTERNATIVES DESCR Makefile PLIST
buildlink3.mk distinfo
pkgsrc/graphics/SDL2_image-legacy/patches: patch-IMG__bmp.c
patch-IMG__gif.c patch-IMG__lbm.c patch-IMG__pcx.c patch-IMG__xcf.c
patch-Makefile.in
Log Message:
import a legacy version of graphics/SDL2_image to go with legacy SDL2
To generate a diff of this commit:
cvs rdiff -u -r1.1050 -r1.1051 pkgsrc/graphics/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/SDL2_image/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/SDL2_image-legacy/ALTERNATIVES \
pkgsrc/graphics/SDL2_image-legacy/DESCR \
pkgsrc/graphics/SDL2_image-legacy/Makefile \
pkgsrc/graphics/SDL2_image-legacy/PLIST \
pkgsrc/graphics/SDL2_image-legacy/buildlink3.mk \
pkgsrc/graphics/SDL2_image-legacy/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__bmp.c \
pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__gif.c \
pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__lbm.c \
pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__pcx.c \
pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__xcf.c \
pkgsrc/graphics/SDL2_image-legacy/patches/patch-Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/Makefile
diff -u pkgsrc/graphics/Makefile:1.1050 pkgsrc/graphics/Makefile:1.1051
--- pkgsrc/graphics/Makefile:1.1050 Tue Apr 30 11:40:24 2024
+++ pkgsrc/graphics/Makefile Mon May 6 18:05:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1050 2024/04/30 11:40:24 wiz Exp $
+# $NetBSD: Makefile,v 1.1051 2024/05/06 18:05:31 nia Exp $
#
COMMENT= Graphics tools and libraries
@@ -48,6 +48,7 @@ SUBDIR+= R-viridis
SUBDIR+= R-viridisLite
SUBDIR+= SDL2_gfx
SUBDIR+= SDL2_image
+SUBDIR+= SDL2_image-legacy
SUBDIR+= SDL_image
SUBDIR+= aalib
SUBDIR+= adaptagrams
Index: pkgsrc/graphics/SDL2_image/buildlink3.mk
diff -u pkgsrc/graphics/SDL2_image/buildlink3.mk:1.12 pkgsrc/graphics/SDL2_image/buildlink3.mk:1.13
--- pkgsrc/graphics/SDL2_image/buildlink3.mk:1.12 Sat Apr 6 08:05:42 2024
+++ pkgsrc/graphics/SDL2_image/buildlink3.mk Mon May 6 18:05:31 2024
@@ -1,12 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.12 2024/04/06 08:05:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2024/05/06 18:05:31 nia Exp $
BUILDLINK_TREE+= SDL2_image
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${MACHINE_PLATFORM:MDarwin-*-powerpc*}
+# This defines SDL2_IMAGE_BUILDLINK3_MK.
+. include "../../graphics/SDL2_image-legacy/buildlink3.mk"
+.endif
+
.if !defined(SDL2_IMAGE_BUILDLINK3_MK)
SDL2_IMAGE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.SDL2_image+= SDL2_image>=2.0.0
-BUILDLINK_ABI_DEPENDS.SDL2_image+= SDL2_image>=2.6.3nb3
BUILDLINK_PKGSRCDIR.SDL2_image?= ../../graphics/SDL2_image
BUILDLINK_INCDIRS.SDL2_image?= include/SDL2
Added files:
Index: pkgsrc/graphics/SDL2_image-legacy/ALTERNATIVES
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/ALTERNATIVES:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/ALTERNATIVES Mon May 6 18:05:31 2024
@@ -0,0 +1 @@
+bin/showimage @PREFIX@/bin/showimage2
Index: pkgsrc/graphics/SDL2_image-legacy/DESCR
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/DESCR:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/DESCR Mon May 6 18:05:31 2024
@@ -0,0 +1,3 @@
+This is a simple library to load images of various formats as SDL surfaces.
+This library supports BMP, PNM (PPM/PGM/PBM), XPM, LBM, PCX, GIF, JPEG, PNG,
+TGA, and TIFF formats.
Index: pkgsrc/graphics/SDL2_image-legacy/Makefile
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/Makefile:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/Makefile Mon May 6 18:05:31 2024
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2024/05/06 18:05:31 nia Exp $
+
+DISTNAME= SDL2_image-2.0.1
+CATEGORIES= graphics devel
+MASTER_SITES= https://www.libsdl.org/projects/SDL_image/release/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.libsdl.org/projects/SDL_image/
+COMMENT= Load images as SDL surfaces
+LICENSE= zlib
+
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+
+CONFIGURE_ARGS+= --disable-imageio
+CONFIGURE_ARGS+= --disable-sdltest
+
+# No runtime loading, bake everything in.
+CONFIGURE_ARGS+= --disable-jpg-shared
+CONFIGURE_ARGS+= --disable-png-shared
+CONFIGURE_ARGS+= --disable-tif-shared
+CONFIGURE_ARGS+= --disable-webp-shared
+
+INSTALLATION_DIRS= bin
+PKGCONFIG_OVERRIDE= SDL2_image.pc.in
+
+post-install:
+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/showimage \
+ ${DESTDIR}${PREFIX}/bin/showimage2
+
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/SDL2_image-legacy/PLIST
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/PLIST:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/PLIST Mon May 6 18:05:31 2024
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2024/05/06 18:05:31 nia Exp $
+bin/showimage2
+include/SDL2/SDL_image.h
+lib/libSDL2_image.la
+lib/pkgconfig/SDL2_image.pc
Index: pkgsrc/graphics/SDL2_image-legacy/buildlink3.mk
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/buildlink3.mk:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/buildlink3.mk Mon May 6 18:05:31 2024
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2024/05/06 18:05:31 nia Exp $
+
+BUILDLINK_TREE+= SDL2_image
+
+.if !defined(SDL2_IMAGE_BUILDLINK3_MK)
+SDL2_IMAGE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.SDL2_image+= SDL2_image>=2.0.0
+BUILDLINK_ABI_DEPENDS.SDL2_image+= SDL2_image>=2.0.0
+BUILDLINK_PKGSRCDIR.SDL2_image?= ../../graphics/SDL2_image-legacy
+BUILDLINK_INCDIRS.SDL2_image?= include/SDL2
+
+.include "../../devel/SDL2/buildlink3.mk"
+.endif # SDL2_IMAGE_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -SDL2_image
Index: pkgsrc/graphics/SDL2_image-legacy/distinfo
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/distinfo:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/distinfo Mon May 6 18:05:31 2024
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1 2024/05/06 18:05:31 nia Exp $
+
+BLAKE2s (SDL2_image-2.0.1.tar.gz) = 2e4fe1e0d91bba5cf162a9c82bd56320757d54081cbba440202b6fff9a82d13e
+SHA512 (SDL2_image-2.0.1.tar.gz) = 99ed5f7b69966cea5fcf9173e7270167c24b55ab459774f10dbf90f26dcb9d5f118971ffd4e583a83148976f44ca166474669398a561169d24ffba80f852306f
+Size (SDL2_image-2.0.1.tar.gz) = 7797848 bytes
+SHA1 (patch-IMG__bmp.c) = 1c86d4948d570b131f44220810046b1a8562a6ac
+SHA1 (patch-IMG__gif.c) = fbafe1e298f5342aecd57258859a0f0926e9b895
+SHA1 (patch-IMG__lbm.c) = af312c686021cdfbd57bc4f75f0622d86bcaaf81
+SHA1 (patch-IMG__pcx.c) = 20bb260be98a7605712e8a474a98ed0f689e3790
+SHA1 (patch-IMG__xcf.c) = a967a661702cfa8f9f83df7ee88fe958c7d2af80
+SHA1 (patch-Makefile.in) = 3c7dc65fa79fc49cd182f18241415bcb3ef73cd2
Index: pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__bmp.c
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__bmp.c:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__bmp.c Mon May 6 18:05:32 2024
@@ -0,0 +1,37 @@
+$NetBSD: patch-IMG__bmp.c,v 1.1 2024/05/06 18:05:32 nia Exp $
+
+Fix various security issues,
+CVE-2017-14441
+CVE-2017-14442
+
+Taken from Ubuntu Linux.
+
+--- IMG_bmp.c.orig 2016-01-03 05:52:28.000000000 +0000
++++ IMG_bmp.c
+@@ -738,6 +738,14 @@ LoadICOCUR_RW(SDL_RWops * src, int type,
+ goto done;
+ }
+
++ /* sanity check image size, so we don't overflow integers, etc. */
++ if ((biWidth < 0) || (biWidth > 0xFFFFFF) ||
++ (biHeight < 0) || (biHeight > 0xFFFFFF)) {
++ IMG_SetError("Unsupported or invalid ICO dimensions");
++ was_error = SDL_TRUE;
++ goto done;
++ }
++
+ /* Create a RGBA surface */
+ biHeight = biHeight >> 1;
+ //printf("%d x %d\n", biWidth, biHeight);
+@@ -755,6 +763,11 @@ LoadICOCUR_RW(SDL_RWops * src, int type,
+ if (biClrUsed == 0) {
+ biClrUsed = 1 << biBitCount;
+ }
++ if (biClrUsed > SDL_arraysize(palette)) {
++ IMG_SetError("Unsupported or incorrect biClrUsed field");
++ was_error = SDL_TRUE;
++ goto done;
++ }
+ for (i = 0; i < (int) biClrUsed; ++i) {
+ SDL_RWread(src, &palette[i], 4, 1);
+ }
Index: pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__gif.c
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__gif.c:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__gif.c Mon May 6 18:05:32 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-IMG__gif.c,v 1.1 2024/05/06 18:05:32 nia Exp $
+
+Fix CVE-2017-14450. Taken from Ubuntu Linux.
+
+--- IMG_gif.c.orig 2016-01-03 05:52:28.000000000 +0000
++++ IMG_gif.c
+@@ -500,8 +500,10 @@ LWZReadByte(SDL_RWops *src, int flag, in
+ return -3;
+ }
+ *sp++ = table[1][code];
+- if (code == table[0][code])
+- RWSetMsg("circular table entry BIG ERROR");
++ if (code == table[0][code]) {
++ RWSetMsg("circular table entry BIG ERROR");
++ return -3;
++ }
+ code = table[0][code];
+ }
+
Index: pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__lbm.c
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__lbm.c:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__lbm.c Mon May 6 18:05:32 2024
@@ -0,0 +1,64 @@
+$NetBSD: patch-IMG__lbm.c,v 1.1 2024/05/06 18:05:32 nia Exp $
+
+Fix various security issues,
+CVE-2017-14440
+CVE-2017-12122
+
+Taken from Ubuntu Linux.
+
+--- IMG_lbm.c.orig 2016-01-03 05:52:28.000000000 +0000
++++ IMG_lbm.c
+@@ -187,6 +187,11 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *
+
+ if ( !SDL_memcmp( id, "CMAP", 4 ) ) /* palette ( Color Map ) */
+ {
++ if (size > sizeof (colormap)) {
++ error="colormap size is too large";
++ goto done;
++ }
++
+ if ( !SDL_RWread( src, &colormap, size, 1 ) )
+ {
+ error="error reading CMAP chunk";
+@@ -237,6 +242,12 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *
+ nbplanes = 1;
+ }
+
++ if ((nbplanes != 1) && (nbplanes != 4) && (nbplanes != 8) && (nbplanes != 24))
++ {
++ error="unsupported number of color planes";
++ goto done;
++ }
++
+ stencil = (bmhd.mask & 1); /* There is a mask ( 'stencil' ) */
+
+ /* Allocate memory for a temporary buffer ( used for
+@@ -249,7 +260,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *
+ goto done;
+ }
+
+- if ( ( Image = SDL_CreateRGBSurface( SDL_SWSURFACE, width, bmhd.h, (bmhd.planes==24 || flagHAM==1)?24:8, 0, 0, 0, 0 ) ) == NULL )
++ if ( ( Image = SDL_CreateRGBSurface( SDL_SWSURFACE, width, bmhd.h, (nbplanes==24 || flagHAM==1)?24:8, 0, 0, 0, 0 ) ) == NULL )
+ goto done;
+
+ if ( bmhd.mask & 2 ) /* There is a transparent color */
+@@ -276,7 +287,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *
+ /* The 32 last colors are the same but divided by 2 */
+ /* Some Amiga pictures save 64 colors with 32 last wrong colors, */
+ /* they shouldn't !, and here we overwrite these 32 bad colors. */
+- if ( (nbcolors==32 || flagEHB ) && (1<<bmhd.planes)==64 )
++ if ( (nbcolors==32 || flagEHB ) && (1<<nbplanes)==64 )
+ {
+ nbcolors = 64;
+ ptr = &colormap[0];
+@@ -290,8 +301,8 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *
+
+ /* If nbcolors < 2^nbplanes, repeat the colormap */
+ /* This happens when pictures have a stencil mask */
+- if ( nbrcolorsfinal > (1<<bmhd.planes) ) {
+- nbrcolorsfinal = (1<<bmhd.planes);
++ if ( nbrcolorsfinal > (1<<nbplanes) ) {
++ nbrcolorsfinal = (1<<nbplanes);
+ }
+ for ( i=nbcolors; i < (Uint32)nbrcolorsfinal; i++ )
+ {
Index: pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__pcx.c
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__pcx.c:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__pcx.c Mon May 6 18:05:32 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-IMG__pcx.c,v 1.1 2024/05/06 18:05:32 nia Exp $
+
+Fix CVE-2018-3837. Taken from Ubuntu Linux.
+
+--- IMG_pcx.c.orig 2016-01-03 05:52:28.000000000 +0000
++++ IMG_pcx.c
+@@ -149,7 +149,7 @@ SDL_Surface *IMG_LoadPCX_RW(SDL_RWops *s
+ if (bpl > surface->pitch) {
+ error = "bytes per line is too large (corrupt?)";
+ }
+- buf = (Uint8 *)SDL_malloc(bpl);
++ buf = (Uint8 *)SDL_calloc(SDL_max(bpl, surface->pitch), 1);
+ row = (Uint8 *)surface->pixels;
+ for ( y=0; y<surface->h; ++y ) {
+ /* decode a scan line to a temporary buffer first */
Index: pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__xcf.c
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__xcf.c:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/patches/patch-IMG__xcf.c Mon May 6 18:05:32 2024
@@ -0,0 +1,136 @@
+$NetBSD: patch-IMG__xcf.c,v 1.1 2024/05/06 18:05:32 nia Exp $
+
+Fix various security issues,
+
+CVE-2017-2887
+CVE-2018-3838
+CVE-2018-3839
+CVE-2017-14448
+CVE-2017-14449
+
+Taken from Ubuntu Linux.
+
+--- IMG_xcf.c.orig 2016-01-03 05:52:28.000000000 +0000
++++ IMG_xcf.c
+@@ -251,6 +251,7 @@ static Uint32 Swap32 (Uint32 v) {
+ }
+
+ static void xcf_read_property (SDL_RWops * src, xcf_prop * prop) {
++ Uint32 len;
+ prop->id = SDL_ReadBE32 (src);
+ prop->length = SDL_ReadBE32 (src);
+
+@@ -274,7 +275,12 @@ static void xcf_read_property (SDL_RWops
+ break;
+ case PROP_COMPRESSION:
+ case PROP_COLOR:
+- SDL_RWread (src, &prop->data, prop->length, 1);
++ if (prop->length > sizeof(prop->data)) {
++ len = sizeof(prop->data);
++ } else {
++ len = prop->length;
++ }
++ SDL_RWread(src, &prop->data, len, 1);
+ break;
+ case PROP_VISIBLE:
+ prop->data.visible = SDL_ReadBE32 (src);
+@@ -468,10 +474,14 @@ static unsigned char * load_xcf_tile_rle
+ int i, size, count, j, length;
+ unsigned char val;
+
++ if (len == 0) { /* probably bogus data. */
++ return NULL;
++ }
++
+ t = load = (unsigned char *) SDL_malloc (len);
+ reallen = SDL_RWread (src, t, 1, len);
+
+- data = (unsigned char *) SDL_malloc (x*y*bpp);
++ data = (unsigned char *) SDL_calloc (1, x*y*bpp);
+ for (i = 0; i < bpp; i++) {
+ d = data + i;
+ size = x*y;
+@@ -488,6 +498,12 @@ static unsigned char * load_xcf_tile_rle
+ t += 2;
+ }
+
++ if (((size_t) (t - load) + length) >= len) {
++ break; /* bogus data */
++ } else if (length > size) {
++ break; /* bogus data */
++ }
++
+ count += length;
+ size -= length;
+
+@@ -503,6 +519,12 @@ static unsigned char * load_xcf_tile_rle
+ t += 2;
+ }
+
++ if (((size_t) (t - load)) >= len) {
++ break; /* bogus data */
++ } else if (length > size) {
++ break; /* bogus data */
++ }
++
+ count += length;
+ size -= length;
+
+@@ -514,6 +536,11 @@ static unsigned char * load_xcf_tile_rle
+ }
+ }
+ }
++
++ if (size > 0) {
++ break; /* just drop out, untouched data initialized to zero. */
++ }
++
+ }
+
+ SDL_free (load);
+@@ -558,6 +585,18 @@ static int do_layer_surface (SDL_Surface
+ SDL_RWseek (src, layer->hierarchy_file_offset, RW_SEEK_SET);
+ hierarchy = read_xcf_hierarchy (src);
+
++ if (hierarchy->bpp > 4) { /* unsupported. */
++ fprintf(stderr, "Unknown Gimp image bpp (%u)\n", (unsigned int) hierarchy->bpp);
++ free_xcf_hierarchy(hierarchy);
++ return 1;
++ }
++
++ if ((hierarchy->width > 20000) || (hierarchy->height > 20000)) { /* arbitrary limit to avoid integer overflow. */
++ fprintf(stderr, "Gimp image too large (%ux%u)\n", (unsigned int) hierarchy->width, (unsigned int) hierarchy->height);
++ free_xcf_hierarchy(hierarchy);
++ return 1;
++ }
++
+ level = NULL;
+ for (i = 0; hierarchy->level_file_offsets [i]; i++) {
+ SDL_RWseek (src, hierarchy->level_file_offsets [i], RW_SEEK_SET);
+@@ -584,6 +623,16 @@ static int do_layer_surface (SDL_Surface
+ ox, oy);
+ }
+
++ if (!tile) {
++ if (hierarchy) {
++ free_xcf_hierarchy(hierarchy);
++ }
++ if (level) {
++ free_xcf_level(level);
++ }
++ return 1;
++ }
++
+ p8 = tile;
+ p16 = (Uint16 *) p8;
+ p = (Uint32 *) p8;
+@@ -627,9 +676,6 @@ static int do_layer_surface (SDL_Surface
+ fprintf (stderr, "Unknown Gimp image type (%d)\n", head->image_type);
+ if (hierarchy)
+ {
+- if (hierarchy->level_file_offsets)
+- SDL_free(hierarchy->level_file_offsets);
+-
+ free_xcf_hierarchy(hierarchy);
+ }
+ if (level)
Index: pkgsrc/graphics/SDL2_image-legacy/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/graphics/SDL2_image-legacy/patches/patch-Makefile.in:1.1
--- /dev/null Mon May 6 18:05:32 2024
+++ pkgsrc/graphics/SDL2_image-legacy/patches/patch-Makefile.in Mon May 6 18:05:32 2024
@@ -0,0 +1,27 @@
+$NetBSD: patch-Makefile.in,v 1.1 2024/05/06 18:05:32 nia Exp $
+
+libtool: link: unable to infer tagged configuration
+libtool: error: specify a tag with '--tag'
+
+Always specify a tag when linking.
+
+--- Makefile.in.orig 2016-01-03 05:52:28.000000000 +0000
++++ Makefile.in
+@@ -124,7 +124,7 @@ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+-libSDL2_image_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
++libSDL2_image_la_LINK = $(LIBTOOL) --tag=CC $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \
+ $(OBJCFLAGS) $(libSDL2_image_la_LDFLAGS) $(LDFLAGS) -o $@
+ PROGRAMS = $(noinst_PROGRAMS)
+@@ -176,7 +176,7 @@ am__v_OBJC_ = $(am__v_OBJC_@AM_DEFAULT_V
+ am__v_OBJC_0 = @echo " OBJC " $@;
+ am__v_OBJC_1 =
+ OBJCLD = $(OBJC)
+-OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++OBJCLINK = $(LIBTOOL) --tag=CC $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@)
Home |
Main Index |
Thread Index |
Old Index