diff -Nru vdr-plugin-avahi4vdr-16/avahi4vdr.c vdr-plugin-avahi4vdr-18/avahi4vdr.c --- vdr-plugin-avahi4vdr-16/avahi4vdr.c 2013-09-26 01:08:33.000000000 +0000 +++ vdr-plugin-avahi4vdr-18/avahi4vdr.c 2015-11-11 20:46:25.000000000 +0000 @@ -16,7 +16,7 @@ #include -static const char *VERSION = "16"; +static const char *VERSION = "18"; static const char *DESCRIPTION = trNOOP("publish and browse for network services"); static const char *MAINMENUENTRY = NULL; @@ -135,14 +135,16 @@ void cPluginAvahi4vdr::Stop(void) { // Stop any background activities the plugin is performing. - if (*_watch_id) { - cPlugin *dbus2vdr = cPluginManager::GetPlugin("dbus2vdr"); - if (dbus2vdr != NULL) { - int replyCode = 0; - cString data = cString::sprintf("busname=system,id=%s", *_watch_id); - dbus2vdr->SVDRPCommand("UnwatchBusname", *data, replyCode); - } - } + + // We're going to stop and dbus2vdr may be gone already, so what... + //if (*_watch_id) { + // cPlugin *dbus2vdr = cPluginManager::GetPlugin("dbus2vdr"); + // if (dbus2vdr != NULL) { + // int replyCode = 0; + // cString data = cString::sprintf("busname=system,id=%s", *_watch_id); + // dbus2vdr->SVDRPCommand("UnwatchBusname", *data, replyCode); + // } + // } _client_mutex.Lock(); if (_avahi_client != NULL) { diff -Nru vdr-plugin-avahi4vdr-16/avahi-client.c vdr-plugin-avahi4vdr-18/avahi-client.c --- vdr-plugin-avahi4vdr-16/avahi-client.c 2013-09-26 00:52:11.000000000 +0000 +++ vdr-plugin-avahi4vdr-18/avahi-client.c 2015-11-11 20:46:17.000000000 +0000 @@ -24,26 +24,36 @@ _services.Clear(); } -cAvahiBrowser *cAvahiClient::GetBrowser(const char *id) const +const cAvahiBrowser *cAvahiClient::GetBrowser(const char *id) const { if (id == NULL) return NULL; - cAvahiBrowser *browser = _browsers.First(); + const cAvahiBrowser *browser = _browsers.First(); while ((browser != NULL) && (strcmp(*browser->Id(), id) != 0)) browser = _browsers.Next(browser); return browser; } -cAvahiService *cAvahiClient::GetService(const char *id) const +cAvahiBrowser *cAvahiClient::GetBrowser(const char *id) +{ + return const_cast(GetBrowser(id)); +} + +const cAvahiService *cAvahiClient::GetService(const char *id) const { if (id == NULL) return NULL; - cAvahiService *service = _services.First(); + const cAvahiService *service = _services.First(); while ((service != NULL) && (strcmp(*service->Id(), id) != 0)) service = _services.Next(service); return service; } +cAvahiService *cAvahiClient::GetService(const char *id) +{ + return const_cast(GetService(id)); +} + void cAvahiClient::BrowserError(cAvahiBrowser *browser) { esyslog("avahi4vdr-client: browser error"); diff -Nru vdr-plugin-avahi4vdr-16/avahi-client.h vdr-plugin-avahi4vdr-18/avahi-client.h --- vdr-plugin-avahi4vdr-16/avahi-client.h 2013-09-26 00:46:03.000000000 +0000 +++ vdr-plugin-avahi4vdr-18/avahi-client.h 2015-11-11 20:46:17.000000000 +0000 @@ -30,8 +30,10 @@ cCondVar _loop_cond; bool _loop_quit; - cAvahiBrowser *GetBrowser(const char *id) const; - cAvahiService *GetService(const char *id) const; + const cAvahiBrowser *GetBrowser(const char *id) const; + cAvahiBrowser *GetBrowser(const char *id); + const cAvahiService *GetService(const char *id) const; + cAvahiService *GetService(const char *id); void BrowserError(cAvahiBrowser *browser); void ServiceError(cAvahiService *service); diff -Nru vdr-plugin-avahi4vdr-16/debian/changelog vdr-plugin-avahi4vdr-18/debian/changelog --- vdr-plugin-avahi4vdr-16/debian/changelog 2015-12-22 19:42:30.000000000 +0000 +++ vdr-plugin-avahi4vdr-18/debian/changelog 2015-12-22 22:17:48.000000000 +0000 @@ -1,116 +1,32 @@ -vdr-plugin-avahi4vdr (16-3frodo4~trusty) trusty; urgency=medium +vdr-plugin-avahi4vdr (18-0yavdr2~trusty) trusty; urgency=medium * automatic rebuild - -- Frodo Tue, 22 Dec 2015 20:42:30 +0100 + -- yavdr package builder Tue, 22 Dec 2015 23:17:48 +0100 -vdr-plugin-avahi4vdr (16-3frodo3~trusty) trusty; urgency=medium +vdr-plugin-avahi4vdr (18-0yavdr2~trusty) trusty; urgency=medium * automatic rebuild - -- Frodo Sun, 20 Dec 2015 00:28:39 +0100 + -- yavdr package builder Tue, 22 Dec 2015 18:40:17 +0100 -vdr-plugin-avahi4vdr (16-3frodo2~trusty) trusty; urgency=medium +vdr-plugin-avahi4vdr (18-0yavdr1~trusty) trusty; urgency=medium * automatic rebuild - -- Frodo Mon, 24 Aug 2015 21:15:38 +0200 + -- yavdr package builder Mon, 21 Dec 2015 20:16:43 +0100 -vdr-plugin-avahi4vdr (16-3frodo1~trusty) trusty; urgency=medium +vdr-plugin-avahi4vdr (18-0yavdr0~trusty) trusty; urgency=medium - * automatic rebuild - - -- Frodo Sat, 08 Aug 2015 22:12:19 +0200 - -vdr-plugin-avahi4vdr (16-3frodo0~trusty) trusty; urgency=medium - - * automatic rebuild - - -- Frodo Fri, 17 Jul 2015 11:01:11 +0200 - -vdr-plugin-avahi4vdr (16-2yavdr1~trusty) trusty; urgency=medium - - * copy from yavdr unstable-vdr - - -- Frodo Sun, 12 Jul 2015 17:48:38 +0200 - -vdr-plugin-avahi4vdr (16-2yavdr1~trusty) trusty; urgency=medium - - * automatic rebuild - - -- Alexander Grothe Mon, 25 May 2015 17:33:59 +0200 - -vdr-plugin-avahi4vdr (16-2yavdr0~trusty) trusty; urgency=medium - - * rework debian dir - - -- Alexander Grothe Mon, 06 Apr 2015 11:08:11 +0200 - -vdr-plugin-avahi4vdr (16-1yavdr10~trusty) trusty; urgency=medium - - * automatic rebuild - - -- yavdr package builder Fri, 03 Apr 2015 15:15:46 +0200 - -vdr-plugin-avahi4vdr (16-1yavdr9~trusty) trusty; urgency=medium - - * automatic rebuild - - -- Lars Hanisch Fri, 20 Feb 2015 11:08:18 +0100 - -vdr-plugin-avahi4vdr (16-1yavdr8~trusty) trusty; urgency=medium - - * automatic rebuild + * new upstream release - -- Lars Hanisch Thu, 12 Feb 2015 00:28:18 +0100 + -- Lars Hanisch Wed, 11 Nov 2015 21:46:57 +0100 -vdr-plugin-avahi4vdr (16-1yavdr7~trusty) trusty; urgency=medium +vdr-plugin-avahi4vdr (17-0yavdr0~trusty) trusty; urgency=medium - * automatic rebuild - - -- Lars Hanisch Sun, 08 Feb 2015 16:11:10 +0100 - -vdr-plugin-avahi4vdr (16-1yavdr6~trusty) trusty; urgency=medium - - * automatic rebuild - - -- Lars Hanisch Sun, 01 Feb 2015 16:10:56 +0100 - -vdr-plugin-avahi4vdr (16-1yavdr5~trusty) trusty; urgency=medium - - * automatic rebuild - - -- Lars Hanisch Sun, 18 Jan 2015 16:29:34 +0100 - -vdr-plugin-avahi4vdr (16-1yavdr4~trusty) trusty; urgency=medium - - * rebuild for trusty thar - - -- Alexander Grothe Sat, 05 Apr 2014 14:25:22 +0200 - -vdr-plugin-avahi4vdr (16-1yavdr3~precise) precise; urgency=medium - - * automatic rebuild - - -- yavdr package builder Wed, 02 Apr 2014 21:58:04 +0200 - -vdr-plugin-avahi4vdr (16-1yavdr1~precise) precise; urgency=medium - - * automatic rebuild - - -- yavdr package builder Sun, 23 Mar 2014 15:52:37 +0100 - -vdr-plugin-avahi4vdr (16-1yavdr0~precise) precise; urgency=medium - - * add vdr-abi dependency - - -- Lars Hanisch Fri, 24 Jan 2014 16:18:53 +0100 - -vdr-plugin-avahi4vdr (16-0yavdr1~precise) precise; urgency=medium - - * automatic rebuild + * make compatible with vdr 2.3.1 - -- yavdr package builder Sat, 26 Oct 2013 10:31:46 +0200 + -- Lars Hanisch Sat, 07 Nov 2015 15:01:10 +0100 vdr-plugin-avahi4vdr (16-0yavdr0~precise) precise; urgency=medium diff -Nru vdr-plugin-avahi4vdr-16/debian/control vdr-plugin-avahi4vdr-18/debian/control --- vdr-plugin-avahi4vdr-16/debian/control 2015-04-03 14:28:23.000000000 +0000 +++ vdr-plugin-avahi4vdr-18/debian/control 2015-11-11 20:48:33.000000000 +0000 @@ -2,13 +2,13 @@ Section: video Priority: extra Maintainer: Lars Hanisch -Build-Depends: debhelper (>= 8), vdr-dev (>= 2.2.0-1), pkg-config, libavahi-client-dev, libavahi-common-dev, libavahi-glib-dev, uuid-dev +Build-Depends: debhelper (>= 8), vdr-dev (>= 1.7.27), pkg-config, libavahi-client-dev, libavahi-common-dev, libavahi-glib-dev, uuid-dev Standards-Version: 3.9.1 Homepage: https://github.com/flensrocker/vdr-plugin-avahi4vdr Package: vdr-plugin-avahi4vdr Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: A VDR plugin, publish or browser for network service with avahi This VDR-plugin will expose some methods to publish or browser for network service announced by the avahi-daemon. diff -Nru vdr-plugin-avahi4vdr-16/debian/rules vdr-plugin-avahi4vdr-18/debian/rules --- vdr-plugin-avahi4vdr-16/debian/rules 2015-04-06 09:08:06.000000000 +0000 +++ vdr-plugin-avahi4vdr-18/debian/rules 2015-11-11 20:48:33.000000000 +0000 @@ -2,18 +2,14 @@ #DH_VERBOSE=1 -PLG_PACKAGE = $(filter-out %-dbg, $(shell dh_listpackages)) -DBG_PACKAGE = $(filter %-dbg, $(shell dh_listpackages)) - .PHONY: override_dh_strip override_dh_auto_install - override_dh_strip: - dh_strip --dbg-package=$(DBG_PACKAGE) + dh_strip --dbg-package=vdr-plugin-avahi4vdr-dbg override_dh_auto_install: - dh_auto_install --destdir=debian/$(PLG_PACKAGE) + dh_auto_install --destdir=debian/vdr-plugin-avahi4vdr %: - dh $@ --with vdrplugin + dh $@ diff -Nru vdr-plugin-avahi4vdr-16/Makefile vdr-plugin-avahi4vdr-18/Makefile --- vdr-plugin-avahi4vdr-16/Makefile 2013-04-17 21:20:39.000000000 +0000 +++ vdr-plugin-avahi4vdr-18/Makefile 2015-11-11 20:46:17.000000000 +0000 @@ -16,7 +16,7 @@ ### The directory environment: # Use package data if installed...otherwise assume we're under the VDR source directory: -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr)) #INCDIR = $(call PKGCFG,incdir) INCDIR ?= /usr/include PLGINCDIR = $(INCDIR)/vdr/plugins/$(PLUGIN)