[gentoo-commits] gentoo-x86 commit in media-sound/cantata/files: cantata-1.0.3-audiocd-automagic.patch cantata-1.0.3-system-qjson.patch

[gentoo-commits] gentoo-x86 commit in media-sound/cantata/files: cantata-1.0.3-audiocd-automagic.patch cantata-1.0.3-system-qjson.patch

[Johannes Huber (johu)]

johu        13/06/14 23:23:18

  Added:                cantata-1.0.3-audiocd-automagic.patch
                        cantata-1.0.3-system-qjson.patch
  Log:
  Fix several dep issues by Nikoli <nikoli@lavabit.com> wrt bug #472140.
  
  (Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

Revision  Changes    Path
1.1                  media-sound/cantata/files/cantata-1.0.3-audiocd-automagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cantata/files/cantata-1.0.3-audiocd-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cantata/files/cantata-1.0.3-audiocd-automagic.patch?rev=1.1&content-type=text/plain

Index: cantata-1.0.3-audiocd-automagic.patch
===================================================================
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 2749)
+++ CMakeLists.txt	(revision 2750)
@@ -33,6 +33,10 @@
 OPTION(ENABLE_UDISKS2 "Build UDisks2 backend, and NOT UDisks, for Qt builds" OFF)
 OPTION(ENABLE_OVERLAYSCROLLBARS "Enable support for overlay style scrollbars when using QGtkStyle (Linux only)" OFF)
 OPTION(ENABLE_ONLINE_SERVICES "Enable support for online services (Jamendo and Magantune)" ON)
+OPTION(ENABLE_CDPARANOIA "Enable CDParanoia libraries (required for AudioCD support)" ON)
+OPTION(ENABLE_CDDB "Enable CDDB libraries (either this or MusicBrianz required for AudioCD support)" ON)
+OPTION(ENABLE_MUSICBRAINZ "Enable MusicBrianz libraries (either this or CDDB required for AudioCD support)" ON)
+OPTION(ENABLE_LAME "Enable LAME libraries (required for AudioCD playback support)" ON)
 
 if (ENABLE_QT5)
     set(ENABLE_PHONON FALSE)
@@ -142,12 +146,20 @@
     SET( CANTATA_UIS ${CANTATA_UIS} online/onlineservicespage.ui)
 endif (ENABLE_ONLINE_SERVICES)
 
-find_package( Cdparanoia )
-if (CDPARANOIA_FOUND) 
-    find_package( CDDB )
-    find_package( MusicBrainz5 )
-    find_package( Lame )
-endif (CDPARANOIA_FOUND)
+if (ENABLE_CDPARANOIA)
+    find_package(Cdparanoia)
+    if (CDPARANOIA_FOUND) 
+        if (ENABLE_CDDB)
+            find_package(CDDB)
+        endif (ENABLE_CDDB)
+        if (ENABLE_MUSICBRAINZ)
+            find_package(MusicBrainz5)
+        endif (ENABLE_MUSICBRAINZ)
+        if (ENABLE_LAME)
+            find_package(Lame)
+        endif (ENABLE_LAME)
+    endif (CDPARANOIA_FOUND)
+endif (ENABLE_CDPARANOIA)
 
 if (ENABLE_TAGLIB)
     set(TAGLIB_MIN_VERSION "1.6")



1.1                  media-sound/cantata/files/cantata-1.0.3-system-qjson.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cantata/files/cantata-1.0.3-system-qjson.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cantata/files/cantata-1.0.3-system-qjson.patch?rev=1.1&content-type=text/plain

Index: cantata-1.0.3-system-qjson.patch
===================================================================
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 2794)
+++ CMakeLists.txt	(revision 2795)
@@ -166,6 +166,10 @@
     find_package(Taglib)
 endif (ENABLE_TAGLIB)
 
+if (NOT ENABLE_QT5 AND NOT WIN32)
+    find_package( QJSON )
+endif (NOT ENABLE_QT5 AND NOT WIN32)
+
 if (ENABLE_OVERLAYSCROLLBARS)
     add_definitions(-DENABLE_OVERLAYSCROLLBARS)
 endif (ENABLE_OVERLAYSCROLLBARS)
@@ -495,9 +499,17 @@
 endif (NOT WIN32)
 
 add_subdirectory(3rdparty/qtiocompressor)
-add_subdirectory(3rdparty/qjson)
-TARGET_LINK_LIBRARIES(cantata qtiocompressor qjson)
 
+if (QJSON_FOUND)
+    include_directories(${QJSON_INCLUDE_DIR})
+    TARGET_LINK_LIBRARIES(cantata ${QJSON_LIBRARIES})
+else (QJSON_FOUND)
+    add_subdirectory(3rdparty/qjson)
+    TARGET_LINK_LIBRARIES(cantata qjson)
+endif (QJSON_FOUND)
+
+TARGET_LINK_LIBRARIES(cantata qtiocompressor)
+
 ADD_SUBDIRECTORY( icons )
 
 target_link_libraries(cantata support sha2 ${QTLIBS} ${ZLIB_LIBRARIES})

[gentoo-commits] gentoo-x86 commit in media-sound/cantata/files: cantata-1.0.3-audiocd-automagic.patch cantata-1.0.3-system-qjson.patch

[Manuel Rueger (mrueg)]

mrueg       14/01/08 04:20:06

  Removed:              cantata-1.0.3-audiocd-automagic.patch
                        cantata-1.0.3-system-qjson.patch
  Log:
  Version bump. Thanks to Nikoli. Fixes bug #497152. Remove unused patches, too.
  
  (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key )