Hi!
The diff below updated audio/py-mutagen to its latest version.
MAKE_ENV here is needed to fix a reproducible error in regression
tests:
TMid3v2 (21): ........E............ 20
======================================================================
ERROR: test_encoding_with_escape (tests.test_tools_mid3v2.TMid3v2)
----------------------------------------------------------------------
Traceback (most recent call last):
File
"/usr/ports/pobj/py-mutagen-1.22/mutagen-1.22/tests/test_tools_mid3v2.py", line
178, in test_encoding_with_escape
res, out = self.call("-e", "-a", text.encode(enc), self.filename)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2:
ordinal not in range(128)
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/py-mutagen/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 7 Aug 2013 21:31:17 -0000 1.11
+++ Makefile 16 Sep 2013 07:41:48 -0000
@@ -2,10 +2,9 @@
COMMENT = Python module to handle audio metadata
-MODPY_EGG_VERSION = 1.20
+MODPY_EGG_VERSION = 1.22
DISTNAME = mutagen-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 2
CATEGORIES = audio
HOMEPAGE = https://mutagen.googlecode.com/
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
-MODPY_ADJ_FILES = mutagen/__init__.py \
+MODPY_ADJ_FILES = docs/id3_frames_gen.py \
tools/mid3iconv \
tools/mid3v2 \
tools/moggsplit \
@@ -31,10 +30,9 @@ TEST_DEPENDS = audio/faad \
audio/vorbis-tools \
multimedia/oggz
-pre-build:
- @rm ${WRKDIST}/tools/*.orig
+MAKE_ENV = LC_CTYPE="en_US.UTF-8"
do-test:
- ${MODPY_CMD} test
+ ${MODPY_TEST_TARGET}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/py-mutagen/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 31 May 2011 09:49:52 -0000 1.3
+++ distinfo 16 Sep 2013 07:41:48 -0000
@@ -1,5 +1,2 @@
-MD5 (mutagen-1.20.tar.gz) = rbFtn2BWvIZKXIbG+IWveQ==
-RMD160 (mutagen-1.20.tar.gz) = 6O3OuhHWcM3TAhQp3rz0VOEdTZY=
-SHA1 (mutagen-1.20.tar.gz) = eowZGBYOa10krNFG9XwI7ZQqL6g=
-SHA256 (mutagen-1.20.tar.gz) = flbEeN4VT9zQDSV+vHe+hxgYjxoNuRb1HxKbfKAd5uc=
-SIZE (mutagen-1.20.tar.gz) = 651649
+SHA256 (mutagen-1.22.tar.gz) = 3fKQe8r0gnsESj1wsvs8G1iVRJfYYTPxZxX8bEB9SU4=
+SIZE (mutagen-1.22.tar.gz) = 813763
Index: patches/patch-man_mid3v2_1
===================================================================
RCS file: patches/patch-man_mid3v2_1
diff -N patches/patch-man_mid3v2_1
--- patches/patch-man_mid3v2_1 31 May 2011 09:49:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-man_mid3v2_1,v 1.1 2011/05/31 09:49:52 dcoppa Exp $
-
-Add --TXXX support to mid3v2
-(upstream revision r97)
-
---- man/mid3v2.1.orig Sun Dec 13 05:11:56 2009
-+++ man/mid3v2.1 Thu May 26 12:28:04 2011
-@@ -1,4 +1,4 @@
--.TH mid3v2 1 "December 12th, 2009"
-+.TH mid3v2 1 "October 30th, 2010"
- .SH NAME
- mid3v2 \- audio tag editor similar to 'id3v2'
- .SH SYNOPSIS
-@@ -60,6 +60,11 @@ Set the track number (TRCK).
- Any text or URL frame (those beginning with T or W) can be modified or
- added by prefixing the name of the frame with "\-\-". For example,
- \fB\-\-TIT3 "Monkey!"\fR will set the TIT3 (subtitle) frame to \fBMonkey!\fR.
-+.PP
-+The TXXX frame requires a colon-separated description key; many TXXX
-+frames may be set in the file as long as they have different keys. To
-+set this key, just separate the text with a colon, e.g.
-+\fB\-\-TXXX "ALBUMARTISTSORT:Examples,\ The"\fR.
- .SH BUGS
- No sanity checking is done on the editing operations you perform, so
- mid3v2 will happily accept \-\-TSIZ when editing an ID3v2.4 frame. However,
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/audio/py-mutagen/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 31 May 2011 09:49:52 -0000 1.2
+++ patches/patch-setup_py 16 Sep 2013 07:41:48 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.2 2011/05/31 09:49:52 dcoppa Exp $
---- setup.py.orig Thu Oct 8 09:26:23 2009
-+++ setup.py Thu May 26 12:02:03 2011
-@@ -196,7 +196,7 @@ class coverage_cmd(Command):
+--- setup.py.orig Fri Sep 6 11:11:46 2013
++++ setup.py Mon Sep 16 07:48:58 2013
+@@ -171,7 +171,7 @@ class coverage_cmd(Command):
raise SystemExit("Coverage percentage went up; change setup.py.")
if os.name == "posix":
Index: patches/patch-tests_test___init___py
===================================================================
RCS file: patches/patch-tests_test___init___py
diff -N patches/patch-tests_test___init___py
--- patches/patch-tests_test___init___py 31 May 2011 09:49:52 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-tests_test___init___py,v 1.1 2011/05/31 09:49:52 dcoppa Exp $
---- tests/test___init__.py.orig Thu May 26 14:34:47 2011
-+++ tests/test___init__.py Thu May 26 14:35:05 2011
-@@ -181,23 +181,3 @@ class TFile(TestCase):
- MP3.score(filename, fileobj, header))
-
- add(TFile)
--
--class TMutagen(TestCase):
-- uses_mmap = False
--
-- def test_not_prerelease(self):
-- from mutagen import version
-- from os.path import dirname, basename, abspath
-- trunk = dirname(dirname(abspath(__file__)))
-- definitely_trunk = os.path.join(trunk, "..", "trunk")
-- if os.path.isdir(definitely_trunk):
-- if basename(trunk) != "trunk":
-- self.failIf(
-- version[-1] < 0, "mutagen.version is a prerelease.")
-- else:
-- self.failIf(
-- version[-1] >= 0, "mutagen.version is not a prerelease.")
-- else:
-- print "WARNING: Unable to check version correctness."
-- print "WARNING: %r does not exist." % definitely_trunk
--add(TMutagen)
Index: patches/patch-tools_mid3v2
===================================================================
RCS file: patches/patch-tools_mid3v2
diff -N patches/patch-tools_mid3v2
--- patches/patch-tools_mid3v2 31 May 2011 09:49:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-tools_mid3v2,v 1.1 2011/05/31 09:49:52 dcoppa Exp $
-
-Add --TXXX support to mid3v2
-(upstream revision r97)
-
---- tools/mid3v2.orig Wed Dec 30 01:21:12 2009
-+++ tools/mid3v2 Thu May 26 12:21:12 2011
-@@ -89,7 +89,8 @@ def delete_frames(deletes, filenames):
-
- def write_files(edits, filenames):
- enc = locale.getpreferredencoding()
-- edits = [(frame[2:], value.decode(enc)) for (frame, value) in edits]
-+ edits = [(frame[2:], value.decode(enc)) for (frame, value) in edits
-+ if value]
-
- # preprocess:
- # for all [frame,value] pairs in the edits list
-@@ -128,11 +129,22 @@ def write_files(edits, filenames):
- desc, lang = values[0], values[-1]
- frame = mutagen.id3.COMM(
- encoding=3, text=value, lang=lang, desc=desc)
-+ id3.add(frame)
-+ elif frame == "TXXX":
-+ for value in vlist:
-+ values = value.split(":", 1)
-+ if len(values) == 1:
-+ desc, value = "", values[0]
-+ else:
-+ desc, value = values[0], values[1]
-+ frame = mutagen.id3.TXXX(encoding=3, text=value,
desc=desc)
-+ id3.add(frame)
- elif issubclass(mutagen.id3.Frames[frame], mutagen.id3.UrlFrame):
- frame = mutagen.id3.Frames[frame](encoding=3, url=vlist)
-+ id3.add(frame)
- else:
- frame = mutagen.id3.Frames[frame](encoding=3, text=vlist)
-- id3.add(frame)
-+ id3.add(frame)
- id3.save(filename)
-
- def list_tags(filenames):
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/py-mutagen/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 31 May 2011 09:49:52 -0000 1.2
+++ pkg/PLIST 16 Sep 2013 07:41:48 -0000
@@ -10,6 +10,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mutagen/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/mutagen/_constants.py
lib/python${MODPY_VERSION}/site-packages/mutagen/_constants.pyc
+lib/python${MODPY_VERSION}/site-packages/mutagen/_id3frames.py
+lib/python${MODPY_VERSION}/site-packages/mutagen/_id3frames.pyc
+lib/python${MODPY_VERSION}/site-packages/mutagen/_id3specs.py
+lib/python${MODPY_VERSION}/site-packages/mutagen/_id3specs.pyc
+lib/python${MODPY_VERSION}/site-packages/mutagen/_id3util.py
+lib/python${MODPY_VERSION}/site-packages/mutagen/_id3util.pyc
lib/python${MODPY_VERSION}/site-packages/mutagen/_util.py
lib/python${MODPY_VERSION}/site-packages/mutagen/_util.pyc
lib/python${MODPY_VERSION}/site-packages/mutagen/_vorbis.py
@@ -40,6 +46,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mutagen/ogg.pyc
lib/python${MODPY_VERSION}/site-packages/mutagen/oggflac.py
lib/python${MODPY_VERSION}/site-packages/mutagen/oggflac.pyc
+lib/python${MODPY_VERSION}/site-packages/mutagen/oggopus.py
+lib/python${MODPY_VERSION}/site-packages/mutagen/oggopus.pyc
lib/python${MODPY_VERSION}/site-packages/mutagen/oggspeex.py
lib/python${MODPY_VERSION}/site-packages/mutagen/oggspeex.pyc
lib/python${MODPY_VERSION}/site-packages/mutagen/oggtheora.py
