From e356a9f51edf59b00cf4dfcdb2458a0dfd79838e Mon Sep 17 00:00:00 2001 From: cwen Date: Sun, 25 Jul 2021 22:53:09 +0000 Subject: [PATCH] atomicparsley: update to 20210715 Changelog: https://github.com/wez/atomicparsley/compare/0.9.6...20210715.151551.e7ad03a Also add patches to ensure the runtime is fine on unsigned char archs. OK sthen@ --- multimedia/atomicparsley/Makefile | 32 ++++++++----------- multimedia/atomicparsley/distinfo | 4 +-- .../patches/patch-src_AtomicParsley_h | 17 ++++++++++ .../atomicparsley/patches/patch-src_CDtoc_cpp | 21 ++++++------ .../patches/patch-src_parsley_cpp | 17 ++++++++++ 5 files changed, 60 insertions(+), 31 deletions(-) create mode 100644 multimedia/atomicparsley/patches/patch-src_AtomicParsley_h create mode 100644 multimedia/atomicparsley/patches/patch-src_parsley_cpp diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile index ecabe0b3854..4e79e7dcb78 100644 --- a/multimedia/atomicparsley/Makefile +++ b/multimedia/atomicparsley/Makefile @@ -1,34 +1,28 @@ -# $OpenBSD: Makefile,v 1.14 2020/02/03 20:40:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2021/07/25 22:53:09 cwen Exp $ COMMENT= read and set MPEG-4/3GPP metadata tags -V= 0.9.6 -DISTNAME= atomicparsley-$V -REVISION= 4 -DISTFILES= ${DISTNAME}{$V}.tar.bz2 -WRKDIST= ${WRKDIR}/wez-atomicparsley-da2f6e4fc120 +GH_ACCOUNT= wez +GH_PROJECT= atomicparsley +GH_TAGNAME= 20210715.151551.e7ad03a + +DISTNAME= atomicparsley-20210715 CATEGORIES= multimedia -HOMEPAGE= https://bitbucket.org/wez/atomicparsley/ - # GPLv2 "or its successor" PERMIT_PACKAGE= Yes -WANTLIB= c m ${COMPILER_LIBCXX} z +WANTLIB += ${COMPILER_LIBCXX} c m z -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES= https://bitbucket.org/wez/atomicparsley/get/ +MODULES = devel/cmake -CONFIGURE_STYLE= autoreconf -CONFIGURE_ENV= ac_cv_func_lroundf=yes \ - OBJCXX="${CXX}" -AUTOCONF_VERSION= 2.69 -AUTOMAKE_VERSION= 1.15 -AUTORECONF= ./autogen.sh +# Don't use git to retrieve the build version +CONFIGURE_ARGS += -DGIT= \ + -DPACKAGE_VERSION="${PKGNAME} (${GH_TAGNAME})" -NO_TEST= Yes -SEPARATE_BUILD= Yes +NO_TEST = Yes .include diff --git a/multimedia/atomicparsley/distinfo b/multimedia/atomicparsley/distinfo index 8584c7f8a28..8e900f3f865 100644 --- a/multimedia/atomicparsley/distinfo +++ b/multimedia/atomicparsley/distinfo @@ -1,2 +1,2 @@ -SHA256 (atomicparsley-0.9.6.tar.bz2) = 4o1GcovoYhnmzkhpXqY32DHKAXDKa9rJmBCZaoKR7lA= -SIZE (atomicparsley-0.9.6.tar.bz2) = 178956 +SHA256 (atomicparsley-20210715.tar.gz) = VG3LXztiWv9Pa/ItJ6CmNtFYVP1ylAKmkz0x89BBfg0= +SIZE (atomicparsley-20210715.tar.gz) = 230214 diff --git a/multimedia/atomicparsley/patches/patch-src_AtomicParsley_h b/multimedia/atomicparsley/patches/patch-src_AtomicParsley_h new file mode 100644 index 00000000000..f6efcbea648 --- /dev/null +++ b/multimedia/atomicparsley/patches/patch-src_AtomicParsley_h @@ -0,0 +1,17 @@ +$OpenBSD: patch-src_AtomicParsley_h,v 1.1 2021/07/25 22:53:09 cwen Exp $ + +Fix potential bug on unsigned char archs +See https://github.com/wez/atomicparsley/pull/41 + +Index: src/AtomicParsley.h +--- src/AtomicParsley.h.orig ++++ src/AtomicParsley.h +@@ -258,7 +258,7 @@ AtomicInfo *APar_UserData_atom_Init(const char *userda + + /* ID3v2 (2.4) style metadata, non-external form */ + AtomicInfo *APar_ID32_atom_Init(const char *frameID_str, +- char meta_area, ++ signed char meta_area, + const char *lang_str, + uint16_t id32_lang); + diff --git a/multimedia/atomicparsley/patches/patch-src_CDtoc_cpp b/multimedia/atomicparsley/patches/patch-src_CDtoc_cpp index 67f6175dee3..ddcd8808d5c 100644 --- a/multimedia/atomicparsley/patches/patch-src_CDtoc_cpp +++ b/multimedia/atomicparsley/patches/patch-src_CDtoc_cpp @@ -1,12 +1,13 @@ -$OpenBSD: patch-src_CDtoc_cpp,v 1.1 2016/06/11 22:11:53 sthen Exp $ ---- src/CDtoc.cpp.orig Sat Jun 11 23:06:27 2016 -+++ src/CDtoc.cpp Sat Jun 11 23:06:38 2016 -@@ -71,7 +71,7 @@ CD_TOC_* cdTOC = NULL; - uint8_t LEADOUT_TRACK_NUMBER = MACOSX_LEADOUT_TRACK; - #elif defined (HAVE_LINUX_CDROM_H) - uint8_t LEADOUT_TRACK_NUMBER = CDROM_LEADOUT; --#elif defined (_WIN32) +$OpenBSD: patch-src_CDtoc_cpp,v 1.2 2021/07/25 22:53:09 cwen Exp $ +Index: src/CDtoc.cpp +--- src/CDtoc.cpp.orig ++++ src/CDtoc.cpp +@@ -73,7 +73,7 @@ CD_TOC_ *cdTOC = NULL; + uint8_t LEADOUT_TRACK_NUMBER = MACOSX_LEADOUT_TRACK; + #elif defined(__linux__) + uint8_t LEADOUT_TRACK_NUMBER = CDROM_LEADOUT; +-#elif defined(_WIN32) +#else - uint8_t LEADOUT_TRACK_NUMBER = 0xAA; //NOTE: for WinXP IOCTL_CDROM_READ_TOC_EX code, its 0xA2 + uint8_t LEADOUT_TRACK_NUMBER = + 0xAA; // NOTE: for WinXP IOCTL_CDROM_READ_TOC_EX code, its 0xA2 #endif - diff --git a/multimedia/atomicparsley/patches/patch-src_parsley_cpp b/multimedia/atomicparsley/patches/patch-src_parsley_cpp new file mode 100644 index 00000000000..d8ff0a14e30 --- /dev/null +++ b/multimedia/atomicparsley/patches/patch-src_parsley_cpp @@ -0,0 +1,17 @@ +$OpenBSD: patch-src_parsley_cpp,v 1.1 2021/07/25 22:53:09 cwen Exp $ + +Fix potential bug on unsigned char archs +See https://github.com/wez/atomicparsley/pull/41 + +Index: src/parsley.cpp +--- src/parsley.cpp.orig ++++ src/parsley.cpp +@@ -3561,7 +3561,7 @@ AtomicInfo *APar_reverseDNS_atom_Init(const char *rDNS + } + + AtomicInfo *APar_ID32_atom_Init(const char *frameID_str, +- char meta_area, ++ signed char meta_area, + const char *lang_str, + uint16_t id32_lang) { + uint8_t total_tracks = 0;