audacious-plugins: updated to 3.3.4

7 files changed, 30 insertions, 2 deletions

diff --git a/audio-plugins/audacious-plugins/DEPENDS b/audio-plugins/audacious-plugins/DEPENDS
index 5c58a86580..a5813e9fcf 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -108,9 +108,13 @@ optional_depends libcdio \
                  "--disable-cdaudio" \
                  "Enable CD Audio Plugin?" &&
 
+optional_depends libcdio-paranoia \
+                 "" "" \
+                 "Needed for CD Audio plugin" &&
+
 optional_depends libcddb \
                  "" "" \
-                 "Needed for CD Audio plugin?" &&
+                 "Needed for CD Audio plugin" &&
 
 optional_depends libmms \
                  "--enable-mms" \
diff --git a/audio-plugins/audacious-plugins/DETAILS b/audio-plugins/audacious-plugins/DETAILS
index 219c30eedd..7b59299593 100755
--- a/audio-plugins/audacious-plugins/DETAILS
+++ b/audio-plugins/audacious-plugins/DETAILS
@@ -1,5 +1,5 @@
            SPELL=audacious-plugins
-         VERSION=3.3.2
+         VERSION=3.3.4
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/audio-plugins/audacious-plugins/HISTORY b/audio-plugins/audacious-plugins/HISTORY
index afa8d7e9e7..aa95191538 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,8 @@
+2013-02-17 Robin Cook <rcook@wyrms.net>
+	* DETAILS: updated VERSION to 3.3.4
+	* DEPENDS: added optional depends libcdio-paranoia
+	* PRE_BUILD: apply patch to correctly find cdda.h
+
 2012-10-19 Robin Cook <rcook@wyrms.net>
 	* DETAILS: updated VERSION to 3.3.2
 	* DEPENDS: updated with new depends
diff --git a/audio-plugins/audacious-plugins/PRE_BUILD b/audio-plugins/audacious-plugins/PRE_BUILD
new file mode 100755
index 0000000000..6a08469527
--- /dev/null
+++ b/audio-plugins/audacious-plugins/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY  &&
+patch -p1 < $SPELL_DIRECTORY/cdda.patch
diff --git a/audio-plugins/audacious-plugins/audacious-plugins-3.3.2.tar.bz2.sig b/audio-plugins/audacious-plugins/audacious-plugins-3.3.2.tar.bz2.sig
deleted file mode 100644
index 0ea820e44f..0000000000
--- a/audio-plugins/audacious-plugins/audacious-plugins-3.3.2.tar.bz2.sig
+++ /dev/null
diff --git a/audio-plugins/audacious-plugins/audacious-plugins-3.3.4.tar.bz2.sig b/audio-plugins/audacious-plugins/audacious-plugins-3.3.4.tar.bz2.sig
new file mode 100644
index 0000000000..d4a7947427
--- /dev/null
+++ b/audio-plugins/audacious-plugins/audacious-plugins-3.3.4.tar.bz2.sig
diff --git a/audio-plugins/audacious-plugins/cdda.patch b/audio-plugins/audacious-plugins/cdda.patch
new file mode 100644
index 0000000000..5780e96378
--- /dev/null
+++ b/audio-plugins/audacious-plugins/cdda.patch
@@ -0,0 +1,16 @@
+diff -ur audacious-plugins-3.3.4/src/cdaudio-ng/cdaudio-ng.c audacious-plugins-mod/src/cdaudio-ng/cdaudio-ng.c
+--- audacious-plugins-3.3.4/src/cdaudio-ng/cdaudio-ng.c	2013-02-03 14:09:33.000000000 -0600
++++ audacious-plugins-mod/src/cdaudio-ng/cdaudio-ng.c	2013-02-17 20:43:38.505087973 -0600
+@@ -29,12 +29,7 @@
+ #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