From owner-svn-ports-all@FreeBSD.ORG Mon Jun 1 19:13:41 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4503C1B8; Mon, 1 Jun 2015 19:13:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) 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 331EA1D5F; Mon, 1 Jun 2015 19:13:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t51JDfrL060225; Mon, 1 Jun 2015 19:13:41 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t51JDdat060215; Mon, 1 Jun 2015 19:13:39 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506011913.t51JDdat060215@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 1 Jun 2015 19:13:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388256 - in head/graphics: jpeg-turbo jpeg-turbo/files libjpeg-turbo 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.20 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: Mon, 01 Jun 2015 19:13:41 -0000 Author: antoine Date: Mon Jun 1 19:13:39 2015 New Revision: 388256 URL: https://svnweb.freebsd.org/changeset/ports/388256 Log: - Update to 1.4.0 - Allow building on non i386/amd64 [1] PR: 200095 Approved by: maintainer timeout (3 weeks) Tested on: ia64 and sparc64 [1] Added: head/graphics/jpeg-turbo/files/patch-md5_md5.c (contents, props changed) Deleted: head/graphics/jpeg-turbo/files/patch-jchuff.c 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 Jun 1 19:06:53 2015 (r388255) +++ head/graphics/jpeg-turbo/Makefile Mon Jun 1 19:13:39 2015 (r388256) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= jpeg-turbo -PORTVERSION= 1.3.1 -PORTREVISION?= 2 +PORTVERSION= 1.4.0 +PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION} DISTNAME= lib${PORTNAME}-${PORTVERSION} @@ -11,9 +11,6 @@ DISTNAME= lib${PORTNAME}-${PORTVERSION} MAINTAINER= bytestore@yandex.ru COMMENT?= SIMD-accelerated JPEG codec which replaces libjpeg -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm - -ONLY_FOR_ARCHS= amd64 i386 USES= cpe libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-jpeg8 @@ -34,11 +31,17 @@ DOCS_MAKE_ARGS_OFF= dist_doc_DATA="" EXAMPLES_MAKE_ARGS= exampledir="${EXAMPLESDIR}" EXAMPLES_MAKE_ARGS_OFF= dist_example_DATA="" -.if defined(SLAVE_PORT) +.include + +.if ${ARCH} == i386 || ${ARCH} == amd64 +BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm +.endif + +.if ${SLAVE_PORT} == yes CONFIGURE_ARGS+=--with-pic PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else -CONFIGURE_ARGS+=--program-suffix=-turbo --without-libturbojpeg +CONFIGURE_ARGS+=--program-suffix=-turbo --without-turbojpeg PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " post-install: Modified: head/graphics/jpeg-turbo/distinfo ============================================================================== --- head/graphics/jpeg-turbo/distinfo Mon Jun 1 19:06:53 2015 (r388255) +++ head/graphics/jpeg-turbo/distinfo Mon Jun 1 19:13:39 2015 (r388256) @@ -1,2 +1,2 @@ -SHA256 (libjpeg-turbo-1.3.1.tar.gz) = c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9 -SIZE (libjpeg-turbo-1.3.1.tar.gz) = 1390282 +SHA256 (libjpeg-turbo-1.4.0.tar.gz) = d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee +SIZE (libjpeg-turbo-1.4.0.tar.gz) = 1524645 Added: head/graphics/jpeg-turbo/files/patch-md5_md5.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jpeg-turbo/files/patch-md5_md5.c Mon Jun 1 19:13:39 2015 (r388256) @@ -0,0 +1,11 @@ +--- md5/md5.c.orig 2014-08-30 13:52:09 UTC ++++ md5/md5.c +@@ -45,6 +45,8 @@ static void MD5Transform(unsigned int [4 + #include + #define le32toh(x) OSSwapLittleToHostInt32(x) + #define htole32(x) OSSwapHostToLittleInt32(x) ++#elif defined(__FreeBSD__) ++#include + #endif + + /* Modified: head/graphics/jpeg-turbo/pkg-plist ============================================================================== --- head/graphics/jpeg-turbo/pkg-plist Mon Jun 1 19:06:53 2015 (r388255) +++ head/graphics/jpeg-turbo/pkg-plist Mon Jun 1 19:13:39 2015 (r388256) @@ -23,4 +23,4 @@ %%LIBTURBOJPEG%%lib/libturbojpeg.a %%LIBTURBOJPEG%%lib/libturbojpeg.so %%LIBTURBOJPEG%%lib/libturbojpeg.so.0 -%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.0.0 +%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.1.0 Modified: head/graphics/libjpeg-turbo/Makefile ============================================================================== --- head/graphics/libjpeg-turbo/Makefile Mon Jun 1 19:06:53 2015 (r388255) +++ head/graphics/libjpeg-turbo/Makefile Mon Jun 1 19:13:39 2015 (r388256) @@ -1,7 +1,6 @@ # Created by: Denis Podolskiy # $FreeBSD$ -PORTREVISION= 5 PKGNAMEPREFIX= lib COMMENT= SIMD-accelerated JPEG codec library, provides libTurboJPEG