Date: Mon, 27 Jun 2011 07:37:37 +0400 From: Pan Tsu <inyaoo@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/158328: [patch] graphics/libjpeg-turbo: enable compat with graphics/jpeg Message-ID: <868vsoq70e.fsf@gmail.com> Resent-Message-ID: <201106270340.p5R3e3Ju024574@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158328
>Category: ports
>Synopsis: [patch] graphics/libjpeg-turbo: enable compat with graphics/jpeg
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 27 03:40:03 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Pan Tsu
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- switch API/ABI to v8
- chase SOVERSION of graphics/jpeg[1]
- prune unnecessary autotools
Most ports don't need rebuild.
[1] it should avoid the need to touch libmap.conf(5) or do a sweeping
change for ports that specify version, e.g.
$ fgrep -lr jpeg.11: /usr/ports # to get a list
>How-To-Repeat:
$ cd www/firefox; make install
$ cd graphics/jpeg; make deinstall
$ cd graphics/libjpeg-turbo; make install
$ firefox &
alternatively
$ cd graphics/libjpeg-turbo; make install
$ cd www/firefox; make install
$ firefox &
>Fix:
--- a.diff begins here ---
Index: graphics/libjpeg-turbo/Makefile
===================================================================
RCS file: /a/.cvsup/ports/graphics/libjpeg-turbo/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- graphics/libjpeg-turbo/Makefile 21 Jun 2011 17:11:59 -0000 1.14
+++ graphics/libjpeg-turbo/Makefile 27 Jun 2011 03:13:59 -0000
@@ -18,10 +18,15 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/na
CONFLICTS= jpeg-[0-9]*
ONLY_FOR_ARCHS= amd64 i386
-USE_AUTOTOOLS= autoconf autoheader aclocal automake libtool
-ACLOCAL_ARGS= -I.
+USE_AUTOTOOLS= libtool
+CONFIGURE_ENV= SO_MAJOR_VERSION=${SOVERSION}
+CONFIGURE_ARGS= --with-jpeg8
USE_LDCONFIG= yes
MAN1= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
+PLIST_SUB= SOVERSION=${SOVERSION}
+
+# chase graphics/jpeg
+SOVERSION= 11
.include <bsd.port.mk>
Index: graphics/libjpeg-turbo/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/graphics/libjpeg-turbo/pkg-plist,v
retrieving revision 1.3
diff -u -p -r1.3 pkg-plist
--- graphics/libjpeg-turbo/pkg-plist 11 Mar 2011 15:11:06 -0000 1.3
+++ graphics/libjpeg-turbo/pkg-plist 27 Jun 2011 03:14:19 -0000
@@ -12,7 +12,7 @@ include/turbojpeg.h
lib/libjpeg.a
lib/libjpeg.la
lib/libjpeg.so
-lib/libjpeg.so.62
+lib/libjpeg.so.%%SOVERSION%%
lib/libturbojpeg.a
lib/libturbojpeg.la
lib/libturbojpeg.so
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?868vsoq70e.fsf>