Fix build with post-split libcdio-paranoia.

3 files changed, 46 insertions, 7 deletions

diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index cd7f218dd07..65a637a54b7 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2014/10/07 16:47:35 adam Exp $
+# $NetBSD: Makefile,v 1.68 2014/10/17 16:48:17 joerg Exp $
 #
 
 DISTNAME=	gvfs-1.6.7
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--disable-samba
 .endif
 
 .if !empty(PKG_OPTIONS:Mhal)
-.include "../../misc/libcdio/buildlink3.mk"
+.include "../../misc/libcdio-paranoia/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-hal
 CONFIGURE_ARGS+=	--enable-cdda
diff --git a/sysutils/gvfs/distinfo b/sysutils/gvfs/distinfo
index 1e06f4c333b..68acc6511d9 100644
--- a/sysutils/gvfs/distinfo
+++ b/sysutils/gvfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.22 2013/05/10 14:37:42 obache Exp $
+$NetBSD: distinfo,v 1.23 2014/10/17 16:48:17 joerg Exp $
 
 SHA1 (gvfs-1.6.7.tar.bz2) = 285a810772dce8b37289cbe0aaab8354f2b6717a
 RMD160 (gvfs-1.6.7.tar.bz2) = e833fdbc9dc503cdde8e0ab5a7a8fa5403ec1aa1
 Size (gvfs-1.6.7.tar.bz2) = 1404372 bytes
 SHA1 (patch-aa) = 37691e13b1c2edbcf1af301bfae22c6b1943efdf
 SHA1 (patch-ac) = 2168ed0d5883747e9b4e1b938ee818e6aefb8e56
-SHA1 (patch-ad) = 8c8fe33189d182e769da5092fa309f01f56a1081
+SHA1 (patch-ad) = 45e7d172fe4839018b64babdca2f8c60c7eeec70
 SHA1 (patch-ae) = 07b631786e89f38f831a1cc926818c15520fcd3b
 SHA1 (patch-ag) = 8474aed53e07f2c3899bafc278d886c41ccd04a5
 SHA1 (patch-ai) = 2246232efe91c36be8c577c1db16e80ebb45a515
diff --git a/sysutils/gvfs/patches/patch-ad b/sysutils/gvfs/patches/patch-ad
index 77583cf9338..6e3dec06c4e 100644
--- a/sysutils/gvfs/patches/patch-ad
+++ b/sysutils/gvfs/patches/patch-ad
@@ -1,8 +1,47 @@
-$NetBSD: patch-ad,v 1.1 2009/12/09 18:53:49 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2014/10/17 16:48:17 joerg Exp $
 
---- daemon/gvfsbackendcdda.c.orig	2009-07-25 22:22:03.000000000 +0200
+--- daemon/gvfsbackendcdda.c.orig	2011-03-21 15:42:18.000000000 +0000
 +++ daemon/gvfsbackendcdda.c
-@@ -194,7 +194,11 @@ find_udi_for_device (GVfsBackendCdda *cd
+@@ -55,7 +55,7 @@
+ #include "gvfsjobenumerate.h"
+ 
+ #define DO_NOT_WANT_PARANOIA_COMPATIBILITY
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/paranoia.h>
+ #include <cdio/cdio.h>
+ 
+ /* TODO:
+@@ -169,11 +169,11 @@ fetch_metadata (GVfsBackendCdda *cdda_ba
+   if (!cdio)
+     return;
+ 
+-  cdtext = cdio_get_cdtext(cdio, 0);
++  cdtext = cdio_get_cdtext(cdio);
+   if (cdtext) {
+-    cdda_backend->album_title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext));
+-    cdda_backend->album_artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext));
+-    cdda_backend->genre = g_strdup (cdtext_get (CDTEXT_GENRE, cdtext));
++    cdda_backend->album_title = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_TITLE, 0));
++    cdda_backend->album_artist = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_PERFORMER, 0));
++    cdda_backend->genre = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_GENRE, 0));
+   }
+ 
+   cdtrack = cdio_get_first_track_num(cdio);
+@@ -182,10 +182,10 @@ fetch_metadata (GVfsBackendCdda *cdda_ba
+   for ( ; cdtrack < last_cdtrack; cdtrack++ ) {
+     GVfsBackendCddaTrack *track;
+     track = g_new0 (GVfsBackendCddaTrack, 1);
+-    cdtext = cdio_get_cdtext(cdio, cdtrack);
++    cdtext = cdio_get_cdtext(cdio);
+     if (cdtext) {
+-      track->title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext));
+-      track->artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext));
++      track->title = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_TITLE, cdtrack));
++      track->artist = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_PERFORMER, cdtrack));
+     }
+     track->duration = cdio_get_track_sec_count (cdio, cdtrack) / CDIO_CD_FRAMES_PER_SEC;
+ 
+@@ -226,7 +226,11 @@ find_udi_for_device (GVfsBackendCdda *cd
    cdda_backend->hal_udi = NULL;
  
    devices = libhal_manager_find_device_string_match (cdda_backend->hal_ctx,