From 3dbbb71ff969aae9b3fe088daa9f9ec50b0ec097 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 27 Mar 2009 15:12:19 +0000 Subject: [PATCH] - unbreak and re-enable the goom plugin by fixing a variable in gst-default.m4 ; rhythmbox does not crash anymore with goom - enhance configure output - fix PKGNAME --- multimedia/gstreamer-0.10/plugins-good/Makefile | 12 +++--------- .../patches/patch-common_m4_gst-default_m4 | 12 ++++++++++++ .../plugins-good/patches/patch-configure_ac | 8 ++++---- .../gstreamer-0.10/plugins-good/pkg/PLIST-main | 4 +++- 4 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 diff --git a/multimedia/gstreamer-0.10/plugins-good/Makefile b/multimedia/gstreamer-0.10/plugins-good/Makefile index 0f1679fbbbe..e9cbd4af962 100644 --- a/multimedia/gstreamer-0.10/plugins-good/Makefile +++ b/multimedia/gstreamer-0.10/plugins-good/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2009/03/16 22:20:02 kili Exp $ +# $OpenBSD: Makefile,v 1.37 2009/03/27 15:12:19 ajacoutot Exp $ COMMENT-main = multimedia framework - good plugins COMMENT-aalib = multimedia framework - aalib plugin @@ -19,7 +19,7 @@ COMMENT-wavpack = multimedia framework - wavpack plugin V = 0.10.8 DISTNAME = gst-plugins-good-$V -PKGNAME-main = gstreamer-plugins-good-$V10 +PKGNAME-main = gstreamer-plugins-good-$Vp10v0 PKGNAME-aalib = gstreamer-aalib-$Vp1 PKGNAME-cairo = gstreamer-cairo-$Vp2 PKGNAME-gconf = gstreamer-confelements-$Vp2 @@ -169,18 +169,12 @@ CONFIGURE_ARGS += --with-aalib-prefix=${LOCALBASE} \ --disable-schemas-install \ --enable-experimental \ --enable-gst_v4l2 \ + --enable-goom \ --with-default-audiosink=libsndiosink \ --with-default-audiosrc=libsndiosrc \ --with-default-videosink=xvimagesink \ --with-default-videosrc=v4l2src -# XXX probably our default thread stack size is too low -# #0 0x09b37a78 in plugin_info_init (pp=0x85e35000, nbVisuals=-2048700416) -# at /usr/obj/ports/gst-plugins-good-0.10.8/gst-plugins-good-0.10.8/gst/goom/plugin_info.c:92 -# p = Cannot access memory at address 0x88f22290 -# XXX When fixed, remove x11/gnome/totem/patches/patch-configure -CONFIGURE_ARGS += --disable-goom - post-extract: cp -R ${FILESDIR} ${WRKSRC}/ext/libsndio diff --git a/multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 b/multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 new file mode 100644 index 00000000000..f33413fb86d --- /dev/null +++ b/multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-common_m4_gst-default_m4,v 1.4 2009/03/27 15:12:19 ajacoutot Exp $ +--- common/m4/gst-default.m4.orig Fri Mar 27 14:10:43 2009 ++++ common/m4/gst-default.m4 Fri Mar 27 14:10:58 2009 +@@ -113,7 +113,7 @@ AC_DEFUN([AG_GST_DEFAULT_ELEMENTS], + esac + ], + [ +- DEFAULT_AUDIOSINK="$DEFAULT_VISUALIZER" ++ DEFAULT_VISUALIZER="$DEFAULT_VISUALIZER" + ] dnl Default value as determined above + ) + AC_MSG_NOTICE(Using $DEFAULT_VISUALIZER as default visualizer) diff --git a/multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac b/multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac index 3ea6434beb7..c8b6b196e5b 100644 --- a/multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac +++ b/multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_ac,v 1.6 2008/11/03 23:24:09 jakemsr Exp $ ---- configure.ac.orig Tue Apr 22 18:55:55 2008 -+++ configure.ac Mon Oct 27 01:45:57 2008 +$OpenBSD: patch-configure_ac,v 1.7 2009/03/27 15:12:19 ajacoutot Exp $ +--- configure.ac.orig Wed Apr 23 03:55:55 2008 ++++ configure.ac Fri Mar 27 13:55:13 2009 @@ -488,6 +488,8 @@ AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2 #ifdef __sun /* Solaris */ #include @@ -25,7 +25,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2008/11/03 23:24:09 jakemsr Exp $ +dnl *** libsndio *** +translit(dnm, m, l) AM_CONDITIONAL(USE_LIBSNDIO, true) -+AG_GST_CHECK_FEATURE(LIBSNDIO, [libsndio audio], libsndioaudio, [ ++AG_GST_CHECK_FEATURE(LIBSNDIO, [libsndio audio], libsndio, [ + AC_CHECK_HEADER(sndio.h, HAVE_LIBSNDIO="yes", HAVE_LIBSNDIO="no") + if test $HAVE_LIBSNDIO = yes + then diff --git a/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main b/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main index 64a403f24a3..156e127d127 100644 --- a/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main +++ b/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.12 2009/03/05 07:49:45 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.13 2009/03/27 15:12:19 ajacoutot Exp $ @conflict gstreamer-plugins-bad-<0.10.7 lib/gstreamer-${VERSION}/libgstalaw.la lib/gstreamer-${VERSION}/libgstalaw.so @@ -26,6 +26,8 @@ lib/gstreamer-${VERSION}/libgstflxdec.la lib/gstreamer-${VERSION}/libgstflxdec.so lib/gstreamer-${VERSION}/libgstgamma.la lib/gstreamer-${VERSION}/libgstgamma.so +lib/gstreamer-${VERSION}/libgstgoom.la +lib/gstreamer-${VERSION}/libgstgoom.so lib/gstreamer-${VERSION}/libgstgoom2k1.la lib/gstreamer-${VERSION}/libgstgoom2k1.so lib/gstreamer-${VERSION}/libgsticydemux.la