[lilac] updated to 1.0.0.r24.gf5546d27-3

3 files changed, 5 insertions, 116 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f3e8e5eb266..2f169567197d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pipewire-full-git
 	pkgdesc = Low-latency audio/video router and processor
 	pkgver = 1.0.0.r24.gf5546d27
-	pkgrel = 2
+	pkgrel = 3
 	url = https://pipewire.org
 	arch = x86_64
 	license = MIT
@@ -15,6 +15,7 @@ pkgbase = pipewire-full-git
 	makedepends = glib2
 	makedepends = graphviz
 	makedepends = gst-plugins-base
+	makedepends = jack
 	makedepends = libcamera
 	makedepends = libcanberra
 	makedepends = libfdk-aac
@@ -47,9 +48,7 @@ pkgbase = pipewire-full-git
 	makedepends = ffmpeg
 	makedepends = modemmanager
 	source = git+https://gitlab.freedesktop.org/pipewire/pipewire.git
-	source = jack-link-pipewire-jack.patch
 	b2sums = SKIP
-	b2sums = f82000d699619ab92794c1db49284ea5877b73d7cb934ecce697b267e9109c9d72fd3b4d4eb3e19aa9948e34dbfd97ba62f63ce8cba98e0b8a12da8d17012ea8
 
 pkgname = pipewire-full-git
 	install = pipewire.install
@@ -57,7 +56,7 @@ pkgname = pipewire-full-git
 	license = LGPL-2.1-or-later
 	depends = gcc-libs
 	depends = glibc
-	depends = libpipewire-full-git=1.0.0.r24.gf5546d27-2
+	depends = libpipewire-full-git=1.0.0.r24.gf5546d27-3
 	depends = libcamera-base.so
 	depends = libcamera.so
 	depends = libdbus-1.so
diff --git a/PKGBUILD b/PKGBUILD
index a89b81746ace..0fbbc377118e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ pkgname=(
 pkgver=1.0.0.r24.gf5546d27
 _so_ver=0.3
 _short_pkgver=${pkgver%%.r*}
-pkgrel=2
+pkgrel=3
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
 arch=(x86_64)
@@ -40,6 +40,7 @@ makedepends=(
   glib2
   graphviz
   gst-plugins-base
+  jack # jack2 or pipewire-jack
   libcamera
   libcanberra
   libfdk-aac
@@ -76,11 +77,9 @@ checkdepends=(
 )
 source=(
   "git+https://gitlab.freedesktop.org/pipewire/pipewire.git"
-  jack-link-pipewire-jack.patch
 )
 b2sums=(
   'SKIP'
-  f82000d699619ab92794c1db49284ea5877b73d7cb934ecce697b267e9109c9d72fd3b4d4eb3e19aa9948e34dbfd97ba62f63ce8cba98e0b8a12da8d17012ea8
 )
 
 pkgver() {
@@ -90,11 +89,6 @@ pkgver() {
 
 prepare() {
   cd pipewire
-
-  # use internal jack headers and library in build stage,
-  # libspa-jack.so would still link to /usr/lib/libjack.so,
-  # which provided by both pipewire-jack and jack2,
-  patch -Np1 < ../jack-link-pipewire-jack.patch
 }
 
 build() {
@@ -111,7 +105,6 @@ build() {
     -D session-managers=[]
     -D udevrulesdir=/usr/lib/udev/rules.d
     -D selinux=disabled
-    -D jack-link-pipewire-jack=enabled
     -D vulkan=enabled
     -D pw-cat-ffmpeg=enabled
     -D ffmpeg=enabled
diff --git a/jack-link-pipewire-jack.patch b/jack-link-pipewire-jack.patch
deleted file mode 100644
index e4ade92d9a3c..000000000000
--- a/jack-link-pipewire-jack.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 87d65edb2..70031faf7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -432,6 +432,13 @@ summary({'lilv (for lv2 plugins)': lilv_lib.found()}, bool_yn: true)
- libffado_dep = dependency('libffado', required: get_option('libffado'))
- summary({'ffado': libffado_dep.found()}, bool_yn: true)
- 
-+
-+jack_dep = dependency('', required: false)
-+if not get_option('jack-link-pipewire-jack').allowed()
-+  jack_dep = dependency('jack', version : '>= 1.9.10', required: get_option('jack'))
-+  summary({'JACK2': jack_dep.found()}, bool_yn: true, section: 'Backend')
-+endif
-+
- check_functions = [
-   ['gettid', '#include <unistd.h>', ['-D_GNU_SOURCE'], []],
-   ['memfd_create', '#include <sys/mman.h>', ['-D_GNU_SOURCE'], []],
-@@ -476,6 +483,11 @@ configure_file(output : 'config.h',
- if get_option('pipewire-jack').allowed()
-   subdir('pipewire-jack')
- endif
-+
-+if jack_dep.found()
-+  subdir('spa/plugins/jack')
-+endif
-+
- if get_option('pipewire-v4l2').allowed()
-   subdir('pipewire-v4l2')
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index 3344b6244..8c3567d29 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -148,6 +148,10 @@ option('jack',
-        description: 'Enable jack spa plugin integration',
-        type: 'feature',
-        value: 'auto')
-+option('jack-link-pipewire-jack',
-+       description: 'Link jack spa plugin against pipewire-jack',
-+       type: 'feature',
-+       value: 'disabled')
- option('support',
-        description: 'Enable support spa plugin integration',
-        type: 'feature',
-diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
-index def7746af..69a076e02 100644
---- a/pipewire-jack/src/meson.build
-+++ b/pipewire-jack/src/meson.build
-@@ -51,6 +51,13 @@ pipewire_jack = shared_library('jack',
-     install_dir : libjack_path,
- )
- 
-+if get_option('jack-link-pipewire-jack').allowed()
-+  jack_dep = declare_dependency(
-+    include_directories: [jack_inc],
-+    link_with: [pipewire_jack],
-+  )
-+endif
-+
- pipewire_jackserver = shared_library('jackserver',
-     pipewire_jackserver_sources,
-     soversion : soversion,
-diff --git a/spa/meson.build b/spa/meson.build
-index 27cdd2113..ee4266324 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -85,8 +85,6 @@ if get_option('spa-plugins').allowed()
-       summary({'ModemManager': mm_dep.found()}, bool_yn: true, section: 'Bluetooth backends')
-     endif
-   endif
--  jack_dep = dependency('jack', version : '>= 1.9.10', required: get_option('jack'))
--  summary({'JACK2': jack_dep.found()}, bool_yn: true, section: 'Backend')
- 
-   have_vulkan = false
-   vulkan_dep = dependency('vulkan', version : '>= 1.2.170', required: get_option('vulkan'))
-diff --git a/spa/plugins/meson.build b/spa/plugins/meson.build
-index 210004691..a879ae715 100644
---- a/spa/plugins/meson.build
-+++ b/spa/plugins/meson.build
-@@ -22,9 +22,6 @@ endif
- if avcodec_dep.found()
-   subdir('ffmpeg')
- endif
--if jack_dep.found()
--  subdir('jack')
--endif
- if get_option('support').allowed()
-   subdir('support')
- endif
-diff --git a/src/modules/meson.build b/src/modules/meson.build
-index a60b85eee..e74e30c98 100644
---- a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -178,7 +178,7 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
-   dependencies : [mathlib, dl_lib, pipewire_dep, audioconvert_dep],
- )
- 
--build_module_jack_tunnel = jack_dep.found()
-+build_module_jack_tunnel = get_option('jack').allowed()
- if build_module_jack_tunnel
-   pipewire_module_jack_tunnel = shared_library('pipewire-module-jack-tunnel',
-     [ 'module-jack-tunnel.c' ],