[SCM] vdr-plugin-graphtft packaging repository branch, master, updated. debian/0.3.2_rc2+svn20090728.2153-5-9-g15cfd37
etobi
git at e-tobi.net
Sat Jun 2 19:25:50 UTC 2012
The following commit has been merged in the master branch:
commit be6a34a92e0318df693cdafd5fa6251980d2421b
Author: etobi <git at e-tobi.net>
Date: Sat Jun 2 21:00:03 2012 +0200
Updated patches
diff --git a/debian/patches/01_Makefile-fPIC-fix.patch b/debian/patches/01_Makefile-fPIC-fix.patch
index ab8d8c0..c6e434c 100644
--- a/debian/patches/01_Makefile-fPIC-fix.patch
+++ b/debian/patches/01_Makefile-fPIC-fix.patch
@@ -6,10 +6,11 @@
## DP: Adds -fPIC to Makefile to fix potential FTBFS.
@DPATCH@
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2~/Makefile vdr-plugin-graphtft-0.3.2~rc2/Makefile
---- vdr-plugin-graphtft-0.3.2~rc2~/Makefile 2008-12-15 22:56:58.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2/Makefile 2009-05-03 16:30:25.000000000 +0200
-@@ -123,8 +123,7 @@
+Index: vdr-plugin-graphtft/Makefile
+===================================================================
+--- vdr-plugin-graphtft.orig/Makefile 2012-06-02 20:51:04.000000000 +0200
++++ vdr-plugin-graphtft/Makefile 2012-06-02 20:55:45.000000000 +0200
+@@ -125,8 +125,7 @@
## compiler options:
@@ -19,7 +20,7 @@ diff -urNad vdr-plugin-graphtft-0.3.2~rc2~/Makefile vdr-plugin-graphtft-0.3.2~rc
### The directory environment:
-@@ -221,7 +220,7 @@
+@@ -234,7 +233,7 @@
DEFINES += -DPVRFB
endif
diff --git a/debian/patches/02_ffmpeg.patch b/debian/patches/02_ffmpeg.patch
index 37de14d..7daaac3 100644
--- a/debian/patches/02_ffmpeg.patch
+++ b/debian/patches/02_ffmpeg.patch
@@ -9,20 +9,22 @@
## DP: FFMPEG related fixes
@DPATCH@
---- ./Makefile
-+++ ./Makefile
-@@ -156,6 +156,7 @@
- -I./dfbrenderer -I./imlibrenderer/dmyrenderer $(GTOP_INC)
-
+Index: vdr-plugin-graphtft/Makefile
+===================================================================
+--- vdr-plugin-graphtft.orig/Makefile 2012-06-02 20:55:45.000000000 +0200
++++ vdr-plugin-graphtft/Makefile 2012-06-02 20:56:03.000000000 +0200
+@@ -155,6 +155,7 @@
+ -I./dfbrenderer -I./imlibrenderer/dmyrenderer $(GTOP_INC)
+
DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -D__STDC_CONSTANT_MACROS
-
+
ifdef HAVE_IMLIB
LIBS += `imlib2-config --libs`
-Index: imlibrenderer/dvbrenderer/mpeg2encoder.c
+Index: vdr-plugin-graphtft/imlibrenderer/dvbrenderer/mpeg2encoder.c
===================================================================
---- ./imlibrenderer/dvbrenderer/mpeg2encoder.c (Revision 24)
-+++ ./imlibrenderer/dvbrenderer/mpeg2encoder.c (Arbeitskopie)
+--- vdr-plugin-graphtft.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c 2012-06-02 20:51:33.000000000 +0200
++++ vdr-plugin-graphtft/imlibrenderer/dvbrenderer/mpeg2encoder.c 2012-06-02 20:56:03.000000000 +0200
@@ -23,10 +23,10 @@
extern "C"
@@ -36,25 +38,11 @@ Index: imlibrenderer/dvbrenderer/mpeg2encoder.c
#endif
}
-@@ -126,11 +126,11 @@
- int i;
- AVPicture avpsrc;
-
-- avpicture_fill(&avpsrc, buf, PIX_FMT_RGBA32, width, height);
-+ avpicture_fill(&avpsrc, buf, PIX_FMT_RGB32, width, height);
-
- #ifndef HAVE_SWSCALE
-
-- img_convert(&pic, PIX_FMT_YUV420P, &avpsrc, PIX_FMT_RGBA32, width, height);
-+ img_convert(&pic, PIX_FMT_YUV420P, &avpsrc, PIX_FMT_RGB32, width, height);
-
- #else
-
-Index: imlibrenderer/fbrenderer/fbrenderer.c
+Index: vdr-plugin-graphtft/imlibrenderer/fbrenderer/fbrenderer.c
===================================================================
---- ./imlibrenderer/fbrenderer/fbrenderer.c (Revision 24)
-+++ ./imlibrenderer/fbrenderer/fbrenderer.c (Arbeitskopie)
-@@ -32,7 +32,7 @@
+--- vdr-plugin-graphtft.orig/imlibrenderer/fbrenderer/fbrenderer.c 2012-06-02 20:51:33.000000000 +0200
++++ vdr-plugin-graphtft/imlibrenderer/fbrenderer/fbrenderer.c 2012-06-02 20:56:03.000000000 +0200
+@@ -33,7 +33,7 @@
#include <fbrenderer.h>
@@ -63,19 +51,10 @@ Index: imlibrenderer/fbrenderer/fbrenderer.c
#include <common.h>
#include <setup.h>
-@@ -194,7 +194,7 @@
-
- switch (fb_vinfo.bits_per_pixel)
- {
-- case 32: tell(4, "fbdevout.c: using 32 bit depth"); fb_type = PIX_FMT_RGBA32; break;
-+ case 32: tell(4, "fbdevout.c: using 32 bit depth"); fb_type = PIX_FMT_RGB32; break;
- case 24: tell(4, "fbdevout.c: using 24 bit depth"); fb_type = PIX_FMT_RGB24; break;
- case 16: tell(4, "fbdevout.c: using 16 bit depth"); fb_type = PIX_FMT_RGB565; break;
- default: tell(4, "fbdevout.c: color depth not supported -> %i bits per pixel",
-Index: imlibrenderer/fbrenderer/mpeg2decoder.c
+Index: vdr-plugin-graphtft/imlibrenderer/fbrenderer/mpeg2decoder.c
===================================================================
---- ./imlibrenderer/fbrenderer/mpeg2decoder.c (Revision 24)
-+++ ./imlibrenderer/fbrenderer/mpeg2decoder.c (Arbeitskopie)
+--- vdr-plugin-graphtft.orig/imlibrenderer/fbrenderer/mpeg2decoder.c 2012-06-02 20:51:04.000000000 +0200
++++ vdr-plugin-graphtft/imlibrenderer/fbrenderer/mpeg2decoder.c 2012-06-02 20:56:03.000000000 +0200
@@ -24,7 +24,7 @@
extern "C"
{
@@ -85,10 +64,10 @@ Index: imlibrenderer/fbrenderer/mpeg2decoder.c
# endif
}
-Index: imlibrenderer/fbrenderer/mpeg2decoder.h
+Index: vdr-plugin-graphtft/imlibrenderer/fbrenderer/mpeg2decoder.h
===================================================================
---- ./imlibrenderer/fbrenderer/mpeg2decoder.h (Revision 24)
-+++ ./imlibrenderer/fbrenderer/mpeg2decoder.h (Arbeitskopie)
+--- vdr-plugin-graphtft.orig/imlibrenderer/fbrenderer/mpeg2decoder.h 2012-06-02 20:51:04.000000000 +0200
++++ vdr-plugin-graphtft/imlibrenderer/fbrenderer/mpeg2decoder.h 2012-06-02 20:56:03.000000000 +0200
@@ -19,7 +19,7 @@
extern "C"
diff --git a/debian/patches/03_gcc44.patch b/debian/patches/03_gcc44.patch
index 6818fa7..572efaf 100644
--- a/debian/patches/03_gcc44.patch
+++ b/debian/patches/03_gcc44.patch
@@ -5,32 +5,10 @@
## DP: patch for graphtft to compile with gcc-4.4.
@DPATCH@
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/common.h vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/common.h
---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/common.h 2008-12-17 22:56:39.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/common.h 2009-10-06 17:26:38.906841958 +0200
-@@ -17,6 +17,7 @@
-
- #include <string>
- #include <iconv.h>
-+#include <stdint.h>
-
- using std::string;
-
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/display.c vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/display.c
---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/display.c 2009-02-15 16:06:59.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/display.c 2009-10-06 17:28:39.157961000 +0200
-@@ -158,7 +158,7 @@
-
- int cGraphTFTDisplay::Init(const char* dev, const char* cfgDir, int port)
- {
-- char* pos = 0;
-+ const char* pos = 0;
- int devnum = na;
-
- #ifdef HAVE_DFB
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/scan.h vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/scan.h
---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/scan.h 2008-12-17 22:56:39.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/scan.h 2009-10-06 17:29:15.147022353 +0200
+Index: vdr-plugin-graphtft/scan.h
+===================================================================
+--- vdr-plugin-graphtft.orig/scan.h 2012-06-02 20:51:33.000000000 +0200
++++ vdr-plugin-graphtft/scan.h 2012-06-02 20:58:13.000000000 +0200
@@ -12,6 +12,7 @@
// Includes
//***************************************************************************
@@ -38,16 +16,4 @@ diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/scan.h vdr-plugin-gr
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/theme.c vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/theme.c
---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153~/theme.c 2009-02-15 16:06:59.000000000 +0100
-+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/theme.c 2009-10-06 17:29:55.986746000 +0200
-@@ -112,7 +112,7 @@
- {
- s++;
-
-- if (!(e = strchr(s, '}')))
-+ if (!(e = (char *)strchr(s, '}')))
- {
- tell(0, "Parsing of [%s] failed, missing bracket '}'", expression);
- return fail;
+ #include <stdio.h>
--
vdr-plugin-graphtft packaging repository
More information about the pkg-vdr-dvb-changes
mailing list