diff options
| -rw-r--r-- | .SRCINFO | 21 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ETL-1.2.1.patch | 12 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | savecanvas-template.patch | 15 |
5 files changed, 44 insertions, 39 deletions
@@ -1,7 +1,7 @@ pkgbase = synfig pkgdesc = Professional vector animation program (CLI renderer only) - pkgver = 1.2.1 - pkgrel = 5 + pkgver = 1.2.2 + pkgrel = 2 url = https://synfig.org arch = x86_64 license = GPL2 @@ -21,16 +21,19 @@ pkgbase = synfig depends = mlt depends = fftw depends = intltool + depends = sdl + depends = sdl_mixer + depends = sdl_image optdepends = openexr optdepends = libsigc++ - source = https://github.com/synfig/synfig/releases/download/v1.2.1/ETL-1.2.1.tar.gz - source = https://github.com/synfig/synfig/releases/download/v1.2.1/synfig-1.2.1.tar.gz - source = ETL-1.2.1.patch + source = https://github.com/synfig/synfig/releases/download/v1.2.2/source-ETL-1.2.2.tar.gz + source = https://github.com/synfig/synfig/releases/download/v1.2.2/source-synfig-1.2.2.tar.gz source = ffmpeg-3.0.patch - sha256sums = 754d88c5ddfdef54f27d1e17f62a902eb9f09fbe7ef9aebded34541b4c1700e6 - sha256sums = 4d8bada4e99f05ee16b4256fc3f5a551d00a745347944837bbd6fa158b57e457 - sha256sums = 35e218317050430ebae667d26269903ad1c377407b9a75feb48a9138af131cb0 - sha256sums = 424b3cc38809038c3b015ce2a6d3a006d73aefe0445d0090fae45e8eb69b2b55 + source = savecanvas-template.patch + sha256sums = 0dc19c5a6c9e964054ca3af6dacd6ab0c198d78071cfab2aebac178afe454d8b + sha256sums = 5f5f7b33483041165f9a63fe4d95eb815971c7444569e574206f6964e83cc2ef + sha256sums = SKIP + sha256sums = SKIP pkgname = synfig diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..72e8ffc0db8a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +* diff --git a/ETL-1.2.1.patch b/ETL-1.2.1.patch deleted file mode 100644 index bcf70e00880c..000000000000 --- a/ETL-1.2.1.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/ETL/_pen.h 2017-09-08 05:51:26.000000000 -0400 -+++ b/ETL/_pen.h 2018-07-27 12:56:43.833337339 -0400 -@@ -136,7 +136,8 @@ - typedef int value_type; - value_type x,y; - difference_type(value_type x, value_type y):x(x),y(y) { } -- value_type &operator[](int i)const { return i?y:x; } -+ const value_type &operator[](int i) const { return i?y:x; } -+ value_type &operator[](int i) { return i?y:x; } - }; - - protected: @@ -1,41 +1,39 @@ -# Maintainer: Mattéo Delabre <bonjour@matteodelabre.me> +# Maintainer: Mattéo Delabre <spam@delab.re> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=1.2.1 -pkgrel=5 +pkgver=1.2.2 +pkgrel=2 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(x86_64) url="https://synfig.org" license=('GPL2') depends=('libxml++2.6' 'libsigc++2.0' 'libmagick6' 'ffmpeg' 'fontconfig' 'libpng' 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs' 'mlt' - 'fftw' 'intltool') + 'fftw' 'intltool' 'sdl' 'sdl_mixer' 'sdl_image') makedepends=('boost') optdepends=('openexr' 'libsigc++') source=( - "https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/ETL-$pkgver.tar.gz" - "https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" - 'ETL-1.2.1.patch' - 'ffmpeg-3.0.patch') + "https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/source-ETL-$pkgver.tar.gz" + "https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/source-$pkgname-$pkgver.tar.gz" + 'ffmpeg-3.0.patch' + 'savecanvas-template.patch') sha256sums=( - '754d88c5ddfdef54f27d1e17f62a902eb9f09fbe7ef9aebded34541b4c1700e6' - '4d8bada4e99f05ee16b4256fc3f5a551d00a745347944837bbd6fa158b57e457' - '35e218317050430ebae667d26269903ad1c377407b9a75feb48a9138af131cb0' - '424b3cc38809038c3b015ce2a6d3a006d73aefe0445d0090fae45e8eb69b2b55') + '0dc19c5a6c9e964054ca3af6dacd6ab0c198d78071cfab2aebac178afe454d8b' + '5f5f7b33483041165f9a63fe4d95eb815971c7444569e574206f6964e83cc2ef' + 'SKIP' + 'SKIP') prepare() { - # Fix const-invalid method in ETL 1.2.1 using the patch which is included - # in ETL ≥ 1.3.9. This makes building with GCC possible. - # (see <https://github.com/synfig/synfig/commit/cb05b072>) - cd "$srcdir"/ETL-$pkgver - patch -p1 -i "$srcdir"/ETL-1.2.1.patch - # Workaround usage of deprecated ffmpeg constants by manually defining # them, and other deprecation workarounds cd "$srcdir"/$pkgname-$pkgver patch -p1 -i "$srcdir"/ffmpeg-3.0.patch + + # Fix invalid template inside “extern” C block + patch -p1 -i "$srcdir"/savecanvas-template.patch + } build() { diff --git a/savecanvas-template.patch b/savecanvas-template.patch new file mode 100644 index 000000000000..c25844a58257 --- /dev/null +++ b/savecanvas-template.patch @@ -0,0 +1,15 @@ +diff -u --recursive --text a/src/synfig/savecanvas.cpp b/src/synfig/savecanvas.cpp +--- a/src/synfig/savecanvas.cpp 2018-09-08 00:07:57.000000000 -0600 ++++ b/src/synfig/savecanvas.cpp 2019-11-19 16:27:16.276693231 -0700 +@@ -71,7 +71,7 @@ + #include "gradient.h" + #include <errno.h> + +-extern "C" { +-#include <libxml/tree.h> +-} ++// extern "C" { ++// #include <libxml/tree.h> ++// } + + #endif |