Create desktop files, proper submodule support

- update pkgbulid to provide desktop files and icons
- update pkgbuild to properly handle submodules
- add patch file

3 files changed, 80 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65403b5d2efa..7d09c7b47272 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,22 @@ pkgbase = hdrview-git
 	makedepends = git
 	provides = hdrview
 	source = git+https://bitbucket.org/wkjarosz/hdrview.git
+	source = hdrview-git.patch
+	source = git+https://github.com/cxong/tinydir.git
+	source = git+https://github.com/docopt/docopt.cpp.git
+	source = git+https://github.com/gabime/spdlog.git
+	source = git+https://github.com/syoyo/tinydngloader.git
+	source = git+https://github.com/mitsuba-renderer/openexr.git
+	source = git+https://github.com/mitsuba-renderer/zlib.git
+	source = git+https://github.com/wjakob/nanogui.git
+	sha256sums = SKIP
+	sha256sums = 29450b60ca46062663ec603a0b68f8500cf882761654f756b81afb368845fdc5
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = hdrview-git
diff --git a/PKGBUILD b/PKGBUILD
index 55a837f5ec0d..77e02b58cbb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,23 +10,53 @@ url='https://bitbucket.org/wkjarosz/hdrview'
 arch=('x86_64')
 license=('BSD')
 makedepends=('cmake' 'git')
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '29450b60ca46062663ec603a0b68f8500cf882761654f756b81afb368845fdc5'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')
 
-source=('git+https://bitbucket.org/wkjarosz/hdrview.git')
+source=('git+https://bitbucket.org/wkjarosz/hdrview.git' 
+        'hdrview-git.patch'
+        'git+https://github.com/cxong/tinydir.git'
+        'git+https://github.com/docopt/docopt.cpp.git'
+        'git+https://github.com/gabime/spdlog.git'
+        'git+https://github.com/syoyo/tinydngloader.git'
+        'git+https://github.com/mitsuba-renderer/openexr.git'
+        'git+https://github.com/mitsuba-renderer/zlib.git'
+        'git+https://github.com/wjakob/nanogui.git')
 
 pkgver() {
-    cd $_pkgname
+    cd ${_pkgname}
     printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd $_pkgname
+    cd ${_pkgname}
+
+    # Apply patch to make sure missing icons paths aren't used
+    patch --forward --strip=1 --input=${srcdir}/hdrview-git.patch
+
+    # Set up submodules as per the wiki's guidelines here:
+    # https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git_Submodules
     git submodule init
+    git config --local submodule.ext/tinydir.url ${srcdir}/tinydir
+    git config --local submodule.ext/docopt.url ${srcdir}/docopt.cpp
+    git config --local submodule.ext/spdlog.url ${srcdir}/spdlog
+    git config --local submodule.ext/openexr.url ${srcdir}/openexr
+    git config --local submodule.ext/zlib.url ${srcdir}/zlib
+    git config --local submodule.ext/nanogui.url ${srcdir}/nanogui
+
+    # Initialize submodules' recursive submodules
     git submodule update --init --recursive
 }
 
 build() {
-    cd $_pkgname
+    cd ${_pkgname}
     mkdir -p build
     cd build
     cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
@@ -34,8 +64,14 @@ build() {
 }
 
 package() {
-    mkdir -p $pkgdir/usr/bin
-    cp $_pkgname/build/hdrbatch $pkgdir/usr/bin
-    cp $_pkgname/build/HDRView $pkgdir/usr/bin
-    cp $_pkgname/build/force-random-dither $pkgdir/usr/bin
+    # Create directories for icons, metadata
+    mkdir -p ${pkgdir}/usr/bin
+    mkdir -p ${pkgdir}/usr/share/applications
+    mkdir -p ${pkgdir}/usr/share/icons/hicolor/512x512/apps
+    mkdir -p ${pkgdir}/usr/share/icons/hicolor/256x256/apps
+    mkdir -p ${pkgdir}/usr/share/icons/hicolor/128x128/apps
+    mkdir -p ${pkgdir}/usr/share/icons/hicolor/64x64/apps
+    mkdir -p ${pkgdir}/usr/share/icons/hicolor/32x32/apps
+    mkdir -p ${pkgdir}/usr/share/icons/hicolor/16x16/apps
+    make -C ${_pkgname}/build DESTDIR="${pkgdir}/" install
 }
diff --git a/hdrview-git.patch b/hdrview-git.patch
new file mode 100644
index 000000000000..dc6d5f4283f2
--- /dev/null
+++ b/hdrview-git.patch
@@ -0,0 +1,19 @@
+diff --unified --recursive --text hdrview/CMakeLists.txt hdrview/CMakeLists.txt
+--- hdrview/CMakeLists.txt	2019-03-29 12:02:37.897333401 -0400
++++ hdrview/CMakeLists.txt	2019-03-29 12:05:52.409958962 -0400
+@@ -266,14 +266,11 @@
+ else()
+     install(TARGETS HDRView RUNTIME DESTINATION "bin")
+     install(FILES resources/hdrview.desktop DESTINATION "/usr/share/applications")
+-    install(FILES resources/icon-512.png DESTINATION "/usr/share/icons/hicolor/1024x1024/apps" RENAME hdrview.png)
++    install(FILES resources/icon-1024.png DESTINATION "/usr/share/icons/hicolor/1024x1024/apps" RENAME hdrview.png)
+     install(FILES resources/icon-512.png DESTINATION "/usr/share/icons/hicolor/512x512/apps" RENAME hdrview.png)
+     install(FILES resources/icon-256.png DESTINATION "/usr/share/icons/hicolor/256x256/apps" RENAME hdrview.png)
+     install(FILES resources/icon-128.png DESTINATION "/usr/share/icons/hicolor/128x128/apps" RENAME hdrview.png)
+-    install(FILES resources/icon-96.png DESTINATION "/usr/share/icons/hicolor/96x96/apps" RENAME hdrview.png)
+     install(FILES resources/icon-64.png DESTINATION "/usr/share/icons/hicolor/64x64/apps" RENAME hdrview.png)
+-    install(FILES resources/icon-48.png DESTINATION "/usr/share/icons/hicolor/48x48/apps" RENAME hdrview.png)
+     install(FILES resources/icon-32.png DESTINATION "/usr/share/icons/hicolor/32x32/apps" RENAME hdrview.png)
+-    install(FILES resources/icon-24.png DESTINATION "/usr/share/icons/hicolor/24x24/apps" RENAME hdrview.png)
+     install(FILES resources/icon-16.png DESTINATION "/usr/share/icons/hicolor/16x16/apps" RENAME hdrview.png)
+ endif()