[arch-commits] Commit in acidrip/trunk (PKGBUILD acidrip.png xvidencopts.patch)

[Andrea Scarpino]

    Date: Wednesday, September 8, 2010 @ 10:19:40
  Author: andrea
Revision: 90153

upgpkg: acidrip 0.14-8
fix XVid bug (FS#20195)

Added:
  acidrip/trunk/acidrip.png
  acidrip/trunk/xvidencopts.patch
Modified:
  acidrip/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   45 +++++++++++++++++++++++++++------------------
 xvidencopts.patch |   14 ++++++++++++++
 2 files changed, 41 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-09-08 14:13:11 UTC (rev 90152)
+++ PKGBUILD    2010-09-08 14:19:40 UTC (rev 90153)
@@ -1,32 +1,41 @@
 # $Id$
-# Maintainer: Aaron Griffin <aa...@archlinux.org>
+# Maintainer:
+# Contributor: Aaron Griffin <aa...@archlinux.org>
 
 pkgname=acidrip
 pkgver=0.14
-pkgrel=7
+pkgrel=8
 pkgdesc="A Gtk2::Perl application for ripping and encoding DVD's"
 arch=('any')
 url="http://untrepid.com/acidrip/";
 license=('GPL')
-depends=('mplayer' 'lsdvd' 'lame' 'libdvdcss' 'gtk2-perl' 'perl>=5.10.0')
-source=(ftp://ftp.archlinux.org/other/acidrip/$pkgname-$pkgver.tar.gz
-        http://untrepid.com/acidrip/acidrip-icon4bit.png
-        acidrip.desktop crop-fixes.patch)
-md5sums=('c1c27bbf658e5c30f43e067a8ae283de' '7498602e2a3838cf35b94af85d9954d3'\
-         'f6896612df224a325d66c5f8fa8553e7' '1a8470702e2e0eda8ecbc473141aa08f')
-options=(!emptydirs)
+depends=('mplayer' 'lsdvd' 'lame' 'libdvdcss' 'gtk2-perl' 'perl')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        'acidrip.desktop' 'acidrip.png'
+       'crop-fixes.patch' 'xvidencopts.patch')
+md5sums=('c1c27bbf658e5c30f43e067a8ae283de'
+         'f6896612df224a325d66c5f8fa8553e7'
+         '7498602e2a3838cf35b94af85d9954d3'
+         '1a8470702e2e0eda8ecbc473141aa08f'
+         '8cdf13f4bf0fd7b8c3c6adfd22480706')
+options=('!emptydirs')
 
-build()
-{
-  cd $srcdir/$pkgname-$pkgver
-  patch -up1 < $srcdir/crop-fixes.patch || return 1
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/crop-fixes.patch
+  patch -Np1 -i ${srcdir}/xvidencopts.patch
+
   # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORSCRIPT=/usr/bin || return 1
-  make  || return 1
-  make install DESTDIR=${pkgdir} || return 1
+  perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORSCRIPT=/usr/bin
+  make
+}
 
-  install -Dm644 ${srcdir}/acidrip-icon4bit.png \
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+
+  install -Dm644 ${srcdir}/acidrip.png \
       ${pkgdir}/usr/share/pixmaps/acidrip.png
-  install -D -m644 ${srcdir}/acidrip.desktop \
+  install -Dm644 ${srcdir}/acidrip.desktop \
       ${pkgdir}/usr/share/applications/acidrip.desktop
 }

Added: acidrip.png
===================================================================
(Binary files differ)


Property changes on: acidrip/trunk/acidrip.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: xvidencopts.patch
===================================================================
--- xvidencopts.patch                           (rev 0)
+++ xvidencopts.patch   2010-09-08 14:19:40 UTC (rev 90153)
@@ -0,0 +1,14 @@
+diff -rauN acidrip-0.14.orig/AcidRip/acidrip.pm acidrip-0.14/AcidRip/acidrip.pm
+--- acidrip-0.14.orig/AcidRip/acidrip.pm       2004-07-25 16:03:09.000000000 
+0200
++++ acidrip-0.14/AcidRip/acidrip.pm    2005-10-28 18:46:48.429939022 +0200
+@@ -218,7 +218,9 @@
+     $menc{'video'} .= ":pass=$::settings->{'video_pass'}" if 
$::settings->{'video_passes'} > 1;
+   }
+   if ( $::settings->{'video_codec'} eq 'xvid' ) {
+-    $menc{'video'} = "-ovc xvid -xvidencopts 
$::settings->{'xvid_options'}:bitrate=$::settings->{'video_bitrate'}";
++    $menc{'video'} = "-ovc xvid -xvidencopts ";
++    $menc{'video'} .= "$::settings->{'xvid_options'}:" if 
$::settings->{'xvid_options'} ne '';
++    $menc{'video'} .= "bitrate=$::settings->{'video_bitrate'}";
+     $menc{'video'} .= ":pass=$::settings->{'video_pass'}" if 
$::settings->{'video_passes'} > 1;
+   }
+   if ( $::settings->{'video_codec'} eq 'nuv' ) {