Include advice from M-Reimer and resolved namcap issues

1 files changed, 35 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e347e981d974..ffeb00bcaf16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,49 @@
 # Maintainer: ohli <olifriedrich at gmail dot com>
+# Contributor: Manuel Reimer <manuel.reimer@gmx.de>
 
 pkgname=w_scan_cpp
 pkgver=20211128
-provides=("w_scan")
-conflicts=("w_scan")
-pkgrel=1
+pkgrel=2
+
+# These are versions of dependencies used by w_scan_cpp
+_wirbelscan_version=wirbelscan-2021.11.28
+_satip_gitver=a89ad423e9a3994572d3bbbbf2958b470afa8de1
+_vdr_gitver=0d50ec57f50375c8fda92d117e348dd8fd5a77a9
+
 pkgdesc="A dtv channel scanner based on VDR. Successor of w_scan"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://www.gen2vdr.de/wirbel/w_scan_cpp/index2.html"
-replaces=('w_scan')
 license=('GPL')
-depends=('glibc' 'libcap' 'freetype2' 'fontconfig' 'pugixml' 'librepfunc')
-makedepends=('sed' 'make' 'wget' 'git' 'pango')
-source=("https://www.gen2vdr.de/wirbel/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('c3a859a42f338d9c4bbdde2883e32989cd02f72bf2c31bfb18f7b6b23fc61254')
+depends=('freetype2' 'fontconfig' 'pugixml' 'librepfunc' 'libjpeg' 'curl')
+makedepends=('git' 'pango')
+source=("https://www.gen2vdr.de/wirbel/$pkgname/$pkgname-$pkgver.tar.bz2"
+        "https://www.gen2vdr.de/wirbel/wirbelscan/vdr-${_wirbelscan_version}.tgz"
+        "git://git.tvdr.de/vdr.git#commit=$_vdr_gitver"
+        "git+https://github.com/wirbel-at-vdr-portal/vdr-plugin-satip.git#commit=$_satip_gitver"
+       )
+sha256sums=('c3a859a42f338d9c4bbdde2883e32989cd02f72bf2c31bfb18f7b6b23fc61254'
+            'f1005d1cccba77faacd294723240656fd7bad7987f0cf4a9728cc527fd7db76a'
+            'SKIP'
+            'SKIP')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # Copy VDR source into place
+  cp -a "$srcdir/vdr" .
+  rm -rf "vdr/.git"
+  mkdir -p "vdr/PLUGINS/src"
+  mkdir -p "vdr/PLUGINS/lib"
+
+  # Copy plugin sources into place
+  cp -a "$srcdir/vdr-plugin-satip" "vdr/PLUGINS/src"
+  ln -s "vdr-plugin-satip" "vdr/PLUGINS/src/satip"
+  cp -a "$srcdir/$_wirbelscan_version" "vdr/PLUGINS/src"
+  ln -s "$_wirbelscan_version" "vdr/PLUGINS/src/wirbelscan"
+}
 
 build() {
   cd "$pkgname-$pkgver"
-  make -j1 download
   make
 }