Update to 1.3.0-1

2 files changed, 15 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4513eb91cac1..e04741c990e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = djv
 	pkgdesc = Movie playback and image processing software for the film and computer animation industries
-	pkgver = 1.2.5
-	pkgrel = 4
+	pkgver = 1.3.0
+	pkgrel = 1
 	url = http://djv.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = cmake
 	makedepends = glm
+	makedepends = picojson-git
 	makedepends = portaudio
 	makedepends = qt5-tools
 	depends = desktop-file-utils
@@ -20,7 +21,7 @@ pkgbase = djv
 	depends = openexr
 	depends = qt5-base
 	depends = qt5-svg
-	source = git://git.code.sf.net/p/djv/git#tag=1.2.5
+	source = djv::git+https://github.com/darbyjohnston/DJV#tag=1.3.0
 	source = djv_view.desktop
 	md5sums = SKIP
 	md5sums = 2668ad2635036f33ba615b5dc538b1cf
diff --git a/PKGBUILD b/PKGBUILD
index 16e04217cf3b..176078326921 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,25 @@
 # Maintainer: Jonathan Liu <net147@gmail.com>
 # Contributer: N30N <archlinux@alunamation.com>
 pkgname=djv
-pkgver=1.2.5
-pkgrel=4
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Movie playback and image processing software for the film and computer animation industries"
 url="http://djv.sourceforge.net/"
 license=('BSD')
 arch=('i686' 'x86_64')
 depends=("desktop-file-utils" "ffmpeg" "glew" "libjpeg" "libpng" "libquicktime" "libtiff" "openexr" "qt5-base" "qt5-svg")
-makedepends=("cmake" "glm" "portaudio" "qt5-tools")
-source=("git://git.code.sf.net/p/djv/git#tag=1.2.5"
+makedepends=("cmake" "glm" "picojson-git" "portaudio" "qt5-tools")
+source=("${pkgname}::git+https://github.com/darbyjohnston/DJV#tag=${pkgver}"
         "${pkgname}_view.desktop")
 md5sums=('SKIP'
          '2668ad2635036f33ba615b5dc538b1cf')
 
 prepare() {
-    cd git
+    cd "${pkgname}"
     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
+    sed -i 's#picojson/picojson.h#picojson.h#' lib/djvCore/PicoJSON.h
 }
 
 build() {
@@ -28,18 +29,19 @@ build() {
           -DOpenGL_GL_PREFERENCE=LEGACY \
           -DILMBASE_SHARED_LIBS=ON \
           -DOPENEXR_SHARED_LIBS=ON \
+          -DPicoJSON_INCLUDE_DIR=/usr/include \
           -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_PLATFORM_HEADERS_INCLUDE_DIR=/usr/include/qt/QtPlatformHeaders \
           -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
+          "../${pkgname}"
     make
 }
 
@@ -51,8 +53,8 @@ package() {
       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.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"
+    install -D -m644 "${srcdir}/${pkgname}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+    install -D -m644 "${srcdir}/${pkgname}/etc/Windows/djv_view_512x512.png" "${pkgdir}/usr/share/pixmaps/djv_view.png"
     rm "${pkgdir}/opt/${pkgname}/bin/djv_view.sh"
 }