Date: Friday, November 20, 2020 @ 11:45:39
  Author: heftig
Revision: 401538

archrelease: copy trunk to testing-x86_64

Added:
  pipewire/repos/testing-x86_64/PKGBUILD
    (from rev 401537, pipewire/trunk/PKGBUILD)
  pipewire/repos/testing-x86_64/pipewire-pulse.install
    (from rev 401537, pipewire/trunk/pipewire-pulse.install)
  pipewire/repos/testing-x86_64/pipewire.install
    (from rev 401537, pipewire/trunk/pipewire.install)
Deleted:
  pipewire/repos/testing-x86_64/PKGBUILD
  pipewire/repos/testing-x86_64/pipewire-pulse.install
  pipewire/repos/testing-x86_64/pipewire.install

------------------------+
 PKGBUILD               |  241 +++++++++++++++++++++++------------------------
 pipewire-pulse.install |   28 ++---
 pipewire.install       |   28 ++---
 3 files changed, 150 insertions(+), 147 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2020-11-20 11:45:26 UTC (rev 401537)
+++ PKGBUILD    2020-11-20 11:45:39 UTC (rev 401538)
@@ -1,119 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
-# Contributor: Jan de Groot <j...@archlinux.org>
-
-pkgbase=pipewire
-pkgname=(pipewire pipewire-docs pipewire-jack pipewire-pulse pipewire-alsa
-         gst-plugin-pipewire)
-pkgver=0.3.16
-pkgrel=3
-pkgdesc="Server and user space API to deal with multimedia pipelines"
-url="https://pipewire.org";
-license=(LGPL2.1)
-arch=(x86_64)
-makedepends=(git meson doxygen graphviz xmltoman valgrind jack2 libpulse
-             alsa-lib gst-plugins-base sbc rtkit vulkan-icd-loader dbus
-             libsndfile bluez-libs vulkan-headers)
-_commit=09d373f094f0e6797aef3d97cde2c0167dccc986  # tags/0.3.16
-source=("git+https://github.com/PipeWire/pipewire#commit=$_commit";)
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgbase
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgbase
-}
-
-build() {
-  arch-meson $pkgbase build \
-    -D docs=true \
-    -D udevrulesdir=/usr/lib/udev/rules.d
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-_pick() {
-  local p="$1" f d; shift
-  for f; do
-    d="$srcdir/$p/${f#$pkgdir/}"
-    mkdir -p "$(dirname "$d")"
-    mv "$f" "$d"
-    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
-  done
-}
-
-_ver=${pkgver:0:3}
-
-package_pipewire() {
-  depends=(sbc rtkit vulkan-icd-loader bluez-libs alsa-card-profiles
-           libdbus-1.so libsndfile.so libudev.so libasound.so libsystemd.so
-           libglib-2.0.so libgobject-2.0.so)
-  optdepends=('pipewire-docs: Documentation'
-              'pipewire-jack: JACK support'
-              'pipewire-pulse: PulseAudio support')
-  provides=(libpipewire-$_ver.so)
-  backup=(etc/pipewire/pipewire.conf)
-  install=pipewire.install
-
-  DESTDIR="$pkgdir" meson install -C build
-
-  cd "$pkgdir"
-
-  mkdir -p etc/alsa/conf.d
-  ln -st etc/alsa/conf.d /usr/share/alsa/alsa.conf.d/50-pipewire.conf 
-
-  _pick docs usr/share/doc
-
-  _pick pulse usr/bin/pipewire-pulse
-  _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-protocol-pulse.so
-  _pick pulse usr/lib/systemd/user/pipewire-pulse.*
-
-  _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack
-  _pick jack usr/lib/spa-0.2/jack
-  _pick jack usr/share/man/man1/pw-jack.1
-
-  _pick gst usr/lib/gstreamer-1.0
-
-  # Use alsa-card-profiles built with Pulseaudio
-  rm -rv "$pkgdir"/usr/share/alsa-card-profile
-}
-
-package_pipewire-docs() {
-  pkgdesc+=" (documentation)"
-  mv docs/* "$pkgdir"
-}
-
-package_pipewire-jack() {
-  pkgdesc+=" (JACK support)"
-  depends=(libpipewire-$_ver.so libjack.so)
-  mv jack/* "$pkgdir"
-}
-
-package_pipewire-pulse() {
-  pkgdesc+=" (PulseAudio support)"
-  depends=(libpipewire-$_ver.so libpulse.so)
-  provides=(pulseaudio pulseaudio-bluetooth)
-  conflicts=(pulseaudio)  # Sockets conflict
-  install=pipewire-pulse.install
-  mv pulse/* "$pkgdir"
-}
-
-package_pipewire-alsa() {
-  pkgdesc="ALSA Configuration for PipeWire"
-  depends=(libpipewire-$_ver.so)
-  provides=(pulseaudio-alsa)
-
-  mkdir -p "$pkgdir/etc/alsa/conf.d"
-  ln -st "$pkgdir/etc/alsa/conf.d" 
/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf
-}
-
-package_gst-plugin-pipewire() {
-  pkgdesc="Multimedia graph framework - pipewire plugin"
-  depends=(libpipewire-$_ver.so gst-plugins-base-libs)
-  mv gst/* "$pkgdir"
-}

Copied: pipewire/repos/testing-x86_64/PKGBUILD (from rev 401537, 
pipewire/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2020-11-20 11:45:39 UTC (rev 401538)
@@ -0,0 +1,122 @@
+# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
+# Contributor: Jan de Groot <j...@archlinux.org>
+
+pkgbase=pipewire
+pkgname=(pipewire pipewire-docs pipewire-jack pipewire-pulse pipewire-alsa
+         gst-plugin-pipewire)
+pkgver=0.3.16
+pkgrel=4
+pkgdesc="Server and user space API to deal with multimedia pipelines"
+url="https://pipewire.org";
+license=(LGPL2.1)
+arch=(x86_64)
+makedepends=(git meson doxygen graphviz xmltoman valgrind jack2 libpulse
+             alsa-lib gst-plugins-base sbc rtkit vulkan-icd-loader dbus
+             libsndfile bluez-libs vulkan-headers)
+_commit=09d373f094f0e6797aef3d97cde2c0167dccc986  # tags/0.3.16
+source=("git+https://github.com/PipeWire/pipewire#commit=$_commit";)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgbase
+
+  # fix kwin
+  git cherry-pick -n fc2b0b20ad4271b0c6f258451a82311b792b7a57
+}
+
+build() {
+  arch-meson $pkgbase build \
+    -D docs=true \
+    -D udevrulesdir=/usr/lib/udev/rules.d
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+_ver=${pkgver:0:3}
+
+package_pipewire() {
+  depends=(sbc rtkit vulkan-icd-loader bluez-libs alsa-card-profiles
+           libdbus-1.so libsndfile.so libudev.so libasound.so libsystemd.so
+           libglib-2.0.so libgobject-2.0.so)
+  optdepends=('pipewire-docs: Documentation'
+              'pipewire-jack: JACK support'
+              'pipewire-pulse: PulseAudio support')
+  provides=(libpipewire-$_ver.so)
+  backup=(etc/pipewire/pipewire.conf)
+  install=pipewire.install
+
+  DESTDIR="$pkgdir" meson install -C build
+
+  cd "$pkgdir"
+
+  mkdir -p etc/alsa/conf.d
+  ln -st etc/alsa/conf.d /usr/share/alsa/alsa.conf.d/50-pipewire.conf 
+
+  _pick docs usr/share/doc
+
+  _pick pulse usr/bin/pipewire-pulse
+  _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-protocol-pulse.so
+  _pick pulse usr/lib/systemd/user/pipewire-pulse.*
+
+  _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack
+  _pick jack usr/lib/spa-0.2/jack
+  _pick jack usr/share/man/man1/pw-jack.1
+
+  _pick gst usr/lib/gstreamer-1.0
+
+  # Use alsa-card-profiles built with Pulseaudio
+  rm -rv "$pkgdir"/usr/share/alsa-card-profile
+}
+
+package_pipewire-docs() {
+  pkgdesc+=" (documentation)"
+  mv docs/* "$pkgdir"
+}
+
+package_pipewire-jack() {
+  pkgdesc+=" (JACK support)"
+  depends=(libpipewire-$_ver.so libjack.so)
+  mv jack/* "$pkgdir"
+}
+
+package_pipewire-pulse() {
+  pkgdesc+=" (PulseAudio support)"
+  depends=(libpipewire-$_ver.so libpulse.so)
+  provides=(pulseaudio pulseaudio-bluetooth)
+  conflicts=(pulseaudio)  # Sockets conflict
+  install=pipewire-pulse.install
+  mv pulse/* "$pkgdir"
+}
+
+package_pipewire-alsa() {
+  pkgdesc="ALSA Configuration for PipeWire"
+  depends=(libpipewire-$_ver.so)
+  provides=(pulseaudio-alsa)
+
+  mkdir -p "$pkgdir/etc/alsa/conf.d"
+  ln -st "$pkgdir/etc/alsa/conf.d" 
/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf
+}
+
+package_gst-plugin-pipewire() {
+  pkgdesc="Multimedia graph framework - pipewire plugin"
+  depends=(libpipewire-$_ver.so gst-plugins-base-libs)
+  mv gst/* "$pkgdir"
+}

Deleted: pipewire-pulse.install
===================================================================
--- pipewire-pulse.install      2020-11-20 11:45:26 UTC (rev 401537)
+++ pipewire-pulse.install      2020-11-20 11:45:39 UTC (rev 401538)
@@ -1,14 +0,0 @@
-post_install() {
-  # Enable socket by default
-  systemctl --global enable pipewire-pulse.socket
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 0.3.16-1) < 0)); then
-    systemctl --global enable pipewire-pulse.socket
-  fi
-}
-
-pre_remove() {
-  systemctl --global disable pipewire-pulse.socket
-}

Copied: pipewire/repos/testing-x86_64/pipewire-pulse.install (from rev 401537, 
pipewire/trunk/pipewire-pulse.install)
===================================================================
--- pipewire-pulse.install                              (rev 0)
+++ pipewire-pulse.install      2020-11-20 11:45:39 UTC (rev 401538)
@@ -0,0 +1,14 @@
+post_install() {
+  # Enable socket by default
+  systemctl --global enable pipewire-pulse.socket
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 0.3.16-1) < 0)); then
+    systemctl --global enable pipewire-pulse.socket
+  fi
+}
+
+pre_remove() {
+  systemctl --global disable pipewire-pulse.socket
+}

Deleted: pipewire.install
===================================================================
--- pipewire.install    2020-11-20 11:45:26 UTC (rev 401537)
+++ pipewire.install    2020-11-20 11:45:39 UTC (rev 401538)
@@ -1,14 +0,0 @@
-post_install() {
-  # Enable socket by default
-  systemctl --global enable pipewire.socket
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 0.1.6-2) < 0)); then
-    systemctl --global enable pipewire.socket
-  fi
-}
-
-pre_remove() {
-  systemctl --global disable pipewire.socket
-}

Copied: pipewire/repos/testing-x86_64/pipewire.install (from rev 401537, 
pipewire/trunk/pipewire.install)
===================================================================
--- pipewire.install                            (rev 0)
+++ pipewire.install    2020-11-20 11:45:39 UTC (rev 401538)
@@ -0,0 +1,14 @@
+post_install() {
+  # Enable socket by default
+  systemctl --global enable pipewire.socket
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 0.1.6-2) < 0)); then
+    systemctl --global enable pipewire.socket
+  fi
+}
+
+pre_remove() {
+  systemctl --global disable pipewire.socket
+}

Reply via email to