Update to version 0.2.41

2 files changed, 36 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64f2bacbd63f..97bb00dd1b9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = lib32-zvbi
 	pkgdesc = VBI capture and decoding library (32-bit)
-	pkgver = 0.2.35
-	pkgrel = 3
+	pkgver = 0.2.41
+	pkgrel = 1
 	url = http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome
 	arch = x86_64
-	license = GPL
+	license = BSD
+	license = GPL2
+	license = LGPL2.1
+	license = MIT
+	makedepends = git
 	makedepends = lib32-libx11
 	depends = lib32-libpng
 	depends = zvbi
-	source = http://downloads.sourceforge.net/sourceforge/zapping/zvbi-0.2.35.tar.bz2
-	sha256sums = fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318
+	source = git+https://github.com/zapping-vbi/zvbi.git#tag=74016b7aef2f52f44920a04f9bcfe52ed72905d1
+	b2sums = SKIP
 
 pkgname = lib32-zvbi
-
diff --git a/PKGBUILD b/PKGBUILD
index bf1596b143d7..1c7efb6de51e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,39 +3,54 @@
 
 pkgname=lib32-zvbi
 _basename=zvbi
-pkgver=0.2.35
-pkgrel=3
+pkgver=0.2.41
+pkgrel=1
 pkgdesc="VBI capture and decoding library  (32-bit)"
 url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
 arch=('x86_64')
 depends=('lib32-libpng' 'zvbi')
-makedepends=('lib32-libx11')
-license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/zapping/${_basename}-${pkgver}.tar.bz2)
-sha256sums=('fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318')
+makedepends=('git' 'lib32-libx11')
+license=('BSD' 'GPL2' 'LGPL2.1' 'MIT')
+_tag=74016b7aef2f52f44920a04f9bcfe52ed72905d1
+source=(git+https://github.com/zapping-vbi/zvbi.git#tag=${_tag})
+b2sums=(SKIP)
+
+prepare() {
+  cd zvbi
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+pkgver() {
+    cd zvbi
+
+    git describe --tags | sed 's/^v//'
+}
 
 build() {
-    cd "${_basename}-${pkgver}"
+    cd zvbi
 
     export CC='gcc -m32'
     export CXX='g++ -m32'
     export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-
-    ./configure --prefix=/usr \
-        --build=i686-pc-linux-gnu \
+    ./configure \
+        --prefix=/usr \
         --sbindir=/usr/bin \
-        --libdir=/usr/lib32
+        --libdir=/usr/lib32 \
+        --build=i686-pc-linux-gnu
 
     make
 }
 
 package() {
-    cd "${_basename}-${pkgver}"
+    cd zvbi
 
     make DESTDIR="${pkgdir}" install
 
     rm -r "${pkgdir}/usr/bin"
     rm -r "${pkgdir}/usr/include"
     rm -r "${pkgdir}/usr/share"
+
+    install -Dm 644 COPYING.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }