diff --git a/.gitignore b/.gitignore index 59ece3c..1cfeb16 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /pipewire-0.3.23.tar.gz /pipewire-0.3.24.tar.gz /pipewire-0.3.25.tar.gz +/pipewire-0.3.26.tar.gz diff --git a/0001-Add-feature-option-for-installing-jack-development-f.patch b/0001-Add-feature-option-for-installing-jack-development-f.patch deleted file mode 100644 index 0e5bbc4..0000000 --- a/0001-Add-feature-option-for-installing-jack-development-f.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 228bc444cfc18fc7ce360db91094925acac96f77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nils=20Tonn=C3=A4tt?= -Date: Sun, 18 Apr 2021 14:21:43 +0200 -Subject: [PATCH 1/4] Add feature option for installing jack development files - ---- - meson_options.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/meson_options.txt b/meson_options.txt -index ea18a2ec..66791f3a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -54,6 +54,10 @@ option('pipewire-jack', - description: 'Enable pipewire-jack integration', - type: 'feature', - value: 'auto') -+option('jack-devel', -+ description: 'Install jack development files', -+ type: 'feature', -+ value: 'disabled') - option('libjack-path', - description: 'Where to install the libjack.so library', - type: 'string') --- -2.31.1 - diff --git a/0002-Install-jack-headers.patch b/0002-Install-jack-headers.patch deleted file mode 100644 index a172fd5..0000000 --- a/0002-Install-jack-headers.patch +++ /dev/null @@ -1,22 +0,0 @@ -From bd6d72be8f7ceed231661c01b5ad21d8fde9c705 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nils=20Tonn=C3=A4tt?= -Date: Sun, 18 Apr 2021 15:14:30 +0200 -Subject: [PATCH 2/4] Install jack headers - ---- - pipewire-jack/meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pipewire-jack/meson.build b/pipewire-jack/meson.build -index 5968c84d..c295e45e 100644 ---- a/pipewire-jack/meson.build -+++ b/pipewire-jack/meson.build -@@ -1,2 +1,5 @@ - jack_inc = include_directories('.') -+if get_option('jack-devel').enabled() -+ install_subdir('jack', install_dir: get_option('includedir'), strip_directory: false) -+endif - subdir('src') --- -2.31.1 - diff --git a/0003-Generate-JACK-pkgconfig-file.patch b/0003-Generate-JACK-pkgconfig-file.patch deleted file mode 100644 index fdbcaca..0000000 --- a/0003-Generate-JACK-pkgconfig-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 01951fd278fece5bd7ef1d504788125a2b8e1fa9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nils=20Tonn=C3=A4tt?= -Date: Sun, 18 Apr 2021 15:47:58 +0200 -Subject: [PATCH 3/4] Generate JACK pkgconfig file - ---- - pipewire-jack/src/meson.build | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build -index 148db282..32d37c48 100644 ---- a/pipewire-jack/src/meson.build -+++ b/pipewire-jack/src/meson.build -@@ -47,6 +47,15 @@ pipewire_jack = shared_library('jack', - install_dir : libjack_path, - ) - -+if get_option('jack-devel').enabled() -+ pkgconfig.generate(filebase : 'jack', -+ libraries : pipewire_jack, -+ name : 'jack', -+ description : 'PipeWire JACK API', -+ version : '1.9.17', -+ extra_cflags : '-D_REENTRANT') -+endif -+ - pipewire_jackserver = shared_library('jackserver', - pipewire_jackserver_sources, - soversion : soversion, --- -2.31.1 - diff --git a/0004-Add-server_libs-variable-to-jack-pkgconf-file.patch b/0004-Add-server_libs-variable-to-jack-pkgconf-file.patch deleted file mode 100644 index 8443c2a..0000000 --- a/0004-Add-server_libs-variable-to-jack-pkgconf-file.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b48d1facf4e77a37a84713ba02d140a792cebc8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nils=20Tonn=C3=A4tt?= -Date: Sun, 18 Apr 2021 18:14:34 +0200 -Subject: [PATCH 4/4] Add server_libs variable to jack pkgconf file - ---- - pipewire-jack/src/meson.build | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build -index 32d37c48..83e340ba 100644 ---- a/pipewire-jack/src/meson.build -+++ b/pipewire-jack/src/meson.build -@@ -47,15 +47,6 @@ pipewire_jack = shared_library('jack', - install_dir : libjack_path, - ) - --if get_option('jack-devel').enabled() -- pkgconfig.generate(filebase : 'jack', -- libraries : pipewire_jack, -- name : 'jack', -- description : 'PipeWire JACK API', -- version : '1.9.17', -- extra_cflags : '-D_REENTRANT') --endif -- - pipewire_jackserver = shared_library('jackserver', - pipewire_jackserver_sources, - soversion : soversion, -@@ -78,6 +69,16 @@ pipewire_jackserver = shared_library('jacknet', - install_dir : libjack_path, - ) - -+if get_option('jack-devel').enabled() -+ pkgconfig.generate(filebase : 'jack', -+ libraries : [pipewire_jack, pipewire_jackserver], -+ name : 'jack', -+ description : 'PipeWire JACK API', -+ version : '1.9.17', -+ extra_cflags : '-D_REENTRANT', -+ variables: ['server_libs=-L${libdir} -ljackserver']) -+endif -+ - if sdl_dep.found() - executable('video-dsp-play', - '../examples/video-dsp-play.c', --- -2.31.1 - diff --git a/pipewire.spec b/pipewire.spec index f5a7f80..4e315dd 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,6 +1,6 @@ %global majorversion 0 %global minorversion 3 -%global microversion 25 +%global microversion 26 %global apiversion 0.3 %global spaversion 0.2 @@ -8,7 +8,7 @@ %global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0 # For rpmdev-bumpspec and releng automation -%global baserelease 2 +%global baserelease 1 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -47,11 +47,6 @@ Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{ver %endif ## upstream patches -## Install jack headers and pkgconfig file to substitute JACK entirely -Patch0001: 0001-Add-feature-option-for-installing-jack-development-f.patch -Patch0002: 0002-Install-jack-headers.patch -Patch0003: 0003-Generate-JACK-pkgconfig-file.patch -Patch0004: 0004-Add-server_libs-variable-to-jack-pkgconf-file.patch ## upstreamable patches @@ -404,6 +399,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_bindir}/pw-dot %{_bindir}/pw-cat %{_bindir}/pw-dump +%{_bindir}/pw-link %{_bindir}/pw-loopback %{_bindir}/pw-play %{_bindir}/pw-profiler @@ -466,6 +462,9 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Thu Apr 22 2021 Wim Taymans - 0.3.26-1 +- Update to 0.3.26 + * Tue Apr 20 2021 Neal Gompa - 0.3.25-2 - Add jack-devel subpackage, enable JACK support on RHEL 9+ (#1945951) diff --git a/sources b/sources index e666b7c..e5dd979 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pipewire-0.3.25.tar.gz) = 0f84be21bfcd70f25900c53a8ce399c29ce2d4d10f8b56e5103603cf0c80673aab0b16492e55b42985283adf46343cdca01626225db85a2263f06c309f68f2d7 +SHA512 (pipewire-0.3.26.tar.gz) = d771956a42801a6e07fac48a175363eb4107a9fba13d649ff5c2cdc40044c84a61bf56050783507f6dd8efae8c59a2be07ec67433827335ae60f8116c4a4e178