From 827a4ca6e00feb79bedcae76bbe27918ffc144c4 Mon Sep 17 00:00:00 2001 From: naddy Date: Sun, 16 Sep 2007 16:45:59 +0000 Subject: [PATCH] use autoconf instead of directly patching configure; it's more maintainable --- devel/gstreamer-plugins/Makefile | 4 +- .../patches/patch-common_m4_gst-feature_m4 | 12 +++++ .../gstreamer-plugins/patches/patch-configure | 47 ------------------- .../patches/patch-configure_ac | 34 ++++++++++++++ .../patches/patch-m4_gst-sid_m4 | 12 +++++ 5 files changed, 60 insertions(+), 49 deletions(-) create mode 100644 devel/gstreamer-plugins/patches/patch-common_m4_gst-feature_m4 delete mode 100644 devel/gstreamer-plugins/patches/patch-configure create mode 100644 devel/gstreamer-plugins/patches/patch-configure_ac create mode 100644 devel/gstreamer-plugins/patches/patch-m4_gst-sid_m4 diff --git a/devel/gstreamer-plugins/Makefile b/devel/gstreamer-plugins/Makefile index 1876bd88fe9..2dfae2a2461 100644 --- a/devel/gstreamer-plugins/Makefile +++ b/devel/gstreamer-plugins/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2007/09/16 02:52:59 merdely Exp $ +# $OpenBSD: Makefile,v 1.35 2007/09/16 16:45:59 naddy Exp $ COMMENT-main= GStreamer Streaming-media framework plug-ins @@ -32,7 +32,7 @@ SHARED_ONLY= Yes USE_GMAKE= Yes USE_LIBTOOL= Yes AUTOCONF_VERSION= 2.59 -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= autoconf CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gst-plugins # Disable plugins might try to build that we shouldn't diff --git a/devel/gstreamer-plugins/patches/patch-common_m4_gst-feature_m4 b/devel/gstreamer-plugins/patches/patch-common_m4_gst-feature_m4 new file mode 100644 index 00000000000..907d3c1b525 --- /dev/null +++ b/devel/gstreamer-plugins/patches/patch-common_m4_gst-feature_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-common_m4_gst-feature_m4,v 1.1 2007/09/16 16:45:59 naddy Exp $ +--- common/m4/gst-feature.m4.orig Sun Sep 16 17:46:12 2007 ++++ common/m4/gst-feature.m4 Sun Sep 16 17:46:49 2007 +@@ -133,7 +133,7 @@ AC_DEFUN([GST_CHECK_CONFIGPROG], + [$1]_CFLAGS= + HAVE_[$1]=no + else +- if [$2] --plugin-libs [$3] &> /dev/null; then ++ if [$2] --plugin-libs [$3] > /dev/null 2>&1; then + [$1]_LIBS=`[$2] --plugin-libs [$3]` + else + [$1]_LIBS=`[$2] --libs [$3]` diff --git a/devel/gstreamer-plugins/patches/patch-configure b/devel/gstreamer-plugins/patches/patch-configure deleted file mode 100644 index e637a725248..00000000000 --- a/devel/gstreamer-plugins/patches/patch-configure +++ /dev/null @@ -1,47 +0,0 @@ -$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" - case "$host" in -- *-sun-* | *pc-solaris* ) -+ *-sun-* | *pc-solaris* | *-*-openbsd* ) - DEFAULT_AUDIOSINK="sunaudiosink" - DEFAULT_VIDEOSINK="ximagesink" - DEFAULT_AUDIOSRC="sunaudiosrc" -@@ -35338,7 +35338,7 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_lib_Xv_pic_XvQueryExtension" >&5 - echo "${ECHO_T}$ac_cv_lib_Xv_pic_XvQueryExtension" >&6 - if test $ac_cv_lib_Xv_pic_XvQueryExtension = yes; then -- HAVE_XVIDEO="yes" -+ HAVE_XVIDEO="no" # break this test for now so we get the non-pic Xv - else - HAVE_XVIDEO="no" - 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 -- if dvdnav-config --plugin-libs &> /dev/null; then -+ if dvdnav-config --plugin-libs 2> /dev/null >/dev/null; then - 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++" - - - diff --git a/devel/gstreamer-plugins/patches/patch-configure_ac b/devel/gstreamer-plugins/patches/patch-configure_ac new file mode 100644 index 00000000000..132caa042f3 --- /dev/null +++ b/devel/gstreamer-plugins/patches/patch-configure_ac @@ -0,0 +1,34 @@ +$OpenBSD: patch-configure_ac,v 1.1 2007/09/16 16:45:59 naddy Exp $ +--- configure.ac.orig Sun Sep 16 17:33:20 2007 ++++ configure.ac Sun Sep 16 17:38:43 2007 +@@ -106,7 +106,7 @@ DEFAULT_AUDIOSRC="osssrc" + DEFAULT_VIDEOSRC="v4lsrc" + DEFAULT_VISUALIZER="goom" + case "$host" in +- *-sun-* | *pc-solaris* ) ++ *-sun-* | *pc-solaris* | *-*-openbsd* ) + DEFAULT_AUDIOSINK="sunaudiosink" + DEFAULT_VIDEOSINK="ximagesink" + DEFAULT_AUDIOSRC="sunaudiosrc" +@@ -671,9 +671,9 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true) + GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], + [xvimagesink], [ + if test x$HAVE_X = xyes; then +- AC_CHECK_LIB(Xv_pic, XvQueryExtension, +- HAVE_XVIDEO="yes", HAVE_XVIDEO="no", +- $X_LIBS -lXext) ++dnl AC_CHECK_LIB(Xv_pic, XvQueryExtension, ++dnl HAVE_XVIDEO="yes", HAVE_XVIDEO="no", ++dnl $X_LIBS -lXext) + + if test x$HAVE_XVIDEO = xyes; then + XVIDEO_LIBS="-lXv_pic -lXext" +@@ -840,7 +840,7 @@ fi + + translit(dnm, m, l) AM_CONDITIONAL(USE_ARTS, true) + GST_CHECK_FEATURE(ARTS, [arts plug-ins], arts, [ +- AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no) ++ AM_PATH_ARTS(, ARTS_LIBS="-lstdc++" HAVE_ARTS=yes, HAVE_ARTS=no) + ]) + + dnl *** artsc *** diff --git a/devel/gstreamer-plugins/patches/patch-m4_gst-sid_m4 b/devel/gstreamer-plugins/patches/patch-m4_gst-sid_m4 new file mode 100644 index 00000000000..e2ad8c83fc9 --- /dev/null +++ b/devel/gstreamer-plugins/patches/patch-m4_gst-sid_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-m4_gst-sid_m4,v 1.1 2007/09/16 16:45:59 naddy Exp $ +--- m4/gst-sid.m4.orig Sun Sep 16 17:49:30 2007 ++++ m4/gst-sid.m4 Sun Sep 16 17:49:43 2007 +@@ -31,7 +31,7 @@ if test $HAVE_SIDPLAY = "yes"; then + fi + + SIDPLAY_CFLAGS= +-SIDPLAY_LIBS="-lsidplay" ++SIDPLAY_LIBS="-lsidplay -lstdc++" + AC_SUBST(SIDPLAY_CFLAGS) + AC_SUBST(SIDPLAY_LIBS) +