amarok-upnp-dep.patch

   1 diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
   2 --- amarok-2.4.0.90.orig/CMakeLists.txt 2011-04-19 00:03:27.910000016 +0000
   3 +++ amarok-2.4.0.90/CMakeLists.txt      2011-04-19 00:06:17.466666683 +0000
   4 @@ -105,6 +105,10 @@
   5      macro_optional_find_package(QJSON)
   6      macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
   7
   8 +    # HUpnp is required for the upnp plugin
   9 +    macro_optional_find_package(HUpnp)
  10 +    macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
  11 +
  12      # We tell users that we need 1.0.3, but we really check just >= 1.0.0. This is because
  13      # upstream forgot to update version in lastfm/global.h, so it looks like 1.0.2. :-(
  14      # will be fixed in liblastfm-1.0.4
  15 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
  16 --- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt       2011-04-19 00:03:27.940000015 +0000
  17 +++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt    2011-04-19 00:07:06.753333348 +0000
  18 @@ -25,5 +25,7 @@
  19  if( QJSON_FOUND )
  20      add_subdirectory( playdarcollection )
  21  endif( QJSON_FOUND )
  22 -add_subdirectory( upnpcollection )
  23 +if( HUPNP_FOUND )
  24 +    add_subdirectory( upnpcollection )
  25 +endif( HUPNP_FOUND )
  26  add_subdirectory( nepomukcollection )
  27 diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
  28 --- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake  2011-04-19 01:59:14.313333349 +0000
  29 +++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake       2011-04-19 02:14:13.670000016 +0000
  30 @@ -6,7 +6,7 @@
  31  # HUPNP_LIBRARIES
  32  # HUPNP_FOUND
  33
  34 -find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
  35 +find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
  36
  37  find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})