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

[Eric Bélanger]

    Date: Sunday, July 12, 2009 @ 20:35:37
  Author: eric
Revision: 45593

Merged revisions 45592 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/audacious-plugins/trunk

........
  r45592 | eric | 2009-07-12 20:35:21 -0400 (Sun, 12 Jul 2009) | 2 lines
  
  upgpkg: audacious-plugins 2.1-1
      New upstream release, Changed audacious depends to makedepends (close FS#14655), Removed old patches
........

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-1.5.1-libmtp.patch
  audacious-plugins/repos/extra-x86_64/audacious-plugins-amidi.patch

--------------------------------------+
 ChangeLog                            |    7 +++++++
 PKGBUILD                             |   19 ++++++-------------
 audacious-plugins-1.5.1-libmtp.patch |   18 ------------------
 audacious-plugins-amidi.patch        |   11 -----------
 4 files changed, 13 insertions(+), 42 deletions(-)


Property changes on: audacious-plugins/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /audacious-plugins/trunk:1-36224
   + /audacious-plugins/trunk:1-45592

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-07-13 00:35:21 UTC (rev 45592)
+++ extra-x86_64/ChangeLog	2009-07-13 00:35:37 UTC (rev 45593)
@@ -1,3 +1,10 @@
+2009-07-12  Eric Belanger  <eric at archlinux.org>
+
+	* audacious-plugins 2.1-1
+	New upstream release.
+	Changed audacious depends to makedepends (close FS#14655)
+	Removed old patches
+
 2009-02-17  Eric Belanger  <eric at archlinux.org>
 
   * audacious-plugins-1.5.1-3:

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-13 00:35:21 UTC (rev 45592)
+++ extra-x86_64/PKGBUILD	2009-07-13 00:35:37 UTC (rev 45593)
@@ -3,16 +3,16 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=audacious-plugins
-pkgver=1.5.1
-pkgrel=3
+pkgver=2.1
+pkgrel=1
 pkgdesc="Plugins for Audacious"
 arch=('i686' 'x86_64')
 url="http://audacious-media-player.org/"
 license=('GPL')
-depends=('audacious' 'libmad' 'libvorbis')
+depends=('libmad' 'libvorbis')
 makedepends=('jack-audio-connection-kit' 'lame' 'fluidsynth' 'libcdio>=0.81-2' 'libsidplay' 'wavpack'
              'libmpcdec' 'taglib' 'lirc-utils' 'curl' 'libmtp>=0.3.7-1' 'sdl' 'projectm' 'imlib2'
-             'neon' 'libmms' 'gtkglext')
+             'neon' 'libmms' 'gtkglext' "audacious>=${pkgver}")
 optdepends=('jack-audio-connection-kit: JACK output plugin'
             'lame: FileWriter output plugin'
             'fluidsynth: FluidSynth backend for AMIDI-Plug input plugin'
@@ -29,20 +29,13 @@
             '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
-	audacious-plugins-1.5.1-libmtp.patch)
-md5sums=('b237754a615cf9a3d77a93bf18de26fc'
-         'd8887eb15957b106bcb84acc0e243ac9'
-         'b5344559449b9bc49331213a6052aef8')
+source=(http://distfiles.atheme.org/audacious-plugins-$pkgver.tgz)
+md5sums=('087fcb1f6fb8429b267f18ed3e3acb7a')
 
 
 build() {
   cd "$srcdir/audacious-plugins-$pkgver"
 
-  patch -Np1 -i "$srcdir/audacious-plugins-amidi.patch" || return 1
-  patch -Np1 -i "$srcdir/audacious-plugins-1.5.1-libmtp.patch" || return 1
-
   if [[ $CARCH = "i686" ]]; then
     ./configure --prefix=/usr --disable-esd --disable-arts --disable-pulse \
       --enable-amidiplug --disable-timidity --disable-adplug \

Deleted: extra-x86_64/audacious-plugins-1.5.1-libmtp.patch
===================================================================
--- extra-x86_64/audacious-plugins-1.5.1-libmtp.patch	2009-07-13 00:35:21 UTC (rev 45592)
+++ extra-x86_64/audacious-plugins-1.5.1-libmtp.patch	2009-07-13 00:35:37 UTC (rev 45593)
@@ -1,18 +0,0 @@
-diff -ur audacious-plugins-fedora-1.5.1-orig/src/mtp_up/mtp.c audacious-plugins-fedora-1.5.1/src/mtp_up/mtp.c
---- audacious-plugins-fedora-1.5.1-orig/src/mtp_up/mtp.c	2008-08-17 21:29:48.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1/src/mtp_up/mtp.c	2008-08-17 22:35:10.000000000 +0200
-@@ -192,12 +192,12 @@
- 
-     g_free(from_path);
-     g_free(tmp);
--    parent_id = mtp_device->default_music_folder;
-+    gentrack->parent_id = mtp_device->default_music_folder;
- 
- #if DEBUG
-     g_print("Uploading track '%s'\n",filename);
- #endif
--    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL, parent_id);
-+    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL);
-     LIBMTP_destroy_track_t(gentrack);
-     if (ret == 0) 
-         g_print("Track upload finished!\n");

Deleted: extra-x86_64/audacious-plugins-amidi.patch
===================================================================
--- extra-x86_64/audacious-plugins-amidi.patch	2009-07-13 00:35:21 UTC (rev 45592)
+++ extra-x86_64/audacious-plugins-amidi.patch	2009-07-13 00:35:37 UTC (rev 45593)
@@ -1,11 +0,0 @@
-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;