merge

1 files changed, 17 insertions, 18 deletions

diff --git a/abs/core/v4l-dvb/PKGBUILD b/abs/core/v4l-dvb/PKGBUILD
index 58e9013..b853b24 100644
--- a/abs/core/v4l-dvb/PKGBUILD
+++ b/abs/core/v4l-dvb/PKGBUILD
@@ -1,26 +1,27 @@
-# Maintainer: Nicky726 (Nicky726 <at> gmail <dot> com)
+# Maintainer: Cecil Watson<knoppmyth@gmail.com>
 
 pkgname=v4l-dvb
-pkgver=20111110
+_kernver=`uname -r`
+pkgver=20120113
 pkgrel=1
-pkgdesc="V4L-DVB device drivers git version"
+pkgdesc="V4L-DVB device drivers (newer than those included in kernel)"
 arch=('i686' 'x86_64')
 url="http://linuxtv.org/"
-license=('GPL')
+license=('GPL2')
 depends=('kernel26')
-makedepends=('git' 'linux-api-headers' 'perl-proc-processtable' 'patchutils')
+makedepends=('git' 'kernel26-headers' 'perl-proc-processtable' 'patchutils')
 options=(!makeflags)
 install=v4l-dvb.install
 _gitroot="git://linuxtv.org/media_build.git"
 _gitname="media_build"
-source=(config)
+
 
 build() {
   cd "${srcdir}"
   msg "Connecting to GIT server...."
 
   if [ -d "${srcdir}/${_gitname}" ] ; then
-    cd ${_gitname} && git pull --rebase
+    cd ${_gitname} && git checkout -- . && git pull --rebase
   else
     git clone ${_gitroot}
   fi
@@ -31,20 +32,18 @@ build() {
   cd "${srcdir}/${_gitname}/linux"
   make download untar
   cd ..
-  # Build with 3.0-ARCH kernel
-  _kernver=`uname -r`
-  sed -i -e "s/KERNELRELEASE\ :=/KERNELRELEASE\ :=\ ${_kernver}/" \
-    -e "s/\$(KERNELRELEASE)/${_kernver}/" \
-    "${srcdir}/${_gitname}"/v4l/Makefile{,.sound}
-  # Use alternate config, because cx23885 module won't build
-#  cp "${srcdir}/config" "${srcdir}/${_gitname}/v4l/.config"
+
+#  Build with 3.0-ARCH kernel
+#  sed -i -e "s/KERNELRELEASE\ :=/KERNELRELEASE\ :=\ ${_kernver}/" \
+#    -e "s/\$(KERNELRELEASE)/${_kernver}/" \
+#    "${srcdir}/${_gitname}"/v4l/Makefile{,.sound}
+
   make
 }
 
 package() {
-  install -dm755 "${srcdir}/lib/modules/$(uname -r)/updates"
   cd "${srcdir}/${_gitname}"
-  make DESTDIR="${pkgdir}/lib/modules/$(uname -r)/updates" install
+  make DESTDIR="${pkgdir}" install
+  rm -fr ${pkgdir}/lib/modules/$_kernver/modules*
 }
-
-md5sums=('927cc1fcddc2a71a7fde97322237c7a8')
+md5sums=()