[Lunar-commits] <moonbase> audacious: fix all bugs by using Ubuntu patches

Paul Bredbury brebs at lunar-linux.org
Fri Sep 4 16:22:15 CEST 2009


commit fe9f10e2731d13c4c3bf379ed69afc8d93f83ad3
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Fri Sep 4 21:22:15 2009 +0700

    audacious: fix all bugs by using Ubuntu patches
    
    Audacious 2 segfaults at startup, which isn't very good.
    
    Ubuntu's audacious 1.5.1 works great. So here it is. No, Ubuntu is not evil ;)
---
 audio/audacious-plugins/BUILD   |    9 ++++++-
 audio/audacious-plugins/DEPENDS |   47 ++++++++++++++++++++++----------------
 audio/audacious-plugins/DETAILS |   21 ++++++++++-------
 audio/audacious/BUILD           |   14 +++++++++--
 audio/audacious/DEPENDS         |   12 +++++++--
 audio/audacious/DETAILS         |   17 ++++++++-----
 audio/audacious/POST_INSTALL    |    1 +
 7 files changed, 78 insertions(+), 43 deletions(-)

diff --git a/audio/audacious-plugins/BUILD b/audio/audacious-plugins/BUILD
index 4935091..1de5da5 100644
--- a/audio/audacious-plugins/BUILD
+++ b/audio/audacious-plugins/BUILD
@@ -1,6 +1,13 @@
 (
 
-  OPTS="$OPTS --enable-ipv6"
+  # Ubuntu's patches
+  patch_it $SOURCE2 1             &&
+  patch_it debian/patches/001* 1  &&
+  patch_it debian/patches/002* 1  &&
+  patch_it debian/patches/003* 1  &&
+  patch_it debian/patches/090* 1  &&
+
+  OPTS+=" --enable-ipv6"  &&
 
   default_build
 
diff --git a/audio/audacious-plugins/DEPENDS b/audio/audacious-plugins/DEPENDS
index 31ad769..73d25b8 100644
--- a/audio/audacious-plugins/DEPENDS
+++ b/audio/audacious-plugins/DEPENDS
@@ -1,87 +1,94 @@
-depends  audacious  &&
-depends libcddb &&
-
 optional_depends  "alsa-lib"                      \
                   ""                              \
                   "--disable-alsa"                \
-                  "for ALSA input plugin"         &&
+                  "for ALSA output plugin"
+
+optional_depends  "dbus-glib"                     \
+                  ""                              \
+                  "--disable-dbus"                \
+                  "for DBUS support, required for some Audacious functionality"
 
 optional_depends  "libmad"                        \
                   ""                              \
                   ""                              \
-                  "for MP3 playback"              &&
+                  "for MP3 playback"
 
 optional_depends  "flac"                          \
                   ""                              \
                   "--disable-flac"                \
-                  "for FLAC input plugin"         &&
+                  "for FLAC input plugin"
 
 optional_depends  "libvorbis"                     \
                   ""                              \
                   ""                              \
-                  "for Ogg Vorbis input plugin"   &&
+                  "for Ogg Vorbis input plugin"
 
 optional_depends  "libmpcdec"                     \
                   ""                              \
                   ""                              \
-                  "for Musepack input plugin"     &&
+                  "for Musepack input plugin"
 
 optional_depends  "taglib"                        \
                   ""                              \
                   ""                              \
-                  "required if you use musepack"  &&
+                  "required if you use musepack"
 
 optional_depends  "arts"                          \
                   ""                              \
                   "--disable-arts"                \
-                  "for arts (KDE) output plugin"  &&
+                  "for arts (KDE) output plugin"
 
 optional_depends  "jack"                          \
                   ""                              \
                   "--disable-jack"                \
-                  "for JACK output plugin"        &&
+                  "for JACK output plugin"
 
 optional_depends  "esound"                        \
                   ""                              \
                   "--disable-esd"                 \
-                  "for esound output plugin"      &&
+                  "for esound output plugin"
 
 optional_depends  "pulseaudio"                    \
                   ""                              \
                   "--disable-pulse"               \
-                  "for PulseAudio output plugin"  &&
+                  "for PulseAudio output plugin"
 
 optional_depends  "libmodplug"                    \
                   ""                              \
                   ""                              \
-                  "for ModPlug plugin"            &&
+                  "for ModPlug plugin"
 
 optional_depends  "lirc"                          \
                   ""                              \
                   "--disable-lirc"                \
-                  "for LIRC plugin"               &&
+                  "for LIRC plugin"
 
 optional_depends  "timidity++"                    \
                   ""                              \
                   ""                              \
-                  "for timidity plugin"           &&
+                  "for timidity plugin"
 
 optional_depends  "libsndfile"                    \
                   ""                              \
                   ""                              \
-                  "for sndfile extensions"        &&
+                  "for sndfile extensions"
 
 optional_depends  "curl"                          \
                   ""                              \
                   ""                              \
-                  "for audio scrobbler support"   &&
+                  "for audio scrobbler support"
 
 optional_depends  "lame"                          \
                   ""                              \
                   ""                              \
-                  "for lame encoder support"     && 
+                  "for lame encoder support"
 
 optional_depends  "libcdio"                       \
                   ""                              \
                   ""                              \
-                  "for CD playback"                              
+                  "for CD playback"
+
+optional_depends  "SDL"                           \
+                  ""                              \
+                  ""                              \
+                  "for Paranormal and projectM visualization plugins"
diff --git a/audio/audacious-plugins/DETAILS b/audio/audacious-plugins/DETAILS
index c07a794..5150595 100644
--- a/audio/audacious-plugins/DETAILS
+++ b/audio/audacious-plugins/DETAILS
@@ -1,19 +1,22 @@
           MODULE=audacious-plugins
          VERSION=1.5.1
-          SOURCE=$MODULE-$VERSION.tgz
-        WEB_SITE=http://audacious-media-player.org
-      SOURCE_URL=http://distfiles.atheme.org/
+          SOURCE=$MODULE\_$VERSION.orig.tar.gz
+         SOURCE2=$MODULE\_$VERSION-2ubuntu3.diff.gz
+        WEB_SITE=http://audacious-media-player.org/
+      SOURCE_URL=http://archive.ubuntu.com/ubuntu/pool/universe/a/audacious-plugins/
+     SOURCE2_URL=http://archive.ubuntu.com/ubuntu/pool/universe/a/audacious-plugins/
       SOURCE_VFY=sha1:630c936027c66649795cac7327cf6ab3590d3e49
+     SOURCE2_VFY=sha1:5b5aefe01c23a6c942e25044327131368642abb6
          ENTERED=20061024
-         UPDATED=20090322
-           SHORT="A lot of plugins for Audacious"
-      MAINTAINER=jannis at lunar-linux.org
+         UPDATED=20090904
+           SHORT="plugins for the audacious media player"
+      MAINTAINER=brebs at lunar-linux.org
 
 cat << EOF
-Audacious is a media player based on XMMS (http://www.xmms.org). The 
+Audacious is a media player based on XMMS ( http://www.xmms.org/ ). The
 primary goals of this fork are UI enhancements with latest technology
 (eg GTK2 and Pango), and usability while maintaining the skinned UI.
 
-The content of this package is a couple of plugins for the Audacious'
-work.
+This module provides essential plugins for audio input, audio output,
+and visualization.
 EOF
diff --git a/audio/audacious/BUILD b/audio/audacious/BUILD
index 89faf59..e180bf6 100644
--- a/audio/audacious/BUILD
+++ b/audio/audacious/BUILD
@@ -1,7 +1,15 @@
 (
-  # Disable GnomeVFS support (broken ever since it was invented, at least 
-  # if we can trust the Audacious developers)
-  OPTS="$OPTS --disable-gnome-vfs"
+
+  # Ubuntu's patches
+  patch_it $SOURCE2 1                               &&
+  patch_it debian/patches/000* 1                    &&
+  patch_it debian/patches/001* 1                    &&
+  patch_it debian/patches/003* 1                    &&
+  patch_it debian/patches/004* 1                    &&
+  patch_it debian/patches/audacious-play-*.patch 1  &&
+  patch_it debian/patches/bugzilla-42.patch 1       &&
+  patch_it debian/patches/005* 1                    &&
+  patch_it debian/patches/Update-Spanish-*.patch 1  &&
 
   default_build
 
diff --git a/audio/audacious/DEPENDS b/audio/audacious/DEPENDS
index 4d91b06..1f650e0 100644
--- a/audio/audacious/DEPENDS
+++ b/audio/audacious/DEPENDS
@@ -1,7 +1,13 @@
-depends  libglade  &&
-depends  libmcs     &&
+depends  libmcs
+depends  libxml2
+depends  gtk+-2
+
+optional_depends  "dbus-glib"                   \
+                  ""                            \
+                  "--disable-dbus"              \
+                  "for DBUS support, required for some Audacious functionality"
 
 optional_depends  "libsamplerate"               \
                   "--enable-samplerate"         \
                   ""                            \
-                  "for sample rate conversion"
+                  "for sample-rate conversion"
diff --git a/audio/audacious/DETAILS b/audio/audacious/DETAILS
index f4689fe..8eee53f 100644
--- a/audio/audacious/DETAILS
+++ b/audio/audacious/DETAILS
@@ -1,16 +1,19 @@
           MODULE=audacious
          VERSION=1.5.1
-          SOURCE=$MODULE-$VERSION.tgz
-        WEB_SITE=http://audacious-media-player.org
-      SOURCE_URL=http://distfiles.atheme.org/
+          SOURCE=$MODULE\_$VERSION.orig.tar.gz
+         SOURCE2=$MODULE\_$VERSION-4ubuntu3.diff.gz
+        WEB_SITE=http://audacious-media-player.org/
+      SOURCE_URL=http://archive.ubuntu.com/ubuntu/pool/universe/a/audacious/
+     SOURCE2_URL=http://archive.ubuntu.com/ubuntu/pool/universe/a/audacious/
       SOURCE_VFY=sha1:3c3cb3a4f9997f5ab3a6b4937260b2899c844806
+     SOURCE2_VFY=sha1:59e951bcd5a5418f76a80cb29c57d836b74df059
          ENTERED=20060613
-         UPDATED=20090322
-           SHORT="A GTK+-2 port of XMMS"
-      MAINTAINER=jannis at lunar-linux.org
+         UPDATED=20090904
+           SHORT="GTK+-2 port of XMMS"
+      MAINTAINER=brebs at lunar-linux.org
 
 cat << EOF
-Audacious is a media player based on XMMS (http://www.xmms.org). The 
+Audacious is a media player based on XMMS ( http://www.xmms.org/ ). The
 primary goals of this fork are UI enhancements with latest technology
 (eg GTK2 and Pango), and usability while maintaining the skinned UI.
 EOF
diff --git a/audio/audacious/POST_INSTALL b/audio/audacious/POST_INSTALL
new file mode 100644
index 0000000..050948a
--- /dev/null
+++ b/audio/audacious/POST_INSTALL
@@ -0,0 +1 @@
+lin -c audacious-plugins


More information about the Lunar-commits mailing list