Projects
Multimedia
synfig
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 14
View file
synfig.spec
Changed
@@ -34,6 +34,8 @@ Patch0: synfig-configure-debug.patch Patch1: synfig-no-buildtime.patch Patch2: synfig-intltoolize.patch +Patch3: synfig-lyr_freetype.patch +Patch4: synfig-devel-deps.patch %if %{with imagemagick} BuildRequires: ImageMagick-devel %endif @@ -129,6 +131,8 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build autoreconf --install --force
View file
synfig-devel-deps.patch
Added
@@ -0,0 +1,64 @@ +--- + configure.ac | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +Index: synfig-1.0/configure.ac +=================================================================== +--- synfig-1.0.orig/configure.ac ++++ synfig-1.0/configure.ac +@@ -139,6 +139,7 @@ if test $with_magickpp = "yes" ; then { + PKG_CHECK_MODULES(MAGICKPP, Magick++ >= 6.4.2,[ + with_magickpp="yes" + AM_CONDITIONAL(HAVE_LIBMAGICKPP,true) ++ CONFIG_DEPS="$CONFIG_DEPS Magick++" + ],[ + with_magickpp="no" + AC_MSG_RESULT([ *** Magick++ Output target disabled]) +@@ -199,6 +200,7 @@ if test $with_libavcodec != "no" ; then + if test $with_libavcodec = "yes" ; then { + AC_DEFINE(WITH_LIBAVCODEC,[],[enable libavcodec support]) + AM_CONDITIONAL(WITH_LIBAVCODEC,true) ++ CONFIG_DEPS="$CONFIG_DEPS libavcodec libavformat" + } else { + AM_CONDITIONAL(WITH_LIBAVCODEC,false) + } ; fi +@@ -229,6 +231,7 @@ if test $with_libavcodec = "yes" ; then + + if test $with_libswscale = "yes" ; then { + AC_DEFINE(WITH_LIBSWSCALE, [], [enable libswscale support]) ++ CONFIG_DEPS="$CONFIG_DEPS libswscale" + + # Need to check both the new and old locations for the swscale header + # Need to save flags, add swscale flags, check headers and restore flags +@@ -261,6 +264,7 @@ AC_ARG_WITH(freetype, + if test $with_freetype != "no" ; then { + PKG_CHECK_MODULES(FREETYPE, freetype2,[ + with_freetype="yes" ++ CONFIG_DEPS="$CONFIG_DEPS freetype2" + ],[ + PKG_CHECK_MODULES(FREETYPE, xft,[ + with_freetype="yes" +@@ -283,6 +287,7 @@ AC_ARG_WITH(fontconfig, + if test $with_fontconfig != "no" ; then { + PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[ + with_fontconfig="yes" ++ CONFIG_DEPS="$CONFIG_DEPS fontconfig" + ],[ + with_fontconfig="no" + ]) +@@ -306,6 +311,7 @@ if test $with_openexr = "yes" ; then { + PKG_CHECK_MODULES(OPENEXR, OpenEXR,[ + AC_DEFINE(HAVE_OPENEXR,[], [ Define if OpenEXR is available ] ) + AM_CONDITIONAL(WITH_OPENEXR,true) ++ CONFIG_DEPS="$CONFIG_DEPS OpenEXR" + ], + [ + with_openexr="no" +@@ -317,7 +323,6 @@ if test $with_openexr = "no" ; then { + } ; fi + if test $use_openexr_half = yes ; then { + AC_MSG_RESULT([ ** Using OpenEXR Half.]) +- CONFIG_DEPS="$CONFIG_DEPS OpenEXR" + CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE" + OPENEXR_HALF_LIBS="-lHalf" + } else {
View file
synfig-lyr_freetype.patch
Added
@@ -0,0 +1,17 @@ +--- + src/modules/lyr_freetype/lyr_freetype.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: synfig-1.0/src/modules/lyr_freetype/lyr_freetype.cpp +=================================================================== +--- synfig-1.0.orig/src/modules/lyr_freetype/lyr_freetype.cpp ++++ synfig-1.0/src/modules/lyr_freetype/lyr_freetype.cpp +@@ -408,7 +408,7 @@ Layer_Freetype::new_face(const String &n + FcFontSetAdd(fs, match); + if (pat) + FcPatternDestroy(pat); +- if(fs){ ++ if(fs && fs->nfont){ + FcChar8* file; + if( FcPatternGetString (fs->fonts[0], FC_FILE, 0, &file) == FcResultMatch ) + error=FT_New_Face(ft_library,(const char*)file,face_index,&face);
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.