[gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/

["Sebastian Pipping" <sping@gentoo.org>]

commit:     0217aa144b09b53ccd7da255559fe90edd91e81a
Author:     Bob Brooks <gitbugged <AT> cool <DOT> fr <DOT> nf>
AuthorDate: Sat Dec 16 18:16:49 2017 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 22:35:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0217aa14

media-libs/gegl-0.2.0-r5: fix ffmpeg/libav support

ffmpeg has renamed avcodec_alloc_frame to av_frame_alloc

Closes: https://bugs.gentoo.org/636780
Closes: https://github.com/gentoo/gentoo/pull/6154

 .../files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch   |  38 +++++
 media-libs/gegl/gegl-0.2.0-r5.ebuild               | 164 +++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch
new file mode 100644
index 00000000000..6998a02e75f
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch
@@ -0,0 +1,38 @@
+From 6e9ac140385d28210afdd2ed2bf9b0533ca0aac1 Mon Sep 17 00:00:00 2001
+From: fafryd <dz1125.bug.tracker@gmail.com>
+Date: Sat, 5 Mar 2016 22:11:39 +0100
+Subject: [PATCH] use av_frame_alloc instead of avcodec_alloc_frame
+
+---
+ operations/external/ff-load.c          | 2 +-
+ operations/workshop/external/ff-save.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 442ec5f..0b9d8e8 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -321,7 +321,7 @@ prepare (GeglOperation *operation)
+       p->width = p->enc->width;
+       p->height = p->enc->height;
+       p->frames = 10000000;
+-      p->lavc_frame = avcodec_alloc_frame ();
++      p->lavc_frame = av_frame_alloc ();
+ 
+       if (p->fourcc)
+         g_free (p->fourcc);
+diff --git a/operations/workshop/external/ff-save.c b/operations/workshop/external/ff-save.c
+index 0f3105d..84d68c5 100644
+--- a/operations/workshop/external/ff-save.c
++++ b/operations/workshop/external/ff-save.c
+@@ -537,7 +537,7 @@ alloc_picture (int pix_fmt, int width, int height)
+   uint8_t  *picture_buf;
+   int       size;
+ 
+-  picture = avcodec_alloc_frame ();
++  picture = av_frame_alloc ();
+   if (!picture)
+     return NULL;
+   size = avpicture_get_size (pix_fmt, width, height);
+-- 
+2.7.2

diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
new file mode 100644
index 00000000000..37bbe3ca913
--- /dev/null
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.11  # see bug 471990, comment 3
+# vala and introspection support is broken, bug #468208
+#VALA_MIN_API_VERSION=0.14
+#VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools #vala
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+
+RDEPEND="
+	>=media-libs/babl-0.1.10
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gdk-pixbuf-2.18:2
+	x11-libs/pango
+	sys-libs/zlib
+	cairo? ( x11-libs/cairo )
+	ffmpeg? (
+		libav? ( >=media-video/libav-11.3:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng:0= )
+	raw? ( >=media-libs/libopenraw-0.1:0= )
+	sdl? ( media-libs/libsdl )
+	svg? ( >=gnome-base/librsvg-2.14:2 )
+	umfpack? ( sci-libs/umfpack )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+"
+#	>=media-libs/babl-0.1.10[introspection?]
+#	introspection? ( >=dev-libs/gobject-introspection-0.10
+#			>=dev-python/pygobject-2.26:2 )
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.1
+	dev-lang/perl
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2
+"
+#	vala? ( $(vala_depend) )"
+
+DOCS=( ChangeLog INSTALL README NEWS )
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=636780
+	epatch "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=442016
+	epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+	epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=416587
+	epatch "${FILESDIR}/${P}-introspection-version.patch"
+
+	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=605216
+	# https://bugs.gentoo.org/show_bug.cgi?id=617430
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
+	epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
+
+	eapply_user
+	eautoreconf
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=468248
+	local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
+	[[ -f "${deps_file}" ]] || touch "${deps_file}"
+
+#	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# never enable altering of CFLAGS via profile option
+	# libspiro: not in portage main tree
+	# disable documentation as the generating is bit automagic
+	#    if anyone wants to work on it just create bug with patch
+
+	# Also please note that:
+	#
+	#  - Some auto-detections are not patched away since the docs are
+	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
+	#    tools affect re-generation of docs, only
+	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+	#
+	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
+	#
+	#  - Parameter --disable-workshop disables any use of Lua, effectivly
+	#
+	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+	#
+	#  - There are two checks for dot, one controllable by --with(out)-graphviz
+	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+	#
+	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
+	# https://bugs.gentoo.org/show_bug.cgi?id=451136
+	#
+	econf \
+		--disable-silent-rules \
+		--disable-profile \
+		--without-libspiro \
+		--disable-docs --disable-workshop \
+		--with-pango --with-gdk-pixbuf \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable debug) \
+		$(use_with cairo) \
+		$(use_with cairo pangocairo) \
+		--without-exiv2 \
+		$(use_with ffmpeg libavformat) \
+		--without-graphviz \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k jasper) \
+		--without-lua \
+		$(use_with openexr) \
+		$(use_with png libpng) \
+		$(use_with raw libopenraw) \
+		$(use_with sdl) \
+		$(use_with svg librsvg) \
+		$(use_with umfpack) \
+		--without-libv4l \
+		$(use_with lensfun) \
+		--disable-introspection \
+		--without-vala
+#		$(use_enable introspection) \
+#		$(use_with vala)
+}
+
+src_test() {
+	gnome2_environment_reset  # sandbox issues
+	default
+}
+
+src_compile() {
+	gnome2_environment_reset  # sandbox issues (bug #396687)
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}