diff --git a/media-gfx/synfig/files/synfig-1.4.0-fix-cflags.patch b/media-gfx/synfig/files/synfig-1.4.0-fix-cflags.patch new file mode 100644 index 0000000..330f31e --- /dev/null +++ b/media-gfx/synfig/files/synfig-1.4.0-fix-cflags.patch @@ -0,0 +1,24 @@ +--- a/m4/subs.m4 2020-11-13 12:21:45.000000000 +0200 ++++ b/m4/subs.m4 2021-03-13 19:19:48.626353955 +0200 +@@ -77,16 +77,16 @@ + + case "$debug" in + yes) +- debug_flags="-D_DEBUG -g -O0" ++ debug_flags="-D_DEBUG" + BIGOBJ_FLAGS="" + ($CC --version | grep -q mingw) && BIGOBJ_FLAGS="-Wa,-mbig-obj" +- CXXFLAGS="`echo $CXXFLAGS | sed s:-O.::` $debug_flags -fno-inline $BIGOBJ_FLAGS" +- CFLAGS="`echo $CFLAGS | sed s:-O.::` $debug_flags" ++ CXXFLAGS="${CXXFLAGS} $debug_flags -fno-inline $BIGOBJ_FLAGS" ++ CFLAGS="${CFLAGS} $debug_flags" + ;; + no|*) + debug_flags="-DNDEBUG" +- CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags" +- CFLAGS="`echo $CFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags" ++ CXXFLAGS="${CXXFLAGS} $debug_flags" ++ CFLAGS="${CFLAGS} $debug_flags" + ;; + esac + diff --git a/media-gfx/synfig/synfig-1.4.0-r2.ebuild b/media-gfx/synfig/synfig-1.4.0-r2.ebuild index 77dff87..108c587 100644 --- a/media-gfx/synfig/synfig-1.4.0-r2.ebuild +++ b/media-gfx/synfig/synfig-1.4.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 #Ebuild based on the booboo overlay version @@ -23,31 +23,34 @@ IUSE="imagemagick ffmpeg dv openexr truetype jpeg fontconfig opencl" DEPEND=" ~dev-cpp/ETL-${PV} >=dev-cpp/glibmm-2.4:2 - dev-libs/boost - sys-libs/zlib - dev-libs/libsigc++:2 dev-cpp/libxmlpp:2.6 - media-libs/libpng - media-libs/mlt - x11-libs/pango - x11-libs/cairo + dev-libs/boost:= + dev-libs/libsigc++:2 + media-libs/libpng:= + media-libs/mlt:= sci-libs/fftw:3.0 - ffmpeg? ( media-video/ffmpeg ) - openexr? ( media-libs/openexr ) - truetype? ( media-libs/freetype ) + sys-libs/zlib:= + x11-libs/cairo:= + x11-libs/pango:= + ffmpeg? ( media-video/ffmpeg:= ) fontconfig? ( media-libs/fontconfig ) jpeg? ( virtual/jpeg ) opencl? ( dev-libs/ocl-icd ) + openexr? ( media-libs/openexr:= ) + truetype? ( media-libs/freetype:= ) " RDEPEND="${DEPEND} - dv? ( media-libs/libdv ) - imagemagick? ( media-gfx/imagemagick ) + dv? ( media-libs/libdv:= ) + imagemagick? ( media-gfx/imagemagick:= ) " -src_prepare() { - eapply_user +PATCHES=( + "${FILESDIR}"/${P}-fix-cflags.patch +) +src_prepare() { default + eautoreconf }