commit 71f5f57566f95c8014fdfad42cb11576e66e7027e972a665f90e6ab06897895d Author: Luca Beltrame Date: Wed Feb 7 18:01:32 2024 +0000 Plasma 6 RC 2. Still untested... OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0001-Set-SOVERSION-to-6.patch b/0001-Set-SOVERSION-to-6.patch new file mode 100644 index 0000000..71299c2 --- /dev/null +++ b/0001-Set-SOVERSION-to-6.patch @@ -0,0 +1,54 @@ +From de903d21a8e8cf269de7e0d37ff319943757962d Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 6 Feb 2024 21:09:39 +0100 +Subject: [PATCH] Set SOVERSION to 6 + +The SOVERSION has nothing to do with the major version, it needs to be 6 +also for 5.92.x and might even become 7+ for 6.1. +--- + src/CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b72dcb5..15d29ed 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -70,7 +70,7 @@ target_include_directories(KPipeWire PRIVATE ${CMAKE_CURRENT_BINARY_DIR} + INTERFACE "$") + set_target_properties(KPipeWire PROPERTIES + VERSION ${PROJECT_VERSION} +- SOVERSION ${PROJECT_VERSION_MAJOR} ++ SOVERSION 6 + ) + + ecm_generate_export_header(KPipeWire +@@ -99,7 +99,7 @@ target_link_libraries(KPipeWireDmaBuf PUBLIC KPipeWire + + set_target_properties(KPipeWireDmaBuf PROPERTIES + VERSION ${PROJECT_VERSION} +- SOVERSION ${PROJECT_VERSION_MAJOR} ++ SOVERSION 6 + ) + + ecm_generate_export_header(KPipeWireDmaBuf +@@ -146,7 +146,7 @@ ecm_generate_headers(KPipeWireRecord_HEADERS + ) + set_target_properties(KPipeWireRecord PROPERTIES + VERSION ${PROJECT_VERSION} +- SOVERSION ${PROJECT_VERSION_MAJOR} ++ SOVERSION 6 + ) + + install(FILES +@@ -161,7 +161,7 @@ install(TARGETS KPipeWire KPipeWireRecord KPipeWireDmaBuf EXPORT KPipeWireTarget + ecm_setup_version(PROJECT VARIABLE_PREFIX KPIPEWIRE + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpipewire_version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPipeWireConfigVersion.cmake" +- SOVERSION ${PROJECT_VERSION_MAJOR}) ++ SOVERSION 6) + + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPipeWire") + install(EXPORT KPipeWireTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPipeWireTargets.cmake NAMESPACE K::) +-- +2.43.0 + diff --git a/kpipewire-5.93.1.tar.xz b/kpipewire-5.93.1.tar.xz new file mode 100644 index 0000000..90684c5 --- /dev/null +++ b/kpipewire-5.93.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db3f05fa6062dd26fd6ae6f48a5f20a23640cd6a2ad5b32e3e4f7737f6291214 +size 144844 diff --git a/kpipewire-5.93.1.tar.xz.sig b/kpipewire-5.93.1.tar.xz.sig new file mode 100644 index 0000000..851b82e --- /dev/null +++ b/kpipewire-5.93.1.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmXCW2IACgkQ11dEg7tX +sY08Ew/7BvqB72nSRzHptmQ/PLrRmd5/2M6ajaV39P+ytiqlyRB+u/ycAsbfYUpX +uLK1SnEkIUooJod9dGnANOolRAVSJR10udRDFsru1L7JAHC99ftCWcaszDBF21M/ +45xuRYaJpmpKuHXDZ1OARJLXJDS14Eu57onkcchf96dCfYKwQ9LtEnqa9XysJj6b +bwor0N/ARnzSwz69ZgDlvBTk1F2MlVs+7SSji3TIbZ+0x/HLBeMOr9J7XTx878Hv +YbhnAPJ6a/ehBJq3tzBJjROc7hl9FvvW6fag0eyoThM8/5OZzTFwTag22Bp/OrMc +S1BIgwFHQnai+HuAdSOehDkFclAkEePP7inm/ENDKH/hhaMfQE0MUkhwsloeJ4bx +6NderXo8t4DEtTtYFJwqQri8udHzqh/ibBGKKKWspeA5pzMO4YZ0Wm0G+KZwDcZw +FWmjIA0VCrz3rUHfFktKZvELXSgvwgNn3rWNbMnqAyfwpBwfBkrQVTHS2o1bIRgX +lYrUQ9om76OzcPegXs8ygg9k4V3a8ELfgXZXC4WSFBQaOCyflcCag0RyXEYN7KCp +9IVU7Wbdq5Or39t5eMxVTlx2GNglJJ1ZATj3vqwXPDSpnYENz4AqS+O4HIehJV8r +8mxoNtMLWV2NnIUPFEh1RJ2LL124eSvsK1yCraMR/0jbGQEkbkA= +=Q+D+ +-----END PGP SIGNATURE----- diff --git a/kpipewire6.changes b/kpipewire6.changes new file mode 100644 index 0000000..ac58a92 --- /dev/null +++ b/kpipewire6.changes @@ -0,0 +1,33 @@ +------------------------------------------------------------------- +Tue Feb 6 18:22:58 UTC 2024 - Fabian Vogt + +- Update to 5.93.1: + * New bugfix release + * See https://kde.org/announcements/megarelease/6/rc2/ for details +- Changes since 5.93.0: + * Set the framework version in the project() call + * Install kpipewire_version.h +- Add patch to set the SOVERSION correctly: + * 0001-Set-SOVERSION-to-6.patch + +------------------------------------------------------------------- +Wed Jan 31 17:37:04 UTC 2024 - Fabian Vogt + +- Update to 5.93.0 (6.0 RC 2): + * New bugfix release + * See https://kde.org/announcements/megarelease/6/rc2/ for details +- Changes since 5.92.0: + * source: Increase logging, drop redundant condition + * Add missing cases to convertQImageFormatToAVPixelFormat + +------------------------------------------------------------------- +Mon Jan 15 21:08:49 UTC 2024 - Fabian Vogt + +- Update to 5.92.0 (6.0 RC 1) + * For more details please see: + https://kde.org/announcements/megarelease/6/rc1/ + +------------------------------------------------------------------- +Sat Jul 1 15:46:53 UTC 2023 - Christophe Marin + +- Init kpipewire6 diff --git a/kpipewire6.spec b/kpipewire6.spec new file mode 100644 index 0000000..4065693 --- /dev/null +++ b/kpipewire6.spec @@ -0,0 +1,162 @@ +# +# spec file for package kpipewire6 +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global kf6_version 5.240.0 +%define qt6_version 6.5.0 + +%define _sover 6 +%define rname kpipewire +# Full Plasma 6 version (e.g. 6.0.0) +%{!?_plasma6_bugfix: %global _plasma6_bugfix %{version}} +%bcond_without released +Name: kpipewire6 +Version: 5.93.1 +Release: 0 +Summary: PipeWire integration for KDE Plasma +License: LGPL-2.0-only AND LGPL-3.0-only +URL: https://www.kde.org +Source: https://download.kde.org/unstable/plasma/5.93.0/%{rname}-%{version}.tar.xz +%if %{with released} +Source1: https://download.kde.org/unstable/plasma/5.93.0/%{rname}-%{version}.tar.xz.sig +Source2: plasma.keyring +%endif +# PATCH-FIX-UPSTREAM +Patch1: 0001-Set-SOVERSION-to-6.patch +BuildRequires: kf6-extra-cmake-modules +BuildRequires: pkgconfig +BuildRequires: qt6-gui-private-devel >= %{qt6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KWayland) >= %{_plasma6_version} +BuildRequires: cmake(PlasmaWaylandProtocols) +BuildRequires: cmake(Qt6DBus) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickTest) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6WaylandClient) >= %{qt6_version} +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(epoxy) +BuildRequires: pkgconfig(gbm) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavfilter) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libpipewire-0.3) +BuildRequires: pkgconfig(libswscale) +BuildRequires: pkgconfig(libva) +BuildRequires: pkgconfig(libva-drm) + +%description +KPipeWire provides PipeWire integration for the Plasma desktop and mobile shells. + +%package -n libKPipeWire%{_sover} +Summary: PipeWire integration for KDE Plasma - main library + +%description -n libKPipeWire%{_sover} +KPipeWire provides PipeWire integration for the Plasma desktop and mobile shells. +This package contains the main KPipeWire library. + +%package -n libKPipeWireRecord%{_sover} +Summary: PipeWire integration for KDE Plasma - recording support + +%description -n libKPipeWireRecord%{_sover} +KPipeWire provides PipeWire integration for the Plasma desktop and mobile shells. +This package contains the library needed for video and audio capture. + +%package -n libKPipeWireDmaBuf%{_sover} +Summary: PipeWire integration for KDE Plasma - DMA-BUF support + +%description -n libKPipeWireDmaBuf%{_sover} +KPipeWire provides PipeWire integration for the Plasma desktop and mobile shells. +This package provides a helper for downloading DMA-BUF textures for CPU processing. + +%package imports +Summary: QtQuick bindings for kpipewire6 +Requires: libKPipeWire%{_sover} = %{version} +Requires: libKPipeWireDmaBuf%{_sover} = %{version} +Requires: libKPipeWireRecord%{_sover} = %{version} + +%description imports +KPipeWire provides PipeWire integration for the Plasma desktop and mobile shells. +This package provides QtQuick bindings for the main KPipeWire libraries. + +%package devel +Summary: Development files for kpipewire6 +Requires: kpipewire6-imports = %{version} +Requires: libKPipeWire%{_sover} = %{version} +Requires: libKPipeWireDmaBuf%{_sover} = %{version} +Requires: libKPipeWireRecord%{_sover} = %{version} +Requires: pkgconfig(epoxy) +Requires: pkgconfig(libpipewire-0.3) +Conflicts: kpipewire-devel + +%description devel +KPipeWire provides PipeWire integration for the Plasma desktop and mobile shells. +This package provides the development files needed to build applications +which use KPipeWire. + +%lang_package -n libKPipeWire%{_sover} + +%prep +%autosetup -p1 -n %{rname}-%{version} + +%build +%cmake_kf6 + +%kf6_build + +%install +%kf6_install + +%find_lang kpipewire6 + +%check +# Test fails since 03201bb6. A running pipewire is required +# %%ctest + +%ldconfig_scriptlets -n libKPipeWire%{_sover} +%ldconfig_scriptlets -n libKPipeWireRecord%{_sover} +%ldconfig_scriptlets -n libKPipeWireDmaBuf%{_sover} + +%files -n libKPipeWire%{_sover} +%license LICENSES/* +%doc README.md +%{_kf6_libdir}/libKPipeWire.so.* +%{_kf6_debugdir}/kpipewire.categories + +%files -n libKPipeWireRecord%{_sover} +%{_kf6_libdir}/libKPipeWireRecord.so.* +%{_kf6_debugdir}/kpipewirerecord.categories + +%files -n libKPipeWireDmaBuf%{_sover} +%{_kf6_libdir}/libKPipeWireDmaBuf.so.* + +%files imports +%{_kf6_qmldir}/org/kde/pipewire/ + +%files devel +%{_includedir}/KPipeWire/ +%{_kf6_cmakedir}/KPipeWire/ +%{_kf6_libdir}/libKPipeWire.so +%{_kf6_libdir}/libKPipeWireRecord.so +%{_kf6_libdir}/libKPipeWireDmaBuf.so + +%files -n libKPipeWire%{_sover}-lang -f kpipewire6.lang + +%changelog diff --git a/plasma.keyring b/plasma.keyring new file mode 100644 index 0000000..df40fb7 Binary files /dev/null and b/plasma.keyring differ