git: 8d20726a99ff - main - audio/pulseaudio-qt: update to 1.4.0 and flavorize for Qt 5 and Qt 6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 13 Jan 2024 19:36:19 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8d20726a99ff2400ba2229a4deb16e1dd59c07e4
commit 8d20726a99ff2400ba2229a4deb16e1dd59c07e4
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2024-01-12 18:43:43 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2024-01-13 19:35:39 +0000
audio/pulseaudio-qt: update to 1.4.0 and flavorize for Qt 5 and Qt 6
- Add flavors to simplify the coming transition phase from a Qt5 based
KDE desktop to a Qt6 based one.
---
audio/pulseaudio-qt/Makefile | 18 +++++---
audio/pulseaudio-qt/distinfo | 6 +--
audio/pulseaudio-qt/pkg-plist | 95 ++++++++++++++++++++-------------------
deskutils/kdeconnect-kde/Makefile | 3 +-
4 files changed, 66 insertions(+), 56 deletions(-)
diff --git a/audio/pulseaudio-qt/Makefile b/audio/pulseaudio-qt/Makefile
index ca5c25b2a80c..08bbf832a2d7 100644
--- a/audio/pulseaudio-qt/Makefile
+++ b/audio/pulseaudio-qt/Makefile
@@ -1,20 +1,28 @@
PORTNAME= pulseaudio-qt
-DISTVERSION= 1.3
+DISTVERSION= 1.4.0
MASTER_SITES= KDE/stable/${PORTNAME}
-PORTREVISION= 2
CATEGORIES= audio kde
+PKGNAMESUFFIX= ${FLAVOR:S/qt//}
MAINTAINER= kde@FreeBSD.org
COMMENT= Pulseaudio bindings for Qt
WWW= https://github.com/KDE/pulseaudio-qt
+FLAVORS= qt5 qt6
+FLAVOR?= qt5
+
LIB_DEPENDS= libcanberra.so:audio/libcanberra \
libpulse.so:audio/pulseaudio
-USES= cmake compiler:c++11-lib gettext kde:5 \
- pkgconfig qt:5 shebangfix tar:xz
+USES= cmake compiler:c++11-lib gettext kde:${FLAVOR:S/qt//} \
+ pkgconfig qt:${FLAVOR:S/qt//} shebangfix tar:xz
USE_KDE= ecm:build
-USE_QT= core dbus gui \
+_USE_QT_qt5= core dbus gui \
buildtools:build qmake:build
+_USE_QT_qt6= base
+USE_QT= ${_USE_QT_${FLAVOR}}
+CMAKE_ARGS= -DQT_MAJOR_VERSION=${FLAVOR:S/qt//}
+
+PLIST_SUB= QT_VER=${FLAVOR:S/qt//}
.include <bsd.port.mk>
diff --git a/audio/pulseaudio-qt/distinfo b/audio/pulseaudio-qt/distinfo
index 84d3ceffb06e..f65ff0692f38 100644
--- a/audio/pulseaudio-qt/distinfo
+++ b/audio/pulseaudio-qt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622271634
-SHA256 (pulseaudio-qt-1.3.tar.xz) = bceb07630d946fa0ce928b177687f618186cdef2309828188211d61a36589ec4
-SIZE (pulseaudio-qt-1.3.tar.xz) = 34148
+TIMESTAMP = 1705084640
+SHA256 (pulseaudio-qt-1.4.0.tar.xz) = d8ca624ecf2130856b859cf9341177f6fef8c51f20f7728d807d09c7150ed065
+SIZE (pulseaudio-qt-1.4.0.tar.xz) = 35704
diff --git a/audio/pulseaudio-qt/pkg-plist b/audio/pulseaudio-qt/pkg-plist
index f403fb4e4009..4b98b7188ef3 100644
--- a/audio/pulseaudio-qt/pkg-plist
+++ b/audio/pulseaudio-qt/pkg-plist
@@ -1,47 +1,48 @@
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Card
-include/KF5/KF5PulseAudioQt/PulseAudioQt/CardPort
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Client
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Context
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Device
-include/KF5/KF5PulseAudioQt/PulseAudioQt/IndexedPulseObject
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Models
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Module
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Port
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Profile
-include/KF5/KF5PulseAudioQt/PulseAudioQt/PulseObject
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Server
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Sink
-include/KF5/KF5PulseAudioQt/PulseAudioQt/SinkInput
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Source
-include/KF5/KF5PulseAudioQt/PulseAudioQt/SourceOutput
-include/KF5/KF5PulseAudioQt/PulseAudioQt/Stream
-include/KF5/KF5PulseAudioQt/PulseAudioQt/StreamRestore
-include/KF5/KF5PulseAudioQt/PulseAudioQt/VolumeObject
-include/KF5/KF5PulseAudioQt/PulseAudioQt/card.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/cardport.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/client.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/context.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/device.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/indexedpulseobject.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/models.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/module.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/port.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/profile.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/pulseaudioqt_export.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/pulseobject.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/server.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/sink.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/sinkinput.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/source.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/sourceoutput.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/stream.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/streamrestore.h
-include/KF5/KF5PulseAudioQt/PulseAudioQt/volumeobject.h
-include/KF5/pulseaudioqt_version.h
-lib/cmake/KF5PulseAudioQt/KF5PulseAudioQtConfig.cmake
-lib/cmake/KF5PulseAudioQt/KF5PulseAudioQtConfigVersion.cmake
-lib/cmake/KF5PulseAudioQt/KF5PulseAudioQtTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/KF5PulseAudioQt/KF5PulseAudioQtTargets.cmake
-lib/libKF5PulseAudioQt.so
-lib/libKF5PulseAudioQt.so.1.3.0
-lib/libKF5PulseAudioQt.so.3
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Card
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/CardPort
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Client
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Context
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Device
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/IndexedPulseObject
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Models
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Module
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Port
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Profile
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/PulseObject
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Server
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Sink
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/SinkInput
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Source
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/SourceOutput
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Stream
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/StreamRestore
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/VolumeObject
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/card.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/cardport.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/client.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/context.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/device.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/indexedpulseobject.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/models.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/module.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/port.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/profile.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/pulseaudioqt_export.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/pulseobject.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/server.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/sink.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/sinkinput.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/source.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/sourceoutput.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/stream.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/streamrestore.h
+include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/volumeobject.h
+include/KF%%QT_VER%%/pulseaudioqt_version.h
+lib/cmake/KF%%QT_VER%%PulseAudioQt/KF%%QT_VER%%PulseAudioQtConfig.cmake
+lib/cmake/KF%%QT_VER%%PulseAudioQt/KF%%QT_VER%%PulseAudioQtConfigVersion.cmake
+lib/cmake/KF%%QT_VER%%PulseAudioQt/KF%%QT_VER%%PulseAudioQtTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KF%%QT_VER%%PulseAudioQt/KF%%QT_VER%%PulseAudioQtTargets.cmake
+lib/libKF%%QT_VER%%PulseAudioQt.so
+lib/libKF%%QT_VER%%PulseAudioQt.so.1.4.0
+lib/libKF%%QT_VER%%PulseAudioQt.so.4
+libdata/pkgconfig/KF%%QT_VER%%PulseAudioQt.pc
diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile
index 88093581a964..b1a517866a50 100644
--- a/deskutils/kdeconnect-kde/Makefile
+++ b/deskutils/kdeconnect-kde/Makefile
@@ -1,5 +1,6 @@
PORTNAME= kdeconnect-kde
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libfakekey.so:x11/libfakekey \
libwayland-client.so:graphics/wayland \
- libKF5PulseAudioQt.so:audio/pulseaudio-qt
+ libKF5PulseAudioQt.so:audio/pulseaudio-qt@qt5
BUILD_DEPENDS= kpeoplevcard>0:net/kpeoplevcard \
${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
wayland-protocols>=0:graphics/wayland-protocols \