Changes 3.1:

Bug fixes and improvements.

4 files changed, 25 insertions, 20 deletions

diff --git a/audio/py-audiotools/Makefile b/audio/py-audiotools/Makefile
index d60a199ab37..2870b22d2f2 100644
--- a/audio/py-audiotools/Makefile
+++ b/audio/py-audiotools/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.16 2015/05/21 18:00:08 adam Exp $
+# $NetBSD: Makefile,v 1.17 2015/10/18 15:25:04 adam Exp $
 
-DISTNAME=	audiotools-3.0
+DISTNAME=	audiotools-3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	audio
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audiotools/}
-MASTER_SITES=	${MASTER_SITE_GITHUB:=tuffy/}
-GITHUB_PROJECT=	python-audio-tools
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audiotools/}
+#MASTER_SITES=	${MASTER_SITE_GITHUB:=tuffy/}
+#GITHUB_PROJECT=	python-audio-tools
+#GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://audiotools.sourceforge.net/
@@ -23,6 +23,8 @@ REPLACE_PYTHON+=	audiotools/py_encoders/*.py
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
+.include "../../audio/wavpack/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../misc/libcdio-paranoia/buildlink3.mk"
diff --git a/audio/py-audiotools/PLIST b/audio/py-audiotools/PLIST
index cdf30df9eae..139f1173388 100644
--- a/audio/py-audiotools/PLIST
+++ b/audio/py-audiotools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/05/04 11:41:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/10/18 15:25:04 adam Exp $
 bin/audiotools-config
 bin/cd2track
 bin/cdinfo
@@ -137,9 +137,6 @@ ${PYSITELIB}/audiotools/py_encoders/wavpack.py
 ${PYSITELIB}/audiotools/py_encoders/wavpack.pyc
 ${PYSITELIB}/audiotools/py_encoders/wavpack.pyo
 ${PYSITELIB}/audiotools/replaygain.so
-${PYSITELIB}/audiotools/shn.py
-${PYSITELIB}/audiotools/shn.pyc
-${PYSITELIB}/audiotools/shn.pyo
 ${PYSITELIB}/audiotools/text.py
 ${PYSITELIB}/audiotools/text.pyc
 ${PYSITELIB}/audiotools/text.pyo
diff --git a/audio/py-audiotools/distinfo b/audio/py-audiotools/distinfo
index 4386cef6e34..d5fddb2c6a0 100644
--- a/audio/py-audiotools/distinfo
+++ b/audio/py-audiotools/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/05/04 11:41:31 adam Exp $
+$NetBSD: distinfo,v 1.6 2015/10/18 15:25:04 adam Exp $
 
-SHA1 (audiotools-3.0.tar.gz) = 09548db315da0b57784a4b5840c1d5a5dda0774d
-RMD160 (audiotools-3.0.tar.gz) = 54049889d3202965741cfed448edb087d6584001
-Size (audiotools-3.0.tar.gz) = 6959571 bytes
-SHA1 (patch-src_cdiomodule.h) = cacb21a287e0e5590804d06e49c1844d96534871
+SHA1 (audiotools-3.1.tar.gz) = 1b614d3cb26aaf14bd5f7b0f1e52d70b4da39d59
+RMD160 (audiotools-3.1.tar.gz) = 366b28c499f6a12b9b517186b4e710ebd9c1d57a
+SHA512 (audiotools-3.1.tar.gz) = 793a5109477e57ceb1d7146d48fb3f000abfd5333a7ad82ef5d9ef12667880e319a2aa25d24ca260aed64c3e107e7e35d8d4b6985b9cf232c5855953d123347b
+Size (audiotools-3.1.tar.gz) = 6318431 bytes
+SHA1 (patch-src_cdiomodule.h) = f7624e9c0923dfeceb422039a711e95697548e5a
 SHA1 (patch-src_samplerate_src__sinc.c) = c069c78096f444fc686f5ea6d5319a6e5ed458d1
diff --git a/audio/py-audiotools/patches/patch-src_cdiomodule.h b/audio/py-audiotools/patches/patch-src_cdiomodule.h
index 11b26826be2..f911efc26be 100644
--- a/audio/py-audiotools/patches/patch-src_cdiomodule.h
+++ b/audio/py-audiotools/patches/patch-src_cdiomodule.h
@@ -1,15 +1,20 @@
-$NetBSD: patch-src_cdiomodule.h,v 1.1 2014/10/09 12:44:37 adam Exp $
+$NetBSD: patch-src_cdiomodule.h,v 1.2 2015/10/18 15:25:04 adam Exp $
 
-Fix for newer libcdio-paranoia.
+Fix includes.
 
---- src/cdiomodule.h.orig	2014-10-09 12:37:31.000000000 +0000
+--- src/cdiomodule.h.orig	2015-07-08 09:42:02.000000000 +0000
 +++ src/cdiomodule.h
-@@ -1,6 +1,6 @@
+@@ -1,11 +1,6 @@
  #include <Python.h>
+-#ifdef OLD_PARANOIA
 -#include <cdio/cdda.h>
 -#include <cdio/paranoia.h>
+-#else
+-#include <cdio/cdparanoia/cdda.h>
+-#include <cdio/cdparanoia/paranoia.h>
+-#endif
 +#include <cdio/paranoia/cdda.h>
 +#include <cdio/paranoia/paranoia.h>
- #include "array.h"
  
  /********************************************************
+  Audio Tools, a module and set of tools for manipulating audio data