ports/132267: multimedia/kaffeine DVB-T is broken, fix included

[Jan Henrik Sylvester]

>Number:         132267
>Category:       ports
>Synopsis:       multimedia/kaffeine DVB-T is broken, fix included
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 02 20:00:10 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jan Henrik Sylvester
>Release:        7.1-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
Raaf confirmed that DVB-T is broken for some time last February: http://lists.freebsd.org/pipermail/freebsd-multimedia/2008-February/008092.html

Now Tim Borgeaud introduced a new DVB-T device: http://lists.freebsd.org/pipermail/freebsd-multimedia/2009-March/009816.html

There he put a new version of patch-dvbsection.cpp that fixes the problem for the new DVB device.

I can confirm that the new patch also fixes the problem for the Freecom device that is covered by Raaf's driver. Thus, the new patch should be included with the port.
>How-To-Repeat:
- attach a Freecom DVB-T device with Raaf's driver
- try to scan DVB-T channels
- observe Kaffeine crashing
>Fix:
The patch by Tim Borgeaud works. It is from: http://www.tangobravo.co.uk/v4l-compat/

Patch attached with submission follows:

diff -u multimedia/kaffeine/files/patch-dvbsection.cpp.orig multimedia/kaffeine/files/patch-dvbsection.cpp
--- multimedia/kaffeine/files/patch-dvbsection.cpp.orig	2008-01-31 15:47:31.000000000 +0100
+++ multimedia/kaffeine/files/patch-dvbsection.cpp	2009-03-02 20:27:11.000000000 +0100
@@ -1,6 +1,6 @@
 --- kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp.orig	2008-01-30 22:22:36.000000000 +0100
 +++ kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp	2008-01-30 22:26:23.000000000 +0100
-@@ -134,7 +134,8 @@
+@@ -134,13 +134,14 @@
  bool KaffeineDVBsection::doIconv( QCString &s, QCString table, char *buffer, int buflen )
  {
  	size_t inSize, outSize=buflen;
@@ -10,6 +10,13 @@
  	iconv_t cd;
  
  	inSize = s.length();
+ 	if ( inSize<1 )
+ 		return false;
+-	cd = iconv_open( "UTF8", table );
++	cd = iconv_open( "UTF-8", table );
+ 	inBuf = s.data();
+ 	outBuf = buffer;
+ 	outBuf[0] = 0;
 @@ -230,7 +231,8 @@
  	char c[4];
  	QString s;


>Release-Note:
>Audit-Trail:
>Unformatted: