[arch-commits] Commit in muine/repos (4 files)

[Eric Belanger]

    Date: Sunday, August 17, 2008 @ 14:23:29
  Author: eric
Revision: 9452

Merged revisions 2-9451 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/muine/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r5531 | jgc | 2008-07-18 02:37:43 -0400 (Fri, 18 Jul 2008) | 5 lines
  
  Fix dependencies on old gstreamer plugins
  Add postinstall message from rhythmbox
  Add md5sums
  clean up PKGBUILD to comply with GNOME packaging standards
........
  r9451 | eric | 2008-08-17 14:23:15 -0400 (Sun, 17 Aug 2008) | 2 lines
  
  upgpkg: muine 0.8.8-2
      fixed build problem, rebuild against faad2 2.6.1 (close FS#11234)
........

Added:
  muine/repos/extra-x86_64/disambiguate_volumebutton.diff
    (from rev 9451, muine/trunk/disambiguate_volumebutton.diff)
Modified:
  muine/repos/extra-x86_64/	(properties)
  muine/repos/extra-x86_64/PKGBUILD
  muine/repos/extra-x86_64/muine.install

--------------------------------+
 PKGBUILD                       |   22 +++++++++++-----------
 disambiguate_volumebutton.diff |   20 ++++++++++++++++++++
 muine.install                  |   18 ++++++++----------
 3 files changed, 39 insertions(+), 21 deletions(-)


Property changes on: muine/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /muine/trunk:1
   + /muine/trunk:1-9451

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-17 18:23:15 UTC (rev 9451)
+++ extra-x86_64/PKGBUILD	2008-08-17 18:23:29 UTC (rev 9452)
@@ -4,18 +4,17 @@
 
 pkgname=muine
 pkgver=0.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A music player written in C#"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.muine-player.org/"
-depends=('gnome-sharp' 'gstreamer0.10-faad>=0.10.4-2' 'desktop-file-utils'
-         'gstreamer0.10-vorbis' 'gstreamer0.10-mad' 'gstreamer0.10-flac>=0.10.5-2'
-         'gstreamer0.10-gnomevfs' 'gstreamer0.10-gconf' 'libgnomeui>=2.20.1')
+depends=('gnome-sharp' 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'libgnomeui>=2.22.1' 'libid3tag' 'faad2>=2.6.1')
 makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 install=muine.install
-source=(http://muine-player.org/releases/muine-${pkgver}.tar.gz)
+source=(http://muine-player.org/releases/muine-${pkgver}.tar.gz disambiguate_volumebutton.diff)
+md5sums=('0bf318424d35241525df701e107dd6b1' 'd25d08ac961f451cd955745067be634c')
 md5sums=('0bf318424d35241525df701e107dd6b1')
 
 build() {
@@ -24,15 +23,16 @@
   mkdir -p "${MONO_SHARED_DIR}"
  
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -p1 < ../disambiguate_volumebutton.diff || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --enable-gstreamer
+              --disable-static --enable-gstreamer || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+  make DESTDIR=${startdir}/pkg GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install || return 1
 
-  install -m755 plugins/TrayIcon.{dll,xml} ${startdir}/pkg/usr/lib/muine/plugins/
-  install -m644 plugins/muine-tray-*.png ${startdir}/pkg/usr/lib/muine/plugins/
+  install -m755 plugins/TrayIcon.{dll,xml} ${startdir}/pkg/usr/lib/muine/plugins/ || return 1
+  install -m644 plugins/muine-tray-*.png ${startdir}/pkg/usr/lib/muine/plugins/ || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }

Copied: muine/repos/extra-x86_64/disambiguate_volumebutton.diff (from rev 9451, muine/trunk/disambiguate_volumebutton.diff)
===================================================================
--- extra-x86_64/disambiguate_volumebutton.diff	                        (rev 0)
+++ extra-x86_64/disambiguate_volumebutton.diff	2008-08-17 18:23:29 UTC (rev 9452)
@@ -0,0 +1,20 @@
+--- trunk/src/PlaylistWindow.cs	2008/02/26 21:35:12	1176
++++ trunk/src/PlaylistWindow.cs	2008/02/26 21:37:01	1177
+@@ -176,7 +176,7 @@
+ 		[Glade.Widget] private Button       add_song_button   ;
+ 		[Glade.Widget] private Button       add_album_button  ;		
+ 
+-		private VolumeButton volume_button;
++		private Bacon.VolumeButton volume_button;
+ 
+ 		// Widgets :: Player
+ 		[Glade.Widget] private Label song_label;
+@@ -869,7 +869,7 @@
+ 			add_album_button  .Clicked += OnAddAlbumButtonClicked;
+ 
+ 			// Volume
+-			volume_button = new VolumeButton ();
++			volume_button = new Bacon.VolumeButton ();
+ 			volume_button_container.Add (volume_button);
+ 			volume_button.Visible = true;
+ 			volume_button.VolumeChanged += OnVolumeChanged;

Modified: extra-x86_64/muine.install
===================================================================
--- extra-x86_64/muine.install	2008-08-17 18:23:15 UTC (rev 9451)
+++ extra-x86_64/muine.install	2008-08-17 18:23:29 UTC (rev 9452)
@@ -4,15 +4,17 @@
   usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -f -t -q usr/share/icons/hicolor
+  cat << EOF
 
-  cat << _EOF
+  ==> Muine uses GStreamer to play media. By default, only plugins from
+  ==> gst-plugins-good and gst-plugins-base are installed.
+  ==>
+  ==> To play additional media formats, more plugins are available from
+  ==> gstreamer0.10-ugly-plugins, gstreamer0.10-bad-plugins 
+  ==> and gstreamer0.10-ffmpeg packages.
 
-==> Muine uses GStreamer 0.10 to play audio files.
- -> Muine is configured to play OGG, FLAC and MP3 audio files.
- -> To play additional audio formats please install the corresponding 
- -> gstreamer0.10- package for that audio format.
+EOF
 
-_EOF
 }
 
 pre_upgrade() {
@@ -31,7 +33,3 @@
   gtk-update-icon-cache -f -t -q /usr/share/icons/hicolor
   update-desktop-database -q
 }
-
-op=$1
-shift
-$op $*