[SCM] gmerlin/master: Import Debian changes 1.2.0~dfsg+1-6.1

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c64b555d004e99427e5b7220a065e04b8ef6e23b
Author: Matthias Klose <doko at debian.org>
Date:   Thu Nov 16 13:47:08 2017 +0100

    Import Debian changes 1.2.0~dfsg+1-6.1
    
    gmerlin (1.2.0~dfsg+1-6.1) unstable; urgency=medium
    
      * Fix build with libcdio 0.94. Closes: #881794.

diff --git a/debian/changelog b/debian/changelog
index 53fd04c..a31237f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmerlin (1.2.0~dfsg+1-6.1) unstable; urgency=medium
+
+  * Fix build with libcdio 0.94. Closes: #881794.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 16 Nov 2017 13:47:08 +0100
+
 gmerlin (1.2.0~dfsg+1-6) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/cdio-api-fixes.patch b/debian/patches/cdio-api-fixes.patch
new file mode 100644
index 0000000..14c934b
--- /dev/null
+++ b/debian/patches/cdio-api-fixes.patch
@@ -0,0 +1,104 @@
+diff -upr gmerlin-1.2.0.orig/plugins/cdaudio/cdparanoia.c gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c
+--- gmerlin-1.2.0.orig/plugins/cdaudio/cdparanoia.c	2013-01-10 21:16:27.000000000 +0200
++++ gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c	2013-01-10 21:25:59.000000000 +0200
+@@ -28,8 +28,8 @@
+ 
+ #include "cdaudio.h"
+ #define DO_NOT_WANT_PARANOIA_COMPATIBILITY
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ 
+ /*
+  *  Ripping support
+diff -upr gmerlin-1.2.0.orig/plugins/cdaudio/cdtext.c gmerlin-1.2.0/plugins/cdaudio/cdtext.c
+--- gmerlin-1.2.0.orig/plugins/cdaudio/cdtext.c	2013-01-10 21:16:27.000000000 +0200
++++ gmerlin-1.2.0/plugins/cdaudio/cdtext.c	2013-01-10 21:25:27.000000000 +0200
+@@ -34,7 +34,7 @@
+ #include "cdaudio.h"
+ 
+ #define GET_FIELD(dst, key) \
+-  field = cdtext_get_const(key, cdtext);
++  field = cdtext_get_const(cdtext, key, i+1);
+ 
+ #define GET_FIELD_DEFAULT(dst,key)                                      \
+   field = cdtext_get_const(key, cdtext);                                \
+@@ -64,30 +64,26 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+ 
+   /* Get information for the whole disc */
+   
+-  cdtext = cdio_get_cdtext (cdio, 0);
++  cdtext = cdio_get_cdtext (cdio);
+ 
+   if(!cdtext)
+     return 0;
+   
+-  artist  = cdtext_get_const(CDTEXT_PERFORMER, cdtext);
+-  author  = cdtext_get_const(CDTEXT_COMPOSER, cdtext); /* Composer overwrites songwriter */
++  artist  = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, 0);
++  author  = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, 0); /* Composer overwrites songwriter */
+ 
+   if(!author)
+-    author  = cdtext_get_const(CDTEXT_SONGWRITER, cdtext);
++    author  = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, 0);
+   
+-  album  = cdtext_get_const(CDTEXT_TITLE, cdtext);
+-  genre  = cdtext_get_const(CDTEXT_GENRE, cdtext);
+-  comment  = cdtext_get_const(CDTEXT_MESSAGE, cdtext);
++  album  = cdtext_get_const(cdtext, CDTEXT_FIELD_TITLE, 0);
++  genre  = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, 0);
++  comment  = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, 0);
+   
+   for(i = 0; i < idx->num_tracks; i++)
+     {
+     if(idx->tracks[i].is_audio)
+       {
+-      cdtext = cdio_get_cdtext (cdio, i+1);
+-      if(!cdtext)
+-        return 0;
+-      
+-      GET_FIELD(title, CDTEXT_TITLE);
++      GET_FIELD(title, CDTEXT_FIELD_TITLE);
+       
+       if(!title)
+         return 0;
+@@ -95,7 +91,7 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+       gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                         GAVL_META_TITLE, title);
+ 
+-      if((field = cdtext_get_const(CDTEXT_PERFORMER, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_ARTIST, field);
+       else
+@@ -103,10 +99,10 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+                           GAVL_META_ARTIST, artist);
+ 
+ 
+-      if((field = cdtext_get_const(CDTEXT_COMPOSER, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_AUTHOR, field);
+-      else if((field = cdtext_get_const(CDTEXT_SONGWRITER, cdtext)))
++      else if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_AUTHOR, field);
+       else if(author)
+@@ -114,14 +110,14 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+                           GAVL_META_AUTHOR, author);
+ 
+ 
+-      if((field = cdtext_get_const(CDTEXT_GENRE, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_GENRE, field);
+       else
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_GENRE, genre);
+ 
+-      if((field = cdtext_get_const(CDTEXT_MESSAGE, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_COMMENT, field);
+       else
diff --git a/debian/patches/series b/debian/patches/series
index a9ff39d..f2ee7da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ binutils_gold.patch
 strip_doc_out.patch
 hardening_ldflags.patch
 fix_transcoder_track.patch
+cdio-api-fixes.patch

-- 
gmerlin packaging