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 B6758138334 for ; Sun, 22 Jul 2018 21:50:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12B55E096C; Sun, 22 Jul 2018 21:50:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BDEACE096C for ; Sun, 22 Jul 2018 21:50:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 07860335D8B for ; Sun, 22 Jul 2018 21:50:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DEA038A for ; Sun, 22 Jul 2018 21:50:47 +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: <1532296157.a044a48adad0837c64c527504135fc2b08be7218.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.6.0-r1.ebuild X-VCS-Directories: media-libs/mlt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a044a48adad0837c64c527504135fc2b08be7218 X-VCS-Branch: master Date: Sun, 22 Jul 2018 21:50:47 +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: 155a7ce0-7802-4f4c-bcd7-f95cdc5c465c X-Archives-Hash: b0dfbbd3adf6b7e7fb16a5403f5a26c7 commit: a044a48adad0837c64c527504135fc2b08be7218 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 22 20:55:19 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 22 21:49:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a044a48a media-libs/mlt: 6.6.0: USE=sdl2 switches to libsdl2 instead-of libsdl Next version bump should drop sdl. Closes: https://bugs.gentoo.org/656904 Package-Manager: Portage-2.3.43, Repoman-2.3.10 media-libs/mlt/mlt-6.6.0-r1.ebuild | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/media-libs/mlt/mlt-6.6.0-r1.ebuild b/media-libs/mlt/mlt-6.6.0-r1.ebuild index 0b4ce6cd3fb..6d779bafb86 100644 --- a/media-libs/mlt/mlt-6.6.0-r1.ebuild +++ b/media-libs/mlt/mlt-6.6.0-r1.ebuild @@ -22,7 +22,7 @@ gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio # java perl php tcl vidstab IUSE="${IUSE} kernel_linux" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) sdl2? ( sdl )" #rtaudio will use OSS on non linux OSes COMMON_DEPEND=" @@ -63,12 +63,14 @@ COMMON_DEPEND=" ) ruby? ( ${RUBY_DEPS} ) sdl? ( - >=media-libs/libsdl-1.2.10[X,opengl,video] - >=media-libs/sdl-image-1.2.4 - ) - sdl2? ( - media-libs/libsdl2[X,opengl,video] - media-libs/sdl2-image + sdl2? ( + media-libs/libsdl2[X,opengl,video] + media-libs/sdl2-image + ) + !sdl2? ( + >=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 )" @@ -137,8 +139,6 @@ src_configure() { $(use_enable cpu_flags_x86_sse sse) $(use_enable cpu_flags_x86_sse2 sse2) $(use_enable gtk gtk2) - $(use_enable sdl) - $(use_enable sdl2) $(use_enable jack jackrack) $(use_enable ffmpeg avformat) $(use ffmpeg && echo ' --avformat-swscale') @@ -167,6 +167,14 @@ src_configure() { myconf+=( --disable-qt ) fi + if use sdl ; then + if use sdl2 ; then + myconf+=( --enable-sdl2 --disable-sdl ) + else + myconf+=( --enable-sdl --disable-sdl2 ) + fi + fi + if use x86 || use amd64 ; then myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) else