Fix symbol conflict between the ffmpegcolorspace elements in gst-plugin and

gst-ffmpeg.

Submitted by:	marcus
This commit is contained in:
Koop Mast 2005-03-09 19:25:40 +00:00
parent 0b2730b93e
commit 065eb0daa5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=130749
8 changed files with 48 additions and 2 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= gstreamer PORTNAME= gstreamer
PORTVERSION= 0.8.3 PORTVERSION= 0.8.3
PORTREVISION= 1
CATEGORIES= multimedia CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX= -ffmpeg PKGNAMESUFFIX= -ffmpeg

View file

@ -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@

View file

@ -7,6 +7,7 @@
PORTNAME= gstreamer PORTNAME= gstreamer
PORTVERSION= 0.8.3 PORTVERSION= 0.8.3
PORTREVISION= 1
CATEGORIES= multimedia CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX= -ffmpeg PKGNAMESUFFIX= -ffmpeg

View file

@ -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@

View file

@ -7,7 +7,7 @@
PORTNAME= gstreamer PORTNAME= gstreamer
PORTVERSION= 0.8.8 PORTVERSION= 0.8.8
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES?= multimedia audio CATEGORIES?= multimedia audio
MASTER_SITES= ${MASTER_SITE_GNOME} \ MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gst-plugins/ http://gstreamer.freedesktop.org/src/gst-plugins/

View file

@ -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@

View file

@ -7,7 +7,7 @@
PORTNAME= gstreamer PORTNAME= gstreamer
PORTVERSION= 0.8.8 PORTVERSION= 0.8.8
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES?= multimedia audio CATEGORIES?= multimedia audio
MASTER_SITES= ${MASTER_SITE_GNOME} \ MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gst-plugins/ http://gstreamer.freedesktop.org/src/gst-plugins/

View file

@ -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@