72 lines
2.1 KiB
Text
72 lines
2.1 KiB
Text
--- unix/unix_vid.c.orig 2014-06-08 16:08:05.000000000 +0400
|
|
+++ unix/unix_vid.c 2014-09-25 15:20:25.000000000 +0400
|
|
@@ -126,28 +126,5 @@
|
|
*/
|
|
qboolean VID_GetDisplaySize( int *width, int *height )
|
|
{
|
|
- XRRScreenConfiguration *xrrConfig;
|
|
- XRRScreenSize *xrrSizes;
|
|
- Display *dpy;
|
|
- Window root;
|
|
- Rotation rotation;
|
|
- SizeID size_id;
|
|
- int num_sizes;
|
|
-
|
|
- dpy = XOpenDisplay( NULL );
|
|
- if( dpy )
|
|
- {
|
|
- root = DefaultRootWindow( dpy );
|
|
- xrrConfig = XRRGetScreenInfo( dpy, root );
|
|
- xrrSizes = XRRConfigSizes( xrrConfig, &num_sizes );
|
|
- size_id = XRRConfigCurrentConfiguration( xrrConfig, &rotation );
|
|
-
|
|
- *width = xrrSizes[size_id].width;
|
|
- *height = xrrSizes[size_id].height;
|
|
-
|
|
- XCloseDisplay( dpy );
|
|
- return qtrue;
|
|
- }
|
|
-
|
|
return qfalse;
|
|
}
|
|
--- unix/unix_glw.c.orig 2014-06-08 16:08:05.000000000 +0400
|
|
+++ unix/unix_glw.c 2014-09-25 15:20:05.000000000 +0400
|
|
@@ -41,7 +41,7 @@
|
|
#define INIT_MASK ( KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | FocusChangeMask | DISPLAY_MASK )
|
|
|
|
// use experimental Xrandr resolution?
|
|
-#define _XRANDR_OVER_VIDMODE_
|
|
+#undef _XRANDR_OVER_VIDMODE_
|
|
|
|
x11display_t x11display;
|
|
x11wndproc_t x11wndproc;
|
|
--- Makefile.orig 2014-06-08 16:08:05.000000000 +0400
|
|
+++ Makefile 2014-09-25 15:39:56.000000000 +0400
|
|
@@ -265,7 +265,7 @@
|
|
LIB=lib
|
|
endif
|
|
|
|
-LDFLAGS_CLIENT=-lz -lpthread -lX11 -lXext -lXi -lXrandr -lrt $(shell curl-config --libs)
|
|
+LDFLAGS_CLIENT=-lz -lpthread -lX11 -lXext -lXi -lrt $(shell curl-config --libs)
|
|
LDFLAGS_DED=-lz -lpthread $(shell curl-config --libs)
|
|
LDFLAGS_MODULE=-shared
|
|
LDFLAGS_TV_SERVER=-lz -lpthread $(shell curl-config --libs)
|
|
@@ -306,7 +306,7 @@
|
|
|
|
ifeq ($(BUILD_REF_GL),YES)
|
|
CFLAGS_REF_GL=
|
|
-LDFLAGS_REF_GL=-lX11 -lXext -lXinerama -lXrandr -lXxf86vm -ljpeg -lpng -lz
|
|
+LDFLAGS_REF_GL=-lX11 -lXext -lXinerama -lXxf86vm -ljpeg -lpng -lz
|
|
endif
|
|
|
|
LDFLAGS_IRC=
|
|
--- unix/x11.h.orig 2014-06-08 16:08:05.000000000 +0400
|
|
+++ unix/x11.h 2014-09-25 16:38:59.000000000 +0400
|
|
@@ -6,7 +6,6 @@
|
|
|
|
#include <X11/extensions/xf86vmode.h>
|
|
#include <X11/extensions/Xinerama.h>
|
|
-#include <X11/extensions/Xrandr.h>
|
|
#include <X11/extensions/XInput2.h>
|
|
|
|
#include <GL/glx.h>
|