[arch-commits] Commit in audacious-plugins/repos (6 files)
Gaetan Bisson
bisson at nymeria.archlinux.org
Mon Feb 4 00:32:24 UTC 2013
Date: Monday, February 4, 2013 @ 01:32:24
Author: bisson
Revision: 177007
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
audacious-plugins/repos/extra-i686/PKGBUILD
(from rev 177005, audacious-plugins/trunk/PKGBUILD)
audacious-plugins/repos/extra-x86_64/PKGBUILD
(from rev 177006, audacious-plugins/trunk/PKGBUILD)
Deleted:
audacious-plugins/repos/extra-i686/PKGBUILD
audacious-plugins/repos/extra-i686/libcdio.patch
audacious-plugins/repos/extra-x86_64/PKGBUILD
audacious-plugins/repos/extra-x86_64/libcdio.patch
----------------------------+
extra-i686/PKGBUILD | 132 ++++++++++++++++++++-----------------------
extra-i686/libcdio.patch | 111 ------------------------------------
extra-x86_64/PKGBUILD | 132 ++++++++++++++++++++-----------------------
extra-x86_64/libcdio.patch | 111 ------------------------------------
4 files changed, 128 insertions(+), 358 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-02-04 00:32:16 UTC (rev 177006)
+++ extra-i686/PKGBUILD 2013-02-04 00:32:24 UTC (rev 177007)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=audacious-plugins
-pkgver=3.3.3
-pkgrel=3
-pkgdesc='Plugins for Audacious'
-url='http://audacious-media-player.org/'
-license=('custom:BSD' 'GPL')
-arch=('i686' 'x86_64')
-
-makedepends=("audacious>=${pkgver}"
- 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
- 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
- 'libnotify' 'lirc-utils' 'curl' 'libmtp'
- 'neon' 'libmms' 'libcue')
-
-optdepends=('oss: Open Sound System v4 output'
- 'alsa-lib: Advanced Linux Sound Arch. output'
- 'pulseaudio: PulseAudio output'
- 'jack2: Jack Audio Connection Kit output'
- 'lame: FileWriter MP3 output'
- 'libvorbis: Vorbis input, FileWriter Vorbis output'
- 'flac: FLAC input, FileWriter FLAC output'
-
- 'mpg123: MP3 input'
- 'faad2: AAC input'
- 'ffmpeg: ffaudio input'
- 'libmodplug: modplug input'
- 'fluidsynth: MIDI FluidSynth backend input'
- 'libcdio-paranoia: CD Digital Audio input'
- 'libsidplay: Commodore 64 audio input'
- 'wavpack: WavPack input'
-
- 'libnotify: libnotify OSD'
- 'lirc-utils: LIRC'
- 'curl: AudioScrobbler Client'
- 'libmtp: Upload to MTP device'
-
- 'neon: neon-based http transport'
- 'libmms: libmms-based mms transport'
- 'libcue: CUE playlist format')
-
-source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2"
- 'libcdio.patch')
-sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e'
- '56977393425c98183d8c69540ac80545fc4ba19a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i ../libcdio.patch
-
- ./configure \
- --prefix=/usr \
- --enable-amidiplug \
- --disable-adplug \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: audacious-plugins/repos/extra-i686/PKGBUILD (from rev 177005, audacious-plugins/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-02-04 00:32:24 UTC (rev 177007)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=audacious-plugins
+pkgver=3.3.4
+pkgrel=1
+pkgdesc='Plugins for Audacious'
+url='http://audacious-media-player.org/'
+license=('custom:BSD' 'GPL')
+arch=('i686' 'x86_64')
+
+makedepends=("audacious>=${pkgver}"
+ 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
+ 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
+ 'libnotify' 'lirc-utils' 'curl' 'libmtp'
+ 'neon' 'libmms' 'libcue')
+
+optdepends=('oss: Open Sound System v4 output'
+ 'alsa-lib: Advanced Linux Sound Arch. output'
+ 'pulseaudio: PulseAudio output'
+ 'jack2: Jack Audio Connection Kit output'
+ 'lame: FileWriter MP3 output'
+ 'libvorbis: Vorbis input, FileWriter Vorbis output'
+ 'flac: FLAC input, FileWriter FLAC output'
+
+ 'mpg123: MP3 input'
+ 'faad2: AAC input'
+ 'ffmpeg: ffaudio input'
+ 'libmodplug: modplug input'
+ 'fluidsynth: MIDI FluidSynth backend input'
+ 'libcdio-paranoia: CD Digital Audio input'
+ 'libsidplay: Commodore 64 audio input'
+ 'wavpack: WavPack input'
+
+ 'libnotify: libnotify OSD'
+ 'lirc-utils: LIRC'
+ 'curl: AudioScrobbler Client'
+ 'libmtp: Upload to MTP device'
+
+ 'neon: neon-based http transport'
+ 'libmms: libmms-based mms transport'
+ 'libcue: CUE playlist format')
+
+source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('6493f051417a201fc0e2de7ef36a709676f96607')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure \
+ --prefix=/usr \
+ --enable-amidiplug \
+ --disable-adplug \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-i686/libcdio.patch
===================================================================
--- extra-i686/libcdio.patch 2013-02-04 00:32:16 UTC (rev 177006)
+++ extra-i686/libcdio.patch 2013-02-04 00:32:24 UTC (rev 177007)
@@ -1,111 +0,0 @@
-diff --git a/src/cdaudio-ng/cdaudio-ng.c b/src/cdaudio-ng/cdaudio-ng.c
-index 925b847..e986839 100644
---- a/src/cdaudio-ng/cdaudio-ng.c
-+++ b/src/cdaudio-ng/cdaudio-ng.c
-@@ -26,11 +26,16 @@
- #include <cdio/cdio.h>
- #include <cdio/cdtext.h>
- #include <cdio/track.h>
--#include <cdio/cdda.h>
- #include <cdio/audio.h>
- #include <cdio/sector.h>
- #include <cdio/cd_types.h>
-
-+#if LIBCDIO_VERSION_NUM >= 90
-+#include <cdio/paranoia/cdda.h>
-+#else
-+#include <cdio/cdda.h>
-+#endif
-+
- /* libcdio's header files #define these */
- #undef PACKAGE
- #undef PACKAGE_BUGREPORT
-@@ -269,9 +274,9 @@ static void cdaudio_set_strinfo (trackinfo_t * t,
- const char * performer, const char * name,
- const char * genre)
- {
-- g_strlcpy (t->performer, performer, DEF_STRING_LEN);
-- g_strlcpy (t->name, name, DEF_STRING_LEN);
-- g_strlcpy (t->genre, genre, DEF_STRING_LEN);
-+ g_strlcpy (t->performer, performer ? performer : "", DEF_STRING_LEN);
-+ g_strlcpy (t->name, name ? name : "", DEF_STRING_LEN);
-+ g_strlcpy (t->genre, genre ? genre : "", DEF_STRING_LEN);
- }
-
- /* thread safe (mutex may be locked) */
-@@ -622,23 +627,32 @@ static void scan_cd (void)
- }
-
- /* 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 LIBCDIO_VERSION_NUM >= 90
-+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
-+ if (pcdtext == NULL)
-+#else
-+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
- if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL)
-+#endif
- {
- 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] : "");
-+#if LIBCDIO_VERSION_NUM >= 90
-+ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, 0),
-+ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, 0),
-+ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, 0));
-+#else
-+ pcdtext->field[CDTEXT_PERFORMER],
-+ pcdtext->field[CDTEXT_TITLE],
-+ pcdtext->field[CDTEXT_GENRE]);
-+#endif
- }
- }
-
-@@ -646,7 +660,7 @@ static void scan_cd (void)
- bool_t cdtext_was_available = FALSE;
- for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
- {
-- cdtext_t *pcdtext = NULL;
-+#if LIBCDIO_VERSION_NUM < 90
- if (aud_get_bool ("CDDA", "use_cdtext"))
- {
- AUDDBG ("getting cd-text information for track %d\n", trackno);
-@@ -657,16 +671,20 @@ static void scan_cd (void)
- pcdtext = NULL;
- }
- }
-+#endif
-
- 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] : "");
-+#if LIBCDIO_VERSION_NUM >= 90
-+ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, trackno),
-+ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, trackno),
-+ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, trackno));
-+#else
-+ pcdtext->field[CDTEXT_PERFORMER],
-+ pcdtext->field[CDTEXT_TITLE],
-+ pcdtext->field[CDTEXT_GENRE]);
-+#endif
- cdtext_was_available = TRUE;
- }
- else
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-02-04 00:32:16 UTC (rev 177006)
+++ extra-x86_64/PKGBUILD 2013-02-04 00:32:24 UTC (rev 177007)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=audacious-plugins
-pkgver=3.3.3
-pkgrel=3
-pkgdesc='Plugins for Audacious'
-url='http://audacious-media-player.org/'
-license=('custom:BSD' 'GPL')
-arch=('i686' 'x86_64')
-
-makedepends=("audacious>=${pkgver}"
- 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
- 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
- 'libnotify' 'lirc-utils' 'curl' 'libmtp'
- 'neon' 'libmms' 'libcue')
-
-optdepends=('oss: Open Sound System v4 output'
- 'alsa-lib: Advanced Linux Sound Arch. output'
- 'pulseaudio: PulseAudio output'
- 'jack2: Jack Audio Connection Kit output'
- 'lame: FileWriter MP3 output'
- 'libvorbis: Vorbis input, FileWriter Vorbis output'
- 'flac: FLAC input, FileWriter FLAC output'
-
- 'mpg123: MP3 input'
- 'faad2: AAC input'
- 'ffmpeg: ffaudio input'
- 'libmodplug: modplug input'
- 'fluidsynth: MIDI FluidSynth backend input'
- 'libcdio-paranoia: CD Digital Audio input'
- 'libsidplay: Commodore 64 audio input'
- 'wavpack: WavPack input'
-
- 'libnotify: libnotify OSD'
- 'lirc-utils: LIRC'
- 'curl: AudioScrobbler Client'
- 'libmtp: Upload to MTP device'
-
- 'neon: neon-based http transport'
- 'libmms: libmms-based mms transport'
- 'libcue: CUE playlist format')
-
-source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2"
- 'libcdio.patch')
-sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e'
- '56977393425c98183d8c69540ac80545fc4ba19a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i ../libcdio.patch
-
- ./configure \
- --prefix=/usr \
- --enable-amidiplug \
- --disable-adplug \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: audacious-plugins/repos/extra-x86_64/PKGBUILD (from rev 177006, audacious-plugins/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-02-04 00:32:24 UTC (rev 177007)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=audacious-plugins
+pkgver=3.3.4
+pkgrel=1
+pkgdesc='Plugins for Audacious'
+url='http://audacious-media-player.org/'
+license=('custom:BSD' 'GPL')
+arch=('i686' 'x86_64')
+
+makedepends=("audacious>=${pkgver}"
+ 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
+ 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
+ 'libnotify' 'lirc-utils' 'curl' 'libmtp'
+ 'neon' 'libmms' 'libcue')
+
+optdepends=('oss: Open Sound System v4 output'
+ 'alsa-lib: Advanced Linux Sound Arch. output'
+ 'pulseaudio: PulseAudio output'
+ 'jack2: Jack Audio Connection Kit output'
+ 'lame: FileWriter MP3 output'
+ 'libvorbis: Vorbis input, FileWriter Vorbis output'
+ 'flac: FLAC input, FileWriter FLAC output'
+
+ 'mpg123: MP3 input'
+ 'faad2: AAC input'
+ 'ffmpeg: ffaudio input'
+ 'libmodplug: modplug input'
+ 'fluidsynth: MIDI FluidSynth backend input'
+ 'libcdio-paranoia: CD Digital Audio input'
+ 'libsidplay: Commodore 64 audio input'
+ 'wavpack: WavPack input'
+
+ 'libnotify: libnotify OSD'
+ 'lirc-utils: LIRC'
+ 'curl: AudioScrobbler Client'
+ 'libmtp: Upload to MTP device'
+
+ 'neon: neon-based http transport'
+ 'libmms: libmms-based mms transport'
+ 'libcue: CUE playlist format')
+
+source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('6493f051417a201fc0e2de7ef36a709676f96607')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure \
+ --prefix=/usr \
+ --enable-amidiplug \
+ --disable-adplug \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/libcdio.patch
===================================================================
--- extra-x86_64/libcdio.patch 2013-02-04 00:32:16 UTC (rev 177006)
+++ extra-x86_64/libcdio.patch 2013-02-04 00:32:24 UTC (rev 177007)
@@ -1,111 +0,0 @@
-diff --git a/src/cdaudio-ng/cdaudio-ng.c b/src/cdaudio-ng/cdaudio-ng.c
-index 925b847..e986839 100644
---- a/src/cdaudio-ng/cdaudio-ng.c
-+++ b/src/cdaudio-ng/cdaudio-ng.c
-@@ -26,11 +26,16 @@
- #include <cdio/cdio.h>
- #include <cdio/cdtext.h>
- #include <cdio/track.h>
--#include <cdio/cdda.h>
- #include <cdio/audio.h>
- #include <cdio/sector.h>
- #include <cdio/cd_types.h>
-
-+#if LIBCDIO_VERSION_NUM >= 90
-+#include <cdio/paranoia/cdda.h>
-+#else
-+#include <cdio/cdda.h>
-+#endif
-+
- /* libcdio's header files #define these */
- #undef PACKAGE
- #undef PACKAGE_BUGREPORT
-@@ -269,9 +274,9 @@ static void cdaudio_set_strinfo (trackinfo_t * t,
- const char * performer, const char * name,
- const char * genre)
- {
-- g_strlcpy (t->performer, performer, DEF_STRING_LEN);
-- g_strlcpy (t->name, name, DEF_STRING_LEN);
-- g_strlcpy (t->genre, genre, DEF_STRING_LEN);
-+ g_strlcpy (t->performer, performer ? performer : "", DEF_STRING_LEN);
-+ g_strlcpy (t->name, name ? name : "", DEF_STRING_LEN);
-+ g_strlcpy (t->genre, genre ? genre : "", DEF_STRING_LEN);
- }
-
- /* thread safe (mutex may be locked) */
-@@ -622,23 +627,32 @@ static void scan_cd (void)
- }
-
- /* 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 LIBCDIO_VERSION_NUM >= 90
-+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
-+ if (pcdtext == NULL)
-+#else
-+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
- if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL)
-+#endif
- {
- 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] : "");
-+#if LIBCDIO_VERSION_NUM >= 90
-+ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, 0),
-+ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, 0),
-+ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, 0));
-+#else
-+ pcdtext->field[CDTEXT_PERFORMER],
-+ pcdtext->field[CDTEXT_TITLE],
-+ pcdtext->field[CDTEXT_GENRE]);
-+#endif
- }
- }
-
-@@ -646,7 +660,7 @@ static void scan_cd (void)
- bool_t cdtext_was_available = FALSE;
- for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
- {
-- cdtext_t *pcdtext = NULL;
-+#if LIBCDIO_VERSION_NUM < 90
- if (aud_get_bool ("CDDA", "use_cdtext"))
- {
- AUDDBG ("getting cd-text information for track %d\n", trackno);
-@@ -657,16 +671,20 @@ static void scan_cd (void)
- pcdtext = NULL;
- }
- }
-+#endif
-
- 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] : "");
-+#if LIBCDIO_VERSION_NUM >= 90
-+ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, trackno),
-+ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, trackno),
-+ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, trackno));
-+#else
-+ pcdtext->field[CDTEXT_PERFORMER],
-+ pcdtext->field[CDTEXT_TITLE],
-+ pcdtext->field[CDTEXT_GENRE]);
-+#endif
- cdtext_was_available = TRUE;
- }
- else
More information about the arch-commits
mailing list