[arch-commits] Commit in dleyna-renderer/trunk (PKGBUILD crash.patch)

[Jan Steffens]

    Date: Wednesday, September 20, 2017 @ 18:56:50
  Author: heftig
Revision: 305943

0.6.0-1

Modified:
  dleyna-renderer/trunk/PKGBUILD
Deleted:
  dleyna-renderer/trunk/crash.patch

-------------+
 PKGBUILD    |   25 +++++++++++++++----------
 crash.patch |   32 --------------------------------
 2 files changed, 15 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-20 18:55:49 UTC (rev 305942)
+++ PKGBUILD	2017-09-20 18:56:50 UTC (rev 305943)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=dleyna-renderer
-pkgver=0.5.0
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="Library to discover and manipulate Digital Media Renderers"
 arch=(i686 x86_64)
@@ -9,18 +9,23 @@
 url="http://01.org/dleyna"
 license=(LGPL2.1)
 depends=(dleyna-connector-dbus gupnp-av gupnp-dlna libsoup)
-source=(https://01.org/sites/default/files/downloads/dleyna/$pkgname-$pkgver.tar.gz
-        crash.patch)
-sha256sums=('a62e98991b268f3a23d1c3e2275cdffb114a440d0b364e45480c8028573a6bc3'
-            '90f3ec4d37e9c5bb690e71081c67de9d495679725c70f10a40610de07741d5e5')
+makedepends=(git)
+_commit=334baba53e253957637b86764347dcc27cf091ab  # tags/0.6.0
+source=("git+https://github.com/01org/dleyna-renderer#commit=$_commit")
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../crash.patch
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --libexecdir=/usr/lib/$pkgname
   make
@@ -27,11 +32,11 @@
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make check
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }

Deleted: crash.patch
===================================================================
--- crash.patch	2017-09-20 18:55:49 UTC (rev 305942)
+++ crash.patch	2017-09-20 18:56:50 UTC (rev 305943)
@@ -1,32 +0,0 @@
-From d8ebea65fe69d6df05ee87bdabf30ae8dc313b26 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir at freedesktop.org>
-Date: Tue, 20 Jan 2015 11:20:07 +0100
-Subject: [PATCH] Ensure that g_context.watchers has a valid value
-
-Since g_context.watchers is an unsigned integer, we should be careful
-not to decrement it below zero. This can happen if the service is
-spawned as a result of the following command:
-$ gdbus call \
-    --session \
-    --dest com.intel.dleyna-renderer \
-    --object-path /com/intel/dLeynaRenderer \
-    --method com.intel.dLeynaRenderer.Manager.Release
----
- libdleyna/renderer/server.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libdleyna/renderer/server.c b/libdleyna/renderer/server.c
-index 6d5afa6..e15c326 100644
---- a/libdleyna/renderer/server.c
-+++ b/libdleyna/renderer/server.c
-@@ -688,7 +688,9 @@ static void prv_remove_client(const gchar *name)
- 
- 	dlr_upnp_lost_client(g_context.upnp, name);
- 
--	g_context.watchers--;
-+	if (g_context.watchers > 0)
-+		g_context.watchers--;
-+
- 	if (g_context.watchers == 0)
- 		if (!dleyna_settings_is_never_quit(g_context.settings))
- 			dleyna_task_processor_set_quitting(g_context.processor);