rpms/vdr-skindesigner/devel c0ab674dfba4f6b8dd62bd5b7b7b8a254ae59eab.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 sources, 1.43, 1.44 vdr-skindesigner.spec, 1.46, 1.47

[Martin Gansser]

Author: martinkg

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

Modified Files:
	.cvsignore sources vdr-skindesigner.spec 
Added Files:
	c0ab674dfba4f6b8dd62bd5b7b7b8a254ae59eab.patch 
Log Message:


c0ab674dfba4f6b8dd62bd5b7b7b8a254ae59eab.patch:
 HISTORY                        |    1 +
 displaymenu.h                  |    7 ++++---
 views/displayaudiotracksview.c |    1 +
 views/displaymenulistview.c    |    1 +
 views/displaymenurootview.c    |    1 +
 views/displaymenuview.c        |    2 +-
 6 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE c0ab674dfba4f6b8dd62bd5b7b7b8a254ae59eab.patch ---
>From c0ab674dfba4f6b8dd62bd5b7b7b8a254ae59eab Mon Sep 17 00:00:00 2001
From: louis
Date: Sun, 09 Aug 2015 07:33:36 +0000
Subject: fixed compiling fur unpatched VDR

---
diff --git a/HISTORY b/HISTORY
index e8811ba..86fc82a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -423,3 +423,4 @@ Version 0.6.3
 
 Version 0.7.0
 
+- fixed compiling fur unpatched VDR
diff --git a/displaymenu.h b/displaymenu.h
index 5aee6d1..6600a9a 100644
--- a/displaymenu.h
+++ b/displaymenu.h
@@ -1,8 +1,5 @@
 #ifndef __DISPLAYMENU_H
 #define __DISPLAYMENU_H
-#include "libskindesignerapi/skindesignerapi.h"
-#include "libtemplate/template.h"
-#include "views/displaymenurootview.h"
 
 #if defined(APIVERSNUM) && APIVERSNUM < 20301
 #ifndef MENU_ORIENTATION_DEFINED
@@ -13,6 +10,10 @@ enum eMenuOrientation {
 #endif
 #endif
 
+#include "libskindesignerapi/skindesignerapi.h"
+#include "libtemplate/template.h"
+#include "views/displaymenurootview.h"
+
 enum eViewState {
     vsInit,
     vsMenuInit,
diff --git a/views/displayaudiotracksview.c b/views/displayaudiotracksview.c
index f2f6a32..a24d331 100644
--- a/views/displayaudiotracksview.c
+++ b/views/displayaudiotracksview.c
@@ -1,5 +1,6 @@
 #define __STL_CONFIG_H
 #include <vdr/menu.h>
+#include "../displaymenu.h"
 #include "displayaudiotracksview.h"
 
 cDisplayAudiotracksView::cDisplayAudiotracksView(int numTracks, cTemplateView *tmplView) : cView(tmplView) {
diff --git a/views/displaymenulistview.c b/views/displaymenulistview.c
index b96bdc2..7cc08c9 100644
--- a/views/displaymenulistview.c
+++ b/views/displaymenulistview.c
@@ -1,4 +1,5 @@
 #include <vdr/menu.h>
+#include "../displaymenu.h"
 #include "displaymenulistview.h"
 
 
diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c
index 2d4e457..76d8b86 100644
--- a/views/displaymenurootview.c
+++ b/views/displaymenurootview.c
@@ -1,5 +1,6 @@
 #define __STL_CONFIG_H
 #include <vdr/menu.h>
+#include "../displaymenu.h"
 #include "displaymenurootview.h"
 #include "displayviewelements.h"
 #include "../config.h"
diff --git a/views/displaymenuview.c b/views/displaymenuview.c
index 53ab558..d5abe7d 100644
--- a/views/displaymenuview.c
+++ b/views/displaymenuview.c
@@ -1,6 +1,7 @@
 #define __STL_CONFIG_H
 #include <vdr/menu.h>
 #include <vdr/videodir.h>
+#include "../displaymenu.h"
 #include "displaymenuview.h"
 #include "displayviewelements.h"
 #include "../config.h"
--
cgit v0.9.0.2-40-g7c79


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	30 Jul 2015 17:48:09 -0000	1.42
+++ .cvsignore	9 Aug 2015 08:42:19 -0000	1.43
@@ -1 +1 @@
-vdr-plugin-skindesigner-0.6.3.tar.bz2
+vdr-plugin-skindesigner-0.7.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	30 Jul 2015 17:48:09 -0000	1.43
+++ sources	9 Aug 2015 08:42:19 -0000	1.44
@@ -1 +1 @@
-36103d7483fc01d8290c4efb66369787  vdr-plugin-skindesigner-0.6.3.tar.bz2
+77995cfb9a817a5dcbc77b446bcbb861  vdr-plugin-skindesigner-0.7.0.tar.bz2


Index: vdr-skindesigner.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/vdr-skindesigner.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- vdr-skindesigner.spec	30 Jul 2015 17:48:09 -0000	1.46
+++ vdr-skindesigner.spec	9 Aug 2015 08:42:19 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           vdr-skindesigner
-Version:        0.6.3
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        A VDR skinning engine that displays XML based Skins
 
@@ -9,6 +9,8 @@
 Source0:        http://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git/snapshot/vdr-plugin-skindesigner-%{version}.tar.bz2
 # Configuration files for plugin parameters. These are Fedora specific and not in upstream.
 Source1:        %{name}.conf
+# fixed compiling for unpatched VDR
+Patch0:         c0ab674dfba4f6b8dd62bd5b7b7b8a254ae59eab.patch
 
 BuildRequires:  vdr-devel >= 2.0.0
 BuildRequires:  gettext
@@ -62,6 +64,8 @@
 sed -i -e 's|PCDIR  ?= $(PREFIX)/lib/pkgconfig|PCDIR  ?= %{_libdir}/pkgconfig|g' libskindesignerapi/Makefile
 chmod 755 scripts/temperatures.g2v
 
+%patch0 -p1
+
 %build
 make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
 
@@ -113,6 +117,10 @@
 %{_includedir}/libskindesignerapi/
 
 %changelog
+* Sun Aug 09 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.7.0-1
+- Update to 0.7.0
+- added Patch that fixed compiling for unpatched VDR
+
 * Thu Jul 30 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.6.3-1
 - Update to 0.6.3