[SCM] cantata/master: Update for libmusicbrainz5 transition

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Thu Jul 9 10:37:21 UTC 2015


The following commit has been merged in the master branch:
commit 90827a2b6a22be58e7d413a23ac479cb1571ee0d
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Thu Jul 9 12:36:23 2015 +0200

    Update for libmusicbrainz5 transition

diff --git a/debian/control b/debian/control
index c3044ac..c15df70 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: cmake,
                libavutil-dev,
                libcdparanoia-dev,
                libebur128-dev,
-               libmusicbrainz5-dev,
+               libmusicbrainz5-dev (>= 5.1.0+git20150707),
                libmpg123-dev,
                libmtp-dev (>= 1.0.0),
                libphonon-dev,
diff --git a/debian/patches/libmusicbrainz5cc.patch b/debian/patches/libmusicbrainz5cc.patch
new file mode 100644
index 0000000..2fb0157
--- /dev/null
+++ b/debian/patches/libmusicbrainz5cc.patch
@@ -0,0 +1,19 @@
+Description: Look for libmusicbrainz5cc instead of libmusicbrainz5.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2015-07-09
+
+--- cantata-1.5.2.ds2.orig/cmake/FindMusicBrainz5.cmake
++++ cantata-1.5.2.ds2/cmake/FindMusicBrainz5.cmake
+@@ -16,10 +16,10 @@ endif(MUSICBRAINZ5_INCLUDE_DIRS AND MUSI
+ 
+ IF (NOT WIN32)
+    find_package(PkgConfig)
+-   PKG_SEARCH_MODULE( MUSICBRAINZ5 libmusicbrainz5 )
++   PKG_SEARCH_MODULE( MUSICBRAINZ5 libmusicbrainz5cc )
+ ELSE (NOT WIN32)
+   FIND_PATH( MUSICBRAINZ5_INCLUDE_DIRS musicbrainz5/Disc.h )
+-  FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5 )
++  FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5cc )
+ ENDIF (NOT WIN32)
+ 
+ include(FindPackageHandleStandardArgs)
diff --git a/debian/patches/series b/debian/patches/series
index f0c3466..381f209 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 # only needed for Qt in wheezy
 #playeradaptor.patch
 ebur128-location.patch
+libmusicbrainz5cc.patch

-- 
cantata packaging



More information about the pkg-multimedia-commits mailing list