Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b14a78a3b4d61b1df81e115868ad6d570076f5c4

commit b14a78a3b4d61b1df81e115868ad6d570076f5c4
Author: James Buren <r...@frugalware.org>
Date:   Wed Sep 21 17:47:07 2011 -0500

audacious-plugins-3.0.3-1-i686
* version bump
* revive ffaudio & scrobbler plugins
* remove deprecated or broken plugins: jack, lirc, paranormal, projectm
* fluidsynth plugin renamed to midi
* rewrite subpkg management
* most dependencies are now split into plugin subpkgs

diff --git a/source/xmultimedia-extra/audacious-plugins/FrugalBuild 
b/source/xmultimedia-extra/audacious-plugins/FrugalBuild
index 6be0b49..3e24c2c 100644
--- a/source/xmultimedia-extra/audacious-plugins/FrugalBuild
+++ b/source/xmultimedia-extra/audacious-plugins/FrugalBuild
@@ -2,91 +2,88 @@
# Maintainer: James Buren <r...@frugalware.org>

pkgname=audacious-plugins
-pkgver=2.5.4
+pkgver=3.0.3
pkgrel=1
pkgdesc="Plugins for audacious."
url="http://audacious-media-player.org";
-depends=('audacious>=2.5.4' 'flac>=1.1.4' 'libvorbis' 'unzip' 'lame' 'libmad' \
-         'libxcomposite' 'alsa-lib' 'faad2' 'libsamplerate')
-makedepends=('krb5')
-# Blue tooth disabled because of compile errors.
-conflicts=('audacious-plugin-arts' 'audacious-plugin-musepack' \
-           'audacious-plugin-bluetooth' 'audacious-plugin-lastfm' \
-           'audacious-plugin-scrobbler' 'audacious-plugin-esd' \
-           'audacious-plugin-icecast' 'audacious-plugin-ffaudio')
-replaces=(${conflicts[@]})
+rodepends=('unzip')
+depends=("audacious>=$pkgver")
+makedepends=('krb5' 'oss-libs')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
-up2date="lynx -dump '$url/downloads' | grep -o '$pkgname-\(.*\).tar.gz' | tail 
-n1 | sed 's|$pkgname-\(.*\).tar.gz|\1|'"
-source=(http://distfiles.atheme.org/$pkgname-$pkgver.tar.gz)
-sha1sums=('8aedcc58c3b5a9415345374014d809ccb9a7541a')
+up2date="Flasttar http://distfiles.atheme.org";
+source=(http://distfiles.atheme.org/$pkgname-$pkgver.tar.bz2)
+sha1sums=('12807cff9235bde8348d90d2fa9968855850ab36')
+
+# TODO: Investigate why jack & smbclient plugins cannot detect their libraries.

+subname='audacious-plugin'
+subdesc='Audacious plugin for'
+libdir='/usr/lib/audacious'

-subpkgs=( "audacious-plugin-jack" "audacious-plugin-neon"             \
-          "audacious-plugin-wavpack" "audacious-plugin-sidplay"       \
-          "audacious-plugin-mtp" "audacious-plugin-mms"               \
-          "audacious-plugin-pulseaudio" "audacious-plugin-paranormal" \
-          "audacious-plugin-adplug" "audacious-plugin-cd"             \
-          "audacious-plugin-sndfile" "audacious-plugin-cue"           \
-          "audacious-plugin-bs2b" "audacious-plugin-projectm"         \
-          "audacious-plugin-fluidsynth" "audacious-plugin-notify" )
-subdescs=( 'Audacious jack output plugin' 'Audacious neon transport plugin'  \
-           'Audacious wavpack input plugin' 'Audacious sidplay input plugin' \
-           'Audacious mtp general plugin' 'Audacious mms transport plugin'   \
-           'Audacious pulseaudio output plugin'                              \
-           'Audacious paranormal visualization plugin'                       \
-           'Audacious adplug input plugin' 'Audacious cd input plugin'       \
-           'Audacious sndfile input plugin' 'Audacious cue container plugin' \
-           'Audacious bs2b effect plugin'                                    \
-           'Audacious projectm visualization plugin'                         \
-           'Audacious fluidsynth input plugin'                               \
-           'Audacious notify general plugin' )
-subdepends=( "jack" "neon>=0.28.3" "wavpack>=4.40.0" "libsidplay libsidplay2" \
-             "libmtp" "libmms" "pulseaudio>=0.9.23 libcap>=2.19" "sdl" 
"adplug>=2.1"  \
-             "libcdio>=0.80-2" "libsndfile" "libcue>=1.4.0" "libbs2b"         \
-             "libprojectm gtkglext" "fluidsynth" "libnotify>=0.7" )
+Faddsubpkg "$subname-mtp"        "$subdesc mtp."        "libmtp"
+Faddsubpkg "$subname-mms"        "$subdesc mms."        "libmms"
+Faddsubpkg "$subname-ffaudio"    "$subdesc ffaudio."    "ffmpeg"
+Faddsubpkg "$subname-sidplay"    "$subdesc sidplay."    "libsidplay 
libsidplay2"
+Faddsubpkg "$subname-adplug"     "$subdesc adplug."     "adplug"
+Faddsubpkg "$subname-sndfile"    "$subdesc sndfile."    "libsndfile"
+Faddsubpkg "$subname-cue"        "$subdesc cue."        "libcue"
+Faddsubpkg "$subname-bs2b"       "$subdesc bs2b."       "libbs2b"
+Faddsubpkg "$subname-notify"     "$subdesc notify."     "libnotify"
+Faddsubpkg "$subname-wavpack"    "$subdesc wavpack."    "wavpack"
+Faddsubpkg "$subname-pulseaudio" "$subdesc pulseaudio." "pulseaudio"
+Faddsubpkg "$subname-neon"       "$subdesc neon."       "neon"
+Faddsubpkg "$subname-midi"       "$subdesc midi."       "fluidsynth alsa-lib"
+Faddsubpkg "$subname-scrobbler"  "$subdesc scrobbler."  "curl"
+Faddsubpkg "$subname-modplug"    "$subdesc modplug."    "libmodplug"
+Faddsubpkg "$subname-aac"        "$subdesc aac."        "faad2"
+Faddsubpkg "$subname-cd"         "$subdesc cd."         "libcdio"
+Faddsubpkg "$subname-resample"   "$subdesc resample."   "libsamplerate"
+Faddsubpkg "$subname-flac"       "$subdesc flac."       "flac"
+Faddsubpkg "$subname-vorbis"     "$subdesc vorbis."     "libvorbis"
+Faddsubpkg "$subname-mp3"        "$subdesc mp3."        "libmpg123"
+Faddsubpkg "$subname-filewriter" "$subdesc filewriter." "libvorbis flac lame"
+Faddsubpkg "$subname-alsa"       "$subdesc alsa."       "alsa-lib"
+Faddsubpkg "$subname-sdl"        "$subdesc sdl."        "sdl"

-for i in $(seq 0 $(echo ${#subpkgs[@]} - 1 | bc)); do
-  subrodepends[$i]="$pkgname=$pkgver"
-  subarchs[$i]=${archs[@]}
-  subgroups[$i]=${groups[@]}
-done
+conflicts=("$subname-arts" "$subname-musepack" "$subname-bluetooth" \
+       "$subname-lastfm" "$subname-esd" "$subname-icecast" \
+       "$subname-lirc" "$subname-paranormal" "$subname-projectm" \
+       "$subname-jack" "$subname-fluidsynth")

-if [ "$CARCH" != "ppc" ]; then
-subpkgs=("${subpkgs[@]}" 'audacious-plugin-lirc')
-subdescs=("${subdescs[@]}" 'Audacious lirc plugin')
-subdepends=("${subdepends[@]}" "lirc")
-subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver")
-subgroups=("${subgroups[@]}" 'xmultimedia-extra')
-subarchs=("${subarchs[@]}" 'i686 x86_64')
-fi
+replaces=(${conflicts[@]})

build()
{
if [ "$CARCH" == "i686" ]; then
opts="--disable-sse2"
fi
-       Fbuild --enable-usf $opts
-       Fsplit audacious-plugin-jack usr/lib/audacious/Output/jackout.so
-       if [ "$CARCH" != "ppc" ]; then
-               Fsplit audacious-plugin-lirc usr/lib/audacious/General/lirc.so
-       fi
-       Fsplit audacious-plugin-neon usr/lib/audacious/Transport/neon.so
-       Fsplit audacious-plugin-wavpack usr/lib/audacious/Input/wavpack.so
-       Fsplit audacious-plugin-sidplay usr/lib/audacious/Input/sid.so
-       Fsplit audacious-plugin-mtp usr/lib/audacious/General/mtp_up.so
-       Fsplit audacious-plugin-mms usr/lib/audacious/Transport/mms.so
-       Fsplit audacious-plugin-pulseaudio 
usr/lib/audacious/Output/pulse_audio.so
-       Fsplit audacious-plugin-paranormal 
usr/lib/audacious/Visualization/paranormal.so
-       Fsplit audacious-plugin-adplug usr/lib/audacious/Input/adplug.so
-       Fsplit audacious-plugin-cd usr/lib/audacious/Input/cdaudio-ng.so
-       Fsplit audacious-plugin-sndfile usr/lib/audacious/Input/sndfile.so
-       Fsplit audacious-plugin-cue usr/lib/audacious/Container/cue.so
-       Fsplit audacious-plugin-bs2b usr/lib/audacious/Effect/bs2b.so
-       Fsplit audacious-plugin-projectm 
usr/lib/audacious/Visualization/projectm-1.0.so
-       Fsplit audacious-plugin-fluidsynth 
usr/lib/audacious/Input/amidi-plug/ap-fluidsynth.so
-       Fsplit audacious-plugin-notify usr/lib/audacious/General/notify.so
+       Fbuild --enable-usf --enable-gio $opts
+       Fsplit $subname-mms $libdir/Transport/mms.so
+       Fsplit $subname-neon $libdir/Transport/neon.so
+       Fsplit $subname-pulseaudio $libdir/Output/pulse_audio.so
+       Fsplit $subname-cue $libdir/Container/cue.so
+       Fsplit $subname-bs2b $libdir/Effect/bs2b.so
+       Fsplit $subname-notify $libdir/General/notify.so
+       Fsplit $subname-mtp $libdir/General/mtp_up.so
+       Fsplit $subname-modplug $libdir/Input/modplug.so
+       Fsplit $subname-adplug $libdir/Input/adplug.so
+       Fsplit $subname-ffaudio $libdir/Input/ffaudio.so
+       Fsplit $subname-sidplay $libdir/Input/sid.so
+       Fsplit $subname-wavpack $libdir/Input/wavpack.so
+       Fsplit $subname-scrobbler $libdir/General/scrobbler.so
+       Fsplit $subname-midi $libdir/Input/amidi-plug{,.so}
+       Fsplit $subname-sndfile $libdir/Input/sndfile.so
+       Fsplit $subname-cd $libdir/Input/cdaudio-ng.so
+       Fsplit $subname-aac $libdir/Input/aac.so
+       Fsplit $subname-resample $libdir/Effect/resample.so
+       Fsplit $subname-flac $libdir/Input/flacng.so
+       Fsplit $subname-vorbis $libdir/Input/vorbis.so
+       Fsplit $subname-mp3 $libdir/Input/madplug.so
+       Fsplit $subname-filewriter $libdir/Output/filewriter.so
+       Fsplit $subname-alsa $libdir/Output/alsa.so
+       Fsplit $subname-sdl $libdir/Output/sdlout.so
}

# optimization OK
diff --git a/source/xmultimedia-extra/audacious-plugins/libnotify07.diff 
b/source/xmultimedia-extra/audacious-plugins/libnotify07.diff
deleted file mode 100644
index 1a92ddb..0000000
--- a/source/xmultimedia-extra/audacious-plugins/libnotify07.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur audacious-plugins-fedora-2.4.2-orig/src/notify/libnotify-aosd_osd.c 
audacious-plugins-fedora-2.4.2/src/notify/libnotify-aosd_osd.c
---- audacious-plugins-fedora-2.4.2-orig/src/notify/libnotify-aosd_osd.c        
2010-12-08 00:14:55.000000000 +0100
-+++ audacious-plugins-fedora-2.4.2/src/notify/libnotify-aosd_osd.c     
2010-12-09 19:37:35.037726989 +0100
-@@ -55,7 +55,7 @@
-       GError *error = NULL;
-
-       if(notification == NULL) {
--              notification = notify_notification_new(title, message, pb == 
NULL ? icon : NULL, NULL);
-+              notification = notify_notification_new(title, message, pb == 
NULL ? icon : NULL);
-               g_signal_connect(notification, "closed", 
G_CALLBACK(osd_closed_handler), NULL);
-               AUDDBG("new osd created! (notification=%p)\n", notification);
-       } else {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to