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 CD6E6138334 for ; Wed, 12 Jun 2019 09:18:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E51CFE0924; Wed, 12 Jun 2019 09:18:38 +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 B3C54E0924 for ; Wed, 12 Jun 2019 09:18:38 +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 51D12345F17 for ; Wed, 12 Jun 2019 09:18:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 451BE615 for ; Wed, 12 Jun 2019 09:18:35 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1560331108.a7e59b6ee2d8ab6930421b30c5a14f89b14346ed.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/simplescreenrecorder/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild X-VCS-Directories: media-video/simplescreenrecorder/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a7e59b6ee2d8ab6930421b30c5a14f89b14346ed X-VCS-Branch: master Date: Wed, 12 Jun 2019 09:18:35 +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: 9b71975f-be4a-4391-8524-e6b58aa2a6b4 X-Archives-Hash: 96efac869ef5e60165d773dfb88e7954 commit: a7e59b6ee2d8ab6930421b30c5a14f89b14346ed Author: Lars Wendler gentoo org> AuthorDate: Wed Jun 12 09:17:50 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jun 12 09:18:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e59b6e media-video/simplescreenrecorder: Synced live ebuild Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Lars Wendler gentoo.org> .../simplescreenrecorder-9999.ebuild | 40 +++++++++++++++------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild index 1cf430a123e..852caf0a6ba 100644 --- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild +++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-multilib flag-o-matic gnome2-utils xdg-utils +inherit cmake-multilib flag-o-matic xdg if [[ ${PV} = 9999 ]]; then inherit git-r3 @@ -47,8 +47,8 @@ DEPEND="${RDEPEND} dev-qt/linguist-tools:5 " -pkg_setup() { - if [[ ${ABI} == amd64 ]]; then +pkg_pretend() { + if [[ "${ABI}" == amd64 ]]; then elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system" elog "When added 32bit GLInject libraries are also included. This is" elog "required if you want to use OpenGL recording on 32bit applications." @@ -63,16 +63,22 @@ pkg_setup() { ewarn "record videos with x264." ewarn fi +} +pkg_setup() { # QT requires -fPIC. Compile fails otherwise. # Recently removed from the default compile options upstream # https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180 append-flags -fPIC } +src_prepare() { + # required because xdg.eclass overrides default cmake-utils_src_prepare + cmake-utils_src_prepare +} + multilib_src_configure() { local mycmakeargs=( - -DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)" -DENABLE_X86_ASM="$(usex asm)" -DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)" -DWITH_JACK="$(multilib_native_usex jack)" @@ -86,20 +92,30 @@ multilib_src_configure() { fi if multilib_is_native_abi ; then - mycmakeargs+=( -DWITH_QT5="true" ) + mycmakeargs+=( + -DENABLE_32BIT_GLINJECT="false" + -DWITH_QT5="true" + ) else - mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" ) + mycmakeargs+=( + # https://bugs.gentoo.org/660438 + -DCMAKE_INSTALL_LIB32DIR="$(get_libdir)" + -DENABLE_32BIT_GLINJECT="true" + -DWITH_SIMPLESCREENRECORDER="false" + ) fi cmake-utils_src_configure } +pkg_preinst() { + xdg_pkg_preinst +} + pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst } pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postrm }