From f47f22d6282d377b7da96c6fd8ac688507b34942 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 30 Sep 2003 21:48:37 +0000 Subject: Apply the ffmpeg configure patch conditionally. This patch breaks the build on i386. Reported by: Jeremy Messenger Approved by: lioux (implicit) --- multimedia/gstreamer-plugins/Makefile | 6 ++++++ .../gstreamer-plugins/files/ia64-patch-ffmpeg::configure | 10 ++++++++++ multimedia/gstreamer-plugins/files/patch-ffmpeg::configure | 10 ---------- multimedia/gstreamer-plugins80/Makefile | 6 ++++++ .../gstreamer-plugins80/files/ia64-patch-ffmpeg::configure | 10 ++++++++++ multimedia/gstreamer-plugins80/files/patch-ffmpeg::configure | 10 ---------- 6 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure delete mode 100644 multimedia/gstreamer-plugins/files/patch-ffmpeg::configure create mode 100644 multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure delete mode 100644 multimedia/gstreamer-plugins80/files/patch-ffmpeg::configure (limited to 'multimedia') diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 39f577faf79f..ef5d1b1faa1d 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -105,6 +105,12 @@ post-install: .include +# Fix build on ia64. This patch breaks other archs, so include it +# conditionally +.if ${ARCH} == "ia64" +EXTRA_PATCHES= ${FILESDIR}/ia64-patch-ffmpeg::configure +.endif + # hermes is required for gstreamer-player to work # since it is currently the only colorspace plugin available WITH_HERMES= yes diff --git a/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure new file mode 100644 index 000000000000..f4c1cb8ae5f6 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure @@ -0,0 +1,10 @@ +--- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 ++++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 +@@ -119,6 +119,7 @@ + v4l="no" + audio_oss="yes" + make="gmake" ++CFLAGS="$CFLAGS -fPIC -DPIC" + LDFLAGS="$LDFLAGS -export-dynamic" + ;; + BSD/OS) diff --git a/multimedia/gstreamer-plugins/files/patch-ffmpeg::configure b/multimedia/gstreamer-plugins/files/patch-ffmpeg::configure deleted file mode 100644 index f4c1cb8ae5f6..000000000000 --- a/multimedia/gstreamer-plugins/files/patch-ffmpeg::configure +++ /dev/null @@ -1,10 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 -@@ -119,6 +119,7 @@ - v4l="no" - audio_oss="yes" - make="gmake" -+CFLAGS="$CFLAGS -fPIC -DPIC" - LDFLAGS="$LDFLAGS -export-dynamic" - ;; - BSD/OS) diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index 39f577faf79f..ef5d1b1faa1d 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -105,6 +105,12 @@ post-install: .include +# Fix build on ia64. This patch breaks other archs, so include it +# conditionally +.if ${ARCH} == "ia64" +EXTRA_PATCHES= ${FILESDIR}/ia64-patch-ffmpeg::configure +.endif + # hermes is required for gstreamer-player to work # since it is currently the only colorspace plugin available WITH_HERMES= yes diff --git a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure new file mode 100644 index 000000000000..f4c1cb8ae5f6 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure @@ -0,0 +1,10 @@ +--- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 ++++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 +@@ -119,6 +119,7 @@ + v4l="no" + audio_oss="yes" + make="gmake" ++CFLAGS="$CFLAGS -fPIC -DPIC" + LDFLAGS="$LDFLAGS -export-dynamic" + ;; + BSD/OS) diff --git a/multimedia/gstreamer-plugins80/files/patch-ffmpeg::configure b/multimedia/gstreamer-plugins80/files/patch-ffmpeg::configure deleted file mode 100644 index f4c1cb8ae5f6..000000000000 --- a/multimedia/gstreamer-plugins80/files/patch-ffmpeg::configure +++ /dev/null @@ -1,10 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 -@@ -119,6 +119,7 @@ - v4l="no" - audio_oss="yes" - make="gmake" -+CFLAGS="$CFLAGS -fPIC -DPIC" - LDFLAGS="$LDFLAGS -export-dynamic" - ;; - BSD/OS) -- cgit