pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2012Q1]: pkgsrc/multimedia/kmplayer-kde3 Pullup ticket #3740 -...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/52fb903e87d7
branches:  pkgsrc-2012Q1
changeset: 602033:52fb903e87d7
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Apr 16 13:37:30 2012 +0000

description:
Pullup ticket #3740 - requested by dholland
multimedia/kmplayer-kde3: build fix

Revisions pulled up:
- multimedia/kmplayer-kde3/Makefile                             1.12-1.13
- multimedia/kmplayer-kde3/distinfo                             1.2-1.3
- multimedia/kmplayer-kde3/patches/patch-src_xineplayer_cpp     1.1-1.2

---
   Module Name: pkgsrc
   Committed By:        markd
   Date:                Sun Apr 15 04:10:23 UTC 2012

   Modified Files:
        pkgsrc/multimedia/kmplayer-kde3: Makefile

   Log Message:
   Remove dependency on xine-arts -- not needed.

   Still need patches to build with latest xine-lib

---
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Sun Apr 15 20:38:37 UTC 2012

   Modified Files:
        pkgsrc/multimedia/kmplayer-kde3: distinfo
   Added Files:
        pkgsrc/multimedia/kmplayer-kde3/patches: patch-src_xineplayer_cpp

   Log Message:
   Fix build with current xine-lib.

---
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Sun Apr 15 22:18:38 UTC 2012

   Modified Files:
        pkgsrc/multimedia/kmplayer-kde3: distinfo
        pkgsrc/multimedia/kmplayer-kde3/patches: patch-src_xineplayer_cpp

   Log Message:
   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.

---
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Sun Apr 15 23:02:11 UTC 2012

   Modified Files:
        pkgsrc/multimedia/kmplayer-kde3: Makefile

   Log Message:
   This is also, apparently, not MAKE_JOBS_SAFE.

diffstat:

 multimedia/kmplayer-kde3/Makefile                         |    5 +-
 multimedia/kmplayer-kde3/distinfo                         |    3 +-
 multimedia/kmplayer-kde3/patches/patch-src_xineplayer_cpp |  124 ++++++++++++++
 3 files changed, 129 insertions(+), 3 deletions(-)

diffs (163 lines):

diff -r 84252ac7e72d -r 52fb903e87d7 multimedia/kmplayer-kde3/Makefile
--- a/multimedia/kmplayer-kde3/Makefile Sun Apr 15 15:26:35 2012 +0000
+++ b/multimedia/kmplayer-kde3/Makefile Mon Apr 16 13:37:30 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/03/03 00:13:40 wiz Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2012/04/16 13:37:30 tron Exp $
 #
 
 DISTNAME=      kmplayer-0.10.0c
@@ -13,9 +13,10 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+MAKE_JOBS_SAFE=                no
+
 DEPENDS+=              mplayer>=1.0rc3:../../multimedia/mplayer
 DEPENDS+=              mencoder>=1.0rc3:../../multimedia/mencoder
-DEPENDS+=              xine-arts>=1rc0a:../../audio/xine-arts
 
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake msgfmt perl pkg-config
diff -r 84252ac7e72d -r 52fb903e87d7 multimedia/kmplayer-kde3/distinfo
--- a/multimedia/kmplayer-kde3/distinfo Sun Apr 15 15:26:35 2012 +0000
+++ b/multimedia/kmplayer-kde3/distinfo Mon Apr 16 13:37:30 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/04/10 04:04:21 markd Exp $
+$NetBSD: distinfo,v 1.1.1.1.16.1 2012/04/16 13:37:30 tron Exp $
 
 SHA1 (kmplayer-0.10.0c.tar.bz2) = 52bfa017e1360fdc60c10445090c867039da4830
 RMD160 (kmplayer-0.10.0c.tar.bz2) = 4f7f291733f9a73f5838e028af5e5268d1a0ee10
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 7e0c7d32ded98070438532c6365cafc0ef8bfd1f
 SHA1 (patch-ab) = 6d0635e5d9ea62de7363f761493d80d9d9734857
 SHA1 (patch-ac) = d91f1a27a0768e19c856079328db54d563e96128
+SHA1 (patch-src_xineplayer_cpp) = 2676560e14461c15d8662450eb15cbaa4af4ffe2
diff -r 84252ac7e72d -r 52fb903e87d7 multimedia/kmplayer-kde3/patches/patch-src_xineplayer_cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/kmplayer-kde3/patches/patch-src_xineplayer_cpp Mon Apr 16 13:37:30 2012 +0000
@@ -0,0 +1,124 @@
+$NetBSD: patch-src_xineplayer_cpp,v 1.2.2.2 2012/04/16 13:37:30 tron Exp $
+
+Fix build with xine-lib 1.2.x.
+
+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);
+     if (mrl == "cdda:/") {
+         int nr;
+-        char ** mrls = xine_get_autoplay_mrls (xine, "CD", &nr);
++        const char *const * mrls = xine_get_autoplay_mrls (xine, "CD", &nr);
+         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);
+         }
+     }
+ };



Home | Main Index | Thread Index | Old Index