dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 13:52:40 +01:00
Code Issues Releases Wiki Activity

-media-sound/mixxx: bump to 2.0.0-rc2

Browse Source
This commit is contained in:
David GUGLIELMI
2015-12-19 17:32:07 +01:00
parent 88433aaa0f
commit a1e9f69867
3 changed files with 188 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
media-sound/mixxx/files/mixxx-2.0.0_rc2-fix-qtgl-build.patch Normal file
View File

@@ -0,0 +1,66 @@
diff -dNur a/src/waveform/vsyncthread.cpp b/src/waveform/vsyncthread.cpp
--- a/src/waveform/vsyncthread.cpp 2015-12-17 02:44:04.000000000 +0100
+++ b/src/waveform/vsyncthread.cpp 2015-12-19 17:29:19.449521628 +0100
@@ -1,4 +1,5 @@
#include <QThread>
+#include <QGLWidget>
#include <QGLFormat>
#include <QTime>
#include <QtDebug>
@@ -131,12 +132,8 @@
glw->swapBuffers();
#else
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#ifdef QT_OPENGL_ES_2
- glw->swapBuffers();
-#else
const QX11Info *xinfo = qt_x11Info(glw);
glXSwapBuffers(xinfo->display(), glw->winId());
-#endif
#else
glw->swapBuffers();
#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
diff -dNur a/src/waveform/vsyncthread.h b/src/waveform/vsyncthread.h
--- a/src/waveform/vsyncthread.h 2015-12-17 02:44:04.000000000 +0100
+++ b/src/waveform/vsyncthread.h 2015-12-19 17:29:19.449521628 +0100
@@ -5,7 +5,6 @@
#include <QThread>
#include <QSemaphore>
#include <QPair>
-#include <QGLWidget>
#if defined(__APPLE__)
@@ -13,19 +12,26 @@
#else
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#ifndef QT_OPENGL_ES_2
#include <qx11info_x11.h>
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#endif
+
+#include "util/performancetimer.h"
+
+
+#if defined(__APPLE__)
+
+#elif defined(__WINDOWS__)
+
+#else
#include <GL/glx.h>
- //#include "GL/glxext.h"
+ #include "GL/glxext.h"
// clean up after Xlib.h, which #defines values that conflict with QT.
#undef Bool
#undef Unsorted
-#endif // QT_OPENGL_ES_2
-#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#endif
-#include "util/performancetimer.h"
-
+class QGLWidget;
class GuiTick;
class MixxxMainWindow;