diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | savecanvas-template.patch | 15 |
4 files changed, 34 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = synfig pkgdesc = Professional vector animation program (CLI renderer only) pkgver = 1.2.2 - pkgrel = 1 + pkgrel = 2 url = https://synfig.org arch = x86_64 license = GPL2 @@ -21,14 +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.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 + source = savecanvas-template.patch sha256sums = 0dc19c5a6c9e964054ca3af6dacd6ab0c198d78071cfab2aebac178afe454d8b sha256sums = 5f5f7b33483041165f9a63fe4d95eb815971c7444569e574206f6964e83cc2ef - sha256sums = 424b3cc38809038c3b015ce2a6d3a006d73aefe0445d0090fae45e8eb69b2b55 + 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 @@ +* @@ -1,33 +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.2 -pkgrel=1 +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/source-ETL-$pkgver.tar.gz" "https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/source-$pkgname-$pkgver.tar.gz" - 'ffmpeg-3.0.patch') + 'ffmpeg-3.0.patch' + 'savecanvas-template.patch') sha256sums=( '0dc19c5a6c9e964054ca3af6dacd6ab0c198d78071cfab2aebac178afe454d8b' '5f5f7b33483041165f9a63fe4d95eb815971c7444569e574206f6964e83cc2ef' - '424b3cc38809038c3b015ce2a6d3a006d73aefe0445d0090fae45e8eb69b2b55') + 'SKIP' + 'SKIP') prepare() { # 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 |