`PKGBUILD` overhaul.

2 files changed, 74 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e149469ae94d..d93279945f56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,28 @@
 pkgbase = hdrview-git
 	pkgdesc = High dynamic range (HDR) image viewer and comparison tool
-	pkgver = 1.8.0
+	pkgver = 1.8.0.r319.20230316.4b02bbd
 	pkgrel = 1
+	epoch = 0
 	url = https://github.com/wkjarosz/hdrview
 	arch = x86_64
-	license = BSD
+	arch = i686
+	license = BSD-3-Clause
 	makedepends = git
 	makedepends = cmake
 	makedepends = ninja
 	depends = hicolor-icon-theme
 	depends = libglvnd
 	depends = zlib
+	depends = glibc
+	depends = gcc-libs
 	depends = libxi
 	depends = libxrandr
 	depends = libxinerama
 	depends = libxcursor
-	provides = hdrview
+	depends = libx11
+	provides = hdrview=1.8.0.r319.20230316.4b02bbd
 	conflicts = hdrview
-	source = hdrview-git::git+https://github.com/wkjarosz/hdrview
+	source = hdrview::git+https://github.com/wkjarosz/hdrview.git
 	sha256sums = SKIP
 
 pkgname = hdrview-git
diff --git a/PKGBUILD b/PKGBUILD
index 532378ae0b92..61c8a7373153 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,31 @@
-# Maintainer: Eric Engestrom <aur@engestrom.ch>
-# Contributor: Afnan Enayet <afnan at afnan.io>
+# Maintainer:  dreieck (https://aur.archlinux.org/account/dreieck)
+# Maintainer:  Afnan Enayet <afnan at afnan.io>
+# Contributor: Eric Engestrom (https://aur.archlinux.org/account/1ace)
+
 
 _pkgname=hdrview
-pkgname=$_pkgname-git
-pkgver=1.8.0
+pkgname="$_pkgname-git"
+epoch=0
+pkgver=1.8.0.r319.20230316.4b02bbd
 pkgrel=1
 pkgdesc='High dynamic range (HDR) image viewer and comparison tool'
 url='https://github.com/wkjarosz/hdrview'
-arch=(x86_64)
-license=(BSD)
-makedepends=(git cmake ninja)
-depends=(hicolor-icon-theme libglvnd zlib libx{i,randr,inerama,cursor})
-source=("$pkgname::git+$url")
+arch=('x86_64' 'i686')
+license=('BSD-3-Clause')
+makedepends=('git' 'cmake' 'ninja')
+depends=('hicolor-icon-theme' 'libglvnd' 'zlib' 'glibc' 'gcc-libs' libx{i,randr,inerama,cursor,11})
+source=("$_pkgname::git+$url.git")
 sha256sums=('SKIP')
-provides=(hdrview)
-conflicts=(hdrview)
-
-pkgver() {
-  git -C $pkgname describe --tags --abbrev=10 | sed 's/^v//; s/-/+/; s/-/./'
-}
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
 
 prepare() {
   # Run cmake in `prepare()` since it will download stuff.
-  cmake -S $pkgname -B build \
+  cmake -S "$_pkgname" -B build \
     -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
+    -DDOCS=ON \
     -DFETCHCONTENT_QUIET=OFF \
     -DIMATH_INSTALL_PKG_CONFIG=OFF \
     -DIMATH_INSTALL_SYM_LINK=OFF \
@@ -34,24 +34,63 @@ prepare() {
     -DOPENEXR_INSTALL_TOOLS=OFF
 }
 
+pkgver() {
+  cd "$srcdir/$_pkgname"
+
+  _ver="$(git describe  --tags | sed -E 's|-g[0-9a-fA-F]*$||' | sed -E 's|^[vV]||' | tr '-' '+')"
+  _rev="$(git rev-list --count HEAD)"
+  _date="$(git log -1 --date=format:"%Y%m%d" --format="%ad")"
+  _hash="$(git rev-parse --short HEAD)"
+
+  if [ -z "${_ver}" ]; then
+      error "Version could not be determined."
+  return 1
+  else
+      printf '%s' "${_ver}.r${_rev}.${_date}.${_hash}"
+  fi
+}
+
 build() {
    cmake --build build
 }
 
 package() {
+  ## Install main project
   DESTDIR="$pkgdir" cmake --install build
 
-  # Project installs a copy of its own deps as well
-  for dep in Imath
+  ## Add a lowercase executable symlink
+  ln -svr "${pkgdir}/usr/bin/HDRView" "${pkgdir}/usr/bin/hdrview"
+
+  ## Project installs a copy of its own deps as well. Fixup.
+  for dep in Imath # OpenEXR
   do
-    rm -r "$pkgdir"/usr/include/$dep/
-    rm -r "$pkgdir"/usr/lib/cmake/$dep/
-    rm    "$pkgdir"/usr/lib/lib$dep*.a
+    rm -rf "$pkgdir/usr/include/$dep"/
+    rm -rf "$pkgdir/usr/lib/cmake/$dep"/
   done
+  # These don't have a filename trivially derived from the dep name, but
+  # the project doesn't have any static lib of its own so let's just
+  # blindly remove any.
+  rm -f "$pkgdir"/usr/lib/lib*.a
+
+  ## Delete directories that should be empty.
+  #  If not empty: Raise an error in case there's every anything else added (either
+  #  a new dep, or the project starts shipping libs). That's why we use `rmdir` and not `rm -rf`.
+  if [ -d "$pkgdir"/usr/include/ ]; then
+    rmdir "$pkgdir"/usr/include/
+  fi
+  if [ -d "$pkgdir"/usr/lib/cmake/ ]; then
+    rmdir "$pkgdir"/usr/lib/cmake/
+  fi
+  if [ -d "$pkgdir"/usr/lib/pkgconfig/ ]; then
+    rmdir "$pkgdir"/usr/lib/pkgconfig/
+  fi
+  if [ -d "$pkgdir"/usr/lib/ ]; then
+    rmdir "$pkgdir"/usr/lib/
+  fi
 
-  # Raise an error in case there's every anything else added (either
-  # a new dep, or the project starts shipping libs)
-  rmdir "$pkgdir"/usr/include/
-  rmdir "$pkgdir"/usr/lib/cmake/
-  rmdir "$pkgdir"/usr/lib/
+  ## Install documentation and license
+  for _docfile in README.md TODO.md; do
+    install -D -m644 -v "$srcdir/$_pkgname/$_docfile" "$pkgdir/usr/share/doc/$_pkgname/$_docfile"
+  done
+  install -D -m644 -v "$srcdir/$_pkgname/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
 }