Hi!
The diff below updates tagpy to the latest version.
Tested (including consumers) on amd64.
Ciao,
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/py-tagpy/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 4 Oct 2012 09:17:31 -0000 1.11
+++ Makefile 23 Jan 2013 15:32:13 -0000
@@ -2,10 +2,9 @@
COMMENT= Python bindings to TagLib audio file tag library
-MODPY_EGG_VERSION = 0.94.8
+MODPY_EGG_VERSION = 2013.1
DISTNAME = tagpy-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = audio devel
@@ -27,7 +26,7 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
- audio/taglib>=1.8 \
+ audio/taglib>=1.8p4 \
devel/boost
CONFIGURE_ARGS += --boost-python-libname=boost_python-mt \
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/py-tagpy/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 26 Jun 2011 06:34:01 -0000 1.2
+++ distinfo 23 Jan 2013 15:32:13 -0000
@@ -1,5 +1,2 @@
-MD5 (tagpy-0.94.8.tar.gz) = a6/2MxjPkLm8WiSXoFl4Ag==
-RMD160 (tagpy-0.94.8.tar.gz) = lAJppKVKImY5AqPGdYgPnvctrr4=
-SHA1 (tagpy-0.94.8.tar.gz) = BSEmpTPkj2CAewpnixXllO9X2Gc=
-SHA256 (tagpy-0.94.8.tar.gz) = Vuq43YFRD4rxjhk3Wg/9XNJcjlVRBL5GqSw9wIY0oNw=
-SIZE (tagpy-0.94.8.tar.gz) = 151986
+SHA256 (tagpy-2013.1.tar.gz) = gEgceM40h456HzIxrNeBo78bC1accM4OjWOvWAYRUvQ=
+SIZE (tagpy-2013.1.tar.gz) = 151463
Index: patches/patch-aksetup_helper_py
===================================================================
RCS file: /cvs/ports/audio/py-tagpy/patches/patch-aksetup_helper_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-aksetup_helper_py
--- patches/patch-aksetup_helper_py 4 Oct 2012 09:17:31 -0000 1.2
+++ patches/patch-aksetup_helper_py 23 Jan 2013 15:32:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-aksetup_helper_py,v 1.2 2012/10/04 09:17:31 dcoppa Exp $
---- aksetup_helper.py.orig Tue Jul 20 04:38:24 2010
-+++ aksetup_helper.py Tue Oct 2 22:15:41 2012
-@@ -1,11 +1,11 @@
+--- aksetup_helper.py.orig Wed Jan 23 15:38:05 2013
++++ aksetup_helper.py Wed Jan 23 15:39:48 2013
+@@ -1,6 +1,6 @@
# dealings with ez_setup
------------------------------------------------------
-import distribute_setup
-distribute_setup.use_setuptools()
@@ -10,17 +10,20 @@ $OpenBSD: patch-aksetup_helper_py,v 1.2
import setuptools
from setuptools import Extension
+@@ -18,7 +18,7 @@ def count_down_delay(delay):
+
+
+
+-if not hasattr(setuptools, "_distribute"):
++if False and not hasattr(setuptools, "_distribute"):
+
print("-------------------------------------------------------------------------")
+ print("Setuptools conflict detected.")
+
print("-------------------------------------------------------------------------")
+@@ -197,7 +197,6 @@ def hack_distutils(debug=False, fast_link=True, what_o
+ if what_opt is None:
+ pass
+ else:
+- cflags.append("-O%s" % what_opt)
+ cflags.append("-DNDEBUG")
--if 'distribute' not in setuptools.__file__:
-+if False and 'distribute' not in setuptools.__file__:
- print
"-------------------------------------------------------------------------"
- print "Setuptools conflict detected."
- print
"-------------------------------------------------------------------------"
-@@ -190,7 +190,6 @@ def hack_distutils(debug=False, fast_link=True):
- if debug:
- cflags.append("-g")
- else:
-- cflags.append("-O3")
- cflags.append("-DNDEBUG")
cvars['OPT'] = str.join(' ', cflags)
- cvars["CFLAGS"] = cvars["BASECFLAGS"] + " " + cvars["OPT"]
Index: patches/patch-src_wrapper_id3_cpp
===================================================================
RCS file: patches/patch-src_wrapper_id3_cpp
diff -N patches/patch-src_wrapper_id3_cpp
--- patches/patch-src_wrapper_id3_cpp 4 Oct 2012 09:17:31 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_wrapper_id3_cpp,v 1.1 2012/10/04 09:17:31 dcoppa Exp $
-
-Unbreak build with taglib>=1.8
-
---- src/wrapper/id3.cpp.orig Tue Aug 31 16:19:02 2010
-+++ src/wrapper/id3.cpp Tue Oct 2 21:59:51 2012
-@@ -198,6 +198,10 @@ void exposeID3()
- &cl::frameList;
- const ID3v2::FrameList &(cl::*fl2)() const =
- &cl::frameList;
-+ ByteVector (cl::*r1)(int) const =
-+ &cl::render;
-+ ByteVector (cl::*r2)() const =
-+ &cl::render;
-
- class_<cl, boost::noncopyable, bases<Tag> >("id3v2_Tag")
- .def("header", &ID3v2::Tag::header, return_internal_reference<>())
-@@ -212,7 +216,8 @@ void exposeID3()
- .DEF_SIMPLE_METHOD(removeFrame)
- .DEF_SIMPLE_METHOD(removeFrames)
-
-- .DEF_SIMPLE_METHOD(render)
-+ .def("render", r1)
-+ .def("render", r2)
- ;
- }
-
