Hi,
two patches I use attached,
Joerg
Am 15.03.2013 16:38, schrieb Carsten Koch:
Hi,
On 03/16/11 20:29, Reinhard Nissl wrote:
I'm pleased to announce maintenance release 0.9.4.
is there something newer available?
In partcular, something that works with VDR 1.7.40?
With VDR 1.7.40 (under OpenSUSE 12.3) I get:
*** Plugin xine:
WARNING: plugin xine is using an old Makefile!
g++ -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses -fPIC
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -c -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"xine"'
-DFIFO_DIR=\"/tmp/vdr-xine\" -DVERIFY_BITMAP_DIRTY=0 `pkg-config
--cflags libxine` -I/home/cko/vdr-1.7.40/include xineDevice.c
xineDevice.c: In member function 'virtual void
PluginXine::cXineDevice::StillPicture(const uchar*, int)':
xineDevice.c:1203:36: error: 'class cPatPmtParser' has no member named
'PmtPid'
xineDevice.c:1403:1: warning: narrowing conversion of
'(vdr172::cRemux::IsFrameH264(Data, Length) ? 10 : 183)' from 'int' to
'uchar {aka unsigned char}' inside { } is ill-formed in C++11 [-Wnarrowing]
make[1]: *** [xineDevice.o] Error 1
You can
find it on my homepage as usual:
http://home.vr-web.de/~rnissl
Not any more.
http://home.vr-web.de in general and http://home.vr-web.de/~rnissl
seems to be gone.
Cheers,
Carsten.
_______________________________________________
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
diff -Naur xine-0.9.4_orig/xineDevice.c xine-0.9.4/xineDevice.c
--- xine-0.9.4_orig/xineDevice.c 2011-02-27 19:14:19.000000000 +0100
+++ xine-0.9.4/xineDevice.c 2012-12-22 18:42:36.389557075 +0100
@@ -1200,7 +1200,11 @@
int pid = TsPid(Data);
if (pid == 0)
patPmtParser.ParsePat(Data, TS_SIZE);
+#if APIVERSNUM >= 10732
+ else if (patPmtParser.IsPmtPid(pid))
+#else
else if (pid == patPmtParser.PmtPid())
+#endif
patPmtParser.ParsePmt(Data, TS_SIZE);
else if (pid == patPmtParser.Vpid())
{
diff -Nru b/Makefile a/Makefile
--- b/Makefile 2011-03-15 23:22:03.000000000 +0100
+++ a/Makefile 2012-03-27 23:28:00.684231800 +0200
@@ -97,7 +97,7 @@
### The main target:
-all: libvdr-$(PLUGIN).so i18n xineplayer
+all: libvdr-$(PLUGIN).so xineplayer
### Implicit rules:
diff -Nru b/xine.c a/xine.c
--- b/xine.c 2011-01-18 14:45:04.000000000 +0100
+++ a/xine.c 2012-03-27 23:29:28.338233019 +0200
@@ -13,7 +13,6 @@
#include "xineDevice.h"
#include "xineSettings.h"
#include "xineSetupPage.h"
-#include "xineI18n.h"
_______________________________________________
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
