diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-16 15:43:45 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-19 07:29:17 +0200 |
commit | 5250895e0421cbd95cb97d201fcb8fbc3a7bcc18 (patch) | |
tree | 61bd75f270c13c23d5d4bbb84926d724eb3b0dc2 /recipes/obsolete | |
parent | 2c2b2d98a72ede9a3cf6213351bcd0019bed686f (diff) | |
download | openembedded-5250895e0421cbd95cb97d201fcb8fbc3a7bcc18.tar.gz |
xorg-xserver: move older not pinned versions to obsolete dir
Acked-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/obsolete')
30 files changed, 519 insertions, 0 deletions
diff --git a/recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff b/recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff new file mode 100644 index 0000000000..65121efc3b --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff @@ -0,0 +1,11 @@ +--- /tmp/configure.ac 2008-10-29 18:53:23.000000000 +0100 ++++ xorg-server-1.4.2/configure.ac 2008-10-29 18:53:40.000000000 +0100 +@@ -865,7 +865,7 @@ + FONTPATH="built-ins" + fi + +-if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then ++if test "x$XCALIBRATE" = xyes ; then + AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) + REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" + else diff --git a/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc b/recipes/obsolete/xorg/xorg-xserver/xorg-xserver-common.inc index 79905d2106..79905d2106 100644 --- a/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc +++ b/recipes/obsolete/xorg/xorg-xserver/xorg-xserver-common.inc diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch new file mode 100644 index 0000000000..72bdcda358 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch @@ -0,0 +1,13 @@ +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) + +--- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am ++++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am +@@ -38,7 +38,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SOURCES = \ diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch new file mode 100644 index 0000000000..6dfe7baeb5 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch @@ -0,0 +1,15 @@ +upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22133 +status: Rejected +comment: It's a bit unclear if this patch was ever needed, but recent versions seem + to work fine without it. + +--- xorg-server-1.3.0.0/render/glyphstr.h~ 2006-09-18 03:04:18.000000000 -0300 ++++ xorg-server-1.3.0.0/render/glyphstr.h 2008-02-03 22:14:23.187159732 -0200 +@@ -25,6 +25,7 @@ + #ifndef _GLYPHSTR_H_ + #define _GLYPHSTR_H_ + ++#include <X11/X.h> + #include <X11/extensions/renderproto.h> + #include "picture.h" + #include "screenint.h" diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch new file mode 100644 index 0000000000..dde76376f3 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch @@ -0,0 +1,15 @@ +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) + +Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200 ++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100 +@@ -41,7 +41,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch new file mode 100644 index 0000000000..dde76376f3 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch @@ -0,0 +1,15 @@ +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) + +Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200 ++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100 +@@ -41,7 +41,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch index 8ebda98975..8ebda98975 100644 --- a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch new file mode 100644 index 0000000000..8ebda98975 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch @@ -0,0 +1,15 @@ +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) + +Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 ++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 +@@ -40,7 +40,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch new file mode 100644 index 0000000000..85db023a6d --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch @@ -0,0 +1,38 @@ +From ddb265e3c5e99065ceeef92ecb9fd94b4c3e169e Mon Sep 17 00:00:00 2001 +From: Daniel Stone <daniel@fooishbar.org> +Date: Thu, 7 May 2009 14:23:25 +0200 +Subject: [PATCH 36/78] configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest + +This fixes the linking for these two when using DRI2, which requires +DLOPEN_LIBS. +(cherry picked from commit ae38151ddda9984effca5bb7c582540061201dce) + +Conflicts: + + configure.ac +--- + configure.ac | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +Index: xorg-server-1.5.3/configure.ac +=================================================================== +--- xorg-server-1.5.3.orig/configure.ac 2008-11-05 11:46:15.000000000 -0800 ++++ xorg-server-1.5.3/configure.ac 2009-09-14 19:48:11.043879237 -0700 +@@ -1215,7 +1215,7 @@ + + if test "x$XVFB" = xyes; then + XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB" +- XVFB_SYS_LIBS="$XVFBMODULES_LIBS" ++ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS" + AC_SUBST([XVFB_LIBS]) + AC_SUBST([XVFB_SYS_LIBS]) + fi +@@ -1233,7 +1233,7 @@ + + if test "x$XNEST" = xyes; then + XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB" +- XNEST_SYS_LIBS="$XNESTMODULES_LIBS" ++ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS" + AC_SUBST([XNEST_LIBS]) + AC_SUBST([XNEST_SYS_LIBS]) + fi diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch new file mode 100644 index 0000000000..17eb0f58a6 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch @@ -0,0 +1,108 @@ +From 70df9cb2b93ed3d4b7d6e201a58951c9981bbc93 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> +Date: Thu, 7 May 2009 14:19:22 +0200 +Subject: [PATCH 35/78] cherry-pick the rest of "glcore: prepare for dynamic loading" + +When f2c30a57e3c6169fbecdbb60ac24ad2a5e9aa8a4 was cherry-picked into the +1.5 branch, some parts were lost. This commit brings the missing bits. + +Conflicts: + + configure.ac +--- + configure.ac | 2 +- + hw/kdrive/ephyr/Makefile.am | 4 ++++ + hw/kdrive/fake/Makefile.am | 4 ++++ + hw/kdrive/fbdev/Makefile.am | 4 ++++ + hw/kdrive/sdl/Makefile.am | 4 ++++ + hw/kdrive/vesa/Makefile.am | 4 ++++ + 6 files changed, 21 insertions(+), 1 deletions(-) + +Index: xorg-server-1.5.3/configure.ac +=================================================================== +--- xorg-server-1.5.3.orig/configure.ac 2009-09-14 19:48:11.043879237 -0700 ++++ xorg-server-1.5.3/configure.ac 2009-09-14 19:49:34.903881120 -0700 +@@ -1964,7 +1964,7 @@ + KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" + KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" + KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" +- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS" ++ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) +Index: xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am +=================================================================== +--- xorg-server-1.5.3.orig/hw/kdrive/ephyr/Makefile.am 2008-11-05 08:52:17.000000000 -0800 ++++ xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am 2009-09-14 19:49:34.903881120 -0700 +@@ -67,6 +67,10 @@ + Xephyr_SOURCES = \ + ephyrinit.c + ++if GLX ++Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++endif ++ + Xephyr_LDADD = \ + libxephyr.a \ + libxephyr-hostx.a \ +Index: xorg-server-1.5.3/hw/kdrive/fake/Makefile.am +=================================================================== +--- xorg-server-1.5.3.orig/hw/kdrive/fake/Makefile.am 2008-07-11 08:12:13.000000000 -0700 ++++ xorg-server-1.5.3/hw/kdrive/fake/Makefile.am 2009-09-14 19:49:34.903881120 -0700 +@@ -16,6 +16,10 @@ + Xfake_SOURCES = \ + fakeinit.c + ++if GLX ++Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++endif ++ + Xfake_LDADD = \ + libfake.a \ + @KDRIVE_LIBS@ \ +Index: xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am +=================================================================== +--- xorg-server-1.5.3.orig/hw/kdrive/fbdev/Makefile.am 2008-07-11 08:12:13.000000000 -0700 ++++ xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am 2009-09-14 19:49:34.903881120 -0700 +@@ -14,6 +14,10 @@ + Xfbdev_SOURCES = \ + fbinit.c + ++if GLX ++Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++endif ++ + Xfbdev_LDADD = \ + libfbdev.a \ + @KDRIVE_LIBS@ +Index: xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am +=================================================================== +--- xorg-server-1.5.3.orig/hw/kdrive/sdl/Makefile.am 2008-07-11 08:12:13.000000000 -0700 ++++ xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am 2009-09-14 19:49:34.903881120 -0700 +@@ -7,6 +7,10 @@ + + Xsdl_SOURCES = sdl.c + ++if GLX ++Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++endif ++ + Xsdl_LDADD = \ + @KDRIVE_LIBS@ \ + @XSDL_LIBS@ +Index: xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am +=================================================================== +--- xorg-server-1.5.3.orig/hw/kdrive/vesa/Makefile.am 2008-11-05 08:52:17.000000000 -0800 ++++ xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am 2009-09-14 19:49:34.903881120 -0700 +@@ -19,6 +19,10 @@ + Xvesa_SOURCES = \ + vesainit.c + ++if GLX ++Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++endif ++ + Xvesa_LDADD = \ + libvesa.a \ + @KDRIVE_LIBS@ diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch new file mode 100644 index 0000000000..8ebda98975 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch @@ -0,0 +1,15 @@ +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) + +Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 ++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 +@@ -40,7 +40,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch index a947582f15..a947582f15 100644 --- a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch index a947582f15..a947582f15 100644 --- a/recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch new file mode 100644 index 0000000000..9e15f42e84 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch @@ -0,0 +1,22 @@ +Index: xorg-server-1.6.1/acinclude.m4 +=================================================================== +--- xorg-server-1.6.1.orig/acinclude.m4 2009-04-14 21:14:56.000000000 +0400 ++++ xorg-server-1.6.1/acinclude.m4 2009-07-15 12:38:33.796848843 +0400 +@@ -147,7 +147,7 @@ + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -163,7 +163,7 @@ + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch new file mode 100644 index 0000000000..fcbeac097c --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch @@ -0,0 +1,15 @@ +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) + +Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am ++++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am +@@ -24,7 +24,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ + +-INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SOURCES = \ diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch new file mode 100644 index 0000000000..ed39bf45d0 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch @@ -0,0 +1,11 @@ +--- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100 ++++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100 +@@ -14,7 +14,7 @@ + #endif + + INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \ +- -I$(INCLUDESRC) ++ -I$(INCLUDESRC) $(CC_STAGING) + HEADERS = + #ifdef FontFormatDefines + FORMAT_DEFS = FontFormatDefines diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch new file mode 100644 index 0000000000..0ba3dd5627 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch @@ -0,0 +1,22 @@ +--- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100 ++++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100 +@@ -20,7 +20,7 @@ + + INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ + -I$(SERVERSRC)/include $(EXTRAINCLUDES) \ +- -I$(INCLUDESRC) ++ -I$(INCLUDESRC) $(CC_STAGING) + + SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c + OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o +--- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100 ++++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100 +@@ -3371,7 +3371,7 @@ + + #if BuildFreetype2Library || HasFreetype2 + #if Freetype2IncDirStandard +-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config ++FREETYPE2INCLUDES = `pkg-config --cflags freetype2` + #else + FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + #endif diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch new file mode 100644 index 0000000000..d3661cbea2 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch @@ -0,0 +1,39 @@ +Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1 +(and probably other) while returning from chvt or resume on some +hardware (e. g. zaurus). + +Correct fix would require debugging of fbdev mode during LeaveVT and +EnterVT. + +This patch may cause staying in incorrect or corrupted display mode +after EnterVT, but on man affected devices it does not cause any visible +problems. + +Hacked code is never called on properly written drivers. + +Devices affected and testers involved for future patch removal: +Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz> + +See also: +https://bugzilla.redhat.com/show_bug.cgi?id=238451 + +The bug (first line indicates that your device is affected): + +(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode + +Fatal server error: +EnterVT failed for screen 0 + +Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +=================================================================== +--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c ++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa + #if DEBUG + print_fbdev_mode("returned", &set_var); + #endif +- return FALSE; ++ /* return FALSE; UGLY HACK to allow return from chvt */ + } + + if (!check) diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch new file mode 100644 index 0000000000..57821075ef --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch @@ -0,0 +1,11 @@ +--- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100 ++++ xc/config/cf/Imake.tmpl 2005-05-05 21:04:49.000000000 +0100 +@@ -2058,7 +2058,7 @@ + * INCLUDES contains client-specific includes set in Imakefile + * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile + */ +- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) ++ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch new file mode 100644 index 0000000000..cd7cbe371c --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch @@ -0,0 +1,15 @@ +upstream: not applicable to upstream + +--- xserver/include/site.h-orig 2006-11-02 10:37:14.000000000 +0000 ++++ xserver/include/site.h 2006-11-02 10:37:14.000000000 +0000 +@@ -117,8 +117,8 @@ + #define DEFAULT_PTR_DENOMINATOR 1 + #define DEFAULT_PTR_THRESHOLD 4 + +-#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000)) +-#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000)) ++#define DEFAULT_SCREEN_SAVER_TIME 0 ++#define DEFAULT_SCREEN_SAVER_INTERVAL 0 + #define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking + #define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures + #ifndef NOLOGOHACK diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch new file mode 100644 index 0000000000..17d05d3ff8 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch @@ -0,0 +1,30 @@ +--- 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 ++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am 2006-06-23 10:20:50.923757680 -0600 +@@ -1,6 +1,6 @@ + xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts + +-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts ++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + + XPFONTS = \ + AvantGarde-Book.pmf \ +--- 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 ++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am 2006-06-23 10:21:11.903568264 -0600 +@@ -1,6 +1,6 @@ + xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts + +-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts ++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + + XPFONTS = \ + AvantGarde-Book.pmf \ +--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am.orig 2006-06-23 10:21:22.893897480 -0600 ++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am 2006-06-23 10:21:28.412058592 -0600 +@@ -1,6 +1,6 @@ + xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts + +-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts ++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + + XPFONTS = \ + Courier-Bold.pmf \ diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb new file mode 100644 index 0000000000..0b2e39958c --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb @@ -0,0 +1,15 @@ +MESA_VER = "6.5.2" + +require xorg-xserver-common.inc +PE = "1" +PR = "${INC_PR}.1" + +export LDFLAGS += " -ldl " + +#DESCRIPTION = "" + +#DEPENDS += " " + +SRC_URI += "file://report-correct-randr10.patch" +SRC_URI[archive.md5sum] = "ea291c89e68832d570d9d5e007218bd6" +SRC_URI[archive.sha256sum] = "e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85" diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb new file mode 100644 index 0000000000..c2ec4b1084 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -0,0 +1,18 @@ +MESA_VER = "6.5.2" + +require xorg-xserver-common.inc +PE = "1" +PR = "${INC_PR}.1" + +SRC_URI += "file://drmfix.patch \ + file://glyphstr.patch \ + file://report-correct-randr12.patch" + +export LDFLAGS += " -ldl " + +#DESCRIPTION = "" + +#DEPENDS += " " + +SRC_URI[archive.md5sum] = "a51a7d482e3c689394755bb17bda8526" +SRC_URI[archive.sha256sum] = "93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975" diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb new file mode 100644 index 0000000000..0f4f8e73c4 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb @@ -0,0 +1,20 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman" +RDEPENDS_${PN} += "hal" +PE = "1" +PR = "${INC_PR}.1" + +SRC_URI += "file://drmfix.patch \ + file://pkgconfig_fix.patch \ + file://sysroot_fix.patch \ + file://xcalibrate-xorg.diff \ +" + +MESA_VER = "7.0.2" + +export LDFLAGS += " -ldl " + +SRC_URI[archive.md5sum] = "fa2915ae377f61c340a18ebef484b64b" +SRC_URI[archive.sha256sum] = "829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d" diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb new file mode 100644 index 0000000000..f1532126c4 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb @@ -0,0 +1,18 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman" +RDEPENDS_${PN} += "hal" +PE = "1" +PR = "${INC_PR}.1" + +SRC_URI += "file://drmfix.patch \ + file://pkgconfig_fix.patch \ + file://sysroot_fix.patch" + +MESA_VER = "7.0.2" + +export LDFLAGS += " -ldl " + +SRC_URI[archive.md5sum] = "a06d9fe4f9f1d459ae02657f9ce64220" +SRC_URI[archive.sha256sum] = "51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2" diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb new file mode 100644 index 0000000000..b1eef4f14f --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb @@ -0,0 +1,17 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl" +RDEPENDS_${PN} += "hal" +PE = "1" +PR = "${INC_PR}.1" + +SRC_URI += "file://drmfix.patch \ + file://sysroot_fix.patch" + +MESA_VER = "7.2" + +export LDFLAGS += " -ldl " + +SRC_URI[archive.md5sum] = "d16f5a033f001c9069b4141194614da2" +SRC_URI[archive.sha256sum] = "2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21" diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb new file mode 100644 index 0000000000..776b87f7c9 --- /dev/null +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb @@ -0,0 +1,21 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl" +RDEPENDS_${PN} += "hal" +PE = "2" +PR = "${INC_PR}.2" + +SRC_URI += "file://drmfix.patch \ + file://sysroot_fix.patch \ + file://xorg-avr32-support.diff \ + file://xorg-server-1.5.3-configure.patch \ + file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch \ +" + +MESA_VER = "7.2" + +export LDFLAGS += " -ldl " + +SRC_URI[archive.md5sum] = "308971036e25250e7fe3cccfd5a120f8" +SRC_URI[archive.sha256sum] = "a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb" diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.6.1.bb index 630ec576d6..630ec576d6 100644 --- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.6.1.bb diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.2.bb index efe68d2180..efe68d2180 100644 --- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.2.bb diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.3.bb index fc8c3540cd..fc8c3540cd 100644 --- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb +++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.3.bb |