Revision: 5294 Author: pebender Date: Tue Aug 11 18:20:44 2009 Log: - Patched MythStream in MythTV trunk so that it uses QX11Info::display instead of qt_xdisplay().
http://code.google.com/p/minimyth/source/detail?r=5294 Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/myth-trunk/mythstream/checksums /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-mythtv_0_22.patch ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Mon Aug 10 21:14:43 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Aug 11 18:20:44 2009 @@ -54,6 +54,8 @@ - Fixed a bug that caused the Cyberlink remote to not be detected. - Fixed MythStream's parser for youtube videos. - Fixed a bug that caused LCDproc's dm140 driver to not be compiled. + - Patched MythStream in MythTV trunk so that it uses QX11Info::display + instead of qt_xdisplay(). Modified build system - Added ability for software list files to depend on the version of ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/checksums Fri Jul 24 08:17:22 2009 +++ /trunk/gar-minimyth/script/myth-trunk/mythstream/checksums Tue Aug 11 18:20:44 2009 @@ -1,7 +1,7 @@ 818f65c2592975b3433ebaa6623aa310 download/mythstream-0.18_qt4.tar.gz 998926ebaed46c84423d4baeb451182e download/mythstream-0.18_qt4-apple_parser_fix.patch e2c67be4122927917c77c83cba94ee95 download/mythstream-0.18_qt4-youtube_parser_fix.patch -a4917ac0e28f4b280b92bf439fd21945 download/mythstream-0.18_qt4-mythtv_0_22.patch +940cc012f71e822be8ebf3d637af83fb download/mythstream-0.18_qt4-mythtv_0_22.patch 0974415f6eef253a72cec3f0400661e7 download/mythstream-0.18_qt4-streams_res.patch b7b59b661edc6fb3c24dcfb051c52dc0 download/mythstream-0.18_qt4-fftw3f.patch d66d4a7c81c11ae0b0ea316173e500e5 download/mythstream-0.18_qt4.patch.gar ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-mythtv_0_22.patch Sat Jul 18 08:40:36 2009 +++ /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-mythtv_0_22.patch Tue Aug 11 18:20:44 2009 @@ -1,6 +1,6 @@ diff -Naur mythstream-0.18_qt4-old/libs/configelements.cpp mythstream-0.18_qt4-new/libs/configelements.cpp --- mythstream-0.18_qt4-old/libs/configelements.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/configelements.cpp 2009-07-17 14:25:27.000000000 -0700 ++++ mythstream-0.18_qt4-new/libs/configelements.cpp 2009-08-11 16:20:39.000000000 -0700 @@ -110,7 +110,7 @@ lab->setMaximumHeight(maxHeight); tmp = new MyLineEdit(this, "edit" + QString::number(i)); @@ -12,7 +12,7 @@ diff -Naur mythstream-0.18_qt4-old/libs/configelements.h mythstream-0.18_qt4-new/libs/configelements.h --- mythstream-0.18_qt4-old/libs/configelements.h 2008-04-07 04:17:57.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/configelements.h 2009-07-17 14:25:27.000000000 -0700 ++++ mythstream-0.18_qt4-new/libs/configelements.h 2009-08-11 16:20:39.000000000 -0700 @@ -30,7 +30,7 @@ #ifdef MYTHTV @@ -24,7 +24,7 @@ #endif diff -Naur mythstream-0.18_qt4-old/libs/recorder.cpp mythstream-0.18_qt4-new/libs/recorder.cpp --- mythstream-0.18_qt4-old/libs/recorder.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/recorder.cpp 2009-07-17 14:25:27.000000000 -0700 ++++ mythstream-0.18_qt4-new/libs/recorder.cpp 2009-08-11 16:20:39.000000000 -0700 @@ -112,7 +112,7 @@ if (recList.count() != 0) // no storage event should occur during recording cerr << "TARGET warning: storage manipulation during recording" << endl; @@ -36,7 +36,7 @@ stopAllRecordings(); diff -Naur mythstream-0.18_qt4-old/libs/storage.cpp mythstream-0.18_qt4-new/libs/storage.cpp --- mythstream-0.18_qt4-old/libs/storage.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/storage.cpp 2009-07-17 14:25:27.000000000 -0700 ++++ mythstream-0.18_qt4-new/libs/storage.cpp 2009-08-11 16:20:39.000000000 -0700 @@ -37,9 +37,9 @@ using namespace std; @@ -220,7 +220,7 @@ return currentStorage->removeRecord(ident, values, error); diff -Naur mythstream-0.18_qt4-old/libs/storage.h mythstream-0.18_qt4-new/libs/storage.h --- mythstream-0.18_qt4-old/libs/storage.h 2008-04-07 04:17:57.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/storage.h 2009-07-17 14:25:27.000000000 -0700 ++++ mythstream-0.18_qt4-new/libs/storage.h 2009-08-11 16:20:39.000000000 -0700 @@ -37,7 +37,9 @@ /* Absolutely NOT thread safe @@ -255,7 +255,7 @@ #ifdef MYTHTV diff -Naur mythstream-0.18_qt4-old/libs/streamstorage.cpp mythstream-0.18_qt4-new/libs/streamstorage.cpp --- mythstream-0.18_qt4-old/libs/streamstorage.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streamstorage.cpp 2009-07-17 14:25:27.000000000 -0700 ++++ mythstream-0.18_qt4-new/libs/streamstorage.cpp 2009-08-11 16:20:39.000000000 -0700 @@ -326,7 +326,7 @@ return (values.count() >= r_count_file && values[r_name] == storageName); } @@ -267,7 +267,7 @@ QString source; diff -Naur mythstream-0.18_qt4-old/libs/streamstorage.h mythstream-0.18_qt4-new/libs/streamstorage.h --- mythstream-0.18_qt4-old/libs/streamstorage.h 2008-04-07 04:17:57.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streamstorage.h 2009-07-17 14:25:27.000000000 -0700 ++++ mythstream-0.18_qt4-new/libs/streamstorage.h 2009-08-11 16:20:39.000000000 -0700 @@ -36,15 +36,15 @@ // Open reposstorage first: it creates default files on first run @@ -287,9 +287,65 @@ { public: ReposStorage(); +diff -Naur mythstream-0.18_qt4-old/libs/x11win.cpp mythstream-0.18_qt4-new/libs/x11win.cpp +--- mythstream-0.18_qt4-old/libs/x11win.cpp 2008-04-07 14:14:56.000000000 -0700 ++++ mythstream-0.18_qt4-new/libs/x11win.cpp 2009-08-11 18:17:05.000000000 -0700 +@@ -1,26 +1,28 @@ + + #include <iostream> + #include <X11/Xlib.h> ++#ifdef CursorShape ++#undef CursorShape // defined as a constant in X11/X.h and used as an enum in QtGui/qcursor.h. ++#endif ++#include <QX11Info> + + + using namespace std; + + //extern void handleExposeEvent(); + +-Display* qt_xdisplay (void); +- + void myX11MapWindow (uint id) + { + //cout << "mapping" << endl; +- XMapWindow (qt_xdisplay(), id); +- XFlush (qt_xdisplay()); ++ XMapWindow (QX11Info::display(), id); ++ XFlush (QX11Info::display()); + } + + void myX11UnmapWindow (uint id) + { + // cout << "unmapping" << endl; +- XUnmapWindow (qt_xdisplay(), id); +- XFlush (qt_xdisplay()); ++ XUnmapWindow (QX11Info::display(), id); ++ XFlush (QX11Info::display()); + } + + +@@ -28,7 +30,7 @@ + { + uint res; + +- res = XGrabKeyboard(qt_xdisplay(), id, true, GrabModeAsync, GrabModeAsync, CurrentTime); ++ res = XGrabKeyboard(QX11Info::display(), id, true, GrabModeAsync, GrabModeAsync, CurrentTime); + + switch (res) + { +@@ -43,7 +45,7 @@ + + void myX11UngrabKeyboard() + { +- XUngrabKeyboard(qt_xdisplay(), CurrentTime); ++ XUngrabKeyboard(QX11Info::display(), CurrentTime); + } + + /* diff -Naur mythstream-0.18_qt4-old/mythstream/main.cpp mythstream-0.18_qt4-new/mythstream/main.cpp --- mythstream-0.18_qt4-old/mythstream/main.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/mythstream/main.cpp 2009-07-17 14:32:45.000000000 -0700 ++++ mythstream-0.18_qt4-new/mythstream/main.cpp 2009-08-11 16:20:39.000000000 -0700 @@ -32,11 +32,12 @@ #include "../libs/streamconfig.h" #include "../libs/storageconfig.h" @@ -326,9 +382,17 @@ runMenu( themedir, "streamconfigmenu.xml"); return 0; } +diff -Naur mythstream-0.18_qt4-old/mythstream.pro mythstream-0.18_qt4-new/mythstream.pro +--- mythstream-0.18_qt4-old/mythstream.pro 2008-04-07 05:28:59.000000000 -0700 ++++ mythstream-0.18_qt4-new/mythstream.pro 2009-08-11 18:05:27.000000000 -0700 +@@ -3,4 +3,3 @@ + # Directories + SUBDIRS = mythstream + #SUBDIRS = mythstream alt_parsers +- diff -Naur mythstream-0.18_qt4-old/settings.pro mythstream-0.18_qt4-new/settings.pro --- mythstream-0.18_qt4-old/settings.pro 2008-04-07 15:40:18.000000000 -0700 -+++ mythstream-0.18_qt4-new/settings.pro 2009-07-17 14:25:27.000000000 -0700 ++++ mythstream-0.18_qt4-new/settings.pro 2009-08-11 16:20:39.000000000 -0700 @@ -3,15 +3,26 @@ VERSION=0.18_2 --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
