lives-2.6.8-1: updating version

3 files changed, 243 insertions, 16 deletions

diff --git a/pcr/lives/PKGBUILD b/pcr/lives/PKGBUILD
index a23faff04..8dc338cc6 100644
--- a/pcr/lives/PKGBUILD
+++ b/pcr/lives/PKGBUILD
@@ -1,31 +1,35 @@
 # Contributor (Arch): Angelo Theodorou <encelo@users.sourceforge.net>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 pkgname=lives
-pkgver=2.4.6
+pkgver=2.6.8
 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' 'ffmpeg' 'jack' 'fftw')
-optdepends=('xorg-utils' 'sdl' 'libogg' 'mkvtoolnix-cli' 'libmatroska' 'ogmtools' 'dvgrab' 'cdrkit' 'lame' 'youtube-dl')
-options=(!libtool)
-source=(http://lives-video.com/releases/LiVES-$pkgver.tar.bz2)
-md5sums=('3249657af1310db812ff8bdb7e53cfe5')
+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 disable-toonz.patch)
+md5sums=('1b0fe11fc1c20fb176e740f181a948ad' '9820005ad3c3626dc4853fb09301f7bc')
 
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # with opencv installed, toonz.cpp failes to build
+  patch -p1 -i "${srcdir}/disable-toonz.patch"
+  automake
+}
 
-  # /bin/touch -> /usr/bin/touch
-  find -type f -exec sed -i 's:/bin/touch:/usr&:g' {} \;
-  ./configure --prefix=/usr
+build() {
+  cd ${pkgname}-${pkgver}
+  PKG_CONFIG_PATH=/usr/lib/ffmpeg2.8/pkgconfig\
+    ./configure --prefix=/usr --enable-turbo
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/bin/lives
-  ln -s /usr/bin/lives-exe "$pkgdir"/usr/bin/lives
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/pcr/lives/disable-toonz.patch b/pcr/lives/disable-toonz.patch
new file mode 100644
index 000000000..1d3bc5b0f
--- /dev/null
+++ b/pcr/lives/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/pcr/lives/lives.changelog b/pcr/lives/lives.changelog
new file mode 100644
index 000000000..d883c1ea1
--- /dev/null
+++ b/pcr/lives/lives.changelog
@@ -0,0 +1,205 @@
+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 :
+	Removed "!libtool" option and added "!emptydirs
+	Removed the fix to call the touch command
+	Removed the command to create a symlink to the executable
+	Deleted commands to remove empty directories from the package
+
+2016-07-04 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added "--enable-turbo" option to the configure script
+	Added ffmpeg2.8 as a dependency instead of ffmpeg
+	Exported a pkg-config variable in order to compile with FFmpeg 2.8
+	Added commands to remove empty directories from the package
+
+2015-08-22 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Project URL updated
+	Removed ffmpeg-compat as a dependency
+
+2013-12-14 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Updated depends array
+
+2013-05-26 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Updated depends and optdepends arrays
+
+2013-04-07 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added gtk3 as a dependency instead of gtk2
+
+2012-06-30 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD:
+	Added pulseaudio as a dependency instead of pulse
+
+2012-06-24 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD:
+	Added ffmpeg as a dependency
+	Removed libtheora and libvorbis as dependencies (covered by ffmpeg)
+	Removed jack and perl as dependencies (covered by mplayer)
+	Fix added for a correct invoking of the touch command
+
+2012-01-17 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD:
+	Project URL updated
+	The weed-compat.h patch has been removed
+
+2012-01-14 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD:
+	Static libraries enabled again
+
+2012-01-07 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	makedepends array removed
+	Quotation marks added around srcdir and pkgdir variables
+	Package built without static libraries building
+
+2012-01-05 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added the changelog directive
+	Added a package() function
+	imake removed from the makedepends array
+
+2011-06-14 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	The previous patch is no more needed and thus not included
+
+2011-06-08 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added a patch to allow compilation on kernel >= 2.6.38
+
+2011-02-21 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	No more patches needed to build the package
+
+2010-11-28 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added a patch for the file frei0r.c
+
+2010-11-03 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added a patch for the file callbacks.c
+
+2010-03-22 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added pulse to the optdepends array
+
+2010-03-10 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	The jack-audio-connection-kit dependency has been renamed to jack
+
+2009-10-27 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	libvis.patch removed
+
+2009-10-18 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Dropped gdk-pixbuf dependency
+	Added a patch for the file libvis.c
+
+2009-08-06 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	The executable symbolic link creation is still needed
+
+2009-07-23 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	No more explicit symbolic linking of the executable
+
+2009-07-08 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	resize.patch is no more needed, it is integrated in the sources
+
+2009-06-29 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added a patch for the "Resize Frames" function
+
+2009-06-01 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	libweed patch not needed anymore
+
+2009-05-01 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Removed commands for directory creation in /usr/share 
+	Added a patch to install libweed
+
+2009-02-06 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added mkvtoolnix to the optdepends array
+
+2008-12-12 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Applying a patch from the author
+	Using $srcdir and $pkgdir variables
+
+2008-12-04 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Updated depends and optdepends arrays
+
+2008-10-23 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Fixed a dependency name
+
+2008-10-02 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Added some optional dependencies
+
+2008-09-23 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Description changed
+	Using optdepends variable instead of lives.install
+
+2008-07-16 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	No libtool options added
+
+2008-03-16 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	License field is not an array anymore
+	Contributor line added
+
+2008-03-08 encelo <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	imake, which includes mkdirhier, has been added to the makedepends array