media-sound/amarok-svn/files/gstreamer.patch

gstreamer.patch (text/plain), 6.11 KB, created by Wai Ling on 2007-01-07 01:12:51 UTC

--- src/engine/Makefile.am.orig	2007-01-03 20:06:23.000000000 -0500
+++ src/engine/Makefile.am	2007-01-03 20:06:43.000000000 -0500
@@ -1,6 +1,6 @@
-#if with_gst10
-#    GST10_ENGINE_SUBDIR = gst10
-#endif
+if with_gst10
+    GST10_ENGINE_SUBDIR = gst10
+endif
 
 if with_nmm
     NMM_ENGINE_SUBDIR = nmm
@@ -21,6 +21,7 @@
 SUBDIRS = . \
     void \
     $(XINE_ENGINE_SUBDIR) \
+    $(GST10_ENGINE_SUBDIR) \
     $(NMM_ENGINE_SUBDIR) \
     $(HELIX_ENGINE_SUBDIR) \
     $(YAUAP_ENGINE_SUBDIR)
--- configure.in.orig	2007-01-04 22:17:41.000000000 -0500
+++ configure.in.in	2007-01-04 22:18:53.000000000 -0500
@@ -51,41 +51,41 @@
 # BEGIN GSTREAMER-0.10 CHECK
 ###############################################################################
 
-#AC_ARG_WITH(gstreamer10,
-#    AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]),
-#    [build_gstreamer10=$withval],
-#    [build_gstreamer10=no]
-#)
-#
-#if test "$build_gstreamer10" != "no"; then
-#    if test "$PKGCONFIGFOUND" = "yes" ; then
-#        # check for GStreamer
-#        dnl Now we're ready to ask for gstreamer libs and cflags
-#        dnl And we can also ask for the right version of gstreamer
-#        have_gst10=no
-#
-#        GST10_MAJORMINOR=0.10
-#        GST10_REQ=0.10.0
-#
-#        PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
-#            have_gst10=yes,have_gst10=no)
-#
-#        dnl Give error if we don't have gstreamer
-#        if test "x$have_gst10" = "xno"; then
-#            LIB_GST10=""
-#            CFLAGS_GST10=""
-#        else
-#            LIB_GST10=$GST10_LIBS
-#            CFLAGS_GST10=$GST10_CFLAGS
-#            AC_SUBST(LIB_GST10)
-#            AC_SUBST(CFLAGS_GST10)
-#            AC_SUBST(GST10_MAJORMINOR)
-#            AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
-#        fi
-#    fi
-#fi
-#
-#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
+AC_ARG_WITH(gstreamer10,
+    AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]),
+    [build_gstreamer10=$withval],
+    [build_gstreamer10=no]
+)
+
+if test "$build_gstreamer10" != "no"; then
+    if test "$PKGCONFIGFOUND" = "yes" ; then
+        # check for GStreamer
+        dnl Now we're ready to ask for gstreamer libs and cflags
+        dnl And we can also ask for the right version of gstreamer
+        have_gst10=no
+
+        GST10_MAJORMINOR=0.10
+        GST10_REQ=0.10.0
+
+        PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
+            have_gst10=yes,have_gst10=no)
+
+        dnl Give error if we don't have gstreamer
+        if test "x$have_gst10" = "xno"; then
+            LIB_GST10=""
+            CFLAGS_GST10=""
+        else
+            LIB_GST10=$GST10_LIBS
+            CFLAGS_GST10=$GST10_CFLAGS
+            AC_SUBST(LIB_GST10)
+            AC_SUBST(CFLAGS_GST10)
+            AC_SUBST(GST10_MAJORMINOR)
+            AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
+        fi
+    fi
+fi
+
+AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
 
 ###############################################################################
 # END GSTREAMER-0.10 CHECK
@@ -1136,7 +1136,7 @@
 # BEGIN DO_NOT_COMPILE CHECK
 ###############################################################################
 
-if test x$build_xine = xno -a x$build_helix = xno; then
+if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
 
     DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
     no_engine=yes
--- configure.in.orig	2007-01-04 22:20:21.000000000 -0500
+++ configure.in.bot	2007-01-04 22:20:49.000000000 -0500
@@ -79,18 +79,18 @@
     echo " ="
 fi
 
-#if test x$have_gst_plugins = xno -a x$have_gst = xyes; then
-#    echo " =========================="
-#    echo " ===  Amarok - WARNING  ========================================================"
-#    echo " =========================="
-#    echo " ="
-#    echo " = No GStreamer plugins were detected!"
-#    echo " = Without plugins you will not be able to play any media using the"
-#    echo " = GStreamer-engine! You need at least the MP3 plugin and a sink plugin, (eg."
-#    echo " = ALSAsink). Please refer to http://gstreamer.freedesktop.org/"
-#    echo " = NOTE: you will still be able to play media with another engine plugin."
-#    echo " ="
-#fi
+if test x$have_gst_plugins = xno -a x$have_gst = xyes; then
+    echo " =========================="
+    echo " ===  Amarok - WARNING  ========================================================"
+    echo " =========================="
+    echo " ="
+    echo " = No GStreamer plugins were detected!"
+    echo " = Without plugins you will not be able to play any media using the"
+    echo " = GStreamer-engine! You need at least the MP3 plugin and a sink plugin, (eg."
+    echo " = ALSAsink). Please refer to http://gstreamer.freedesktop.org/"
+    echo " = NOTE: you will still be able to play media with another engine plugin."
+    echo " ="
+fi
 
 if test x$included_sqlite = xno; then
   if test x$have_sqlite = xyes; then
@@ -174,9 +174,9 @@
 #        echo " =   - aKode-engine"
 #    fi
 
-#    if test x$have_gst10 != xyes; then
-#        echo " =   - GStreamer0.10-engine"
-#    fi
+    if test x$have_gst10 != xyes; then
+        echo " =   - GStreamer0.10-engine"
+    fi
 
     if test x$build_xine != xyes; then
         echo " =   - xine-engine"
@@ -250,9 +250,9 @@
 #        echo " =   + aKode-engine"
 #    fi
 
-#    if test x$have_gst10 = xyes; then
-#        echo " =   + GStreamer0.10-engine"
-#    fi
+    if test x$have_gst10 = xyes; then
+        echo " =   + GStreamer0.10-engine"
+    fi
 
     if test x$build_xine = xyes; then
         echo " =   + xine-engine"
--- src/engine/gst10/amarok_gst10engine_plugin.desktop.orig	2007-01-04 23:20:43.000000000 -0500
+++ src/engine/gst10/amarok_gst10engine_plugin.desktop	2007-01-04 23:20:53.000000000 -0500
@@ -76,7 +76,7 @@
 X-KDE-Amarok-name=gst10-engine
 X-KDE-Amarok-authors=Mark Kretschmann,Jakub Stachowski,Paul Cifarelli
 X-KDE-Amarok-email=[e-mail],[e-mail],[e-mail]
-X-KDE-Amarok-rank=0
+X-KDE-Amarok-rank=255
 X-KDE-Amarok-version=1
 X-KDE-Amarok-framework-version=28