Date: Sun, 16 Jul 2023 12:42:10 GMT From: Nicola Vitale <nivit@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b856ee2ca2c1 - main - audio/py-tagpy: Update to 2022.1 Message-ID: <202307161242.36GCgAot095516@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=b856ee2ca2c10315bb383f94ee374995400aea50 commit b856ee2ca2c10315bb383f94ee374995400aea50 Author: Nicola Vitale <nivit@FreeBSD.org> AuthorDate: 2023-07-16 12:40:51 +0000 Commit: Nicola Vitale <nivit@FreeBSD.org> CommitDate: 2023-07-16 12:40:51 +0000 audio/py-tagpy: Update to 2022.1 At the same time fix build on -CURRENT. --- audio/py-tagpy/Makefile | 24 ++++----- audio/py-tagpy/distinfo | 5 +- audio/py-tagpy/files/patch-aksetup__helper.py | 11 ----- audio/py-tagpy/files/patch-src_wrapper_id3.cpp | 58 ++++++++++++++++++++++ audio/py-tagpy/files/patch-src_wrapper_rest.cpp | 66 +++++++++++++++++++++++++ 5 files changed, 140 insertions(+), 24 deletions(-) diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile index 49a576a4966a..fb280b76a5c7 100644 --- a/audio/py-tagpy/Makefile +++ b/audio/py-tagpy/Makefile @@ -1,6 +1,6 @@ PORTNAME= tagpy -PORTVERSION= 2013.1 -PORTREVISION= 22 +PORTVERSION= 2022.1 +PORTREVISION= 0 CATEGORIES= audio python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,14 +15,16 @@ LIB_DEPENDS= ${PY_BOOST} \ libtag.so:audio/taglib USES= compiler:c++11-lang python shebangfix -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= configure.py -CONFIGURE_ARGS= --taglib-inc-dir="${LOCALBASE}/include/taglib" \ - --taglib-lib-dir="${LOCALBASE}/lib" \ - --boost-inc-dir="${PYTHON_INCLUDEDIR},${LOCALBASE}/include" \ - --boost-lib-dir="${PYTHON_LIBDIR},${LOCALBASE}/lib" \ - --boost-python-libname="${PY_BOOST_LIB}" -SHEBANG_FILES= configure.py -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils + +PYDISTUTILS_BUILD_TARGET= build_ext +PYDISTUTILS_BUILDARGS= --include-dirs="${LOCALBASE}/include/taglib" \ + --include-dirs="${LOCALBASE}/include" \ + --library-dirs="${LOCALBASE}/lib" + +CPPFLAGS+= -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_tagpy.cpython-${PYTHON_SUFFIX}.so .include <bsd.port.mk> diff --git a/audio/py-tagpy/distinfo b/audio/py-tagpy/distinfo index d3b4043284f1..29877b76331a 100644 --- a/audio/py-tagpy/distinfo +++ b/audio/py-tagpy/distinfo @@ -1,2 +1,3 @@ -SHA256 (tagpy-2013.1.tar.gz) = 80481c78ce34878e7a1f3231acd781a3bf1b0b569c70ce0e8d63af58061152f4 -SIZE (tagpy-2013.1.tar.gz) = 151463 +TIMESTAMP = 1689488833 +SHA256 (tagpy-2022.1.tar.gz) = 8939bf0ccd7c4e776feccb1d5e7b72f31e11a0c8c5f9e37154bad6a9fa444bff +SIZE (tagpy-2022.1.tar.gz) = 140786 diff --git a/audio/py-tagpy/files/patch-aksetup__helper.py b/audio/py-tagpy/files/patch-aksetup__helper.py deleted file mode 100644 index 9dfc31b75e5e..000000000000 --- a/audio/py-tagpy/files/patch-aksetup__helper.py +++ /dev/null @@ -1,11 +0,0 @@ ---- aksetup_helper.py.orig 2012-12-16 01:56:27 UTC -+++ aksetup_helper.py -@@ -1,6 +1,6 @@ - # dealings with ez_setup ------------------------------------------------------ --import distribute_setup --distribute_setup.use_setuptools() -+#import distribute_setup -+#distribute_setup.use_setuptools() - - import setuptools - from setuptools import Extension diff --git a/audio/py-tagpy/files/patch-src_wrapper_id3.cpp b/audio/py-tagpy/files/patch-src_wrapper_id3.cpp new file mode 100644 index 000000000000..166362a2bbf6 --- /dev/null +++ b/audio/py-tagpy/files/patch-src_wrapper_id3.cpp @@ -0,0 +1,58 @@ +--- src/wrapper/id3.cpp.orig 2022-12-27 17:50:55 UTC ++++ src/wrapper/id3.cpp +@@ -265,7 +265,7 @@ void exposeID3() + { + typedef ID3v2::AttachedPictureFrame cl; + class_<cl, bases<ID3v2::Frame>, boost::noncopyable> +- ("id3v2_AttachedPictureFrame", init<optional<const ByteVector &> >()) ++ ("id3v2_AttachedPictureFrame", init<boost::python::optional<const ByteVector &> >()) + .DEF_SIMPLE_METHOD(textEncoding) + .DEF_SIMPLE_METHOD(setTextEncoding) + .DEF_SIMPLE_METHOD(mimeType) +@@ -282,7 +282,7 @@ void exposeID3() + { + typedef ID3v2::CommentsFrame cl; + class_<cl, bases<ID3v2::Frame>, boost::noncopyable> +- ("id3v2_CommentsFrame", init<optional<const ByteVector &> >()) ++ ("id3v2_CommentsFrame", init<boost::python::optional<const ByteVector &> >()) + .def(init<String::Type>()) + .DEF_SIMPLE_METHOD(language) + .DEF_SIMPLE_METHOD(setLanguage) +@@ -336,7 +336,7 @@ void exposeID3() + { + typedef ID3v2::TextIdentificationFrame cl; + class_<cl, bases<ID3v2::Frame>, boost::noncopyable> +- ("id3v2_TextIdentificationFrame", init<const ByteVector &, optional<String::Type> >()) ++ ("id3v2_TextIdentificationFrame", init<const ByteVector &, boost::python::optional<String::Type> >()) + .def("setText", (void (cl::*)(const String &)) &cl::setText) + .def("setText", (void (cl::*)(const StringList &)) &cl::setText) + .DEF_SIMPLE_METHOD(textEncoding) +@@ -348,7 +348,7 @@ void exposeID3() + { + typedef ID3v2::UnsynchronizedLyricsFrame cl; + class_<cl, bases<ID3v2::Frame>, boost::noncopyable> +- ("id3v2_UnsynchronizedLyricsFrame", init<optional<const ByteVector &> >()) ++ ("id3v2_UnsynchronizedLyricsFrame", init<boost::python::optional<const ByteVector &> >()) + .def(init<String::Type>()) + .DEF_SIMPLE_METHOD(language) + .DEF_SIMPLE_METHOD(setLanguage) +@@ -363,7 +363,7 @@ void exposeID3() + typedef ID3v2::UserTextIdentificationFrame cl; + class_<cl, bases<ID3v2::TextIdentificationFrame>, boost::noncopyable> + ("id3v2_UserTextIdentificationFrame", init<const ByteVector &>()) +- .def(init<optional<String::Type> >()) ++ .def(init<boost::python::optional<String::Type> >()) + .DEF_SIMPLE_METHOD(description) + .DEF_SIMPLE_METHOD(setDescription) + .DEF_SIMPLE_METHOD(fieldList) +@@ -420,8 +420,8 @@ void exposeID3() + typedef MPEG::File cl; + class_<MPEG::File, bases<File>, boost::noncopyable> + ("mpeg_File", +- init<const char *, optional<bool, AudioProperties::ReadStyle> >()) +- .def(init<const char *, ID3v2::FrameFactory *, optional<bool, AudioProperties::ReadStyle> >()) ++ init<const char *, boost::python::optional<bool, AudioProperties::ReadStyle> >()) ++ .def(init<const char *, ID3v2::FrameFactory *, boost::python::optional<bool, AudioProperties::ReadStyle> >()) + .def("save", + #if (TAGPY_TAGLIB_HEX_VERSION >= 0x10800) + (bool (MPEG::File::*)(int, bool, int)) diff --git a/audio/py-tagpy/files/patch-src_wrapper_rest.cpp b/audio/py-tagpy/files/patch-src_wrapper_rest.cpp new file mode 100644 index 000000000000..f4a36d335f95 --- /dev/null +++ b/audio/py-tagpy/files/patch-src_wrapper_rest.cpp @@ -0,0 +1,66 @@ +--- src/wrapper/rest.cpp.orig 2022-12-23 20:39:57 UTC ++++ src/wrapper/rest.cpp +@@ -84,7 +84,7 @@ void exposeRest() + { + typedef Ogg::XiphComment cl; + class_<cl, bases<Tag>, boost::noncopyable> +- ("ogg_XiphComment", init<optional<const ByteVector &> >()) ++ ("ogg_XiphComment", init<boost::python::optional<const ByteVector &> >()) + .DEF_SIMPLE_METHOD(fieldCount) + .def("fieldListMap", &cl::fieldListMap, + return_internal_reference<>()) +@@ -109,14 +109,14 @@ void exposeRest() + { + typedef Ogg::FLAC::File cl; + class_<cl, bases<Ogg::File>, boost::noncopyable> +- ("ogg_flac_File", init<const char *, optional<bool, AudioProperties::ReadStyle> >()) ++ ("ogg_flac_File", init<const char *, boost::python::optional<bool, AudioProperties::ReadStyle> >()) + ; + } + + { + typedef Ogg::Vorbis::File cl; + class_<cl, bases<Ogg::File>, boost::noncopyable> +- ("ogg_vorbis_File", init<const char *, optional<bool, AudioProperties::ReadStyle> >()) ++ ("ogg_vorbis_File", init<const char *, boost::python::optional<bool, AudioProperties::ReadStyle> >()) + ; + } + +@@ -126,7 +126,7 @@ void exposeRest() + { + typedef APE::Footer cl; + class_<cl, boost::noncopyable>( +- "ape_Footer", init<optional<const ByteVector &> >()) ++ "ape_Footer", init<boost::python::optional<const ByteVector &> >()) + .DEF_SIMPLE_METHOD(version) + .DEF_SIMPLE_METHOD(headerPresent) + .DEF_SIMPLE_METHOD(footerPresent) +@@ -193,8 +193,8 @@ void exposeRest() + { + typedef FLAC::File cl; + class_<cl, boost::noncopyable, bases<File> >("flac_File", +- init<const char *, optional<bool, AudioProperties::ReadStyle> >()) +- .def(init<const char *, ID3v2::FrameFactory *, optional<bool, AudioProperties::ReadStyle> >()) ++ init<const char *, boost::python::optional<bool, AudioProperties::ReadStyle> >()) ++ .def(init<const char *, ID3v2::FrameFactory *, boost::python::optional<bool, AudioProperties::ReadStyle> >()) + .def("ID3v1Tag", + (ID3v1::Tag *(FLAC::File::*)(bool)) + &FLAC::File::ID3v1Tag, +@@ -227,7 +227,7 @@ void exposeRest() + { + typedef MPC::File cl; + class_<MPC::File, bases<File>, boost::noncopyable> +- ("mpc_File", init<const char *, optional<bool, AudioProperties::ReadStyle> >()) ++ ("mpc_File", init<const char *, boost::python::optional<bool, AudioProperties::ReadStyle> >()) + .def("ID3v1Tag", + (ID3v1::Tag *(cl::*)(bool)) + &cl::ID3v1Tag, +@@ -255,7 +255,7 @@ void exposeRest() + { + typedef TagLib::RIFF::WAV::File cl; + class_<cl, bases<File>, boost::noncopyable> +- ("wav_File", init<const char *, optional<bool, AudioProperties::ReadStyle> >()) ++ ("wav_File", init<const char *, boost::python::optional<bool, AudioProperties::ReadStyle> >()) + .def("ID3v2Tag", + (ID3v2::Tag *(TagLib::RIFF::WAV::File::*)()) + &cl::ID3v2Tag,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307161242.36GCgAot095516>