Attachment #37996 for bug #60269

View | Details | Raw Unified | Return to bug 60269
Collapse All | Expand All




#

PORTNAME=	imlib2
PORTVERSION=	1.1.0
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	enlightenment

MAINTAINER=	ports@FreeBSD.org
COMMENT=	The next generation graphic library for enlightenment package

LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
		jpeg.9:${PORTSDIR}/graphics/jpeg \
		ungif.5:${PORTSDIR}/graphics/libungif \
		png.5:${PORTSDIR}/graphics/png \
		tiff.4:${PORTSDIR}/graphics/tiff \
		freetype.9:${PORTSDIR}/print/freetype2

USE_REINPLACE=	yes
USE_X_PREFIX=	yes
USE_GNOME=	gnomehack pkgconfig
USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
			  -I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib"

.include <bsd.port.pre.mk>


Line 1 Link Here

(-)graphics/imlib2/distinfo (-1 / +1 lines)
1	MD5 (imlib2-1.0.6.tar.gz) = e3475376bf27347c47c7a9ffb49bdb96	1	MD5 (imlib2-1.1.0.tar.gz) = 1589ebb054da76734fe08ae570460034

Lines 1-11 Link Here

(-)graphics/imlib2/files/patch-aa (-4 / +4 lines)
1	--- imlib2-config.in.orig Tue Aug 22 16:38:40 2000	1	--- imlib2-config.in.orig Sun Jul 20 15:10:43 2003
2	+++ imlib2-config.in Sun Oct 29 21:38:09 2000	2	+++ imlib2-config.in Mon Dec 8 04:30:33 2003
3	@@ -45,7 +45,7 @@	3	@@ -45,7 +45,7 @@
4	echo $includes @x_cflags@	4	echo $includes @x_cflags@
5	;;	5	;;
6	--libs)	6	--libs)
7	- libdirs=-L@libdir@	7	- libdirs=-L@libdir@
8	+ libdirs="-L@libdir@ -L@localbase@/lib"	8	+ libdirs=-L@libdir@ -L@localbase@/lib
9	echo $libdirs -lImlib2 -lttf -lm @dlopen_libs@ @x_ldflags@ @x_libs@	9	echo $libdirs -lImlib2 @freetype_libs@ -lm @dlopen_libs@ @x_ldflags@ @x_libs@
10	;;	10	;;
11	*)	11	*)




--- configure.orig	Mon Sep  8 11:12:12 2003
+++ configure	Mon Dec  8 05:29:41 2003
@@ -1244,16 +1244,6 @@
 fi
 	      
 
-  case $enable_ltdl_convenience in
-  no) { echo "configure: error: this package needs a convenience libltdl" 1>&2; exit 1; } ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;

 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
@@ -7682,75 +7672,5 @@
     esac
   done
 




--- loaders/Makefile.in.orig	Mon Sep  8 11:12:29 2003
+++ loaders/Makefile.in	Mon Dec  8 05:09:37 2003
@@ -99,10 +99,10 @@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 
-LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib 
+LDFLAGS = @LDFLAGS@
 INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
-                       -I/usr/X11R6/include $(X_CFLAGS) \
+                       -I$(top_srcdir)/loaders \
+                       $(X_CFLAGS) \
                        -I$(prefix)/include -I$(includedir)
 
 jpeg_la_SOURCES = loader_jpeg.c
 jpeg_la_LDFLAGS = -no-undefined -module -avoid-version
-jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src -lImlib2
+jpeg_la_LIBADD = @JPEGLIBS@ $(top_builddir)/src/libImlib2.la
 
 png_la_SOURCES = loader_png.c
 png_la_LDFLAGS = -no-undefined -module -avoid-version
-png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src -lImlib2
+png_la_LIBADD = @PNGLIBS@ $(top_builddir)/src/libImlib2.la
 
 tiff_la_SOURCES = loader_tiff.c
 tiff_la_LDFLAGS = -no-undefined -module -avoid-version
-tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src -lImlib2
+tiff_la_LIBADD = @TIFFLIBS@ $(top_builddir)/src/libImlib2.la
 
 gif_la_SOURCES = loader_gif.c
 gif_la_LDFLAGS = -no-undefined -module -avoid-version
-gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src -lImlib2
+gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/libImlib2.la
 
 pnm_la_SOURCES = loader_pnm.c
 pnm_la_LDFLAGS = -no-undefined -module -avoid-version
-pnm_la_LIBADD = -L$(top_builddir)/src -lImlib2
+pnm_la_LIBADD = $(top_builddir)/src/libImlib2.la
 
 argb_la_SOURCES = loader_argb.c
 argb_la_LDFLAGS = -no-undefined -module -avoid-version
-argb_la_LIBADD = -L$(top_builddir)/src -lImlib2
+argb_la_LIBADD = $(top_builddir)/src/libImlib2.la
 
 bmp_la_SOURCES = loader_bmp.c
 bmp_la_LDFLAGS = -no-undefined -module -avoid-version
-bmp_la_LIBADD = -L$(top_builddir)/src -lImlib2
+bmp_la_LIBADD = $(top_builddir)/src/libImlib2.la
 
 xpm_la_SOURCES = loader_xpm.c
 xpm_la_LDFLAGS = -no-undefined -module -avoid-version
-xpm_la_LIBADD = -L$(top_builddir)/src -lImlib2
+xpm_la_LIBADD = $(top_builddir)/src/libImlib2.la
 
 tga_la_SOURCES = loader_tga.c
 tga_la_LDFLAGS = -no-undefined -module -avoid-version
-tga_la_LIBADD = -L$(top_builddir)/src -lImlib2
+tga_la_LIBADD = $(top_builddir)/src/libImlib2.la
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 




--- ltmain.sh.orig	Mon Sep  8 11:12:11 2003
+++ ltmain.sh	Mon Dec  8 05:15:45 2003
@@ -944,6 +944,7 @@
 	;;
 
       -avoid-version)
+	build_old_libs=no
 	avoid_version=yes
 	continue
 	;;
@@ -2408,6 +2409,9 @@
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
+	  *-*-freebsd*)
+	    # FreeBSD doesn't need this....
+	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
@@ -4175,10 +4179,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false; then
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
 	$show "$install_prog $instname $destdir/$name"
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"




--- src/Makefile.in.orig	Mon Sep  8 11:12:28 2003
+++ src/Makefile.in	Mon Dec  8 04:42:05 2003
@@ -99,10 +99,10 @@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in loaderpath.h
 
-LDFLAGS = -L/usr/X11R6/lib
+LDFLAGS = @LDFLAGS@
 INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
-                       $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \
+                       -I$(top_srcdir)/loaders \
+                       $(freetype_cflags) $(X_CFLAGS) \
                        -I$(prefix)/include -I$(includedir)
 
 MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \
@@ -128,10 +128,10 @@
 
 libImlib2_la_LDFLAGS = -version-info 2:0:1
 @HAVE_MMX_TRUE@libImlib2_la_LIBADD = @HAVE_MMX_TRUE@$(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) \
-@HAVE_MMX_TRUE@                       $(top_builddir)/libltdl/libltdlc.la \
+@HAVE_MMX_TRUE@                       -lltdl \
 @HAVE_MMX_TRUE@                       $(x_libs) $(freetype_libs) $(LDFLAGS)
 @HAVE_MMX_FALSE@libImlib2_la_LIBADD = @HAVE_MMX_FALSE@$(X_OBJS) @DLLDFLAGS@ \
-@HAVE_MMX_FALSE@                       $(top_builddir)/libltdl/libltdlc.la \
+@HAVE_MMX_FALSE@                       -lltdl \
 @HAVE_MMX_FALSE@                       $(x_libs) $(freetype_libs) $(LDFLAGS)
 @HAVE_MMX_TRUE@libImlib2_la_DEPENDENCIES = @HAVE_MMX_TRUE@$(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS)
 @HAVE_MMX_FALSE@libImlib2_la_DEPENDENCIES = @HAVE_MMX_FALSE@$(top_builddir)/config.h $(X_OBJS)
@@ -314,57 +314,57 @@
 	  fi; \
 	done
 api.lo api.o : api.c ../config.h common.h colormod.h image.h \

 filter.lo filter.o : filter.c common.h ../config.h colormod.h image.h \
-	../libltdl/ltdl.h blend.h filter.h
+	blend.h filter.h
 font_draw.lo font_draw.o : font_draw.c ../config.h common.h colormod.h \
-	image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \
+	image.h blend.h font.h file.h updates.h \
 	rgbadraw.h rotate.h
 font_load.lo font_load.o : font_load.c ../config.h common.h colormod.h \
-	image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \
+	image.h blend.h font.h file.h updates.h \
 	rgbadraw.h rotate.h
 font_main.lo font_main.o : font_main.c ../config.h common.h colormod.h \
-	image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \
+	image.h blend.h font.h file.h updates.h \
 	rgbadraw.h rotate.h
 font_query.lo font_query.o : font_query.c ../config.h common.h \
-	colormod.h image.h ../libltdl/ltdl.h blend.h font.h file.h \
+	colormod.h image.h blend.h font.h file.h \
 	updates.h rgbadraw.h rotate.h
 format.lo format.o : format.c format.h
 grab.lo grab.o : grab.c common.h ../config.h grab.h
 grad.lo grad.o : grad.c common.h ../config.h colormod.h image.h \




include/Imlib2.h
lib/libImlib2.a
lib/libImlib2.so
lib/libImlib2.so.2
lib/loaders/filter/bump_map.so
lib/loaders/filter/colormod.so
lib/loaders/filter/testfilter.so
lib/loaders/image/argb.so
lib/loaders/image/bmp.so
lib/loaders/image/gif.so
lib/loaders/image/gzbz2.so
lib/loaders/image/jpeg.so
lib/loaders/image/png.so
lib/loaders/image/pnm.so
lib/loaders/image/tga.so
lib/loaders/image/tiff.so
lib/loaders/image/xpm.so
libdata/pkgconfig/imlib2.pc
@dirrm lib/loaders/image
@dirrm lib/loaders/filter
@dirrm lib/loaders

Return to bug 60269

Lines 6-13 Link Here

(-)graphics/imlib2/Makefile (-11 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= imlib2	8	PORTNAME= imlib2
9	PORTVERSION= 1.0.6	9	PORTVERSION= 1.1.0
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= enlightenment	12	MASTER_SITE_SUBDIR= enlightenment
Lines 15-34 Link Here
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= The next generation graphic library for enlightenment package	15	COMMENT= The next generation graphic library for enlightenment package
17		16
18	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \	17	LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
19	ltdl.4:${PORTSDIR}/devel/libltdl \	18	jpeg.9:${PORTSDIR}/graphics/jpeg \
		19	ungif.5:${PORTSDIR}/graphics/libungif \
20	png.5:${PORTSDIR}/graphics/png \	20	png.5:${PORTSDIR}/graphics/png \
21	tiff.4:${PORTSDIR}/graphics/tiff \	21	tiff.4:${PORTSDIR}/graphics/tiff \
22	ungif.5:${PORTSDIR}/graphics/libungif	22	freetype.9:${PORTSDIR}/print/freetype2
23		23
24	USE_REINPLACE= yes
25	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
26	USE_FREETYPE= yes	25	USE_GNOME= gnomehack pkgconfig
27	USE_LIBTOOL= yes	26	USE_REINPLACE= yes
		27	GNU_CONFIGURE= yes
		28	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
		29	LDFLAGS="-L${LOCALBASE}/lib"
28	INSTALLS_SHLIB= yes	30	INSTALLS_SHLIB= yes
29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
30	-I${LOCALBASE}/include" \
31	LIBS="-L${LOCALBASE}/lib"
32		31
33	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>
34		33

Lines 1-10 Link Here

(-)graphics/imlib2/files/patch-configure (-5 / +5 lines)
1	--- configure.orig Wed Aug 29 21:48:58 2001	1	--- configure.orig Mon Sep 8 11:12:12 2003
2	+++ configure Sun Oct 7 17:23:22 2001	2	+++ configure Mon Dec 8 05:29:41 2003
3	@@ -1031,16 +1031,6 @@	3	@@ -1244,16 +1244,6 @@
4	fi	4	fi
5		5
6		6
7	- case "$enable_ltdl_convenience" in	7	- case $enable_ltdl_convenience in
8	- no) { echo "configure: error: this package needs a convenience libltdl" 1>&2; exit 1; } ;;	8	- no) { echo "configure: error: this package needs a convenience libltdl" 1>&2; exit 1; } ;;
9	- "") enable_ltdl_convenience=yes	9	- "") enable_ltdl_convenience=yes
10	- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;	10	- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
Lines 17-23 Link Here
17		17
18	# Extract the first word of "gcc", so it can be a program name with args.	18	# Extract the first word of "gcc", so it can be a program name with args.
19	set dummy gcc; ac_word=$2	19	set dummy gcc; ac_word=$2
20	@@ -4313,75 +4303,5 @@	20	@@ -7682,75 +7672,5 @@
21	esac	21	esac
22	done	22	done
23		23

Lines 1-51 Link Here

(-)graphics/imlib2/files/patch-loaders::Makefile.in (-49 / +14 lines)
1	--- loaders/Makefile.in.orig Fri Apr 26 08:45:29 2002	1	--- loaders/Makefile.in.orig Mon Sep 8 11:12:29 2003
2	+++ loaders/Makefile.in Fri Sep 20 04:20:42 2002	2	+++ loaders/Makefile.in Mon Dec 8 05:09:37 2003
3	@@ -108,39 +108,39 @@	3	@@ -99,10 +99,10 @@
		4	# A list of all the files in the current directory which can be regenerated
		5	MAINTAINERCLEANFILES = Makefile.in
		6
		7	-LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib
		8	+LDFLAGS = @LDFLAGS@
		9	INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
		10	- -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
		11	- -I/usr/X11R6/include $(X_CFLAGS) \
		12	+ -I$(top_srcdir)/loaders \
		13	+ $(X_CFLAGS) \
		14	-I$(prefix)/include -I$(includedir)
4		15
5	jpeg_la_SOURCES = loader_jpeg.c
6	jpeg_la_LDFLAGS = -no-undefined -module -avoid-version
7	-jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src -lImlib2
8	+jpeg_la_LIBADD = @JPEGLIBS@ $(top_builddir)/src/libImlib2.la
9		16
10	png_la_SOURCES = loader_png.c
11	png_la_LDFLAGS = -no-undefined -module -avoid-version
12	-png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src -lImlib2
13	+png_la_LIBADD = @PNGLIBS@ $(top_builddir)/src/libImlib2.la
14
15	tiff_la_SOURCES = loader_tiff.c
16	tiff_la_LDFLAGS = -no-undefined -module -avoid-version
17	-tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src -lImlib2
18	+tiff_la_LIBADD = @TIFFLIBS@ $(top_builddir)/src/libImlib2.la
19
20	gif_la_SOURCES = loader_gif.c
21	gif_la_LDFLAGS = -no-undefined -module -avoid-version
22	-gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src -lImlib2
23	+gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/libImlib2.la
24
25	pnm_la_SOURCES = loader_pnm.c
26	pnm_la_LDFLAGS = -no-undefined -module -avoid-version
27	-pnm_la_LIBADD = -L$(top_builddir)/src -lImlib2
28	+pnm_la_LIBADD = $(top_builddir)/src/libImlib2.la
29
30	argb_la_SOURCES = loader_argb.c
31	argb_la_LDFLAGS = -no-undefined -module -avoid-version
32	-argb_la_LIBADD = -L$(top_builddir)/src -lImlib2
33	+argb_la_LIBADD = $(top_builddir)/src/libImlib2.la
34
35	bmp_la_SOURCES = loader_bmp.c
36	bmp_la_LDFLAGS = -no-undefined -module -avoid-version
37	-bmp_la_LIBADD = -L$(top_builddir)/src -lImlib2
38	+bmp_la_LIBADD = $(top_builddir)/src/libImlib2.la
39
40	xpm_la_SOURCES = loader_xpm.c
41	xpm_la_LDFLAGS = -no-undefined -module -avoid-version
42	-xpm_la_LIBADD = -L$(top_builddir)/src -lImlib2
43	+xpm_la_LIBADD = $(top_builddir)/src/libImlib2.la
44
45	tga_la_SOURCES = loader_tga.c
46	tga_la_LDFLAGS = -no-undefined -module -avoid-version
47	-tga_la_LIBADD = -L$(top_builddir)/src -lImlib2
48	+tga_la_LIBADD = $(top_builddir)/src/libImlib2.la
49	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
50	CONFIG_HEADER = ../config.h
51	CONFIG_CLEAN_FILES =

Line 0 Link Here

(-)graphics/imlib2/files/patch-ltmain.sh (+33 lines)
	1	--- ltmain.sh.orig Mon Sep 8 11:12:11 2003
	2	+++ ltmain.sh Mon Dec 8 05:15:45 2003
	3	@@ -944,6 +944,7 @@
	4	;;
	5
	6	-avoid-version)
	7	+ build_old_libs=no
	8	avoid_version=yes
	9	continue
	10	;;
	11	@@ -2408,6 +2409,9 @@
	12	--netbsd*)
	13	# Don't link with libc until the a.out ld.so is fixed.
	14	;;
	15	+ --freebsd*)
	16	+ # FreeBSD doesn't need this....
	17	+ ;;
	18	*)
	19	# Add libc to deplibs on all other systems if necessary.
	20	if test "$build_libtool_need_lc" = "yes"; then
	21	@@ -4175,10 +4179,12 @@
	22	fi
	23
	24	# Install the pseudo-library for information purposes.
	25	+ if /usr/bin/false; then
	26	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
	27	instname="$dir/$name"i
	28	$show "$install_prog $instname $destdir/$name"
	29	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
	30	+ fi
	31
	32	# Maybe install the static library, too.
	33	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 1-26 Link Here

(-)graphics/imlib2/files/patch-src::Makefile.in (-23 / +42 lines)
1	--- src/Makefile.in.orig Fri Sep 21 12:31:03 2001	1	--- src/Makefile.in.orig Mon Sep 8 11:12:28 2003
2	+++ src/Makefile.in Sun Oct 7 18:25:33 2001	2	+++ src/Makefile.in Mon Dec 8 04:42:05 2003
3	@@ -93,7 +93,7 @@	3	@@ -99,10 +99,10 @@
		4	# A list of all the files in the current directory which can be regenerated
4	MAINTAINERCLEANFILES = Makefile.in loaderpath.h	5	MAINTAINERCLEANFILES = Makefile.in loaderpath.h
5		6
6	LDFLAGS = -L/usr/X11R6/lib	7	-LDFLAGS = -L/usr/X11R6/lib
7	-INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders	8	+LDFLAGS = @LDFLAGS@
8	+INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders	9	INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
		10	- -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
		11	- $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \
		12	+ -I$(top_srcdir)/loaders \
		13	+ $(freetype_cflags) $(X_CFLAGS) \
		14	-I$(prefix)/include -I$(includedir)
9		15
10	MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S asm_blend_cmod.S	16	MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \
		17	@@ -128,10 +128,10 @@
11		18
12	@@ -107,8 +107,8 @@	19	libImlib2_la_LDFLAGS = -version-info 2:0:1
13	EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c context.c color.h context.h draw.h grab.h rend.h rgba.h ximage.h $(MMX_SRCS)	20	@HAVE_MMX_TRUE@libImlib2_la_LIBADD = @HAVE_MMX_TRUE@$(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) \
14		21	-@HAVE_MMX_TRUE@ $(top_builddir)/libltdl/libltdlc.la \
15	libImlib2_la_LDFLAGS = -version-info 1:4:0	22	+@HAVE_MMX_TRUE@ -lltdl \
16	-@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) $(top_builddir)/libltdl/libltdlc.la $(x_libs) -lttf $(LDFLAGS)	23	@HAVE_MMX_TRUE@ $(x_libs) $(freetype_libs) $(LDFLAGS)
17	-@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la $(x_libs) -lttf $(LDFLAGS)	24	@HAVE_MMX_FALSE@libImlib2_la_LIBADD = @HAVE_MMX_FALSE@$(X_OBJS) @DLLDFLAGS@ \
18	+@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) -lltdl $(x_libs) -lttf $(LDFLAGS)	25	-@HAVE_MMX_FALSE@ $(top_builddir)/libltdl/libltdlc.la \
19	+@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ -lltdl $(x_libs) -lttf $(LDFLAGS)	26	+@HAVE_MMX_FALSE@ -lltdl \
20	@HAVE_MMX_TRUE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS)	27	@HAVE_MMX_FALSE@ $(x_libs) $(freetype_libs) $(LDFLAGS)
21	@HAVE_MMX_FALSE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)	28	@HAVE_MMX_TRUE@libImlib2_la_DEPENDENCIES = @HAVE_MMX_TRUE@$(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS)
22		29	@HAVE_MMX_FALSE@libImlib2_la_DEPENDENCIES = @HAVE_MMX_FALSE@$(top_builddir)/config.h $(X_OBJS)
23	@@ -283,48 +283,48 @@	30	@@ -314,57 +314,57 @@
24	fi; \	31	fi; \
25	done	32	done
26	api.lo api.o : api.c ../config.h common.h colormod.h image.h \	33	api.lo api.o : api.c ../config.h common.h colormod.h image.h \
Lines 51-60 Link Here
51	filter.lo filter.o : filter.c common.h ../config.h colormod.h image.h \	58	filter.lo filter.o : filter.c common.h ../config.h colormod.h image.h \
52	- ../libltdl/ltdl.h blend.h filter.h	59	- ../libltdl/ltdl.h blend.h filter.h
53	+ blend.h filter.h	60	+ blend.h filter.h
54	font.lo font.o : font.c ../config.h common.h colormod.h image.h \	61	font_draw.lo font_draw.o : font_draw.c ../config.h common.h colormod.h \
55	- ../libltdl/ltdl.h blend.h font.h file.h updates.h rgbadraw.h \	62	- image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \
56	+ blend.h font.h file.h updates.h rgbadraw.h \	63	+ image.h blend.h font.h file.h updates.h \
57	rotate.h	64	rgbadraw.h rotate.h
		65	font_load.lo font_load.o : font_load.c ../config.h common.h colormod.h \
		66	- image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \
		67	+ image.h blend.h font.h file.h updates.h \
		68	rgbadraw.h rotate.h
		69	font_main.lo font_main.o : font_main.c ../config.h common.h colormod.h \
		70	- image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \
		71	+ image.h blend.h font.h file.h updates.h \
		72	rgbadraw.h rotate.h
		73	font_query.lo font_query.o : font_query.c ../config.h common.h \
		74	- colormod.h image.h ../libltdl/ltdl.h blend.h font.h file.h \
		75	+ colormod.h image.h blend.h font.h file.h \
		76	updates.h rgbadraw.h rotate.h
58	format.lo format.o : format.c format.h	77	format.lo format.o : format.c format.h
59	grab.lo grab.o : grab.c common.h ../config.h grab.h	78	grab.lo grab.o : grab.c common.h ../config.h grab.h
60	grad.lo grad.o : grad.c common.h ../config.h colormod.h image.h \	79	grad.lo grad.o : grad.c common.h ../config.h colormod.h image.h \

Lines 2-20 Link Here

(-)graphics/imlib2/pkg-plist (-1 / +3 lines)
2	include/Imlib2.h	2	include/Imlib2.h
3	lib/libImlib2.a	3	lib/libImlib2.a
4	lib/libImlib2.so	4	lib/libImlib2.so
5	lib/libImlib2.so.1	5	lib/libImlib2.so.2
6	lib/loaders/filter/bump_map.so	6	lib/loaders/filter/bump_map.so
7	lib/loaders/filter/colormod.so	7	lib/loaders/filter/colormod.so
8	lib/loaders/filter/testfilter.so	8	lib/loaders/filter/testfilter.so
9	lib/loaders/image/argb.so	9	lib/loaders/image/argb.so
10	lib/loaders/image/bmp.so	10	lib/loaders/image/bmp.so
11	lib/loaders/image/gif.so	11	lib/loaders/image/gif.so
		12	lib/loaders/image/gzbz2.so
12	lib/loaders/image/jpeg.so	13	lib/loaders/image/jpeg.so
13	lib/loaders/image/png.so	14	lib/loaders/image/png.so
14	lib/loaders/image/pnm.so	15	lib/loaders/image/pnm.so
15	lib/loaders/image/tga.so	16	lib/loaders/image/tga.so
16	lib/loaders/image/tiff.so	17	lib/loaders/image/tiff.so
17	lib/loaders/image/xpm.so	18	lib/loaders/image/xpm.so
		19	libdata/pkgconfig/imlib2.pc
18	@dirrm lib/loaders/image	20	@dirrm lib/loaders/image
19	@dirrm lib/loaders/filter	21	@dirrm lib/loaders/filter
20	@dirrm lib/loaders	22	@dirrm lib/loaders