Update to 2.6.5

4 files changed, 51 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f9341cbe4e1..fe31847f5140 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 # Generated by mksrcinfo v8
-# Wed Jul  6 12:50:14 UTC 2016
+# Sun Aug 14 19:10:17 UTC 2016
 pkgbase = lives
 	pkgdesc = A Video Editing System
-	pkgver = 2.6.3
-	pkgrel = 2
+	pkgver = 2.6.5
+	pkgrel = 1
 	url = http://lives-video.com
 	changelog = lives.changelog
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = automake
 	depends = mplayer
 	depends = imagemagick
 	depends = gtk3
 	depends = sox
 	depends = libvisual
 	depends = liboil
-	depends = libavc1394
 	depends = mjpegtools
 	depends = python
 	depends = ffmpeg2.8
@@ -27,13 +27,17 @@ pkgbase = lives
 	optdepends = mkvtoolnix-cli
 	optdepends = libmatroska
 	optdepends = ogmtools
+	optdepends = libavc1394
 	optdepends = dvgrab
 	optdepends = cdrkit
 	optdepends = lame
 	optdepends = youtube-dl
+	optdepends = opencv
 	options = !emptydirs
-	source = http://lives-video.com/releases/LiVES-2.6.3.tar.bz2
-	md5sums = b5fad0838b180902f8304b1978bbac41
+	source = http://lives-video.com/releases/LiVES-2.6.5.tar.bz2
+	source = disable-toonz.patch
+	md5sums = 7514aca89eb7b3800c7f3f53a1678ef8
+	md5sums = 9820005ad3c3626dc4853fb09301f7bc
 
 pkgname = lives
 
diff --git a/PKGBUILD b/PKGBUILD
index 28d4daca5f99..78ed90ffd054 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,34 @@
 # Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
 pkgname=lives
-pkgver=2.6.3
-pkgrel=2
+pkgver=2.6.5
+pkgrel=1
 pkgdesc="A Video Editing System"
 arch=('i686' 'x86_64')
 url="http://lives-video.com"
 license=('GPL')
-depends=('mplayer' 'imagemagick' 'gtk3' 'sox' 'libvisual' 'liboil' 'libavc1394' 'mjpegtools' 'python' 'ffmpeg2.8' 'jack' 'fftw')
-optdepends=('xorg-utils' 'sdl' 'libogg' 'mkvtoolnix-cli' 'libmatroska' 'ogmtools' 'dvgrab' 'cdrkit' 'lame' 'youtube-dl')
+depends=('mplayer' 'imagemagick' 'gtk3' 'sox' 'libvisual' 'liboil' 'mjpegtools' 'python' 'ffmpeg2.8' 'jack' 'fftw')
+optdepends=('xorg-utils' 'sdl' 'libogg' 'mkvtoolnix-cli' 'libmatroska' 'ogmtools' 'libavc1394' 'dvgrab' 'cdrkit' 'lame' 'youtube-dl' 'opencv')
+makedepends=('automake')
 options=(!emptydirs)
 changelog=lives.changelog
-source=(http://lives-video.com/releases/LiVES-$pkgver.tar.bz2)
-md5sums=('b5fad0838b180902f8304b1978bbac41')
+source=(http://lives-video.com/releases/LiVES-$pkgver.tar.bz2 disable-toonz.patch)
+md5sums=('7514aca89eb7b3800c7f3f53a1678ef8' '9820005ad3c3626dc4853fb09301f7bc')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # with opencv installed, toonz.cpp failes to build
+  patch -p1 -i "${srcdir}/disable-toonz.patch"
+  automake
+}
 
 build() {
-  cd $pkgname-$pkgver
+  cd ${pkgname}-${pkgver}
   PKG_CONFIG_PATH=/usr/lib/ffmpeg2.8/pkgconfig\
     ./configure --prefix=/usr --enable-turbo
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/disable-toonz.patch b/disable-toonz.patch
new file mode 100644
index 000000000000..1d3bc5b0f50a
--- /dev/null
+++ b/disable-toonz.patch
@@ -0,0 +1,18 @@
+--- old/lives-plugins/weed-plugins/Makefile.am	2016-04-22 05:57:54.000000000 +0200
++++ new/lives-plugins/weed-plugins/Makefile.am	2016-07-22 22:56:02.687306326 +0200
+@@ -89,13 +89,8 @@
+ farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
+ farneback_analyser_la_SOURCES = farneback_analyser.cpp
+ 
+-toonz_libs = toonz.la
+-toonz_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_imgproc
+-toonz_la_CPPFLAGS = $(AM_CPPFLAGS) -std=c++11
+-toonz_la_SOURCES = toonz.cpp
+-
+ opencvlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+-opencvlib_LTLIBRARIES = $(farneback_analyser_libs) $(toonz_libs)
++opencvlib_LTLIBRARIES = $(farneback_analyser_libs)
+ endif
+ 
+ 
+src/
diff --git a/lives.changelog b/lives.changelog
index a22c33114b85..d883c1ea129f 100644
--- a/lives.changelog
+++ b/lives.changelog
@@ -1,3 +1,9 @@
+2016-08-14 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Updated the dependency arrays
+	Added a patch to enable compilation when OpenCV is installed
+
 2016-07-06 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
 
 	* PKGBUILD :