update to work with GNU Radio 3.9

2 files changed, 8 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cad06dc86525..cd28ddeb5d3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gr-osmosdr-git
 	pkgdesc = GNU Radio source block for OsmoSDR, which is a 100% Free Software based small form-factor inexpensive SDR (Software Defined Radio) project.
-	pkgver = 0.1.4.48.g86ad584
+	pkgver = d77577
 	pkgrel = 1
 	url = http://sdr.osmocom.org/trac/
 	arch = i686
@@ -9,7 +9,7 @@ pkgbase = gr-osmosdr-git
 	makedepends = git
 	makedepends = cmake
 	makedepends = boost
-	makedepends = python2-cheetah
+	makedepends = python-cheetah3
 	depends = gnuradio
 	depends = swig
 	depends = rtl-sdr
@@ -19,7 +19,7 @@ pkgbase = gr-osmosdr-git
 	depends = airspy-git
 	provides = gr-osmosdr
 	provides = gnuradio-osmosdr
-	source = git://git.osmocom.org/gr-osmosdr
+	source = git+https://github.com/drmpeg/gr-osmosdr39.git
 	md5sums = SKIP
 
 pkgname = gr-osmosdr-git
diff --git a/PKGBUILD b/PKGBUILD
index 824d9f6842aa..bd2b94886984 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Modified from rtl-sdr-git PKGBUILD
 
 pkgname=gr-osmosdr-git
-pkgver=0.1.4.48.g86ad584
+pkgver=d77577
 pkgrel=1
 pkgdesc="GNU Radio source block for OsmoSDR, which is a 100% Free Software based small form-factor inexpensive SDR (Software Defined Radio) project."
 arch=('i686' 'x86_64')
@@ -22,57 +22,30 @@ makedepends=(
     'git'
     'cmake'
     'boost'
-    'python2-cheetah'
+    'python-cheetah3'
     )
 #optdepends=()
 provides=('gr-osmosdr' 'gnuradio-osmosdr')
 
-source=('git://git.osmocom.org/gr-osmosdr')
+source=('git+https://github.com/drmpeg/gr-osmosdr39.git')
 md5sums=('SKIP')
-
-#_gitroot="git://git.osmocom.org/gr-osmosdr"
-_gitname="gr-osmosdr"
+_gitname="gr-osmosdr39"
 
 pkgver() {
-  #date +%Y%m%d
-  
   cd $_gitname
   # Use the tag of the last commit
   git describe --always | sed 's|-|.|g; s|^.||'
-  #echo "0"
 }
 
 build() {
-  #cd "$srcdir"
-  #msg "Connecting to GIT server...."
-
-  #if [[ -d "$_gitname" ]]; then
-  #  cd "$_gitname" && git pull origin
-  #  msg "The local files are updated."
-  #else
-  #  git clone "$_gitroot" "$_gitname"
-  #fi
-
-  #msg "GIT checkout done or server timeout"
-  #msg "Starting build..."
-
-  #rm -rf "$srcdir/$_gitname-build"
-  #git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  #cd "$srcdir/$_gitname-build/"
-  
   cd "$srcdir/$_gitname"
-  #rm -rf build
   mkdir -p build
   cd build
-#  cmake ../
-  cmake -DPYTHON_EXECUTABLE=$(which python2) -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) -DCMAKE_INSTALL_PREFIX=/usr ../
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ../
   make
 }
 
 package() {
-  #cd "$srcdir/$_gitname-build/build/"
   cd "$srcdir/$_gitname/build/"
   make DESTDIR=${pkgdir} install
 }
-
-# vim:set ts=2 sw=2 et: