From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F29BF138334 for ; Thu, 9 Aug 2018 22:20:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F372BE09D8; Thu, 9 Aug 2018 22:20:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5F72E09D8 for ; Thu, 9 Aug 2018 22:20:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C44A6335C9E for ; Thu, 9 Aug 2018 22:20:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B066F380 for ; Thu, 9 Aug 2018 22:20:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1533853175.27f16b16970c8fd338fda948ed5c13e6bcdc6f0b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/, media-libs/mlt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mlt/Manifest media-libs/mlt/files/mlt-6.10.0-swig-underlinking.patch media-libs/mlt/mlt-6.10.0.ebuild X-VCS-Directories: media-libs/mlt/files/ media-libs/mlt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 27f16b16970c8fd338fda948ed5c13e6bcdc6f0b X-VCS-Branch: master Date: Thu, 9 Aug 2018 22:20:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 62500a62-4997-418a-9df8-db101b670563 X-Archives-Hash: 716dce04c0358e58b848509ae0088d03 commit: 27f16b16970c8fd338fda948ed5c13e6bcdc6f0b Author: Jouni Kosonen tukesoft com> AuthorDate: Sat Jul 28 19:02:56 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 9 22:19:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f16b16 media-libs/mlt: version bump 6.10.0 Bug: https://bugs.gentoo.org/661842 Bug: https://bugs.gentoo.org/650258 Closes: https://github.com/gentoo/gentoo/pull/9371 media-libs/mlt/Manifest | 1 + .../mlt/files/mlt-6.10.0-swig-underlinking.patch | 12 ++ media-libs/mlt/mlt-6.10.0.ebuild | 220 +++++++++++++++++++++ 3 files changed, 233 insertions(+) diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 58d6d4bec16..acea3b43f21 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,2 +1,3 @@ DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb DIST mlt-6.6.0.tar.gz 1365768 BLAKE2B e2e6919d603560dac3d809740a3be2989a3b52a4e933fa67927c5c26796a5c9b35da1aedb54caa4c87133dc682d5f41455900594ebdfd6ec1516ff02d477d58f SHA512 06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845 +DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B 4bbcf95409df1ea1828d2b34e6d6663cf83f5672641034f775d029037505051c5490c46c69e104811aaf776794be2df95913d094319f4a2dbba0c42117abe15e SHA512 6f374f20f1dc851792c1075537cf7e977038fb557b2bd5d5816c1fc69d471947c8469c914cf662766f3b503ae819881bf2b4e1673e0f7a84309e0fb671a9de1b diff --git a/media-libs/mlt/files/mlt-6.10.0-swig-underlinking.patch b/media-libs/mlt/files/mlt-6.10.0-swig-underlinking.patch new file mode 100644 index 00000000000..e84e98c1576 --- /dev/null +++ b/media-libs/mlt/files/mlt-6.10.0-swig-underlinking.patch @@ -0,0 +1,12 @@ +diff --git a/src/swig/ruby/build b/src/swig/ruby/build +index 2d0cc0d..1a8aee7 100755 +--- a/src/swig/ruby/build ++++ b/src/swig/ruby/build +@@ -8,6 +8,6 @@ system( "ln -sf ../mlt.i" ) + system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" ) + $CFLAGS = $CFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '') + $CXXFLAGS = $CXXFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '') +-$LDFLAGS = $LDFLAGS.to_s + " -L../../mlt++ -lmlt++" ++$LDFLAGS = $LDFLAGS.to_s + " -L../../mlt++ -lmlt++ -L../../framework -lmlt" + create_makefile('mlt') + system( "make V=1" ) diff --git a/media-libs/mlt/mlt-6.10.0.ebuild b/media-libs/mlt/mlt-6.10.0.ebuild new file mode 100644 index 00000000000..0e420e80014 --- /dev/null +++ b/media-libs/mlt/mlt-6.10.0.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2018 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="ruby23" +inherit flag-o-matic 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-12: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-4.1.2 + kernel_linux? ( media-libs/alsa-lib ) + ) + ruby? ( ${RUBY_DEPS} ) + sdl? ( + media-libs/libsdl2[X,opengl,video] + media-libs/sdl2-image + ) + 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}"/${P}-swig-underlinking.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-sdl + --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 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 sdl sdl2) + $(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="${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 +}