From f37c3c03d49ccfb576672a1f2ac18de6d79509f5 Mon Sep 17 00:00:00 2001 From: Eric Sandall Date: Mon, 8 Jul 2019 18:59:23 +0000 Subject: libid3tag: Fix compilation against GCC 9. Remove redundant PATCHLEVEL Apply libid3tag-0.15.1b-gperf.patch an generate new C files. --- audio-libs/libid3tag/DETAILS | 1 - audio-libs/libid3tag/HISTORY | 5 ++++ audio-libs/libid3tag/PRE_BUILD | 5 ++++ .../patches/libid3tag-0.15.1b-gperf.patch | 27 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 audio-libs/libid3tag/patches/libid3tag-0.15.1b-gperf.patch (limited to 'audio-libs') diff --git a/audio-libs/libid3tag/DETAILS b/audio-libs/libid3tag/DETAILS index 8d0aa457b0..39e380e321 100755 --- a/audio-libs/libid3tag/DETAILS +++ b/audio-libs/libid3tag/DETAILS @@ -10,7 +10,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_GPG=4BF38A33.gpg:$SOURCE2:UPSTREAM_KEY SOURCE2_IGNORE=signature ENTERED=20031122 - PATCHLEVEL=1 LICENSE[0]=GPL KEYWORDS="audio libs" SHORT="ID3 tag manipulation library" diff --git a/audio-libs/libid3tag/HISTORY b/audio-libs/libid3tag/HISTORY index 0c77409bea..edf7eb992d 100644 --- a/audio-libs/libid3tag/HISTORY +++ b/audio-libs/libid3tag/HISTORY @@ -1,3 +1,8 @@ +2019-07-08 Eric Sandall + * DETAILS: Remove redundant PATCHLEVEL + * patches/libid3tag-0.15.1b-gperf.patch: Fix compilation against GCC 9. + * PRE_BUILD: Apply libid3tag-0.15.1b-gperf.patch an generate new C files. + 2019-05-23 Ismael Luceno * PRE_BUILD: Fixed build against musl diff --git a/audio-libs/libid3tag/PRE_BUILD b/audio-libs/libid3tag/PRE_BUILD index e4b138170f..7841917726 100755 --- a/audio-libs/libid3tag/PRE_BUILD +++ b/audio-libs/libid3tag/PRE_BUILD @@ -1,5 +1,6 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && +# Apply patches patch -p0 < $SPELL_DIRECTORY/patches/libid3tag-0.15.1b-64bit-long.patch && patch -p2 < $SPELL_DIRECTORY/patches/libid3tag-0.15.1b-a_capella.patch && patch -p1 < $SPELL_DIRECTORY/patches/libid3tag-0.15.1b-compat.patch && @@ -8,4 +9,8 @@ patch -p0 < $SPELL_DIRECTORY/patches/libid3tag-0.15.1b-fix_overflow.patch && patch -p0 < $SPELL_DIRECTORY/patches/libid3tag-0.15.1b-tag.patch && patch -p1 < $SPELL_DIRECTORY/patches/libid3tag-0.15.1b-unknown-encoding.patch && patch -p1 < $SPELL_DIRECTORY/patches/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch && +patch -p1 < $SPELL_DIRECTORY/patches/libid3tag-0.15.1b-gperf.patch && +# Regenerate these files from source after gperf.patch above +rm compat.c frametype.c && +# Fix compiling against musl sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub diff --git a/audio-libs/libid3tag/patches/libid3tag-0.15.1b-gperf.patch b/audio-libs/libid3tag/patches/libid3tag-0.15.1b-gperf.patch new file mode 100644 index 0000000000..acc0e2b840 --- /dev/null +++ b/audio-libs/libid3tag/patches/libid3tag-0.15.1b-gperf.patch @@ -0,0 +1,27 @@ +# From https://git.archlinux.org/svntogit/packages.git/tree/trunk/libid3tag-gperf.patch?h=packages/libid3tag +Index: libid3tag-0.15.1b/frametype.h +=================================================================== +--- libid3tag-0.15.1b.orig/frametype.h ++++ libid3tag-0.15.1b/frametype.h +@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_fr + extern struct id3_frametype const id3_frametype_obsolete; + + struct id3_frametype const *id3_frametype_lookup(register char const *, +- register unsigned int); ++ register size_t); + + # endif +Index: libid3tag-0.15.1b/compat.h +=================================================================== +--- libid3tag-0.15.1b.orig/compat.h ++++ libid3tag-0.15.1b/compat.h +@@ -34,7 +34,7 @@ struct id3_compat { + }; + + struct id3_compat const *id3_compat_lookup(register char const *, +- register unsigned int); ++ register size_t); + + int id3_compat_fixup(struct id3_tag *); + + -- cgit v1.2.3