[arch-commits] Commit in ivtv-utils/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Giovanni Scafora]

    Date: Tuesday, December 16, 2008 @ 20:06:19
  Author: giovanni
Revision: 21882

Merged revisions 356,21880 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/ivtv-utils/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (ven, 18 apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r21880 | giovanni | 2008-12-16 17:03:01 -0800 (mar, 16 dic 2008) | 2 lines
  
  upgpkg: ivtv-utils 1.3.0-1
      New version 1.3.0
........

Modified:
  ivtv-utils/repos/extra-x86_64/	(properties)
  ivtv-utils/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   53 +++++++++++++++++++++--------------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)


Property changes on: ivtv-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ivtv-utils/trunk:1
   + /ivtv-utils/trunk:1-21880

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-17 01:04:46 UTC (rev 21881)
+++ extra-x86_64/PKGBUILD	2008-12-17 01:06:19 UTC (rev 21882)
@@ -1,43 +1,32 @@
 # $Id$
-# Contributor: Sasha Zbrozek <kleptophobiac at gmail.com>
-# Maintainer: Paul Mattal <paul at archlinux.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Andrea Scarpino <bash.lnx at gmail.com>
 
 pkgname=ivtv-utils
-pkgver=1.0.3
+pkgver=1.3.0
 pkgrel=1
-_kernver=2.6.23-ARCH
-pkgdesc="Non-mainline kernel drivers and userspace utilities for Hauppauge PVR cards"
-arch=(i686 x86_64)
+pkgdesc="Userspace utilities for Hauppauge PVR cards"
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://ivtvdriver.org"
-source=("http://dl.ivtvdriver.org/ivtv/archive/1.0.x/ivtv-$pkgver.tar.gz" \
-	'http://dl.ivtvdriver.org/ivtv/firmware/firmware.tar.gz' )
+source=(http://dl.ivtvdriver.org/ivtv/stable/$pkgname-$pkgver.tar.gz
+        http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz
+        ivtv-utils-2.6.27.patch)
 depends=('gcc-libs')
-md5sums=('2c0e04a861cb7409ea82a2935b1e0050' '9e06ccf5afec2a90aab14e8ec905a458')
-
+md5sums=('4781298cac4a3d8cfd5a8338895d102b'
+         'b9a871f1c569025be9c48a77b3515faf'
+         'af96eb672441e08816fab0d8eb25992e')
+ 
 build() {
-  # SET UP
-  cd $startdir/src/ivtv-$pkgver || return 1
-
-  # don't call depmod here
-  sed -i 's|/sbin/depmod -a||' driver/Makefile i2c-drivers/Makefile || return 1
-
-  # install the utils in /usr/bin, not /usr/local/bin
-  sed -i "s%PREFIX = /usr/local%PREFIX = /usr%g" utils/Makefile || return 1
-
-  # build
-  make INSTALLDIR=/usr/bin || return 1
-
-  # install
-  make DESTDIR=$startdir/pkg install || return 1
-
-  # remove the kernel modules in the utils package
-  rm -rf $startdir/pkg/lib/modules || return 1
-
-  # install the firmware
+  cd "$srcdir/$pkgname-$pkgver"
+ 
+  patch -Np1 -i ../ivtv-utils-2.6.27.patch
+ 
+  make || return 1
+  make DESTDIR="$pkgdir" install || return 1
+ 
   cd $startdir/src || return 1
-  for file in  v4l-cx2341x-dec.fw v4l-cx2341x-enc.fw v4l-cx2341x-init.mpg v4l-cx25840.fw v4l-pvrusb2-24xxx-01.fw v4l-pvrusb2-29xxx-01.fw
-  do
-	  install -D -m 0644 $file $startdir/pkg/lib/firmware/$file || return 1
+  for file in `ls *.fw` v4l-cx2341x-init.mpg; do
+    install -D -m644 $file "$pkgdir/lib/firmware/$file" || return 1
   done
 }