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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0CB65158043 for ; Sun, 3 Mar 2024 16:37:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53486E2A2F; Sun, 3 Mar 2024 16:37:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BE31E2A2F for ; Sun, 3 Mar 2024 16:37:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 719CE33F9FD for ; Sun, 3 Mar 2024 16:37:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B82210B0 for ; Sun, 3 Mar 2024 16:37:48 +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: <1709483841.bb80c953d6aaff067ded6b27a0b21b082b3edae2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild X-VCS-Directories: media-libs/phonon-vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bb80c953d6aaff067ded6b27a0b21b082b3edae2 X-VCS-Branch: master Date: Sun, 3 Mar 2024 16:37:48 +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: ad9fc36b-88c4-4bf5-a080-f156200a1876 X-Archives-Hash: cc6ec239e8227397036009351d99e3ec commit: bb80c953d6aaff067ded6b27a0b21b082b3edae2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 3 16:09:23 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 3 16:37:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb80c953 media-libs/phonon-vlc: Use cmake.eclass and multibuild instead of ecm.eclass Simultanous build of Qt5 and Qt6 is broken, installing Qt6 plugins in Qt5 paths and vice versa. ebuild was barely using ecm facilities anyway, this makes sure only those deps that are needed are also used. Closes: https://bugs.gentoo.org/923502 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild | 79 +++++++++++++++++++++++ media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild | 44 ------------- 2 files changed, 79 insertions(+), 44 deletions(-) diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild new file mode 100644 index 000000000000..bae71d282ec3 --- /dev/null +++ b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic kde.org multibuild + +DESCRIPTION="VLC backend for the Phonon multimedia library" +HOMEPAGE="https://community.kde.org/Phonon" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz" + S="${WORKDIR}"/phonon-backend-vlc-${PV} + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" +SLOT="0" +IUSE="debug +qt5 qt6" +REQUIRED_USE="|| ( qt5 qt6 )" + +DEPEND=" + >=media-libs/phonon-4.12.0[qt5=,qt6=] + media-video/vlc:=[dbus,ogg,vorbis(+)] + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/libpcre2:* + virtual/pkgconfig + qt5? ( + dev-qt/linguist-tools:5 + >=kde-frameworks/extra-cmake-modules-5.115.0:* + ) + qt6? ( + dev-qt/qttools:6[linguist] + >=kde-frameworks/extra-cmake-modules-6.0.0:* + ) +" + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_configure() { + use debug || append-cppflags -DQT_NO_DEBUG + + myconfigure() { + local mycmakeargs=( + -DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/} + -DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass + -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass + ) + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + mycmakeargs+=( -DPHONON_BUILD_QT5=OFF ) + else + mycmakeargs+=( -DPHONON_BUILD_QT6=OFF ) + fi + + cmake_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild deleted file mode 100644 index 62401f9834d8..000000000000 --- a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit ecm kde.org - -DESCRIPTION="VLC backend for the Phonon multimedia library" -HOMEPAGE="https://community.kde.org/Phonon" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz" - S="${WORKDIR}"/phonon-backend-vlc-${PV} - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" -SLOT="0" -IUSE="+qt5 qt6" -REQUIRED_USE="|| ( qt5 qt6 )" - -DEPEND=" - >=media-libs/phonon-4.12.0[qt5=,qt6=] - media-video/vlc:=[dbus,ogg,vorbis(+)] - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - qt6? ( dev-qt/qtbase:6[gui,widgets] ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - qt5? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) - virtual/pkgconfig -" - -src_configure() { - local mycmakeargs=( - -DPHONON_BUILD_QT5=$(usex qt5) - -DPHONON_BUILD_QT6=$(usex qt6) - ) - ecm_src_configure -}