Date: Sat, 09 Aug 2014 15:36:34 +0200 From: Barbara Guida <barbara.freebsd@gmail.com> To: Tilman Keskinoz <arved@FreeBSD.org> Cc: gnome@FreeBSD.org Subject: Re: svn commit: r364423 - in head: audio/aqualung audio/clementine-player audio/cmus audio/cripple audio/deadbeef audio/musicpd audio/mythplugin-mythmusic audio/sound-juicer audio/xmms2 devel/gvfs emul... Message-ID: <53E623E2.80602@gmail.com> In-Reply-To: <53e5f2c0.26e4.68103fa9@svn.freebsd.org> References: <53e5f2c0.26e4.68103fa9@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000207090100020308040609 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Tilman Keskinoz wrote: > Author: arved > Date: Sat Aug 9 10:06:54 2014 > New Revision: 364423 > URL: http://svnweb.freebsd.org/changeset/ports/364423 > QAT: https://qat.redports.org/buildarchive/r364423/ > > Log: > Chase library dependencies after libcdio <-> libcdio-paranoia split > > PR: 192271 > > Modified: > head/devel/gvfs/Makefile Hi Tilman, devel/gvfs is not building on my box, because a .h file has been moved and something changed in cdtext.h and disc.h. I had to wrote a patch for daemon/gvfsbackendcdda.c I don't know if it's 100% correct, mainly because I don't know how to test it, but at least it builds. Please consider the attached diff. CCing also to devel/gvfs maintainer(s) (gnome@FreeBSD.org) Regards Barbara --------------000207090100020308040609 Content-Type: text/x-patch; name="devel_gvfs.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="devel_gvfs.diff" Index: devel/gvfs/files/patch-daemon_gvfsbackendcdda.c =================================================================== --- devel/gvfs/files/patch-daemon_gvfsbackendcdda.c (revision 0) +++ devel/gvfs/files/patch-daemon_gvfsbackendcdda.c (working copy) @@ -0,0 +1,50 @@ +--- daemon/gvfsbackendcdda.c.orig 2012-05-15 20:01:50.000000000 +0200 ++++ daemon/gvfsbackendcdda.c 2014-08-09 15:10:30.000000000 +0200 +@@ -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: +@@ -161,7 +161,7 @@ + static void + fetch_metadata (GVfsBackendCdda *cdda_backend) + { +- CdIo *cdio; ++ CdIo_t *cdio; + track_t cdtrack, last_cdtrack; + const cdtext_t *cdtext; + +@@ -169,11 +169,11 @@ + 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 @@ + 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; + Property changes on: devel/gvfs/files/patch-daemon_gvfsbackendcdda.c ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property --------------000207090100020308040609--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53E623E2.80602>