explicitly link in libstdc++ to arts & sidplay plugins to correct

gst-register core dumps reported by steven@. also remove extra pthread
WANTLIB for dvdnav. okay nikolay@
This commit is contained in:
kurt 2006-08-18 17:04:22 +00:00
parent 9403280d56
commit 33092bd075
2 changed files with 26 additions and 9 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.17 2006/08/10 22:30:48 steven Exp $
# $OpenBSD: Makefile,v 1.18 2006/08/18 17:04:22 kurt Exp $
COMMENT= "GStreamer Streaming-media framework plug-ins."
VERSION= 0.8.11
PATCHLEVEL=
DISTNAME= gst-plugins-${VERSION}
PKGNAME= gstreamer-plugins-${VERSION}p7
PKGNAME= gstreamer-plugins-${VERSION}p8
SHARED_LIBS= gstgconf-0.8 1.0 \
gstinterfaces-0.8 1.0 \
gstmedia-info-0.8 1.0 \
@ -94,7 +94,7 @@ OPTIONS-a52= a52dec
# arts
COMMENT-arts= "GStreamer plugin for interfacing with KDE arts"
WANTLIB-arts= vorbis vorbisenc pthread audiofile ossaudio mad ogg \
esd vorbisfile
esd vorbisfile stdc++
DEPENDS-arts= artsflow,mcop,artsflow_idl,artsc::x11/kde/arts3
OPTIONS-arts= arts artsc
@ -115,7 +115,6 @@ OPTIONS-cdda= cdparanoia
COMMENT-dvdnav= "GStreamer plugin for DVD playback with menus"
DEPENDS-dvdnav= dvdnav::multimedia/libdvdnav \
dvdread::devel/libdvdread
WANTLIB-dvdnav= pthread
# dvdreadsrc
COMMENT-dvdread= "GStreamer plugin for DVD playback"
@ -190,6 +189,7 @@ LIB_DEPENDS+= gstinterfaces-0.8.>=1.0::devel/gstreamer-plugins
# sidplay
COMMENT-sidplay= "GStreamer plugin for playing SID files"
WANTLIB-sidplay= stdc++
DEPENDS-sidplay= sidplay::audio/libsidplay
# sndfile
@ -216,7 +216,7 @@ DEPENDS-vorbis= vorbis,vorbisenc::audio/libvorbis
.for PLUGIN in ${PLUGINS}
COMMENT-${PLUGIN}?= "GStreamer plugin for ${PLUGIN}"
PKGNAME-${PLUGIN}?= gstreamer-${PLUGIN}-${VERSION}${PATCHLEVEL}p7
PKGNAME-${PLUGIN}?= gstreamer-${PLUGIN}-${VERSION}${PATCHLEVEL}p8
OPTIONS-${PLUGIN}?= ${PLUGIN}
. if defined(PACKAGING)
. if ${SUBPACKAGE} == "-${PLUGIN}"

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.5 2006/03/20 15:33:21 espie Exp $
--- configure.orig Sun Sep 4 14:21:34 2005
+++ configure Mon Mar 20 16:28:55 2006
$OpenBSD: patch-configure,v 1.6 2006/08/18 17:04:22 kurt Exp $
--- configure.orig Sun Sep 4 08:21:34 2005
+++ configure Wed Aug 16 17:24:06 2006
@@ -28114,7 +28114,7 @@ DEFAULT_AUDIOSRC="osssrc"
DEFAULT_VIDEOSRC="v4lsrc"
DEFAULT_VISUALIZER="goom"
@ -19,7 +19,15 @@ $OpenBSD: patch-configure,v 1.5 2006/03/20 15:33:21 espie Exp $
else
HAVE_XVIDEO="no"
fi
@@ -42153,7 +42153,7 @@ fi
@@ -38321,6 +38321,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$no_arts" = x ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
+ ARTS_LIBS="-lstdc++"
HAVE_ARTS=yes
else
echo "$as_me:$LINENO: result: no" >&5
@@ -42153,7 +42154,7 @@ fi
DVDNAV_CFLAGS=
HAVE_DVDNAV=no
else
@ -28,3 +36,12 @@ $OpenBSD: patch-configure,v 1.5 2006/03/20 15:33:21 espie Exp $
DVDNAV_LIBS=`dvdnav-config --plugin-libs `
else
DVDNAV_LIBS=`dvdnav-config --libs `
@@ -53328,7 +53329,7 @@ echo "${ECHO_T}$HAVE_SIDPLAY" >&6
fi
SIDPLAY_CFLAGS=
-SIDPLAY_LIBS="-lsidplay"
+SIDPLAY_LIBS="-lsidplay -lstdc++"