From 5df64586b3c8fd6f357af9c89351c5b5bf3f366e Mon Sep 17 00:00:00 2001 From: lioux Date: Sun, 14 Nov 2004 01:16:22 +0000 Subject: Fix build on FreeBSD 4.x branch: use a patch only on 5.x branch Reviewed by: ahze, Geoffrey Mainland , --- multimedia/mpeg4ip/Makefile | 1 + .../files/extra-patch-player::src::codec::mp3::mp3_file.cpp | 10 ++++++++++ .../mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp | 10 ---------- 3 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp delete mode 100644 multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index b1fdbd6f4f84..03b545d223ae 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -92,6 +92,7 @@ MAN3= MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \ # Build fix .if ${OSVERSION} >= 502100 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib::sdp::sdp_decode.c +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-player::src::codec::mp3::mp3_file.cpp .else USE_GCC= 3.4 .endif diff --git a/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp b/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp new file mode 100644 index 000000000000..5a1bed279202 --- /dev/null +++ b/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp @@ -0,0 +1,10 @@ +--- player/src/codec/mp3/mp3_file.cpp.orig Wed Sep 29 00:24:31 2004 ++++ player/src/codec/mp3/mp3_file.cpp Wed Sep 29 00:28:47 2004 +@@ -126,6 +126,7 @@ + descptr[1] = strdup(desc); + CHECK_AND_FREE(ret); + } ++ ret = ID3_v1_genre_description[NULL]; + ret = ID3_GetAlbum(&myTag); + if (ret) { + diff --git a/multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp b/multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp deleted file mode 100644 index 5a1bed279202..000000000000 --- a/multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- player/src/codec/mp3/mp3_file.cpp.orig Wed Sep 29 00:24:31 2004 -+++ player/src/codec/mp3/mp3_file.cpp Wed Sep 29 00:28:47 2004 -@@ -126,6 +126,7 @@ - descptr[1] = strdup(desc); - CHECK_AND_FREE(ret); - } -+ ret = ID3_v1_genre_description[NULL]; - ret = ID3_GetAlbum(&myTag); - if (ret) { - -- cgit