Merge branch 'master' of https://aur.archlinux.org/dsd-louiserigherve-git

3 files changed, 55 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54eeea1d00db..ab0c7f2b5ed4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,25 @@
 pkgbase = dsd-git
-	pkgdesc = Decoder for P25, ProVoice, X2-TDMA, DMR/MOTOTRBO, NXDN
-	pkgver = 1.6.0.r91.gf175834
+	pkgdesc = Decoder for P25 Phase 1, D-STAR, NXDN/IDAS, ProVoice, DMR/MOTOTRBO, X2-TDMA, dPMR (LouisErigHerve's fork).
+	pkgver = 1.6.0.r111.g5077daf
 	pkgrel = 1
-	url = https://github.com/szechyjs/dsd
-	arch = i686
+	url = https://github.com/LouisErigHerve/dsd
 	arch = x86_64
-	license = custom:copyright
+	license = GPL2
+	license = ISC
+	makedepends = cmake
+	makedepends = git
+	makedepends = help2man
+	depends = gcc-libs
+	depends = glibc
+	depends = itpp
+	depends = libsndfile
 	depends = mbelib
 	depends = portaudio
-	depends = itpp
+	provides = dsd-louiserigherve
 	provides = dsd
+	conflicts = dsd-louiserigherve
 	conflicts = dsd
-	source = dsd::git+https://github.com/szechyjs/dsd.git
-	md5sums = SKIP
+	source = dsd-louiserigherve::git+https://github.com/LouisErigHerve/dsd
+	sha256sums = SKIP
 
 pkgname = dsd-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a22cc89847ff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!*.install
+!*.patch
+!*.service
+!*.conf.d
diff --git a/PKGBUILD b/PKGBUILD
index 1b034d71528a..d1a0e4e7c638 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,41 @@
-# Maintainer: Kiril Zyapkov <kiril.zyapkov@gmail.com>
-_pkgbase=dsd
-pkgname=$_pkgbase-git
-pkgver=1.6.0.r91.gf175834
+# Maintainer:  lmbbrkr <lmbbrkr at protonmail dot ch>
+# Contributor: Marcell Meszaros < marcell.meszaros AT runbox.eu >
+# Contributor: Kiril Zyapkov <kiril.zyapkov@gmail.com>
+
+pkgname=dsd-git
+_forkname=dsd-louiserigherve
+pkgver=1.6.0.r111.g5077daf
 pkgrel=1
-pkgdesc="Decoder for P25, ProVoice, X2-TDMA, DMR/MOTOTRBO, NXDN"
-arch=('i686' 'x86_64')
-url="https://github.com/szechyjs/dsd"
-license=('custom:copyright')
-depends=('mbelib' 'portaudio' 'itpp')
-provides=('dsd')
-conflicts=('dsd')
-source=("$_pkgbase::git+https://github.com/szechyjs/dsd.git")
-md5sums=('SKIP')
+pkgdesc="Decoder for P25 Phase 1, D-STAR, NXDN/IDAS, ProVoice, DMR/MOTOTRBO, X2-TDMA, dPMR (LouisErigHerve's fork)."
+arch=('x86_64')
+url="https://github.com/LouisErigHerve/dsd"
+license=('GPL2' 'ISC')
+depends=('gcc-libs' 'glibc' 'itpp' 'libsndfile' 'mbelib' 'portaudio')
+makedepends=('cmake' 'git' 'help2man')
+provides=("${_forkname}" 'dsd')
+conflicts=("${_forkname}" 'dsd')
+source=("${_forkname}::git+${url}")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_pkgbase"
-  # disable $HOME to prevent git to use user's configuration
-  HOME=/dev/null git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${_forkname}"
+  printf "%s" "$(HOME=/dev/null git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')"
 }
 
 build() {
-    cd "$srcdir/$_pkgbase"
-    mkdir -p build
-    cd build
-    cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ../
-    make
+  cd "${_forkname}"
+  cmake -B build ./ \
+    -Wno-dev \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  sed -i 's|help2man -n|help2man --no-discard-stderr -n|' build/CMakeFiles/dsd.dir/build.make
+  make -C build
 }
 
 package() {
-    cd "$srcdir/$_pkgbase/build"
-    make DESTDIR="$pkgdir" install
-
-    cd "$srcdir/$_pkgbase"
-    install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+  cd "${_forkname}"
+  make -C build DESTDIR="${pkgdir}/" install
+  install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et: