Previous wasn't complete (cost of cutting corners when build and commit

hosts aren't the same...)

More xine fixes; the ones to cope with xine_event_t member reordering
are obvious. The others are cribbed from the kdemultimedia3 xine patch
and I have no idea if they'll actually work.

Package now builds, at least for me.

2 files changed, 114 insertions, 5 deletions

diff --git a/multimedia/kmplayer-kde3/distinfo b/multimedia/kmplayer-kde3/distinfo
index f51510def9f..7d51fe059d2 100644
--- a/multimedia/kmplayer-kde3/distinfo
+++ b/multimedia/kmplayer-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 20:38:37 dholland Exp $
+$NetBSD: distinfo,v 1.3 2012/04/15 22:18:38 dholland Exp $
 
 SHA1 (kmplayer-0.10.0c.tar.bz2) = 52bfa017e1360fdc60c10445090c867039da4830
 RMD160 (kmplayer-0.10.0c.tar.bz2) = 4f7f291733f9a73f5838e028af5e5268d1a0ee10
@@ -6,4 +6,4 @@ Size (kmplayer-0.10.0c.tar.bz2) = 1047729 bytes
 SHA1 (patch-aa) = 7e0c7d32ded98070438532c6365cafc0ef8bfd1f
 SHA1 (patch-ab) = 6d0635e5d9ea62de7363f761493d80d9d9734857
 SHA1 (patch-ac) = d91f1a27a0768e19c856079328db54d563e96128
-SHA1 (patch-src_xineplayer_cpp) = 0b8eb794c5c0868b38e97e2ad7ebc7a76297c778
+SHA1 (patch-src_xineplayer_cpp) = 2676560e14461c15d8662450eb15cbaa4af4ffe2
diff --git a/multimedia/kmplayer-kde3/patches/patch-src_xineplayer_cpp b/multimedia/kmplayer-kde3/patches/patch-src_xineplayer_cpp
index a5d64d1da71..044855d64e4 100644
--- a/multimedia/kmplayer-kde3/patches/patch-src_xineplayer_cpp
+++ b/multimedia/kmplayer-kde3/patches/patch-src_xineplayer_cpp
@@ -1,8 +1,10 @@
-$NetBSD: patch-src_xineplayer_cpp,v 1.1 2012/04/15 20:38:37 dholland Exp $
+$NetBSD: patch-src_xineplayer_cpp,v 1.2 2012/04/15 22:18:38 dholland Exp $
 
-Fix build with newer xine-lib.
+Fix build with xine-lib 1.2.x.
 
---- src/xineplayer.cpp~	2007-12-21 21:51:44.000000000 +0000
+The vo_port bits are cribbed from the kdemultimedia3 patch.
+
+--- src/xineplayer.cpp.orig	2007-12-21 21:51:44.000000000 +0000
 +++ src/xineplayer.cpp
 @@ -528,7 +528,7 @@ void KXinePlayer::play (int repeat) {
      xine_event_create_listener_thread (event_queue, event_listener, NULL);
@@ -13,3 +15,110 @@ Fix build with newer xine-lib.
          running = 1;
          for (int i = 0; i < nr; i++) {
              QString m (mrls[i]);
+@@ -549,7 +549,7 @@ void KXinePlayer::play (int repeat) {
+         return;
+     }
+ 
+-    xine_gui_send_vo_data(stream, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1);
++    xine_port_send_gui_data(vo_port, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1);
+ 
+     running = 1;
+     QString mrlsetup = mrl;
+@@ -860,8 +860,9 @@ protected:
+                                 mutex.lock ();
+                                 if (stream) {
+                                     xine_event_t xine_event =  { 
++				        stream, 0L, 0,
+                                         XINE_EVENT_INPUT_PREVIOUS,
+-                                        stream, 0L, 0, { 0, 0 }
++                                        { 0, 0 }
+                                     };
+                                     xine_event_send (stream, &xine_event);
+                                 } 
+@@ -872,8 +873,9 @@ protected:
+                                 mutex.lock ();
+                                 if (stream) {
+                                     xine_event_t xine_event =  { 
++				        stream, 0L, 0,
+                                         XINE_EVENT_INPUT_NEXT,
+-                                        stream, 0L, 0, { 0, 0 }
++                                        { 0, 0 }
+                                     };
+                                     xine_event_send (stream, &xine_event);
+                                 } 
+@@ -884,8 +886,9 @@ protected:
+                                 mutex.lock ();
+                                 if (stream) {
+                                     xine_event_t xine_event =  { 
++				        stream, 0L, 0,
+                                         XINE_EVENT_INPUT_MENU1,
+-                                        stream, 0L, 0, { 0, 0 }
++                                        { 0, 0 }
+                                     };
+                                     xine_event_send (stream, &xine_event);
+                                 } 
+@@ -896,8 +899,9 @@ protected:
+                                 mutex.lock ();
+                                 if (stream) {
+                                     xine_event_t xine_event =  { 
++				        stream, 0L, 0,
+                                         XINE_EVENT_INPUT_MENU3,
+-                                        stream, 0L, 0, { 0, 0 }
++                                        { 0, 0 }
+                                     };
+                                     xine_event_send (stream, &xine_event);
+                                 } 
+@@ -939,7 +943,7 @@ protected:
+                     if(xevent.xexpose.count != 0 || !stream || xevent.xexpose.window != wid)
+                         break;
+                     mutex.lock ();
+-                    xine_gui_send_vo_data(stream, XINE_GUI_SEND_EXPOSE_EVENT, &xevent);
++                    xine_port_send_gui_data(vo_port, XINE_GUI_SEND_EXPOSE_EVENT, &xevent);
+                     mutex.unlock ();
+                     break;
+ 
+@@ -967,15 +971,15 @@ protected:
+                     if (stream) {
+                         XMotionEvent *mev = (XMotionEvent *) &xevent;
+                         x11_rectangle_t rect = { mev->x, mev->y, 0, 0 };
+-                        if (xine_gui_send_vo_data (stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1)
++                        if (xine_port_send_gui_data (vo_port, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1)
+                             break;
+                         xine_input_data_t data;
+                         data.x = rect.x;
+                         data.y = rect.y;
+                         data.button = 0;
+                         xine_event_t xine_event =  { 
+-                                XINE_EVENT_INPUT_MOUSE_MOVE,
+                                 stream, &data, sizeof (xine_input_data_t),
++                                XINE_EVENT_INPUT_MOUSE_MOVE,
+                                 { 0 , 0 }
+                         };
+                         mutex.lock ();
+@@ -1001,15 +1005,15 @@ protected:
+                         fprintf(stderr, "ButtonPress\n");
+                         XButtonEvent *bev = (XButtonEvent *) &xevent;
+                         x11_rectangle_t rect = { bev->x, bev->y, 0, 0 };
+-                        if (xine_gui_send_vo_data (stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1)
++                        if (xine_port_send_gui_data (vo_port, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1)
+                             break;
+                         xine_input_data_t data;
+                         data.x = rect.x;
+                         data.y = rect.y;
+                         data.button = 1;
+                         xine_event_t xine_event =  { 
+-                                XINE_EVENT_INPUT_MOUSE_BUTTON,
+                                 stream, &data, sizeof (xine_input_data_t),
++                                XINE_EVENT_INPUT_MOUSE_BUTTON,
+                                 { 0, 0 }
+                         };
+                         mutex.lock ();
+@@ -1036,7 +1040,7 @@ protected:
+             }
+ 
+             if(xevent.type == completion_event && stream)
+-                xine_gui_send_vo_data(stream, XINE_GUI_SEND_COMPLETION_EVENT, &xevent);
++                xine_port_send_gui_data(vo_port, XINE_GUI_SEND_COMPLETION_EVENT, &xevent);
+         }
+     }
+ };