gentoo resync : 16.11.2017

4 files changed, 321 insertions, 0 deletions

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 58383f05c2eb..cd48cefeab16 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -3,9 +3,12 @@ AUX mlt-6.4.1-glibc226-1.patch 1224 SHA256 0a3c41b54d660fc174556321e248265a055c6
 AUX mlt-6.4.1-glibc226-2.patch 732 SHA256 fb8a13b16b3d7f9bd51dca6a6d4c56738cf056e37d1e230ff9fadbcf2e64bb10 SHA512 3a696bb3ffbc8940b39fecf3dbee21d938a417fdd28aaf59d17b184a941bf2b45bbfde40f9b84e358517cee5db2da47e19f69488ca518a255267241c8dca7db3 WHIRLPOOL c6759432734694508e843811c9892506d9b1f862b00b99a1720da5d0cc87578426ea7fa9d99fe945537e2085533f411088f3152928b17f5e365a1f9bb4d7ed08
 AUX mlt-6.4.1-libebur128-unbundle.patch 4162 SHA256 4872117b2b43e3bb82f96f9bb531860e71fe3e8e730a4123965506213ae209b9 SHA512 70db75522fce9ba8b296cb86c4574ba499e6274eb1cab3170e0524cba76482af4fde49a2c422215461ceb6f1258c00e535914c90c177b93893c2b330ad0cd08b WHIRLPOOL 62ddb1ee6fccfffa7f8ec275e38b5d9acfae3fb105490b57c6cd6a1bbd52cf244e5ebea20005e1f272adce10185e261aaa7b95683d275b5d5fb1004b5d42cdaa
 AUX mlt-6.4.1-opencv-3.3.patch 1346 SHA256 61d168b826741cda400f67380c5ae9fa6245f3d0527338e1494da4f8ab76a8f1 SHA512 5bab43be1a0e85764a7a80f58a1f211aef737a6ccbe3d9080e12103235891a0418aa8505268a71632b737834c9a5eb379bdefcb24f63862a596860dd118ee622 WHIRLPOOL aadd587d4accd29ccfcecba0fbf3372a1ce4bbcd58dc70410af50db7043bf51cd4b8badd6d4866174a4cd08140f74f65af68889e3fe44071170d5deec926f6a5
+AUX mlt-6.4.1-qtopengl-1.patch 993 SHA256 fbd0ca45e0b6c93b1bc9037c89bf3cecb797fbae6bc756b3ef0de911e8fd1a53 SHA512 4acc3ff23c286748986236211b20f6b6192828908e7177bd2056da87dcdc1f9abe93bf50f7d53e2ccac148d6ab757371619f02d4e2ac77fb6b810580804e9696 WHIRLPOOL 8b772bfff05e73652f448801c1958abf887fe58d06b9139f4876fea252bb012758c18a67cb07d6d6a2ded66e2ba72b4d0560bb09c0a19ca1f46ed66fb5f7497c
+AUX mlt-6.4.1-qtopengl-2.patch 2573 SHA256 295bda8cef85cedb435179e05f3809e99d32908763f31616a3f1ff5341d6fd79 SHA512 dd1c0972e5b659c777a94a05a7d070e0e1ffdf1a364f24213ad7ab37bf90e9d7209711dd1e1dd106ed260721a32533fd4873d0df28e5ac683eb88ccdbbd0947f WHIRLPOOL 7d2cc5296369e64751ebe3907f5a2554adcde29354e23a0461759f88981c88b929b1de68702ff0ef7dd9352aa3b09442ab9f134cc9bd0ed09c488a61d43651e4
 DIST mlt-6.4.1.tar.gz 1344030 SHA256 87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb WHIRLPOOL 5b89a42bd95be98e5461d5dcf2dd0f2fe481b519078c54fc461ff8561a2cc29eb18027061efd6a4d53b2a3c15bf4605add57fdfd98a49226eaf3abc738b73962
 EBUILD mlt-6.4.1-r2.ebuild 5611 SHA256 87e2762bcdf800c70aba822c5296aee427b64548ee31004d9898d301c382d735 SHA512 dc24d3812d5452b056ee7e7192f22712177aec8cdf5470e76314a7335f7a8ba849f5dd629b9d6f5c9f873a4b03181cb00914398406106b1aec682b8e8f0bed20 WHIRLPOOL d0b3531890c74ca1535992ddaaf09dc8edde6a2ebd4771509adeaec1d602160bd62526bcd52a4e51ef8bdf62f4a915cc9d2fe74b13a37032ef02f9d9c158bdd9
 EBUILD mlt-6.4.1-r4.ebuild 5814 SHA256 9ec5ffdc4ec51b4a8b541d792eaa75f820ca54a466114bb39a4f76db05803d56 SHA512 a9dad9ccaf640182da4f94bcdc5f9ce1a7a8cb0462a98b1a01dcaf8781c50b734ba74d0c4f597f6c41b2d1fe2de29f3ad0e73def1562768d30fc2f16fb880064 WHIRLPOOL db7f514c7df75790085c8b941286930056a08c9813a35b3ced3eaf8c175c944bbfdf59177b248c585e73268829c4b72b21a919209d60eb30943813e217fd1ff3
+EBUILD mlt-6.4.1-r5.ebuild 5683 SHA256 26a2c060d9930d36355ec1c7ff43d872a524319dfb13abb70e2e3ca151ab6542 SHA512 9a4d3473497eac6e8dd884ee83b6f2c6b55ff7decd4b2ac86ef68b0e6d5bfc4ce8fec063d1028ddd9912bb32deae7498808168371a39e600ea73f91df6ef4018 WHIRLPOOL d04375121f6ee4edaaac780c1e35691004b4c729c1efc7777a0bbc863f4547a3497ea77e7afc94c43179834e2e649bfe78d55f686e460e50f9d3ef827b3777d3
 MISC ChangeLog 7686 SHA256 18446c0ec5118510f377ab8b8f40ee3740acc91467c96b7e7e6a1249071042c0 SHA512 c46342484514eeccf9aa8febcef9124251282a837881ca810f2eed3b0e80c6a049de0b666feb75a3e5416a4090dba8c6fd8d4394d178512acf5019b7e066bca9 WHIRLPOOL ec9d22690d6e07969f4bdaab649de2d5410e083e7b57f7c4d349a19dfe4378183dc540111c34e2719a4f1b769b4564ee70a83707aceee0211e571a0f5bdc28c0
 MISC ChangeLog-2015 17633 SHA256 b35b70222bff7554b6e4173e6aa0efc79a1eb996fa97d2e27629f4728c8581e0 SHA512 b408d322a82ab8558ab7048739a5dacd1298b5d02e6a1f32bdb0da9fd2c1f6ad44d463f536f2592cb02537cc0fafde8d9b57ae92c47847f08afff43ef732c0a6 WHIRLPOOL 254f90f3f76a534c1e1bdbb2126e5778601c55c71df41bcebda7a3959fb62d1b023d2d374028f3c08c02f7106678ad8cf8b3d6f2c3111713365ffcc524da09a0
 MISC metadata.xml 1501 SHA256 f1723731cc9d4d48fb2c87dea4c7a6205038ecf2f804408759cc813b131219d0 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4 WHIRLPOOL 2ecbf7d62271b255c04d2d954fecb1e9b41404c214d72648daec718377e08b2515339751c5a8b0aea76d880a153de31e742d3e2c35ab95801cdc7eb641df547f
diff --git a/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch b/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch
new file mode 100644
index 000000000000..c00e8d05615b
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch
@@ -0,0 +1,33 @@
+From d2a04ae77a6b2c82a2e12b9fb631beb8f825946d Mon Sep 17 00:00:00 2001
+From: Alberto Villa <avilla@FreeBSD.org>
+Date: Sat, 24 Dec 2016 05:07:54 +0100
+Subject: [PATCH] Move Qt OpenGL include(s) to Qt 4 specific code
+
+Only Qt 4 code references those files (QMutex and QWaitCondition are
+not OpenGL files, but still they're only useful in Qt 4 code).
+---
+ src/modules/qt/consumer_qglsl.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/qt/consumer_qglsl.cpp b/src/modules/qt/consumer_qglsl.cpp
+index 74840602..ca0cf383 100644
+--- a/src/modules/qt/consumer_qglsl.cpp
++++ b/src/modules/qt/consumer_qglsl.cpp
+@@ -20,13 +20,14 @@
+ #include "common.h"
+ #include <framework/mlt.h>
+ #include <QApplication>
+-#include <QGLWidget>
+-#include <QMutex>
+-#include <QWaitCondition>
+ #include <QtGlobal>
+ 
+ #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ 
++#include <QGLWidget>
++#include <QMutex>
++#include <QWaitCondition>
++
+ class GLWidget : public QGLWidget
+ {
+ private:
diff --git a/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch b/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch
new file mode 100644
index 000000000000..5f98f12bbb1a
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch
@@ -0,0 +1,61 @@
+From 6ba6cab570d824641f63c66b355ba28f0721811f Mon Sep 17 00:00:00 2001
+From: Alberto Villa <avilla@FreeBSD.org>
+Date: Sat, 24 Dec 2016 05:10:20 +0100
+Subject: [PATCH] Avoid looking for Qt5OpenGL module
+
+The OpenGL-related code needed by qimage was moved to Qt5Gui, which
+allows to safely remove the dependency on Qt 5 builds.
+
+Build tested on FreeBSD.
+---
+ src/modules/qt/configure | 20 +-------------------
+ 1 file changed, 1 insertion(+), 19 deletions(-)
+
+diff --git a/src/modules/qt/configure b/src/modules/qt/configure
+index 24803baf..7475dc09 100755
+--- a/src/modules/qt/configure
++++ b/src/modules/qt/configure
+@@ -107,14 +107,6 @@ else
+ 		then
+ 			echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtWidgets >> config.mak
+ 			echo QTLIBS=-Wl,-rpath-link,"$qt_libdir" -L"$qt_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5Widgets >> config.mak
+-			if [ -f "$qt_libdir/libQt5OpenGL.so" ] || [ -f "$qt_libdir/libQt5OpenGL.a" ]
+-			then
+-				echo QTCXXFLAGS+=-I$qt_includedir/QtOpenGL >> config.mak
+-				echo QTLIBS+=-lQt5OpenGL >> config.mak
+-			else
+-				echo "- Qt5OpenGL not found: disabling"
+-				without_opengl=true
+-			fi
+ 		# Qt5 on OS X
+ 		elif [ -d "$qt_libdir/QtWidgets.framework" ]
+ 		then
+@@ -123,11 +115,10 @@ else
+ 				-I$qt_includedir/QtGui -I$qt_libdir/QtGui.framework/Headers \
+ 				-I$qt_includedir/QtXml -I$qt_libdir/QtXml.framework/Headers \
+ 				-I$qt_includedir/QtSvg -I$qt_libdir/QtSvg.framework/Headers \
+-				-I$qt_includedir/QtOpenGL -I$qt_libdir/QtOpenGL.framework/Headers \
+ 				-I$qt_includedir/QtWidgets -I$qt_libdir/QtWidgets.framework/Headers \
+ 				>> config.mak
+ 			echo QTLIBS=-F"$qt_libdir" -framework QtCore -framework QtGui -framework \
+-				QtXml -framework QtSvg -framework QtOpenGL -framework QtWidgets >> config.mak
++				QtXml -framework QtSvg -framework QtWidgets >> config.mak
+ 		# Qt4 on OS X
+ 		elif [ -d "$qt_libdir/QtGui.framework" ]
+ 		then
+@@ -151,15 +142,6 @@ else
+ 			without_kde=true
+ 			echo QTCXXFLAGS=$(pkg-config --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
+ 			echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
+-			pkg-config --exists 'Qt5OpenGL'
+-			if [ $? -eq 0 ]
+-			then
+-				echo QTCXXFLAGS+=$(pkg-config --cflags Qt5OpenGL) >> config.mak
+-				echo QTLIBS+=$(pkg-config --libs Qt5OpenGL) >> config.mak
+-			else
+-				echo "- Qt5OpenGL not found: disabling"
+-				without_opengl=true
+-			fi
+ 		else
+ 			pkg-config --exists 'QtGui >= 4'
+ 			if [ $? -eq 0 ]
diff --git a/media-libs/mlt/mlt-6.4.1-r5.ebuild b/media-libs/mlt/mlt-6.4.1-r5.ebuild
new file mode 100644
index 000000000000..64cf548226c9
--- /dev/null
+++ b/media-libs/mlt/mlt-6.4.1-r5.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+# this ebuild currently only supports installing ruby bindings for a single ruby version
+# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
+# /usr/bin/${USE_RUBY} directly
+USE_RUBY="ruby22"
+inherit eutils flag-o-matic multilib python-single-r1 ruby-single toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
+gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
+# java perl php tcl vidstab
+IUSE="${IUSE} kernel_linux"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+#rtaudio will use OSS on non linux OSes
+COMMON_DEPEND="
+	>=media-libs/libebur128-1.2.2
+	ffmpeg? (
+		libav? ( media-video/libav:0=[vdpau?] )
+		!libav? ( media-video/ffmpeg:0=[vdpau?] )
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( >=dev-lang/lua-5.1.4-r4:= )
+	opencv? ( >=media-libs/opencv-3.2.0:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+	)
+	rtaudio? (
+		media-libs/rtaudio
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	ruby? ( ${RUBY_DEPS} )
+	sdl? (
+		>=media-libs/libsdl-1.2.10[X,opengl,video]
+		>=media-libs/sdl-image-1.2.4
+	)
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+#	vidstab? ( media-libs/libvidstab )
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+RDEPEND="${COMMON_DEPEND}
+	!media-libs/mlt++
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
+	"${FILESDIR}"/${P}-libebur128-unbundle.patch
+	"${FILESDIR}"/${P}-opencv-3.3.patch
+	"${FILESDIR}"/${P}-glibc226-{1,2}.patch
+	"${FILESDIR}"/${P}-qtopengl-{1,2}.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+	done
+	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
+
+	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# bug 589848
+	append-cxxflags -std=c++11
+
+	local myconf=(
+		--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-kde
+		--disable-swfdec
+		$(use_enable debug)
+		$(use compressed-lumas && echo ' --luma-compress')
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable gtk gtk2)
+		$(use_enable sdl)
+		$(use_enable jack jackrack)
+		$(use_enable ffmpeg avformat)
+		$(use ffmpeg && echo ' --avformat-swscale')
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable melt)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable libsamplerate resample)
+		$(use_enable rtaudio)
+		$(use vdpau && echo ' --avformat-vdpau')
+		$(use_enable xml)
+		$(use_enable xine)
+		$(use_enable kdenlive)
+		--disable-sox
+	)
+		#$(use_enable sox) FIXME
+
+	if use qt5 ; then
+		myconf+=(
+			--enable-qt
+			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
+			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)
+		)
+	else
+		myconf+=( --disable-qt )
+	fi
+
+	if use x86 || use amd64 ; then
+		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
+	else
+		myconf+=( --disable-mmx )
+	fi
+
+	if ! use melt; then
+		sed -i -e "s;src/melt;;" Makefile || die
+	fi
+
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang=()
+	# TODO: java perl php tcl
+	for i in lua python ruby ; do
+		use $i && swig_lang+=( $i )
+	done
+	[[ -z ${swig_lang} ]] && swig_lang=( none )
+
+	econf ${myconf[@]} --swig-languages="${swig_lang[@]}"
+
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	docinto swig
+
+	# Install SWIG bindings
+	if use lua; then
+		cd "${S}"/src/swig/lua || die
+		exeinto $(pkg-config --variable INSTALL_CMOD lua)
+		doexe mlt.so
+		dodoc play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		insinto $(python_get_sitedir)
+		doins mlt.py
+		exeinto $(python_get_sitedir)
+		doexe _mlt.so
+		dodoc play.py
+		python_optimize
+	fi
+
+	if use ruby; then
+		cd "${S}"/src/swig/ruby || die
+		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+		doexe mlt.so
+		dodoc play.rb thumbs.rb
+	fi
+	# TODO: java perl php tcl
+}