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

[Jan de Groot]

    Date: Thursday, May 21, 2009 @ 10:24:22
  Author: jgc
Revision: 39826

Merged revisions 356,39761 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/lsdvd/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r39761 | jgc | 2009-05-21 13:31:55 +0200 (Thu, 21 May 2009) | 2 lines
  
  upgpkg: lsdvd 0.16-4
      Fix prefix, fix manpath, build with new libdvdread
........

Modified:
  lsdvd/repos/extra-i686/	(properties)
  lsdvd/repos/extra-i686/PKGBUILD
Deleted:
  lsdvd/repos/extra-i686/palette_loop.patch

--------------------+
 PKGBUILD           |   17 ++++++++---------
 palette_loop.patch |   12 ------------
 2 files changed, 8 insertions(+), 21 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-21 14:24:07 UTC (rev 39825)
+++ extra-i686/PKGBUILD	2009-05-21 14:24:22 UTC (rev 39826)
@@ -3,22 +3,21 @@
 
 pkgname=lsdvd
 pkgver=0.16
-pkgrel=3
+pkgrel=4
 pkgdesc="lsdvd is a C application for reading the contents of a DVD and printing the contents to your terminal"
 arch=(i686 x86_64)
 url="http://untrepid.com/acidrip/lsdvd.html"
-depends=('libdvdread')
+depends=('libdvdread>=4.1.3')
 license=('GPL2')
 #Special thanks to Mathieu Clabaut <mathieu.clabaut at gmail.com> for patches
-source=(http://downloads.sourceforge.net/lsdvd/$pkgname-$pkgver.tar.gz \
+source=(http://downloads.sourceforge.net/lsdvd/${pkgname}-${pkgver}.tar.gz
         stdint_usage.patch)
 md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7' '6cbcbfde873f894bd3c784f65141b2fc')
 
-build()
-{
-  cd $startdir/src/$pkgname-$pkgver
-  patch -up1 < ../stdint_usage.patch
-  ./configure
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/stdint_usage.patch" || return 1
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make DESTDIR="${pkgdir}" install || return 1
 }

Deleted: extra-i686/palette_loop.patch
===================================================================
--- extra-i686/palette_loop.patch	2009-05-21 14:24:07 UTC (rev 39825)
+++ extra-i686/palette_loop.patch	2009-05-21 14:24:22 UTC (rev 39826)
@@ -1,12 +0,0 @@
-This patch fixes a silly looping oversight
---- lsdvd.c	2005-04-13 16:34:34.000000000 -0500
-+++ lsdvd.c	2006-01-11 00:32:55.000000000 -0600
-@@ -320,7 +320,7 @@
- 		// PALETTE
- 		if (opt_P) {
- 			dvd_info.titles[j].palette = malloc(16 * sizeof(int));
--        	        for (i=1; i < 18; i++) { dvd_info.titles[j].palette[i] = pgc->palette[i]; }
-+        	        for (i=0; i < 16; i++) { dvd_info.titles[j].palette[i] = pgc->palette[i]; }
- 		} else {
- 			dvd_info.titles[j].palette = NULL;
- 		}