Update to 1.2.5-1

3 files changed, 30 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4204e5426b64..49e973032557 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = djv
 	pkgdesc = Movie playback and image processing software for the film and computer animation industries
-	pkgver = 1.1.0
-	pkgrel = 3
+	pkgver = 1.2.5
+	pkgrel = 1
 	url = http://djv.sourceforge.net/
-	install = djv.install
 	arch = i686
 	arch = x86_64
 	license = BSD
@@ -20,11 +19,9 @@ pkgbase = djv
 	depends = openexr
 	depends = qt5-base
 	options = !docs
-	source = git://git.code.sf.net/p/djv/git#commit=44a063755e627c70498d948478e29ffc1d3f105d
-	source = ffmpeg.patch
+	source = git://git.code.sf.net/p/djv/git#tag=1.2.5
 	source = djv_view.desktop
 	md5sums = SKIP
-	md5sums = 9544548cd8bd762233398b0cb8ea91cd
 	md5sums = 2668ad2635036f33ba615b5dc538b1cf
 
 pkgname = djv
diff --git a/PKGBUILD b/PKGBUILD
index d115104aa881..1b4d1b7d2085 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Jonathan Liu <net147@gmail.com>
 # Contributer: N30N <archlinux@alunamation.com>
 pkgname=djv
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.2.5
+pkgrel=1
 pkgdesc="Movie playback and image processing software for the film and computer animation industries"
 url="http://djv.sourceforge.net/"
 license=('BSD')
@@ -10,12 +10,9 @@ arch=('i686' 'x86_64')
 depends=("desktop-file-utils" "ffmpeg" "glew" "libjpeg" "libpng" "libquicktime" "libtiff" "openexr" "qt5-base")
 makedepends=("cmake" "portaudio" "qt5-tools")
 options=("!docs")
-install="${pkgname}.install"
-source=("git://git.code.sf.net/p/djv/git#commit=44a063755e627c70498d948478e29ffc1d3f105d"
-        "ffmpeg.patch"
+source=("git://git.code.sf.net/p/djv/git#tag=1.2.5"
         "${pkgname}_view.desktop")
 md5sums=('SKIP'
-         '9544548cd8bd762233398b0cb8ea91cd'
          '2668ad2635036f33ba615b5dc538b1cf')
 
 prepare() {
@@ -23,22 +20,41 @@ prepare() {
     sed -i '/enable_testing()/d' CMakeLists.txt
     sed -i '/add_subdirectory(tests)/d' CMakeLists.txt
     sed -i 's/set(djvPackageThirdParty true)/set(djvPackageThirdParty false)/' CMakeLists.txt
-    patch -Np1 -i "${srcdir}/ffmpeg.patch"
 }
 
 build() {
     [[ -d build ]] && rm -r build
     mkdir build && cd build
-    cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr ../git
+    cmake -DCMAKE_INSTALL_PREFIX:PATH="/opt/${pkgname}" \
+          -DOpenGL_GL_PREFERENCE=LEGACY \
+          -DILMBASE_SHARED_LIBS=ON \
+          -DOPENEXR_SHARED_LIBS=ON \
+          -DQT_INCLUDE_DIR=/usr/include/qt \
+          -DQT_CORE_INCLUDE_DIR=/usr/include/qt/QtCore \
+          -DQT_DBUS_INCLUDE_DIR=/usr/include/qt/QtDBus \
+          -DQT_GUI_INCLUDE_DIR=/usr/include/qt/QtGui \
+          -DQT_NETWORK_INCLUDE_DIR=/usr/include/qt/QtNetwork \
+          -DQT_OPENGL_INCLUDE_DIR=/usr/include/qt/QtOpenGL \
+          -DQT_PRINT_SUPPORT_INCLUDE_DIR=/usr/include/qt/QtPrintSupport \
+          -DQT_SQL_INCLUDE_DIR=/usr/include/qt/QtSql \
+          -DQT_SVG_INCLUDE_DIR=/usr/include/qt/QtSvg \
+          -DQT_WIDGETS_INCLUDE_DIR=/usr/include/qt/QtWidgets \
+          -DQT_XML_INCLUDE_DIR=/usr/include/qt/QtXml \
+          ../git
     make
 }
 
 package() {
     cd build
-    make DESTDIR=${pkgdir} install
+    make DESTDIR="${pkgdir}" install
+    install -d "${pkgdir}/usr/bin"
+    for x in djv_convert djv_info djv_ls djv_view; do
+      ln -s "/opt/${pkgname}/bin/$x" "${pkgdir}/usr/bin/$x"
+    done
     install -D -m644 {"${srcdir}","${pkgdir}/usr/share/applications"}/"${pkgname}_view.desktop"
-    install -D -m644 "${srcdir}/git/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -D -m644 "${srcdir}/git/lib/djvViewLib/images/projector32x32.png" "${pkgdir}/usr/share/pixmaps/djv_view.png"
+    install -D -m644 "${srcdir}/git/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+    install -D -m644 "${srcdir}/git/etc/Windows/djv_view_512x512.png" "${pkgdir}/usr/share/pixmaps/djv_view.png"
+    rm "${pkgdir}/opt/${pkgname}/bin/djv_view.sh"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/djv.install b/djv.install
deleted file mode 100644
index ec1673a2da3a..000000000000
--- a/djv.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    update-mime-database usr/share/mime &> /dev/null
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}