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

[Eric Bélanger]

    Date: Saturday, February 7, 2009 @ 18:16:46
  Author: eric
Revision: 26434

Merged revisions 26424 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/smpeg/trunk

........
  r26424 | eric | 2009-02-07 17:15:29 -0500 (Sat, 07 Feb 2009) | 2 lines
  
  upgpkg: smpeg 0.4.4-5
      Added gtk and mesa optdepends (close FS#12693), FHS man pages, Added ChangeLog
........

Added:
  smpeg/repos/extra-i686/ChangeLog
    (from rev 26424, smpeg/trunk/ChangeLog)
Modified:
  smpeg/repos/extra-i686/	(properties)
  smpeg/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   15 ++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)


Property changes on: smpeg/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /smpeg/trunk:1-19614
   + /smpeg/trunk:1-26433

Copied: smpeg/repos/extra-i686/ChangeLog (from rev 26424, smpeg/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-02-07 23:16:46 UTC (rev 26434)
@@ -0,0 +1,6 @@
+2009-02-07  Eric Belanger  <eric at archlinux.org>
+
+	* smpeg 0.4.4-5
+	* Added gtk and mesa optdepends (close FS#12693)
+	* FHS man pages
+	* Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-07 23:15:05 UTC (rev 26433)
+++ extra-i686/PKGBUILD	2009-02-07 23:16:46 UTC (rev 26434)
@@ -4,25 +4,26 @@
 
 pkgname=smpeg
 pkgver=0.4.4
-pkgrel=4
+pkgrel=5
 pkgdesc="SDL MPEG Player Library"
 arch=('i686' 'x86_64')
 url="http://icculus.org/smpeg/"
 license=('LGPL')
 depends=('sdl')
 makedepends=('gtk' 'mesa')
+optdepends=('gtk: to use gtv ' 'mesa: to use glmovie')
 options=('!libtool' '!makeflags')
-source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/$pkgname-$pkgver.tar.gz smpeg-0.4.4-gcc41.patch)
+source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz smpeg-0.4.4-gcc41.patch)
 md5sums=('59c76ac704088ef5539210190c4e1fe3' '8b979a58307d7196655758bd3d2466c4')
 sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < ../smpeg-0.4.4-gcc41.patch
-  ./configure --prefix=/usr
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 < ../smpeg-0.4.4-gcc41.patch || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make LDFLAGS+=-lstdc++ || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=${pkgdir} install || return 1
   
   #fix aclocal warnings
-  sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4
+  sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 || return 1
 }