mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
xorg-server:
- update to xorg-server-1.6.99.902 - remove dependencies of resourceproto - remove unneeded 30_dri-no-xinerama.diff
This commit is contained in:
parent
f611001325
commit
b0404f9fd7
@ -10,7 +10,6 @@ $SCRIPTS/build xf86driproto
|
|||||||
$SCRIPTS/build randrproto
|
$SCRIPTS/build randrproto
|
||||||
$SCRIPTS/build renderproto
|
$SCRIPTS/build renderproto
|
||||||
$SCRIPTS/build scrnsaverproto
|
$SCRIPTS/build scrnsaverproto
|
||||||
$SCRIPTS/build resourceproto
|
|
||||||
$SCRIPTS/build videoproto
|
$SCRIPTS/build videoproto
|
||||||
$SCRIPTS/build inputproto
|
$SCRIPTS/build inputproto
|
||||||
$SCRIPTS/build compositeproto
|
$SCRIPTS/build compositeproto
|
||||||
|
@ -1,47 +0,0 @@
|
|||||||
diff -Naur a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
|
|
||||||
--- a/hw/xfree86/dri/dri.c 2009-08-31 01:17:11.000000000 +0200
|
|
||||||
+++ b/hw/xfree86/dri/dri.c 2009-09-04 13:35:36.000000000 +0200
|
|
||||||
@@ -73,7 +73,7 @@
|
|
||||||
|
|
||||||
#define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
|
|
||||||
|
|
||||||
-#if !defined(PANORAMIX)
|
|
||||||
+#ifdef PANORAMIX
|
|
||||||
extern Bool noPanoramiXExtension;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -321,7 +321,6 @@
|
|
||||||
drm_context_t * reserved;
|
|
||||||
int reserved_count;
|
|
||||||
int i;
|
|
||||||
- Bool xineramaInCore = FALSE;
|
|
||||||
DRIEntPrivPtr pDRIEntPriv;
|
|
||||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
|
||||||
DRIContextFlags flags = 0;
|
|
||||||
@@ -340,20 +339,17 @@
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef PANORAMIX
|
|
||||||
/*
|
|
||||||
* If Xinerama is on, don't allow DRI to initialise. It won't be usable
|
|
||||||
* anyway.
|
|
||||||
*/
|
|
||||||
- if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
|
|
||||||
- xineramaInCore = TRUE;
|
|
||||||
-
|
|
||||||
- if (xineramaInCore) {
|
|
||||||
- if (!noPanoramiXExtension) {
|
|
||||||
- DRIDrvMsg(pScreen->myNum, X_WARNING,
|
|
||||||
- "Direct rendering is not supported when Xinerama is enabled\n");
|
|
||||||
- return FALSE;
|
|
||||||
- }
|
|
||||||
+ if (!noPanoramiXExtension) {
|
|
||||||
+ DRIDrvMsg(pScreen->myNum, X_WARNING,
|
|
||||||
+ "Direct rendering is not supported when Xinerama is enabled\n");
|
|
||||||
+ return FALSE;
|
|
||||||
}
|
|
||||||
+#endif /* PANORAMIX */
|
|
||||||
|
|
||||||
if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
|
|
||||||
pDRIInfo->busIdString,
|
|
@ -1,62 +1,53 @@
|
|||||||
diff -Naur a/configure b/configure
|
diff -Naur a/configure b/configure
|
||||||
--- a/configure 2009-09-04 08:44:13.000000000 +0200
|
--- a/configure 2009-09-22 20:31:30.000000000 +0200
|
||||||
+++ b/configure 2009-09-04 13:44:05.000000000 +0200
|
+++ b/configure 2009-09-22 20:35:16.000000000 +0200
|
||||||
@@ -22218,12 +22218,12 @@
|
@@ -22270,12 +22270,12 @@
|
||||||
pkg_cv_GL_CFLAGS="$GL_CFLAGS"
|
pkg_cv_GL_CFLAGS="$GL_CFLAGS"
|
||||||
elif test -n "$PKG_CONFIG"; then
|
elif test -n "$PKG_CONFIG"; then
|
||||||
if test -n "$PKG_CONFIG" && \
|
if test -n "$PKG_CONFIG" && \
|
||||||
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9 gl >= 7.1.0\"") >&5
|
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO gl >= 7.1.0\"") >&5
|
||||||
- ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9 gl >= 7.1.0") 2>&5
|
- ($PKG_CONFIG --exists --print-errors "$GLPROTO gl >= 7.1.0") 2>&5
|
||||||
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9\"") >&5
|
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO\"") >&5
|
||||||
+ ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9") 2>&5
|
+ ($PKG_CONFIG --exists --print-errors "$GLPROTO") 2>&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
(exit $ac_status); }; then
|
(exit $ac_status); }; then
|
||||||
- pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.9 gl >= 7.1.0" 2>/dev/null`
|
- pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO gl >= 7.1.0" 2>/dev/null`
|
||||||
+ pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.9" 2>/dev/null`
|
+ pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO" 2>/dev/null`
|
||||||
else
|
else
|
||||||
pkg_failed=yes
|
pkg_failed=yes
|
||||||
fi
|
fi
|
||||||
@@ -22234,12 +22234,12 @@
|
@@ -22286,12 +22286,12 @@
|
||||||
pkg_cv_GL_LIBS="$GL_LIBS"
|
pkg_cv_GL_LIBS="$GL_LIBS"
|
||||||
elif test -n "$PKG_CONFIG"; then
|
elif test -n "$PKG_CONFIG"; then
|
||||||
if test -n "$PKG_CONFIG" && \
|
if test -n "$PKG_CONFIG" && \
|
||||||
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9 gl >= 7.1.0\"") >&5
|
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO gl >= 7.1.0\"") >&5
|
||||||
- ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9 gl >= 7.1.0") 2>&5
|
- ($PKG_CONFIG --exists --print-errors "$GLPROTO gl >= 7.1.0") 2>&5
|
||||||
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9\"") >&5
|
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO\"") >&5
|
||||||
+ ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9") 2>&5
|
+ ($PKG_CONFIG --exists --print-errors "$GLPROTO") 2>&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
(exit $ac_status); }; then
|
(exit $ac_status); }; then
|
||||||
- pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.9 gl >= 7.1.0" 2>/dev/null`
|
- pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$GLPROTO gl >= 7.1.0" 2>/dev/null`
|
||||||
+ pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.9" 2>/dev/null`
|
+ pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$GLPROTO" 2>/dev/null`
|
||||||
else
|
else
|
||||||
pkg_failed=yes
|
pkg_failed=yes
|
||||||
fi
|
fi
|
||||||
@@ -22257,14 +22257,14 @@
|
@@ -22309,14 +22309,14 @@
|
||||||
_pkg_short_errors_supported=no
|
_pkg_short_errors_supported=no
|
||||||
fi
|
fi
|
||||||
if test $_pkg_short_errors_supported = yes; then
|
if test $_pkg_short_errors_supported = yes; then
|
||||||
- GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glproto >= 1.4.9 gl >= 7.1.0" 2>&1`
|
- GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO gl >= 7.1.0" 2>&1`
|
||||||
+ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glproto >= 1.4.9" 2>&1`
|
+ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO" 2>&1`
|
||||||
else
|
else
|
||||||
- GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "glproto >= 1.4.9 gl >= 7.1.0" 2>&1`
|
- GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO gl >= 7.1.0" 2>&1`
|
||||||
+ GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "glproto >= 1.4.9" 2>&1`
|
+ GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO" 2>&1`
|
||||||
fi
|
fi
|
||||||
# Put the nasty error message in config.log where it belongs
|
# Put the nasty error message in config.log where it belongs
|
||||||
echo "$GL_PKG_ERRORS" >&5
|
echo "$GL_PKG_ERRORS" >&5
|
||||||
|
|
||||||
- { { $as_echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.9 gl >= 7.1.0) were not met:
|
- { { $as_echo "$as_me:$LINENO: error: Package requirements ($GLPROTO gl >= 7.1.0) were not met:
|
||||||
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.9) were not met:
|
+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($GLPROTO) were not met:
|
||||||
|
|
||||||
$GL_PKG_ERRORS
|
|
||||||
|
|
||||||
@@ -22275,7 +22275,7 @@
|
|
||||||
and GL_LIBS to avoid the need to call pkg-config.
|
|
||||||
See the pkg-config man page for more details.
|
|
||||||
" >&5
|
|
||||||
-$as_echo "$as_me: error: Package requirements (glproto >= 1.4.9 gl >= 7.1.0) were not met:
|
|
||||||
+$as_echo "$as_me: error: Package requirements (glproto >= 1.4.9) were not met:
|
|
||||||
|
|
||||||
$GL_PKG_ERRORS
|
$GL_PKG_ERRORS
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.6.99.901.tar.bz2
|
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.6.99.902.tar.bz2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user