rpms/amarok/devel amarok-1.4-gstreamer.patch, 1.2, 1.3 amarok.spec, 1.50, 1.51
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Sun May 21 17:14:03 UTC 2006
Author: abompard
Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29717/devel
Modified Files:
amarok-1.4-gstreamer.patch amarok.spec
Log Message:
really fix building gst engine on x86_64
amarok-1.4-gstreamer.patch:
Index: amarok-1.4-gstreamer.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.4-gstreamer.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amarok-1.4-gstreamer.patch 21 May 2006 13:17:47 -0000 1.2
+++ amarok-1.4-gstreamer.patch 21 May 2006 17:14:03 -0000 1.3
@@ -1,5 +1,5 @@
---- ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop.gstreamer 2006-05-21 14:31:55.000000000 +0200
-+++ ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop 2006-05-21 14:32:05.000000000 +0200
+--- ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop.gstreamer 2006-04-09 23:08:25.000000000 +0200
++++ ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop 2006-05-21 18:09:08.000000000 +0200
@@ -74,6 +74,6 @@
X-KDE-amaroK-email=markey at web.de
X-KDE-amaroK-rank=254
@@ -9,7 +9,7 @@
--- ./amarok/src/engine/Makefile.in.gstreamer 2006-05-14 22:05:27.000000000 +0200
-+++ ./amarok/src/engine/Makefile.in 2006-05-21 14:12:47.000000000 +0200
++++ ./amarok/src/engine/Makefile.in 2006-05-21 18:09:08.000000000 +0200
@@ -365,9 +365,6 @@
@@ -31,7 +31,16 @@
subdir = amarok/src/engine
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- ./configure.gstreamer 2006-05-14 22:04:55.000000000 +0200
-+++ ./configure 2006-05-21 14:11:29.000000000 +0200
++++ ./configure 2006-05-21 18:29:33.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_INCL!
UDES all_includes all_libraries AUTODIRS include_ARTS_TRUE inc!
lude_A
_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_hel!
ix_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 IFP_INCLUDES IFP_LIBS with_ifp_TRUE with_ifp_FALSE LIBGPOD_CFLAGS LIBGPOD_LIBS with_libgpod_TRUE with_libgpod_FALSE EXSCALIBAR_CFLAGS EXSCALIBAR_LIBS with_exscalibar_TRUE with_exscalibar_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_FA!
LSE LIBOBJS LTLIBOBJS'
++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_INCL!
UDES all_includes all_libraries AUTODIRS include_ARTS_TRUE inc!
lude_A
_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 wi!
th_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 IFP_INCLUDES IFP_LIBS with_ifp_TRUE with_ifp_FALSE LIBGPOD_CFLAGS LIBGPOD_LIBS with_libgpod_TRUE with_libgpod_FALSE EXSCALIBAR_CFLAGS EXSCALIBAR_LIBS with_exscalibar_TRUE with_exscalibar_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_!
includ
TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
@@ -32730,41 +32730,148 @@
# BEGIN GSTREAMER-0.10 CHECK
###############################################################################
Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- amarok.spec 21 May 2006 14:04:05 -0000 1.50
+++ amarok.spec 21 May 2006 17:14:03 -0000 1.51
@@ -1,7 +1,7 @@
Name: amarok
Summary: Media player for KDE
Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Applications/Multimedia
License: GPL
@@ -31,8 +31,6 @@
# Gstreamer engine
%ifarch ppc64 x86_64 s390 s390x ia64
BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
-# To bring back the gst10 engine
-BuildRequires: automake
%endif
# Helix engine
%ifnarch ppc64 x86_64 s390 s390x ia64
@@ -57,8 +55,8 @@
- compatible with the .m3u and .pls formats for playlists
- nice GUI, integrates into the KDE look, but with a unique touch
-Amarok can use various engines to decode sound : gstreamer, arts,
-helix and xine (disabled by default for patent reasons)
+Amarok can use various engines to decode sound : gstreamer, helix
+and xine (disabled by default for patent reasons)
To use the helix engine, you'll have to install either HelixPlayer
or RealPlayer
@@ -86,6 +84,9 @@
%patch1 -p1 -b .gstreamer
# Gstreamer default sink should be autoaudiosink
%patch2 -p1 -b .engines-cfg
+touch --reference aclocal.m4 amarok/src/engine/gst10/Makefile.in
+touch --reference aclocal.m4 amarok/src/engine/gst10/config/Makefile.in
+touch --reference aclocal.m4 amarok/src/engine/gst10/equalizer/Makefile.in
%endif
@@ -223,6 +224,9 @@
%changelog
+* Sun May 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4.0-4
+- really fix building gst engine on x86_64
+
* Sun May 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4.0-3
- missing buildrequires
More information about the fedora-extras-commits
mailing list