diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 22:31:25 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 19:43:26 +0300 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /yocto-poky/meta/recipes-graphics | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.xz | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'yocto-poky/meta/recipes-graphics')
397 files changed, 0 insertions, 15817 deletions
diff --git a/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb b/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb deleted file mode 100644 index 0a64c31ab..000000000 --- a/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "New user to do specific job" -DESCRIPTION = "This recipe create a new user named ${PN}, who is used for specific jobs like building. The task can be auto started via mini X" -SECTION = "x11" -PR = "r6" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://builder_session.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e" - -SRC_URI = "file://builder_session.sh \ - " - -S = "${WORKDIR}" - -RDEPENDS_${PN} = "mini-x-session" - -inherit useradd - -# builder user password is "builder" -BUILDER_PASSWORD ?= ".gLibiNXn0P12" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --create-home \ - --groups video,tty,audio \ - --password ${BUILDER_PASSWORD} \ - --user-group builder" - -do_install () { - install -d -m 755 ${D}${sysconfdir}/mini_x/session.d - install -p -m 755 builder_session.sh ${D}${sysconfdir}/mini_x/session.d/ - - chown builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_session.sh -} - diff --git a/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh b/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh deleted file mode 100644 index 001a03357..000000000 --- a/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -#This script will be called via mini X session on behalf of file owner, after -#installed in /etc/mini_x/session.d/. Any auto start jobs including X apps can -#be put here - -# start hob here -export PSEUDO_PREFIX=/usr -export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo -export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64 -export GIT_PROXY_COMMAND=/home/builder/poky/scripts/oe-git-proxy - -#start pcmanfm in daemon mode to allow asynchronous launch -pcmanfm -d& - -#register handlers for some file types -if [ ! -d /home/builder/.local/share/applications ]; then - mkdir -p /home/builder/.local/share/applications/ - #register folders to open with PCManFM filemanager - xdg-mime default pcmanfm.desktop inode/directory - - #register html links and files with epiphany - xdg-mime default epiphany.desktop x-scheme-handler/http - xdg-mime default epiphany.desktop x-scheme-handler/https - xdg-mime default epiphany.desktop text/html - - #register text files with leafpad text editor - xdg-mime default leafpad.desktop text/plain -fi - -cd /home/builder/poky -. ./oe-init-build-env - -matchbox-terminal& diff --git a/yocto-poky/meta/recipes-graphics/cairo/cairo-fpu.inc b/yocto-poky/meta/recipes-graphics/cairo/cairo-fpu.inc deleted file mode 100644 index ef72e8904..000000000 --- a/yocto-poky/meta/recipes-graphics/cairo/cairo-fpu.inc +++ /dev/null @@ -1,6 +0,0 @@ - -def get_cairo_fpu_setting(bb, d): - if d.getVar('TARGET_FPU', True) in [ 'soft' ]: - return "--disable-some-floating-point" - return "" - diff --git a/yocto-poky/meta/recipes-graphics/cairo/cairo.inc b/yocto-poky/meta/recipes-graphics/cairo/cairo.inc deleted file mode 100644 index c7e686d5a..000000000 --- a/yocto-poky/meta/recipes-graphics/cairo/cairo.inc +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "The Cairo 2D vector graphics library" -DESCRIPTION = "Cairo is a multi-platform library providing anti-aliased \ -vector-based rendering for multiple target backends. Paths consist \ -of line segments and cubic splines and can be rendered at any width \ -with various join and cap styles. All colors may be specified with \ -optional translucence (opacity/alpha) and combined using the \ -extended Porter/Duff compositing algebra as found in the X Render \ -Extension." -HOMEPAGE = "http://cairographics.org" -BUGTRACKER = "http://bugs.freedesktop.org" -SECTION = "libs" - -LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+" -LICENSE_${PN} = "MPL-1 & LGPLv2.1" -LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1" -LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1" -LICENSE_${PN}-script-interpreter = "MPL-1 & LGPLv2.1" -LICENSE_${PN}-perf-utils = "GPLv3+" - -X11DEPENDS = "virtual/libx11 libsm libxrender libxext" -DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" - -PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" -PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" -PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" -PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" -PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" -PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" - -#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -require cairo-fpu.inc -EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \ - --enable-tee \ - " - -inherit autotools pkgconfig - -# We don't depend on binutils so we need to disable this -export ac_cv_lib_bfd_bfd_openr="no" -# Ensure we don't depend on LZO -export ac_cv_lib_lzo2_lzo2a_decompress="no" - -BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb b/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb deleted file mode 100644 index 20b46689f..000000000 --- a/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb +++ /dev/null @@ -1,45 +0,0 @@ -require cairo.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" - -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" - -SRC_URI[md5sum] = "23a0b2f0235431d35238df1d3a517fdb" -SRC_URI[sha256sum] = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252" - -UPSTREAM_CHECK_REGEX = "cairo-(?P<pver>\d+(\.\d+)+)\.tar" - -PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" - -SUMMARY_${PN} = "The Cairo 2D vector graphics library" -DESCRIPTION_${PN} = "Cairo is a multi-platform library providing anti-aliased \ -vector-based rendering for multiple target backends. Paths consist \ -of line segments and cubic splines and can be rendered at any width \ -with various join and cap styles. All colors may be specified with \ -optional translucence (opacity/alpha) and combined using the \ -extended Porter/Duff compositing algebra as found in the X Render \ -Extension." - -SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library" -DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API." - -SUMMARY_cairo-script-interpreter = "The Cairo library script interpreter" -DESCRIPTION_cairo-script-interpreter = "The Cairo script interpreter implements \ -CairoScript. CairoScript is used by tracing utilities to enable the ability \ -to replay rendering." - -DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" - -FILES_${PN} = "${libdir}/libcairo.so.*" -FILES_${PN}-dev += "${libdir}/cairo/*.so" -FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*" -FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" -FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*" - -do_install_append () { - rm -rf ${D}${bindir}/cairo-sphinx - rm -rf ${D}${libdir}/cairo/cairo-fdr* - rm -rf ${D}${libdir}/cairo/cairo-sphinx* - rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* - rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* -} diff --git a/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb b/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb deleted file mode 100644 index 127f0a1c3..000000000 --- a/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Cantarell, a Humanist sans-serif font family" - -DESCRIPTION = "The Cantarell font typeface is designed as a \ - contemporary Humanist sans serif, and was developed for \ - on-screen reading; in particular, reading web pages on an \ - HTC Dream mobile phone." - -HOMEPAGE = "https://git.gnome.org/browse/cantarell-fonts/" -SECTION = "fonts" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=df91e3ffcab8cfb972a66bf11255188d" - -PV = "0.0.21+git${SRCPV}" - -SRCREV = "611c169df5287c059d63b0c8f0570647c75c9189" -SRC_URI = "git://git.gnome.org/cantarell-fonts;protocol=git;branch=master" - -S = "${WORKDIR}/git" - -inherit autotools allarch fontcache - -PACKAGECONFIG ??= "" -PACKAGECONFIG[fontforge] = "--enable-source-rebuild=yes,--enable-source-rebuild=no,fontforge-native" -FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc deleted file mode 100644 index c6ecd0804..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2.1+" - -inherit clutter ptest-gnome distro_features_check upstream-version-is-even gobject-introspection -# depends on cogl-1.0 which needs opengl -REQUIRED_DISTRO_FEATURES ?= "opengl" - -DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" -PACKAGE_BEFORE_PN += "${PN}-examples" -AUTOTOOLS_AUXDIR = "${S}/build" - -EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" -EDEPENDS_GLX = "virtual/libgl" -EDEPENDS_EGL = "virtual/egl" -EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf" - -EDEPENDS_EVDEV = "libxkbcommon" -ERDEPENDS_EVDEV = "xkeyboard-config" - -# Disable pretty much everything, override in platform specific set up -EXTRA_OECONF += "--disable-quartz-backend \ - --disable-win32-backend \ - --disable-gdk-backend \ - --disable-cex100-backend \ - --disable-tslib-input \ - " - -PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" -PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" -PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" -PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" -PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}" -PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" - -# Default configuration, distros might want to override -PACKAGECONFIG ??= "egl \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" - -FILES_${PN}-examples = "${libdir}/clutter/examples" - -do_configure_prepend() { - # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this - touch -t 200001010000 ${S}/po/clutter-1.0.pot -} diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch deleted file mode 100644 index c4edff395..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 483a4bb00e7dd2f14d86e167c8013c8638723c33 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Thu, 18 Feb 2016 17:19:09 +0000 -Subject: [PATCH] build: Use AC_COMPILE_IFELSE - -Instead of AC_TRY_COMPILE, which has been deprecated by newer autoconf. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - configure.ac | 66 ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 33 insertions(+), 33 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4d72e0c..8ca3f94 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -348,24 +348,25 @@ AS_IF([test "x$enable_wayland" != xno], - # We need to manually check for Wayland support in Cogl because - # the windowing systems are not exposed in the pkg-config file - saved_CFLAGS="${CFLAGS}" -- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" -+ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" - - AC_MSG_CHECKING([for Wayland Cogl backend]) -- AC_TRY_COMPILE([#include <cogl/cogl.h>], -- [ -- #ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT -- #error "No Wayland support in Cogl" -- #endif -- int main (void) { return 0; } -- ], -- [ -- AC_MSG_RESULT(yes) -- have_cogl_wayland=yes -- ], -- [ -- AC_MSG_RESULT(no) -- have_cogl_wayland=no -- ]) -+ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#include <cogl/cogl.h> -+]], -+[[ -+#ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT -+#error Cogl compiled without Wayland support -+#endif -+]])], [ -+ AC_MSG_RESULT(yes) -+ have_cogl_wayland=yes -+ ], [ -+ AC_MSG_RESULT(no) -+ have_cogl_wayland=no -+ ]) -+ - CFLAGS="${saved_CFLAGS}" - AS_IF([test "x$have_cogl_wayland" = xyes], - [ -@@ -499,26 +500,25 @@ AS_IF([test "x$enable_mir" = "xyes"], - # We need to manually check for Mir support in Cogl because - # the windowing systems are not exposed in the pkg-config file - saved_CFLAGS="${CFLAGS}" -- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" -+ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" - - AC_MSG_CHECKING([for Mir Cogl backend]) -- AC_TRY_COMPILE([#include <cogl/cogl.h>], -- [ -- #ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT -- #error "No Mir support in Cogl" -- #endif -- int main (void) { return 0; } -- ], -- [ -- AC_MSG_RESULT(yes) -- have_cogl_mir=yes -- ], -- [ -- AC_MSG_RESULT(no) -- have_cogl_mir=no -- ]) - -- CFLAGS="${saved_CFLAGS}" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#include <cogl/cogl.h> -+]], -+[[ -+#ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT -+#error Cogl compiled without Mir support -+#endif -+]])], [ -+ AC_MSG_RESULT(yes) -+ have_cogl_mir=yes -+ ], [ -+ AC_MSG_RESULT(no) -+ have_cogl_mir=no -+ ]) -+ - AS_IF([test "x$have_cogl_mir" = xno], [AC_MSG_ERROR("*** Cogl is missing Mir support.")]) - - PKG_CHECK_EXISTS([mirclient], --- -1.9.1 - diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch deleted file mode 100644 index 3b6a70ef0..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch +++ /dev/null @@ -1,18 +0,0 @@ -Install the examples to $libdir/clutter/. - -Signed-off-by: Ross Burton <ross.burton@intel.com> -Upstream-Status: Inappropriate - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 4b9b449..232cd19 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -38,6 +38,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter - --noinst_PROGRAMS = $(all_examples) -+exampledir = $(pkglibdir)/examples -+example_PROGRAMS = $(all_examples) - - EXTRA_DIST = redhand.png diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch deleted file mode 100644 index f5c18c582..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 668e1d14af13249384ab324c7d79ec4147f07e48 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Mon, 27 Apr 2015 20:12:33 +0300 -Subject: [PATCH] Run installed tests with tap output - -Configure output from installed-tests to be TAP compliant such that -gnome-desktop-testing-runner properly interprets the results. - -Upstream-Status: Pending - -Signed-off-by: Tim Orling <TicoTimo@gmail.com> ---- - build/autotools/glib-tap.mk | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build/autotools/glib-tap.mk b/build/autotools/glib-tap.mk -index 7c5f82b..844e17e 100644 ---- a/build/autotools/glib-tap.mk -+++ b/build/autotools/glib-tap.mk -@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) - %.test: %$(EXEEXT) Makefile - $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ - echo 'Type=session' >> $@.tmp; \ -- echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ -+ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ -+ echo 'Output=TAP' >> $@.tmp; \ - mv $@.tmp $@) - - CLEANFILES += $(installed_test_meta_DATA) --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest deleted file mode 100644 index 98877e522..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -gnome-desktop-testing-runner clutter diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb deleted file mode 100644 index c53b3e71b..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require clutter-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "3b98e1b33719982a5736ae42cbf7183e" -SRC_URI[archive.sha256sum] = "9631c98cb4bcbfec15e1bbe9eaa6eef0f127201552fce40d7d28f2133803cd63" -SRC_URI += "file://install-examples.patch \ - file://run-installed-tests-with-tap-output.patch \ - file://0001-build-Use-AC_COMPILE_IFELSE.patch \ - file://run-ptest" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc deleted file mode 100644 index 4c877982b..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "GStreamer integration library for Clutter" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2+" - -inherit clutter distro_features_check upstream-version-is-even gobject-introspection -# depends on clutter-1.0 which depends on cogl-1.0 -REQUIRED_DISTRO_FEATURES ?= "opengl" - -SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" - -DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0 libgudev" -RDEPENDS_${PN} += "gstreamer1.0-meta-base" -PACKAGES =+ "${PN}-examples" - -FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch deleted file mode 100644 index 0b26b990d..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d77c711277bf075ce0545c19b322f040c49c778a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 30 Apr 2015 12:19:13 +0300 -Subject: [PATCH] Install example binary needed for core-image-clutter - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [configuration] - -Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, -commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 3.0 - -Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - examples/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index bfbc1b5..09655e3 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,6 +1,6 @@ - NULL = # - --noinst_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content -+bin_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content - - AM_CPPFLAGS = -I$(top_srcdir) \ - $(MAINTAINER_CFLAGS) \ --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb deleted file mode 100644 index fcf5242c5..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb +++ /dev/null @@ -1,7 +0,0 @@ -require clutter-gst-3.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" - -SRC_URI[archive.md5sum] = "ca24eb92a0d34fc9e66fd686a965d51c" -SRC_URI[archive.sha256sum] = "803e8b7265e63e0581e21fd0c6064792dfe951512e9f515e9e7a9b452caaf9f0" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc deleted file mode 100644 index 05c4e5f5c..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2+" - -inherit clutter distro_features_check upstream-version-is-even gobject-introspection -# depends on clutter-1.0 which depends on cogl-1.0 -REQUIRED_DISTRO_FEATURES ?= "opengl" -# depends on gtk+3 -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -DEPENDS = "clutter-1.0 gtk+3" -PACKAGES =+ "${PN}-examples" -AUTOTOOLS_AUXDIR = "${S}/build" - - diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb deleted file mode 100644 index 23257bb9c..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require clutter-gtk-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI[archive.md5sum] = "79dc3d7a8645f87d83a9ccca8a08aa8e" -SRC_URI[archive.sha256sum] = "9440a68600f58d00fe0af35383738943e8ead9907f4cf507a102d96822434a28" diff --git a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc deleted file mode 100644 index 690ea3b86..000000000 --- a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc +++ /dev/null @@ -1,75 +0,0 @@ -SUMMARY = "Modern 3D graphics API with associated utility APIs" -HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" -LICENSE = "MIT" - -inherit clutter distro_features_check upstream-version-is-even gobject-introspection -# cogl-1.0 needs opengl to build -REQUIRED_DISTRO_FEATURES ?= "opengl" - -DEPENDS = "glib-2.0 gdk-pixbuf" -PACKAGES =+ "${PN}-examples \ - libcogl libcogl-gles2 libcogl-pango libcogl-path \ - " -AUTOTOOLS_AUXDIR = "${S}/build" - -# Extra DEPENDS for PACKAGECONFIG -EDEPENDS_GL = "virtual/libgl libdrm" -EDEPENDS_GLES2 = "virtual/libgles2" -EDEPENDS_KMS = "libdrm virtual/egl" -EDEPENDS_EGL = "virtual/egl" -EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" -EDEPENDS_WAYLAND = "virtual/mesa wayland" - -# Extra RDEPENDS for PACKAGECONFIG -# This has to be explictly listed, because cogl dlopens the backends -ERDEPENDS_GL = "libgl" -ERDEPENDS_GLES2 = "libgles2" - -# GLESv1 is rarely tested, so disable it -EXTRA_OECONF += "--enable-examples-install \ - --enable-debug \ - --disable-gles1 \ - --disable-cairo \ - " - -# OpenGL/GLX -PACKAGECONFIG[glx] = "--enable-gl --enable-glx,--disable-gl --disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11},${ERDEPENDS_GL}" - -# GLESv2 -PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" - -# EGL backends -PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" -PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" -PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" -PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" - -# Wayland (server-side) -PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" - -# Support rendering text directly with Pango -PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" - -# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by -# default. -PACKAGECONFIG ??= "cogl-pango gles2 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ - " - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" -} - -FILES_${PN} = "" -FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" -FILES_libcogl = "${libdir}/libcogl${SOLIBS} ${libdir}/girepository-1.0/Cogl-*.typelib" -FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" -FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS} ${libdir}/girepository-1.0/CoglPango*.typelib" - -FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" - -# For backwards compatibility after Debian-renaming -RPROVIDES_libcogl = "cogl-1.0" -RCONFLICTS_libcogl = "cogl-1.0" -RREPLACES_libcogl = "cogl-1.0" diff --git a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch deleted file mode 100644 index 479a0ff4b..000000000 --- a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a51f61d675a0e7d6649182c6a1325ceab8342df2 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Mon, 4 Jan 2016 22:47:29 -0800 -Subject: [PATCH] test-backface-culling.c: fix may be used uninitialized error - -Fixed when gcc -O: -test-backface-culling.c:206:7: error: 'cull_front' may be used uninitialized in this function [-Werror=maybe-uninitialized] -| validate_part (framebuffer, -| ^ -| cc1: some warnings being treated as errors - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - tests/conform/test-backface-culling.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-backface-culling.c -index e90c2f5..7c45592 100644 ---- a/tests/conform/test-backface-culling.c -+++ b/tests/conform/test-backface-culling.c -@@ -164,7 +164,8 @@ validate_result (CoglFramebuffer *framebuffer, int y_offset) - - for (draw_num = 0; draw_num < 16; draw_num++) - { -- CoglBool cull_front, cull_back; -+ CoglBool cull_front = FALSE; -+ CoglBool cull_back = FALSE; - CoglPipelineCullFaceMode cull_mode; - - if (USE_LEGACY_STATE (draw_num)) --- -1.7.9.5 - diff --git a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb deleted file mode 100644 index ed10c7a39..000000000 --- a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require cogl-1.0.inc - -SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch" - -LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" -SRC_URI[archive.md5sum] = "ab684ec96848d79d22757fb3064820c8" -SRC_URI[archive.sha256sum] = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91" diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch deleted file mode 100644 index 0717ea6f8..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 88077ed156a714f32bb408f422278d61611ffd41 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Sat, 26 Jul 2014 16:57:46 -0300 -Subject: [PATCH] configure.in: Fix string argument syntax - -Upstream-Status: Submitted - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index bfe1b82..e939bbd 100644 ---- a/configure.in -+++ b/configure.in -@@ -65,7 +65,7 @@ fi) - - DIRECTFB_REQUIRED_VERSION=1.4.14 - --PKG_CHECK_MODULES(DIRECTFB, directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], -+PKG_CHECK_MODULES([DIRECTFB], directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], - AC_MSG_ERROR([$DIRECTFB_PKG_ERRORS - *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest version - *** of DirectFB is available from http://www.directfb.org/.])) --- -1.7.10.4 - diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb deleted file mode 100644 index 7907c5c0d..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Example DirectFB applications" -DESCRIPTION = "The DirectFB-examples package contains a set of simple DirectFB \ - applications that can be used to test and demonstrate various DirectFB \ - features" -DEPENDS = "directfb" -SECTION = "libs" -LICENSE = "MIT" - -SRC_URI = " \ - http://downloads.yoctoproject.org/mirror/sources/DirectFB-examples-${PV}.tar.gz \ - file://configure.in-Fix-string-argument-syntax.patch \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f" - -S = "${WORKDIR}/DirectFB-examples-${PV}" - -inherit autotools pkgconfig - -SRC_URI[md5sum] = "8b60c867af295481c32a8c7fc5802307" -SRC_URI[sha256sum] = "9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a" diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb.inc b/yocto-poky/meta/recipes-graphics/directfb/directfb.inc deleted file mode 100644 index f6b7cbe1a..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb.inc +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "Graphics abstraction library for the Linux Framebuffer Device" -DESCRIPTION = "DirectFB is a thin library that provides developers \ -with hardware graphics acceleration, input device handling and \ -abstraction, an integrated windowing system with support for \ -translucent windows and multiple display layers on top of the \ -Linux framebuffer device." -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" - -HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" - -SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ - file://configurefix.patch \ - file://fusion.patch \ - file://bashism.patch \ - file://0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch \ - file://compar_fn_t.patch \ - file://union-sigval.patch \ - file://use-PTHREAD_MUTEX_RECURSIVE.patch \ - " - -S = "${WORKDIR}/DirectFB-${PV}" - -LDFLAGS_append =" -lts -lm" - -# Workaround for linking issues seen with armv7a + gold -LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -BINCONFIG = "${bindir}/directfb-config" - -inherit autotools binconfig-disabled pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" -PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" -PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" - -EXTRA_OECONF = "\ - --with-gfxdrivers=none \ - --enable-freetype=yes \ - --enable-zlib \ - --disable-imlib2 \ - --disable-mesa \ - --disable-sdl \ - --disable-vnc \ - --disable-x11 \ -" - -#Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default -#this will cause directfb build failure on x86 arch, so filter out it. -TARGET_CFLAGS_remove_x86 = "-fno-omit-frame-pointer" - -#PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*" -# -#python populate_packages_prepend () { -# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') -# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') -#} - -# NOTE: monolithic packaging for now, should improve that eventually - -FILES_${PN}-dev += "\ - ${bindir}/directfb-config \ - ${libdir}/directfb-${RV}/systems/*.la \ - ${libdir}/directfb-${RV}/inputdrivers/*.la \ - ${libdir}/directfb-${RV}/interfaces/*/*.la \ - ${libdir}/directfb-${RV}/wm/*.la \ -" - -FILES_${PN} += "\ - ${libdir}/directfb-${RV}/systems/*.so \ - ${libdir}/directfb-${RV}/inputdrivers/*.so \ - ${libdir}/directfb-${RV}/interfaces/*/*.so \ - ${libdir}/directfb-${RV}/wm/*.so \ - ${datadir}/directfb-${PV} \ -" diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch deleted file mode 100644 index 76e0f7530..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch +++ /dev/null @@ -1,61 +0,0 @@ -From f43ef44806ffb8e3b35d99070dde9b6cc1714d3d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 8 Sep 2015 21:32:20 +0000 -Subject: [PATCH] gfx,direct: Aboid usng VLAs and printf formats - -VLAs are flagged by clang when using non-POD types, therefore replace -the usage with alloca which is exact same allocation on stack - - __attribute__((__format__ (__printf__))) is not portable as used here - therefore disable the check for clang here, we lose no functionality - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - lib/direct/util.h | 2 +- - src/gfx/util.cpp | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/direct/util.h b/lib/direct/util.h -index 72941e9..8e7fa4a 100644 ---- a/lib/direct/util.h -+++ b/lib/direct/util.h -@@ -98,7 +98,7 @@ - #define D_CONST_FUNC - #endif - --#if __GNUC__ >= 3 -+#if __GNUC__ >= 3 && !defined __clang__ - #define D_FORMAT_PRINTF(n) __attribute__((__format__ (__printf__, n, n+1))) - #define D_FORMAT_VPRINTF(n) __attribute__((__format__ (__printf__, n, 0))) - #else -diff --git a/src/gfx/util.cpp b/src/gfx/util.cpp -index 40032bc..d1015d4 100644 ---- a/src/gfx/util.cpp -+++ b/src/gfx/util.cpp -@@ -294,8 +294,8 @@ dfb_gfx_copy_regions_stereo( CoreSurface *source, - { - unsigned int i, n = 0; - DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h }; -- DFBRectangle rects[num]; -- DFBPoint points[num]; -+ DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num); -+ DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num); - - for (i=0; i<num; i++) { - DFB_REGION_ASSERT( ®ions[i] ); -@@ -351,8 +351,8 @@ dfb_gfx_copy_regions_client( CoreSurface *source, - { - unsigned int i, n = 0; - DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h }; -- DFBRectangle rects[num]; -- DFBPoint points[num]; -+ DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num); -+ DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num); - CoreGraphicsStateClient *client = _client ? _client : &StateClient::Get()->client; - CardState *state = client->state; - CardState backup; --- -2.5.1 - diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/bashism.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/bashism.patch deleted file mode 100644 index 2ef4e9385..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb/bashism.patch +++ /dev/null @@ -1,18 +0,0 @@ -${x//y/} is a bash syntax. Replace with something dash compatible - -RP 2015/5/3 -Upstream-Status: Pending - -Index: DirectFB-1.7.7/configure.in -=================================================================== ---- DirectFB-1.7.7.orig/configure.in -+++ DirectFB-1.7.7/configure.in -@@ -2696,7 +2696,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_ - AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") - - CFLAGS="$CFLAGS $DFB_INTERNAL_CFLAGS" --CXXFLAGS="$CXXFLAGS ${CFLAGS//-Werror-implicit-function-declaration/}" -+CXXFLAGS="$CXXFLAGS $(printf '%s\n' "$CFLAGS" | sed 's/-Werror-implicit-function-declaration//g')" - DFB_LDFLAGS="$LDFLAGS $ZLIB_LIBS" - - CFLAGS="$CFLAGS $CFLAGS_STD" diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch deleted file mode 100644 index ee4d900ba..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch +++ /dev/null @@ -1,62 +0,0 @@ -test for __compar_fn_t and if not defined by libc then define it -help make directfb compile with musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: DirectFB-1.7.7/configure.in -=================================================================== ---- DirectFB-1.7.7.orig/configure.in -+++ DirectFB-1.7.7/configure.in -@@ -112,6 +112,17 @@ AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long) - AC_CHECK_FUNCS(fork) - -+AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ -+ AC_TRY_COMPILE( -+ [#include <stdlib.h>], -+ [void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }], -+ ccache_cv_COMPAR_FN_T=yes, -+ ccache_cv_COMPAR_FN_T=no)]) -+if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then -+ AC_DEFINE(HAVE_COMPAR_FN_T, 1, -+ Define to 1 if you have the `__compar_fn_t' typedef.) -+fi -+ - AC_PATH_PROGS(PERL, perl5 perl) - - AC_PATH_PROG(MAN2HTML, man2html, no) -Index: DirectFB-1.7.7/inputdrivers/lirc/lirc.c -=================================================================== ---- DirectFB-1.7.7.orig/inputdrivers/lirc/lirc.c -+++ DirectFB-1.7.7/inputdrivers/lirc/lirc.c -@@ -59,6 +59,11 @@ - - #include <core/input_driver.h> - -+#if HAVE_COMPAR_FN_T -+#define COMPAR_FN_T __compar_fn_t -+#else -+typedef int (*COMPAR_FN_T)(const void *, const void *); -+#endif - - DFB_INPUT_DRIVER( lirc ) - -@@ -97,7 +102,7 @@ static DFBInputDeviceKeySymbol lirc_pars - qsort ( keynames, - D_ARRAY_SIZE( keynames ), - sizeof(keynames[0]), -- (__compar_fn_t) keynames_sort_compare ); -+ (COMPAR_FN_T) keynames_sort_compare ); - keynames_sorted = true; - } - -@@ -124,7 +129,7 @@ static DFBInputDeviceKeySymbol lirc_pars - symbol_name = bsearch( name, keynames, - D_ARRAY_SIZE( keynames ), - sizeof(keynames[0]), -- (__compar_fn_t) keynames_compare ); -+ (COMPAR_FN_T) keynames_compare ); - if (symbol_name) - return symbol_name->symbol; - break; diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/configurefix.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/configurefix.patch deleted file mode 100644 index dd8c01905..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb/configurefix.patch +++ /dev/null @@ -1,60 +0,0 @@ -Libtool needs these set correctly else we end up with pointless rpaths -such as the QA warnings: - -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfblayer contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbmaster contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgifft contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbdump contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinput contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbfx contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbscreen contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgiff contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinspector contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdfiff contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinfo contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbpenmount contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbg contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6 contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6 contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_fbdev.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_devmem.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_dummy.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_ft2.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/wm/libdirectfbwm_default.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_zytronic.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_penmount.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_linux_input.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_serialmouse.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_mutouch.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_tslib.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_joystick.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_sonypi.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_lirc.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_wm97xx_ts.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_ps2mouse.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_keyboard.so contains probably-redundant RPATH /usr/lib - -Upstream-Status: Pending - -RP 2012/03/16 - -Index: DirectFB-1.4.15/configure.in -=================================================================== ---- DirectFB-1.4.15.orig/configure.in 2012-03-16 13:32:23.692402879 +0000 -+++ DirectFB-1.4.15/configure.in 2012-03-16 13:33:22.312400960 +0000 -@@ -97,13 +97,6 @@ - AC_CHECK_SIZEOF(long long) - AC_CHECK_FUNCS(fork) - -- --## Work around libstuhl during cross build... --if test "$host" != "$build"; then -- sys_lib_dlsearch_path_spec="" -- sys_lib_search_path_spec="" --fi -- - AC_PATH_PROGS(PERL, perl5 perl) - - AC_PATH_PROG(MAN2HTML, man2html, no) diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/fusion.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/fusion.patch deleted file mode 100644 index 1f81a6796..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb/fusion.patch +++ /dev/null @@ -1,36 +0,0 @@ -directfb: Fix for hangs in direct_test, fusion_skirmish on exit - -Upstream-Status: Pending -Signed-off-by: Lauren Post <lauren.post@freescale.com> - ---- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800 -+++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800 -@@ -2853,9 +2853,14 @@ - direct_mutex_lock( &world->event_dispatcher_mutex ); - - while (1) { -- if (!world->event_dispatcher_buffers) -+ if (!world->event_dispatcher_buffers){ - direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); -- -+ if (world->dispatch_stop) { -+ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); -+ direct_mutex_unlock( &world->event_dispatcher_mutex ); -+ return NULL; -+ } -+ } - buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; - D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer ); - -@@ -2872,6 +2877,11 @@ - //D_INFO("waiting...\n"); - D_ASSERT( buf->read_pos == buf->write_pos ); - direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); -+ if (world->dispatch_stop) { -+ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); -+ direct_mutex_unlock( &world->event_dispatcher_mutex ); -+ return NULL; -+ } - } - - buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch deleted file mode 100644 index 29f45c797..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch is taken from gentoo musl overlay -sigval_t is glibc only construct, we use a union of sigval -which pretty much is same effect as sigval_t - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -diff -Naur DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c ---- DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c 2014-07-15 02:54:58.000000000 -0400 -+++ DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c 2015-07-18 16:55:35.077989166 -0400 -@@ -111,7 +111,7 @@ - void - direct_trap( const char *domain, int sig ) - { -- sigval_t val; -+ union sigval val; - - if (direct_config->delay_trap_ms) { - D_LOG( Direct_Trap, VERBOSE, "NOT RAISING signal %d from %s, waiting for %dms... attach gdb --pid=%d\n", sig, domain, direct_config->delay_trap_ms, getpid() ); diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch deleted file mode 100644 index ac48f68db..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch +++ /dev/null @@ -1,116 +0,0 @@ -Remove use of DIRECT_RECURSIVE_MUTEX_INITIALIZER its not portable -use portable way to initialize recursive mutex using pthread_once() and direct_recursive_mutex_init() - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h -=================================================================== ---- DirectFB-1.7.7.orig/lib/direct/os/linux/glibc/mutex.h -+++ DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h -@@ -46,7 +46,6 @@ struct __D_DirectMutex { - /**********************************************************************************************************************/ - - #define DIRECT_MUTEX_INITIALIZER(name) { PTHREAD_MUTEX_INITIALIZER } --#define DIRECT_RECURSIVE_MUTEX_INITIALIZER(name) { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP } - - #endif - -Index: DirectFB-1.7.7/lib/direct/trace.c -=================================================================== ---- DirectFB-1.7.7.orig/lib/direct/trace.c -+++ DirectFB-1.7.7/lib/direct/trace.c -@@ -89,8 +89,15 @@ struct __D_DirectTraceBuffer { - /**************************************************************************************************/ - - static DirectLink *buffers; --static DirectMutex buffers_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(buffers_lock); - -+static pthread_once_t buffers_lock_init_once = PTHREAD_ONCE_INIT; -+static DirectMutex buffers_lock; -+ -+static void -+buffers_lock_init( void ) -+{ -+ direct_recursive_mutex_init(&buffers_lock); -+} - /**************************************************************************************************/ - - __dfb_no_instrument_function__ -@@ -113,6 +120,7 @@ get_trace_buffer( void ) - - D_MAGIC_SET( buffer, DirectTraceBuffer ); - -+ pthread_once(&buffers_lock_init_once, buffers_lock_init); - direct_mutex_lock( &buffers_lock ); - direct_list_append( &buffers, &buffer->link ); - direct_mutex_unlock( &buffers_lock ); -@@ -138,8 +146,14 @@ typedef struct { - } SymbolTable; - - static DirectLink *tables = NULL; --static DirectMutex tables_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(tables_lock); -+static pthread_once_t tables_lock_init_once = PTHREAD_ONCE_INIT; -+static DirectMutex tables_lock; - -+static void -+tables_lock_init( void ) -+{ -+ direct_recursive_mutex_init(&tabless_lock); -+} - - __dfb_no_instrument_function__ - static void -@@ -370,6 +384,7 @@ direct_trace_lookup_symbol( const char * - Symbol *symbol; - SymbolTable *table; - -+ pthread_once(&tables_lock_init_once, tables_lock_init); - direct_mutex_lock( &tables_lock ); - - table = find_table( filename ); -@@ -514,6 +529,7 @@ direct_trace_print_stacks() - DirectTraceBuffer *b; - DirectTraceBuffer *buffer = get_trace_buffer(); - -+ pthread_once(&buffers_lock_init_once, buffers_lock_init); - direct_mutex_lock( &buffers_lock ); - - if (buffer && buffer->level) -@@ -611,6 +627,7 @@ direct_trace_free_buffer( DirectTraceBuf - D_MAGIC_ASSERT( buffer, DirectTraceBuffer ); - - if (buffer->thread) { -+ pthread_once(&buffers_lock_init_once, buffers_lock_init); - direct_mutex_lock( &buffers_lock ); - direct_list_remove( &buffers, &buffer->link ); - direct_mutex_unlock( &buffers_lock ); -Index: DirectFB-1.7.7/src/directfb.c -=================================================================== ---- DirectFB-1.7.7.orig/src/directfb.c -+++ DirectFB-1.7.7/src/directfb.c -@@ -99,6 +99,15 @@ const unsigned int directfb_micro_versio - const unsigned int directfb_binary_age = DIRECTFB_BINARY_AGE; - const unsigned int directfb_interface_age = DIRECTFB_INTERFACE_AGE; - -+static pthread_once_t lock_init_once = PTHREAD_ONCE_INIT; -+static DirectMutex lock; -+ -+static void -+lock_init( void ) -+{ -+ direct_recursive_mutex_init(&lock); -+} -+ - const char * - DirectFBCheckVersion( unsigned int required_major, - unsigned int required_minor, -@@ -215,8 +224,7 @@ DirectFBCreate( IDirectFB **interface_pt - if (dfb_config->remote.host) - return CreateRemote( dfb_config->remote.host, dfb_config->remote.port, interface_ptr ); - -- static DirectMutex lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(lock); -- -+ pthread_once(&lock_init_once, lock_init); - direct_mutex_lock( &lock ); - - if (!dfb_config->no_singleton && idirectfb_singleton) { diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb_1.7.7.bb b/yocto-poky/meta/recipes-graphics/directfb/directfb_1.7.7.bb deleted file mode 100644 index c6c070eda..000000000 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb_1.7.7.bb +++ /dev/null @@ -1,8 +0,0 @@ -require directfb.inc - -RV = "1.7-7" - -LEAD_SONAME = "libdirectfb-1.7.so.0" - -SRC_URI[md5sum] = "152cf1863b1a3a28aa1370e9053440bf" -SRC_URI[sha256sum] = "b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3" diff --git a/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch b/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch deleted file mode 100644 index 286e548bc..000000000 --- a/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch +++ /dev/null @@ -1,24 +0,0 @@ -drmdevice.c: define _GNU_SOURCE - -Include config.h to fix this build error with uclibc: - -libdrm-2.4.66/tests/drmdevice.c: In function 'main': -libdrm-2.4.66/tests/drmdevice.c:96:60: error: -'O_CLOEXEC' undeclared (first use in this function) -fd = open(devices[i]->nodes[j],O_RDONLY | O_CLOEXEC, 0); - -Upstream-Status: Pending - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- -diff -Naur libdrm-2.4.66-orig/tests/drmdevice.c libdrm-2.4.66/tests/drmdevice.c ---- libdrm-2.4.66-orig/tests/drmdevice.c 2016-02-23 11:34:02.054904502 +0200 -+++ libdrm-2.4.66/tests/drmdevice.c 2016-02-23 11:35:34.371750383 +0200 -@@ -21,6 +21,7 @@ - * - */ - -+#include <config.h> - #include <stdio.h> - #include <stdlib.h> - #include <sys/stat.h> diff --git a/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch b/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch deleted file mode 100644 index 30e0a61fd..000000000 --- a/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch +++ /dev/null @@ -1,15 +0,0 @@ -tests: also install tests app - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -Index: libdrm-2.4.66/tests/Makefile.am -=================================================================== ---- libdrm-2.4.66.orig/tests/Makefile.am -+++ libdrm-2.4.66/tests/Makefile.am -@@ -73,3 +73,4 @@ TESTS += \ - endif - - check_PROGRAMS += $(TESTS) -+bin_PROGRAMS = $(check_PROGRAMS) diff --git a/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.67.bb b/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.67.bb deleted file mode 100644 index ddd697f34..000000000 --- a/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.67.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Userspace interface to the kernel DRM services" -DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \ -stands for \"Direct Rendering Manager\", which is the kernel portion of the \ -\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \ -accelerated OpenGL drivers." -HOMEPAGE = "http://dri.freedesktop.org" -SECTION = "x11/base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" -PROVIDES = "drm" -DEPENDS = "libpthread-stubs udev libpciaccess" - -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ - file://installtests.patch \ - file://fix_O_CLOEXEC_undeclared.patch \ - " - -SRC_URI[md5sum] = "b844c6af34e613ebf52f80b3cd8d7055" -SRC_URI[sha256sum] = "ee5b71e1113be37544d0752681c12f040c01f782e2933df7d7bc21fd0d10cebe" - -inherit autotools pkgconfig - -EXTRA_OECONF += "--disable-cairo-tests \ - --enable-omap-experimental-api \ - --enable-install-test-programs \ - --disable-manpages \ - --disable-valgrind \ - " - -ALLOW_EMPTY_${PN}-drivers = "1" -PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ - ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu" - -RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ - ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu" - -FILES_${PN}-tests = "${bindir}/*" -FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" -FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" -FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" -FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" -FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" -FILES_${PN}-kms = "${libdir}/libkms*.so.*" -FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" -FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*" diff --git a/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb deleted file mode 100644 index 455d31e87..000000000 --- a/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -EGLINFO_PLATFORM ?= "fb" -EGLINFO_BINARY_NAME ?= "eglinfo-fb" - -include eglinfo.inc - -SUMMARY += "(Framebuffer version)" diff --git a/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb deleted file mode 100644 index 3427fdf42..000000000 --- a/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -EGLINFO_PLATFORM ?= "x11" -EGLINFO_BINARY_NAME ?= "eglinfo-x11" - -include eglinfo.inc - -DEPENDS += "virtual/libx11" - -inherit distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SUMMARY += "(X11 version)" diff --git a/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc deleted file mode 100644 index d0c0c2761..000000000 --- a/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Utility for printing information EGL and its client APIs (OpenGL, OpenGL ES, OpenVG)" -SECTION = "graphics" -LICENSE = "Zlib" -HOMEPAGE = "https://github.com/dv1/eglinfo" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c" - -DEPENDS = "virtual/egl" - -SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \ - file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \ - " -SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de" - -S = "${WORKDIR}/git" - -inherit waf distro_features_check -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES ?= "opengl" - -# BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, which -# append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS and set -# EGL_DEVICE as appropriate. -EGLINFO_DEVICE ?= "generic" - -EXTRA_OECONF = "--platform=${EGLINFO_PLATFORM} \ - --device=${EGLINFO_DEVICE} \ - --sysroot ${STAGING_DIR_TARGET}" - -do_install_append() { - mv ${D}/${bindir}/eglinfo ${D}/${bindir}/${EGLINFO_BINARY_NAME} -} diff --git a/yocto-poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch b/yocto-poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch deleted file mode 100644 index ca9f55c18..000000000 --- a/yocto-poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 94b1e6daf7d70550b0e32fbb269fcf6887948d3f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jan 2016 16:08:22 -0800 -Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers - -bcm_host.h is in standard includedir in sysroot -add that to header search paths. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - wscript | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index fcbb55b..cece8bf 100644 ---- a/wscript -+++ b/wscript -@@ -163,9 +163,10 @@ def configure_raspberrypi_device(conf, platform): - conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') - import os - sysroot = conf.options.sysroot + conf.options.prefix -+ std_include_path = os.path.join(sysroot, 'include') - vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads') - vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux') -- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path], uselib_store = 'EGL'): -+ if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'): - conf.fatal('Check if --prefix and --sysroot are set correctly.') - conf.env['WITH_APIS'] = [] - if check_gles2(conf): --- -2.7.0 - diff --git a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch deleted file mode 100644 index f2fd5d473..000000000 --- a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 46ec6a52d4cc447cc3ff4a13b2067ecb76c9db2e Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Fri, 26 Jun 2015 17:02:13 -0700 -Subject: [PATCH] Revert changes made to FcConfigAppFontAddDir() recently - -In 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb the behavior of -FcConfigAppFontAddFile/Dir() were changed to return false -if not fonts were found. While this is welldefined and useful -for AddFile(), it's quite problematic for AddDir(). For example, -if the directory is empty, is that a failure or success? Worse, -the false value from AddDir() was being propagated all the way -to FcInit() returning false now. This only happened upon memory -allocation failure before, and some clients assert that FcInit() -is successful. - -With this change, AddDir() is reverted back to what it was. -AddFont() change (which was actually in fcdir.c) from the original -commit is left in. - -Upstream-Status: backport - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - doc/fcconfig.fncs | 2 +- - src/fccfg.c | 29 +++++++++++------------------ - src/fcint.h | 3 --- - src/fcstr.c | 8 -------- - 4 files changed, 12 insertions(+), 30 deletions(-) - -Index: fontconfig-2.11.94/doc/fcconfig.fncs -=================================================================== ---- fontconfig-2.11.94.orig/doc/fcconfig.fncs -+++ fontconfig-2.11.94/doc/fcconfig.fncs -@@ -232,7 +232,7 @@ the current configuration is used. - @DESC@ - Scans the specified directory for fonts, adding each one found to the - application-specific set of fonts. Returns FcFalse --if the fonts cannot be added (due to allocation failure or no fonts found). -+if the fonts cannot be added (due to allocation failure). - Otherwise returns FcTrue. If <parameter>config</parameter> is NULL, - the current configuration is used. - @@ -Index: fontconfig-2.11.94/src/fccfg.c -=================================================================== ---- fontconfig-2.11.94.orig/src/fccfg.c -+++ fontconfig-2.11.94/src/fccfg.c -@@ -368,7 +368,6 @@ FcConfigAddDirList (FcConfig *config, Fc - FcStrList *dirlist; - FcChar8 *dir; - FcCache *cache; -- FcBool ret = FcFalse; - - dirlist = FcStrListCreate (dirSet); - if (!dirlist) -@@ -383,10 +382,9 @@ FcConfigAddDirList (FcConfig *config, Fc - continue; - FcConfigAddCache (config, cache, set, dirSet); - FcDirCacheUnload (cache); -- ret = FcTrue; - } - FcStrListDone (dirlist); -- return ret; -+ return FcTrue; - } - - /* -@@ -2199,7 +2197,6 @@ FcConfigAppFontAddFile (FcConfig *con - FcStrSet *subdirs; - FcStrList *sublist; - FcChar8 *subdir; -- FcBool ret = FcFalse; - - if (!config) - { -@@ -2229,19 +2226,16 @@ FcConfigAppFontAddFile (FcConfig *con - FcStrSetDestroy (subdirs); - return FcFalse; - } -- if (subdirs->num == 0) -- ret = FcTrue; -- else if ((sublist = FcStrListCreate (subdirs))) -+ if ((sublist = FcStrListCreate (subdirs))) - { - while ((subdir = FcStrListNext (sublist))) - { -- if (FcConfigAppFontAddDir (config, subdir)) -- ret = FcTrue; -+ FcConfigAppFontAddDir (config, subdir); - } - FcStrListDone (sublist); - } - FcStrSetDestroy (subdirs); -- return ret; -+ return FcTrue; - } - - FcBool -@@ -2250,7 +2244,6 @@ FcConfigAppFontAddDir (FcConfig *con - { - FcFontSet *set; - FcStrSet *dirs; -- FcBool ret = FcTrue; - - if (!config) - { -@@ -2269,8 +2262,8 @@ FcConfigAppFontAddDir (FcConfig *con - set = FcFontSetCreate (); - if (!set) - { -- ret = FcFalse; -- goto bail; -+ FcStrSetDestroy (dirs); -+ return FcFalse; - } - FcConfigSetFonts (config, set, FcSetApplication); - } -@@ -2278,10 +2271,12 @@ FcConfigAppFontAddDir (FcConfig *con - FcStrSetAddFilename (dirs, dir); - - if (!FcConfigAddDirList (config, FcSetApplication, dirs)) -- ret = FcFalse; --bail: -+ { -+ FcStrSetDestroy (dirs); -+ return FcFalse; -+ } - FcStrSetDestroy (dirs); -- return ret; -+ return FcTrue; - } - - void diff --git a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch deleted file mode 100644 index fca1e6594..000000000 --- a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ -Revert part of http://cgit.freedesktop.org/fontconfig/commit/fontconfig.pc.in?id=338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408 -We really dont do static linking so its not going to cause issues for us but as such this is harming us by adding absolute -paths into -I options into fontconfig.pc which is them prepended with sysroot when read back by cross pkg-config and -we end up with -I <sysroot>/<sysroot>/usr/include/fontconfig in CFLAGS of clients which depend on it. one such example -is matchbox-panel-2 and it was working fine with gcc < 5 because it tolerated non-existing paths in -I flags but gcc-5 -gently refuses and rightly so. - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: fontconfig-2.11.93/fontconfig.pc.in -=================================================================== ---- fontconfig-2.11.93.orig/fontconfig.pc.in -+++ fontconfig-2.11.93/fontconfig.pc.in -@@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@ - Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ - Libs: -L${libdir} -lfontconfig - Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@ --Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@ -+Cflags: -I${includedir} diff --git a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb deleted file mode 100644 index b427947a9..000000000 --- a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Generic font configuration library" -DESCRIPTION = "Fontconfig is a font configuration and customization library, which \ -does not depend on the X Window System. It is designed to locate \ -fonts within the system and select them according to requirements \ -specified by applications. \ -Fontconfig is not a rasterization library, nor does it impose a \ -particular rasterization library on the application. The X-specific \ -library 'Xft' uses fontconfig along with freetype to specify and \ -rasterize fonts." - -HOMEPAGE = "http://www.fontconfig.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" - -LICENSE = "MIT-style & MIT & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \ - file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \ - file://src/fccache.c;beginline=1199;endline=1214;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" - -SECTION = "libs" - -DEPENDS = "expat freetype zlib" - -SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - file://revert-static-pkgconfig.patch \ - file://0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch \ - " -SRC_URI[md5sum] = "479be870c7f83f15f87bac085b61d641" -SRC_URI[sha256sum] = "73f6d323c7bcfbde25d78397675191d55b8f4139132c6a9444410f3a2d8a9a95" - -PACKAGES =+ "fontconfig-utils" -FILES_${PN} =+ "${datadir}/xml/*" -FILES_fontconfig-utils = "${bindir}/*" - -# Work around past breakage in debian.bbclass -RPROVIDES_fontconfig-utils = "libfontconfig-utils" -RREPLACES_fontconfig-utils = "libfontconfig-utils" -RCONFLICTS_fontconfig-utils = "libfontconfig-utils" -DEBIAN_NOAUTONAME_fontconfig-utils = "1" - -inherit autotools pkgconfig - -FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" - -# comma separated list of additional directories -# /usr/share/fonts is already included by default (you can change it with --with-default-fonts) -FONTCONFIG_FONT_DIRS ?= "no" - -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR} --with-add-fonts=${FONTCONFIG_FONT_DIRS}" - -BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch b/yocto-poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch deleted file mode 100644 index 20838813d..000000000 --- a/yocto-poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch +++ /dev/null @@ -1,14 +0,0 @@ -Freetype think that it knows best about where libtool is, and explicitly the -libtool autoconf macros telling it where to find the libtool script. Of course -we prefix the script with the target triplet, so it's wrong. Fix this by -removing the forced assignment, so the configure script's knowledge of where it -put libtool is used. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- freetype-2.6/builds/unix/unix-cc.in.orig 2016-01-07 19:21:45.244943479 +0000 -+++ freetype-2.6/builds/unix/unix-cc.in 2016-01-07 19:21:50.213112131 +0000 -@@ -19,1 +18,1 @@ --LIBTOOL := $(FT_LIBTOOL_DIR)/libtool -+LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ diff --git a/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.3.bb b/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.3.bb deleted file mode 100644 index 3ed907012..000000000 --- a/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.3.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Freetype font rendering library" -DESCRIPTION = "FreeType is a software font engine that is designed to be small, efficient, \ -highly customizable, and portable while capable of producing high-quality output (glyph \ -images). It can be used in graphics libraries, display servers, font conversion tools, text \ -image generation tools, and many other products as well." -HOMEPAGE = "http://www.freetype.org/" -BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" -SECTION = "libs" - -LICENSE = "FreeType | GPLv2+" -LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \ - file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ - file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://use-right-libtool.patch" - -SRC_URI[md5sum] = "0037b25a8c090bc8a1218e867b32beb1" -SRC_URI[sha256sum] = "371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2" - -inherit autotools pkgconfig binconfig-disabled multilib_header - -# Adapt autotools to work with the minimal autoconf usage in freetype -AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix" -CONFIGURE_SCRIPT = "${S}/configure" -EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake" - -PACKAGECONFIG ??= "zlib" - -PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" -# harfbuzz results in a circular dependency so enabling is non-trivial -PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz" -PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" - -EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'" - -TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64" - -do_install_append() { - oe_multilib_header freetype2/freetype/config/ftconfig.h -} - -BINCONFIG = "${bindir}/freetype-config" - -BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb b/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb deleted file mode 100644 index 95c33f410..000000000 --- a/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Various benchmarning tests for X" -HOMEPAGE = "http://www.o-hand.com" -SECTION = "devel" -LICENSE = "Zlib" -DEPENDS = "pango libxext libxft virtual/libx11 gtk+" - -SRCREV = "e5939ff608b95cdd4d0ab0e1935781ab9a276ac0" -PV = "0.1+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655" - -S = "${WORKDIR}/git/tests" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/yocto-poky/meta/recipes-graphics/glew/glew/no-strip.patch b/yocto-poky/meta/recipes-graphics/glew/glew/no-strip.patch deleted file mode 100644 index e411f11cb..000000000 --- a/yocto-poky/meta/recipes-graphics/glew/glew/no-strip.patch +++ /dev/null @@ -1,12 +0,0 @@ -Don't forcibly strip the binaries. - -Signed-off-by: Ross Burton <ross.burton@intel.com> -Upstream-Status: Pending - -diff --git a/Makefile b/Makefile -index 6a9803c..170c0ce 100644 ---- a/Makefile -+++ b/Makefile -@@ -285 +285 @@ install.bin: glew.bin -- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" -+ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" diff --git a/yocto-poky/meta/recipes-graphics/glew/glew_1.13.0.bb b/yocto-poky/meta/recipes-graphics/glew/glew_1.13.0.bb deleted file mode 100644 index a25c405f3..000000000 --- a/yocto-poky/meta/recipes-graphics/glew/glew_1.13.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "OpenGL extension loading library" -DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." -HOMEPAGE = "http://glew.sourceforge.net/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" - -DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ - file://no-strip.patch" - -SRC_URI[md5sum] = "7cbada3166d2aadfc4169c4283701066" -SRC_URI[sha256sum] = "aa25dc48ed84b0b64b8d41cdd42c8f40f149c37fa2ffa39cd97f42c78d128bc7" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew" -UPSTREAM_CHECK_REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/" - -inherit lib_package pkgconfig distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -# Override SYSTEM to avoid calling config.guess, we're cross-compiling. Pass -# our CFLAGS via POPT as that's the optimisation variable and safely -# overwritten. -EXTRA_OEMAKE = "SYSTEM='linux' \ - CC='${CC}' LD='${CC}' STRIP='' \ - LDFLAGS.EXTRA='${LDFLAGS}' \ - POPT='${CFLAGS}' \ - GLEW_PREFIX='${prefix}' BINDIR='${bindir}' \ - LIBDIR='${libdir}' INCDIR='${includedir}/GL'" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install.all -} diff --git a/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.3.bb b/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.3.bb deleted file mode 100644 index cfe885fe7..000000000 --- a/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.3.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Text shaping library" -DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ - file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ -" - -DEPENDS = "glib-2.0 cairo fontconfig freetype" - -SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" - -SRC_URI[md5sum] = "da8d97e262e6ef8288e1ae76369421bd" -SRC_URI[sha256sum] = "8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c" - -inherit autotools pkgconfig lib_package - -PACKAGECONFIG ??= "icu" -PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" - -EXTRA_OECONF = " \ - --with-cairo \ - --with-fontconfig \ - --with-freetype \ - --with-glib \ - --without-graphite2 \ -" - -PACKAGES =+ "${PN}-icu ${PN}-icu-dev" - -FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" -FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ - ${libdir}/libharfbuzz-icu.so \ - ${libdir}/pkgconfig/harfbuzz-icu.pc \ -" - -BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/images/core-image-clutter.bb b/yocto-poky/meta/recipes-graphics/images/core-image-clutter.bb deleted file mode 100644 index b0f25cf1b..000000000 --- a/yocto-poky/meta/recipes-graphics/images/core-image-clutter.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \ -which enables development of rich and animated graphical user interfaces." - -IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear" - -LICENSE = "MIT" - -IMAGE_INSTALL = "\ - ${CORE_IMAGE_BASE_INSTALL} \ - packagegroup-core-clutter-core \ - " - -inherit core-image diff --git a/yocto-poky/meta/recipes-graphics/images/core-image-directfb.bb b/yocto-poky/meta/recipes-graphics/images/core-image-directfb.bb deleted file mode 100644 index 5641195e8..000000000 --- a/yocto-poky/meta/recipes-graphics/images/core-image-directfb.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "An image that uses DirectFB instead of X11" -LICENSE = "MIT" - - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit core-image distro_features_check - -REQUIRED_DISTRO_FEATURES = "directfb" -CONFLICT_DISTRO_FEATURES = "x11" - -IMAGE_INSTALL += "\ - ${CORE_IMAGE_BASE_INSTALL} \ - packagegroup-core-full-cmdline \ - packagegroup-core-directfb \ -" diff --git a/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb b/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb deleted file mode 100644 index 52e271dac..000000000 --- a/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A very basic Wayland image with a terminal" - -IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs" - -LICENSE = "MIT" - -inherit core-image distro_features_check - -REQUIRED_DISTRO_FEATURES = "wayland" - -CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples" diff --git a/yocto-poky/meta/recipes-graphics/images/core-image-x11.bb b/yocto-poky/meta/recipes-graphics/images/core-image-x11.bb deleted file mode 100644 index 8455bb8ca..000000000 --- a/yocto-poky/meta/recipes-graphics/images/core-image-x11.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A very basic X11 image with a terminal" - -IMAGE_FEATURES += "splash package-management x11-base" - -LICENSE = "MIT" - -inherit core-image distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb b/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb deleted file mode 100644 index 485943194..000000000 --- a/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression" -HOMEPAGE = "http://libjpeg-turbo.org/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=cad955d15145c3fdceec6855e078e953 \ - file://jpeglib.h;endline=14;md5=dfc803dc51ae21178d1376ec73c4454d \ - file://djpeg.c;endline=9;md5=e93a8f2061e8a0ac71c7a485c10489e2 \ -" - -DEPENDS = "nasm-native" - -BASEPV = "${@d.getVar('PV',True).split('+')[1]}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${BASEPV}.tar.gz" -SRC_URI[md5sum] = "86b0d5f7507c2e6c21c00219162c3c44" -SRC_URI[sha256sum] = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e" -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" -UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" - -S = "${WORKDIR}/${BPN}-${BASEPV}" - -# Drop-in replacement for jpeg -PROVIDES = "jpeg" -RPROVIDES_${PN} += "jpeg" -RREPLACES_${PN} += "jpeg" -RCONFLICTS_${PN} += "jpeg" - -inherit autotools pkgconfig - -# Work around missing x32 ABI support -EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", d)}" - -PACKAGES =+ "jpeg-tools libturbojpeg" - -DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library." -FILES_jpeg-tools = "${bindir}/*" - -DESCRIPTION_libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs" -FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*" - -BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch deleted file mode 100644 index 674c8e833..000000000 --- a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0001-select-platforms-based-on-configuration-results.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 3a93150bc0aec86afdb7d053247dc2448925e09a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Wed, 6 May 2015 10:45:22 +0200 -Subject: [PATCH 1/2] select platforms based on configuration results -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Submitted [1] - -[1] https://github.com/anholt/libepoxy/pull/52 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 13 +++++-------- - src/dispatch_common.c | 9 ++++++--- - src/dispatch_common.h | 9 +++++---- - 3 files changed, 16 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a52fc58..bdd70da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h], - # uintptr_t to a void *") by default. Kill that. - XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - -+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) -+ -+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) -+ - has_znow=yes - - case $host_os in -@@ -86,7 +90,7 @@ case $host_os in - ;; - *) - build_egl=yes -- build_glx=yes -+ build_glx=$x11 - build_wgl=no - # On platforms with dlopen, we load everything dynamically and - # don't link against a specific window system or GL implementation. -@@ -144,13 +148,6 @@ esac - - AC_SUBST([VISIBILITY_CFLAGS]) - --PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) --if test x$x11 = xno -a x$build_glx = xyes; then -- AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support]) --fi -- --AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) -- - PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no]) - - AC_CONFIG_FILES([ -diff --git a/src/dispatch_common.c b/src/dispatch_common.c -index 4e34d6e..2ab84ed 100644 ---- a/src/dispatch_common.c -+++ b/src/dispatch_common.c -@@ -615,10 +615,13 @@ epoxy_get_proc_address(const char *name) - #elif defined(__APPLE__) - return epoxy_gl_dlsym(name); - #else -+#if PLATFORM_HAS_GLX - if (epoxy_current_context_is_glx()) { - return glXGetProcAddressARB((const GLubyte *)name); -- } else { -+ } else -+#endif /* PLATFORM_HAS_GLX */ - #if PLATFORM_HAS_EGL -+ { - GLenum egl_api = epoxy_egl_get_current_gl_context_api(); - - switch (egl_api) { -@@ -628,10 +631,10 @@ epoxy_get_proc_address(const char *name) - case EGL_NONE: - break; - } --#endif - } -+#endif /* PLATFORM_HAS_EGL */ - errx(1, "Couldn't find current GLX or EGL context.\n"); --#endif -+#endif /* _WIN32 | __APPLE__*/ - } - - void -diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index 6b8503a..82681e4 100644 ---- a/src/dispatch_common.h -+++ b/src/dispatch_common.h -@@ -21,12 +21,13 @@ - * IN THE SOFTWARE. - */ - -+#include <config.h> - #include <stdbool.h> - - #ifdef _WIN32 - #define PLATFORM_HAS_EGL 0 - #define PLATFORM_HAS_GLX 0 --#define PLATFORM_HAS_WGL 1 -+#define PLATFORM_HAS_WGL BUILD_WGL - #define EPOXY_IMPORTEXPORT __declspec(dllexport) - #elif defined(__APPLE__) - #define PLATFORM_HAS_EGL 0 -@@ -34,13 +35,13 @@ - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #elif defined(ANDROID) --#define PLATFORM_HAS_EGL 1 -+#define PLATFORM_HAS_EGL BUILD_EGL - #define PLATFORM_HAS_GLX 0 - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #else --#define PLATFORM_HAS_EGL 1 --#define PLATFORM_HAS_GLX 1 -+#define PLATFORM_HAS_EGL BUILD_EGL -+#define PLATFORM_HAS_GLX BUILD_GLX - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #endif --- -1.9.3 - diff --git a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch deleted file mode 100644 index 262d6845f..000000000 --- a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/0002-add-an-option-to-disable-glx-support.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 24868cbfb9dda5f6929dd277c47d35df016e8754 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Wed, 6 May 2015 11:05:48 +0200 -Subject: [PATCH 2/2] add an option to disable glx support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this option would help us in yocto to get deterministic build results - -Upstream-Status: Submitted [1] - -[1] https://github.com/anholt/libepoxy/pull/52 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bdd70da..6c7153d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h], - # uintptr_t to a void *") by default. Kill that. - XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - --PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) -+AC_ARG_ENABLE([glx], -+ [AS_HELP_STRING([--disable-glx], -+ [disable if you don't want x11/glx support])], -+ [], -+ [enable_glx=yes] -+ ) -+ -+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no]) - - AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) - --- -1.9.3 - diff --git a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch deleted file mode 100644 index 4b8fea58d..000000000 --- a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-need-for-python3.patch +++ /dev/null @@ -1,20 +0,0 @@ -There is no need to use python3 by this package (the python scripts -that are using during configuration only need python2.7+) - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Gary Thomas <gary@mlbassoc.com> --- -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -40,7 +40,7 @@ m4_ifndef([XORG_MACROS_VERSION], - XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --AC_CHECK_PROGS([PYTHON], [python3 python2 python]) -+AC_CHECK_PROGS([PYTHON], [python2 python]) - - # Initialize libtool - AC_DISABLE_STATIC diff --git a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb deleted file mode 100644 index 6c247ccaf..000000000 --- a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "OpenGL function pointer management library" -HOMEPAGE = "https://github.com/anholt/libepoxy/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" - - -SRC_URI = " \ - git://github.com/anholt/libepoxy.git \ - file://0001-select-platforms-based-on-configuration-results.patch \ - file://0002-add-an-option-to-disable-glx-support.patch \ - file://no-need-for-python3.patch \ -" -SRCREV="e2c33af5bfcfc9d168f9e776156dd47c33f428b3" -PV = "1.3.1" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS = "util-macros virtual/egl" - -PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" diff --git a/yocto-poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/yocto-poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb deleted file mode 100644 index c60ddea74..000000000 --- a/yocto-poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library for converting characters to X key-presses" -DESCRIPTION = "libfakekey is a simple library for converting UTF-8 characters into 'fake' X \ -key-presses." -HOMEPAGE = "http://matchbox-project.org/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/libfakekey.c;endline=30;md5=602b5ccd48f64407510867f3373b448c" - -DEPENDS = "libxtst" -SECTION = "x11/wm" - -SRCREV = "e327ff049b8503af2dadffa84370a0860b9fb682" -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig gettext distro_features_check - -# The libxtst requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch b/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch deleted file mode 100644 index 8cd507f79..000000000 --- a/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch +++ /dev/null @@ -1,69 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 19c3d242034748b3c60765683e1ff4e2df970205 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 10 Dec 2013 11:37:32 +0000 -Subject: [PATCH] configure: improve libpng detection - -Instead of looking for "libpng12" explicitly though pkg-config and then falling -back to library hunting, just use pkg-config to find "libpng" which is provided -by both libpng12 and libpng16. - -This also makes the libpng detection deterministic. - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - configure.ac | 29 +++++------------------------ - 1 file changed, 5 insertions(+), 24 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8a28076..65d7c79 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -34,7 +34,7 @@ AC_ARG_ENABLE(jpeg, - enable_jpeg=$enableval, enable_jpeg=no) - - AC_ARG_ENABLE(png, -- [ --disable-png disable png support [default=no]], -+ [ --disable-png disable PNG support [default=enabled]], - enable_png=$enableval, enable_png=yes ) - - AC_ARG_ENABLE(doxygen-docs, -@@ -156,29 +156,10 @@ fi - dnl ------ Check for PNG --------------------------------------------------- - - if test x$enable_png != xno; then -- AC_MSG_CHECKING(for libpng12) -- if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng12; then -- AC_MSG_RESULT(yes) -- PNG_LIBS=`$PKG_CONFIG --libs libpng12` -- PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12` -- AC_DEFINE(USE_PNG, [1], [Use Png]) -- SUPPORTS_PNG=1 -- PNG_REQUIRED="libpng12" -- else -- AC_MSG_RESULT(no) -- # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] ) -- AC_CHECK_LIB([png], [png_create_read_struct], [have_png="yes"], [have_png="no"]) -- -- if test x$have_png=xyes && test x$have_png_h=xyes; then -- AC_DEFINE(USE_PNG, [1], [Use Png]) -- SUPPORTS_PNG=1 -- PNG_LIBS="-lpng -lz" -- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS" -- else -- AC_MSG_WARN([*** Cannot find PNG, disabling support]) -- enable_png=no -- fi -- fi -+ PKG_CHECK_MODULES(PNG, libpng) -+ AC_DEFINE(USE_PNG, [1], [Use PNG]) -+ SUPPORTS_PNG=1 -+ PNG_REQUIRED="libpng" - fi - - --- -1.8.5 - diff --git a/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb deleted file mode 100644 index f2eb67560..000000000 --- a/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Matchbox window manager core library" -SECTION = "x11/libs" -HOMEPAGE = "http://matchbox-project.org/" -BUGTRACKER = "http://bugzilla.yoctoproject.com/" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \ - file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51" - -DEPENDS = "virtual/libx11 libxext" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \ - file://libpng.patch" - -SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" -SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG ??= "jpeg png xft xsettings" -PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" -PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" -PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,libxft" -PACKAGECONFIG[xsettings] = "--enable-xsettings,--disable-xsettings,libxsettings-client" diff --git a/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch deleted file mode 100644 index f98b92752..000000000 --- a/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch +++ /dev/null @@ -1,19 +0,0 @@ -libX11-1.5.99.901 has changed prototype of _XData32 - -Upstream-Status: Backport -<http://bugzilla.libsdl.org/show_bug.cgi?id=1769> - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h ---- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800 -+++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100 -@@ -165,7 +165,7 @@ - */ - #ifdef LONG64 - SDL_X11_MODULE(IO_32BIT) --SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) -+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) - SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) - #endif - diff --git a/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch deleted file mode 100644 index 913baa92a..000000000 --- a/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch +++ /dev/null @@ -1,187 +0,0 @@ -Rather than code which doesn't even work properly when cross compiling, -lets just use pkg-config instead. Its a little simpler. - -RP 2014/6/20 - -Upstream-Status: Pending - -Index: SDL-1.2.15/sdl.m4 -=================================================================== ---- SDL-1.2.15.orig/sdl.m4 -+++ SDL-1.2.15/sdl.m4 -@@ -12,174 +12,8 @@ dnl Test for SDL, and define SDL_CFLAGS - dnl - AC_DEFUN([AM_PATH_SDL], - [dnl --dnl Get the cflags and libraries from the sdl-config script --dnl --AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], -- sdl_prefix="$withval", sdl_prefix="") --AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], -- sdl_exec_prefix="$withval", sdl_exec_prefix="") --AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], -- , enable_sdltest=yes) -- -- if test x$sdl_exec_prefix != x ; then -- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" -- if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -- fi -- fi -- if test x$sdl_prefix != x ; then -- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" -- if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_prefix/bin/sdl-config -- fi -- fi -- -- as_save_PATH="$PATH" -- if test "x$prefix" != xNONE; then -- PATH="$prefix/bin:$prefix/usr/bin:$PATH" -- fi -- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) -- PATH="$as_save_PATH" - min_sdl_version=ifelse([$1], ,0.11.0,$1) -- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) -- no_sdl="" -- if test "$SDL_CONFIG" = "no" ; then -- no_sdl=yes -- else -- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` -- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` -- -- sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test "x$enable_sdltest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_CXXFLAGS="$CXXFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $SDL_CFLAGS" -- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -- LIBS="$LIBS $SDL_LIBS" --dnl --dnl Now check if the installed SDL is sufficiently new. (Also sanity --dnl checks the results of sdl-config to some extent --dnl -- rm -f conf.sdltest -- AC_TRY_RUN([ --#include <stdio.h> --#include <stdlib.h> --#include <string.h> --#include "SDL.h" -- --char* --my_strdup (char *str) --{ -- char *new_str; -- -- if (str) -- { -- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -- strcpy (new_str, str); -- } -- else -- new_str = NULL; -- -- return new_str; --} -- --int main (int argc, char *argv[]) --{ -- int major, minor, micro; -- char *tmp_version; -- -- /* This hangs on some systems (?) -- system ("touch conf.sdltest"); -- */ -- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } -- -- /* HP/UX 9 (%@#!) writes to sscanf strings */ -- tmp_version = my_strdup("$min_sdl_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_sdl_version"); -- exit(1); -- } -- -- if (($sdl_major_version > major) || -- (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -- printf("*** best to upgrade to the required version.\n"); -- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -- printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -- printf("*** config.cache before re-running configure\n"); -- return 1; -- } --} -- --],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -- CFLAGS="$ac_save_CFLAGS" -- CXXFLAGS="$ac_save_CXXFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- if test "x$no_sdl" = x ; then -- AC_MSG_RESULT(yes) -- ifelse([$2], , :, [$2]) -- else -- AC_MSG_RESULT(no) -- if test "$SDL_CONFIG" = "no" ; then -- echo "*** The sdl-config script installed by SDL could not be found" -- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -- echo "*** your path, or set the SDL_CONFIG environment variable to the" -- echo "*** full path to sdl-config." -- else -- if test -f conf.sdltest ; then -- : -- else -- echo "*** Could not run SDL test program, checking why..." -- CFLAGS="$CFLAGS $SDL_CFLAGS" -- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -- LIBS="$LIBS $SDL_LIBS" -- AC_TRY_LINK([ --#include <stdio.h> --#include "SDL.h" -- --int main(int argc, char *argv[]) --{ return 0; } --#undef main --#define main K_and_R_C_main --], [ return 0; ], -- [ echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding SDL or finding the wrong" -- echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location Also, make sure you have run ldconfig if that" -- echo "*** is required on your system" -- echo "***" -- echo "*** If you have an old version installed, it is best to remove it, although" -- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], -- [ echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means SDL was incorrectly installed" -- echo "*** or that you have moved SDL since it was installed. In the latter case, you" -- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) -- CFLAGS="$ac_save_CFLAGS" -- CXXFLAGS="$ac_save_CXXFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- SDL_CFLAGS="" -- SDL_LIBS="" -- ifelse([$3], , :, [$3]) -- fi -+ PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version]) - AC_SUBST(SDL_CFLAGS) - AC_SUBST(SDL_LIBS) -- rm -f conf.sdltest - ]) diff --git a/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb deleted file mode 100644 index 9c0ec541e..000000000 --- a/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer" -DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \ -library designed to provide low level access to audio, keyboard, mouse, \ -joystick, 3D hardware via OpenGL, and 2D video framebuffer." -HOMEPAGE = "http://www.libsdl.org" -BUGTRACKER = "http://bugzilla.libsdl.org/" - -SECTION = "libs" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" - -PROVIDES = "virtual/libsdl" - -PR = "r3" - -SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ - file://libsdl-1.2.15-xdata32.patch \ - file://pkgconfig.patch \ - " - -UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar" - -S = "${WORKDIR}/SDL-${PV}" - -SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85" -SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00" - -BINCONFIG = "${bindir}/sdl-config" - -inherit autotools lib_package binconfig-disabled pkgconfig - -EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ - --enable-file --disable-oss --disable-esd --disable-arts \ - --disable-diskaudio --disable-nas \ - --disable-mintaudio --disable-nasm --disable-video-dga \ - --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \ - --disable-xbios --disable-gem --disable-video-dummy \ - --enable-input-events --enable-pthreads \ - --disable-video-svga \ - --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ - --disable-rpath" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG_class-native = "x11" -PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib" -PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" -PACKAGECONFIG[tslib] = "--enable-input-tslib, --disable-input-tslib, tslib" -PACKAGECONFIG[directfb] = "--enable-video-directfb, --disable-video-directfb, directfb" -PACKAGECONFIG[opengl] = "--enable-video-opengl, --disable-video-opengl, virtual/libgl libglu" -PACKAGECONFIG[x11] = "--enable-video-x11 --disable-x11-shared, --disable-video-x11, virtual/libx11 libxext libxrandr libxrender" - -EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" - -do_configure_prepend() { - # Remove old libtool macros. - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - for i in ${MACROS}; do - rm -f ${S}/acinclude/$i - done - export SYSROOT=$PKG_CONFIG_SYSROOT_DIR -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch b/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch deleted file mode 100644 index 60185b131..000000000 --- a/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch +++ /dev/null @@ -1,46 +0,0 @@ -When building use the libtool intermediate .lo files instead of explicitly using -the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is -a static build, and .libs/foo.o is a shared build. - -If static libraries have been disabled globally then libtool won't generate them -and explicit references to foo.o won't be satisfied. - -Upstream-Status: Pending -RP -2016/1/16 - - -Index: SDL2-2.0.4/configure.in -=================================================================== ---- SDL2-2.0.4.orig/configure.in -+++ SDL2-2.0.4/configure.in -@@ -3464,23 +3464,23 @@ done - - VERSION_OBJECTS=`echo $VERSION_SOURCES` - VERSION_DEPENDS=`echo $VERSION_SOURCES` --VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` -+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` - VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ --\\$(objects)/\\2.o: \\1/\\2.rc\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ - \\$(WINDRES) \\$< \\$@,g"` - - SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` - SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` --SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` -+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.o: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` - - SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` - SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` --SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` -+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.o: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` - - # Set runtime shared library paths as needed diff --git a/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb b/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb deleted file mode 100644 index 428230711..000000000 --- a/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer" -DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \ -library designed to provide low level access to audio, keyboard, mouse, \ -joystick, 3D hardware via OpenGL, and 2D video framebuffer." -HOMEPAGE = "http://www.libsdl.org" -BUGTRACKER = "http://bugzilla.libsdl.org/" - -SECTION = "libs" - -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b2304ad7e91711027590d3f102a754b7" - -PROVIDES = "virtual/libsdl2" - -DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" - -SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ - file://linkage.patch" - -S = "${WORKDIR}/SDL2-${PV}" - -SRC_URI[md5sum] = "44fc4a023349933e7f5d7a582f7b886e" -SRC_URI[sha256sum] = "da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b" - -inherit autotools lib_package binconfig pkgconfig - -EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ - --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ - --disable-video-dummy \ - --enable-pthreads \ - --enable-sdl-dlopen \ - --disable-rpath" - -# opengl packageconfig factored out to make it easy for distros -# and BSP layers to pick either (desktop) opengl, gles2, or no GL -PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}" - -PACKAGECONFIG ??= " \ - ${PACKAGECONFIG_GL} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ -" -PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," -PACKAGECONFIG[directfb] = "--enable-video-directfb --disable-video-directfb,directfb" -PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,virtual/libgles2" -PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" -PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" -PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" -PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland libxkbcommon" -PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender" - -EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" - -do_configure_prepend() { - # Remove old libtool macros. - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - for i in ${MACROS}; do - rm -f ${S}/acinclude/$i - done - export SYSROOT=$PKG_CONFIG_SYSROOT_DIR -} - -FILES_${PN}-dev += "${libdir}/cmake" diff --git a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license deleted file mode 100644 index 628de9830..000000000 --- a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright © 2001 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Red Hat not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. Red Hat makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Owen Taylor, Red Hat, Inc. - */ diff --git a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch deleted file mode 100644 index d08d0d5b9..000000000 --- a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: Xsettings-client-0.10/Makefile.am -=================================================================== ---- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000 -+++ Xsettings-client-0.10/Makefile.am 2008-02-07 14:50:00.000000000 +0000 -@@ -9,4 +9,4 @@ - - libXsettings_client_la_SOURCES= $(source_c) $(source_h) - --libXsettings_client_la_LIBADD = @X_LIBS@ -\ No newline at end of file -+libXsettings_client_la_LIBADD = @X_LIBS@ -lX11 diff --git a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch deleted file mode 100644 index 905d08e61..000000000 --- a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd Xsettings-client-0.10/configure.ac Xsettings-client-0.10/configure.ac ---- Xsettings-client-0.10/configure.ac 2003-03-28 12:39:51.000000000 +0200 -+++ Xsettings-client-0.10/configure.ac 2013-01-11 07:37:21.491597743 +0200 -@@ -1,7 +1,7 @@ - # Process this file with autoconf to produce a configure script. - AC_INIT(xsettings-client.c) - AM_INIT_AUTOMAKE(Xsettings-client, 0.10) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - CFLAGS="-Os -Wall" diff --git a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb deleted file mode 100644 index 67c5e2777..000000000 --- a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "utility functions for the Xsettings protocol" -DESCRIPTION = "Libraries used for applications making use of the Xsettings configuration \ -setting propagation protocol. Controls setting of double click timeout, drag-and-drop \ -threshold, and default foreground and background colors for all applications running within a \ -desktop." -HOMEPAGE = "http://matchbox-project.org/sources/optional-dependencies/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" -SECTION = "x/libs" -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ - file://xsettings-client.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ - file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" -DEPENDS = "virtual/libx11" - -PR = "r5" - -headers = "xsettings-common.h xsettings-client.h" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-0.10.tar.gz \ - file://MIT-style-license \ - file://link-x11.patch;apply=yes \ - file://obsolete_automake_macros.patch \ -" - -SRC_URI[md5sum] = "c14aa9db6c097e0306dac97fb7da1add" -SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43" - -S = "${WORKDIR}/Xsettings-client-0.10" - -inherit autotools gettext distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -do_configure_prepend() { - # This package doesn't ship with its own COPYING file and - # autotools will install a GPLv2 one instead of the actual MIT-style license here. - # Add the correct license here to avoid confusion. - cp -f ${WORKDIR}/MIT-style-license ${S}/COPYING -} - diff --git a/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session b/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session deleted file mode 100644 index 4d6caa0c5..000000000 --- a/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# Very simple session manager for matchbox tools -# - -# Uncomment below to enable parsing of debian menu entrys -# export MB_USE_DEB_MENUS=1 - -if [ -e $HOME/.matchbox/session ] -then -exec $HOME/.matchbox/session -fi - -if [ -e /etc/matchbox/session ] -then -exec /etc/matchbox/session -fi - -# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session -# dont exist. - -matchbox-desktop & -matchbox-panel & -exec matchbox-window-manager $@ diff --git a/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb deleted file mode 100644 index cbaf05436..000000000 --- a/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Custom Matchbox session files" -HOMEPAGE = "http://www.matchbox-project.org/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea" - -SECTION = "x11" -RCONFLICTS_${PN} = "matchbox-common" - -SRC_URI = "file://matchbox-session" -S = "${WORKDIR}" - -PR = "r4" - -inherit update-alternatives - -ALTERNATIVE_${PN} = "x-session-manager" -ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "100" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/matchbox-session ${D}/${bindir} -} diff --git a/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig b/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig deleted file mode 100644 index 239da8f57..000000000 --- a/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig +++ /dev/null @@ -1,42 +0,0 @@ -# -# This is an example keyboard config file for matchbox -# -# You can edit this file or change per user by copying to -# ~/.matchbox/kbdconfig -# -# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) - -### Window operation short cuts - -<Alt>n=next -<Alt>p=prev -<Alt>c=close -<Alt>d=desktop -<Alt>m=!matchbox-remote -mbmenu - -### App launching. - -<ctrl><alt>x=!xterm -<ctrl><alt>r=!rxvt - -### poky additions - -XF86Calendar=!$contacts -telephone=!$dates -XF86Start=!matchbox-remote -desktop -F2=!matchbox-remote -mbmenu - -#XF86Mail=!$tasks -#Escape=close - -### windows style key shortcuts - -<alt>Tab=next -<alt><shift>Tab=prev - -<alt>space=taskmenu -<alt>escape=!matchbox-remote -mbmenu -<alt>f4=close - -f11=fullscreen - diff --git a/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb deleted file mode 100644 index aa768280a..000000000 --- a/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Matchbox lightweight window manager" -HOMEPAGE = "http://matchbox-project.org" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa835 \ - file://src/main.c;endline=21;md5=3e5d9f832b527b0d72dbe8e3c4c60b95 \ - file://src/wm.c;endline=21;md5=8dc9d24477d87ef5dfbc2e4927146aab" - -SECTION = "x11/wm" -DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes" - -SRCREV = "8178e70d5c742c4cd63b51df228cc8aa3594d518" -PV = "1.2+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ - file://kbdconfig" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -FILES_${PN} = "${bindir}/* \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -EXTRA_OECONF = " --enable-startup-notification \ - --disable-xrm \ - --enable-expat \ - --with-expat-lib=${STAGING_LIBDIR} \ - --with-expat-includes=${STAGING_INCDIR}" - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} diff --git a/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb b/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb deleted file mode 100644 index eb80cd3bb..000000000 --- a/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Library for caching application menus" -DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus" -HOMEPAGE = "http://lxde.sourceforge.net/" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" - -SECTION = "x11/libs" -DEPENDS = "glib-2.0 intltool-native libfm-extra" - -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz" - -SRC_URI[md5sum] = "a856ba860b16fdc8c69ee784bc4ade36" -SRC_URI[sha256sum] = "0ac72649919946070258320aafc320467dd040bcef7b3a225e2ab7241ddffd59" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/" - -inherit autotools gettext pkgconfig gtk-doc diff --git a/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch deleted file mode 100644 index e4461ef17..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch +++ /dev/null @@ -1,17 +0,0 @@ -endianness check is OS wide and not specific to libc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h -=================================================================== ---- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h -+++ mesa-11.1.1/src/gallium/include/pipe/p_config.h -@@ -130,7 +130,7 @@ - * Endian detection. - */ - --#ifdef __GLIBC__ -+#if defined(__linux__) - #include <endian.h> - - #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/yocto-poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb b/yocto-poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb deleted file mode 100644 index 010998d92..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "The OpenGL utility toolkit" -DESCRIPTION = "GLU is a utility toolkit used with OpenGL implementations" - -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \ - file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9" - -# Epoch as this used to be part of mesa -PE = "2" -PR = "0" - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${PV}.tar.bz2" - -SRC_URI[md5sum] = "be9249132ff49275461cf92039083030" -SRC_URI[sha256sum] = "1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12" - -S = "${WORKDIR}/glu-${PV}" - -DEPENDS = "virtual/libgl" - -inherit autotools pkgconfig distro_features_check - -# Requires libGL.so which is provided by mesa when x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -# Remove the mesa-glu dependency in mesa-glu-dev, as mesa-glu is empty -RDEPENDS_${PN}-dev = "" diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch deleted file mode 100644 index 93ee9c286..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch +++ /dev/null @@ -1,624 +0,0 @@ -From b695c3a3fa3f4cd48c13aa26542110de27075518 Mon Sep 17 00:00:00 2001 -From: Drew Moseley <drew_moseley@mentor.com> -Date: Mon, 12 May 2014 15:22:32 -0400 -Subject: [PATCH 1/9] mesa-demos: Add missing data files. - -Add some data files that are present in the git repository: - http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0 -but not in the release tarball - ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2 - -Upstream-Status: Backport -Signed-off-by: Drew Moseley <drew_moseley@mentor.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/fpglsl/depth-read.glsl | 4 + - src/fpglsl/infinite-loop.glsl | 7 + - src/glsl/CH11-bumpmaptex.frag | 47 +++++++ - src/glsl/blinking-teapot.frag | 31 +++++ - src/glsl/blinking-teapot.vert | 16 +++ - src/glsl/convolution.frag | 21 +++ - src/glsl/simplex-noise.glsl | 279 ++++++++++++++++++++++++++++++++++++++++ - src/glsl/skinning.vert | 24 ++++ - src/perf/glslstateschange1.frag | 19 +++ - src/perf/glslstateschange1.vert | 14 ++ - src/perf/glslstateschange2.frag | 17 +++ - src/perf/glslstateschange2.vert | 14 ++ - src/vpglsl/infinite-loop.glsl | 8 ++ - 13 files changed, 501 insertions(+) - create mode 100644 src/fpglsl/depth-read.glsl - create mode 100644 src/fpglsl/infinite-loop.glsl - create mode 100644 src/glsl/CH11-bumpmaptex.frag - create mode 100644 src/glsl/blinking-teapot.frag - create mode 100644 src/glsl/blinking-teapot.vert - create mode 100644 src/glsl/convolution.frag - create mode 100644 src/glsl/simplex-noise.glsl - create mode 100644 src/glsl/skinning.vert - create mode 100644 src/perf/glslstateschange1.frag - create mode 100644 src/perf/glslstateschange1.vert - create mode 100644 src/perf/glslstateschange2.frag - create mode 100644 src/perf/glslstateschange2.vert - create mode 100644 src/vpglsl/infinite-loop.glsl - -diff --git a/src/fpglsl/depth-read.glsl b/src/fpglsl/depth-read.glsl -new file mode 100644 -index 0000000..86d298e ---- /dev/null -+++ b/src/fpglsl/depth-read.glsl -@@ -0,0 +1,4 @@ -+void main() -+{ -+ gl_FragColor = gl_FragCoord.zzzz; -+} -diff --git a/src/fpglsl/infinite-loop.glsl b/src/fpglsl/infinite-loop.glsl -new file mode 100644 -index 0000000..c6dc6ee ---- /dev/null -+++ b/src/fpglsl/infinite-loop.glsl -@@ -0,0 +1,7 @@ -+void main() { -+ vec4 sum = vec4(0); -+ for (int i = 1; i != 2; i += 2) { -+ sum += vec4(0.1, 0.1, 0.1, 0.1); -+ } -+ gl_FragColor = sum; -+} -diff --git a/src/glsl/CH11-bumpmaptex.frag b/src/glsl/CH11-bumpmaptex.frag -new file mode 100644 -index 0000000..b5dabb4 ---- /dev/null -+++ b/src/glsl/CH11-bumpmaptex.frag -@@ -0,0 +1,47 @@ -+// -+// Fragment shader for procedural bumps -+// -+// Authors: John Kessenich, Randi Rost -+// -+// Copyright (c) 2002-2006 3Dlabs Inc. Ltd. -+// -+// See 3Dlabs-License.txt for license information -+// -+// Texture mapping/modulation added by Brian Paul -+// -+ -+varying vec3 LightDir; -+varying vec3 EyeDir; -+ -+uniform float BumpDensity; // = 16.0 -+uniform float BumpSize; // = 0.15 -+uniform float SpecularFactor; // = 0.5 -+ -+uniform sampler2D Tex; -+ -+void main() -+{ -+ vec3 ambient = vec3(0.25); -+ vec3 litColor; -+ vec2 c = BumpDensity * gl_TexCoord[0].st; -+ vec2 p = fract(c) - vec2(0.5); -+ -+ float d, f; -+ d = p.x * p.x + p.y * p.y; -+ f = inversesqrt(d + 1.0); -+ -+ if (d >= BumpSize) -+ { p = vec2(0.0); f = 1.0; } -+ -+ vec3 SurfaceColor = texture2D(Tex, gl_TexCoord[0].st).xyz; -+ -+ vec3 normDelta = vec3(p.x, p.y, 1.0) * f; -+ litColor = SurfaceColor * (ambient + max(dot(normDelta, LightDir), 0.0)); -+ vec3 reflectDir = reflect(LightDir, normDelta); -+ -+ float spec = max(dot(EyeDir, reflectDir), 0.0); -+ spec *= SpecularFactor; -+ litColor = min(litColor + spec, vec3(1.0)); -+ -+ gl_FragColor = vec4(litColor, 1.0); -+} -diff --git a/src/glsl/blinking-teapot.frag b/src/glsl/blinking-teapot.frag -new file mode 100644 -index 0000000..0db060b ---- /dev/null -+++ b/src/glsl/blinking-teapot.frag -@@ -0,0 +1,31 @@ -+#extension GL_ARB_uniform_buffer_object : enable -+ -+layout(std140) uniform colors0 -+{ -+ float DiffuseCool; -+ float DiffuseWarm; -+ vec3 SurfaceColor; -+ vec3 WarmColor; -+ vec3 CoolColor; -+ vec4 some[8]; -+}; -+ -+varying float NdotL; -+varying vec3 ReflectVec; -+varying vec3 ViewVec; -+ -+void main (void) -+{ -+ -+ vec3 kcool = min(CoolColor + DiffuseCool * SurfaceColor, 1.0); -+ vec3 kwarm = min(WarmColor + DiffuseWarm * SurfaceColor, 1.0); -+ vec3 kfinal = mix(kcool, kwarm, NdotL); -+ -+ vec3 nreflect = normalize(ReflectVec); -+ vec3 nview = normalize(ViewVec); -+ -+ float spec = max(dot(nreflect, nview), 0.0); -+ spec = pow(spec, 32.0); -+ -+ gl_FragColor = vec4 (min(kfinal + spec, 1.0), 1.0); -+} -diff --git a/src/glsl/blinking-teapot.vert b/src/glsl/blinking-teapot.vert -new file mode 100644 -index 0000000..397d733 ---- /dev/null -+++ b/src/glsl/blinking-teapot.vert -@@ -0,0 +1,16 @@ -+vec3 LightPosition = vec3(0.0, 10.0, 4.0); -+ -+varying float NdotL; -+varying vec3 ReflectVec; -+varying vec3 ViewVec; -+ -+void main(void) -+{ -+ vec3 ecPos = vec3 (gl_ModelViewMatrix * gl_Vertex); -+ vec3 tnorm = normalize(gl_NormalMatrix * gl_Normal); -+ vec3 lightVec = normalize(LightPosition - ecPos); -+ ReflectVec = normalize(reflect(-lightVec, tnorm)); -+ ViewVec = normalize(-ecPos); -+ NdotL = (dot(lightVec, tnorm) + 1.0) * 0.5; -+ gl_Position = ftransform(); -+} -diff --git a/src/glsl/convolution.frag b/src/glsl/convolution.frag -new file mode 100644 -index 0000000..e49b8ac ---- /dev/null -+++ b/src/glsl/convolution.frag -@@ -0,0 +1,21 @@ -+ -+const int KernelSize = 9; -+ -+//texture offsets -+uniform vec2 Offset[KernelSize]; -+//convolution kernel -+uniform vec4 KernelValue[KernelSize]; -+uniform sampler2D srcTex; -+uniform vec4 ScaleFactor; -+uniform vec4 BaseColor; -+ -+void main(void) -+{ -+ int i; -+ vec4 sum = vec4(0.0); -+ for (i = 0; i < KernelSize; ++i) { -+ vec4 tmp = texture2D(srcTex, gl_TexCoord[0].st + Offset[i]); -+ sum += tmp * KernelValue[i]; -+ } -+ gl_FragColor = sum * ScaleFactor + BaseColor; -+} -diff --git a/src/glsl/simplex-noise.glsl b/src/glsl/simplex-noise.glsl -new file mode 100644 -index 0000000..b6833cb ---- /dev/null -+++ b/src/glsl/simplex-noise.glsl -@@ -0,0 +1,279 @@ -+// -+// Description : Array and textureless GLSL 2D/3D/4D simplex -+// noise functions. -+// Author : Ian McEwan, Ashima Arts. -+// Maintainer : ijm -+// Lastmod : 20110223 -+// License : Copyright (C) 2011 Ashima Arts. All rights reserved. -+// Distributed under the Artistic License 2.0; See LICENCE file. -+// -+ -+#define NORMALIZE_GRADIENTS -+#undef USE_CIRCLE -+#define COLLAPSE_SORTNET -+ -+float permute(float x0,vec3 p) { -+ float x1 = mod(x0 * p.y, p.x); -+ return floor( mod( (x1 + p.z) *x0, p.x )); -+ } -+vec2 permute(vec2 x0,vec3 p) { -+ vec2 x1 = mod(x0 * p.y, p.x); -+ return floor( mod( (x1 + p.z) *x0, p.x )); -+ } -+vec3 permute(vec3 x0,vec3 p) { -+ vec3 x1 = mod(x0 * p.y, p.x); -+ return floor( mod( (x1 + p.z) *x0, p.x )); -+ } -+vec4 permute(vec4 x0,vec3 p) { -+ vec4 x1 = mod(x0 * p.y, p.x); -+ return floor( mod( (x1 + p.z) *x0, p.x )); -+ } -+ -+uniform vec4 pParam; -+// Example -+// const vec4 pParam = vec4( 17.* 17., 34., 1., 7.); -+ -+float taylorInvSqrt(float r) -+ { -+ return ( 0.83666002653408 + 0.7*0.85373472095314 - 0.85373472095314 * r ); -+ } -+ -+float simplexNoise2(vec2 v) -+ { -+ const vec2 C = vec2(0.211324865405187134, // (3.0-sqrt(3.0))/6.; -+ 0.366025403784438597); // 0.5*(sqrt(3.0)-1.); -+ const vec3 D = vec3( 0., 0.5, 2.0) * 3.14159265358979312; -+// First corner -+ vec2 i = floor(v + dot(v, C.yy) ); -+ vec2 x0 = v - i + dot(i, C.xx); -+ -+// Other corners -+ vec2 i1 = (x0.x > x0.y) ? vec2(1.,0.) : vec2(0.,1.) ; -+ -+ // x0 = x0 - 0. + 0. * C -+ vec2 x1 = x0 - i1 + 1. * C.xx ; -+ vec2 x2 = x0 - 1. + 2. * C.xx ; -+ -+// Permutations -+ i = mod(i, pParam.x); -+ vec3 p = permute( permute( -+ i.y + vec3(0., i1.y, 1. ), pParam.xyz) -+ + i.x + vec3(0., i1.x, 1. ), pParam.xyz); -+ -+#ifndef USE_CIRCLE -+// ( N points uniformly over a line, mapped onto a diamond.) -+ vec3 x = fract(p / pParam.w) ; -+ vec3 h = 0.5 - abs(x) ; -+ -+ vec3 sx = vec3(lessThan(x,D.xxx)) *2. -1.; -+ vec3 sh = vec3(lessThan(h,D.xxx)); -+ -+ vec3 a0 = x + sx*sh; -+ vec2 p0 = vec2(a0.x,h.x); -+ vec2 p1 = vec2(a0.y,h.y); -+ vec2 p2 = vec2(a0.z,h.z); -+ -+#ifdef NORMALISE_GRADIENTS -+ p0 *= taylorInvSqrt(dot(p0,p0)); -+ p1 *= taylorInvSqrt(dot(p1,p1)); -+ p2 *= taylorInvSqrt(dot(p2,p2)); -+#endif -+ -+ vec3 g = 2.0 * vec3( dot(p0, x0), dot(p1, x1), dot(p2, x2) ); -+#else -+// N points around a unit circle. -+ vec3 phi = D.z * mod(p,pParam.w) /pParam.w ; -+ vec4 a0 = sin(phi.xxyy+D.xyxy); -+ vec2 a1 = sin(phi.zz +D.xy); -+ vec3 g = vec3( dot(a0.xy, x0), dot(a0.zw, x1), dot(a1.xy, x2) ); -+#endif -+// mix -+ vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); -+ m = m*m ; -+ return 1.66666* 70.*dot(m*m, g); -+ } -+ -+float simplexNoise3(vec3 v) -+ { -+ const vec2 C = vec2(1./6. , 1./3. ) ; -+ const vec4 D = vec4(0., 0.5, 1.0, 2.0); -+ -+// First corner -+ vec3 i = floor(v + dot(v, C.yyy) ); -+ vec3 x0 = v - i + dot(i, C.xxx) ; -+ -+// Other corners -+#ifdef COLLAPSE_SORTNET -+ vec3 g = vec3( greaterThan( x0.xyz, x0.yzx) ); -+ vec3 l = vec3( lessThanEqual( x0.xyz, x0.yzx) ); -+ -+ vec3 i1 = g.xyz * l.zxy; -+ vec3 i2 = max( g.xyz, l.zxy); -+#else -+// Keeping this clean - let the compiler optimize. -+ vec3 q1; -+ q1.x = max(x0.x, x0.y); -+ q1.y = min(x0.x, x0.y); -+ q1.z = x0.z; -+ -+ vec3 q2; -+ q2.x = max(q1.x,q1.z); -+ q2.z = min(q1.x,q1.z); -+ q2.y = q1.y; -+ -+ vec3 q3; -+ q3.y = max(q2.y, q2.z); -+ q3.z = min(q2.y, q2.z); -+ q3.x = q2.x; -+ -+ vec3 i1 = vec3(equal(q3.xxx, x0)); -+ vec3 i2 = i1 + vec3(equal(q3.yyy, x0)); -+#endif -+ -+ // x0 = x0 - 0. + 0. * C -+ vec3 x1 = x0 - i1 + 1. * C.xxx; -+ vec3 x2 = x0 - i2 + 2. * C.xxx; -+ vec3 x3 = x0 - 1. + 3. * C.xxx; -+ -+// Permutations -+ i = mod(i, pParam.x ); -+ vec4 p = permute( permute( permute( -+ i.z + vec4(0., i1.z, i2.z, 1. ), pParam.xyz) -+ + i.y + vec4(0., i1.y, i2.y, 1. ), pParam.xyz) -+ + i.x + vec4(0., i1.x, i2.x, 1. ), pParam.xyz); -+ -+// Gradients -+// ( N*N points uniformly over a square, mapped onto a octohedron.) -+ float n_ = 1.0/pParam.w ; -+ vec3 ns = n_ * D.wyz - D.xzx ; -+ -+ vec4 j = p - pParam.w*pParam.w*floor(p * ns.z *ns.z); // mod(p,N*N) -+ -+ vec4 x_ = floor(j * ns.z) ; -+ vec4 y_ = floor(j - pParam.w * x_ ) ; // mod(j,N) -+ -+ vec4 x = x_ *ns.x + ns.yyyy; -+ vec4 y = y_ *ns.x + ns.yyyy; -+ vec4 h = 1. - abs(x) - abs(y); -+ -+ vec4 b0 = vec4( x.xy, y.xy ); -+ vec4 b1 = vec4( x.zw, y.zw ); -+ -+ vec4 s0 = vec4(lessThan(b0,D.xxxx)) *2. -1.; -+ vec4 s1 = vec4(lessThan(b1,D.xxxx)) *2. -1.; -+ vec4 sh = vec4(lessThan(h, D.xxxx)); -+ -+ vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ; -+ vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ; -+ -+ vec3 p0 = vec3(a0.xy,h.x); -+ vec3 p1 = vec3(a0.zw,h.y); -+ vec3 p2 = vec3(a1.xy,h.z); -+ vec3 p3 = vec3(a1.zw,h.w); -+ -+#ifdef NORMALISE_GRADIENTS -+ p0 *= taylorInvSqrt(dot(p0,p0)); -+ p1 *= taylorInvSqrt(dot(p1,p1)); -+ p2 *= taylorInvSqrt(dot(p2,p2)); -+ p3 *= taylorInvSqrt(dot(p3,p3)); -+#endif -+ -+// Mix -+ vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.); -+ m = m * m; -+//used to be 64. -+ return 48.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1), -+ dot(p2,x2), dot(p3,x3) ) ); -+ } -+ -+vec4 grad4(float j, vec4 ip) -+ { -+ const vec4 ones = vec4(1.,1.,1.,-1.); -+ vec4 p,s; -+ -+ p.xyz = floor( fract (vec3(j) * ip.xyz) *pParam.w) * ip.z -1.0; -+ p.w = 1.5 - dot(abs(p.xyz), ones.xyz); -+ s = vec4(lessThan(p,vec4(0.))); -+ p.xyz = p.xyz + (s.xyz*2.-1.) * s.www; -+ -+ return p; -+ } -+ -+float simplexNoise4(vec4 v) -+ { -+ const vec2 C = vec2( 0.138196601125010504, // (5 - sqrt(5))/20 G4 -+ 0.309016994374947451); // (sqrt(5) - 1)/4 F4 -+// First corner -+ vec4 i = floor(v + dot(v, C.yyyy) ); -+ vec4 x0 = v - i + dot(i, C.xxxx); -+ -+// Other corners -+ -+// Force existance of strict total ordering in sort. -+ vec4 q0 = floor(x0 * 1024.0) + vec4( 0., 1./4., 2./4. , 3./4.); -+ vec4 q1; -+ q1.xy = max(q0.xy,q0.zw); // x:z y:w -+ q1.zw = min(q0.xy,q0.zw); -+ -+ vec4 q2; -+ q2.xz = max(q1.xz,q1.yw); // x:y z:w -+ q2.yw = min(q1.xz,q1.yw); -+ -+ vec4 q3; -+ q3.y = max(q2.y,q2.z); // y:z -+ q3.z = min(q2.y,q2.z); -+ q3.xw = q2.xw; -+ -+ vec4 i1 = vec4(lessThanEqual(q3.xxxx, q0)); -+ vec4 i2 = vec4(lessThanEqual(q3.yyyy, q0)); -+ vec4 i3 = vec4(lessThanEqual(q3.zzzz, q0)); -+ -+ // x0 = x0 - 0. + 0. * C -+ vec4 x1 = x0 - i1 + 1. * C.xxxx; -+ vec4 x2 = x0 - i2 + 2. * C.xxxx; -+ vec4 x3 = x0 - i3 + 3. * C.xxxx; -+ vec4 x4 = x0 - 1. + 4. * C.xxxx; -+ -+// Permutations -+ i = mod(i, pParam.x ); -+ float j0 = permute( permute( permute( permute ( -+ i.w, pParam.xyz) + i.z, pParam.xyz) -+ + i.y, pParam.xyz) + i.x, pParam.xyz); -+ vec4 j1 = permute( permute( permute( permute ( -+ i.w + vec4(i1.w, i2.w, i3.w, 1. ), pParam.xyz) -+ + i.z + vec4(i1.z, i2.z, i3.z, 1. ), pParam.xyz) -+ + i.y + vec4(i1.y, i2.y, i3.y, 1. ), pParam.xyz) -+ + i.x + vec4(i1.x, i2.x, i3.x, 1. ), pParam.xyz); -+// Gradients -+// ( N*N*N points uniformly over a cube, mapped onto a 4-octohedron.) -+ vec4 ip = pParam ; -+ ip.xy *= pParam.w ; -+ ip.x *= pParam.w ; -+ ip = vec4(1.,1.,1.,2.) / ip ; -+ -+ vec4 p0 = grad4(j0, ip); -+ vec4 p1 = grad4(j1.x, ip); -+ vec4 p2 = grad4(j1.y, ip); -+ vec4 p3 = grad4(j1.z, ip); -+ vec4 p4 = grad4(j1.w, ip); -+ -+#ifdef NORMALISE_GRADIENTS -+ p0 *= taylorInvSqrt(dot(p0,p0)); -+ p1 *= taylorInvSqrt(dot(p1,p1)); -+ p2 *= taylorInvSqrt(dot(p2,p2)); -+ p3 *= taylorInvSqrt(dot(p3,p3)); -+ p4 *= taylorInvSqrt(dot(p4,p4)); -+#endif -+ -+// Mix -+ vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); -+ vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4) ), 0.); -+ m0 = m0 * m0; -+ m1 = m1 * m1; -+ return 32. * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 ))) -+ + dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ; -+ -+ } -+ -+ -+ -diff --git a/src/glsl/skinning.vert b/src/glsl/skinning.vert -new file mode 100644 -index 0000000..28970ee ---- /dev/null -+++ b/src/glsl/skinning.vert -@@ -0,0 +1,24 @@ -+// Vertex weighting/blendin shader -+// Brian Paul -+// 4 Nov 2008 -+ -+uniform mat4 mat0, mat1; -+attribute float weight; -+ -+void main() -+{ -+ // simple diffuse shading -+ // Note that we should really transform the normal vector along with -+ // the postion below... someday. -+ vec3 lightVec = vec3(0, 0, 1); -+ vec3 norm = gl_NormalMatrix * gl_Normal; -+ float dot = 0.2 + max(0.0, dot(norm, lightVec)); -+ gl_FrontColor = vec4(dot); -+ -+ // compute sum of weighted transformations -+ vec4 pos0 = mat0 * gl_Vertex; -+ vec4 pos1 = mat1 * gl_Vertex; -+ vec4 pos = mix(pos0, pos1, weight); -+ -+ gl_Position = gl_ModelViewProjectionMatrix * pos; -+} -diff --git a/src/perf/glslstateschange1.frag b/src/perf/glslstateschange1.frag -new file mode 100644 -index 0000000..0839436 ---- /dev/null -+++ b/src/perf/glslstateschange1.frag -@@ -0,0 +1,19 @@ -+// Multi-texture fragment shader -+// Brian Paul -+ -+// Composite second texture over first. -+// We're assuming the 2nd texture has a meaningful alpha channel. -+ -+uniform sampler2D tex1; -+uniform sampler2D tex2; -+uniform vec4 UniV1; -+uniform vec4 UniV2; -+ -+void main() -+{ -+ vec4 t3; -+ vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); -+ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); -+ t3 = mix(t1, t2, t2.w); -+ gl_FragColor = t3 + UniV1 + UniV2; -+} -diff --git a/src/perf/glslstateschange1.vert b/src/perf/glslstateschange1.vert -new file mode 100644 -index 0000000..cef50db ---- /dev/null -+++ b/src/perf/glslstateschange1.vert -@@ -0,0 +1,14 @@ -+// Multi-texture vertex shader -+// Brian Paul -+ -+ -+attribute vec4 TexCoord0, TexCoord1; -+attribute vec4 VertCoord; -+ -+void main() -+{ -+ gl_TexCoord[0] = TexCoord0; -+ gl_TexCoord[1] = TexCoord1; -+ // note: may use gl_Vertex or VertCoord here for testing: -+ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -+} -diff --git a/src/perf/glslstateschange2.frag b/src/perf/glslstateschange2.frag -new file mode 100644 -index 0000000..0df0319 ---- /dev/null -+++ b/src/perf/glslstateschange2.frag -@@ -0,0 +1,17 @@ -+// Multi-texture fragment shader -+// Brian Paul -+ -+// Composite second texture over first. -+// We're assuming the 2nd texture has a meaningful alpha channel. -+ -+uniform sampler2D tex1; -+uniform sampler2D tex2; -+uniform vec4 UniV1; -+uniform vec4 UniV2; -+ -+void main() -+{ -+ vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); -+ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); -+ gl_FragColor = t1 + t2 + UniV1 + UniV2; -+} -diff --git a/src/perf/glslstateschange2.vert b/src/perf/glslstateschange2.vert -new file mode 100644 -index 0000000..cef50db ---- /dev/null -+++ b/src/perf/glslstateschange2.vert -@@ -0,0 +1,14 @@ -+// Multi-texture vertex shader -+// Brian Paul -+ -+ -+attribute vec4 TexCoord0, TexCoord1; -+attribute vec4 VertCoord; -+ -+void main() -+{ -+ gl_TexCoord[0] = TexCoord0; -+ gl_TexCoord[1] = TexCoord1; -+ // note: may use gl_Vertex or VertCoord here for testing: -+ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -+} -diff --git a/src/vpglsl/infinite-loop.glsl b/src/vpglsl/infinite-loop.glsl -new file mode 100644 -index 0000000..bc7ae4b ---- /dev/null -+++ b/src/vpglsl/infinite-loop.glsl -@@ -0,0 +1,8 @@ -+void main() { -+ gl_Position = gl_Vertex; -+ vec4 sum = vec4(0); -+ for (int i = 1; i != 2; i += 2) { -+ sum += vec4(0.1, 0.1, 0.1, 0.1); -+ } -+ gl_FrontColor = sum; -+} --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch deleted file mode 100644 index 09054cb75..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 36829a8d7ad2888515fbee95c2a70b3d636d7538 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 9 Jul 2014 14:30:33 +0200 -Subject: [PATCH 2/9] Correctly implement with AC_WITH(glut) so that - --without-glut works. - -Signed-off-by: Ross Burton <ross.burton@intel.com> -Upstream-Status: Submitted (https://patchwork.freedesktop.org/patch/64417/) - ---- - configure.ac | 26 +++++++++++++++----------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c4ee12b..9445424 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -67,21 +67,25 @@ DEMO_CFLAGS="$DEMO_CFLAGS $GL_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GL_LIBS" - - dnl Check for GLUT --GLUT_CFLAGS="" --GLUT_LIBS=-lglut --glut_enabled=yes -+glut_enabled=no - AC_ARG_WITH([glut], - [AS_HELP_STRING([--with-glut=DIR], - [glut install directory])], - [GLUT_CFLAGS="-I$withval/include" -- GLUT_LIBS="-L$withval/lib -lglut"]) --AC_CHECK_HEADER([GL/glut.h], -- [], -- [glut_enabled=no]) --AC_CHECK_LIB([glut], -- [glutInit], -- [], -- [glut_enabled=no]) -+ GLUT_LIBS="-L$withval/lib -lglut"], -+ [GLUT_CFLAGS="" -+ GLUT_LIBS="-lglut"] -+ ) -+AS_IF([test "x$with_glut" != xno], -+ [AC_CHECK_HEADER([GL/glut.h], -+ [], -+ [glut_enabled=no]) -+ AC_CHECK_LIB([glut], -+ [glutInit], -+ [], -+ [glut_enabled=no]) -+ glut_enabled=yes -+]) - - dnl Check for FreeGLUT 2.6 or later - AC_EGREP_HEADER([glutInitContextProfile], --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch deleted file mode 100644 index 6b58c2b77..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch +++ /dev/null @@ -1,424 +0,0 @@ -From b25e9c675cf560b8b037dc855c6b3b1d09957867 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Wed, 9 Jul 2014 14:23:41 +0200 -Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or - GLU - -* in some systems without X11 support we don't have GLEW, but - mesa-demos are still useful - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 49 ++++++++++++++++++++--------- - src/Makefile.am | 14 ++++++--- - src/demos/Makefile.am | 73 ++++++++++++++++++++++++------------------- - src/egl/Makefile.am | 8 +++-- - src/egl/opengles1/Makefile.am | 44 +++++++++++++++----------- - src/egl/opengles2/Makefile.am | 33 ++++++++++--------- - 6 files changed, 135 insertions(+), 86 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9445424..bc4c8d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -93,25 +93,44 @@ AC_EGREP_HEADER([glutInitContextProfile], - [AC_DEFINE(HAVE_FREEGLUT)], - []) - --dnl Check for GLEW --PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4]) --DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" --DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" -+AC_ARG_ENABLE([glew], -+ [AS_HELP_STRING([--enable-glew], -+ [build demos which require glew @<:@default=yes@:>@])], -+ [enable_glew="$enableval"], -+ [enable_glew=yes] -+) -+ -+if test "x$enable_glew" = xyes; then -+ dnl Check for GLEW -+ PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4], [glew_enabled=yes], [glew_enabled=no]) -+ DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" -+ DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" -+fi - - # LIBS was set by AC_CHECK_LIB above - LIBS="" - --PKG_CHECK_MODULES(GLU, [glu], [], -- [AC_CHECK_HEADER([GL/glu.h], -- [], -- AC_MSG_ERROR([GLU not found])) -- AC_CHECK_LIB([GLU], -- [gluBeginCurve], -- [GLU_LIBS=-lGLU], -- AC_MSG_ERROR([GLU required])) ]) -+AC_ARG_ENABLE([glu], -+ [AS_HELP_STRING([--enable-glu], -+ [build demos which require glu @<:@default=yes@:>@])], -+ [enable_glu="$enableval"], -+ [enable_glu=yes] -+) - --DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" --DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" -+if test "x$enable_glu" = xyes; then -+ PKG_CHECK_MODULES(GLU, [glu], [glu_enabled=yes], -+ [AC_CHECK_HEADER([GL/glu.h], -+ [], -+ AC_MSG_ERROR([GLU not found])) -+ AC_CHECK_LIB([GLU], -+ [gluBeginCurve], -+ [GLU_LIBS=-lGLU -+ glu_enabled=yes], -+ AC_MSG_ERROR([GLU required])) ]) -+ -+ DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" -+ DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" -+fi - - AC_ARG_ENABLE([egl], - [AS_HELP_STRING([--enable-egl], -@@ -304,6 +323,8 @@ AC_SUBST([WAYLAND_CFLAGS]) - AC_SUBST([WAYLAND_LIBS]) - - -+AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes") -+AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes") - AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -diff --git a/src/Makefile.am b/src/Makefile.am -index 1647d64..754c47c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -23,14 +23,18 @@ - # Eric Anholt <eric@anholt.net> - -+if HAVE_GLEW -+UTIL = util -+endif -+ - SUBDIRS = \ -- util \ -+ $(UTIL) \ - data \ - demos \ - egl \ - fp \ - fpglsl \ - glsl \ -- gs \ -+ gs \ - objviewer \ - osdemos \ - perf \ -@@ -40,8 +39,12 @@ SUBDIRS = \ - slang \ - tests \ - tools \ -- trivial \ -- vp \ -- vpglsl \ - wgl \ - xdemos -+ -+if HAVE_GLEW -+SUBDIRS += \ -+ vp \ -+ vpglsl \ -+ trivial -+endif -diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am -index 41603fa..ab1e3ab 100644 ---- a/src/demos/Makefile.am -+++ b/src/demos/Makefile.am -@@ -30,91 +30,100 @@ AM_LDFLAGS = \ - $(DEMO_LIBS) \ - $(GLUT_LIBS) - -+bin_PROGRAMS = -+ - if HAVE_GLUT --bin_PROGRAMS = \ -+if HAVE_GLEW -+bin_PROGRAMS += \ - arbfplight \ - arbfslight \ - arbocclude \ - arbocclude2 \ -- bounce \ -- clearspd \ - copypix \ - cubemap \ - cuberender \ - dinoshade \ -- dissolve \ -- drawpix \ - engine \ - fbo_firecube \ - fbotexture \ -- fire \ - fogcoord \ - fplight \ - fslight \ -+ gloss \ -+ isosurf \ -+ multiarb \ -+ paltex \ -+ pointblast \ -+ projtex \ -+ shadowtex \ -+ spriteblast \ -+ stex3d \ -+ textures \ -+ vao_demo \ -+ winpos -+ -+copypix_LDADD = ../util/libutil.la -+cubemap_LDADD = ../util/libutil.la -+cuberender_LDADD = ../util/libutil.la -+engine_LDADD = ../util/libutil.la -+fbo_firecube_LDADD = ../util/libutil.la -+gloss_LDADD = ../util/libutil.la -+isosurf_LDADD = ../util/libutil.la -+multiarb_LDADD = ../util/libutil.la -+projtex_LDADD = ../util/libutil.la -+textures_LDADD = ../util/libutil.la -+winpos_LDADD = ../util/libutil.la -+endif -+ -+if HAVE_GLU -+bin_PROGRAMS += \ -+ bounce \ -+ clearspd \ -+ dissolve \ -+ drawpix \ -+ fire \ - gamma \ - gearbox \ - gears \ - geartrain \ - glinfo \ -- gloss \ - gltestperf \ - ipers \ -- isosurf \ - lodbias \ - morph3d \ -- multiarb \ -- paltex \ - pixeltest \ -- pointblast \ -- projtex \ - ray \ - readpix \ - reflect \ - renormal \ -- shadowtex \ - singlebuffer \ - spectex \ -- spriteblast \ -- stex3d \ - teapot \ - terrain \ - tessdemo \ - texcyl \ - texenv \ -- textures \ - trispd \ - tunnel2 \ -- tunnel \ -- vao_demo \ -- winpos --endif -+ tunnel - - tunnel_SOURCES = \ - tunnel.c \ - tunneldat.h - --copypix_LDADD = ../util/libutil.la --cubemap_LDADD = ../util/libutil.la --cuberender_LDADD = ../util/libutil.la --drawpix_LDADD = ../util/libutil.la - dissolve_LDADD = ../util/libutil.la --engine_LDADD = ../util/libutil.la --fbo_firecube_LDADD = ../util/libutil.la -+drawpix_LDADD = ../util/libutil.la - fire_LDADD = ../util/libutil.la --gloss_LDADD = ../util/libutil.la - ipers_LDADD = ../util/libutil.la --isosurf_LDADD = ../util/libutil.la - lodbias_LDADD = ../util/libutil.la --multiarb_LDADD = ../util/libutil.la --projtex_LDADD = ../util/libutil.la - readpix_LDADD = ../util/libutil.la - reflect_LDADD = ../util/libutil.la - teapot_LDADD = ../util/libutil.la - texcyl_LDADD = ../util/libutil.la --textures_LDADD = ../util/libutil.la - tunnel_LDADD = ../util/libutil.la - tunnel2_LDADD = ../util/libutil.la --winpos_LDADD = ../util/libutil.la -+endif -+endif - - EXTRA_DIST = \ - README -diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am -index d64a49e..4fe1ca8 100644 ---- a/src/egl/Makefile.am -+++ b/src/egl/Makefile.am -@@ -24,8 +24,12 @@ - - SUBDIRS = \ - eglut \ -- opengl \ -- openvg \ - opengles1 \ - opengles2 \ - oes_vg -+ -+if HAVE_GLU -+SUBDIRS += \ -+ opengl \ -+ openvg -+endif -diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am -index 7a9828d..3455e75 100644 ---- a/src/egl/opengles1/Makefile.am -+++ b/src/egl/opengles1/Makefile.am -@@ -36,28 +36,43 @@ AM_LDFLAGS = \ - $(EGL_LIBS) \ - -lm - -+noinst_PROGRAMS = -+ - if HAVE_EGL - if HAVE_GLESV1 --noinst_PROGRAMS = \ -- bindtex \ -- clear \ -+noinst_PROGRAMS += \ - drawtex_screen \ -+ gears_screen \ -+ torus_screen \ -+ tri_screen -+ -+drawtex_screen_SOURCES = drawtex.c -+gears_screen_SOURCES = gears.c -+torus_screen_SOURCES = torus.c -+tri_screen_SOURCES = tri.c -+ -+drawtex_screen_LDADD = ../eglut/libeglut_screen.la -+gears_screen_LDADD = ../eglut/libeglut_screen.la -+torus_screen_LDADD = ../eglut/libeglut_screen.la -+tri_screen_LDADD = ../eglut/libeglut_screen.la -+ -+if HAVE_X11 -+noinst_PROGRAMS += \ -+ clear -+ -+bin_PROGRAMS = \ -+ bindtex \ - drawtex_x11 \ - eglfbdev \ - es1_info \ -- gears_screen \ - gears_x11 \ - msaa \ - pbuffer\ - render_tex \ - texture_from_pixmap \ -- torus_screen \ - torus_x11 \ -- tri_screen \ - tri_x11 \ - two_win --endif --endif - - bindtex_LDADD = $(X11_LIBS) - es1_info_LDADD = $(X11_LIBS) -@@ -71,22 +86,15 @@ two_win_LDADD = $(X11_LIBS) - clear_LDADD = ../eglut/libeglut_x11.la $(EGL_LIBS) $(X11_LIBS) - clear_LDFLAGS = - --drawtex_screen_SOURCES = drawtex.c --gears_screen_SOURCES = gears.c --torus_screen_SOURCES = torus.c --tri_screen_SOURCES = tri.c -- - drawtex_x11_SOURCES = drawtex.c - gears_x11_SOURCES = gears.c - torus_x11_SOURCES = torus.c - tri_x11_SOURCES = tri.c - --drawtex_screen_LDADD = ../eglut/libeglut_screen.la --gears_screen_LDADD = ../eglut/libeglut_screen.la --torus_screen_LDADD = ../eglut/libeglut_screen.la --tri_screen_LDADD = ../eglut/libeglut_screen.la -- - drawtex_x11_LDADD = ../eglut/libeglut_x11.la - gears_x11_LDADD = ../eglut/libeglut_x11.la - torus_x11_LDADD = ../eglut/libeglut_x11.la - tri_x11_LDADD = ../eglut/libeglut_x11.la -+endif -+endif -+endif -diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am -index 41c1b80..74af460 100644 ---- a/src/egl/opengles2/Makefile.am -+++ b/src/egl/opengles2/Makefile.am -@@ -36,26 +36,29 @@ AM_LDFLAGS = \ - if HAVE_EGL - if HAVE_GLESV2 - bin_PROGRAMS = \ -- es2_info \ -- es2gears_screen \ -- es2gears_x11 \ -- es2tri -+ es2gears_screen -+ -+es2gears_screen_SOURCES = es2gears.c -+es2gears_screen_LDADD = ../eglut/libeglut_screen.la -+ - if HAVE_WAYLAND - bin_PROGRAMS += es2gears_wayland --endif --endif --endif - --es2_info_LDADD = $(X11_LIBS) --es2tri_LDADD = $(X11_LIBS) -+es2gears_wayland_SOURCES = es2gears.c -+es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la -+endif - --es2gears_screen_SOURCES = es2gears.c -+if HAVE_X11 -+bin_PROGRAMS += \ -+ es2tri \ -+ es2_info \ -+ es2gears_x11 - -+es2_info_LDADD = $(X11_LIBS) - es2gears_x11_SOURCES = es2gears.c -- --es2gears_screen_LDADD = ../eglut/libeglut_screen.la -- - es2gears_x11_LDADD = ../eglut/libeglut_x11.la -+es2tri_LDADD = $(X11_LIBS) -+endif -+endif -+endif - --es2gears_wayland_SOURCES = es2gears.c --es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch deleted file mode 100644 index f77b97f3e..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch +++ /dev/null @@ -1,234 +0,0 @@ -From 5e10108d76a59abac21c7e540bcfd2ddaccca2cb Mon Sep 17 00:00:00 2001 -From: Drew Moseley <drew_moseley@mentor.com> -Date: Fri, 9 May 2014 11:50:24 -0400 -Subject: [PATCH 4/9] Use DEMOS_DATA_DIR to locate data files - -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=78496] -Signed-off-by: Drew Moseley <drew_moseley@mentor.com> ---- - src/glsl/bezier.c | 2 +- - src/glsl/blinking-teapot.c | 4 ++-- - src/glsl/brick.c | 4 ++-- - src/glsl/bump.c | 6 +++--- - src/glsl/convolutions.c | 2 +- - src/glsl/mandelbrot.c | 4 ++-- - src/glsl/multitex.c | 4 ++-- - src/glsl/simplex-noise.c | 2 +- - src/glsl/skinning.c | 4 ++-- - src/glsl/texdemo1.c | 8 ++++---- - src/glsl/toyball.c | 4 ++-- - src/objviewer/objview.c | 12 ++++++------ - src/perf/glslstateschange.c | 8 ++++---- - 13 files changed, 32 insertions(+), 32 deletions(-) - -diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c -index 0b56bc1..e01603d 100644 ---- a/src/glsl/bezier.c -+++ b/src/glsl/bezier.c -@@ -13,7 +13,7 @@ - #include "glut_wrap.h" - #include "shaderutil.h" - --static const char *filename = "bezier.geom"; -+static const char *filename = DEMOS_DATA_DIR "bezier.geom"; - - static GLuint fragShader; - static GLuint vertShader; -diff --git a/src/glsl/blinking-teapot.c b/src/glsl/blinking-teapot.c -index e3bf24d..7662b1f 100644 ---- a/src/glsl/blinking-teapot.c -+++ b/src/glsl/blinking-teapot.c -@@ -63,8 +63,8 @@ init_opengl (void) - exit(1); - } - -- vshad_id = CompileShaderFile (GL_VERTEX_SHADER, "blinking-teapot.vert"); -- fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, "blinking-teapot.frag"); -+ vshad_id = CompileShaderFile (GL_VERTEX_SHADER, DEMOS_DATA_DIR "blinking-teapot.vert"); -+ fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, DEMOS_DATA_DIR "blinking-teapot.frag"); - prog_id = LinkShaders (vshad_id, fshad_id); - - UseProgram (prog_id); -diff --git a/src/glsl/brick.c b/src/glsl/brick.c -index 3021856..fe5f190 100644 ---- a/src/glsl/brick.c -+++ b/src/glsl/brick.c -@@ -14,8 +14,8 @@ - #include "shaderutil.h" - - --static char *FragProgFile = "CH06-brick.frag"; --static char *VertProgFile = "CH06-brick.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "CH06-brick.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "CH06-brick.vert"; - - /* program/shader objects */ - static GLuint fragShader; -diff --git a/src/glsl/bump.c b/src/glsl/bump.c -index 59f62cd..3a1b20a 100644 ---- a/src/glsl/bump.c -+++ b/src/glsl/bump.c -@@ -15,9 +15,9 @@ - #include "readtex.h" - - --static char *FragProgFile = "CH11-bumpmap.frag"; --static char *FragTexProgFile = "CH11-bumpmaptex.frag"; --static char *VertProgFile = "CH11-bumpmap.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "CH11-bumpmap.frag"; -+static char *FragTexProgFile = DEMOS_DATA_DIR "CH11-bumpmaptex.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "CH11-bumpmap.vert"; - static char *TextureFile = DEMOS_DATA_DIR "tile.rgb"; - - /* program/shader objects */ -diff --git a/src/glsl/convolutions.c b/src/glsl/convolutions.c -index a120cfe..9312f00 100644 ---- a/src/glsl/convolutions.c -+++ b/src/glsl/convolutions.c -@@ -340,7 +340,7 @@ static void init(void) - - menuInit(); - readTexture(textureLocation); -- createProgram("convolution.vert", "convolution.frag"); -+ createProgram(DEMOS_DATA_DIR "convolution.vert", DEMOS_DATA_DIR "convolution.frag"); - - glEnable(GL_TEXTURE_2D); - glClearColor(1.0, 1.0, 1.0, 1.0); -diff --git a/src/glsl/mandelbrot.c b/src/glsl/mandelbrot.c -index 31ede1d..ab34a0f 100644 ---- a/src/glsl/mandelbrot.c -+++ b/src/glsl/mandelbrot.c -@@ -14,8 +14,8 @@ - #include "shaderutil.h" - - --static char *FragProgFile = "CH18-mandel.frag"; --static char *VertProgFile = "CH18-mandel.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "CH18-mandel.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "CH18-mandel.vert"; - - /* program/shader objects */ - static GLuint fragShader; -diff --git a/src/glsl/multitex.c b/src/glsl/multitex.c -index 262ea50..546bd27 100644 ---- a/src/glsl/multitex.c -+++ b/src/glsl/multitex.c -@@ -35,8 +35,8 @@ - - static const char *Demo = "multitex"; - --static const char *VertFile = "multitex.vert"; --static const char *FragFile = "multitex.frag"; -+static const char *VertFile = DEMOS_DATA_DIR "multitex.vert"; -+static const char *FragFile = DEMOS_DATA_DIR "multitex.frag"; - - static const char *TexFiles[2] = - { -diff --git a/src/glsl/simplex-noise.c b/src/glsl/simplex-noise.c -index 13fdd5d..885f01e 100644 ---- a/src/glsl/simplex-noise.c -+++ b/src/glsl/simplex-noise.c -@@ -169,7 +169,7 @@ SpecialKey(int key, int x, int y) - static void - Init(void) - { -- const char *filename = "simplex-noise.glsl"; -+ const char *filename = DEMOS_DATA_DIR "simplex-noise.glsl"; - char noiseText[10000]; - FILE *f; - int len; -diff --git a/src/glsl/skinning.c b/src/glsl/skinning.c -index bf38d77..536d475 100644 ---- a/src/glsl/skinning.c -+++ b/src/glsl/skinning.c -@@ -20,8 +20,8 @@ - #define M_PI 3.1415926535 - #endif - --static char *FragProgFile = "skinning.frag"; --static char *VertProgFile = "skinning.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "skinning.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "skinning.vert"; - - /* program/shader objects */ - static GLuint fragShader; -diff --git a/src/glsl/texdemo1.c b/src/glsl/texdemo1.c -index 6cde239..a082342 100644 ---- a/src/glsl/texdemo1.c -+++ b/src/glsl/texdemo1.c -@@ -35,11 +35,11 @@ - - static const char *Demo = "texdemo1"; - --static const char *ReflectVertFile = "reflect.vert"; --static const char *CubeFragFile = "cubemap.frag"; -+static const char *ReflectVertFile = DEMOS_DATA_DIR "reflect.vert"; -+static const char *CubeFragFile = DEMOS_DATA_DIR "cubemap.frag"; - --static const char *SimpleVertFile = "simple.vert"; --static const char *SimpleTexFragFile = "shadowtex.frag"; -+static const char *SimpleVertFile = DEMOS_DATA_DIR "simple.vert"; -+static const char *SimpleTexFragFile = DEMOS_DATA_DIR "shadowtex.frag"; - - static const char *GroundImage = DEMOS_DATA_DIR "tile.rgb"; - -diff --git a/src/glsl/toyball.c b/src/glsl/toyball.c -index 5f27951..4e7e832 100644 ---- a/src/glsl/toyball.c -+++ b/src/glsl/toyball.c -@@ -14,8 +14,8 @@ - #include "shaderutil.h" - - --static char *FragProgFile = "CH11-toyball.frag"; --static char *VertProgFile = "CH11-toyball.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "CH11-toyball.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "CH11-toyball.vert"; - - /* program/shader objects */ - static GLuint fragShader; -diff --git a/src/objviewer/objview.c b/src/objviewer/objview.c -index 6def726..78a6acf 100644 ---- a/src/objviewer/objview.c -+++ b/src/objviewer/objview.c -@@ -162,12 +162,12 @@ init_model(void) - static void - init_skybox(void) - { -- SkyboxTex = LoadSkyBoxCubeTexture("alpine_east.rgb", -- "alpine_west.rgb", -- "alpine_up.rgb", -- "alpine_down.rgb", -- "alpine_south.rgb", -- "alpine_north.rgb"); -+ SkyboxTex = LoadSkyBoxCubeTexture(DEMOS_DATA_DIR "alpine_east.rgb", -+ DEMOS_DATA_DIR "alpine_west.rgb", -+ DEMOS_DATA_DIR "alpine_up.rgb", -+ DEMOS_DATA_DIR "alpine_down.rgb", -+ DEMOS_DATA_DIR "alpine_south.rgb", -+ DEMOS_DATA_DIR "alpine_north.rgb"); - glmSpecularTexture(Model, SkyboxTex); - } - -diff --git a/src/perf/glslstateschange.c b/src/perf/glslstateschange.c -index 7422b78..dbf8332 100644 ---- a/src/perf/glslstateschange.c -+++ b/src/perf/glslstateschange.c -@@ -33,10 +33,10 @@ - #include "glmain.h" - #include "common.h" - --static const char *VertFile1 = "glslstateschange1.vert"; --static const char *FragFile1 = "glslstateschange1.frag"; --static const char *VertFile2 = "glslstateschange2.vert"; --static const char *FragFile2 = "glslstateschange2.frag"; -+static const char *VertFile1 = DEMOS_DATA_DIR "glslstateschange1.vert"; -+static const char *FragFile1 = DEMOS_DATA_DIR "glslstateschange1.frag"; -+static const char *VertFile2 = DEMOS_DATA_DIR "glslstateschange2.vert"; -+static const char *FragFile2 = DEMOS_DATA_DIR "glslstateschange2.frag"; - static struct uniform_info Uniforms1[] = { - { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, - { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 }, --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch deleted file mode 100644 index aac2a3729..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch +++ /dev/null @@ -1,267 +0,0 @@ -From 453353a221de9c64479f4372565d2cd8591b36cc Mon Sep 17 00:00:00 2001 -From: Frank Binns <frank.binns@imgtec.com> -Date: Fri, 29 Jun 2012 11:26:04 +0100 -Subject: [PATCH 5/9] Fix build when EGL_MESA_screen_surface extension isn't - present - -The EGL demos won't build against EGL implementations that don't support -the EGL_MESA_screen_surface extension. Fix this, in most cases, by -wrapping relevant bits of code in #ifdef EGL_MESA_screen_surface. - -Signed-off-by: Frank Binns <frank.binns@imgtec.com> - -Applied and fixed up in Yocto by... - -Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> - -Upstream-Status: Pending ---- - src/egl/eglut/eglut.c | 9 +++++++-- - src/egl/eglut/eglut_screen.c | 14 ++++++++++++++ - src/egl/opengl/demo1.c | 2 ++ - src/egl/opengl/demo2.c | 7 ++++++- - src/egl/opengl/demo3.c | 7 ++++++- - 5 files changed, 35 insertions(+), 4 deletions(-) - -diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c -index 2ee6f15..f6a2ad4 100644 ---- a/src/egl/eglut/eglut.c -+++ b/src/egl/eglut/eglut.c -@@ -76,8 +76,9 @@ _eglutNow(void) - static void - _eglutDestroyWindow(struct eglut_window *win) - { -- if (_eglut->surface_type != EGL_PBUFFER_BIT && -- _eglut->surface_type != EGL_SCREEN_BIT_MESA) -+ -+ if (_eglut->surface_type == EGL_WINDOW_BIT || -+ _eglut->surface_type == EGL_PIXMAP_BIT) - eglDestroySurface(_eglut->dpy, win->surface); - - _eglutNativeFiniWindow(win); -@@ -175,7 +176,9 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h) - win->config, win->native.u.pixmap, NULL); - break; - case EGL_PBUFFER_BIT: -+#ifdef EGL_MESA_screen_surface - case EGL_SCREEN_BIT_MESA: -+#endif - win->surface = win->native.u.surface; - break; - default: -@@ -289,8 +292,10 @@ eglutDestroyWindow(int win) - if (window->index != win) - return; - -+#ifdef EGL_MESA_screen_surface - /* XXX it causes some bug in st/egl KMS backend */ - if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA) -+#endif - eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); - - _eglutDestroyWindow(_eglut->current); -diff --git a/src/egl/eglut/eglut_screen.c b/src/egl/eglut/eglut_screen.c -index 021a8f1..094a4e2 100644 ---- a/src/egl/eglut/eglut_screen.c -+++ b/src/egl/eglut/eglut_screen.c -@@ -35,26 +35,33 @@ - - #define MAX_MODES 100 - -+#ifdef EGL_MESA_screen_surface - static EGLScreenMESA kms_screen; - static EGLModeMESA kms_mode; - static EGLint kms_width, kms_height; -+#endif - - void - _eglutNativeInitDisplay(void) - { -+#ifdef EGL_MESA_screen_surface - _eglut->native_dpy = EGL_DEFAULT_DISPLAY; - _eglut->surface_type = EGL_SCREEN_BIT_MESA; -+#endif - } - - void - _eglutNativeFiniDisplay(void) - { -+#ifdef EGL_MESA_screen_surface - kms_screen = 0; - kms_mode = 0; - kms_width = 0; - kms_height = 0; -+#endif - } - -+#ifdef EGL_MESA_screen_surface - static void - init_kms(void) - { -@@ -94,19 +101,23 @@ init_kms(void) - kms_width = width; - kms_height = height; - } -+#endif - - void - _eglutNativeInitWindow(struct eglut_window *win, const char *title, - int x, int y, int w, int h) - { -+#ifdef EGL_MESA_screen_surface - EGLint surf_attribs[16]; - EGLint i; -+#endif - const char *exts; - - exts = eglQueryString(_eglut->dpy, EGL_EXTENSIONS); - if (!exts || !strstr(exts, "EGL_MESA_screen_surface")) - _eglutFatal("EGL_MESA_screen_surface is not supported\n"); - -+#ifdef EGL_MESA_screen_surface - init_kms(); - - i = 0; -@@ -128,14 +139,17 @@ _eglutNativeInitWindow(struct eglut_window *win, const char *title, - - win->native.width = kms_width; - win->native.height = kms_height; -+#endif - } - - void - _eglutNativeFiniWindow(struct eglut_window *win) - { -+#ifdef EGL_MESA_screen_surface - eglShowScreenSurfaceMESA(_eglut->dpy, - kms_screen, EGL_NO_SURFACE, 0); - eglDestroySurface(_eglut->dpy, win->native.u.surface); -+#endif - } - - void -diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c -index d892734..3a3564c 100644 ---- a/src/egl/opengl/demo1.c -+++ b/src/egl/opengl/demo1.c -@@ -18,6 +18,7 @@ - static void - TestScreens(EGLDisplay dpy) - { -+#ifdef EGL_MESA_screen_surface - #define MAX 8 - EGLScreenMESA screens[MAX]; - EGLint numScreens; -@@ -28,6 +29,7 @@ TestScreens(EGLDisplay dpy) - for (i = 0; i < numScreens; i++) { - printf(" Screen %d handle: %d\n", i, (int) screens[i]); - } -+#endif - } - - /** -diff --git a/src/egl/opengl/demo2.c b/src/egl/opengl/demo2.c -index 505b474..bfef59e 100644 ---- a/src/egl/opengl/demo2.c -+++ b/src/egl/opengl/demo2.c -@@ -16,6 +16,7 @@ - - /*#define FRONTBUFFER*/ - -+#ifdef EGL_MESA_screen_surface - static void _subset_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2, - GLfloat r, GLfloat g, GLfloat b) - { -@@ -95,12 +96,13 @@ TestScreens(EGLDisplay dpy) - printf(" Screen %d handle: %d\n", i, (int) screens[i]); - } - } -- -+#endif - - int - main(int argc, char *argv[]) - { - int maj, min; -+#ifdef EGL_MESA_screen_surface - EGLContext ctx; - EGLSurface pbuffer, screen_surf; - EGLConfig configs[10]; -@@ -115,6 +117,7 @@ main(int argc, char *argv[]) - EGLModeMESA mode; - EGLScreenMESA screen; - EGLint count; -+#endif - - EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY); - assert(d); -@@ -132,6 +135,7 @@ main(int argc, char *argv[]) - exit(1); - } - -+#ifdef EGL_MESA_screen_surface - eglGetConfigs(d, configs, 10, &numConfigs); - printf("Got %d EGL configs:\n", numConfigs); - for (i = 0; i < numConfigs; i++) { -@@ -211,6 +215,7 @@ main(int argc, char *argv[]) - eglDestroySurface(d, pbuffer); - eglDestroyContext(d, ctx); - eglTerminate(d); -+#endif - - return 0; - } -diff --git a/src/egl/opengl/demo3.c b/src/egl/opengl/demo3.c -index f84ca23..31b5d8b 100644 ---- a/src/egl/opengl/demo3.c -+++ b/src/egl/opengl/demo3.c -@@ -46,7 +46,7 @@ GLubyte OpenGL_bits[] = { - 0x3e, 0x00, 0x00, 0xf8, 0x0c, 0x00, - }; - -- -+#ifdef EGL_MESA_screen_surface - static void Init(void) - { - -@@ -551,11 +551,13 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height) - fclose(f); - } - } -+#endif - - int - main(int argc, char *argv[]) - { - int maj, min; -+#ifdef EGL_MESA_screen_surface - EGLContext ctx; - EGLSurface screen_surf; - EGLConfig configs[10]; -@@ -566,6 +568,7 @@ main(int argc, char *argv[]) - const GLubyte *bitmap; - EGLint screenAttribs[32]; - EGLint i; -+#endif - - EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY); - assert(d); -@@ -583,6 +586,7 @@ main(int argc, char *argv[]) - exit(1); - } - -+#ifdef EGL_MESA_screen_surface - eglGetConfigs(d, configs, 10, &numConfigs); - eglGetScreensMESA(d, &screen, 1, &count); - eglGetModesMESA(d, screen, &mode, 1, &count); -@@ -642,6 +646,7 @@ main(int argc, char *argv[]) - eglDestroySurface(d, screen_surf); - eglDestroyContext(d, ctx); - eglTerminate(d); -+#endif - - return 0; - } --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch deleted file mode 100644 index 12e0805f1..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6a19dba1d275579c73e7763b0554410ff4e1e650 Mon Sep 17 00:00:00 2001 -From: Frank Binns <frank.binns@imgtec.com> -Date: Fri, 29 Jun 2012 12:00:26 +0100 -Subject: [PATCH 6/9] Query display for EGL_MESA_screen_surface extension - before using it - -This code makes heavy use of the EGL_MESA_screen_surface extension so -check the display to determine if it's supported by the underlying EGL -implementation. If it doesn't then bail. - -Signed-off-by: Frank Binns <frank.binns@imgtec.com> - -Applied and fixed up in Yocto by... - -Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> - -Upstream-Status: Pending ---- - src/egl/opengl/demo1.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c -index 3a3564c..06e2138 100644 ---- a/src/egl/opengl/demo1.c -+++ b/src/egl/opengl/demo1.c -@@ -110,6 +110,12 @@ main(int argc, char *argv[]) - printf("EGL version = %d.%d\n", maj, min); - printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); - -+ if (!strstr(eglQueryString(d, EGL_EXTENSIONS), -+ "EGL_MESA_screen_surface")) { -+ printf("EGL_MESA_screen_surface is not supported\n"); -+ exit(1); -+ } -+ - eglGetConfigs(d, NULL, 0, &numConfigs); - configs = malloc(sizeof(*configs) *numConfigs); - eglGetConfigs(d, configs, numConfigs, &numConfigs); --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch deleted file mode 100644 index 89d2fac4f..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d930b2da57f7c9efb80c8cef8f8adad15bbbc0d3 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 10 Jul 2014 14:30:52 +0200 -Subject: [PATCH 7/9] Install few more test programs - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/egl/opengl/Makefile.am | 2 +- - src/egl/opengles1/Makefile.am | 10 ++++------ - src/egl/openvg/Makefile.am | 2 +- - 3 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am -index 0c7228f..87b2f1a 100644 ---- a/src/egl/opengl/Makefile.am -+++ b/src/egl/opengl/Makefile.am -@@ -50,7 +50,7 @@ endif - endif - - if HAVE_EGL --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - demo1 \ - demo2 \ - demo3 \ -diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am -index 3455e75..516e516 100644 ---- a/src/egl/opengles1/Makefile.am -+++ b/src/egl/opengles1/Makefile.am -@@ -36,11 +36,11 @@ AM_LDFLAGS = \ - $(EGL_LIBS) \ - -lm - --noinst_PROGRAMS = -+bin_PROGRAMS = - - if HAVE_EGL - if HAVE_GLESV1 --noinst_PROGRAMS += \ -+bin_PROGRAMS += \ - drawtex_screen \ - gears_screen \ - torus_screen \ -@@ -57,10 +57,8 @@ torus_screen_LDADD = ../eglut/libeglut_screen.la - tri_screen_LDADD = ../eglut/libeglut_screen.la - - if HAVE_X11 --noinst_PROGRAMS += \ -- clear -- --bin_PROGRAMS = \ -+bin_PROGRAMS += \ -+ clear \ - bindtex \ - drawtex_x11 \ - eglfbdev \ -diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am -index 7318a43..b545225 100644 ---- a/src/egl/openvg/Makefile.am -+++ b/src/egl/openvg/Makefile.am -@@ -49,7 +49,7 @@ endif - - if HAVE_EGL - if HAVE_VG --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - lion_screen \ - sp_screen \ - $(EGL_X11_DEMOS) --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch deleted file mode 100644 index a6085754d..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0b6f95f9b8ece22e9856c150e4be29fd86eaf546 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 10 Jul 2014 14:29:27 +0200 -Subject: [PATCH 8/9] glsl, perf: Add few missing .glsl, .vert, .frag files to - EXTRA_DATA - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/fpglsl/Makefile.am | 2 ++ - src/glsl/Makefile.am | 10 ++++++++-- - src/perf/Makefile.am | 6 ++++++ - src/vpglsl/Makefile.am | 1 + - 4 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am -index 47c1039..fd43c91 100644 ---- a/src/fpglsl/Makefile.am -+++ b/src/fpglsl/Makefile.am -@@ -39,10 +39,12 @@ noinst_PROGRAMS = \ - endif - - EXTRA_DIST = \ -+ depth-read.glsl \ - dowhile2.glsl \ - dowhile.glsl \ - forbreak.glsl \ - for.glsl \ -+ infinite-loop.glsl \ - mov.glsl \ - mov-imm.glsl \ - simpleif.glsl \ -diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am -index 4faa8db..079a29d 100644 ---- a/src/glsl/Makefile.am -+++ b/src/glsl/Makefile.am -@@ -37,7 +37,7 @@ AM_LDFLAGS = \ - if HAVE_GLUT - bin_PROGRAMS = \ - array \ -- bezier \ -+ bezier \ - bitmap \ - brick \ - bump \ -@@ -123,12 +123,16 @@ EXTRA_DIST = \ - CH06-brick.vert \ - CH11-bumpmap.frag \ - CH11-bumpmap.vert \ -+ CH11-bumpmaptex.frag \ - CH11-toyball.frag \ - CH11-toyball.vert \ - CH18-mandel.frag \ - CH18-mandel.vert \ -- bezier.geom \ -+ bezier.geom \ - brick.shtest \ -+ blinking-teapot.frag \ -+ blinking-teapot.vert \ -+ convolution.frag \ - convolution.vert \ - cubemap.frag \ - mandelbrot.shtest \ -@@ -138,5 +142,7 @@ EXTRA_DIST = \ - reflect.vert \ - shadowtex.frag \ - simple.vert \ -+ simplex-noise.glsl \ - skinning.frag \ -+ skinning.vert \ - toyball.shtest -diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am -index 5363c58..c5cca8d 100644 ---- a/src/perf/Makefile.am -+++ b/src/perf/Makefile.am -@@ -57,3 +57,9 @@ bin_PROGRAMS = \ - endif - - glslstateschange_LDADD = libperf.la ../util/libutil.la -+ -+EXTRA_DIST = \ -+ glslstateschange1.frag \ -+ glslstateschange1.vert \ -+ glslstateschange2.frag \ -+ glslstateschange2.vert -diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am -index 4a85ed4..48b08f4 100644 ---- a/src/vpglsl/Makefile.am -+++ b/src/vpglsl/Makefile.am -@@ -44,6 +44,7 @@ EXTRA_DIST = \ - func2.glsl \ - ifelse.glsl \ - if.glsl \ -+ infinite-loop.glsl \ - mov.glsl \ - nestedifs.glsl \ - nestedswizzle.glsl \ --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch deleted file mode 100644 index 1262dee23..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c8c3de5417d6b6c7d7579c528c0cab718f4bfdb6 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 10 Jul 2014 14:48:12 +0200 -Subject: [PATCH 9/9] glsl, perf: Install .glsl, .vert, .frag files - -Upstream-Status: Pending -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/fpglsl/Makefile.am | 3 ++- - src/glsl/Makefile.am | 3 ++- - src/perf/Makefile.am | 3 ++- - src/vpglsl/Makefile.am | 3 ++- - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am -index fd43c91..2bf51de 100644 ---- a/src/fpglsl/Makefile.am -+++ b/src/fpglsl/Makefile.am -@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ - fp-tri - endif - --EXTRA_DIST = \ -+demosdatadir=$(datadir)/$(PACKAGE)/ -+dist_demosdata_DATA= \ - depth-read.glsl \ - dowhile2.glsl \ - dowhile.glsl \ -diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am -index 079a29d..f66ec29 100644 ---- a/src/glsl/Makefile.am -+++ b/src/glsl/Makefile.am -@@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la - vert_tex_LDADD = ../util/libutil.la - vsraytrace_LDADD = ../util/libutil.la - --EXTRA_DIST = \ -+demosdatadir=$(datadir)/$(PACKAGE)/ -+dist_demosdata_DATA= \ - CH06-brick.frag \ - CH06-brick.vert \ - CH11-bumpmap.frag \ -diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am -index c5cca8d..140256d 100644 ---- a/src/perf/Makefile.am -+++ b/src/perf/Makefile.am -@@ -58,7 +58,8 @@ endif - - glslstateschange_LDADD = libperf.la ../util/libutil.la - --EXTRA_DIST = \ -+demosdatadir=$(datadir)/$(PACKAGE)/ -+dist_demosdata_DATA= \ - glslstateschange1.frag \ - glslstateschange1.vert \ - glslstateschange2.frag \ -diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am -index 48b08f4..5526867 100644 ---- a/src/vpglsl/Makefile.am -+++ b/src/vpglsl/Makefile.am -@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ - vp-tris - endif - --EXTRA_DIST = \ -+demosdatadir=$(datadir)/$(PACKAGE)/ -+dist_demosdata_DATA= \ - for.glsl \ - func.glsl \ - func2.glsl \ --- -2.0.0 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch deleted file mode 100644 index 04e1b446f..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 525fa9ded72d22b53c5eb366f61e2ac1d407a2db Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Thu, 8 Oct 2015 13:49:31 +0500 -Subject: [PATCH] sharedtex_mt: fix rendering thread hang - -XNextEvent is a blocking call which locks up the display mutex -this causes the rendering threads to hang when they try call -glXSwapBuffers() as that tries to take the same mutex in -underlying calls through XCopyArea(). -So we only go to XNextEvent when it has at least one event -and we wouldn't lock indefinitely. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> -Upstream-Status: Backport (2b304e765695d385fd3bf414e6e444020bedb0a8) - ---- - src/xdemos/sharedtex_mt.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/xdemos/sharedtex_mt.c b/src/xdemos/sharedtex_mt.c -index a90903a..1d503c4 100644 ---- a/src/xdemos/sharedtex_mt.c -+++ b/src/xdemos/sharedtex_mt.c -@@ -420,9 +420,14 @@ Resize(struct window *h, unsigned int width, unsigned int height) - static void - EventLoop(void) - { -+ int i; -+ XEvent event; - while (1) { -- int i; -- XEvent event; -+ /* Do we have an event? */ -+ if (XPending(gDpy) == 0) { -+ usleep(10000); -+ continue; -+ } - XNextEvent(gDpy, &event); - for (i = 0; i < NumWindows; i++) { - struct window *h = &Windows[i]; --- -1.9.1 - diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb deleted file mode 100644 index 557b8c65d..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "Mesa demo applications" -DESCRIPTION = "This package includes the demonstration application, such as glxgears. \ -These applications can be used for Mesa validation and benchmarking." -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" - -LICENSE = "MIT & PD" -LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \ - file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ - file://0001-mesa-demos-Add-missing-data-files.patch \ - file://0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch \ - file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \ - file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ - file://0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch \ - file://0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch \ - file://0007-Install-few-more-test-programs.patch \ - file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \ - file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \ - file://0010-sharedtex_mt-fix-rendering-thread-hang.patch \ -" -SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061" -SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/egl, virtual/libgl ... -REQUIRED_DISTRO_FEATURES = "opengl" - -PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew glu', '', d)}" - -# The Wayland code doesn't work with Wayland 1.0, so disable it for now -#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" - -EXTRA_OECONF = "--with-system-data-files" - -PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" -PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" -PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype" -PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl" -PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1" -PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" -PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut," -PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa," -PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libopenvg" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" -PACKAGECONFIG[glew] = "--enable-glew,--disable-glew,glew" -PACKAGECONFIG[glu] = "--enable-glu,--disable-glu,virtual/libgl" - -do_install_append() { - # it can be completely empty when all PACKAGECONFIG options are disabled - rmdir --ignore-fail-on-non-empty ${D}${bindir} - - if [ -f ${D}${bindir}/clear ]; then - mv ${D}${bindir}/clear ${D}${bindir}/clear.mesa-demos - fi -} diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb deleted file mode 100644 index fc2bca998..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa.inc b/yocto-poky/meta/recipes-graphics/mesa/mesa.inc deleted file mode 100644 index 442479ae6..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa.inc +++ /dev/null @@ -1,188 +0,0 @@ -SUMMARY = "A free implementation of the OpenGL API" -DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \ -a system for rendering interactive 3D graphics. \ -A variety of device drivers allows Mesa to be used in many different environments \ -ranging from software emulation to complete hardware acceleration for modern GPUs. \ -Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \ -environment." - -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" - -PE = "2" - -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" - -PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" - -inherit autotools pkgconfig pythonnative gettext distro_features_check - -REQUIRED_DISTRO_FEATURES = "opengl" - -EXTRA_OECONF = "--enable-shared-glapi" - -PACKAGECONFIG ??= "egl gles dri ${MESA_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ - " - -X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" -PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" -PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" -PACKAGECONFIG[wayland] = ",,wayland-native wayland" - -DRIDRIVERS = "swrast" -DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" -DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" -PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS} --enable-gbm, --disable-dri, dri2proto libdrm" -PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" - -PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" - -EGL_PLATFORMS = "drm" -EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" -EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" -PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" - -GALLIUMDRIVERS = "swrast" -GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" -PACKAGECONFIG[r600] = "" -GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" -GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" -GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" -GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" -# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers -PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" -MESA_LLVM_RELEASE ?= "3.3" -PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ - ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" -export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" -PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" - -# Mesa requires one of the following crypto implementation, pick one of them -MESA_CRYPTO ??= "openssl" -PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" -PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" -PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" - -# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) -FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" - -# Multiple virtual/gl providers being built breaks staging -EXCLUDE_FROM_WORLD = "1" - -# Remove the mesa dependency on mesa-dev, as mesa is empty -RDEPENDS_${PN}-dev = "" - -PACKAGES =+ "libegl-mesa libegl-mesa-dev \ - libosmesa libosmesa-dev \ - libgl-mesa libgl-mesa-dev \ - libglapi libglapi-dev \ - libgbm libgbm-dev \ - libgles1-mesa libgles1-mesa-dev \ - libgles2-mesa libgles2-mesa-dev \ - libgles3-mesa libgles3-mesa-dev \ - libwayland-egl libwayland-egl-dev \ - libxvmcsoftpipe libxvmcsoftpipe-dev \ - libxatracker libxatracker-dev \ - mesa-megadriver \ - " - -do_install_append () { - # Drivers never need libtool .la files - rm -f ${D}${libdir}/dri/*.la - rm -f ${D}${libdir}/egl/*.la - rm -f ${D}${libdir}/gallium-pipe/*.la - rm -f ${D}${libdir}/gbm/*.la - - # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used - rm -f ${D}${sysconfdir}/drirc -} - -# For the packages that make up the OpenGL interfaces, inject variables so that -# they don't get Debian-renamed (which would remove the -mesa suffix), and -# RPROVIDEs/RCONFLICTs on the generic libgl name. -python __anonymous() { - pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() - for p in (("egl", "libegl", "libegl1"), - ("dri", "libgl", "libgl1"), - ("gles", "libgles1", "libglesv1-cm1"), - ("gles", "libgles2", "libglesv2-2"), - ("gles", "libgles3",)): - if not p[0] in pkgconfig: - continue - fullp = p[1] + "-mesa" - pkgs = " ".join(p[1:]) - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) - - d.appendVar("RRECOMMENDS_" + fullp, " mesa-megadriver") - - # For -dev, the first element is both the Debian and original name - fullp += "-dev" - pkgs = p[1] + "-dev" - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) -} - -python mesa_populate_packages() { - pkgs = ['mesa', 'mesa-dev', 'mesa-dbg'] - for pkg in pkgs: - d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - - import re - dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") - dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root) - lib_name = d.expand("${MLPREFIX}mesa-megadriver") - for p in dri_pkgs: - m = re.match('^(.*)_dri\.so$', p) - if m: - pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) - d.appendVar("RPROVIDES_%s" % lib_name, pkg_name) - d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) - d.appendVar("RREPLACES_%s" % lib_name, pkg_name) - - pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") - do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') -} - -PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " - -PACKAGES_DYNAMIC += "^mesa-driver-.*" - -FILES_${PN} += "${sysconfdir}/drirc" -FILES_mesa-megadriver = "${libdir}/dri/*" -FILES_libegl-mesa = "${libdir}/libEGL.so.*" -FILES_libgbm = "${libdir}/libgbm.so.*" -FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" -FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*" -FILES_libgl-mesa = "${libdir}/libGL.so.*" -FILES_libglapi = "${libdir}/libglapi.so.*" -FILES_libosmesa = "${libdir}/libOSMesa.so.*" -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" -FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" -FILES_libxatracker = "${libdir}/libxatracker.so.*" - -FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" -FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" -FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" -FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" -FILES_libglapi-dev = "${libdir}/libglapi.*" -FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" -FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" -FILES_libgles3-mesa-dev = "${includedir}/GLES3" -FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" -FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" -FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ - ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ - ${libdir}/pkgconfig/xatracker.pc" diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa_11.1.1.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa_11.1.1.bb deleted file mode 100644 index 502afcfd8..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa_11.1.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ -" - -SRC_URI[md5sum] = "1043dfb907beecb2a761272455960427" -SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa_git.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa_git.bb deleted file mode 100644 index c0345178c..000000000 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -require ${BPN}.inc - -DEFAULT_PREFERENCE = "-1" - -SRCREV = "ea0d1f575c214c09ba3df12644a960e86e031766" -PV = "10.5.4+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.5" - -S = "${WORKDIR}/git" - -DEPENDS += "python-mako-native" - -inherit pythonnative - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/yocto-poky/meta/recipes-graphics/mini-x-session/files/mini-x-session b/yocto-poky/meta/recipes-graphics/mini-x-session/files/mini-x-session deleted file mode 100644 index dca655a91..000000000 --- a/yocto-poky/meta/recipes-graphics/mini-x-session/files/mini-x-session +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Very simple session manager for Mini X -# - -# Uncomment below to enable parsing of debian menu entrys -# export MB_USE_DEB_MENUS=1 - -if [ -e $HOME/.mini_x/session ] -then -exec $HOME/.mini_x/session -fi - -if [ -e /etc/mini_x/session ] -then -exec /etc/mini_x/session -fi - -MINI_X_SESSION_DIR=/etc/mini_x/session.d -if [ -d "$MINI_X_SESSION_DIR" ]; then - # Execute session file on behalf of file owner - find $MINI_X_SESSION_DIR -type f | while read SESSIONFILE; do - set +e - USERNAME=`stat -c %U $SESSIONFILE` - # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] -# su -l -c '$SESSIONFILE&' $USERNAME - sudo -b -i -u $USERNAME $SESSIONFILE& - set -e - done -fi - -# This resolution is big enough for hob2's max window size. -xrandr -s 1024x768 - -# Default files to run if $HOME/.mini_x/session or /etc/mini_x/session -# dont exist. - -matchbox-terminal& -exec matchbox-window-manager diff --git a/yocto-poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/yocto-poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb deleted file mode 100644 index 4e89d631c..000000000 --- a/yocto-poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Very simple session manager for X" -HOMEPAGE = "http://www.yoctoproject.org" -BUGTRACKER = "http://bugzilla.pokylinux.org" - -PR = "r4" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487" - -SECTION = "x11" -RCONFLICTS_${PN} = "matchbox-common" - -SRC_URI = "file://mini-x-session" -S = "${WORKDIR}" - -RDEPENDS_${PN} = "sudo" - -inherit update-alternatives - -ALTERNATIVE_${PN} = "x-session-manager" -ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/mini-x-session" -ALTERNATIVE_PRIORITY = "50" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/mini-x-session ${D}/${bindir} -} diff --git a/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch b/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch deleted file mode 100644 index 3c8a83202..000000000 --- a/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix build for S != B - -This patch is specific to version 1.4.x -Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81 -Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> --- -Index: git/docs/reference/libmx-gtk/Makefile.am -=================================================================== ---- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 -+++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 -@@ -1,3 +1,6 @@ -+EXTRA_DIST= -+CLEANFILES= -+ - ## Process this file with automake to produce Makefile.in - - # We require automake 1.6 at least. -@@ -77,7 +80,7 @@ - GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la - - # This includes the standard gtk-doc make rules, copied by gtkdocize. --include $(top_srcdir)/gtk-doc.make -+include $(top_builddir)/gtk-doc.make - - # Other files to distribute - EXTRA_DIST += version.xml.in -Index: git/docs/reference/libmx/Makefile.am -=================================================================== ---- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 -+++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 -@@ -1,3 +1,6 @@ -+EXTRA_DIST= -+CLEANFILES= -+ - ## Process this file with automake to produce Makefile.in - - # We require automake 1.6 at least. -@@ -106,7 +109,7 @@ - GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la - - # This includes the standard gtk-doc make rules, copied by gtkdocize. --include $(top_srcdir)/gtk-doc.make -+include $(top_builddir)/gtk-doc.make - - # Other files to distribute - EXTRA_DIST += version.xml.in diff --git a/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch b/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch deleted file mode 100644 index 82c93dd60..000000000 --- a/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix missing include directory when building tests - -This patch is currently required for all versions of mx -Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/82 -Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> --- -Index: git/tests/Makefile.am -=================================================================== ---- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 -+++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 -@@ -10,7 +10,8 @@ - - INCLUDES = \ - -I$(top_srcdir) \ -- -I$(top_builddir) -+ -I$(top_builddir)\ -+ -I$(top_builddir)/mx - - noinst_PROGRAMS = \ - test-deform-texture \ diff --git a/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb deleted file mode 100644 index 5545c1e81..000000000 --- a/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -require mx.inc - -# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix -SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" -PV = "1.4.7+git${SRCPV}" - -# Exclude x.99.x versions from upstream checks -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)" - -SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ - file://fix-build-dir.patch \ - file://fix-test-includes.patch \ - " -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ - file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879" diff --git a/yocto-poky/meta/recipes-graphics/mx/mx.inc b/yocto-poky/meta/recipes-graphics/mx/mx.inc deleted file mode 100644 index 4f1095793..000000000 --- a/yocto-poky/meta/recipes-graphics/mx/mx.inc +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Clutter based UI widget library" -LICENSE = "LGPLv2.1" - -inherit clutter autotools-brokensep distro_features_check gobject-introspection -# depends on clutter-1.0 which depends on cogl-1.0 -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" - -SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" - -EXTRA_OECONF = "--disable-gtk-doc \ - --disable-gtk-widgets \ - --with-dbus \ - --with-winsys=none \ - --without-clutter-imcontext \ - --without-clutter-gesture \ - --without-startup-notification \ - --without-glade \ - " - -FILES_${PN} += "${datadir}" diff --git a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb deleted file mode 100644 index 5734b2785..000000000 --- a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -SUMMARY = "Clutter package groups" -LICENSE = "MIT" - -PR = "r6" - -inherit packagegroup distro_features_check -# rdepends on clutter-* -REQUIRED_DISTRO_FEATURES = "opengl" - -PACKAGES = "\ - ${PN}-core \ - " - -SUMMARY_${PN}-core = "Clutter graphics library" -RDEPENDS_${PN}-core = "\ - clutter-1.0 \ - clutter-gst-3.0 \ - clutter-gtk-1.0 \ - " diff --git a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb deleted file mode 100644 index a657a1a4e..000000000 --- a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "DirectFB without X11" -LICENSE = "MIT" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' - -RDEPENDS_${PN} = " \ - directfb \ - directfb-examples \ - pango \ - fontconfig \ - ${TOUCH} \ -" diff --git a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb deleted file mode 100644 index 17301a052..000000000 --- a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Basic X11 session" -DESCRIPTION = "Packages required to set up a basic working X11 session" -LICENSE = "MIT" -PR = "r1" - -inherit packagegroup distro_features_check -# rdepends on matchbox-wm -REQUIRED_DISTRO_FEATURES = "x11" - -RDEPENDS_${PN} = "\ - packagegroup-core-x11-xserver \ - packagegroup-core-x11-utils \ - dbus \ - pointercal \ - matchbox-terminal \ - matchbox-wm \ - mini-x-session \ - liberation-fonts \ - " diff --git a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb deleted file mode 100644 index c53f1b758..000000000 --- a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2011 Intel Corporation -# - -SUMMARY = "X11 display server" -LICENSE = "MIT" -PR = "r40" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup distro_features_check -# rdepends on XSERVER -REQUIRED_DISTRO_FEATURES = "x11" - -XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" -XSERVERCODECS ?= "" - -RDEPENDS_${PN} = "\ - ${XSERVER} \ - ${XSERVERCODECS} \ - " diff --git a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb deleted file mode 100644 index 3537d8cbb..000000000 --- a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (C) 2011 Intel Corporation -# - -LICENSE = "MIT" -PR = "r40" - -inherit packagegroup distro_features_check -# rdepends on x11-common -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGES = "${PN} ${PN}-utils" - -# xserver-common, x11-common -VIRTUAL-RUNTIME_xserver_common ?= "x11-common" - -# elsa, xserver-nodm-init -VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" - -SUMMARY = "X11 display server and basic utilities" -RDEPENDS_${PN} = "\ - ${PN}-xserver \ - ${PN}-utils \ - " - -SUMMARY_${PN}-utils = "X11 basic utilities and init" -RDEPENDS_${PN}-utils = "\ - ${VIRTUAL-RUNTIME_xserver_common} \ - ${VIRTUAL-RUNTIME_graphical_init_manager} \ - xauth \ - xhost \ - xset \ - xrandr \ - " diff --git a/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch b/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch deleted file mode 100644 index 812da21c5..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 867a512eddbeb1899d3e7096df3da1dd0ce3e7b7 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 23 Oct 2015 14:06:17 +0300 -Subject: [PATCH] Drop introspection macros from acinclude.m4 - -They take precendence over our customized macros, and so -introspection doesn't work correctly. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - acinclude.m4 | 96 ------------------------------------------------------------ - 1 file changed, 96 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 8899c7c..48fd5d8 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -55,99 +55,3 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], - ]) - - --dnl REMOVE THIS WHEN introspection.m4 is widely available --dnl --dnl -*- mode: autoconf -*- --dnl Copyright 2009 Johan Dahlin --dnl --dnl This file is free software; the author(s) gives unlimited --dnl permission to copy and/or distribute it, with or without --dnl modifications, as long as this notice is preserved. --dnl -- --# serial 1 -- --m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], --[ -- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -- -- dnl enable/disable introspection -- m4_if([$2], [require], -- [dnl -- enable_introspection=yes -- ],[dnl -- AC_ARG_ENABLE(introspection, -- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -- [Enable introspection for this build]),, -- [enable_introspection=auto]) -- ])dnl -- -- AC_MSG_CHECKING([for gobject-introspection]) -- -- dnl presence/version checking -- AS_CASE([$enable_introspection], -- [no], [dnl -- found_introspection="no (disabled, use --enable-introspection to enable)" -- ],dnl -- [yes],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0],, -- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -- found_introspection=yes, -- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -- ],dnl -- [auto],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -- ],dnl -- [dnl -- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -- ])dnl -- -- AC_MSG_RESULT([$found_introspection]) -- -- INTROSPECTION_SCANNER= -- INTROSPECTION_COMPILER= -- INTROSPECTION_GENERATE= -- INTROSPECTION_GIRDIR= -- INTROSPECTION_TYPELIBDIR= -- if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -- fi -- AC_SUBST(INTROSPECTION_SCANNER) -- AC_SUBST(INTROSPECTION_COMPILER) -- AC_SUBST(INTROSPECTION_GENERATE) -- AC_SUBST(INTROSPECTION_GIRDIR) -- AC_SUBST(INTROSPECTION_TYPELIBDIR) -- AC_SUBST(INTROSPECTION_CFLAGS) -- AC_SUBST(INTROSPECTION_LIBS) -- AC_SUBST(INTROSPECTION_MAKEFILE) -- -- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") --]) -- -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -- --AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) --]) -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -- -- --AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) --]) --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/pango/pango/run-ptest b/yocto-poky/meta/recipes-graphics/pango/pango/run-ptest deleted file mode 100644 index fa87a7577..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -gnome-desktop-testing-runner pango diff --git a/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb b/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb deleted file mode 100644 index 7fc65fd43..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Framework for layout and rendering of internationalized text" -DESCRIPTION = "Pango is a library for laying out and rendering of text, \ -with an emphasis on internationalization. Pango can be used anywhere \ -that text layout is needed, though most of the work on Pango so far has \ -been done in the context of the GTK+ widget toolkit. Pango forms the \ -core of text and font handling for GTK+-2.x." -HOMEPAGE = "http://www.pango.org/" -BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "libs" -LICENSE = "LGPLv2.0+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection - -SRC_URI += "file://run-ptest \ - file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ -" - -SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d" -SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" - -DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" - -EXTRA_AUTORECONF = "" - -EXTRA_OECONF = " \ - --disable-debug \ - " - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.8.0" - -# This binary needs to be compiled for the host architecture. This isn't pretty! -do_compile_prepend_class-target () { - if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then - make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode - fi -} - -FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" - -RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ - pango-module-basic-fc pango-module-arabic-lang" - -BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch b/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch deleted file mode 100644 index c27cc04f0..000000000 --- a/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> - -From e40e0a25f996d2e205c4bdec2c8a5cc7f74e5065 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Mon, 15 Jun 2015 16:25:30 -0300 -Subject: tests: Fix missing include of Xutil.h - -The EGL tests rely on Xutil.h being included. Some EGL implementation -does not explitly include it by default and then the build fails. - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> -Reviewed-by: Neil Roberts <neil@linux.intel.com> - -diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c -index 0504a26..154b55c 100644 ---- a/tests/egl/egl-configless-context.c -+++ b/tests/egl/egl-configless-context.c -@@ -32,6 +32,7 @@ - /* Chunks of code in this file are taken from egl-util.c */ - - #include <X11/Xlib.h> -+#include <X11/Xutil.h> - - #include "piglit-util-gl.h" - #include "piglit-util-egl.h" --- -cgit v0.10.2 diff --git a/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb b/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb deleted file mode 100644 index 607f236c2..000000000 --- a/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "OpenGL driver testing framework" -LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" - -SRC_URI = "git://anongit.freedesktop.org/piglit \ - file://0001-tests-Fix-missing-include-of-Xutil.h.patch" - -# From 2015-02-19 -SRCREV = "c4585427913e4cb28994b4bfb11d49778273aa2c" -# (when PV goes above 1.0 remove the trailing r) -PV = "1.0+gitr${SRCPV}" - -S = "${WORKDIR}/git" - -DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native" - -inherit cmake pythonnative distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -# The built scripts go into the temporary directory according to tempfile -# (typically /tmp) which can race if multiple builds happen on the same machine, -# so tell it to use a directory in ${B} to avoid overwriting. -export TEMP = "${B}/temp/" -do_compile[dirs] =+ "${B}/temp/" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," - -do_configure_prepend() { - if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then - sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h - sed -i -e "/^#.*include.*<GL\/glut.h>$/d" ${S}/src/piglit/glut_wrap.h - fi -} - -RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \ - python-argparse python-importlib python-unixadmin python-xml \ - python-multiprocessing python-textutils python-netserver python-shell \ - mesa-demos bash \ - " - -INSANE_SKIP_${PN} += "dev-so" diff --git a/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c b/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c deleted file mode 100644 index 41cebc58a..000000000 --- a/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c +++ /dev/null @@ -1,410 +0,0 @@ -/* - * Pong Clock - A clock that plays pong. - * See http://mocoloco.com/archives/001766.php for the inspiration. - * - * Copyright (C) 2005 Matthew Allum - * - * Author: Matthew Allum mallum@openedhand.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include <stdlib.h> -#include <time.h> -#include <sys/time.h> -#include <sys/types.h> -#include <string.h> -#include <stdio.h> -#include <unistd.h> -#include <signal.h> - -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/Xatom.h> - -/* Tweak values for different hw setups */ - -#define FPS 50 -#define RESX 40 -#define RESY 40 -#define TO_MISS_SECS 55 -#define BALLDX 16 -#define BALLDY 4 - - -typedef struct PongClock -{ - Display *xdpy; - int xscreen; - Window xwin, xwin_root; - Pixmap backbuffer; - GC xgc; - int xwin_width, xwin_height; - int pixelw, pixelh; - - int ball_x, ball_y, ball_dx, ball_dy; - int bata_y, batb_y; - Bool bata_to_miss, batb_to_miss; - -} -PongClock; - -void -get_time(int *hour, int *min, int *sec) -{ - struct timeval tv; - struct tm *localTime = NULL; - time_t actualTime; - - gettimeofday(&tv, 0); - actualTime = tv.tv_sec; - localTime = localtime(&actualTime); - - if (hour) - *hour = localTime->tm_hour; - - if (min) - *min = localTime->tm_min; - - if (sec) - *sec = localTime->tm_sec; -} - -void -draw_rect (PongClock *pong_clock, - int x, - int y, - int width, - int height) -{ - XFillRectangle (pong_clock->xdpy, - pong_clock->backbuffer, - pong_clock->xgc, - x * pong_clock->pixelw, - y * pong_clock->pixelh, - width * pong_clock->pixelw, - height * pong_clock->pixelh); -} - -void -draw_field (PongClock *pong_clock) -{ - int i; - - draw_rect (pong_clock, 0, 0, RESX+1, 1); - draw_rect (pong_clock, 0, RESY-1, RESX+1, 1); - - for (i=0; i < RESY/2; i++) - draw_rect (pong_clock, (RESX/2)-1, i*2, 2, 1); -} - -void -draw_digit (PongClock *pong_clock, - int x, - int y, - int digit) -{ - int digits[] = { 0x1f8c63f, 0x1f21086, 0x1f0fe1f, 0x1f87e1f, 0x1087e31, - 0x1f87c3f, 0x1f8fc3f, 0x84421f, 0x1f8fe3f, 0x1087e3f }; - - XRectangle rects[5*5]; - int i,j,k; - - i = 0; - - for (k=0; k<5; k++) - for (j=0; j<5; j++) - if (digits[digit] & (1 << ((k*5)+j))) - { - rects[i].x = (x + j) * pong_clock->pixelw; - rects[i].y = (y + k) * pong_clock->pixelh; - rects[i].width = pong_clock->pixelw; - rects[i].height = pong_clock->pixelh; - i++; - } - - XFillRectangles (pong_clock->xdpy, - pong_clock->backbuffer, - pong_clock->xgc, - rects, i); -} - -void -draw_time (PongClock *pong_clock) -{ - int hour, min; - - get_time(&hour, &min, NULL); - - draw_digit (pong_clock, - (RESX/2) - 14, - 5, - hour / 10 ); - - draw_digit (pong_clock, - (RESX/2) - 8, - 5, - hour % 10 ); - - draw_digit (pong_clock, - (RESX/2) + 3, - 5, - min / 10 ); - - draw_digit (pong_clock, - (RESX/2) + 9, - 5, - min % 10 ); -} - -void -draw_bat_and_ball (PongClock *pong_clock) -{ - /* ball */ - - XFillRectangle (pong_clock->xdpy, - pong_clock->backbuffer, - pong_clock->xgc, - pong_clock->ball_x, - pong_clock->ball_y, - pong_clock->pixelw, - pong_clock->pixelh); - - /* bat a */ - - XFillRectangle (pong_clock->xdpy, - pong_clock->backbuffer, - pong_clock->xgc, - 0, - pong_clock->bata_y - (2 * pong_clock->pixelh), - pong_clock->pixelw, - pong_clock->pixelh * 5); - - /* bat b */ - - XFillRectangle (pong_clock->xdpy, - pong_clock->backbuffer, - pong_clock->xgc, - (pong_clock->xwin_width - pong_clock->pixelw), - pong_clock->batb_y - (2 * pong_clock->pixelh), - pong_clock->pixelw, - pong_clock->pixelh * 5); - -} - -void -update_state (PongClock *pong_clock) -{ - int sec, min, hour; - - get_time(&hour, &min, &sec); - - /* Check ball is on field and no ones dues to miss a shot. - */ - if ( (pong_clock->ball_x < 0 && !pong_clock->bata_to_miss) - || (pong_clock->ball_x > (pong_clock->xwin_width - pong_clock->pixelw) - && !pong_clock->batb_to_miss) ) - pong_clock->ball_dx *= -1; - - if ((pong_clock->ball_y < pong_clock->pixelh) - || pong_clock->ball_y > (pong_clock->xwin_height - (2*pong_clock->pixelh))) - pong_clock->ball_dy *= -1; - - pong_clock->ball_x += pong_clock->ball_dx; - pong_clock->ball_y += pong_clock->ball_dy; - - /* Set up someone to miss if we getting close to an hour or min. - */ - if (sec > TO_MISS_SECS) - { - if (min == 59) - pong_clock->batb_to_miss = True; - else - pong_clock->bata_to_miss = True; - } - else - { - /* Reset the game */ - if (pong_clock->bata_to_miss) - { - pong_clock->bata_to_miss = False; - pong_clock->ball_y = pong_clock->bata_y; - pong_clock->ball_x = pong_clock->pixelw; - pong_clock->ball_dx *= -1; - } - - if (pong_clock->batb_to_miss) - { - pong_clock->batb_to_miss = False; - pong_clock->ball_y = pong_clock->batb_y; - pong_clock->ball_x = pong_clock->xwin_width - pong_clock->pixelw; - pong_clock->ball_dx *= -1; - } - } - - /* Keep bats on field and only move in not setup to miss */ - if (pong_clock->ball_y >= (3*pong_clock->pixelh) - && pong_clock->ball_y <= (pong_clock->xwin_height - (5*pong_clock->pixelh))) - { - if (!pong_clock->batb_to_miss) - pong_clock->batb_y = pong_clock->ball_y; - - if (!pong_clock->bata_to_miss) - pong_clock->bata_y = pong_clock->ball_y; - } -} - -void -draw_frame (PongClock *pong_clock) -{ - update_state (pong_clock); - - /* Clear playfield */ - XSetForeground (pong_clock->xdpy, - pong_clock->xgc, - BlackPixel(pong_clock->xdpy, - pong_clock->xscreen)); - - XFillRectangle (pong_clock->xdpy, - pong_clock->backbuffer, - pong_clock->xgc, - 0, 0, - pong_clock->xwin_width, - pong_clock->xwin_height); - - XSetForeground (pong_clock->xdpy, - pong_clock->xgc, - WhitePixel(pong_clock->xdpy, - pong_clock->xscreen)); - - draw_field (pong_clock); - - draw_time (pong_clock); - - draw_bat_and_ball (pong_clock); - - /* flip 'backbuffer' */ - XSetWindowBackgroundPixmap (pong_clock->xdpy, - pong_clock->xwin, - pong_clock->backbuffer); - XClearWindow(pong_clock->xdpy, pong_clock->xwin); - - XSync(pong_clock->xdpy, False); -} - -int -main (int argc, char **argv) -{ - XGCValues gcv; - Atom atoms_WINDOW_STATE, atoms_WINDOW_STATE_FULLSCREEN; - PongClock *pong_clock; - - pong_clock = malloc(sizeof(PongClock)); - memset(pong_clock, 0, sizeof(PongClock)); - - if ((pong_clock->xdpy = XOpenDisplay(getenv("DISPLAY"))) == NULL) { - fprintf(stderr, "Cannot connect to X server on display %s.", - getenv("DISPLAY")); - exit(-1); - } - - pong_clock->xscreen = DefaultScreen(pong_clock->xdpy); - pong_clock->xwin_root = DefaultRootWindow(pong_clock->xdpy); - pong_clock->xwin_width = DisplayWidth(pong_clock->xdpy, - pong_clock->xscreen); - pong_clock->xwin_height = DisplayHeight(pong_clock->xdpy, - pong_clock->xscreen); - - pong_clock->pixelw = pong_clock->xwin_width / RESX; - pong_clock->pixelh = pong_clock->xwin_height / RESY; - - pong_clock->ball_x = 0; - pong_clock->ball_y = pong_clock->xwin_height / 2; - - pong_clock->ball_dx = BALLDX; - pong_clock->ball_dy = BALLDY; - - pong_clock->batb_y = pong_clock->bata_y = pong_clock->ball_y; - - gcv.background = BlackPixel(pong_clock->xdpy, - pong_clock->xscreen); - gcv.foreground = WhitePixel(pong_clock->xdpy, - pong_clock->xscreen); - gcv.graphics_exposures = False; - - pong_clock->xgc = XCreateGC (pong_clock->xdpy, pong_clock->xwin_root, - GCForeground|GCBackground|GCGraphicsExposures, - &gcv); - - atoms_WINDOW_STATE - = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE",False); - atoms_WINDOW_STATE_FULLSCREEN - = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE_FULLSCREEN",False); - - pong_clock->xwin = XCreateSimpleWindow(pong_clock->xdpy, - pong_clock->xwin_root, - 0, 0, - pong_clock->xwin_width, - pong_clock->xwin_height, - 0, - WhitePixel(pong_clock->xdpy, - pong_clock->xscreen), - BlackPixel(pong_clock->xdpy, - pong_clock->xscreen)); - - pong_clock->backbuffer = XCreatePixmap(pong_clock->xdpy, - pong_clock->xwin_root, - pong_clock->xwin_width, - pong_clock->xwin_height, - DefaultDepth(pong_clock->xdpy, - pong_clock->xscreen)); - - XSelectInput(pong_clock->xdpy, pong_clock->xwin, KeyPressMask); - - - /* Set the hints for fullscreen */ - XChangeProperty(pong_clock->xdpy, - pong_clock->xwin, - atoms_WINDOW_STATE, - XA_ATOM, - 32, - PropModeReplace, - (unsigned char *) &atoms_WINDOW_STATE_FULLSCREEN, 1); - - XMapWindow(pong_clock->xdpy, pong_clock->xwin); - - while (True) - { - struct timeval timeout; - XEvent xev; - - timeout.tv_sec = 0; - timeout.tv_usec = 1000000 / FPS; - select (0, NULL, NULL, NULL, &timeout); - - draw_frame (pong_clock); - - XFlush(pong_clock->xdpy); - - if (XPending(pong_clock->xdpy)) - { - if (XCheckMaskEvent(pong_clock->xdpy, - KeyPressMask, - &xev)) - exit(-1); - } - } -} diff --git a/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb deleted file mode 100644 index 0e1a7928f..000000000 --- a/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A clock combined with a game of pong" -LICENSE = "GPLv2+" -DEPENDS = "virtual/libx11 xdmcp xau" - -inherit distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "file://pong-clock-no-flicker.c" - -LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3" - -S = "${WORKDIR}" - -do_compile () { - ${CC} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp` -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 pong-clock ${D}${bindir} -} diff --git a/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch b/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch deleted file mode 100644 index 9e86f2b2e..000000000 --- a/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59097] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd startup-notification-0.12/configure.in startup-notification-0.12/configure.in ---- startup-notification-0.12/configure.in 2011-05-16 17:29:20.000000000 +0300 -+++ startup-notification-0.12/configure.in 2013-01-07 06:00:48.921905409 +0200 -@@ -3,7 +3,7 @@ - AC_CONFIG_SRCDIR(libsn/sn-launchee.c) - - AM_INIT_AUTOMAKE --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - # Honor aclocal flags - AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") diff --git a/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb deleted file mode 100644 index 6c1b93cd0..000000000 --- a/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Enables monitoring and display of application startup" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/startup-notification/" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=Specifications" - -# most files are under MIT, but libsn/sn-util.c is under LGPL, the -# effective license is LGPL -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=a2ae2cd47d6d2f238410f5364dfbc0f2 \ - file://libsn/sn-util.c;endline=18;md5=18a14dc1825d38e741d772311fea9ee1 \ - file://libsn/sn-common.h;endline=23;md5=6d05bc0ebdcf5513a6e77cb26e8cd7e2 \ - file://test/test-boilerplate.h;endline=23;md5=923e706b2a70586176eead261cc5bb98" - -PR = "r2" - -SECTION = "libs" - - -DEPENDS = "virtual/libx11 libsm xcb-util" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz \ - file://obsolete_automake_macros.patch \ -" - -SRC_URI[md5sum] = "2cd77326d4dcaed9a5a23a1232fb38e9" -SRC_URI[sha256sum] = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a" diff --git a/yocto-poky/meta/recipes-graphics/tslib/tslib/ts.conf b/yocto-poky/meta/recipes-graphics/tslib/tslib/ts.conf deleted file mode 100644 index 1b0da937e..000000000 --- a/yocto-poky/meta/recipes-graphics/tslib/tslib/ts.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Uncomment if you wish to use the linux input layer event interface -module_raw input - -# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d -# module_raw collie - -# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 -# module_raw corgi - -# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface -# module_raw ucb1x00 - -# Uncomment if you're using an HP iPaq h3600 or similar -# module_raw h3600 - -# Uncomment if you're using a Hitachi Webpad -# module_raw mk712 - -# Uncomment if you're using an IBM Arctic II -# module_raw arctic2 - -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/yocto-poky/meta/recipes-graphics/tslib/tslib/tslib.sh b/yocto-poky/meta/recipes-graphics/tslib/tslib/tslib.sh deleted file mode 100644 index 7068e8d92..000000000 --- a/yocto-poky/meta/recipes-graphics/tslib/tslib/tslib.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ -e /dev/input/touchscreen0 ]; then - TSLIB_TSDEVICE=/dev/input/touchscreen0 - - export TSLIB_TSDEVICE -fi - diff --git a/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb b/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb deleted file mode 100644 index b0264c3b3..000000000 --- a/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "An abstraction layer for touchscreen panel events" -DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ -events, as well as a filter stack for the manipulation of those events. \ -Tslib is generally used on embedded devices to provide a common user \ -space interface to touchscreen functionality." -HOMEPAGE = "http://tslib.berlios.de/" - -AUTHOR = "Russell King w/ plugins by Chris Larson et. al." -SECTION = "base" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" - -SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ - file://ts.conf \ - file://tslib.sh \ -" - -SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d" -SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" - -UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" - -do_install_prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ -} - -# People should consider using udev's /dev/input/touchscreen0 symlink -# instead of detect-stylus -#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" -RPROVIDES_tslib-conf = "libts-0.0-conf" - -PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" -DEBIAN_NOAUTONAME_tslib-conf = "1" -DEBIAN_NOAUTONAME_tslib-tests = "1" -DEBIAN_NOAUTONAME_tslib-calibrate = "1" - -RDEPENDS_${PN} = "tslib-conf" -RRECOMMENDS_${PN} = "pointercal" - -FILES_${PN}-dev += "${libdir}/ts/*.la" -FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" -FILES_tslib-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf b/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf deleted file mode 100644 index 06094503c..000000000 --- a/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<!-- conf.d/sub-pixel.conf --> -<fontconfig> - <alias> - <family>sans-serif</family> - <accept><family>Liberation Sans</family></accept> - </alias> - <alias> - <family>serif</family> - <accept><family>Liberation Serif</family></accept> - </alias> - <alias> - <family>monospace</family> - <accept><family>Liberation Mono</family></accept> - </alias> -</fontconfig> diff --git a/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb deleted file mode 100644 index bda82e7ef..000000000 --- a/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Liberation(tm) Fonts" -DESCRIPTION = "The Liberation(tm) Fonts is a font family originally \ -created by Ascender(c) which aims at metric compatibility with \ -Arial, Times New Roman, Courier New." -HOMEPAGE = "https://fedorahosted.org/liberation-fonts/" -BUGTRACKER = "https://bugzilla.redhat.com/" - -RECIPE_NO_UPDATE_REASON = "2.x depends on fontforge package, which is not yet provided in oe-core" - -SECTION = "x11/fonts" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r4" -PE = "1" - -inherit allarch fontcache - -FONT_PACKAGES = "${PN}" - -SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \ - file://30-liberation-aliases.conf" - -SRC_URI[md5sum] = "4846797ef0fc70b0cbaede2514677c58" -SRC_URI[sha256sum] = "0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1" - -do_install () { - install -d ${D}${datadir}/fonts/ttf/ - for i in *.ttf; do - install -m 0644 $i ${D}${prefix}/share/fonts/ttf/${i} - done - - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${prefix}/share/doc/${BPN}/ - install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/ -} - -PACKAGES = "${PN}" -FILES_${PN} += "${sysconfdir} ${datadir}" diff --git a/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb deleted file mode 100644 index b2e4cef39..000000000 --- a/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "The Bitstream Vera fonts - TTF Edition" -DESCRIPTION = "The Bitstream Vera fonts include four monospace and sans \ -faces (normal, oblique, bold, bold oblique) and two serif faces (normal \ -and bold). In addition Fontconfig/Xft2 can artificially oblique the \ -serif faces for you: this loses hinting and distorts the faces slightly, \ -but is visibly different than normal and bold, and reasonably pleasing." -SECTION = "x11/fonts" -LICENSE = "BitstreamVera" -LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" -PR = "r7" - -inherit fontcache - -FONT_PACKAGES = "${PN}" - -SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" - -do_install () { - install -d ${D}${prefix}/share/fonts/ttf/ - for i in *.ttf; do - install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i} - done - - # fontconfig ships this too. not sure what to do about it. - #install -d ${D}${sysconfdir}/fonts - #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf - - - install -d ${D}${prefix}/share/doc/${BPN}/ - for i in *.TXT; do - install -m 644 $i ${D}${prefix}/share/doc/${BPN}/$i - done -} - -FILES_${PN} = "/etc ${datadir}/fonts" - -SRC_URI[md5sum] = "bb22bd5b4675f5dbe17c6963d8c00ed6" -SRC_URI[sha256sum] = "db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc" diff --git a/yocto-poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch b/yocto-poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch deleted file mode 100644 index a0c826ed9..000000000 --- a/yocto-poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 3b9b8f5f6d1b99af43e95ec0868404e552a85b73 Mon Sep 17 00:00:00 2001 -From: Emil Velikov <emil.l.velikov@gmail.com> -Date: Thu, 19 Mar 2015 22:26:11 +0000 -Subject: [PATCH] third_party/threads: Use PTHREAD_MUTEX_RECURSIVE by default - -PTHREAD_MUTEX_RECURSIVE_NP was used for compatibility with old glibc. -Although due to the_GNU_SOURCES define the portable, -PTHREAD_MUTEX_RECURSIVE will be available for Linuxes since at least -1998. Simplify things giving us compatibility with musl which -apparently does not provide the non-portable define. - -Inspired by almost identical commit in mesa aead7fe2e2b(c11/threads: Use -PTHREAD_MUTEX_RECURSIVE by default) by Felix Janda. - -Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> -Reviewed-by: Chad Versace <chad.versace@intel.com> ---- -Upstream-Status: Backport - - third_party/threads/threads_posix.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/third_party/threads/threads_posix.c b/third_party/threads/threads_posix.c -index 5835e43..e122bf9 100644 ---- a/third_party/threads/threads_posix.c -+++ b/third_party/threads/threads_posix.c -@@ -26,6 +26,9 @@ - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+ -+#define _GNU_SOURCE -+ - #include <stdlib.h> - #ifndef assert - #include <assert.h> -@@ -150,13 +153,8 @@ int mtx_init(mtx_t *mtx, int type) - && type != (mtx_try|mtx_recursive)) - return thrd_error; - pthread_mutexattr_init(&attr); -- if ((type & mtx_recursive) != 0) { --#if defined(__linux__) || defined(__linux) -- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); --#else -+ if ((type & mtx_recursive) != 0) - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); --#endif -- } - pthread_mutex_init(mtx, &attr); - pthread_mutexattr_destroy(&attr); - return thrd_success; --- -2.5.2 - diff --git a/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb deleted file mode 100644 index f7db1bc95..000000000 --- a/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "cross-platform C library to defer selection of GL API and of window system" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ - file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" - -SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz \ - file://0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch \ - " -SRC_URI[md5sum] = "c669c91bf2f7e13a5d781c3dbb30fd8c" -SRC_URI[sha256sum] = "d2c096cf654bf0061323a4b9231a1ef5b749a1e5c7c5bfe067e964219c2a851c" - -UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html" - -inherit cmake distro_features_check lib_package - -# This should be overridden per-machine to reflect the capabilities of the GL -# stack. -PACKAGECONFIG ??= "glx" - -# libx11 requires x11 in DISTRO_FEATURES. -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" - -# I say virtual/libgl, actually wants gl.pc -PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/libgl libx11" - -# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland -# DISTRO_FEATURE. -PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,-Dwaffle_has_wayland=0,virtual/libgl wayland" - -# I say virtual/libgl, actually wants gbm.pc egl.pc -PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/libgl udev" - -# I say virtual/libgl, actually wants egl.pc -PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/libgl libxcb" - -FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake \ - ${libdir}/cmake/Waffle/" diff --git a/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch b/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch deleted file mode 100644 index 97c63bd37..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch +++ /dev/null @@ -1,72 +0,0 @@ -This is a workaround upstream suggests for use with kernel 4.1. - -Upstream-Status: Inappropriate [temporary work-around] -Signed-Off-By: Jussi Kukkonen <jussi.kukkonen@intel.com> - - - -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon Aug 3 18:23:12 PDT 2015 -Subject: [PATCH v3 libinput] touchpad: serial synaptics need to fake new touches on TRIPLETAP - -On the 4.1 kernels synaptics pretends to have 3 slots (the serial fw only does -2). This was added to avoid cursor jumps but has since been reverted for 4.2 -(kernel commit dbf3c37086, 4.1.3 is still buggy). In some cases a TRIPLETAP -may be triggered without slot 2 ever activating. - -While there are still those kernels out there, work around this bug by opening -a new touch point where none exists if the fake finger count exceeds the slot -count. - -Reported-by: Jan Alexander Steffens <jan.steffens at gmail.com> -Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net> -Tested-by: Jan Alexander Steffens <jan.steffens at gmail.com> -Reviewed-by: Hans de Goede <hdegoede at redhat.com> ---- -Changes to v2: -- split out the handling instead of having a tmp state variable, see Hans' - comments from v2 - -Mainly sending this to the list again so I have a link to point people to. -If you're on 4.1.x add this patch to your distribution package. - - src/evdev-mt-touchpad.c | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index a683d9a..5ef03d5 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -369,13 +369,23 @@ tp_restore_synaptics_touches(struct tp_dispatch *tp, - for (i = 0; i < tp->num_slots; i++) { - struct tp_touch *t = tp_get_touch(tp, i); - -- if (t->state != TOUCH_END) -+ switch(t->state) { -+ case TOUCH_HOVERING: -+ case TOUCH_BEGIN: -+ case TOUCH_UPDATE: - continue; -- -- /* new touch, move it through begin to update immediately */ -- tp_new_touch(tp, t, time); -- tp_begin_touch(tp, t, time); -- t->state = TOUCH_UPDATE; -+ case TOUCH_NONE: -+ /* new touch, move it through to begin immediately */ -+ tp_new_touch(tp, t, time); -+ tp_begin_touch(tp, t, time); -+ break; -+ case TOUCH_END: -+ /* touch just ended ,we need need to restore it to update */ -+ tp_new_touch(tp, t, time); -+ tp_begin_touch(tp, t, time); -+ t->state = TOUCH_UPDATE; -+ break; -+ } - } - } - --- -2.4.3 - diff --git a/yocto-poky/meta/recipes-graphics/wayland/libinput_1.1.4.bb b/yocto-poky/meta/recipes-graphics/wayland/libinput_1.1.4.bb deleted file mode 100644 index 4167679c2..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/libinput_1.1.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Library to handle input devices in Wayland compositors" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f" - -DEPENDS = "libevdev udev mtdev" - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \ -" -SRC_URI[md5sum] = "0945318141c1a9f52857bbf65d175f32" -SRC_URI[sha256sum] = "302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" -PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3" - -FILES_${PN} += "${libdir}/udev/" diff --git a/yocto-poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/yocto-poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb deleted file mode 100644 index ccd0ebbfc..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Multitouch Protocol Translation Library" - -DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ -multitouch events to the slotted type B protocol. The events put into mtdev may \ -be from any MT device, specifically type A without contact tracking, type A with \ -contact tracking, or type B with contact tracking" - -HOMEPAGE = "http://bitmath.org/code/mtdev/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" - -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" -SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" -SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" - -inherit autotools pkgconfig diff --git a/yocto-poky/meta/recipes-graphics/wayland/wayland_1.9.0.bb b/yocto-poky/meta/recipes-graphics/wayland/wayland_1.9.0.bb deleted file mode 100644 index d12ac186c..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/wayland_1.9.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ - file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "5e141b3f2a7005d6c89d6f233c87c317" -SRC_URI[sha256sum] = "9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa" - -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS = "expat libffi wayland-native" - -EXTRA_OECONF = "--disable-documentation --with-host-scanner" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install_append_class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} - -sysroot_stage_all_append_class-target () { - rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 - cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ -} - -FILES_${PN} = "${libdir}/*${SOLIBS}" -FILES_${PN}-dev += "${bindir} ${datadir}/wayland" diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb b/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb deleted file mode 100644 index 653541e3c..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" - -SRC_URI = "file://init \ - file://weston.service" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}/${sysconfdir}/init.d - install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston - - install -d ${D}${systemd_system_unitdir} - install -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir} -} - -inherit allarch update-rc.d distro_features_check systemd - -# rdepends on weston which depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -RDEPENDS_${PN} = "weston kbd" - -INITSCRIPT_NAME = "weston" -INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." - -SYSTEMD_SERVICE_${PN} = "weston.service" diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston-init/init b/yocto-poky/meta/recipes-graphics/wayland/weston-init/init deleted file mode 100644 index 2e938f430..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston-init/init +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: weston -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -if test -e /etc/default/weston ; then - . /etc/default/weston -fi - -killproc() { - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - weston=false) - echo "Weston disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - . /etc/profile - - # This is all a nasty hack - if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/root - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - - openvt -s weston -- $OPTARGS - ;; - - stop) - echo "Stopping Weston" - killproc weston - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service b/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service deleted file mode 100644 index 4f1f7ff10..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Weston Wayland compositor startup -RequiresMountsFor=/run - -[Service] -User=root -EnvironmentFile=-/etc/default/weston -Environment="XDG_RUNTIME_DIR=/run/user/root" -ExecStartPre=/bin/mkdir -p /run/user/root -ExecStartPre=/bin/chmod 0700 /run/user/root -ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS - -[Install] -WantedBy=multi-user.target - diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch deleted file mode 100644 index 148848d8d..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 May 2015 20:56:00 -0700 -Subject: [PATCH weston] make error() portable - -error() is not posix but gnu extension so may not be available on all -kind of systemsi e.g. musl. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - configure.ac | 2 ++ - src/weston-error.h | 20 ++++++++++++++++++++ - src/weston-launch.c | 2 +- - 3 files changed, 23 insertions(+), 1 deletion(-) - create mode 100644 src/weston-error.h - -diff --git a/configure.ac b/configure.ac -index 263fc22..f52cd62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include <time.h>]]) - AC_CHECK_HEADERS([execinfo.h]) - -+AC_CHECK_HEADERS([error.h]) -+ - AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - - COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2" -diff --git a/src/weston-error.h b/src/weston-error.h -new file mode 100644 -index 0000000..2089d02 ---- /dev/null -+++ b/src/weston-error.h -@@ -0,0 +1,20 @@ -+#ifndef _WESTON_ERROR_H -+#define _WESTON_ERROR_H -+ -+#if defined(HAVE_ERROR_H) -+#include <error.h> -+#else -+#include <err.h> -+#include <string.h> -+#define _weston_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _weston_error -+#endif -+ -+#endif -+ -diff --git a/src/weston-launch.c b/src/weston-launch.c -index 10c66de..3e6d30a 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -30,7 +30,6 @@ - #include <poll.h> - #include <errno.h> - --#include <error.h> - #include <getopt.h> - - #include <sys/types.h> -@@ -56,6 +55,7 @@ - #endif - - #include "weston-launch.h" -+#include "weston-error.h" - - #define DRM_MAJOR 226 - --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch deleted file mode 100644 index a40eaf186..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico@cadete.eu> -Date: Mon, 28 Sep 2015 00:30:10 +0200 -Subject: configure.ac: add explicit enable/disable for systemd-login support - -Otherwise, auto-enable depending on whether the system has the necessary -libraries. - -[Updated help text as per pq suggestion -- bwh] - -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> -Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> -Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> - -Upstream-Status: Backport -Backported from Weston git: -http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc - -Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> - -diff --git a/configure.ac b/configure.ac -index a9cd429..67e80d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - --PKG_CHECK_MODULES(SYSTEMD_LOGIN, -- [libsystemd >= 209], -- [have_systemd_login_209=yes;have_systemd_login=yes], -- [have_systemd_login_209=no;have_systemd_login=no]) -- --# Older versions of systemd package systemd-login separately. Fall back on that --AS_IF([test x$have_systemd_login != xyes],[ -- PKG_CHECK_MODULES(SYSTEMD_LOGIN, -- [libsystemd-login >= 198], -- [have_systemd_login=yes], -- [have_systemd_login=no]) -- ]) -+AC_ARG_ENABLE(systemd-login, -+ AS_HELP_STRING([--enable-systemd-login], -+ [Enable logind support]),, -+ enable_systemd_login=auto) -+if test x$enable_systemd_login != xno; then -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd >= 209], -+ [have_systemd_login_209=yes;have_systemd_login=yes], -+ [have_systemd_login_209=no;have_systemd_login=no]) -+ -+ # Older versions of systemd package systemd-login separately. Fall back on that -+ AS_IF([test x$have_systemd_login != xyes],[ -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd-login >= 198], -+ [have_systemd_login=yes], -+ [have_systemd_login=no]) -+ ]) -+else -+ have_systemd_login=no -+fi -+ -+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then -+ AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login]) -+fi - - AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) --- -cgit v0.10.2 - diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch deleted file mode 100644 index 2d28d5689..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico@cadete.eu> -Date: Mon, 28 Sep 2015 00:30:09 +0200 -Subject: configure.ac: add support for new versions of systemd - -Starting from systemd version 209, a single libsystemd.pc is provided. -For previous versions, fall back on libsystemd-login.pc. - -Signed-off-by: Frederico Cadete <frederico@cadete.eu> -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> -Reviewed-by: Derek Foreman <derekf@osg.samsung.com> - -Upstream-Status: Backport -Backported from Weston git: -http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025 - -Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> - -diff --git a/configure.ac b/configure.ac -index 045291c..a9cd429 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - --PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], -- [have_systemd_login=yes], [have_systemd_login=no]) -+PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd >= 209], -+ [have_systemd_login_209=yes;have_systemd_login=yes], -+ [have_systemd_login_209=no;have_systemd_login=no]) -+ -+# Older versions of systemd package systemd-login separately. Fall back on that -+AS_IF([test x$have_systemd_login != xyes],[ -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd-login >= 198], -+ [have_systemd_login=yes], -+ [have_systemd_login=no]) -+ ]) -+ - AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) - AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") - --PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209], -- [have_systemd_login_209=yes], [have_systemd_login_209=no]) - AS_IF([test "x$have_systemd_login_209" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) - --- -cgit v0.10.2 - diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch deleted file mode 100644 index 35e6d6ff5..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch +++ /dev/null @@ -1,43 +0,0 @@ -weston-1.5.0/configure.ac: make lcms explicitly configurable - -The lcms package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if lcms -dependencies are missing, autoconf throws a fatal error. Follow -upstream style to make it more likely to be merged. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, - enable_demo_clients_install=no) - AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) - --PKG_CHECK_MODULES(LCMS, lcms2, -- [have_lcms=yes], [have_lcms=no]) --if test "x$have_lcms" = xyes; then -- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+AC_ARG_ENABLE(lcms, -+ AS_HELP_STRING([--disable-lcms], -+ [Disable lcms support]),, -+ enable_lcms=auto) -+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) -+if test "x$enable_lcms" != "xno"; then -+ PKG_CHECK_MODULES(LCMS, -+ lcms2, -+ [have_lcms=yes], -+ [have_lcms=no]) -+ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then -+ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) -+ fi -+ if test "x$have_lcms" = "xyes"; then -+ enable_lcms=yes -+ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+ fi - fi --AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) - - AC_PATH_PROG([wayland_scanner], [wayland-scanner]) - if test x$wayland_scanner = x; then diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch deleted file mode 100644 index ad07d4fc2..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch +++ /dev/null @@ -1,37 +0,0 @@ - -The libwebp package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if libwebp -dependencies are missing, autoconf throws a fatal error. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -268,9 +268,22 @@ fi - - PKG_CHECK_MODULES(PIXMAN, [pixman-1]) - PKG_CHECK_MODULES(PNG, [libpng]) --PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) --AS_IF([test "x$have_webp" = "xyes"], -- [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+AC_ARG_ENABLE(webp, -+ AS_HELP_STRING([--disable-webp], -+ [Disable libwebp support]),, -+ enable_webp=auto) -+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes]) -+AS_IF([test "x$enable_webp" != "xno"], -+ PKG_CHECK_MODULES(WEBP, -+ [libwebp], -+ [have_webp=yes], -+ [have_webp=no]) -+ AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"], -+ AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found])) -+ AS_IF([test "x$have_webp" = "xyes"], -+ [enable_webp=yes] -+ [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+) - - AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],, - enable_vaapi_recorder=auto) diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/weston.desktop b/yocto-poky/meta/recipes-graphics/wayland/weston/weston.desktop deleted file mode 100644 index 1086ae8bf..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/weston.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Weston -Comment=Wayland Compostitor -Exec=weston -Icon=weston -Terminal=false -Categories=Utility; diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/weston.png b/yocto-poky/meta/recipes-graphics/wayland/weston/weston.png Binary files differdeleted file mode 100644 index ea8b7e0e2..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/weston.png +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston_1.9.0.bb b/yocto-poky/meta/recipes-graphics/wayland/weston_1.9.0.bb deleted file mode 100644 index 16a788d2a..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston_1.9.0.bb +++ /dev/null @@ -1,103 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://weston.png \ - file://weston.desktop \ - file://make-lcms-explicitly-configurable.patch \ - file://make-libwebp-explicitly-configurable.patch \ - file://0001-make-error-portable.patch \ - file://libsystemd.patch \ - file://explicit-enable-disable-systemd.patch \ -" -SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" -SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" - -inherit autotools pkgconfig useradd distro_features_check -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland libinput virtual/egl pango wayland-native" - -EXTRA_OECONF = "--enable-setuid-install \ - --enable-simple-clients \ - --enable-clients \ - --enable-demo-clients-install \ - --disable-rpi-compositor \ - --disable-rdp-compositor \ - " - -EXTRA_OECONF_append_qemux86 = "\ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -EXTRA_OECONF_append_qemux86-64 = "\ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - " -# -# Compositor choices -# -# Weston on KMS -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" -# Weston on X11 -PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" -# Headless Weston -PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" -# Weston on framebuffer -PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" -# weston-launch -PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" -# VA-API desktop recorder -PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" -# Weston with EGL support -PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" -# Weston with cairo glesv2 support -PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" -# Weston with lcms support -PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" -# Weston with webp support -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" -# Weston with unwinding support -PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" -# Weston with systemd-login support -PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus" -# Weston with Xwayland support -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo" -# colord CMS support -PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" - -do_install_append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/weston/*.la - - # If X11, ship a desktop file to launch it - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi -} - -PACKAGES += "${PN}-examples" - -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" -FILES_${PN}-examples = "${bindir}/*" - -RDEPENDS_${PN} += "xkeyboard-config" -RRECOMMENDS_${PN} = "liberation-fonts" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system weston-launch" diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/Xserver.in b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/Xserver.in deleted file mode 100644 index b8eed7610..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/Xserver.in +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# - -XSERVER=/usr/bin/Xorg - -. /etc/profile - -ARGS=" -br -pn @BLANK_ARGS@" - -DISPLAY=':0' - -exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults deleted file mode 100644 index f5b69dd51..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults +++ /dev/null @@ -1,3 +0,0 @@ -Rxvt*scrollBar_right: true -Rxvt*font: xft:Mono:pixelsize=9 - diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession deleted file mode 100644 index 0b73127ae..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -if [ -x /usr/bin/dbus-launch ]; then - # As this is the X session script, always start a new DBus session. - eval `dbus-launch --sh-syntax --exit-with-session </dev/null` - echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS" -fi - -. /etc/profile - -if [ -f $HOME/.profile ]; then - . $HOME/.profile -fi - -SYSSESSIONDIR=/etc/X11/Xsession.d - -export CLUTTER_DISABLE_MIPMAPPED_TEXT=1 - -for SESSIONFILE in $SYSSESSIONDIR/*; do - set +e - case "$SESSIONFILE" in - *.sh) - . "$SESSIONFILE" - ;; - *.shbg) - "$SESSIONFILE" & - ;; - *~) - # Ignore backup files - ;; - *) - "$SESSIONFILE" - ;; - esac - set -e -done - -exit 0 diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh deleted file mode 100644 index a9d102c74..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# kdrive 1.4 does not have default keymap in server -#xmodmap - </etc/X11/default.xmodmap diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh deleted file mode 100644 index 91594b9e3..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Minimal/stub implementation of the XDG Base Directory specification. -# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html -# -# Wayland needs XDG_RUNTIME_DIR, so set it to /tmp. This isn't compliant with -# the specification (wrong mode, wrong owner) but it's mostly sufficient. -# -# In the ideal case where SystemD is booting and userspace is initiated by a -# SystemD user session this will have been set already, so don't overwrite it. - -if [ -z "$XGD_RUNTIME_DIR" ]; then - XDG_RUNTIME_DIR="/tmp" - export XDG_RUNTIME_DIR -fi diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh deleted file mode 100644 index 3d7008ca4..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh +++ /dev/null @@ -1,7 +0,0 @@ -XDGAUTOSTART=/etc/xdg/autostart -if [ -d $XDGAUTOSTART ]; then - for SCRIPT in $XDGAUTOSTART/*; do - CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2` - $CMD & - done -fi diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh deleted file mode 100644 index b936dedf3..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh +++ /dev/null @@ -1,7 +0,0 @@ -if [ -x $HOME/.Xsession ]; then - exec $HOME/.Xsession -elif [ -x /usr/bin/x-session-manager ]; then - exec /usr/bin/x-session-manager -else - exec /usr/bin/x-window-manager -fi diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap deleted file mode 100644 index 05a13fa3c..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap +++ /dev/null @@ -1,260 +0,0 @@ -keycode 8 = -keycode 9 = Escape -keycode 10 = 1 exclam -keycode 11 = 2 at -keycode 12 = 3 numbersign -keycode 13 = 4 dollar -keycode 14 = 5 percent -keycode 15 = 6 asciicircum -keycode 16 = 7 ampersand braceleft -keycode 17 = 8 asterisk bracketleft -keycode 18 = 9 parenleft bracketright -keycode 19 = 0 parenright braceright -keycode 20 = minus underscore backslash -keycode 21 = equal plus -keycode 22 = BackSpace -keycode 23 = Tab -keycode 24 = q Q q -keycode 25 = w W w -keycode 26 = e E -keycode 27 = r R r -keycode 28 = t T t -keycode 29 = y Y y -keycode 30 = u U u -keycode 31 = i I i -keycode 32 = o O o -keycode 33 = p P p -keycode 34 = bracketleft braceleft -keycode 35 = bracketright braceright asciitilde -keycode 36 = Return -keycode 37 = Control_L -keycode 38 = a A -keycode 39 = s S s -keycode 40 = d D -keycode 41 = f F -keycode 42 = g G g -keycode 43 = h H h -keycode 44 = j J j -keycode 45 = k K k -keycode 46 = l L l -keycode 47 = semicolon colon -keycode 48 = apostrophe quotedbl -keycode 49 = grave asciitilde -keycode 50 = Shift_L -keycode 51 = backslash bar -keycode 52 = z Z z -keycode 53 = x X x -keycode 54 = c C -keycode 55 = v V v -keycode 56 = b B -keycode 57 = n N n -keycode 58 = m M m -keycode 59 = comma less -keycode 60 = period greater -keycode 61 = slash question -keycode 62 = Shift_R -keycode 63 = KP_Multiply -keycode 64 = Alt_L -keycode 65 = space -keycode 66 = Caps_Lock -keycode 67 = F1 F11 -keycode 68 = F2 F12 -keycode 69 = F3 F13 -keycode 70 = F4 F14 -keycode 71 = F5 F15 -keycode 72 = F6 F16 -keycode 73 = F7 F17 -keycode 74 = F8 F18 -keycode 75 = F9 F19 -keycode 76 = F10 F20 -keycode 77 = Num_Lock -keycode 78 = Scroll_Lock -keycode 79 = KP_7 -keycode 80 = KP_8 -keycode 81 = KP_9 -keycode 82 = KP_Subtract -keycode 83 = KP_4 -keycode 84 = KP_5 -keycode 85 = KP_6 -keycode 86 = KP_Add -keycode 87 = KP_1 -keycode 88 = KP_2 -keycode 89 = KP_3 -keycode 90 = KP_0 -keycode 91 = KP_Decimal -keycode 92 = -keycode 93 = -keycode 94 = less greater bar -keycode 95 = F11 -keycode 96 = F12 -keycode 97 = -keycode 98 = -keycode 99 = -keycode 100 = -keycode 101 = -keycode 102 = -keycode 103 = -keycode 104 = KP_Enter -keycode 105 = Control_R -keycode 106 = KP_Divide -keycode 107 = -keycode 108 = Mode_switch -keycode 109 = Break -keycode 110 = Home -keycode 111 = Up -keycode 112 = Prior -keycode 113 = Left -keycode 114 = Right -keycode 115 = End -keycode 116 = Down -keycode 117 = Next -keycode 118 = Insert -keycode 119 = Delete -keycode 120 = Menu -keycode 121 = F13 -keycode 122 = F14 -keycode 123 = Help -keycode 124 = Execute -keycode 125 = F17 -keycode 126 = KP_Subtract -keycode 127 = Pause -keycode 128 = -keycode 129 = -keycode 130 = -keycode 131 = -keycode 132 = -keycode 133 = -keycode 134 = -keycode 135 = -keycode 136 = -keycode 137 = -keycode 138 = -keycode 139 = -keycode 140 = -keycode 141 = -keycode 142 = -keycode 143 = -keycode 144 = -keycode 145 = -keycode 146 = -keycode 147 = -keycode 148 = -keycode 149 = -keycode 150 = -keycode 151 = -keycode 152 = -keycode 153 = -keycode 154 = -keycode 155 = -keycode 156 = -keycode 157 = -keycode 158 = -keycode 159 = -keycode 160 = -keycode 161 = -keycode 162 = -keycode 163 = -keycode 164 = -keycode 165 = -keycode 166 = -keycode 167 = -keycode 168 = -keycode 169 = -keycode 170 = -keycode 171 = -keycode 172 = -keycode 173 = -keycode 174 = -keycode 175 = -keycode 176 = -keycode 177 = -keycode 178 = -keycode 179 = -keycode 180 = -keycode 181 = -keycode 182 = -keycode 183 = -keycode 184 = -keycode 185 = -keycode 186 = -keycode 187 = -keycode 188 = -keycode 189 = -keycode 190 = -keycode 191 = -keycode 192 = -keycode 193 = -keycode 194 = -keycode 195 = -keycode 196 = -keycode 197 = -keycode 198 = -keycode 199 = -keycode 200 = -keycode 201 = -keycode 202 = -keycode 203 = -keycode 204 = -keycode 205 = -keycode 206 = -keycode 207 = -keycode 208 = -keycode 209 = -keycode 210 = -keycode 211 = -keycode 212 = -keycode 213 = -keycode 214 = -keycode 215 = -keycode 216 = -keycode 217 = -keycode 218 = -keycode 219 = -keycode 220 = -keycode 221 = -keycode 222 = -keycode 223 = -keycode 224 = -keycode 225 = -keycode 226 = -keycode 227 = -keycode 228 = -keycode 229 = -keycode 230 = -keycode 231 = -keycode 232 = -keycode 233 = -keycode 234 = -keycode 235 = -keycode 236 = -keycode 237 = -keycode 238 = -keycode 239 = -keycode 240 = -keycode 241 = -keycode 242 = -keycode 243 = -keycode 244 = -keycode 245 = -keycode 246 = -keycode 247 = -keycode 248 = -keycode 249 = -keycode 250 = -keycode 251 = -keycode 252 = -keycode 253 = -keycode 254 = - -add shift = Shift_L -add shift = Shift_R -add shift = Menu -add lock = Caps_Lock -add control = Control_L -add control = Control_R -add mod1 = Alt_L -add mod2 = Num_Lock -!mod3 -add mod4 = Mode_switch -!mod5 - diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch deleted file mode 100644 index eff975e34..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch +++ /dev/null @@ -1,355 +0,0 @@ -COPYING: add GPLv2 license file - -this is a local file recipe and the license file is missing.In order -to pass the license checksum checking, the license file is needed. So -this patch add the GPLv2 license file. - -Upstream-Status: Inappropriate [licensing] - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -diff --git a/COPYING b/COPYING -new file mode 100644 -index 0000000..d511905 ---- /dev/null -+++ b/COPYING -@@ -0,0 +1,339 @@ -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 -+ -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ Everyone is permitted to copy and distribute verbatim copies -+ of this license document, but changing it is not allowed. -+ -+ Preamble -+ -+ The licenses for most software are designed to take away your -+freedom to share and change it. By contrast, the GNU General Public -+License is intended to guarantee your freedom to share and change free -+software--to make sure the software is free for all its users. This -+General Public License applies to most of the Free Software -+Foundation's software and to any other program whose authors commit to -+using it. (Some other Free Software Foundation software is covered by -+the GNU Lesser General Public License instead.) You can apply it to -+your programs, too. -+ -+ When we speak of free software, we are referring to freedom, not -+price. Our General Public Licenses are designed to make sure that you -+have the freedom to distribute copies of free software (and charge for -+this service if you wish), that you receive source code or can get it -+if you want it, that you can change the software or use pieces of it -+in new free programs; and that you know you can do these things. -+ -+ To protect your rights, we need to make restrictions that forbid -+anyone to deny you these rights or to ask you to surrender the rights. -+These restrictions translate to certain responsibilities for you if you -+distribute copies of the software, or if you modify it. -+ -+ For example, if you distribute copies of such a program, whether -+gratis or for a fee, you must give the recipients all the rights that -+you have. You must make sure that they, too, receive or can get the -+source code. And you must show them these terms so they know their -+rights. -+ -+ We protect your rights with two steps: (1) copyright the software, and -+(2) offer you this license which gives you legal permission to copy, -+distribute and/or modify the software. -+ -+ Also, for each author's protection and ours, we want to make certain -+that everyone understands that there is no warranty for this free -+software. If the software is modified by someone else and passed on, we -+want its recipients to know that what they have is not the original, so -+that any problems introduced by others will not reflect on the original -+authors' reputations. -+ -+ Finally, any free program is threatened constantly by software -+patents. We wish to avoid the danger that redistributors of a free -+program will individually obtain patent licenses, in effect making the -+program proprietary. To prevent this, we have made it clear that any -+patent must be licensed for everyone's free use or not licensed at all. -+ -+ The precise terms and conditions for copying, distribution and -+modification follow. -+ -+ GNU GENERAL PUBLIC LICENSE -+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -+ -+ 0. This License applies to any program or other work which contains -+a notice placed by the copyright holder saying it may be distributed -+under the terms of this General Public License. The "Program", below, -+refers to any such program or work, and a "work based on the Program" -+means either the Program or any derivative work under copyright law: -+that is to say, a work containing the Program or a portion of it, -+either verbatim or with modifications and/or translated into another -+language. (Hereinafter, translation is included without limitation in -+the term "modification".) Each licensee is addressed as "you". -+ -+Activities other than copying, distribution and modification are not -+covered by this License; they are outside its scope. The act of -+running the Program is not restricted, and the output from the Program -+is covered only if its contents constitute a work based on the -+Program (independent of having been made by running the Program). -+Whether that is true depends on what the Program does. -+ -+ 1. You may copy and distribute verbatim copies of the Program's -+source code as you receive it, in any medium, provided that you -+conspicuously and appropriately publish on each copy an appropriate -+copyright notice and disclaimer of warranty; keep intact all the -+notices that refer to this License and to the absence of any warranty; -+and give any other recipients of the Program a copy of this License -+along with the Program. -+ -+You may charge a fee for the physical act of transferring a copy, and -+you may at your option offer warranty protection in exchange for a fee. -+ -+ 2. You may modify your copy or copies of the Program or any portion -+of it, thus forming a work based on the Program, and copy and -+distribute such modifications or work under the terms of Section 1 -+above, provided that you also meet all of these conditions: -+ -+ a) You must cause the modified files to carry prominent notices -+ stating that you changed the files and the date of any change. -+ -+ b) You must cause any work that you distribute or publish, that in -+ whole or in part contains or is derived from the Program or any -+ part thereof, to be licensed as a whole at no charge to all third -+ parties under the terms of this License. -+ -+ c) If the modified program normally reads commands interactively -+ when run, you must cause it, when started running for such -+ interactive use in the most ordinary way, to print or display an -+ announcement including an appropriate copyright notice and a -+ notice that there is no warranty (or else, saying that you provide -+ a warranty) and that users may redistribute the program under -+ these conditions, and telling the user how to view a copy of this -+ License. (Exception: if the Program itself is interactive but -+ does not normally print such an announcement, your work based on -+ the Program is not required to print an announcement.) -+ -+These requirements apply to the modified work as a whole. If -+identifiable sections of that work are not derived from the Program, -+and can be reasonably considered independent and separate works in -+themselves, then this License, and its terms, do not apply to those -+sections when you distribute them as separate works. But when you -+distribute the same sections as part of a whole which is a work based -+on the Program, the distribution of the whole must be on the terms of -+this License, whose permissions for other licensees extend to the -+entire whole, and thus to each and every part regardless of who wrote it. -+ -+Thus, it is not the intent of this section to claim rights or contest -+your rights to work written entirely by you; rather, the intent is to -+exercise the right to control the distribution of derivative or -+collective works based on the Program. -+ -+In addition, mere aggregation of another work not based on the Program -+with the Program (or with a work based on the Program) on a volume of -+a storage or distribution medium does not bring the other work under -+the scope of this License. -+ -+ 3. You may copy and distribute the Program (or a work based on it, -+under Section 2) in object code or executable form under the terms of -+Sections 1 and 2 above provided that you also do one of the following: -+ -+ a) Accompany it with the complete corresponding machine-readable -+ source code, which must be distributed under the terms of Sections -+ 1 and 2 above on a medium customarily used for software interchange; or, -+ -+ b) Accompany it with a written offer, valid for at least three -+ years, to give any third party, for a charge no more than your -+ cost of physically performing source distribution, a complete -+ machine-readable copy of the corresponding source code, to be -+ distributed under the terms of Sections 1 and 2 above on a medium -+ customarily used for software interchange; or, -+ -+ c) Accompany it with the information you received as to the offer -+ to distribute corresponding source code. (This alternative is -+ allowed only for noncommercial distribution and only if you -+ received the program in object code or executable form with such -+ an offer, in accord with Subsection b above.) -+ -+The source code for a work means the preferred form of the work for -+making modifications to it. For an executable work, complete source -+code means all the source code for all modules it contains, plus any -+associated interface definition files, plus the scripts used to -+control compilation and installation of the executable. However, as a -+special exception, the source code distributed need not include -+anything that is normally distributed (in either source or binary -+form) with the major components (compiler, kernel, and so on) of the -+operating system on which the executable runs, unless that component -+itself accompanies the executable. -+ -+If distribution of executable or object code is made by offering -+access to copy from a designated place, then offering equivalent -+access to copy the source code from the same place counts as -+distribution of the source code, even though third parties are not -+compelled to copy the source along with the object code. -+ -+ 4. You may not copy, modify, sublicense, or distribute the Program -+except as expressly provided under this License. Any attempt -+otherwise to copy, modify, sublicense or distribute the Program is -+void, and will automatically terminate your rights under this License. -+However, parties who have received copies, or rights, from you under -+this License will not have their licenses terminated so long as such -+parties remain in full compliance. -+ -+ 5. You are not required to accept this License, since you have not -+signed it. However, nothing else grants you permission to modify or -+distribute the Program or its derivative works. These actions are -+prohibited by law if you do not accept this License. Therefore, by -+modifying or distributing the Program (or any work based on the -+Program), you indicate your acceptance of this License to do so, and -+all its terms and conditions for copying, distributing or modifying -+the Program or works based on it. -+ -+ 6. Each time you redistribute the Program (or any work based on the -+Program), the recipient automatically receives a license from the -+original licensor to copy, distribute or modify the Program subject to -+these terms and conditions. You may not impose any further -+restrictions on the recipients' exercise of the rights granted herein. -+You are not responsible for enforcing compliance by third parties to -+this License. -+ -+ 7. If, as a consequence of a court judgment or allegation of patent -+infringement or for any other reason (not limited to patent issues), -+conditions are imposed on you (whether by court order, agreement or -+otherwise) that contradict the conditions of this License, they do not -+excuse you from the conditions of this License. If you cannot -+distribute so as to satisfy simultaneously your obligations under this -+License and any other pertinent obligations, then as a consequence you -+may not distribute the Program at all. For example, if a patent -+license would not permit royalty-free redistribution of the Program by -+all those who receive copies directly or indirectly through you, then -+the only way you could satisfy both it and this License would be to -+refrain entirely from distribution of the Program. -+ -+If any portion of this section is held invalid or unenforceable under -+any particular circumstance, the balance of the section is intended to -+apply and the section as a whole is intended to apply in other -+circumstances. -+ -+It is not the purpose of this section to induce you to infringe any -+patents or other property right claims or to contest validity of any -+such claims; this section has the sole purpose of protecting the -+integrity of the free software distribution system, which is -+implemented by public license practices. Many people have made -+generous contributions to the wide range of software distributed -+through that system in reliance on consistent application of that -+system; it is up to the author/donor to decide if he or she is willing -+to distribute software through any other system and a licensee cannot -+impose that choice. -+ -+This section is intended to make thoroughly clear what is believed to -+be a consequence of the rest of this License. -+ -+ 8. If the distribution and/or use of the Program is restricted in -+certain countries either by patents or by copyrighted interfaces, the -+original copyright holder who places the Program under this License -+may add an explicit geographical distribution limitation excluding -+those countries, so that distribution is permitted only in or among -+countries not thus excluded. In such case, this License incorporates -+the limitation as if written in the body of this License. -+ -+ 9. The Free Software Foundation may publish revised and/or new versions -+of the General Public License from time to time. Such new versions will -+be similar in spirit to the present version, but may differ in detail to -+address new problems or concerns. -+ -+Each version is given a distinguishing version number. If the Program -+specifies a version number of this License which applies to it and "any -+later version", you have the option of following the terms and conditions -+either of that version or of any later version published by the Free -+Software Foundation. If the Program does not specify a version number of -+this License, you may choose any version ever published by the Free Software -+Foundation. -+ -+ 10. If you wish to incorporate parts of the Program into other free -+programs whose distribution conditions are different, write to the author -+to ask for permission. For software which is copyrighted by the Free -+Software Foundation, write to the Free Software Foundation; we sometimes -+make exceptions for this. Our decision will be guided by the two goals -+of preserving the free status of all derivatives of our free software and -+of promoting the sharing and reuse of software generally. -+ -+ NO WARRANTY -+ -+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -+REPAIR OR CORRECTION. -+ -+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -+POSSIBILITY OF SUCH DAMAGES. -+ -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs -+ -+ If you develop a new program, and you want it to be of the greatest -+possible use to the public, the best way to achieve this is to make it -+free software which everyone can redistribute and change under these terms. -+ -+ To do so, attach the following notices to the program. It is safest -+to attach them to the start of each source file to most effectively -+convey the exclusion of warranty; and each file should have at least -+the "copyright" line and a pointer to where the full notice is found. -+ -+ <one line to give the program's name and a brief idea of what it does.> -+ Copyright (C) <year> <name of author> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ -+Also add information on how to contact you by electronic and paper mail. -+ -+If the program is interactive, make it output a short notice like this -+when it starts in an interactive mode: -+ -+ Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -+ This is free software, and you are welcome to redistribute it -+ under certain conditions; type `show c' for details. -+ -+The hypothetical commands `show w' and `show c' should show the appropriate -+parts of the General Public License. Of course, the commands you use may -+be called something other than `show w' and `show c'; they could even be -+mouse-clicks or menu items--whatever suits your program. -+ -+You should also get your employer (if you work as a programmer) or your -+school, if any, to sign a "copyright disclaimer" for the program, if -+necessary. Here is a sample; alter the names: -+ -+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program -+ `Gnomovision' (which makes passes at compilers) written by James Hacker. -+ -+ <signature of Ty Coon>, 1 April 1989 -+ Ty Coon, President of Vice -+ -+This General Public License does not permit incorporating your program into -+proprietary programs. If your program is a subroutine library, you may -+consider it more useful to permit linking proprietary applications with the -+library. If this is what you want to do, use the GNU Lesser General -+Public License instead of this License. diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb deleted file mode 100644 index 6d7c347c0..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Common X11 scripts and configuration files" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SECTION = "x11" -PR = "r47" - -inherit distro_features_check -# rdepends on xdypinfo xmodmap xinit -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "file://etc \ - file://Xserver.in \ - file://gplv2-license.patch" - -S = "${WORKDIR}" - -PACKAGECONFIG ??= "blank" -# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG -PACKAGECONFIG[blank] = "" - -do_install() { - cp -R ${S}/etc ${D}${sysconfdir} - sed -e 's/@BLANK_ARGS@/${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}/' \ - ${S}/Xserver.in > ${D}${sysconfdir}/X11/Xserver - - chmod -R 755 ${D}${sysconfdir} -} - -RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" - diff --git a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb deleted file mode 100644 index b68d40e1b..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Simple Xserver Init Script (no dm)" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SECTION = "x11" -PR = "r31" - -SRC_URI = "file://xserver-nodm \ - file://Xusername \ - file://gplv2-license.patch \ - file://xserver-nodm.service \ - file://xserver-nodm.conf \ -" - -S = "${WORKDIR}" - -# Since we refer to ROOTLESS_X which is normally enabled per-machine -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit update-rc.d systemd - -do_install() { - install -d ${D}${sysconfdir}/init.d - install xserver-nodm ${D}${sysconfdir}/init.d - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/default - install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system - if [ "${ROOTLESS_X}" = "1" ] ; then - sed -i 's!^HOME=.*!HOME=/home/xuser!' ${D}${sysconfdir}/default/xserver-nodm - sed -i 's!^User=.*!User=xuser!' ${D}${systemd_unitdir}/system/xserver-nodm.service - else - sed -i 's!^HOME=.*!HOME=${ROOT_HOME}!' ${D}${sysconfdir}/default/xserver-nodm - sed -i '/^User=/d' ${D}${systemd_unitdir}/system/xserver-nodm.service - fi - fi - - if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - if [ "${ROOTLESS_X}" = "1" ] ; then - install -d ${D}${sysconfdir}/X11 - install Xusername ${D}${sysconfdir}/X11 - fi - fi -} - -RDEPENDS_${PN} = "${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" - -INITSCRIPT_NAME = "xserver-nodm" -INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." -SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" - diff --git a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername deleted file mode 100644 index 7060e5ec1..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername +++ /dev/null @@ -1 +0,0 @@ -xuser diff --git a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch deleted file mode 100644 index eff975e34..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch +++ /dev/null @@ -1,355 +0,0 @@ -COPYING: add GPLv2 license file - -this is a local file recipe and the license file is missing.In order -to pass the license checksum checking, the license file is needed. So -this patch add the GPLv2 license file. - -Upstream-Status: Inappropriate [licensing] - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -diff --git a/COPYING b/COPYING -new file mode 100644 -index 0000000..d511905 ---- /dev/null -+++ b/COPYING -@@ -0,0 +1,339 @@ -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 -+ -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ Everyone is permitted to copy and distribute verbatim copies -+ of this license document, but changing it is not allowed. -+ -+ Preamble -+ -+ The licenses for most software are designed to take away your -+freedom to share and change it. By contrast, the GNU General Public -+License is intended to guarantee your freedom to share and change free -+software--to make sure the software is free for all its users. This -+General Public License applies to most of the Free Software -+Foundation's software and to any other program whose authors commit to -+using it. (Some other Free Software Foundation software is covered by -+the GNU Lesser General Public License instead.) You can apply it to -+your programs, too. -+ -+ When we speak of free software, we are referring to freedom, not -+price. Our General Public Licenses are designed to make sure that you -+have the freedom to distribute copies of free software (and charge for -+this service if you wish), that you receive source code or can get it -+if you want it, that you can change the software or use pieces of it -+in new free programs; and that you know you can do these things. -+ -+ To protect your rights, we need to make restrictions that forbid -+anyone to deny you these rights or to ask you to surrender the rights. -+These restrictions translate to certain responsibilities for you if you -+distribute copies of the software, or if you modify it. -+ -+ For example, if you distribute copies of such a program, whether -+gratis or for a fee, you must give the recipients all the rights that -+you have. You must make sure that they, too, receive or can get the -+source code. And you must show them these terms so they know their -+rights. -+ -+ We protect your rights with two steps: (1) copyright the software, and -+(2) offer you this license which gives you legal permission to copy, -+distribute and/or modify the software. -+ -+ Also, for each author's protection and ours, we want to make certain -+that everyone understands that there is no warranty for this free -+software. If the software is modified by someone else and passed on, we -+want its recipients to know that what they have is not the original, so -+that any problems introduced by others will not reflect on the original -+authors' reputations. -+ -+ Finally, any free program is threatened constantly by software -+patents. We wish to avoid the danger that redistributors of a free -+program will individually obtain patent licenses, in effect making the -+program proprietary. To prevent this, we have made it clear that any -+patent must be licensed for everyone's free use or not licensed at all. -+ -+ The precise terms and conditions for copying, distribution and -+modification follow. -+ -+ GNU GENERAL PUBLIC LICENSE -+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -+ -+ 0. This License applies to any program or other work which contains -+a notice placed by the copyright holder saying it may be distributed -+under the terms of this General Public License. The "Program", below, -+refers to any such program or work, and a "work based on the Program" -+means either the Program or any derivative work under copyright law: -+that is to say, a work containing the Program or a portion of it, -+either verbatim or with modifications and/or translated into another -+language. (Hereinafter, translation is included without limitation in -+the term "modification".) Each licensee is addressed as "you". -+ -+Activities other than copying, distribution and modification are not -+covered by this License; they are outside its scope. The act of -+running the Program is not restricted, and the output from the Program -+is covered only if its contents constitute a work based on the -+Program (independent of having been made by running the Program). -+Whether that is true depends on what the Program does. -+ -+ 1. You may copy and distribute verbatim copies of the Program's -+source code as you receive it, in any medium, provided that you -+conspicuously and appropriately publish on each copy an appropriate -+copyright notice and disclaimer of warranty; keep intact all the -+notices that refer to this License and to the absence of any warranty; -+and give any other recipients of the Program a copy of this License -+along with the Program. -+ -+You may charge a fee for the physical act of transferring a copy, and -+you may at your option offer warranty protection in exchange for a fee. -+ -+ 2. You may modify your copy or copies of the Program or any portion -+of it, thus forming a work based on the Program, and copy and -+distribute such modifications or work under the terms of Section 1 -+above, provided that you also meet all of these conditions: -+ -+ a) You must cause the modified files to carry prominent notices -+ stating that you changed the files and the date of any change. -+ -+ b) You must cause any work that you distribute or publish, that in -+ whole or in part contains or is derived from the Program or any -+ part thereof, to be licensed as a whole at no charge to all third -+ parties under the terms of this License. -+ -+ c) If the modified program normally reads commands interactively -+ when run, you must cause it, when started running for such -+ interactive use in the most ordinary way, to print or display an -+ announcement including an appropriate copyright notice and a -+ notice that there is no warranty (or else, saying that you provide -+ a warranty) and that users may redistribute the program under -+ these conditions, and telling the user how to view a copy of this -+ License. (Exception: if the Program itself is interactive but -+ does not normally print such an announcement, your work based on -+ the Program is not required to print an announcement.) -+ -+These requirements apply to the modified work as a whole. If -+identifiable sections of that work are not derived from the Program, -+and can be reasonably considered independent and separate works in -+themselves, then this License, and its terms, do not apply to those -+sections when you distribute them as separate works. But when you -+distribute the same sections as part of a whole which is a work based -+on the Program, the distribution of the whole must be on the terms of -+this License, whose permissions for other licensees extend to the -+entire whole, and thus to each and every part regardless of who wrote it. -+ -+Thus, it is not the intent of this section to claim rights or contest -+your rights to work written entirely by you; rather, the intent is to -+exercise the right to control the distribution of derivative or -+collective works based on the Program. -+ -+In addition, mere aggregation of another work not based on the Program -+with the Program (or with a work based on the Program) on a volume of -+a storage or distribution medium does not bring the other work under -+the scope of this License. -+ -+ 3. You may copy and distribute the Program (or a work based on it, -+under Section 2) in object code or executable form under the terms of -+Sections 1 and 2 above provided that you also do one of the following: -+ -+ a) Accompany it with the complete corresponding machine-readable -+ source code, which must be distributed under the terms of Sections -+ 1 and 2 above on a medium customarily used for software interchange; or, -+ -+ b) Accompany it with a written offer, valid for at least three -+ years, to give any third party, for a charge no more than your -+ cost of physically performing source distribution, a complete -+ machine-readable copy of the corresponding source code, to be -+ distributed under the terms of Sections 1 and 2 above on a medium -+ customarily used for software interchange; or, -+ -+ c) Accompany it with the information you received as to the offer -+ to distribute corresponding source code. (This alternative is -+ allowed only for noncommercial distribution and only if you -+ received the program in object code or executable form with such -+ an offer, in accord with Subsection b above.) -+ -+The source code for a work means the preferred form of the work for -+making modifications to it. For an executable work, complete source -+code means all the source code for all modules it contains, plus any -+associated interface definition files, plus the scripts used to -+control compilation and installation of the executable. However, as a -+special exception, the source code distributed need not include -+anything that is normally distributed (in either source or binary -+form) with the major components (compiler, kernel, and so on) of the -+operating system on which the executable runs, unless that component -+itself accompanies the executable. -+ -+If distribution of executable or object code is made by offering -+access to copy from a designated place, then offering equivalent -+access to copy the source code from the same place counts as -+distribution of the source code, even though third parties are not -+compelled to copy the source along with the object code. -+ -+ 4. You may not copy, modify, sublicense, or distribute the Program -+except as expressly provided under this License. Any attempt -+otherwise to copy, modify, sublicense or distribute the Program is -+void, and will automatically terminate your rights under this License. -+However, parties who have received copies, or rights, from you under -+this License will not have their licenses terminated so long as such -+parties remain in full compliance. -+ -+ 5. You are not required to accept this License, since you have not -+signed it. However, nothing else grants you permission to modify or -+distribute the Program or its derivative works. These actions are -+prohibited by law if you do not accept this License. Therefore, by -+modifying or distributing the Program (or any work based on the -+Program), you indicate your acceptance of this License to do so, and -+all its terms and conditions for copying, distributing or modifying -+the Program or works based on it. -+ -+ 6. Each time you redistribute the Program (or any work based on the -+Program), the recipient automatically receives a license from the -+original licensor to copy, distribute or modify the Program subject to -+these terms and conditions. You may not impose any further -+restrictions on the recipients' exercise of the rights granted herein. -+You are not responsible for enforcing compliance by third parties to -+this License. -+ -+ 7. If, as a consequence of a court judgment or allegation of patent -+infringement or for any other reason (not limited to patent issues), -+conditions are imposed on you (whether by court order, agreement or -+otherwise) that contradict the conditions of this License, they do not -+excuse you from the conditions of this License. If you cannot -+distribute so as to satisfy simultaneously your obligations under this -+License and any other pertinent obligations, then as a consequence you -+may not distribute the Program at all. For example, if a patent -+license would not permit royalty-free redistribution of the Program by -+all those who receive copies directly or indirectly through you, then -+the only way you could satisfy both it and this License would be to -+refrain entirely from distribution of the Program. -+ -+If any portion of this section is held invalid or unenforceable under -+any particular circumstance, the balance of the section is intended to -+apply and the section as a whole is intended to apply in other -+circumstances. -+ -+It is not the purpose of this section to induce you to infringe any -+patents or other property right claims or to contest validity of any -+such claims; this section has the sole purpose of protecting the -+integrity of the free software distribution system, which is -+implemented by public license practices. Many people have made -+generous contributions to the wide range of software distributed -+through that system in reliance on consistent application of that -+system; it is up to the author/donor to decide if he or she is willing -+to distribute software through any other system and a licensee cannot -+impose that choice. -+ -+This section is intended to make thoroughly clear what is believed to -+be a consequence of the rest of this License. -+ -+ 8. If the distribution and/or use of the Program is restricted in -+certain countries either by patents or by copyrighted interfaces, the -+original copyright holder who places the Program under this License -+may add an explicit geographical distribution limitation excluding -+those countries, so that distribution is permitted only in or among -+countries not thus excluded. In such case, this License incorporates -+the limitation as if written in the body of this License. -+ -+ 9. The Free Software Foundation may publish revised and/or new versions -+of the General Public License from time to time. Such new versions will -+be similar in spirit to the present version, but may differ in detail to -+address new problems or concerns. -+ -+Each version is given a distinguishing version number. If the Program -+specifies a version number of this License which applies to it and "any -+later version", you have the option of following the terms and conditions -+either of that version or of any later version published by the Free -+Software Foundation. If the Program does not specify a version number of -+this License, you may choose any version ever published by the Free Software -+Foundation. -+ -+ 10. If you wish to incorporate parts of the Program into other free -+programs whose distribution conditions are different, write to the author -+to ask for permission. For software which is copyrighted by the Free -+Software Foundation, write to the Free Software Foundation; we sometimes -+make exceptions for this. Our decision will be guided by the two goals -+of preserving the free status of all derivatives of our free software and -+of promoting the sharing and reuse of software generally. -+ -+ NO WARRANTY -+ -+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -+REPAIR OR CORRECTION. -+ -+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -+POSSIBILITY OF SUCH DAMAGES. -+ -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs -+ -+ If you develop a new program, and you want it to be of the greatest -+possible use to the public, the best way to achieve this is to make it -+free software which everyone can redistribute and change under these terms. -+ -+ To do so, attach the following notices to the program. It is safest -+to attach them to the start of each source file to most effectively -+convey the exclusion of warranty; and each file should have at least -+the "copyright" line and a pointer to where the full notice is found. -+ -+ <one line to give the program's name and a brief idea of what it does.> -+ Copyright (C) <year> <name of author> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ -+Also add information on how to contact you by electronic and paper mail. -+ -+If the program is interactive, make it output a short notice like this -+when it starts in an interactive mode: -+ -+ Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -+ This is free software, and you are welcome to redistribute it -+ under certain conditions; type `show c' for details. -+ -+The hypothetical commands `show w' and `show c' should show the appropriate -+parts of the General Public License. Of course, the commands you use may -+be called something other than `show w' and `show c'; they could even be -+mouse-clicks or menu items--whatever suits your program. -+ -+You should also get your employer (if you work as a programmer) or your -+school, if any, to sign a "copyright disclaimer" for the program, if -+necessary. Here is a sample; alter the names: -+ -+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program -+ `Gnomovision' (which makes passes at compilers) written by James Hacker. -+ -+ <signature of Ty Coon>, 1 April 1989 -+ Ty Coon, President of Vice -+ -+This General Public License does not permit incorporating your program into -+proprietary programs. If your program is a subroutine library, you may -+consider it more useful to permit linking proprietary applications with the -+library. If this is what you want to do, use the GNU Lesser General -+Public License instead of this License. diff --git a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm deleted file mode 100755 index bfa0a8d6c..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: xserver -# Required-Start: $local_fs $remote_fs dbus -# Required-Stop: $local_fs $remote_fs -# Default-Start: 5 -# Default-Stop: 0 1 2 3 6 -### END INIT INFO - -killproc() { # kill the named process(es) - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - x11=false) - echo "X Server disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - . /etc/profile - username=root - echo "Starting Xserver" - if [ -f /etc/X11/Xusername ]; then - username=`cat /etc/X11/Xusername` - # setting for rootless X - chmod o+w /var/log - chmod g+r /dev/tty[0-3] - # hidraw device is probably needed - if [ -e /dev/hidraw0 ]; then - chmod o+rw /dev/hidraw* - fi - fi - # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] - su -l -c '/etc/X11/Xserver&' $username - # Wait for the desktop to say its finished loading - # before loading the rest of the system - # dbus-wait org.matchbox_project.desktop Loaded - ;; - - stop) - echo "Stopping XServer" - killproc xinit - sleep 1 - chvt 1 & - ;; - - restart) - $0 stop - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf deleted file mode 100644 index 3c0582a87..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf +++ /dev/null @@ -1 +0,0 @@ -HOME=/home/root diff --git a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service b/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service deleted file mode 100644 index 62d979f1d..000000000 --- a/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Xserver startup without a display manager - -[Service] -User=root -EnvironmentFile=/etc/default/xserver-nodm -ExecStart=/etc/X11/Xserver - -[Install] -Alias=display-manager.service diff --git a/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb deleted file mode 100644 index b871d89f9..000000000 --- a/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Transparent X11 cursor theme for touchscreens" -HOMEPAGE = "http://www.matchbox-project.org/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SECTION = "x11/base" - -SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06" -PV = "0.1.1+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" - -S = "${WORKDIR}/git" - -inherit autotools allarch - -FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" diff --git a/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput deleted file mode 100644 index 9633fc5f3..000000000 --- a/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput +++ /dev/null @@ -1 +0,0 @@ -# replace with valid machine specific pointercal.xinput diff --git a/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb deleted file mode 100644 index 65348c376..000000000 --- a/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Touchscreen calibration data from xinput-calibrator" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PR = "r7" - -SRC_URI = "file://pointercal.xinput" -S = "${WORKDIR}" - -do_install() { - # Only install file if it has a contents - if [ -s ${S}/pointercal.xinput ] &&\ - [ ! -n "$(head -n1 ${S}/pointercal.xinput|grep "replace.*pointercal\.xinput")" ]; then - install -d ${D}${sysconfdir}/ - install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/ - fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput" diff --git a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh deleted file mode 100644 index 529072678..000000000 --- a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -if [ "$HAVE_TOUCHSCREEN" = "1" ]; then - /usr/bin/xinput_calibrator_once.sh -fi diff --git a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch deleted file mode 100644 index 86982924a..000000000 --- a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch +++ /dev/null @@ -1,66 +0,0 @@ -Upstream-Status: Pending - -From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 -From: Laurentiu Palcu <laurentiu.palcu@intel.com> -Date: Mon, 1 Jul 2013 15:38:02 +0300 -Subject: [PATCH] Allow xinput_calibrator_pointercal.sh to be run as normal - user - -Allow normal user to create their own pointercal.xinput files that -override the system pointercal file in /etc. - -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> ---- - scripts/xinput_calibrator_pointercal.sh | 33 +++++++++++++++++++++---------- - 1 file changed, 23 insertions(+), 10 deletions(-) - -diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh -index fccb197..0ada7da 100755 ---- a/scripts/xinput_calibrator_pointercal.sh -+++ b/scripts/xinput_calibrator_pointercal.sh -@@ -11,19 +11,32 @@ - PATH="/usr/bin:$PATH" - - BINARY="xinput_calibrator" --CALFILE="/etc/pointercal.xinput" --LOGFILE="/var/log/xinput_calibrator.pointercal.log" -+SYS_CALFILE="/etc/pointercal.xinput" -+USER_CALFILE="$HOME/.pointercal/pointercal.xinput" - --if [ -e $CALFILE ] ; then -- if grep replace $CALFILE ; then -- echo "Empty calibration file found, removing it" -- rm $CALFILE -- else -- echo "Using calibration data stored in $CALFILE" -- . $CALFILE && exit 0 -- fi -+if [ "$USER" = "root" ]; then -+ LOGFILE="/var/log/xinput_calibrator.pointercal.log" -+ CALFILES="$SYS_CALFILE" -+else -+ LOGFILE="$HOME/.pointercal/xinput_calibrator.pointercal.log" -+ CALFILES="$USER_CALFILE $SYS_CALFILE" -+ mkdir -p "$HOME/.pointercal" - fi - -+for CALFILE in $CALFILES; do -+ if [ -e $CALFILE ]; then -+ if grep replace $CALFILE ; then -+ echo "Empty calibration file found, removing it" -+ rm $CALFILE 2>/dev/null || true -+ else -+ echo "Using calibration data stored in $CALFILE" -+ . $CALFILE && exit 0 -+ fi -+ fi -+done -+ -+[ "$USER" != "root" ] && CALFILE=$USER_CALFILE -+ - CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` - if [ ! -z "$CALDATA" ] ; then - echo $CALDATA > $CALFILE --- -1.7.9.5 - diff --git a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch deleted file mode 100644 index 9351331be..000000000 --- a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Inappropriate [no longer maintained] - -From 93abf28d602da637376b78de8c88b7ab5cf13b4f Mon Sep 17 00:00:00 2001 -From: Jonathan David <jonathan.david@ni.com> -Date: Mon, 30 Nov 2015 12:12:20 -0600 -Subject: [PATCH] add geometry input when calibrating - -Send monitor geometry to xinput_calibrator when running the script - -Signed-off-by: Jonathan David <jonathan.david@ni.com> ---- - scripts/xinput_calibrator_pointercal.sh | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh -index 0ada7da..6a3aded 100755 ---- a/scripts/xinput_calibrator_pointercal.sh -+++ b/scripts/xinput_calibrator_pointercal.sh -@@ -37,7 +37,10 @@ done - - [ "$USER" != "root" ] && CALFILE=$USER_CALFILE - --CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` -+read RESOLUTION <<< $(xrandr | awk -F '[[:space:]+]' '/ connected/ \ -+ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }') -+ -+CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` - if [ ! -z "$CALDATA" ] ; then - echo $CALDATA > $CALFILE - echo "Calibration data stored in $CALFILE (log in $LOGFILE)" --- -1.9.1 - diff --git a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb deleted file mode 100644 index ac5b70cba..000000000 --- a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Touchscreen calibration program for X11" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a" -DEPENDS = "virtual/libx11 libxi" - -PV = "0.7.5+git${SRCPV}" -PR = "r6" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" -SRC_URI = "git://github.com/tias/xinput_calibrator.git \ - file://30xinput_calibrate.sh \ - file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \ - file://add-geometry-input-when-calibrating.patch" - -S = "${WORKDIR}/git" - -# force native X11 ui as we don't have gtk+ in DEPENDS -EXTRA_OECONF += "--with-gui=x11" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 ${S}/scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh - - install -d ${D}${sysconfdir}/X11/Xsession.d/ - install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ - - install -d ${D}${sysconfdir}/xdg/autostart - sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' ${S}/scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop -} - -FILES_${PN} += "${sysconfdir}/xdg/autostart" -RDEPENDS_${PN} = "xinput formfactor" -RRECOMMENDS_${PN} = "pointercal-xinput" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/yocto-poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb deleted file mode 100644 index a453e2487..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "A program to create an index of X font files in a directory" - -DESCRIPTION = "For each directory argument, mkfontdir reads all of the \ -font files in the directory. The font names and related data are written \ -out to the files \"fonts.dir\", \"fonts.scale\", and \"fonts.alias\". \ -The X server and font server use these files to find the available font \ -files." - -PE = "1" -PR = "${INC_PR}.0" - -RDEPENDS_${PN} += "mkfontscale" -RDEPENDS_${PN}_class-native += "mkfontscale-native" - -BBCLASSEXTEND = "native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b4fcf2b90cadbfc15009b9e124dc3a3f" - -SRC_URI[md5sum] = "18c429148c96c2079edda922a2b67632" -SRC_URI[sha256sum] = "56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb deleted file mode 100644 index 31cf18676..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "A program to create an index of scalable font files for X" - -DESCRIPTION = "For each directory argument, mkfontscale reads all of the \ -scalable font files in the directory. For every font file found, an X11 \ -font name (XLFD) is generated, and is written together with the file \ -name to a file fonts.scale in the directory. The resulting fonts.scale \ -is used by the mkfontdir program." - -DEPENDS = "util-macros-native zlib libfontenc freetype xproto" - -BBCLASSEXTEND = "native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" - -SRC_URI[md5sum] = "9bdd6ebfa62b1bbd474906ac86a40fd8" -SRC_URI[sha256sum] = "8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb b/yocto-poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb deleted file mode 100644 index 87268046e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "X11 color name database" -DESCRIPTION = "This package includes both the list mapping X color names \ -to RGB values (rgb.txt) and, if configured to use a database for color \ -lookup, the rgb program to convert the text file into the binary database \ -format." - -DEPENDS += " xproto util-macros" -LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" -PE = "1" - -SRC_URI[md5sum] = "eab5bbd7642e5c784429307ec210d198" -SRC_URI[sha256sum] = "bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0" - -FILES_${PN} += "${datadir}/X11" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb b/yocto-poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb deleted file mode 100644 index 4e9355880..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "X11 server performance test program" - -DESCRIPTION = "The x11perf program runs one or more performance tests \ -and reports how fast an X server can execute the tests." - - -DEPENDS += "libxmu libxrender libxft libxext fontconfig" - -LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ - file://x11perf.h;endline=24;md5=29555066baf406a105ff917ac25b2d01" - -PE = "1" - -FILES_${PN} += "${libdir}/X11/x11perfcomp/*" - -SRC_URI[md5sum] = "f0b24e4d8beb622a419e8431e1c03cd7" -SRC_URI[sha256sum] = "e87098dec1947572d70c62697a7b70bde1ab5668237d4660080eade6bc096751" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb deleted file mode 100644 index b173f4fe8..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xorg-app-common.inc -SUMMARY = "X authority utilities" -DESCRIPTION = "X application to edit and display the authorization \ -information used in connecting to the X server." - -LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" - -DEPENDS += "libxau libxext libxmu" -PE = "1" - -SRC_URI[md5sum] = "7d6003f32838d5b688e2c8a131083271" -SRC_URI[sha256sum] = "56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch deleted file mode 100644 index 1e8199cc6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Pending - -Index: xdpyinfo-1.3.0/configure.ac -=================================================================== ---- xdpyinfo-1.3.0.orig/configure.ac 2011-10-21 21:34:21.000000000 -0700 -+++ xdpyinfo-1.3.0/configure.ac 2011-11-28 20:06:56.554056935 -0800 -@@ -47,11 +47,15 @@ - AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) - -+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), -+ XKB="$enableval", XKB="yes") -+if test "x$XKB" = "xyes" ; then - PKG_CHECK_MODULES(DPY_XKB, x11, - [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -+fi - - PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, - [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb deleted file mode 100644 index af04bb6e3..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Display information utility for X" - -DESCRIPTION = "Xdpyinfo is a utility for displaying information about an \ -X server. It is used to examine the capabilities of a server, the \ -predefined values for various parameters used in communicating between \ -clients and the server, and the different types of screens and visuals \ -that are available." - -LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" -DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau libxcomposite" -PE = "1" - -SRC_URI += "file://disable-xkb.patch" - -SRC_URI[md5sum] = "8809037bd48599af55dad81c508b6b39" -SRC_URI[sha256sum] = "30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51" - -EXTRA_OECONF = "--disable-xkb" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/yocto-poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch deleted file mode 100644 index 6130959f8..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch +++ /dev/null @@ -1,82 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - ---- - xev.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -Index: xev-1.2.0/xev.c -=================================================================== ---- xev-1.2.0.orig/xev.c -+++ xev-1.2.0/xev.c -@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp) - nbytes = XLookupString (e, str, 256, &ks, NULL); - - /* not supposed to call XmbLookupString on a key release event */ -- if (e->type == KeyPress && xic) { -+ /*if (e->type == KeyPress && xic) { - do { - nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); - buf[nmbbytes] = '\0'; -@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp) - buf = realloc (buf, bsize); - } - } while (status == XBufferOverflow); -- } -+ }*/ - - if (ks == NoSymbol) - ksname = "NoSymbol"; -@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp) - } - - /* not supposed to call XmbLookupString on a key release event */ -- if (e->type == KeyPress && xic) { -+ /*if (e->type == KeyPress && xic) { - printf (" XmbLookupString gives %d bytes: ", nmbbytes); - if (nmbbytes > 0) { - dump (buf, nmbbytes); -@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp) - } else { - printf ("\n"); - } -- } -+ } */ - - printf (" XFilterEvent returns: %s\n", - XFilterEvent (eventp, e->window) ? "True" : "False"); -@@ -1015,7 +1015,7 @@ main (int argc, char **argv) - fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); - } - -- xim = XOpenIM (dpy, NULL, NULL, NULL); -+ /*xim = XOpenIM (dpy, NULL, NULL, NULL); - if (xim == NULL) { - fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); - } -@@ -1042,7 +1042,7 @@ main (int argc, char **argv) - } - XFree (xim_styles); - } -- } -+ }*/ - - screen = DefaultScreen (dpy); - -@@ -1109,7 +1109,7 @@ main (int argc, char **argv) - printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); - } - -- if (xim && xim_style) { -+ /*if (xim && xim_style) { - xic = XCreateIC (xim, - XNInputStyle, xim_style, - XNClientWindow, w, -@@ -1119,7 +1119,7 @@ main (int argc, char **argv) - if (xic == NULL) { - fprintf (stderr, "XCreateIC failed\n"); - } -- } -+ }*/ - - have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base); - if (have_rr) { diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb deleted file mode 100644 index f151b579e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "X Event Viewer" -DESCRIPTION = "Xev creates a window and then asks the X server to send it events \ -whenever anything happens to the window (such as it being moved, resized, \ -typed in, clicked in, etc.). You can also attach it to an existing window." - -LIC_FILES_CHKSUM = "file://xev.c;beginline=1;endline=33;md5=577c99421f1803b891d2c79097ae4682" -LICENSE = "MIT" - -PE = "1" - -DEPENDS += "libxrandr xproto" - -SRC_URI += "file://diet-x11.patch" - -SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e" -SRC_URI[sha256sum] = "d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb deleted file mode 100644 index 84d0cb804..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "X11 eyes that follow the mouse cursor demo" -DESCRIPTION = "Xeyes is a small X11 application that shows a pair of eyes that move to \ -follow the location of the mouse cursor around the screen." - -PE = "1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6" - -SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981" -SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521" - -DEPENDS += "libxau libxt libxext libxmu libxrender" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb deleted file mode 100644 index 825737f39..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Server access control program for X" - -DESCRIPTION = "The xhost program is used to add and delete host names or \ -user names to the list allowed to make connections to the X server. In \ -the case of hosts, this provides a rudimentary form of privacy control \ -and security. Environments which require more sophisticated measures \ -should implement the user-based mechanism or use the hooks in the \ -protocol for passing other authentication data to the server." - -LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199" -DEPENDS += "libxmu libxau" -PE = "1" - -SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516" -SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb deleted file mode 100644 index 93185188e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "X Window System initializer" - -DESCRIPTION = "The xinit program is used to start the X Window System \ -server and a first client program on systems that cannot start X \ -directly from /etc/init or in environments that use multiple window \ -systems. When this first client exits, xinit will kill the X server and \ -then terminate." - -LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" - -PE = "1" - -SRC_URI[md5sum] = "4e928452dfaf73851413a2d8b8c76388" -SRC_URI[sha256sum] = "75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3" - -EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" - -RDEPENDS_${PN} += "util-linux-mcookie" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb deleted file mode 100644 index 25cd047bc..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Runtime configuration and test of XInput devices" - -DESCRIPTION = "Xinput is an utility for configuring and testing XInput devices" - -LIC_FILES_CHKSUM = "file://COPYING;md5=881525f89f99cad39c9832bcb72e6fa5" - -DEPENDS += " libxi libxrandr libxinerama" - -SRC_URI[md5sum] = "6a889412eff2e3c1c6bb19146f6fe84c" -SRC_URI[sha256sum] = "3694d29b4180952fbf13c6d4e59541310cbb11eef5bf888ff3d8b7f4e3aee5c4" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.1.bb deleted file mode 100644 index 1c9835987..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "A program to compile XKB keyboard description" - -DESCRIPTION = "The xkbcomp keymap compiler converts a description of an \ -XKB keymap into one of several output formats. The most common use for \ -xkbcomp is to create a compiled keymap file (.xkm extension) which can \ -be read directly by XKB-capable X servers or utilities." - -LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a" - -PR = "${INC_PR}.0" - -DEPENDS += "libxkbfile" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "a4d8353daf6cb0a9c47379b7413c42c6" -SRC_URI[sha256sum] = "0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb deleted file mode 100644 index 2deac6a05..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Utility for modifying keymaps and pointer button mappings in X" - -DESCRIPTION = "The xmodmap program is used to edit and display the \ -keyboard modifier map and keymap table that are used by client \ -applications to convert event keycodes into keysyms. It is usually run \ -from the user's session startup script to configure the keyboard \ -according to personal tastes." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" - -PE = "1" - -SRC_URI[md5sum] = "723f02d3a5f98450554556205f0a9497" -SRC_URI[sha256sum] = "b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/yocto-poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc deleted file mode 100644 index 3529cb26e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "X application" -HOMEPAGE = "http://www.x.org/" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11/apps" -LICENSE = "MIT-X" -DEPENDS = "util-macros-native virtual/libx11" - -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -INC_PR = "r8" - -SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" - -inherit autotools pkgconfig distro_features_check - -FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb deleted file mode 100644 index d78bf0451..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Utility to display window and font properties of an X server" - -DESCRIPTION = "The xprop utility is for displaying window and font \ -properties in an X server. One window or font is selected using the \ -command line arguments or possibly in the case of a window, by clicking \ -on the desired window. A list of properties is then given, possibly with \ -formatting information." - -LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" - -DEPENDS += "libxmu" - -PE = "1" - -SRC_URI[md5sum] = "fae3d2fda07684027a643ca783d595cc" -SRC_URI[sha256sum] = "9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb deleted file mode 100644 index 41bd42069..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "XRandR: X Resize, Rotate and Reflect extension command" - -DESCRIPTION = "Xrandr is used to set the size, orientation and/or \ -reflection of the outputs for a screen. It can also set the screen \ -size." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" -DEPENDS += "libxrandr libxrender" -PE = "1" - -SRC_URI[md5sum] = "441fdb98d2abc6051108b7075d948fc7" -SRC_URI[sha256sum] = "7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch deleted file mode 100644 index 97d13a30d..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch +++ /dev/null @@ -1,26 +0,0 @@ -add "-disable-xkb" option - -Upstream-Status: Pending - -Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com> - -diff --git a/configure.ac b/configure.ac -index 81c3ae4..26601bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, - AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) - -+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), -+ XKB="$enableval", XKB="yes") -+if test "x$XKB" = "xyes" ; then - PKG_CHECK_MODULES(SET_XKB, x11, - [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" - AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -+fi - - AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), - [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"]) diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb deleted file mode 100644 index f683b7603..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Utility for setting various user preference options of the display" - -DESCRIPTION = "xset is a utility that is used to set various user \ -preference options of the display." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" -DEPENDS += "libxext libxxf86misc libxmu libxau" -PE = "1" - -SRC_URI += "file://disable-xkb.patch" - -SRC_URI[md5sum] = "dcd227388b57487d543cab2fd7a602d7" -SRC_URI[sha256sum] = "4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063" - -CFLAGS += "-D_GNU_SOURCE" -EXTRA_OECONF = "--disable-xkb --without-fontcache" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb deleted file mode 100644 index 2965ef7f8..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Print out X-Video extension adaptor information" - -DESCRIPTION = "xvinfo prints out the capabilities of any video adaptors \ -associated with the display that are accessible through the X-Video \ -extension." - -LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68" -DEPENDS += " libxv" -PE = "1" - -SRC_URI[md5sum] = "558360176b718dee3c39bc0648c0d10c" -SRC_URI[sha256sum] = "9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb deleted file mode 100644 index 0c23d1943..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Window information utility for X" - -DESCRIPTION = "Xwininfo is a utility for displaying information about \ -windows. Information may include window position, size, color depth, \ -and a number of other items." - -LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e" -DEPENDS += "libxext libxmu gettext-native" - -PE = "0" - -SRC_URI[md5sum] = "b777bafb674555e48fd8437618270931" -SRC_URI[sha256sum] = "218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb deleted file mode 100644 index cf77ad209..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- event devices (evdev) input driver" - -DESCRIPTION = "evdev is an Xorg input driver for Linux's generic event \ -devices. It therefore supports all input devices that the kernel knows \ -about, including most mice and keyboards. \ -\ -The evdev driver can serve as both a pointer and a keyboard input \ -device, and may be used as both the core keyboard and the core pointer. \ -Multiple input devices are supported by multiple instances of this \ -driver, with one Load directive for evdev in the Module section of your \ -xorg.conf for each input device that will use this driver. " - -LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" - -DEPENDS += "mtdev libevdev" - -SRC_URI[md5sum] = "96d89d9406a02f5e36bdaa4edd9a243a" -SRC_URI[sha256sum] = "af9c2b47f5b272ae56b45da6bd84610fc9a3d80a4b32c8215842a39d862de017" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb deleted file mode 100644 index 6fe51accb..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- keyboard input driver" - -DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ -driver supports the standard OS-provided keyboard interface. The driver \ -functions as a keyboard input device, and may be used as the X server's \ -core keyboard." - -LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10" - -SRC_URI[md5sum] = "96ccc43d389b970afbd3893875dfd678" -SRC_URI[sha256sum] = "1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb deleted file mode 100644 index dfb08f724..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- keyboard input driver" - -DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ -driver supports the standard OS-provided keyboard interface. The driver \ -functions as a keyboard input device, and may be used as the X server's \ -core keyboard." - -SRCREV = "3e28d68b50d291938734e9684b8296ca864f3892" -PV = "1.3.2+git${SRCPV}" -PR = "${INC_PR}.0" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard" -S = "${WORKDIR}/git" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb deleted file mode 100644 index 0252baff1..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "Generic input driver for the X.Org server based on libinput" -LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0" - -DEPENDS += "libinput" - -SRC_URI[md5sum] = "2c8cb520f88da7bafaceebc0b34ea1d4" -SRC_URI[sha256sum] = "fdade531e91e79acf6dce8ac55fa4f65abe3f1358c5d3d777ae48dbc74b76f49" - -FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch deleted file mode 100644 index 6930864ed..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch +++ /dev/null @@ -1,21 +0,0 @@ -Unbreak the linux mouse driver by using config.h - -RP - 4/11/07 - -Upstream-Status: Pending - -Index: git/src/lnx_mouse.c -=================================================================== ---- git.orig/src/lnx_mouse.c 2008-11-04 23:46:05.000000000 +0000 -+++ git/src/lnx_mouse.c 2008-11-04 23:46:15.000000000 +0000 -@@ -3,8 +3,8 @@ - * Copyright 1999 by The XFree86 Project, Inc. - */ - --#ifdef HAVE_XORG_CONFIG_H --#include <xorg-config.h> -+#ifdef HAVE_CONFIG_H -+#include <config.h> - #endif - - #include <X11/X.h> diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb deleted file mode 100644 index 1f0b78a15..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- mouse input driver" - -DESCRIPTION = "mouse is an Xorg input driver for mice. The driver \ -supports most available mouse types and interfaces. The mouse driver \ -functions as a pointer input device, and may be used as the X server's \ -core pointer. Multiple mice are supported by multiple instances of this \ -driver." - -LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510" - -SRC_URI[md5sum] = "77085b649c5c0b333565ba562f573951" -SRC_URI[sha256sum] = "3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb deleted file mode 100644 index d79a2e4dd..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- mouse input driver" - -DESCRIPTION = "mouse is an Xorg input driver for mice. The driver \ -supports most available mouse types and interfaces. The mouse driver \ -functions as a pointer input device, and may be used as the X server's \ -core pointer. Multiple mice are supported by multiple instances of this \ -driver." - -SRCREV = "ea5cfe804e112f320f14ad896c7802d53551d3e6" -PV = "1.3.0+git${SRCPV}" -PR = "${INC_PR}.0" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse \ - file://unbreak.patch" -S = "${WORKDIR}/git" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb deleted file mode 100644 index b47c82cc6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- synaptics touchpad input driver" - -DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ -Synaptics Incorporated. Even though these touchpads (by default, \ -operating in a compatibility mode emulating a standard mouse) can be \ -handled by the normal evdev or mouse drivers, this driver allows more \ -advanced features of the touchpad to become available." - -LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" - -SRC_URI[md5sum] = "4e3c8bed1ab4a67db2160c2c3d7e2a34" -SRC_URI[sha256sum] = "d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01" - -DEPENDS += "libxi mtdev libxtst libevdev" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb deleted file mode 100644 index 140f633b4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- synaptics touchpad input driver" - -DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ -Synaptics Incorporated. Even though these touchpads (by default, \ -operating in a compatibility mode emulating a standard mouse) can be \ -handled by the normal evdev or mouse drivers, this driver allows more \ -advanced features of the touchpad to become available." - -SRCREV = "934bc0012f948c52aadc8eda912f7728fb7394a2" -PV = "0.15.2+git${SRCPV}" -PR = "${INC_PR}.1" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics" -S = "${WORKDIR}/git" - -DEPENDS += "libxi mtdev libxtst" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb deleted file mode 100644 index 8615b48da..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- VMWare mouse input driver" -DESCRIPTION = "The vmmouse driver enables support for the special VMMouse \ -protocol that is provided by VMware virtual machines to give absolute \ -pointer positioning. The vmmouse driver is capable of falling back to the \ -standard 'mouse' driver if a VMware virtual machine is not detected." - -SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed" -SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319" - -RDEPENDS_${PN} += "xf86-input-mouse" - -LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -do_install_append () { - # We don't care about hal - rm -rf ${D}${datadir}/hal/ - rm -rf ${D}${libdir}/hal/ -} - -EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" - -FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ ${datadir}/X11/xorg.conf.d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb deleted file mode 100644 index c49847760..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- cirrus display driver" -DESCRIPTION = "cirrus is an Xorg driver for Cirrus Logic VGA adapters. These \ -devices are not so common in the wild anymore, but QEMU can emulate one, so \ -the driver is still useful." - -LIC_FILES_CHKSUM = "file://COPYING;md5=6ddc7ca860dc5fd014e7f160ea699295" - -SRC_URI[md5sum] = "7d7dfd4cdc42aa8b6e923510fa00ad2b" -SRC_URI[sha256sum] = "edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab" - -DEPENDS += "libpciaccess" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb deleted file mode 100644 index 52e9bd1df..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- fbdev display driver" -DESCRIPTION = "fbdev is an Xorg driver for framebuffer devices. This is a non-accelerated driver." - -LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" - -SRC_URI[md5sum] = "3931c0e19d441cc576dc088f9eb9fd73" -SRC_URI[sha256sum] = "9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch deleted file mode 100644 index 35762192f..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch +++ /dev/null @@ -1,65 +0,0 @@ -From c43617b739e358064396912c7a7a8028ca91d201 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> -Date: Thu, 16 Apr 2015 20:40:39 +0300 -Subject: [PATCH] gen8: Fix the YUV->RGB shader -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use the correct register (Yn_01) with first half of the -Y samples instead of using the register (Yn_23) with the -second half twice when computing the green channel. - -Also use the Yn_01 register name instead of Yn for the red -channel as well, just for a bit of extra consistency. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89807 -Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Tested-by: Chris Wilson <chris@chris-wilson.co.uk> - -Upstream-Status: Backport -Signed-off-by: Saul Wold <sgw@linux.intel.com> - ---- - src/render_program/exa_wm_yuv_rgb.g8a | 4 ++-- - src/render_program/exa_wm_yuv_rgb.g8b | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/render_program/exa_wm_yuv_rgb.g8a b/src/render_program/exa_wm_yuv_rgb.g8a -index 7def093..34973ba 100644 ---- a/src/render_program/exa_wm_yuv_rgb.g8a -+++ b/src/render_program/exa_wm_yuv_rgb.g8a -@@ -76,7 +76,7 @@ add (16) Cbn<1>F Cb<8,8,1>F -0.501961F { compr align1 }; - /* - * R = Y + Cr * 1.596 - */ --mov (8) acc0<1>F Yn<8,8,1>F { compr align1 }; -+mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 }; - mac.sat(8) src_sample_r_01<1>F Crn_01<8,8,1>F 1.596F { compr align1 }; - - mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 }; -@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_23<1>F Crn_23<8,8,1>F 1.596F { compr align1 }; - /* - * G = Crn * -0.813 + Cbn * -0.392 + Y - */ --mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 }; -+mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 }; - mac (8) acc0<1>F Crn_01<8,8,1>F -0.813F { compr align1 }; - mac.sat(8) src_sample_g_01<1>F Cbn_01<8,8,1>F -0.392F { compr align1 }; - -diff --git a/src/render_program/exa_wm_yuv_rgb.g8b b/src/render_program/exa_wm_yuv_rgb.g8b -index 4494953..2cd6fc4 100644 ---- a/src/render_program/exa_wm_yuv_rgb.g8b -+++ b/src/render_program/exa_wm_yuv_rgb.g8b -@@ -6,7 +6,7 @@ - { 0x80600048, 0x21c03ae8, 0x3e8d02c0, 0x3fcc49ba }, - { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, - { 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba }, -- { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, -+ { 0x00600001, 0x24003ae0, 0x008d0300, 0x00000000 }, - { 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 }, - { 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 }, - { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, --- -2.5.0 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch deleted file mode 100644 index 29924bb90..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2c5063938cc809f624e56efd4673041fa8141e81 Mon Sep 17 00:00:00 2001 -From: Martin Peres <martin.peres@linux.intel.com> -Date: Thu, 9 Jul 2015 11:26:38 +0300 -Subject: [PATCH] uxa: fix the call to PixmapSyncDirtyHelper, broken by - xserver's 90db5ed - -[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie] -Signed-off-by: Martin Peres <martin.peres@linux.intel.com> - -Upstream-Status: Backport -Signed-off-by: Saul Wold <sgw@linux.intel.com> ---- - src/compat-api.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/compat-api.h b/src/compat-api.h -index aa93bee..293e9d7 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap) - #endif - - #endif -+ -+#if HAS_DIRTYTRACKING_ROTATION -+#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d) -+#endif --- -2.5.0 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch deleted file mode 100644 index 8a5dd39ae..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch +++ /dev/null @@ -1,24 +0,0 @@ -Include xorg-server.h to fix build errors seen with glibc 2.20 - -In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-intel/2_2.99.912-r0/xf86-video-intel-2.99.912/src/backlight.c:39: -/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' - strndup(const char *str, size_t n); - ^ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - -Index: xf86-video-intel-2.99.912/src/backlight.c -=================================================================== ---- xf86-video-intel-2.99.912.orig/src/backlight.c 2014-04-09 10:41:18.000000000 -0700 -+++ xf86-video-intel-2.99.912/src/backlight.c 2014-08-28 18:52:25.524070587 -0700 -@@ -29,6 +29,7 @@ - #include "config.h" - #endif - -+#include <xorg-server.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <sys/stat.h> diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch deleted file mode 100644 index dda508dcf..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch +++ /dev/null @@ -1,17 +0,0 @@ -These modules are only used for tests that don't get installed, and the -automatic detection without explicit dependencies means that a build can find -e.g. xshmfence at configure time but then it's been removed from the sysroot by -the time compile happens. - -As the tests don't get installed, just disable the checks. - -Upstream-Status: Inappropriate [OE-specific] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index bd654f3..78a0e0d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -251 +251 @@ fi --PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) -+#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch deleted file mode 100644 index 589d52e0f..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Thu, 19 Mar 2015 23:14:17 +0000 -Subject: [PATCH] sna: Protect against ABI breakage in recent versions of - libdrm - -commit 7fe2b2948652443ff43d907855bd7a051d54d309 upstream. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Upstream-Status: Backport -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/src/sna/kgem.c b/src/sna/kgem.c -index 11f0828f2bbc..6f16cbac87f2 100644 ---- a/src/sna/kgem.c -+++ b/src/sna/kgem.c -@@ -182,6 +182,15 @@ struct local_i915_gem_caching { - #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching) - #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching) - -+struct local_i915_gem_mmap { -+ uint32_t handle; -+ uint32_t pad; -+ uint64_t offset; -+ uint64_t size; -+ uint64_t addr_ptr; -+}; -+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap) -+ - struct local_i915_gem_mmap2 { - uint32_t handle; - uint32_t pad; -@@ -514,15 +523,15 @@ retry_wc: - - static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo) - { -- struct drm_i915_gem_mmap mmap_arg; -+ struct local_i915_gem_mmap arg; - int err; - - retry: -- VG_CLEAR(mmap_arg); -- mmap_arg.handle = bo->handle; -- mmap_arg.offset = 0; -- mmap_arg.size = bytes(bo); -- if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) { -+ VG_CLEAR(arg); -+ arg.handle = bo->handle; -+ arg.offset = 0; -+ arg.size = bytes(bo); -+ if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) { - assert(err != EINVAL); - - if (__kgem_throttle_retire(kgem, 0)) -@@ -536,10 +545,10 @@ retry: - return NULL; - } - -- VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo))); -+ VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo))); - - DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle)); -- return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr; -+ return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr; - } - - static int gem_write(int fd, uint32_t handle, --- -2.4.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch deleted file mode 100644 index 0e675ee9f..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch +++ /dev/null @@ -1,59 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Tue, 24 Feb 2015 15:25:40 +0000 -Subject: sna: udev integration depends on fstat and sys/stat.h - -src/sna/sna_driver.c: In function 'sna_handle_uevents': -src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration] - -Also take the opportunity to include udev support in the configure -summary. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> - -diff --git a/configure.ac b/configure.ac -index 7476e2b..de3a4b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev, - - if test "x$UDEV" != "xno"; then - PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"]) -+ AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"]) - if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then - AC_MSG_ERROR([udev support requested but not found (libudev)]) - fi - if test "x$udev" = "xyes"; then - AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection]) -+ udev_msg=" yes" -+ else -+ udev_msg=" no" - fi - fi - -@@ -911,6 +915,7 @@ echo " Support for Kernel Mode Setting? $KMS" - echo " Support for legacy User Mode Setting (for i810)? $UMS" - echo " Support for Direct Rendering Infrastructure:$dri_msg" - echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg" -+echo " Support for display hotplug notifications (udev):$udev_msg" - echo " Build additional tools and utilities?$tools_msg" - if test -n "$xp_msg"; then - echo " Experimental support:$xp_msg" -diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c -index 8c0d0b5..bc20ef0 100644 ---- a/src/sna/sna_driver.c -+++ b/src/sna/sna_driver.c -@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL) - } - - #if HAVE_UDEV -+#include <sys/stat.h> -+ - static void - sna_handle_uevents(int fd, void *closure) - { --- -cgit v0.10.2 diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb deleted file mode 100644 index d75b44f17..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb +++ /dev/null @@ -1,42 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver" - -DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \ -chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \ -the driver supports hardware accelerated 3D via the Direct Rendering \ -Infrastructure (DRI)." - -LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" - -SRC_URI += "file://disable-x11-dri3.patch \ - file://always_include_xorg_server.h.patch \ - file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \ - file://udev-fstat.patch \ - file://0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch \ - file://0001-gen8-Fix-the-YUV-RGB-shader.patch \ - " - -SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" -SRC_URI[sha256sum] = "00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9" - -DEPENDS += "virtual/libx11 drm libpciaccess pixman" - -PACKAGECONFIG ??= "xvmc sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}" - -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri" -PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1,xf86driproto" -PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" -PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" -PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" -PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" -PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc xcb-util" -PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxrandr libxdamage libxfixes libxcursor libxtst libxext libxrender" - -# --enable-kms-only option is required by ROOTLESS_X -EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -FILES_${PN} += "${datadir}/polkit-1" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb deleted file mode 100644 index 78954497a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb +++ /dev/null @@ -1,41 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver" - -SUMMARY = "X.Org X server -- TI OMAP integrated graphics chipsets driver" - -DESCRIPTION = "Open-source X.org graphics driver for TI OMAP graphics \ -Currently relies on a closed-source submodule for EXA acceleration on \ -the following chipsets: \ - + OMAP3430 \ - + OMAP3630 \ - + OMAP4430 \ - + OMAP4460 \ - + OMAP5430 \ - + OMAP5432 \ -\ -NOTE: this driver is work in progress.. you probably don't want to try \ -and use it yet. The API/ABI between driver and kernel, and driver and \ -acceleration submodules is not stable yet. This driver requires the \ -omapdrm kernel driver w/ GEM support. \ -" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" -DEPENDS += "virtual/libx11 libdrm xf86driproto" - -SRC_URI[md5sum] = "a364e151a537948f75bb8c9b840a31da" -SRC_URI[sha256sum] = "a7192690b8638f5c8d611a1bae07cc13081e22edd4070f37a2f5c3f8d79e7ebc" - -CFLAGS += " -I${STAGING_INCDIR}/xorg " - -# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) -do_compile_prepend_armv7a () { - sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c -} - -python () { - if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d): - raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES") -} - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch deleted file mode 100644 index c4cf16eb0..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 28c006c94e57ea71df11ec4fff79d7ffcfc4860f Mon Sep 17 00:00:00 2001 -From: Far McKon <FarMcKon@buglabs.net> -Date: Tue, 3 May 2011 20:59:04 +0300 -Subject: [PATCH] Prevents omapfb from from crashing when pixelclock of 0 is - sent to it. - -Due to a Linux design bug it is easy to get a pixelclock set to zero -when changing displays at runtime. ---- - src/omapfb-output.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/omapfb-output.c b/src/omapfb-output.c -index f8b4db3..4d59265 100644 ---- a/src/omapfb-output.c -+++ b/src/omapfb-output.c -@@ -125,8 +125,13 @@ OMAPFBOutputGetModes(xf86OutputPtr output) - /* Only populate the native (current) mode */ - mode = calloc(1, sizeof(DisplayModeRec)); - mode->type |= M_T_PREFERRED; -- mode->Clock = PICOS2KHZ(ofb->state_info.pixclock); -- mode->SynthClock = PICOS2KHZ(ofb->state_info.pixclock); -+ if (ofb->state_info.pixclock == 0) { -+ mode->Clock = 0; -+ mode->SynthClock = 0; -+ } else { -+ mode->Clock = PICOS2KHZ(ofb->state_info.pixclock); -+ mode->SynthClock = PICOS2KHZ(ofb->state_info.pixclock); -+ } - mode->HDisplay = ofb->state_info.xres; - mode->HSyncStart = mode->HDisplay - + ofb->state_info.right_margin; --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch deleted file mode 100644 index 9fb01d438..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8fb7d0f99d4afbb574b30cb4f1e66a8f89d94ad5 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Wed, 26 Jan 2011 12:04:36 +0100 -Subject: [PATCH 1/6] Revert "Set a large CRTC upper limit to not prune larger - resolutions" - -Picture is garbled after switching resolutions, so revert it. -Virtual size too big, revert the commit 9c4d7592dcb7dc20a48a6f941d9d94bd73d34153. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/omapfb-crtc.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c -index 9aaa52f..cbeff35 100644 ---- a/src/omapfb-crtc.c -+++ b/src/omapfb-crtc.c -@@ -190,13 +190,13 @@ OMAPFBCRTCInit(ScrnInfoPtr pScrn) - * In practise, this doesn't seem to be supported. - * (no way to setup the overlay offset/base address) - */ -- /* FIXME: figure out what makes sense here. A known max resolution? -- * framebuffer size? -- */ - xf86CrtcSetSizeRange(pScrn, -- 8, 8, 2048, 2048); -+ 8, 8, -+ ofb->state_info.xres_virtual, -+ ofb->state_info.yres_virtual); - - ofb->crtc = xf86CrtcCreate(pScrn, &OMAPFBCrtcFuncs); -+ - } - - --- -1.8.0 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch deleted file mode 100644 index 683a98983..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 855c333ac0d16350f895f1d1b9391e9cbb0b6db4 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Wed, 26 Jan 2011 13:27:20 +0100 -Subject: [PATCH 2/6] Revert "Set virtual size when configuring framebuffer" - -Virtual size too big, so revert it. - -This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/omapfb-crtc.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c -index cbeff35..9655db2 100644 ---- a/src/omapfb-crtc.c -+++ b/src/omapfb-crtc.c -@@ -98,8 +98,6 @@ OMAPFBCrtcCommitChangeMode (xf86CrtcPtr crtc) - v = ofb->state_info; - v.xres = mode->HDisplay; - v.yres = mode->VDisplay; -- v.xres_virtual = crtc->scrn->virtualX; -- v.yres_virtual = crtc->scrn->virtualY; - v.activate = FB_ACTIVATE_NOW; - v.pixclock = KHZ2PICOS(mode->Clock ? mode->Clock : 56000); - v.left_margin = mode->HTotal - mode->HSyncEnd; --- -1.8.0 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch deleted file mode 100644 index 67ea7c1a5..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 252f44c072d3447a32127fc9afe5d0d40f3c510e Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Wed, 26 Jan 2011 13:20:20 +0100 -Subject: [PATCH 3/6] force 'plain' mode - -The new DSS mode breaks XV, so force plain mode - -Upstream-Status: Pending - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/omapfb-driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c -index 018e040..48aa09c 100644 ---- a/src/omapfb-driver.c -+++ b/src/omapfb-driver.c -@@ -326,7 +326,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) - OMAPFBProbeController(ofb->ctrl_name); - - /* Do we have the DSS kernel API? */ -- if (stat(SYSFS_DSS_DIR, &st) == 0) { -+ if (0) { //stat(SYSFS_DSS_DIR, &st) == 0) { - ofb->dss = TRUE; - } else { - ofb->dss = FALSE; --- -1.8.0 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch deleted file mode 100644 index b0ac9a44c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch +++ /dev/null @@ -1,33 +0,0 @@ -From cfa46b67f59115f6d8ef9414af60380749ff3eb3 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Wed, 26 Jan 2011 13:21:12 +0100 -Subject: [PATCH 4/6] blacklist tv out - -The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails. so blacklist it - -Upstream-Status: Pending - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/omapfb-output-dss.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c -index 6cc52de..83cb711 100644 ---- a/src/omapfb-output-dss.c -+++ b/src/omapfb-output-dss.c -@@ -205,6 +205,10 @@ OMAPFBDSSOutputDetect (xf86OutputPtr output) - if(ofb->timings[idx][0] == '\0') - return XF86OutputStatusDisconnected; - -+ // Hack to disable the tv out -+ if (strncmp(output->name, "tv", 2) == 0) -+ return XF86OutputStatusDisconnected; -+ - return XF86OutputStatusConnected; - } - --- -1.8.0 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch deleted file mode 100644 index 67b284023..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch +++ /dev/null @@ -1,325 +0,0 @@ -From 8b1f697a60e35ab82fffdabfaefdb45e9a9df379 Mon Sep 17 00:00:00 2001 -From: Eino-Ville Talvala <talvala@stanford.edu> -Date: Tue, 23 Aug 2011 18:37:01 +0200 -Subject: [PATCH 5/6] Attempt to fix VRFB - -Upstream-Status: Pending - -http://dominion.thruhere.net/git/cgit.cgi/xf86-video-omapfb/commit/?h=koen/fixups&id=6833fc9f795265e4943d248103fbaf3463b515d6 - -Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/image-format-conversions.c | 4 +-- - src/image-format-conversions.h | 2 +- - src/omapfb-driver.c | 28 +++++++++++++--- - src/omapfb-xv-blizzard.c | 1 + - src/omapfb-xv-generic.c | 72 +++++++++++++++++++++++++++++++++--------- - src/omapfb-xv.c | 3 ++ - 6 files changed, 88 insertions(+), 22 deletions(-) - -diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c -index dcefa9b..d43427d 100644 ---- a/src/image-format-conversions.c -+++ b/src/image-format-conversions.c -@@ -38,13 +38,13 @@ - #include "image-format-conversions.h" - - /* Basic line-based copy for packed formats */ --void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest) -+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest) - { - int i; - int len = w * 2; - for (i = 0; i < h; i++) - { -- memcpy(dest + i * len, src + i * stride, len); -+ memcpy(dest + i * dst_stride, src + i * src_stride, len); - } - } - -diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h -index 584896a..ba7caf2 100644 ---- a/src/image-format-conversions.h -+++ b/src/image-format-conversions.h -@@ -27,7 +27,7 @@ - #include <stdint.h> - - /* Basic line-based copy for packed formats */ --void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest); -+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest); - - /* Basic C implementation of YV12/I420 to UYVY conversion */ - void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest); -diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c -index 48aa09c..07989f5 100644 ---- a/src/omapfb-driver.c -+++ b/src/omapfb-driver.c -@@ -66,6 +66,7 @@ - #define OMAPFB_VERSION 1000 - #define OMAPFB_DRIVER_NAME "OMAPFB" - #define OMAPFB_NAME "omapfb" -+#define ENFORCE_MODES - - static Bool OMAPFBProbe(DriverPtr drv, int flags); - static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); -@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = { - typedef enum { - OPTION_ACCELMETHOD, - OPTION_FB, -+ OPTION_ROTATE, - } FBDevOpts; - - static const OptionInfoRec OMAPFBOptions[] = { - { OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE }, - { OPTION_FB, "fb", OPTV_STRING, {0}, FALSE }, -+ { OPTION_ROTATE, "rotation", OPTV_STRING, {0}, FALSE }, - { -1, NULL, OPTV_NONE, {0}, FALSE } - }; - -@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) - { - OMAPFBPtr ofb; - EntityInfoPtr pEnt; -+ char *rotate; - rgb zeros = { 0, 0, 0 }; - struct stat st; - -@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) - pScrn->progClock = TRUE; - pScrn->chipset = "omapfb"; - -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n"); -+ - /* Start with configured virtual size */ - pScrn->virtualX = pScrn->display->virtualX; - pScrn->virtualY = pScrn->display->virtualY; -@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - ofb->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = OMAPFBCloseScreen; - -+ /* Enforce the default mode (this is silly I guess) */ -+#ifdef ENFORCE_MODES -+ //xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n"); -+ //set_mode(ofb, &ofb->default_mode); -+ //pScrn->displayWidth = ofb->fixed_info.line_length / -+ // (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres; -+#endif -+ - /* Map our framebuffer memory */ -+ ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres; - ofb->fb = mmap (NULL, ofb->mem_info.size, - PROT_READ | PROT_WRITE, MAP_SHARED, - ofb->fd, 0); -- if (ofb->fb == NULL) { -- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n"); -+ if (ofb->fb == MAP_FAILED) { -+ xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); - return FALSE; - } - -@@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } else if (!ofb->dss) { - - ofb->plane_info.enabled = 1; -- ofb->plane_info.out_width = ofb->state_info.xres; -- ofb->plane_info.out_height = ofb->state_info.yres; -+ if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) { -+ ofb->plane_info.out_width = ofb->state_info.xres; -+ ofb->plane_info.out_height = ofb->state_info.yres; -+ } else { -+ ofb->plane_info.out_width = ofb->state_info.yres; -+ ofb->plane_info.out_height = ofb->state_info.xres; -+ } - - if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) { - xf86DrvMsg(scrnIndex, X_ERROR, -diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c -index 406ffc6..b71d2aa 100644 ---- a/src/omapfb-xv-blizzard.c -+++ b/src/omapfb-xv-blizzard.c -@@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn, - packed_line_copy(src_w & ~3, - src_h & ~3, - ((src_w + 1) & ~1) * 2, -+ ofb->port->fixed_info.line_length, - (uint8_t*)buf, - (uint8_t*)ofb->port->fb); - break; -diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c -index e6f89fe..b33f344 100644 ---- a/src/omapfb-xv-generic.c -+++ b/src/omapfb-xv-generic.c -@@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) - { - OMAPFBPtr ofb = OMAPFB(pScrn); - -- /* The memory size is already set in OMAPFBXVQueryImageAttributes */ -+ /* The memory size is already set before we get here */ - if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to allocate video plane memory\n"); -@@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) - ofb->port->fb = mmap (NULL, ofb->port->mem_info.size, - PROT_READ | PROT_WRITE, MAP_SHARED, - ofb->port->fd, 0); -- if (ofb->port->fb == NULL) { -+ if (ofb->port->fb == MAP_FAILED) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Mapping video memory failed\n"); - return XvBadAlloc; - } - - /* Update the state info */ -+ /* Let's not - it's bad - if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info)) - { - xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); - return XvBadAlloc; - } -- -+ */ - return Success; - } - -@@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) - int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn) - { - OMAPFBPtr ofb = OMAPFB(pScrn); -+ int ret; - - if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info)) - { -@@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn) - xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); - return XvBadAlloc; - } -+ /* Changing rotation/nonstd flags can change the fixed info! */ -+ if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info)) -+ { -+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); -+ return XvBadAlloc; -+ } -+ /* Correct fixed info requires recalculation of needed memory */ -+ ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres; -+ -+ /* Allocate buffer memory */ -+ ret = OMAPXVAllocPlane(pScrn); -+ if (ret != Success) -+ return ret; -+ -+ /* Workaround for reset of mode after memory allo */ -+ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info)) -+ { -+ xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__); -+ return XvBadAlloc; -+ } -+ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info)) -+ { -+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); -+ return XvBadAlloc; -+ } - - if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE, - &ofb->port->plane_info) != 0) { -@@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, - DrawablePtr pDraw) - { - OMAPFBPtr ofb = OMAPFB(pScrn); -+ short drw_temp; -+ short rot_xres, rot_yres; - - if (!ofb->port->plane_info.enabled - || ofb->port->update_window.x != src_x -@@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, - return Success; - } - -- /* If we don't have the plane running, enable it */ -- if (!ofb->port->plane_info.enabled) { -- ret = OMAPXVAllocPlane(pScrn); -- if (ret != Success) -- return ret; -- } -- - /* Set up the state info, xres and yres will be used for - * scaling to the values in the plane info struct - */ -@@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, - ofb->port->state_info.yres_virtual = 0; - ofb->port->state_info.xoffset = 0; - ofb->port->state_info.yoffset = 0; -- ofb->port->state_info.rotate = 0; -+ //ofb->port->state_info.rotate = 0; - ofb->port->state_info.grayscale = 0; - ofb->port->state_info.activate = FB_ACTIVATE_NOW; - ofb->port->state_info.bits_per_pixel = 0; - ofb->port->state_info.nonstd = xv_to_omapfb_format(image); - -+ /* Plane info does not rotate with state_info */ -+ if (ofb->port->state_info.rotate == 1 || -+ ofb->port->state_info.rotate == 3) { -+ drw_temp = drw_x; -+ drw_x = drw_y; -+ drw_y = drw_temp; -+ -+ drw_temp = drw_w; -+ drw_w = drw_h; -+ drw_h = drw_temp; -+ -+ rot_xres = ofb->port->state_info.yres; -+ rot_yres = ofb->port->state_info.xres; -+ } else { -+ rot_xres = ofb->port->state_info.xres; -+ rot_yres = ofb->port->state_info.yres; -+ } -+ -+ - /* Set up the video plane info */ - ofb->port->plane_info.enabled = 1; - ofb->port->plane_info.pos_x = drw_x; -@@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, - ofb->port->plane_info.out_height = drw_h & ~15; - - /* Cap output to screen size */ -- if (ofb->port->plane_info.out_width > ofb->state_info.xres) { -+ if (ofb->port->plane_info.out_width > rot_xres) { - ofb->port->plane_info.pos_x = 0; -- ofb->port->plane_info.out_width = ofb->state_info.xres; -+ ofb->port->plane_info.out_width = rot_xres; - } -- if (ofb->port->plane_info.out_height > ofb->state_info.yres) { -+ if (ofb->port->plane_info.out_height > rot_yres) { - ofb->port->plane_info.pos_y = 0; -- ofb->port->plane_info.out_height = ofb->state_info.yres; -+ ofb->port->plane_info.out_height = rot_yres; - } - - ret = OMAPXVSetupVideoPlane(pScrn); -@@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, - packed_line_copy(src_w & ~15, - src_h & ~15, - ((src_w + 1) & ~1) * 2, -+ ofb->port->fixed_info.line_length, - (uint8_t*)buf, - (uint8_t*)ofb->port->fb); - break; -diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c -index 1df651e..0fee2c6 100644 ---- a/src/omapfb-xv.c -+++ b/src/omapfb-xv.c -@@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn, - h = *height; - - w = (w + 1) & ~1; -+ -+ /* Can't calculate these here - don't know line length - ofb->port->mem_info.size = w << 1; - ofb->port->mem_info.size *= h; -+ */ - - return size; - } --- -1.8.0 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch deleted file mode 100644 index d56729987..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch +++ /dev/null @@ -1,272 +0,0 @@ -From 803ecf2909949e6152f4a81b6cbb92a4430679ac Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Fri, 23 Nov 2012 00:31:06 +0100 -Subject: [PATCH 6/6] omapfb: port to new xserver video API - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/compat-api.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/omapfb-driver.c | 41 ++++++++++++----------- - 2 files changed, 118 insertions(+), 19 deletions(-) - create mode 100644 src/compat-api.h - -diff --git a/src/compat-api.h b/src/compat-api.h -new file mode 100644 -index 0000000..b1591b1 ---- /dev/null -+++ b/src/compat-api.h -@@ -0,0 +1,96 @@ -+/* -+ * Copyright 2012 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Dave Airlie <airlied@redhat.com> -+ */ -+ -+/* this file provides API compat between server post 1.13 and pre it, -+ it should be reused inside as many drivers as possible */ -+#ifndef COMPAT_API_H -+#define COMPAT_API_H -+ -+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -+#endif -+ -+#ifndef XF86_HAS_SCRN_CONV -+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -+#endif -+ -+#ifndef XF86_SCRN_INTERFACE -+ -+#define SCRN_ARG_TYPE int -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] -+ -+#define SCREEN_ARG_TYPE int -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -+ -+#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -+ -+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -+ -+#define FREE_SCREEN_ARGS_DECL int arg, int flags -+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 -+ -+#define VT_FUNC_ARGS_DECL int arg, int flags -+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) -+ -+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) -+#else -+#define SCRN_ARG_TYPE ScrnInfoPtr -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) -+ -+#define SCREEN_ARG_TYPE ScreenPtr -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -+ -+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -+ -+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -+#define FREE_SCREEN_ARGS(x) (x) -+ -+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -+#define VT_FUNC_ARGS(flags) pScrn -+ -+#define XF86_ENABLEDISABLEFB_ARG(x) (x) -+ -+#endif -+ -+#endif -diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c -index 07989f5..486ffa4 100644 ---- a/src/omapfb-driver.c -+++ b/src/omapfb-driver.c -@@ -44,6 +44,8 @@ - - #include "exa.h" - -+#include "compat-api.h" -+ - #ifdef HAVE_XEXTPROTO_71 - #include <X11/extensions/dpmsconst.h> - #else -@@ -70,10 +72,10 @@ - - static Bool OMAPFBProbe(DriverPtr drv, int flags); - static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); --static Bool OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv); --static Bool OMAPFBEnterVT(int scrnIndex, int flags); --static void OMAPFBLeaveVT(int scrnIndex, int flags); --static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); -+static Bool OMAPFBScreenInit(SCREEN_INIT_ARGS_DECL); -+static Bool OMAPFBEnterVT(VT_FUNC_ARGS_DECL); -+static void OMAPFBLeaveVT(VT_FUNC_ARGS_DECL); -+static Bool OMAPFBSwitchMode(SWITCH_MODE_ARGS_DECL); - - static Bool - OMAPFBEnsureRec(ScrnInfoPtr pScrn) -@@ -481,7 +483,7 @@ OMAPFBXvScreenInit(ScreenPtr pScreen) - } - - static Bool --OMAPFBCloseScreen(int scrnIndex, ScreenPtr pScreen) -+OMAPFBCloseScreen(CLOSE_SCREEN_ARGS_DECL) - { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - OMAPFBPtr ofb = OMAPFB(pScrn); -@@ -490,11 +492,11 @@ OMAPFBCloseScreen(int scrnIndex, ScreenPtr pScreen) - - pScreen->CloseScreen = ofb->CloseScreen; - -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - static Bool --OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+OMAPFBScreenInit(SCREEN_INIT_ARGS_DECL) - { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - OMAPFBPtr ofb = OMAPFB(pScrn); -@@ -516,7 +518,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - PROT_READ | PROT_WRITE, MAP_SHARED, - ofb->fd, 0); - if (ofb->fb == MAP_FAILED) { -- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); - return FALSE; - } - -@@ -526,7 +528,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* Only support TrueColor for now */ - if (!miSetVisualTypes(pScrn->depth, TrueColorMask, - pScrn->rgbBits, pScrn->defaultVisual)) { -- xf86DrvMsg(scrnIndex, X_ERROR, "visual type setup failed" -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "visual type setup failed" - " for %d bits per pixel [1]\n", - pScrn->bitsPerPixel); - return FALSE; -@@ -534,7 +536,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - /* Set up pixmap depth information */ - if (!miSetPixmapDepths()) { -- xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n"); - return FALSE; - } - -@@ -546,7 +548,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - pScrn->virtualY, pScrn->xDpi, - pScrn->yDpi, pScrn->displayWidth, - pScrn->bitsPerPixel)) { -- xf86DrvMsg(scrnIndex, X_ERROR, "fbScreenInit failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbScreenInit failed\n"); - return FALSE; - } - -@@ -567,7 +569,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - /* Initialize XRender fallbacks */ - if (!fbPictureInit(pScreen, NULL, 0)) { -- xf86DrvMsg(scrnIndex, X_ERROR, "fbPictureInit failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbPictureInit failed\n"); - return FALSE; - } - -@@ -579,7 +581,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - /* Initialize default colormap */ - if (!miCreateDefColormap(pScreen)) { -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "creating default colormap failed\n"); - return FALSE; - } -@@ -589,7 +591,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* This is non-fatal since we might be running against older - * kernel driver in which case we only do basic 2D stuff... - */ -- xf86DrvMsg(scrnIndex, X_ERROR, "Reading plane info failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Reading plane info failed\n"); - } else if (!ofb->dss) { - - ofb->plane_info.enabled = 1; -@@ -602,7 +604,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) { -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "%s: Plane setup failed: %s\n", - __FUNCTION__, strerror(errno)); - return FALSE; -@@ -645,9 +647,10 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - return TRUE; - } - --static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) -+static Bool OMAPFBSwitchMode(SWITCH_MODE_ARGS_DECL) - { -- return xf86SetSingleMode (xf86Screens[scrnIndex], mode, RR_Rotate_0); -+ SCRN_INFO_PTR(arg); -+ return xf86SetSingleMode (pScrn, mode, RR_Rotate_0); - } - - void -@@ -699,14 +702,14 @@ OMAPFBPrintCapabilities(ScrnInfoPtr pScrn, - /*** Unimplemented: */ - - static Bool --OMAPFBEnterVT(int scrnIndex, int flags) -+OMAPFBEnterVT(VT_FUNC_ARGS_DECL) - { - xf86Msg(X_NOT_IMPLEMENTED, "%s\n", __FUNCTION__); - return TRUE; - } - - static void --OMAPFBLeaveVT(int scrnIndex, int flags) -+OMAPFBLeaveVT(VT_FUNC_ARGS_DECL) - { - xf86Msg(X_NOT_IMPLEMENTED, "%s\n", __FUNCTION__); - } --- -1.8.0 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch deleted file mode 100644 index dc0b9b3f4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix errors with glibc 2.20 - -In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-omapfb/2_0.1.1+gitrAUTOINC+28c006c94e-r21.7/git/src/omapfb-xv-blizzard.c:33: -/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' - strndup(const char *str, size_t n); - ^ -In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, - from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-omapfb/2_0.1.1+gitrAUTOINC+28c006c94e-r21.7/git/src/omapfb-xv-generic.c:28: -/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' - strndup(const char *str, size_t n); - ^ - -Singed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: git/src/omapfb-xv-blizzard.c -=================================================================== ---- git.orig/src/omapfb-xv-blizzard.c 2014-08-28 05:16:25.684070587 -0700 -+++ git/src/omapfb-xv-blizzard.c 2014-08-28 19:05:39.440070587 -0700 -@@ -30,6 +30,7 @@ - * - - */ - -+#include <xorg-server.h> - #include "xf86.h" - #include "xf86_OSlib.h" - #include "xf86xv.h" -Index: git/src/omapfb-xv-generic.c -=================================================================== ---- git.orig/src/omapfb-xv-generic.c 2014-08-28 05:16:25.684070587 -0700 -+++ git/src/omapfb-xv-generic.c 2014-08-28 19:05:51.780070587 -0700 -@@ -25,6 +25,7 @@ - * Generic functions for the XV driver - */ - -+#include <xorg-server.h> - #include "xf86.h" - #include "xf86_OSlib.h" - #include "xf86xv.h" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb deleted file mode 100644 index 7ebb960f1..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver" - -DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \ -framebuffer." - -LICENSE = "MIT-X & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" -DEPENDS += "virtual/libx11" - -SRCREV = "33e36c12dde336edbdd34626dd8adfcaebc8fbb8" -PR = "${INC_PR}.7" -PV = "0.1.1+gitr${SRCPV}" - -# Blacklist debian-specific tags in upstream version check -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)(?!-)" - -SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ - file://0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch \ - file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ - file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ - file://0003-force-plain-mode.patch \ - file://0004-blacklist-tv-out.patch \ - file://0005-Attempt-to-fix-VRFB.patch \ - file://0006-omapfb-port-to-new-xserver-video-API.patch \ - file://0007-always_include_xorg_server.h.patch \ -" - -S = "${WORKDIR}/git" - -CFLAGS += " -I${STAGING_INCDIR}/xorg " - -# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) -do_compile_prepend_armv7a () { - sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb deleted file mode 100644 index fa251b50e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -require xorg-driver-video.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a1f0610ebdc6f314a9fa5102a8c5c1b0" - -SUMMARY = "X.Org X server -- Generic Vesa video driver" - -DESCRIPTION = "vesa is an Xorg driver for generic VESA video cards. It \ -can drive most VESA-compatible video cards, but only makes use of the \ -basic standard VESA core that is common to these cards. The driver \ -supports depths 8, 15 16 and 24." - -PR = "${INC_PR}.0" - -DEPENDS += "virtual/libx11 randrproto libpciaccess" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" - -SRC_URI[md5sum] = "a893c37c589f7a31cea929a5d896a0e2" -SRC_URI[sha256sum] = "7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch deleted file mode 100644 index 6039d089a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch +++ /dev/null @@ -1,98 +0,0 @@ -Upstream-Status:Submitted -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From f103d6f570671c649ccd7b225e6d6c9f14371888 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 25 Jun 2014 16:16:44 +0100 -Subject: [PATCH 2/2] add option for vmwgfx - ---- - configure.ac | 49 ++++++++++++++++++++----------------------------- - 1 file changed, 20 insertions(+), 29 deletions(-) - -diff --git a/configure.ac b/configure.ac -index be40ed7..8e15307 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client, - [VMWARECTRL=$enableval], [VMWARECTRL=no]) - AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes]) - -+# Define a configure option to build the vmwgfx driver -+AC_ARG_ENABLE(vmwgfx, -+ AS_HELP_STRING([--disable-vmwgfx], -+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]), -+ [VMWGFX="$enableval"], [VMWGFX="yes"]) -+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes) -+ - # Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) -@@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99], - [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1, - [Has version 1.5.0 or greater of the Xserver])]) - --PKG_CHECK_EXISTS([xorg-server >= 1.7.0], -- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1, -- [Has version 1.7.0 or greater of the Xserver]) -- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no]) -- - PKG_CHECK_EXISTS([xorg-server >= 1.12.0], - [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, - [Has version 1.12.0 or greater of the Xserver])]) -@@ -114,39 +116,28 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - - AC_SUBST([moduledir]) - --if test x$BUILD_VMWGFX = xyes; then -- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) --fi --if test x$BUILD_VMWGFX = xyes; then --# --# Early versions of mesa 10 forgot to bump the XA major version number in --# the xa_tracker.h header --# -- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], -- [PKG_CHECK_EXISTS([xatracker = 2.0.0], -- [AC_DEFINE([HAVE_XA_2], 1, -- [Has version 2 of XA])])], -- [BUILD_VMWGFX=no]) --# --# Check for prime. --# -+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) -+if test x$VMWGFX = xyes; then -+ PKG_CHECK_MODULES([LIBDRM], [libdrm]) -+ # Check for prime. - PKG_CHECK_EXISTS([libdrm >= 2.4.38], - [AC_DEFINE([HAVE_LIBDRM_2_4_38], 1, - [Has version 2.4.38 or greater of libdrm])]) --fi - --DRIVER_NAME=vmware --AC_SUBST([DRIVER_NAME]) -- --AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) --if test x$BUILD_VMWGFX = xyes; then -- AC_MSG_RESULT([yes]) -+ # Early versions of mesa 10 forgot to bump the XA major version number -+ # in the xa_tracker.h header -+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], -+ [PKG_CHECK_EXISTS([xatracker = 2.0.0], -+ [AC_DEFINE([HAVE_XA_2], 1, -+ [Has version 2 of XA])])]) - AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) -+ AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - --AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes) -+DRIVER_NAME=vmware -+AC_SUBST([DRIVER_NAME]) - - AC_CONFIG_FILES([ - Makefile --- -1.7.10.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb deleted file mode 100644 index 8c891e6ae..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- VMware SVGA display driver" - -DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." - -LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" - -DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" - -SRC_URI += "file://0002-add-option-for-vmwgfx.patch" - -SRC_URI[md5sum] = "0cba22fed4cb639d5c4276f7892c543d" -SRC_URI[sha256sum] = "3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc" - -COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' - -PACKAGECONFIG ?= "" -PACKAGECONFIG[vmwgfx] = "--enable-vmwgfx, --disable-vmwgfx, libdrm virtual/mesa" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc deleted file mode 100644 index 57a4c827d..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "X driver" -HOMEPAGE = "http://www.x.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11/drivers" -LICENSE = "MIT-X" - -PE = "2" -INC_PR = "r21" - -DEPENDS = "virtual/xserver xproto randrproto util-macros" - -SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" - -FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/xserver -REQUIRED_DISTRO_FEATURES = "x11" - -# FIXME: We don't want to include the libtool archives (*.la) from modules -# directory, as they serve no useful purpose. Upstream should fix Makefile.am -do_install_append() { - find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- -} - -# Function to add the relevant ABI dependency to drivers, which should be called -# from a PACKAGEFUNC. -def _add_xorg_abi_depends(d, name): - # Map of ABI names exposed in the dependencies to pkg-config variables - abis = { - "video": "abi_videodrv", - "input": "abi_xinput" - } - - output = os.popen("pkg-config xorg-server --variable=%s" % abis[name]).read() - mlprefix = d.getVar('MLPREFIX', True) or '' - abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) - - pn = d.getVar("PN", True) - d.appendVar('RDEPENDS_' + pn, ' ' + abi) diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc deleted file mode 100644 index c4dba1b19..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc +++ /dev/null @@ -1,12 +0,0 @@ -include xorg-driver-common.inc - -DEPENDS += "inputproto kbproto " - -python add_xorg_abi_depends() { - _add_xorg_abi_depends(d, "input") -} -PACKAGEFUNCS =+ "add_xorg_abi_depends" - -FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \ - ${datadir}/X11/xorg.conf.d \ - " diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc deleted file mode 100644 index 38281e0f2..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc +++ /dev/null @@ -1,8 +0,0 @@ -include xorg-driver-common.inc - -DEPENDS =+ "renderproto videoproto xextproto fontsproto" - -python add_xorg_abi_depends() { - _add_xorg_abi_depends(d, "video") -} -PACKAGEFUNCS =+ "add_xorg_abi_depends" diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/yocto-poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch deleted file mode 100644 index f330c185a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -XORG_DEFAULT_OPTIONS pulls in the following dependency chains: - -XORG_CWARNFLAGS -> AC_PROG_CC_C99 -XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS -XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host - -each of which triggers the use of the host compiler. As an "all" -architecture package, it shouldn't need a compiler (and doesn't). - -RP 17/5/2011 - -Index: encodings-1.0.4/configure.ac -=================================================================== ---- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100 -+++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100 -@@ -4,12 +4,12 @@ - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS - m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) - XORG_MACROS_VERSION(1.3) --XORG_DEFAULT_OPTIONS -- -+XORG_RELEASE_VERSION -+XORG_CHANGELOG -+XORG_INSTALL - AC_PROG_INSTALL - - # Require X.Org's font util macros 1.2 or later diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb deleted file mode 100644 index 90846d818..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "The Xorg font encoding files" - -DESCRIPTION = "The encodings that map to specific characters for a \ -number of Xorg and common fonts." - -require xorg-font-common.inc -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" -PE = "1" -PR = "${INC_PR}.1" - -DEPENDS = "mkfontscale-native font-util-native" -RDEPENDS_${PN} = "" - -SRC_URI += "file://nocompiler.patch" - -inherit allarch - -EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" - -SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" -SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch b/yocto-poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch deleted file mode 100644 index 0b9fb8ccc..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -XORG_DEFAULT_OPTIONS pulls in the following dependency chains: - -XORG_CWARNFLAGS -> AC_PROG_CC_C99 -XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS -XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host - -each of which triggers the use of the host compiler. As an "all" -architecture package, it shouldn't need a compiler (and doesn't). - -RP 17/5/2011 - -diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac ---- font-alias-1.0.3.orig//configure.ac 2011-05-18 21:29:18.378258643 +0200 -+++ font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200 -@@ -28,12 +28,12 @@ - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS - m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) - XORG_MACROS_VERSION(1.3) --XORG_DEFAULT_OPTIONS -- -+XORG_RELEASE_VERSION -+XORG_CHANGELOG -+XORG_INSTALL - AC_PROG_INSTALL - - XORG_FONTROOTDIR diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb deleted file mode 100644 index 15e101596..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "X font aliases" - -require xorg-font-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ - file://cyrillic/fonts.alias;md5=f40795b0640d6785826aecd3b16f6124 \ - file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ - file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \ - file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" - -SRC_URI += "file://nocompiler.patch" - -DEPENDS = "util-macros-native font-util-native" -RDEPENDS_${PN} = "encodings font-util" -RDEPENDS_${PN}_class-native = "font-util-native" - -inherit allarch - -PE = "1" -PR = "${INC_PR}.3" - -SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" -SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb deleted file mode 100644 index 228512498..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "X.Org font package creation/installation utilities" - -require xorg-font-common.inc - -#Unicode is MIT -LICENSE = "BSD & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5df208ec65eb84ce5bb8d82d8f3b9675 \ - file://ucs2any.c;endline=28;md5=8357dc567fc628bd12696f15b2a33bcb \ - file://bdftruncate.c;endline=26;md5=4f82ffc101a1b165eae9c6998abff937 \ - file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34" - -DEPENDS = "encodings util-macros" -DEPENDS_class-native = "util-macros-native" -RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" -RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "23756dab809f9ec5011bb27fb2c3c7d6" -SRC_URI[sha256sum] = "aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921" - -SYSROOT_PREPROCESS_FUNCS += "fontutil_sysroot_preprocess" -fontutil_sysroot_preprocess () { - sysroot_stage_dir ${D}${datadir}/fonts/ ${SYSROOT_DESTDIR}${datadir}/fonts/ -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc deleted file mode 100644 index d5267f59a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ /dev/null @@ -1,42 +0,0 @@ -HOMEPAGE = "http://www.x.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" - -SECTION = "x11/fonts" -LICENSE = "MIT-X" - -DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native" -RDEPENDS_${PN} = "encodings font-util font-alias" - -XORG_PN = "${BPN}" -INC_PR = "r2" - - -SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-${PV}" - -inherit autotools pkgconfig distro_features_check - -# The mkfontscale-native requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)" - -do_install_append() { - find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f - find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f - find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f - find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f -} - -FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" - -pkg_postinst_${PN} () { - for fontdir in `find $D/usr/lib/X11/fonts -type d`; do - mkfontdir $fontdir - mkfontscale $fontdir - done - for fontdir in `find $D/usr/share/fonts/X11 -type d`; do - mkfontdir $fontdir - mkfontscale $fontdir - done -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb deleted file mode 100644 index 9bcd1b2fa..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Xorg minimal fonts data" -DESCRIPTION = "Minimal fonts required by X.org." -HOMEPAGE = "http://www.x.org" - -SECTION = "x11/fonts" - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519ab \ - file://../misc/cursor.pcf.gz;md5=40bc81001fef4c21ca08df4305014a2a" - -SRC_URI = "file://misc" - -PE = "1" -PR = "r2" - -inherit allarch distro_features_check - -# The font-alias requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -S = "${WORKDIR}/misc" - -PACKAGES = "${PN}" -FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" -RDEPENDS_${PN} += "font-alias" - -do_install() { - install -d ${D}/${datadir}/fonts/X11/misc - install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/ - install -d ${D}/${libdir}/X11 - ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz Binary files differdeleted file mode 100644 index 8bc8570a4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz Binary files differdeleted file mode 100644 index 8fa829015..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz Binary files differdeleted file mode 100644 index bb1c5e138..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz Binary files differdeleted file mode 100644 index 842fa1b41..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz Binary files differdeleted file mode 100644 index cd119b66d..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz Binary files differdeleted file mode 100644 index 25fe84a0e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz Binary files differdeleted file mode 100644 index e362c70ce..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz Binary files differdeleted file mode 100644 index 176a7591c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz Binary files differdeleted file mode 100644 index a4faf1a6c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz Binary files differdeleted file mode 100644 index 96ddd1525..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz Binary files differdeleted file mode 100644 index 541a2ad2c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz Binary files differdeleted file mode 100644 index a4986f406..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz Binary files differdeleted file mode 100644 index 3f89abe77..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz Binary files differdeleted file mode 100644 index 432b53622..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz Binary files differdeleted file mode 100644 index e7fcb898e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz Binary files differdeleted file mode 100644 index 2df635537..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz Binary files differdeleted file mode 100644 index a263c5dd3..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz Binary files differdeleted file mode 100644 index a1a7d37e6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz Binary files differdeleted file mode 100644 index a148e99bc..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz Binary files differdeleted file mode 100644 index 8791b8ca3..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz Binary files differdeleted file mode 100644 index 860450868..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz Binary files differdeleted file mode 100644 index f28b1f1c4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz Binary files differdeleted file mode 100644 index fd1e6cfe9..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz Binary files differdeleted file mode 100644 index 672b75942..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz Binary files differdeleted file mode 100644 index d90a4330d..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz Binary files differdeleted file mode 100644 index 775e7c18b..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz Binary files differdeleted file mode 100644 index ac12fd98a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz Binary files differdeleted file mode 100644 index 42bbd5221..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz Binary files differdeleted file mode 100644 index 690d31f86..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz Binary files differdeleted file mode 100644 index d4c3184c7..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz Binary files differdeleted file mode 100644 index 884b5130c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz Binary files differdeleted file mode 100644 index cbb1a9d70..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz Binary files differdeleted file mode 100644 index 78c8580cf..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz Binary files differdeleted file mode 100644 index 0e90f3ee1..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz Binary files differdeleted file mode 100644 index bd1273e1f..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz Binary files differdeleted file mode 100644 index 5100b429a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz Binary files differdeleted file mode 100644 index ec5bbed29..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz Binary files differdeleted file mode 100644 index 06c835ee6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz Binary files differdeleted file mode 100644 index 478541c2a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz Binary files differdeleted file mode 100644 index 1c593ce0c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz Binary files differdeleted file mode 100644 index 335cf5fc3..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz Binary files differdeleted file mode 100644 index 099423e64..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz Binary files differdeleted file mode 100644 index 4a546ddb1..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz Binary files differdeleted file mode 100644 index 72eb72bbe..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir b/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir deleted file mode 100644 index 0a2718f7b..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir +++ /dev/null @@ -1,410 +0,0 @@ -409 -10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1 -10x20-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-10 -10x20-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-11 -10x20-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-13 -10x20-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-14 -10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15 -10x20-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-16 -10x20-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2 -10x20-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-3 -10x20-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-4 -10x20-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-5 -10x20-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-7 -10x20-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-8 -10x20-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-9 -10x20-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r -10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 -12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1 -12x24.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1 -12x24rk.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0 -18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1 -18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1 -4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1 -4x6-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-10 -4x6-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-13 -4x6-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-14 -4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15 -4x6-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-16 -4x6-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-2 -4x6-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-3 -4x6-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-4 -4x6-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-5 -4x6-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-7 -4x6-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-8 -4x6-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-9 -4x6-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-koi8-r -4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1 -5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 -5x7-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-10 -5x7-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-13 -5x7-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-14 -5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15 -5x7-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-16 -5x7-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2 -5x7-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-3 -5x7-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-4 -5x7-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-5 -5x7-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-7 -5x7-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-8 -5x7-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-9 -5x7-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-koi8-r -5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1 -5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 -5x8-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-10 -5x8-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-13 -5x8-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-14 -5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15 -5x8-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-16 -5x8-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2 -5x8-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-3 -5x8-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-4 -5x8-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-5 -5x8-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-7 -5x8-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-8 -5x8-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-9 -5x8-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r -5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 -6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1 -6x10-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-10 -6x10-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-13 -6x10-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-14 -6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15 -6x10-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-16 -6x10-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2 -6x10-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-3 -6x10-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-4 -6x10-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-5 -6x10-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-7 -6x10-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-8 -6x10-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-9 -6x10-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r -6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1 -6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1 -6x12-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-10 -6x12-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-13 -6x12-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-14 -6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15 -6x12-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-16 -6x12-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2 -6x12-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-3 -6x12-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-4 -6x12-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-5 -6x12-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-7 -6x12-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-8 -6x12-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-9 -6x12-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-koi8-r -6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1 -6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 -6x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-10 -6x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-11 -6x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-13 -6x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-14 -6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15 -6x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-16 -6x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2 -6x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-3 -6x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-4 -6x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-5 -6x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-7 -6x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8 -6x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-9 -6x13-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r -6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 -6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 -6x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-10 -6x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-13 -6x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-14 -6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15 -6x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-16 -6x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2 -6x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-3 -6x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-4 -6x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-5 -6x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-7 -6x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-8 -6x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-9 -6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1 -6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1 -6x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-10 -6x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-13 -6x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-14 -6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15 -6x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-16 -6x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-2 -6x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-3 -6x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-4 -6x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-5 -6x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-7 -6x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-9 -6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1 -6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 -6x9-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-10 -6x9-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-13 -6x9-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-14 -6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15 -6x9-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-16 -6x9-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2 -6x9-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-3 -6x9-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-4 -6x9-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-5 -6x9-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-7 -6x9-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-8 -6x9-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-9 -6x9-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r -6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1 -7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 -7x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-10 -7x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-11 -7x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-13 -7x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-14 -7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15 -7x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-16 -7x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2 -7x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-3 -7x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-4 -7x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-5 -7x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-7 -7x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-8 -7x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-9 -7x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-koi8-r -7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1 -7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 -7x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-10 -7x13B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-11 -7x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-13 -7x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-14 -7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15 -7x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-16 -7x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-2 -7x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-3 -7x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-4 -7x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-5 -7x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-7 -7x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-8 -7x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-9 -7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1 -7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1 -7x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-10 -7x13O-ISO8859-11.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-11 -7x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-13 -7x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-14 -7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15 -7x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-16 -7x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-2 -7x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-3 -7x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-4 -7x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-5 -7x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-7 -7x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-9 -7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1 -7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 -7x14-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-10 -7x14-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-11 -7x14-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-13 -7x14-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-14 -7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15 -7x14-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-16 -7x14-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-2 -7x14-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-3 -7x14-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-4 -7x14-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-5 -7x14-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-7 -7x14-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-8 -7x14-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-9 -7x14-JISX0201.1976-0.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 -7x14-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r -7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 -7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 -7x14B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-10 -7x14B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-11 -7x14B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-13 -7x14B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-14 -7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15 -7x14B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-16 -7x14B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-2 -7x14B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-3 -7x14B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-4 -7x14B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-5 -7x14B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-7 -7x14B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-8 -7x14B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-9 -7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1 -8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 -8x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-10 -8x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-13 -8x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-14 -8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15 -8x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-16 -8x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-2 -8x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-3 -8x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-4 -8x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-5 -8x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-7 -8x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8 -8x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-9 -8x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r -8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 -8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1 -8x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-10 -8x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-13 -8x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-14 -8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15 -8x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-16 -8x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-2 -8x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-3 -8x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-4 -8x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-5 -8x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-7 -8x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-8 -8x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-9 -8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1 -8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1 -8x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-10 -8x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-13 -8x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-14 -8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15 -8x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-16 -8x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-2 -8x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-3 -8x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-4 -8x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-5 -8x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-7 -8x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-9 -8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1 -8x16.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1 -8x16rk.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 -9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 -9x15-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-10 -9x15-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-11 -9x15-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-13 -9x15-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-14 -9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15 -9x15-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-16 -9x15-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2 -9x15-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-3 -9x15-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-4 -9x15-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-5 -9x15-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-7 -9x15-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-8 -9x15-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-9 -9x15-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r -9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 -9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1 -9x15B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-10 -9x15B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-11 -9x15B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-13 -9x15B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-14 -9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15 -9x15B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-16 -9x15B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2 -9x15B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-3 -9x15B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-4 -9x15B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-5 -9x15B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-7 -9x15B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-8 -9x15B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-9 -9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1 -9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 -9x18-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-10 -9x18-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-11 -9x18-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-13 -9x18-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-14 -9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15 -9x18-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-16 -9x18-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-2 -9x18-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-3 -9x18-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-4 -9x18-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-5 -9x18-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-7 -9x18-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-8 -9x18-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-9 -9x18-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r -9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 -9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1 -9x18B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-10 -9x18B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-13 -9x18B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-14 -9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15 -9x18B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-16 -9x18B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-2 -9x18B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-3 -9x18B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-4 -9x18B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-5 -9x18B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-7 -9x18B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-8 -9x18B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-9 -9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1 -arabic24.pcf.gz -arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1 -clB6x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-60-iso646.1991-irv -clB6x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-60-iso646.1991-irv -clB8x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-80-iso646.1991-irv -clB8x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-80-iso646.1991-irv -clB8x13.pcf.gz -schumacher-clean-bold-r-normal--13-130-75-75-c-80-iso646.1991-irv -clB8x14.pcf.gz -schumacher-clean-bold-r-normal--14-140-75-75-c-80-iso646.1991-irv -clB8x16.pcf.gz -schumacher-clean-bold-r-normal--16-160-75-75-c-80-iso646.1991-irv -clB8x8.pcf.gz -schumacher-clean-bold-r-normal--8-80-75-75-c-80-iso646.1991-irv -clB9x15.pcf.gz -schumacher-clean-bold-r-normal--15-150-75-75-c-90-iso646.1991-irv -clI6x12.pcf.gz -schumacher-clean-medium-i-normal--12-120-75-75-c-60-iso646.1991-irv -clI8x8.pcf.gz -schumacher-clean-medium-i-normal--8-80-75-75-c-80-iso646.1991-irv -clR4x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-40-iso646.1991-irv -clR5x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-50-iso646.1991-irv -clR5x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-50-iso646.1991-irv -clR5x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv -clR6x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-60-iso646.1991-irv -clR6x12-ISO8859-1.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-1 -clR6x12-ISO8859-10.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-10 -clR6x12-ISO8859-13.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-13 -clR6x12-ISO8859-14.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-14 -clR6x12-ISO8859-15.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-15 -clR6x12-ISO8859-16.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-16 -clR6x12-ISO8859-2.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-2 -clR6x12-ISO8859-3.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-3 -clR6x12-ISO8859-4.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-4 -clR6x12-ISO8859-5.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-5 -clR6x12-ISO8859-7.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-7 -clR6x12-ISO8859-8.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-8 -clR6x12-ISO8859-9.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-9 -clR6x12-KOI8-R.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-koi8-r -clR6x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso10646-1 -clR6x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-60-iso646.1991-irv -clR6x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-60-iso646.1991-irv -clR6x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-60-iso646.1991-irv -clR7x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-70-iso646.1991-irv -clR7x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-70-iso646.1991-irv -clR7x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-70-iso646.1991-irv -clR7x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-70-iso646.1991-irv -clR8x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-80-iso646.1991-irv -clR8x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-80-iso646.1991-irv -clR8x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-80-iso646.1991-irv -clR8x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-80-iso646.1991-irv -clR8x16.pcf.gz -schumacher-clean-medium-r-normal--16-160-75-75-c-80-iso646.1991-irv -clR8x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-80-iso646.1991-irv -clR9x15.pcf.gz -schumacher-clean-medium-r-normal--15-150-75-75-c-90-iso646.1991-irv -cu-alt12.pcf.gz -mutt-clearlyu alternate glyphs-medium-r-normal--17-120-100-100-p-122-iso10646-1 -cu-arabic12.pcf.gz -mutt-clearlyu arabic extra-medium-r-normal--17-120-100-100-p-101-fontspecific-0 -cu-devnag12.pcf.gz -mutt-clearlyu devangari extra-medium-r-normal--17-120-100-100-p-105-fontspecific-0 -cu-lig12.pcf.gz -mutt-clearlyu ligature-medium-r-normal--17-120-100-100-p-141-fontspecific-0 -cu-pua12.pcf.gz -mutt-clearlyu pua-medium-r-normal--17-120-100-100-p-110-iso10646-1 -cu12.pcf.gz -mutt-clearlyu-medium-r-normal--17-120-100-100-p-123-iso10646-1 -cuarabic12.pcf.gz -mutt-clearlyu arabic-medium-r-normal--17-120-100-100-p-93-iso10646-1 -cudevnag12.pcf.gz -mutt-clearlyu devanagari-medium-r-normal--15-120-90-90-p-104-fontspecific-0 -cursor.pcf.gz cursor -deccurs.pcf.gz decw$cursor -decsess.pcf.gz decw$session -gb16fs.pcf.gz -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0 -gb16st.pcf.gz -isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0 -gb24st.pcf.gz -isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0 -hanglg16.pcf.gz -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0 -hanglm16.pcf.gz -daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0 -hanglm24.pcf.gz -daewoo-mincho-medium-r-normal--24-170-100-100-c-240-ksc5601.1987-0 -jiskan16.pcf.gz -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 -jiskan24.pcf.gz -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0 -k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 -micro.pcf.gz micro -nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific -olcursor.pcf.gz -sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1 -olgl10.pcf.gz -sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1 -olgl12.pcf.gz -sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1 -olgl14.pcf.gz -sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1 -olgl19.pcf.gz -sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1 diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb deleted file mode 100644 index e623cee42..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "DMX: Distributed Multihead X extension library" - -DESCRIPTION = "The DMX extension provides support for communication with \ -and control of Xdmx(1) server. Attributes of the Xdmx(1) server and of \ -the back-end screens attached to the server can be queried and modified \ -via this protocol." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ - file://src/dmx.c;endline=33;md5=c43f19af03c7c8619cadc9724ed9afe1" - -DEPENDS += "libxext dmxproto" - -PE = "1" - -SRC_URI[md5sum] = "ba983eba5a9f05d152a0725b8e863151" -SRC_URI[sha256sum] = "c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb deleted file mode 100644 index a181f05c2..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "X font encoding library" - -DESCRIPTION = "libfontenc is a library which helps font libraries \ -portably determine and deal with different encodings of fonts." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" - -DEPENDS += "zlib xproto font-util" -PE = "1" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "0920924c3a9ebc1265517bdd2f9fde50" -SRC_URI[sha256sum] = "70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb deleted file mode 100644 index 5049b7ee0..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "ICE: Inter-Client Exchange library" - -DESCRIPTION = "The Inter-Client Exchange (ICE) protocol provides a \ -generic framework for building protocols on top of reliable, byte-stream \ -transport connections. It provides basic mechanisms for setting up and \ -shutting down connections, for performing authentication, for \ -negotiating versions, and for reporting errors. " - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93" - -DEPENDS += "xproto xtrans" -PROVIDES = "ice" - -PE = "1" - -XORG_PN = "libICE" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" -SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch deleted file mode 100644 index e92fc0d95..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch +++ /dev/null @@ -1,187 +0,0 @@ -From b14696a55796e739624bbda4f772427032efff2a Mon Sep 17 00:00:00 2001 -From: Julien Cristau <jcristau@debian.org> -Date: Sun, 26 Apr 2015 15:20:57 +0200 -Subject: [PATCH 1/4] Include config.h before anything else in *.c - -Debian bug#749008 <https://bugs.debian.org/749008> - -Reported-by: Michael Tautschnig <mt@debian.org> -Signed-off-by: Julien Cristau <jcristau@debian.org> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -Upstream-Status: Backport - - src/common_capability.c | 3 +++ - src/common_init.c | 3 +++ - src/common_interface.c | 3 +++ - src/common_io.c | 3 +++ - src/common_iterator.c | 3 +++ - src/common_map.c | 3 +++ - src/common_vgaarb_stub.c | 3 +++ - src/linux_devmem.c | 5 +++-- - src/openbsd_pci.c | 3 +++ - src/solx_devfs.c | 3 +++ - src/x86_pci.c | 4 +++- - 11 files changed, 33 insertions(+), 3 deletions(-) - -diff --git a/src/common_capability.c b/src/common_capability.c -index 488743d..15d395d 100644 ---- a/src/common_capability.c -+++ b/src/common_capability.c -@@ -31,6 +31,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <stdio.h> -diff --git a/src/common_init.c b/src/common_init.c -index b1c0c3e..f7b59bd 100644 ---- a/src/common_init.c -+++ b/src/common_init.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <errno.h> -diff --git a/src/common_interface.c b/src/common_interface.c -index 59778cf..cb95e90 100644 ---- a/src/common_interface.c -+++ b/src/common_interface.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <string.h> -diff --git a/src/common_io.c b/src/common_io.c -index f5c9e45..e9586ad 100644 ---- a/src/common_io.c -+++ b/src/common_io.c -@@ -22,6 +22,9 @@ - * Author: - * Adam Jackson <ajax@redhat.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <string.h> -diff --git a/src/common_iterator.c b/src/common_iterator.c -index ccf656d..2beb180 100644 ---- a/src/common_iterator.c -+++ b/src/common_iterator.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <string.h> -diff --git a/src/common_map.c b/src/common_map.c -index 8757151..f1854bb 100644 ---- a/src/common_map.c -+++ b/src/common_map.c -@@ -21,6 +21,9 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <sys/types.h> - #include <sys/mman.h> -diff --git a/src/common_vgaarb_stub.c b/src/common_vgaarb_stub.c -index 9394273..c1708f6 100644 ---- a/src/common_vgaarb_stub.c -+++ b/src/common_vgaarb_stub.c -@@ -23,6 +23,9 @@ - * OTHER DEALINGS IN THE SOFTWARE. - * - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdio.h> - #include "pciaccess.h" -diff --git a/src/linux_devmem.c b/src/linux_devmem.c -index 10e3bde..0d0567c 100644 ---- a/src/linux_devmem.c -+++ b/src/linux_devmem.c -@@ -32,8 +32,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -- --#define _GNU_SOURCE -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <string.h> -diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c -index 4d1b5cd..b8ce318 100644 ---- a/src/openbsd_pci.c -+++ b/src/openbsd_pci.c -@@ -13,6 +13,9 @@ - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <sys/param.h> - #include <sys/ioctl.h> -diff --git a/src/solx_devfs.c b/src/solx_devfs.c -index f572393..cf96467 100644 ---- a/src/solx_devfs.c -+++ b/src/solx_devfs.c -@@ -25,6 +25,9 @@ - /* - * Solaris devfs interfaces - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <strings.h> -diff --git a/src/x86_pci.c b/src/x86_pci.c -index 49c1cab..32daa04 100644 ---- a/src/x86_pci.c -+++ b/src/x86_pci.c -@@ -18,8 +18,10 @@ - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - --#define _GNU_SOURCE - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch deleted file mode 100644 index 16d69a82a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 765e0a38cb8c40f8865af5cb356ffe6039ffb08f Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <wiz@NetBSD.org> -Date: Sun, 22 Mar 2015 21:38:23 +0100 -Subject: [PATCH 2/4] Fix quoting issue. - -m4 has '[]' as quoting characters, so if we want '[]' to -end up in the configure script, we need to quote them again. - -Reported by Greg Troxel <gdt@ir.bbn.com>. - -Signed-off-by: Thomas Klausner <wiz@NetBSD.org> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -Upstream-Status: Backport - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e67e9e1..888330b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,7 +76,7 @@ case $host_os in - ;; - *netbsd*) - case $host in -- *i[3-9]86*) -+ *i[[3-9]]86*) - PCIACCESS_LIBS="$PCIACCESS_LIBS -li386" - ;; - *x86_64*|*amd64*) --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index f513c8e59..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6bd2f7f92eae713663f4e13f6e2cb23526607b8c Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Fri, 1 May 2015 16:36:50 +0200 -Subject: [PATCH 3/4] linux_sysfs.c: Include <limits.h> for PATH_MAX - -Fixes compilation with musl libc. - -Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> -Signed-off-by: Felix Janda <felix.janda@posteo.de> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -Upstream-Status: Backport - - src/linux_sysfs.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c -index 50d94cf..3f95e53 100644 ---- a/src/linux_sysfs.c -+++ b/src/linux_sysfs.c -@@ -45,6 +45,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <limits.h> - #include <sys/mman.h> - #include <dirent.h> - #include <errno.h> --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch deleted file mode 100644 index f53285824..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b6df5202306bd71158b482f25ca2e6919645d4dd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 4 Jun 2015 20:55:06 -0700 -Subject: [PATCH 4/4] Don't include sys/io.h on arm - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/linux_sysfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c -index 3f95e53..1e3aad3 100644 ---- a/src/linux_sysfs.c -+++ b/src/linux_sysfs.c -@@ -50,7 +50,7 @@ - #include <dirent.h> - #include <errno.h> - --#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) -+#if defined(__i386__) || defined(__x86_64__) - #include <sys/io.h> - #else - #define inb(x) -1 --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb deleted file mode 100644 index ffa6a609f..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Generic PCI access library for X" - -DESCRIPTION = "libpciaccess provides functionality for X to access the \ -PCI bus and devices in a platform-independent way." - -require xorg-lib-common.inc - -SRC_URI += "\ - file://0001-Include-config.h-before-anything-else-in-.c.patch \ - file://0002-Fix-quoting-issue.patch \ - file://0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch \ - file://0004-Don-t-include-sys-io.h-on-arm.patch \ -" - -SRC_URI[md5sum] = "ace78aec799b1cf6dfaea55d3879ed9f" -SRC_URI[sha256sum] = "07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf" - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" - -REQUIRED_DISTRO_FEATURES = "" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb deleted file mode 100644 index 5514c7f5e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Library that provides weak aliases for pthread functions" -DESCRIPTION = "This library provides weak aliases for pthread functions \ -not provided in libc or otherwise available by default." -HOMEPAGE = "http://xcb.freedesktop.org" -BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=XCB" -SECTION = "x11/libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" - -#DEPENDS = "xcb-proto xproto libxau libxslt-native" -# DEPENDS += "xsltproc-native gperf-native" - -ALLOW_EMPTY_${PN} = "1" - -SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" - -SRC_URI[md5sum] = "e8fa31b42e13f87e8f5a7a2b731db7ee" -SRC_URI[sha256sum] = "35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299" - -inherit autotools pkgconfig - -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb deleted file mode 100644 index 192513636..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "SM: Session Management library" - -DESCRIPTION = "The Session Management Library (SMlib) is a low-level \"C\" \ -language interface to XSMP. The purpose of the X Session Management \ -Protocol (XSMP) is to provide a uniform mechanism for users to save and \ -restore their sessions. A session is a group of clients, each of which \ -has a particular state." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" - -DEPENDS += "libice xproto xtrans" - -# libSM can work without libuuid, we explicitly disable it to break the following circular dependency -# when DISTRO_FEATURES contains 'systemd' and 'x11'. -# systemd -> dbus -> libsm -> util-linux -> systemd -EXTRA_OECONF += "--without-libuuid" - -PE = "1" - -XORG_PN = "libSM" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" -SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb deleted file mode 100644 index c0d014825..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -require libx11.inc - -DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ -this version." - -SRC_URI += "file://X18NCMSstubs.diff \ - file://fix-disable-xlocale.diff \ - file://fix-utf8-wrong-define.patch \ - " - -RPROVIDES_${PN}-dev = "libx11-dev" -RPROVIDES_${PN}-locale = "libx11-locale" - -SRC_URI[md5sum] = "2e36b73f8a42143142dda8129f02e4e0" -SRC_URI[sha256sum] = "cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111" - -EXTRA_OECONF += "--disable-xlocale" - -PACKAGECONFIG ??= "" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc deleted file mode 100644 index b04eafbdf..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Xlib: C Language X Interface library" - -DESCRIPTION = "This package provides a client interface to the X Window \ -System, otherwise known as 'Xlib'. It provides a complete API for the \ -basic functions of the window system." - -require xorg-lib-common.inc - -inherit siteinfo - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" - -PE = "1" - -PROVIDES = "virtual/libx11" - -XORG_PN = "libX11" -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - -DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" -DEPENDS += "xproto-native" - -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" -EXTRA_OEMAKE += 'CWARNFLAGS=""' - -PACKAGECONFIG ??= "xcms" -PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" - -# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined. -CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE" - -PACKAGES =+ "${PN}-xcb" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" -FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - -# Multiple libx11 derivatives from from this file and are selected by virtual/libx11 -# A world build should only build the correct version, not all of them. -EXCLUDE_FROM_WORLD = "1" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff deleted file mode 100644 index 744cedc77..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff +++ /dev/null @@ -1,520 +0,0 @@ -Upstream-Status: Pending - -Upstream-Status: Inappropriate [configuration] -Index: libX11-1.3/src/imConv.c -=================================================================== ---- libX11-1.3.orig/src/imConv.c -+++ libX11-1.3/src/imConv.c -@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[ - * from UCS char to specified charset char. - * This converter is needed for _XimGetCharCode subroutine. - */ -+#ifdef XLOCALE - XPointer - _XimGetLocaleCode ( - _Xconst char* encoding_name) -@@ -96,6 +97,7 @@ _XimGetLocaleCode ( - } - return cvt; - } -+#endif - - /* - * Returns the locale dependent representation of a keysym. -@@ -106,6 +108,7 @@ _XimGetLocaleCode ( - * terminating NUL byte. Return 0 if the keysym is not representable in the - * locale - */ -+#ifdef XLOCALE - /*ARGSUSED*/ - int - _XimGetCharCode ( -@@ -135,6 +138,7 @@ _XimGetCharCode ( - buf[count]= '\0'; - return count; - } -+#endif - - #ifdef XKB - static int lookup_string( -Index: libX11-1.3/src/X18NCMSstubs.c -=================================================================== ---- /dev/null -+++ libX11-1.3/src/X18NCMSstubs.c -@@ -0,0 +1,428 @@ -+/* -+ * X18NCMSstubs.c -+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed -+ * -+ * Copyright © 2003 Matthew Allum -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Matthew Allum not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Keith Packard and Compaq makes no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, -+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include <stdlib.h> -+#include "Xlibint.h" -+#include "Xlcint.h" -+#include <X11/Xlocale.h> -+#include <X11/Xos.h> -+#ifdef WIN32 -+#undef close -+#endif -+#include <X11/Xutil.h> -+#include "XlcPubI.h" -+ -+#include "Xcmsint.h" /* for XcmsCCC type */ -+#include "XlcPubI.h" /* for XLCd type */ -+#include "config.h" -+ -+#if ! XLOCALE -+ -+Bool -+XSupportsLocale() -+{ -+ return False; -+} -+ -+char * -+XSetLocaleModifiers( -+ const char *modifiers) -+{ -+ return NULL; -+} -+ -+XLCd -+_XOpenLC( -+ char *name) -+{ -+ return NULL; -+} -+ -+XLCd -+_XlcCurrentLC() -+{ -+ return NULL; -+} -+ -+void -+_XlcVaToArgList( -+ va_list var, -+ int count, -+ XlcArgList *args_ret) -+{ -+ return; -+} -+ -+void -+_XlcCountVaList( -+ va_list var, -+ int *count_ret) -+{ -+ return; -+} -+ -+void -+_XCloseLC( -+ XLCd lcd) -+{ -+ return; -+} -+ -+int -+_XlcConvert( -+ XlcConv conv, -+ XPointer *from, -+ int *from_left, -+ XPointer *to, -+ int *to_left, -+ XPointer *args, -+ int num_args) -+{ -+ return 0; -+} -+ -+/* XIM Stubs */ -+ -+XPointer -+_XimGetLocaleCode ( _Xconst char* encoding_name ) -+{ -+ return NULL; -+} -+ -+int -+_XimGetCharCode ( -+ XPointer ucs_conv, -+ KeySym keysym, -+ unsigned char* buf, -+ int nbytes) -+{ -+ return 0; -+} -+ -+/* Xrm Stubs */ -+ -+XrmMethods -+_XrmInitParseInfo( -+ XPointer *state) -+{ -+ return (XrmMethods) NULL; -+} -+ -+/* Xwc Stubs */ -+ -+int -+XwcTextExtents( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len, -+ XRectangle *overall_ink_extents, -+ XRectangle *overall_logical_extents) -+{ -+ return 0; -+} -+ -+void -+XwcDrawString(Display *display, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, int y, -+ _Xconst wchar_t *string, -+ int num_wchars) -+{ -+ ; -+} -+ -+void -+XwcDrawText( -+ Display *dpy, -+ Drawable d, -+ GC gc, -+ int x, -+ int y, -+ XwcTextItem *text_items, -+ int nitems) -+{ -+ ; -+} -+ -+void -+XwcDrawImageString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst wchar_t *text, -+ int text_len) -+{ -+ ; -+} -+ -+int -+XwcTextEscapement( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len) -+{ -+ return 0; -+} -+ -+Status -+XwcTextPerCharExtents( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len, -+ XRectangle *ink_extents_buffer, -+ XRectangle *logical_extents_buffer, -+ int buffer_size, -+ int *num_chars, -+ XRectangle *max_ink_extents, -+ XRectangle *max_logical_extents) -+{ -+ return(XcmsFailure); -+} -+ -+int -+XwcTextPropertyToTextList( -+ Display *dpy, -+ const XTextProperty *text_prop, -+ wchar_t ***list_ret, -+ int *count_ret) -+{ -+ return 0; -+} -+ -+int -+XwcTextListToTextProperty( -+ Display *dpy, -+ wchar_t **list, -+ int count, -+ XICCEncodingStyle style, -+ XTextProperty *text_prop) -+{ -+ return 0; -+} -+ -+void -+XwcFreeStringList(wchar_t **list) -+{ -+ return; -+} -+ -+ -+void XmbSetWMProperties ( /* Actually from mbWMProps.c */ -+ Display *dpy, -+ Window w, -+ _Xconst char *windowName, -+ _Xconst char *iconName, -+ char **argv, -+ int argc, -+ XSizeHints *sizeHints, -+ XWMHints *wmHints, -+ XClassHint *classHints) -+{ -+ return; -+} -+ -+int -+XmbTextPropertyToTextList( -+ Display *dpy, -+ const XTextProperty *text_prop, -+ char ***list_ret, -+ int *count_ret) -+{ -+ return XLocaleNotSupported; -+} -+ -+int -+XmbTextListToTextProperty( -+ Display *dpy, -+ char **list, -+ int count, -+ XICCEncodingStyle style, -+ XTextProperty *text_prop) -+{ -+ return XLocaleNotSupported; -+} -+ -+int -+XmbTextExtents( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len, -+ XRectangle *overall_ink_extents, -+ XRectangle *overall_logical_extents) -+{ -+ return 0; -+} -+ -+void -+XmbDrawText( -+ Display *dpy, -+ Drawable d, -+ GC gc, -+ int x, -+ int y, -+ XmbTextItem *text_items, -+ int nitems) -+{ -+ ; -+} -+ -+void -+XmbDrawString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst char *text, -+ int text_len) -+{ -+ ; -+} -+ -+void -+XmbDrawImageString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst char *text, -+ int text_len) -+{ -+ ; -+} -+ -+int -+XmbTextEscapement( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len) -+{ -+ return 0; -+} -+ -+Status -+XmbTextPerCharExtents( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len, -+ XRectangle *ink_extents_buffer, -+ XRectangle *logical_extents_buffer, -+ int buffer_size, -+ int *num_chars, -+ XRectangle *max_ink_extents, -+ XRectangle *max_logical_extents) -+{ -+ return 0; -+} -+ -+unsigned int -+KeySymToUcs4(KeySym keysym) -+{ -+ return 0; -+} -+ -+#endif -+ -+#if ! XCMS -+ -+XcmsCCC -+XcmsCCCOfColormap(dpy, cmap) -+ Display *dpy; -+ Colormap cmap; -+{ -+ return NULL; -+} -+ -+Status -+_XcmsResolveColorString ( -+ XcmsCCC ccc, -+ const char **color_string, -+ XcmsColor *pColor_exact_return, -+ XcmsColorFormat result_format) -+{ -+ return(XcmsFailure); -+} -+ -+void -+_XcmsUnresolveColor( -+ XcmsCCC ccc, -+ XcmsColor *pColor) -+{ -+ return; -+} -+ -+void -+_XUnresolveColor( -+ XcmsCCC ccc, -+ XColor *pXColor) -+{ -+ return; -+} -+ -+XcmsCmapRec * -+_XcmsAddCmapRec(dpy, cmap, windowID, visual) -+ Display *dpy; -+ Colormap cmap; -+ Window windowID; -+ Visual *visual; -+{ -+ return NULL; -+} -+ -+void -+_XcmsRGB_to_XColor( -+ XcmsColor *pColors, -+ XColor *pXColors, -+ unsigned int nColors) -+{ -+ return; -+} -+ -+XcmsCmapRec * -+_XcmsCopyCmapRecAndFree( -+ Display *dpy, -+ Colormap src_cmap, -+ Colormap copy_cmap) -+{ -+ return NULL; -+} -+ -+void -+_XcmsDeleteCmapRec( -+ Display *dpy, -+ Colormap cmap) -+{ -+ return; -+} -+ -+#endif -Index: libX11-1.3/src/Makefile.am -=================================================================== ---- libX11-1.3.orig/src/Makefile.am -+++ libX11-1.3/src/Makefile.am -@@ -335,6 +335,8 @@ if THRSTUBS - libX11_la_SOURCES+=UIThrStubs.c - endif - -+libX11_la_SOURCES+=X18NCMSstubs.c -+ - x11datadir = @X11_DATADIR@ - x11data_DATA = XKeysymDB XErrorDB - -@@ -342,6 +344,7 @@ EXTRA_DIST = \ - $(x11data_DATA) \ - os2Stubs.c \ -- UIThrStubs.c -+ UIThrStubs.c \ -+ X18NCMSstubs.c - - if XCB - libX11_la_SOURCES += \ -Index: libX11-1.3/src/locking.c -=================================================================== ---- libX11-1.3.orig/src/locking.c -+++ libX11-1.3/src/locking.c -@@ -66,7 +66,9 @@ in this Software without prior written a - #define NUM_FREE_CVLS 4 - - /* in lcWrap.c */ -+#ifdef XLOCALE - extern LockInfoPtr _Xi18n_lock; -+#endif - - #ifdef WIN32 - static DWORD _X_TlsIndex = (DWORD)-1; -@@ -594,9 +596,11 @@ Status XInitThreads(void) - _Xglobal_lock = &global_lock; - xmutex_init(_Xglobal_lock->lock); - xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); -+#ifdef XLOCALE - _Xi18n_lock = &i18n_lock; - xmutex_init(_Xi18n_lock->lock); - xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); -+#endif - _XLockMutex_fn = _XLockMutex; - _XUnlockMutex_fn = _XUnlockMutex; - _XCreateMutex_fn = _XCreateMutex; diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch deleted file mode 100644 index c1b6cde53..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> - -Update for 1.6.1 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am ---- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 -+++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 -@@ -36,11 +36,6 @@ - < locale.dir.l1 > locale.dir.l2 - cat locale.dir.l2 locale.dir.l1 > locale.dir - --if HAVE_PERL --LOG_COMPILER = $(PERL) --TESTS = compose-check.pl --endif HAVE_PERL -- - - # Per-locale data files diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff deleted file mode 100644 index a7c3984fd..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> ---- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 -@@ -701,7 +701,11 @@ - } - if (l - 2 - (p - charset) < 0) - return 0; -+#ifdef XLOCALE - if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) -+#else -+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) -+#endif - return 0; - if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) - return 0; diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch deleted file mode 100644 index c6347f5be..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h -@@ -103,7 +103,7 @@ - - /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in - November 2000. Its presence is indicated through the following macro. */ --#define X_HAVE_UTF8_STRING 1 -+#undef X_HAVE_UTF8_STRING - - typedef char *XPointer; - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch deleted file mode 100644 index f2abf7c7a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 4d85d5f3bd8afac893738fd88e19d8cb5cf998ff Mon Sep 17 00:00:00 2001 -From: Drew Moseley <drew_moseley@mentor.com> -Date: Sun, 27 Jul 2014 13:10:07 -0400 -Subject: [PATCH] libX11: Add missing NULL check on im and im->methods - -Upstream-Status: Backport (c827edcd1c4a7f920aa25208083b5b58d60d2b44) -Signed-off-by: Drew Moseley <drew_moseley@mentor.com> - ---- - src/xlibi18n/ICWrap.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWrap.c ---- libX11-1.6.2-orig/src/xlibi18n/ICWrap.c 2014-07-27 13:38:29.586666449 -0400 -+++ libX11-1.6.2/src/xlibi18n/ICWrap.c 2014-07-27 13:41:39.671609030 -0400 -@@ -169,7 +169,7 @@ - va_list var; - int total_count; - XIMArg *args; -- char *ret; -+ char *ret = NULL; - - /* - * so count the stuff dangling here -@@ -185,7 +185,8 @@ - _XIMVaToNestedList(var, total_count, &args); - va_end(var); - -- ret = (*im->methods->set_values) (im, args); -+ if (im && im->methods) -+ ret = (*im->methods->set_values) (im, args); - Xfree(args); - return ret; - } -@@ -196,7 +197,7 @@ - va_list var; - int total_count; - XIMArg *args; -- char *ret; -+ char *ret = NULL; - - /* - * so count the stuff dangling here -@@ -212,7 +213,8 @@ - _XIMVaToNestedList(var, total_count, &args); - va_end(var); - -- ret = (*im->methods->get_values) (im, args); -+ if (im && im->methods) -+ ret = (*im->methods->get_values) (im, args); - Xfree(args); - return ret; - } -@@ -228,7 +230,7 @@ - va_list var; - int total_count; - XIMArg *args; -- XIC ic; -+ XIC ic = NULL; - - /* - * so count the stuff dangling here -@@ -244,7 +246,8 @@ - _XIMVaToNestedList(var, total_count, &args); - va_end(var); - -- ic = (XIC) (*im->methods->create_ic) (im, args); -+ if (im && im->methods) -+ ic = (XIC) (*im->methods->create_ic) (im, args); - Xfree(args); - if (ic) { - ic->core.next = im->core.ic_chain; diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb deleted file mode 100644 index 8e531c745..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require libx11.inc -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += "file://disable_tests.patch \ - file://libX11-Add-missing-NULL-check.patch \ - " - -SRC_URI[md5sum] = "2e36b73f8a42143142dda8129f02e4e0" -SRC_URI[sha256sum] = "cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb deleted file mode 100644 index 2ef8bfa8b..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Xau: X Authority Database library" - -DESCRIPTION = "libxau provides the main interfaces to the X11 \ -authorisation handling, which controls authorisation for X connections, \ -both client-side and server-side." - -require xorg-lib-common.inc - -inherit gettext - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec" - -DEPENDS += " xproto" -PROVIDES = "xau" - -PE = "1" - -XORG_PN = "libXau" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "685f8abbffa6d145c0f930f00703b21b" -SRC_URI[sha256sum] = "fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch deleted file mode 100644 index d6148834a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Pending - -There is no extra reply data and if we say not to disgard it, xcb -throws fatal asserts. - -RP - 26/11/09 - -Index: git/xcalibrate.c -=================================================================== ---- git.orig/xcalibrate.c 2009-11-26 08:11:48.000000000 +0000 -+++ git/xcalibrate.c 2009-11-26 08:09:55.000000000 +0000 -@@ -216,7 +216,7 @@ - req->reqType = info->codes->major_opcode; - req->xCalibrateReqType = X_XCalibrateRawMode; - req->on = enable; -- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) -+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) - { - UnlockDisplay (dpy); - SyncHandle (); -@@ -240,7 +240,7 @@ - req->xCalibrateReqType = X_XCalibrateScreenToCoord; - req->x = *x; - req->y = *y; -- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) -+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) - { - UnlockDisplay (dpy); - SyncHandle (); diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb deleted file mode 100644 index 455e869c7..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "XCalibrate: Touchscreen calibration library" - -DESCRIPTION = "libXCalibrate is a library for performing touchscreen \ -calibration with the kdrive tslib touchscreen driver." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \ - file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7" - -DEPENDS = "virtual/libx11 calibrateproto libxext" - -SRCREV = "209d83af61ed38a002c8096377deac292b3e396c" -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate \ - file://fix-xcb.patch" - -S = "${WORKDIR}/git" - -FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch deleted file mode 100644 index 5641c0fe9..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -The "check" package is checked for without an explicit enable/disable option, -which can lead to non-deterministic build issues with both check and libxslt. - -As the unit test suite is minimal at present, simply disable the test suite. In -the future if the test suite is expanded this can be made conditional on the -ptest DISTRO_FEATURE. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - - -diff --git a/configure.ac b/configure.ac -index 6d7c9a5..22cceb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS - - AM_PATH_PYTHON([2.6]) - --PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) -+dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) -+HAVE_CHECK=no - AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) - - AC_CONFIG_HEADERS([src/config.h]) diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch deleted file mode 100644 index 698d038f9..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch +++ /dev/null @@ -1,22 +0,0 @@ -Reduce debug info for xcb.c since on mips we run into a gcc5 bug - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68302 - -This patch is a workaround to get past the gcc bug until its resolved. -it should have minimal impact on libxcb while make it work. - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: libxcb-1.11.1/src/Makefile.am -=================================================================== ---- libxcb-1.11.1.orig/src/Makefile.am -+++ libxcb-1.11.1/src/Makefile.am -@@ -188,6 +188,7 @@ EXTSOURCES += xkb.c - if BUILD_XKB - lib_LTLIBRARIES += libxcb-xkb.la - libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined -+CFLAGS += -g1 - libxcb_xkb_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h - endif diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch deleted file mode 100644 index 46297c33c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch +++ /dev/null @@ -1,28 +0,0 @@ -As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot -to the beginning of variables that are used later on the host. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index 94da4f7..d29cd6a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,7 +64,7 @@ AC_SUBST(NEEDED) - - # Find the xcb-proto protocol descriptions - AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) --XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` -+XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto` - AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) - AC_SUBST(XCBPROTO_XCBINCLUDEDIR) - -@@ -74,7 +74,7 @@ AC_SUBST(XCBPROTO_VERSION) - - # Find the xcbgen Python package - AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR) --XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` -+XCBPROTO_XCBPYTHONDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=pythondir xcb-proto` - AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) - AC_SUBST(XCBPROTO_XCBPYTHONDIR) - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb deleted file mode 100644 index 0856c190a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "XCB: The X protocol C binding library" -DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \ -for Xlib featuring a small footprint, latency hiding, direct access to \ -the protocol, improved threading support, and extensibility." -HOMEPAGE = "http://xcb.freedesktop.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" -SECTION = "x11/libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - -SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ - file://xcbincludedir.patch \ - file://disable-check.patch \ - file://gcc-mips-pr68302-mips-workaround.patch \ - " -SRC_URI[md5sum] = "f97a65e6158775de518ac391935634c2" -SRC_URI[sha256sum] = "b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30" - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS = "xcb-proto xproto libxau libpthread-stubs libxdmcp" - -PACKAGES_DYNAMIC = "^libxcb-.*" - -FILES_${PN} = "${libdir}/libxcb.so.*" - -inherit autotools pkgconfig distro_features_check - -# The libxau and others requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" - -python populate_packages_prepend () { - do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch deleted file mode 100644 index 60331f6e7..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -This patch makes the build use its own Xcomposite.h over rather than an -older Xcomposite.h that might already be installed in the staging dir. - -Index: libXcomposite-0.4.3/src/Makefile.am -=================================================================== ---- libXcomposite-0.4.3.orig/src/Makefile.am 2010-06-30 22:42:53.000000000 -0700 -+++ libXcomposite-0.4.3/src/Makefile.am 2010-11-23 23:09:34.544322930 -0800 -@@ -19,7 +19,7 @@ - # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - # PERFORMANCE OF THIS SOFTWARE. - --AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) -+AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) - AM_CPPFLAGS = -I$(top_srcdir)/include - - lib_LTLIBRARIES = libXcomposite.la diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb deleted file mode 100644 index 70257194a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Xcomposite: X Composite extension library" - -DESCRIPTION = "The composite extension provides three related \ -mechanisms: per-hierarchy storage, automatic shadow update, and external \ -parent. In per-hierarchy storage, the rendering of an entire hierarchy \ -of windows is redirected to off-screen storage. In automatic shadow \ -update, when a hierarchy is rendered off-screen, the X server provides \ -an automatic mechanism for presenting those contents within the parent \ -window. In external parent, a mechanism for providing redirection of \ -compositing transformations through a client." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" - -DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" -PROVIDES = "xcomposite" -BBCLASSEXTEND = "native" - -PE = "1" - -XORG_PN = "libXcomposite" - -SRC_URI += " file://change-include-order.patch" - -SRC_URI[md5sum] = "f7a218dcbf6f0848599c6c36fc65c51a" -SRC_URI[sha256sum] = "ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb deleted file mode 100644 index a8e4f24b6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Xcursor: X Cursor management library" - -DESCRIPTION = "Xcursor is a simple library designed to help locate and \ -load cursors. Cursors can be loaded from files or memory. A library of \ -common cursors exists which map to the standard X cursor names. Cursors \ -can exist in several sizes and the library automatically picks the best \ -size." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=8902e6643f7bcd7793b23dcd5d8031a4" - -DEPENDS += "libxrender libxfixes" -BBCLASSEXTEND = "native" - -PE = "1" - -XORG_PN = "libXcursor" - -SRC_URI[md5sum] = "1e7c17afbbce83e2215917047c57d1b3" -SRC_URI[sha256sum] = "9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb deleted file mode 100644 index c3d70043c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Xdamage: X Damage extension library" - -DESCRIPTION = "'Damage' is a term that describes changes make to pixel \ -contents of windows and pixmaps. Damage accumulates as drawing occurs \ -in the drawable. Each drawing operation 'damages' one or more \ -rectangular areas within the drawable. The rectangles are guaranteed to \ -include the set of pixels modified by each operation, but may include \ -significantly more than just those pixels. The DAMAGE extension allows \ -applications to either receive the raw rectangles as a stream of events, \ -or to have them partially processed within the X server to reduce the \ -amount of data transmitted as well as reduce the processing latency once \ -the repaint operation has started." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868" - -DEPENDS += "virtual/libx11 damageproto libxfixes" -PROVIDES = "xdamage" -BBCLASSEXTEND = "native" - -PE = "1" - -XORG_PN = "libXdamage" - -SRC_URI[md5sum] = "0cf292de2a9fa2e9a939aefde68fd34f" -SRC_URI[sha256sum] = "7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb deleted file mode 100644 index f4e30d93d..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "XDMCP: X Display Manager Control Protocol library" - -DESCRIPTION = "The purpose of the X Display Manager Control Protocol \ -(XDMCP) is to provide a uniform mechanism for an autonomous display to \ -request login service from a remote host. An X terminal (screen, \ -keyboard, mouse, processor, network interface) is a prime example of an \ -autonomous display." - -require xorg-lib-common.inc - -inherit gettext - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123" - -DEPENDS += "xproto" -PROVIDES = "xdmcp" - -PE = "1" - -XORG_PN = "libXdmcp" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "18aa5c1279b01f9d18e3299969665b2e" -SRC_URI[sha256sum] = "81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb deleted file mode 100644 index efa8b65ac..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "XExt: X Extension library" - -DESCRIPTION = "libXext provides an X Window System client interface to \ -several extensions to the X protocol. The supported protocol extensions \ -are DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT_SHM, \ -MIT_SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, \ -XC-APPGROUP, XC-MISC, XTEST. libXext also provides a small set of \ -utility functions to aid authors of client APIs for X protocol \ -extensions." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8" - -DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" -PROVIDES = "xext" - -PE = "1" - -XORG_PN = "libXext" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "52df7c4c1f0badd9f82ab124fb32eb97" -SRC_URI[sha256sum] = "b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_git.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_git.bb deleted file mode 100644 index b799186ef..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XExt: X Extension library" - -DESCRIPTION = "libXext provides an X Window System client interface to \ -several extensions to the X protocol. The supported protocol extensions \ -are DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT_SHM, \ -MIT_SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, \ -XC-APPGROUP, XC-MISC, XTEST. libXext also provides a small set of \ -utility functions to aid authors of client APIs for X protocol \ -extensions." - -DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" -PROVIDES = "xext" -SRCREV = "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" -PE = "1" -PV = "1.0.99.1+gitr${SRCPV}" - -XORG_PN = "libXext" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN}" -S = "${WORKDIR}/git/" - -BBCLASSEXTEND = "nativesdk" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb deleted file mode 100644 index 6e2740c9a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "XFixes: X Fixes extension library" - -DESCRIPTION = "X applications have often needed to work around various \ -shortcomings in the core X window system. This extension is designed to \ -provide the minimal server-side support necessary to eliminate problems \ -caused by these workarounds." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" - -DEPENDS += "virtual/libx11 xproto fixesproto xextproto" - -PE = "1" - -XORG_PN = "libXfixes" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "b985b85f8b9386c85ddcfe1073906b4d" -SRC_URI[sha256sum] = "63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb deleted file mode 100644 index 1b6e33c71..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "XFont: X Font rasterisation library" - -DESCRIPTION = "libXfont provides various services for X servers, most \ -notably font selection and rasterisation (through external libraries \ -such as freetype)." - -require xorg-lib-common.inc - -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" - -DEPENDS += "freetype xtrans fontsproto libfontenc zlib" -PROVIDES = "xfont" - -PE = "1" - -XORG_PN = "libXfont" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "96f76ba94b4c909230bac1e2dcd551c4" -SRC_URI[sha256sum] = "b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb deleted file mode 100644 index a967cdc58..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "XFt: X FreeType libary" - -DESCRIPTION = "Xft was designed to provide good support for scalable \ -fonts, and to do so efficiently. Unlike the core fonts system, it \ -supports features such as anti-aliasing and sub-pixel rasterisation. \ -Perhaps more importantly, it gives applications full control over the \ -way glyphs are rendered, making fine typesetting and WYSIWIG display \ -possible. Finally, it allows applications to use fonts that are not \ -installed system-wide for displaying documents with embedded fonts. Xft \ -is not compatible with the core fonts system: usage of Xft requires \ -fairly extensive changes to toolkits (user-interface libraries)." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" - -DEPENDS += "virtual/libx11 libxrender freetype fontconfig" -PROVIDES = "xft" - -PE = "1" - -SRC_URI[md5sum] = "331b3a2a3a1a78b5b44cfbd43f86fcfe" -SRC_URI[sha256sum] = "f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c" - -XORG_PN = "libXft" - -BBCLASSEXTEND = "native" - -python () { - if d.getVar('DEBIAN_NAMES', True): - d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb deleted file mode 100644 index 752347969..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XI: X Input extension library" - -DESCRIPTION = "libxi is an extension to the X11 protocol to support \ -input devices other than the core X keyboard and pointer. It allows \ -client programs to select input from these devices independently from \ -each other and independently from the core devices." - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \ - file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f" - -DEPENDS += "libxext inputproto libxfixes" - -PE = "1" - -XORG_PN = "libXi" - -SRC_URI[md5sum] = "510e555ecfffa8d2298a0f42b725e563" -SRC_URI[sha256sum] = "1f32a552cec0f056c0260bdb32e853cec0673d2f40646ce932ad5a9f0205b7ac" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb deleted file mode 100644 index 027c8043d..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "Xinerama: Xinerama extension library" - -DESCRIPTION = "Xinerama is a simple library designed to interface the \ -Xinerama Extension for retrieving information about physical output \ -devices which may be combined into a single logical X screen." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6f4f634d1643a2e638bba3fcd19c2536 \ - file://src/Xinerama.c;beginline=2;endline=25;md5=fcef273bfb66339256411dd06ea79c02" - -DEPENDS += "libxext xineramaproto" -PROVIDES = "xinerama" -PE = "1" - -XORG_PN = "libXinerama" - -SRC_URI[md5sum] = "9336dc46ae3bf5f81c247f7131461efd" -SRC_URI[sha256sum] = "7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb deleted file mode 100644 index de22a8197..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Generic XKB keymap library" -DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ -processes a reduced subset of keymaps as defined by the XKB specification." -HOMEPAGE = "http://www.xkbcommon.org" -LIC_FILES_CHKSUM = "file://COPYING;md5=09457b156e3155972abebcaaaa0cb434" -LICENSE = "MIT & MIT-style" - -DEPENDS = "util-macros flex-native bison-native" - -SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158" -SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c" - -UPSTREAM_CHECK_URI = "http://xkbcommon.org/" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-docs" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb deleted file mode 100644 index 39a344cca..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "XKB: X Keyboard File manipulation library" - -DESCRIPTION = "libxkbfile provides an interface to read and manipulate \ -description files for XKB, the X11 keyboard configuration extension." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f" - -DEPENDS += "virtual/libx11 kbproto" - -PE = "1" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "4a4cfeaf24dab1b991903455d6d7d404" -SRC_URI[sha256sum] = "51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb deleted file mode 100644 index 003baec6e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Xmu and Xmuu: X Miscellaneous Utility libraries" - -DESCRIPTION = "The Xmu Library is a collection of miscellaneous (some \ -might say random) utility functions that have been useful in building \ -various applications and widgets. This library is required by the Athena \ -Widgets. A subset of the functions that do not rely on the Athena \ -Widgets (libXaw) or X Toolkit Instrinsics (libXt) are provided in a \ -second library, libXmuu." - - -require xorg-lib-common.inc - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=def3d8e4e9c42004f1941fa22f01dc18" - -DEPENDS += "libxt libxext" -PROVIDES = "xmu" - -PE = "1" - -XORG_PN = "libXmu" - -LEAD_SONAME = "libXmu" - -PACKAGES =+ "libxmuu" - -FILES_libxmuu = "${libdir}/libXmuu.so.*" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" -SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb deleted file mode 100644 index 545874cdd..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb +++ /dev/null @@ -1,27 +0,0 @@ -require xorg-lib-common.inc - -# libxpm requires xgettext to build -inherit gettext - -SUMMARY = "Xpm: X Pixmap extension library" - -DESCRIPTION = "libXpm provides support and common operation for the XPM \ -pixmap format, which is commonly used in legacy X applications. XPM is \ -an extension of the monochrome XBM bitmap specificied in the X \ -protocol." - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" -DEPENDS += "libxext libsm libxt" -PE = "1" - -XORG_PN = "libXpm" - -PACKAGES =+ "sxpm cxpm" -FILES_cxpm = "${bindir}/cxpm" -FILES_sxpm = "${bindir}/sxpm" - -SRC_URI[md5sum] = "769ee12a43611cdebd38094eaf83f3f0" -SRC_URI[sha256sum] = "c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c" - -BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb deleted file mode 100644 index abbbae552..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "XRandR: X Resize, Rotate and Reflect extension library" - -DESCRIPTION = "The X Resize, Rotate and Reflect Extension, called RandR \ -for short, brings the ability to resize, rotate and reflect the root \ -window of a screen. It is based on the X Resize and Rotate Extension as \ -specified in the Proceedings of the 2001 Usenix Technical Conference \ -[RANDR]." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=c9d1a2118a6cd5727521db8e7a2fee69" - -DEPENDS += "virtual/libx11 randrproto libxrender libxext" - -PE = "1" - -XORG_PN = "libXrandr" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "309762867e41c6fd813da880d8a1bc93" -SRC_URI[sha256sum] = "6f864959b7fc35db11754b270d71106ef5b5cf363426aa58589cb8ac8266de58" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb deleted file mode 100644 index 9fde04061..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "XRender: X Rendering Extension library" - -DESCRIPTION = "The X Rendering Extension (Render) introduces digital \ -image composition as the foundation of a new rendering model within the \ -X Window System. Rendering geometric figures is accomplished by \ -client-side tessellation into either triangles or trapezoids. Text is \ -drawn by loading glyphs into the server and rendering sets of them." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196" - -DEPENDS += "virtual/libx11 renderproto xproto xdmcp" - -PE = "1" - -XORG_PN = "libXrender" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "5db92962b124ca3a8147daae4adbd622" -SRC_URI[sha256sum] = "fc2fe57980a14092426dffcd1f2d9de0987b9d40adea663bd70d6342c0e9be1a" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb deleted file mode 100644 index 8c04c44f8..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "XRes: X Resource extension library" - -DESCRIPTION = "libXRes provides an X Window System client interface to \ -the Resource extension to the X protocol. The Resource extension allows \ -for X clients to see and monitor the X resource usage of various clients \ -(pixmaps, et al)." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa" - -DEPENDS += "libxext resourceproto" - -PE = "1" - -XORG_PN = "libXres" - -SRC_URI[md5sum] = "45ef29206a6b58254c81bea28ec6c95f" -SRC_URI[sha256sum] = "26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb deleted file mode 100644 index 354e5de7f..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "Xscrnsaver: X Screen Saver extension library" - -DESCRIPTION = "The X Window System provides support for changing the \ -image on a display screen after a user-settable period of inactivity to \ -avoid burning the cathode ray tube phosphors. However, no interfaces are \ -provided for the user to control the image that is drawn. This extension \ -allows an external \"screen saver\" client to detect when the alternate \ -image is to be displayed and to provide the graphics." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb" - -DEPENDS += "libxext scrnsaverproto" -PROVIDES = "libxss" -RREPLACES_${PN} = "libxss" -PE = "1" - -XORG_PN = "libXScrnSaver" - -SRC_URI[md5sum] = "7a773b16165e39e938650bcc9027c1d5" -SRC_URI[sha256sum] = "8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb deleted file mode 100644 index ae34b1fe4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Shared memory 'SyncFence' synchronization primitive" - -DESCRIPTION = "This library offers a CPU-based synchronization primitive compatible \ -with the X SyncFence objects that can be shared between processes \ -using file descriptor passing." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" - -DEPENDS += "virtual/libx11" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "66662e76899112c0f99e22f2fc775a7e" -SRC_URI[sha256sum] = "d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch deleted file mode 100644 index ce6c756df..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Pending - -This fixes compilation with x32 toolchain. - -Received this patch from H.J. Lu <hjl.tools@gmail.com> -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 - - ---- libXt-1.1.1/include/X11/Xtos.h.x32 2011-02-08 07:56:40.000000000 -0800 -+++ libXt-1.1.1/include/X11/Xtos.h 2011-11-30 17:19:27.473349770 -0800 -@@ -62,7 +62,7 @@ SOFTWARE. - defined(__sparc64__) || \ - defined(__s390x__) || \ - (defined(__hppa__) && defined(__LP64__)) || \ -- defined(__amd64__) || defined(amd64) || \ -+ ((defined(__amd64__) || defined(amd64)) && defined(__LP64__)) || \ - defined(__powerpc64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) - #define LONG64 diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb deleted file mode 100644 index c1ed0bb31..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Xt: X Toolkit Intrinsics library" - -DESCRIPTION = "The Intrinsics are a programming library tailored to the \ -special requirements of user interface construction within a network \ -window system, specifically the X Window System. The Intrinsics and a \ -widget set make up an X Toolkit. The Intrinsics provide the base \ -mechanism necessary to build a wide variety of interoperating widget \ -sets and application environments. The Intrinsics are a layer on top of \ -Xlib, the C Library X Interface. They extend the fundamental \ -abstractions provided by the X Window System while still remaining \ -independent of any particular user interface policy or style." - -require xorg-lib-common.inc - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" - - -DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp" -PROVIDES = "xt" - -PE = "1" - -XORG_PN = "libXt" - -SRC_URI += "file://libxt_fix_for_x32.patch" - -BBCLASSEXTEND = "native" - -EXTRA_OECONF += "--disable-xkb" - -SRC_URI[md5sum] = "8f5b5576fbabba29a05f3ca2226f74d3" -SRC_URI[sha256sum] = "46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb deleted file mode 100644 index 1b0bcf391..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XTest: X Test extension library" - -DESCRIPTION = "This extension is a minimal set of client and server \ -extensions required to completely test the X11 server with no user \ -intervention." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=bb4f89972c3869f617f61c1a79ad1952 \ - file://src/XTest.c;beginline=2;endline=32;md5=b1c8c9dff842b4d5b89ca5fa32c40e99" - -DEPENDS += "libxext recordproto inputproto libxi" -PROVIDES = "xtst" -PE = "1" - -XORG_PN = "libXtst" - -SRC_URI[md5sum] = "25c6b366ac3dc7a12c5d79816ce96a59" -SRC_URI[sha256sum] = "ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb deleted file mode 100644 index f02b8b64f..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Xv: X Video extension library" - -DESCRIPTION = "libXv provides an X Window System client interface to the \ -X Video extension to the X protocol. The X Video extension allows for \ -accelerated drawing of videos. Hardware adaptors are exposed to \ -clients, which may draw in a number of colourspaces, including YUV." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c" - -DEPENDS += "libxext videoproto" - -XORG_PN = "libXv" - -SRC_URI[md5sum] = "e0af49d7d758b990e6fef629722d4aca" -SRC_URI[sha256sum] = "55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb deleted file mode 100644 index 41e8498a6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "XvMC: X Video Motion Compensation extension library" - -DESCRIPTION = "XvMC extends the X Video extension (Xv) and enables \ -hardware rendered motion compensation support." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=0a207f08d4961489c55046c9a5e500da \ - file://wrapper/XvMCWrapper.c;endline=26;md5=5151daa8172a3f1bb0cb0e0ff157d9de" - -DEPENDS += "libxext libxv videoproto" - -PE = "1" - -XORG_PN = "libXvMC" - -SRC_URI[md5sum] = "eba6b738ed5fdcd8f4203d7c8a470c79" -SRC_URI[sha256sum] = "0703d7dff6ffc184f1735ca5d4eb9dbb402b522e08e008f2f96aee16c40a5756" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb deleted file mode 100644 index 695a39637..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension library" - -DESCRIPTION = "libXxf86dga provides the XFree86-DGA extension, which \ -allows direct graphics access to a framebuffer-like region, and also \ -allows relative mouse reporting, et al. It is mainly used by games and \ -emulators for games." - -LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" - -DEPENDS += "libxext xf86dgaproto" - -PE = "1" - -SRC_URI[md5sum] = "d7dd9b9df336b7dd4028b6b56542ff2c" -SRC_URI[sha256sum] = "8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e" - -XORG_PN = "libXxf86dga" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb deleted file mode 100644 index af6f1f76a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension library" - -DESCRIPTION = "The XFree86-Misc extension, provides a means to access \ -input device configuration settings specific to the XFree86/Xorg DDX." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45" - -DEPENDS += "libxext xf86miscproto" -PROVIDES = "xxf86misc" - -PE = "1" - -XORG_PN = "libXxf86misc" - -SRC_URI[md5sum] = "6bc0bf78909fd71021c466c793d4385c" -SRC_URI[sha256sum] = "563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb deleted file mode 100644 index 35f87d271..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "XFree86-VM: XFree86 video mode extension library" - -DESCRIPTION = "libXxf86vm provides an interface to the \ -XFree86-VidModeExtension extension, which allows client applications to \ -get and set video mode timings in extensive detail. It is used by the \ -xvidtune program in particular." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=fa0b9c462d8f2f13eba26492d42ea63d" - -DEPENDS += "libxext xf86vidmodeproto" - -PE = "1" - -XORG_PN = "libXxf86vm" - -SRC_URI[md5sum] = "298b8fff82df17304dfdb5fe4066fe3a" -SRC_URI[sha256sum] = "afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch deleted file mode 100644 index 4569dca01..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch +++ /dev/null @@ -1,144 +0,0 @@ -From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Thu, 23 Aug 2012 18:10:57 +0200 -Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection - code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This was ported from meta-oe's patch [1]. The original pixman patch is found -at [2]. - -[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch -[2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html - -Upstream-Status: Inappropriate [other] qemu fix - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - pixman/pixman-arm.c | 82 ++++++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 65 insertions(+), 17 deletions(-) - -diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c -index 23374e4..d98bda6 100644 ---- a/pixman/pixman-arm.c -+++ b/pixman/pixman-arm.c -@@ -129,16 +129,35 @@ detect_cpu_features (void) - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/mman.h> -+#include <sys/utsname.h> - #include <fcntl.h> - #include <string.h> - #include <elf.h> - -+/* -+ * The whole CPU capabilities detection is a bit ugly: when running in -+ * userspace qemu, we see /proc/self/auxv from the host system. To make -+ * everything even worse, the size of each value is 64-bit when running -+ * on a 64-bit host system. So the data is totally bogus because we expect -+ * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause -+ * segfault (null pointer dereference on x86-64 host). So in order to be -+ * on a safe side, we require that AT_PLATFORM value is found only once, -+ * and it has non-zero value (this is still not totally reliable for a big -+ * endian 64-bit host system running qemu and may theoretically fail). -+ */ -+#define ARM_HWCAP_VFP 64 -+#define ARM_HWCAP_IWMMXT 512 -+#define ARM_HWCAP_NEON 4096 -+ - static arm_cpu_features_t - detect_cpu_features (void) - { - arm_cpu_features_t features = 0; - Elf32_auxv_t aux; - int fd; -+ uint32_t hwcap = 0; -+ const char *plat = NULL; -+ int plat_cnt = 0; - - fd = open ("/proc/self/auxv", O_RDONLY); - if (fd >= 0) -@@ -147,32 +166,61 @@ detect_cpu_features (void) - { - if (aux.a_type == AT_HWCAP) - { -- uint32_t hwcap = aux.a_un.a_val; -- -- /* hardcode these values to avoid depending on specific -- * versions of the hwcap header, e.g. HWCAP_NEON -- */ -- if ((hwcap & 64) != 0) -- features |= ARM_VFP; -- if ((hwcap & 512) != 0) -- features |= ARM_IWMMXT; -- /* this flag is only present on kernel 2.6.29 */ -- if ((hwcap & 4096) != 0) -- features |= ARM_NEON; -+ hwcap = aux.a_un.a_val; - } - else if (aux.a_type == AT_PLATFORM) - { -- const char *plat = (const char*) aux.a_un.a_val; -- -- if (strncmp (plat, "v7l", 3) == 0) -+ plat = (const char*) aux.a_un.a_val; -+ plat_cnt++; -+ } -+ } -+ close (fd); -+ if (plat == NULL || plat_cnt != 1 || *plat != 'v') -+ { -+ /* -+ * Something seems to be really wrong, most likely we are -+ * running under qemu. Let's use machine type from "uname" for -+ * CPU capabilities detection: -+ * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html -+ */ -+ struct utsname u; -+ hwcap = 0; /* clear hwcap, because it is bogus */ -+ if (uname (&u) == 0) -+ { -+ if (strcmp (u.machine, "armv7l") == 0) -+ { - features |= (ARM_V7 | ARM_V6); -- else if (strncmp (plat, "v6l", 3) == 0) -+ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ -+ hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */ -+ } -+ else if (strcmp (u.machine, "armv6l") == 0) -+ { - features |= ARM_V6; -+ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ -+ } - } - } -- close (fd); -+ else if (strncmp (plat, "v7l", 3) == 0) -+ { -+ features |= (ARM_V7 | ARM_V6); -+ } -+ else if (strncmp (plat, "v6l", 3) == 0) -+ { -+ features |= ARM_V6; -+ } - } - -+ /* hardcode these values to avoid depending on specific -+ * versions of the hwcap header, e.g. HWCAP_NEON -+ */ -+ if ((hwcap & ARM_HWCAP_VFP) != 0) -+ features |= ARM_VFP; -+ if ((hwcap & ARM_HWCAP_IWMMXT) != 0) -+ features |= ARM_IWMMXT; -+ /* this flag is only present on kernel 2.6.29 */ -+ if ((hwcap & ARM_HWCAP_NEON) != 0) -+ features |= ARM_NEON; -+ - return features; - } - --- -1.7.6.5 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch deleted file mode 100644 index 6b7c1e62a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch +++ /dev/null @@ -1,65 +0,0 @@ -From fcd5eb9bd0e8674a6f4987a8fce7dc1ba8f9320c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Thu, 17 Sep 2015 03:08:36 +0200 -Subject: [PATCH] [v3] test: add a check for FE_DIVBYZERO - -Some architectures, such as Microblaze and Nios2, currently do not -implement FE_DIVBYZERO, even though they have <fenv.h> and -feenableexcept(). This commit adds a configure.ac check to verify -whether FE_DIVBYZERO is defined or not, and if not, disables the -problematic code in test/utils.c. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Backport [commit 4297e9058] ---- -Changes v1 -> v2: - - * Use the ac_cv_have_decl_FE_DIVBYZERO variable, which is - automatically set by AC_CHECK_DECL, to decide whether or not - HAVE_FEDIVBYZERO should be defined. - -Changes v2 -> v3: - - * Use action-if-yes of AC_CHECK_DECL as suggested in - http://lists.freedesktop.org/archives/pixman/2014-February/003176.html ---- - configure.ac | 5 +++++ - test/utils.c | 2 ++ - 2 files changed, 7 insertions(+) - -diff --git a/configure.ac b/configure.ac -index f93cc30..424bfd3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -891,6 +891,11 @@ if test x$have_feenableexcept = xyes; then - AC_DEFINE(HAVE_FEENABLEEXCEPT, 1, [Whether we have feenableexcept()]) - fi - -+AC_CHECK_DECL([FE_DIVBYZERO], -+ [AC_DEFINE(HAVE_FEDIVBYZERO, 1, [Whether we have FE_DIVBYZERO])], -+ [], -+ [[#include <fenv.h>]]) -+ - AC_CHECK_FUNC(gettimeofday, have_gettimeofday=yes, have_gettimeofday=no) - AC_CHECK_HEADER(sys/time.h, have_sys_time_h=yes, have_sys_time_h=no) - if test x$have_gettimeofday = xyes && test x$have_sys_time_h = xyes; then -diff --git a/test/utils.c b/test/utils.c -index 222d4d5..8657966 100644 ---- a/test/utils.c -+++ b/test/utils.c -@@ -966,9 +966,11 @@ enable_divbyzero_exceptions (void) - { - #ifdef HAVE_FENV_H - #ifdef HAVE_FEENABLEEXCEPT -+#ifdef HAVE_FEDIVBYZERO - feenableexcept (FE_DIVBYZERO); -+#endif - #endif - #endif - } - - void --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch deleted file mode 100644 index b52a5707d..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fixes errors like - -Assembler messages: -Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory - -it works with glibc because it uses gcc fixed-headers but thats not right. - -We move the include under C block - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: pixman-0.32.6/pixman/pixman-private.h -=================================================================== ---- pixman-0.32.6.orig/pixman/pixman-private.h -+++ pixman-0.32.6/pixman/pixman-private.h -@@ -1,4 +1,3 @@ --#include <float.h> - - #ifndef PIXMAN_PRIVATE_H - #define PIXMAN_PRIVATE_H -@@ -17,6 +16,8 @@ - - #ifndef __ASSEMBLER__ - -+#include <float.h> -+ - #ifndef PACKAGE - # error config.h must be included before pixman-private.h - #endif diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch deleted file mode 100644 index 14a5fd209..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch +++ /dev/null @@ -1,22 +0,0 @@ -Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with -errors such as: - -pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267: -Error: invalid operands `mflo $14,$ac3' - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- b/pixman/pixman-mips-dspr2-asm.h -+++ a/pixman/pixman-mips-dspr2-asm.h -@@ -72,10 +72,7 @@ - #define LEAF_MIPS32R2(symbol) \ - .globl symbol; \ - .align 2; \ --#ifdef __ELF__ -- .hidden symbol; \ - .type symbol, @function; \ --#endif - .ent symbol, 0; \ - symbol: .frame sp, 0, ra; \ - .set push; \ diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb deleted file mode 100644 index 553ce369b..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Pixman: Pixel Manipulation library" - -DESCRIPTION = "Pixman provides a library for manipulating pixel regions \ --- a set of Y-X banded rectangles, image compositing using the \ -Porter/Duff model and implicit mask generation for geometric primitives \ -including trapezoids, triangles, and rectangles." - -require xorg-lib-common.inc - -# see http://cairographics.org/releases/ - only even minor versions are stable -UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" - -LICENSE = "MIT & MIT-style & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ - file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ - file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ - " -DEPENDS += "zlib libpng" -BBCLASSEXTEND = "native nativesdk" - -PE = "1" - -IWMMXT = "--disable-arm-iwmmxt" -LOONGSON_MMI = "--disable-loongson-mmi" -# If target supports neon then disable the 'simd' (ie VFPv2) fallback, otherwise disable neon. -NEON = "${@bb.utils.contains("TUNE_FEATURES", "neon", "--disable-arm-simd", "--disable-arm-neon" ,d)}" - -EXTRA_OECONF = "--disable-gtk ${IWMMXT} ${LOONGSON_MMI} ${NEON}" -EXTRA_OECONF_class-native = "--disable-gtk" -EXTRA_OECONF_class-nativesdk = "--disable-gtk" - -SRC_URI += "\ - file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ - file://mips-export-revert.patch \ - file://asm_include.patch \ - file://0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch \ -" - -SRC_URI[md5sum] = "18d6b62abdb7bc0f8e6b0ddf48986b2c" -SRC_URI[sha256sum] = "5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1" - -REQUIRED_DISTRO_FEATURES = "" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch deleted file mode 100644 index 11e90940a..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch +++ /dev/null @@ -1,24 +0,0 @@ -Make clang happy since it squashes the control warning, ideally it will never reach that return value due to assert -but there is a chance when NDEBUG is defined - -| In file included from ../../xcb-util-image-0.4.0/image/xcb_image.c:37: -| ../../xcb-util-image-0.4.0/image/xcb_bitops.h:210:1: error: control may reach end of non-void function [-Werror,-Wreturn-type] -| } -| ^ -| 1 error generated. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: xcb-util-image-0.4.0/image/xcb_bitops.h -=================================================================== ---- xcb-util-image-0.4.0.orig/image/xcb_bitops.h -+++ xcb-util-image-0.4.0/image/xcb_bitops.h -@@ -207,6 +207,7 @@ xcb_host_byte_order(void) { - return XCB_IMAGE_ORDER_LSB_FIRST; - } - assert(0); -+ return -1; - } - - #endif /* __XCB_BITOPS_H__ */ diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb deleted file mode 100644 index c6bb5a61c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xcb-util.inc - -DEPENDS += "xcb-util" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ - file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" - -SRC_URI += "file://clang.patch \ -" - -SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87" -SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb deleted file mode 100644 index bca64ed61..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xcb-util.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \ - " -SRC_URI[md5sum] = "1022293083eec9e62d5659261c29e367" -SRC_URI[sha256sum] = "0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9" - - diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb deleted file mode 100644 index 25c22e5fa..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xcb-util.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://renderutil/glyph.c;endline=24;md5=c517c483b8d726234ec94f9169236661 \ - file://renderutil/util.c;endline=20;md5=6e0bfc44fb13298c0f4694eb70dc80d4 \ - file://renderutil/xcb_renderutil.h;endline=24;md5=d0ddab3052dd4949c93cfcb0891c96df \ - " - -SRC_URI[md5sum] = "468b119c94da910e1291f3ffab91019a" -SRC_URI[sha256sum] = "c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb deleted file mode 100644 index 39f138329..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xcb-util.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ewmh/ewmh.c.m4;endline=27;md5=63fd80552d7dc886f4eb267610d5bb9d \ - file://ewmh/xcb_ewmh.h.m4;beginline=4;endline=30;md5=73b589f90ef90b4a43998955daad5cd8 \ - file://icccm/icccm.c;endline=28;md5=e2b3240a0c197e8977adde2a5cf18d50 \ - file://icccm/xcb_icccm.h;beginline=4;endline=31;md5=393772b7b07b9868d479d538238c1d8a \ - " - -SRC_URI[md5sum] = "87b19a1cd7bfcb65a24e36c300e03129" -SRC_URI[sha256sum] = "28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util.inc deleted file mode 100644 index 99d04f9d4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "XCB: The X protocol C binding utilities" -DESCRIPTION = "The xcb-util module provides a number of libraries which \ -sit on top of libxcb, the core X protocol library, and some of the \ -extension libraries. These experimental libraries provide convenience \ -functions and interfaces which make the raw X protocol more usable. Some \ -of the libraries also provide client-side code which is not strictly \ -part of the X protocol but which have traditionally been provided by \ -Xlib." -HOMEPAGE = "http://xcb.freedesktop.org/XcbUtil/" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" - -LICENSE = "MIT" - -SECTION = "x11/libs" - -DEPENDS = "libxcb" -DEPENDS += "gperf-native" - -SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" - -inherit autotools pkgconfig distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb deleted file mode 100644 index 206f07a65..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xcb-util.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \ - file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9" - -SRC_URI[md5sum] = "2e97feed81919465a04ccc71e4073313" -SRC_URI[sha256sum] = "46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb deleted file mode 100644 index 16a1f4f31..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Keyboard configuration database for X Window" - -DESCRIPTION = "The non-arch keyboard configuration database for X \ -Window. The goal is to provide the consistent, well-structured, \ -frequently released open source of X keyboard configuration data for X \ -Window System implementations. The project is targeted to XKB-based \ -systems." - -HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config" - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" - -SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "bf6aa31195584cfce01b2194c3e5ea26" -SRC_URI[sha256sum] = "1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58" - -SECTION = "x11/libs" -DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" - -EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" - -FILES_${PN} += "${datadir}/X11/xkb" - -inherit autotools pkgconfig gettext - -do_install_append () { - install -d ${D}${datadir}/X11/xkb/compiled - cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc deleted file mode 100644 index 6f4e44454..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ /dev/null @@ -1,27 +0,0 @@ -HOMEPAGE = "http://www.x.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" - -SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "util-macros" - -XORG_PN = "${BPN}" - -SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" - -S = "${WORKDIR}/${XORG_PN}-${PV}" - -inherit autotools distro_features_check pkgconfig - -EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" - -UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ - --disable-specs --without-groff --without-ps2pdf --without-fop \ - --without-xmlto --with-xmlto \ -" - -REQUIRED_DISTRO_FEATURES ?= "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb deleted file mode 100644 index d5b7f1a2c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "XTrans: X Transport library" - -DESCRIPTION = "The X Transport Interface is intended to combine all \ -system and transport specific code into a single place. This API should \ -be used by all libraries, clients and servers of the X Window System. \ -Use of this API should allow the addition of new types of transports and \ -support for new platforms without making any changes to the source \ -except in the X Transport Interface code." - -require xorg-lib-common.inc - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca" - -PE = "1" - -RDEPENDS_${PN}-dev = "" - -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "c5ba432dd1514d858053ffe9f4737dd8" -SRC_URI[sha256sum] = "adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb deleted file mode 100644 index f798a4353..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -require xorg-proto-common.inc - -PE = "1" - -SUMMARY = "BigReqs: X Big Requests extension headers" - -DESCRIPTION = "This package provides the wire protocol for the \ -BIG-REQUESTS extension, used to send larger requests that usual in order \ -to avoid fragmentation." - -BBCLASSEXTEND = "native nativesdk" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b12715630da6f268d0d3712ee1a504f4" - -SRC_URI[md5sum] = "1a05fb01fa1d5198894c931cf925c025" -SRC_URI[sha256sum] = "462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch deleted file mode 100644 index ff8cb25cd..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Pending - -Add missing length fields to the replies. Without these, sanity checking in recent X -breaks things. - -RP 11/2/10 - - -Index: git/xcalibrateproto.h -=================================================================== ---- git.orig/xcalibrateproto.h 2010-02-11 11:47:45.711985932 +0000 -+++ git/xcalibrateproto.h 2010-02-11 11:40:21.000000000 +0000 -@@ -67,13 +67,13 @@ - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; -+ CARD32 length; - CARD32 status; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -- CARD32 pad7 B32; - } xXCalibrateRawModeReply; - - #define sz_xXCalibrateRawModeReply 32 -@@ -92,13 +92,13 @@ - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; -+ CARD32 length; - CARD32 x; - CARD32 y; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -- CARD32 pad6 B32; - } xXCalibrateScreenToCoordReply; - - #define sz_xXCalibrateScreenToCoordReply 32 diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb deleted file mode 100644 index b88d15792..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XCalibrate: Touchscreen calibration headers" - -DESCRIPTION = "This package provides the wire protocol for the \ -Touchscreen calibration extension." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://xcalibratewire.h;endline=23;md5=7f86ef7b03cce6c4c9ebd59d20ca485f \ - file://xcalibrateproto.h;endline=23;md5=e4490491edcc171ca24f98569ee580db" - -SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c" - -PV = "0.0+git${SRCPV}" -PR = "r2" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto \ - file://fix.patch;apply=yes" -S = "${WORKDIR}/git" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb deleted file mode 100644 index adfee2630..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "Xcomposite: X composite extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X \ -composite extension. The X composite extension provides three related \ -mechanisms for compositing and off-screen storage." - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \ - file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926" - -RCONFLICTS_${PN} = "compositeext" -BBCLASSEXTEND = "native" - -PR = "r1" -PE = "1" - -SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0" -SRC_URI[sha256sum] = "049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb deleted file mode 100644 index 75d026810..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "Xdamage: X Damage extension headers" - -DESCRIPTION = "This package provides the wire protocol for the DAMAGE \ -extension. The DAMAGE extension allows applications to receive \ -information about changes made to pixel contents of windows and \ -pixmaps." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=d5f5a2de65c3a84cbde769f07a769608 \ - file://damagewire.h;endline=23;md5=4a4501a592dbc7de5ce89255e50d0296" - -RCONFLICTS_${PN} = "damageext" -BBCLASSEXTEND = "native" -PR = "r1" -PE = "1" - -SRC_URI[md5sum] = "998e5904764b82642cc63d97b4ba9e95" -SRC_URI[sha256sum] = "5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb deleted file mode 100644 index d960e5d4c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "DMX: Distributed Multihead extension headers" - -DESCRIPTION = "This package provides the wire protocol for the DMX \ -extension. The DMX extension provides support for communication with \ -and control of Xdmx server. Attributes of the Xdmx server and of the \ -back-end screens attached to the server can be queried and modified via \ -this protocol." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ - file://dmxproto.h;endline=32;md5=ab8509955c3dd4c65fac728e1b367bc4" - -PE = "1" - -SRC_URI[md5sum] = "4ee175bbd44d05c34d43bb129be5098a" -SRC_URI[sha256sum] = "e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb deleted file mode 100644 index f4c40c571..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb +++ /dev/null @@ -1,15 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers" - -DESCRIPTION = "This package provides the wire protocol for the Direct \ -Rendering Ifnrastructure 2. DIR is required for may hardware \ -accelerated OpenGL drivers." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \ - file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca" - - -SRC_URI[md5sum] = "b2721d5d24c04d9980a0c6540cb5396a" -SRC_URI[sha256sum] = "f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_git.bb deleted file mode 100644 index 9074f48d4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers" - -DESCRIPTION = "This package provides the wire protocol for the Direct \ -Rendering Ifnrastructure 2. DIR is required for may hardware \ -accelerated OpenGL drivers." - -SRCREV = "66c56ab10d917e3f47f93178d7eac6430970d3c4" -PV = "1.99.3+git${SRCPV}" -PR = "r2" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/dri2proto" - -LIC_FILES_CHKSUM="file://COPYING;md5=2e396fa91834f8786032cad2da5638f3" - -S = "${WORKDIR}/git" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb deleted file mode 100644 index bed97b3f4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "Direct Rendering Infrastructure 3 Extension" - -DESCRIPTION = "The DRI3 extension provides mechanisms to translate between direct \ -rendered buffers and X pixmaps. When combined with the Present extension, \ -a complete direct rendering solution for OpenGL is provided." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://dri3proto.h;endline=21;md5=ac90d1d416be3cb13e1d3c88cd5166bf" - - -SRC_URI[md5sum] = "a3d2cbe60a9ca1bf3aea6c93c817fee3" -SRC_URI[sha256sum] = "01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb deleted file mode 100644 index 39fb88d84..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XFixes: X Fixes extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X Fixes \ -extension. This extension is designed to provide server-side support \ -for application work arounds to shortcomings in the core X window \ -system." - - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \ - file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4" - -RCONFLICTS_${PN} = "fixesext" -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "e7431ab84d37b2678af71e29355e101d" -SRC_URI[sha256sum] = "ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb deleted file mode 100644 index 27fc28174..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XFont: X Font rasterisation headers" - -DESCRIPTION = "This package provides the wire protocol for the X Font \ -rasterisation extensions. These extensions are used to control \ -server-side font configurations." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=c3e48aa9ce868c8e90f0401db41c11a2 \ - file://FSproto.h;endline=44;md5=d2e58e27095e5ea7d4ad456ccb91986c" - -PE = "1" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "36934d00b00555eaacde9f091f392f97" -SRC_URI[sha256sum] = "259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb deleted file mode 100644 index eb03d33c2..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "OpenGL: X OpenGL extension headers" - -DESCRIPTION = "This package provides the wire protocol for the \ -OpenGL-related extensions, used to enable the rendering of applications \ -using OpenGL." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ - file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" - -PE = "1" - -BBCLASSEXTEND = "nativesdk" - -SRC_URI[md5sum] = "5565f1b0facf4a59c2778229c1f70d10" -SRC_URI[sha256sum] = "adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb deleted file mode 100644 index 7e8e0c155..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XI: X Input extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X Input \ -extension. The extension supports input devices other then the core X \ -keyboard and pointer." - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=e562cc0f6587b961f032211d8160f31e \ - file://XI2proto.h;endline=48;md5=1ac1581e61188da2885cc14ff49b20be" - -PE = "1" - -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "6caebead4b779ba031727f66a7ffa358" -SRC_URI[sha256sum] = "5a47ee62053a6acef3a83f506312494be1461068d0b9269d818839703b95c1d1" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_git.bb deleted file mode 100644 index 6520f3bb0..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XI: X Input extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X Input \ -extension. The extension supports input devices other then the core X \ -keyboard and pointer." - -PR = "r1" -PE = "1" -SRCREV = "7203036522ba9d4b224d282d6afc2d0b947711ee" -PV = "1.9.99.12+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto" -S = "${WORKDIR}/git" - -inherit gettext - -BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb deleted file mode 100644 index 46f5c92b6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XKB: X Keyboard extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X \ -Keyboard extension. This extension is used to control options related \ -to keyboard handling and layout." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=7dd6ea99e2a83a552c02c80963623c38 \ - file://XKBproto.h;beginline=1;endline=25;md5=5744eeff407aeb6e7a1346eebab486a2" - -PE = "1" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "94afc90c1f7bef4a27fdd59ece39c878" -SRC_URI[sha256sum] = "f882210b76376e3fa006b11dbd890e56ec0942bc56e65d1249ff4af86f90b857" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb deleted file mode 100644 index dbb6f32bc..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "This package provides the basic headers for the X Window System" -DESCRIPTION = "The Present extension provides a way for applications to update their \ - window contents from a pixmap in a well defined fashion, synchronizing \ - with the display refresh and potentially using a more efficient \ - mechanism than copying the contents of the source pixmap.\ - " - -LICENSE = "GPLv2" - -SRCREV = "24f3a56e541b0a9e6c6ee76081f441221a120ef9" -PV = "1.0+git${SRCPV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/presentproto" -S = "${WORKDIR}/git" - -PR = "r1" - -inherit autotools - -BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb deleted file mode 100644 index b59e52513..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XRandR: X Resize, Rotate and Reflect extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X Resize, \ -Rotate and Reflect extension. This extension provides the ability to \ -resize, rotate and reflect the root window of a screen." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=00426d41bd3d9267cf9bbb2df9323a5e \ - file://randrproto.h;endline=30;md5=3885957c6048fdf3310ac8ba54ca2c3f" - -RCONFLICTS_${PN} = "randrext" -PE = "1" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "a46765c8dcacb7114c821baf0df1e797" -SRC_URI[sha256sum] = "4c675533e79cd730997d232c8894b6692174dce58d3e207021b8f860be498468" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb deleted file mode 100644 index ad2317c26..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XRecord: X Record extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X Record \ -extension. This extension is used to record and play back event \ -sequences." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=575827a0f554bbed332542976d5f3d40 \ - file://recordproto.h;endline=19;md5=1cbb0dd45a0b060ff833901620a3e738" - -RCONFLICTS_${PN} = "recordext" -PR = "r1" -PE = "1" - -SRC_URI[md5sum] = "1b4e5dede5ea51906f1530ca1e21d216" -SRC_URI[sha256sum] = "a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb deleted file mode 100644 index ff800ec83..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XRender: X rendering Extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X \ -Rendering extension. This is the basis the image composition within the \ -X window system." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=f826d99765196352e6122a406cf0d024 \ - file://renderproto.h;beginline=4;endline=24;md5=3e5e2851dad240b0a3a27c4776b4fd1f" - -RCONFLICTS_${PN} = "renderext" -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "a914ccc1de66ddeb4b611c6b0686e274" -SRC_URI[sha256sum] = "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb deleted file mode 100644 index 08b610aea..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XRes: X Resource extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X \ -Resource extension. XRes provides an interface that allows X clients to \ -see and monitor X resource usage of various clients." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97" - -RCONFLICTS_${PN} = "resourceext" - -PR = "r1" -PE = "1" - -SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4" -SRC_URI[sha256sum] = "3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb deleted file mode 100644 index ab07f518c..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "Xscrnsaver: X Screen Saver extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X Screen \ -Saver extension. This extension allows an external \"screen saver\" \ -client to detect when the alternative image is to be displayed and to \ -provide the graphics." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=eed49b78b15b436c933b6b8b054e3901 \ - file://saverproto.h;endline=26;md5=a84c0637305159f3c0ab173aaeede48d" - -PE = "1" - -EXTRA_OECONF_append = " --enable-specs=no" - -SRC_URI[md5sum] = "edd8a73775e8ece1d69515dd17767bfb" -SRC_URI[sha256sum] = "8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb deleted file mode 100644 index 53aa7593b..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "Xv: X Video extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X Video \ -extension. This extension alows for accerlated drawing of videos." - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=ce3472a119a864085fa4155cb0979a7b" - -PE = "1" - -SRC_URI[md5sum] = "e658641595327d3990eab70fdb55ca8b" -SRC_URI[sha256sum] = "8dae168cb820fcd32f564879afb3f24d27c176300d9af66819a18265539bd4b6" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc deleted file mode 100644 index 8703d6391..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "XCB: The X protocol C binding headers" -DESCRIPTION = "Function prototypes for the X protocol C-language Binding \ -(XCB). XCB is a replacement for Xlib featuring a small footprint, \ -latency hiding, direct access to the protocol, improved threading \ -support, and extensibility." -HOMEPAGE = "http://xcb.freedesktop.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" - -SECTION = "x11/libs" -LICENSE = "MIT-X" - -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ - file://no-python-native.patch" - -inherit autotools pkgconfig - -PACKAGES += "python-xcbgen" - -FILES_${PN} = "" -FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" -FILES_python-xcbgen = "${libdir}/xcb-proto" - -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch deleted file mode 100644 index f808e1963..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream uses AM_PATH_PYTHON to find a python binary and ask it where to install -libraries. This means we either need to depend on python-native (large build -dependency, early in the build) or use the host python (pythondir reflects the -host and not the target, breaks builds). - -The third option is to just hardcode the path where the module goes, as most -callers of the code use pkg-config to find where it was installed anyway. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index d140bfe..c7b68da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,10 @@ if test "$XMLLINT" = "no"; then - AC_MSG_WARN([xmllint not found; unable to validate against schema.]) - fi - --AM_PATH_PYTHON([2.5]) -+pythondir="${libdir}/xcb-proto" -+AC_SUBST(pythondir) -+PYTHON="python" -+AC_SUBST(PYTHON) - - xcbincludedir='${datadir}/xcb' - AC_SUBST(xcbincludedir) diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb deleted file mode 100644 index 5bc5a112e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb +++ /dev/null @@ -1,9 +0,0 @@ -include xcb-proto.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ - file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" - - -SRC_URI[md5sum] = "6bf2797445dc6d43e9e4707c082eff9c" -SRC_URI[sha256sum] = "b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb deleted file mode 100644 index 2ea4d0421..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb +++ /dev/null @@ -1,9 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -include xcb-proto.inc -SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66" -PV = "1.2+gitr${SRCPV}" -PR = "r4" - -SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto" -S = "${WORKDIR}/git" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb deleted file mode 100644 index 0751b94c9..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XC-MISC: X XC-Miscellaneous extension headers" - -DESCRIPTION = "This package provides the wire protocol for the XC-MISC \ -extension, which is used to get details of XID allocations within the \ -server." - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=09d83047c15994e05db29b423ed6662e" - -PE = "1" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "5f4847c78e41b801982c8a5e06365b24" -SRC_URI[sha256sum] = "b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb deleted file mode 100644 index dd0bd951b..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XExt: X Extension headers" - -DESCRIPTION = "This package provides the wire protocol for several X \ -extensions. These protocol extensions include DOUBLE-BUFFER, DPMS, \ -Extended-Visual-Information, LBX, MIT_SHM, MIT_SUNDRY-NONSTANDARD, \ -Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, XC-APPGROUP, XC-MISC, \ -XTEST. In addition a small set of utility functions are also \ -available." - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=86f273291759d0ba2a22585cd1c06c53" - -PE = "1" - -inherit gettext - -EXTRA_OECONF_append = " --enable-specs=no" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "70c90f313b4b0851758ef77b95019584" -SRC_URI[sha256sum] = "f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb deleted file mode 100644 index 86f3ce328..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension headers" - -DESCRIPTION = "This package provides the wire protocol for the XFree86 \ -Direct Graphics Access extension. This extension allows direct graphics \ -access to a framebuffer-like region, as well as relative mouse \ -reporting." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6" - -RCONFLICTS_${PN} = "xxf86dgaext" -PR = "r2" -PE = "1" - -SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1" -SRC_URI[sha256sum] = "ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb deleted file mode 100644 index b3f9210cc..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XFree86-DRI: XFree86 Direct Rendering Infrastructure extension headers" - -DESCRIPTION = "This package provides the wire protocol for the XFree86 \ -Direct Rendering Infrastructure extension. The XFree86-DRI extension is \ -used to organize direct rendering support or 3D clients and help \ -arbitrate requests." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ef103b9d951e39ff7e23d386e2011fa3 \ - file://xf86driproto.h;endline=35;md5=42be3d8e6d429ab79172572bb0cff544" - -PE = "1" - -SRC_URI[md5sum] = "1d716d0dac3b664e5ee20c69d34bc10e" -SRC_URI[sha256sum] = "9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb deleted file mode 100644 index d4663ea88..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension headers" - -DESCRIPTION = "This package provides the wire protocol for the XFree \ -miscellaneous extension. The XFree86-Misc extension provides a means to \ -access input device configuration settings specific to the XFree86/Xorg \ -DDX." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6" - -PR = "r1" -PE = "1" - -SRC_URI[md5sum] = "ca63bbb31cf5b7f37b2237e923ff257a" -SRC_URI[sha256sum] = "45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb deleted file mode 100644 index 0f31900a9..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XFree86-VM: XFree86 video mode extension headers" - -DESCRIPTION = "This package provides the wire protocol for the XFree86 \ -video mode extension. This extension allows client applications to get \ -and set video mode timings." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=499be2ff387a42f84628c35f311f1502" - -RCONFLICTS_${PN} = "xxf86vmext" - -PR = "r1" -PE = "1" - -SRC_URI[md5sum] = "e793ecefeaecfeabd1aed6a01095174e" -SRC_URI[sha256sum] = "45d9499aa7b73203fd6b3505b0259624afed5c16b941bd04fcf123e5de698770" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb deleted file mode 100644 index d00774ece..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "Xinerama: Xinerama extension headers" - -DESCRIPTION = "This package provides the wire protocol for the Xinerama \ -extension. This extension is used for retrieving information about \ -physical output devices which may be combined into a single logical X \ -screen." - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e397a5326c83d5d0ebf5b3f87163ac6 \ - file://panoramiXproto.h;endline=24;md5=098e0bc089368a988092b3cbda617a57" - -PE = "1" - -SRC_URI[md5sum] = "9959fe0bfb22a0e7260433b8d199590a" -SRC_URI[sha256sum] = "977574bb3dc192ecd9c55f59f991ec1dff340be3e31392c95deff423da52485b" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc b/yocto-poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc deleted file mode 100644 index 7a417c974..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "X protocol headers: ${XORG_PN}" -HOMEPAGE = "http://www.x.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" - -SECTION = "x11/libs" -LICENSE = "MIT-X" - -XORG_PN = "${BPN}" - -SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2" - -S = "${WORKDIR}/${XORG_PN}-${PV}" - -DEPENDS = "util-macros" - -inherit autotools pkgconfig -EXTRA_OECONF = "--without-fop" - -UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto --with-xmlto" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" - -# ${PN} is empty so we need to tweak -dev and -dbg package dependencies -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch deleted file mode 100644 index 540ad27d4..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Pending - -Don't always define LONG64 for AMD64 - -X32 defines __amd64__/amd64 with 32bit long. We should simply check -__LP64__ before defining LONG64 without checking __amd64__/amd64. - -This fixes compilation with x32 toolchain. - -Received this patch from H.J. Lu <hjl.tools@gmail.com> -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 - ---- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 -+++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 -@@ -62,7 +62,6 @@ SOFTWARE. - defined(__ia64__) || defined(ia64) || \ - defined(__sparc64__) || \ - defined(__s390x__) || \ -- defined(__amd64__) || defined(amd64) || \ - defined(__powerpc64__) - # define LONG64 /* 32/64-bit architecture */ - # endif diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb b/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb deleted file mode 100644 index 7427a7d53..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "Xlib: C Language X interface headers" - -DESCRIPTION = "This package provides the basic headers for the X Window \ -System." - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=b9e051107d5628966739a0b2e9b32676" - -PE = "1" - -SRC_URI += "file://xproto_fix_for_x32.patch" - -EXTRA_OECONF_append = " --enable-specs=no" -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "3ce2f230c5d8fa929f326ad1f0fa40a8" -SRC_URI[sha256sum] = "29e85568d1f68ceef8a2c081dad9bc0e5500a53cfffde24b564dc43d46ddf6ca" - diff --git a/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb deleted file mode 100644 index be3a66744..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Program to create dependencies in makefiles" - -DESCRIPTION = "The gccmakedep program calls 'gcc -M' to output makefile \ -rules describing the dependencies of each sourcefile, so that make knows \ -which object files must be recompiled when a dependency has changed." - -require xorg-util-common.inc -LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" -DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" -DEPENDS = "util-macros" -RDEPENDS_${PN} = "gcc" - -PR = "r3" -PE = "1" - -SRC_URI[md5sum] = "127ddb6131eb4a56fdf6644a63ade788" -SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548" - -do_install_append() { - sed -i "s,--sysroot=${STAGING_DIR_TARGET},," ${D}${bindir}/gccmakedep -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb b/yocto-poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb deleted file mode 100644 index 84a967a81..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -require xorg-util-common.inc - -SUMMARY = "create dependencies in makefiles" - -DESCRIPTION = "The makedepend program reads each sourcefile in sequence \ -and parses it like a C-preprocessor, processing \ -all #include, #define, #undef, #ifdef, #ifndef, #endif, #if, #elif \ -and #else directives so that it can correctly tell which #include, \ -directives would be used in a compilation. Any #include, directives \ -can reference files having other #include directives, and parsing will \ -occur in these files as well." - -DEPENDS = "xproto util-macros" -PE = "1" - -BBCLASSEXTEND = "native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=43a6eda34b48ee821b3b66f4f753ce4f" - -SRC_URI[md5sum] = "efb2d7c7e22840947863efaedc175747" -SRC_URI[sha256sum] = "503903d41fb5badb73cb70d7b3740c8b30fe1cc68c504d3b6a85e6644c4e5004" diff --git a/yocto-poky/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb b/yocto-poky/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb deleted file mode 100644 index 26cf50f2f..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "X autotools macros" - -DESCRIPTION = "M4 autotools macros used by various X.org programs." - -require xorg-util-common.inc - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662" - -PE = "1" - -SRC_URI[md5sum] = "40e1caa49a71a26e0aa68ddd00203717" -SRC_URI[sha256sum] = "0d4df51b29023daf2f63aebf3ebc638ea88efedfd560ab5866741ab3f92acaa1" - -# ${PN} is empty so we need to tweak -dev and -dbg package dependencies -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc b/yocto-poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc deleted file mode 100644 index 18d022c49..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc +++ /dev/null @@ -1,13 +0,0 @@ -HOMEPAGE = "http://www.x.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" - -SECTION = "x11/utils" -LICENSE = "MIT-X" - -XORG_PN = "${BPN}" - -SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz" - -S = "${WORKDIR}/${XORG_PN}-${PV}" - -inherit autotools pkgconfig diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf deleted file mode 100644 index 7ceb6fd63..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf +++ /dev/null @@ -1,9 +0,0 @@ -Section "Module" - Load "fbdevhw" - Load "fb" - Load "shadow" - Load "shadowfb" - Load "vbe" - Load "vgahw" -EndSection - diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf deleted file mode 100644 index 629ae214e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf +++ /dev/null @@ -1,69 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "evdev" - Option "CoreKeyboard" - Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "evdev" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Qemu Tablet" - Driver "evdev" - Option "CorePointer" - Option "Device" "/dev/input/touchscreen0" - Option "USB" "on" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - # InputDevice "Configured Mouse" - InputDevice "QEMU Tablet" - Option "AllowEmptyInput" "no" -EndSection diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index e6c8b514e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null @@ -1,70 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "evdev" - Option "CoreKeyboard" - Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "evdev" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Qemu Tablet" - Driver "evdev" - Option "CorePointer" - Option "Device" "/dev/input/touchscreen0" - Option "USB" "on" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - # InputDevice "Configured Mouse" - InputDevice "QEMU Tablet" - Option "AllowEmptyInput" "no" -EndSection diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 629ae214e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null @@ -1,69 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "evdev" - Option "CoreKeyboard" - Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "evdev" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Qemu Tablet" - Driver "evdev" - Option "CorePointer" - Option "Device" "/dev/input/touchscreen0" - Option "USB" "on" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - # InputDevice "Configured Mouse" - InputDevice "QEMU Tablet" - Option "AllowEmptyInput" "no" -EndSection diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf deleted file mode 100644 index 629ae214e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf +++ /dev/null @@ -1,69 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "evdev" - Option "CoreKeyboard" - Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "evdev" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Qemu Tablet" - Driver "evdev" - Option "CorePointer" - Option "Device" "/dev/input/touchscreen0" - Option "USB" "on" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - # InputDevice "Configured Mouse" - InputDevice "QEMU Tablet" - Option "AllowEmptyInput" "no" -EndSection diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf deleted file mode 100644 index 629ae214e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf +++ /dev/null @@ -1,69 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "evdev" - Option "CoreKeyboard" - Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "evdev" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Qemu Tablet" - Driver "evdev" - Option "CorePointer" - Option "Device" "/dev/input/touchscreen0" - Option "USB" "on" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - # InputDevice "Configured Mouse" - InputDevice "QEMU Tablet" - Option "AllowEmptyInput" "no" -EndSection diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf deleted file mode 100644 index bbda9eaa6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf +++ /dev/null @@ -1,64 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "evdev" - Option "CoreKeyboard" - Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "evdev" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "vmmouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Qemu Tablet" - Driver "evdev" - Option "CorePointer" - Option "Device" "/dev/input/touchscreen0" - Option "USB" "on" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - # InputDevice "Configured Mouse" - InputDevice "QEMU Tablet" - Option "AllowEmptyInput" "no" -EndSection diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf deleted file mode 100644 index bbda9eaa6..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf +++ /dev/null @@ -1,64 +0,0 @@ - -Section "Files" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "evdev" - Option "CoreKeyboard" - Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "evdev" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "vmmouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "ImPS/2" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "true" -EndSection - -Section "InputDevice" - Identifier "Qemu Tablet" - Driver "evdev" - Option "CorePointer" - Option "Device" "/dev/input/touchscreen0" - Option "USB" "on" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - # InputDevice "Configured Mouse" - InputDevice "QEMU Tablet" - Option "AllowEmptyInput" "no" -EndSection diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf deleted file mode 100644 index e69de29bb..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf +++ /dev/null diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb deleted file mode 100644 index e07c204c7..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "X.Org X server configuration file" -HOMEPAGE = "http://www.x.org" -SECTION = "x11/base" -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r33" - -SRC_URI = "file://xorg.conf" - -SRC_URI_append_libc-musl = "\ - file://10-preload-modules.conf \ -" - -S = "${WORKDIR}" - -CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" -CONFFILES_${PN}_append_libc-musl = " ${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -ALLOW_EMPTY_${PN} = "1" - -do_install () { - if test -s ${WORKDIR}/xorg.conf; then - install -d ${D}/${sysconfdir}/X11 - install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ - fi -} - -do_install_append_libc-musl () { - install -Dm 0644 ${WORKDIR}/10-preload-modules.conf ${D}/${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf -} diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc deleted file mode 100644 index f4c5469b5..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ /dev/null @@ -1,177 +0,0 @@ -SUMMARY = "The X.Org X server" -HOMEPAGE = "http://www.x.org" -SECTION = "x11/base" -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" - -# 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 - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "x11" - -PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" -LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" -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}-sdl \ - ${PN}-fbdev \ - ${PN}-xvfb \ - ${PN}-utils \ - ${PN}-xephyr \ - ${PN}-xwayland \ - ${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 \ - xf86-video-modesetting" - -SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" -INSANE_SKIP_xf86-video-modesetting = "xorg-driver-abi" - -XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp" -RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" -RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" -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}-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}-xwayland = "${bindir}/Xwayland" -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" -FILES_xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so" - -EXTRA_OECONF += "--with-fop=no \ - --with-pic \ - --disable-static \ - --disable-record \ - --disable-dmx \ - --disable-xnest \ - --enable-xvfb \ - --enable-composite \ - --without-dtrace \ - --with-int10=x86emu \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-output=/var/lib/xkb \ -" - -PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ -" - -PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" -PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" -# DRI3 requires xshmfence to also be enabled -PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" -PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" -PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" -PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," -PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" -PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" - -# Xorg requires a SHA1 implementation, pick one -XORG_CRYPTO ??= "openssl" -PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" -PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" -PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" - -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/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch deleted file mode 100644 index cd3099952..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Mon, 16 Nov 2015 16:18:40 +0200 -Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check - -REQUIRED_LIBS needs to be set to the correct systemd library, -otherwise the later check will either fail or use the wrong -pc file. - -Upstream-Status: Submitted [xorg-devel@lists.x.org] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 96c0242..f63eca1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon], - [support systemd socket activation (default: auto)]), - [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto]) - PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -- [HAVE_SYSTEMD_DAEMON=yes], -+ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon], - [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], -- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])]) -+ [REQUIRED_SYSTEMD_DAEMON=libsystemd], -+ [REQUIRED_SYSTEMD_DAEMON=])]) -+if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then -+ HAVE_SYSTEMD_DAEMON=no -+else -+ HAVE_SYSTEMD_DAEMON=yes -+fi -+ - if test "x$WITH_SYSTEMD_DAEMON" = xauto; then - WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON" - fi -@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then - AC_MSG_ERROR([systemd support requested but no library has been found]) - fi - AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available]) -- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon" -+ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON" - fi - AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"]) - --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch deleted file mode 100644 index ec0eea6ca..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/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 <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/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch deleted file mode 100644 index 5f186cb84..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 27 Jan 2016 11:50:13 -0500 -Subject: modesetting: Require sufficiently new libdrm - -Bugzilla: https://bugs.freedesktop.org/93883 -Signed-off-by: Adam Jackson <ajax@redhat.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Julien Cristau <jcristau@debian.org> - -Upstream-Status: Backport -Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com> - -diff --git a/configure.ac b/configure.ac -index ac3bb64..312fc69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then - - if test "x$DRM" = xyes; then - dnl 2.4.46 is required for cursor hotspot support. -- PKG_CHECK_EXISTS(libdrm >= 2.4.46) -- XORG_DRIVER_MODESETTING=yes -+ PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no) - fi - - AC_SUBST([XORG_LIBS]) --- -cgit v0.10.2 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch deleted file mode 100644 index 4be441fb7..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch +++ /dev/null @@ -1,18 +0,0 @@ -inb/outb family for arm is only implemented on glibc -so assumption across linux is wrong - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: xorg-server-1.18.0/hw/xfree86/common/compiler.h -=================================================================== ---- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h -+++ xorg-server-1.18.0/hw/xfree86/common/compiler.h -@@ -758,7 +758,7 @@ inl(unsigned short port) - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__GLIBC__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb deleted file mode 100644 index eb79b4046..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -require xserver-xorg.inc - -SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \ - file://musl-arm-inb-outb.patch \ - file://modesetting_libdrm_requirements.patch \ - " -SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd" -SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e" - -# 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 \ - " diff --git a/yocto-poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb b/yocto-poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb deleted file mode 100644 index ce5df0393..000000000 --- a/yocto-poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "XRes: A top-like resource usage tool for X" - -DESCRIPTION = "top-like statistics of X11 server resource usage by clients" - -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop" -BUGTRACKER = "https://bugs.freedesktop.org/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://xrestop.c;endline=18;md5=730876c30f0d8a928676bcd1242a3b35" - -SECTION = "x11/utils" -PR = "r3" - -DEPENDS = "libxres libxext virtual/libx11 ncurses" - -SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-${PV}.tar.gz" - -SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b" -SRC_URI[sha256sum] = "67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/yocto-poky/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh deleted file mode 100644 index fa43617bd..000000000 --- a/yocto-poky/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -if [ "$HAVE_TOUCHSCREEN" = "1" ]; then - n=1 - while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] && [ $n -le 5 ] - do - /usr/bin/xtscal - sleep 1 - n=$(($n+1)) - done -fi diff --git a/yocto-poky/meta/recipes-graphics/xtscal/xtscal/change-cross.patch b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/change-cross.patch deleted file mode 100644 index 1da771786..000000000 --- a/yocto-poky/meta/recipes-graphics/xtscal/xtscal/change-cross.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - ---- tmp/main.c.orig 2007-01-02 15:39:54.000000000 +0000 -+++ tmp/main.c 2007-01-02 15:39:54.000000000 +0000 -@@ -131,9 +131,10 @@ - { - XRenderFillRectangles (dpy, PictOpSrc, pict, &rect_color, rectangles, 2); - -- XFillArc (dpy, crosshair_w, crosshair_gc, (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, -- (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, -- WIDTH + 1, WIDTH + 1, 0, 360 * 64); -+ XFillRectangle (dpy, crosshair_w, crosshair_gc, -+ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), -+ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), -+ WIDTH, WIDTH); - } - - void diff --git a/yocto-poky/meta/recipes-graphics/xtscal/xtscal/cleanup.patch b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/cleanup.patch deleted file mode 100644 index f7b0854c3..000000000 --- a/yocto-poky/meta/recipes-graphics/xtscal/xtscal/cleanup.patch +++ /dev/null @@ -1,621 +0,0 @@ ---- - Makefile.am | 9 -- - configure.ac | 3 - gpe-dist.am | 12 --- - h3600_ts.h | 216 ----------------------------------------------------------- - main.c | 210 ++------------------------------------------------------- - xtscal.in | 19 ----- - 6 files changed, 14 insertions(+), 455 deletions(-) - -Upstream-Status: Pending - -Index: xtscal-0.6.3/xtscal.in -=================================================================== ---- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,19 +0,0 @@ --#!/bin/sh -- --module_id() { -- # Get model name -- echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` --} -- --case `module_id` in -- "HP IPAQ H3100" | "HP IPAQ H3800" ) -- ARGS="-rotate 90" ;; -- "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE) -- ARGS="-rotate 270" ;; -- # H2200: works without rotation --esac -- --# the things we do for autoconf --prefix=@prefix@ --exec_prefix=@exec_prefix@ --exec @libexecdir@/xtscal.bin $ARGS $* -Index: xtscal-0.6.3/main.c -=================================================================== ---- xtscal-0.6.3.orig/main.c 2007-07-01 01:12:52.000000000 +0100 -+++ xtscal-0.6.3/main.c 2007-07-01 01:12:55.000000000 +0100 -@@ -22,12 +22,10 @@ - #include <X11/Xlib.h> - - #include <X11/extensions/Xrender.h> --#include <X11/extensions/Xrandr.h> - #include <X11/Xft/Xft.h> - #include <X11/extensions/xcalibrate.h> - #include <X11/keysym.h> - --#include "h3600_ts.h" - #include "calibrate.h" - - Display *dpy; -@@ -45,15 +43,11 @@ XftColor xftcol; - XftDraw *xftdraw; - XftFont *xftfont; - int screen_x, screen_y; --int ts_fd; - int samples; - Pixmap bg_pixmap; - int flag_debug; --int rotation = 0; - int error_base, event_base; - --int using_xcalibrate; -- - int moving; - - #define CROSSHAIR_SIZE 25 -@@ -63,7 +57,6 @@ int moving; - #define ENOUGH 5 - #define MAX_SAMPLES 40 - --#define RAW_DEVICE "/dev/h3600_tsraw" - #define FONTNAME "sans-10" - - struct point -@@ -287,12 +280,8 @@ sort_by_y (const void* a, const void *b) - void - set_calibration (calibration *cal) - { -- TS_CAL tc; -- int xtrans, ytrans, xscale, yscale, xyscale, yxscale; - calibration ocal = *cal; - -- if (using_xcalibrate) -- { - FILE *fp; - if (flag_debug) - printf ("constants are: %d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); -@@ -304,29 +293,6 @@ set_calibration (calibration *cal) - } - fprintf (fp, "%d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); - fclose (fp); -- return; -- } -- -- xtrans = cal->a[0] / cal->a[6]; -- ytrans = cal->a[3] / cal->a[6]; -- xscale = cal->a[1] * 256 / cal->a[6]; -- yscale = cal->a[5] * 256 / cal->a[6]; -- xyscale = cal->a[2] * 256 / cal->a[6]; -- yxscale = cal->a[4] * 256 / cal->a[6]; -- -- tc.xtrans = xtrans; -- tc.ytrans = ytrans; -- tc.xscale = xscale; -- tc.yscale = yscale; -- tc.xyswap = 0; -- -- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); -- -- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_SET_CAL"); -- exit (1); -- } - } - - void -@@ -398,80 +364,13 @@ handle_ts_event (int x, int y, int press - } - - void --read_ts (void) --{ -- TS_EVENT ts_ev; -- int r; -- -- r = read (ts_fd, &ts_ev, sizeof (ts_ev)); -- if (r == sizeof (ts_ev)) -- handle_ts_event (ts_ev.x, ts_ev.y, ts_ev.pressure); --} -- --void --do_cal (char **args) --{ -- TS_CAL tc; -- -- tc.xscale = atoi (args[0]); -- tc.xtrans = atoi (args[1]); -- tc.yscale = atoi (args[2]); -- tc.ytrans = atoi (args[3]); -- tc.xyswap = atoi (args[4]); -- -- if (flag_debug) -- fprintf (stderr, "setting: %d %d %d %d %d\n", -- tc.xtrans, tc.ytrans, tc.xscale, tc.yscale, tc.xyswap); -- -- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_SET_CAL"); -- exit (1); -- } -- -- exit (0); --} -- --void --show_cal (void) --{ -- TS_CAL tc; -- -- if (ioctl (ts_fd, TS_GET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_GET_CAL"); -- exit (1); -- } -- -- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); --} -- --void - usage (const char *name) - { -- fprintf (stderr, "usage: %s -view\n", name); -- fprintf (stderr, " %s [-rotate <0 | 90 | 180 | 270>]\n", name); -- fprintf (stderr, " %s -cal <xs> <xt> <ys> <yt> <xyswap>\n", name); -- -+ fprintf (stderr, "usage: %s [-debug]\n", name); - exit (1); - } - - int --xrr_supported (void) --{ -- int xrr_event_base, xrr_error_base; -- int xrr_major, xrr_minor; -- -- if (XRRQueryExtension (dpy, &xrr_event_base, &xrr_error_base) == False -- || XRRQueryVersion (dpy, &xrr_major, &xrr_minor) == 0 -- || xrr_major != 1 -- || xrr_minor < 1) -- return 0; -- -- return 1; --} -- --int - main (int argc, char *argv[]) - { - XSetWindowAttributes attributes; -@@ -480,31 +379,11 @@ main (int argc, char *argv[]) - int max_fd; - GC bg_gc; - int i; -- int have_xrandr; - - for (i = 1; i < argc; i++) - { -- if (!strcmp (argv[i], "-view")) -- { -- show_cal (); -- exit (0); -- } -- else if (!strcmp (argv[i], "-debug")) -+ if (!strcmp (argv[i], "-debug")) - flag_debug = 1; -- else if (!strcmp (argv[i], "-cal")) -- { -- if (argc > (i + 5)) -- do_cal (argv + i + 1); -- else -- usage (argv[0]); -- } -- else if (!strcmp (argv[i], "-rotate")) -- { -- if (argc > (i + 1)) -- rotation = atoi (argv[++i]); -- else -- usage (argv[0]); -- } - else - usage (argv[0]); - } -@@ -531,48 +410,11 @@ main (int argc, char *argv[]) - fprintf (stderr, "failed to set raw mode: error %d\n", r); - exit (1); - } -- -- using_xcalibrate = 1; -- } -- -- have_xrandr = xrr_supported (); -- if (have_xrandr) -- { -- XRRScreenConfiguration *rr_screen; -- Rotation current_rotation; -- -- if (flag_debug) -- fprintf (stderr, "XRANDR is supported\n"); -- -- rr_screen = XRRGetScreenInfo (dpy, RootWindow (dpy, screen)); -- -- XRRRotations (dpy, screen, ¤t_rotation); -- -- XRRFreeScreenConfigInfo (rr_screen); -- -- if (flag_debug) -- fprintf (stderr, "Current RANDR rotation is %d\n", current_rotation); -- -- switch (current_rotation) -- { -- case RR_Rotate_270: -- rotation += 90; -- case RR_Rotate_180: -- rotation += 90; -- case RR_Rotate_90: -- rotation += 90; -- rotation %= 360; -- case RR_Rotate_0: -- break; -- default: -- fprintf (stderr, "Unknown RANDR rotation: %d\n", current_rotation); -- break; -- } - } - else - { -- if (flag_debug) -- fprintf (stderr, "XRANDR not supported\n"); -+ perror ("XCALIBRATE extension missing"); -+ exit (1); - } - - attributes.override_redirect = flag_debug ? False : True; -@@ -666,45 +508,17 @@ main (int argc, char *argv[]) - - for (i = 0; i < NR_POINTS; i++) - { -- switch (rotation) -- { -- case 0: -- cal.xfb[i] = cal.xscr[i]; -- cal.yfb[i] = cal.yscr[i]; -- break; -- case 90: -- cal.xfb[i] = cal.yscr[i]; -- cal.yfb[i] = screen_x - cal.xscr[i]; -- break; -- case 180: -- cal.xfb[i] = screen_x - cal.xscr[i]; -- cal.yfb[i] = screen_y - cal.yscr[i]; -- break; -- case 270: -- cal.xfb[i] = screen_y - cal.yscr[i]; -- cal.yfb[i] = cal.xscr[i]; -- break; -- } -+ cal.xfb[i] = cal.xscr[i]; -+ cal.yfb[i] = cal.yscr[i]; -+ XCalibrateScreenToCoord (dpy, &cal.xfb[i], &cal.yfb[i]); - - if (flag_debug) -- printf ("rotation %d: (%d,%d) -> (%d,%d)\n", rotation, -+ printf ("rotation conversion: (%d,%d) -> (%d,%d)\n", - cal.xscr[i], cal.yscr[i], cal.xfb[i], cal.yfb[i]); - } - - next_event (); - -- if (!using_xcalibrate) -- { -- ts_fd = open (RAW_DEVICE, O_RDONLY); -- if (ts_fd < 0) -- { -- perror (RAW_DEVICE); -- exit (1); -- } -- } -- -- max_fd = (xfd > ts_fd) ? xfd : ts_fd; -- - for (;;) - { - fd_set fds; -@@ -713,12 +527,8 @@ main (int argc, char *argv[]) - - FD_ZERO (&fds); - FD_SET (xfd, &fds); -- if (ts_fd != -1) -- FD_SET (ts_fd, &fds); - -- select (max_fd + 1, &fds, NULL, NULL, NULL); -- -- if (ts_fd != -1 && FD_ISSET (ts_fd, &fds)) -- read_ts (); -+ select (xfd + 1, &fds, NULL, NULL, NULL); - } - } -+ -Index: xtscal-0.6.3/configure.ac -=================================================================== ---- xtscal-0.6.3.orig/configure.ac 2004-09-10 20:11:12.000000000 +0100 -+++ xtscal-0.6.3/configure.ac 2007-07-01 01:12:55.000000000 +0100 -@@ -9,8 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - # Checks for programs. - AC_PROG_CC - --PKG_CHECK_MODULES(XTSCAL, x11 xft xext xrandr xcalibrate) -+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) - - AC_CONFIG_FILES([Makefile]) --AC_CONFIG_FILES([xtscal]) - AC_OUTPUT -Index: xtscal-0.6.3/gpe-dist.am -=================================================================== ---- xtscal-0.6.3.orig/gpe-dist.am 2004-06-02 23:07:13.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,12 +0,0 @@ --CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) -- --dist-upload: dist -- scp $(PACKAGE)-$(VERSION).tar.bz2 $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/ -- --tag: -- cvs tag $(CVSTAG) -- --retag: -- cvs tag -F $(CVSTAG) -- --source: tag dist-upload -Index: xtscal-0.6.3/h3600_ts.h -=================================================================== ---- xtscal-0.6.3.orig/h3600_ts.h 2003-07-05 17:27:10.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,216 +0,0 @@ --/* --* --* Driver for the H3600 Touch Screen and other Atmel controlled devices. --* --* Copyright 2000 Compaq Computer Corporation. --* --* Use consistent with the GNU GPL is permitted, --* provided that this copyright notice is --* preserved in its entirety in all copies and derived works. --* --* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED, --* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS --* FITNESS FOR ANY PARTICULAR PURPOSE. --* --* Author: Charles Flynn. --* --*/ -- -- --#ifndef __H3600_TS_H__ --#define __H3600_TS_H__ -- --#include <linux/ioctl.h> -- --enum h3600_ts_minor_devices { -- TS_MINOR = 0, -- TSRAW_MINOR = 1, -- KEY_MINOR = 2 --}; -- --typedef struct h3600_ts_calibration { -- int xscale; -- int xtrans; -- int yscale; -- int ytrans; -- int xyswap; --} TS_CAL; -- --typedef struct h3600_ts_event { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --} TS_EVENT; -- --/* Deprecated - do not use */ --typedef struct h3600_ts_return { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --} TS_RET; -- --enum power_button_mode { -- PBM_SUSPEND = 0, -- PBM_GENERATE_KEYPRESS = 1 --}; -- -- --/* ++++++++++++++ +++++++++++++++++++++++++++++++++++++ */ -- --typedef struct therm_dev { -- short data; --} THERM_DEV; -- --#define H3600_BATT_CHEM_ALKALINE 0x01 --#define H3600_BATT_CHEM_NICD 0x02 --#define H3600_BATT_CHEM_NIMH 0x03 --#define H3600_BATT_CHEM_LION 0x04 --#define H3600_BATT_CHEM_LIPOLY 0x05 --#define H3600_BATT_CHEM_NOT_INSTALLED 0x06 --#define H3600_BATT_CHEM_UNKNOWN 0xff -- --/* These should match the apm_bios.h definitions */ --#define H3600_AC_STATUS_AC_OFFLINE 0x00 --#define H3600_AC_STATUS_AC_ONLINE 0x01 --#define H3600_AC_STATUS_AC_BACKUP 0x02 /* What does this mean? */ --#define H3600_AC_STATUS_AC_UNKNOWN 0xff -- --/* These bitfields are rarely "or'd" together */ --#define H3600_BATT_STATUS_HIGH 0x01 --#define H3600_BATT_STATUS_LOW 0x02 --#define H3600_BATT_STATUS_CRITICAL 0x04 --#define H3600_BATT_STATUS_CHARGING 0x08 --#define H3600_BATT_STATUS_CHARGE_MAIN 0x10 --#define H3600_BATT_STATUS_DEAD 0x20 /* Battery will not charge */ --#define H3600_BATT_NOT_INSTALLED 0x20 /* For expansion pack batteries */ --#define H3600_BATT_STATUS_FULL 0x40 /* Battery fully charged (and connected to AC) */ --#define H3600_BATT_STATUS_NOBATT 0x80 --#define H3600_BATT_STATUS_UNKNOWN 0xff -- --struct battery_data { -- unsigned char chemistry; -- unsigned char status; -- unsigned short voltage; /* Voltage for battery #0; unknown for battery #1 */ -- unsigned short percentage; /* Percentage of full charge */ -- unsigned short life; /* Life remaining in minutes */ --}; -- --struct h3600_battery { -- unsigned char ac_status; -- unsigned char battery_count; /* How many batteries we have */ -- struct battery_data battery[2]; --}; -- --/* -------- EEPROM and SPI Interfaces ---------------*/ -- --#define EEPROM_RD_BUFSIZ 6 /* EEPROM reads are 16 bits */ --#define EEPROM_WR_BUFSIZ 5 /* Allow room for 8bit 'addr' field in buffer*/ --#define SPI_RD_BUFSIZ 16 /* SPI reads are 8 bits */ --#define SPI_WR_BUFSIZ 7 -- --/* The EEPROM is where internal programs are stored on the Amtel. -- You probably don't want to read or write these values */ -- --typedef struct h3600_eeprom_read_request { -- unsigned char addr; /* 8bit Address Offset 0-255 */ -- unsigned char len; /* Number of 16bit words to read 0-128 */ -- unsigned short buff[EEPROM_RD_BUFSIZ]; --} EEPROM_READ; -- --typedef struct h3600_eeprom_write_request { -- unsigned char len; /* used only to compute the number of bytes to send */ -- unsigned char addr; /* 0-128 */ -- unsigned short buff[EEPROM_WR_BUFSIZ]; --} EEPROM_WRITE; -- --/* The SPI bus connects to EEPROMs located on sleeves plugged into -- the iPAQ. You may want to read these values */ -- --typedef struct h3600_spi_read_request { -- unsigned short addr; /* 16bit Address Offset 0-128 */ -- unsigned char len; /* Number of bytes to read */ -- unsigned char buff[SPI_RD_BUFSIZ]; --} SPI_READ; -- --#define SPI_READ_STATUS_BYTE 0xffff /* Use this address to read the status byte */ -- --typedef struct h3600_spi_write_request { -- unsigned short len; /* used only to compute the number of bytes to send */ -- unsigned short addr; /* this 16bit address accesses a single byte */ -- unsigned char buff[SPI_WR_BUFSIZ]; --} SPI_WRITE; -- -- --/* -------- end of EEPROM and SPI Interfaces ---------------*/ -- --/* User space structures for IOCTL calls */ -- --typedef struct h3600_ts_version { -- unsigned char host_version[8]; /* ascii "x.yy" */ -- unsigned char pack_version[8]; /* ascii "x.yy" */ -- unsigned char boot_type; /* TODO ?? */ --} VER_RET; -- --typedef struct h3600_ts_led { -- unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ -- unsigned char TotalTime; /* Units of 5 seconds */ -- unsigned char OnTime; /* units of 100m/s */ -- unsigned char OffTime; /* units of 100m/s */ --} LED_IN; -- --enum flite_mode { -- FLITE_MODE1 = 1, -- FLITE_AUTO_MODE = 1, /* for reference only */ -- FLITE_MANUAL_MODE = 2, /* Use this normally? */ -- FLITE_GET_LIGHT_SENSOR = 3 /* Returns light reading in "brightness" field */ --}; --enum flite_pwr { -- FLITE_PWR_OFF = 0, -- FLITE_PWR_ON = 1 --}; -- --typedef struct h3600_ts_flite { -- unsigned char mode; -- unsigned char pwr; -- unsigned char brightness; --} FLITE_IN; -- --/*************************** Updated "universal" structures *******************/ -- --/* Sets backlight for both H3100 and H3600 models - technically "frontlight" for H3600 */ --struct h3600_ts_backlight { -- enum flite_pwr power; /* 0 = off, 1 = on */ -- unsigned char brightness; /* 0 - 255 */ --}; -- --struct h3600_ts_contrast { /* Only useful on H3100 model */ -- unsigned char contrast; /* 0 - 255 */ --}; -- --/* IOCTL cmds user or kernel space */ -- --/* Use 'f' as magic number */ --#define IOC_H3600_TS_MAGIC 'f' -- --/* TODO: Some of these IOWR values are just plain wrong */ --#define GET_VERSION _IOR(IOC_H3600_TS_MAGIC, 1, struct h3600_ts_version ) --#define READ_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 2, struct h3600_eeprom_read_request) --#define WRITE_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 3, struct h3600_eeprom_write_request) --#define GET_THERMAL _IOR(IOC_H3600_TS_MAGIC, 4, struct therm_dev) --#define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) --#define GET_BATTERY_STATUS _IOR(IOC_H3600_TS_MAGIC, 6, struct h3600_battery) --#define FLITE_ON _IOW(IOC_H3600_TS_MAGIC, 7, struct h3600_ts_flite) --#define READ_SPI _IOWR(IOC_H3600_TS_MAGIC, 8, struct h3600_spi_read_request) --#define WRITE_SPI _IOWR(IOC_H3600_TS_MAGIC, 9, struct h3600_spi_write_request) --#define TS_GET_CAL _IOR(IOC_H3600_TS_MAGIC, 10, struct h3600_ts_calibration) --#define TS_SET_CAL _IOW(IOC_H3600_TS_MAGIC, 11, struct h3600_ts_calibration) -- --/* New IOCTL interfaces - defined to be more user friendly */ --#define TS_GET_BACKLIGHT _IOR(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) --#define TS_SET_BACKLIGHT _IOW(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) --#define TS_GET_CONTRAST _IOR(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) --#define TS_SET_CONTRAST _IOW(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) -- --#endif -Index: xtscal-0.6.3/Makefile.am -=================================================================== ---- xtscal-0.6.3.orig/Makefile.am 2004-06-02 23:07:13.000000000 +0100 -+++ xtscal-0.6.3/Makefile.am 2007-07-02 12:51:02.000000000 +0100 -@@ -1,11 +1,8 @@ --libexec_PROGRAMS = xtscal.bin --bin_SCRIPTS = xtscal -+bin_PROGRAMS = xtscal - --xtscal_bin_SOURCES = main.c calibrate.c calibrate.h h3600_ts.h -+xtscal_SOURCES = main.c calibrate.c calibrate.h - --xtscal_bin_LDADD = @XTSCAL_LIBS@ -+xtscal_LDADD = @XTSCAL_LIBS@ - - INCLUDES = @XTSCAL_CFLAGS@ -DNR_POINTS=5 - --include gpe-dist.am -- diff --git a/yocto-poky/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/yocto-poky/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch deleted file mode 100644 index 3e4533f78..000000000 --- a/yocto-poky/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -after gcc linking has changed, all the libraries must be explicitely specified -This patch avoids this linking error: - -| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o xtscal main.o calibrate.o -lX11 -lXft -lXext -lXcalibrate^M -| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: ^?: invalid DSO for symbol `XRenderChangePicture' definition^M -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make: *** [xtscal] Error 1 - -Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2011/01/11 - -Upstream-Status: Pending - -Index: xtscal-0.6.3/configure.ac -=================================================================== ---- xtscal-0.6.3.orig/configure.ac -+++ xtscal-0.6.3/configure.ac -@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - # Checks for programs. - AC_PROG_CC - --PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) -+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate xrender) - - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT diff --git a/yocto-poky/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb b/yocto-poky/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb deleted file mode 100644 index 4bfddf06b..000000000 --- a/yocto-poky/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Touchscreen calibration utility" - -DESCRIPTION = "Basic touchscreen calibration utility" - -HOMEPAGE = "http://gpe.linuxtogo.org" -BUGTRACKER = "http://bugs.linuxtogo.org" -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://main.c;endline=10;md5=8721bcb08ae9f24e5fe4c82941873c87" - -SECTION = "x11/base" - -DEPENDS = "virtual/libx11 libxft libxcalibrate" - -PR = "r13" - -SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ - file://change-cross.patch \ - file://cleanup.patch \ - file://dso_linking_change_build_fix.patch \ - file://30xTs_Calibrate.sh" - -SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" -SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d/ - install -m 0755 ${WORKDIR}/30xTs_Calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ -} diff --git a/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb deleted file mode 100644 index 51839ddf7..000000000 --- a/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Simple XVideo test application" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://src/test-xvideo.c;beginline=1;endline=20;md5=6ae3b4c3c2ff9e51dbbc35bb237afa00" -DEPENDS = "libxv" - -SRCREV = "7d38b881e99eb74169d292b40f7164e461a65092" -PV = "0.1+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/test-xvideo" - -S = "${WORKDIR}/git" - -inherit autotools distro_features_check - -# The libxv requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" |
