diff options
author | kwm <kwm@FreeBSD.org> | 2005-03-10 03:25:40 +0800 |
---|---|---|
committer | kwm <kwm@FreeBSD.org> | 2005-03-10 03:25:40 +0800 |
commit | 70415d9244c55b609847b7b3acd187ad388350ae (patch) | |
tree | 8778303b5283e03027363a8bae0460d764ad171d /multimedia | |
parent | eafa6e77ceda95acdb297db54426b8058fa95f45 (diff) | |
download | freebsd-ports-gnome-70415d9244c55b609847b7b3acd187ad388350ae.tar.gz freebsd-ports-gnome-70415d9244c55b609847b7b3acd187ad388350ae.tar.zst freebsd-ports-gnome-70415d9244c55b609847b7b3acd187ad388350ae.zip |
Fix symbol conflict between the ffmpegcolorspace elements in gst-plugin and
gst-ffmpeg.
Submitted by: marcus
Diffstat (limited to 'multimedia')
8 files changed, 48 insertions, 2 deletions
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index 534b4a76bac0..fd8f8bd4f711 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ PKGNAMESUFFIX= -ffmpeg diff --git a/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_Makefile.in b/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_Makefile.in new file mode 100644 index 000000000000..ec9dfaf853a2 --- /dev/null +++ b/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_Makefile.in @@ -0,0 +1,11 @@ +--- ext/ffmpeg/Makefile.in.orig Wed Mar 9 19:50:50 2005 ++++ ext/ffmpeg/Makefile.in Wed Mar 9 19:51:23 2005 +@@ -164,7 +164,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -Wl,-Bsymbolic -lc + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile index 534b4a76bac0..fd8f8bd4f711 100644 --- a/multimedia/gstreamer-ffmpeg80/Makefile +++ b/multimedia/gstreamer-ffmpeg80/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ PKGNAMESUFFIX= -ffmpeg diff --git a/multimedia/gstreamer-ffmpeg80/files/patch-ext_ffmpeg_Makefile.in b/multimedia/gstreamer-ffmpeg80/files/patch-ext_ffmpeg_Makefile.in new file mode 100644 index 000000000000..ec9dfaf853a2 --- /dev/null +++ b/multimedia/gstreamer-ffmpeg80/files/patch-ext_ffmpeg_Makefile.in @@ -0,0 +1,11 @@ +--- ext/ffmpeg/Makefile.in.orig Wed Mar 9 19:50:50 2005 ++++ ext/ffmpeg/Makefile.in Wed Mar 9 19:51:23 2005 +@@ -164,7 +164,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -Wl,-Bsymbolic -lc + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 2c25ad69cacf..c1161a62d0b5 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -7,7 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.8.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME} \ http://gstreamer.freedesktop.org/src/gst-plugins/ diff --git a/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in b/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in new file mode 100644 index 000000000000..fb2afdfb0ef3 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in @@ -0,0 +1,11 @@ +--- gst/ffmpegcolorspace/Makefile.in.orig Wed Mar 9 01:40:27 2005 ++++ gst/ffmpegcolorspace/Makefile.in Wed Mar 9 01:41:10 2005 +@@ -360,7 +360,7 @@ + LAME_LIBS = @LAME_LIBS@ + LCS_CFLAGS = @LCS_CFLAGS@ + LCS_LIBS = @LCS_LIBS@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -Wl,-Bsymbolic -lc + LIBCACA_CFLAGS = @LIBCACA_CFLAGS@ + LIBCACA_CONFIG = @LIBCACA_CONFIG@ + LIBCACA_LIBS = @LIBCACA_LIBS@ diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index 2c25ad69cacf..c1161a62d0b5 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -7,7 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.8.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME} \ http://gstreamer.freedesktop.org/src/gst-plugins/ diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_ffmpegcolorspace_Makefile.in b/multimedia/gstreamer-plugins80/files/patch-gst_ffmpegcolorspace_Makefile.in new file mode 100644 index 000000000000..fb2afdfb0ef3 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-gst_ffmpegcolorspace_Makefile.in @@ -0,0 +1,11 @@ +--- gst/ffmpegcolorspace/Makefile.in.orig Wed Mar 9 01:40:27 2005 ++++ gst/ffmpegcolorspace/Makefile.in Wed Mar 9 01:41:10 2005 +@@ -360,7 +360,7 @@ + LAME_LIBS = @LAME_LIBS@ + LCS_CFLAGS = @LCS_CFLAGS@ + LCS_LIBS = @LCS_LIBS@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -Wl,-Bsymbolic -lc + LIBCACA_CFLAGS = @LIBCACA_CFLAGS@ + LIBCACA_CONFIG = @LIBCACA_CONFIG@ + LIBCACA_LIBS = @LIBCACA_LIBS@ |