Since we don't record libstdc++ as NEEDED in shared
libs, it can cause issues when one is dlopen()'ed that
requires it. Both gstreamer-arts and gstreamer-sidplay
plugins are dlopen() and depend on libs that need
libstdc++ so I think the best way to deal with this
is to have them explicitly link in libstdc++.

Also fix an extra pthread WANTLIB on the dvdnav plugin.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/gstreamer-plugins/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile    10 Aug 2006 22:30:48 -0000      1.17
+++ Makefile    16 Aug 2006 21:56:17 -0000
@@ -5,7 +5,7 @@
 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 @@
 # 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 @@
 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 @@
 
 # sidplay
 COMMENT-sidplay=       "GStreamer plugin for playing SID files"
+WANTLIB-sidplay=       stdc++
 DEPENDS-sidplay=       sidplay::audio/libsidplay
 
 # sndfile
@@ -216,7 +216,7 @@
 
 .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}"
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/gstreamer-plugins/patches/patch-configure,v
retrieving revision 1.5
diff -u -r1.5 patch-configure
--- patches/patch-configure     20 Mar 2006 15:33:21 -0000      1.5
+++ patches/patch-configure     16 Aug 2006 21:56:17 -0000
@@ -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
+--- 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 @@
  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 @@
        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++"
+ 
+ 
+ 

Reply via email to