rpms/vdr-softhddevice/devel arm.patch, NONE, 1.1 exit-crash.patch, NONE, 1.1 vdr-softhddevice.spec, 1.24, 1.25

[Martin Gansser]

Author: martinkg

Update of /cvs/free/rpms/vdr-softhddevice/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26218/devel

Modified Files:
	vdr-softhddevice.spec 
Added Files:
	arm.patch exit-crash.patch 
Log Message:


arm.patch:
 softhddev.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE arm.patch ---
--- softhddev.c.orig	2015-06-29 09:54:49.192694598 +0200
+++ softhddev.c	2015-06-29 09:55:25.527691030 +0200
@@ -92,7 +92,7 @@
 static signed char ConfigStartSuspended;	///< flag to start in suspend mode
 static char ConfigFullscreen;		///< fullscreen modus
 static const char *X11ServerArguments;	///< default command arguments
-static char ConfigStillDecoder;		///< hw/sw decoder for still picture
+static signed char ConfigStillDecoder;    ///< hw/sw decoder for still picture
 
 static pthread_mutex_t SuspendLockMutex;	///< suspend lock mutex
 

exit-crash.patch:
 video.c |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

--- NEW FILE exit-crash.patch ---
diff --git a/video.c b/video.c
index 56cae36..456a9ac 100644
--- a/video.c
+++ b/video.c
@@ -9458,6 +9458,41 @@ static void NoopReleaseSurface(
 }
 
 ///
+///	Set noop decoder video clock.
+///
+///	Can be called while exiting.
+///
+///	@param decoder	noop hardware decoder
+///	@param pts	audio presentation timestamp
+///
+void NoopSetClock(__attribute__ ((unused)) VideoHwDecoder * decoder,
+    __attribute__ ((unused)) int64_t pts)
+{
+}
+
+///
+///	Set noop decoder closing stream flag.
+///
+///	Can be called while exiting.
+///
+///	@param decoder	noop hw decoder
+///
+static void NoopSetClosing(__attribute__ ((unused)) VideoHwDecoder * decoder)
+{
+}
+
+///
+///	Reset start of frame counter.
+///
+///	Can be called while exiting.
+///
+///	@param decoder	noop decoder
+///
+static void NoopResetStart(__attribute__ ((unused)) VdpauDecoder * decoder)
+{
+}
+
+///
 ///	Set noop background color.
 ///
 ///	@param rgba	32 bit RGBA color.
@@ -9564,10 +9599,14 @@ static const VideoModule NoopModule = {
 	    const AVCodecContext *, const AVFrame *))NoopSyncRenderFrame,
     .GetHwAccelContext = (void *(*const)(VideoHwDecoder *))
 	DummyGetHwAccelContext,
+#endif
     .SetClock = (void (*const) (VideoHwDecoder *, int64_t))NoopSetClock,
+#if 0
     .GetClock = (int64_t(*const) (const VideoHwDecoder *))NoopGetClock,
+#endif
     .SetClosing = (void (*const) (const VideoHwDecoder *))NoopSetClosing,
     .ResetStart = (void (*const) (const VideoHwDecoder *))NoopResetStart,
+#if 0
     .SetTrickSpeed =
 	(void (*const) (const VideoHwDecoder *, int))NoopSetTrickSpeed,
     .GrabOutput = NoopGrabOutputSurface,


Index: vdr-softhddevice.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/vdr-softhddevice.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vdr-softhddevice.spec	19 Jun 2015 18:24:24 -0000	1.24
+++ vdr-softhddevice.spec	29 Jun 2015 18:36:32 -0000	1.25
@@ -4,7 +4,7 @@
 
 Name:           vdr-softhddevice
 Version:        0.6.0
-Release:        27.%{gitdate}git%{shortcommit}%{?dist}
+Release:        28.%{gitdate}git%{shortcommit}%{?dist}
 Summary:        A software and GPU emulated HD output device plugin for VDR
 
 License:        AGPLv3
@@ -12,6 +12,10 @@
 Source0:        http://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git/snapshot/vdr-plugin-softhddevice-%{commit}.tar.bz2
 # Configuration files for plugin parameters. These are Fedora specific and not in upstream.
 Source1:        %{name}.conf
+# http://projects.vdr-developer.org/issues/1417
+Patch0:         exit-crash.patch
+# http://projects.vdr-developer.org/issues/1916
+Patch1:         arm.patch
 
 BuildRequires:  vdr-devel >= 1.7.22
 BuildRequires:  gettext
@@ -25,6 +29,7 @@
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  mesa-libGL-devel
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
+Requires:       xorg-x11-server-Xorg
 
 %description
 A software and GPU emulated HD output device plugin for VDR.
@@ -48,6 +53,8 @@
 
 %prep
 %setup -qn vdr-plugin-softhddevice-%{commit}
+%patch0 -p1
+%patch1 -p0
 
 # remove .git files and Gentoo files
 rm -f .indent.pro .gitignore .gitattributes
@@ -75,7 +82,12 @@
 %license AGPL-3.0.txt
 
 %changelog
-* Fri Jun 19 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.6.0-27.20150619gitf0d31ad
+* Mon Jun 29 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.6.0-28.20150619git396d5fa
+- added R xorg-x11-server-Xorg
+- added exit-crash.patch
+- added arm.patch
+
+* Fri Jun 19 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.6.0-27.20150619git396d5fa
 - update for new git snapshot
 
 * Wed Apr 22 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.6.0-26.20150422gitf0d31ad