git » pipewire.git » commit 6f922f8

upgpkg: 1:0.3.76-1

author David Runge
2023-07-28 13:24:15 UTC
committer David Runge
2023-07-28 13:24:15 UTC
parent 84c34d55abba86ab41f94c82ca39bf7b3cf38dc1

upgpkg: 1:0.3.76-1

Remove now included patch.
Add all direct dependencies.

PKGBUILD +24 -9
pipewire-0.3.75-add_missing_header.patch +0 -26

diff --git a/PKGBUILD b/PKGBUILD
index 9494448..b512eab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,9 +19,9 @@ pkgname=(
   pipewire-v4l2
   pipewire-x11-bell
 )
-_commit=a3bd0f7a0a8dec9045deeb5eb3eb92b09ff75d57  # tags/0.3.75
-pkgver=0.3.75
-pkgrel=2
+_commit=9bcc90fdc3ece16a4e0a91446641e56332b979fd  # tags/0.3.76
+pkgver=0.3.76
+pkgrel=1
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
@@ -67,10 +67,8 @@ makedepends=(
 checkdepends=(desktop-file-utils)
 source=(
   "git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit"
-  $pkgbase-0.3.75-add_missing_header.patch
 )
-b2sums=('SKIP'
-        'fbf3a698d61fa6f098d9560378c64f9520d2a82957fa11c8dc9a0cad075b3d68de6db70e9842eeb9275f452283ed87cd96a7cfe0bb52e758efd3df8e93bea6d5')
+b2sums=('SKIP')
 
 pkgver() {
   cd pipewire
@@ -78,9 +76,6 @@ pkgver() {
 }
 
 prepare() {
-  # fix missing include: https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1664
-  patch -Np1 -d $pkgbase -i ../$pkgname-0.3.75-add_missing_header.patch
-
   cd pipewire
 
   # remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib
@@ -124,6 +119,8 @@ _ver=${pkgver:0:3}
 package_pipewire() {
   license+=(LGPL)  # libspa-alsa
   depends=(
+    gcc-libs
+    glibc
     "libpipewire=$epoch:$pkgver-$pkgrel"
     libcamera-base.so
     libcamera.so
@@ -232,6 +229,7 @@ package_pipewire() {
 package_libpipewire() {
   pkgdesc+=" - client library"
   depends=(
+    glibc
     gcc-libs
   )
   provides=(libpipewire-$_ver.so)
@@ -260,6 +258,10 @@ package_pipewire-audio() {
   pkgdesc+=" - Audio support"
   depends=(
     alsa-card-profiles
+    dbus
+    gcc-libs
+    glib2
+    glibc
     libasound.so
     libbluetooth.so
     libfdk-aac.so
@@ -275,6 +277,7 @@ package_pipewire-audio() {
     libusb-1.0.so
     libwebrtc_audio_processing.so
     pipewire
+    systemd-libs
   )
 
   mv audio/* "$pkgdir"
@@ -309,6 +312,7 @@ package_pipewire-alsa() {
 package_pipewire-ffado() {
   pkgdesc+=" - FireWire support"
   depends=(
+    glibc
     libffado.so
     libpipewire-$_ver.so
     pipewire
@@ -324,6 +328,7 @@ package_pipewire-jack() {
   pkgdesc+=" - JACK support"
   license+=(GPL2)  # libjackserver
   depends=(
+    glibc
     libpipewire-$_ver.so
     pipewire
     pipewire-audio
@@ -348,6 +353,9 @@ package_pipewire-jack() {
 package_pipewire-pulse() {
   pkgdesc+=" - PulseAudio replacement"
   depends=(
+    dbus
+    gcc-libs
+    glibc
     libavahi-{client,common}.so
     libglib-2.0.so
     libpipewire-$_ver.so
@@ -355,6 +363,7 @@ package_pipewire-pulse() {
     pipewire
     pipewire-audio
     pipewire-session-manager
+    systemd-libs
   )
   provides=(pulseaudio pulseaudio-bluetooth)
   conflicts=(pulseaudio pulseaudio-bluetooth)
@@ -374,6 +383,7 @@ package_pipewire-pulse() {
 package_pipewire-roc() {
   pkgdesc+=" - ROC streaming support"
   depends=(
+    glibc
     libpipewire-$_ver.so
     libroc.so
     pipewire
@@ -406,9 +416,12 @@ package_gst-plugin-pipewire() {
 package_pipewire-zeroconf() {
   pkgdesc+=" - Zeroconf support"
   depends=(
+    gcc-libs
+    glibc
     libavahi-{client,common}.so
     libpipewire-$_ver.so
     openssl
+    opus
     pipewire
     pipewire-audio
   )
@@ -421,6 +434,7 @@ package_pipewire-zeroconf() {
 package_pipewire-v4l2() {
   pkgdesc+=" - V4L2 interceptor"
   depends=(
+    glibc
     libpipewire-$_ver.so
     pipewire
     pipewire-session-manager
@@ -435,6 +449,7 @@ package_pipewire-v4l2() {
 package_pipewire-x11-bell() {
   pkgdesc+=" - X11 bell"
   depends=(
+    glibc
     libcanberra.so
     libpipewire-$_ver.so
     libx11
diff --git a/pipewire-0.3.75-add_missing_header.patch b/pipewire-0.3.75-add_missing_header.patch
deleted file mode 100644
index cff7678..0000000
--- a/pipewire-0.3.75-add_missing_header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 193384b26aba3917d086ac3f009aa2cab9d197d2 Mon Sep 17 00:00:00 2001
-From: "Tom A. Wagner" <tom.a.wagner@protonmail.com>
-Date: Mon, 24 Jul 2023 12:48:33 +0200
-Subject: [PATCH] pipewire: add missing stdbool.h include to version.h.in
-
-The header file only works when included in a file where stdbool.h was already included otherwise.
----
- src/pipewire/version.h.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/pipewire/version.h.in b/src/pipewire/version.h.in
-index 87fc0cfad..94c645b3a 100644
---- a/src/pipewire/version.h.in
-+++ b/src/pipewire/version.h.in
-@@ -11,6 +11,8 @@
- extern "C" {
- #endif
- 
-+#include <stdbool.h>
-+
- /** Return the version of the header files. Keep in mind that this is
- a macro and not a function, so it is impossible to get the pointer of
- it. */
--- 
-GitLab
-