From owner-svn-ports-all@FreeBSD.ORG Tue Apr 15 19:26:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ADA5E875; Tue, 15 Apr 2014 19:26:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E4631325; Tue, 15 Apr 2014 19:26:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3FJQT1R093243; Tue, 15 Apr 2014 19:26:29 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3FJQTPN093238; Tue, 15 Apr 2014 19:26:29 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201404151926.s3FJQTPN093238@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 15 Apr 2014 19:26:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351362 - head/graphics/mozjpeg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2014 19:26:29 -0000 Author: nemysis Date: Tue Apr 15 19:26:28 2014 New Revision: 351362 URL: http://svnweb.freebsd.org/changeset/ports/351362 QAT: https://qat.redports.org/buildarchive/r351362/ Log: - Update to 1.0.1, Announce message: Do not create JFIF header (APP0 block) by default. This saves 18 bytes per image. - Add jpeg and libjpeg-turbo to CONFLICTS_INSTALL - Add USE_LDCONFIG=${PREFIX}/include ${PREFIX}/lib - Change CONFIGURE_ARGS, change USE_LDCONFIG, remove PORTNAME from PLIST_SUB, change STRIP_CMD, change pkg-plist - Add autoheader and libtoolize to USE_AUTOTOOLS, remove run-autotools, add AUTOMAKE_ARGS - Remove LIBTOOL_ARGS and LDFLAGS - Remove SIMD from default Options - Use GCC=yes instead of GCC=any - Change BUILD_DEPENDS from nasm to yasm, moved to SIMD - Change SOMAJORVERSION to VER - Reordering Options - Break lines around 80 characters - Change REINPLACE, cosmetical changes - Patch for warning: always_inline function might not be inlinable http://sourceforge.net/p/libjpeg-turbo/patches/56/ - Use .if for DOCS due to large number of files installed PR: ports/188540 Submitted by: Horia Racoviceanu (maintainer) Modified: head/graphics/mozjpeg/Makefile head/graphics/mozjpeg/distinfo (contents, props changed) head/graphics/mozjpeg/pkg-plist (contents, props changed) Modified: head/graphics/mozjpeg/Makefile ============================================================================== --- head/graphics/mozjpeg/Makefile Tue Apr 15 18:55:47 2014 (r351361) +++ head/graphics/mozjpeg/Makefile Tue Apr 15 19:26:28 2014 (r351362) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mozjpeg -PORTVERSION= 1.0 +PORTVERSION= 1.0.1 CATEGORIES= graphics MAINTAINER= horia@racoviceanu.com @@ -10,24 +10,22 @@ COMMENT= Fork of libjpeg-turbo with 'jpg LICENSE= BSD3CLAUSE -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm - USE_GITHUB= yes GH_ACCOUNT= mozilla GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= febf346 +GH_COMMIT= 0c7449c -USE_AUTOTOOLS= aclocal:env autoconf automake libtool +USE_AUTOTOOLS= aclocal autoconf autoheader automake libtool libtoolize USE_LDCONFIG= ${PREFIX}/include/${PORTNAME} ${PREFIX}/lib/${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --docdir=${PREFIX}/share/doc/${PORTNAME} \ --includedir=${PREFIX}/include/${PORTNAME} \ --libdir=${PREFIX}/lib/${PORTNAME} -LIBTOOL_ARGS+= --finish ${PREFIX}/lib/${PORTNAME} +AUTOMAKE_ARGS+= -fiv --add-missing LDFLAGS+= -L${PREFIX}/lib/${PORTNAME} PLIST_SUB= PORTNAME=${PORTNAME} \ - SOMAJORVERSION=${SOMAJORVERSION} + VER=${VER} PORTDOCS= * @@ -52,7 +50,7 @@ OPTIONS_MULTI_LIBRARIES= SHARED STATIC OPTIONS_SINGLE= API_ABI_EMULATION OPTIONS_SINGLE_API_ABI_EMULATION= JPEG6B JPEG7 JPEG8 -OPTIONS_DEFAULT= DECODING ENCODING GCC JPEG6B SHARED SIMD STATIC TURBOJPEG +OPTIONS_DEFAULT= DECODING ENCODING GCC JPEG8 SHARED STATIC TURBOJPEG OPTIONS_SUB= yes @@ -70,8 +68,9 @@ JPEG6B_DESC= API/ABI-compatible with lib JPEG7_DESC= API/ABI-compatible with libjpeg v7 (implies arith-coding) JPEG8_DESC= API/ABI-compatible with libjpeg v8 (implies arith-coding) -GCC_USE= GCC=any +GCC_USE= GCC=yes SIMD_CONFIGURE_WITH= simd +SIMD_BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm TURBOJPEG_CONFIGURE_WITH= turbojpeg JPEG7_CONFIGURE_WITH= jpeg7 @@ -89,28 +88,27 @@ CONFIGURE_ARGS+= --without-arith-enc . if ! ${PORT_OPTIONS:MDECODING} CONFIGURE_ARGS+= --without-arith-dec . endif -SOMAJORVERSION= 63 +VER= 63 .else -SOMAJORVERSION= 8 +VER= 8 .endif post-patch: - @${REINPLACE_CMD} -e "s|docdir = \$$(datadir)/doc|&/mozjpeg|; \ - s|exampledir = \$$(datadir)/doc|exampledir = ${EXAMPLESDIR}|" \ - ${WRKSRC}/Makefile.am - -run-autotools: run-autotools-autoreconf - -run-autotools-autoreconf: - cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -fiv + @${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|&/mozjpeg|; \ + /^exampledir/s|=.*|= ${EXAMPLESDIR}|' \ + ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e 's|__attribute__((always_inline))",|inline &|' \ + ${WRKSRC}/configure.ac post-install: +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR2} ${INSTALL_DATA} ${DOC_FILES:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR1} ${INSTALL_DATA} ${DOC_FILES:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} +.endif .if ${PORT_OPTIONS:MSHARED} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libjpeg.so.${SOMAJORVERSION} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libjpeg.so.${VER} .endif .if ${PORT_OPTIONS:MSHARED} && ${PORT_OPTIONS:MTURBOJPEG} Modified: head/graphics/mozjpeg/distinfo ============================================================================== --- head/graphics/mozjpeg/distinfo Tue Apr 15 18:55:47 2014 (r351361) +++ head/graphics/mozjpeg/distinfo Tue Apr 15 19:26:28 2014 (r351362) @@ -1,2 +1,2 @@ -SHA256 (mozjpeg-1.0.tar.gz) = 6c4845d7fa0bddd77e4a209e8e81bde11af8524dcd2cb0bb10bfd9519548ec95 -SIZE (mozjpeg-1.0.tar.gz) = 1032706 +SHA256 (mozjpeg-1.0.1.tar.gz) = f3ddbdc323ef3daf6b6958ba1365fc869819d07b201727be1ab3fdaa3213b0c4 +SIZE (mozjpeg-1.0.1.tar.gz) = 1039871 Modified: head/graphics/mozjpeg/pkg-plist ============================================================================== --- head/graphics/mozjpeg/pkg-plist Tue Apr 15 18:55:47 2014 (r351361) +++ head/graphics/mozjpeg/pkg-plist Tue Apr 15 19:26:28 2014 (r351362) @@ -12,7 +12,7 @@ include/%%PORTNAME%%/jpeglib.h %%STATIC%%lib/%%PORTNAME%%/libjpeg.a lib/%%PORTNAME%%/libjpeg.la %%SHARED%%lib/%%PORTNAME%%/libjpeg.so -%%SHARED%%lib/%%PORTNAME%%/libjpeg.so.%%SOMAJORVERSION%% +%%SHARED%%lib/%%PORTNAME%%/libjpeg.so.%%VER%% %%STATIC%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.a %%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.la %%SHARED%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so