[arch-commits] Commit in audacious-plugins/repos (5 files)

Alexander Fehr alexanderf at archlinux.org
Mon Sep 1 19:25:16 UTC 2008


    Date: Monday, September 1, 2008 @ 15:25:14
  Author: alexanderf
Revision: 11720

Merged revisions 2-11719 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/audacious-plugins/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sa, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r11718 | alexanderf | 2008-09-01 21:20:37 +0200 (Mo, 01 Sep 2008) | 1 line
  
  upgpkg: audacious-plugins 1.5.1-1
........

Added:
  audacious-plugins/repos/extra-x86_64/audacious-plugins-amidi.patch
    (from rev 11718, audacious-plugins/trunk/audacious-plugins-amidi.patch)
Modified:
  audacious-plugins/repos/extra-x86_64/	(properties)
  audacious-plugins/repos/extra-x86_64/ChangeLog
  audacious-plugins/repos/extra-x86_64/PKGBUILD
Deleted:
  audacious-plugins/repos/extra-x86_64/audacious-plugins.install

-------------------------------+
 ChangeLog                     |   35 +++++++++++-----
 PKGBUILD                      |   85 +++++++++++++++++++---------------------
 audacious-plugins-amidi.patch |   11 +++++
 audacious-plugins.install     |   17 --------
 4 files changed, 76 insertions(+), 72 deletions(-)


Property changes on: audacious-plugins/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /audacious-plugins/trunk:1
   + /audacious-plugins/trunk:1-11719

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-09-01 19:22:53 UTC (rev 11719)
+++ extra-x86_64/ChangeLog	2008-09-01 19:25:14 UTC (rev 11720)
@@ -1,16 +1,29 @@
-2008-03-15 Travis Willard <travis at archlinux.org>
+2008-08-30  Alexander Fehr  <pizzapunk gmail com>
 
-	* 1.5.0-1
-	New upstream release.
-	Changed dependency on 'audacious-player' to 'audacious'
+  * audacious-plugins-1.5.1-1:
+  New upstream release.
+  New maintainer.
+  Changed license to GPL.
+  Cleaned up dependencies and made more of them optional.
+  Removed !libtool option.
+  Built MTP upload, RootVis and MMS plugins.
+  Enabled SSE2 for x86_64.
+  Added audacious-plugins-amidi.patch to fix AMIDI-Plug plugin.
+  Removed install file.
 
-2008-03-08 Travis Willard <travis at archlinux.org>
+2008-03-15  Travis Willard  <travis at archlinux.org>
 
-	* 1.4.5-2
-	Switched to optdepends usage for optional dependencies
+  * audacious-plugins-1.5.0-1:
+  New upstream release.
+  Changed dependency on 'audacious-player' to 'audacious'.
 
-2008-02-16 Travis Willard <travis at archlinux.org>
+2008-03-08  Travis Willard  <travis at archlinux.org>
 
-	* 1.4.5-1
-	Added ChangeLog
-	New upstream release.
+  * audacious-plugins-1.4.5-2:
+  Switched to optdepends usage for optional dependencies.
+
+2008-02-16  Travis Willard  <travis at archlinux.org>
+
+  * audacious-plugins-1.4.5-1:
+  New upstream release.
+  Added ChangeLog.

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-01 19:22:53 UTC (rev 11719)
+++ extra-x86_64/PKGBUILD	2008-09-01 19:25:14 UTC (rev 11720)
@@ -1,57 +1,54 @@
 # $Id$
-# Maintainer: Travis Willard <travisw at wmpub.ca>
+# Maintainer: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=audacious-plugins
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
-pkgdesc="Plugins for the audacious media player."
+pkgdesc="Plugins for Audacious"
 arch=('i686' 'x86_64')
 url="http://audacious-media-player.org/"
-license=('GPL3')
-depends=('audacious>=1.5.0' 'lame' 'libmcs' 'gtk2' 'libxml2' 'libvorbis' \
-         'libsidplay' 'libsndfile' 'libmpcdec>=1.2.5' 'taglib' 'flac>=1.1.4' \
-         'libmad' 'libxcomposite' 'libmowgli' 'dbus-glib' 'libcdio')
-# Makedepends: first two lines are for optdepends - they need to be present at build to be enabled
-makedepends=('jack-audio-connection-kit' 'curl>=7.16.2' 'musicbrainz' 'lirc-utils' \
-             'libmodplug' 'projectm' 'sdl' 'neon' 'wavpack' 'fluidsynth' \
-             'pkgconfig')
-optdepends=('jack-audio-connection-kit: Jack output' \
-            'curl>=7.16.2: Audioscrobbler plugin' \
-            'musicbrainz: Audioscrobbler plugin' \
-            'lirc-utils: Infra-red support' \
-            'libmodplug: Modplug plugin' \
-            'projectm: Projectm visualization plugin' \
-            'sdl: Paranormal visualization plugin' \
-            'neon: HTTP and Web-stream playback' \
-            'wavpack: Wavpack input' \
-            'fluidsynth: Fluidsynth amidi-plug backend' \
-            )
-install=audacious-plugins.install
-source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz)
-md5sums=('42c82ffffd57aca612141bc106b9f51e')
-options=('!libtool')
+license=('GPL')
+depends=('audacious' 'libmad' 'libvorbis')
+makedepends=('jack-audio-connection-kit' 'lame' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack'
+             'libmpcdec' 'taglib' 'lirc-utils' 'curl' 'libmtp' 'sdl' 'projectm' 'imlib2'
+             'neon' 'libmms')
+optdepends=('jack-audio-connection-kit: JACK output plugin'
+            'lame: FileWriter output plugin'
+            'fluidsynth: FluidSynth backend for AMIDI-Plug input plugin'
+            'libcdio: CD Audio input plugin'
+            'libsidplay: SID input plugin'
+            'wavpack: WavPack input plugin'
+            'libmpcdec: Musepack input plugin'
+            'taglib: Musepack input plugin'
+            'lirc-utils: LIRC plugin'
+            'curl: Audioscrobbler plugin'
+            'libmtp: MTP upload plugin'
+            'sdl: Paranormal and projectM visualization plugins'
+            'projectm: projectM visualization plugin'
+            'imlib2: RootVis visualization plugin'
+            'neon: HTTP transport plugin'
+            'libmms: MMS transport plugin')
+source=(http://distfiles.atheme.org/audacious-plugins-$pkgver.tbz2
+        audacious-plugins-amidi.patch)
+md5sums=('b237754a615cf9a3d77a93bf18de26fc'
+         'd8887eb15957b106bcb84acc0e243ac9')
 
 build() {
+  cd "$srcdir/audacious-plugins-$pkgver"
 
-  # NOTE TO ANYONE BUILDING THIS PKG!
-  # 
-  # Audacious and Audacious-plugins must both be built with
-  # the same CFLAGS and CXXFLAGS.  
-  # If ever strange, unexplainable playlist corruption happens, this
-  # is likely the cause - make sure both packages were built with
-  # the same flags and same version of GCC.
+  patch -Np1 -i "$srcdir/audacious-plugins-amidi.patch" || return 1
 
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --disable-esd --enable-jack \
-              --disable-timidity --enable-amidiplug \
-              --enable-chardet --enable-modplug \
-	      --enable-wavpack \
-	      --enable-fluidsynth \
-              --enable-sid --disable-sse2
+  if [[ $CARCH == "i686" ]]; then
+    ./configure --prefix=/usr --disable-esd --disable-arts --disable-pulse \
+      --enable-amidiplug --disable-timidity --disable-adplug \
+      --disable-projectm-1.0 --enable-chardet --disable-sse2 || return 1
+  elif [[ $CARCH == "x86_64" ]]; then
+    ./configure --prefix=/usr --disable-esd --disable-arts --disable-pulse \
+      --enable-amidiplug --disable-timidity --disable-adplug \
+      --disable-projectm-1.0 --enable-chardet || return 1
+  fi
 
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-} 
-
+  make DESTDIR="$pkgdir" install || return 1
+}

Copied: audacious-plugins/repos/extra-x86_64/audacious-plugins-amidi.patch (from rev 11718, audacious-plugins/trunk/audacious-plugins-amidi.patch)
===================================================================
--- extra-x86_64/audacious-plugins-amidi.patch	                        (rev 0)
+++ extra-x86_64/audacious-plugins-amidi.patch	2008-09-01 19:25:14 UTC (rev 11720)
@@ -0,0 +1,11 @@
+diff -ur audacious-plugins-1.5.1.orig/src/amidi-plug/i_configure.c audacious-plugins-1.5.1/src/amidi-plug/i_configure.c
+--- audacious-plugins-1.5.1.orig/src/amidi-plug/i_configure.c	2008-05-24 00:44:19.000000000 +0200
++++ audacious-plugins-1.5.1/src/amidi-plug/i_configure.c	2008-08-18 12:06:08.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include "i_configure-dummy.h"
+ #include "i_utils.h"
+ #include <audacious/auddrct.h>
++#include <audacious/plugin.h>
+ 
+ 
+ amidiplug_cfg_backend_t * amidiplug_cfg_backend;

Deleted: extra-x86_64/audacious-plugins.install
===================================================================
--- extra-x86_64/audacious-plugins.install	2008-09-01 19:22:53 UTC (rev 11719)
+++ extra-x86_64/audacious-plugins.install	2008-09-01 19:25:14 UTC (rev 11720)
@@ -1,17 +0,0 @@
-# $Id: audacious-plugins.install,v 1.8 2008/03/08 17:52:53 travis Exp $
-# arg 1:  the new package version
-post_install() {
-    # Run ldconfig after installation
-    #  the makefile wants to do this after make install
-    /sbin/ldconfig
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    post_install $1 
-}
-
-op=$1
-shift
-$op $*




More information about the arch-commits mailing list