Fixes

2 files changed, 11 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c2126d5b378..326505a74b28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Jul 24 01:01:29 UTC 2017
 pkgbase = libopenshot-git
 	pkgdesc = A high quality, open-source video editing, animation, and playback library for C++, Python, and Ruby (git version)
-	pkgver = 0.1.7.r3.gc30dbb9
+	pkgver = 0.2.2.r0.gc90fb9b
 	pkgrel = 1
 	url = http://www.openshot.org/
 	arch = i686
@@ -13,7 +11,7 @@ pkgbase = libopenshot-git
 	makedepends = doxygen
 	makedepends = swig
 	makedepends = unittestpp
-	depends = imagemagick
+	depends = libmagick6
 	depends = ffmpeg
 	depends = libx264
 	depends = libopenshot-audio
diff --git a/PKGBUILD b/PKGBUILD
index 32c24d35c468..174a8182877e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
+# Maintainer: Daniel Bermond < gmail-com: danielbermond >
 
 pkgname=libopenshot-git
-pkgver=0.1.7.r3.gc30dbb9
+pkgver=0.2.2.r0.gc90fb9b
 pkgrel=1
 pkgdesc='A high quality, open-source video editing, animation, and playback library for C++, Python, and Ruby (git version)'
 arch=('i686' 'x86_64')
 url='http://www.openshot.org/'
 license=('LGPL3')
-depends=('imagemagick' 'ffmpeg' 'libx264' 'libopenshot-audio' 'python' 'jsoncpp' 'qt5-multimedia' 'zeromq')
+depends=('libmagick6' 'ffmpeg' 'libx264' 'libopenshot-audio' 'python' 'jsoncpp' 'qt5-multimedia' 'zeromq')
 makedepends=('git' 'cmake' 'doxygen' 'swig' 'unittestpp')
 provides=('libopenshot')
 conflicts=('libopenshot')
@@ -23,42 +23,23 @@ pkgver() {
 
 build() {
     cd "$pkgname"
+    
     mkdir -p build
     cd build
     
-    if command -v magick >/dev/null 2>&1
-    then
-        local _im_command='magick'
-    else
-        local _im_command='convert'
-    fi
-    
-    if "$_im_command" --version | grep -q 'HDRI'
-    then
-        local _hdri='1'
-    else
-        local _hdri='0'
-    fi
-    
-    local _depth="$("$_im_command" --version | grep -oE 'Q[0-9]+' | sed 's/Q//')"
-    
-    #export CXXFLAGS+=" -std=gnu++98"
-    
     cmake \
-        -DCMAKE_BUILD_TYPE:STRING='Release' \
-        -DCMAKE_COLOR_MAKEFILE:BOOL='ON' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DUSE_SYSTEM_JSONCPP:BOOL='ON' \
-        -DMAGICKCORE_HDRI_ENABLE="$_hdri" \
-        -DMAGICKCORE_QUANTUM_DEPTH="$_depth" \
-        -DENABLE_RUBY='0' \
+        -DMAGICKCORE_HDRI_ENABLE='1' \
+        -DMAGICKCORE_QUANTUM_DEPTH='16' \
+        -DENABLE_RUBY='OFF' \
         -Wno-dev \
         ..
     make
 }
 
 package() {
-    cd "$pkgname"
-    cd build
+    cd "${pkgname}/build"
+    
     make DESTDIR="$pkgdir" install
 }