mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
xorg-server:
- update to xorg-server-20100218 with some upstream patches from krh - install protocol.txt to /usr/lib/xorg - sync some patches with patches from fedora - add some quirks from fedora
This commit is contained in:
Stephan Raue
parent
e8066d8089
commit
12585cf9f7
10
packages/x11/xserver/xorg-server/config/10-quirks.conf
Normal file
10
packages/x11/xserver/xorg-server/config/10-quirks.conf
Normal file
@ -0,0 +1,10 @@
|
||||
# Collection of quirks and blacklist/whitelists for specific devices.
|
||||
|
||||
|
||||
# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
|
||||
# http://bugs.freedesktop.org/show_bug.cgi?id=22442
|
||||
Section "InputClass"
|
||||
Identifier "ThinkPad HDAPS accelerometer blacklist"
|
||||
MatchProduct "ThinkPad HDAPS accelerometer data"
|
||||
Option "Ignore" "on"
|
||||
EndSection
|
||||
@ -47,8 +47,11 @@ mkdir -p $XORG_DST/linux
|
||||
mkdir -p $XORG_DST/multimedia
|
||||
cp $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
|
||||
|
||||
mkdir -p $INSTALL/etc/X11
|
||||
cp $PKG_BUILD/dix/protocol.txt $INSTALL/etc/X11
|
||||
mkdir -p $INSTALL/usr/lib/xorg
|
||||
cp $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg
|
||||
|
||||
mkdir -p $INSTALL/etc/X11/xorg.conf.d
|
||||
cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
|
||||
|
||||
#Fonts
|
||||
$SCRIPTS/install encodings
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur xorg-server-1.5.2.orig/dix/registry.c xorg-server-1.5.2/dix/registry.c
|
||||
--- xorg-server-1.5.2.orig/dix/registry.c 2008-10-11 14:11:31.000000000 +0200
|
||||
+++ xorg-server-1.5.2/dix/registry.c 2008-10-11 14:12:27.000000000 +0200
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#define BASE_SIZE 16
|
||||
#define CORE "X11"
|
||||
-#define FILENAME SERVER_MISC_CONFIG_PATH "/protocol.txt"
|
||||
+#define FILENAME "/etc/X11/protocol.txt"
|
||||
|
||||
#define PROT_COMMENT '#'
|
||||
#define PROT_REQUEST 'R'
|
||||
@ -1,3 +1,17 @@
|
||||
From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001
|
||||
From: Fedora X Ninjas <x@fedoraproject.org>
|
||||
Date: Wed, 20 Jan 2010 14:46:12 +1300
|
||||
Subject: [PATCH] Add nr for background=none root
|
||||
|
||||
---
|
||||
dix/globals.c | 1 +
|
||||
dix/window.c | 12 +++++++-----
|
||||
hw/xfree86/common/xf86Init.c | 11 +++++++++++
|
||||
hw/xfree86/common/xf86str.h | 5 ++++-
|
||||
include/opaque.h | 1 +
|
||||
os/utils.c | 3 +++
|
||||
6 files changed, 27 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dix/globals.c b/dix/globals.c
|
||||
index c24a94f..907a5e8 100644
|
||||
--- a/dix/globals.c
|
||||
@ -11,10 +25,10 @@ index c24a94f..907a5e8 100644
|
||||
int cursorScreenDevPriv[MAXSCREENS];
|
||||
|
||||
diff --git a/dix/window.c b/dix/window.c
|
||||
index caff1cb..f343d25 100644
|
||||
index caff1cb..be1d1c4 100644
|
||||
--- a/dix/window.c
|
||||
+++ b/dix/window.c
|
||||
@@ -466,23 +466,24 @@ InitRootWindow(WindowPtr pWin)
|
||||
@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin)
|
||||
pWin->optional->cursor = rootCursor;
|
||||
rootCursor->refcnt++;
|
||||
|
||||
@ -24,7 +38,7 @@ index caff1cb..f343d25 100644
|
||||
if (party_like_its_1989) {
|
||||
MakeRootTile(pWin);
|
||||
backFlag |= CWBackPixmap;
|
||||
+ (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
|
||||
+ pScreen->ChangeWindowAttributes(pWin, backFlag);
|
||||
+ } else if (bgNoneRoot) {
|
||||
+ /* nothing, handled in xf86CreateRootWindow */
|
||||
} else {
|
||||
@ -33,19 +47,19 @@ index caff1cb..f343d25 100644
|
||||
else
|
||||
pWin->background.pixel = pScreen->blackPixel;
|
||||
backFlag |= CWBackPixel;
|
||||
+ (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
|
||||
}
|
||||
- }
|
||||
|
||||
- pWin->backingStore = defaultBackingStore;
|
||||
- pWin->forcedBS = (defaultBackingStore != NotUseful);
|
||||
- /* We SHOULD check for an error value here XXX */
|
||||
- (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
|
||||
-
|
||||
+ pScreen->ChangeWindowAttributes(pWin, backFlag);
|
||||
+ }
|
||||
|
||||
MapWindow(pWin, serverClient);
|
||||
}
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
|
||||
index c9baff3..81c62f2 100644
|
||||
index 6707448..776b898 100644
|
||||
--- a/hw/xfree86/common/xf86Init.c
|
||||
+++ b/hw/xfree86/common/xf86Init.c
|
||||
@@ -77,6 +77,7 @@
|
||||
@ -56,7 +70,7 @@ index c9baff3..81c62f2 100644
|
||||
|
||||
#include "xf86VGAarbiter.h"
|
||||
#include "globals.h"
|
||||
@@ -249,6 +250,7 @@ xf86CreateRootWindow(WindowPtr pWin)
|
||||
@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin)
|
||||
int ret = TRUE;
|
||||
int err = Success;
|
||||
ScreenPtr pScreen = pWin->drawable.pScreen;
|
||||
@ -64,11 +78,11 @@ index c9baff3..81c62f2 100644
|
||||
RootWinPropPtr pProp;
|
||||
CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
|
||||
dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
|
||||
@@ -300,6 +302,15 @@ xf86CreateRootWindow(WindowPtr pWin)
|
||||
@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (bgNoneRoot && pScrn->canDoBGNoneRoot || 1) {
|
||||
+ if (bgNoneRoot && pScrn->canDoBGNoneRoot) {
|
||||
+ pWin->backgroundState = XaceBackgroundNoneState(pWin);
|
||||
+ pWin->background.pixel = pScreen->whitePixel;
|
||||
+ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore);
|
||||
@ -81,10 +95,10 @@ index c9baff3..81c62f2 100644
|
||||
return (ret);
|
||||
}
|
||||
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
|
||||
index b9a2e06..fd28664 100644
|
||||
index de1f1b6..5c3aa00 100644
|
||||
--- a/hw/xfree86/common/xf86str.h
|
||||
+++ b/hw/xfree86/common/xf86str.h
|
||||
@@ -516,7 +516,7 @@ typedef struct _confdrirec {
|
||||
@@ -503,7 +503,7 @@ typedef struct _confdrirec {
|
||||
} confDRIRec, *confDRIPtr;
|
||||
|
||||
/* These values should be adjusted when new fields are added to ScrnInfoRec */
|
||||
@ -93,8 +107,8 @@ index b9a2e06..fd28664 100644
|
||||
#define NUM_RESERVED_POINTERS 14
|
||||
#define NUM_RESERVED_FUNCS 11
|
||||
|
||||
@@ -788,6 +788,9 @@ typedef struct _ScrnInfoRec {
|
||||
ClockRangesPtr clockRanges;
|
||||
@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec {
|
||||
ClockRangePtr clockRanges;
|
||||
int adjustFlags;
|
||||
|
||||
+ /* -nr support */
|
||||
@ -116,7 +130,7 @@ index b3c7c70..fcc8c95 100644
|
||||
extern _X_EXPORT Bool CoreDump;
|
||||
|
||||
diff --git a/os/utils.c b/os/utils.c
|
||||
index 3718b17..52e30d3 100644
|
||||
index d7c8388..40583d0 100644
|
||||
--- a/os/utils.c
|
||||
+++ b/os/utils.c
|
||||
@@ -513,6 +513,7 @@ void UseMsg(void)
|
||||
@ -136,3 +150,6 @@ index 3718b17..52e30d3 100644
|
||||
else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
|
||||
if(++i < argc) {
|
||||
long reqSizeArg = atol(argv[i]);
|
||||
--
|
||||
1.6.6
|
||||
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From 57a188877b0472edb12bdf707b1550abbeb85af8 Mon Sep 17 00:00:00 2001
|
||||
From: Fedora X Ninjas <x@fedoraproject.org>
|
||||
Date: Wed, 17 Feb 2010 11:12:36 +1000
|
||||
Subject: [PATCH] Stick giant warning into logfiles about udev configuration changes.
|
||||
|
||||
Signed-off-by: Fedora X Ninjas <x@fedoraproject.org>
|
||||
---
|
||||
hw/xfree86/common/xf86Config.c | 13 +++++++++++++
|
||||
1 files changed, 13 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
|
||||
index 132e8bc..b1722cd 100644
|
||||
--- a/hw/xfree86/common/xf86Config.c
|
||||
+++ b/hw/xfree86/common/xf86Config.c
|
||||
@@ -1472,6 +1472,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
|
||||
"input devices.\n\tIf no devices become available, "
|
||||
"reconfigure %s or disable AutoAddDevices.\n",
|
||||
config_backend, config_backend);
|
||||
+
|
||||
+ xf86Msg(X_INFO, "\n"
|
||||
+ "***************************************************************\n"
|
||||
+ "***************************************************************\n"
|
||||
+ "** OpenELEC.tv switched to udev-based device detection with **\n"
|
||||
+ "** xorg-x11-server-1.7.99.901-1. Custom HAL configuration **\n"
|
||||
+ "** stored in /etc/hal/fdi/policy will not be seen by this **\n"
|
||||
+ "** server version. If you have such configuration you will **\n"
|
||||
+ "** need to update it to the new format. **\n"
|
||||
+ "** For more information, see the Fedora wiki page **\n"
|
||||
+ "** https://fedoraproject.org/wiki/Input_device_configuration **\n"
|
||||
+ "***************************************************************\n"
|
||||
+ "***************************************************************\n");
|
||||
#else
|
||||
xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n"
|
||||
"\tTry disabling AllowEmptyInput.\n");
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
@ -1 +1 @@
|
||||
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.99.901.tar.bz2
|
||||
http://sources.openelec.tv/svn/xorg-server-20100218.tar.bz2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user