Skip to content

Commit

Permalink
audio/py-tagpy: Update to 2022.1
Browse files Browse the repository at this point in the history 
At the same time fix build on -CURRENT.
  • Loading branch information
@nivit
nivit committed Jul 16, 2023
1 parent 93e03d4 commit b856ee2
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 24 deletions.
24 changes: 13 additions & 11 deletions audio/py-tagpy/Makefile
View file
@@ -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}
Expand All @@ -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>
5 changes: 3 additions & 2 deletions audio/py-tagpy/distinfo
View file
@@ -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
11 changes: 0 additions & 11 deletions audio/py-tagpy/files/patch-aksetup__helper.py
View file

This file was deleted.

58 changes: 58 additions & 0 deletions audio/py-tagpy/files/patch-src_wrapper_id3.cpp
View file
@@ -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))
66 changes: 66 additions & 0 deletions audio/py-tagpy/files/patch-src_wrapper_rest.cpp
View file
@@ -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,

0 comments on commit b856ee2

Please sign in to comment.