From b18260736035e936287c62644d286b7110a80bfe Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 9 Oct 2013 18:38:39 +0200 Subject: xserver: remove the 1.13 recipe, as 1.14 now works --- .../xorg-xserver/xserver-xorg-1.13.1/aarch64.patch | 64 --------- .../xserver-xorg-1.13.1/crosscompile.patch | 22 --- .../fix_open_max_preprocessor_error.patch | 15 -- .../xserver-xorg-1.13.1/macro_tweak.patch | 25 ---- .../xserver-xorg-1.13.1/mips64-compiler.patch | 29 ---- recipes-graphics/xorg-xserver/xserver-xorg.inc | 160 --------------------- .../xorg-xserver/xserver-xorg_1.13.1.bb | 35 ----- 7 files changed, 350 deletions(-) delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/crosscompile.patch delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg.inc delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb (limited to 'recipes-graphics') diff --git a/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch b/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch deleted file mode 100644 index 8a4f3e3..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch +++ /dev/null @@ -1,64 +0,0 @@ -Subject: Add AArch64 support to xserver-xorg -Author: Marcin Juszkiewicz - -lnx_video.c parts are not existing in 1.14 branch. - -Xserver was checked in AArch64 fastmodel (commercial one with graphics support). - -http://patchwork.freedesktop.org/patch/12785/ - -Upstream-status: Pending - ---- - hw/xfree86/os-support/linux/lnx_video.c | 4 ++-- - include/servermd.h | 7 +++++++ - 2 files changed, 9 insertions(+), 2 deletions(-) - ---- xorg-server-1.13.1.orig/hw/xfree86/os-support/linux/lnx_video.c -+++ xorg-server-1.13.1/hw/xfree86/os-support/linux/lnx_video.c -@@ -509,11 +509,11 @@ xf86EnableIO(void) - return FALSE; - } - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); - else - FatalError("xf86EnableIOPorts: failed to set IOPL" -@@ -538,11 +538,11 @@ xf86DisableIO(void) - if (!ExtendedEnabled) - return; - #if defined(__powerpc__) - munmap(ioBase, 0x20000); - ioBase = NULL; --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__) - iopl(0); - ioperm(0, 1024, 0); - #endif - ExtendedEnabled = FALSE; - ---- xorg-server-1.13.1.orig/include/servermd.h -+++ xorg-server-1.13.1/include/servermd.h -@@ -243,10 +243,17 @@ SOFTWARE. - #define BITMAP_BIT_ORDER LSBFirst - #define GLYPHPADBYTES 4 - /* ???? */ - #endif /* AMD64 */ - -+#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64) -+#define IMAGE_BYTE_ORDER MSBFirst -+#define BITMAP_BIT_ORDER MSBFirst -+#define GLYPHPADBYTES 4 -+/* ???? */ -+#endif /* AArch64 */ -+ - #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \ - defined(__alpha__) || defined(__alpha) || \ - defined(__i386__) || \ - defined(__s390x__) || defined(__s390__) - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/crosscompile.patch b/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/crosscompile.patch deleted file mode 100644 index 2f98bb8..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/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/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch b/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch deleted file mode 100644 index 2f62972..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -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/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch b/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch deleted file mode 100644 index ec0eea6..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch +++ /dev/null @@ -1,25 +0,0 @@ -This is the revised version of files/macro_tweak.patch for -xorg-server 1.8.99.904 and newer. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke - -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/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch b/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch deleted file mode 100644 index 168368e..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch +++ /dev/null @@ -1,29 +0,0 @@ -on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well -so we end up with incompatible conversion errors - -This patch choses the right values for mips64 - -Signed-off-by: Khem Raj - -Upstream-Status: Pending -Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h -=================================================================== ---- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 -+++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 -@@ -101,6 +101,7 @@ - #if defined(NO_INLINE) || defined(DO_PROTOTYPES) - #if !defined(__arm__) - #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ -+ && !defined(__mips64) \ - && !(defined(__alpha__) && defined(linux)) \ - && !(defined(__ia64__) && defined(linux)) \ - -@@ -721,7 +722,7 @@ - } - - #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) --#ifdef __arm32__ -+#if defined (__arm32__) || defined (__mips64) - #define PORT_SIZE long - #else - #define PORT_SIZE short diff --git a/recipes-graphics/xorg-xserver/xserver-xorg.inc b/recipes-graphics/xorg-xserver/xserver-xorg.inc deleted file mode 100644 index 5d5443c..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ /dev/null @@ -1,160 +0,0 @@ -DESCRIPTION = "The X.Org X server" -HOMEPAGE = "http://www.x.org" -SECTION = "x11/base" -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13" - -# xf86-*-* packages depend on an X server built with the xfree86 DDX -# so we have a virtual to represent that: -# deprecated, we should use virtual/xserver instead -PROVIDES = "virtual/xserver-xf86" - -# Other packages tend to just care that there is *an* X server: -PROVIDES += "virtual/xserver" - -PE = "2" -INC_PR = "r8" - -XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -SRC_URI += "file://macro_tweak.patch" - -S = "${WORKDIR}/${XORG_PN}-${PV}" - -inherit autotools pkgconfig - -PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" -LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" - -# Split out some modules and extensions from the main package -# These aren't needed for basic operations and only take up space: -# 32.0k libdri.so -# 91.0k libexa.so -# 336.0k libglx.so -# 1360k libint10.so -# 180.0k libwfb.so -# 320.0k libxaa.so -# 124.0k libxf1bpp.so -# 84.0k libxf4bpp.so -# librecord.so -# libextmod.so -# libdbe.so - -PACKAGES =+ "${PN}-security-policy \ - ${PN}-sdl \ - ${PN}-fbdev \ - ${PN}-xvfb \ - ${PN}-utils \ - ${PN}-xephyr \ - ${PN}-multimedia-modules \ - ${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-glx \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - ${PN}-module-libint10 \ - ${PN}-module-libafb \ - ${PN}-module-libwfb \ - ${PN}-module-libmfb \ - ${PN}-module-libcfb \ - ${PN}-module-exa \ - ${PN}-module-xaa \ - ${PN}-module-libxf1bpp \ - ${PN}-module-libxf4bpp" - -RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" -RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" - -FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" -FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" -FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" -FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ - ${libdir}/xorg/modules/*/.debug \ - ${libdir}/xorg/modules/*/*/.debug \ - " -FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" -FILES_${PN}-sdl = "${bindir}/Xsdl" -FILES_${PN}-fbdev = "${bindir}/Xfbdev" -FILES_${PN}-xvfb = "${bindir}/Xvfb" -FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN}-xephyr = "${bindir}/Xephyr" -FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" -FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" -FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" -FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" -FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" -FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" -FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" -FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" -FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" -FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" -FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" -FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" -FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" -FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" -FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" -FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" - -EXTRA_OECONF += "--with-fop=no \ - --without-xmlto \ - --with-pic \ - --disable-static \ - --disable-acfb \ - --disable-ccfb \ - --disable-mcfb \ - --disable-xinerama \ - --disable-xf86misc \ - --disable-xorgcfg \ - --disable-record \ - --disable-dmx \ - --disable-xnest \ - --disable-xvfb \ - --enable-composite \ - --without-dtrace \ - --with-int10=x86emu \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-fontdir=${datadir}/fonts/X11 \ - --with-xkb-output=/var/lib/xkb \ - ac_cv_file__usr_share_sgml_X11_defs_ent=no \ -" - -PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" -PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" -PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ - --disable-dri --disable-dri2 --disable-glx,\ - xf86driproto dri2proto mesa-dri" - -do_install_append () { - # Its assumed base-files creates this for us - rmdir ${D}${localstatedir}/log/ -} - -# Add runtime provides for the ABI versions of the video and input subsystems, -# so that drivers can depend on the relevant version. -python populate_packages_prepend() { - import subprocess - - # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going - # into the new package, not the staged ones. - newenv = dict(os.environ) - newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/") - - def get_abi(name): - abis = { - "video": "abi_videodrv", - "input": "abi_xinput" - } - p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], - shell=True, env=newenv, stdout=subprocess.PIPE) - output = p.communicate()[0] - mlprefix = d.getVar('MLPREFIX', True) or '' - return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) - - pn = d.getVar("PN", True) - d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) - d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) -} diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb deleted file mode 100644 index 50b3117..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -require xserver-xorg.inc - -# Misc build failure for master HEAD -SRC_URI += "file://crosscompile.patch \ - file://fix_open_max_preprocessor_error.patch \ - file://mips64-compiler.patch \ - file://aarch64.patch \ - " - -SRC_URI[md5sum] = "a13d8876e3e804189392119638a07a1f" -SRC_URI[sha256sum] = "c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00" - -PR = "${INC_PR}.0" - -# These extensions are now integrated into the server, so declare the migration -# path for in-place upgrades. - -RREPLACES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RPROVIDES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RCONFLICTS_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -- cgit v1.2.3