maintenance update to tagpy-2013.1

This commit is contained in:
dcoppa 2013-01-25 13:56:20 +00:00
parent e594dcbe6f
commit 2a5fd0ba0f
4 changed files with 24 additions and 52 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2012/10/04 09:17:31 dcoppa Exp $ # $OpenBSD: Makefile,v 1.12 2013/01/25 13:56:20 dcoppa Exp $
COMMENT= Python bindings to TagLib audio file tag library 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} DISTNAME = tagpy-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME} PKGNAME = py-${DISTNAME}
REVISION = 1
CATEGORIES = audio devel CATEGORIES = audio devel
@ -27,7 +26,7 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes MODPY_SETUPTOOLS = Yes
LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
audio/taglib>=1.8 \ audio/taglib>=1.8p4 \
devel/boost devel/boost
CONFIGURE_ARGS += --boost-python-libname=boost_python-mt \ CONFIGURE_ARGS += --boost-python-libname=boost_python-mt \

View File

@ -1,5 +1,2 @@
MD5 (tagpy-0.94.8.tar.gz) = a6/2MxjPkLm8WiSXoFl4Ag== SHA256 (tagpy-2013.1.tar.gz) = gEgceM40h456HzIxrNeBo78bC1accM4OjWOvWAYRUvQ=
RMD160 (tagpy-0.94.8.tar.gz) = lAJppKVKImY5AqPGdYgPnvctrr4= SIZE (tagpy-2013.1.tar.gz) = 151463
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

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-aksetup_helper_py,v 1.2 2012/10/04 09:17:31 dcoppa Exp $ $OpenBSD: patch-aksetup_helper_py,v 1.3 2013/01/25 13:56:20 dcoppa Exp $
--- aksetup_helper.py.orig Tue Jul 20 04:38:24 2010 --- aksetup_helper.py.orig Wed Jan 23 15:38:05 2013
+++ aksetup_helper.py Tue Oct 2 22:15:41 2012 +++ aksetup_helper.py Wed Jan 23 15:39:48 2013
@@ -1,11 +1,11 @@ @@ -1,6 +1,6 @@
# dealings with ez_setup ------------------------------------------------------ # dealings with ez_setup ------------------------------------------------------
-import distribute_setup -import distribute_setup
-distribute_setup.use_setuptools() -distribute_setup.use_setuptools()
@ -10,17 +10,20 @@ $OpenBSD: patch-aksetup_helper_py,v 1.2 2012/10/04 09:17:31 dcoppa Exp $
import setuptools import setuptools
from setuptools import Extension 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['OPT'] = str.join(' ', cflags)
cvars["CFLAGS"] = cvars["BASECFLAGS"] + " " + cvars["OPT"]

View File

@ -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)
;
}