From: Taner Tas <taner76@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Taner Tas <taner76@gmail.com>
Subject: [alpine-aports] [PATCH v3] unmaintained/vdr/APKBUILD -> testing/vdr: Takeover, update, improve and modernize package [Single Patch]
Date: Tue, 11 Jul 2017 07:16:02 +0000
Message-Id: <20170711071602.4371-1-taner76@gmail.com>
In-Reply-To: <20170710204508.10684-1-taner76@gmail.com>
References: <20170710204508.10684-1-taner76@gmail.com>
Precedence: list

---
 {unmaintained => testing}/vdr/APKBUILD          |  0
 {unmaintained => testing}/vdr/Make.config       |  0
 {unmaintained => testing}/vdr/musl-compat.patch |  0
 testing/vdr/softhddevice-musl.patch             | 19 ++++++++++
 testing/vdr/streamdev-for-2.3.7.patch           | 46 +++++++++++++++++++++++++
 5 files changed, 65 insertions(+)
 rename {unmaintained => testing}/vdr/APKBUILD (100%)
 rename {unmaintained => testing}/vdr/Make.config (100%)
 rename {unmaintained => testing}/vdr/musl-compat.patch (100%)
 create mode 100644 testing/vdr/softhddevice-musl.patch
 create mode 100644 testing/vdr/streamdev-for-2.3.7.patch

diff --git a/unmaintained/vdr/APKBUILD b/testing/vdr/APKBUILD
similarity index 100%
rename from unmaintained/vdr/APKBUILD
rename to testing/vdr/APKBUILD
diff --git a/unmaintained/vdr/Make.config b/testing/vdr/Make.config
similarity index 100%
rename from unmaintained/vdr/Make.config
rename to testing/vdr/Make.config
diff --git a/unmaintained/vdr/musl-compat.patch b/testing/vdr/musl-compat.patch
similarity index 100%
rename from unmaintained/vdr/musl-compat.patch
rename to testing/vdr/musl-compat.patch
diff --git a/testing/vdr/softhddevice-musl.patch b/testing/vdr/softhddevice-musl.patch
new file mode 100644
index 00000000..8564ef5e
--- /dev/null
+++ b/testing/vdr/softhddevice-musl.patch
@@ -0,0 +1,19 @@
+--- a/PLUGINS/src/softhddevice/audio.c
++++ b/PLUGINS/src/softhddevice/audio.c
+@@ -48,6 +48,7 @@
+ #include <inttypes.h>
+ #include <string.h>
+ #include <math.h>
++#include <sched.h>
+ 
+ #include <libintl.h>
+ #define _(str) gettext(str)		///< gettext shortcut
+@@ -1584,7 +1585,7 @@
+ 	if (err < 0) {			// underrun error
+ 	    return -1;
+ 	}
+-	pthread_yield();
++	sched_yield();
+ 	usleep(OssFragmentTime * 1000);	// let fill/empty the buffers
+ 	return 0;
+     }
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 00000000..0b9b9e10
--- /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
-- 
2.13.2



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---