rtl-sdr-git: update

4 files changed, 49 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 776e66b4370b..fc373b08a2d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = rtl-sdr-git
-	pkgdesc = Tuner for DVB-T sticks based on the Realtek RTL2832U, which can be used as a cheap SDR, since the chip allows transferring the raw I/Q samples to the host.
-	pkgver = 0.6.0.r31.ga4eab76
+	pkgdesc = Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR).
+	pkgver = 0.8.0.r2.gfe22586
 	pkgrel = 1
-	epoch = 1
-	url = https://osmocom.org/projects/rtl-sdr/wiki
+	url = https://github.com/librtlsdr/librtlsdr
+	install = rtl-sdr.install
 	arch = i686
 	arch = x86_64
 	arch = aarch64
 	license = GPL
 	makedepends = git
 	makedepends = cmake
-	depends = libusb
+	depends = libusb>=1.0
 	provides = rtl-sdr
-	source = rtl-sdr::git://git.osmocom.org/rtl-sdr.git
-	md5sums = SKIP
+	conflicts = rtl-sdr
+	source = rtl-sdr::git+https://github.com/librtlsdr/librtlsdr
+	source = rtlsdr.conf
+	sha256sums = SKIP
+	sha256sums = 678ecf05c85e79f29048c7093aee18c90e0e50dcd47ca61d842938b608ef3215
 
 pkgname = rtl-sdr-git
diff --git a/PKGBUILD b/PKGBUILD
index 81eb251422d8..1d087d09285c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,48 @@
 
 pkgname=rtl-sdr-git
 pkgrel=1
-pkgver=0.6.0.r31.ga4eab76
-epoch=1
-pkgdesc="Tuner for DVB-T sticks based on the Realtek RTL2832U, which can be used as a cheap SDR, since the chip allows transferring the raw I/Q samples to the host."
+pkgver=0.8.0.r2.gfe22586
+pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)."
 arch=('i686' 'x86_64' 'aarch64')
-url="https://osmocom.org/projects/rtl-sdr/wiki"
+url="https://github.com/librtlsdr/librtlsdr"
 license=('GPL')
-depends=('libusb')
+depends=('libusb>=1.0')
 makedepends=('git' 'cmake')
-provides=('rtl-sdr')
-source=('rtl-sdr::git://git.osmocom.org/rtl-sdr.git')
+provides=("${pkgname%%-git}")
+conflicts=("${pkgname%%-git}")
+install="${pkgname%%-git}.install"
+source=("${pkgname%%-git}::git+${url}"
+  'rtlsdr.conf')
 
 pkgver() {
-  cd "${srcdir}/rtl-sdr"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${srcdir}/${pkgname%%-git}"
+  git describe --long --tags |
+    sed 's/\([^-]*-g\)/r\1/;s/-/./g' |
+    sed s/v//
 }
 
 build() {
-  cd "${srcdir}/rtl-sdr"
+  cd "${srcdir}/${pkgname%%-git}"
   mkdir -p build
   cd build
   cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects" \
     -DDETACH_KERNEL_DRIVER=ON -Wno-dev ../
   make
 }
 
 package() {
-  cd "${srcdir}/rtl-sdr/build/"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/rtl-sdr/rtl-sdr.rules" \
-    "${pkgdir}/usr/lib/udev/rules.d/10-rtl-sdr.rules"
+  cd "${srcdir}/${pkgname%%-git}/build"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir/${pkgname%%-git}/rtl-sdr.rules" \
+    "$pkgdir/usr/lib/udev/rules.d/10-rtl-sdr.rules"
+  install -Dm644 "$srcdir/rtlsdr.conf" \
+    "$pkgdir/usr/lib/modprobe.d/rtlsdr.conf"
+
+  install -dm755 "${pkgdir}/usr/share/man/man1"
+  install -m644 "${srcdir}/${pkgname%%-git}/debian/"{rtl_adsb,rtl_eeprom,rtl_fm,rtl_power,rtl_sdr,rtl_tcp,rtl_test}".1" \
+    "${pkgdir}/usr/share/man/man1/"
 }
 
-md5sums=('SKIP')
+sha256sums=('SKIP'
+  '678ecf05c85e79f29048c7093aee18c90e0e50dcd47ca61d842938b608ef3215')
diff --git a/rtl-sdr.install b/rtl-sdr.install
new file mode 100644
index 000000000000..81635a2e6a6a
--- /dev/null
+++ b/rtl-sdr.install
@@ -0,0 +1,8 @@
+post_install() {
+  echo ">>> RTL-SDR-compatible DVB stick cannot be used for both DVB and SDR at once (driver conflict). This package provides /usr/lib/modprobe.d/rtlsdr.conf to blacklist the DVB drivers."
+}
+
+post_upgrade() {
+  post_install
+}
+
diff --git a/rtlsdr.conf b/rtlsdr.conf
new file mode 100644
index 000000000000..f3ff303440a4
--- /dev/null
+++ b/rtlsdr.conf
@@ -0,0 +1,4 @@
+# disable DVB drivers
+blacklist rtl2830
+blacklist rtl2832
+blacklist dvb_usb_rtl28xxu