From 573d8bcb8ef011c2e605a806ca0b8ff5d4a8819d Mon Sep 17 00:00:00 2001
From: maya <maya@pkgsrc.org>
Date: Fri, 16 Mar 2018 21:54:13 +0000
Subject: tremor: update to latest git commit.

This fixes an out of bound write, but possibly many other changes.
Unfortunately upstream doesn't do releases for tremor, so I manually
fetch the tarball and uploaded it.
---
 audio/tremor/Makefile                   | 16 +++++++++-------
 audio/tremor/PLIST                      |  5 ++---
 audio/tremor/distinfo                   | 13 +++++++------
 audio/tremor/patches/patch-configure.in | 15 +++++++++++++++
 4 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 audio/tremor/patches/patch-configure.in

(limited to 'audio')

diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index 4d8cc1d3c25..a819a37b4a6 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.25 2017/08/16 20:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/03/16 21:54:13 maya Exp $
 
-DISTNAME=	tremor_snapshot_030406
-PKGNAME=	tremor-1.0.2
-PKGREVISION=	5
+DISTNAME=	tremor-562307a
+PKGNAME=	tremor-1.0.2.20180316
 CATEGORIES=	devel audio
-MASTER_SITES=	https://www.xiph.org/ogg/vorbis/download/
-EXTRACT_SUFX=	.tgz
+# No releases.
+#GIT_COMMIT=	562307a4a7082e24553f3d2c55dab397a17c4b4f
+#MASTER_SITES=	"http://git.xiph.org/?p=tremor.git;a=snapshot;sf=tgz;h=${GIT_COMMIT};"
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.xiph.org/vorbis/
 COMMENT=	Fixed point decoding library for the Ogg Vorbis audio encoding format
 LICENSE=	modified-bsd
 
-WRKSRC=		${WRKDIR}/Tremor
 AUTOCONF_REQD=		2.50
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		autoconf automake gmake
@@ -21,9 +21,11 @@ USE_LIBTOOL=		yes
 PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
 
 pre-configure:
+	touch ${WRKSRC}/config.h.in
 	cd ${WRKSRC} && aclocal
 	cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake
 	cd ${WRKSRC} && automake --add-missing
 	cd ${WRKSRC} && autoconf
 
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/tremor/PLIST b/audio/tremor/PLIST
index 3b3256dda73..6de2f1ef4af 100644
--- a/audio/tremor/PLIST
+++ b/audio/tremor/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2018/01/01 22:29:18 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/03/16 21:54:13 maya Exp $
 include/tremor/config_types.h
 include/tremor/ivorbiscodec.h
 include/tremor/ivorbisfile.h
-include/tremor/ogg.h
-include/tremor/os_types.h
 lib/libvorbisidec.la
+lib/pkgconfig/vorbisidec.pc
diff --git a/audio/tremor/distinfo b/audio/tremor/distinfo
index 2d76538d69d..bce2d2c44c2 100644
--- a/audio/tremor/distinfo
+++ b/audio/tremor/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 01:12:53 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/03/16 21:54:13 maya Exp $
 
-SHA1 (tremor_snapshot_030406.tgz) = f0df8d70e2aad9a345716b551ead826434134f39
-RMD160 (tremor_snapshot_030406.tgz) = 34eebdf9a74f729ae0319c9e8d8b707642f5d002
-SHA512 (tremor_snapshot_030406.tgz) = 8dbf9abea4dfe09f011b292edd32cee8845c95df3d6571bb67e6f72e77742ec8bdb7c8d49c5a57e0e263c31839a065ddd1910eda3321d73f23fca7f8567700cd
-Size (tremor_snapshot_030406.tgz) = 151981 bytes
-SHA1 (patch-misc.h) = ebe129d13d711d238b7f1e7c52e55804b040fa86
+SHA1 (tremor-562307a.tar.gz) = 31f596fe1e55ce67e5c8b03d611bd1b9593272bd
+RMD160 (tremor-562307a.tar.gz) = d04d47d8441ed7f66b3e9be9507af81cb2116fcb
+SHA512 (tremor-562307a.tar.gz) = 19776c9a9e022c14224578eca5b290cd26a9f883ef20567c172491617c929c254d8cd6b844f8419e2e62c88f71e61238f87d82c23c02ab8ad195ab2a3b0f9384
+Size (tremor-562307a.tar.gz) = 148875 bytes
+SHA1 (patch-configure.in) = cf359f27acf93eab341b084b0fb9c007e7f3baed
+SHA1 (patch-misc.h) = 46f83e79562934bce45758254df401d3b551ccfa
diff --git a/audio/tremor/patches/patch-configure.in b/audio/tremor/patches/patch-configure.in
new file mode 100644
index 00000000000..ef8b247c492
--- /dev/null
+++ b/audio/tremor/patches/patch-configure.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2018/03/16 21:54:13 maya Exp $
+
+Avoid trying to use a non-existent Version_script file
+
+--- configure.in.orig	2018-03-16 05:15:51.000000000 +0000
++++ configure.in
+@@ -79,7 +79,7 @@ LDFLAGS="$LDFLAGS $ldflags_save"
+ AC_PROG_LD
+ AC_PROG_LD_GNU
+ if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
+-   SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
++   #SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" # XXX this file doesn't exist?!
+    LDFLAGS="$LDFLAGS $SHLIB_VERSION_ARG"
+ fi
+ 
-- 
cgit v1.2.3