v4.1.0.r3.g04ef944, corrected version, updated dependencies, changed build completely due to upstream

2 files changed, 26 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4cdd014249de..c037568aa74e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = imv-git
 	pkgdesc = imv is a command line image viewer intended for use with tiling window managers, with Wayland and X11 support.
-	pkgver = v2.1.3.r300.ge0e019c
+	pkgver = v4.1.0.r3.g04ef944
 	pkgrel = 1
 	url = https://github.com/eXeC64/imv
 	arch = x86_64
@@ -9,12 +9,24 @@ pkgbase = imv-git
 	makedepends = git
 	makedepends = asciidoc
 	makedepends = cmocka
+	makedepends = meson
+	depends = libxkbcommon
 	depends = libxkbcommon-x11
+	depends = cairo
+	depends = icu
+	depends = libx11
+	depends = glu
+	depends = libxcb
 	depends = freeimage
 	depends = librsvg
 	depends = desktop-file-utils
 	optdepends = wayland
 	optdepends = egl-wayland
+	optdepends = libtiff
+	optdepends = libpng
+	optdepends = libjpeg-turbo
+	optdepends = librsvg
+	optdepends = libnsgif
 	provides = imv
 	conflicts = renameutils
 	conflicts = imv
diff --git a/PKGBUILD b/PKGBUILD
index e8c483216b75..dfeb2b4696d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,18 @@
 # Contributor: Ainola
 
 pkgname=imv-git
-pkgver=v2.1.3.r300.ge0e019c
+pkgver=v4.1.0.r3.g04ef944
 pkgrel=1
 pkgdesc='imv is a command line image viewer intended for use with tiling window managers, with Wayland and X11 support.'
 url="https://github.com/eXeC64/imv"
 arch=('x86_64' 'i686')
 license=('MIT')
-depends=('libxkbcommon-x11' 'freeimage' 'librsvg' 'desktop-file-utils')
-makedepends=('git' 'asciidoc' 'cmocka')
-optdepends=('wayland' 'egl-wayland')
+depends=('libxkbcommon' 'libxkbcommon-x11' 'cairo' 'icu' 'libx11' 'glu' 'libxcb' 'freeimage' 'librsvg' 'desktop-file-utils')
+makedepends=('git' 'asciidoc' 'cmocka' 'meson')
+optdepends=(#wayland
+            'wayland' 'egl-wayland'
+            #image support
+            'libtiff' 'libpng' 'libjpeg-turbo' 'librsvg' 'libnsgif')
 provides=('imv')
 conflicts=('renameutils' 'imv')
 source=("git+https://github.com/eXeC64/imv.git")
@@ -18,18 +21,17 @@ sha1sums=('SKIP')
 
 pkgver() {
     cd imv
-    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    make -C imv BUILDDIR=build
-}
-
-check() {
-    make check -C imv BUILDIR=build
+    cd $srcdir/imv
+    meson --prefix /usr --buildtype=plain . build
+    ninja -C build
 }
 
 package() {
-    make -C imv BUILDDIR=build DESTDIR="$pkgdir" install
+    cd $srcdir/imv
+    DESTDIR="$pkgdir" ninja -C build install
     install -Dm644 $srcdir/imv/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }