From c75ad36399df447dbb954b5195b1daab6efe5b3b Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 1 Apr 2006 21:36:24 +0000 Subject: Fix some more problems with undefined symbols particularly in the theora and esd modules. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5994 df743ca5-7f9a-e211-a948-0013205c9059 --- multimedia/gstreamer-plugins/Makefile | 16 ++++++++++------ multimedia/gstreamer-plugins/Makefile.common | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index f28cbad67..83e16b6d3 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -3,13 +3,13 @@ # Whom: Mario Sergio Fujikawa Ferreira # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.74 2006/03/11 05:45:18 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.75 2006/03/14 19:05:05 ahze Exp $ # PORTNAME= gstreamer PORTVERSION?= 0.10.5 ## SET BACK TO PORTREVISION?= when we reset PORTREVISION in all the gst plugin ports -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME:S|$|sources/gst-plugins-base/0.10/:base|} \ http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \ @@ -127,10 +127,14 @@ post-patch: s|%%VERSION%%|${VERSION}|' @${FIND} ${WRKSRC}/ext -name Makefile.in | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ - 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la||; \ - s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la||; \ - s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la||; \ - s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la||' + '/la_DEPENDENCIES =/s|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la||; \ + s|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la|-L${X11BASE}/lib -lgsttag-@GST_MAJORMINOR@|; \ + /la_DEPENDENCIES =/s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la||; \ + s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la|-L${X11BASE}/lib -lgstaudio-@GST_MAJORMINOR@|; \ + /la_DEPENDENCIES =/s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la||; \ + s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la|-L${X11BASE}/lib -lgstriff-@GST_MAJORMINOR@|; \ + /la_DEPENDENCIES =/s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la||; \ + s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|-L${X11BASE}/lib -lgstcdda-@GST_MAJORMINOR@|' @${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \ s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \ ${WRKSRC}/configure diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index 27bd8fa1d..3ac7f5094 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -1,5 +1,5 @@ # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.36 2006/02/25 00:09:17 marcus Exp $ +# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.37 2006/03/14 19:09:14 ahze Exp $ # base BASE_GST_ALL_PLUGINS= \ alsa \ @@ -148,6 +148,8 @@ LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv .if ${GST_PLUGIN}=="esound" USE_GNOME+= esound GST_PLUGIN_DIR= ext/esd +CONFIGURE_ENV+= ESD_CFLAGS="`pkg-config --cflags esound`" \ + ESD_LIBS="`pkgconfig --libs esound`" PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \ ${GST_LIB_DIR}/libgstesd.a \ ${GST_LIB_DIR}/libgstesd.la -- cgit v1.2.3