Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/240517491ff7b7996182550fe3378781c13d86c4)

2 files changed, 13 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48728dba1b49..f440dd009f40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = dddvb-dkms
 	pkgdesc = Official Digital Devices driver package as DKMS
-	pkgver = 0.9.19c
+	pkgver = 0.9.20
 	pkgrel = 1
-	url = http://download.digital-devices.de/download/linux/
+	url = http://download.digital-devices.de
 	install = dddvb-dkms.install
 	arch = i686
 	arch = x86_64
@@ -16,8 +16,8 @@ pkgbase = dddvb-dkms
 	replaces = digitaldevices-dvb-drivers
 	replaces = dvbsky-dvb-drivers
 	replaces = technotrend-dvb-drivers
-	source = http://download.digital-devices.de/download/linux/dddvb-0.9.19c.tar.bz2
-	md5sums = 6b759c1d8cb733a58009dc61ecd36141
+	source = https://github.com/DigitalDevices/dddvb/archive/0.9.20.tar.gz
+	md5sums = 9ad46fe47ba464081b1fe6e07ba6149d
 
 pkgname = dddvb-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index b170e0930a91..7422ab4d15fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@
 _pkgbase="dddvb"
 pkgname="dddvb-dkms"
 pkgdesc="Official Digital Devices driver package as DKMS"
-pkgver=0.9.19c
+pkgver=0.9.20
 pkgrel=1
 arch=("i686" "x86_64")
-url="http://download.digital-devices.de/download/linux/"
+url="http://download.digital-devices.de"
 license=("GPL2")
 depends=("dkms")
 makedepends=('linux-headers')
@@ -15,8 +15,8 @@ replaces=('digitaldevices-dvb-drivers' 'dvbsky-dvb-drivers' 'technotrend-dvb-dri
 conflicts=('digitaldevices-dvb-drivers' 'dvbsky-dvb-drivers' 'technotrend-dvb-drivers')
 provides=('dddvb-dkms')
 install="${pkgname}.install"
-source=("http://download.digital-devices.de/download/linux/$_pkgbase-$pkgver.tar.bz2")
-md5sums=('6b759c1d8cb733a58009dc61ecd36141')
+source=("https://github.com/DigitalDevices/$_pkgbase/archive/$pkgver.tar.gz")
+md5sums=('9ad46fe47ba464081b1fe6e07ba6149d')
 
 prepare() {
   cd "$srcdir"
@@ -27,13 +27,14 @@ prepare() {
   echo 'MAKE="make"' >> dkms.conf
   echo 'CLEAN="make clean"' >> dkms.conf
 
-  cd "$srcdir/$_pkgbase"
+  cd "$srcdir/$_pkgbase-$pkgver"
   sed -i '/eth_rebuild_header/d' dvb-core/dvb_net.c
   sed -i '/apps/d' Makefile
+  sed -i 's/CONFIG_DVB_OCTONET=m//' Makefile
 }
 
 build() {
-  cd "$srcdir/$_pkgbase"
+  cd "$srcdir/$_pkgbase-$pkgver"
   make
 
   # Borrowed from dahdi-linux
@@ -47,12 +48,13 @@ build() {
   done
 
   make clean
+  find -name modules.order -delete
 }
 
 package() {
   install -D -m 0644 "$srcdir/dkms.conf" "$pkgdir/usr/src/$_pkgbase-$pkgver/dkms.conf"
 
-  cd "$srcdir/$_pkgbase"
+  cd "$srcdir/$_pkgbase-$pkgver"
 
   cp -a * "$pkgdir/usr/src/$_pkgbase-$pkgver"
 }