Date: Tuesday, January 8, 2013 @ 09:59:57 Author: bisson Revision: 174895
rebuild for libcdio-0.90 Added: audacious-plugins/trunk/libcdio.patch Modified: audacious-plugins/trunk/PKGBUILD ---------------+ PKGBUILD | 14 ++++++--- libcdio.patch | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-01-08 14:55:50 UTC (rev 174894) +++ PKGBUILD 2013-01-08 14:59:57 UTC (rev 174895) @@ -5,7 +5,7 @@ pkgname=audacious-plugins pkgver=3.3.3 -pkgrel=1 +pkgrel=2 pkgdesc='Plugins for Audacious' url='http://audacious-media-player.org/' license=('custom:BSD' 'GPL') @@ -13,7 +13,7 @@ makedepends=("audacious>=${pkgver}" 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' - 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' + 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack' 'libnotify' 'lirc-utils' 'curl' 'libmtp' 'neon' 'libmms' 'libcue') @@ -30,7 +30,7 @@ 'ffmpeg: ffaudio input' 'libmodplug: modplug input' 'fluidsynth: MIDI FluidSynth backend input' - 'libcdio: CD Digital Audio input' + 'libcdio-paranoia: CD Digital Audio input' 'libsidplay: Commodore 64 audio input' 'wavpack: WavPack input' @@ -43,12 +43,16 @@ 'libmms: libmms-based mms transport' 'libcue: CUE playlist format') -source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2";) -sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e') +source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2"; + 'libcdio.patch') +sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e' + '82253eff3cf268c3fa48d9e86150af44fe0e8f0e') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../libcdio.patch + ./configure \ --prefix=/usr \ --enable-amidiplug \ Added: libcdio.patch =================================================================== --- libcdio.patch (rev 0) +++ libcdio.patch 2013-01-08 14:59:57 UTC (rev 174895) @@ -0,0 +1,79 @@ +diff -aur old/src/cdaudio-ng/cdaudio-ng.c new/src/cdaudio-ng/cdaudio-ng.c +--- old/src/cdaudio-ng/cdaudio-ng.c 2012-12-10 23:49:06.000000000 +0000 ++++ new/src/cdaudio-ng/cdaudio-ng.c 2013-01-08 14:18:19.760077951 +0000 +@@ -26,7 +26,7 @@ + #include <cdio/cdio.h> + #include <cdio/cdtext.h> + #include <cdio/track.h> +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #include <cdio/audio.h> + #include <cdio/sector.h> + #include <cdio/cd_types.h> +@@ -622,23 +622,24 @@ + } + + /* get trackinfo[0] cdtext information (the disc) */ ++ cdtext_t *pcdtext = NULL; + if (aud_get_bool ("CDDA", "use_cdtext")) + { + AUDDBG ("getting cd-text information for disc\n"); +- cdtext_t *pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0); +- if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL) ++ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio); ++ if (pcdtext == NULL) + { + AUDDBG ("no cd-text available for disc\n"); + } + else + { + cdaudio_set_strinfo (&trackinfo[0], +- pcdtext->field[CDTEXT_PERFORMER] ? pcdtext-> +- field[CDTEXT_PERFORMER] : "", +- pcdtext->field[CDTEXT_TITLE] ? pcdtext-> +- field[CDTEXT_TITLE] : "", +- pcdtext->field[CDTEXT_GENRE] ? pcdtext-> +- field[CDTEXT_GENRE] : ""); ++ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, 0) ? ++ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, 0) : "", ++ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, 0) ? ++ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, 0) : "", ++ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, 0) ? ++ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, 0) : ""); + } + } + +@@ -646,27 +647,15 @@ + bool_t cdtext_was_available = FALSE; + for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) + { +- cdtext_t *pcdtext = NULL; +- if (aud_get_bool ("CDDA", "use_cdtext")) +- { +- AUDDBG ("getting cd-text information for track %d\n", trackno); +- pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, trackno); +- if (pcdtext == NULL || pcdtext->field[CDTEXT_PERFORMER] == NULL) +- { +- AUDDBG ("no cd-text available for track %d\n", trackno); +- pcdtext = NULL; +- } +- } +- + if (pcdtext != NULL) + { + cdaudio_set_strinfo (&trackinfo[trackno], +- pcdtext->field[CDTEXT_PERFORMER] ? pcdtext-> +- field[CDTEXT_PERFORMER] : "", +- pcdtext->field[CDTEXT_TITLE] ? pcdtext-> +- field[CDTEXT_TITLE] : "", +- pcdtext->field[CDTEXT_GENRE] ? pcdtext-> +- field[CDTEXT_GENRE] : ""); ++ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, trackno) ? ++ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, trackno) : "", ++ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, trackno) ? ++ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, trackno) : "", ++ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, trackno) ? ++ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, trackno) : ""); + cdtext_was_available = TRUE; + } + else
