diff options
8 files changed, 0 insertions, 246 deletions
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc deleted file mode 100644 index 1c71d7bb..00000000 --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc +++ /dev/null @@ -1,20 +0,0 @@ -SRC_URI += "file://nodolt.patch \ - file://crosscompile.patch" - -# Misc build failure for master HEAD -SRC_URI += "file://fix_open_max_preprocessor_error.patch" - -# What once were warnings now are errors, fix those up -SRC_URI += "file://werror-address-fix.patch \ - file://ptr-to-int-cast-fix.patch" - -PROTO_DEPS += "xf86driproto dri2proto" -DEPENDS += "font-util" -EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353" - -SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201" -SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d" - -PR = "r2" diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch deleted file mode 100644 index 2f98bb8c..00000000 --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff --git a/configure.ac b/configure.ac -index b3b752c..600500b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, - dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross - dnl compiling, assume default font path uses standard FONTROOTDIR directories. - DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" --if test "$cross_compiling" != yes; then -- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], -- [case $host_os in -+ case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; -- esac]) --fi -+ esac - AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), - [ FONTPATH="$withval" ], - [ FONTPATH="${DEFAULT_FONT_PATH}" ]) diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch deleted file mode 100644 index 9c33072c..00000000 --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Index: git/os/osdep.h -=================================================================== ---- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 -+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100 -@@ -92,7 +92,7 @@ - * like sysconf(_SC_OPEN_MAX) is not supported. - */ - --#if OPEN_MAX <= 256 -+#if 0 - #define MAXSOCKS (OPEN_MAX - 1) - #else - #define MAXSOCKS 256 diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/macro_tweak.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/macro_tweak.patch deleted file mode 100644 index 2b754271..00000000 --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/macro_tweak.patch +++ /dev/null @@ -1,30 +0,0 @@ -This is the revised version of files/macro_tweak.patch for -xorg-server 1.8.99.904. - -the files/macro_tweak.patch can not removed now since it is used by -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they -are all upgraded to 1.8.99.904, the the files/macro_tweak.patch -can be safely replace by this patch. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -diff --git a/xorg-server.m4 b/xorg-server.m4 -index bdecf62..040fdb8 100644 ---- a/xorg-server.m4 -+++ b/xorg-server.m4 -@@ -28,10 +28,12 @@ dnl - # Checks for the $1 define in xorg-server.h (from the sdk). If it - # is defined, then add $1 to $REQUIRED_MODULES. - -+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) -+ - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "xorg-server.h" - #if !defined $1 diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/nodolt.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/nodolt.patch deleted file mode 100644 index 9cd7f932..00000000 --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/nodolt.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 -+++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000 -@@ -62,7 +62,6 @@ - AC_LIBTOOL_WIN32_DLL - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --DOLT - AC_PROG_MAKE_SET - PKG_PROG_PKG_CONFIG - AC_PROG_LEX diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/ptr-to-int-cast-fix.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/ptr-to-int-cast-fix.patch deleted file mode 100644 index 705cffcb..00000000 --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/ptr-to-int-cast-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -Upstream-Status: Inappropriate [already upstream] - -It's broken for devices with BARs above 4G, and the sysfs method should -work everywhere anyway. As a pleasant side effect, this fixes some -warnings: - -fbdevhw.c: In function 'fbdev_open_pci': -fbdevhw.c:333:4: warning: cast from pointer to integer of different size -fbdevhw.c:334:4: warning: cast from pointer to integer of different size -fbdevhw.c:336:4: warning: cast from pointer to integer of different size -fbdevhw.c:337:4: warning: cast from pointer to integer of different size - -Signed-off-by: Adam Jackson <ajax (a] redhat.com> -Integrated-by: Tom Zanussi <tom.zanussi (a] intel.com> - -Index: xorg-server-1.9.3/hw/xfree86/fbdevhw/fbdevhw.c -=================================================================== ---- xorg-server-1.9.3.orig/hw/xfree86/fbdevhw/fbdevhw.c 2012-01-12 10:32:07.097729262 -0600 -+++ xorg-server-1.9.3/hw/xfree86/fbdevhw/fbdevhw.c 2012-01-12 10:32:55.076732780 -0600 -@@ -291,14 +291,7 @@ - { - struct fb_fix_screeninfo fix; - char filename[256]; -- int fd,i,j; -- -- -- /* There are two ways to that we can determine which fb device is -- * associated with this PCI device. The more modern way is to look in -- * the sysfs directory for the PCI device for a file named -- * "graphics/fb*" -- */ -+ int fd, i; - - for (i = 0; i < 8; i++) { - sprintf(filename, -@@ -331,55 +324,10 @@ - } - } - -- -- /* The other way is to examine the resources associated with each fb -- * device and see if there is a match with the PCI device. This technique -- * has some problems on certain mixed 64-bit / 32-bit architectures. -- * There is a flaw in the fb_fix_screeninfo structure in that it only -- * returns the low 32-bits of the address of the resources associated with -- * a device. However, on a mixed architecture the base addresses of PCI -- * devices, even for 32-bit applications, may be higher than 0x0f0000000. -- */ -- -- for (i = 0; i < 8; i++) { -- sprintf(filename,"/dev/fb%d",i); -- if (-1 == (fd = open(filename,O_RDWR,0))) { -- xf86DrvMsg(-1, X_WARNING, -- "open %s: %s\n", filename, strerror(errno)); -- continue; -- } -- if (-1 == ioctl(fd,FBIOGET_FSCREENINFO,(void*)&fix)) { -- close(fd); -- continue; -- } -- for (j = 0; j < 6; j++) { -- const pciaddr_t res_start = pPci->regions[j].base_addr; -- const pciaddr_t res_end = res_start + pPci->regions[j].size; -- -- if ((0 != fix.smem_len && -- (pciaddr_t) fix.smem_start >= res_start && -- (pciaddr_t) fix.smem_start < res_end) || -- (0 != fix.mmio_len && -- (pciaddr_t) fix.mmio_start >= res_start && -- (pciaddr_t) fix.mmio_start < res_end)) -- break; -- } -- if (j == 6) { -- close(fd); -- continue; -- } -- if (namep) { -- *namep = xnfalloc(16); -- strncpy(*namep,fix.id,16); -- } -- return fd; -- } -- - if (namep) - *namep = NULL; - -- xf86DrvMsg(-1, X_ERROR, -- "Unable to find a valid framebuffer device\n"); -+ xf86DrvMsg(-1, X_ERROR, "Unable to find a valid framebuffer device\n"); - return -1; - } - diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/werror-address-fix.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/werror-address-fix.patch deleted file mode 100644 index 49d3f947..00000000 --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/werror-address-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -Upstream-Status: Inappropriate [yocto-specific] - -This is fixed upstream by actually making these tests meaningful. -As they stand, the warning is correct and they're no-ops, so remove -them. - -Signed-off-by: Tom Zanussi <tom.zanussi (a] intel.com> - -Index: xorg-server-1.9.3/Xext/xvmc.c -=================================================================== ---- xorg-server-1.9.3.orig/Xext/xvmc.c 2012-01-12 09:57:36.306947860 -0600 -+++ xorg-server-1.9.3/Xext/xvmc.c 2012-01-12 10:24:59.286729946 -0600 -@@ -467,7 +467,6 @@ - return Success; - } - -- - static int - ProcXvMCListSubpictureTypes(ClientPtr client) - { -@@ -487,9 +486,6 @@ - - pScreen = pPort->pAdaptor->pScreen; - -- if(XvMCScreenKey == NULL) /* No XvMC adaptors */ -- return BadMatch; -- - if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen))) - return BadMatch; /* None this screen */ - -@@ -668,9 +664,6 @@ - { - ExtensionEntry *extEntry; - -- if(XvMCScreenKey == NULL) /* nobody supports it */ -- return; -- - if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes, - "XvMCRTContext"))) - return; -@@ -746,8 +739,6 @@ - XvMCAdaptorPtr adaptor = NULL; - int i; - -- if(XvMCScreenKey == NULL) return NULL; -- - if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen))) - return NULL; - diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb b/common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb deleted file mode 100644 index f62cad20..00000000 --- a/common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require recipes-graphics/xorg-xserver/xserver-xorg.inc -require xserver-xorg-${PV}.inc - -PE = "1" |