ports/165057: multimedia/k9copy-kd4: libxine 1.2.x patches

[Juergen Lock]

>Number:         165057
>Category:       ports
>Synopsis:       multimedia/k9copy-kd4: libxine 1.2.x patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 12 20:30:14 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Juergen Lock
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
me?  organized??
>Environment:
System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #5 r227907: Wed Nov 23 21:55:50 UTC 2011 simon at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


>Description:
	Hi!

	I maintain the multimedia/libxine port which I want to update
	to 1.2.1 and I found k9copy-kd4 needs patches to build with
	it.  The libxine update is here:

	http://people.freebsd.org/~nox/tmp/libxine-1.2.1.patch

	The rest of the patches for ports depending on libxine which
	I already have approval for is here:

	http://people.freebsd.org/~nox/tmp/libxine-1.2.1-ports-001.patch

	Are the patches ok, can I commit them?  (A PORTREVISION bump
	is also needed.)

	Thanx! :)
		Juergen

>How-To-Repeat:
	Apply http://people.freebsd.org/~nox/tmp/libxine-1.2.1.patch
	and then try to build k9copy-kde4.

>Fix:

Index: files/patch-src-xine-k9xineplayer.cpp
@@ -0,0 +1,35 @@
+--- src/xine/k9xineplayer.cpp.orig
++++ src/xine/k9xineplayer.cpp
+@@ -260,8 +260,10 @@ void k9xinePlayer::init(WId _wid) {
+     event_queue = xine_event_new_queue(stream);
+     xine_event_create_listener_thread(event_queue, event_listener, this);
+ 
+-    xine_gui_send_vo_data(stream, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid);
+-    xine_gui_send_vo_data(stream, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1);
++    // xine_gui_send_vo_data(stream, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid);
++    // xine_gui_send_vo_data(stream, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1);
++    xine_port_send_gui_data(vo_port, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid);
++    xine_port_send_gui_data(vo_port, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1);
+     m_execute=true;
+ 
+ }
+@@ -284,7 +286,8 @@ void k9xinePlayer::quit() {
+ void k9xinePlayer::update() {
+     if (stream && !running ) {
+         if (m_mutex.tryLock()) {
+-           xine_gui_send_vo_data(stream, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid);
++           // xine_gui_send_vo_data(stream, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid);
++           xine_port_send_gui_data(vo_port, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid);
+            m_mutex.unlock();
+         }
+     }
+@@ -317,7 +320,8 @@ void k9xineThread::run() {
+         case Expose:
+             if (xevent.xexpose.count != 0)
+                 break;
+-            xine_gui_send_vo_data(m_player->getStream(), XINE_GUI_SEND_EXPOSE_EVENT, &xevent);
++            // xine_gui_send_vo_data(m_player->getStream(), XINE_GUI_SEND_EXPOSE_EVENT, &xevent);
++            xine_port_send_gui_data(m_player->getPort(), XINE_GUI_SEND_EXPOSE_EVENT, &xevent);
+             break;
+         }
+     }
Index: files/patch-src-xine-k9xineplayer.h
@@ -0,0 +1,10 @@
+--- src/xine/k9xineplayer.h.orig
++++ src/xine/k9xineplayer.h
+@@ -68,6 +68,7 @@ public:
+     int positionAbs() {return m_posabs ;}
+     int length() {return m_length;}
+     xine_stream_t *getStream() { return stream;}
++    xine_video_port_t *getPort() { return vo_port;}
+     bool isRunning() {return running;}
+     WId wid() const { return m_wid;}
+     QString title() const {return m_title;}
>Release-Note:
>Audit-Trail:
>Unformatted: