mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
update to xorg-server-1.6.1.901
This commit is contained in:
parent
73d8cb0c50
commit
f87446be3a
@ -1 +1 @@
|
||||
http://elisa.fluendo.com/download/elisa/elisa-plugins-bad-0.5.37.tar.gz
|
||||
http://sources.openelec.tv/svn/elisa-plugins-bad-0.9.1.tar.gz
|
||||
|
@ -1 +0,0 @@
|
||||
http://sources.openelec.tv/svn/elisa-plugins-bad-0.9.1.tar.gz
|
@ -1 +1 @@
|
||||
http://elisa.fluendo.com/download/elisa/elisa-plugins-good-0.5.37.tar.gz
|
||||
http://sources.openelec.tv/svn/elisa-plugins-good-0.9.1.tar.gz
|
||||
|
@ -1 +0,0 @@
|
||||
http://sources.openelec.tv/svn/elisa-plugins-good-0.9.1.tar.gz
|
@ -1 +1 @@
|
||||
http://elisa.fluendo.com/download/elisa/elisa-plugins-ugly-0.5.37.tar.gz
|
||||
http://sources.openelec.tv/svn//elisa-plugins-ugly-0.9.1.tar.gz
|
||||
|
@ -1 +0,0 @@
|
||||
http://sources.openelec.tv/svn//elisa-plugins-ugly-0.9.1.tar.gz
|
@ -1 +1 @@
|
||||
http://elisa.fluendo.com/download/elisa/elisa-0.5.37.tar.gz
|
||||
http://sources.openelec.tv/svn/elisa-0.9.1.tar.gz
|
||||
|
@ -1 +0,0 @@
|
||||
http://sources.openelec.tv/svn/elisa-0.9.1.tar.gz
|
@ -1,46 +0,0 @@
|
||||
diff -Naur xf86-video-intel-2.3.2.orig/src/i830.h xf86-video-intel-2.3.2/src/i830.h
|
||||
--- xf86-video-intel-2.3.2.orig/src/i830.h 2008-07-06 15:52:23.000000000 +0200
|
||||
+++ xf86-video-intel-2.3.2/src/i830.h 2008-07-06 15:52:38.000000000 +0200
|
||||
@@ -920,4 +923,42 @@
|
||||
#define QUIRK_RESET_MODES 0x00000020
|
||||
extern void i830_fixup_devices(ScrnInfoPtr);
|
||||
|
||||
+#ifndef TTM_API
|
||||
+/* reuse some TTM API */
|
||||
+
|
||||
+#define DRM_BO_MEM_LOCAL 0
|
||||
+#define DRM_BO_MEM_TT 1
|
||||
+#define DRM_BO_MEM_VRAM 2
|
||||
+#define DRM_BO_MEM_PRIV0 3
|
||||
+#define DRM_BO_MEM_PRIV1 4
|
||||
+#define DRM_BO_MEM_PRIV2 5
|
||||
+#define DRM_BO_MEM_PRIV3 6
|
||||
+#define DRM_BO_MEM_PRIV4 7
|
||||
+
|
||||
+#define DRM_BO_FLAG_READ (1ULL << 0)
|
||||
+#define DRM_BO_FLAG_WRITE (1ULL << 1)
|
||||
+#define DRM_BO_FLAG_EXE (1ULL << 2)
|
||||
+#define DRM_BO_MASK_ACCESS (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_EXE)
|
||||
+#define DRM_BO_FLAG_NO_EVICT (1ULL << 4)
|
||||
+
|
||||
+#define DRM_BO_FLAG_MAPPABLE (1ULL << 5)
|
||||
+#define DRM_BO_FLAG_SHAREABLE (1ULL << 6)
|
||||
+
|
||||
+#define DRM_BO_FLAG_CACHED (1ULL << 7)
|
||||
+
|
||||
+#define DRM_BO_FLAG_NO_MOVE (1ULL << 8)
|
||||
+#define DRM_BO_FLAG_CACHED_MAPPED (1ULL << 19)
|
||||
+#define DRM_BO_FLAG_FORCE_CACHING (1ULL << 13)
|
||||
+#define DRM_BO_FLAG_FORCE_MAPPABLE (1ULL << 14)
|
||||
+#define DRM_BO_FLAG_TILE (1ULL << 15)
|
||||
+
|
||||
+#define DRM_BO_FLAG_MEM_LOCAL (1ULL << 24)
|
||||
+#define DRM_BO_FLAG_MEM_TT (1ULL << 25)
|
||||
+#define DRM_BO_FLAG_MEM_VRAM (1ULL << 26)
|
||||
+
|
||||
+#define DRM_BO_MASK_MEM 0x00000000FF000000ULL
|
||||
+
|
||||
+#define DRM_FENCE_TYPE_EXE 0x00000001
|
||||
+#endif
|
||||
+
|
||||
#endif /* _I830_H_ */
|
@ -1,10 +1,10 @@
|
||||
diff -Naur xorg-server-1.6.1.orig/configure xorg-server-1.6.1/configure
|
||||
--- xorg-server-1.6.1.orig/configure 2009-04-14 23:05:10.000000000 +0200
|
||||
+++ xorg-server-1.6.1/configure 2009-04-14 23:07:38.000000000 +0200
|
||||
@@ -21923,12 +21923,12 @@
|
||||
pkg_cv_GL_CFLAGS="$GL_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
diff -Naur xorg-server-1.6.1.901.orig/configure xorg-server-1.6.1.901/configure
|
||||
--- xorg-server-1.6.1.901.orig/configure 2009-05-09 13:58:58.000000000 +0200
|
||||
+++ xorg-server-1.6.1.901/configure 2009-05-09 14:12:45.000000000 +0200
|
||||
@@ -21949,12 +21949,12 @@
|
||||
pkg_cv_GL_CFLAGS="$GL_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9 gl >= 7.1.0\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9 gl >= 7.1.0") 2>&5
|
||||
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9\"") >&5
|
||||
@ -17,10 +17,10 @@ diff -Naur xorg-server-1.6.1.orig/configure xorg-server-1.6.1/configure
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -21939,12 +21939,12 @@
|
||||
pkg_cv_GL_LIBS="$GL_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
@@ -21967,12 +21967,12 @@
|
||||
pkg_cv_GL_LIBS="$GL_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9 gl >= 7.1.0\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9 gl >= 7.1.0") 2>&5
|
||||
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9\"") >&5
|
||||
@ -33,89 +33,3 @@ diff -Naur xorg-server-1.6.1.orig/configure xorg-server-1.6.1/configure
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -21962,14 +21962,14 @@
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
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 >= 1.4.9" 2>&1`
|
||||
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 >= 1.4.9" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
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 >= 1.4.9) were not met:
|
||||
|
||||
$GL_PKG_ERRORS
|
||||
|
||||
@@ -21980,7 +21980,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
|
||||
|
||||
@@ -22200,12 +22200,12 @@
|
||||
pkg_cv_GL_CFLAGS="$GL_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.1 dri >= 7.1.0\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.1 dri >= 7.1.0") 2>&5
|
||||
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.1\"") >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.1") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
- pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.1 dri >= 7.1.0" 2>/dev/null`
|
||||
+ pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.1" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -22216,12 +22216,12 @@
|
||||
pkg_cv_GL_LIBS="$GL_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.1 dri >= 7.1.0\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.1 dri >= 7.1.0") 2>&5
|
||||
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.1\"") >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.1") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
- pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.1 dri >= 7.1.0" 2>/dev/null`
|
||||
+ pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.1" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -22239,14 +22239,14 @@
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
- GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glproto >= 1.4.1 dri >= 7.1.0" 2>&1`
|
||||
+ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glproto >= 1.4.1" 2>&1`
|
||||
else
|
||||
- GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "glproto >= 1.4.1 dri >= 7.1.0" 2>&1`
|
||||
+ GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "glproto >= 1.4.1" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$GL_PKG_ERRORS" >&5
|
||||
|
||||
- { { $as_echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.1 dri >= 7.1.0) were not met:
|
||||
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.1) were not met:
|
||||
|
||||
$GL_PKG_ERRORS
|
||||
|
||||
@@ -22257,7 +22257,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.1 dri >= 7.1.0) were not met:
|
||||
+$as_echo "$as_me: error: Package requirements (glproto >= 1.4.1) were not met:
|
||||
|
||||
$GL_PKG_ERRORS
|
||||
|
||||
|
@ -1 +1 @@
|
||||
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.6.1.tar.bz2
|
||||
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.6.1.901.tar.bz2
|
||||
|
Loading…
x
Reference in New Issue
Block a user