svn commit: r365789 - in head: . graphics/jpeg-turbo graphics/libjpeg-turbo

Adam Weinberger adamw at FreeBSD.org
Sat Aug 23 19:40:23 UTC 2014 

Author: adamw
Date: Sat Aug 23 19:40:21 2014
New Revision: 365789
URL: http://svnweb.freebsd.org/changeset/ports/365789
QAT: https://qat.redports.org/buildarchive/r365789/

Log:
  libjpeg-turbo installs its own unique library (libturbojpeg.so) and
  a drop-in replacement for libjpeg.so.
  
  This commit splits them apart into two ports:
  	graphics/libjpeg-turbo which installs only libturbojpeg.so
  	graphics/jpeg-turbo which installs the libjpeg.so replacement
  
  This will allow ports to depend on libturbojpeg.so without causing
  pkg conflicts.
  
  Approved by:	maintainer

Added:
  head/graphics/jpeg-turbo/
     - copied from r365750, head/graphics/libjpeg-turbo/
Deleted:
  head/graphics/libjpeg-turbo/distinfo
  head/graphics/libjpeg-turbo/pkg-plist
Modified:
  head/UPDATING
  head/graphics/jpeg-turbo/Makefile
  head/graphics/jpeg-turbo/pkg-descr
  head/graphics/jpeg-turbo/pkg-plist
  head/graphics/libjpeg-turbo/Makefile
  head/graphics/libjpeg-turbo/pkg-descr

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Aug 23 19:38:15 2014	(r365788)
+++ head/UPDATING	Sat Aug 23 19:40:21 2014	(r365789)
@@ -6,6 +6,19 @@ You should get into the habit of checkin
 you update your ports collection, before attempting any port upgrades.
 
 20140823
+  AFFECTS: users of graphics/libjpeg-turbo
+  AUTHOR: adamw at FreeBSD.org
+
+  libjpeg-turbo installs its own unique library (libturbojpeg.so) and
+  a drop-in replacement for libjpeg.so. The drop-in replacement has been
+  split off into graphics/jpeg-turbo; libjpeg-turbo now installs only
+  libturbojpeg.so.
+  
+  If you were using the libjpeg.so from graphics/libjpeg-turbo, you
+  should install graphics/jpeg-turbo AFTER upgrading the libjpeg-turbo
+  port.
+
+20140823
   AFFECTS: users of TeXLive
   AUTHOR: hrs at FreeBSD.org
 

Modified: head/graphics/jpeg-turbo/Makefile
==============================================================================
--- head/graphics/libjpeg-turbo/Makefile	Sat Aug 23 16:14:19 2014	(r365750)
+++ head/graphics/jpeg-turbo/Makefile	Sat Aug 23 19:40:21 2014	(r365789)
@@ -1,18 +1,18 @@
 # Created by: Denis Podolskiy <bytestore at yandex.ru>
 # $FreeBSD$
 
-PORTNAME=	libjpeg-turbo
+PORTNAME=	jpeg-turbo
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bytestore at yandex.ru
-COMMENT=	SIMD-accelerated JPEG codec which provides both the libjpeg,TurboJPEG
+COMMENT?=	SIMD-accelerated JPEG codec which replaces libjpeg
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-CONFLICTS_INSTALL=	jpeg-[0-9]*
 ONLY_FOR_ARCHS=	amd64 i386
 USES=		libtool
 GNU_CONFIGURE=	yes
@@ -20,6 +20,7 @@ CONFIGURE_ENV=	SO_MAJOR_VERSION=${SOVERS
 CONFIGURE_ARGS=	--with-jpeg8
 USE_LDCONFIG=	yes
 ALL_TARGET=	test
+INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	SOVERSION=${SOVERSION}
 PORTDOCS=	*
@@ -28,30 +29,23 @@ PORTEXAMPLES=	*
 # chase graphics/jpeg
 SOVERSION=	11
 
-OPTIONS_DEFINE=	PIC DOCS EXAMPLES
+OPTIONS_DEFINE=	PIC
 PIC_DESC=	Static library with PIC (required for VirtualGL)
 
-.include <bsd.port.options.mk>
+PIC_CONFIGURE_ON=	--with-pic
 
-.if ${PORT_OPTIONS:MPIC}
-CONFIGURE_ARGS+=--with-pic
+.if defined(SLAVE_PORT)
+PLIST_SUB+=	JPEG="@comment " LIBTURBOJPEG=""
+.else
+PLIST_SUB+=	JPEG="" LIBTURBOJPEG="@comment "
+CONFLICTS_INSTALL=	jpeg-[0-9]*
+OPTIONS_DEFINE+=DOCS EXAMPLES
+CONFIGURE_ARGS+=--without-libturbojpeg
 .endif
 
 post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -e '/^install-data-am/s,install-dist_docDATA,,' \
-		${WRKSRC}/Makefile.in
-.else
 	${REINPLACE_CMD} -e '/^docdir/s,=.*,= ${DOCSDIR},' \
+		-e '/^exampledir/s,=.*,= ${EXAMPLESDIR},' \
 		${WRKSRC}/Makefile.in
-.endif
-
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-	${REINPLACE_CMD} -e '/^install-data-am/s,install-dist_exampleDATA,,' \
-		${WRKSRC}/Makefile.in
-.else
-	${REINPLACE_CMD} -e '/^exampledir/s,=.*,= ${EXAMPLESDIR},' \
-		${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/jpeg-turbo/pkg-descr
==============================================================================
--- head/graphics/libjpeg-turbo/pkg-descr	Sat Aug 23 16:14:19 2014	(r365750)
+++ head/graphics/jpeg-turbo/pkg-descr	Sat Aug 23 19:40:21 2014	(r365789)
@@ -1,3 +1,6 @@
+This is a drop-in replacement for the graphics/jpeg library. It does not
+include libturbojpeg.so (see graphics/libjpeg-turbo).
+
 libjpeg-turbo is a high-speed version of libjpeg for x86 and x86-64 processors
 which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG
 compression and decompression.

Modified: head/graphics/jpeg-turbo/pkg-plist
==============================================================================
--- head/graphics/libjpeg-turbo/pkg-plist	Sat Aug 23 16:14:19 2014	(r365750)
+++ head/graphics/jpeg-turbo/pkg-plist	Sat Aug 23 19:40:21 2014	(r365789)
@@ -1,24 +1,24 @@
-bin/cjpeg
-bin/djpeg
-bin/jpegtran
-bin/rdjpgcom
-bin/tjbench
-bin/wrjpgcom
-include/jconfig.h
-include/jerror.h
-include/jmorecfg.h
-include/jpeglib.h
-include/turbojpeg.h
-lib/libjpeg.a
-lib/libjpeg.so
-lib/libjpeg.so.%%SOVERSION%%
-lib/libjpeg.so.%%SOVERSION%%.0.2
-lib/libturbojpeg.a
-lib/libturbojpeg.so
-lib/libturbojpeg.so.0
-lib/libturbojpeg.so.0.0.0
-man/man1/cjpeg.1.gz
-man/man1/djpeg.1.gz
-man/man1/jpegtran.1.gz
-man/man1/rdjpgcom.1.gz
-man/man1/wrjpgcom.1.gz
+%%JPEG%%bin/cjpeg
+%%JPEG%%bin/djpeg
+%%JPEG%%bin/jpegtran
+%%JPEG%%bin/rdjpgcom
+%%JPEG%%bin/wrjpgcom
+%%JPEG%%include/jconfig.h
+%%JPEG%%include/jerror.h
+%%JPEG%%include/jmorecfg.h
+%%JPEG%%include/jpeglib.h
+%%JPEG%%lib/libjpeg.a
+%%JPEG%%lib/libjpeg.so
+%%JPEG%%lib/libjpeg.so.%%SOVERSION%%
+%%JPEG%%lib/libjpeg.so.%%SOVERSION%%.0.2
+%%JPEG%%man/man1/cjpeg.1.gz
+%%JPEG%%man/man1/djpeg.1.gz
+%%JPEG%%man/man1/jpegtran.1.gz
+%%JPEG%%man/man1/rdjpgcom.1.gz
+%%JPEG%%man/man1/wrjpgcom.1.gz
+%%LIBTURBOJPEG%%bin/tjbench
+%%LIBTURBOJPEG%%include/turbojpeg.h
+%%LIBTURBOJPEG%%lib/libturbojpeg.a
+%%LIBTURBOJPEG%%lib/libturbojpeg.so
+%%LIBTURBOJPEG%%lib/libturbojpeg.so.0
+%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.0.0

Modified: head/graphics/libjpeg-turbo/Makefile
==============================================================================
--- head/graphics/libjpeg-turbo/Makefile	Sat Aug 23 19:38:15 2014	(r365788)
+++ head/graphics/libjpeg-turbo/Makefile	Sat Aug 23 19:40:21 2014	(r365789)
@@ -1,57 +1,12 @@
 # Created by: Denis Podolskiy <bytestore at yandex.ru>
 # $FreeBSD$
 
-PORTNAME=	libjpeg-turbo
-PORTVERSION=	1.3.0
-PORTREVISION=	1
-CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
+PKGNAMEPREFIX=	lib
 
-MAINTAINER=	bytestore at yandex.ru
-COMMENT=	SIMD-accelerated JPEG codec which provides both the libjpeg,TurboJPEG
+COMMENT=	SIMD-accelerated JPEG codec library, provides libTurboJPEG
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+MASTERDIR=	${.CURDIR:H}/jpeg-turbo
+SLAVE_PORT=	yes
+OPTIONS_SLAVE=	PIC
 
-CONFLICTS_INSTALL=	jpeg-[0-9]*
-ONLY_FOR_ARCHS=	amd64 i386
-USES=		libtool
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SO_MAJOR_VERSION=${SOVERSION}
-CONFIGURE_ARGS=	--with-jpeg8
-USE_LDCONFIG=	yes
-ALL_TARGET=	test
-
-PLIST_SUB=	SOVERSION=${SOVERSION}
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-# chase graphics/jpeg
-SOVERSION=	11
-
-OPTIONS_DEFINE=	PIC DOCS EXAMPLES
-PIC_DESC=	Static library with PIC (required for VirtualGL)
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPIC}
-CONFIGURE_ARGS+=--with-pic
-.endif
-
-post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -e '/^install-data-am/s,install-dist_docDATA,,' \
-		${WRKSRC}/Makefile.in
-.else
-	${REINPLACE_CMD} -e '/^docdir/s,=.*,= ${DOCSDIR},' \
-		${WRKSRC}/Makefile.in
-.endif
-
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-	${REINPLACE_CMD} -e '/^install-data-am/s,install-dist_exampleDATA,,' \
-		${WRKSRC}/Makefile.in
-.else
-	${REINPLACE_CMD} -e '/^exampledir/s,=.*,= ${EXAMPLESDIR},' \
-		${WRKSRC}/Makefile.in
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"

Modified: head/graphics/libjpeg-turbo/pkg-descr
==============================================================================
--- head/graphics/libjpeg-turbo/pkg-descr	Sat Aug 23 19:38:15 2014	(r365788)
+++ head/graphics/libjpeg-turbo/pkg-descr	Sat Aug 23 19:40:21 2014	(r365789)
@@ -1,3 +1,5 @@
+This is the libjpeg-turbo library.
+
 libjpeg-turbo is a high-speed version of libjpeg for x86 and x86-64 processors
 which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG
 compression and decompression.

More information about the svn-ports-head mailing list