svn commit: r477110 - in head/graphics: jpeg-turbo jpeg-turbo/files libjpeg-turbo
Antoine Brodin
antoine at FreeBSD.org
Mon Aug 13 20:22:40 UTC 2018
Author: antoine
Date: Mon Aug 13 20:22:38 2018
New Revision: 477110
URL: https://svnweb.freebsd.org/changeset/ports/477110
Log:
Update graphics/jpeg-turbo and graphics/libjpeg-turbo to 2.0.0
Upstream switched build system to CMake
PR: 230143
With hat: portmgr
Deleted:
head/graphics/jpeg-turbo/files/
Modified:
head/graphics/jpeg-turbo/Makefile
head/graphics/jpeg-turbo/distinfo
head/graphics/jpeg-turbo/pkg-plist
head/graphics/libjpeg-turbo/Makefile
Modified: head/graphics/jpeg-turbo/Makefile
==============================================================================
--- head/graphics/jpeg-turbo/Makefile Mon Aug 13 20:21:00 2018 (r477109)
+++ head/graphics/jpeg-turbo/Makefile Mon Aug 13 20:22:38 2018 (r477110)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= jpeg-turbo
-PORTVERSION= 1.5.3
+PORTVERSION= 2.0.0
PORTREVISION?= 0
CATEGORIES= graphics
MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION}
@@ -15,31 +15,23 @@ LICENSE= BSD3CLAUSE IJG ZLIB
LICENSE_COMB= multi
LICENSE_GROUPS_IJG= FSF GPL
LICENSE_NAME_IJG= Independent JPEG Group License
-LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/turbojpeg.c
+LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.md
LICENSE_FILE_IJG= ${WRKSRC}/README.ijg
-LICENSE_FILE_ZLIB= ${WRKSRC}/simd/jsimdext.inc
+LICENSE_FILE_ZLIB= ${WRKSRC}/LICENSE.md
LICENSE_PERMS_IJG= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= cpe libtool pathfix
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-jpeg8
+USES= cmake:outsource cpe
USE_LDCONFIG= yes
-INSTALL_TARGET= install-strip
-TEST_TARGET= test
+CMAKE_ON= WITH_JPEG8
CPE_VENDOR= d.r.commander
CPE_PRODUCT= libjpeg-turbo
+TEST_TARGET= test
PORTDOCS= *
-PORTEXAMPLES= *
+DOCSDIR= ${PREFIX}/share/doc/libjpeg-turbo
-OPTIONS_DEFINE= DOCS EXAMPLES
+OPTIONS_DEFINE= DOCS
-DOCS_MAKE_ARGS= docdir="${DOCSDIR}"
-DOCS_MAKE_ARGS_OFF= dist_doc_DATA=""
-
-EXAMPLES_MAKE_ARGS= exampledir="${EXAMPLESDIR}"
-EXAMPLES_MAKE_ARGS_OFF= dist_example_DATA=""
-
.include <bsd.port.options.mk>
.if ${ARCH} == i386 || ${ARCH} == amd64
@@ -47,12 +39,9 @@ BUILD_DEPENDS+= nasm:devel/nasm
.endif
.if ${SLAVE_PORT} == yes
-# libturbojpeg.a has to be built with PIC for virtualgl
-CONFIGURE_ARGS+=--with-pic
-USES+= jpeg
PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG=""
.else
-CONFIGURE_ARGS+=--without-turbojpeg
+CMAKE_OFF= WITH_TURBOJPEG
CONFLICTS_INSTALL= jpeg-[0-9]*
PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment "
.endif
Modified: head/graphics/jpeg-turbo/distinfo
==============================================================================
--- head/graphics/jpeg-turbo/distinfo Mon Aug 13 20:21:00 2018 (r477109)
+++ head/graphics/jpeg-turbo/distinfo Mon Aug 13 20:22:38 2018 (r477110)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514013995
-SHA256 (libjpeg-turbo-1.5.3.tar.gz) = b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523
-SIZE (libjpeg-turbo-1.5.3.tar.gz) = 1658672
+TIMESTAMP = 1532858291
+SHA256 (libjpeg-turbo-2.0.0.tar.gz) = 778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868
+SIZE (libjpeg-turbo-2.0.0.tar.gz) = 2158457
Modified: head/graphics/jpeg-turbo/pkg-plist
==============================================================================
--- head/graphics/jpeg-turbo/pkg-plist Mon Aug 13 20:21:00 2018 (r477109)
+++ head/graphics/jpeg-turbo/pkg-plist Mon Aug 13 20:22:38 2018 (r477110)
@@ -10,7 +10,7 @@
%%JPEG%%lib/libjpeg.a
%%JPEG%%lib/libjpeg.so
%%JPEG%%lib/libjpeg.so.8
-%%JPEG%%lib/libjpeg.so.8.1.2
+%%JPEG%%lib/libjpeg.so.8.2.2
%%JPEG%%libdata/pkgconfig/libjpeg.pc
%%JPEG%%man/man1/cjpeg.1.gz
%%JPEG%%man/man1/djpeg.1.gz
@@ -22,5 +22,5 @@
%%LIBTURBOJPEG%%lib/libturbojpeg.a
%%LIBTURBOJPEG%%lib/libturbojpeg.so
%%LIBTURBOJPEG%%lib/libturbojpeg.so.0
-%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.1.0
+%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.2.0
%%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc
Modified: head/graphics/libjpeg-turbo/Makefile
==============================================================================
--- head/graphics/libjpeg-turbo/Makefile Mon Aug 13 20:21:00 2018 (r477109)
+++ head/graphics/libjpeg-turbo/Makefile Mon Aug 13 20:22:38 2018 (r477110)
@@ -8,6 +8,6 @@ COMMENT= SIMD-accelerated JPEG codec library, provides
MASTERDIR= ${.CURDIR:H}/jpeg-turbo
SLAVE_PORT= yes
-OPTIONS_EXCLUDE=DOCS EXAMPLES
+OPTIONS_EXCLUDE=DOCS
.include "${MASTERDIR}/Makefile"
More information about the svn-ports-all
mailing list