* [gentoo-commits] gentoo-x86 commit in media-sound/amarok/files: amarok-2.4.0.90-fix-upnp-dep.patch
@ 2011-04-20 5:05 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 3+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2011-04-20 5:05 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 11/04/20 05:05:10
Modified: amarok-2.4.0.90-fix-upnp-dep.patch
Log:
Updated upnp patch so cmake can find the HUpnp include dir.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.2 media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch?r1=1.1&r2=1.2
Index: amarok-2.4.0.90-fix-upnp-dep.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-2.4.0.90-fix-upnp-dep.patch 19 Apr 2011 02:40:12 -0000 1.1
+++ amarok-2.4.0.90-fix-upnp-dep.patch 20 Apr 2011 05:05:10 -0000 1.2
@@ -31,7 +31,7 @@
# HUPNP_FOUND
-find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
-+find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} ${KDE_INCLUDE_DIR}/HUpnpCore)
++find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-sound/amarok/files: amarok-2.4.0.90-fix-upnp-dep.patch
@ 2011-05-08 16:23 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 3+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2011-05-08 16:23 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 11/05/08 16:23:03
Removed: amarok-2.4.0.90-fix-upnp-dep.patch
Log:
Dropping the old patch.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/amarok/files: amarok-2.4.0.90-fix-upnp-dep.patch
@ 2011-04-19 2:40 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 3+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2011-04-19 2:40 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 11/04/19 02:40:15
Added: amarok-2.4.0.90-fix-upnp-dep.patch
Log:
Bumped amarok to the 2.4.0.90 release (2.4.1 beta 1).
Added a patch to get upnp support - not working yet.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.1 media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch?rev=1.1&content-type=text/plain
Index: amarok-2.4.0.90-fix-upnp-dep.patch
===================================================================
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} ${KDE_INCLUDE_DIR}/HUpnpCore)
find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-08 16:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-20 5:05 [gentoo-commits] gentoo-x86 commit in media-sound/amarok/files: amarok-2.4.0.90-fix-upnp-dep.patch Jorge Manuel B. S. Vicetto (jmbsvicetto)
-- strict thread matches above, loose matches on Subject: below --
2011-05-08 16:23 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2011-04-19 2:40 Jorge Manuel B. S. Vicetto (jmbsvicetto)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox