packages: amarok/amarok.spec, amarok/amarok-upnp-dep.patch (NEW) - add patc...

[lisu]

Author: lisu                         Date: Fri Jul  1 14:11:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add patch from gentoo

---- Files affected:
packages/amarok:
   amarok.spec (1.252 -> 1.253) , amarok-upnp-dep.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/amarok/amarok.spec
diff -u packages/amarok/amarok.spec:1.252 packages/amarok/amarok.spec:1.253
--- packages/amarok/amarok.spec:1.252	Fri Jul  1 15:49:42 2011
+++ packages/amarok/amarok.spec	Fri Jul  1 16:11:07 2011
@@ -20,6 +20,7 @@
 # Source0-md5:	4c65c5cd4d7bd267bdbef8e912fd6cb6
 Patch0:		%{name}-disable_qtscriptbindings_check_fix.patch
 Patch1:		%{name}-ffmpeg08.patch
+Patch2:		%{name}-upnp-dep.patch
 URL:		http://amarok.kde.org/
 BuildRequires:	QtNetwork-devel >= %{qtver}
 BuildRequires:	QtSql-devel >= %{qtver}
@@ -116,6 +117,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
@@ -321,6 +323,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.253  2011/07/01 14:11:07  lisu
+- add patch from gentoo
+
 Revision 1.252  2011/07/01 13:49:42  lisu
 - BR: qjson-devel >= 0.5 for Playdar Collection
 - dropped Titanium conditions

================================================================
Index: packages/amarok/amarok-upnp-dep.patch
diff -u /dev/null packages/amarok/amarok-upnp-dep.patch:1.1
--- /dev/null	Fri Jul  1 16:11:12 2011
+++ packages/amarok/amarok-upnp-dep.patch	Fri Jul  1 16:11:07 2011
@@ -0,0 +1,36 @@
+diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
+--- amarok-2.4.0.90.orig/CMakeLists.txt	2011-04-19 00:03:27.910000016 +0000
++++ amarok-2.4.0.90/CMakeLists.txt	2011-04-19 00:06:17.466666683 +0000
+@@ -105,6 +105,10 @@
+     macro_optional_find_package(QJSON)
+     macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
+ 
++    # HUpnp is required for the upnp plugin
++    macro_optional_find_package(HUpnp)
++    macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
++
+     # macro_optional_find_package(Strigi)
+     # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" )
+ 
+diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
+--- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:03:27.940000015 +0000
++++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:07:06.753333348 +0000
+@@ -25,4 +25,6 @@
+ if( QJSON_FOUND )
+     add_subdirectory( playdarcollection )
+ endif( QJSON_FOUND )
+-add_subdirectory( upnpcollection )
++if( HUPNP_FOUND )
++    add_subdirectory( upnpcollection )
++endif( HUPNP_FOUND )
+diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
+--- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake	2011-04-19 01:59:14.313333349 +0000
++++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake	2011-04-19 02:14:13.670000016 +0000
+@@ -6,7 +6,7 @@
+ # HUPNP_LIBRARIES
+ # HUPNP_FOUND
+ 
+-find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
++find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
+ 
+ find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.252&r2=1.253&f=u