summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-xserver/xserver-xorg
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-xorg')
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/dri.patch10
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/drmfix.patch13
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/fontfile.patch11
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/freetype.patch22
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch11
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch38
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch11
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/xorg.conf149
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch30
9 files changed, 295 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xorg/dri.patch b/meta/packages/xorg-xserver/xserver-xorg/dri.patch
new file mode 100644
index 0000000000..37d0407fe4
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/dri.patch
@@ -0,0 +1,10 @@
1--- xc/extras/drm/shared/drm.h.old 2004-09-14 21:42:45.000000000 +0100
2+++ xc/extras/drm/shared/drm.h 2004-09-14 21:42:47.000000000 +0100
3@@ -38,7 +38,6 @@
4 #define _DRM_H_
5
6 #if defined(__linux__)
7-#include <linux/config.h>
8 #include <asm/ioctl.h> /* For _IO* macros */
9 #define DRM_IOCTL_NR(n) _IOC_NR(n)
10 #define DRM_IOC_VOID _IOC_NONE
diff --git a/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch b/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch
new file mode 100644
index 0000000000..04b0c1ae4f
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch
@@ -0,0 +1,13 @@
1Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
2===================================================================
3--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
4+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
5@@ -24,7 +24,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid
6
7 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
8
9-INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
10+INCLUDES = $(XORG_INCS) $(LIBDRM_CFLAGS)
11
12 # FIXME: These need to be added to the build
13 LNX_EXTRA_SOURCES = \
diff --git a/meta/packages/xorg-xserver/xserver-xorg/fontfile.patch b/meta/packages/xorg-xserver/xserver-xorg/fontfile.patch
new file mode 100644
index 0000000000..ed39bf45d0
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/fontfile.patch
@@ -0,0 +1,11 @@
1--- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100
2+++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100
3@@ -14,7 +14,7 @@
4 #endif
5
6 INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \
7- -I$(INCLUDESRC)
8+ -I$(INCLUDESRC) $(CC_STAGING)
9 HEADERS =
10 #ifdef FontFormatDefines
11 FORMAT_DEFS = FontFormatDefines
diff --git a/meta/packages/xorg-xserver/xserver-xorg/freetype.patch b/meta/packages/xorg-xserver/xserver-xorg/freetype.patch
new file mode 100644
index 0000000000..0ba3dd5627
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/freetype.patch
@@ -0,0 +1,22 @@
1--- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100
2+++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100
3@@ -20,7 +20,7 @@
4
5 INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
6 -I$(SERVERSRC)/include $(EXTRAINCLUDES) \
7- -I$(INCLUDESRC)
8+ -I$(INCLUDESRC) $(CC_STAGING)
9
10 SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c
11 OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o
12--- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100
13+++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100
14@@ -3371,7 +3371,7 @@
15
16 #if BuildFreetype2Library || HasFreetype2
17 #if Freetype2IncDirStandard
18-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
19+FREETYPE2INCLUDES = `pkg-config --cflags freetype2`
20 #else
21 FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
22 #endif
diff --git a/meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch b/meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch
new file mode 100644
index 0000000000..57821075ef
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch
@@ -0,0 +1,11 @@
1--- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100
2+++ xc/config/cf/Imake.tmpl 2005-05-05 21:04:49.000000000 +0100
3@@ -2058,7 +2058,7 @@
4 * INCLUDES contains client-specific includes set in Imakefile
5 * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
6 */
7- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
8+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
9 ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
10 CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
11 LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
diff --git a/meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch b/meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch
new file mode 100644
index 0000000000..bf2e350830
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch
@@ -0,0 +1,38 @@
1--- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
2+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
3@@ -2038,11 +2038,11 @@
4 */
5 ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
6 ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
7- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
8+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
9 LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
10 LDPRELIB = LdPreLib $(INSTALLED_LIBS)
11 LDPOSTLIB = LdPostLib
12- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
13+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
14 CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
15
16 LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
17--- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
18+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
19@@ -114,7 +114,7 @@
20 STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
21 CDEBUGFLAGS = LibraryCDebugFlags
22 CLIBDEBUGFLAGS = LibraryDebugOpt
23- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
24+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
25 # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
26 PICFLAGS = LargePositionIndependentCFlags
27 # endif
28--- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
29+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
30@@ -3359,7 +3359,7 @@
31 FREETYPE2LIBDIR = Freetype2LibDir
32 FREETYPE2INCDIR = Freetype2IncDir
33 #if Freetype2LibDirStandard
34-FREETYPE2LIB = -lfreetype
35+FREETYPE2LIB = $(LD_STAGING) -lfreetype
36 #else
37 FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
38 #endif
diff --git a/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch b/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
new file mode 100644
index 0000000000..fbade4319a
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
@@ -0,0 +1,11 @@
1--- temp/xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2005-12-01 23:02:44.000000000 -0700
2+++ xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2006-04-18 23:16:04.315823560 -0600
3@@ -2,7 +2,7 @@
4
5 AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
6
7-INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
8+INCLUDES = -I$(top_srcdir)/miext/shadow -I$(top_srcdir)/hw/xfree86/os-support
9
10 liblayer_la_SOURCES = \
11 layer.h \
diff --git a/meta/packages/xorg-xserver/xserver-xorg/xorg.conf b/meta/packages/xorg-xserver/xserver-xorg/xorg.conf
new file mode 100644
index 0000000000..34f4465764
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/xorg.conf
@@ -0,0 +1,149 @@
1
2# xorg configuration
3
4Section "ServerLayout"
5 Identifier "Default Layout"
6 Screen 0 "Screen0" 0 0
7 InputDevice "Mouse0" "CorePointer"
8 InputDevice "Keyboard0" "CoreKeyboard"
9EndSection
10
11Section "Files"
12
13# RgbPath is the location of the RGB database. Note, this is the name of the
14# file minus the extension (like ".txt" or ".db"). There is normally
15# no need to change the default.
16# Multiple FontPath entries are allowed (they are concatenated together)
17# By default, Red Hat 6.0 and later now use a font server independent of
18# the X server to render fonts.
19# FontPath "unix/:7100"
20 FontPath "/usr/lib/X11/fonts/misc"
21EndSection
22
23Section "Module"
24 Load "dbe"
25 Load "extmod"
26 Load "fbdevhw"
27# Load "glx"
28 Load "record"
29 Load "freetype"
30 Load "type1"
31# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox
32# Load "z4l"
33EndSection
34
35Section "InputDevice"
36
37# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
38# Option "Xleds" "1 2 3"
39# To disable the XKEYBOARD extension, uncomment XkbDisable.
40# Option "XkbDisable"
41# To customise the XKB settings to suit your keyboard, modify the
42# lines below (which are the defaults). For example, for a non-U.S.
43# keyboard, you will probably want to use:
44# Option "XkbModel" "pc102"
45# If you have a US Microsoft Natural keyboard, you can use:
46# Option "XkbModel" "microsoft"
47#
48# Then to change the language, change the Layout setting.
49# For example, a german layout can be obtained with:
50# Option "XkbLayout" "de"
51# or:
52# Option "XkbLayout" "de"
53# Option "XkbVariant" "nodeadkeys"
54#
55# If you'd like to switch the positions of your capslock and
56# control keys, use:
57# Option "XkbOptions" "ctrl:swapcaps"
58# Or if you just want both to be control, use:
59# Option "XkbOptions" "ctrl:nocaps"
60#
61 Identifier "Keyboard0"
62 Driver "keyboard"
63 Option "XkbModel" "pc105"
64 Option "XkbLayout" "us"
65EndSection
66
67Section "InputDevice"
68 Identifier "Mouse0"
69 Driver "mouse"
70 Option "Protocol" "PS/2"
71# Option "Protocol" "IMPS/2"
72 Option "Device" "/dev/psaux"
73# Option "Device" "/dev/input/mice"
74 Option "ZAxisMapping" "4 5"
75 Option "Emulate3Buttons" "yes"
76EndSection
77
78Section "Monitor"
79 Identifier "Monitor0"
80 VendorName "Monitor Vendor"
81 ModelName "NEC FP2141SB"
82# DisplaySize 400 300
83# Note: setting HorizSync/VertRefresh will override DDC probe
84# HorizSync 30.0 - 140.0
85# VertRefresh 25.0 - 160.0
86 Option "dpms"
87EndSection
88
89Section "Monitor"
90 Identifier "Monitor1"
91 VendorName "Generic Vendor"
92 ModelName "Generic Monitor"
93 HorizSync 28-50
94 VertRefresh 43-73
95 Modeline "800x600-60" 40.0000 800 840 976 1056 600 601 605 628
96 Modeline "800x600-72" 50.0000 800 856 976 1040 600 637 643 666
97 Modeline "640x480-60" 25.1749 640 656 744 800 480 490 492 525 -HSync -VSync
98 Modeline "640x480-72" 31.5000 640 664 704 832 480 489 492 520 -HSync -VSync
99 Option "dpms"
100EndSection
101
102
103Section "Device"
104 Identifier "Videocard0"
105 Driver "s3"
106# Driver "nv"
107 VendorName "Videocard vendor"
108 BoardName "S3 driver"
109 #BoardName "NVidia driver"
110EndSection
111
112Section "Device"
113 Identifier "FBDev"
114 Driver "fbdev"
115 #Option "shadowfb" "off"
116 VideoRam 4096
117EndSection
118
119Section "Screen"
120 Identifier "Screen0"
121 Device "Videocard0"
122 Monitor "Monitor0"
123# DefaultDepth 8
124 DefaultDepth 16
125# DefaultDepth 24
126
127 SubSection "Display"
128 Depth 8
129 Modes "1024x768" "800x600" "640x480"
130 EndSubsection
131
132 SubSection "Display"
133 Depth 16
134 Modes "1024x768" "800x600" "640x480"
135 EndSubsection
136
137 SubSection "Display"
138 Depth 24
139 FbBpp 32
140 Modes "1024x768" "800x600" "640x480"
141 EndSubsection
142
143EndSection
144
145Section "DRI"
146 Group 0
147 Mode 0666
148EndSection
149
diff --git a/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch b/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
new file mode 100644
index 0000000000..17d05d3ff8
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
@@ -0,0 +1,30 @@
1--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am.orig 2006-06-23 10:20:42.126095128 -0600
2+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am 2006-06-23 10:20:50.923757680 -0600
3@@ -1,6 +1,6 @@
4 xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
5
6-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
7+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
8
9 XPFONTS = \
10 AvantGarde-Book.pmf \
11--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am.orig 2006-06-23 10:21:02.877940368 -0600
12+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am 2006-06-23 10:21:11.903568264 -0600
13@@ -1,6 +1,6 @@
14 xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
15
16-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
17+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
18
19 XPFONTS = \
20 AvantGarde-Book.pmf \
21--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am.orig 2006-06-23 10:21:22.893897480 -0600
22+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am 2006-06-23 10:21:28.412058592 -0600
23@@ -1,6 +1,6 @@
24 xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
25
26-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
27+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
28
29 XPFONTS = \
30 Courier-Bold.pmf \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-06 11:47:48 +0000