aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2004-11-14 09:16:22 +0800
committerlioux <lioux@FreeBSD.org>2004-11-14 09:16:22 +0800
commit5df64586b3c8fd6f357af9c89351c5b5bf3f366e (patch)
treec04b66c71c2a627c3294224552eb76b7d47b1ba0
parent030c470f6507cc3bb41d6018e76379786248d3d3 (diff)
downloadfreebsd-ports-gnome-5df64586b3c8fd6f357af9c89351c5b5bf3f366e.tar.gz
freebsd-ports-gnome-5df64586b3c8fd6f357af9c89351c5b5bf3f366e.tar.zst
freebsd-ports-gnome-5df64586b3c8fd6f357af9c89351c5b5bf3f366e.zip
Fix build on FreeBSD 4.x branch: use a patch only on 5.x branch
Reviewed by: ahze, Geoffrey Mainland <mainland@apeiron.net>,
-rw-r--r--multimedia/mpeg4ip/Makefile1
-rw-r--r--multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp (renamed from multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp)0
2 files changed, 1 insertions, 0 deletions
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/patch-player::src::codec::mp3::mp3_file.cpp b/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp
index 5a1bed279202..5a1bed279202 100644
--- a/multimedia/mpeg4ip/files/patch-player::src::codec::mp3::mp3_file.cpp
+++ b/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp