From a3af2f481bb0bc4810b6168e764d3b0f175ab9a7 Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 11 Apr 2005 05:29:15 +0000 Subject: Fix imlib2 use through dlopen. Patch pointer provided by Charlie Allom. Closes PR 29054. --- graphics/imlib2/Makefile | 4 +- graphics/imlib2/distinfo | 6 ++- graphics/imlib2/patches/patch-ba | 22 +++++++++++ graphics/imlib2/patches/patch-bb | 39 +++++++++++++++++++ graphics/imlib2/patches/patch-bc | 78 ++++++++++++++++++++++++++++++++++++++ graphics/imlib2/patches/patch-bd | 81 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 227 insertions(+), 3 deletions(-) create mode 100644 graphics/imlib2/patches/patch-ba create mode 100644 graphics/imlib2/patches/patch-bb create mode 100644 graphics/imlib2/patches/patch-bc create mode 100644 graphics/imlib2/patches/patch-bd (limited to 'graphics') diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index dcec22cab59..00d8b7c76ac 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2005/03/14 15:46:18 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2005/04/11 05:29:15 kim Exp $ DISTNAME= imlib2-1.2.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index f71ff88f3e3..432b4173cce 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1,7 +1,11 @@ -$NetBSD: distinfo,v 1.11 2005/03/14 15:46:18 wiz Exp $ +$NetBSD: distinfo,v 1.12 2005/04/11 05:29:15 kim Exp $ SHA1 (imlib2-1.2.0.tar.gz) = 54f8ef83b0eac3f8e7f2218705e02a425fa73118 RMD160 (imlib2-1.2.0.tar.gz) = 158ed1bd7c59b8d1db2c00db98027d9c5c0abec3 Size (imlib2-1.2.0.tar.gz) = 890457 bytes SHA1 (patch-aa) = 73e23778f6aaee5de213865aa64f9c5a4af6ba24 SHA1 (patch-ab) = 42529ee0815cbb96ab29ac24a4ebb8eea0c754e2 +SHA1 (patch-ba) = 0a3937fc4d017356ba5d33f957426f9befc94730 +SHA1 (patch-bb) = 9df1e76c3023c6f9714906b226293bc3e026baca +SHA1 (patch-bc) = 29365da268d210b4eb7bb431f815a78bcf22f1e3 +SHA1 (patch-bd) = 2fd3fa738dc36c360868c0b73f1a3fcb3a4a14e4 diff --git a/graphics/imlib2/patches/patch-ba b/graphics/imlib2/patches/patch-ba new file mode 100644 index 00000000000..cade992e893 --- /dev/null +++ b/graphics/imlib2/patches/patch-ba @@ -0,0 +1,22 @@ +$NetBSD: patch-ba,v 1.1 2005/04/11 05:29:15 kim Exp $ + +--- src/modules/filters/Makefile.am.orig 2004-11-01 22:03:49.000000000 -0500 ++++ src/modules/filters/Makefile.am 2005-04-11 01:11:56.000000000 -0400 +@@ -11,11 +11,14 @@ + pkg_LTLIBRARIES = testfilter.la bumpmap.la colormod.la + + testfilter_la_SOURCES = filter_test.c +-testfilter_la_LDFLAGS = -module -avoid-version ++testfilter_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++testfilter_la_LIBADD = -lImlib2 + + bumpmap_la_SOURCES = filter_bumpmap.c +-bumpmap_la_LDFLAGS = -module -avoid-version ++bumpmap_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++bumpmap_la_LIBADD = -lImlib2 + + colormod_la_SOURCES = filter_colormod.c +-colormod_la_LDFLAGS = -module -avoid-version ++colormod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++colormod_la_LIBADD = -lImlib2 + diff --git a/graphics/imlib2/patches/patch-bb b/graphics/imlib2/patches/patch-bb new file mode 100644 index 00000000000..0f40eca77a0 --- /dev/null +++ b/graphics/imlib2/patches/patch-bb @@ -0,0 +1,39 @@ +$NetBSD: patch-bb,v 1.1 2005/04/11 05:29:15 kim Exp $ + +--- src/modules/filters/Makefile.in.orig 2005-01-08 02:56:15.000000000 -0500 ++++ src/modules/filters/Makefile.in 2005-04-11 00:55:20.000000000 -0400 +@@ -104,13 +104,16 @@ + pkg_LTLIBRARIES = testfilter.la bumpmap.la colormod.la + + testfilter_la_SOURCES = filter_test.c +-testfilter_la_LDFLAGS = -module -avoid-version ++testfilter_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++testfilter_la_LIBADD = -lImlib2 + + bumpmap_la_SOURCES = filter_bumpmap.c +-bumpmap_la_LDFLAGS = -module -avoid-version ++bumpmap_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++bumpmap_la_LIBADD = -lImlib2 + + colormod_la_SOURCES = filter_colormod.c +-colormod_la_LDFLAGS = -module -avoid-version ++colormod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++colormod_la_LIBADD = -lImlib2 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +@@ -121,11 +124,11 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-testfilter_la_LIBADD = ++testfilter_la_DEPENDENCIES = + testfilter_la_OBJECTS = filter_test.lo +-bumpmap_la_LIBADD = ++bumpmap_la_DEPENDENCIES = + bumpmap_la_OBJECTS = filter_bumpmap.lo +-colormod_la_LIBADD = ++colormod_la_DEPENDENCIES = + colormod_la_OBJECTS = filter_colormod.lo + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/graphics/imlib2/patches/patch-bc b/graphics/imlib2/patches/patch-bc new file mode 100644 index 00000000000..1d976ad77c4 --- /dev/null +++ b/graphics/imlib2/patches/patch-bc @@ -0,0 +1,78 @@ +$NetBSD: patch-bc,v 1.1 2005/04/11 05:29:15 kim Exp $ + +--- src/modules/loaders/Makefile.am.orig 2004-11-01 22:04:05.000000000 -0500 ++++ src/modules/loaders/Makefile.am 2005-04-11 01:11:56.000000000 -0400 +@@ -43,49 +43,49 @@ + lbm.la + + jpeg_la_SOURCES = loader_jpeg.c +-jpeg_la_LDFLAGS = -module -avoid-version +-jpeg_la_LIBADD = @JPEGLIBS@ ++jpeg_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2 + + png_la_SOURCES = loader_png.c +-png_la_LDFLAGS = -module -avoid-version +-png_la_LIBADD = @PNGLIBS@ ++png_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++png_la_LIBADD = @PNGLIBS@ -lImlib2 + + tiff_la_SOURCES = loader_tiff.c +-tiff_la_LDFLAGS = -module -avoid-version +-tiff_la_LIBADD = @TIFFLIBS@ ++tiff_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++tiff_la_LIBADD = @TIFFLIBS@ -lImlib2 + + gif_la_SOURCES = loader_gif.c +-gif_la_LDFLAGS = -module -avoid-version +-gif_la_LIBADD = @GIFLIBS@ ++gif_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++gif_la_LIBADD = @GIFLIBS@ -lImlib2 + + zlib_la_SOURCES = loader_zlib.c +-zlib_la_LDFLAGS = -module -avoid-version +-zlib_la_LIBADD = @ZLIBLIBS@ ++zlib_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++zlib_la_LIBADD = @ZLIBLIBS@ -lImlib2 + + bz2_la_SOURCES = loader_bz2.c +-bz2_la_LDFLAGS = -module -avoid-version +-bz2_la_LIBADD = @BZ2LIBS@ ++bz2_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++bz2_la_LIBADD = @BZ2LIBS@ -lImlib2 + + pnm_la_SOURCES = loader_pnm.c +-pnm_la_LDFLAGS = -module -avoid-version +-pnm_la_LIBADD = ++pnm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++pnm_la_LIBADD = -lImlib2 + + argb_la_SOURCES = loader_argb.c +-argb_la_LDFLAGS = -module -avoid-version +-argb_la_LIBADD = ++argb_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++argb_la_LIBADD = -lImlib2 + + bmp_la_SOURCES = loader_bmp.c +-bmp_la_LDFLAGS = -module -avoid-version +-bmp_la_LIBADD = ++bmp_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++bmp_la_LIBADD = -lImlib2 + + xpm_la_SOURCES = loader_xpm.c +-xpm_la_LDFLAGS = -module -avoid-version +-xpm_la_LIBADD = ++xpm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++xpm_la_LIBADD = -lImlib2 + + tga_la_SOURCES = loader_tga.c +-tga_la_LDFLAGS = -module -avoid-version +-tga_la_LIBADD = ++tga_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++tga_la_LIBADD = -lImlib2 + + lbm_la_SOURCES = loader_lbm.c +-lbm_la_LDFLAGS = -module -avoid-version +-lbm_la_LIBADD = ++lbm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++lbm_la_LIBADD = -lImlib2 diff --git a/graphics/imlib2/patches/patch-bd b/graphics/imlib2/patches/patch-bd new file mode 100644 index 00000000000..fe4b9f43c93 --- /dev/null +++ b/graphics/imlib2/patches/patch-bd @@ -0,0 +1,81 @@ +$NetBSD: patch-bd,v 1.1 2005/04/11 05:29:15 kim Exp $ + +--- src/modules/loaders/Makefile.in.orig 2005-01-08 02:56:15.000000000 -0500 ++++ src/modules/loaders/Makefile.in 2005-04-11 01:19:24.000000000 -0400 +@@ -113,52 +113,52 @@ + + + jpeg_la_SOURCES = loader_jpeg.c +-jpeg_la_LDFLAGS = -module -avoid-version +-jpeg_la_LIBADD = @JPEGLIBS@ ++jpeg_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2 + + png_la_SOURCES = loader_png.c +-png_la_LDFLAGS = -module -avoid-version +-png_la_LIBADD = @PNGLIBS@ ++png_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++png_la_LIBADD = @PNGLIBS@ -lImlib2 + + tiff_la_SOURCES = loader_tiff.c +-tiff_la_LDFLAGS = -module -avoid-version +-tiff_la_LIBADD = @TIFFLIBS@ ++tiff_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++tiff_la_LIBADD = @TIFFLIBS@ -lImlib2 + + gif_la_SOURCES = loader_gif.c +-gif_la_LDFLAGS = -module -avoid-version +-gif_la_LIBADD = @GIFLIBS@ ++gif_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++gif_la_LIBADD = @GIFLIBS@ -lImlib2 + + zlib_la_SOURCES = loader_zlib.c +-zlib_la_LDFLAGS = -module -avoid-version +-zlib_la_LIBADD = @ZLIBLIBS@ ++zlib_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++zlib_la_LIBADD = @ZLIBLIBS@ -lImlib2 + + bz2_la_SOURCES = loader_bz2.c +-bz2_la_LDFLAGS = -module -avoid-version +-bz2_la_LIBADD = @BZ2LIBS@ ++bz2_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++bz2_la_LIBADD = @BZ2LIBS@ -lImlib2 + + pnm_la_SOURCES = loader_pnm.c +-pnm_la_LDFLAGS = -module -avoid-version +-pnm_la_LIBADD = ++pnm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++pnm_la_LIBADD = -lImlib2 + + argb_la_SOURCES = loader_argb.c +-argb_la_LDFLAGS = -module -avoid-version +-argb_la_LIBADD = ++argb_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++argb_la_LIBADD = -lImlib2 + + bmp_la_SOURCES = loader_bmp.c +-bmp_la_LDFLAGS = -module -avoid-version +-bmp_la_LIBADD = ++bmp_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++bmp_la_LIBADD = -lImlib2 + + xpm_la_SOURCES = loader_xpm.c +-xpm_la_LDFLAGS = -module -avoid-version +-xpm_la_LIBADD = ++xpm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++xpm_la_LIBADD = -lImlib2 + + tga_la_SOURCES = loader_tga.c +-tga_la_LDFLAGS = -module -avoid-version +-tga_la_LIBADD = ++tga_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++tga_la_LIBADD = -lImlib2 + + lbm_la_SOURCES = loader_lbm.c +-lbm_la_LDFLAGS = -module -avoid-version +-lbm_la_LIBADD = ++lbm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ ++lbm_la_LIBADD = -lImlib2 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = -- cgit v1.2.3