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 55E9B138334 for ; Sun, 30 Jun 2019 11:51:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8ECCCE0883; Sun, 30 Jun 2019 11:51:21 +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 62744E0883 for ; Sun, 30 Jun 2019 11:51:21 +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 F0FF4346D03 for ; Sun, 30 Jun 2019 11:51:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 684482A5 for ; Sun, 30 Jun 2019 11:51:18 +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: <1561895461.fad2ebe4331c7f3fffdf4586871f94483a6444e6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mlt/mlt-6.16.0-r1.ebuild X-VCS-Directories: media-libs/mlt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fad2ebe4331c7f3fffdf4586871f94483a6444e6 X-VCS-Branch: master Date: Sun, 30 Jun 2019 11:51:18 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 667e3306-618f-4ae0-a3a1-6865d08c4736 X-Archives-Hash: 0a87dab1a02e53a912bb879f14098d09 commit: fad2ebe4331c7f3fffdf4586871f94483a6444e6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 30 11:29:14 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 30 11:51:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad2ebe4 media-libs/mlt: Re-add USE ruby (ruby24) Bug: https://bugs.gentoo.org/684436 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/mlt/mlt-6.16.0-r1.ebuild | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild index 2cd5d3c075b..6161697e042 100644 --- a/media-libs/mlt/mlt-6.16.0-r1.ebuild +++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild @@ -4,7 +4,11 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) -inherit python-single-r1 qmake-utils toolchain-funcs +# 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="ruby24" +inherit python-single-r1 qmake-utils ruby-single toolchain-funcs DESCRIPTION="Open source multimedia framework for television broadcasting" HOMEPAGE="https://www.mltframework.org/" @@ -15,7 +19,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86 ~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 kernel_linux libav libsamplerate lua melt opencv opengl python -qt5 rtaudio sdl vdpau vidstab xine xml" +qt5 rtaudio ruby sdl vdpau vidstab xine xml" # java perl php tcl REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -24,13 +28,13 @@ SWIG_DEPEND=">=dev-lang/swig-2.0" # java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 ) # perl? ( ${SWIG_DEPEND} ) # php? ( ${SWIG_DEPEND} ) -# ruby? ( ${SWIG_DEPEND} ) # tcl? ( ${SWIG_DEPEND} ) BDEPEND=" virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) - python? ( ${SWIG_DEPEND} )" + python? ( ${SWIG_DEPEND} ) + ruby? ( ${SWIG_DEPEND} )" #rtaudio will use OSS on non linux OSes DEPEND=" >=media-libs/libebur128-1.2.2:= @@ -68,6 +72,7 @@ DEPEND=" >=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 @@ -78,7 +83,6 @@ DEPEND=" # java? ( >=virtual/jre-1.5 ) # perl? ( dev-lang/perl ) # php? ( dev-lang/php ) -# ruby? ( ${RUBY_DEPS} ) # sox? ( media-sound/sox ) # tcl? ( dev-lang/tcl:0= ) RDEPEND="${DEPEND}" @@ -106,6 +110,8 @@ src_prepare() { sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die done + sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die + # fix python3 include dir sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die } @@ -169,8 +175,8 @@ src_configure() { # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover local swig_lang=() - # TODO: java perl php ruby tcl - for i in lua python ; do + # TODO: java perl php tcl + for i in lua python ruby ; do use $i && swig_lang+=( $i ) done [[ -z "${swig_lang}" ]] && swig_lang=( none ) @@ -207,5 +213,11 @@ src_install() { python_optimize fi - # TODO: java perl php ruby tcl + 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 }