From 326b75a854bdf25dc59358a227ce7dfb35608424 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 9 Oct 2014 12:44:36 +0000 Subject: Changes 2.22: List of changes is unknown. --- audio/py-audiotools/Makefile | 12 +++---- audio/py-audiotools/PLIST | 38 +++++++++++++++++----- audio/py-audiotools/distinfo | 10 +++--- .../patches/patch-audiotools_player.py | 12 ------- audio/py-audiotools/patches/patch-src_cdiomodule.h | 15 +++++++++ 5 files changed, 56 insertions(+), 31 deletions(-) delete mode 100644 audio/py-audiotools/patches/patch-audiotools_player.py create mode 100644 audio/py-audiotools/patches/patch-src_cdiomodule.h (limited to 'audio/py-audiotools') diff --git a/audio/py-audiotools/Makefile b/audio/py-audiotools/Makefile index 07e9902cf27..6a5663008fe 100644 --- a/audio/py-audiotools/Makefile +++ b/audio/py-audiotools/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2014/05/09 07:36:53 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/10/09 12:44:36 adam Exp $ -DISTNAME= audiotools-2.20 +DISTNAME= audiotools-2.22 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audiotools/2.18/} @@ -12,16 +12,16 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-urwid-[0-9]*:../../devel/py-urwid -USE_LANGUAGES= c - +USE_LANGUAGES= c REPLACE_PYTHON+= audiotools/*.py REPLACE_PYTHON+= audiotools/py_decoders/*.py REPLACE_PYTHON+= audiotools/py_encoders/*.py -EGG_NAME= Python_Audio_Tools-${PKGVERSION_NOREV} PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 2.20 +.include "../../audio/lame/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" -.include "../../misc/libcdio/buildlink3.mk" +.include "../../misc/libcdio-paranoia/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-audiotools/PLIST b/audio/py-audiotools/PLIST index b54d1369a23..a25d06efe2e 100644 --- a/audio/py-audiotools/PLIST +++ b/audio/py-audiotools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2014/01/20 11:54:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/10/09 12:44:36 adam Exp $ bin/audiotools-config bin/cd2track bin/cdinfo @@ -24,6 +24,8 @@ ${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/audiotools/__init__.py ${PYSITELIB}/audiotools/__init__.pyc ${PYSITELIB}/audiotools/__init__.pyo +${PYSITELIB}/audiotools/_accuraterip.so +${PYSITELIB}/audiotools/_ogg.so ${PYSITELIB}/audiotools/accuraterip.py ${PYSITELIB}/audiotools/accuraterip.pyc ${PYSITELIB}/audiotools/accuraterip.pyo @@ -38,9 +40,15 @@ ${PYSITELIB}/audiotools/au.pyc ${PYSITELIB}/audiotools/au.pyo ${PYSITELIB}/audiotools/bitstream.so ${PYSITELIB}/audiotools/cdio.so -${PYSITELIB}/audiotools/cue.py -${PYSITELIB}/audiotools/cue.pyc -${PYSITELIB}/audiotools/cue.pyo +${PYSITELIB}/audiotools/cue/__init__.py +${PYSITELIB}/audiotools/cue/__init__.pyc +${PYSITELIB}/audiotools/cue/__init__.pyo +${PYSITELIB}/audiotools/cue/tokrules.py +${PYSITELIB}/audiotools/cue/tokrules.pyc +${PYSITELIB}/audiotools/cue/tokrules.pyo +${PYSITELIB}/audiotools/cue/yaccrules.py +${PYSITELIB}/audiotools/cue/yaccrules.pyc +${PYSITELIB}/audiotools/cue/yaccrules.pyo ${PYSITELIB}/audiotools/decoders.so ${PYSITELIB}/audiotools/delta.py ${PYSITELIB}/audiotools/delta.pyc @@ -88,6 +96,15 @@ ${PYSITELIB}/audiotools/pcmconverter.so ${PYSITELIB}/audiotools/player.py ${PYSITELIB}/audiotools/player.pyc ${PYSITELIB}/audiotools/player.pyo +${PYSITELIB}/audiotools/ply/__init__.py +${PYSITELIB}/audiotools/ply/__init__.pyc +${PYSITELIB}/audiotools/ply/__init__.pyo +${PYSITELIB}/audiotools/ply/lex.py +${PYSITELIB}/audiotools/ply/lex.pyc +${PYSITELIB}/audiotools/ply/lex.pyo +${PYSITELIB}/audiotools/ply/yacc.py +${PYSITELIB}/audiotools/ply/yacc.pyc +${PYSITELIB}/audiotools/ply/yacc.pyo ${PYSITELIB}/audiotools/py_decoders/__init__.py ${PYSITELIB}/audiotools/py_decoders/__init__.pyc ${PYSITELIB}/audiotools/py_decoders/__init__.pyo @@ -131,16 +148,21 @@ ${PYSITELIB}/audiotools/shn.pyo ${PYSITELIB}/audiotools/text.py ${PYSITELIB}/audiotools/text.pyc ${PYSITELIB}/audiotools/text.pyo -${PYSITELIB}/audiotools/toc.py -${PYSITELIB}/audiotools/toc.pyc -${PYSITELIB}/audiotools/toc.pyo +${PYSITELIB}/audiotools/toc/__init__.py +${PYSITELIB}/audiotools/toc/__init__.pyc +${PYSITELIB}/audiotools/toc/__init__.pyo +${PYSITELIB}/audiotools/toc/tokrules.py +${PYSITELIB}/audiotools/toc/tokrules.pyc +${PYSITELIB}/audiotools/toc/tokrules.pyo +${PYSITELIB}/audiotools/toc/yaccrules.py +${PYSITELIB}/audiotools/toc/yaccrules.pyc +${PYSITELIB}/audiotools/toc/yaccrules.pyo ${PYSITELIB}/audiotools/tta.py ${PYSITELIB}/audiotools/tta.pyc ${PYSITELIB}/audiotools/tta.pyo ${PYSITELIB}/audiotools/ui.py ${PYSITELIB}/audiotools/ui.pyc ${PYSITELIB}/audiotools/ui.pyo -${PYSITELIB}/audiotools/verify.so ${PYSITELIB}/audiotools/vorbis.py ${PYSITELIB}/audiotools/vorbis.pyc ${PYSITELIB}/audiotools/vorbis.pyo diff --git a/audio/py-audiotools/distinfo b/audio/py-audiotools/distinfo index 5cbed71c265..acdf046f08e 100644 --- a/audio/py-audiotools/distinfo +++ b/audio/py-audiotools/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2014/02/24 13:05:39 wiedi Exp $ +$NetBSD: distinfo,v 1.4 2014/10/09 12:44:36 adam Exp $ -SHA1 (audiotools-2.20.tar.gz) = 0ed9c286f21101dc4ff9fa702b5d4d52f6826ea8 -RMD160 (audiotools-2.20.tar.gz) = d879fa9acc83e059b5aa124b36fda0d57479c4f6 -Size (audiotools-2.20.tar.gz) = 6471831 bytes -SHA1 (patch-audiotools_player.py) = cf6a8884ca976c188ab13cf4acfb23c775c61c7f +SHA1 (audiotools-2.22.tar.gz) = 14de7f3a002296ec9693885f9ec032d46f5c84cb +RMD160 (audiotools-2.22.tar.gz) = f14943b47009a4bca6cb309cb52b7fc8e32629ea +Size (audiotools-2.22.tar.gz) = 6993462 bytes +SHA1 (patch-src_cdiomodule.h) = cacb21a287e0e5590804d06e49c1844d96534871 SHA1 (patch-src_samplerate_src__sinc.c) = c069c78096f444fc686f5ea6d5319a6e5ed458d1 diff --git a/audio/py-audiotools/patches/patch-audiotools_player.py b/audio/py-audiotools/patches/patch-audiotools_player.py deleted file mode 100644 index c5363851977..00000000000 --- a/audio/py-audiotools/patches/patch-audiotools_player.py +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-audiotools_player.py,v 1.1 2014/01/20 11:54:21 wiz Exp $ - -Fix incorrect path so that pkgsrc logic can fix it. - ---- audiotools/player.py.orig 2014-01-20 11:41:18.000000000 +0000 -+++ audiotools/player.py -@@ -1,4 +1,4 @@ --#!/usr/bin/bin -+#!/usr/bin/python - - #Audio Tools, a module and set of tools for manipulating audio data - #Copyright (C) 2007-2013 Brian Langenberger diff --git a/audio/py-audiotools/patches/patch-src_cdiomodule.h b/audio/py-audiotools/patches/patch-src_cdiomodule.h new file mode 100644 index 00000000000..11b26826be2 --- /dev/null +++ b/audio/py-audiotools/patches/patch-src_cdiomodule.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_cdiomodule.h,v 1.1 2014/10/09 12:44:37 adam Exp $ + +Fix for newer libcdio-paranoia. + +--- src/cdiomodule.h.orig 2014-10-09 12:37:31.000000000 +0000 ++++ src/cdiomodule.h +@@ -1,6 +1,6 @@ + #include +-#include +-#include ++#include ++#include + #include "array.h" + + /******************************************************** -- cgit v1.2.3