[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/amarok
From: Mark Kretschmann <markey () web ! de>
Date: 2006-06-30 20:17:24
Message-ID: 1151698644.351138.31692.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 556594 by markey:
Disable gst engine for 1.4.1.
M +0 -4 README
M +18 -18 configure.in.bot
M +35 -35 configure.in.in
M +1 -1 release_scripts/release_amarok.rb
M +4 -5 src/engine/Makefile.am
M +1 -2 src/engine/gst10/amarok_gst10engine_plugin.desktop
--- trunk/extragear/multimedia/amarok/README #556593:556594
@@ -65,10 +65,6 @@
http://www.real.com
(Note: only HelixPlayer is exactly RealPlayer without MP3 support)
- * GStreamer-0.10 + GStreamer-Plugins-0.10
- (multimedia framework)
- http://gstreamer.net
-
* NMM 0.7.0
(multimedia framework)
http://www.networkmultimedia.org
--- trunk/extragear/multimedia/amarok/configure.in.bot #556593:556594
@@ -78,18 +78,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
@@ -173,9 +173,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"
@@ -242,9 +242,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"
--- trunk/extragear/multimedia/amarok/configure.in.in #556593:556594
@@ -70,42 +70,42 @@
# 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]
-)
+#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])
-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
###############################################################################
--- trunk/extragear/multimedia/amarok/release_scripts/release_amarok.rb \
#556593:556594 @@ -161,7 +161,7 @@
# This stuff doesn't belong in the tarball
`rm -rf src/scripts/rbot`
`rm -rf release_scripts`
-# `rm -rf src/engine/gst10` #Removed for now
+`rm -rf src/engine/gst10` #Removed for now
Dir.chdir( "src" )
--- trunk/extragear/multimedia/amarok/src/engine/Makefile.am #556593:556594
@@ -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
@@ -19,6 +19,5 @@
void \
$(XINE_ENGINE_SUBDIR) \
$(NMM_ENGINE_SUBDIR) \
- $(HELIX_ENGINE_SUBDIR) \
- $(GST10_ENGINE_SUBDIR)
+ $(HELIX_ENGINE_SUBDIR)
--- trunk/extragear/multimedia/amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop \
#556593:556594 @@ -57,8 +57,7 @@
X-KDE-Amarok-name=gst10-engine
X-KDE-Amarok-authors=Mark Kretschmann,Jakub Stachowski,Paul Cifarelli
X-KDE-Amarok-email=markey@web.de,qbast@go2.pl,paul@cifarelli.net
-X-KDE-Amarok-rank=100
+X-KDE-Amarok-rank=0
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=25
-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic