diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-11-24 09:58:05 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-11-24 09:58:05 +0100 |
| commit | 32fb770ae4ed0851491a59df5e23e27fb8afdadf (patch) | |
| tree | c36a3226a9dd6588d754bd3b0dccacf89e0589b3 /redhat/applications/kmplayer | |
| parent | e7f51ead5a067b6e3ac4fc64edc734a82711f2d2 (diff) | |
| download | tde-packaging-32fb770ae4ed0851491a59df5e23e27fb8afdadf.tar.gz tde-packaging-32fb770ae4ed0851491a59df5e23e27fb8afdadf.zip | |
RPM: add PCLinuxOS support
Diffstat (limited to 'redhat/applications/kmplayer')
| -rw-r--r-- | redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch | 102 | ||||
| -rw-r--r-- | redhat/applications/kmplayer/trinity-kmplayer-3.5.13.1.spec | 9 |
2 files changed, 105 insertions, 6 deletions
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch b/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch index c0b0edc76..1dd604c1a 100644 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch +++ b/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch @@ -1,5 +1,7 @@ ---- kmplayer-3.5.13.1/src/xineplayer.cpp.ORI 2012-10-04 19:44:38.403679339 +0200 -+++ kmplayer-3.5.13.1/src/xineplayer.cpp 2012-10-04 19:48:14.399221962 +0200 +Index: b/src/xineplayer.cpp +=================================================================== +--- a/src/xineplayer.cpp 2012-10-30 18:39:16.000000000 +0000 ++++ b/src/xineplayer.cpp 2012-11-03 17:56:01.760234144 +0000 @@ -528,7 +528,11 @@ xine_event_create_listener_thread (event_queue, event_listener, NULL); if (mrl == "cdda:/") { @@ -12,3 +14,99 @@ running = 1; for (int i = 0; i < nr; i++) { TQString m (mrls[i]); +@@ -863,10 +867,10 @@ + case XK_p: // previous + mutex.lock (); + if (stream) { +- xine_event_t xine_event = { +- XINE_EVENT_INPUT_PREVIOUS, +- stream, 0L, 0, { 0, 0 } +- }; ++ xine_event_t xine_event; ++ memset(&xine_event, 0, sizeof(xine_event)); ++ xine_event.type = XINE_EVENT_INPUT_PREVIOUS; ++ xine_event.stream = stream; + xine_event_send (stream, &xine_event); + } + mutex.unlock (); +@@ -875,10 +879,10 @@ + case XK_n: // next + mutex.lock (); + if (stream) { +- xine_event_t xine_event = { +- XINE_EVENT_INPUT_NEXT, +- stream, 0L, 0, { 0, 0 } +- }; ++ xine_event_t xine_event; ++ memset(&xine_event, 0, sizeof(xine_event)); ++ xine_event.type = XINE_EVENT_INPUT_NEXT; ++ xine_event.stream = stream; + xine_event_send (stream, &xine_event); + } + mutex.unlock (); +@@ -887,10 +891,10 @@ + case XK_u: // up menu + mutex.lock (); + if (stream) { +- xine_event_t xine_event = { +- XINE_EVENT_INPUT_MENU1, +- stream, 0L, 0, { 0, 0 } +- }; ++ xine_event_t xine_event; ++ memset(&xine_event, 0, sizeof(xine_event)); ++ xine_event.type = XINE_EVENT_INPUT_MENU1; ++ xine_event.stream = stream; + xine_event_send (stream, &xine_event); + } + mutex.unlock (); +@@ -899,10 +903,10 @@ + case XK_r: // root menu + mutex.lock (); + if (stream) { +- xine_event_t xine_event = { +- XINE_EVENT_INPUT_MENU3, +- stream, 0L, 0, { 0, 0 } +- }; ++ xine_event_t xine_event; ++ memset(&xine_event, 0, sizeof(xine_event)); ++ xine_event.type = XINE_EVENT_INPUT_MENU3; ++ xine_event.stream = stream; + xine_event_send (stream, &xine_event); + } + mutex.unlock (); +@@ -985,11 +989,12 @@ + 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), +- { 0 , 0 } +- }; ++ xine_event_t xine_event; ++ memset(&xine_event, 0, sizeof(xine_event)); ++ xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE; ++ xine_event.stream = stream; ++ xine_event.data = &data; ++ xine_event.data_length = sizeof (xine_input_data_t); + mutex.lock (); + xine_event_send (stream, &xine_event); + mutex.unlock (); +@@ -1023,11 +1028,12 @@ + 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), +- { 0, 0 } +- }; ++ xine_event_t xine_event; ++ memset(&xine_event, 0, sizeof(xine_event)); ++ xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON; ++ xine_event.stream = stream; ++ xine_event.data = &data; ++ xine_event.data_length = sizeof (xine_input_data_t); + mutex.lock (); + xine_event_send (stream, &xine_event); + mutex.unlock (); diff --git a/redhat/applications/kmplayer/trinity-kmplayer-3.5.13.1.spec b/redhat/applications/kmplayer/trinity-kmplayer-3.5.13.1.spec index e06bd44e7..ef7b3201b 100644 --- a/redhat/applications/kmplayer/trinity-kmplayer-3.5.13.1.spec +++ b/redhat/applications/kmplayer/trinity-kmplayer-3.5.13.1.spec @@ -26,7 +26,7 @@ Name: trinity-%{kdecomp} Summary: media player for Trinity Version: 0.10.0c -Release: 3%{?dist}%{?_variant} +Release: 4%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Multimedia @@ -115,7 +115,7 @@ Summary: Handbook for KMPlayer [Trinity] Documention for KMPlayer, a basic audio/video viewer application for KDE. -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif @@ -141,8 +141,6 @@ unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export CXXFLAGS="${CXXFLAGS} -fpermissive" - %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -235,6 +233,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Sat Nov 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-4 +- Fix xine 1.2 support (openSUSE 12.2 only) + * Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3 - Initial build for TDE 3.5.13.1 |