r8374 - in /vdr/vdr-plugin-xineliboutput/trunk/debian: changelog control patches/ patches/00list patches/01_fix_letterbox_osd_close_crash.dpatch rules

[tschmidt at users.alioth.debian.org]

Author: tschmidt
Date: Fri Jan 29 08:14:32 2010
New Revision: 8374

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8374
Log:
* Added 01_fix_letterbox_osd_close_crash.dpatch to fix a crash of vdr-
  sxfe when closing the osd while viewing letterbox video which is
  auto-cropped to fill the screen
* Re-enabled dpatch in debian/rules
* Build-Depend on dpatch

Added:
    vdr/vdr-plugin-xineliboutput/trunk/debian/patches/
    vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
    vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_fix_letterbox_osd_close_crash.dpatch   (with props)
Modified:
    vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
    vdr/vdr-plugin-xineliboutput/trunk/debian/control
    vdr/vdr-plugin-xineliboutput/trunk/debian/rules

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/changelog?rev=8374&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog Fri Jan 29 08:14:32 2010
@@ -1,3 +1,13 @@
+vdr-plugin-xineliboutput (1.0.4+cvs20100128.1850-2) UNRELEASED; urgency=low
+
+  * Added 01_fix_letterbox_osd_close_crash.dpatch to fix a crash of vdr-
+    sxfe when closing the osd while viewing letterbox video which is
+    auto-cropped to fill the screen
+  * Re-enabled dpatch in debian/rules
+  * Build-Depend on dpatch
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Fri, 29 Jan 2010 09:10:24 +0100
+
 vdr-plugin-xineliboutput (1.0.4+cvs20100128.1850-1) unstable; urgency=low
 
   * New Upstream Snapshot

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/control?rev=8374&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/control (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/control Fri Jan 29 08:14:32 2010
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), gettext,
   libxine-dev (>= 1.1.12), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev,
   libextractor-dev, sharutils, libdbus-glib-1-dev, txt2man,
-  libmagick++9-dev | libmagick++-dev, libvdpau-dev
+  libmagick++9-dev | libmagick++-dev, libvdpau-dev, dpatch
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list?rev=8374&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list Fri Jan 29 08:14:32 2010
@@ -1,0 +1,1 @@
+01_fix_letterbox_osd_close_crash

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_fix_letterbox_osd_close_crash.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_fix_letterbox_osd_close_crash.dpatch?rev=8374&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_fix_letterbox_osd_close_crash.dpatch (added)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_fix_letterbox_osd_close_crash.dpatch Fri Jan 29 08:14:32 2010
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_letterbox_osd_close_crash.dpatch by Thomas Schmidt <tschmidt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes a crash of vdr-sxfe when closing the osd while viewing letterbox-video which 
+## DP: is cropped to fill the screen on widescreen monitors.
+## DP:
+## DP: This patch basically reverts the commit 0a607d57ef045583c4664002ec0df36aa134590f of
+## DP: the git repository from http://projects.vdr-developer.org/git/?p=xineliboutput.git
+
+ at DPATCH@
+diff -urNad vdr-plugin-xineliboutput-1.0.4+cvs20100128.1850~/xine_post_autocrop.c vdr-plugin-xineliboutput-1.0.4+cvs20100128.1850/xine_post_autocrop.c
+--- vdr-plugin-xineliboutput-1.0.4+cvs20100128.1850~/xine_post_autocrop.c	2010-01-19 01:09:52.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.4+cvs20100128.1850/xine_post_autocrop.c	2010-01-29 08:57:22.571053316 +0100
+@@ -1454,11 +1454,6 @@
+   pthread_mutex_unlock(&this->crop_lock);
+ 
+   if(cropping_active && crop_total>10) {
+-#ifdef VO_CAP_CUSTOM_EXTENT_OVERLAY
+-    /* Do not move overlay if video_out has independent video and OSD resolutions */
+-    if (event->object.overlay->extent_width  <= 0 ||
+-        event->object.overlay->extent_height <= 0)
+-#endif
+     if (event->event_type == OVERLAY_EVENT_SHOW) {
+       switch (event->object.object_type) {
+       case 0:

Propchange: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_fix_letterbox_osd_close_crash.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/rules?rev=8374&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules Fri Jan 29 08:14:32 2010
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY