| /[mcore-svn]/smage/trunk/core/xf86-video-vmware/mcore/files/xf86-video-vmware-11.0.1-mcore-no-drm.patch |
Annotation of /smage/trunk/core/xf86-video-vmware/mcore/files/xf86-video-vmware-11.0.1-mcore-no-drm.patch
Parent Directory
| 
Revision Log
Revision 442 -
(hide annotations)
(download)
Fri May 7 15:07:59 2010 UTC (14 years ago) by niro
File size: 4067 byte(s)
Fri May 7 15:07:59 2010 UTC (14 years ago) by niro
File size: 4067 byte(s)
-added no-drm patch
| 1 | niro | 442 | diff -Naur xf86-video-vmware-11.0.1/Makefile.in xf86-video-vmware-11.0.1-mcore/Makefile.in |
| 2 | --- xf86-video-vmware-11.0.1/Makefile.in 2010-03-18 15:32:48.000000000 +0100 | ||
| 3 | +++ xf86-video-vmware-11.0.1-mcore/Makefile.in 2010-05-07 17:08:54.000000000 +0200 | ||
| 4 | @@ -114,8 +114,6 @@ | ||
| 5 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ | ||
| 6 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ | ||
| 7 | DRIVER_NAME = @DRIVER_NAME@ | ||
| 8 | -DRM_CFLAGS = @DRM_CFLAGS@ | ||
| 9 | -DRM_LIBS = @DRM_LIBS@ | ||
| 10 | DSYMUTIL = @DSYMUTIL@ | ||
| 11 | DUMPBIN = @DUMPBIN@ | ||
| 12 | ECHO_C = @ECHO_C@ | ||
| 13 | diff -Naur xf86-video-vmware-11.0.1/configure.ac xf86-video-vmware-11.0.1-mcore/configure.ac | ||
| 14 | --- xf86-video-vmware-11.0.1/configure.ac 2010-03-18 15:30:14.000000000 +0100 | ||
| 15 | +++ xf86-video-vmware-11.0.1-mcore/configure.ac 2010-05-07 17:08:36.000000000 +0200 | ||
| 16 | @@ -62,7 +62,6 @@ | ||
| 17 | |||
| 18 | # Checks for pkg-config packages | ||
| 19 | PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1 xproto fontsproto $REQUIRED_MODULES]) | ||
| 20 | -PKG_CHECK_MODULES(DRM, [libdrm]) | ||
| 21 | |||
| 22 | PKG_CHECK_EXISTS([xorg-server >= 1.1.0], | ||
| 23 | [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1, | ||
| 24 | diff -Naur xf86-video-vmware-11.0.1/man/Makefile.in xf86-video-vmware-11.0.1-mcore/man/Makefile.in | ||
| 25 | --- xf86-video-vmware-11.0.1/man/Makefile.in 2010-03-18 15:32:48.000000000 +0100 | ||
| 26 | +++ xf86-video-vmware-11.0.1-mcore/man/Makefile.in 2010-05-07 17:10:45.000000000 +0200 | ||
| 27 | @@ -100,8 +100,6 @@ | ||
| 28 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ | ||
| 29 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ | ||
| 30 | DRIVER_NAME = @DRIVER_NAME@ | ||
| 31 | -DRM_CFLAGS = @DRM_CFLAGS@ | ||
| 32 | -DRM_LIBS = @DRM_LIBS@ | ||
| 33 | DSYMUTIL = @DSYMUTIL@ | ||
| 34 | DUMPBIN = @DUMPBIN@ | ||
| 35 | ECHO_C = @ECHO_C@ | ||
| 36 | diff -Naur xf86-video-vmware-11.0.1/src/Makefile.am xf86-video-vmware-11.0.1-mcore/src/Makefile.am | ||
| 37 | --- xf86-video-vmware-11.0.1/src/Makefile.am 2010-02-22 19:47:51.000000000 +0100 | ||
| 38 | +++ xf86-video-vmware-11.0.1-mcore/src/Makefile.am 2010-05-07 17:09:41.000000000 +0200 | ||
| 39 | @@ -54,8 +54,8 @@ | ||
| 40 | |||
| 41 | vmware_drv_la_LTLIBRARIES = vmware_drv.la | ||
| 42 | vmware_drv_la_LDFLAGS = -module -avoid-version | ||
| 43 | -vmware_drv_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ | ||
| 44 | -vmware_drv_la_LIBADD = @DRM_LIBS@ | ||
| 45 | +vmware_drv_la_CFLAGS = @XORG_CFLAGS@ | ||
| 46 | +vmware_drv_la_LIBADD = | ||
| 47 | vmware_drv_ladir = @moduledir@/drivers | ||
| 48 | |||
| 49 | vmware_drv_la_SOURCES = \ | ||
| 50 | diff -Naur xf86-video-vmware-11.0.1/src/Makefile.in xf86-video-vmware-11.0.1-mcore/src/Makefile.in | ||
| 51 | --- xf86-video-vmware-11.0.1/src/Makefile.in 2010-03-18 15:32:48.000000000 +0100 | ||
| 52 | +++ xf86-video-vmware-11.0.1-mcore/src/Makefile.in 2010-05-07 17:09:27.000000000 +0200 | ||
| 53 | @@ -137,8 +137,6 @@ | ||
| 54 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ | ||
| 55 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ | ||
| 56 | DRIVER_NAME = @DRIVER_NAME@ | ||
| 57 | -DRM_CFLAGS = @DRM_CFLAGS@ | ||
| 58 | -DRM_LIBS = @DRM_LIBS@ | ||
| 59 | DSYMUTIL = @DSYMUTIL@ | ||
| 60 | DUMPBIN = @DUMPBIN@ | ||
| 61 | ECHO_C = @ECHO_C@ | ||
| 62 | @@ -277,8 +275,8 @@ | ||
| 63 | |||
| 64 | vmware_drv_la_LTLIBRARIES = vmware_drv.la | ||
| 65 | vmware_drv_la_LDFLAGS = -module -avoid-version | ||
| 66 | -vmware_drv_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ | ||
| 67 | -vmware_drv_la_LIBADD = @DRM_LIBS@ | ||
| 68 | +vmware_drv_la_CFLAGS = @XORG_CFLAGS@ | ||
| 69 | +vmware_drv_la_LIBADD = | ||
| 70 | vmware_drv_ladir = @moduledir@/drivers | ||
| 71 | vmware_drv_la_SOURCES = \ | ||
| 72 | vmwaremodule.c | ||
| 73 | diff -Naur xf86-video-vmware-11.0.1/src/vmwaremodule.c xf86-video-vmware-11.0.1-mcore/src/vmwaremodule.c | ||
| 74 | --- xf86-video-vmware-11.0.1/src/vmwaremodule.c 2010-03-18 15:02:17.000000000 +0100 | ||
| 75 | +++ xf86-video-vmware-11.0.1-mcore/src/vmwaremodule.c 2010-05-07 17:10:24.000000000 +0200 | ||
| 76 | @@ -25,7 +25,6 @@ | ||
| 77 | |||
| 78 | #include <xorg-server.h> | ||
| 79 | #include <xf86.h> | ||
| 80 | -#include <xf86drm.h> | ||
| 81 | |||
| 82 | #ifdef HAVE_CONFIG_H | ||
| 83 | #include "config.h" | ||
| 84 | @@ -80,21 +79,6 @@ | ||
| 85 | static Bool | ||
| 86 | vmware_check_kernel_module() | ||
| 87 | { | ||
| 88 | - /* Super simple way of knowing if the kernel driver is loaded */ | ||
| 89 | - int ret = drmOpen(VMWGFX_MODULE_NAME, NULL); | ||
| 90 | - if (ret < 0) { | ||
| 91 | - /* This shouldn't go in the log as the original message does not */ | ||
| 92 | - fprintf(stderr, "%s: Please ignore above \"FATAL: Module %s not found." | ||
| 93 | - "\"\n", VMWARE_DRIVER_NAME, VMWGFX_MODULE_NAME); | ||
| 94 | - /* This is what goes into the log on the other hand */ | ||
| 95 | - xf86DrvMsg(-1, X_PROBED, "%s: Please ignore above \"[drm] failed to " | ||
| 96 | - "load kernel module \"%s\"\"\n", VMWARE_DRIVER_NAME, | ||
| 97 | - VMWGFX_MODULE_NAME); | ||
| 98 | - return FALSE; | ||
| 99 | - } | ||
| 100 | - | ||
| 101 | - drmClose(ret); | ||
| 102 | - | ||
| 103 | return TRUE; | ||
| 104 | } | ||
| 105 |