diff --git a/pipewire-32/.footprint b/pipewire-32/.footprint index 5be20810..693e92ce 100644 --- a/pipewire-32/.footprint +++ b/pipewire-32/.footprint @@ -4,8 +4,8 @@ drwxr-xr-x root/root usr/lib32/alsa-lib/ -rwxr-xr-x root/root usr/lib32/alsa-lib/libasound_module_ctl_pipewire.so -rwxr-xr-x root/root usr/lib32/alsa-lib/libasound_module_pcm_pipewire.so lrwxrwxrwx root/root usr/lib32/libpipewire-0.3.so -> libpipewire-0.3.so.0 -lrwxrwxrwx root/root usr/lib32/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.372.0 --rwxr-xr-x root/root usr/lib32/libpipewire-0.3.so.0.372.0 +lrwxrwxrwx root/root usr/lib32/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.373.0 +-rwxr-xr-x root/root usr/lib32/libpipewire-0.3.so.0.373.0 drwxr-xr-x root/root usr/lib32/pipewire-0.3/ -rwxr-xr-x root/root usr/lib32/pipewire-0.3/libpipewire-module-access.so -rwxr-xr-x root/root usr/lib32/pipewire-0.3/libpipewire-module-adapter.so diff --git a/pipewire-32/.signature b/pipewire-32/.signature index 3e640828..70746059 100644 --- a/pipewire-32/.signature +++ b/pipewire-32/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXSSla20sLGjuofaaMvrPZM4HxZKH3eDCsqYh2H8buykV0zg8d/7SHusAf0ZpuIx7DPY+mkC1NieMQy/BXbImMw4= -SHA256 (Pkgfile) = 33a44ef9afc5087bb44909561e9dc581ca0eccdcb74a078a11a0cb0671d2508a -SHA256 (.footprint) = 46121a9df867ebf8a30313f22104ee03c3765915094e3e6e29972263a8fdf93c -SHA256 (pipewire-0.3.72.tar.gz) = eb11d03e7c700e0d9204624fd3116f165f104c37eff30e93e7ac6df763e93829 -SHA256 (1650.patch) = 8cfe514cbfe945ef6d81edddfea4aa2e0c9241561d2367a9d85453c7a474d0cf +RWSwxGo/zH7eXbR+36KUpkFbOv0mWZqGnQ5t9KJOQNcpZdM/0yWbxCJIUY/G8oiq4vbe0coDBeNQSoGW/QBKxqpj9368eX/RSw8= +SHA256 (Pkgfile) = 1132801d84937b022aca147087178abcf2de7dc7ae4af90aeb3f90e0c09051e4 +SHA256 (.footprint) = b9bbf22e60f5909e35cf92449d63f45e9d9f629dbdf60cc843aca10b65442dff +SHA256 (pipewire-0.3.73.tar.gz) = a4f8ee0577ef1ef72e0b4f1612fd99db3163541d4c36361cb938d5a62fa6d82b diff --git a/pipewire-32/1650.patch b/pipewire-32/1650.patch deleted file mode 100644 index 78655f33..00000000 --- a/pipewire-32/1650.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 15ddbfd037695da919e736e8a005336d012155d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= - <89q1r14hd@relay.firefox.com> -Date: Mon, 26 Jun 2023 17:07:04 +0300 -Subject: [PATCH 1/2] spa/plugins/bluez5/meson: removed some unneeded redefines -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As far as I can tell, the code in question was not doing anything there -and was also breaking the new code elsewhere, so it was put on the -chopping block. Don't mind the squirming tentacles. - -Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> ---- - spa/plugins/bluez5/meson.build | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build -index e6c52ccc57..80493cfe61 100644 ---- a/spa/plugins/bluez5/meson.build -+++ b/spa/plugins/bluez5/meson.build -@@ -118,16 +118,14 @@ endif - - if ldac_dep.found() - ldac_args = codec_args -- ldac_dep = [ ldac_dep ] - if ldac_abr_dep.found() - ldac_args += [ '-DENABLE_LDAC_ABR' ] -- ldac_dep += ldac_abr_dep - endif - bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac', - [ 'a2dp-codec-ldac.c', 'media-codecs.c' ], - include_directories : [ configinc ], - c_args : ldac_args, -- dependencies : [ spa_dep, ldac_dep ], -+ dependencies : [ spa_dep, ldac_dep, ldac_abr_dep ], - install : true, - install_dir : spa_plugindir / 'bluez5') - endif -@@ -144,7 +142,6 @@ endif - - if get_option('bluez5-codec-opus').allowed() and opus_dep.found() - opus_args = codec_args -- opus_dep = [ opus_dep ] - bluez_codec_opus = shared_library('spa-codec-bluez5-opus', - [ 'a2dp-codec-opus.c', 'media-codecs.c' ], - include_directories : [ configinc ], --- -GitLab - - -From e4cc63a6dc231a8a2717a2e0f9b1be1603b2b1ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= - <89q1r14hd@relay.firefox.com> -Date: Mon, 26 Jun 2023 16:35:01 +0300 -Subject: [PATCH 2/2] src/modules/meson: ensure Opus libs were actually found, - too -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The old way fails, if a distro has the header but not the library, -which can happen on at least Gentoo with multilib deployments, -where the shared header is present but non-native libraries might not. - -This could still fail, if a distro had some but not all libraries for -some architectures but hopefully no one did that. In that case, a compile -test would likely be required via cc.check_header() instead but let's try -the faster fix first. - -Reported-by: Sam James -Thanks-to: Barnabás Pőcze -Thanks-to: Xavier Claessens -Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> ---- - src/modules/meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 342bd697b1..970e04db98 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -203,7 +203,8 @@ endif - summary({'ffado-driver': build_module_ffado_driver}, bool_yn: true, section: 'Optional Modules') - - opus_custom_h = cc.has_header('opus/opus_custom.h', dependencies: opus_dep) --if opus_custom_h -+# One would imagine that opus_dep is a requirement but for some reason it's not, so we need to manually check that -+if opus_dep.found() and opus_custom_h - opus_custom_dep = declare_dependency(compile_args: ['-DHAVE_OPUS_CUSTOM'], dependencies: opus_dep) - else - opus_custom_dep = dependency('', required: false) --- -GitLab - diff --git a/pipewire-32/Pkgfile b/pipewire-32/Pkgfile index cd46d80b..f3f422a5 100644 --- a/pipewire-32/Pkgfile +++ b/pipewire-32/Pkgfile @@ -5,10 +5,9 @@ # Optional: avahi-32 jack-32 libsdl2-32 libsndfile-32 pulseaudio-32 vulkan-loader-32 xorg-libxcb-32 name=pipewire-32 -version=0.3.72 +version=0.3.73 release=1 -source=(https://github.com/PipeWire/pipewire/archive/$version/pipewire-$version.tar.gz - 1650.patch) +source=(https://github.com/PipeWire/pipewire/archive/$version/pipewire-$version.tar.gz) build() { prt-get isinst alsa-lib-32 && PKGMK_PW+=' -D alsa=enabled -D pipewire-alsa=enabled' @@ -19,8 +18,6 @@ build() { prt-get isinst pulseaudio-32 && PKGMK_PW+=' -D libpulse=enabled' prt-get isinst vulkan-loader-32 && PKGMK_PW+=' -D vulkan=enabled' - patch -Np1 -d pipewire-$version -i $SRC/1650.patch - meson setup pipewire-$version build $PKGMK_PW \ -D prefix=/usr \ --libdir=lib32 \