From 77ff453ff861d5d572de2c101d77b1f26618736e Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 12 Dec 2016 14:53:13 +0000
Subject: Updated speex to 1.2.0.

I just pushed the Speex 1.2.0 stable release.
Thanks to Ralph Giles for helping with the release process.
---
 audio/speex/Makefile         |  4 ++--
 audio/speex/distinfo         | 12 ++++++------
 audio/speex/patches/patch-ab | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'audio/speex')

diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 6e0c3d09bbe..dda2bcb52a7 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2015/01/16 08:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2016/12/12 14:53:13 wiz Exp $
 
-DISTNAME=	speex-1.2rc2
+DISTNAME=	speex-1.2.0
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.us.xiph.org/releases/speex/
 
diff --git a/audio/speex/distinfo b/audio/speex/distinfo
index 356e86d2e04..6a8fbac431a 100644
--- a/audio/speex/distinfo
+++ b/audio/speex/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2015/11/03 01:12:51 agc Exp $
+$NetBSD: distinfo,v 1.17 2016/12/12 14:53:13 wiz Exp $
 
-SHA1 (speex-1.2rc2.tar.gz) = 03ce8418c4e05cb166374bfadef46e7646da62e1
-RMD160 (speex-1.2rc2.tar.gz) = 3ef717a426b12172ada5b5d6d9e9e73b8f1e7219
-SHA512 (speex-1.2rc2.tar.gz) = 557cf22ed7085dba94d92963cf4a4b5030a1f7f9936783ba427378d60dd7881a886687fb987b3c951120728009fb47054091e2d7d5e3dfcc6912b51ffdfbb97e
-Size (speex-1.2rc2.tar.gz) = 1016729 bytes
-SHA1 (patch-ab) = 5bbe38404f2832126d8c0aab714e1d551d0e3d99
+SHA1 (speex-1.2.0.tar.gz) = 18ebc3fa3236b4369509e9439acc32d0e864fa7f
+RMD160 (speex-1.2.0.tar.gz) = 898a8746130794b2b5778f339ca72f99fb903e72
+SHA512 (speex-1.2.0.tar.gz) = 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
+Size (speex-1.2.0.tar.gz) = 1047080 bytes
+SHA1 (patch-ab) = cffe95988c956177cb2e849083c44168bf737f9a
diff --git a/audio/speex/patches/patch-ab b/audio/speex/patches/patch-ab
index 34ad3695b52..cf35f72f9cf 100644
--- a/audio/speex/patches/patch-ab
+++ b/audio/speex/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.7 2015/01/16 08:50:47 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2016/12/12 14:53:14 wiz Exp $
 
 Add getopt/ossaudio libraries where needed.
 
---- src/Makefile.in.orig	2014-12-06 19:58:25.000000000 +0000
+--- src/Makefile.in.orig	2016-12-07 23:21:03.000000000 +0000
 +++ src/Makefile.in
-@@ -248,7 +248,7 @@ LD = @LD@
+@@ -260,7 +260,7 @@ LD = @LD@
  LDFLAGS = @LDFLAGS@
  LIBM = @LIBM@
  LIBOBJS = @LIBOBJS@
@@ -13,7 +13,7 @@ Add getopt/ossaudio libraries where needed.
  LIBTOOL = @LIBTOOL@
  LIPO = @LIPO@
  LN_S = @LN_S@
-@@ -351,11 +351,11 @@ include_HEADERS = 
+@@ -366,11 +366,11 @@ include_HEADERS = 
  noinst_HEADERS = wav_io.h
  speexenc_SOURCES = speexenc.c wav_io.c skeleton.c
  speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la \
@@ -22,8 +22,8 @@ Add getopt/ossaudio libraries where needed.
  
  speexdec_SOURCES = speexdec.c wav_io.c
  speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
--	$(OGG_LIBS)  @FFT_LIBS@
-+	$(OGG_LIBS)  @FFT_LIBS@ $(LIBOSSAUDIO)
+-	$(OGG_LIBS) @WINMM_LIBS@ @FFT_LIBS@
++	$(OGG_LIBS) @WINMM_LIBS@ @FFT_LIBS@ $(LIBOSSAUDIO)
  
  all: all-am
  
-- 
cgit v1.2.3