diff options
| author | Taner Tas <taner76@gmail.com> | 2017-07-11 07:00:09 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-07-24 10:40:53 +0000 |
| commit | 5a98b04cc37938b42fc9de0da61eef3792e8c001 (patch) | |
| tree | 242d791ac3c05a956f7a26bc28a3f50390e6113a /testing/vdr/streamdev-for-2.3.7.patch | |
| parent | 60d203036f77aa3a021d0a66264031059c9a2f55 (diff) | |
| download | aports-5a98b04cc37938b42fc9de0da61eef3792e8c001.tar.bz2 aports-5a98b04cc37938b42fc9de0da61eef3792e8c001.tar.xz | |
unmaintained/vdr/APKBUILD -> testing/vdr:
Diffstat (limited to 'testing/vdr/streamdev-for-2.3.7.patch')
| -rw-r--r-- | testing/vdr/streamdev-for-2.3.7.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/testing/vdr/streamdev-for-2.3.7.patch b/testing/vdr/streamdev-for-2.3.7.patch new file mode 100644 index 0000000000..0b9b9e1023 --- /dev/null +++ b/testing/vdr/streamdev-for-2.3.7.patch @@ -0,0 +1,46 @@ +From ce74c3ab559d579c37ad8ac29ddfc188d2f3ba26 Mon Sep 17 00:00:00 2001 +From: Jasmin Jessich <jasmin@anw.at> +Date: Sun, 11 Jun 2017 21:01:01 +0200 +Subject: [PATCH] Fixed compilation for vdr 2.3.7 + +--- a/PLUGINS/src/streamdev/server/connectionVTP.c ++++ b/PLUGINS/src/streamdev/server/connectionVTP.c +@@ -41,7 +41,9 @@ private: + enum eStates { Channel, Event, Title, Subtitle, Description, Vps, Content, Rating, + EndEvent, EndChannel, EndEPG }; + cConnectionVTP *m_Client; ++#if APIVERSNUM < 20300 + cSchedulesLock *m_SchedulesLock; ++#endif + const cSchedules *m_Schedules; + const cSchedule *m_Schedule; + const cEvent *m_Event; +@@ -210,7 +212,9 @@ cLSTEHandler::cLSTEHandler(cConnectionVTP *Client, const char *Option): + + cLSTEHandler::~cLSTEHandler() + { ++#if APIVERSNUM < 20300 + delete m_SchedulesLock; ++#endif + } + + bool cLSTEHandler::Next(bool &Last) +--- a/PLUGINS/src/streamdev/Makefile.orig ++++ b/PLUGINS/src/streamdev/Makefile +@@ -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)) + LIBDIR = $(call PKGCFG,libdir) + LOCDIR = $(call PKGCFG,locdir) + PLGCFG = $(call PKGCFG,plgcfg) +@@ -37,8 +37,6 @@ + -include $(PLGCFG) + + ### export all vars for sub-makes, using absolute paths +-LIBDIR := $(shell cd $(LIBDIR) >/dev/null 2>&1 && pwd) +-LOCDIR := $(shell cd $(LOCDIR) >/dev/null 2>&1 && pwd) + export + unexport PLUGIN |