From nobody Sun Dec 3 21:37:57 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sk0X61RHbz51fLP; Sun, 3 Dec 2023 21:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sk0X574Pkz3f7F; Sun, 3 Dec 2023 21:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701639478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7bz4IozaPI5U8KsYmCgSWbTC+Dq6Awgck/x235694U=; b=ap7QnWE/2c0pxdsIzlYwZf1WbJQcABMAY6aXh4QA2/npvBeRDDITE046ELC18XNO3vobgb FfXk8aN2hWeYwgCl0Z94t6m0RlB1Dp0IPuUZ8jDk2LWuf1IjsdQypUq9eI5b607p6HROfU E3/wm94WfIb/9144JraU7BAdMaIHvSKDUAEuJrOxBZJhrf9wArVucXxmwTWJAmXyIlgYrI pdxUOW4JFKzJLUrIXWUQ7PuymjbDw7/NbeNutnoBecqscupUiCVDkdF7rA5nTKSScvKBoN NoLp8Fika79zqS1GwPdJwE4uLyH07Q0Xo14N/D4OMOiLWqtOk7gCqgZQHIT4dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701639478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7bz4IozaPI5U8KsYmCgSWbTC+Dq6Awgck/x235694U=; b=w4qp/9fknX/7Bw0oLpv2cZvmhToQcP5TMaQ3D/Fqhr3Sgp2G6t4XBtBdONbFPfRbIX7Iqh w0ZuqXqHWgykyHyaLdxw9gzKgHUKnzqYhNflvIvf3p+ctzfDBJNtiEcA7uFaSmU4hg7Csd AVh57m4E21uoBS5eFeDLvJiqP3rYPdZ7W1zxXfrij/FcIFKB8SfU1d3VPCrm5Jy5afQvla zyRwgffWtxknnPGmYVFm5UPHKCfVKIO6gek43UA61HDWRiIaYeOy4U4VfJJYrgKhD/622N 7q7rBdT6Y6Om7fAnw5wMgansPB6VadyzaK+Wl+YQBOWG3lMLQw+zuuWgEdjHeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701639478; a=rsa-sha256; cv=none; b=MjAkVFEYXU2R46iNDXYo5plk6SYY4vM+YZelitPpbc+HptcQAFwdIn5HA8rmV3I7me+tDN 6jArepzKgHXssDMKRLhcbq7eZ2OWvx1/aZBoDoMvJgeeLgASdxpTe5sAdoSj7KeWXyx8mC R3l+n/O1tbmvio10RgMiHncGGqNbaQxSK1OTdEZYISe1vyV4gy2A2vCs0MS0xaj7LJuF0C ZPb2hk6TKqP4kL9ay50g6SQflGsSzuvo90xx2iMr4E/qSlkoxz/uLLmfvhU9O7CXtjMYSI IuAuHMnxiu/dJPHDiShZ+ujuq7cpLLyJQV6dW3FnfqAWXay4aKe1HPcrU61Giw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sk0X569hBz1F78; Sun, 3 Dec 2023 21:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B3Lbvs2006380; Sun, 3 Dec 2023 21:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3Lbv9W006377; Sun, 3 Dec 2023 21:37:57 GMT (envelope-from git) Date: Sun, 3 Dec 2023 21:37:57 GMT Message-Id: <202312032137.3B3Lbv9W006377@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: abb0715471a4 - main - multimedia/phonon-vlc: flavorize for Qt5 and Qt6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abb0715471a4ff65cbf26e2006f00e8afd47d4df Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=abb0715471a4ff65cbf26e2006f00e8afd47d4df commit abb0715471a4ff65cbf26e2006f00e8afd47d4df Author: Tobias C. Berner AuthorDate: 2023-12-03 21:12:03 +0000 Commit: Tobias C. Berner CommitDate: 2023-12-03 21:12:12 +0000 multimedia/phonon-vlc: flavorize for Qt5 and Qt6 - Only build the settings binary for the Qt5 flavor - Only install localizations for the Qt5 flavor - Sub-packages will improve this in the future --- multimedia/phonon-vlc/Makefile | 32 +++++++++--- multimedia/phonon-vlc/pkg-plist | 110 ++++++++++++++++++++-------------------- 2 files changed, 79 insertions(+), 63 deletions(-) diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile index 6fafa544d007..532ad1117e17 100644 --- a/multimedia/phonon-vlc/Makefile +++ b/multimedia/phonon-vlc/Makefile @@ -1,8 +1,9 @@ PORTNAME= phonon DISTVERSION= 0.12.0 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend-${PHONON_PLUGIN}/${DISTVERSION} -PKGNAMESUFFIX= -${PHONON_PLUGIN} +PKGNAMESUFFIX= -${PHONON_PLUGIN}-${FLAVOR} DISTNAME= ${PORTNAME}-backend-${PHONON_PLUGIN}-${DISTVERSION} DIST_SUBDIR= KDE/phonon @@ -13,16 +14,31 @@ WWW= https://userbase.kde.org/Phonon LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libvlc.so:multimedia/vlc +FLAVORS= qt5 qt6 +FLAVOR?= qt5 -USES= cmake pkgconfig tar:xz +LIB_DEPENDS= libvlc.so:multimedia/vlc -USES+= compiler:c++11-lang kde:5 qt:5 +USES= cmake compiler:c++11-lang kde:${FLAVOR:S/qt//} pkgconfig \ + qt:${FLAVOR:S/qt//} tar:xz USE_KDE= ecm:build -USE_QT= core gui phonon4 widgets \ - buildtools:build qmake:build -CMAKE_ON= PHONON_BUILD_QT5 -CMAKE_OFF= PHONON_BUILD_QT6 +USE_QT= ${_USE_QT_${FLAVOR}} phonon4 + +CMAKE_ON= ${_CMAKE_ON_${FLAVOR}} +CMAKE_OFF= ${_CMAKE_OFF_${FLAVOR}} + +_CMAKE_ON_qt5= PHONON_BUILD_QT5 +_CMAKE_ON_qt6= PHONON_BUILD_QT6 +_CMAKE_OFF_qt5= PHONON_BUILD_QT6 +_CMAKE_OFF_qt6= PHONON_BUILD_QT5 + +_USE_QT_qt5= core gui widgets buildtools:build qmake:build +_USE_QT_qt6= base 5compat tools + +_QT5_ONLY_qt5= # +_QT5_ONLY_qt6= "@comment " +PLIST_SUB= QT5_ONLY=${_QT5_ONLY_${FLAVOR}} \ + QT_VER=${FLAVOR:S/qt//} \ PHONON_PLUGIN= vlc diff --git a/multimedia/phonon-vlc/pkg-plist b/multimedia/phonon-vlc/pkg-plist index 6e940c831257..24ca1b52dc7e 100644 --- a/multimedia/phonon-vlc/pkg-plist +++ b/multimedia/phonon-vlc/pkg-plist @@ -1,55 +1,55 @@ -%%QT_PLUGINDIR%%/phonon4qt5_backend/phonon_vlc_qt5.so -share/locale/az/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/bg/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/bs/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ca/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ca@valencia/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/cs/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/da/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/de/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/el/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/en_GB/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/eo/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/es/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/et/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/eu/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/fi/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/fr/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ga/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/gl/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/hi/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/hu/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ia/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/id/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/is/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/it/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ja/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ka/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/kk/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ko/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/lt/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/mr/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/nb/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/nds/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/nl/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/nn/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/pa/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/pl/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/pt/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/pt_BR/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ro/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ru/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/sk/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/sl/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/sr/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/sr@ijekavian/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/sr@latin/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/sv/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/tg/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/tr/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/ug/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/uk/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/vi/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/zh_CN/LC_MESSAGES/phonon_vlc_qt.qm -share/locale/zh_TW/LC_MESSAGES/phonon_vlc_qt.qm +%%QT_PLUGINDIR%%/phonon4qt%%QT_VER%%_backend/phonon_vlc_qt%%QT_VER%%.so +%%QT5_ONLY%%share/locale/az/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/bg/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/bs/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ca/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ca@valencia/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/cs/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/da/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/de/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/el/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/en_GB/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/eo/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/es/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/et/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/eu/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/fi/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/fr/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ga/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/gl/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/hi/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/hu/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ia/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/id/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/is/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/it/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ja/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ka/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/kk/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ko/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/lt/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/mr/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/nb/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/nds/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/nl/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/nn/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/pa/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/pl/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/pt/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/pt_BR/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ro/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ru/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/sk/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/sl/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/sr/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/sr@ijekavian/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/sr@latin/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/sv/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/tg/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/tr/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/ug/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/uk/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/vi/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/zh_CN/LC_MESSAGES/phonon_vlc_qt.qm +%%QT5_ONLY%%share/locale/zh_TW/LC_MESSAGES/phonon_vlc_qt.qm