From 429b042533817f1e47176218778d861af73122e4 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 18 Jul 2015 10:40:20 +0000 Subject: Changes 0.16.2: Fixed several bugs detected by running American Fuzzy Lop --- graphics/libraw/Makefile | 9 ++++----- graphics/libraw/buildlink3.mk | 8 +++++--- graphics/libraw/distinfo | 13 ++++++------- graphics/libraw/patches/patch-configure | 10 ++++++---- graphics/libraw/patches/patch-configure.ac | 13 ------------- graphics/libraw/patches/patch-libraw__r.pc.in | 4 +++- 6 files changed, 24 insertions(+), 33 deletions(-) delete mode 100644 graphics/libraw/patches/patch-configure.ac (limited to 'graphics/libraw') diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile index 27eb659bb96..00a8471294b 100644 --- a/graphics/libraw/Makefile +++ b/graphics/libraw/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2014/11/17 19:04:25 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2015/07/18 10:40:20 adam Exp $ -DISTNAME= LibRaw-0.15.1 +DISTNAME= LibRaw-0.16.2 PKGNAME= ${DISTNAME:tl} -PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.libraw.org/data/ @@ -15,8 +14,6 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= yes -#MAKE_JOBS_SAFE= no - CONFIGURE_ARGS+= --disable-examples CONFIGURE_ARGS+= --disable-demosaic-pack-gpl2 CONFIGURE_ARGS+= --disable-demosaic-pack-gpl3 @@ -24,5 +21,7 @@ CONFIGURE_ARGS+= --disable-demosaic-pack-gpl3 PKGCONFIG_OVERRIDE+= libraw.pc.in PKGCONFIG_OVERRIDE+= libraw_r.pc.in +.include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libraw/buildlink3.mk b/graphics/libraw/buildlink3.mk index 229acf36ce9..b3d8463e53f 100644 --- a/graphics/libraw/buildlink3.mk +++ b/graphics/libraw/buildlink3.mk @@ -1,15 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.5 2012/10/10 13:06:14 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2015/07/18 10:40:20 adam Exp $ BUILDLINK_TREE+= libraw .if !defined(LIBRAW_BUILDLINK3_MK) LIBRAW_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libraw+= libraw>=0.12.0 -BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.14.6 +BUILDLINK_API_DEPENDS.libraw+= libraw>=0.16.0 +BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.16.0 BUILDLINK_PKGSRCDIR.libraw?= ../../graphics/libraw +.include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # LIBRAW_BUILDLINK3_MK BUILDLINK_TREE+= -libraw diff --git a/graphics/libraw/distinfo b/graphics/libraw/distinfo index 41afcb36039..2ef07cef431 100644 --- a/graphics/libraw/distinfo +++ b/graphics/libraw/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.18 2014/11/17 19:04:25 joerg Exp $ +$NetBSD: distinfo,v 1.19 2015/07/18 10:40:20 adam Exp $ -SHA1 (LibRaw-0.15.1.tar.gz) = b080046190902169f7f329c09e9183789417f1d2 -RMD160 (LibRaw-0.15.1.tar.gz) = 5364ee06551132cbaa1c6c2dc585ef8649c3baa1 -Size (LibRaw-0.15.1.tar.gz) = 1406204 bytes -SHA1 (patch-configure) = 2d91bca722e5c45e8f7695a1f7f571937b5b7697 -SHA1 (patch-configure.ac) = c7b3def34afb52b7353a56d4f2d940cb5ec3d1a4 -SHA1 (patch-libraw__r.pc.in) = 4a09704852e7c107bf656de1210bfdea5b889beb +SHA1 (LibRaw-0.16.2.tar.gz) = fd74432c9167a5621d24cb5ba0d1fc082a8963b4 +RMD160 (LibRaw-0.16.2.tar.gz) = 8857b3531be0c96e4715dd7e3f4ba97e9d0f82ac +Size (LibRaw-0.16.2.tar.gz) = 1476575 bytes +SHA1 (patch-configure) = 7626ff87dff75da3c7c136b095ee920a0045c064 +SHA1 (patch-libraw__r.pc.in) = e691f79c69c5530c93262c270fe7e2f5b1c959d9 diff --git a/graphics/libraw/patches/patch-configure b/graphics/libraw/patches/patch-configure index 1cd4decba8b..7e8ae941107 100644 --- a/graphics/libraw/patches/patch-configure +++ b/graphics/libraw/patches/patch-configure @@ -1,13 +1,15 @@ -$NetBSD: patch-configure,v 1.1 2014/11/17 19:04:25 joerg Exp $ +$NetBSD: patch-configure,v 1.2 2015/07/18 10:40:20 adam Exp $ ---- configure.orig 2013-05-24 17:55:19.000000000 +0000 +Avoid libstdc++. + +--- configure.orig 2015-05-16 17:23:47.000000000 +0000 +++ configure -@@ -16207,7 +16207,7 @@ $as_echo "$as_me: WARNING: Unable to fin +@@ -16358,7 +16358,7 @@ $as_echo "$as_me: WARNING: Unable to fin fi fi -LIBS="$LIBS -lm -lstdc++" +LIBS="$LIBS -lm" - LIBRAW_SHLIB_VERSION=9:0:0 + LIBRAW_SHLIB_VERSION=10:0:0 diff --git a/graphics/libraw/patches/patch-configure.ac b/graphics/libraw/patches/patch-configure.ac deleted file mode 100644 index 5f4129f30f0..00000000000 --- a/graphics/libraw/patches/patch-configure.ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.1 2014/11/17 19:04:25 joerg Exp $ - ---- configure.ac.orig 2013-05-17 22:56:40.000000000 +0000 -+++ configure.ac -@@ -220,7 +220,7 @@ if test x$dp3 = xtrue ; then - fi - fi - --LIBS="$LIBS -lm -lstdc++" -+LIBS="$LIBS -lm" - - AC_SUBST([LIBRAW_SHLIB_VERSION],m4_esyscmd([./shlib-version.sh])) - AC_SUBST([LIBRAW_RELEASE_VERSION],m4_esyscmd([./version.sh])) diff --git a/graphics/libraw/patches/patch-libraw__r.pc.in b/graphics/libraw/patches/patch-libraw__r.pc.in index e42994f4442..4e01db7b92f 100644 --- a/graphics/libraw/patches/patch-libraw__r.pc.in +++ b/graphics/libraw/patches/patch-libraw__r.pc.in @@ -1,4 +1,6 @@ -$NetBSD: patch-libraw__r.pc.in,v 1.1 2014/11/17 19:04:25 joerg Exp $ +$NetBSD: patch-libraw__r.pc.in,v 1.2 2015/07/18 10:40:20 adam Exp $ + +Avoid libstdc++. --- libraw_r.pc.in.orig 2013-05-17 22:56:40.000000000 +0000 +++ libraw_r.pc.in -- cgit v1.2.3