Date: Sat, 21 Sep 2002 01:10:11 +0900 (JST) From: UMENO Takashi <umeno@rr.iij4u.or.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ijliao@FreeBSD.org Subject: ports/43115: Update port: graphics/imlib2 (changes to put shared library again) Message-ID: <200209201610.g8KGAB8G063964@belldandy.unnumbered.net>
next in thread | raw e-mail | index | archive | help
>Number: 43115
>Category: ports
>Synopsis: Update port: graphics/imlib2 (changes to put shared library again)
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 20 09:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: UMENO Takashi
>Release: FreeBSD 4.7-PRERELEASE i386
>Organization:
personal
>Environment:
System: FreeBSD belldandy.unnumbered.net 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #0: Sat Sep 14 01:04:07 JST 2002 umeno@belldandy.unnumbered.net:/usr/src/sys/compile/SAKUYA14 i386
>Description:
When Imlib2's version was up from 1.0.5 to 1.0.6,
libraries in /usr/X11R6/lib/loaders/image changed
from shared library form static library,
some ports depended on Imlib2 (c.f. graphics/zphoto) won't work.
Because imlib_load_image() in libImlib2.so.1 doesn't work correctly
from this changes.
This patch will change to put shared libraries again
in /usr/X11R6/lib/loaders/image directory.
>How-To-Repeat:
N/A
>Fix:
diff -ruN imlib2.orig/Makefile imlib2/Makefile
--- imlib2.orig/Makefile Mon Aug 12 23:38:44 2002
+++ imlib2/Makefile Wed Sep 18 14:47:13 2002
@@ -7,6 +7,7 @@
PORTNAME= imlib2
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= enlightenment
diff -ruN imlib2.orig/files/patch-loaders::Makefile.am imlib2/files/patch-loaders::Makefile.am
--- imlib2.orig/files/patch-loaders::Makefile.am Thu Jan 1 09:00:00 1970
+++ imlib2/files/patch-loaders::Makefile.am Wed Sep 18 14:32:35 2002
@@ -0,0 +1,60 @@
+--- loaders/Makefile.am.orig Tue Apr 9 05:38:54 2002
++++ loaders/Makefile.am Thu Oct 25 07:50:01 2001
+@@ -5,7 +5,7 @@
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in
+
+-LDFLAGS = -L/usr/X11R6/lib -L$(top_builddir)/src
++LDFLAGS = -L/usr/X11R6/lib -L$(top_srcdir)/src
+ INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \
+ $(X_CFLAGS) -I$(prefix)/include -I$(includedir) \
+ -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+@@ -35,39 +35,39 @@
+
+ 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@ -L$(top_builddir)/src/.libs -lImlib2
+
+ 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@ -L$(top_builddir)/src/.libs -lImlib2
+
+ 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@ -L$(top_builddir)/src/.libs -lImlib2
+
+ 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@ -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ #xcf_la_SOURCES = loader_xcf.c loader_xcf_pixelfuncs.c
+ #xcf_la_LDFLAGS = -no-undefined -module -avoid-version
diff -ruN imlib2.orig/files/patch-loaders::Makefile.in imlib2/files/patch-loaders::Makefile.in
--- imlib2.orig/files/patch-loaders::Makefile.in Thu Jan 1 09:00:00 1970
+++ imlib2/files/patch-loaders::Makefile.in Wed Sep 18 14:32:45 2002
@@ -0,0 +1,105 @@
+--- loaders/Makefile.in.orig Fri Apr 26 08:45:29 2002
++++ loaders/Makefile.in Wed Sep 18 14:03:35 2002
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -92,7 +92,7 @@
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in
+
+-LDFLAGS = -L/usr/X11R6/lib -L$(top_builddir)/src
++LDFLAGS = -L/usr/X11R6/lib -L$(top_srcdir)/src
+ 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
+
+
+@@ -108,39 +108,39 @@
+
+ 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@ -L$(top_builddir)/src/.libs -lImlib2
+
+ 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@ -L$(top_builddir)/src/.libs -lImlib2
+
+ 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@ -L$(top_builddir)/src/.libs -lImlib2
+
+ 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@ -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+
+ 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 = -L$(top_builddir)/src/.libs -lImlib2
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+@@ -182,7 +182,7 @@
+
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(jpeg_la_SOURCES) $(png_la_SOURCES) $(tiff_la_SOURCES) $(gif_la_SOURCES) $(pnm_la_SOURCES) $(argb_la_SOURCES) $(bmp_la_SOURCES) $(xpm_la_SOURCES) $(tga_la_SOURCES)
+ OBJECTS = $(jpeg_la_OBJECTS) $(png_la_OBJECTS) $(tiff_la_OBJECTS) $(gif_la_OBJECTS) $(pnm_la_OBJECTS) $(argb_la_OBJECTS) $(bmp_la_OBJECTS) $(xpm_la_OBJECTS) $(tga_la_OBJECTS)
+@@ -332,26 +332,6 @@
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+-loader_argb.lo loader_argb.o : loader_argb.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h
+-loader_bmp.lo loader_bmp.o : loader_bmp.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h
+-loader_gif.lo loader_gif.o : loader_gif.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h
+-loader_jpeg.lo loader_jpeg.o : loader_jpeg.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h
+-loader_png.lo loader_png.o : loader_png.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h
+-loader_pnm.lo loader_pnm.o : loader_pnm.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h
+-loader_tga.lo loader_tga.o : loader_tga.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h ../src/colormod.h \
+- ../src/blend.h
+-loader_tiff.lo loader_tiff.o : loader_tiff.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h
+-loader_xpm.lo loader_xpm.o : loader_xpm.c ../config.h ../src/common.h \
+- ../src/image.h ../libltdl/ltdl.h
+-
+ info-am:
+ info: info-am
+ dvi-am:
diff -ruN imlib2.orig/pkg-plist imlib2/pkg-plist
--- imlib2.orig/pkg-plist Mon Aug 12 23:38:44 2002
+++ imlib2/pkg-plist Wed Sep 18 14:44:31 2002
@@ -6,15 +6,15 @@
lib/loaders/filter/bump_map.so
lib/loaders/filter/colormod.so
lib/loaders/filter/testfilter.so
-lib/loaders/image/argb.a
-lib/loaders/image/bmp.a
-lib/loaders/image/gif.a
-lib/loaders/image/jpeg.a
-lib/loaders/image/png.a
-lib/loaders/image/pnm.a
-lib/loaders/image/tga.a
-lib/loaders/image/tiff.a
-lib/loaders/image/xpm.a
+lib/loaders/image/argb.so
+lib/loaders/image/bmp.so
+lib/loaders/image/gif.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
@dirrm lib/loaders/filter
@dirrm lib/loaders/image
@dirrm lib/loaders
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209201610.g8KGAB8G063964>