TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RHEL/Fedora: enables 'akode' support in Amarok

Browse Source
pull/3/head
Francois Andriot 13 years ago
parent 7c0ff901a2
commit 09713d07b2
2 changed files with 96 additions and 2 deletions
Show Stats Download Patch File Download Diff File

82
redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
Unescape View File

@ -0,0 +1,82 @@
diff -Nuar amarok.ORI/amarok/src/engine/akode/CMakeLists.txt amarok.P/amarok/src/engine/akode/CMakeLists.txt
--- amarok.ORI/amarok/src/engine/akode/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ amarok.P/amarok/src/engine/akode/CMakeLists.txt 2012-01-16 21:42:52.701799667 +0100
@@ -0,0 +1,37 @@
+#################################################
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/amarok/src/amarokcore
+ ${CMAKE_SOURCE_DIR}/amarok/src
+ ${CMAKE_SOURCE_DIR}/amarok/src/engine/akode
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${AKODE_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES amarok_aKode-engine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+##### libamarok_akode-engine (module) ############
+
+tde_add_kpart( libamarok_akode-engine AUTOMOC
+ SOURCES
+ akode-scope.cpp akode-engine.cpp
+ LINK amarok-shared ${AKODE_LIBRARIES}
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff -Nuar amarok.ORI/amarok/src/engine/CMakeLists.txt amarok.P/amarok/src/engine/CMakeLists.txt
--- amarok.ORI/amarok/src/engine/CMakeLists.txt 2012-01-16 21:26:50.433584399 +0100
+++ amarok.P/amarok/src/engine/CMakeLists.txt 2012-01-16 21:27:36.702218362 +0100
@@ -14,3 +14,4 @@
add_subdirectory( void )
tde_conditional_add_subdirectory( WITH_XINE xine )
tde_conditional_add_subdirectory( WITH_YAUAP yauap )
+tde_conditional_add_subdirectory( WITH_AKODE akode )
diff -Nuar amarok.ORI/CMakeLists.txt amarok.P/CMakeLists.txt
--- amarok.ORI/CMakeLists.txt 2012-01-16 21:26:50.418583977 +0100
+++ amarok.P/CMakeLists.txt 2012-01-16 21:28:23.382857595 +0100
@@ -47,6 +47,7 @@
option( WITH_KONQSIDEBAR "Enable konqsidebar plugin" OFF )
option( WITH_XINE "Enable xine-engine support" OFF )
option( WITH_YAUAP "Enable yauap-engine support" OFF )
+option( WITH_AKODE "Enable akode-engine support" OFF )
option( WITH_IPOD "Enable iPod support from libgpod" OFF )
option( WITH_IFP "Enable ifp support" OFF )
option( WITH_NJB "Enable njb support" OFF )
diff -Nuar amarok.ORI/ConfigureChecks.cmake amarok.P/ConfigureChecks.cmake
--- amarok.ORI/ConfigureChecks.cmake 2012-01-16 21:26:50.491585184 +0100
+++ amarok.P/ConfigureChecks.cmake 2012-01-16 21:40:55.883193781 +0100
@@ -121,6 +121,18 @@
endif( )
endif( )
+# akode-engine
+if( WITH_AKODE )
+ pkg_search_module( AKODE akode )
+ if( AKODE_FOUND )
+ if( ${AKODE_VERSION} VERSION_LESS "2.0.0" )
+ tde_message_fatal( "your akode version is too old; at least 2.0.0 is required" )
+ endif( )
+ else( )
+ tde_message_fatal( "akode is requested, but was not found on your system" )
+ endif( )
+endif( )
+
# iPod
if( WITH_IPOD )

16
redhat/applications/amarok/trinity-amarok.spec
Unescape View File

@ -1,7 +1,7 @@
# Basic package informations
%define kdecomp amarok
%define version 1.4.10
%define release 3
%define release 4
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -36,6 +36,7 @@ Patch1: amarok-1.4.8-gcc43.patch
Patch2: amarok-3.5.13-cmake_konqsidebar.patch
Patch3: amarok-3.5.13-taglib_include.patch
Patch4: amarok-3.5.13-enable_riokarma.patch
Patch5: amarok-3.5.13-enable_akode.patch
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
@ -71,6 +72,7 @@ BuildRequires: libkarma-devel karma-sharp
#%{?fedora:BuildRequires: xmms-devel}
BuildRequires: dbus-devel
BuildRequires: dbus-tqt-devel
BuildRequires: akode-devel
# For dir ownership and some default plugins (lyrics), -ruby subpkg? -- Rex
Requires: ruby
@ -117,7 +119,7 @@ Summary: Visualisation plugins for Amarok
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
# No plugins by default, we need libvisual-plugins
Requires: libvisual-plugins
#Requires: libvisual-plugins
%description visualisation
Amarok can use visualisation plugins from different origins.
Right now, only xmms is supported, which means that you can
@ -130,6 +132,7 @@ use any of xmms' visualisation plugins with Amarok.
%patch2 -p0
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
@ -145,6 +148,7 @@ cd build
-DWITH_KONQSIDEBAR=ON \
-DWITH_XINE=ON \
-DWITH_YAUAP=ON \
-DWITH_AKODE=ON \
-DWITH_IPOD=ON \
-DWITH_IFP=ON \
-DWITH_NJB=ON \
@ -268,6 +272,10 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
# YAUAP
%{_datadir}/services/amarok_yauap-engine_plugin.desktop
%{tde_libdir}/libamarok_yauap-engine_plugin.*
# AKODE
%{_datadir}/services/amarok_aKode-engine.desktop
%{tde_libdir}/libamarok_akode-engine.*
%files konqueror
@ -282,6 +290,10 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
%changelog
* Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-4
- Enable 'akode' support
- Removes 'libvisual-plugins' dependency (obsolete ?)
* Mon Nov 28 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-3
- Enable riokarma support
- Enhance localized files packaging

Write Preview
Loading…
Cancel
Save