mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-07 22:37:12 +02:00
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
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
|