diff options
Diffstat (limited to 'recipes/xorg-xserver')
5 files changed, 53 insertions, 3 deletions
diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc index c9b33768c6..a2a95b74cf 100644 --- a/recipes/xorg-xserver/xorg-xserver-common.inc +++ b/recipes/xorg-xserver/xorg-xserver-common.inc @@ -6,7 +6,7 @@ INC_PR = "r13" PROVIDES = "virtual/xserver" -DEPENDS = "hal fontconfig freetype flex-native kbproto \ +DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch new file mode 100644 index 0000000000..b0044886e5 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch @@ -0,0 +1,20 @@ +See https://bugs.gentoo.org/show_bug.cgi?id=235789 +2008-09-09 Martin von Gagern + +--- xorg-server-1.5.0.orig/hw/kdrive/vesa/vm86.h 2008-09-09 17:24:59.000000000 +0200 ++++ xorg-server-1.5.0/hw/kdrive/vesa/vm86.h 2008-09-09 18:01:53.000000000 +0200 +@@ -67,6 +67,13 @@ + #include "os.h" + #endif + ++#ifndef IF_MASK ++#define IF_MASK X86_EFLAGS_IF ++#endif ++#ifndef IOPL_MASK ++#define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++ + typedef unsigned char U8; + typedef unsigned short U16; + typedef unsigned int U32; + diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb index 0b347aad7b..b6322769ab 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r7" +PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -27,6 +27,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://no_xkb.patch;patch=1;pnum=0 \ file://xorg-1.4-kdrive-rotation.patch;patch=1 \ file://split_multiple_AC_SUBST.patch;patch=1 \ + file://vm86_masks.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" diff --git a/recipes/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf new file mode 100644 index 0000000000..07d849d705 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-conf/cm-t35/xorg.conf @@ -0,0 +1,29 @@ +Section "Module" + Load "extmod" + Load "dbe" + Load "glx" + Load "freetype" + Load "type1" + Load "record" + Load "dri" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 8945e1e8f1..77e0f8df48 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r16" +PR = "r17" SRC_URI = "file://xorg.conf" |