From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] phonon/phonon-backend-vlc: update
Date: Wed, 06 Mar 2024 22:52:05 +0100 [thread overview]
Message-ID: <20240306215205.594B826392@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47609@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages phonon
https://github.com/void-linux/void-packages/pull/47609
phonon/phonon-backend-vlc: update
- phonon-qt5: update to 4.12.0.
- phonon-qt5-backend-vlc: update to 0.12.0.
A patch file from https://github.com/void-linux/void-packages/pull/47609.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phonon-47609.patch --]
[-- Type: text/x-diff, Size: 9445 bytes --]
From e4429d932447ddc958aecda82f23e7bbace60458 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Dec 2023 22:26:50 +0100
Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0.
---
common/shlibs | 2 +
srcpkgs/phonon-devel | 1 +
srcpkgs/phonon-locale | 1 +
srcpkgs/phonon-qt5 | 1 +
srcpkgs/phonon-qt5-devel | 2 +-
srcpkgs/phonon-qt5/template | 27 ---------
srcpkgs/phonon/template | 80 +++++++++++++++++++++++++++
srcpkgs/{phonon-qt5 => phonon}/update | 0
8 files changed, 86 insertions(+), 28 deletions(-)
create mode 120000 srcpkgs/phonon-devel
create mode 120000 srcpkgs/phonon-locale
create mode 120000 srcpkgs/phonon-qt5
delete mode 100644 srcpkgs/phonon-qt5/template
create mode 100644 srcpkgs/phonon/template
rename srcpkgs/{phonon-qt5 => phonon}/update (100%)
diff --git a/common/shlibs b/common/shlibs
index 5a317bb15d4a41..a7f4a2d92b5700 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,6 +2234,8 @@ libqca-qt6.so.2 qca-qt6-2.3.8_1
libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
libphonon4qt5.so.4 phonon-qt5-4.8.3_1
libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
+libphonon4qt6.so.4 phonon-4.12.0_1
+libphonon4qt6experimental.so.4 phonon-4.12.0_1
libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
libtelepathy-qt5-service.so.1 telepathy-qt5-0.9.8_1
libtelepathy-qt5-farstream.so.0 telepathy-qt5-farstream-0.9.5_1
diff --git a/srcpkgs/phonon-devel b/srcpkgs/phonon-devel
new file mode 120000
index 00000000000000..ce8c63abf05038
--- /dev/null
+++ b/srcpkgs/phonon-devel
@@ -0,0 +1 @@
+phonon
\ No newline at end of file
diff --git a/srcpkgs/phonon-locale b/srcpkgs/phonon-locale
new file mode 120000
index 00000000000000..b45aefd2252cae
--- /dev/null
+++ b/srcpkgs/phonon-locale
@@ -0,0 +1 @@
+phonon-qt5
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt5 b/srcpkgs/phonon-qt5
new file mode 120000
index 00000000000000..ce8c63abf05038
--- /dev/null
+++ b/srcpkgs/phonon-qt5
@@ -0,0 +1 @@
+phonon
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt5-devel b/srcpkgs/phonon-qt5-devel
index b45aefd2252cae..ce8c63abf05038 120000
--- a/srcpkgs/phonon-qt5-devel
+++ b/srcpkgs/phonon-qt5-devel
@@ -1 +1 @@
-phonon-qt5
\ No newline at end of file
+phonon
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
deleted file mode 100644
index 150ef594bb8b8c..00000000000000
--- a/srcpkgs/phonon-qt5/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'phonon-qt5'
-pkgname=phonon-qt5
-version=4.11.1
-revision=2
-build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
-hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
-makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
-short_desc="Multimedia framework for KDE"
-maintainer="John <me@johnnynator.dev>"
-license="LGPL-2.1-or-later"
-homepage="https://phonon.kde.org/"
-distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
-
-phonon-qt5-devel_package() {
- depends="qt5-devel ${sourcepkg}-${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/qt5/mkspecs
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template
new file mode 100644
index 00000000000000..276df69b7ef4ae
--- /dev/null
+++ b/srcpkgs/phonon/template
@@ -0,0 +1,80 @@
+# Template file for 'phonon'
+pkgname=phonon
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="$(vopt_bool designerplugin PHONON_BUILD_DESIGNER_PLUGIN)"
+hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel
+ qt6-base qt6-tools qt6-tools"
+makedepends="glib-devel qt5-devel pulseaudio-devel qt6-qt5compat-devel"
+depends="phonon-locale"
+short_desc="Multimedia framework for KDE"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+build_options="designerplugin"
+build_options_default=""
+
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="designerplugin"
+fi
+
+if [ "$build_option_designerplugin" ]; then
+ makedepends+=" qt6-tools-devel qt5-tools-devel"
+ nocross="yes"
+fi
+
+post_install() {
+ if [ "$build_option_designerplugin" ]; then
+ vmkdir usr/lib/qt6/plugins/designer
+ mv "${DESTDIR}/usr/lib/qt5/plugins/designer/phonon4qt6widgets.so" \
+ "${DESTDIR}/usr/lib/qt6/plugins/designer/phonon4qt6widgets.so"
+ fi
+}
+
+phonon-locale_package() {
+ short_desc+=" - locale files"
+ pkg_install() {
+ vmove usr/share/locale
+ }
+}
+
+phonon-devel_package() {
+ short_desc+=" - development files"
+ depends="qt6-base-devel phonon>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/lib/cmake/phonon4qt6
+ vmove usr/include/phonon4qt6
+ vmove usr/lib/pkgconfig/phonon4qt6.pc
+ vmove "usr/lib/libphonon4qt6*.so"
+ if [ "$build_option_designerplugin" ]; then
+ vmove usr/lib/qt6/plugins/designer
+ fi
+ }
+}
+
+phonon-qt5-devel_package() {
+ short_desc+=" (Qt5) - development files"
+ depends="qt5-devel ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/phonon4qt5
+ vmove usr/lib/qt5/mkspecs
+ vmove usr/lib/cmake/phonon4qt5
+ vmove usr/lib/pkgconfig/phonon4qt5.pc
+ vmove "usr/lib/libphonon4qt5*.so"
+ if [ "$build_option_designerplugin" ]; then
+ vmove usr/lib/qt5/plugins/designer
+ fi
+ }
+}
+
+phonon-qt5_package() {
+ short_desc+=" (Qt5)"
+ depends="phonon-locale>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/libphonon4qt5*.so.*"
+ }
+}
diff --git a/srcpkgs/phonon-qt5/update b/srcpkgs/phonon/update
similarity index 100%
rename from srcpkgs/phonon-qt5/update
rename to srcpkgs/phonon/update
From 1c11da9ea6768d119e276c3fecde5b5b7c8a5ab1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Dec 2023 22:47:56 +0100
Subject: [PATCH 2/2] phonon-qt5-backend-vlc: update to 0.12.0.
---
srcpkgs/phonon-backend-vlc/template | 26 +++++++++++++++++++
.../update | 0
srcpkgs/phonon-qt5-backend-vlc | 1 +
srcpkgs/phonon-qt5-backend-vlc/template | 23 ----------------
4 files changed, 27 insertions(+), 23 deletions(-)
create mode 100644 srcpkgs/phonon-backend-vlc/template
rename srcpkgs/{phonon-qt5-backend-vlc => phonon-backend-vlc}/update (100%)
create mode 120000 srcpkgs/phonon-qt5-backend-vlc
delete mode 100644 srcpkgs/phonon-qt5-backend-vlc/template
diff --git a/srcpkgs/phonon-backend-vlc/template b/srcpkgs/phonon-backend-vlc/template
new file mode 100644
index 00000000000000..463cb6b119fb95
--- /dev/null
+++ b/srcpkgs/phonon-backend-vlc/template
@@ -0,0 +1,26 @@
+# Template file for 'phonon-backend-vlc'
+pkgname=phonon-backend-vlc
+version=0.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_PHONON4QT5=ON"
+hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-devel
+ qt5-qmake qt6-base qt6-tools"
+makedepends="qt5-devel qt5-tools-devel phonon-qt5-devel vlc-devel
+ phonon-devel"
+short_desc="Phonon VLC backend for Qt6"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-2.1-only"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/phonon/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
+checksum=338479dc451e4b94b3ca5b578def741dcf82f5c626a2807d36235be2dce7c9a5
+lib32disabled=yes
+
+phonon-qt5-backend-vlc_package() {
+ provides="phonon-qt5-backend-0_1"
+ replaces="phonon-qt5-backend>=0"
+ short_desc="Phonon VLC backend for Qt5"
+ pkg_install() {
+ vmove usr/lib/qt5/plugins
+ }
+}
diff --git a/srcpkgs/phonon-qt5-backend-vlc/update b/srcpkgs/phonon-backend-vlc/update
similarity index 100%
rename from srcpkgs/phonon-qt5-backend-vlc/update
rename to srcpkgs/phonon-backend-vlc/update
diff --git a/srcpkgs/phonon-qt5-backend-vlc b/srcpkgs/phonon-qt5-backend-vlc
new file mode 120000
index 00000000000000..987138b2013ade
--- /dev/null
+++ b/srcpkgs/phonon-qt5-backend-vlc
@@ -0,0 +1 @@
+phonon-backend-vlc
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt5-backend-vlc/template b/srcpkgs/phonon-qt5-backend-vlc/template
deleted file mode 100644
index 8eb0f72fcd545b..00000000000000
--- a/srcpkgs/phonon-qt5-backend-vlc/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'phonon-qt5-backend-vlc'
-pkgname=phonon-qt5-backend-vlc
-version=0.11.1
-revision=1
-build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON"
-hostmakedepends="pkg-config extra-cmake-modules"
-makedepends="qt5-devel qt5-tools-devel phonon-qt5-devel vlc-devel"
-short_desc="Phonon VLC backend for Qt5"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://phonon.kde.org/"
-distfiles="${KDE_SITE}/phonon/${pkgname/-qt5/}/${version}/${pkgname/-qt5/}-${version}.tar.xz"
-checksum=ccd91e967f943b9e2d7a1115cd1e2851b69f693d568d2174bf709a944a14e5ee
-
-provides="phonon-qt5-backend-0_1"
-replaces="phonon-qt5-backend>=0"
-
-lib32disabled=yes
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel phonon-qt5-devel"
-fi
next prev parent reply other threads:[~2024-03-06 21:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 22:01 [PR PATCH] " Johnnynator
2024-03-05 1:44 ` github-actions
2024-03-06 15:51 ` Luciogi
2024-03-06 15:52 ` Luciogi
2024-03-06 21:52 ` Johnnynator [this message]
2024-03-06 21:55 ` Johnnynator
2024-03-06 21:55 ` [PR PATCH] [Merged]: " Johnnynator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240306215205.594B826392@inbox.vuxu.org \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).