summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Theodorou2017-01-02 23:19:30 +0000
committerAngelo Theodorou2017-01-02 23:19:30 +0000
commitcc34d6e866073f58b58476e4b14d7d7831e0bee0 (patch)
treed7556437c5a6e46d98cad9ec855704a7b08343aa
parent0ba973f3173eebb46025c317af3644b3324e3d7c (diff)
downloadaur-cc34d6e866073f58b58476e4b14d7d7831e0bee0.tar.gz
Remove again the patch to disable toonz
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD14
-rw-r--r--disable-toonz.patch17
-rw-r--r--lives.changelog5
4 files changed, 10 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5e7a5673c6b1..f6fbae0e0ceb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
# Generated by mksrcinfo v8
-# Mon Jan 2 23:04:33 UTC 2017
+# Mon Jan 2 23:18:21 UTC 2017
pkgbase = lives
pkgdesc = A Video Editing System
pkgver = 2.8.3
- pkgrel = 1
+ pkgrel = 2
url = http://lives-video.com
changelog = lives.changelog
arch = i686
arch = x86_64
license = GPL
- makedepends = automake
depends = mplayer
depends = imagemagick
depends = gtk3
@@ -35,9 +34,7 @@ pkgbase = lives
optdepends = opencv
options = !emptydirs
source = http://lives-video.com/releases/LiVES-2.8.3.tar.bz2
- source = disable-toonz.patch
md5sums = 77c63dab400491cfcd762823c34d1c61
- md5sums = dffab836d4dc5a277c67450e2b1b810b
pkgname = lives
diff --git a/PKGBUILD b/PKGBUILD
index f3615a7bbe6b..8c4a72ba954b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,17 @@
# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
pkgname=lives
pkgver=2.8.3
-pkgrel=1
+pkgrel=2
pkgdesc="A Video Editing System"
arch=('i686' 'x86_64')
url="http://lives-video.com"
license=('GPL')
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=('77c63dab400491cfcd762823c34d1c61' 'dffab836d4dc5a277c67450e2b1b810b')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- # with opencv installed, toonz.cpp failes to build
- patch -p1 -i "${srcdir}/disable-toonz.patch"
- automake
-}
+source=(http://lives-video.com/releases/LiVES-$pkgver.tar.bz2)
+md5sums=('77c63dab400491cfcd762823c34d1c61')
build() {
cd ${pkgname}-${pkgver}
diff --git a/disable-toonz.patch b/disable-toonz.patch
deleted file mode 100644
index 794e5595022e..000000000000
--- a/disable-toonz.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- old/lives-plugins/weed-plugins/Makefile.am.org 2016-10-23 01:03:56.000000000 +0200
-+++ new/lives-plugins/weed-plugins/Makefile.am 2016-11-07 00:25:36.907891417 +0100
-@@ -89,14 +89,7 @@
- farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
- farneback_analyser_la_SOURCES = farneback_analyser.cpp
-
--if ENABLE_TOONZ
--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
--else
- toonz_libs =
--endif
-
- opencvlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
- opencvlib_LTLIBRARIES = $(farneback_analyser_libs) $(toonz_libs)
diff --git a/lives.changelog b/lives.changelog
index 8e6abd66e249..0faf0bef28a1 100644
--- a/lives.changelog
+++ b/lives.changelog
@@ -1,3 +1,8 @@
+2017-01-02 Angelo "Encelo" Theodorou <encelo@users.sourceforge.net>
+
+ * PKGBUILD :
+ Toonz patch removed again
+
2016-11-20 Angelo "Encelo" Theodorou <encelo@users.sourceforge.net>
* PKGBUILD :