mirror of
https://abf.rosa.ru/djam/synfig.git
synced 2025-02-23 17:12:57 +00:00
Updated to 1.2.2
This commit is contained in:
parent
9aaddb8e39
commit
c844a0f7b1
6 changed files with 41 additions and 30 deletions
3
.abf.yml
3
.abf.yml
|
@ -1,5 +1,6 @@
|
|||
removed_sources:
|
||||
synfig-1.0.1.tar.gz: 9f6e942a97f3bdbab6e96698ac53dee6dcff9391
|
||||
synfig-1.0.tar.gz: 309db20d015c1b2b99eca80fbcd47b875c190b4c
|
||||
sources:
|
||||
synfig-1.2.0.tar.gz: 15ca82e44f27c851bfc223791b3b4d6a023d44c3
|
||||
sources:
|
||||
synfig-1.2.2.tar.gz: 3fdc8f4b90888dfecc0589f9c7c88e3d1841add9
|
||||
|
|
12
synfig-1.0.1-buildfix.patch
Normal file
12
synfig-1.0.1-buildfix.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
diff -up ./src/synfig/time.cpp.0000 ./src/synfig/time.cpp
|
||||
--- ./src/synfig/time.cpp.0000 2015-07-31 20:13:19.829856535 +0300
|
||||
+++ ./src/synfig/time.cpp 2015-07-31 20:12:27.451866131 +0300
|
||||
@@ -60,7 +60,7 @@ inline bool isnan(float x) { return x !=
|
||||
|
||||
/* === U S I N G =========================================================== */
|
||||
|
||||
-using namespace std;
|
||||
+/* using namespace std; */
|
||||
using namespace etl;
|
||||
using namespace synfig;
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN synfig-1.0.1.old/configure.ac synfig-1.0.1/configure.ac
|
||||
--- synfig-1.0.1.old/configure.ac 2015-07-21 08:07:35.000000000 +0200
|
||||
+++ synfig-1.0.1/configure.ac 2015-12-23 18:10:10.424235124 +0100
|
||||
@@ -46,8 +46,6 @@ AC_C_BIGENDIAN
|
||||
|
||||
# -- A R G U M E N T S ----------------------------------------
|
||||
|
||||
-AC_ARG_OPTIMIZATION
|
||||
-AC_ARG_DEBUG
|
||||
AC_ARG_WARNINGS
|
||||
AC_ARG_PROFILING
|
||||
AC_ARG_PROFILE_ARCS
|
|
@ -1,11 +0,0 @@
|
|||
diff -urN synfig-1.0.2/configure.ac synfig-1.0.2-patched/configure.ac
|
||||
--- synfig-1.0.2/configure.ac 2015-10-06 19:13:36.000000000 +1000
|
||||
+++ synfig-1.0.2-patched/configure.ac 2016-11-11 23:31:31.144848872 +1000
|
||||
@@ -125,6 +125,7 @@
|
||||
|
||||
AC_ARG_WITH(magickpp,
|
||||
AS_HELP_STRING(--without-magickpp, [do not support Magick++]),[
|
||||
+ AM_CONDITIONAL(HAVE_LIBMAGICKPP,false)
|
||||
],[
|
||||
with_magickpp="yes"
|
||||
])
|
21
synfig-1.1.10-optflags.patch
Normal file
21
synfig-1.1.10-optflags.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
--- a/configure.ac~ 2016-07-06 12:58:17.000000000 -0500
|
||||
+++ b/configure.ac 2016-07-06 13:25:30.034489640 -0500
|
||||
@@ -47,12 +47,12 @@
|
||||
|
||||
# -- A R G U M E N T S ----------------------------------------
|
||||
|
||||
-AC_ARG_OPTIMIZATION
|
||||
-AC_ARG_DEBUG
|
||||
-AC_ARG_WARNINGS
|
||||
-AC_ARG_PROFILING
|
||||
-AC_ARG_PROFILE_ARCS
|
||||
-AC_ARG_BRANCH_PROBABILITIES
|
||||
+#AC_ARG_OPTIMIZATION
|
||||
+#AC_ARG_DEBUG
|
||||
+#AC_ARG_WARNINGS
|
||||
+#AC_ARG_PROFILING
|
||||
+#AC_ARG_PROFILE_ARCS
|
||||
+#AC_ARG_BRANCH_PROBABILITIES
|
||||
|
||||
AC_ARG_ENABLE(g5opt,
|
||||
AS_HELP_STRING(--enable-g5opt, [enable optimizations specific to G5 proc]),[
|
12
synfig.spec
12
synfig.spec
|
@ -6,15 +6,15 @@
|
|||
|
||||
Summary: Vector-based 2D animation renderer
|
||||
Name: synfig
|
||||
Version: 1.2.0
|
||||
Release: 3
|
||||
Version: 1.2.2
|
||||
Release: 1
|
||||
License: GPLv3+
|
||||
Group: Graphics
|
||||
Url: http://www.synfig.org
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source100: %{name}.rpmlintrc
|
||||
Patch0: synfig-1.0.1-cflags.patch
|
||||
Patch1: synfig-1.0.2-configure.patch
|
||||
Patch0: synfig-1.0.1-buildfix.patch
|
||||
Patch1: synfig-1.1.10-optflags.patch
|
||||
BuildRequires: automake
|
||||
#BuildRequires: automake1.4
|
||||
BuildRequires: config(autoconf)
|
||||
|
@ -103,16 +103,16 @@ by synfig.
|
|||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
|
||||
%build
|
||||
export CC=gcc
|
||||
export CXX=g++
|
||||
autoreconf -vfi
|
||||
intltoolize --copy --force
|
||||
# FIXME Enabling magickpp makes the build fail:
|
||||
# 'GetExceptionInfo' is not a member of 'MagickCore'
|
||||
%configure2_5x \
|
||||
--disable-static \
|
||||
--without-magickpp
|
||||
--with-imagemagick
|
||||
%make
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue