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 D6137138350 for ; Thu, 19 Mar 2020 16:01:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16A08E0AF6; Thu, 19 Mar 2020 16:01:48 +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 DD1E3E0AF6 for ; Thu, 19 Mar 2020 16:01:47 +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 6940234F31D for ; Thu, 19 Mar 2020 16:01:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86DD2106 for ; Thu, 19 Mar 2020 16:01:44 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1584633704.2a66f9175c3378079f295971d31ad8f863138c30.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/obs-studio/Manifest media-video/obs-studio/obs-studio-25.0.0.ebuild media-video/obs-studio/obs-studio-9999.ebuild X-VCS-Directories: media-video/obs-studio/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 2a66f9175c3378079f295971d31ad8f863138c30 X-VCS-Branch: master Date: Thu, 19 Mar 2020 16:01:44 +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: 92939b20-f4e3-4825-b398-8cc864510fac X-Archives-Hash: 9df2e3f839643253f2035cea70de60b9 commit: 2a66f9175c3378079f295971d31ad8f863138c30 Author: Rick Farina gentoo org> AuthorDate: Thu Mar 19 16:01:33 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Thu Mar 19 16:01:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a66f917 media-video/obs-studio: mostly simple bump add a few directly linked things to DEPEND minor harmonization to keep release and live ebuilds the same Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Rick Farina gentoo.org> media-video/obs-studio/Manifest | 1 + .../{obs-studio-9999.ebuild => obs-studio-25.0.0.ebuild} | 14 ++++++++++++++ media-video/obs-studio/obs-studio-9999.ebuild | 14 ++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 53c9e37d7c2..cf9867a4ab9 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,2 +1,3 @@ DIST obs-studio-24.0.3.tar.gz 6285359 BLAKE2B f799e93e9c35c22e5d7f6e4da04e30b06a3a1ad1b3bfd0a75acdbb5d1f28a717d84809a1f35a858252ff30094fa80521d752a35b5285b0a606d0d77ff88fb3cf SHA512 57cef700076457da1eee344042261e1ada6d6744fcb3033a1d4eaffb9e84dd350aa198984fba3de82d4e727706f562c7c3568d95de6859a4942d9fa6368a02ab DIST obs-studio-24.0.5.tar.gz 7901198 BLAKE2B 79c9712f3523114a70e0df3e0631c19067fd7ead5fd9031123dd4c82d9b92dee69473fb51a495f938430540505a5cf45258eeee01d61a7aaa6654255fee14aca SHA512 99be46046b70597474f25a85036ebe5a2f704eef47c77bc27e2ba8890b877da346ff6008c5922d7a83a4cead9df7214c6a3be885430693e609a42d9d06fedfaf +DIST obs-studio-25.0.0.tar.gz 8364710 BLAKE2B 20e48edb1fcb900bec464e970232a0cc920028455df51a8b7372f90ea96f1a614eba3b43c8f186fa2703cccad505a46f0a8e79b4f966c4964fd2542b460d9a85 SHA512 473bd8b749f52143768a550ca63a300e123be68654c9f5864c6e5c76ca0a74ad998cc24eef999dfb6189afada2b1f4c1d0cf3e45835ee27720429277ef1e10d6 diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-25.0.0.ebuild similarity index 93% copy from media-video/obs-studio/obs-studio-9999.ebuild copy to media-video/obs-studio/obs-studio-25.0.0.ebuild index 99837250612..33ca63777c3 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-25.0.0.ebuild @@ -41,11 +41,19 @@ DEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + media-libs/x264 media-video/ffmpeg:=[x264] net-misc/curl + sys-apps/dbus + sys-libs/zlib + virtual/udev + x11-libs/libX11 x11-libs/libXcomposite + x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr + x11-libs/libxcb alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) @@ -91,6 +99,12 @@ src_configure() { -DWITH_RTMPS=$(usex ssl) ) + if [ "${PV}" != "9999" ]; then + mycmakeargs+=( + -DOBS_VERSION_OVERRIDE=${PV} + ) + fi + if use luajit || use python; then mycmakeargs+=( -DDISABLE_LUA=$(usex !luajit) diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 99837250612..33ca63777c3 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -41,11 +41,19 @@ DEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + media-libs/x264 media-video/ffmpeg:=[x264] net-misc/curl + sys-apps/dbus + sys-libs/zlib + virtual/udev + x11-libs/libX11 x11-libs/libXcomposite + x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr + x11-libs/libxcb alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) @@ -91,6 +99,12 @@ src_configure() { -DWITH_RTMPS=$(usex ssl) ) + if [ "${PV}" != "9999" ]; then + mycmakeargs+=( + -DOBS_VERSION_OVERRIDE=${PV} + ) + fi + if use luajit || use python; then mycmakeargs+=( -DDISABLE_LUA=$(usex !luajit)