diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-03-19 14:03:53 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-03-19 14:03:53 +0000 |
| commit | 604648da116336a299bd9ff21f9c32c9b401a5c4 (patch) | |
| tree | 65ee74ba58b02bbcdd2f5b8622efe168e7ab83cc /contrib/packages/rpm/sle11/SOURCES/libdrm.diff | |
| parent | 266eec4ecf338f3f08771f8dfe79dbd5d9da00a1 (diff) | |
| download | tigervnc-604648da116336a299bd9ff21f9c32c9b401a5c4.tar.gz tigervnc-604648da116336a299bd9ff21f9c32c9b401a5c4.zip | |
Backport the contrib directory from trunk as well as our new buildv1.3.11.3-branch
system relies on it.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_3@5173 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'contrib/packages/rpm/sle11/SOURCES/libdrm.diff')
| -rw-r--r-- | contrib/packages/rpm/sle11/SOURCES/libdrm.diff | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/contrib/packages/rpm/sle11/SOURCES/libdrm.diff b/contrib/packages/rpm/sle11/SOURCES/libdrm.diff new file mode 100644 index 00000000..31c9abcf --- /dev/null +++ b/contrib/packages/rpm/sle11/SOURCES/libdrm.diff @@ -0,0 +1,18 @@ +Index: hw/xfree86/common/xf86Helper.c +================================================================================ +--- hw/xfree86/common/xf86Helper.c ++++ hw/xfree86/common/xf86Helper.c +@@ -2183,6 +2183,13 @@ + &errmaj, &errmin); + if (!ret) + LoaderErrorMsg(pScrn->name, name, errmaj, errmin); ++ ++ /* "drm" module has been merged into "dri" module, but some drivers ++ are still trying to load it explictely and fail if it doesn't exist :-( */ ++ if (!ret && !strcmp(name,"drm")) { ++ ret = (pointer) -1; ++ } ++ + return ret; + } + |