rpms/vdr/devel vdr-1.6.0-dxr3-subtitles.patch, NONE, 1.1.2.1 vdr.spec, 1.23.2.6, 1.23.2.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3883

Modified Files:
      Tag: vdr-1_6-test
	vdr.spec 
Added Files:
      Tag: vdr-1_6-test
	vdr-1.6.0-dxr3-subtitles.patch 
Log Message:
Apply Luca Olivetti's DXR3 subtitle compatibility patch.

vdr-1.6.0-dxr3-subtitles.patch:

--- NEW FILE vdr-1.6.0-dxr3-subtitles.patch ---
Hack to improve subtitles experience with VDR 1.6.0 and DXR3 (Luca Olivetti).

--- dvbsubtitle.c.orig	2008-03-06 21:38:45.698657000 +0100
+++ dvbsubtitle.c	2008-03-06 21:41:58.308657000 +0100
@@ -983,8 +983,15 @@
      return;
   tArea *Areas = Page->GetAreas();
   int NumAreas = Page->regions.Count();
-  int Bpp = 8;
+  //int Bpp = 8;
   bool Reduced = false;
+  for (int i = 0; i < NumAreas; i++) {
+    if (Areas[i].bpp > 2) {
+      Areas[i].bpp = 2;
+      Reduced = true;
+    }
+  }
+  /*
   while (osd->CanHandleAreas(Areas, NumAreas) != oeOk) {
         int HalfBpp = Bpp / 2;
         if (HalfBpp >= 2) {
@@ -999,6 +1006,7 @@
         else
            return; // unable to draw bitmaps
         }
+  */      
   if (Reduced) {
      for (int i = 0; i < NumAreas; i++) {
          cSubtitleRegion *sr = Page->regions.Get(i);


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.23.2.6
retrieving revision 1.23.2.7
diff -u -r1.23.2.6 -r1.23.2.7
--- vdr.spec	7 Apr 2008 14:59:14 -0000	1.23.2.6
+++ vdr.spec	7 Apr 2008 15:01:00 -0000	1.23.2.7
@@ -76,6 +76,7 @@
 Patch13:        %{name}-1.5.17-progressbar-support-0.0.1.diff
 Patch14:        %{name}-1.6.0-includes+pkgconfig.patch
 Patch15:        %{name}-1.6.0-fedora-pkgconfig.patch
+Patch16:        %{name}-1.6.0-dxr3-subtitles.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -187,6 +188,7 @@
 %patch13 -p1
 %patch14 -p0
 %patch15 -p0
+%patch16 -p0
 
 for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -486,6 +488,7 @@
 %changelog
 * Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi>
 - Apply "unofficial" timercmd patch from HoochVDR.
+- Apply Luca Olivetti's DXR3 subtitle compatibility patch.
 
 * Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.4
 - Obsolete vdr-subtitles.