[arch-commits] Commit in pipewire/trunk (PKGBUILD pipewire.install svg.diff)

[Jan Steffens]

    Date: Thursday, November 23, 2017 @ 12:05:13
  Author: heftig
Revision: 310729

0.1.6-2

Added:
  pipewire/trunk/pipewire.install
Modified:
  pipewire/trunk/PKGBUILD
Deleted:
  pipewire/trunk/svg.diff

------------------+
 PKGBUILD         |   21 ++++++++++-----------
 pipewire.install |   14 ++++++++++++++
 svg.diff         |   26 --------------------------
 3 files changed, 24 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-23 11:55:22 UTC (rev 310728)
+++ PKGBUILD	2017-11-23 12:05:13 UTC (rev 310729)
@@ -3,7 +3,7 @@
 
 pkgname=pipewire
 pkgver=0.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Server and user space API to deal with multimedia pipelines"
 url="http://pipewire.org"
 license=(LGPL2.1)
@@ -11,11 +11,10 @@
 depends=(gstreamer gst-plugins-base v4l-utils)
 makedepends=(git meson doxygen graphviz xmltoman ffmpeg jack2 libva)
 optdepends=(ffmpeg jack2 libva)
+install=pipewire.install
 _commit=5fec60078d25ca3465f30b5d4fbe5d7ea6fabd65  # tags/0.1.6
-source=("git+https://github.com/PipeWire/pipewire#commit=$_commit"
-        svg.diff)
-sha256sums=('SKIP'
-            '23df81ab6c70e1d1e29505f846abffe3530495fdcede6fbed08f42b4c86e6e65')
+source=("git+https://github.com/PipeWire/pipewire#commit=$_commit")
+sha256sums=('SKIP')
 
 
 pkgver() {
@@ -26,13 +25,14 @@
 prepare() {
   mkdir build
   cd $pkgname
-  patch -Np1 -i ../svg.diff
+  # Reduce docs size
+  printf '%s\n' >>doc/Doxyfile.in \
+    HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
 }
 
 build() {
-  cd build
-  meson setup --prefix=/usr --sysconfdir=/etc --buildtype=release -Denable_docs=true -Denable_man=true ../$pkgname
-  ninja
+  arch-meson $pkgname build -Denable_docs=true -Denable_man=true
+  ninja -C build
 }
 
 check() {
@@ -41,6 +41,5 @@
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" ninja -C build install
 }

Added: pipewire.install
===================================================================
--- pipewire.install	                        (rev 0)
+++ pipewire.install	2017-11-23 12:05:13 UTC (rev 310729)
@@ -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
+}

Deleted: svg.diff
===================================================================
--- svg.diff	2017-11-23 11:55:22 UTC (rev 310728)
+++ svg.diff	2017-11-23 12:05:13 UTC (rev 310729)
@@ -1,26 +0,0 @@
-diff --git i/doc/Doxyfile.in w/doc/Doxyfile.in
-index dceb922dc853eb44..726bd38a2945075d 100644
---- i/doc/Doxyfile.in
-+++ w/doc/Doxyfile.in
-@@ -2305,19 +2305,19 @@ DIRECTORY_GRAPH        = YES
- # The default value is: png.
- # This tag requires that the tag HAVE_DOT is set to YES.
- 
--DOT_IMAGE_FORMAT       = png
-+DOT_IMAGE_FORMAT       = svg
- 
- # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
- # enable generation of interactive SVG images that allow zooming and panning.
- #
- # Note that this requires a modern browser other than Internet Explorer. Tested
- # and working are Firefox, Chrome, Safari, and Opera.
- # Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
- # the SVG files visible. Older versions of IE do not have SVG support.
- # The default value is: NO.
- # This tag requires that the tag HAVE_DOT is set to YES.
- 
--INTERACTIVE_SVG        = NO
-+INTERACTIVE_SVG        = YES
- 
- # The DOT_PATH tag can be used to specify the path where the dot tool can be
- # found. If left blank, it is assumed the dot tool can be found in the path.