mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix the build on MacOSX. since the one shipped by Apple is from the middle ages and is packed with issues.

Browse source 
Original commit message from CVS:
* configure.ac:
* ext/ffmpeg/Makefile.am:
* ext/libpostproc/Makefile.am:
Fix the build on MacOSX.
This requires a recent enough version of libtool (ex : 1.5.22), since
the one shipped by Apple is from the middle ages and is packed with
issues.
Fixes #435742
This commit is contained in:
Edward Hervey 2007-05-17 15:46:17 +00:00
parent cc9a75adcb
commit bdadc136b2
5 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2007-05-17 Edward Hervey <edward@fluendo.com>
* configure.ac:
* ext/ffmpeg/Makefile.am:
* ext/libpostproc/Makefile.am:
Fix the build on MacOSX.
This requires a recent enough version of libtool (ex : 1.5.22), since
the one shipped by Apple is from the middle ages and is packed with
issues.
Fixes #435742
2007-05-09 Edward Hervey <edward@fluendo.com> 2007-05-09 Edward Hervey <edward@fluendo.com>
* ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_av_find_stream_info): * ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_av_find_stream_info):

2
common

@ -1 +1 @@
Subproject commit 61edc2dc7b8eba179d85a6545e46e0d65239e94d Subproject commit b5971d76ccd216c27e095c02c3a369a9d05cb36d

12
configure.ac
View file

@ -171,6 +171,18 @@ dnl check for "check", unit testing library/header
AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no) AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
dnl Add MacOSX specific flags
AC_CANONICAL_HOST
case $host_os in
darwin*)
DARWIN_LDFLAGS="-Wl,-read_only_relocs,suppress"
;;
*)
DARWIN_LDFLAGS=""
;;
esac
AC_SUBST(DARWIN_LDFLAGS)
dnl *** configure external libs *** dnl *** configure external libs ***
HAVE_FFMPEG_UNINSTALLED=1 HAVE_FFMPEG_UNINSTALLED=1

2
ext/ffmpeg/Makefile.am
View file

@ -14,7 +14,7 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
$(FFMPEG_CFLAGS) $(FFMPEG_CFLAGS)
libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS)
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
if HAVE_FFMPEG_UNINSTALLED if HAVE_FFMPEG_UNINSTALLED
libgstffmpeg_la_DEPENDENCIES = $(FFMPEG_LIBS) libgstffmpeg_la_DEPENDENCIES = $(FFMPEG_LIBS)

2
ext/libpostproc/Makefile.am
View file

@ -8,4 +8,4 @@ libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \
$(POSTPROC_LIBS) \ $(POSTPROC_LIBS) \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)