svn commit: r388256 - in head/graphics: jpeg-turbo jpeg-turbo/files libjpeg-turbo

[Antoine Brodin]

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 at 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 <bsd.port.options.mk>
+
+.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 <libkern/OSByteOrder.h>
+ #define le32toh(x) OSSwapLittleToHostInt32(x)
+ #define htole32(x) OSSwapHostToLittleInt32(x)
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
+ #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 <bytestore at yandex.ru>
 # $FreeBSD$
 
-PORTREVISION=	5
 PKGNAMEPREFIX=	lib
 
 COMMENT=	SIMD-accelerated JPEG codec library, provides libTurboJPEG