rpms/amarok/devel amarok-1.4.1-gstreamer.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 amarok.spec, 1.52, 1.53 sources, 1.23, 1.24 amarok-1.4-gstreamer.patch, 1.3, NONE

Aurelien Bompard (abompard) fedora-extras-commits at redhat.com
Sat Jul 8 13:18:15 UTC 2006


Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29620/devel

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-1.4.1-gstreamer.patch 
Removed Files:
	amarok-1.4-gstreamer.patch 
Log Message:
version 1.4.1

amarok-1.4.1-gstreamer.patch:

--- NEW FILE amarok-1.4.1-gstreamer.patch ---
--- ./amarok/src/engine/Makefile.in.gstreamer	2006-07-02 22:30:04.000000000 +0200
+++ ./amarok/src/engine/Makefile.in	2006-07-08 14:53:39.000000000 +0200
@@ -371,7 +371,8 @@
     void \
     $(XINE_ENGINE_SUBDIR) \
     $(NMM_ENGINE_SUBDIR) \
-    $(HELIX_ENGINE_SUBDIR)
+    $(HELIX_ENGINE_SUBDIR) \
+    gst10
 
 subdir = amarok/src/engine
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- ./configure.gstreamer	2006-07-02 22:29:34.000000000 +0200
+++ ./configure	2006-07-08 14:58:28.000000000 +0200
@@ -464,7 +464,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_!
 VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLU!
 DES all_includes all_libraries AUTODIRS include_ARTS_TRUE incl!
 ude_AR
FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND TAGLIB_CONFIG taglib_includes taglib_libs RUBY XINE_CONFIG with_xine_TRUE with_xine_FALSE CFLAGS_XINE LIBS_XINE with_nmm_TRUE with_nmm_FALSE CFLAGS_NMM LDFLAGS_NMM PKG_CONFIG ALSALIB_CFLAGS ALSALIB_LIBS with_heli!
 x_TRUE with_helix_FALSE gl_libs SQLITE_CFLAGS SQLITE_LIBS LIB_SQLITE with_included_sqlite_TRUE with_included_sqlite_FALSE MYSQL_CONFIG enable_mysql_TRUE enable_mysql_FALSE mysql_includes mysql_libs POSTGRESQL_CONFIG enable_postgresql_TRUE enable_postgresql_FALSE postgresql_includes postgresql_libs XMMS_CONFIG xmms_cflags xmms_libs GTK_CONFIG gtk_cflags gtk_libs with_xmmswrapper_TRUE with_xmmswrapper_FALSE SDL_CONFIG sdl_cflags sdl_libs LIBVISUAL_CFLAGS LIBVISUAL_LIBS with_libvisual_TRUE with_libvisual_FALSE LIB_TUNEPIMP with_konqsidebar_TRUE with_konqsidebar_FALSE LIBNJB_CFLAGS LIBNJB_LIBS with_libnjb_TRUE with_libnjb_FALSE IFP_INCLUDES IFP_LIBS with_ifp_TRUE with_ifp_FALSE LIBGPOD_CFLAGS LIBGPOD_LIBS with_libgpod_TRUE with_libgpod_FALSE MP4V2_INCLUDES MP4V2_LIBS with_mp4v2_TRUE with_mp4v2_FALSE TOPSUBDIRS amarok_SUBDIR_included_TRUE amarok_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIB!
 OBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_!
 VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLU!
 DES all_includes all_libraries AUTODIRS include_ARTS_TRUE incl!
 ude_AR
FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND TAGLIB_CONFIG taglib_includes taglib_libs RUBY GST10_CFLAGS GST10_LIBS LIB_GST10 CFLAGS_GST10 GST10_MAJORMINOR with_gst10_TRUE with_gst10_FALSE XINE_CONFIG with_xine_TRUE with_xine_FALSE CFLAGS_XINE LIBS_XINE wit!
 h_nmm_TRUE with_nmm_FALSE CFLAGS_NMM LDFLAGS_NMM PKG_CONFIG ALSALIB_CFLAGS ALSALIB_LIBS with_helix_TRUE with_helix_FALSE gl_libs SQLITE_CFLAGS SQLITE_LIBS LIB_SQLITE with_included_sqlite_TRUE with_included_sqlite_FALSE MYSQL_CONFIG enable_mysql_TRUE enable_mysql_FALSE mysql_includes mysql_libs POSTGRESQL_CONFIG enable_postgresql_TRUE enable_postgresql_FALSE postgresql_includes postgresql_libs XMMS_CONFIG xmms_cflags xmms_libs GTK_CONFIG gtk_cflags gtk_libs with_xmmswrapper_TRUE with_xmmswrapper_FALSE SDL_CONFIG sdl_cflags sdl_libs LIBVISUAL_CFLAGS LIBVISUAL_LIBS with_libvisual_TRUE with_libvisual_FALSE LIB_TUNEPIMP with_konqsidebar_TRUE with_konqsidebar_FALSE LIBNJB_CFLAGS LIBNJB_LIBS with_libnjb_TRUE with_libnjb_FALSE IFP_INCLUDES IFP_LIBS with_ifp_TRUE with_ifp_FALSE LIBGPOD_CFLAGS LIBGPOD_LIBS with_libgpod_TRUE with_libgpod_FALSE MP4V2_INCLUDES MP4V2_LIBS with_mp4v2_TRUE with_mp4v2_FALSE TOPSUBDIRS amarok_SUBDIR_included_TRUE amarok_SUBDIR_included_FALSE doc_SUBDIR_inclu!
 ded_TRUE doc_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_!
 SUBDIR
cluded_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -32731,41 +32731,148 @@
 # 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])
+# Check whether --with-gstreamer10 or --without-gstreamer10 was given.
+if test "${with_gstreamer10+set}" = set; then
+  withval="$with_gstreamer10"
+  build_gstreamer10=$withval
+else
+  build_gstreamer10=no
+
+fi;
+
+if test "$build_gstreamer10" != "no"; then
+    if test "$PKGCONFIGFOUND" = "yes" ; then
+        # check for GStreamer
+                        have_gst10=no
+
+        GST10_MAJORMINOR=0.10
+        GST10_REQ=0.10.0
+
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" >&5
+echo $ECHO_N "checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking GST10_CFLAGS" >&5
+echo $ECHO_N "checking GST10_CFLAGS... $ECHO_C" >&6
+            GST10_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
+            echo "$as_me:$LINENO: result: $GST10_CFLAGS" >&5
+echo "${ECHO_T}$GST10_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking GST10_LIBS" >&5
+echo $ECHO_N "checking GST10_LIBS... $ECHO_C" >&6
+            GST10_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
+            echo "$as_me:$LINENO: result: $GST10_LIBS" >&5
+echo "${ECHO_T}$GST10_LIBS" >&6
+        else
+            GST10_CFLAGS=""
+            GST10_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GST10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     have_gst10=yes
+  else
+     have_gst10=no
+  fi
+
+
+                if test "x$have_gst10" = "xno"; then
+            LIB_GST10=""
+            CFLAGS_GST10=""
+        else
+            LIB_GST10=$GST10_LIBS
+            CFLAGS_GST10=$GST10_CFLAGS
+
+
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GSTREAMER10 1
+_ACEOF
+
+        fi
+    fi
+fi
+
+
+
+if test x$have_gst10 = xyes; then
+  with_gst10_TRUE=
+  with_gst10_FALSE='#'
+else
+  with_gst10_TRUE='#'
+  with_gst10_FALSE=
+fi
+
 
 ###############################################################################
 # END GSTREAMER-0.10 CHECK
@@ -38052,7 +38159,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
@@ -38174,6 +38281,12 @@
           ac_config_files="$ac_config_files amarok/src/engine/void/Makefile"
 
           ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile"
+          
+          ac_config_files="$ac_config_files amarok/src/engine/gst10/Makefile"
+
+          ac_config_files="$ac_config_files amarok/src/engine/gst10/config/Makefile"
+
+          ac_config_files="$ac_config_files amarok/src/engine/gst10/equalizer/Makefile"
 
           ac_config_files="$ac_config_files amarok/src/images/Makefile"
 
@@ -39084,6 +39197,9 @@
   "amarok/src/engine/nmm/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;;
   "amarok/src/engine/void/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;;
   "amarok/src/engine/xine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;;
+  "amarok/src/engine/gst10/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/Makefile" ;;
+  "amarok/src/engine/gst10/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/config/Makefile" ;;
+  "amarok/src/engine/gst10/equalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/equalizer/Makefile" ;;
   "amarok/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;;
   "amarok/src/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;;
   "amarok/src/konquisidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;;
@@ -39487,6 +39603,13 @@
 s, at taglib_includes@,$taglib_includes,;t t
 s, at taglib_libs@,$taglib_libs,;t t
 s, at RUBY@,$RUBY,;t t
+s, at GST10_CFLAGS@,$GST10_CFLAGS,;t t
+s, at GST10_LIBS@,$GST10_LIBS,;t t
+s, at LIB_GST10@,$LIB_GST10,;t t
+s, at CFLAGS_GST10@,$CFLAGS_GST10,;t t
+s, at GST10_MAJORMINOR@,$GST10_MAJORMINOR,;t t
+s, at with_gst10_TRUE@,$with_gst10_TRUE,;t t
+s, at with_gst10_FALSE@,$with_gst10_FALSE,;t t
 s, at XINE_CONFIG@,$XINE_CONFIG,;t t
 s, at with_xine_TRUE@,$with_xine_TRUE,;t t
 s, at with_xine_FALSE@,$with_xine_FALSE,;t t
@@ -40462,9 +40585,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"
@@ -40531,9 +40654,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"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	21 May 2006 13:17:47 -0000	1.23
+++ .cvsignore	8 Jul 2006 13:18:15 -0000	1.24
@@ -1,2 +1,2 @@
-amarok-1.4.0a.tar.bz2
-gst10-1.4beta3.tar.gz
+amarok-1.4.1.tar.bz2
+amarok-1.4.1-beta1-gst10.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- amarok.spec	24 May 2006 10:41:00 -0000	1.52
+++ amarok.spec	8 Jul 2006 13:18:15 -0000	1.53
@@ -1,15 +1,22 @@
+%define gst10 0
+%ifarch ppc64 x86_64 s390 s390x ia64
+%define gst10 1
+%endif
+%{?_with_gst10: %define gst10 1}
+
+
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.0
-Release:    5%{?dist}
+Version:    1.4.1
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2
-# Bring back the gstreamer engine from 1.4 beta3
-Source1:    gst10-1.4beta3.tar.gz
-Patch1:     amarok-1.4-gstreamer.patch
+Source0:    http://dl.sf.net/amarok/amarok-1.4.1.tar.bz2
+# Bring back the gstreamer engine from the beta
+Source1:    amarok-1.4.1-beta1-gst10.tar.bz2
+Patch1:     amarok-1.4.1-gstreamer.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,18 +25,21 @@
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  libGL
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
-BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
+BuildRequires:  libvisual-devel >= 0.4.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libifp-devel, libusb-devel
+# Ipod
 BuildRequires:  libgpod-devel
+# Creative Nomad Jukebox
+BuildRequires:  libnjb-devel
 # Akode engine
 #BuildRequires:  akode-devel
 # Gstreamer engine
-%ifarch ppc64 x86_64 s390 s390x ia64
+%if "%{gst10}" == "1"
 BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
 %endif
 # Helix engine on archs where it is available
@@ -39,8 +49,8 @@
 
 # Lyrics scripts
 Requires:  ruby
-# Only engine available except on these archs, where it's gstreamer
-%ifnarch ppc64 x86_64 s390 s390x ia64
+# If GStreamer won't be built, Helix will be the only available engine
+%if "%{gst10}" == "0"
 Requires:  HelixPlayer
 %endif
 
@@ -81,7 +91,7 @@
 
 %prep
 %setup -q -a 1
-%ifarch ppc64 x86_64 s390 s390x ia64
+%if "%{gst10}" == "1"
 # Bring Gstreamer back and make it a sufficient engine
 # (only engine available if Helix in unavailable)
 mv gst10 amarok/src/engine/
@@ -180,6 +190,7 @@
 %{_bindir}/amarok
 %{_bindir}/amarokapp
 %{_bindir}/amarokcollectionscanner
+%{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/%{name}
 %exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
@@ -192,6 +203,7 @@
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
+%{_datadir}/services/lastfm.protocol
 # IPod support
 %{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_libdir}/kde3/libamarok_ipod-mediadevice.*
@@ -201,11 +213,14 @@
 # iRiver device support
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
+# Creative Zen
+%{_datadir}/services/amarok_njb-mediadevice.desktop
+%{_libdir}/kde3/libamarok_njb-mediadevice.*
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 # Gstreamer engine
-%ifarch ppc64 x86_64 s390 s390x ia64
+%if "%{gst10}" == "1"
 %{_datadir}/services/amarok_gst10engine_plugin.desktop
 %{_libdir}/kde3/libamarok_gst10engine_plugin.*
 %endif
@@ -220,6 +235,7 @@
 
 
 
+
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
@@ -228,6 +244,10 @@
 
 
 %changelog
+* Sat Jul 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.1-1
+- version 1.4.1
+- make it possible to build the gst10 engine with a "--with gst10" switch
+
 * Wed May 24 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4.0-5
 - Require HelixPlayer on archs where it is the only engine available
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	21 May 2006 13:17:47 -0000	1.23
+++ sources	8 Jul 2006 13:18:15 -0000	1.24
@@ -1,2 +1,2 @@
-3ceffe6465290eef618861cdb81b420a  amarok-1.4.0a.tar.bz2
-78f329116089047704f32158e204ef4f  gst10-1.4beta3.tar.gz
+4ed6e766541c4227d1d8c8eb93d0b891  amarok-1.4.1.tar.bz2
+6f03489882587cbc03c424a9b10f4099  amarok-1.4.1-beta1-gst10.tar.bz2


--- amarok-1.4-gstreamer.patch DELETED ---




More information about the fedora-extras-commits mailing list