summaryrefslogtreecommitdiffstats
path: root/meta/packages/xserver/xserver-xorg
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/xserver/xserver-xorg')
-rw-r--r--meta/packages/xserver/xserver-xorg/dri.patch10
-rw-r--r--meta/packages/xserver/xserver-xorg/fontfile.patch11
-rw-r--r--meta/packages/xserver/xserver-xorg/freetype.patch22
-rw-r--r--meta/packages/xserver/xserver-xorg/imake-installed.patch11
-rw-r--r--meta/packages/xserver/xserver-xorg/imake-staging.patch38
5 files changed, 92 insertions, 0 deletions
diff --git a/meta/packages/xserver/xserver-xorg/dri.patch b/meta/packages/xserver/xserver-xorg/dri.patch
new file mode 100644
index 0000000000..37d0407fe4
--- /dev/null
+++ b/meta/packages/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/xserver/xserver-xorg/fontfile.patch b/meta/packages/xserver/xserver-xorg/fontfile.patch
new file mode 100644
index 0000000000..ed39bf45d0
--- /dev/null
+++ b/meta/packages/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/xserver/xserver-xorg/freetype.patch b/meta/packages/xserver/xserver-xorg/freetype.patch
new file mode 100644
index 0000000000..0ba3dd5627
--- /dev/null
+++ b/meta/packages/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/xserver/xserver-xorg/imake-installed.patch b/meta/packages/xserver/xserver-xorg/imake-installed.patch
new file mode 100644
index 0000000000..57821075ef
--- /dev/null
+++ b/meta/packages/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/xserver/xserver-xorg/imake-staging.patch b/meta/packages/xserver/xserver-xorg/imake-staging.patch
new file mode 100644
index 0000000000..bf2e350830
--- /dev/null
+++ b/meta/packages/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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-18 12:28:21 +0000