Split vulkan plugin

2 files changed, 25 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5fbbc0f98636..fc013a098f6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pipewire-common-git
 	pkgdesc = Server and user space API to deal with multimedia pipelines
-	pkgver = 0.3.21.r75.g21040043
+	pkgver = 0.3.21.r85.g58d2fe44
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
@@ -34,7 +34,6 @@ pkgname = pipewire-common-git
 	install = pipewire.install
 	depends = sbc
 	depends = rtkit
-	depends = vulkan-icd-loader
 	depends = libdbus-1.so
 	depends = libncursesw.so
 	depends = libsndfile.so
@@ -102,6 +101,14 @@ pkgname = gst-plugin-pipewire-common-git
 	provides = gst-plugin-pipewire
 	conflicts = gst-plugin-pipewire
 
+pkgname = pipewire-common-vulkan-git
+	pkgdesc = Server and user space API to deal with multimedia pipelines (Vulkan SPA plugin)
+	depends = pipewire-common-git
+	depends = libpipewire-0.3.so
+	depends = vulkan-icd-loader
+	provides = pipewire-vulkan
+	conflicts = pipewire-vulkan
+
 pkgname = pipewire-common-ffmpeg-git
 	pkgdesc = Server and user space API to deal with multimedia pipelines (FFmpeg SPA plugin)
 	depends = pipewire-common-git
diff --git a/PKGBUILD b/PKGBUILD
index 9c955872b2ef..380197e86d16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,10 @@ _pkgbase=pipewire
 pkgbase=pipewire-common-git
 pkgname=(pipewire-common-git pipewire-common-docs-git pipewire-common-jack-git
          pipewire-common-pulse-git pipewire-common-alsa-git
-         gst-plugin-pipewire-common-git pipewire-common-ffmpeg-git
+         gst-plugin-pipewire-common-git
+         pipewire-common-vulkan-git pipewire-common-ffmpeg-git
          pipewire-common-bluez5-git pipewire-common-bluez5-hsphfpd-git)
-pkgver=0.3.21.r75.g21040043
+pkgver=0.3.21.r85.g58d2fe44
 pkgrel=1
 pkgdesc="Server and user space API to deal with multimedia pipelines"
 url="https://pipewire.org"
@@ -61,7 +62,7 @@ _pick() {
 _ver=${pkgver:0:3}
 
 package_pipewire-common-git() {
-  depends=(sbc rtkit vulkan-icd-loader
+  depends=(sbc rtkit
            libdbus-1.so libncursesw.so libsndfile.so libudev.so libasound.so
            libsystemd.so)
   optdepends=('pipewire-common-docs-git: Documentation'
@@ -102,9 +103,6 @@ package_pipewire-common-git() {
 
   cd "$pkgdir"
 
-  mkdir -p etc/alsa/conf.d
-  ln -st etc/alsa/conf.d /usr/share/alsa/alsa.conf.d/50-pipewire.conf
-
   _pick bluez5-hsphfpd usr/lib/spa-0.2/bluez5
 
   _pick docs usr/share/doc
@@ -118,6 +116,8 @@ package_pipewire-common-git() {
 
   _pick gst usr/lib/gstreamer-1.0
 
+  _pick vulkan usr/lib/spa-0.2/vulkan
+
   _pick ffmpeg usr/lib/spa-0.2/ffmpeg
 }
 
@@ -152,7 +152,8 @@ package_pipewire-common-alsa-git() {
   conflicts=(pipewire-alsa)
 
   mkdir -p "$pkgdir"/etc/{alsa/conf.d,pipewire/media-session.d}
-  ln -st "$pkgdir/etc/alsa/conf.d" /usr/share/alsa/alsa.conf.d/99-pipewire-default.conf
+  ln -st "$pkgdir/etc/alsa/conf.d" \
+    /usr/share/alsa/alsa.conf.d/{50-pipewire,99-pipewire-default}.conf
   touch "$pkgdir/etc/pipewire/media-session.d/with-alsa"
 }
 
@@ -164,6 +165,14 @@ package_gst-plugin-pipewire-common-git() {
   mv gst/* "$pkgdir"
 }
 
+package_pipewire-common-vulkan-git() {
+  pkgdesc+=" (Vulkan SPA plugin)"
+  depends=(pipewire-common-git libpipewire-$_ver.so vulkan-icd-loader)
+  provides=(pipewire-vulkan)
+  conflicts=(pipewire-vulkan)
+  mv vulkan/* "${pkgdir}"
+}
+
 package_pipewire-common-ffmpeg-git() {
   pkgdesc+=" (FFmpeg SPA plugin)"
   depends=(pipewire-common-git libpipewire-$_ver.so libavcodec.so libavformat.so)