summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2004-12-07 07:33:09 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2004-12-07 07:33:09 +0800
commitfed79eaa49ecfd2235b9b6ccd989875635926020 (patch)
treec358ba9e5ec296b10f4f6e76025177948c73a522 /multimedia
parentd42059c05d0bc53a9394d8592cfc58d478e88b3a (diff)
downloadmarcuscom-ports-fed79eaa49ecfd2235b9b6ccd989875635926020.tar
marcuscom-ports-fed79eaa49ecfd2235b9b6ccd989875635926020.tar.gz
marcuscom-ports-fed79eaa49ecfd2235b9b6ccd989875635926020.tar.bz2
marcuscom-ports-fed79eaa49ecfd2235b9b6ccd989875635926020.tar.lz
marcuscom-ports-fed79eaa49ecfd2235b9b6ccd989875635926020.tar.xz
marcuscom-ports-fed79eaa49ecfd2235b9b6ccd989875635926020.tar.zst
marcuscom-ports-fed79eaa49ecfd2235b9b6ccd989875635926020.zip
Fix dvd support by really linking to libdvdnav
Pointed out by: yoey via irc git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3229 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gstreamer-plugins-dvd/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common1
-rw-r--r--multimedia/gstreamer-plugins80/Makefile2
-rw-r--r--multimedia/gstreamer-plugins80/Makefile.common1
5 files changed, 6 insertions, 2 deletions
diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile
index bcb207a64..edf6d0523 100644
--- a/multimedia/gstreamer-plugins-dvd/Makefile
+++ b/multimedia/gstreamer-plugins-dvd/Makefile
@@ -5,6 +5,8 @@
# $FreeBSD$
#
+PORTREVISION= 1
+
GST_PLUGIN= dvd
MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 18793b5ae..74077cc56 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -40,7 +40,7 @@ GST_PLUGIN?= base
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib ${EXTRA_LIBS}"
.include <bsd.port.pre.mk>
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 320ed06c1..e397b5921 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -248,6 +248,7 @@ GST_PLIST_SUFFIX= dec
# dvd (dvdnav dvdread)
.if ${GST_PLUGIN}=="dvd"
+EXTRA_LIBS+= -ldvdnav
LIB_DEPENDS+= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
GST_PLUGIN_DIR= ext/dvdnav \
ext/dvdread
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 18793b5ae..74077cc56 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -40,7 +40,7 @@ GST_PLUGIN?= base
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib ${EXTRA_LIBS}"
.include <bsd.port.pre.mk>
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index 320ed06c1..e397b5921 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -248,6 +248,7 @@ GST_PLIST_SUFFIX= dec
# dvd (dvdnav dvdread)
.if ${GST_PLUGIN}=="dvd"
+EXTRA_LIBS+= -ldvdnav
LIB_DEPENDS+= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
GST_PLUGIN_DIR= ext/dvdnav \
ext/dvdread