Update to new version layout, remove unnecessary packages

2 files changed, 83 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89fa31c7f900..45a9c37e57af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = lib32-pipewire-git
-	pkgdesc = Server and user space API to deal with multimedia pipelines. (GIT version)(32-bit client libraries)
-	pkgver = 0.3.11.6.gf6bc9113
+	pkgdesc = Server and user space API to deal with multimedia pipelines (git) (32 bit client libraries)
+	pkgver = 0.3.17.r44.g9818582a
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
-	license = LGPL
+	license = LGPL2.1
 	makedepends = git
 	makedepends = meson
 	makedepends = valgrind
 	makedepends = lib32-jack2
 	makedepends = lib32-libpulse
 	makedepends = lib32-alsa-lib
+	makedepends = lib32-gst-plugins-base
 	makedepends = lib32-sbc
 	makedepends = rtkit
 	makedepends = lib32-vulkan-icd-loader
@@ -19,33 +20,36 @@ pkgbase = lib32-pipewire-git
 	makedepends = lib32-bluez-libs
 	makedepends = vulkan-headers
 	source = git+https://gitlab.freedesktop.org/pipewire/pipewire.git
-	sha256sums = SKIP
+	md5sums = SKIP
 
 pkgname = lib32-pipewire-git
 	depends = lib32-sbc
 	depends = rtkit
 	depends = lib32-vulkan-icd-loader
 	depends = lib32-bluez-libs
+	depends = alsa-card-profiles
 	depends = lib32-dbus
 	depends = lib32-libsndfile
-	optdepends = pipewire-docs: Documentation
+	depends = lib32-libudev0-shim
+	depends = lib32-alsa-lib
+	depends = lib32-systemd
 	optdepends = lib32-pipewire-jack: JACK support
-	optdepends = lib32-pipewire-pulse: PulseAudio support
 	provides = lib32-pipewire
 	conflicts = lib32-pipewire
 
 pkgname = lib32-pipewire-jack-git
-	pkgdesc = Server and user space API to deal with multimedia pipelines. (JACK support)(GIT Version)(32-bit version)
+	pkgdesc = Server and user space API to deal with multimedia pipelines (git) (32 bit client libraries) (JACK support) (git) (32 bit)
 	depends = lib32-pipewire
+	depends = lib32-pipewire-git=0.3.17.r44.g9818582a
 	depends = lib32-jack2
 	provides = lib32-pipewire-jack
 	conflicts = lib32-pipewire-jack
 
-pkgname = lib32-pipewire-pulse-git
-	pkgdesc = Server and user space API to deal with multimedia pipelines. (Pulse support)(GIT version)(32-bit version)
+pkgname = lib32-gst-plugin-pipewire-git
+	pkgdesc = Multimedia graph framework - pipewire plugin (git) (32 bit)
 	depends = lib32-pipewire
-	depends = lib32-libpulse
-	depends = lib32-glib2
-	provides = lib32-pipewire-pulse
-	conflicts = lib32-pipewire-pulse
+	depends = lib32-pipewire-git=0.3.17.r44.g9818582a
+	depends = lib32-gst-plugins-base-libs
+	provides = lib32-gst-plugin-pipewire
+	conflicts = lib32-gst-plugin-pipewire
 
diff --git a/PKGBUILD b/PKGBUILD
index 87fb68266d0c..2acc74492b36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,117 +1,88 @@
+# Maintainer: Christopher Snowhill <kode54@gmail.com>
+# Contributor: katt <magunasu.b97@gmail.com>
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
 pkgbase=lib32-pipewire-git
-pkgname=('lib32-pipewire-git'
-         'lib32-pipewire-jack-git'
-         'lib32-pipewire-pulse-git'
-         )
-pkgver=0.3.11.6.gf6bc9113
+_pkgbase=pipewire
+pkgname=(lib32-pipewire-git lib32-pipewire-jack-git lib32-gst-plugin-pipewire-git)
+pkgver=0.3.17.r44.g9818582a
 pkgrel=1
-pkgdesc='Server and user space API to deal with multimedia pipelines. (GIT version)(32-bit client libraries)'
-arch=('x86_64')
-url='https://pipewire.org'
-license=('LGPL')
-makedepends=('git'
-             'meson'
-             'valgrind'
-             'lib32-jack2'
-             'lib32-libpulse'
-             'lib32-alsa-lib'
-             'lib32-sbc'
-             'rtkit'
-             'lib32-vulkan-icd-loader'
-             'lib32-dbus'
-             'lib32-libsndfile'
-             'lib32-bluez-libs'
-             'vulkan-headers'
-             )
-source=('git+https://gitlab.freedesktop.org/pipewire/pipewire.git')
-sha256sums=('SKIP')
+pkgdesc='Server and user space API to deal with multimedia pipelines (git) (32 bit client libraries)'
+url=https://pipewire.org
+license=(LGPL2.1)
+arch=(x86_64)
+makedepends=(git meson valgrind lib32-jack2 lib32-libpulse lib32-alsa-lib
+             lib32-gst-plugins-base lib32-sbc rtkit lib32-vulkan-icd-loader
+             lib32-dbus lib32-libsndfile lib32-bluez-libs vulkan-headers)
+source=(git+https://gitlab.freedesktop.org/pipewire/pipewire.git)
+md5sums=('SKIP')
 
 pkgver() {
-  cd pipewire
-  echo "$(git describe --long --tags | tr - .)"
-}
-
-prepare() {
-  mkdir -p build
-
-  cd pipewire
+    git -C ${_pkgbase} describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "${srcdir}/build"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  CFLAGS+=" -Wformat"
-
-  arch-meson ../pipewire \
-    --libdir /usr/lib32 \
-    -D udevrulesdir=/usr/lib/udev/rules.d \
-    -D docs=false \
-    -D tests=false \
-    -D gstreamer=false \
-    -D ffmpeg=false \
-
-  ninja
+    export CC="gcc -m32"
+    export CXX="g++ -m32"
+    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+    arch-meson ${_pkgbase} build \
+        --libdir /usr/lib32 \
+        -D docs=false \
+        -D tests=false \
+        -D udevrulesdir=/usr/lib/udev/rules.d
+    meson compile -C build
 }
 
 _pick() {
-  local f d
-  for f; do
-    d="${pkgdir}/${f#$srcdir/install/}"
-    mkdir -p "$(dirname "${d}")"
-    mv "${f}" "${d}"
-    rmdir -p --ignore-fail-on-non-empty "$(dirname "${f}")"
-  done
+    local f d
+    for f; do
+        d="${pkgdir}/${f#$srcdir/install/}"
+        mkdir -p "$(dirname "$d")"
+        mv "$f" "$d"
+        rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+    done
 }
 
+_ver=${pkgver:0:3}
+_spaver="0.2"
+
 package_lib32-pipewire-git() {
-  depends=('lib32-sbc'
-           'rtkit'
-           'lib32-vulkan-icd-loader'
-           'lib32-bluez-libs'
-           'lib32-dbus'
-           'lib32-libsndfile'
-           )
-  optdepends=('pipewire-docs: Documentation'
-              'lib32-pipewire-jack: JACK support'
-              'lib32-pipewire-pulse: PulseAudio support'
-              )
-  provides=('lib32-pipewire')
-  conflicts=('lib32-pipewire')
+    depends=(lib32-sbc rtkit lib32-vulkan-icd-loader lib32-bluez-libs
+        alsa-card-profiles lib32-dbus lib32-libsndfile lib32-libudev0-shim
+        lib32-alsa-lib lib32-systemd)
+    optdepends=('lib32-pipewire-jack: JACK support')
+    provides=(lib32-pipewire)
+    conflicts=(lib32-pipewire)
 
-  DESTDIR="${srcdir}/install" meson install -C build
+    DESTDIR="$srcdir/install" meson install -C build
 
-  cd "${pkgdir}"
+    cd "$pkgdir"
 
-  _pick "${srcdir}"/install/usr/lib32/libpipewire-${pkgver:0:3}.so*
-  _pick "${srcdir}"/install/usr/lib32/alsa-lib/*
-  _pick "${srcdir}"/install/usr/lib32/pipewire-${pkgver:0:3}/libpipewire-module-*.so
-  _pick "${srcdir}"/install/usr/lib32/pkgconfig/*
-  _pick "${srcdir}"/install/usr/lib32/spa-0.2/*
+    _pick "$srcdir"/install/usr/lib32/spa-${_spaver}/jack
+    mkdir -p "$srcdir"/jack
+    mv "$pkgdir"/usr "$srcdir"/jack/
+
+    _pick "$srcdir"/install/usr/lib32/libpipewire-${_ver}.so*
+    _pick "$srcdir"/install/usr/lib32/pipewire-${_ver}/libpipewire-module-*.so
+    _pick "$srcdir"/install/usr/lib32/pkgconfig
+    _pick "$srcdir"/install/usr/lib32/spa-${_spaver}
 }
 
 package_lib32-pipewire-jack-git() {
-  pkgdesc='Server and user space API to deal with multimedia pipelines. (JACK support)(GIT Version)(32-bit version)'
-  depends=('lib32-pipewire'
-           'lib32-jack2'
-           )
-  provides=('lib32-pipewire-jack')
-  conflicts=('lib32-pipewire-jack')
-
-  _pick "${srcdir}"/install/usr/lib32/pipewire-${pkgver:0:3}/jack/*
+    pkgdesc+=' (JACK support) (git) (32 bit)'
+    depends=(lib32-pipewire lib32-pipewire-git=$pkgver lib32-jack2)
+    provides=(lib32-pipewire-jack)
+    conflicts=(lib32-pipewire-jack)
+    mv "$srcdir"/jack/* "$pkgdir"/
+    _pick "$srcdir"/install/usr/lib32/pipewire-${_ver}/jack
 }
 
-package_lib32-pipewire-pulse-git() {
-  pkgdesc='Server and user space API to deal with multimedia pipelines. (Pulse support)(GIT version)(32-bit version)'
-  depends=('lib32-pipewire'
-           'lib32-libpulse'
-           'lib32-glib2'
-           )
-  provides=('lib32-pipewire-pulse')
-  conflicts=('lib32-pipewire-pulse')
-
-  _pick "${srcdir}"/install/usr/lib32/pipewire-${pkgver:0:3}/pulse/*
+package_lib32-gst-plugin-pipewire-git() {
+    pkgdesc='Multimedia graph framework - pipewire plugin (git) (32 bit)'
+    depends=(lib32-pipewire lib32-pipewire-git=$pkgver lib32-gst-plugins-base-libs)
+    provides=(lib32-gst-plugin-pipewire)
+    conflicts=(lib32-gst-plugin-pipewire)
+    _pick "$srcdir"/install/usr/lib32/gstreamer-1.0
 }