Link the loaders/filters with libImlib2. This makes p5-Image-Imlib2 work

again and probably fixes other things too.

Approved by:	vanilla (maintainer)
Obtained from:	Debian Bug #293815

3 files changed, 213 insertions, 1 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 9b15ec57ca86..08e5cd2f7e0d 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/graphics/imlib2/files/patch-filters b/graphics/imlib2/files/patch-filters
new file mode 100644
index 000000000000..e6e4f5293a8e
--- /dev/null
+++ b/graphics/imlib2/files/patch-filters
@@ -0,0 +1,57 @@
+--- src/modules/filters/Makefile.in.orig	Mon Mar 21 09:53:49 2005
++++ src/modules/filters/Makefile.in	Mon Mar 21 09:55:08 2005
+@@ -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)
+--- src/modules/filters/Makefile.am.orig	Mon Mar 21 09:53:44 2005
++++ src/modules/filters/Makefile.am	Mon Mar 21 09:55:46 2005
+@@ -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/files/patch-loaders b/graphics/imlib2/files/patch-loaders
new file mode 100644
index 000000000000..8026cf372db7
--- /dev/null
+++ b/graphics/imlib2/files/patch-loaders
@@ -0,0 +1,155 @@
+--- src/modules/loaders/Makefile.am.orig	Mon Mar 21 09:50:16 2005
++++ src/modules/loaders/Makefile.am	Mon Mar 21 09:52:07 2005
+@@ -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
+--- src/modules/loaders/Makefile.in.orig	Mon Mar 21 09:47:45 2005
++++ src/modules/loaders/Makefile.in	Mon Mar 21 09:50:06 2005
+@@ -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 =