aboutsummaryrefslogtreecommitdiff
path: root/graphics/jpeg-turbo
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2015-09-16 20:35:13 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2015-09-16 20:35:13 +0000
commitb7aac35e1b37cb1264698a7af0cc9e5614ac5d6e (patch)
tree0e330e1751b7f9252b247915b2491d53c66ce07e /graphics/jpeg-turbo
parent302ed8d6debb8f0e1f9e645f42d7265c154d9be2 (diff)
downloadports-b7aac35e1b37cb1264698a7af0cc9e5614ac5d6e.tar.gz
ports-b7aac35e1b37cb1264698a7af0cc9e5614ac5d6e.zip
- Update jpeg-turbo to 1.4.1 and grab maintainership after several timeouts
- Change default jpeg implementation from jpeg to jpeg-turbo Reviewed by: bapt, mat Differential Revision: https://reviews.freebsd.org/D2884
Notes
Notes: svn path=/head/; revision=397084
Diffstat (limited to 'graphics/jpeg-turbo')
-rw-r--r--graphics/jpeg-turbo/Makefile14
-rw-r--r--graphics/jpeg-turbo/distinfo4
-rw-r--r--graphics/jpeg-turbo/pkg-plist36
3 files changed, 25 insertions, 29 deletions
diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
index 504a52d799f6..2a7108973f4f 100644
--- a/graphics/jpeg-turbo/Makefile
+++ b/graphics/jpeg-turbo/Makefile
@@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= jpeg-turbo
-PORTVERSION= 1.4.0
-PORTREVISION?= 1
+PORTVERSION= 1.4.1
+PORTREVISION?= 0
CATEGORIES= graphics
MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION}
DISTNAME= lib${PORTNAME}-${PORTVERSION}
-MAINTAINER= bytestore@yandex.ru
+MAINTAINER= portmgr@FreeBSD.org
COMMENT?= SIMD-accelerated JPEG codec which replaces libjpeg
USES= cpe libtool
@@ -38,15 +38,13 @@ BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
.endif
.if ${SLAVE_PORT} == yes
+# libturbojpeg.a has to be built with PIC for virtualgl
CONFIGURE_ARGS+=--with-pic
PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG=""
.else
-CONFIGURE_ARGS+=--program-suffix=-turbo --without-turbojpeg
+CONFIGURE_ARGS+=--without-turbojpeg
+CONFLICTS_INSTALL= jpeg-[0-9]*
PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment "
-
-post-install:
- @${ECHO_CMD} "libjpeg.so.8 libjpeg.so.8.0.2" \
- > ${STAGEDIR}${PREFIX}/etc/libmap.d/${PORTNAME}.conf
.endif
.include <bsd.port.mk>
diff --git a/graphics/jpeg-turbo/distinfo b/graphics/jpeg-turbo/distinfo
index b078f650ccfd..bfc3fdd1b887 100644
--- a/graphics/jpeg-turbo/distinfo
+++ b/graphics/jpeg-turbo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libjpeg-turbo-1.4.0.tar.gz) = d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee
-SIZE (libjpeg-turbo-1.4.0.tar.gz) = 1524645
+SHA256 (libjpeg-turbo-1.4.1.tar.gz) = 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08
+SIZE (libjpeg-turbo-1.4.1.tar.gz) = 1529614
diff --git a/graphics/jpeg-turbo/pkg-plist b/graphics/jpeg-turbo/pkg-plist
index 032d3d99f49c..7e8881a9ddd1 100644
--- a/graphics/jpeg-turbo/pkg-plist
+++ b/graphics/jpeg-turbo/pkg-plist
@@ -1,23 +1,21 @@
-%%JPEG%%etc/libmap.d/jpeg-turbo.conf
-%%JPEG%%bin/cjpeg-turbo
-%%JPEG%%bin/djpeg-turbo
-%%JPEG%%bin/jpegtran-turbo
-%%JPEG%%bin/rdjpgcom-turbo
-%%JPEG%%bin/wrjpgcom-turbo
-@comment %%JPEG%%include/jconfig.h
-@comment %%JPEG%%include/jerror.h
-@comment %%JPEG%%include/jmorecfg.h
-@comment %%JPEG%%include/jpeglib.h
-@comment %%JPEG%%lib/libjpeg.a
-@comment %%JPEG%%lib/libjpeg.so
-@comment %%JPEG%%lib/libjpeg.so.8
+%%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.8
%%JPEG%%lib/libjpeg.so.8.0.2
-%%JPEG%%man/man1/cjpeg-turbo.1.gz
-%%JPEG%%man/man1/djpeg-turbo.1.gz
-%%JPEG%%man/man1/jpegtran-turbo.1.gz
-%%JPEG%%man/man1/rdjpgcom-turbo.1.gz
-%%JPEG%%man/man1/wrjpgcom-turbo.1.gz
-@comment bin/tjbench-turbo
+%%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