[arch-commits] Commit in bmp/repos (3 files)

[Eric Bélanger]

    Date: Tuesday, March 17, 2009 @ 00:28:32
  Author: eric
Revision: 30190

Fixed svn conflict

Modified:
  bmp/repos/extra-i686/	(properties)
  bmp/repos/extra-i686/PKGBUILD
Deleted:
  bmp/repos/extra-i686/0.9.7-visualization.patch

---------------------------+
 0.9.7-visualization.patch |   12 ------------
 PKGBUILD                  |   24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 23 deletions(-)


Property changes on: bmp/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /bmp/trunk:1
   + /bmp/trunk:1-30189

Deleted: extra-i686/0.9.7-visualization.patch
===================================================================
--- extra-i686/0.9.7-visualization.patch	2009-03-17 04:26:00 UTC (rev 30189)
+++ extra-i686/0.9.7-visualization.patch	2009-03-17 04:28:32 UTC (rev 30190)
@@ -1,12 +0,0 @@
---- beep/vis.c	2004-12-04 10:04:29.000000000 +0100
-+++ beep/vis.c	2005-02-17 12:02:25.391044008 +0100
-@@ -223,7 +223,8 @@ vis_draw(Widget * w)
-     /* FIXME: The check "shouldn't" be neccessary? */
-     /*	if (GTK_IS_WINDOW(vis->vs_window)) { */
-     GDK_THREADS_ENTER();
--    gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-+    if (GDK_IS_DRAWABLE(vis->vs_window))
-+        gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-                            vis->vs_widget.x, vis->vs_widget.y,
-                            vis->vs_widget.width, vis->vs_widget.height,
-                            GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-17 04:26:00 UTC (rev 30189)
+++ extra-i686/PKGBUILD	2009-03-17 04:28:32 UTC (rev 30190)
@@ -4,22 +4,24 @@
 
 pkgname=bmp
 pkgver=0.9.7.1
-pkgrel=4
+pkgrel=5
 pkgdesc="gtk2 port of xmms"
 arch=(i686 x86_64)
-url="http://bmp.beep-media-player.org/"
-depends=('esd' 'id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip')
-source=(http://dl.sourceforge.net/sourceforge/beepmp/$pkgname-$pkgver.tar.gz $pkgver-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
+url="http://sourceforge.net/projects/beepmp/"
+license=('GPL')
+depends=('esound' 'id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip')
+makedepends=('libxt')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
 md5sums=('c25d5a8d49cc5851d13d525a20023c4c' 'fa1bdf5a8d03e8539a6bed5caa471176'\
          '42ad4109ddb66024d4c6d1f3e572ab86')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p0 -i ../${pkgver}-visualization.patch
-  patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch
-  ./configure --prefix=/usr
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p0 -i ../${pkgver}-visualization.patch || return 1
+  patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
 }
 # vim: ts=2 sw=2 et ft=sh