diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-graphics | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-graphics')
390 files changed, 16993 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cairo/cairo-fpu.inc b/meta/recipes-graphics/cairo/cairo-fpu.inc new file mode 100644 index 0000000000..ef72e8904b --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo-fpu.inc | |||
@@ -0,0 +1,6 @@ | |||
1 | |||
2 | def get_cairo_fpu_setting(bb, d): | ||
3 | if d.getVar('TARGET_FPU', True) in [ 'soft' ]: | ||
4 | return "--disable-some-floating-point" | ||
5 | return "" | ||
6 | |||
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc new file mode 100644 index 0000000000..cd375597f0 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo.inc | |||
@@ -0,0 +1,39 @@ | |||
1 | SUMMARY = "The Cairo 2D vector graphics library" | ||
2 | DESCRIPTION = "Cairo is a multi-platform library providing anti-aliased \ | ||
3 | vector-based rendering for multiple target backends. Paths consist \ | ||
4 | of line segments and cubic splines and can be rendered at any width \ | ||
5 | with various join and cap styles. All colors may be specified with \ | ||
6 | optional translucence (opacity/alpha) and combined using the \ | ||
7 | extended Porter/Duff compositing algebra as found in the X Render \ | ||
8 | Extension." | ||
9 | HOMEPAGE = "http://cairographics.org" | ||
10 | BUGTRACKER = "http://bugs.freedesktop.org" | ||
11 | SECTION = "libs" | ||
12 | LICENSE = "MPL-1 & LGPLv2.1" | ||
13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" | ||
14 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" | ||
15 | |||
16 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
17 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | ||
18 | PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" | ||
19 | PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" | ||
20 | PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" | ||
21 | PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" | ||
22 | PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" | ||
23 | |||
24 | #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points | ||
25 | require cairo-fpu.inc | ||
26 | EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \ | ||
27 | --enable-tee \ | ||
28 | " | ||
29 | |||
30 | inherit autotools pkgconfig | ||
31 | |||
32 | # We don't depend on binutils so we need to disable this | ||
33 | export ac_cv_lib_bfd_bfd_openr="no" | ||
34 | # Ensure we don't depend on LZO | ||
35 | export ac_cv_lib_lzo2_lzo2a_decompress="no" | ||
36 | |||
37 | BBCLASSEXTEND = "native" | ||
38 | |||
39 | CFLAGS += "-ffat-lto-objects" | ||
diff --git a/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch b/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch new file mode 100644 index 0000000000..87297b25b4 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From bdf15c249130568093676ed3b6c91f6f5e06f089 Mon Sep 17 00:00:00 2001 | ||
2 | From: Uli Schlachter <psychon@znc.in> | ||
3 | Date: Mon, 21 Jul 2014 17:10:16 +0200 | ||
4 | Subject: [PATCH] Remove LTO support | ||
5 | |||
6 | This just never worked too well and caused too many issues. I don't think anyone | ||
7 | will miss this. | ||
8 | |||
9 | As mentioned in the below bug report, proper LTO support also requires using | ||
10 | special versions of ranlib, nm and ar which support the LTO object files. | ||
11 | Otherwise, calling the normal ranlib on an .a library breaks the list of | ||
12 | exported symbols and thus completely breaks the static library. | ||
13 | |||
14 | This (partly) reverts the following commits: | ||
15 | |||
16 | c3645d97ebd24c6f7ad850785d585aebc706a11c configure.ac: Add a --disable-lto configure option | ||
17 | d486ea30f1a58640a1178de74f705a73845b1cda configure: Conditionally include -flto | ||
18 | 0870c6fb5b39dcc04fa376123848adde2d06d2ce gcc-4.5 warnings and optimisation flags. | ||
19 | |||
20 | (The last commit is the one which brought us -flto in the first place even | ||
21 | though it doesn't talk about this. It's also the one which is only reverted | ||
22 | partly.) | ||
23 | |||
24 | Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=77060 | ||
25 | CC: Chris Wilson <chris@chris-wilson.co.uk> | ||
26 | Signed-off-by: Uli Schlachter <psychon@znc.in> | ||
27 | Reviewed-by: Bryce Harrington <b.harrington@samsung.com> | ||
28 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
29 | |||
30 | Upstream-Status: Backport (will be in 1.14*) | ||
31 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
32 | --- | ||
33 | build/configure.ac.warnings | 11 ----------- | ||
34 | 1 file changed, 11 deletions(-) | ||
35 | |||
36 | diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings | ||
37 | index f984eb2..2c4e34d 100644 | ||
38 | --- a/build/configure.ac.warnings | ||
39 | +++ b/build/configure.ac.warnings | ||
40 | @@ -35,17 +35,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ | ||
41 | |||
42 | dnl We also abuse the warning-flag facility to enable other compiler | ||
43 | dnl options. Namely, the following: | ||
44 | - | ||
45 | -dnl -flto working really needs a test link, not just a compile | ||
46 | - | ||
47 | -safe_MAYBE_WARN="$MAYBE_WARN" | ||
48 | -MAYBE_WARN="$MAYBE_WARN -flto" | ||
49 | -AC_TRY_LINK([],[ | ||
50 | - int main(int argc, char **argv) { return 0; } | ||
51 | -],[],[ | ||
52 | - MAYBE_WARN="$safe_MAYBE_WARN" | ||
53 | -]) | ||
54 | - | ||
55 | MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" | ||
56 | |||
57 | dnl Also to turn various gcc/glibc-specific preprocessor checks | ||
58 | -- | ||
59 | 2.0.2 | ||
60 | |||
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.16.bb b/meta/recipes-graphics/cairo/cairo_1.12.16.bb new file mode 100644 index 0000000000..42f7682607 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo_1.12.16.bb | |||
@@ -0,0 +1,47 @@ | |||
1 | require cairo.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" | ||
4 | |||
5 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ | ||
6 | file://0001-Remove-LTO-support.patch \ | ||
7 | " | ||
8 | |||
9 | SRC_URI[md5sum] = "a1304edcdc99282f478b995ee5f8f854" | ||
10 | SRC_URI[sha256sum] = "2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846" | ||
11 | |||
12 | PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" | ||
13 | |||
14 | SUMMARY_${PN} = "The Cairo 2D vector graphics library" | ||
15 | DESCRIPTION_${PN} = "Cairo is a multi-platform library providing anti-aliased \ | ||
16 | vector-based rendering for multiple target backends. Paths consist \ | ||
17 | of line segments and cubic splines and can be rendered at any width \ | ||
18 | with various join and cap styles. All colors may be specified with \ | ||
19 | optional translucence (opacity/alpha) and combined using the \ | ||
20 | extended Porter/Duff compositing algebra as found in the X Render \ | ||
21 | Extension." | ||
22 | |||
23 | SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library" | ||
24 | DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API." | ||
25 | |||
26 | SUMMARY_cairo-script-interpreter = "The Cairo library script interpreter" | ||
27 | DESCRIPTION_cairo-script-interpreter = "The Cairo script interpreter implements \ | ||
28 | CairoScript. CairoScript is used by tracing utilities to enable the ability \ | ||
29 | to replay rendering." | ||
30 | |||
31 | DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" | ||
32 | |||
33 | FILES_${PN} = "${libdir}/libcairo.so.*" | ||
34 | FILES_${PN}-dev += "${libdir}/cairo/*.la ${libdir}/cairo/*.so" | ||
35 | #FILES_${PN}-dbg += "${libdir}/cairo/.debug" | ||
36 | #FILES_${PN}-staticdev += "${libdir}/cairo/*.a" | ||
37 | FILES_cairo-gobject = "${libdir}/libcairo-gobject.so.*" | ||
38 | FILES_cairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" | ||
39 | FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*" | ||
40 | |||
41 | do_install_append () { | ||
42 | rm -rf ${D}${bindir}/cairo-sphinx | ||
43 | rm -rf ${D}${libdir}/cairo/cairo-fdr* | ||
44 | rm -rf ${D}${libdir}/cairo/cairo-sphinx* | ||
45 | rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* | ||
46 | rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* | ||
47 | } | ||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 0000000000..77035d746f --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc | |||
@@ -0,0 +1,45 @@ | |||
1 | SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" | ||
2 | HOMEPAGE = "http://www.clutter-project.org/" | ||
3 | LICENSE = "LGPLv2.1+" | ||
4 | |||
5 | inherit clutter | ||
6 | |||
7 | DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" | ||
8 | PACKAGE_BEFORE_PN += "${PN}-examples" | ||
9 | AUTOTOOLS_AUXDIR = "${S}/build" | ||
10 | |||
11 | EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" | ||
12 | EDEPENDS_GLX = "virtual/libgl" | ||
13 | EDEPENDS_EGL = "virtual/egl" | ||
14 | EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf" | ||
15 | |||
16 | EDEPENDS_EVDEV = "libxkbcommon" | ||
17 | ERDEPENDS_EVDEV = "xkeyboard-config" | ||
18 | |||
19 | # Disable pretty much everything, override in platform specific set up | ||
20 | EXTRA_OECONF += "--disable-introspection \ | ||
21 | --disable-quartz-backend \ | ||
22 | --disable-win32-backend \ | ||
23 | --disable-gdk-backend \ | ||
24 | --disable-cex100-backend \ | ||
25 | --disable-tslib-input \ | ||
26 | " | ||
27 | |||
28 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" | ||
29 | PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" | ||
30 | PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" | ||
31 | PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" | ||
32 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}" | ||
33 | PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" | ||
34 | |||
35 | # Default configuration, distros might want to override | ||
36 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ | ||
37 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" | ||
38 | |||
39 | FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug" | ||
40 | FILES_${PN}-examples = "${libdir}/clutter/examples" | ||
41 | |||
42 | do_configure_prepend() { | ||
43 | # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this | ||
44 | touch -t 200001010000 ${S}/po/clutter-1.0.pot | ||
45 | } | ||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch new file mode 100644 index 0000000000..3b6a70ef0a --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Install the examples to $libdir/clutter/. | ||
2 | |||
3 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
4 | Upstream-Status: Inappropriate | ||
5 | |||
6 | diff --git a/examples/Makefile.am b/examples/Makefile.am | ||
7 | index 4b9b449..232cd19 100644 | ||
8 | --- a/examples/Makefile.am | ||
9 | +++ b/examples/Makefile.am | ||
10 | @@ -38,6 +38,7 @@ AM_CPPFLAGS = \ | ||
11 | -I$(top_srcdir)/clutter \ | ||
12 | -I$(top_builddir)/clutter | ||
13 | |||
14 | -noinst_PROGRAMS = $(all_examples) | ||
15 | +exampledir = $(pkglibdir)/examples | ||
16 | +example_PROGRAMS = $(all_examples) | ||
17 | |||
18 | EXTRA_DIST = redhand.png | ||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb new file mode 100644 index 0000000000..452e7eefd0 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require clutter-1.0.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
4 | |||
5 | SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29" | ||
6 | SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63" | ||
7 | |||
8 | SRC_URI += "file://install-examples.patch" | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch new file mode 100644 index 0000000000..d009e44c34 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomas Frydrych <tomas@sleepfive.com> | ||
3 | Date: Thu, 11 Oct 2012 08:53:03 +0100 | ||
4 | Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against | ||
5 | cogl-1.14 | ||
6 | |||
7 | Cogl 1.14 exposes various GL types through the public API but it does not | ||
8 | pull in the GL type definitions through its public headers; specifically | ||
9 | compilation will fail due to undefined GL_TEXTURE_2D. So include the headers | ||
10 | the hard way. | ||
11 | |||
12 | Upstream-Status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 | ||
13 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
14 | --- | ||
15 | clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++ | ||
16 | 1 file changed, 17 insertions(+) | ||
17 | |||
18 | diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c | ||
19 | index 9b4b53c..f092581 100644 | ||
20 | --- a/clutter-gst/clutter-gst-video-sink.c | ||
21 | +++ b/clutter-gst/clutter-gst-video-sink.c | ||
22 | @@ -42,6 +42,23 @@ | ||
23 | #include "config.h" | ||
24 | #endif | ||
25 | |||
26 | +/* | ||
27 | + * cogl-1.14 exposes generic GL types in the API, but not the actual includes. | ||
28 | + */ | ||
29 | +#include <cogl/cogl.h> | ||
30 | + | ||
31 | +#ifdef COGL_HAS_GLES1 | ||
32 | +#include <GLES/gl.h> | ||
33 | +#include <GLES/glext.h> | ||
34 | +#elif COGL_HAS_GLES2 | ||
35 | +#include <GLES2/gl2.h> | ||
36 | +#include <GLES2/gl2ext.h> | ||
37 | +#elif COGL_HAS_GL | ||
38 | +#include <GL/gl.h> | ||
39 | +#else | ||
40 | +#error Unknown cogl configuration | ||
41 | +#endif | ||
42 | + | ||
43 | #include "clutter-gst-video-sink.h" | ||
44 | #include "clutter-gst-util.h" | ||
45 | #include "clutter-gst-private.h" | ||
46 | -- | ||
47 | 1.7.10.4 | ||
48 | |||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch new file mode 100644 index 0000000000..b3aec392e6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Install example binary needed for core-image-clutter | ||
2 | |||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, | ||
8 | commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 | ||
9 | |||
10 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
11 | |||
12 | Index: git/examples/Makefile.am | ||
13 | =================================================================== | ||
14 | --- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800 | ||
15 | +++ git/examples/Makefile.am 2011-01-31 10:14:34.000000000 +0800 | ||
16 | @@ -1,6 +1,6 @@ | ||
17 | NULL = # | ||
18 | |||
19 | -noinst_PROGRAMS = video-player video-sink video-sink-navigation | ||
20 | +bin_PROGRAMS = video-player video-sink video-sink-navigation | ||
21 | |||
22 | INCLUDES = -I$(top_srcdir) \ | ||
23 | $(MAINTAINER_CFLAGS) \ | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc new file mode 100644 index 0000000000..bb05ede624 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "GStreamer integration library for Clutter" | ||
2 | HOMEPAGE = "http://www.clutter-project.org/" | ||
3 | LICENSE = "LGPLv2+" | ||
4 | |||
5 | inherit clutter | ||
6 | |||
7 | SRC_URI += "file://enable-tests.patch" | ||
8 | |||
9 | DEPENDS = "gst-plugins-base gst-plugins-bad clutter-1.0" | ||
10 | RDEPENDS_${PN} += "gst-meta-base" | ||
11 | PACKAGES =+ "${PN}-examples" | ||
12 | |||
13 | EXTRA_OECONF += "--disable-introspection" | ||
14 | |||
15 | FILES_${PN} += "${libdir}/gstreamer-0.10/lib*.so" | ||
16 | FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la" | ||
17 | FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/lib*.so" | ||
18 | FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb new file mode 100644 index 0000000000..dc5cc13053 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require clutter-gst-1.0.inc | ||
2 | |||
3 | SRC_URI += "file://cogl-1.14.patch" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | ||
6 | file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" | ||
7 | |||
8 | SRC_URI[archive.md5sum] = "d60ab0118730cecd5dd9988ad7da034b" | ||
9 | SRC_URI[archive.sha256sum] = "abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622" | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 0000000000..45898b4d60 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | |||
@@ -0,0 +1,12 @@ | |||
1 | SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" | ||
2 | HOMEPAGE = "http://www.clutter-project.org/" | ||
3 | LICENSE = "LGPLv2+" | ||
4 | |||
5 | inherit clutter | ||
6 | |||
7 | DEPENDS = "clutter-1.0 gtk+3" | ||
8 | PACKAGES =+ "${PN}-examples" | ||
9 | AUTOTOOLS_AUXDIR = "${S}/build" | ||
10 | |||
11 | EXTRA_OECONF += "--disable-introspection" | ||
12 | |||
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb new file mode 100644 index 0000000000..37a035c514 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require clutter-gtk-1.0.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | ||
4 | |||
5 | SRC_URI[archive.md5sum] = "ef50b52ffc2a18704eb62f13dd8d6198" | ||
6 | SRC_URI[archive.sha256sum] = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e" | ||
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 0000000000..b763dd5ba8 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc | |||
@@ -0,0 +1,88 @@ | |||
1 | SUMMARY = "Modern 3D graphics API with associated utility APIs" | ||
2 | HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" | ||
3 | LICENSE = "MIT" | ||
4 | |||
5 | inherit clutter | ||
6 | |||
7 | DEPENDS = "glib-2.0 gdk-pixbuf" | ||
8 | PACKAGES =+ "${PN}-examples \ | ||
9 | libcogl libcogl-dev \ | ||
10 | libcogl-gles2 libcogl-gles2-dev \ | ||
11 | libcogl-pango libcogl-pango-dev \ | ||
12 | libcogl-path libcogl-path-dev" | ||
13 | AUTOTOOLS_AUXDIR = "${S}/build" | ||
14 | |||
15 | # Extra DEPENDS for PACKAGECONFIG | ||
16 | EDEPENDS_GL = "virtual/libgl libdrm" | ||
17 | EDEPENDS_GLES2 = "virtual/libgles2" | ||
18 | EDEPENDS_KMS = "libdrm virtual/egl" | ||
19 | EDEPENDS_EGL = "virtual/egl" | ||
20 | EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" | ||
21 | EDEPENDS_WAYLAND = "virtual/mesa wayland" | ||
22 | |||
23 | # Extra RDEPENDS for PACKAGECONFIG | ||
24 | # This has to be explictly listed, because cogl dlopens the backends | ||
25 | ERDEPENDS_GL = "libgl" | ||
26 | ERDEPENDS_GLES2 = "libgles2" | ||
27 | |||
28 | # GLESv1 is rarely tested, so disable it | ||
29 | EXTRA_OECONF += "--disable-introspection \ | ||
30 | --enable-examples-install \ | ||
31 | --enable-debug \ | ||
32 | --disable-gles1 \ | ||
33 | --disable-cairo \ | ||
34 | " | ||
35 | |||
36 | # OpenGL/GLX | ||
37 | PACKAGECONFIG[glx] = "--enable-gl --enable-glx,--disable-gl --disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11},${ERDEPENDS_GL}" | ||
38 | |||
39 | # GLESv2 | ||
40 | PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" | ||
41 | |||
42 | # EGL backends | ||
43 | PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" | ||
44 | PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" | ||
45 | PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" | ||
46 | PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" | ||
47 | |||
48 | # Wayland (server-side) | ||
49 | PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" | ||
50 | |||
51 | # Support rendering text directly with Pango | ||
52 | PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" | ||
53 | |||
54 | # Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by | ||
55 | # default. | ||
56 | PACKAGECONFIG ??= "cogl-pango gles2 \ | ||
57 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ | ||
58 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" | ||
59 | |||
60 | FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" | ||
61 | FILES_libcogl = "${libdir}/libcogl${SOLIBS}" | ||
62 | FILES_libcogl-dev = "${includedir}/cogl/cogl \ | ||
63 | ${libdir}/libcogl${SOLIBSDEV} \ | ||
64 | ${libdir}/libcogl.la \ | ||
65 | ${libdir}/pkgconfig/cogl-1.0.pc \ | ||
66 | ${libdir}/pkgconfig/cogl-2.0-experimental.pc \ | ||
67 | ${libdir}/pkgconfig/cogl-gl-1.0.pc" | ||
68 | FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" | ||
69 | FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \ | ||
70 | ${libdir}/libcogl-gles2${SOLIBSDEV} \ | ||
71 | ${libdir}/libcogl-gles2.la \ | ||
72 | ${libdir}/pkgconfig/cogl-gles2-experimental.pc" | ||
73 | FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" | ||
74 | FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \ | ||
75 | ${libdir}/libcogl-pango${SOLIBSDEV} \ | ||
76 | ${libdir}/libcogl-pango.la \ | ||
77 | ${libdir}/pkgconfig/cogl-pango-1.0.pc" | ||
78 | |||
79 | FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" | ||
80 | FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \ | ||
81 | ${libdir}/libcogl-path${SOLIBSDEV} \ | ||
82 | ${libdir}/libcogl-path.la \ | ||
83 | ${libdir}/pkgconfig/cogl-path-1.0.pc" | ||
84 | |||
85 | # For backwards compatibility after Debian-renaming | ||
86 | RPROVIDES_libcogl = "cogl-1.0" | ||
87 | RCONFLICTS_libcogl = "cogl-1.0" | ||
88 | RREPLACES_libcogl = "cogl-1.0" | ||
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb new file mode 100644 index 0000000000..6700efb66b --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require cogl-1.0.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" | ||
4 | |||
5 | SRC_URI[archive.md5sum] = "952155d526d35f297737266408e842b5" | ||
6 | SRC_URI[archive.sha256sum] = "9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa" | ||
diff --git a/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch b/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch new file mode 100644 index 0000000000..0717ea6f88 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 88077ed156a714f32bb408f422278d61611ffd41 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Sat, 26 Jul 2014 16:57:46 -0300 | ||
4 | Subject: [PATCH] configure.in: Fix string argument syntax | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | |||
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
9 | --- | ||
10 | configure.in | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure.in b/configure.in | ||
14 | index bfe1b82..e939bbd 100644 | ||
15 | --- a/configure.in | ||
16 | +++ b/configure.in | ||
17 | @@ -65,7 +65,7 @@ fi) | ||
18 | |||
19 | DIRECTFB_REQUIRED_VERSION=1.4.14 | ||
20 | |||
21 | -PKG_CHECK_MODULES(DIRECTFB, directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], | ||
22 | +PKG_CHECK_MODULES([DIRECTFB], directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], | ||
23 | AC_MSG_ERROR([$DIRECTFB_PKG_ERRORS | ||
24 | *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest version | ||
25 | *** of DirectFB is available from http://www.directfb.org/.])) | ||
26 | -- | ||
27 | 1.7.10.4 | ||
28 | |||
diff --git a/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb new file mode 100644 index 0000000000..9c3e8bf3d3 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "Example DirectFB applications" | ||
2 | DESCRIPTION = "The DirectFB-examples package contains a set of simple DirectFB \ | ||
3 | applications that can be used to test and demonstrate various DirectFB \ | ||
4 | features" | ||
5 | DEPENDS = "directfb" | ||
6 | SECTION = "libs" | ||
7 | LICENSE = "MIT" | ||
8 | |||
9 | SRC_URI = " \ | ||
10 | http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \ | ||
11 | file://configure.in-Fix-string-argument-syntax.patch \ | ||
12 | " | ||
13 | |||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f" | ||
15 | |||
16 | S = "${WORKDIR}/DirectFB-examples-${PV}" | ||
17 | |||
18 | inherit autotools pkgconfig | ||
19 | |||
20 | SRC_URI[md5sum] = "8b60c867af295481c32a8c7fc5802307" | ||
21 | SRC_URI[sha256sum] = "9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a" | ||
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc new file mode 100644 index 0000000000..669c0ffd9d --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb.inc | |||
@@ -0,0 +1,76 @@ | |||
1 | SUMMARY = "Graphics abstraction library for the Linux Framebuffer Device" | ||
2 | DESCRIPTION = "DirectFB is a thin library that provides developers \ | ||
3 | with hardware graphics acceleration, input device handling and \ | ||
4 | abstraction, an integrated windowing system with support for \ | ||
5 | translucent windows and multiple display layers on top of the \ | ||
6 | Linux framebuffer device." | ||
7 | SECTION = "libs" | ||
8 | LICENSE = "LGPLv2.1" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" | ||
10 | |||
11 | HOMEPAGE = "http://directfb.org" | ||
12 | DEPENDS = "jpeg libpng freetype zlib tslib" | ||
13 | |||
14 | SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ | ||
15 | file://configurefix.patch \ | ||
16 | file://fusion.patch" | ||
17 | |||
18 | S = "${WORKDIR}/DirectFB-${PV}" | ||
19 | |||
20 | LDFLAGS_append =" -lts -lm" | ||
21 | |||
22 | BINCONFIG = "${bindir}/directfb-config" | ||
23 | |||
24 | inherit autotools binconfig-disabled pkgconfig | ||
25 | |||
26 | PACKAGECONFIG ??= "" | ||
27 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" | ||
28 | PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" | ||
29 | PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" | ||
30 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | ||
31 | |||
32 | EXTRA_OECONF = "\ | ||
33 | --with-gfxdrivers=none \ | ||
34 | --enable-libmpeg3=no \ | ||
35 | --enable-freetype=yes \ | ||
36 | --enable-sdl=no \ | ||
37 | --enable-vnc=no \ | ||
38 | --disable-x11 \ | ||
39 | --disable-mesa \ | ||
40 | " | ||
41 | |||
42 | #Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default | ||
43 | #this will cause directfb build failure on x86 arch, so filter out it. | ||
44 | TARGET_CFLAGS_x86 := "${@oe_filter_out('-fno-omit-frame-pointer', '${TARGET_CFLAGS}', d)}" | ||
45 | |||
46 | #PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*" | ||
47 | # | ||
48 | #python populate_packages_prepend () { | ||
49 | # inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') | ||
50 | # do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') | ||
51 | #} | ||
52 | |||
53 | # NOTE: monolithic packaging for now, should improve that eventually | ||
54 | |||
55 | |||
56 | |||
57 | FILES_${PN}-dbg += "\ | ||
58 | ${libdir}/directfb-${RV}/*/*/.debug/*.so \ | ||
59 | ${libdir}/directfb-${RV}/*/.debug/*.so \ | ||
60 | " | ||
61 | |||
62 | FILES_${PN}-dev += "\ | ||
63 | ${bindir}/directfb-config \ | ||
64 | ${libdir}/directfb-${RV}/systems/*.la \ | ||
65 | ${libdir}/directfb-${RV}/inputdrivers/*.la \ | ||
66 | ${libdir}/directfb-${RV}/interfaces/*/*.la \ | ||
67 | ${libdir}/directfb-${RV}/wm/*.la \ | ||
68 | " | ||
69 | |||
70 | FILES_${PN} += "\ | ||
71 | ${libdir}/directfb-${RV}/systems/*.so \ | ||
72 | ${libdir}/directfb-${RV}/inputdrivers/*.so \ | ||
73 | ${libdir}/directfb-${RV}/interfaces/*/*.so \ | ||
74 | ${libdir}/directfb-${RV}/wm/*.so \ | ||
75 | ${datadir}/directfb-${PV} \ | ||
76 | " | ||
diff --git a/meta/recipes-graphics/directfb/directfb/configurefix.patch b/meta/recipes-graphics/directfb/directfb/configurefix.patch new file mode 100644 index 0000000000..dd8c01905f --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/configurefix.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | Libtool needs these set correctly else we end up with pointless rpaths | ||
2 | such as the QA warnings: | ||
3 | |||
4 | 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 | ||
5 | 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 | ||
6 | 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 | ||
7 | 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 | ||
8 | 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 | ||
9 | 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 | ||
10 | 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 | ||
11 | 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 | ||
12 | 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 | ||
13 | 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 | ||
14 | 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 | ||
15 | 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 | ||
16 | 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 | ||
17 | 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 | ||
18 | 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 | ||
19 | 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 | ||
20 | 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 | ||
21 | 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 | ||
22 | 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 | ||
23 | 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 | ||
24 | 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 | ||
25 | 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 | ||
26 | 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 | ||
27 | 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 | ||
28 | 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 | ||
29 | 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 | ||
30 | 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 | ||
31 | 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 | ||
32 | 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 | ||
33 | 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 | ||
34 | 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 | ||
35 | 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 | ||
36 | 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 | ||
37 | 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 | ||
38 | |||
39 | Upstream-Status: Pending | ||
40 | |||
41 | RP 2012/03/16 | ||
42 | |||
43 | Index: DirectFB-1.4.15/configure.in | ||
44 | =================================================================== | ||
45 | --- DirectFB-1.4.15.orig/configure.in 2012-03-16 13:32:23.692402879 +0000 | ||
46 | +++ DirectFB-1.4.15/configure.in 2012-03-16 13:33:22.312400960 +0000 | ||
47 | @@ -97,13 +97,6 @@ | ||
48 | AC_CHECK_SIZEOF(long long) | ||
49 | AC_CHECK_FUNCS(fork) | ||
50 | |||
51 | - | ||
52 | -## Work around libstuhl during cross build... | ||
53 | -if test "$host" != "$build"; then | ||
54 | - sys_lib_dlsearch_path_spec="" | ||
55 | - sys_lib_search_path_spec="" | ||
56 | -fi | ||
57 | - | ||
58 | AC_PATH_PROGS(PERL, perl5 perl) | ||
59 | |||
60 | AC_PATH_PROG(MAN2HTML, man2html, no) | ||
diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch new file mode 100644 index 0000000000..94a9ba5f02 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Fix out of tree builds | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | RP 2013/03/21 | ||
6 | |||
7 | Index: DirectFB-1.6.1/configure.in | ||
8 | =================================================================== | ||
9 | --- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 | ||
10 | +++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 | ||
11 | @@ -111,7 +111,7 @@ | ||
12 | AC_PATH_TOOL(FLUXCOMP, fluxcomp) | ||
13 | AC_SUBST(FLUXCOMP) | ||
14 | if test -z "$FLUXCOMP"; then | ||
15 | - if ! test -e src/core/CoreDFB.cpp; then | ||
16 | + if ! test -e $srcdir/src/core/CoreDFB.cpp; then | ||
17 | AC_MSG_ERROR([ | ||
18 | *** DirectFB compilation requires fluxcomp *** | ||
19 | |||
diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch b/meta/recipes-graphics/directfb/directfb/fusion.patch new file mode 100644 index 0000000000..1f81a6796c --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/fusion.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | directfb: Fix for hangs in direct_test, fusion_skirmish on exit | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Lauren Post <lauren.post@freescale.com> | ||
5 | |||
6 | --- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800 | ||
7 | +++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800 | ||
8 | @@ -2853,9 +2853,14 @@ | ||
9 | direct_mutex_lock( &world->event_dispatcher_mutex ); | ||
10 | |||
11 | while (1) { | ||
12 | - if (!world->event_dispatcher_buffers) | ||
13 | + if (!world->event_dispatcher_buffers){ | ||
14 | direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); | ||
15 | - | ||
16 | + if (world->dispatch_stop) { | ||
17 | + D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); | ||
18 | + direct_mutex_unlock( &world->event_dispatcher_mutex ); | ||
19 | + return NULL; | ||
20 | + } | ||
21 | + } | ||
22 | buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; | ||
23 | D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer ); | ||
24 | |||
25 | @@ -2872,6 +2877,11 @@ | ||
26 | //D_INFO("waiting...\n"); | ||
27 | D_ASSERT( buf->read_pos == buf->write_pos ); | ||
28 | direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); | ||
29 | + if (world->dispatch_stop) { | ||
30 | + D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); | ||
31 | + direct_mutex_unlock( &world->event_dispatcher_mutex ); | ||
32 | + return NULL; | ||
33 | + } | ||
34 | } | ||
35 | |||
36 | buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; | ||
diff --git a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch new file mode 100644 index 0000000000..443df5a9da --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch | |||
@@ -0,0 +1,345 @@ | |||
1 | Rename __no_instrument_function__ macro to avoid conficting redefinitions | ||
2 | of the same symbol. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
6 | |||
7 | Index: DirectFB-1.6.1/lib/direct/clock.c | ||
8 | =================================================================== | ||
9 | --- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300 | ||
10 | +++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200 | ||
11 | @@ -36,28 +36,28 @@ | ||
12 | |||
13 | /**********************************************************************************************************************/ | ||
14 | |||
15 | -__no_instrument_function__ | ||
16 | +__dfb_no_instrument_function__ | ||
17 | long long | ||
18 | direct_clock_get_micros( void ) | ||
19 | { | ||
20 | return direct_clock_get_time( DIRECT_CLOCK_SESSION ); | ||
21 | } | ||
22 | |||
23 | -__no_instrument_function__ | ||
24 | +__dfb_no_instrument_function__ | ||
25 | long long | ||
26 | direct_clock_get_millis( void ) | ||
27 | { | ||
28 | return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL; | ||
29 | } | ||
30 | |||
31 | -__no_instrument_function__ | ||
32 | +__dfb_no_instrument_function__ | ||
33 | long long | ||
34 | direct_clock_get_abs_micros( void ) | ||
35 | { | ||
36 | return direct_clock_get_time( DIRECT_CLOCK_REALTIME ); | ||
37 | } | ||
38 | |||
39 | -__no_instrument_function__ | ||
40 | +__dfb_no_instrument_function__ | ||
41 | long long | ||
42 | direct_clock_get_abs_millis( void ) | ||
43 | { | ||
44 | Index: DirectFB-1.6.1/lib/direct/debug.c | ||
45 | =================================================================== | ||
46 | --- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300 | ||
47 | +++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200 | ||
48 | @@ -48,7 +48,7 @@ | ||
49 | |||
50 | #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ | ||
51 | |||
52 | -__no_instrument_function__ | ||
53 | +__dfb_no_instrument_function__ | ||
54 | void | ||
55 | direct_debug_log( DirectLogDomain *domain, | ||
56 | unsigned int debug_level, /* 1-9, 0 = info */ | ||
57 | @@ -63,7 +63,7 @@ | ||
58 | va_end( ap ); | ||
59 | } | ||
60 | |||
61 | -__no_instrument_function__ | ||
62 | +__dfb_no_instrument_function__ | ||
63 | void | ||
64 | direct_debug_at( DirectLogDomain *domain, | ||
65 | const char *format, ... ) | ||
66 | @@ -77,7 +77,7 @@ | ||
67 | |||
68 | #endif /* DIRECT_BUILD_DEBUGS */ | ||
69 | |||
70 | -__no_instrument_function__ | ||
71 | +__dfb_no_instrument_function__ | ||
72 | void | ||
73 | direct_debug_at_always( DirectLogDomain *domain, | ||
74 | const char *format, ... ) | ||
75 | @@ -93,7 +93,7 @@ | ||
76 | |||
77 | #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ | ||
78 | |||
79 | -__no_instrument_function__ | ||
80 | +__dfb_no_instrument_function__ | ||
81 | void | ||
82 | direct_break( const char *func, | ||
83 | const char *file, | ||
84 | @@ -123,7 +123,7 @@ | ||
85 | direct_trap( "Break", SIGABRT ); | ||
86 | } | ||
87 | |||
88 | -__no_instrument_function__ | ||
89 | +__dfb_no_instrument_function__ | ||
90 | void | ||
91 | direct_assertion( const char *exp, | ||
92 | const char *func, | ||
93 | @@ -144,7 +144,7 @@ | ||
94 | direct_trap( "Assertion", SIGTRAP ); | ||
95 | } | ||
96 | |||
97 | -__no_instrument_function__ | ||
98 | +__dfb_no_instrument_function__ | ||
99 | void | ||
100 | direct_assumption( const char *exp, | ||
101 | const char *func, | ||
102 | Index: DirectFB-1.6.1/lib/direct/interface.c | ||
103 | =================================================================== | ||
104 | --- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300 | ||
105 | +++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200 | ||
106 | @@ -522,7 +522,7 @@ | ||
107 | |||
108 | /**************************************************************************************************/ | ||
109 | |||
110 | -__no_instrument_function__ | ||
111 | +__dfb_no_instrument_function__ | ||
112 | static InterfaceDesc * | ||
113 | allocate_interface_desc( void ) | ||
114 | { | ||
115 | @@ -543,7 +543,7 @@ | ||
116 | return &alloc_list[alloc_count++]; | ||
117 | } | ||
118 | |||
119 | -__no_instrument_function__ | ||
120 | +__dfb_no_instrument_function__ | ||
121 | static __inline__ void | ||
122 | fill_interface_desc( InterfaceDesc *desc, | ||
123 | const void *interface_ptr, | ||
124 | @@ -565,7 +565,7 @@ | ||
125 | |||
126 | /**************************************************************************************************/ | ||
127 | |||
128 | -__no_instrument_function__ | ||
129 | +__dfb_no_instrument_function__ | ||
130 | void | ||
131 | direct_dbg_interface_add( const char *func, | ||
132 | const char *file, | ||
133 | @@ -586,7 +586,7 @@ | ||
134 | direct_mutex_unlock( &alloc_lock ); | ||
135 | } | ||
136 | |||
137 | -__no_instrument_function__ | ||
138 | +__dfb_no_instrument_function__ | ||
139 | void | ||
140 | direct_dbg_interface_remove( const char *func, | ||
141 | const char *file, | ||
142 | Index: DirectFB-1.6.1/lib/direct/log.c | ||
143 | =================================================================== | ||
144 | --- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300 | ||
145 | +++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200 | ||
146 | @@ -128,7 +128,7 @@ | ||
147 | return DR_OK; | ||
148 | } | ||
149 | |||
150 | -__no_instrument_function__ | ||
151 | +__dfb_no_instrument_function__ | ||
152 | DirectResult | ||
153 | direct_log_printf( DirectLog *log, | ||
154 | const char *format, ... ) | ||
155 | @@ -197,7 +197,7 @@ | ||
156 | return DR_OK; | ||
157 | } | ||
158 | |||
159 | -__no_instrument_function__ | ||
160 | +__dfb_no_instrument_function__ | ||
161 | void | ||
162 | direct_log_lock( DirectLog *log ) | ||
163 | { | ||
164 | @@ -211,7 +211,7 @@ | ||
165 | direct_mutex_lock( &log->lock ); | ||
166 | } | ||
167 | |||
168 | -__no_instrument_function__ | ||
169 | +__dfb_no_instrument_function__ | ||
170 | void | ||
171 | direct_log_unlock( DirectLog *log ) | ||
172 | { | ||
173 | @@ -262,7 +262,7 @@ | ||
174 | |||
175 | /**********************************************************************************************************************/ | ||
176 | |||
177 | -__no_instrument_function__ | ||
178 | +__dfb_no_instrument_function__ | ||
179 | DirectLog * | ||
180 | direct_log_default( void ) | ||
181 | { | ||
182 | Index: DirectFB-1.6.1/lib/direct/log_domain.c | ||
183 | =================================================================== | ||
184 | --- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300 | ||
185 | +++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200 | ||
186 | @@ -69,7 +69,7 @@ | ||
187 | |||
188 | /**********************************************************************************************************************/ | ||
189 | |||
190 | -__no_instrument_function__ | ||
191 | +__dfb_no_instrument_function__ | ||
192 | static __inline__ LogDomainEntry * | ||
193 | lookup_domain( const char *name, bool sub ); | ||
194 | |||
195 | @@ -104,7 +104,7 @@ | ||
196 | return NULL; | ||
197 | } | ||
198 | |||
199 | -__no_instrument_function__ | ||
200 | +__dfb_no_instrument_function__ | ||
201 | static DirectLogLevel | ||
202 | check_domain( DirectLogDomain *domain ); | ||
203 | |||
204 | @@ -207,7 +207,7 @@ | ||
205 | /* FIXME: merge following */ | ||
206 | |||
207 | |||
208 | -__no_instrument_function__ | ||
209 | +__dfb_no_instrument_function__ | ||
210 | DirectResult | ||
211 | direct_log_domain_vprintf( DirectLogDomain *domain, | ||
212 | DirectLogLevel level, | ||
213 | @@ -268,7 +268,7 @@ | ||
214 | return DR_OK; | ||
215 | } | ||
216 | |||
217 | -__no_instrument_function__ | ||
218 | +__dfb_no_instrument_function__ | ||
219 | DirectResult | ||
220 | direct_log_domain_log( DirectLogDomain *domain, | ||
221 | DirectLogLevel level, | ||
222 | Index: DirectFB-1.6.1/lib/direct/mem.c | ||
223 | =================================================================== | ||
224 | --- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300 | ||
225 | +++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200 | ||
226 | @@ -121,7 +121,7 @@ | ||
227 | |||
228 | /**********************************************************************************************************************/ | ||
229 | |||
230 | -__no_instrument_function__ | ||
231 | +__dfb_no_instrument_function__ | ||
232 | static __inline__ MemDesc * | ||
233 | fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace ) | ||
234 | { | ||
235 | Index: DirectFB-1.6.1/lib/direct/messages.c | ||
236 | =================================================================== | ||
237 | --- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300 | ||
238 | +++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200 | ||
239 | @@ -40,7 +40,7 @@ | ||
240 | |||
241 | #if DIRECT_BUILD_TEXT | ||
242 | |||
243 | -__no_instrument_function__ | ||
244 | +__dfb_no_instrument_function__ | ||
245 | void | ||
246 | direct_messages_info( const char *format, ... ) | ||
247 | { | ||
248 | @@ -57,7 +57,7 @@ | ||
249 | direct_log_printf( NULL, "(*) %s", buf ); | ||
250 | } | ||
251 | |||
252 | -__no_instrument_function__ | ||
253 | +__dfb_no_instrument_function__ | ||
254 | void | ||
255 | direct_messages_error( const char *format, ... ) | ||
256 | { | ||
257 | @@ -76,7 +76,7 @@ | ||
258 | direct_trace_print_stack( NULL ); | ||
259 | } | ||
260 | |||
261 | -__no_instrument_function__ | ||
262 | +__dfb_no_instrument_function__ | ||
263 | void | ||
264 | direct_messages_derror( DirectResult result, const char *format, ... ) | ||
265 | { | ||
266 | @@ -95,7 +95,7 @@ | ||
267 | direct_trace_print_stack( NULL ); | ||
268 | } | ||
269 | |||
270 | -__no_instrument_function__ | ||
271 | +__dfb_no_instrument_function__ | ||
272 | void | ||
273 | direct_messages_perror( int erno, const char *format, ... ) | ||
274 | { | ||
275 | @@ -114,7 +114,7 @@ | ||
276 | direct_trace_print_stack( NULL ); | ||
277 | } | ||
278 | |||
279 | -__no_instrument_function__ | ||
280 | +__dfb_no_instrument_function__ | ||
281 | void | ||
282 | direct_messages_dlerror( const char *dlerr, const char *format, ... ) | ||
283 | { | ||
284 | @@ -133,7 +133,7 @@ | ||
285 | direct_trace_print_stack( NULL ); | ||
286 | } | ||
287 | |||
288 | -__no_instrument_function__ | ||
289 | +__dfb_no_instrument_function__ | ||
290 | void | ||
291 | direct_messages_once( const char *func, | ||
292 | const char *file, | ||
293 | @@ -155,7 +155,7 @@ | ||
294 | direct_trace_print_stack( NULL ); | ||
295 | } | ||
296 | |||
297 | -__no_instrument_function__ | ||
298 | +__dfb_no_instrument_function__ | ||
299 | void | ||
300 | direct_messages_unimplemented( const char *func, | ||
301 | const char *file, | ||
302 | @@ -166,7 +166,7 @@ | ||
303 | direct_trace_print_stack( NULL ); | ||
304 | } | ||
305 | |||
306 | -__no_instrument_function__ | ||
307 | +__dfb_no_instrument_function__ | ||
308 | void | ||
309 | direct_messages_bug( const char *func, | ||
310 | const char *file, | ||
311 | @@ -188,7 +188,7 @@ | ||
312 | direct_trace_print_stack( NULL ); | ||
313 | } | ||
314 | |||
315 | -__no_instrument_function__ | ||
316 | +__dfb_no_instrument_function__ | ||
317 | void | ||
318 | direct_messages_warn( const char *func, | ||
319 | const char *file, | ||
320 | Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h | ||
321 | =================================================================== | ||
322 | --- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300 | ||
323 | +++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200 | ||
324 | @@ -74,7 +74,7 @@ | ||
325 | |||
326 | #define __inline__ inline | ||
327 | #define D_UNUSED __attribute__((unused)) | ||
328 | -#define __no_instrument_function__ __attribute__((no_instrument_function)) | ||
329 | +#define __dfb_no_instrument_function__ __attribute__((no_instrument_function)) | ||
330 | #define __constructor__ __attribute__((constructor)) | ||
331 | #define __destructor__ __attribute__((destructor)) | ||
332 | #define __typeof__(x) typeof(x) | ||
333 | Index: DirectFB-1.6.1/lib/direct/util.c | ||
334 | =================================================================== | ||
335 | --- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300 | ||
336 | +++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200 | ||
337 | @@ -110,7 +110,7 @@ | ||
338 | /* | ||
339 | * translates errno to DirectResult | ||
340 | */ | ||
341 | -__no_instrument_function__ | ||
342 | +__dfb_no_instrument_function__ | ||
343 | DirectResult | ||
344 | errno2result( int erno ) | ||
345 | { | ||
diff --git a/meta/recipes-graphics/directfb/directfb_1.7.4.bb b/meta/recipes-graphics/directfb/directfb_1.7.4.bb new file mode 100644 index 0000000000..39b006e8b3 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb_1.7.4.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | require directfb.inc | ||
2 | |||
3 | RV = "1.7-4" | ||
4 | |||
5 | DEPENDS += "sysfsutils" | ||
6 | |||
7 | SRC_URI += "file://fixsepbuild.patch" | ||
8 | |||
9 | EXTRA_OECONF = "\ | ||
10 | --enable-freetype=yes \ | ||
11 | --enable-zlib \ | ||
12 | --with-gfxdrivers=none \ | ||
13 | --disable-sdl \ | ||
14 | --disable-vnc \ | ||
15 | --disable-x11 \ | ||
16 | --disable-imlib2 \ | ||
17 | --disable-mesa \ | ||
18 | " | ||
19 | |||
20 | LEAD_SONAME = "libdirectfb-1.7.so.0" | ||
21 | |||
22 | SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" | ||
23 | SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" | ||
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc new file mode 100644 index 0000000000..cfac9e2a2b --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm.inc | |||
@@ -0,0 +1,42 @@ | |||
1 | SUMMARY = "Userspace interface to the kernel DRM services" | ||
2 | DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \ | ||
3 | stands for \"Direct Rendering Manager\", which is the kernel portion of the \ | ||
4 | \"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \ | ||
5 | accelerated OpenGL drivers." | ||
6 | HOMEPAGE = "http://dri.freedesktop.org" | ||
7 | SECTION = "x11/base" | ||
8 | LICENSE = "MIT" | ||
9 | LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" | ||
10 | SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" | ||
11 | PROVIDES = "drm" | ||
12 | DEPENDS = "libpthread-stubs udev" | ||
13 | |||
14 | # be aware that libdrm_2.4.44.bb ignores this | ||
15 | INC_PR = "r4" | ||
16 | |||
17 | #libpciaccess is required starting from libdrm 2.4.26 | ||
18 | DEPENDS += " libpciaccess" | ||
19 | |||
20 | inherit autotools pkgconfig | ||
21 | |||
22 | EXTRA_OECONF += "--disable-cairo-tests \ | ||
23 | --enable-omap-experimental-api \ | ||
24 | --enable-freedreno-experimental-api \ | ||
25 | --enable-install-test-programs \ | ||
26 | --disable-manpages \ | ||
27 | " | ||
28 | ALLOW_EMPTY_${PN}-drivers = "1" | ||
29 | PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ | ||
30 | ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno" | ||
31 | |||
32 | RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ | ||
33 | ${PN}-exynos ${PN}-freedreno" | ||
34 | |||
35 | FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" | ||
36 | FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" | ||
37 | FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" | ||
38 | FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" | ||
39 | FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" | ||
40 | FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" | ||
41 | FILES_${PN}-kms = "${libdir}/libkms*.so.*" | ||
42 | FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" | ||
diff --git a/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch b/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch new file mode 100644 index 0000000000..8eb1d5e1ea --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | uclibc headers need to know if _GNU_SOURCE is defined or not and its defined | ||
2 | in config.h so include it first to get the definition if its there fixed build | ||
3 | problems on uclibc | ||
4 | |||
5 | test_decode.c:107:2: error: implicit declaration of function 'open_memstream' [-Werror=implicit-function-declaration] | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Index: libdrm-2.4.30/intel/test_decode.c | ||
11 | =================================================================== | ||
12 | --- libdrm-2.4.30.orig/intel/test_decode.c 2012-02-03 14:28:46.409355918 -0800 | ||
13 | +++ libdrm-2.4.30/intel/test_decode.c 2012-02-03 14:29:02.357356689 -0800 | ||
14 | @@ -21,6 +21,8 @@ | ||
15 | * IN THE SOFTWARE. | ||
16 | */ | ||
17 | |||
18 | +#include "config.h" | ||
19 | + | ||
20 | #include <string.h> | ||
21 | #include <stdlib.h> | ||
22 | #include <stdio.h> | ||
23 | @@ -31,7 +33,6 @@ | ||
24 | #include <sys/mman.h> | ||
25 | #include <err.h> | ||
26 | |||
27 | -#include "config.h" | ||
28 | #include "intel_bufmgr.h" | ||
29 | #include "intel_chipset.h" | ||
30 | |||
diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch new file mode 100644 index 0000000000..7d443af663 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | tests: also install tests app | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
6 | |||
7 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
8 | index bf1987f..d909e19 100644 | ||
9 | --- a/tests/Makefile.am | ||
10 | +++ b/tests/Makefile.am | ||
11 | @@ -6,10 +6,11 @@ AM_CPPFLAGS = \ | ||
12 | |||
13 | LDADD = $(top_builddir)/libdrm.la | ||
14 | |||
15 | -check_PROGRAMS = \ | ||
16 | +bin_PROGRAMS = \ | ||
17 | dristat \ | ||
18 | drmstat | ||
19 | |||
20 | +check_PROGRAMS = | ||
21 | SUBDIRS = modeprint | ||
22 | |||
23 | if HAVE_LIBKMS | ||
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.54.bb b/meta/recipes-graphics/drm/libdrm_2.4.54.bb new file mode 100644 index 0000000000..12eefc7751 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.54.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require libdrm.inc | ||
2 | |||
3 | SRC_URI += "file://installtests.patch \ | ||
4 | file://GNU_SOURCE_definition.patch \ | ||
5 | " | ||
6 | SRC_URI[md5sum] = "56e98a9c2073c3fab7f95e003b657f46" | ||
7 | SRC_URI[sha256sum] = "d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9" | ||
8 | |||
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb new file mode 100644 index 0000000000..d7245ee865 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_git.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require libdrm.inc | ||
2 | |||
3 | SRC_URI = "git://anongit.freedesktop.org/git/mesa/drm" | ||
4 | |||
5 | S = "${WORKDIR}/git" | ||
6 | |||
7 | DEFAULT_PREFERENCE = "-1" | ||
8 | |||
9 | SRCREV = "e01d68f9f3acfc35fe164283904b5d058c2ab378" | ||
10 | PV = "2.4.40+git${SRCPV}" | ||
11 | PR = "${INC_PR}.0" | ||
12 | |||
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb new file mode 100644 index 0000000000..455d31e872 --- /dev/null +++ b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | EGLINFO_PLATFORM ?= "fb" | ||
2 | EGLINFO_BINARY_NAME ?= "eglinfo-fb" | ||
3 | |||
4 | include eglinfo.inc | ||
5 | |||
6 | SUMMARY += "(Framebuffer version)" | ||
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb new file mode 100644 index 0000000000..18fc8938d6 --- /dev/null +++ b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | EGLINFO_PLATFORM ?= "x11" | ||
2 | EGLINFO_BINARY_NAME ?= "eglinfo-x11" | ||
3 | |||
4 | include eglinfo.inc | ||
5 | |||
6 | DEPENDS += "virtual/libx11" | ||
7 | |||
8 | SUMMARY += "(X11 version)" | ||
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/meta/recipes-graphics/eglinfo/eglinfo.inc new file mode 100644 index 0000000000..b87688af72 --- /dev/null +++ b/meta/recipes-graphics/eglinfo/eglinfo.inc | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "Utility for printing information EGL and its client APIs (OpenGL, OpenGL ES, OpenVG)" | ||
2 | SECTION = "graphics" | ||
3 | LICENSE = "Zlib" | ||
4 | HOMEPAGE = "https://github.com/dv1/eglinfo" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c" | ||
6 | |||
7 | DEPENDS = "virtual/egl" | ||
8 | |||
9 | SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master" | ||
10 | SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | inherit waf | ||
15 | |||
16 | # BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, which | ||
17 | # append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS and set | ||
18 | # EGL_DEVICE as appropriate. | ||
19 | EGLINFO_DEVICE ?= "generic" | ||
20 | |||
21 | EXTRA_OECONF = "--platform=${EGLINFO_PLATFORM} \ | ||
22 | --device=${EGLINFO_DEVICE} \ | ||
23 | --sysroot ${STAGING_DIR_TARGET}" | ||
24 | |||
25 | do_install_append() { | ||
26 | mv ${D}/${bindir}/eglinfo ${D}/${bindir}/${EGLINFO_BINARY_NAME} | ||
27 | } | ||
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb new file mode 100644 index 0000000000..7c5b4b4bf9 --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb | |||
@@ -0,0 +1,44 @@ | |||
1 | SUMMARY = "Generic font configuration library" | ||
2 | DESCRIPTION = "Fontconfig is a font configuration and customization library, which \ | ||
3 | does not depend on the X Window System. It is designed to locate \ | ||
4 | fonts within the system and select them according to requirements \ | ||
5 | specified by applications. \ | ||
6 | Fontconfig is not a rasterization library, nor does it impose a \ | ||
7 | particular rasterization library on the application. The X-specific \ | ||
8 | library 'Xft' uses fontconfig along with freetype to specify and \ | ||
9 | rasterize fonts." | ||
10 | |||
11 | HOMEPAGE = "http://www.fontconfig.org" | ||
12 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" | ||
13 | |||
14 | LICENSE = "MIT-style & MIT & PD" | ||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \ | ||
16 | file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \ | ||
17 | file://src/fccache.c;beginline=1143;endline=1158;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" | ||
18 | |||
19 | SECTION = "libs" | ||
20 | |||
21 | DEPENDS = "expat freetype zlib" | ||
22 | |||
23 | SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ | ||
24 | " | ||
25 | SRC_URI[md5sum] = "e75e303b4f7756c2b16203a57ac87eba" | ||
26 | SRC_URI[sha256sum] = "b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d" | ||
27 | |||
28 | PACKAGES =+ "fontconfig-utils" | ||
29 | FILES_${PN} =+ "${datadir}/xml/*" | ||
30 | FILES_fontconfig-utils = "${bindir}/*" | ||
31 | |||
32 | # Work around past breakage in debian.bbclass | ||
33 | RPROVIDES_fontconfig-utils = "libfontconfig-utils" | ||
34 | RREPLACES_fontconfig-utils = "libfontconfig-utils" | ||
35 | RCONFLICTS_fontconfig-utils = "libfontconfig-utils" | ||
36 | DEBIAN_NOAUTONAME_fontconfig-utils = "1" | ||
37 | |||
38 | inherit autotools pkgconfig | ||
39 | |||
40 | FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" | ||
41 | |||
42 | EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}" | ||
43 | |||
44 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-graphics/freetype/freetype_2.5.3.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb new file mode 100644 index 0000000000..2c861de63a --- /dev/null +++ b/meta/recipes-graphics/freetype/freetype_2.5.3.bb | |||
@@ -0,0 +1,60 @@ | |||
1 | SUMMARY = "Freetype font rendering library" | ||
2 | DESCRIPTION = "FreeType is a software font engine that is designed to be small, efficient, \ | ||
3 | highly customizable, and portable while capable of producing high-quality output (glyph \ | ||
4 | images). It can be used in graphics libraries, display servers, font conversion tools, text \ | ||
5 | image generation tools, and many other products as well." | ||
6 | HOMEPAGE = "http://www.freetype.org/" | ||
7 | BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" | ||
8 | |||
9 | LICENSE = "FreeType | GPLv2+" | ||
10 | LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \ | ||
11 | file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ | ||
12 | file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" | ||
13 | |||
14 | SECTION = "libs" | ||
15 | |||
16 | SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2" | ||
17 | SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65" | ||
18 | SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" | ||
19 | |||
20 | BINCONFIG = "${bindir}/freetype-config" | ||
21 | |||
22 | inherit autotools-brokensep pkgconfig binconfig-disabled multilib_header | ||
23 | |||
24 | LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" | ||
25 | EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" | ||
26 | EXTRA_OEMAKE_class-native = "" | ||
27 | EXTRA_OECONF = "--without-zlib --without-bzip2 CC_BUILD='${BUILD_CC}'" | ||
28 | TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64" | ||
29 | |||
30 | |||
31 | PACKAGECONFIG ??= "" | ||
32 | PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" | ||
33 | # This results in a circular dependency so enabling is non-trivial | ||
34 | PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz" | ||
35 | |||
36 | do_configure() { | ||
37 | cd builds/unix | ||
38 | libtoolize --force --copy | ||
39 | aclocal -I . | ||
40 | gnu-configize --force | ||
41 | autoconf | ||
42 | cd ${S} | ||
43 | oe_runconf | ||
44 | } | ||
45 | |||
46 | do_configure_class-native() { | ||
47 | (cd builds/unix && gnu-configize) || die "failure running gnu-configize" | ||
48 | oe_runconf | ||
49 | } | ||
50 | |||
51 | do_compile_prepend() { | ||
52 | ${BUILD_CC} -o objs/apinames src/tools/apinames.c | ||
53 | } | ||
54 | |||
55 | do_install_append() { | ||
56 | oe_multilib_header freetype2/config/ftconfig.h | ||
57 | } | ||
58 | |||
59 | BBCLASSEXTEND = "native" | ||
60 | |||
diff --git a/meta/recipes-graphics/fstests/fstests_git.bb b/meta/recipes-graphics/fstests/fstests_git.bb new file mode 100644 index 0000000000..57ff9f6d54 --- /dev/null +++ b/meta/recipes-graphics/fstests/fstests_git.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "Various benchmarning tests for X" | ||
2 | HOMEPAGE = "http://www.o-hand.com" | ||
3 | SECTION = "devel" | ||
4 | LICENSE = "Zlib" | ||
5 | DEPENDS = "pango libxext libxft virtual/libx11 gtk+" | ||
6 | |||
7 | SRCREV = "e5939ff608b95cdd4d0ab0e1935781ab9a276ac0" | ||
8 | PV = "0.1+git${SRCPV}" | ||
9 | |||
10 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
11 | |||
12 | LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655" | ||
13 | |||
14 | S = "${WORKDIR}/git/tests" | ||
15 | |||
16 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-graphics/glew/glew/autotools.patch b/meta/recipes-graphics/glew/glew/autotools.patch new file mode 100644 index 0000000000..7dfe087d52 --- /dev/null +++ b/meta/recipes-graphics/glew/glew/autotools.patch | |||
@@ -0,0 +1,149 @@ | |||
1 | |||
2 | Upstream-Status: Inappropriate [configuration] | ||
3 | |||
4 | Index: glew/Makefile.am | ||
5 | =================================================================== | ||
6 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
7 | +++ glew/Makefile.am 2009-12-02 00:30:23.296641663 +0100 | ||
8 | @@ -0,0 +1,5 @@ | ||
9 | + | ||
10 | +ACLOCAL_AMFLAGS = -I m4 --install | ||
11 | + | ||
12 | +SUBDIRS = include src | ||
13 | + | ||
14 | Index: glew/configure.ac | ||
15 | =================================================================== | ||
16 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
17 | +++ glew/configure.ac 2009-12-02 00:30:23.296641663 +0100 | ||
18 | @@ -0,0 +1,67 @@ | ||
19 | +# -*- Autoconf -*- | ||
20 | +# Process this file with autoconf to produce a configure script. | ||
21 | + | ||
22 | +AC_PREREQ([2.62]) | ||
23 | +AC_INIT([glew], [1.9.0], [BUG-REPORT-ADDRESS]) | ||
24 | +AC_CONFIG_SRCDIR([src/glew.c]) | ||
25 | +AC_CONFIG_HEADERS([config.h]) | ||
26 | +AM_INIT_AUTOMAKE([-Wall -Werror foreign]) | ||
27 | +AC_CONFIG_MACRO_DIR([m4]) | ||
28 | + | ||
29 | +LT_INIT | ||
30 | + | ||
31 | +# Checks for programs. | ||
32 | +AC_PROG_CC | ||
33 | +AC_PROG_INSTALL | ||
34 | +AC_PROG_LN_S | ||
35 | + | ||
36 | +# Checks for libraries. | ||
37 | + | ||
38 | +# Checks for header files. | ||
39 | +AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h]) | ||
40 | + | ||
41 | +# Checks for typedefs, structures, and compiler characteristics. | ||
42 | +AC_TYPE_INT32_T | ||
43 | +AC_TYPE_INT64_T | ||
44 | +AC_TYPE_UINT64_T | ||
45 | +AC_CHECK_TYPES([ptrdiff_t]) | ||
46 | + | ||
47 | +# Checks for library functions. | ||
48 | +AC_FUNC_MALLOC | ||
49 | +AC_CHECK_FUNCS([strtol]) | ||
50 | + | ||
51 | +# Check for pkgconfig libs | ||
52 | + | ||
53 | +PKG_CHECK_MODULES([X11], [x11]) | ||
54 | +AC_SUBST([X11_LIBS]) | ||
55 | +AC_SUBST([X11_CFLAGS]) | ||
56 | + | ||
57 | +PKG_CHECK_MODULES([XMU], [xmu]) | ||
58 | +AC_SUBST([XMU_LIBS]) | ||
59 | +AC_SUBST([XMU_CFLAGS]) | ||
60 | + | ||
61 | +PKG_CHECK_MODULES([XI], [xi]) | ||
62 | +AC_SUBST([XI_LIBS]) | ||
63 | +AC_SUBST([XI_CFLAGS]) | ||
64 | + | ||
65 | +PKG_CHECK_MODULES([XEXT], [xext]) | ||
66 | +AC_SUBST([XEXT_LIBS]) | ||
67 | +AC_SUBST([XEXT_CFLAGS]) | ||
68 | + | ||
69 | +# Check for GLU is enough and imples gl so no doubled -lGL in LDFLAGS | ||
70 | +PKG_CHECK_MODULES([GLU], [glu]) | ||
71 | +AC_SUBST([GLU_LIBS]) | ||
72 | +AC_SUBST([GLU_CFLAGS]) | ||
73 | + | ||
74 | +# ENABLE option for Multiple Rendering Contexts support | ||
75 | +AC_CHECK_ENABLE_GLEWMX | ||
76 | + | ||
77 | +# for now we use the same version as the package, but that should be avoided | ||
78 | +# in the future | ||
79 | + | ||
80 | +AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) | ||
81 | + | ||
82 | +AC_CONFIG_FILES([Makefile | ||
83 | + include/Makefile | ||
84 | + src/Makefile]) | ||
85 | +AC_OUTPUT | ||
86 | Index: glew/src/Makefile.am | ||
87 | =================================================================== | ||
88 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
89 | +++ glew/src/Makefile.am 2009-12-02 00:33:48.690786110 +0100 | ||
90 | @@ -0,0 +1,35 @@ | ||
91 | + | ||
92 | +AM_CPPFLAGS = -I$(top_srcdir)/include | ||
93 | + | ||
94 | +if ENABLE_GLEWMX | ||
95 | +AM_CPPFLAGS += -DGLEW_MX | ||
96 | +endif | ||
97 | + | ||
98 | +AM_CFLAGS = @X11_CFLAGS@ \ | ||
99 | + @XMU_CFLAGS@ \ | ||
100 | + @XI_CFLAGS@ \ | ||
101 | + @XEXT_CFLAGS@ \ | ||
102 | + @GLU_CFLAGS@ | ||
103 | + | ||
104 | +lib_LTLIBRARIES = libGLEW.la | ||
105 | + | ||
106 | +libGLEW_la_SOURCES = glew.c | ||
107 | + | ||
108 | +libGLEW_la_LIBADD = @X11_LIBS@ \ | ||
109 | + @XMU_LIBS@ \ | ||
110 | + @XI_LIBS@ \ | ||
111 | + @XEXT_LIBS@ \ | ||
112 | + @GLU_LIBS@ | ||
113 | + | ||
114 | +libGLEW_la_LDFLAGS = -version-number @LIBGLEW_SO_VERSION@ | ||
115 | + | ||
116 | +bin_PROGRAMS = glewinfo visualinfo | ||
117 | + | ||
118 | +glewinfo_SOURCES = glewinfo.c | ||
119 | + | ||
120 | +glewinfo_LDADD = libGLEW.la | ||
121 | + | ||
122 | +visualinfo_SOURCES = visualinfo.c | ||
123 | + | ||
124 | +visualinfo_LDADD = libGLEW.la | ||
125 | + | ||
126 | Index: glew/m4/glewmx.m4 | ||
127 | =================================================================== | ||
128 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
129 | +++ glew/m4/glewmx.m4 2009-12-02 00:30:23.296641663 +0100 | ||
130 | @@ -0,0 +1,11 @@ | ||
131 | + | ||
132 | +AC_DEFUN([AC_CHECK_ENABLE_GLEWMX],[ | ||
133 | +AC_MSG_CHECKING([whether to include Multiple Rendering Contexts support]) | ||
134 | +AC_ARG_ENABLE([glewmx], | ||
135 | + [AS_HELP_STRING([--enable-glewmx], [enable GLEW Multiple Rendering Contexts (default is no)])], | ||
136 | + [ENABLE_GLEWMX="$enableval"], | ||
137 | + [ENABLE_GLEWMX="no"]) | ||
138 | +AC_MSG_RESULT([${ENABLE_GLEWMX}]) | ||
139 | +AM_CONDITIONAL([ENABLE_GLEWMX], [test x"${ENABLE_GLEWMX}" = "xyes"]) | ||
140 | +]) | ||
141 | + | ||
142 | Index: glew/include/Makefile.am | ||
143 | =================================================================== | ||
144 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
145 | +++ glew/include/Makefile.am 2009-12-02 00:30:23.296641663 +0100 | ||
146 | @@ -0,0 +1,3 @@ | ||
147 | + | ||
148 | +nobase_include_HEADERS = GL/glew.h GL/glxew.h GL/wglew.h | ||
149 | + | ||
diff --git a/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch new file mode 100644 index 0000000000..70a99aeeee --- /dev/null +++ b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | |||
2 | We maintain the autotools configure.ac and Makefile.am, to correctly | ||
3 | provide the glew.pc, the following patch is needed. | ||
4 | |||
5 | Upstream-Status: Inappropriate | ||
6 | |||
7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
8 | |||
9 | Index: glew-1.11.0/Makefile.am | ||
10 | =================================================================== | ||
11 | --- glew-1.11.0.orig/Makefile.am | ||
12 | +++ glew-1.11.0/Makefile.am | ||
13 | @@ -3,3 +3,5 @@ ACLOCAL_AMFLAGS = -I m4 --install | ||
14 | |||
15 | SUBDIRS = include src | ||
16 | |||
17 | +pkgconfigdir = $(libdir)/pkgconfig | ||
18 | +pkgconfig_DATA = glew.pc | ||
19 | Index: glew-1.11.0/configure.ac | ||
20 | =================================================================== | ||
21 | --- glew-1.11.0.orig/configure.ac | ||
22 | +++ glew-1.11.0/configure.ac | ||
23 | @@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) | ||
24 | |||
25 | AC_CONFIG_FILES([Makefile | ||
26 | include/Makefile | ||
27 | - src/Makefile]) | ||
28 | + src/Makefile | ||
29 | + glew.pc]) | ||
30 | AC_OUTPUT | ||
31 | Index: glew-1.11.0/glew.pc.in | ||
32 | =================================================================== | ||
33 | --- glew-1.11.0.orig/glew.pc.in | ||
34 | +++ glew-1.11.0/glew.pc.in | ||
35 | @@ -5,7 +5,7 @@ includedir=${prefix}/include/GL | ||
36 | |||
37 | Name: glew | ||
38 | Description: The OpenGL Extension Wrangler library | ||
39 | -Version: @version@ | ||
40 | -Cflags: -I${includedir} @cflags@ | ||
41 | -Libs: -L${libdir} -l@libname@ | ||
42 | -Requires: @requireslib@ | ||
43 | +Version: @VERSION@ | ||
44 | +Cflags: -I${includedir} @CFLAGS@ | ||
45 | +Libs: -L${libdir} -lGLEW | ||
46 | +Requires: glu | ||
diff --git a/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch b/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..0707efba26 --- /dev/null +++ b/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This patch fixes following issue with automake 1.12 | ||
4 | |||
5 | | automake: warnings are treated as errors | ||
6 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libGLEW.la': linking libtool libraries using a non-POSIX | ||
7 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' | ||
8 | |||
9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
10 | 2012/05/03 | ||
11 | |||
12 | Index: glew-1.7.0/configure.ac | ||
13 | =================================================================== | ||
14 | --- glew-1.7.0.orig/configure.ac | ||
15 | +++ glew-1.7.0/configure.ac | ||
16 | @@ -14,6 +14,9 @@ LT_INIT | ||
17 | AC_PROG_CC | ||
18 | AC_PROG_INSTALL | ||
19 | AC_PROG_LN_S | ||
20 | +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it | ||
21 | +m4_pattern_allow([AM_PROG_AR]) | ||
22 | +AM_PROG_AR | ||
23 | |||
24 | # Checks for libraries. | ||
25 | |||
diff --git a/meta/recipes-graphics/glew/glew_1.11.0.bb b/meta/recipes-graphics/glew/glew_1.11.0.bb new file mode 100644 index 0000000000..4231320dbd --- /dev/null +++ b/meta/recipes-graphics/glew/glew_1.11.0.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "OpenGL extension loading library" | ||
2 | DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." | ||
3 | HOMEPAGE = "http://glew.sourceforge.net/" | ||
4 | BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586" | ||
5 | SECTION = "x11" | ||
6 | LICENSE = "MIT" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" | ||
8 | |||
9 | DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" | ||
10 | |||
11 | |||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ | ||
13 | file://autotools.patch \ | ||
14 | file://glew_fix_for_automake-1.12.patch \ | ||
15 | file://fix-glew.pc-install.patch \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[md5sum] = "f6d72c7426a5f66580ad09e50816450a" | ||
19 | SRC_URI[sha256sum] = "69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6" | ||
20 | |||
21 | inherit autotools lib_package pkgconfig | ||
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb new file mode 100644 index 0000000000..2329b2ffc8 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | SUMMARY = "Text shaping library" | ||
2 | DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." | ||
3 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" | ||
4 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" | ||
5 | |||
6 | LICENSE = "MIT" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ | ||
8 | file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ | ||
9 | " | ||
10 | |||
11 | SECTION = "libs" | ||
12 | |||
13 | SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" | ||
14 | SRC_URI[md5sum] = "531ee8650626ecddcd90b2a4637e31d4" | ||
15 | SRC_URI[sha256sum] = "0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed" | ||
16 | inherit autotools pkgconfig lib_package | ||
17 | |||
18 | DEPENDS = "glib-2.0 cairo freetype" | ||
19 | |||
20 | BBCLASSEXTEND = "native" | ||
21 | |||
22 | EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2" | ||
23 | |||
24 | PACKAGECONFIG ??= "" | ||
25 | PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" | ||
26 | |||
27 | PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev" | ||
28 | |||
29 | FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" | ||
30 | FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*" | ||
31 | FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ | ||
32 | ${libdir}/libharfbuzz-icu.so \ | ||
33 | ${libdir}/pkgconfig/harfbuzz-icu.pc \ | ||
34 | " | ||
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb new file mode 100644 index 0000000000..b0f25cf1b1 --- /dev/null +++ b/meta/recipes-graphics/images/core-image-clutter.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \ | ||
2 | which enables development of rich and animated graphical user interfaces." | ||
3 | |||
4 | IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear" | ||
5 | |||
6 | LICENSE = "MIT" | ||
7 | |||
8 | IMAGE_INSTALL = "\ | ||
9 | ${CORE_IMAGE_BASE_INSTALL} \ | ||
10 | packagegroup-core-clutter-core \ | ||
11 | " | ||
12 | |||
13 | inherit core-image | ||
diff --git a/meta/recipes-graphics/images/core-image-directfb.bb b/meta/recipes-graphics/images/core-image-directfb.bb new file mode 100644 index 0000000000..5641195e8c --- /dev/null +++ b/meta/recipes-graphics/images/core-image-directfb.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "An image that uses DirectFB instead of X11" | ||
2 | LICENSE = "MIT" | ||
3 | |||
4 | |||
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | ||
6 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
7 | |||
8 | inherit core-image distro_features_check | ||
9 | |||
10 | REQUIRED_DISTRO_FEATURES = "directfb" | ||
11 | CONFLICT_DISTRO_FEATURES = "x11" | ||
12 | |||
13 | IMAGE_INSTALL += "\ | ||
14 | ${CORE_IMAGE_BASE_INSTALL} \ | ||
15 | packagegroup-core-full-cmdline \ | ||
16 | packagegroup-core-directfb \ | ||
17 | " | ||
diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb new file mode 100644 index 0000000000..52e271dacd --- /dev/null +++ b/meta/recipes-graphics/images/core-image-weston.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | SUMMARY = "A very basic Wayland image with a terminal" | ||
2 | |||
3 | IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs" | ||
4 | |||
5 | LICENSE = "MIT" | ||
6 | |||
7 | inherit core-image distro_features_check | ||
8 | |||
9 | REQUIRED_DISTRO_FEATURES = "wayland" | ||
10 | |||
11 | CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples" | ||
diff --git a/meta/recipes-graphics/images/core-image-x11.bb b/meta/recipes-graphics/images/core-image-x11.bb new file mode 100644 index 0000000000..8455bb8cae --- /dev/null +++ b/meta/recipes-graphics/images/core-image-x11.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | SUMMARY = "A very basic X11 image with a terminal" | ||
2 | |||
3 | IMAGE_FEATURES += "splash package-management x11-base" | ||
4 | |||
5 | LICENSE = "MIT" | ||
6 | |||
7 | inherit core-image distro_features_check | ||
8 | |||
9 | REQUIRED_DISTRO_FEATURES = "x11" | ||
diff --git a/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/meta/recipes-graphics/libfakekey/libfakekey_git.bb new file mode 100644 index 0000000000..862fe38de2 --- /dev/null +++ b/meta/recipes-graphics/libfakekey/libfakekey_git.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "Library for converting characters to X key-presses" | ||
2 | DESCRIPTION = "libfakekey is a simple library for converting UTF-8 characters into 'fake' X \ | ||
3 | key-presses." | ||
4 | HOMEPAGE = "http://matchbox-project.org/" | ||
5 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
6 | |||
7 | LICENSE = "LGPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://src/libfakekey.c;endline=30;md5=602b5ccd48f64407510867f3373b448c" | ||
9 | |||
10 | DEPENDS = "libxtst" | ||
11 | SECTION = "x11/wm" | ||
12 | |||
13 | SRCREV = "e327ff049b8503af2dadffa84370a0860b9fb682" | ||
14 | PV = "0.0+git${SRCPV}" | ||
15 | |||
16 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit autotools pkgconfig gettext | ||
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch b/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch new file mode 100644 index 0000000000..8cd507f799 --- /dev/null +++ b/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 19c3d242034748b3c60765683e1ff4e2df970205 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Tue, 10 Dec 2013 11:37:32 +0000 | ||
7 | Subject: [PATCH] configure: improve libpng detection | ||
8 | |||
9 | Instead of looking for "libpng12" explicitly though pkg-config and then falling | ||
10 | back to library hunting, just use pkg-config to find "libpng" which is provided | ||
11 | by both libpng12 and libpng16. | ||
12 | |||
13 | This also makes the libpng detection deterministic. | ||
14 | |||
15 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
16 | --- | ||
17 | configure.ac | 29 +++++------------------------ | ||
18 | 1 file changed, 5 insertions(+), 24 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index 8a28076..65d7c79 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -34,7 +34,7 @@ AC_ARG_ENABLE(jpeg, | ||
25 | enable_jpeg=$enableval, enable_jpeg=no) | ||
26 | |||
27 | AC_ARG_ENABLE(png, | ||
28 | - [ --disable-png disable png support [default=no]], | ||
29 | + [ --disable-png disable PNG support [default=enabled]], | ||
30 | enable_png=$enableval, enable_png=yes ) | ||
31 | |||
32 | AC_ARG_ENABLE(doxygen-docs, | ||
33 | @@ -156,29 +156,10 @@ fi | ||
34 | dnl ------ Check for PNG --------------------------------------------------- | ||
35 | |||
36 | if test x$enable_png != xno; then | ||
37 | - AC_MSG_CHECKING(for libpng12) | ||
38 | - if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng12; then | ||
39 | - AC_MSG_RESULT(yes) | ||
40 | - PNG_LIBS=`$PKG_CONFIG --libs libpng12` | ||
41 | - PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12` | ||
42 | - AC_DEFINE(USE_PNG, [1], [Use Png]) | ||
43 | - SUPPORTS_PNG=1 | ||
44 | - PNG_REQUIRED="libpng12" | ||
45 | - else | ||
46 | - AC_MSG_RESULT(no) | ||
47 | - # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] ) | ||
48 | - AC_CHECK_LIB([png], [png_create_read_struct], [have_png="yes"], [have_png="no"]) | ||
49 | - | ||
50 | - if test x$have_png=xyes && test x$have_png_h=xyes; then | ||
51 | - AC_DEFINE(USE_PNG, [1], [Use Png]) | ||
52 | - SUPPORTS_PNG=1 | ||
53 | - PNG_LIBS="-lpng -lz" | ||
54 | - MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS" | ||
55 | - else | ||
56 | - AC_MSG_WARN([*** Cannot find PNG, disabling support]) | ||
57 | - enable_png=no | ||
58 | - fi | ||
59 | - fi | ||
60 | + PKG_CHECK_MODULES(PNG, libpng) | ||
61 | + AC_DEFINE(USE_PNG, [1], [Use PNG]) | ||
62 | + SUPPORTS_PNG=1 | ||
63 | + PNG_REQUIRED="libpng" | ||
64 | fi | ||
65 | |||
66 | |||
67 | -- | ||
68 | 1.8.5 | ||
69 | |||
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb new file mode 100644 index 0000000000..4acac39f0d --- /dev/null +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "Matchbox window manager core library" | ||
2 | SECTION = "x11/libs" | ||
3 | HOMEPAGE = "http://matchbox-project.org/" | ||
4 | BUGTRACKER = "http://bugzilla.yoctoproject.com/" | ||
5 | |||
6 | LICENSE = "LGPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ | ||
8 | file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \ | ||
9 | file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51" | ||
10 | |||
11 | DEPENDS = "virtual/libx11 libxext" | ||
12 | |||
13 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \ | ||
14 | file://libpng.patch" | ||
15 | |||
16 | SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" | ||
17 | SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
21 | PACKAGECONFIG ??= "jpeg png xft xsettings" | ||
22 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" | ||
23 | PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" | ||
24 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" | ||
25 | PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,libxft" | ||
26 | PACKAGECONFIG[xsettings] = "--enable-xsettings,--disable-xsettings,libxsettings-client" | ||
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch new file mode 100644 index 0000000000..3f97639533 --- /dev/null +++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch | |||
@@ -0,0 +1,1111 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: SDL-1.2.15/configure.in | ||
4 | =================================================================== | ||
5 | --- SDL-1.2.15.orig/configure.in | ||
6 | +++ SDL-1.2.15/configure.in | ||
7 | @@ -48,9 +48,9 @@ AC_CONFIG_AUX_DIR([build-scripts]) | ||
8 | dnl AC_CANONICAL_HOST | ||
9 | AC_C_BIGENDIAN | ||
10 | if test x$ac_cv_c_bigendian = xyes; then | ||
11 | - AC_DEFINE(SDL_BYTEORDER, 4321) | ||
12 | + AC_DEFINE(SDL_BYTEORDER, 4321, "Byte Order") | ||
13 | else | ||
14 | - AC_DEFINE(SDL_BYTEORDER, 1234) | ||
15 | + AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order") | ||
16 | fi | ||
17 | |||
18 | dnl Check for tools | ||
19 | @@ -134,7 +134,7 @@ AC_ARG_ENABLE(libc, | ||
20 | AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]), | ||
21 | , enable_libc=yes) | ||
22 | if test x$enable_libc = xyes; then | ||
23 | - AC_DEFINE(HAVE_LIBC) | ||
24 | + AC_DEFINE(HAVE_LIBC,1,"") | ||
25 | |||
26 | dnl Check for C library headers | ||
27 | AC_HEADER_STDC | ||
28 | @@ -145,7 +145,7 @@ if test x$enable_libc = xyes; then | ||
29 | if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then | ||
30 | AC_CHECK_TYPE(int64_t) | ||
31 | if test x$ac_cv_type_int64_t = xyes; then | ||
32 | - AC_DEFINE(SDL_HAS_64BIT_TYPE) | ||
33 | + AC_DEFINE(SDL_HAS_64BIT_TYPE,1,"") | ||
34 | fi | ||
35 | have_inttypes=yes | ||
36 | fi | ||
37 | @@ -161,11 +161,11 @@ if test x$enable_libc = xyes; then | ||
38 | |||
39 | AC_FUNC_MEMCMP | ||
40 | if test x$ac_cv_func_memcmp_working = xyes; then | ||
41 | - AC_DEFINE(HAVE_MEMCMP) | ||
42 | + AC_DEFINE(HAVE_MEMCMP,1,"") | ||
43 | fi | ||
44 | AC_FUNC_STRTOD | ||
45 | if test x$ac_cv_func_strtod = xyes; then | ||
46 | - AC_DEFINE(HAVE_STRTOD) | ||
47 | + AC_DEFINE(HAVE_STRTOD,1,"") | ||
48 | fi | ||
49 | AC_CHECK_FUNC(mprotect, | ||
50 | AC_TRY_COMPILE([ | ||
51 | @@ -191,40 +191,40 @@ if test x$have_inttypes != xyes; then | ||
52 | AC_CHECK_SIZEOF(long, 4) | ||
53 | AC_CHECK_SIZEOF(long long, 8) | ||
54 | if test x$ac_cv_sizeof_char = x1; then | ||
55 | - AC_DEFINE(int8_t, signed char) | ||
56 | - AC_DEFINE(uint8_t, unsigned char) | ||
57 | + AC_DEFINE(int8_t, signed char,"") | ||
58 | + AC_DEFINE(uint8_t, unsigned char,"") | ||
59 | fi | ||
60 | if test x$ac_cv_sizeof_short = x2; then | ||
61 | - AC_DEFINE(int16_t, signed short) | ||
62 | - AC_DEFINE(uint16_t, unsigned short) | ||
63 | + AC_DEFINE(int16_t, signed short,"") | ||
64 | + AC_DEFINE(uint16_t, unsigned short,"") | ||
65 | else | ||
66 | if test x$ac_cv_sizeof_int = x2; then | ||
67 | - AC_DEFINE(int16_t, signed int) | ||
68 | - AC_DEFINE(uint16_t, unsigned int) | ||
69 | + AC_DEFINE(int16_t, signed int,"") | ||
70 | + AC_DEFINE(uint16_t, unsigned int,"") | ||
71 | fi | ||
72 | fi | ||
73 | if test x$ac_cv_sizeof_int = x4; then | ||
74 | - AC_DEFINE(int32_t, signed int) | ||
75 | - AC_DEFINE(uint32_t, unsigned int) | ||
76 | + AC_DEFINE(int32_t, signed int,"") | ||
77 | + AC_DEFINE(uint32_t, unsigned int,"") | ||
78 | else | ||
79 | if test x$ac_cv_sizeof_long = x4; then | ||
80 | - AC_DEFINE(int32_t, signed long) | ||
81 | - AC_DEFINE(uint32_t, unsigned long) | ||
82 | + AC_DEFINE(int32_t, signed long,"") | ||
83 | + AC_DEFINE(uint32_t, unsigned long,"") | ||
84 | fi | ||
85 | fi | ||
86 | if test x$ac_cv_sizeof_long = x8; then | ||
87 | - AC_DEFINE(int64_t, signed long) | ||
88 | - AC_DEFINE(uint64_t, unsigned long) | ||
89 | - AC_DEFINE(SDL_HAS_64BIT_TYPE) | ||
90 | + AC_DEFINE(int64_t, signed long,"") | ||
91 | + AC_DEFINE(uint64_t, unsigned long,"") | ||
92 | + AC_DEFINE(SDL_HAS_64BIT_TYPE,"") | ||
93 | else | ||
94 | if test x$ac_cv_sizeof_long_long = x8; then | ||
95 | - AC_DEFINE(int64_t, signed long long) | ||
96 | - AC_DEFINE(uint64_t, unsigned long long) | ||
97 | - AC_DEFINE(SDL_HAS_64BIT_TYPE) | ||
98 | + AC_DEFINE(int64_t, signed long long,"") | ||
99 | + AC_DEFINE(uint64_t, unsigned long long,"") | ||
100 | + AC_DEFINE(SDL_HAS_64BIT_TYPE,"") | ||
101 | fi | ||
102 | fi | ||
103 | - AC_DEFINE(size_t, unsigned int) | ||
104 | - AC_DEFINE(uintptr_t, unsigned long) | ||
105 | + AC_DEFINE(size_t, unsigned int,"") | ||
106 | + AC_DEFINE(uintptr_t, unsigned long,"") | ||
107 | fi | ||
108 | |||
109 | # Standard C sources | ||
110 | @@ -245,25 +245,25 @@ AC_ARG_ENABLE(audio, | ||
111 | AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]), | ||
112 | , enable_audio=yes) | ||
113 | if test x$enable_audio != xyes; then | ||
114 | - AC_DEFINE(SDL_AUDIO_DISABLED) | ||
115 | + AC_DEFINE(SDL_AUDIO_DISABLED,1,"") | ||
116 | fi | ||
117 | AC_ARG_ENABLE(video, | ||
118 | AC_HELP_STRING([--enable-video], [Enable the video subsystem [[default=yes]]]), | ||
119 | , enable_video=yes) | ||
120 | if test x$enable_video != xyes; then | ||
121 | - AC_DEFINE(SDL_VIDEO_DISABLED) | ||
122 | + AC_DEFINE(SDL_VIDEO_DISABLED,1,"") | ||
123 | fi | ||
124 | AC_ARG_ENABLE(events, | ||
125 | AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]), | ||
126 | , enable_events=yes) | ||
127 | if test x$enable_events != xyes; then | ||
128 | - AC_DEFINE(SDL_EVENTS_DISABLED) | ||
129 | + AC_DEFINE(SDL_EVENTS_DISABLED,1,"") | ||
130 | fi | ||
131 | AC_ARG_ENABLE(joystick, | ||
132 | AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]), | ||
133 | , enable_joystick=yes) | ||
134 | if test x$enable_joystick != xyes; then | ||
135 | - AC_DEFINE(SDL_JOYSTICK_DISABLED) | ||
136 | + AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"") | ||
137 | else | ||
138 | SOURCES="$SOURCES $srcdir/src/joystick/*.c" | ||
139 | fi | ||
140 | @@ -271,43 +271,43 @@ AC_ARG_ENABLE(cdrom, | ||
141 | AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]), | ||
142 | , enable_cdrom=yes) | ||
143 | if test x$enable_cdrom != xyes; then | ||
144 | - AC_DEFINE(SDL_CDROM_DISABLED) | ||
145 | + AC_DEFINE(SDL_CDROM_DISABLED,1,"") | ||
146 | fi | ||
147 | AC_ARG_ENABLE(threads, | ||
148 | AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]), | ||
149 | , enable_threads=yes) | ||
150 | if test x$enable_threads != xyes; then | ||
151 | - AC_DEFINE(SDL_THREADS_DISABLED) | ||
152 | + AC_DEFINE(SDL_THREADS_DISABLED,1,"") | ||
153 | fi | ||
154 | AC_ARG_ENABLE(timers, | ||
155 | AC_HELP_STRING([--enable-timers], [Enable the timer subsystem [[default=yes]]]), | ||
156 | , enable_timers=yes) | ||
157 | if test x$enable_timers != xyes; then | ||
158 | - AC_DEFINE(SDL_TIMERS_DISABLED) | ||
159 | + AC_DEFINE(SDL_TIMERS_DISABLED,1,"") | ||
160 | fi | ||
161 | AC_ARG_ENABLE(file, | ||
162 | AC_HELP_STRING([--enable-file], [Enable the file subsystem [[default=yes]]]), | ||
163 | , enable_file=yes) | ||
164 | if test x$enable_file != xyes; then | ||
165 | - AC_DEFINE(SDL_FILE_DISABLED) | ||
166 | + AC_DEFINE(SDL_FILE_DISABLED,1,"") | ||
167 | fi | ||
168 | AC_ARG_ENABLE(loadso, | ||
169 | AC_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [[default=yes]]]), | ||
170 | , enable_loadso=yes) | ||
171 | if test x$enable_loadso != xyes; then | ||
172 | - AC_DEFINE(SDL_LOADSO_DISABLED) | ||
173 | + AC_DEFINE(SDL_LOADSO_DISABLED,1,"") | ||
174 | fi | ||
175 | AC_ARG_ENABLE(cpuinfo, | ||
176 | AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [[default=yes]]]), | ||
177 | , enable_cpuinfo=yes) | ||
178 | if test x$enable_cpuinfo != xyes; then | ||
179 | - AC_DEFINE(SDL_CPUINFO_DISABLED) | ||
180 | + AC_DEFINE(SDL_CPUINFO_DISABLED,1,"") | ||
181 | fi | ||
182 | AC_ARG_ENABLE(assembly, | ||
183 | AC_HELP_STRING([--enable-assembly], [Enable assembly routines [[default=yes]]]), | ||
184 | , enable_assembly=yes) | ||
185 | if test x$enable_assembly = xyes; then | ||
186 | - AC_DEFINE(SDL_ASSEMBLY_ROUTINES) | ||
187 | + AC_DEFINE(SDL_ASSEMBLY_ROUTINES,1,"") | ||
188 | fi | ||
189 | |||
190 | dnl See if the OSS audio interface is supported | ||
191 | @@ -335,12 +335,12 @@ AC_HELP_STRING([--enable-oss], [support | ||
192 | int arg = SNDCTL_DSP_SETFRAGMENT; | ||
193 | ],[ | ||
194 | have_oss=yes | ||
195 | - AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H) | ||
196 | + AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H,1,"") | ||
197 | ]) | ||
198 | fi | ||
199 | AC_MSG_RESULT($have_oss) | ||
200 | if test x$have_oss = xyes; then | ||
201 | - AC_DEFINE(SDL_AUDIO_DRIVER_OSS) | ||
202 | + AC_DEFINE(SDL_AUDIO_DRIVER_OSS,1,"") | ||
203 | SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c" | ||
204 | SOURCES="$SOURCES $srcdir/src/audio/dma/*.c" | ||
205 | have_audio=yes | ||
206 | @@ -407,7 +407,7 @@ CheckDMEDIA() | ||
207 | AC_MSG_RESULT($have_dmedia) | ||
208 | # Set up files for the audio library | ||
209 | if test x$have_dmedia = xyes; then | ||
210 | - AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA) | ||
211 | + AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA,1,"") | ||
212 | SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c" | ||
213 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio" | ||
214 | have_audio=yes | ||
215 | @@ -444,7 +444,7 @@ CheckMME() | ||
216 | AC_MSG_RESULT($have_mme) | ||
217 | # Set up files for the audio library | ||
218 | if test x$have_mme = xyes; then | ||
219 | - AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO) | ||
220 | + AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO,1,"") | ||
221 | SOURCES="$SOURCES $srcdir/src/audio/mme/*.c" | ||
222 | EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS" | ||
223 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS" | ||
224 | @@ -467,7 +467,7 @@ AC_HELP_STRING([--enable-esd-shared], [d | ||
225 | , enable_esd_shared=yes) | ||
226 | esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] | ||
227 | |||
228 | - AC_DEFINE(SDL_AUDIO_DRIVER_ESD) | ||
229 | + AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"") | ||
230 | SOURCES="$SOURCES $srcdir/src/audio/esd/*.c" | ||
231 | EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS" | ||
232 | if test x$have_loadso != xyes && \ | ||
233 | @@ -477,7 +477,7 @@ AC_HELP_STRING([--enable-esd-shared], [d | ||
234 | if test x$have_loadso = xyes && \ | ||
235 | test x$enable_esd_shared = xyes && test x$esd_lib != x; then | ||
236 | echo "-- dynamic libesd -> $esd_lib" | ||
237 | - AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib") | ||
238 | + AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "") | ||
239 | else | ||
240 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS" | ||
241 | fi | ||
242 | @@ -564,7 +564,7 @@ AC_HELP_STRING([--enable-arts-shared], [ | ||
243 | , enable_arts_shared=yes) | ||
244 | arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] | ||
245 | |||
246 | - AC_DEFINE(SDL_AUDIO_DRIVER_ARTS) | ||
247 | + AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "") | ||
248 | SOURCES="$SOURCES $srcdir/src/audio/arts/*.c" | ||
249 | EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS" | ||
250 | if test x$have_loadso != xyes && \ | ||
251 | @@ -574,7 +574,7 @@ AC_HELP_STRING([--enable-arts-shared], [ | ||
252 | if test x$have_loadso = xyes && \ | ||
253 | test x$enable_arts_shared = xyes && test x$arts_lib != x; then | ||
254 | echo "-- dynamic libartsc -> $arts_lib" | ||
255 | - AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib") | ||
256 | + AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"") | ||
257 | else | ||
258 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS" | ||
259 | fi | ||
260 | @@ -634,7 +634,7 @@ AC_HELP_STRING([--enable-nas-shared], [d | ||
261 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS" | ||
262 | fi | ||
263 | |||
264 | - AC_DEFINE(SDL_AUDIO_DRIVER_NAS) | ||
265 | + AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"") | ||
266 | SOURCES="$SOURCES $srcdir/src/audio/nas/*.c" | ||
267 | EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS" | ||
268 | have_audio=yes | ||
269 | @@ -649,7 +649,7 @@ CheckDiskAudio() | ||
270 | AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]), | ||
271 | , enable_diskaudio=yes) | ||
272 | if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then | ||
273 | - AC_DEFINE(SDL_AUDIO_DRIVER_DISK) | ||
274 | + AC_DEFINE(SDL_AUDIO_DRIVER_DISK,1,"") | ||
275 | SOURCES="$SOURCES $srcdir/src/audio/disk/*.c" | ||
276 | fi | ||
277 | } | ||
278 | @@ -661,7 +661,7 @@ CheckDummyAudio() | ||
279 | AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]), | ||
280 | , enable_dummyaudio=yes) | ||
281 | if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then | ||
282 | - AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY) | ||
283 | + AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY,1,"") | ||
284 | SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c" | ||
285 | fi | ||
286 | } | ||
287 | @@ -677,7 +677,7 @@ AC_HELP_STRING([--enable-mintaudio], [su | ||
288 | AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes) | ||
289 | if test x$have_mint_falcon_hdr = xyes; then | ||
290 | mintaudio=yes | ||
291 | - AC_DEFINE(SDL_AUDIO_DRIVER_MINT) | ||
292 | + AC_DEFINE(SDL_AUDIO_DRIVER_MINT,1,"") | ||
293 | SOURCES="$SOURCES $srcdir/src/audio/mint/*.c" | ||
294 | SOURCES="$SOURCES $srcdir/src/audio/mint/*.S" | ||
295 | have_audio=yes | ||
296 | @@ -746,7 +746,7 @@ AC_HELP_STRING([--enable-nasm], [use nas | ||
297 | CompileNASM unquoted-sections || NASM="" | ||
298 | |||
299 | if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then | ||
300 | - AC_DEFINE(SDL_HERMES_BLITTERS) | ||
301 | + AC_DEFINE(SDL_HERMES_BLITTERS,1,"") | ||
302 | SOURCES="$SOURCES $srcdir/src/hermes/*.asm" | ||
303 | NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/" | ||
304 | |||
305 | @@ -840,9 +840,9 @@ AC_HELP_STRING([--enable-altivec], [use | ||
306 | CFLAGS="$save_CFLAGS" | ||
307 | |||
308 | if test x$have_gcc_altivec = xyes; then | ||
309 | - AC_DEFINE(SDL_ALTIVEC_BLITTERS) | ||
310 | + AC_DEFINE(SDL_ALTIVEC_BLITTERS,1,"") | ||
311 | if test x$have_altivec_h_hdr = xyes; then | ||
312 | - AC_DEFINE(HAVE_ALTIVEC_H) | ||
313 | + AC_DEFINE(HAVE_ALTIVEC_H,1,"") | ||
314 | fi | ||
315 | EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS" | ||
316 | fi | ||
317 | @@ -920,7 +920,7 @@ AC_HELP_STRING([--enable-ipod], [configu | ||
318 | |||
319 | if test x$enable_ipod = xyes; then | ||
320 | EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD" | ||
321 | - AC_DEFINE(SDL_VIDEO_DRIVER_IPOD) | ||
322 | + AC_DEFINE(SDL_VIDEO_DRIVER_IPOD,1,"") | ||
323 | SOURCES="$SOURCES $srcdir/src/video/ipod/*.c" | ||
324 | fi | ||
325 | } | ||
326 | @@ -954,7 +954,7 @@ CheckNANOX() | ||
327 | EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB" | ||
328 | fi | ||
329 | |||
330 | - AC_DEFINE(SDL_VIDEO_DRIVER_NANOX) | ||
331 | + AC_DEFINE(SDL_VIDEO_DRIVER_NANOX,1,"") | ||
332 | SOURCES="$SOURCES $srcdir/src/video/nanox/*.c" | ||
333 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X" | ||
334 | have_video=yes | ||
335 | @@ -1020,7 +1020,7 @@ AC_HELP_STRING([--enable-x11-shared], [d | ||
336 | CFLAGS="$CFLAGS $X_CFLAGS" | ||
337 | LDFLAGS="$LDFLAGS $X_LIBS" | ||
338 | |||
339 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11) | ||
340 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11,1,"") | ||
341 | SOURCES="$SOURCES $srcdir/src/video/x11/*.c" | ||
342 | EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" | ||
343 | |||
344 | @@ -1042,8 +1042,8 @@ AC_HELP_STRING([--enable-x11-shared], [d | ||
345 | test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then | ||
346 | echo "-- dynamic libX11 -> $x11_lib" | ||
347 | echo "-- dynamic libX11ext -> $x11ext_lib" | ||
348 | - AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib") | ||
349 | - AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib") | ||
350 | + AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib","") | ||
351 | + AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib","") | ||
352 | else | ||
353 | enable_x11_shared=no | ||
354 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" | ||
355 | @@ -1060,20 +1060,20 @@ AC_HELP_STRING([--enable-dga], [allow us | ||
356 | AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]), | ||
357 | , enable_video_dga=yes) | ||
358 | if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then | ||
359 | - AC_DEFINE(SDL_VIDEO_DRIVER_DGA) | ||
360 | + AC_DEFINE(SDL_VIDEO_DRIVER_DGA,1,"") | ||
361 | SOURCES="$SOURCES $srcdir/src/video/dga/*.c" | ||
362 | fi | ||
363 | AC_ARG_ENABLE(video-x11-dgamouse, | ||
364 | AC_HELP_STRING([--enable-video-x11-dgamouse], [use X11 DGA for mouse events [[default=yes]]]), | ||
365 | , enable_video_x11_dgamouse=yes) | ||
366 | if test x$enable_dga = xyes -a x$enable_video_x11_dgamouse = xyes; then | ||
367 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE) | ||
368 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE,1,"") | ||
369 | fi | ||
370 | AC_ARG_ENABLE(video-x11-vm, | ||
371 | AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]), | ||
372 | , enable_video_x11_vm=yes) | ||
373 | if test x$enable_video_x11_vm = xyes; then | ||
374 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE) | ||
375 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE,1,"") | ||
376 | SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c" | ||
377 | fi | ||
378 | AC_ARG_ENABLE(video-x11-xv, | ||
379 | @@ -1087,14 +1087,14 @@ AC_HELP_STRING([--enable-video-x11-xv], | ||
380 | AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]), | ||
381 | , enable_video_x11_xinerama=yes) | ||
382 | if test x$enable_video_x11_xinerama = xyes; then | ||
383 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA) | ||
384 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA,1,"") | ||
385 | SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c" | ||
386 | fi | ||
387 | AC_ARG_ENABLE(video-x11-xme, | ||
388 | AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]), | ||
389 | , enable_video_x11_xme=yes) | ||
390 | if test x$enable_video_x11_xme = xyes; then | ||
391 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME) | ||
392 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME,1,"") | ||
393 | SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c" | ||
394 | fi | ||
395 | AC_ARG_ENABLE(video-x11-xrandr, | ||
396 | @@ -1111,8 +1111,8 @@ AC_HELP_STRING([--enable-video-x11-xrand | ||
397 | if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then | ||
398 | echo "-- dynamic libXrender -> $xrender_lib" | ||
399 | echo "-- dynamic libXrandr -> $xrandr_lib" | ||
400 | - AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib") | ||
401 | - AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib") | ||
402 | + AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib","") | ||
403 | + AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib","") | ||
404 | definitely_enable_video_x11_xrandr=yes | ||
405 | else | ||
406 | AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes) | ||
407 | @@ -1125,7 +1125,7 @@ AC_HELP_STRING([--enable-video-x11-xrand | ||
408 | fi | ||
409 | fi | ||
410 | if test x$definitely_enable_video_x11_xrandr = xyes; then | ||
411 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) | ||
412 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"") | ||
413 | fi | ||
414 | fi | ||
415 | fi | ||
416 | @@ -1152,7 +1152,7 @@ AC_HELP_STRING([--enable-video-photon], | ||
417 | ]) | ||
418 | AC_MSG_RESULT($video_photon) | ||
419 | if test x$video_photon = xyes; then | ||
420 | - AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON) | ||
421 | + AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON,1,"") | ||
422 | SOURCES="$SOURCES $srcdir/src/video/photon/*.c" | ||
423 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph" | ||
424 | have_video=yes | ||
425 | @@ -1166,7 +1166,7 @@ dnl Set up the BWindow video driver if e | ||
426 | CheckBWINDOW() | ||
427 | { | ||
428 | if test x$enable_video = xyes; then | ||
429 | - AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW) | ||
430 | + AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW,1,"") | ||
431 | SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc" | ||
432 | have_video=yes | ||
433 | fi | ||
434 | @@ -1189,7 +1189,7 @@ AC_HELP_STRING([--enable-video-carbon], | ||
435 | ]) | ||
436 | AC_MSG_RESULT($have_carbon) | ||
437 | if test x$have_carbon = xyes; then | ||
438 | - AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX) | ||
439 | + AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX,1,"") | ||
440 | SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c" | ||
441 | SOURCES="$SOURCES $srcdir/src/video/macrom/*.c" | ||
442 | have_video=yes | ||
443 | @@ -1218,7 +1218,7 @@ AC_HELP_STRING([--enable-video-cocoa], [ | ||
444 | AC_MSG_RESULT($have_cocoa) | ||
445 | CFLAGS="$save_CFLAGS" | ||
446 | if test x$have_cocoa = xyes; then | ||
447 | - AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ) | ||
448 | + AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ,1,"") | ||
449 | SOURCES="$SOURCES $srcdir/src/video/quartz/*.m" | ||
450 | have_video=yes | ||
451 | fi | ||
452 | @@ -1245,7 +1245,7 @@ AC_HELP_STRING([--enable-video-fbcon], [ | ||
453 | AC_MSG_RESULT($video_fbcon) | ||
454 | if test x$video_fbcon = xyes; then | ||
455 | AC_CHECK_FUNCS(getpagesize) | ||
456 | - AC_DEFINE(SDL_VIDEO_DRIVER_FBCON) | ||
457 | + AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"") | ||
458 | SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c" | ||
459 | have_video=yes | ||
460 | fi | ||
461 | @@ -1296,7 +1296,7 @@ AC_HELP_STRING([--enable-video-directfb] | ||
462 | AC_MSG_RESULT($video_directfb) | ||
463 | |||
464 | if test x$video_directfb = xyes; then | ||
465 | - AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB) | ||
466 | + AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB,1,"") | ||
467 | SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" | ||
468 | EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" | ||
469 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" | ||
470 | @@ -1323,7 +1323,7 @@ AC_HELP_STRING([--enable-video-ps2gs], [ | ||
471 | ]) | ||
472 | AC_MSG_RESULT($video_ps2gs) | ||
473 | if test x$video_ps2gs = xyes; then | ||
474 | - AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS) | ||
475 | + AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS,1,"") | ||
476 | SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c" | ||
477 | have_video=yes | ||
478 | fi | ||
479 | @@ -1376,7 +1376,7 @@ AC_HELP_STRING([--enable-video-ggi], [us | ||
480 | ]) | ||
481 | AC_MSG_RESULT($video_ggi) | ||
482 | if test x$video_ggi = xyes; then | ||
483 | - AC_DEFINE(SDL_VIDEO_DRIVER_GGI) | ||
484 | + AC_DEFINE(SDL_VIDEO_DRIVER_GGI,1,"") | ||
485 | SOURCES="$SOURCES $srcdir/src/video/ggi/*.c" | ||
486 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg" | ||
487 | have_video=yes | ||
488 | @@ -1406,7 +1406,7 @@ AC_HELP_STRING([--enable-video-svga], [u | ||
489 | ]) | ||
490 | AC_MSG_RESULT($video_svga) | ||
491 | if test x$video_svga = xyes; then | ||
492 | - AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB) | ||
493 | + AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB,1,"") | ||
494 | SOURCES="$SOURCES $srcdir/src/video/svga/*.c" | ||
495 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga" | ||
496 | have_video=yes | ||
497 | @@ -1438,7 +1438,7 @@ AC_HELP_STRING([--enable-video-vgl], [us | ||
498 | ]) | ||
499 | AC_MSG_RESULT($video_vgl) | ||
500 | if test x$video_vgl = xyes; then | ||
501 | - AC_DEFINE(SDL_VIDEO_DRIVER_VGL) | ||
502 | + AC_DEFINE(SDL_VIDEO_DRIVER_VGL,1,"") | ||
503 | SOURCES="$SOURCES $srcdir/src/video/vgl/*.c" | ||
504 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl" | ||
505 | have_video=yes | ||
506 | @@ -1466,7 +1466,7 @@ AC_HELP_STRING([--enable-video-wscons], | ||
507 | ]) | ||
508 | AC_MSG_RESULT($video_wscons) | ||
509 | if test x$video_wscons = xyes; then | ||
510 | - AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS) | ||
511 | + AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS,1,"") | ||
512 | SOURCES="$SOURCES $srcdir/src/video/wscons/*.c" | ||
513 | have_video=yes | ||
514 | fi | ||
515 | @@ -1491,7 +1491,7 @@ AC_HELP_STRING([--enable-video-aalib], [ | ||
516 | ]) | ||
517 | AC_MSG_RESULT($video_aalib) | ||
518 | if test x$video_aalib = xyes; then | ||
519 | - AC_DEFINE(SDL_VIDEO_DRIVER_AALIB) | ||
520 | + AC_DEFINE(SDL_VIDEO_DRIVER_AALIB,1,"") | ||
521 | SOURCES="$SOURCES $srcdir/src/video/aalib/*.c" | ||
522 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa" | ||
523 | have_video=yes | ||
524 | @@ -1553,7 +1553,7 @@ AC_HELP_STRING([--enable-video-qtopia], | ||
525 | CXXFLAGS="$OLD_CXX" | ||
526 | AC_MSG_RESULT($video_qtopia) | ||
527 | if test x$video_qtopia = xyes; then | ||
528 | - AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA) | ||
529 | + AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"") | ||
530 | SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc" | ||
531 | SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc" | ||
532 | SDLMAIN_LDFLAGS="-static" | ||
533 | @@ -1583,7 +1583,7 @@ AC_HELP_STRING([--enable-video-picogui], | ||
534 | ]) | ||
535 | AC_MSG_RESULT($video_picogui) | ||
536 | if test x$video_picogui = xyes; then | ||
537 | - AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI) | ||
538 | + AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI,1,"") | ||
539 | SOURCES="$SOURCES $srcdir/src/video/picogui/*.c" | ||
540 | SDL_LIBS="$SDL_LIBS -lpgui" | ||
541 | have_video=yes | ||
542 | @@ -1607,7 +1607,7 @@ AC_HELP_STRING([--enable-video-xbios], [ | ||
543 | video_xbios=no | ||
544 | if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then | ||
545 | video_xbios=yes | ||
546 | - AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS) | ||
547 | + AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS,1,"") | ||
548 | SOURCES="$SOURCES $srcdir/src/video/xbios/*.c" | ||
549 | have_video=yes | ||
550 | fi | ||
551 | @@ -1625,7 +1625,7 @@ AC_HELP_STRING([--enable-video-gem], [us | ||
552 | AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes) | ||
553 | if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then | ||
554 | video_gem=yes | ||
555 | - AC_DEFINE(SDL_VIDEO_DRIVER_GEM) | ||
556 | + AC_DEFINE(SDL_VIDEO_DRIVER_GEM,1,"") | ||
557 | SOURCES="$SOURCES $srcdir/src/video/gem/*.c" | ||
558 | SDL_LIBS="$SDL_LIBS -lgem" | ||
559 | have_video=yes | ||
560 | @@ -1640,7 +1640,7 @@ CheckDummyVideo() | ||
561 | AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]), | ||
562 | , enable_video_dummy=yes) | ||
563 | if test x$enable_video_dummy = xyes; then | ||
564 | - AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY) | ||
565 | + AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY,1,"") | ||
566 | SOURCES="$SOURCES $srcdir/src/video/dummy/*.c" | ||
567 | have_video=yes | ||
568 | fi | ||
569 | @@ -1667,8 +1667,8 @@ CheckOpenGLX11() | ||
570 | ]) | ||
571 | AC_MSG_RESULT($video_opengl) | ||
572 | if test x$video_opengl = xyes; then | ||
573 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
574 | - AC_DEFINE(SDL_VIDEO_OPENGL_GLX) | ||
575 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
576 | + AC_DEFINE(SDL_VIDEO_OPENGL_GLX,1,"") | ||
577 | fi | ||
578 | fi | ||
579 | } | ||
580 | @@ -1687,7 +1687,7 @@ CheckOpenGLQNX() | ||
581 | ]) | ||
582 | AC_MSG_RESULT($video_opengl) | ||
583 | if test x$video_opengl = xyes; then | ||
584 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
585 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
586 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" | ||
587 | fi | ||
588 | fi | ||
589 | @@ -1697,8 +1697,8 @@ dnl Check for Win32 OpenGL | ||
590 | CheckWIN32GL() | ||
591 | { | ||
592 | if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then | ||
593 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
594 | - AC_DEFINE(SDL_VIDEO_OPENGL_WGL) | ||
595 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
596 | + AC_DEFINE(SDL_VIDEO_OPENGL_WGL,1,"") | ||
597 | fi | ||
598 | } | ||
599 | |||
600 | @@ -1706,7 +1706,7 @@ dnl Check for BeOS OpenGL | ||
601 | CheckBeGL() | ||
602 | { | ||
603 | if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then | ||
604 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
605 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
606 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" | ||
607 | fi | ||
608 | } | ||
609 | @@ -1715,7 +1715,7 @@ dnl Check for MacOS OpenGL | ||
610 | CheckMacGL() | ||
611 | { | ||
612 | if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then | ||
613 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
614 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
615 | case "$host" in | ||
616 | *-*-darwin*) | ||
617 | if test x$enable_video_cocoa = xyes; then | ||
618 | @@ -1747,8 +1747,8 @@ CheckAtariOSMesa() | ||
619 | OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags` | ||
620 | OSMESA_LIBS=`$OSMESA_CONFIG --libs` | ||
621 | fi | ||
622 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
623 | - AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA) | ||
624 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
625 | + AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA,1,"") | ||
626 | SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS" | ||
627 | SDL_LIBS="$SDL_LIBS $OSMESA_LIBS" | ||
628 | |||
629 | @@ -1758,7 +1758,7 @@ AC_HELP_STRING([--enable-osmesa-shared], | ||
630 | if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then | ||
631 | # Dynamic linking | ||
632 | if test "x$have_osmesa_hdr" = "xyes"; then | ||
633 | - AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC) | ||
634 | + AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC,1,"") | ||
635 | fi | ||
636 | fi | ||
637 | fi | ||
638 | @@ -1792,7 +1792,7 @@ AC_HELP_STRING([--enable-input-events], | ||
639 | ]) | ||
640 | AC_MSG_RESULT($use_input_events) | ||
641 | if test x$use_input_events = xyes; then | ||
642 | - AC_DEFINE(SDL_INPUT_LINUXEV) | ||
643 | + AC_DEFINE(SDL_INPUT_LINUXEV,1,"") | ||
644 | fi | ||
645 | fi | ||
646 | } | ||
647 | @@ -1814,7 +1814,7 @@ AC_HELP_STRING([--enable-input-tslib], [ | ||
648 | ]) | ||
649 | AC_MSG_RESULT($enable_input_tslib) | ||
650 | if test x$enable_input_tslib = xyes; then | ||
651 | - AC_DEFINE(SDL_INPUT_TSLIB) | ||
652 | + AC_DEFINE(SDL_INPUT_TSLIB,1,"") | ||
653 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts" | ||
654 | fi | ||
655 | fi | ||
656 | @@ -1837,7 +1837,7 @@ AC_HELP_STRING([--enable-pth], [use GNU | ||
657 | AC_MSG_CHECKING(pth) | ||
658 | AC_MSG_RESULT($use_pth) | ||
659 | if test "x$use_pth" = xyes; then | ||
660 | - AC_DEFINE(SDL_THREAD_PTH) | ||
661 | + AC_DEFINE(SDL_THREAD_PTH,1,"") | ||
662 | SOURCES="$SOURCES $srcdir/src/thread/pth/*.c" | ||
663 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c" | ||
664 | SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`" | ||
665 | @@ -1943,7 +1943,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ | ||
666 | |||
667 | # Do futher testing if we have pthread support... | ||
668 | if test x$use_pthreads = xyes; then | ||
669 | - AC_DEFINE(SDL_THREAD_PTHREAD) | ||
670 | + AC_DEFINE(SDL_THREAD_PTHREAD,1,"") | ||
671 | EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags" | ||
672 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib" | ||
673 | SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags" | ||
674 | @@ -1965,7 +1965,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ | ||
675 | pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); | ||
676 | ],[ | ||
677 | has_recursive_mutexes=yes | ||
678 | - AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX) | ||
679 | + AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX,1,"") | ||
680 | ]) | ||
681 | fi | ||
682 | if test x$has_recursive_mutexes = xno; then | ||
683 | @@ -1976,7 +1976,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ | ||
684 | pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP); | ||
685 | ],[ | ||
686 | has_recursive_mutexes=yes | ||
687 | - AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP) | ||
688 | + AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP,1,"") | ||
689 | ]) | ||
690 | fi | ||
691 | AC_MSG_RESULT($has_recursive_mutexes) | ||
692 | @@ -2065,7 +2065,7 @@ AC_HELP_STRING([--enable-stdio-redirect] | ||
693 | fi | ||
694 | |||
695 | if test x$enable_video = xyes; then | ||
696 | - AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB) | ||
697 | + AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB,1,"") | ||
698 | SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c" | ||
699 | SOURCES="$SOURCES $srcdir/src/video/windib/*.c" | ||
700 | have_video=yes | ||
701 | @@ -2087,7 +2087,7 @@ AC_HELP_STRING([--enable-directx], [use | ||
702 | have_directx=yes | ||
703 | fi | ||
704 | if test x$enable_video = xyes -a x$have_directx = xyes; then | ||
705 | - AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW) | ||
706 | + AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW,1,"") | ||
707 | SOURCES="$SOURCES $srcdir/src/video/windx5/*.c" | ||
708 | have_video=yes | ||
709 | fi | ||
710 | @@ -2118,7 +2118,7 @@ AC_HELP_STRING([--enable-sdl-dlopen], [u | ||
711 | AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS", | ||
712 | AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl", | ||
713 | AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl"))) | ||
714 | - AC_DEFINE(SDL_LOADSO_DLOPEN) | ||
715 | + AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") | ||
716 | SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" | ||
717 | have_loadso=yes | ||
718 | fi | ||
719 | @@ -2135,7 +2135,7 @@ AC_HELP_STRING([--enable-atari-ldg], [us | ||
720 | AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes) | ||
721 | AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem) | ||
722 | if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then | ||
723 | - AC_DEFINE(SDL_LOADSO_LDG) | ||
724 | + AC_DEFINE(SDL_LOADSO_LDG,1,"") | ||
725 | SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c" | ||
726 | SDL_LIBS="$SDL_LIBS -lldg -lgem" | ||
727 | have_loadso=yes | ||
728 | @@ -2266,11 +2266,11 @@ CheckUSBHID() | ||
729 | have_machine_joystick=yes | ||
730 | ]) | ||
731 | if test x$have_machine_joystick = xyes; then | ||
732 | - AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H) | ||
733 | + AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H,1,"") | ||
734 | fi | ||
735 | AC_MSG_RESULT($have_machine_joystick) | ||
736 | |||
737 | - AC_DEFINE(SDL_JOYSTICK_USBHID) | ||
738 | + AC_DEFINE(SDL_JOYSTICK_USBHID,1,"") | ||
739 | SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c" | ||
740 | EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS" | ||
741 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS" | ||
742 | @@ -2289,7 +2289,7 @@ AC_HELP_STRING([--enable-clock_gettime], | ||
743 | if test x$enable_clock_gettime = xyes; then | ||
744 | AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes) | ||
745 | if test x$have_clock_gettime = xyes; then | ||
746 | - AC_DEFINE(HAVE_CLOCK_GETTIME) | ||
747 | + AC_DEFINE(HAVE_CLOCK_GETTIME,1,"") | ||
748 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt" | ||
749 | fi | ||
750 | fi | ||
751 | @@ -2320,7 +2320,7 @@ case "$host" in | ||
752 | CheckIPod | ||
753 | # Set up files for the timer library | ||
754 | if test x$enable_timers = xyes; then | ||
755 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
756 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
757 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
758 | have_timers=yes | ||
759 | fi | ||
760 | @@ -2386,17 +2386,17 @@ case "$host" in | ||
761 | if test x$enable_audio = xyes; then | ||
762 | case $ARCH in | ||
763 | sysv5|solaris|hpux) | ||
764 | - AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO) | ||
765 | + AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"") | ||
766 | SOURCES="$SOURCES $srcdir/src/audio/sun/*.c" | ||
767 | have_audio=yes | ||
768 | ;; | ||
769 | netbsd|openbsd) | ||
770 | - AC_DEFINE(SDL_AUDIO_DRIVER_BSD) | ||
771 | + AC_DEFINE(SDL_AUDIO_DRIVER_BSD,1,"") | ||
772 | SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c" | ||
773 | have_audio=yes | ||
774 | ;; | ||
775 | aix) | ||
776 | - AC_DEFINE(SDL_AUDIO_DRIVER_PAUD) | ||
777 | + AC_DEFINE(SDL_AUDIO_DRIVER_PAUD,1,"") | ||
778 | SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c" | ||
779 | have_audio=yes | ||
780 | ;; | ||
781 | @@ -2406,7 +2406,7 @@ case "$host" in | ||
782 | if test x$enable_joystick = xyes; then | ||
783 | case $ARCH in | ||
784 | linux) | ||
785 | - AC_DEFINE(SDL_JOYSTICK_LINUX) | ||
786 | + AC_DEFINE(SDL_JOYSTICK_LINUX,1,"") | ||
787 | SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c" | ||
788 | have_joystick=yes | ||
789 | ;; | ||
790 | @@ -2416,32 +2416,32 @@ case "$host" in | ||
791 | if test x$enable_cdrom = xyes; then | ||
792 | case $ARCH in | ||
793 | linux|solaris) | ||
794 | - AC_DEFINE(SDL_CDROM_LINUX) | ||
795 | + AC_DEFINE(SDL_CDROM_LINUX,1,"") | ||
796 | SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c" | ||
797 | have_cdrom=yes | ||
798 | ;; | ||
799 | *freebsd*) | ||
800 | - AC_DEFINE(SDL_CDROM_FREEBSD) | ||
801 | + AC_DEFINE(SDL_CDROM_FREEBSD,1,"") | ||
802 | SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c" | ||
803 | have_cdrom=yes | ||
804 | ;; | ||
805 | *openbsd*|*netbsd*) | ||
806 | - AC_DEFINE(SDL_CDROM_OPENBSD) | ||
807 | + AC_DEFINE(SDL_CDROM_OPENBSD,1,"") | ||
808 | SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c" | ||
809 | have_cdrom=yes | ||
810 | ;; | ||
811 | bsdi) | ||
812 | - AC_DEFINE(SDL_CDROM_BSDI) | ||
813 | + AC_DEFINE(SDL_CDROM_BSDI,1,"") | ||
814 | SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c" | ||
815 | have_cdrom=yes | ||
816 | ;; | ||
817 | aix) | ||
818 | - AC_DEFINE(SDL_CDROM_AIX) | ||
819 | + AC_DEFINE(SDL_CDROM_AIX,1,"") | ||
820 | SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c" | ||
821 | have_cdrom=yes | ||
822 | ;; | ||
823 | osf) | ||
824 | - AC_DEFINE(SDL_CDROM_OSF) | ||
825 | + AC_DEFINE(SDL_CDROM_OSF,1,"") | ||
826 | SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c" | ||
827 | have_cdrom=yes | ||
828 | ;; | ||
829 | @@ -2449,7 +2449,7 @@ case "$host" in | ||
830 | fi | ||
831 | # Set up files for the thread library | ||
832 | if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then | ||
833 | - AC_DEFINE(SDL_THREAD_SPROC) | ||
834 | + AC_DEFINE(SDL_THREAD_SPROC,1,"") | ||
835 | SOURCES="$SOURCES $srcdir/src/thread/irix/*.c" | ||
836 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" | ||
837 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" | ||
838 | @@ -2457,7 +2457,7 @@ case "$host" in | ||
839 | fi | ||
840 | # Set up files for the timer library | ||
841 | if test x$enable_timers = xyes; then | ||
842 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
843 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
844 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
845 | have_timers=yes | ||
846 | fi | ||
847 | @@ -2476,20 +2476,20 @@ case "$host" in | ||
848 | CheckPTHREAD | ||
849 | # Set up files for the audio library | ||
850 | if test x$enable_audio = xyes; then | ||
851 | - AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO) | ||
852 | + AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO,1,"") | ||
853 | SOURCES="$SOURCES $srcdir/src/audio/nto/*.c" | ||
854 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound" | ||
855 | have_audio=yes | ||
856 | fi | ||
857 | # Set up files for the cdrom library | ||
858 | if test x$enable_cdrom = xyes; then | ||
859 | - AC_DEFINE(SDL_CDROM_QNX) | ||
860 | + AC_DEFINE(SDL_CDROM_QNX,1,"") | ||
861 | SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c" | ||
862 | have_cdrom=yes | ||
863 | fi | ||
864 | # Set up files for the timer library | ||
865 | if test x$enable_timers = xyes; then | ||
866 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
867 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
868 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
869 | have_timers=yes | ||
870 | fi | ||
871 | @@ -2514,29 +2514,29 @@ case "$host" in | ||
872 | CheckNASM | ||
873 | # Set up files for the audio library | ||
874 | if test x$enable_audio = xyes; then | ||
875 | - AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT) | ||
876 | + AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT,1,"") | ||
877 | SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" | ||
878 | if test x$have_directx = xyes; then | ||
879 | - AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND) | ||
880 | + AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND,1,"") | ||
881 | SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c" | ||
882 | fi | ||
883 | have_audio=yes | ||
884 | fi | ||
885 | # Set up files for the joystick library | ||
886 | if test x$enable_joystick = xyes; then | ||
887 | - AC_DEFINE(SDL_JOYSTICK_WINMM) | ||
888 | + AC_DEFINE(SDL_JOYSTICK_WINMM,1,"") | ||
889 | SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c" | ||
890 | have_joystick=yes | ||
891 | fi | ||
892 | # Set up files for the cdrom library | ||
893 | if test x$enable_cdrom = xyes; then | ||
894 | - AC_DEFINE(SDL_CDROM_WIN32) | ||
895 | + AC_DEFINE(SDL_CDROM_WIN32,1,"") | ||
896 | SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c" | ||
897 | have_cdrom=yes | ||
898 | fi | ||
899 | # Set up files for the thread library | ||
900 | if test x$enable_threads = xyes; then | ||
901 | - AC_DEFINE(SDL_THREAD_WIN32) | ||
902 | + AC_DEFINE(SDL_THREAD_WIN32,1,"") | ||
903 | SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" | ||
904 | SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" | ||
905 | SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" | ||
906 | @@ -2545,13 +2545,13 @@ case "$host" in | ||
907 | fi | ||
908 | # Set up files for the timer library | ||
909 | if test x$enable_timers = xyes; then | ||
910 | - AC_DEFINE(SDL_TIMER_WIN32) | ||
911 | + AC_DEFINE(SDL_TIMER_WIN32,1,"") | ||
912 | SOURCES="$SOURCES $srcdir/src/timer/win32/*.c" | ||
913 | have_timers=yes | ||
914 | fi | ||
915 | # Set up files for the shared object loading library | ||
916 | if test x$enable_loadso = xyes; then | ||
917 | - AC_DEFINE(SDL_LOADSO_WIN32) | ||
918 | + AC_DEFINE(SDL_LOADSO_WIN32,1,"") | ||
919 | SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" | ||
920 | have_loadso=yes | ||
921 | fi | ||
922 | @@ -2622,25 +2622,25 @@ case "$host" in | ||
923 | CheckBeGL | ||
924 | # Set up files for the audio library | ||
925 | if test x$enable_audio = xyes; then | ||
926 | - AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO) | ||
927 | + AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO,1,"") | ||
928 | SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc" | ||
929 | have_audio=yes | ||
930 | fi | ||
931 | # Set up files for the joystick library | ||
932 | if test x$enable_joystick = xyes; then | ||
933 | - AC_DEFINE(SDL_JOYSTICK_BEOS) | ||
934 | + AC_DEFINE(SDL_JOYSTICK_BEOS,1,"") | ||
935 | SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc" | ||
936 | have_joystick=yes | ||
937 | fi | ||
938 | # Set up files for the cdrom library | ||
939 | if test x$enable_cdrom = xyes; then | ||
940 | - AC_DEFINE(SDL_CDROM_BEOS) | ||
941 | + AC_DEFINE(SDL_CDROM_BEOS,1,"") | ||
942 | SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc" | ||
943 | have_cdrom=yes | ||
944 | fi | ||
945 | # Set up files for the thread library | ||
946 | if test x$enable_threads = xyes; then | ||
947 | - AC_DEFINE(SDL_THREAD_BEOS) | ||
948 | + AC_DEFINE(SDL_THREAD_BEOS,1,"") | ||
949 | SOURCES="$SOURCES $srcdir/src/thread/beos/*.c" | ||
950 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" | ||
951 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" | ||
952 | @@ -2648,7 +2648,7 @@ case "$host" in | ||
953 | fi | ||
954 | # Set up files for the timer library | ||
955 | if test x$enable_timers = xyes; then | ||
956 | - AC_DEFINE(SDL_TIMER_BEOS) | ||
957 | + AC_DEFINE(SDL_TIMER_BEOS,1,"") | ||
958 | SOURCES="$SOURCES $srcdir/src/timer/beos/*.c" | ||
959 | have_timers=yes | ||
960 | fi | ||
961 | @@ -2656,11 +2656,11 @@ case "$host" in | ||
962 | if test x$enable_loadso = xyes; then | ||
963 | case "$host" in | ||
964 | *-*-beos*) | ||
965 | - AC_DEFINE(SDL_LOADSO_BEOS) | ||
966 | + AC_DEFINE(SDL_LOADSO_BEOS,1,"") | ||
967 | SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c" | ||
968 | ;; | ||
969 | *-*-haiku*) | ||
970 | - AC_DEFINE(SDL_LOADSO_DLOPEN) | ||
971 | + AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") | ||
972 | SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" | ||
973 | ;; | ||
974 | esac | ||
975 | @@ -2696,7 +2696,7 @@ case "$host" in | ||
976 | # Set up files for the shared object loading library | ||
977 | # (this needs to be done before the dynamic X11 check) | ||
978 | if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then | ||
979 | - AC_DEFINE(SDL_LOADSO_DLCOMPAT) | ||
980 | + AC_DEFINE(SDL_LOADSO_DLCOMPAT,1,"") | ||
981 | SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c" | ||
982 | have_loadso=yes | ||
983 | fi | ||
984 | @@ -2714,26 +2714,26 @@ case "$host" in | ||
985 | |||
986 | # Set up files for the audio library | ||
987 | if test x$enable_audio = xyes; then | ||
988 | - AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO) | ||
989 | + AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"") | ||
990 | SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c" | ||
991 | have_audio=yes | ||
992 | fi | ||
993 | # Set up files for the joystick library | ||
994 | if test x$enable_joystick = xyes; then | ||
995 | - AC_DEFINE(SDL_JOYSTICK_IOKIT) | ||
996 | + AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"") | ||
997 | SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c" | ||
998 | have_joystick=yes | ||
999 | need_iokit_framework=yes | ||
1000 | fi | ||
1001 | # Set up files for the cdrom library | ||
1002 | if test x$enable_cdrom = xyes; then | ||
1003 | - AC_DEFINE(SDL_CDROM_MACOSX) | ||
1004 | + AC_DEFINE(SDL_CDROM_MACOSX,1,"") | ||
1005 | SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c" | ||
1006 | have_cdrom=yes | ||
1007 | fi | ||
1008 | # Set up files for the timer library | ||
1009 | if test x$enable_timers = xyes; then | ||
1010 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
1011 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
1012 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
1013 | have_timers=yes | ||
1014 | fi | ||
1015 | @@ -2775,30 +2775,30 @@ case "$host" in | ||
1016 | # Set up files for the audio library | ||
1017 | if test x$enable_threads = xyes -a x$enable_pth = xyes; then | ||
1018 | if test x$enable_audio = xyes; then | ||
1019 | - AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO) | ||
1020 | + AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"") | ||
1021 | SOURCES="$SOURCES $srcdir/src/audio/sun/*.c" | ||
1022 | have_audio=yes | ||
1023 | fi | ||
1024 | fi | ||
1025 | # Set up files for the joystick library | ||
1026 | if test x$enable_joystick = xyes; then | ||
1027 | - AC_DEFINE(SDL_JOYSTICK_MINT) | ||
1028 | + AC_DEFINE(SDL_JOYSTICK_MINT,1,"") | ||
1029 | SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c" | ||
1030 | have_joystick=yes | ||
1031 | fi | ||
1032 | # Set up files for the cdrom library | ||
1033 | if test x$enable_cdrom = xyes; then | ||
1034 | - AC_DEFINE(SDL_CDROM_MINT) | ||
1035 | + AC_DEFINE(SDL_CDROM_MINT,1,"") | ||
1036 | SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c" | ||
1037 | have_cdrom=yes | ||
1038 | fi | ||
1039 | # Set up files for the timer library | ||
1040 | if test x$enable_timers = xyes; then | ||
1041 | if test x$enable_threads = xyes -a x$enable_pth = xyes; then | ||
1042 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
1043 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
1044 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
1045 | else | ||
1046 | - AC_DEFINE(SDL_TIMER_MINT) | ||
1047 | + AC_DEFINE(SDL_TIMER_MIN,1,""T) | ||
1048 | SOURCES="$SOURCES $srcdir/src/timer/mint/*.c" | ||
1049 | SOURCES="$SOURCES $srcdir/src/timer/mint/*.S" | ||
1050 | fi | ||
1051 | @@ -2811,20 +2811,20 @@ case "$host" in | ||
1052 | CheckPTHREAD | ||
1053 | # Set up files for the video library | ||
1054 | if test x$enable_video = xyes; then | ||
1055 | - AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS) | ||
1056 | + AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS,1,"") | ||
1057 | SOURCES="$SOURCES $srcdir/src/video/riscos/*.c" | ||
1058 | SOURCES="$SOURCES $srcdir/src/video/riscos/*.S" | ||
1059 | have_video=yes | ||
1060 | fi | ||
1061 | # Set up files for the joystick library | ||
1062 | if test x$enable_joystick = xyes; then | ||
1063 | - AC_DEFINE(SDL_JOYSTICK_RISCOS) | ||
1064 | + AC_DEFINE(SDL_JOYSTICK_RISCOS,1,"") | ||
1065 | SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c" | ||
1066 | have_joystick=yes | ||
1067 | fi | ||
1068 | # Set up files for the timer library | ||
1069 | if test x$enable_timers = xyes; then | ||
1070 | - AC_DEFINE(SDL_TIMER_RISCOS) | ||
1071 | + AC_DEFINE(SDL_TIMER_RISCOS,1,"") | ||
1072 | SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c" | ||
1073 | have_timers=yes | ||
1074 | fi | ||
1075 | @@ -2846,31 +2846,31 @@ CheckWarnAll | ||
1076 | if test x$enable_joystick = xyes; then | ||
1077 | if test x$have_joystick != xyes; then | ||
1078 | # Wants joystick subsystem, but doesn't have a platform-specific backend... | ||
1079 | - AC_DEFINE(SDL_JOYSTICK_DUMMY) | ||
1080 | + AC_DEFINE(SDL_JOYSTICK_DUMMY,1,"") | ||
1081 | SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c" | ||
1082 | fi | ||
1083 | fi | ||
1084 | if test x$have_cdrom != xyes; then | ||
1085 | if test x$enable_cdrom = xyes; then | ||
1086 | - AC_DEFINE(SDL_CDROM_DISABLED) | ||
1087 | + AC_DEFINE(SDL_CDROM_DISABLED,1,"") | ||
1088 | fi | ||
1089 | SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c" | ||
1090 | fi | ||
1091 | if test x$have_threads != xyes; then | ||
1092 | if test x$enable_threads = xyes; then | ||
1093 | - AC_DEFINE(SDL_THREADS_DISABLED) | ||
1094 | + AC_DEFINE(SDL_THREADS_DISABLED,1,"") | ||
1095 | fi | ||
1096 | SOURCES="$SOURCES $srcdir/src/thread/generic/*.c" | ||
1097 | fi | ||
1098 | if test x$have_timers != xyes; then | ||
1099 | if test x$enable_timers = xyes; then | ||
1100 | - AC_DEFINE(SDL_TIMERS_DISABLED) | ||
1101 | + AC_DEFINE(SDL_TIMERS_DISABLED,1,"") | ||
1102 | fi | ||
1103 | SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c" | ||
1104 | fi | ||
1105 | if test x$have_loadso != xyes; then | ||
1106 | if test x$enable_loadso = xyes; then | ||
1107 | - AC_DEFINE(SDL_LOADSO_DISABLED) | ||
1108 | + AC_DEFINE(SDL_LOADSO_DISABLED,1,"") | ||
1109 | fi | ||
1110 | SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c" | ||
1111 | fi | ||
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch new file mode 100644 index 0000000000..f98b927522 --- /dev/null +++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | libX11-1.5.99.901 has changed prototype of _XData32 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | <http://bugzilla.libsdl.org/show_bug.cgi?id=1769> | ||
5 | |||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h | ||
9 | --- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800 | ||
10 | +++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100 | ||
11 | @@ -165,7 +165,7 @@ | ||
12 | */ | ||
13 | #ifdef LONG64 | ||
14 | SDL_X11_MODULE(IO_32BIT) | ||
15 | -SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) | ||
16 | +SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) | ||
17 | SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) | ||
18 | #endif | ||
19 | |||
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch new file mode 100644 index 0000000000..913baa92a0 --- /dev/null +++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch | |||
@@ -0,0 +1,187 @@ | |||
1 | Rather than code which doesn't even work properly when cross compiling, | ||
2 | lets just use pkg-config instead. Its a little simpler. | ||
3 | |||
4 | RP 2014/6/20 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: SDL-1.2.15/sdl.m4 | ||
9 | =================================================================== | ||
10 | --- SDL-1.2.15.orig/sdl.m4 | ||
11 | +++ SDL-1.2.15/sdl.m4 | ||
12 | @@ -12,174 +12,8 @@ dnl Test for SDL, and define SDL_CFLAGS | ||
13 | dnl | ||
14 | AC_DEFUN([AM_PATH_SDL], | ||
15 | [dnl | ||
16 | -dnl Get the cflags and libraries from the sdl-config script | ||
17 | -dnl | ||
18 | -AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], | ||
19 | - sdl_prefix="$withval", sdl_prefix="") | ||
20 | -AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], | ||
21 | - sdl_exec_prefix="$withval", sdl_exec_prefix="") | ||
22 | -AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], | ||
23 | - , enable_sdltest=yes) | ||
24 | - | ||
25 | - if test x$sdl_exec_prefix != x ; then | ||
26 | - sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" | ||
27 | - if test x${SDL_CONFIG+set} != xset ; then | ||
28 | - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config | ||
29 | - fi | ||
30 | - fi | ||
31 | - if test x$sdl_prefix != x ; then | ||
32 | - sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" | ||
33 | - if test x${SDL_CONFIG+set} != xset ; then | ||
34 | - SDL_CONFIG=$sdl_prefix/bin/sdl-config | ||
35 | - fi | ||
36 | - fi | ||
37 | - | ||
38 | - as_save_PATH="$PATH" | ||
39 | - if test "x$prefix" != xNONE; then | ||
40 | - PATH="$prefix/bin:$prefix/usr/bin:$PATH" | ||
41 | - fi | ||
42 | - AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) | ||
43 | - PATH="$as_save_PATH" | ||
44 | min_sdl_version=ifelse([$1], ,0.11.0,$1) | ||
45 | - AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) | ||
46 | - no_sdl="" | ||
47 | - if test "$SDL_CONFIG" = "no" ; then | ||
48 | - no_sdl=yes | ||
49 | - else | ||
50 | - SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` | ||
51 | - SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` | ||
52 | - | ||
53 | - sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ | ||
54 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
55 | - sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ | ||
56 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
57 | - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ | ||
58 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
59 | - if test "x$enable_sdltest" = "xyes" ; then | ||
60 | - ac_save_CFLAGS="$CFLAGS" | ||
61 | - ac_save_CXXFLAGS="$CXXFLAGS" | ||
62 | - ac_save_LIBS="$LIBS" | ||
63 | - CFLAGS="$CFLAGS $SDL_CFLAGS" | ||
64 | - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" | ||
65 | - LIBS="$LIBS $SDL_LIBS" | ||
66 | -dnl | ||
67 | -dnl Now check if the installed SDL is sufficiently new. (Also sanity | ||
68 | -dnl checks the results of sdl-config to some extent | ||
69 | -dnl | ||
70 | - rm -f conf.sdltest | ||
71 | - AC_TRY_RUN([ | ||
72 | -#include <stdio.h> | ||
73 | -#include <stdlib.h> | ||
74 | -#include <string.h> | ||
75 | -#include "SDL.h" | ||
76 | - | ||
77 | -char* | ||
78 | -my_strdup (char *str) | ||
79 | -{ | ||
80 | - char *new_str; | ||
81 | - | ||
82 | - if (str) | ||
83 | - { | ||
84 | - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); | ||
85 | - strcpy (new_str, str); | ||
86 | - } | ||
87 | - else | ||
88 | - new_str = NULL; | ||
89 | - | ||
90 | - return new_str; | ||
91 | -} | ||
92 | - | ||
93 | -int main (int argc, char *argv[]) | ||
94 | -{ | ||
95 | - int major, minor, micro; | ||
96 | - char *tmp_version; | ||
97 | - | ||
98 | - /* This hangs on some systems (?) | ||
99 | - system ("touch conf.sdltest"); | ||
100 | - */ | ||
101 | - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } | ||
102 | - | ||
103 | - /* HP/UX 9 (%@#!) writes to sscanf strings */ | ||
104 | - tmp_version = my_strdup("$min_sdl_version"); | ||
105 | - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | ||
106 | - printf("%s, bad version string\n", "$min_sdl_version"); | ||
107 | - exit(1); | ||
108 | - } | ||
109 | - | ||
110 | - if (($sdl_major_version > major) || | ||
111 | - (($sdl_major_version == major) && ($sdl_minor_version > minor)) || | ||
112 | - (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) | ||
113 | - { | ||
114 | - return 0; | ||
115 | - } | ||
116 | - else | ||
117 | - { | ||
118 | - printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); | ||
119 | - printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); | ||
120 | - printf("*** best to upgrade to the required version.\n"); | ||
121 | - printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); | ||
122 | - printf("*** to point to the correct copy of sdl-config, and remove the file\n"); | ||
123 | - printf("*** config.cache before re-running configure\n"); | ||
124 | - return 1; | ||
125 | - } | ||
126 | -} | ||
127 | - | ||
128 | -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
129 | - CFLAGS="$ac_save_CFLAGS" | ||
130 | - CXXFLAGS="$ac_save_CXXFLAGS" | ||
131 | - LIBS="$ac_save_LIBS" | ||
132 | - fi | ||
133 | - fi | ||
134 | - if test "x$no_sdl" = x ; then | ||
135 | - AC_MSG_RESULT(yes) | ||
136 | - ifelse([$2], , :, [$2]) | ||
137 | - else | ||
138 | - AC_MSG_RESULT(no) | ||
139 | - if test "$SDL_CONFIG" = "no" ; then | ||
140 | - echo "*** The sdl-config script installed by SDL could not be found" | ||
141 | - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" | ||
142 | - echo "*** your path, or set the SDL_CONFIG environment variable to the" | ||
143 | - echo "*** full path to sdl-config." | ||
144 | - else | ||
145 | - if test -f conf.sdltest ; then | ||
146 | - : | ||
147 | - else | ||
148 | - echo "*** Could not run SDL test program, checking why..." | ||
149 | - CFLAGS="$CFLAGS $SDL_CFLAGS" | ||
150 | - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" | ||
151 | - LIBS="$LIBS $SDL_LIBS" | ||
152 | - AC_TRY_LINK([ | ||
153 | -#include <stdio.h> | ||
154 | -#include "SDL.h" | ||
155 | - | ||
156 | -int main(int argc, char *argv[]) | ||
157 | -{ return 0; } | ||
158 | -#undef main | ||
159 | -#define main K_and_R_C_main | ||
160 | -], [ return 0; ], | ||
161 | - [ echo "*** The test program compiled, but did not run. This usually means" | ||
162 | - echo "*** that the run-time linker is not finding SDL or finding the wrong" | ||
163 | - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" | ||
164 | - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
165 | - echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
166 | - echo "*** is required on your system" | ||
167 | - echo "***" | ||
168 | - echo "*** If you have an old version installed, it is best to remove it, although" | ||
169 | - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], | ||
170 | - [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
171 | - echo "*** exact error that occured. This usually means SDL was incorrectly installed" | ||
172 | - echo "*** or that you have moved SDL since it was installed. In the latter case, you" | ||
173 | - echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) | ||
174 | - CFLAGS="$ac_save_CFLAGS" | ||
175 | - CXXFLAGS="$ac_save_CXXFLAGS" | ||
176 | - LIBS="$ac_save_LIBS" | ||
177 | - fi | ||
178 | - fi | ||
179 | - SDL_CFLAGS="" | ||
180 | - SDL_LIBS="" | ||
181 | - ifelse([$3], , :, [$3]) | ||
182 | - fi | ||
183 | + PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version]) | ||
184 | AC_SUBST(SDL_CFLAGS) | ||
185 | AC_SUBST(SDL_LIBS) | ||
186 | - rm -f conf.sdltest | ||
187 | ]) | ||
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb new file mode 100644 index 0000000000..e544b60eae --- /dev/null +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | |||
@@ -0,0 +1,69 @@ | |||
1 | SUMMARY = "Simple DirectMedia Layer" | ||
2 | DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \ | ||
3 | library designed to provide low level access to audio, keyboard, mouse, \ | ||
4 | joystick, 3D hardware via OpenGL, and 2D video framebuffer." | ||
5 | HOMEPAGE = "http://www.libsdl.org" | ||
6 | BUGTRACKER = "http://bugzilla.libsdl.org/" | ||
7 | |||
8 | SECTION = "libs" | ||
9 | |||
10 | LICENSE = "LGPLv2.1" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" | ||
12 | |||
13 | PROVIDES = "virtual/libsdl" | ||
14 | |||
15 | DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | ||
16 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \ | ||
17 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ | ||
18 | tslib" | ||
19 | DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" | ||
20 | |||
21 | PR = "r3" | ||
22 | |||
23 | SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ | ||
24 | file://configure_tweak.patch \ | ||
25 | file://libsdl-1.2.15-xdata32.patch \ | ||
26 | file://pkgconfig.patch \ | ||
27 | " | ||
28 | |||
29 | S = "${WORKDIR}/SDL-${PV}" | ||
30 | |||
31 | SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85" | ||
32 | SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00" | ||
33 | |||
34 | BINCONFIG = "${bindir}/sdl-config" | ||
35 | |||
36 | inherit autotools lib_package binconfig-disabled pkgconfig | ||
37 | |||
38 | EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ | ||
39 | --enable-file --disable-oss --disable-esd --disable-arts \ | ||
40 | --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ | ||
41 | --disable-mintaudio --disable-nasm --disable-video-dga \ | ||
42 | --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \ | ||
43 | --disable-xbios --disable-gem --disable-video-dummy \ | ||
44 | --enable-input-events --enable-input-tslib --enable-pthreads \ | ||
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ | ||
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ | ||
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ | ||
48 | --disable-video-svga \ | ||
49 | --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ | ||
50 | --disable-rpath \ | ||
51 | --disable-pulseaudio" | ||
52 | |||
53 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | ||
54 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," | ||
55 | |||
56 | PARALLEL_MAKE = "" | ||
57 | |||
58 | EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" | ||
59 | |||
60 | do_configure_prepend() { | ||
61 | # Remove old libtool macros. | ||
62 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" | ||
63 | for i in ${MACROS}; do | ||
64 | rm -f ${S}/acinclude/$i | ||
65 | done | ||
66 | export SYSROOT=$PKG_CONFIG_SYSROOT_DIR | ||
67 | } | ||
68 | |||
69 | BBCLASSEXTEND = "nativesdk" | ||
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb new file mode 100644 index 0000000000..38304a96a4 --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb | |||
@@ -0,0 +1,56 @@ | |||
1 | SUMMARY = "Simple DirectMedia Layer" | ||
2 | DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \ | ||
3 | library designed to provide low level access to audio, keyboard, mouse, \ | ||
4 | joystick, 3D hardware via OpenGL, and 2D video framebuffer." | ||
5 | HOMEPAGE = "http://www.libsdl.org" | ||
6 | BUGTRACKER = "http://bugzilla.libsdl.org/" | ||
7 | |||
8 | SECTION = "libs" | ||
9 | |||
10 | LICENSE = "Zlib" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=67dcb7fae16952557bc5f96e9eb5d188" | ||
12 | |||
13 | PROVIDES = "virtual/libsdl2" | ||
14 | |||
15 | DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | ||
16 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ | ||
17 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ | ||
18 | tslib" | ||
19 | DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" | ||
20 | |||
21 | SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ | ||
22 | " | ||
23 | |||
24 | S = "${WORKDIR}/SDL2-${PV}" | ||
25 | |||
26 | SRC_URI[md5sum] = "fe6c61d2e9df9ef570e7e80c6e822537" | ||
27 | SRC_URI[sha256sum] = "a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c" | ||
28 | |||
29 | inherit autotools lib_package binconfig pkgconfig | ||
30 | |||
31 | EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ | ||
32 | --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ | ||
33 | --disable-video-dummy \ | ||
34 | --enable-input-tslib --enable-pthreads \ | ||
35 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ | ||
36 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ | ||
37 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ | ||
38 | --enable-sdl-dlopen \ | ||
39 | --disable-rpath \ | ||
40 | --disable-pulseaudio" | ||
41 | |||
42 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | ||
43 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," | ||
44 | |||
45 | PARALLEL_MAKE = "" | ||
46 | |||
47 | EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" | ||
48 | |||
49 | do_configure_prepend() { | ||
50 | # Remove old libtool macros. | ||
51 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" | ||
52 | for i in ${MACROS}; do | ||
53 | rm -f ${S}/acinclude/$i | ||
54 | done | ||
55 | export SYSROOT=$PKG_CONFIG_SYSROOT_DIR | ||
56 | } | ||
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license b/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license new file mode 100644 index 0000000000..628de9830d --- /dev/null +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license | |||
@@ -0,0 +1,22 @@ | |||
1 | /* | ||
2 | * Copyright © 2001 Red Hat, Inc. | ||
3 | * | ||
4 | * Permission to use, copy, modify, distribute, and sell this software and its | ||
5 | * documentation for any purpose is hereby granted without fee, provided that | ||
6 | * the above copyright notice appear in all copies and that both that | ||
7 | * copyright notice and this permission notice appear in supporting | ||
8 | * documentation, and that the name of Red Hat not be used in advertising or | ||
9 | * publicity pertaining to distribution of the software without specific, | ||
10 | * written prior permission. Red Hat makes no representations about the | ||
11 | * suitability of this software for any purpose. It is provided "as is" | ||
12 | * without express or implied warranty. | ||
13 | * | ||
14 | * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL | ||
15 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT | ||
16 | * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
17 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION | ||
18 | * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | ||
19 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
20 | * | ||
21 | * Author: Owen Taylor, Red Hat, Inc. | ||
22 | */ | ||
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch new file mode 100644 index 0000000000..64b7efac23 --- /dev/null +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Do not set Os optimization in target APP CFLAGS, since it may have potential | ||
4 | error if "--enable-target-optspace" is not set when configuring GCC. | ||
5 | |||
6 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
7 | |||
8 | diff -ruN Xsettings-client-0.10-orig/configure.ac Xsettings-client-0.10/configure.ac | ||
9 | --- Xsettings-client-0.10-orig/configure.ac 2010-09-21 14:01:47.000000000 +0800 | ||
10 | +++ Xsettings-client-0.10/configure.ac 2010-09-21 14:02:01.000000000 +0800 | ||
11 | @@ -3,7 +3,7 @@ | ||
12 | AM_INIT_AUTOMAKE(Xsettings-client, 0.10) | ||
13 | AM_CONFIG_HEADER(config.h) | ||
14 | |||
15 | -CFLAGS="-Os -Wall" | ||
16 | +CFLAGS="-O2 -Wall" | ||
17 | |||
18 | # Checks for programs. | ||
19 | AC_PROG_CC | ||
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch new file mode 100644 index 0000000000..d08d0d5b99 --- /dev/null +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: Xsettings-client-0.10/Makefile.am | ||
4 | =================================================================== | ||
5 | --- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000 | ||
6 | +++ Xsettings-client-0.10/Makefile.am 2008-02-07 14:50:00.000000000 +0000 | ||
7 | @@ -9,4 +9,4 @@ | ||
8 | |||
9 | libXsettings_client_la_SOURCES= $(source_c) $(source_h) | ||
10 | |||
11 | -libXsettings_client_la_LIBADD = @X_LIBS@ | ||
12 | \ No newline at end of file | ||
13 | +libXsettings_client_la_LIBADD = @X_LIBS@ -lX11 | ||
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch new file mode 100644 index 0000000000..905d08e616 --- /dev/null +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd Xsettings-client-0.10/configure.ac Xsettings-client-0.10/configure.ac | ||
5 | --- Xsettings-client-0.10/configure.ac 2003-03-28 12:39:51.000000000 +0200 | ||
6 | +++ Xsettings-client-0.10/configure.ac 2013-01-11 07:37:21.491597743 +0200 | ||
7 | @@ -1,7 +1,7 @@ | ||
8 | # Process this file with autoconf to produce a configure script. | ||
9 | AC_INIT(xsettings-client.c) | ||
10 | AM_INIT_AUTOMAKE(Xsettings-client, 0.10) | ||
11 | -AM_CONFIG_HEADER(config.h) | ||
12 | +AC_CONFIG_HEADERS(config.h) | ||
13 | |||
14 | CFLAGS="-Os -Wall" | ||
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb new file mode 100644 index 0000000000..d7a80305e8 --- /dev/null +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | SUMMARY = "utility functions for the Xsettings protocol" | ||
2 | DESCRIPTION = "Libraries used for applications making use of the Xsettings configuration \ | ||
3 | setting propagation protocol. Controls setting of double click timeout, drag-and-drop \ | ||
4 | threshold, and default foreground and background colors for all applications running within a \ | ||
5 | desktop." | ||
6 | HOMEPAGE = "http://matchbox-project.org/sources/optional-dependencies/" | ||
7 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
8 | SECTION = "x/libs" | ||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
11 | file://xsettings-client.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
12 | file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" | ||
13 | DEPENDS = "virtual/libx11" | ||
14 | |||
15 | PR = "r5" | ||
16 | |||
17 | headers = "xsettings-common.h xsettings-client.h" | ||
18 | |||
19 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-0.10.tar.gz \ | ||
20 | file://MIT-style-license \ | ||
21 | file://link-x11.patch;apply=yes \ | ||
22 | file://disable_Os_option.patch \ | ||
23 | file://obsolete_automake_macros.patch \ | ||
24 | " | ||
25 | |||
26 | SRC_URI[md5sum] = "c14aa9db6c097e0306dac97fb7da1add" | ||
27 | SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43" | ||
28 | |||
29 | S = "${WORKDIR}/Xsettings-client-0.10" | ||
30 | |||
31 | inherit autotools gettext | ||
32 | |||
33 | do_configure_prepend() { | ||
34 | # This package doesn't ship with its own COPYING file and | ||
35 | # autotools will install a GPLv2 one instead of the actual MIT-style license here. | ||
36 | # Add the correct license here to avoid confusion. | ||
37 | cp -f ${WORKDIR}/MIT-style-license ${S}/COPYING | ||
38 | } | ||
39 | |||
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session b/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session new file mode 100644 index 0000000000..4d6caa0c5a --- /dev/null +++ b/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session | |||
@@ -0,0 +1,24 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Very simple session manager for matchbox tools | ||
4 | # | ||
5 | |||
6 | # Uncomment below to enable parsing of debian menu entrys | ||
7 | # export MB_USE_DEB_MENUS=1 | ||
8 | |||
9 | if [ -e $HOME/.matchbox/session ] | ||
10 | then | ||
11 | exec $HOME/.matchbox/session | ||
12 | fi | ||
13 | |||
14 | if [ -e /etc/matchbox/session ] | ||
15 | then | ||
16 | exec /etc/matchbox/session | ||
17 | fi | ||
18 | |||
19 | # Default files to run if $HOME/.matchbox/session or /etc/matchbox/session | ||
20 | # dont exist. | ||
21 | |||
22 | matchbox-desktop & | ||
23 | matchbox-panel & | ||
24 | exec matchbox-window-manager $@ | ||
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb new file mode 100644 index 0000000000..cbaf054365 --- /dev/null +++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | SUMMARY = "Custom Matchbox session files" | ||
2 | HOMEPAGE = "http://www.matchbox-project.org/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea" | ||
7 | |||
8 | SECTION = "x11" | ||
9 | RCONFLICTS_${PN} = "matchbox-common" | ||
10 | |||
11 | SRC_URI = "file://matchbox-session" | ||
12 | S = "${WORKDIR}" | ||
13 | |||
14 | PR = "r4" | ||
15 | |||
16 | inherit update-alternatives | ||
17 | |||
18 | ALTERNATIVE_${PN} = "x-session-manager" | ||
19 | ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/matchbox-session" | ||
20 | ALTERNATIVE_PRIORITY = "100" | ||
21 | |||
22 | do_install() { | ||
23 | install -d ${D}/${bindir} | ||
24 | install -m 0755 ${S}/matchbox-session ${D}/${bindir} | ||
25 | } | ||
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch new file mode 100644 index 0000000000..800bf3b559 --- /dev/null +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: matchbox-window-manager/configure.ac | ||
4 | =================================================================== | ||
5 | --- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 | ||
6 | +++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000 | ||
7 | @@ -283,7 +283,7 @@ | ||
8 | yes) | ||
9 | |||
10 | case "$expat" in | ||
11 | - yes) | ||
12 | + yes|"") | ||
13 | EXPAT_LIBS="-lexpat" | ||
14 | ;; | ||
15 | *) | ||
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 new file mode 100644 index 0000000000..aca7c7da45 --- /dev/null +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 | |||
@@ -0,0 +1,39 @@ | |||
1 | dnl AM_GCONF_SOURCE_2 | ||
2 | dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas | ||
3 | dnl (i.e. pass to gconftool-2 | ||
4 | dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where | ||
5 | dnl you should install foo.schemas files | ||
6 | dnl | ||
7 | |||
8 | AC_DEFUN([AM_GCONF_SOURCE_2], | ||
9 | [ | ||
10 | if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then | ||
11 | GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` | ||
12 | else | ||
13 | GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE | ||
14 | fi | ||
15 | |||
16 | AC_ARG_WITH(gconf-source, | ||
17 | [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) | ||
18 | |||
19 | AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) | ||
20 | AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) | ||
21 | |||
22 | if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then | ||
23 | GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' | ||
24 | fi | ||
25 | |||
26 | AC_ARG_WITH(gconf-schema-file-dir, | ||
27 | [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) | ||
28 | |||
29 | AC_SUBST(GCONF_SCHEMA_FILE_DIR) | ||
30 | AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) | ||
31 | |||
32 | AC_ARG_ENABLE(schemas-install, | ||
33 | [ --disable-schemas-install Disable the schemas installation], | ||
34 | [case ${enableval} in | ||
35 | yes|no) ;; | ||
36 | *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; | ||
37 | esac]) | ||
38 | AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) | ||
39 | ]) | ||
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig b/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig new file mode 100644 index 0000000000..239da8f57c --- /dev/null +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig | |||
@@ -0,0 +1,42 @@ | |||
1 | # | ||
2 | # This is an example keyboard config file for matchbox | ||
3 | # | ||
4 | # You can edit this file or change per user by copying to | ||
5 | # ~/.matchbox/kbdconfig | ||
6 | # | ||
7 | # Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) | ||
8 | |||
9 | ### Window operation short cuts | ||
10 | |||
11 | <Alt>n=next | ||
12 | <Alt>p=prev | ||
13 | <Alt>c=close | ||
14 | <Alt>d=desktop | ||
15 | <Alt>m=!matchbox-remote -mbmenu | ||
16 | |||
17 | ### App launching. | ||
18 | |||
19 | <ctrl><alt>x=!xterm | ||
20 | <ctrl><alt>r=!rxvt | ||
21 | |||
22 | ### poky additions | ||
23 | |||
24 | XF86Calendar=!$contacts | ||
25 | telephone=!$dates | ||
26 | XF86Start=!matchbox-remote -desktop | ||
27 | F2=!matchbox-remote -mbmenu | ||
28 | |||
29 | #XF86Mail=!$tasks | ||
30 | #Escape=close | ||
31 | |||
32 | ### windows style key shortcuts | ||
33 | |||
34 | <alt>Tab=next | ||
35 | <alt><shift>Tab=prev | ||
36 | |||
37 | <alt>space=taskmenu | ||
38 | <alt>escape=!matchbox-remote -mbmenu | ||
39 | <alt>f4=close | ||
40 | |||
41 | f11=fullscreen | ||
42 | |||
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb new file mode 100644 index 0000000000..8ee42c34b0 --- /dev/null +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | SUMMARY = "Matchbox lightweight window manager" | ||
2 | SECTION = "x11/wm" | ||
3 | LICENSE = "GPLv2.0+" | ||
4 | DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat" | ||
5 | PR = "r5" | ||
6 | |||
7 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \ | ||
8 | file://configure_fix.patch \ | ||
9 | file://kbdconfig \ | ||
10 | file://gconf-2.m4" | ||
11 | |||
12 | SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb" | ||
13 | SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff" | ||
14 | |||
15 | S = "${WORKDIR}/matchbox-window-manager-${PV}" | ||
16 | |||
17 | inherit autotools pkgconfig | ||
18 | |||
19 | FILES_${PN} = "${bindir}/* \ | ||
20 | ${datadir}/matchbox \ | ||
21 | ${sysconfdir}/matchbox \ | ||
22 | ${datadir}/themes/blondie/matchbox \ | ||
23 | ${datadir}/themes/Default/matchbox \ | ||
24 | ${datadir}/themes/MBOpus/matchbox" | ||
25 | |||
26 | EXTRA_OECONF = " --enable-startup-notification \ | ||
27 | --disable-xrm \ | ||
28 | --enable-expat \ | ||
29 | --with-expat-lib=${STAGING_LIBDIR} \ | ||
30 | --with-expat-includes=${STAGING_INCDIR}" | ||
31 | |||
32 | |||
33 | do_configure_prepend () { | ||
34 | cp ${WORKDIR}/gconf-2.m4 ${S}/ | ||
35 | } | ||
36 | |||
37 | do_install_prepend() { | ||
38 | install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig | ||
39 | } | ||
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb new file mode 100644 index 0000000000..154b967d2c --- /dev/null +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | SUMMARY = "Matchbox lightweight window manager" | ||
2 | HOMEPAGE = "http://matchbox-project.org" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa835 \ | ||
7 | file://src/main.c;endline=21;md5=3e5d9f832b527b0d72dbe8e3c4c60b95 \ | ||
8 | file://src/wm.c;endline=21;md5=8dc9d24477d87ef5dfbc2e4927146aab" | ||
9 | |||
10 | SECTION = "x11/wm" | ||
11 | DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes" | ||
12 | |||
13 | SRCREV = "29544f0e61cc281fc60061443a537271e1081b78" | ||
14 | PV = "1.2+git${SRCPV}" | ||
15 | |||
16 | SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ | ||
17 | file://kbdconfig" | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | |||
21 | inherit autotools pkgconfig | ||
22 | |||
23 | FILES_${PN} = "${bindir}/* \ | ||
24 | ${datadir}/matchbox \ | ||
25 | ${sysconfdir}/matchbox \ | ||
26 | ${datadir}/themes/blondie/matchbox \ | ||
27 | ${datadir}/themes/Default/matchbox \ | ||
28 | ${datadir}/themes/MBOpus/matchbox" | ||
29 | |||
30 | EXTRA_OECONF = " --enable-startup-notification \ | ||
31 | --disable-xrm \ | ||
32 | --enable-expat \ | ||
33 | --with-expat-lib=${STAGING_LIBDIR} \ | ||
34 | --with-expat-includes=${STAGING_INCDIR}" | ||
35 | |||
36 | do_install_prepend() { | ||
37 | install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig | ||
38 | } | ||
diff --git a/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch b/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch new file mode 100644 index 0000000000..74a04074ec --- /dev/null +++ b/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From a497ea6aae3994b7f6527ef7599dd95baf2ad841 Mon Sep 17 00:00:00 2001 | ||
2 | From: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
3 | Date: Mon, 29 Apr 2013 12:04:20 +0300 | ||
4 | Subject: [PATCH] Fix segfault | ||
5 | |||
6 | Apparently, g_io_channel_unref() was called twice: once in the | ||
7 | menu-cache's on_client_closed() callback and once from the finalize | ||
8 | function, g_io_unix_finalize()/g_io_win32_finalize(), which is called | ||
9 | anyway when the source is removed. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
13 | --- | ||
14 | menu-cache-daemon/menu-cached.c | 1 - | ||
15 | 1 file changed, 1 deletion(-) | ||
16 | |||
17 | diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c | ||
18 | index e246bb4..a10b6db 100644 | ||
19 | --- a/menu-cache-daemon/menu-cached.c | ||
20 | +++ b/menu-cache-daemon/menu-cached.c | ||
21 | @@ -579,7 +579,6 @@ static void on_client_closed(gpointer user_data) | ||
22 | } | ||
23 | } | ||
24 | /* DEBUG("client closed"); */ | ||
25 | - g_io_channel_unref(ch); | ||
26 | } | ||
27 | |||
28 | static gboolean on_client_data_in(GIOChannel* ch, GIOCondition cond, gpointer user_data) | ||
29 | -- | ||
30 | 1.7.9.5 | ||
31 | |||
diff --git a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb new file mode 100644 index 0000000000..98bbe76412 --- /dev/null +++ b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "Library for caching application menus" | ||
2 | DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus" | ||
3 | HOMEPAGE = "http://lxde.sourceforge.net/" | ||
4 | |||
5 | LICENSE = "GPLv2 & GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://libmenu-cache/menu-cache.h;endline=29;md5=26571532593adb17a37eac396260532c \ | ||
8 | file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111" | ||
9 | |||
10 | SECTION = "x11/libs" | ||
11 | DEPENDS = "glib-2.0 zlib" | ||
12 | |||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz \ | ||
14 | file://Fix-segfault.patch \ | ||
15 | " | ||
16 | |||
17 | SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0" | ||
18 | SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e" | ||
19 | |||
20 | |||
21 | inherit autotools pkgconfig gtk-doc | ||
diff --git a/meta/recipes-graphics/mesa/libglu_9.0.0.bb b/meta/recipes-graphics/mesa/libglu_9.0.0.bb new file mode 100644 index 0000000000..06d30f9bfa --- /dev/null +++ b/meta/recipes-graphics/mesa/libglu_9.0.0.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "The OpenGL utility toolkit" | ||
2 | DESCRIPTION = "GLU is a utility toolkit used with OpenGL implementations" | ||
3 | |||
4 | HOMEPAGE = "http://mesa3d.org" | ||
5 | BUGTRACKER = "https://bugs.freedesktop.org" | ||
6 | SECTION = "x11" | ||
7 | LICENSE = "MIT" | ||
8 | LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \ | ||
9 | file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9" | ||
10 | |||
11 | # Epoch as this used to be part of mesa | ||
12 | PE = "2" | ||
13 | PR = "0" | ||
14 | |||
15 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${PV}.tar.bz2" | ||
16 | |||
17 | SRC_URI[md5sum] = "be9249132ff49275461cf92039083030" | ||
18 | SRC_URI[sha256sum] = "1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12" | ||
19 | |||
20 | S = "${WORKDIR}/glu-${PV}" | ||
21 | |||
22 | DEPENDS = "virtual/libgl" | ||
23 | |||
24 | inherit autotools pkgconfig | ||
25 | |||
26 | # Remove the mesa-glu dependency in mesa-glu-dev, as mesa-glu is empty | ||
27 | RDEPENDS_${PN}-dev = "" | ||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch new file mode 100644 index 0000000000..93ee9c286d --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch | |||
@@ -0,0 +1,624 @@ | |||
1 | From b695c3a3fa3f4cd48c13aa26542110de27075518 Mon Sep 17 00:00:00 2001 | ||
2 | From: Drew Moseley <drew_moseley@mentor.com> | ||
3 | Date: Mon, 12 May 2014 15:22:32 -0400 | ||
4 | Subject: [PATCH 1/9] mesa-demos: Add missing data files. | ||
5 | |||
6 | Add some data files that are present in the git repository: | ||
7 | http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0 | ||
8 | but not in the release tarball | ||
9 | ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2 | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Drew Moseley <drew_moseley@mentor.com> | ||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | src/fpglsl/depth-read.glsl | 4 + | ||
16 | src/fpglsl/infinite-loop.glsl | 7 + | ||
17 | src/glsl/CH11-bumpmaptex.frag | 47 +++++++ | ||
18 | src/glsl/blinking-teapot.frag | 31 +++++ | ||
19 | src/glsl/blinking-teapot.vert | 16 +++ | ||
20 | src/glsl/convolution.frag | 21 +++ | ||
21 | src/glsl/simplex-noise.glsl | 279 ++++++++++++++++++++++++++++++++++++++++ | ||
22 | src/glsl/skinning.vert | 24 ++++ | ||
23 | src/perf/glslstateschange1.frag | 19 +++ | ||
24 | src/perf/glslstateschange1.vert | 14 ++ | ||
25 | src/perf/glslstateschange2.frag | 17 +++ | ||
26 | src/perf/glslstateschange2.vert | 14 ++ | ||
27 | src/vpglsl/infinite-loop.glsl | 8 ++ | ||
28 | 13 files changed, 501 insertions(+) | ||
29 | create mode 100644 src/fpglsl/depth-read.glsl | ||
30 | create mode 100644 src/fpglsl/infinite-loop.glsl | ||
31 | create mode 100644 src/glsl/CH11-bumpmaptex.frag | ||
32 | create mode 100644 src/glsl/blinking-teapot.frag | ||
33 | create mode 100644 src/glsl/blinking-teapot.vert | ||
34 | create mode 100644 src/glsl/convolution.frag | ||
35 | create mode 100644 src/glsl/simplex-noise.glsl | ||
36 | create mode 100644 src/glsl/skinning.vert | ||
37 | create mode 100644 src/perf/glslstateschange1.frag | ||
38 | create mode 100644 src/perf/glslstateschange1.vert | ||
39 | create mode 100644 src/perf/glslstateschange2.frag | ||
40 | create mode 100644 src/perf/glslstateschange2.vert | ||
41 | create mode 100644 src/vpglsl/infinite-loop.glsl | ||
42 | |||
43 | diff --git a/src/fpglsl/depth-read.glsl b/src/fpglsl/depth-read.glsl | ||
44 | new file mode 100644 | ||
45 | index 0000000..86d298e | ||
46 | --- /dev/null | ||
47 | +++ b/src/fpglsl/depth-read.glsl | ||
48 | @@ -0,0 +1,4 @@ | ||
49 | +void main() | ||
50 | +{ | ||
51 | + gl_FragColor = gl_FragCoord.zzzz; | ||
52 | +} | ||
53 | diff --git a/src/fpglsl/infinite-loop.glsl b/src/fpglsl/infinite-loop.glsl | ||
54 | new file mode 100644 | ||
55 | index 0000000..c6dc6ee | ||
56 | --- /dev/null | ||
57 | +++ b/src/fpglsl/infinite-loop.glsl | ||
58 | @@ -0,0 +1,7 @@ | ||
59 | +void main() { | ||
60 | + vec4 sum = vec4(0); | ||
61 | + for (int i = 1; i != 2; i += 2) { | ||
62 | + sum += vec4(0.1, 0.1, 0.1, 0.1); | ||
63 | + } | ||
64 | + gl_FragColor = sum; | ||
65 | +} | ||
66 | diff --git a/src/glsl/CH11-bumpmaptex.frag b/src/glsl/CH11-bumpmaptex.frag | ||
67 | new file mode 100644 | ||
68 | index 0000000..b5dabb4 | ||
69 | --- /dev/null | ||
70 | +++ b/src/glsl/CH11-bumpmaptex.frag | ||
71 | @@ -0,0 +1,47 @@ | ||
72 | +// | ||
73 | +// Fragment shader for procedural bumps | ||
74 | +// | ||
75 | +// Authors: John Kessenich, Randi Rost | ||
76 | +// | ||
77 | +// Copyright (c) 2002-2006 3Dlabs Inc. Ltd. | ||
78 | +// | ||
79 | +// See 3Dlabs-License.txt for license information | ||
80 | +// | ||
81 | +// Texture mapping/modulation added by Brian Paul | ||
82 | +// | ||
83 | + | ||
84 | +varying vec3 LightDir; | ||
85 | +varying vec3 EyeDir; | ||
86 | + | ||
87 | +uniform float BumpDensity; // = 16.0 | ||
88 | +uniform float BumpSize; // = 0.15 | ||
89 | +uniform float SpecularFactor; // = 0.5 | ||
90 | + | ||
91 | +uniform sampler2D Tex; | ||
92 | + | ||
93 | +void main() | ||
94 | +{ | ||
95 | + vec3 ambient = vec3(0.25); | ||
96 | + vec3 litColor; | ||
97 | + vec2 c = BumpDensity * gl_TexCoord[0].st; | ||
98 | + vec2 p = fract(c) - vec2(0.5); | ||
99 | + | ||
100 | + float d, f; | ||
101 | + d = p.x * p.x + p.y * p.y; | ||
102 | + f = inversesqrt(d + 1.0); | ||
103 | + | ||
104 | + if (d >= BumpSize) | ||
105 | + { p = vec2(0.0); f = 1.0; } | ||
106 | + | ||
107 | + vec3 SurfaceColor = texture2D(Tex, gl_TexCoord[0].st).xyz; | ||
108 | + | ||
109 | + vec3 normDelta = vec3(p.x, p.y, 1.0) * f; | ||
110 | + litColor = SurfaceColor * (ambient + max(dot(normDelta, LightDir), 0.0)); | ||
111 | + vec3 reflectDir = reflect(LightDir, normDelta); | ||
112 | + | ||
113 | + float spec = max(dot(EyeDir, reflectDir), 0.0); | ||
114 | + spec *= SpecularFactor; | ||
115 | + litColor = min(litColor + spec, vec3(1.0)); | ||
116 | + | ||
117 | + gl_FragColor = vec4(litColor, 1.0); | ||
118 | +} | ||
119 | diff --git a/src/glsl/blinking-teapot.frag b/src/glsl/blinking-teapot.frag | ||
120 | new file mode 100644 | ||
121 | index 0000000..0db060b | ||
122 | --- /dev/null | ||
123 | +++ b/src/glsl/blinking-teapot.frag | ||
124 | @@ -0,0 +1,31 @@ | ||
125 | +#extension GL_ARB_uniform_buffer_object : enable | ||
126 | + | ||
127 | +layout(std140) uniform colors0 | ||
128 | +{ | ||
129 | + float DiffuseCool; | ||
130 | + float DiffuseWarm; | ||
131 | + vec3 SurfaceColor; | ||
132 | + vec3 WarmColor; | ||
133 | + vec3 CoolColor; | ||
134 | + vec4 some[8]; | ||
135 | +}; | ||
136 | + | ||
137 | +varying float NdotL; | ||
138 | +varying vec3 ReflectVec; | ||
139 | +varying vec3 ViewVec; | ||
140 | + | ||
141 | +void main (void) | ||
142 | +{ | ||
143 | + | ||
144 | + vec3 kcool = min(CoolColor + DiffuseCool * SurfaceColor, 1.0); | ||
145 | + vec3 kwarm = min(WarmColor + DiffuseWarm * SurfaceColor, 1.0); | ||
146 | + vec3 kfinal = mix(kcool, kwarm, NdotL); | ||
147 | + | ||
148 | + vec3 nreflect = normalize(ReflectVec); | ||
149 | + vec3 nview = normalize(ViewVec); | ||
150 | + | ||
151 | + float spec = max(dot(nreflect, nview), 0.0); | ||
152 | + spec = pow(spec, 32.0); | ||
153 | + | ||
154 | + gl_FragColor = vec4 (min(kfinal + spec, 1.0), 1.0); | ||
155 | +} | ||
156 | diff --git a/src/glsl/blinking-teapot.vert b/src/glsl/blinking-teapot.vert | ||
157 | new file mode 100644 | ||
158 | index 0000000..397d733 | ||
159 | --- /dev/null | ||
160 | +++ b/src/glsl/blinking-teapot.vert | ||
161 | @@ -0,0 +1,16 @@ | ||
162 | +vec3 LightPosition = vec3(0.0, 10.0, 4.0); | ||
163 | + | ||
164 | +varying float NdotL; | ||
165 | +varying vec3 ReflectVec; | ||
166 | +varying vec3 ViewVec; | ||
167 | + | ||
168 | +void main(void) | ||
169 | +{ | ||
170 | + vec3 ecPos = vec3 (gl_ModelViewMatrix * gl_Vertex); | ||
171 | + vec3 tnorm = normalize(gl_NormalMatrix * gl_Normal); | ||
172 | + vec3 lightVec = normalize(LightPosition - ecPos); | ||
173 | + ReflectVec = normalize(reflect(-lightVec, tnorm)); | ||
174 | + ViewVec = normalize(-ecPos); | ||
175 | + NdotL = (dot(lightVec, tnorm) + 1.0) * 0.5; | ||
176 | + gl_Position = ftransform(); | ||
177 | +} | ||
178 | diff --git a/src/glsl/convolution.frag b/src/glsl/convolution.frag | ||
179 | new file mode 100644 | ||
180 | index 0000000..e49b8ac | ||
181 | --- /dev/null | ||
182 | +++ b/src/glsl/convolution.frag | ||
183 | @@ -0,0 +1,21 @@ | ||
184 | + | ||
185 | +const int KernelSize = 9; | ||
186 | + | ||
187 | +//texture offsets | ||
188 | +uniform vec2 Offset[KernelSize]; | ||
189 | +//convolution kernel | ||
190 | +uniform vec4 KernelValue[KernelSize]; | ||
191 | +uniform sampler2D srcTex; | ||
192 | +uniform vec4 ScaleFactor; | ||
193 | +uniform vec4 BaseColor; | ||
194 | + | ||
195 | +void main(void) | ||
196 | +{ | ||
197 | + int i; | ||
198 | + vec4 sum = vec4(0.0); | ||
199 | + for (i = 0; i < KernelSize; ++i) { | ||
200 | + vec4 tmp = texture2D(srcTex, gl_TexCoord[0].st + Offset[i]); | ||
201 | + sum += tmp * KernelValue[i]; | ||
202 | + } | ||
203 | + gl_FragColor = sum * ScaleFactor + BaseColor; | ||
204 | +} | ||
205 | diff --git a/src/glsl/simplex-noise.glsl b/src/glsl/simplex-noise.glsl | ||
206 | new file mode 100644 | ||
207 | index 0000000..b6833cb | ||
208 | --- /dev/null | ||
209 | +++ b/src/glsl/simplex-noise.glsl | ||
210 | @@ -0,0 +1,279 @@ | ||
211 | +// | ||
212 | +// Description : Array and textureless GLSL 2D/3D/4D simplex | ||
213 | +// noise functions. | ||
214 | +// Author : Ian McEwan, Ashima Arts. | ||
215 | +// Maintainer : ijm | ||
216 | +// Lastmod : 20110223 | ||
217 | +// License : Copyright (C) 2011 Ashima Arts. All rights reserved. | ||
218 | +// Distributed under the Artistic License 2.0; See LICENCE file. | ||
219 | +// | ||
220 | + | ||
221 | +#define NORMALIZE_GRADIENTS | ||
222 | +#undef USE_CIRCLE | ||
223 | +#define COLLAPSE_SORTNET | ||
224 | + | ||
225 | +float permute(float x0,vec3 p) { | ||
226 | + float x1 = mod(x0 * p.y, p.x); | ||
227 | + return floor( mod( (x1 + p.z) *x0, p.x )); | ||
228 | + } | ||
229 | +vec2 permute(vec2 x0,vec3 p) { | ||
230 | + vec2 x1 = mod(x0 * p.y, p.x); | ||
231 | + return floor( mod( (x1 + p.z) *x0, p.x )); | ||
232 | + } | ||
233 | +vec3 permute(vec3 x0,vec3 p) { | ||
234 | + vec3 x1 = mod(x0 * p.y, p.x); | ||
235 | + return floor( mod( (x1 + p.z) *x0, p.x )); | ||
236 | + } | ||
237 | +vec4 permute(vec4 x0,vec3 p) { | ||
238 | + vec4 x1 = mod(x0 * p.y, p.x); | ||
239 | + return floor( mod( (x1 + p.z) *x0, p.x )); | ||
240 | + } | ||
241 | + | ||
242 | +uniform vec4 pParam; | ||
243 | +// Example | ||
244 | +// const vec4 pParam = vec4( 17.* 17., 34., 1., 7.); | ||
245 | + | ||
246 | +float taylorInvSqrt(float r) | ||
247 | + { | ||
248 | + return ( 0.83666002653408 + 0.7*0.85373472095314 - 0.85373472095314 * r ); | ||
249 | + } | ||
250 | + | ||
251 | +float simplexNoise2(vec2 v) | ||
252 | + { | ||
253 | + const vec2 C = vec2(0.211324865405187134, // (3.0-sqrt(3.0))/6.; | ||
254 | + 0.366025403784438597); // 0.5*(sqrt(3.0)-1.); | ||
255 | + const vec3 D = vec3( 0., 0.5, 2.0) * 3.14159265358979312; | ||
256 | +// First corner | ||
257 | + vec2 i = floor(v + dot(v, C.yy) ); | ||
258 | + vec2 x0 = v - i + dot(i, C.xx); | ||
259 | + | ||
260 | +// Other corners | ||
261 | + vec2 i1 = (x0.x > x0.y) ? vec2(1.,0.) : vec2(0.,1.) ; | ||
262 | + | ||
263 | + // x0 = x0 - 0. + 0. * C | ||
264 | + vec2 x1 = x0 - i1 + 1. * C.xx ; | ||
265 | + vec2 x2 = x0 - 1. + 2. * C.xx ; | ||
266 | + | ||
267 | +// Permutations | ||
268 | + i = mod(i, pParam.x); | ||
269 | + vec3 p = permute( permute( | ||
270 | + i.y + vec3(0., i1.y, 1. ), pParam.xyz) | ||
271 | + + i.x + vec3(0., i1.x, 1. ), pParam.xyz); | ||
272 | + | ||
273 | +#ifndef USE_CIRCLE | ||
274 | +// ( N points uniformly over a line, mapped onto a diamond.) | ||
275 | + vec3 x = fract(p / pParam.w) ; | ||
276 | + vec3 h = 0.5 - abs(x) ; | ||
277 | + | ||
278 | + vec3 sx = vec3(lessThan(x,D.xxx)) *2. -1.; | ||
279 | + vec3 sh = vec3(lessThan(h,D.xxx)); | ||
280 | + | ||
281 | + vec3 a0 = x + sx*sh; | ||
282 | + vec2 p0 = vec2(a0.x,h.x); | ||
283 | + vec2 p1 = vec2(a0.y,h.y); | ||
284 | + vec2 p2 = vec2(a0.z,h.z); | ||
285 | + | ||
286 | +#ifdef NORMALISE_GRADIENTS | ||
287 | + p0 *= taylorInvSqrt(dot(p0,p0)); | ||
288 | + p1 *= taylorInvSqrt(dot(p1,p1)); | ||
289 | + p2 *= taylorInvSqrt(dot(p2,p2)); | ||
290 | +#endif | ||
291 | + | ||
292 | + vec3 g = 2.0 * vec3( dot(p0, x0), dot(p1, x1), dot(p2, x2) ); | ||
293 | +#else | ||
294 | +// N points around a unit circle. | ||
295 | + vec3 phi = D.z * mod(p,pParam.w) /pParam.w ; | ||
296 | + vec4 a0 = sin(phi.xxyy+D.xyxy); | ||
297 | + vec2 a1 = sin(phi.zz +D.xy); | ||
298 | + vec3 g = vec3( dot(a0.xy, x0), dot(a0.zw, x1), dot(a1.xy, x2) ); | ||
299 | +#endif | ||
300 | +// mix | ||
301 | + vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); | ||
302 | + m = m*m ; | ||
303 | + return 1.66666* 70.*dot(m*m, g); | ||
304 | + } | ||
305 | + | ||
306 | +float simplexNoise3(vec3 v) | ||
307 | + { | ||
308 | + const vec2 C = vec2(1./6. , 1./3. ) ; | ||
309 | + const vec4 D = vec4(0., 0.5, 1.0, 2.0); | ||
310 | + | ||
311 | +// First corner | ||
312 | + vec3 i = floor(v + dot(v, C.yyy) ); | ||
313 | + vec3 x0 = v - i + dot(i, C.xxx) ; | ||
314 | + | ||
315 | +// Other corners | ||
316 | +#ifdef COLLAPSE_SORTNET | ||
317 | + vec3 g = vec3( greaterThan( x0.xyz, x0.yzx) ); | ||
318 | + vec3 l = vec3( lessThanEqual( x0.xyz, x0.yzx) ); | ||
319 | + | ||
320 | + vec3 i1 = g.xyz * l.zxy; | ||
321 | + vec3 i2 = max( g.xyz, l.zxy); | ||
322 | +#else | ||
323 | +// Keeping this clean - let the compiler optimize. | ||
324 | + vec3 q1; | ||
325 | + q1.x = max(x0.x, x0.y); | ||
326 | + q1.y = min(x0.x, x0.y); | ||
327 | + q1.z = x0.z; | ||
328 | + | ||
329 | + vec3 q2; | ||
330 | + q2.x = max(q1.x,q1.z); | ||
331 | + q2.z = min(q1.x,q1.z); | ||
332 | + q2.y = q1.y; | ||
333 | + | ||
334 | + vec3 q3; | ||
335 | + q3.y = max(q2.y, q2.z); | ||
336 | + q3.z = min(q2.y, q2.z); | ||
337 | + q3.x = q2.x; | ||
338 | + | ||
339 | + vec3 i1 = vec3(equal(q3.xxx, x0)); | ||
340 | + vec3 i2 = i1 + vec3(equal(q3.yyy, x0)); | ||
341 | +#endif | ||
342 | + | ||
343 | + // x0 = x0 - 0. + 0. * C | ||
344 | + vec3 x1 = x0 - i1 + 1. * C.xxx; | ||
345 | + vec3 x2 = x0 - i2 + 2. * C.xxx; | ||
346 | + vec3 x3 = x0 - 1. + 3. * C.xxx; | ||
347 | + | ||
348 | +// Permutations | ||
349 | + i = mod(i, pParam.x ); | ||
350 | + vec4 p = permute( permute( permute( | ||
351 | + i.z + vec4(0., i1.z, i2.z, 1. ), pParam.xyz) | ||
352 | + + i.y + vec4(0., i1.y, i2.y, 1. ), pParam.xyz) | ||
353 | + + i.x + vec4(0., i1.x, i2.x, 1. ), pParam.xyz); | ||
354 | + | ||
355 | +// Gradients | ||
356 | +// ( N*N points uniformly over a square, mapped onto a octohedron.) | ||
357 | + float n_ = 1.0/pParam.w ; | ||
358 | + vec3 ns = n_ * D.wyz - D.xzx ; | ||
359 | + | ||
360 | + vec4 j = p - pParam.w*pParam.w*floor(p * ns.z *ns.z); // mod(p,N*N) | ||
361 | + | ||
362 | + vec4 x_ = floor(j * ns.z) ; | ||
363 | + vec4 y_ = floor(j - pParam.w * x_ ) ; // mod(j,N) | ||
364 | + | ||
365 | + vec4 x = x_ *ns.x + ns.yyyy; | ||
366 | + vec4 y = y_ *ns.x + ns.yyyy; | ||
367 | + vec4 h = 1. - abs(x) - abs(y); | ||
368 | + | ||
369 | + vec4 b0 = vec4( x.xy, y.xy ); | ||
370 | + vec4 b1 = vec4( x.zw, y.zw ); | ||
371 | + | ||
372 | + vec4 s0 = vec4(lessThan(b0,D.xxxx)) *2. -1.; | ||
373 | + vec4 s1 = vec4(lessThan(b1,D.xxxx)) *2. -1.; | ||
374 | + vec4 sh = vec4(lessThan(h, D.xxxx)); | ||
375 | + | ||
376 | + vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ; | ||
377 | + vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ; | ||
378 | + | ||
379 | + vec3 p0 = vec3(a0.xy,h.x); | ||
380 | + vec3 p1 = vec3(a0.zw,h.y); | ||
381 | + vec3 p2 = vec3(a1.xy,h.z); | ||
382 | + vec3 p3 = vec3(a1.zw,h.w); | ||
383 | + | ||
384 | +#ifdef NORMALISE_GRADIENTS | ||
385 | + p0 *= taylorInvSqrt(dot(p0,p0)); | ||
386 | + p1 *= taylorInvSqrt(dot(p1,p1)); | ||
387 | + p2 *= taylorInvSqrt(dot(p2,p2)); | ||
388 | + p3 *= taylorInvSqrt(dot(p3,p3)); | ||
389 | +#endif | ||
390 | + | ||
391 | +// Mix | ||
392 | + vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.); | ||
393 | + m = m * m; | ||
394 | +//used to be 64. | ||
395 | + return 48.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1), | ||
396 | + dot(p2,x2), dot(p3,x3) ) ); | ||
397 | + } | ||
398 | + | ||
399 | +vec4 grad4(float j, vec4 ip) | ||
400 | + { | ||
401 | + const vec4 ones = vec4(1.,1.,1.,-1.); | ||
402 | + vec4 p,s; | ||
403 | + | ||
404 | + p.xyz = floor( fract (vec3(j) * ip.xyz) *pParam.w) * ip.z -1.0; | ||
405 | + p.w = 1.5 - dot(abs(p.xyz), ones.xyz); | ||
406 | + s = vec4(lessThan(p,vec4(0.))); | ||
407 | + p.xyz = p.xyz + (s.xyz*2.-1.) * s.www; | ||
408 | + | ||
409 | + return p; | ||
410 | + } | ||
411 | + | ||
412 | +float simplexNoise4(vec4 v) | ||
413 | + { | ||
414 | + const vec2 C = vec2( 0.138196601125010504, // (5 - sqrt(5))/20 G4 | ||
415 | + 0.309016994374947451); // (sqrt(5) - 1)/4 F4 | ||
416 | +// First corner | ||
417 | + vec4 i = floor(v + dot(v, C.yyyy) ); | ||
418 | + vec4 x0 = v - i + dot(i, C.xxxx); | ||
419 | + | ||
420 | +// Other corners | ||
421 | + | ||
422 | +// Force existance of strict total ordering in sort. | ||
423 | + vec4 q0 = floor(x0 * 1024.0) + vec4( 0., 1./4., 2./4. , 3./4.); | ||
424 | + vec4 q1; | ||
425 | + q1.xy = max(q0.xy,q0.zw); // x:z y:w | ||
426 | + q1.zw = min(q0.xy,q0.zw); | ||
427 | + | ||
428 | + vec4 q2; | ||
429 | + q2.xz = max(q1.xz,q1.yw); // x:y z:w | ||
430 | + q2.yw = min(q1.xz,q1.yw); | ||
431 | + | ||
432 | + vec4 q3; | ||
433 | + q3.y = max(q2.y,q2.z); // y:z | ||
434 | + q3.z = min(q2.y,q2.z); | ||
435 | + q3.xw = q2.xw; | ||
436 | + | ||
437 | + vec4 i1 = vec4(lessThanEqual(q3.xxxx, q0)); | ||
438 | + vec4 i2 = vec4(lessThanEqual(q3.yyyy, q0)); | ||
439 | + vec4 i3 = vec4(lessThanEqual(q3.zzzz, q0)); | ||
440 | + | ||
441 | + // x0 = x0 - 0. + 0. * C | ||
442 | + vec4 x1 = x0 - i1 + 1. * C.xxxx; | ||
443 | + vec4 x2 = x0 - i2 + 2. * C.xxxx; | ||
444 | + vec4 x3 = x0 - i3 + 3. * C.xxxx; | ||
445 | + vec4 x4 = x0 - 1. + 4. * C.xxxx; | ||
446 | + | ||
447 | +// Permutations | ||
448 | + i = mod(i, pParam.x ); | ||
449 | + float j0 = permute( permute( permute( permute ( | ||
450 | + i.w, pParam.xyz) + i.z, pParam.xyz) | ||
451 | + + i.y, pParam.xyz) + i.x, pParam.xyz); | ||
452 | + vec4 j1 = permute( permute( permute( permute ( | ||
453 | + i.w + vec4(i1.w, i2.w, i3.w, 1. ), pParam.xyz) | ||
454 | + + i.z + vec4(i1.z, i2.z, i3.z, 1. ), pParam.xyz) | ||
455 | + + i.y + vec4(i1.y, i2.y, i3.y, 1. ), pParam.xyz) | ||
456 | + + i.x + vec4(i1.x, i2.x, i3.x, 1. ), pParam.xyz); | ||
457 | +// Gradients | ||
458 | +// ( N*N*N points uniformly over a cube, mapped onto a 4-octohedron.) | ||
459 | + vec4 ip = pParam ; | ||
460 | + ip.xy *= pParam.w ; | ||
461 | + ip.x *= pParam.w ; | ||
462 | + ip = vec4(1.,1.,1.,2.) / ip ; | ||
463 | + | ||
464 | + vec4 p0 = grad4(j0, ip); | ||
465 | + vec4 p1 = grad4(j1.x, ip); | ||
466 | + vec4 p2 = grad4(j1.y, ip); | ||
467 | + vec4 p3 = grad4(j1.z, ip); | ||
468 | + vec4 p4 = grad4(j1.w, ip); | ||
469 | + | ||
470 | +#ifdef NORMALISE_GRADIENTS | ||
471 | + p0 *= taylorInvSqrt(dot(p0,p0)); | ||
472 | + p1 *= taylorInvSqrt(dot(p1,p1)); | ||
473 | + p2 *= taylorInvSqrt(dot(p2,p2)); | ||
474 | + p3 *= taylorInvSqrt(dot(p3,p3)); | ||
475 | + p4 *= taylorInvSqrt(dot(p4,p4)); | ||
476 | +#endif | ||
477 | + | ||
478 | +// Mix | ||
479 | + vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); | ||
480 | + vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4) ), 0.); | ||
481 | + m0 = m0 * m0; | ||
482 | + m1 = m1 * m1; | ||
483 | + return 32. * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 ))) | ||
484 | + + dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ; | ||
485 | + | ||
486 | + } | ||
487 | + | ||
488 | + | ||
489 | + | ||
490 | diff --git a/src/glsl/skinning.vert b/src/glsl/skinning.vert | ||
491 | new file mode 100644 | ||
492 | index 0000000..28970ee | ||
493 | --- /dev/null | ||
494 | +++ b/src/glsl/skinning.vert | ||
495 | @@ -0,0 +1,24 @@ | ||
496 | +// Vertex weighting/blendin shader | ||
497 | +// Brian Paul | ||
498 | +// 4 Nov 2008 | ||
499 | + | ||
500 | +uniform mat4 mat0, mat1; | ||
501 | +attribute float weight; | ||
502 | + | ||
503 | +void main() | ||
504 | +{ | ||
505 | + // simple diffuse shading | ||
506 | + // Note that we should really transform the normal vector along with | ||
507 | + // the postion below... someday. | ||
508 | + vec3 lightVec = vec3(0, 0, 1); | ||
509 | + vec3 norm = gl_NormalMatrix * gl_Normal; | ||
510 | + float dot = 0.2 + max(0.0, dot(norm, lightVec)); | ||
511 | + gl_FrontColor = vec4(dot); | ||
512 | + | ||
513 | + // compute sum of weighted transformations | ||
514 | + vec4 pos0 = mat0 * gl_Vertex; | ||
515 | + vec4 pos1 = mat1 * gl_Vertex; | ||
516 | + vec4 pos = mix(pos0, pos1, weight); | ||
517 | + | ||
518 | + gl_Position = gl_ModelViewProjectionMatrix * pos; | ||
519 | +} | ||
520 | diff --git a/src/perf/glslstateschange1.frag b/src/perf/glslstateschange1.frag | ||
521 | new file mode 100644 | ||
522 | index 0000000..0839436 | ||
523 | --- /dev/null | ||
524 | +++ b/src/perf/glslstateschange1.frag | ||
525 | @@ -0,0 +1,19 @@ | ||
526 | +// Multi-texture fragment shader | ||
527 | +// Brian Paul | ||
528 | + | ||
529 | +// Composite second texture over first. | ||
530 | +// We're assuming the 2nd texture has a meaningful alpha channel. | ||
531 | + | ||
532 | +uniform sampler2D tex1; | ||
533 | +uniform sampler2D tex2; | ||
534 | +uniform vec4 UniV1; | ||
535 | +uniform vec4 UniV2; | ||
536 | + | ||
537 | +void main() | ||
538 | +{ | ||
539 | + vec4 t3; | ||
540 | + vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); | ||
541 | + vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); | ||
542 | + t3 = mix(t1, t2, t2.w); | ||
543 | + gl_FragColor = t3 + UniV1 + UniV2; | ||
544 | +} | ||
545 | diff --git a/src/perf/glslstateschange1.vert b/src/perf/glslstateschange1.vert | ||
546 | new file mode 100644 | ||
547 | index 0000000..cef50db | ||
548 | --- /dev/null | ||
549 | +++ b/src/perf/glslstateschange1.vert | ||
550 | @@ -0,0 +1,14 @@ | ||
551 | +// Multi-texture vertex shader | ||
552 | +// Brian Paul | ||
553 | + | ||
554 | + | ||
555 | +attribute vec4 TexCoord0, TexCoord1; | ||
556 | +attribute vec4 VertCoord; | ||
557 | + | ||
558 | +void main() | ||
559 | +{ | ||
560 | + gl_TexCoord[0] = TexCoord0; | ||
561 | + gl_TexCoord[1] = TexCoord1; | ||
562 | + // note: may use gl_Vertex or VertCoord here for testing: | ||
563 | + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; | ||
564 | +} | ||
565 | diff --git a/src/perf/glslstateschange2.frag b/src/perf/glslstateschange2.frag | ||
566 | new file mode 100644 | ||
567 | index 0000000..0df0319 | ||
568 | --- /dev/null | ||
569 | +++ b/src/perf/glslstateschange2.frag | ||
570 | @@ -0,0 +1,17 @@ | ||
571 | +// Multi-texture fragment shader | ||
572 | +// Brian Paul | ||
573 | + | ||
574 | +// Composite second texture over first. | ||
575 | +// We're assuming the 2nd texture has a meaningful alpha channel. | ||
576 | + | ||
577 | +uniform sampler2D tex1; | ||
578 | +uniform sampler2D tex2; | ||
579 | +uniform vec4 UniV1; | ||
580 | +uniform vec4 UniV2; | ||
581 | + | ||
582 | +void main() | ||
583 | +{ | ||
584 | + vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); | ||
585 | + vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); | ||
586 | + gl_FragColor = t1 + t2 + UniV1 + UniV2; | ||
587 | +} | ||
588 | diff --git a/src/perf/glslstateschange2.vert b/src/perf/glslstateschange2.vert | ||
589 | new file mode 100644 | ||
590 | index 0000000..cef50db | ||
591 | --- /dev/null | ||
592 | +++ b/src/perf/glslstateschange2.vert | ||
593 | @@ -0,0 +1,14 @@ | ||
594 | +// Multi-texture vertex shader | ||
595 | +// Brian Paul | ||
596 | + | ||
597 | + | ||
598 | +attribute vec4 TexCoord0, TexCoord1; | ||
599 | +attribute vec4 VertCoord; | ||
600 | + | ||
601 | +void main() | ||
602 | +{ | ||
603 | + gl_TexCoord[0] = TexCoord0; | ||
604 | + gl_TexCoord[1] = TexCoord1; | ||
605 | + // note: may use gl_Vertex or VertCoord here for testing: | ||
606 | + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; | ||
607 | +} | ||
608 | diff --git a/src/vpglsl/infinite-loop.glsl b/src/vpglsl/infinite-loop.glsl | ||
609 | new file mode 100644 | ||
610 | index 0000000..bc7ae4b | ||
611 | --- /dev/null | ||
612 | +++ b/src/vpglsl/infinite-loop.glsl | ||
613 | @@ -0,0 +1,8 @@ | ||
614 | +void main() { | ||
615 | + gl_Position = gl_Vertex; | ||
616 | + vec4 sum = vec4(0); | ||
617 | + for (int i = 1; i != 2; i += 2) { | ||
618 | + sum += vec4(0.1, 0.1, 0.1, 0.1); | ||
619 | + } | ||
620 | + gl_FrontColor = sum; | ||
621 | +} | ||
622 | -- | ||
623 | 2.0.0 | ||
624 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch b/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch new file mode 100644 index 0000000000..c96af12acf --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From 36829a8d7ad2888515fbee95c2a70b3d636d7538 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Wed, 9 Jul 2014 14:30:33 +0200 | ||
4 | Subject: [PATCH 2/9] Correctly implement with AC_WITH(glut) so that | ||
5 | --without-glut works. | ||
6 | |||
7 | --- | ||
8 | configure.ac | 26 +++++++++++++++----------- | ||
9 | 1 file changed, 15 insertions(+), 11 deletions(-) | ||
10 | |||
11 | diff --git a/configure.ac b/configure.ac | ||
12 | index c4ee12b..9445424 100644 | ||
13 | --- a/configure.ac | ||
14 | +++ b/configure.ac | ||
15 | @@ -67,21 +67,25 @@ DEMO_CFLAGS="$DEMO_CFLAGS $GL_CFLAGS" | ||
16 | DEMO_LIBS="$DEMO_LIBS $GL_LIBS" | ||
17 | |||
18 | dnl Check for GLUT | ||
19 | -GLUT_CFLAGS="" | ||
20 | -GLUT_LIBS=-lglut | ||
21 | -glut_enabled=yes | ||
22 | +glut_enabled=no | ||
23 | AC_ARG_WITH([glut], | ||
24 | [AS_HELP_STRING([--with-glut=DIR], | ||
25 | [glut install directory])], | ||
26 | [GLUT_CFLAGS="-I$withval/include" | ||
27 | - GLUT_LIBS="-L$withval/lib -lglut"]) | ||
28 | -AC_CHECK_HEADER([GL/glut.h], | ||
29 | - [], | ||
30 | - [glut_enabled=no]) | ||
31 | -AC_CHECK_LIB([glut], | ||
32 | - [glutInit], | ||
33 | - [], | ||
34 | - [glut_enabled=no]) | ||
35 | + GLUT_LIBS="-L$withval/lib -lglut"], | ||
36 | + [GLUT_CFLAGS="" | ||
37 | + GLUT_LIBS="-lglut"] | ||
38 | + ) | ||
39 | +AS_IF([test "x$with_glut" != xno], | ||
40 | + [AC_CHECK_HEADER([GL/glut.h], | ||
41 | + [], | ||
42 | + [glut_enabled=no]) | ||
43 | + AC_CHECK_LIB([glut], | ||
44 | + [glutInit], | ||
45 | + [], | ||
46 | + [glut_enabled=no]) | ||
47 | + glut_enabled=yes | ||
48 | +]) | ||
49 | |||
50 | dnl Check for FreeGLUT 2.6 or later | ||
51 | AC_EGREP_HEADER([glutInitContextProfile], | ||
52 | -- | ||
53 | 2.0.0 | ||
54 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch new file mode 100644 index 0000000000..4b07193a7f --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch | |||
@@ -0,0 +1,424 @@ | |||
1 | From b25e9c675cf560b8b037dc855c6b3b1d09957867 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 9 Jul 2014 14:23:41 +0200 | ||
4 | Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or | ||
5 | GLU | ||
6 | |||
7 | * in some systems without X11 support we don't have GLEW, but | ||
8 | mesa-demos are still useful | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | configure.ac | 49 ++++++++++++++++++++--------- | ||
15 | src/Makefile.am | 14 ++++++--- | ||
16 | src/demos/Makefile.am | 73 ++++++++++++++++++++++++------------------- | ||
17 | src/egl/Makefile.am | 8 +++-- | ||
18 | src/egl/opengles1/Makefile.am | 44 +++++++++++++++----------- | ||
19 | src/egl/opengles2/Makefile.am | 33 ++++++++++--------- | ||
20 | 6 files changed, 135 insertions(+), 86 deletions(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index 9445424..bc4c8d1 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -93,25 +93,44 @@ AC_EGREP_HEADER([glutInitContextProfile], | ||
27 | [AC_DEFINE(HAVE_FREEGLUT)], | ||
28 | []) | ||
29 | |||
30 | -dnl Check for GLEW | ||
31 | -PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4]) | ||
32 | -DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" | ||
33 | -DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" | ||
34 | +AC_ARG_ENABLE([glew], | ||
35 | + [AS_HELP_STRING([--enable-glew], | ||
36 | + [build demos which require glew @<:@default=yes@:>@])], | ||
37 | + [enable_glew="$enableval"], | ||
38 | + [enable_glew=yes] | ||
39 | +) | ||
40 | + | ||
41 | +if test "x$enable_glew" = xyes; then | ||
42 | + dnl Check for GLEW | ||
43 | + PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4], [glew_enabled=yes], [glew_enabled=no]) | ||
44 | + DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" | ||
45 | + DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" | ||
46 | +fi | ||
47 | |||
48 | # LIBS was set by AC_CHECK_LIB above | ||
49 | LIBS="" | ||
50 | |||
51 | -PKG_CHECK_MODULES(GLU, [glu], [], | ||
52 | - [AC_CHECK_HEADER([GL/glu.h], | ||
53 | - [], | ||
54 | - AC_MSG_ERROR([GLU not found])) | ||
55 | - AC_CHECK_LIB([GLU], | ||
56 | - [gluBeginCurve], | ||
57 | - [GLU_LIBS=-lGLU], | ||
58 | - AC_MSG_ERROR([GLU required])) ]) | ||
59 | +AC_ARG_ENABLE([glu], | ||
60 | + [AS_HELP_STRING([--enable-glu], | ||
61 | + [build demos which require glu @<:@default=yes@:>@])], | ||
62 | + [enable_glu="$enableval"], | ||
63 | + [enable_glu=yes] | ||
64 | +) | ||
65 | |||
66 | -DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" | ||
67 | -DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" | ||
68 | +if test "x$enable_glu" = xyes; then | ||
69 | + PKG_CHECK_MODULES(GLU, [glu], [], | ||
70 | + [AC_CHECK_HEADER([GL/glu.h], | ||
71 | + [], | ||
72 | + AC_MSG_ERROR([GLU not found])) | ||
73 | + AC_CHECK_LIB([GLU], | ||
74 | + [gluBeginCurve], | ||
75 | + [GLU_LIBS=-lGLU | ||
76 | + glu_enabled=yes], | ||
77 | + AC_MSG_ERROR([GLU required])) ]) | ||
78 | + | ||
79 | + DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" | ||
80 | + DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" | ||
81 | +fi | ||
82 | |||
83 | AC_ARG_ENABLE([egl], | ||
84 | [AS_HELP_STRING([--enable-egl], | ||
85 | @@ -304,6 +323,8 @@ AC_SUBST([WAYLAND_CFLAGS]) | ||
86 | AC_SUBST([WAYLAND_LIBS]) | ||
87 | |||
88 | |||
89 | +AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes") | ||
90 | +AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes") | ||
91 | AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") | ||
92 | AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") | ||
93 | AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") | ||
94 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
95 | index 1647d64..754c47c 100644 | ||
96 | --- a/src/Makefile.am | ||
97 | +++ b/src/Makefile.am | ||
98 | @@ -23,14 +23,18 @@ | ||
99 | # Eric Anholt <eric@anholt.net> | ||
100 | |||
101 | +if HAVE_GLEW | ||
102 | +UTIL = util | ||
103 | +endif | ||
104 | + | ||
105 | SUBDIRS = \ | ||
106 | - util \ | ||
107 | + $(UTIL) \ | ||
108 | data \ | ||
109 | demos \ | ||
110 | egl \ | ||
111 | fp \ | ||
112 | fpglsl \ | ||
113 | glsl \ | ||
114 | - gs \ | ||
115 | + gs \ | ||
116 | objviewer \ | ||
117 | osdemos \ | ||
118 | perf \ | ||
119 | @@ -40,8 +39,12 @@ SUBDIRS = \ | ||
120 | slang \ | ||
121 | tests \ | ||
122 | tools \ | ||
123 | - trivial \ | ||
124 | - vp \ | ||
125 | - vpglsl \ | ||
126 | wgl \ | ||
127 | xdemos | ||
128 | + | ||
129 | +if HAVE_GLEW | ||
130 | +SUBDIRS += \ | ||
131 | + vp \ | ||
132 | + vpglsl \ | ||
133 | + trivial | ||
134 | +endif | ||
135 | diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am | ||
136 | index 41603fa..ab1e3ab 100644 | ||
137 | --- a/src/demos/Makefile.am | ||
138 | +++ b/src/demos/Makefile.am | ||
139 | @@ -30,91 +30,100 @@ AM_LDFLAGS = \ | ||
140 | $(DEMO_LIBS) \ | ||
141 | $(GLUT_LIBS) | ||
142 | |||
143 | +bin_PROGRAMS = | ||
144 | + | ||
145 | if HAVE_GLUT | ||
146 | -bin_PROGRAMS = \ | ||
147 | +if HAVE_GLEW | ||
148 | +bin_PROGRAMS += \ | ||
149 | arbfplight \ | ||
150 | arbfslight \ | ||
151 | arbocclude \ | ||
152 | arbocclude2 \ | ||
153 | - bounce \ | ||
154 | - clearspd \ | ||
155 | copypix \ | ||
156 | cubemap \ | ||
157 | cuberender \ | ||
158 | dinoshade \ | ||
159 | - dissolve \ | ||
160 | - drawpix \ | ||
161 | engine \ | ||
162 | fbo_firecube \ | ||
163 | fbotexture \ | ||
164 | - fire \ | ||
165 | fogcoord \ | ||
166 | fplight \ | ||
167 | fslight \ | ||
168 | + gloss \ | ||
169 | + isosurf \ | ||
170 | + multiarb \ | ||
171 | + paltex \ | ||
172 | + pointblast \ | ||
173 | + projtex \ | ||
174 | + shadowtex \ | ||
175 | + spriteblast \ | ||
176 | + stex3d \ | ||
177 | + textures \ | ||
178 | + vao_demo \ | ||
179 | + winpos | ||
180 | + | ||
181 | +copypix_LDADD = ../util/libutil.la | ||
182 | +cubemap_LDADD = ../util/libutil.la | ||
183 | +cuberender_LDADD = ../util/libutil.la | ||
184 | +engine_LDADD = ../util/libutil.la | ||
185 | +fbo_firecube_LDADD = ../util/libutil.la | ||
186 | +gloss_LDADD = ../util/libutil.la | ||
187 | +isosurf_LDADD = ../util/libutil.la | ||
188 | +multiarb_LDADD = ../util/libutil.la | ||
189 | +projtex_LDADD = ../util/libutil.la | ||
190 | +textures_LDADD = ../util/libutil.la | ||
191 | +winpos_LDADD = ../util/libutil.la | ||
192 | +endif | ||
193 | + | ||
194 | +if HAVE_GLU | ||
195 | +bin_PROGRAMS += \ | ||
196 | + bounce \ | ||
197 | + clearspd \ | ||
198 | + dissolve \ | ||
199 | + drawpix \ | ||
200 | + fire \ | ||
201 | gamma \ | ||
202 | gearbox \ | ||
203 | gears \ | ||
204 | geartrain \ | ||
205 | glinfo \ | ||
206 | - gloss \ | ||
207 | gltestperf \ | ||
208 | ipers \ | ||
209 | - isosurf \ | ||
210 | lodbias \ | ||
211 | morph3d \ | ||
212 | - multiarb \ | ||
213 | - paltex \ | ||
214 | pixeltest \ | ||
215 | - pointblast \ | ||
216 | - projtex \ | ||
217 | ray \ | ||
218 | readpix \ | ||
219 | reflect \ | ||
220 | renormal \ | ||
221 | - shadowtex \ | ||
222 | singlebuffer \ | ||
223 | spectex \ | ||
224 | - spriteblast \ | ||
225 | - stex3d \ | ||
226 | teapot \ | ||
227 | terrain \ | ||
228 | tessdemo \ | ||
229 | texcyl \ | ||
230 | texenv \ | ||
231 | - textures \ | ||
232 | trispd \ | ||
233 | tunnel2 \ | ||
234 | - tunnel \ | ||
235 | - vao_demo \ | ||
236 | - winpos | ||
237 | -endif | ||
238 | + tunnel | ||
239 | |||
240 | tunnel_SOURCES = \ | ||
241 | tunnel.c \ | ||
242 | tunneldat.h | ||
243 | |||
244 | -copypix_LDADD = ../util/libutil.la | ||
245 | -cubemap_LDADD = ../util/libutil.la | ||
246 | -cuberender_LDADD = ../util/libutil.la | ||
247 | -drawpix_LDADD = ../util/libutil.la | ||
248 | dissolve_LDADD = ../util/libutil.la | ||
249 | -engine_LDADD = ../util/libutil.la | ||
250 | -fbo_firecube_LDADD = ../util/libutil.la | ||
251 | +drawpix_LDADD = ../util/libutil.la | ||
252 | fire_LDADD = ../util/libutil.la | ||
253 | -gloss_LDADD = ../util/libutil.la | ||
254 | ipers_LDADD = ../util/libutil.la | ||
255 | -isosurf_LDADD = ../util/libutil.la | ||
256 | lodbias_LDADD = ../util/libutil.la | ||
257 | -multiarb_LDADD = ../util/libutil.la | ||
258 | -projtex_LDADD = ../util/libutil.la | ||
259 | readpix_LDADD = ../util/libutil.la | ||
260 | reflect_LDADD = ../util/libutil.la | ||
261 | teapot_LDADD = ../util/libutil.la | ||
262 | texcyl_LDADD = ../util/libutil.la | ||
263 | -textures_LDADD = ../util/libutil.la | ||
264 | tunnel_LDADD = ../util/libutil.la | ||
265 | tunnel2_LDADD = ../util/libutil.la | ||
266 | -winpos_LDADD = ../util/libutil.la | ||
267 | +endif | ||
268 | +endif | ||
269 | |||
270 | EXTRA_DIST = \ | ||
271 | README | ||
272 | diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am | ||
273 | index d64a49e..4fe1ca8 100644 | ||
274 | --- a/src/egl/Makefile.am | ||
275 | +++ b/src/egl/Makefile.am | ||
276 | @@ -24,8 +24,12 @@ | ||
277 | |||
278 | SUBDIRS = \ | ||
279 | eglut \ | ||
280 | - opengl \ | ||
281 | - openvg \ | ||
282 | opengles1 \ | ||
283 | opengles2 \ | ||
284 | oes_vg | ||
285 | + | ||
286 | +if HAVE_GLU | ||
287 | +SUBDIRS += \ | ||
288 | + opengl \ | ||
289 | + openvg | ||
290 | +endif | ||
291 | diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am | ||
292 | index 7a9828d..3455e75 100644 | ||
293 | --- a/src/egl/opengles1/Makefile.am | ||
294 | +++ b/src/egl/opengles1/Makefile.am | ||
295 | @@ -36,28 +36,43 @@ AM_LDFLAGS = \ | ||
296 | $(EGL_LIBS) \ | ||
297 | -lm | ||
298 | |||
299 | +noinst_PROGRAMS = | ||
300 | + | ||
301 | if HAVE_EGL | ||
302 | if HAVE_GLESV1 | ||
303 | -noinst_PROGRAMS = \ | ||
304 | - bindtex \ | ||
305 | - clear \ | ||
306 | +noinst_PROGRAMS += \ | ||
307 | drawtex_screen \ | ||
308 | + gears_screen \ | ||
309 | + torus_screen \ | ||
310 | + tri_screen | ||
311 | + | ||
312 | +drawtex_screen_SOURCES = drawtex.c | ||
313 | +gears_screen_SOURCES = gears.c | ||
314 | +torus_screen_SOURCES = torus.c | ||
315 | +tri_screen_SOURCES = tri.c | ||
316 | + | ||
317 | +drawtex_screen_LDADD = ../eglut/libeglut_screen.la | ||
318 | +gears_screen_LDADD = ../eglut/libeglut_screen.la | ||
319 | +torus_screen_LDADD = ../eglut/libeglut_screen.la | ||
320 | +tri_screen_LDADD = ../eglut/libeglut_screen.la | ||
321 | + | ||
322 | +if HAVE_X11 | ||
323 | +noinst_PROGRAMS += \ | ||
324 | + clear | ||
325 | + | ||
326 | +bin_PROGRAMS = \ | ||
327 | + bindtex \ | ||
328 | drawtex_x11 \ | ||
329 | eglfbdev \ | ||
330 | es1_info \ | ||
331 | - gears_screen \ | ||
332 | gears_x11 \ | ||
333 | msaa \ | ||
334 | pbuffer\ | ||
335 | render_tex \ | ||
336 | texture_from_pixmap \ | ||
337 | - torus_screen \ | ||
338 | torus_x11 \ | ||
339 | - tri_screen \ | ||
340 | tri_x11 \ | ||
341 | two_win | ||
342 | -endif | ||
343 | -endif | ||
344 | |||
345 | bindtex_LDADD = $(X11_LIBS) | ||
346 | es1_info_LDADD = $(X11_LIBS) | ||
347 | @@ -71,22 +86,15 @@ two_win_LDADD = $(X11_LIBS) | ||
348 | clear_LDADD = ../eglut/libeglut_x11.la $(EGL_LIBS) $(X11_LIBS) | ||
349 | clear_LDFLAGS = | ||
350 | |||
351 | -drawtex_screen_SOURCES = drawtex.c | ||
352 | -gears_screen_SOURCES = gears.c | ||
353 | -torus_screen_SOURCES = torus.c | ||
354 | -tri_screen_SOURCES = tri.c | ||
355 | - | ||
356 | drawtex_x11_SOURCES = drawtex.c | ||
357 | gears_x11_SOURCES = gears.c | ||
358 | torus_x11_SOURCES = torus.c | ||
359 | tri_x11_SOURCES = tri.c | ||
360 | |||
361 | -drawtex_screen_LDADD = ../eglut/libeglut_screen.la | ||
362 | -gears_screen_LDADD = ../eglut/libeglut_screen.la | ||
363 | -torus_screen_LDADD = ../eglut/libeglut_screen.la | ||
364 | -tri_screen_LDADD = ../eglut/libeglut_screen.la | ||
365 | - | ||
366 | drawtex_x11_LDADD = ../eglut/libeglut_x11.la | ||
367 | gears_x11_LDADD = ../eglut/libeglut_x11.la | ||
368 | torus_x11_LDADD = ../eglut/libeglut_x11.la | ||
369 | tri_x11_LDADD = ../eglut/libeglut_x11.la | ||
370 | +endif | ||
371 | +endif | ||
372 | +endif | ||
373 | diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am | ||
374 | index 41c1b80..74af460 100644 | ||
375 | --- a/src/egl/opengles2/Makefile.am | ||
376 | +++ b/src/egl/opengles2/Makefile.am | ||
377 | @@ -36,26 +36,29 @@ AM_LDFLAGS = \ | ||
378 | if HAVE_EGL | ||
379 | if HAVE_GLESV2 | ||
380 | bin_PROGRAMS = \ | ||
381 | - es2_info \ | ||
382 | - es2gears_screen \ | ||
383 | - es2gears_x11 \ | ||
384 | - es2tri | ||
385 | + es2gears_screen | ||
386 | + | ||
387 | +es2gears_screen_SOURCES = es2gears.c | ||
388 | +es2gears_screen_LDADD = ../eglut/libeglut_screen.la | ||
389 | + | ||
390 | if HAVE_WAYLAND | ||
391 | bin_PROGRAMS += es2gears_wayland | ||
392 | -endif | ||
393 | -endif | ||
394 | -endif | ||
395 | |||
396 | -es2_info_LDADD = $(X11_LIBS) | ||
397 | -es2tri_LDADD = $(X11_LIBS) | ||
398 | +es2gears_wayland_SOURCES = es2gears.c | ||
399 | +es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la | ||
400 | +endif | ||
401 | |||
402 | -es2gears_screen_SOURCES = es2gears.c | ||
403 | +if HAVE_X11 | ||
404 | +bin_PROGRAMS += \ | ||
405 | + es2tri \ | ||
406 | + es2_info \ | ||
407 | + es2gears_x11 | ||
408 | |||
409 | +es2_info_LDADD = $(X11_LIBS) | ||
410 | es2gears_x11_SOURCES = es2gears.c | ||
411 | - | ||
412 | -es2gears_screen_LDADD = ../eglut/libeglut_screen.la | ||
413 | - | ||
414 | es2gears_x11_LDADD = ../eglut/libeglut_x11.la | ||
415 | +es2tri_LDADD = $(X11_LIBS) | ||
416 | +endif | ||
417 | +endif | ||
418 | +endif | ||
419 | |||
420 | -es2gears_wayland_SOURCES = es2gears.c | ||
421 | -es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la | ||
422 | -- | ||
423 | 2.0.0 | ||
424 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch new file mode 100644 index 0000000000..f77b97f3e5 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch | |||
@@ -0,0 +1,234 @@ | |||
1 | From 5e10108d76a59abac21c7e540bcfd2ddaccca2cb Mon Sep 17 00:00:00 2001 | ||
2 | From: Drew Moseley <drew_moseley@mentor.com> | ||
3 | Date: Fri, 9 May 2014 11:50:24 -0400 | ||
4 | Subject: [PATCH 4/9] Use DEMOS_DATA_DIR to locate data files | ||
5 | |||
6 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=78496] | ||
7 | Signed-off-by: Drew Moseley <drew_moseley@mentor.com> | ||
8 | --- | ||
9 | src/glsl/bezier.c | 2 +- | ||
10 | src/glsl/blinking-teapot.c | 4 ++-- | ||
11 | src/glsl/brick.c | 4 ++-- | ||
12 | src/glsl/bump.c | 6 +++--- | ||
13 | src/glsl/convolutions.c | 2 +- | ||
14 | src/glsl/mandelbrot.c | 4 ++-- | ||
15 | src/glsl/multitex.c | 4 ++-- | ||
16 | src/glsl/simplex-noise.c | 2 +- | ||
17 | src/glsl/skinning.c | 4 ++-- | ||
18 | src/glsl/texdemo1.c | 8 ++++---- | ||
19 | src/glsl/toyball.c | 4 ++-- | ||
20 | src/objviewer/objview.c | 12 ++++++------ | ||
21 | src/perf/glslstateschange.c | 8 ++++---- | ||
22 | 13 files changed, 32 insertions(+), 32 deletions(-) | ||
23 | |||
24 | diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c | ||
25 | index 0b56bc1..e01603d 100644 | ||
26 | --- a/src/glsl/bezier.c | ||
27 | +++ b/src/glsl/bezier.c | ||
28 | @@ -13,7 +13,7 @@ | ||
29 | #include "glut_wrap.h" | ||
30 | #include "shaderutil.h" | ||
31 | |||
32 | -static const char *filename = "bezier.geom"; | ||
33 | +static const char *filename = DEMOS_DATA_DIR "bezier.geom"; | ||
34 | |||
35 | static GLuint fragShader; | ||
36 | static GLuint vertShader; | ||
37 | diff --git a/src/glsl/blinking-teapot.c b/src/glsl/blinking-teapot.c | ||
38 | index e3bf24d..7662b1f 100644 | ||
39 | --- a/src/glsl/blinking-teapot.c | ||
40 | +++ b/src/glsl/blinking-teapot.c | ||
41 | @@ -63,8 +63,8 @@ init_opengl (void) | ||
42 | exit(1); | ||
43 | } | ||
44 | |||
45 | - vshad_id = CompileShaderFile (GL_VERTEX_SHADER, "blinking-teapot.vert"); | ||
46 | - fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, "blinking-teapot.frag"); | ||
47 | + vshad_id = CompileShaderFile (GL_VERTEX_SHADER, DEMOS_DATA_DIR "blinking-teapot.vert"); | ||
48 | + fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, DEMOS_DATA_DIR "blinking-teapot.frag"); | ||
49 | prog_id = LinkShaders (vshad_id, fshad_id); | ||
50 | |||
51 | UseProgram (prog_id); | ||
52 | diff --git a/src/glsl/brick.c b/src/glsl/brick.c | ||
53 | index 3021856..fe5f190 100644 | ||
54 | --- a/src/glsl/brick.c | ||
55 | +++ b/src/glsl/brick.c | ||
56 | @@ -14,8 +14,8 @@ | ||
57 | #include "shaderutil.h" | ||
58 | |||
59 | |||
60 | -static char *FragProgFile = "CH06-brick.frag"; | ||
61 | -static char *VertProgFile = "CH06-brick.vert"; | ||
62 | +static char *FragProgFile = DEMOS_DATA_DIR "CH06-brick.frag"; | ||
63 | +static char *VertProgFile = DEMOS_DATA_DIR "CH06-brick.vert"; | ||
64 | |||
65 | /* program/shader objects */ | ||
66 | static GLuint fragShader; | ||
67 | diff --git a/src/glsl/bump.c b/src/glsl/bump.c | ||
68 | index 59f62cd..3a1b20a 100644 | ||
69 | --- a/src/glsl/bump.c | ||
70 | +++ b/src/glsl/bump.c | ||
71 | @@ -15,9 +15,9 @@ | ||
72 | #include "readtex.h" | ||
73 | |||
74 | |||
75 | -static char *FragProgFile = "CH11-bumpmap.frag"; | ||
76 | -static char *FragTexProgFile = "CH11-bumpmaptex.frag"; | ||
77 | -static char *VertProgFile = "CH11-bumpmap.vert"; | ||
78 | +static char *FragProgFile = DEMOS_DATA_DIR "CH11-bumpmap.frag"; | ||
79 | +static char *FragTexProgFile = DEMOS_DATA_DIR "CH11-bumpmaptex.frag"; | ||
80 | +static char *VertProgFile = DEMOS_DATA_DIR "CH11-bumpmap.vert"; | ||
81 | static char *TextureFile = DEMOS_DATA_DIR "tile.rgb"; | ||
82 | |||
83 | /* program/shader objects */ | ||
84 | diff --git a/src/glsl/convolutions.c b/src/glsl/convolutions.c | ||
85 | index a120cfe..9312f00 100644 | ||
86 | --- a/src/glsl/convolutions.c | ||
87 | +++ b/src/glsl/convolutions.c | ||
88 | @@ -340,7 +340,7 @@ static void init(void) | ||
89 | |||
90 | menuInit(); | ||
91 | readTexture(textureLocation); | ||
92 | - createProgram("convolution.vert", "convolution.frag"); | ||
93 | + createProgram(DEMOS_DATA_DIR "convolution.vert", DEMOS_DATA_DIR "convolution.frag"); | ||
94 | |||
95 | glEnable(GL_TEXTURE_2D); | ||
96 | glClearColor(1.0, 1.0, 1.0, 1.0); | ||
97 | diff --git a/src/glsl/mandelbrot.c b/src/glsl/mandelbrot.c | ||
98 | index 31ede1d..ab34a0f 100644 | ||
99 | --- a/src/glsl/mandelbrot.c | ||
100 | +++ b/src/glsl/mandelbrot.c | ||
101 | @@ -14,8 +14,8 @@ | ||
102 | #include "shaderutil.h" | ||
103 | |||
104 | |||
105 | -static char *FragProgFile = "CH18-mandel.frag"; | ||
106 | -static char *VertProgFile = "CH18-mandel.vert"; | ||
107 | +static char *FragProgFile = DEMOS_DATA_DIR "CH18-mandel.frag"; | ||
108 | +static char *VertProgFile = DEMOS_DATA_DIR "CH18-mandel.vert"; | ||
109 | |||
110 | /* program/shader objects */ | ||
111 | static GLuint fragShader; | ||
112 | diff --git a/src/glsl/multitex.c b/src/glsl/multitex.c | ||
113 | index 262ea50..546bd27 100644 | ||
114 | --- a/src/glsl/multitex.c | ||
115 | +++ b/src/glsl/multitex.c | ||
116 | @@ -35,8 +35,8 @@ | ||
117 | |||
118 | static const char *Demo = "multitex"; | ||
119 | |||
120 | -static const char *VertFile = "multitex.vert"; | ||
121 | -static const char *FragFile = "multitex.frag"; | ||
122 | +static const char *VertFile = DEMOS_DATA_DIR "multitex.vert"; | ||
123 | +static const char *FragFile = DEMOS_DATA_DIR "multitex.frag"; | ||
124 | |||
125 | static const char *TexFiles[2] = | ||
126 | { | ||
127 | diff --git a/src/glsl/simplex-noise.c b/src/glsl/simplex-noise.c | ||
128 | index 13fdd5d..885f01e 100644 | ||
129 | --- a/src/glsl/simplex-noise.c | ||
130 | +++ b/src/glsl/simplex-noise.c | ||
131 | @@ -169,7 +169,7 @@ SpecialKey(int key, int x, int y) | ||
132 | static void | ||
133 | Init(void) | ||
134 | { | ||
135 | - const char *filename = "simplex-noise.glsl"; | ||
136 | + const char *filename = DEMOS_DATA_DIR "simplex-noise.glsl"; | ||
137 | char noiseText[10000]; | ||
138 | FILE *f; | ||
139 | int len; | ||
140 | diff --git a/src/glsl/skinning.c b/src/glsl/skinning.c | ||
141 | index bf38d77..536d475 100644 | ||
142 | --- a/src/glsl/skinning.c | ||
143 | +++ b/src/glsl/skinning.c | ||
144 | @@ -20,8 +20,8 @@ | ||
145 | #define M_PI 3.1415926535 | ||
146 | #endif | ||
147 | |||
148 | -static char *FragProgFile = "skinning.frag"; | ||
149 | -static char *VertProgFile = "skinning.vert"; | ||
150 | +static char *FragProgFile = DEMOS_DATA_DIR "skinning.frag"; | ||
151 | +static char *VertProgFile = DEMOS_DATA_DIR "skinning.vert"; | ||
152 | |||
153 | /* program/shader objects */ | ||
154 | static GLuint fragShader; | ||
155 | diff --git a/src/glsl/texdemo1.c b/src/glsl/texdemo1.c | ||
156 | index 6cde239..a082342 100644 | ||
157 | --- a/src/glsl/texdemo1.c | ||
158 | +++ b/src/glsl/texdemo1.c | ||
159 | @@ -35,11 +35,11 @@ | ||
160 | |||
161 | static const char *Demo = "texdemo1"; | ||
162 | |||
163 | -static const char *ReflectVertFile = "reflect.vert"; | ||
164 | -static const char *CubeFragFile = "cubemap.frag"; | ||
165 | +static const char *ReflectVertFile = DEMOS_DATA_DIR "reflect.vert"; | ||
166 | +static const char *CubeFragFile = DEMOS_DATA_DIR "cubemap.frag"; | ||
167 | |||
168 | -static const char *SimpleVertFile = "simple.vert"; | ||
169 | -static const char *SimpleTexFragFile = "shadowtex.frag"; | ||
170 | +static const char *SimpleVertFile = DEMOS_DATA_DIR "simple.vert"; | ||
171 | +static const char *SimpleTexFragFile = DEMOS_DATA_DIR "shadowtex.frag"; | ||
172 | |||
173 | static const char *GroundImage = DEMOS_DATA_DIR "tile.rgb"; | ||
174 | |||
175 | diff --git a/src/glsl/toyball.c b/src/glsl/toyball.c | ||
176 | index 5f27951..4e7e832 100644 | ||
177 | --- a/src/glsl/toyball.c | ||
178 | +++ b/src/glsl/toyball.c | ||
179 | @@ -14,8 +14,8 @@ | ||
180 | #include "shaderutil.h" | ||
181 | |||
182 | |||
183 | -static char *FragProgFile = "CH11-toyball.frag"; | ||
184 | -static char *VertProgFile = "CH11-toyball.vert"; | ||
185 | +static char *FragProgFile = DEMOS_DATA_DIR "CH11-toyball.frag"; | ||
186 | +static char *VertProgFile = DEMOS_DATA_DIR "CH11-toyball.vert"; | ||
187 | |||
188 | /* program/shader objects */ | ||
189 | static GLuint fragShader; | ||
190 | diff --git a/src/objviewer/objview.c b/src/objviewer/objview.c | ||
191 | index 6def726..78a6acf 100644 | ||
192 | --- a/src/objviewer/objview.c | ||
193 | +++ b/src/objviewer/objview.c | ||
194 | @@ -162,12 +162,12 @@ init_model(void) | ||
195 | static void | ||
196 | init_skybox(void) | ||
197 | { | ||
198 | - SkyboxTex = LoadSkyBoxCubeTexture("alpine_east.rgb", | ||
199 | - "alpine_west.rgb", | ||
200 | - "alpine_up.rgb", | ||
201 | - "alpine_down.rgb", | ||
202 | - "alpine_south.rgb", | ||
203 | - "alpine_north.rgb"); | ||
204 | + SkyboxTex = LoadSkyBoxCubeTexture(DEMOS_DATA_DIR "alpine_east.rgb", | ||
205 | + DEMOS_DATA_DIR "alpine_west.rgb", | ||
206 | + DEMOS_DATA_DIR "alpine_up.rgb", | ||
207 | + DEMOS_DATA_DIR "alpine_down.rgb", | ||
208 | + DEMOS_DATA_DIR "alpine_south.rgb", | ||
209 | + DEMOS_DATA_DIR "alpine_north.rgb"); | ||
210 | glmSpecularTexture(Model, SkyboxTex); | ||
211 | } | ||
212 | |||
213 | diff --git a/src/perf/glslstateschange.c b/src/perf/glslstateschange.c | ||
214 | index 7422b78..dbf8332 100644 | ||
215 | --- a/src/perf/glslstateschange.c | ||
216 | +++ b/src/perf/glslstateschange.c | ||
217 | @@ -33,10 +33,10 @@ | ||
218 | #include "glmain.h" | ||
219 | #include "common.h" | ||
220 | |||
221 | -static const char *VertFile1 = "glslstateschange1.vert"; | ||
222 | -static const char *FragFile1 = "glslstateschange1.frag"; | ||
223 | -static const char *VertFile2 = "glslstateschange2.vert"; | ||
224 | -static const char *FragFile2 = "glslstateschange2.frag"; | ||
225 | +static const char *VertFile1 = DEMOS_DATA_DIR "glslstateschange1.vert"; | ||
226 | +static const char *FragFile1 = DEMOS_DATA_DIR "glslstateschange1.frag"; | ||
227 | +static const char *VertFile2 = DEMOS_DATA_DIR "glslstateschange2.vert"; | ||
228 | +static const char *FragFile2 = DEMOS_DATA_DIR "glslstateschange2.frag"; | ||
229 | static struct uniform_info Uniforms1[] = { | ||
230 | { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, | ||
231 | { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 }, | ||
232 | -- | ||
233 | 2.0.0 | ||
234 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch b/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch new file mode 100644 index 0000000000..aac2a37294 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch | |||
@@ -0,0 +1,267 @@ | |||
1 | From 453353a221de9c64479f4372565d2cd8591b36cc Mon Sep 17 00:00:00 2001 | ||
2 | From: Frank Binns <frank.binns@imgtec.com> | ||
3 | Date: Fri, 29 Jun 2012 11:26:04 +0100 | ||
4 | Subject: [PATCH 5/9] Fix build when EGL_MESA_screen_surface extension isn't | ||
5 | present | ||
6 | |||
7 | The EGL demos won't build against EGL implementations that don't support | ||
8 | the EGL_MESA_screen_surface extension. Fix this, in most cases, by | ||
9 | wrapping relevant bits of code in #ifdef EGL_MESA_screen_surface. | ||
10 | |||
11 | Signed-off-by: Frank Binns <frank.binns@imgtec.com> | ||
12 | |||
13 | Applied and fixed up in Yocto by... | ||
14 | |||
15 | Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | --- | ||
19 | src/egl/eglut/eglut.c | 9 +++++++-- | ||
20 | src/egl/eglut/eglut_screen.c | 14 ++++++++++++++ | ||
21 | src/egl/opengl/demo1.c | 2 ++ | ||
22 | src/egl/opengl/demo2.c | 7 ++++++- | ||
23 | src/egl/opengl/demo3.c | 7 ++++++- | ||
24 | 5 files changed, 35 insertions(+), 4 deletions(-) | ||
25 | |||
26 | diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c | ||
27 | index 2ee6f15..f6a2ad4 100644 | ||
28 | --- a/src/egl/eglut/eglut.c | ||
29 | +++ b/src/egl/eglut/eglut.c | ||
30 | @@ -76,8 +76,9 @@ _eglutNow(void) | ||
31 | static void | ||
32 | _eglutDestroyWindow(struct eglut_window *win) | ||
33 | { | ||
34 | - if (_eglut->surface_type != EGL_PBUFFER_BIT && | ||
35 | - _eglut->surface_type != EGL_SCREEN_BIT_MESA) | ||
36 | + | ||
37 | + if (_eglut->surface_type == EGL_WINDOW_BIT || | ||
38 | + _eglut->surface_type == EGL_PIXMAP_BIT) | ||
39 | eglDestroySurface(_eglut->dpy, win->surface); | ||
40 | |||
41 | _eglutNativeFiniWindow(win); | ||
42 | @@ -175,7 +176,9 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h) | ||
43 | win->config, win->native.u.pixmap, NULL); | ||
44 | break; | ||
45 | case EGL_PBUFFER_BIT: | ||
46 | +#ifdef EGL_MESA_screen_surface | ||
47 | case EGL_SCREEN_BIT_MESA: | ||
48 | +#endif | ||
49 | win->surface = win->native.u.surface; | ||
50 | break; | ||
51 | default: | ||
52 | @@ -289,8 +292,10 @@ eglutDestroyWindow(int win) | ||
53 | if (window->index != win) | ||
54 | return; | ||
55 | |||
56 | +#ifdef EGL_MESA_screen_surface | ||
57 | /* XXX it causes some bug in st/egl KMS backend */ | ||
58 | if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA) | ||
59 | +#endif | ||
60 | eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); | ||
61 | |||
62 | _eglutDestroyWindow(_eglut->current); | ||
63 | diff --git a/src/egl/eglut/eglut_screen.c b/src/egl/eglut/eglut_screen.c | ||
64 | index 021a8f1..094a4e2 100644 | ||
65 | --- a/src/egl/eglut/eglut_screen.c | ||
66 | +++ b/src/egl/eglut/eglut_screen.c | ||
67 | @@ -35,26 +35,33 @@ | ||
68 | |||
69 | #define MAX_MODES 100 | ||
70 | |||
71 | +#ifdef EGL_MESA_screen_surface | ||
72 | static EGLScreenMESA kms_screen; | ||
73 | static EGLModeMESA kms_mode; | ||
74 | static EGLint kms_width, kms_height; | ||
75 | +#endif | ||
76 | |||
77 | void | ||
78 | _eglutNativeInitDisplay(void) | ||
79 | { | ||
80 | +#ifdef EGL_MESA_screen_surface | ||
81 | _eglut->native_dpy = EGL_DEFAULT_DISPLAY; | ||
82 | _eglut->surface_type = EGL_SCREEN_BIT_MESA; | ||
83 | +#endif | ||
84 | } | ||
85 | |||
86 | void | ||
87 | _eglutNativeFiniDisplay(void) | ||
88 | { | ||
89 | +#ifdef EGL_MESA_screen_surface | ||
90 | kms_screen = 0; | ||
91 | kms_mode = 0; | ||
92 | kms_width = 0; | ||
93 | kms_height = 0; | ||
94 | +#endif | ||
95 | } | ||
96 | |||
97 | +#ifdef EGL_MESA_screen_surface | ||
98 | static void | ||
99 | init_kms(void) | ||
100 | { | ||
101 | @@ -94,19 +101,23 @@ init_kms(void) | ||
102 | kms_width = width; | ||
103 | kms_height = height; | ||
104 | } | ||
105 | +#endif | ||
106 | |||
107 | void | ||
108 | _eglutNativeInitWindow(struct eglut_window *win, const char *title, | ||
109 | int x, int y, int w, int h) | ||
110 | { | ||
111 | +#ifdef EGL_MESA_screen_surface | ||
112 | EGLint surf_attribs[16]; | ||
113 | EGLint i; | ||
114 | +#endif | ||
115 | const char *exts; | ||
116 | |||
117 | exts = eglQueryString(_eglut->dpy, EGL_EXTENSIONS); | ||
118 | if (!exts || !strstr(exts, "EGL_MESA_screen_surface")) | ||
119 | _eglutFatal("EGL_MESA_screen_surface is not supported\n"); | ||
120 | |||
121 | +#ifdef EGL_MESA_screen_surface | ||
122 | init_kms(); | ||
123 | |||
124 | i = 0; | ||
125 | @@ -128,14 +139,17 @@ _eglutNativeInitWindow(struct eglut_window *win, const char *title, | ||
126 | |||
127 | win->native.width = kms_width; | ||
128 | win->native.height = kms_height; | ||
129 | +#endif | ||
130 | } | ||
131 | |||
132 | void | ||
133 | _eglutNativeFiniWindow(struct eglut_window *win) | ||
134 | { | ||
135 | +#ifdef EGL_MESA_screen_surface | ||
136 | eglShowScreenSurfaceMESA(_eglut->dpy, | ||
137 | kms_screen, EGL_NO_SURFACE, 0); | ||
138 | eglDestroySurface(_eglut->dpy, win->native.u.surface); | ||
139 | +#endif | ||
140 | } | ||
141 | |||
142 | void | ||
143 | diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c | ||
144 | index d892734..3a3564c 100644 | ||
145 | --- a/src/egl/opengl/demo1.c | ||
146 | +++ b/src/egl/opengl/demo1.c | ||
147 | @@ -18,6 +18,7 @@ | ||
148 | static void | ||
149 | TestScreens(EGLDisplay dpy) | ||
150 | { | ||
151 | +#ifdef EGL_MESA_screen_surface | ||
152 | #define MAX 8 | ||
153 | EGLScreenMESA screens[MAX]; | ||
154 | EGLint numScreens; | ||
155 | @@ -28,6 +29,7 @@ TestScreens(EGLDisplay dpy) | ||
156 | for (i = 0; i < numScreens; i++) { | ||
157 | printf(" Screen %d handle: %d\n", i, (int) screens[i]); | ||
158 | } | ||
159 | +#endif | ||
160 | } | ||
161 | |||
162 | /** | ||
163 | diff --git a/src/egl/opengl/demo2.c b/src/egl/opengl/demo2.c | ||
164 | index 505b474..bfef59e 100644 | ||
165 | --- a/src/egl/opengl/demo2.c | ||
166 | +++ b/src/egl/opengl/demo2.c | ||
167 | @@ -16,6 +16,7 @@ | ||
168 | |||
169 | /*#define FRONTBUFFER*/ | ||
170 | |||
171 | +#ifdef EGL_MESA_screen_surface | ||
172 | static void _subset_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2, | ||
173 | GLfloat r, GLfloat g, GLfloat b) | ||
174 | { | ||
175 | @@ -95,12 +96,13 @@ TestScreens(EGLDisplay dpy) | ||
176 | printf(" Screen %d handle: %d\n", i, (int) screens[i]); | ||
177 | } | ||
178 | } | ||
179 | - | ||
180 | +#endif | ||
181 | |||
182 | int | ||
183 | main(int argc, char *argv[]) | ||
184 | { | ||
185 | int maj, min; | ||
186 | +#ifdef EGL_MESA_screen_surface | ||
187 | EGLContext ctx; | ||
188 | EGLSurface pbuffer, screen_surf; | ||
189 | EGLConfig configs[10]; | ||
190 | @@ -115,6 +117,7 @@ main(int argc, char *argv[]) | ||
191 | EGLModeMESA mode; | ||
192 | EGLScreenMESA screen; | ||
193 | EGLint count; | ||
194 | +#endif | ||
195 | |||
196 | EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY); | ||
197 | assert(d); | ||
198 | @@ -132,6 +135,7 @@ main(int argc, char *argv[]) | ||
199 | exit(1); | ||
200 | } | ||
201 | |||
202 | +#ifdef EGL_MESA_screen_surface | ||
203 | eglGetConfigs(d, configs, 10, &numConfigs); | ||
204 | printf("Got %d EGL configs:\n", numConfigs); | ||
205 | for (i = 0; i < numConfigs; i++) { | ||
206 | @@ -211,6 +215,7 @@ main(int argc, char *argv[]) | ||
207 | eglDestroySurface(d, pbuffer); | ||
208 | eglDestroyContext(d, ctx); | ||
209 | eglTerminate(d); | ||
210 | +#endif | ||
211 | |||
212 | return 0; | ||
213 | } | ||
214 | diff --git a/src/egl/opengl/demo3.c b/src/egl/opengl/demo3.c | ||
215 | index f84ca23..31b5d8b 100644 | ||
216 | --- a/src/egl/opengl/demo3.c | ||
217 | +++ b/src/egl/opengl/demo3.c | ||
218 | @@ -46,7 +46,7 @@ GLubyte OpenGL_bits[] = { | ||
219 | 0x3e, 0x00, 0x00, 0xf8, 0x0c, 0x00, | ||
220 | }; | ||
221 | |||
222 | - | ||
223 | +#ifdef EGL_MESA_screen_surface | ||
224 | static void Init(void) | ||
225 | { | ||
226 | |||
227 | @@ -551,11 +551,13 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height) | ||
228 | fclose(f); | ||
229 | } | ||
230 | } | ||
231 | +#endif | ||
232 | |||
233 | int | ||
234 | main(int argc, char *argv[]) | ||
235 | { | ||
236 | int maj, min; | ||
237 | +#ifdef EGL_MESA_screen_surface | ||
238 | EGLContext ctx; | ||
239 | EGLSurface screen_surf; | ||
240 | EGLConfig configs[10]; | ||
241 | @@ -566,6 +568,7 @@ main(int argc, char *argv[]) | ||
242 | const GLubyte *bitmap; | ||
243 | EGLint screenAttribs[32]; | ||
244 | EGLint i; | ||
245 | +#endif | ||
246 | |||
247 | EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY); | ||
248 | assert(d); | ||
249 | @@ -583,6 +586,7 @@ main(int argc, char *argv[]) | ||
250 | exit(1); | ||
251 | } | ||
252 | |||
253 | +#ifdef EGL_MESA_screen_surface | ||
254 | eglGetConfigs(d, configs, 10, &numConfigs); | ||
255 | eglGetScreensMESA(d, &screen, 1, &count); | ||
256 | eglGetModesMESA(d, screen, &mode, 1, &count); | ||
257 | @@ -642,6 +646,7 @@ main(int argc, char *argv[]) | ||
258 | eglDestroySurface(d, screen_surf); | ||
259 | eglDestroyContext(d, ctx); | ||
260 | eglTerminate(d); | ||
261 | +#endif | ||
262 | |||
263 | return 0; | ||
264 | } | ||
265 | -- | ||
266 | 2.0.0 | ||
267 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch b/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch new file mode 100644 index 0000000000..12e0805f15 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 6a19dba1d275579c73e7763b0554410ff4e1e650 Mon Sep 17 00:00:00 2001 | ||
2 | From: Frank Binns <frank.binns@imgtec.com> | ||
3 | Date: Fri, 29 Jun 2012 12:00:26 +0100 | ||
4 | Subject: [PATCH 6/9] Query display for EGL_MESA_screen_surface extension | ||
5 | before using it | ||
6 | |||
7 | This code makes heavy use of the EGL_MESA_screen_surface extension so | ||
8 | check the display to determine if it's supported by the underlying EGL | ||
9 | implementation. If it doesn't then bail. | ||
10 | |||
11 | Signed-off-by: Frank Binns <frank.binns@imgtec.com> | ||
12 | |||
13 | Applied and fixed up in Yocto by... | ||
14 | |||
15 | Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | --- | ||
19 | src/egl/opengl/demo1.c | 6 ++++++ | ||
20 | 1 file changed, 6 insertions(+) | ||
21 | |||
22 | diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c | ||
23 | index 3a3564c..06e2138 100644 | ||
24 | --- a/src/egl/opengl/demo1.c | ||
25 | +++ b/src/egl/opengl/demo1.c | ||
26 | @@ -110,6 +110,12 @@ main(int argc, char *argv[]) | ||
27 | printf("EGL version = %d.%d\n", maj, min); | ||
28 | printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); | ||
29 | |||
30 | + if (!strstr(eglQueryString(d, EGL_EXTENSIONS), | ||
31 | + "EGL_MESA_screen_surface")) { | ||
32 | + printf("EGL_MESA_screen_surface is not supported\n"); | ||
33 | + exit(1); | ||
34 | + } | ||
35 | + | ||
36 | eglGetConfigs(d, NULL, 0, &numConfigs); | ||
37 | configs = malloc(sizeof(*configs) *numConfigs); | ||
38 | eglGetConfigs(d, configs, numConfigs, &numConfigs); | ||
39 | -- | ||
40 | 2.0.0 | ||
41 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch new file mode 100644 index 0000000000..89d2fac4fd --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | From d930b2da57f7c9efb80c8cef8f8adad15bbbc0d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 10 Jul 2014 14:30:52 +0200 | ||
4 | Subject: [PATCH 7/9] Install few more test programs | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | src/egl/opengl/Makefile.am | 2 +- | ||
11 | src/egl/opengles1/Makefile.am | 10 ++++------ | ||
12 | src/egl/openvg/Makefile.am | 2 +- | ||
13 | 3 files changed, 6 insertions(+), 8 deletions(-) | ||
14 | |||
15 | diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am | ||
16 | index 0c7228f..87b2f1a 100644 | ||
17 | --- a/src/egl/opengl/Makefile.am | ||
18 | +++ b/src/egl/opengl/Makefile.am | ||
19 | @@ -50,7 +50,7 @@ endif | ||
20 | endif | ||
21 | |||
22 | if HAVE_EGL | ||
23 | -noinst_PROGRAMS = \ | ||
24 | +bin_PROGRAMS = \ | ||
25 | demo1 \ | ||
26 | demo2 \ | ||
27 | demo3 \ | ||
28 | diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am | ||
29 | index 3455e75..516e516 100644 | ||
30 | --- a/src/egl/opengles1/Makefile.am | ||
31 | +++ b/src/egl/opengles1/Makefile.am | ||
32 | @@ -36,11 +36,11 @@ AM_LDFLAGS = \ | ||
33 | $(EGL_LIBS) \ | ||
34 | -lm | ||
35 | |||
36 | -noinst_PROGRAMS = | ||
37 | +bin_PROGRAMS = | ||
38 | |||
39 | if HAVE_EGL | ||
40 | if HAVE_GLESV1 | ||
41 | -noinst_PROGRAMS += \ | ||
42 | +bin_PROGRAMS += \ | ||
43 | drawtex_screen \ | ||
44 | gears_screen \ | ||
45 | torus_screen \ | ||
46 | @@ -57,10 +57,8 @@ torus_screen_LDADD = ../eglut/libeglut_screen.la | ||
47 | tri_screen_LDADD = ../eglut/libeglut_screen.la | ||
48 | |||
49 | if HAVE_X11 | ||
50 | -noinst_PROGRAMS += \ | ||
51 | - clear | ||
52 | - | ||
53 | -bin_PROGRAMS = \ | ||
54 | +bin_PROGRAMS += \ | ||
55 | + clear \ | ||
56 | bindtex \ | ||
57 | drawtex_x11 \ | ||
58 | eglfbdev \ | ||
59 | diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am | ||
60 | index 7318a43..b545225 100644 | ||
61 | --- a/src/egl/openvg/Makefile.am | ||
62 | +++ b/src/egl/openvg/Makefile.am | ||
63 | @@ -49,7 +49,7 @@ endif | ||
64 | |||
65 | if HAVE_EGL | ||
66 | if HAVE_VG | ||
67 | -noinst_PROGRAMS = \ | ||
68 | +bin_PROGRAMS = \ | ||
69 | lion_screen \ | ||
70 | sp_screen \ | ||
71 | $(EGL_X11_DEMOS) | ||
72 | -- | ||
73 | 2.0.0 | ||
74 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch b/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch new file mode 100644 index 0000000000..a6085754d2 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch | |||
@@ -0,0 +1,101 @@ | |||
1 | From 0b6f95f9b8ece22e9856c150e4be29fd86eaf546 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 10 Jul 2014 14:29:27 +0200 | ||
4 | Subject: [PATCH 8/9] glsl, perf: Add few missing .glsl, .vert, .frag files to | ||
5 | EXTRA_DATA | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | src/fpglsl/Makefile.am | 2 ++ | ||
12 | src/glsl/Makefile.am | 10 ++++++++-- | ||
13 | src/perf/Makefile.am | 6 ++++++ | ||
14 | src/vpglsl/Makefile.am | 1 + | ||
15 | 4 files changed, 17 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am | ||
18 | index 47c1039..fd43c91 100644 | ||
19 | --- a/src/fpglsl/Makefile.am | ||
20 | +++ b/src/fpglsl/Makefile.am | ||
21 | @@ -39,10 +39,12 @@ noinst_PROGRAMS = \ | ||
22 | endif | ||
23 | |||
24 | EXTRA_DIST = \ | ||
25 | + depth-read.glsl \ | ||
26 | dowhile2.glsl \ | ||
27 | dowhile.glsl \ | ||
28 | forbreak.glsl \ | ||
29 | for.glsl \ | ||
30 | + infinite-loop.glsl \ | ||
31 | mov.glsl \ | ||
32 | mov-imm.glsl \ | ||
33 | simpleif.glsl \ | ||
34 | diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am | ||
35 | index 4faa8db..079a29d 100644 | ||
36 | --- a/src/glsl/Makefile.am | ||
37 | +++ b/src/glsl/Makefile.am | ||
38 | @@ -37,7 +37,7 @@ AM_LDFLAGS = \ | ||
39 | if HAVE_GLUT | ||
40 | bin_PROGRAMS = \ | ||
41 | array \ | ||
42 | - bezier \ | ||
43 | + bezier \ | ||
44 | bitmap \ | ||
45 | brick \ | ||
46 | bump \ | ||
47 | @@ -123,12 +123,16 @@ EXTRA_DIST = \ | ||
48 | CH06-brick.vert \ | ||
49 | CH11-bumpmap.frag \ | ||
50 | CH11-bumpmap.vert \ | ||
51 | + CH11-bumpmaptex.frag \ | ||
52 | CH11-toyball.frag \ | ||
53 | CH11-toyball.vert \ | ||
54 | CH18-mandel.frag \ | ||
55 | CH18-mandel.vert \ | ||
56 | - bezier.geom \ | ||
57 | + bezier.geom \ | ||
58 | brick.shtest \ | ||
59 | + blinking-teapot.frag \ | ||
60 | + blinking-teapot.vert \ | ||
61 | + convolution.frag \ | ||
62 | convolution.vert \ | ||
63 | cubemap.frag \ | ||
64 | mandelbrot.shtest \ | ||
65 | @@ -138,5 +142,7 @@ EXTRA_DIST = \ | ||
66 | reflect.vert \ | ||
67 | shadowtex.frag \ | ||
68 | simple.vert \ | ||
69 | + simplex-noise.glsl \ | ||
70 | skinning.frag \ | ||
71 | + skinning.vert \ | ||
72 | toyball.shtest | ||
73 | diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am | ||
74 | index 5363c58..c5cca8d 100644 | ||
75 | --- a/src/perf/Makefile.am | ||
76 | +++ b/src/perf/Makefile.am | ||
77 | @@ -57,3 +57,9 @@ bin_PROGRAMS = \ | ||
78 | endif | ||
79 | |||
80 | glslstateschange_LDADD = libperf.la ../util/libutil.la | ||
81 | + | ||
82 | +EXTRA_DIST = \ | ||
83 | + glslstateschange1.frag \ | ||
84 | + glslstateschange1.vert \ | ||
85 | + glslstateschange2.frag \ | ||
86 | + glslstateschange2.vert | ||
87 | diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am | ||
88 | index 4a85ed4..48b08f4 100644 | ||
89 | --- a/src/vpglsl/Makefile.am | ||
90 | +++ b/src/vpglsl/Makefile.am | ||
91 | @@ -44,6 +44,7 @@ EXTRA_DIST = \ | ||
92 | func2.glsl \ | ||
93 | ifelse.glsl \ | ||
94 | if.glsl \ | ||
95 | + infinite-loop.glsl \ | ||
96 | mov.glsl \ | ||
97 | nestedifs.glsl \ | ||
98 | nestedswizzle.glsl \ | ||
99 | -- | ||
100 | 2.0.0 | ||
101 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch new file mode 100644 index 0000000000..1262dee237 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | From c8c3de5417d6b6c7d7579c528c0cab718f4bfdb6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 10 Jul 2014 14:48:12 +0200 | ||
4 | Subject: [PATCH 9/9] glsl, perf: Install .glsl, .vert, .frag files | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | src/fpglsl/Makefile.am | 3 ++- | ||
10 | src/glsl/Makefile.am | 3 ++- | ||
11 | src/perf/Makefile.am | 3 ++- | ||
12 | src/vpglsl/Makefile.am | 3 ++- | ||
13 | 4 files changed, 8 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am | ||
16 | index fd43c91..2bf51de 100644 | ||
17 | --- a/src/fpglsl/Makefile.am | ||
18 | +++ b/src/fpglsl/Makefile.am | ||
19 | @@ -38,7 +38,8 @@ noinst_PROGRAMS = \ | ||
20 | fp-tri | ||
21 | endif | ||
22 | |||
23 | -EXTRA_DIST = \ | ||
24 | +demosdatadir=$(datadir)/$(PACKAGE)/ | ||
25 | +dist_demosdata_DATA= \ | ||
26 | depth-read.glsl \ | ||
27 | dowhile2.glsl \ | ||
28 | dowhile.glsl \ | ||
29 | diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am | ||
30 | index 079a29d..f66ec29 100644 | ||
31 | --- a/src/glsl/Makefile.am | ||
32 | +++ b/src/glsl/Makefile.am | ||
33 | @@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la | ||
34 | vert_tex_LDADD = ../util/libutil.la | ||
35 | vsraytrace_LDADD = ../util/libutil.la | ||
36 | |||
37 | -EXTRA_DIST = \ | ||
38 | +demosdatadir=$(datadir)/$(PACKAGE)/ | ||
39 | +dist_demosdata_DATA= \ | ||
40 | CH06-brick.frag \ | ||
41 | CH06-brick.vert \ | ||
42 | CH11-bumpmap.frag \ | ||
43 | diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am | ||
44 | index c5cca8d..140256d 100644 | ||
45 | --- a/src/perf/Makefile.am | ||
46 | +++ b/src/perf/Makefile.am | ||
47 | @@ -58,7 +58,8 @@ endif | ||
48 | |||
49 | glslstateschange_LDADD = libperf.la ../util/libutil.la | ||
50 | |||
51 | -EXTRA_DIST = \ | ||
52 | +demosdatadir=$(datadir)/$(PACKAGE)/ | ||
53 | +dist_demosdata_DATA= \ | ||
54 | glslstateschange1.frag \ | ||
55 | glslstateschange1.vert \ | ||
56 | glslstateschange2.frag \ | ||
57 | diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am | ||
58 | index 48b08f4..5526867 100644 | ||
59 | --- a/src/vpglsl/Makefile.am | ||
60 | +++ b/src/vpglsl/Makefile.am | ||
61 | @@ -38,7 +38,8 @@ noinst_PROGRAMS = \ | ||
62 | vp-tris | ||
63 | endif | ||
64 | |||
65 | -EXTRA_DIST = \ | ||
66 | +demosdatadir=$(datadir)/$(PACKAGE)/ | ||
67 | +dist_demosdata_DATA= \ | ||
68 | for.glsl \ | ||
69 | func.glsl \ | ||
70 | func2.glsl \ | ||
71 | -- | ||
72 | 2.0.0 | ||
73 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb new file mode 100644 index 0000000000..1caa50bc1b --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb | |||
@@ -0,0 +1,53 @@ | |||
1 | SUMMARY = "Mesa demo applications" | ||
2 | DESCRIPTION = "This package includes the demonstration application, such as glxgears. \ | ||
3 | These applications can be used for Mesa validation and benchmarking." | ||
4 | HOMEPAGE = "http://mesa3d.org" | ||
5 | BUGTRACKER = "https://bugs.freedesktop.org" | ||
6 | SECTION = "x11" | ||
7 | |||
8 | LICENSE = "MIT & PD" | ||
9 | LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \ | ||
10 | file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" | ||
11 | |||
12 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ | ||
13 | file://0001-mesa-demos-Add-missing-data-files.patch \ | ||
14 | file://0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch \ | ||
15 | file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \ | ||
16 | file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ | ||
17 | file://0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch \ | ||
18 | file://0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch \ | ||
19 | file://0007-Install-few-more-test-programs.patch \ | ||
20 | file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \ | ||
21 | file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \ | ||
22 | " | ||
23 | SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061" | ||
24 | SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92" | ||
25 | |||
26 | inherit autotools pkgconfig | ||
27 | |||
28 | PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 glu \ | ||
29 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew', '', d)}" | ||
30 | |||
31 | # The Wayland code doesn't work with Wayland 1.0, so disable it for now | ||
32 | #${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" | ||
33 | |||
34 | EXTRA_OECONF = "--with-system-data-files" | ||
35 | |||
36 | PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" | ||
37 | PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" | ||
38 | PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype" | ||
39 | PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl" | ||
40 | PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1" | ||
41 | PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" | ||
42 | PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut," | ||
43 | PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa," | ||
44 | PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg" | ||
45 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland" | ||
46 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" | ||
47 | PACKAGECONFIG[glew] = "--enable-glew,--disable-glew,glew" | ||
48 | PACKAGECONFIG[glu] = "--enable-glu,--disable-glu,virtual/libgl" | ||
49 | |||
50 | do_install_append() { | ||
51 | # it can be completely empty when all PACKAGECONFIG options are disabled | ||
52 | rmdir --ignore-fail-on-non-empty ${D}${bindir} | ||
53 | } | ||
diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb new file mode 100644 index 0000000000..2acc21dce5 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require mesa_${PV}.bb | ||
2 | |||
3 | SUMMARY += " (OpenGL only, no EGL/GLES)" | ||
4 | |||
5 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" | ||
6 | |||
7 | PROVIDES = "virtual/libgl virtual/mesa" | ||
8 | |||
9 | PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | ||
10 | |||
11 | EXCLUDE_FROM_WORLD = "1" | ||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc new file mode 100644 index 0000000000..1857f3c220 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -0,0 +1,189 @@ | |||
1 | SUMMARY = "A free implementation of the OpenGL API" | ||
2 | DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \ | ||
3 | a system for rendering interactive 3D graphics. \ | ||
4 | A variety of device drivers allows Mesa to be used in many different environments \ | ||
5 | ranging from software emulation to complete hardware acceleration for modern GPUs. \ | ||
6 | Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \ | ||
7 | environment." | ||
8 | |||
9 | HOMEPAGE = "http://mesa3d.org" | ||
10 | BUGTRACKER = "https://bugs.freedesktop.org" | ||
11 | SECTION = "x11" | ||
12 | LICENSE = "MIT" | ||
13 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" | ||
14 | |||
15 | PE = "2" | ||
16 | |||
17 | DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" | ||
18 | |||
19 | PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" | ||
20 | |||
21 | inherit autotools pkgconfig pythonnative gettext distro_features_check | ||
22 | |||
23 | REQUIRED_DISTRO_FEATURES = "opengl" | ||
24 | |||
25 | EXTRA_OECONF = "--enable-shared-glapi" | ||
26 | |||
27 | PACKAGECONFIG ??= "egl gles dri \ | ||
28 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ | ||
29 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ | ||
30 | " | ||
31 | |||
32 | X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" | ||
33 | PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" | ||
34 | PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" | ||
35 | PACKAGECONFIG[wayland] = ",,wayland" | ||
36 | |||
37 | DRIDRIVERS = "swrast" | ||
38 | DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" | ||
39 | DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" | ||
40 | PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" | ||
41 | PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" | ||
42 | |||
43 | EXTRA_OECONF += "--enable-gbm" | ||
44 | |||
45 | PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" | ||
46 | |||
47 | EGL_PLATFORMS = "drm" | ||
48 | EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" | ||
49 | EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" | ||
50 | PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" | ||
51 | |||
52 | PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" | ||
53 | |||
54 | GALLIUMDRIVERS = "swrast" | ||
55 | GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" | ||
56 | GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" | ||
57 | GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" | ||
58 | GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" | ||
59 | GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" | ||
60 | # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers | ||
61 | PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" | ||
62 | PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" | ||
63 | PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" | ||
64 | MESA_LLVM_RELEASE ?= "3.3" | ||
65 | PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ | ||
66 | ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" | ||
67 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" | ||
68 | |||
69 | # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) | ||
70 | FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" | ||
71 | |||
72 | # Multiple virtual/gl providers being built breaks staging | ||
73 | EXCLUDE_FROM_WORLD = "1" | ||
74 | |||
75 | # Remove the mesa dependency on mesa-dev, as mesa is empty | ||
76 | RDEPENDS_${PN}-dev = "" | ||
77 | |||
78 | PACKAGES =+ "libegl-mesa libegl-mesa-dev \ | ||
79 | libosmesa libosmesa-dev \ | ||
80 | libgl-mesa libgl-mesa-dev \ | ||
81 | libglapi libglapi-dev \ | ||
82 | libgbm libgbm-dev \ | ||
83 | libgles1-mesa libgles1-mesa-dev \ | ||
84 | libgles2-mesa libgles2-mesa-dev \ | ||
85 | libgles3-mesa libgles3-mesa-dev \ | ||
86 | libwayland-egl libwayland-egl-dev \ | ||
87 | libegl-gallium libgbm-gallium \ | ||
88 | libopenvg libopenvg-dev \ | ||
89 | libxvmcsoftpipe libxvmcsoftpipe-dev \ | ||
90 | mesa-megadriver \ | ||
91 | " | ||
92 | |||
93 | do_install_append () { | ||
94 | # Drivers never need libtool .la files | ||
95 | rm -f ${D}${libdir}/dri/*.la | ||
96 | rm -f ${D}${libdir}/egl/*.la | ||
97 | rm -f ${D}${libdir}/gallium-pipe/*.la | ||
98 | rm -f ${D}${libdir}/gbm/*.la | ||
99 | |||
100 | # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used | ||
101 | rm -f ${D}${sysconfdir}/drirc | ||
102 | } | ||
103 | |||
104 | # For the packages that make up the OpenGL interfaces, inject variables so that | ||
105 | # they don't get Debian-renamed (which would remove the -mesa suffix), and | ||
106 | # RPROVIDEs/RCONFLICTs on the generic libgl name. | ||
107 | python __anonymous() { | ||
108 | pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() | ||
109 | for p in (("egl", "libegl", "libegl1"), | ||
110 | ("dri", "libgl", "libgl1"), | ||
111 | ("gles", "libgles1", "libglesv1-cm1"), | ||
112 | ("gles", "libgles2", "libglesv2-2"), | ||
113 | ("gles", "libgles3",)): | ||
114 | if not p[0] in pkgconfig: | ||
115 | continue | ||
116 | fullp = p[1] + "-mesa" | ||
117 | pkgs = " ".join(p[1:]) | ||
118 | d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") | ||
119 | d.appendVar("RREPLACES_" + fullp, pkgs) | ||
120 | d.appendVar("RPROVIDES_" + fullp, pkgs) | ||
121 | d.appendVar("RCONFLICTS_" + fullp, pkgs) | ||
122 | |||
123 | # For -dev, the first element is both the Debian and original name | ||
124 | fullp += "-dev" | ||
125 | pkgs = p[1] + "-dev" | ||
126 | d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") | ||
127 | d.appendVar("RREPLACES_" + fullp, pkgs) | ||
128 | d.appendVar("RPROVIDES_" + fullp, pkgs) | ||
129 | d.appendVar("RCONFLICTS_" + fullp, pkgs) | ||
130 | } | ||
131 | |||
132 | python mesa_populate_packages() { | ||
133 | pkgs = ['mesa', 'mesa-dev', 'mesa-dbg'] | ||
134 | for pkg in pkgs: | ||
135 | d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) | ||
136 | d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) | ||
137 | d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) | ||
138 | |||
139 | import re | ||
140 | dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") | ||
141 | dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root) | ||
142 | lib_name = d.expand("${MLPREFIX}mesa-megadriver") | ||
143 | for p in dri_pkgs: | ||
144 | m = re.match('^(.*)_dri\.so$', p) | ||
145 | if m: | ||
146 | pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) | ||
147 | d.appendVar("RPROVIDES_%s" % lib_name, pkg_name) | ||
148 | d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) | ||
149 | d.appendVar("RREPLACES_%s" % lib_name, pkg_name) | ||
150 | |||
151 | pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") | ||
152 | do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') | ||
153 | } | ||
154 | |||
155 | PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " | ||
156 | |||
157 | PACKAGES_DYNAMIC += "^mesa-driver-.*" | ||
158 | |||
159 | FILES_${PN}-dbg += "${libdir}/dri/.debug/*" | ||
160 | FILES_${PN} += "${sysconfdir}/drirc" | ||
161 | FILES_mesa-megadriver = "${libdir}/dri/*" | ||
162 | FILES_libegl-mesa = "${libdir}/libEGL.so.*" | ||
163 | FILES_libgbm = "${libdir}/libgbm.so.*" | ||
164 | FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" | ||
165 | FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*" | ||
166 | FILES_libgl-mesa = "${libdir}/libGL.so.*" | ||
167 | FILES_libglapi = "${libdir}/libglapi.so.*" | ||
168 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" | ||
169 | FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" | ||
170 | FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*" | ||
171 | FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*" | ||
172 | FILES_libopenvg = "${libdir}/libOpenVG.so.*" | ||
173 | FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" | ||
174 | |||
175 | FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" | ||
176 | FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" | ||
177 | FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" | ||
178 | FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" | ||
179 | FILES_libglapi-dev = "${libdir}/libglapi.*" | ||
180 | FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" | ||
181 | FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" | ||
182 | FILES_libgles3-mesa-dev = "${includedir}/GLES3" | ||
183 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" | ||
184 | FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" | ||
185 | FILES_libopenvg-dev = "${libdir}/libOpenVG.so ${libdir}/libOpenVG.la* \ | ||
186 | ${includedir}/VG ${libdir}/pkgconfig/vg.pc" | ||
187 | FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" | ||
188 | |||
189 | FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/* ${libdir}/gbm/.debug/* ${libdir}/gallium-pipe/.debug" | ||
diff --git a/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch b/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch new file mode 100644 index 0000000000..2df5e61d21 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From debac5531f7107d239530ff6e29eeda72b9ec1e9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 29 Jun 2013 11:20:51 +0200 | ||
4 | Subject: [PATCH 2/4] pipe_loader_sw: include xlib_sw_winsys.h only when | ||
5 | HAVE_PIPE_LOADER_XLIB | ||
6 | |||
7 | * HAVE_WINSYS_XLIB was removed in | ||
8 | commit b3f1f665b0fef178ae193e6b111f14c9a5ad3b25 | ||
9 | Author: Matt Turner <mattst88@gmail.com> | ||
10 | Date: Sun Jan 20 15:32:08 2013 -0800 | ||
11 | build: Get rid of GALLIUM_WINSYS_DIRS | ||
12 | |||
13 | * HAVE_PIPE_LOADER_XLIB is set correctly: | ||
14 | if test "x$NEED_WINSYS_XLIB" = xyes; then | ||
15 | GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB" | ||
16 | GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la" | ||
17 | fi | ||
18 | |||
19 | * fixes build of pipe_loader_sw without libx11 headers available | ||
20 | |||
21 | Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=66357 | ||
22 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
23 | --- | ||
24 | src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 4 +++- | ||
25 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | ||
28 | index c2b78c6..0da3f4d 100644 | ||
29 | --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | ||
30 | +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | ||
31 | @@ -31,7 +31,9 @@ | ||
32 | #include "util/u_dl.h" | ||
33 | #include "sw/null/null_sw_winsys.h" | ||
34 | #include "target-helpers/inline_sw_helper.h" | ||
35 | +#ifdef HAVE_PIPE_LOADER_XLIB | ||
36 | #include "state_tracker/xlib_sw_winsys.h" | ||
37 | +#endif | ||
38 | |||
39 | struct pipe_loader_sw_device { | ||
40 | struct pipe_loader_device base; | ||
41 | @@ -44,7 +46,7 @@ struct pipe_loader_sw_device { | ||
42 | static struct pipe_loader_ops pipe_loader_sw_ops; | ||
43 | |||
44 | static struct sw_winsys *(*backends[])() = { | ||
45 | -#ifdef HAVE_WINSYS_XLIB | ||
46 | +#ifdef HAVE_PIPE_LOADER_XLIB | ||
47 | x11_sw_create, | ||
48 | #endif | ||
49 | null_sw_create | ||
50 | -- | ||
51 | 1.8.2.1 | ||
52 | |||
diff --git a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch new file mode 100644 index 0000000000..30a3d98758 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch | |||
@@ -0,0 +1,362 @@ | |||
1 | From 06c1ba29de8a26fffb73ee99f0fc54c704e9fee4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Stone <daniel@fooishbar.org> | ||
3 | Date: Fri, 24 May 2013 17:20:27 +0100 | ||
4 | Subject: [PATCH 3/5] EGL: Mutate NativeDisplayType depending on config | ||
5 | |||
6 | If we go through ./configure without enabling X11 anywhere, then set the | ||
7 | fallback types for EGL NativeDisplay and friends, rather than assuming | ||
8 | X11/Xlib. | ||
9 | |||
10 | Upstream-Status: Backport (slightly different solution was applied in master | ||
11 | https://bugs.freedesktop.org/show_bug.cgi?id=64959) | ||
12 | |||
13 | Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | --- | ||
16 | configure.ac | 9 +++ | ||
17 | include/EGL/eglplatform.h | 146 ------------------------------------------- | ||
18 | include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++ | ||
19 | 3 files changed, 155 insertions(+), 146 deletions(-) | ||
20 | delete mode 100644 include/EGL/eglplatform.h | ||
21 | create mode 100644 include/EGL/eglplatform.h.in | ||
22 | |||
23 | diff --git a/configure.ac b/configure.ac | ||
24 | index 2b4a374..d4c7a95 100644 | ||
25 | --- a/configure.ac | ||
26 | +++ b/configure.ac | ||
27 | @@ -1565,12 +1565,20 @@ fi | ||
28 | |||
29 | EGL_PLATFORMS="$egl_platforms" | ||
30 | |||
31 | +if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then | ||
32 | + MESA_EGL_NO_X11_HEADERS=0 | ||
33 | +else | ||
34 | + MESA_EGL_NO_X11_HEADERS=1 | ||
35 | +fi | ||
36 | + | ||
37 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) | ||
38 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) | ||
39 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1) | ||
40 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1) | ||
41 | AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1) | ||
42 | |||
43 | +AC_SUBST([MESA_EGL_NO_X11_HEADERS]) | ||
44 | + | ||
45 | AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") | ||
46 | AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") | ||
47 | |||
48 | @@ -2042,6 +2050,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" | ||
49 | |||
50 | dnl Substitute the config | ||
51 | AC_CONFIG_FILES([Makefile | ||
52 | + include/EGL/eglplatform.h | ||
53 | src/Makefile | ||
54 | src/egl/Makefile | ||
55 | src/egl/drivers/Makefile | ||
56 | diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h | ||
57 | deleted file mode 100644 | ||
58 | index 17fdc61..0000000 | ||
59 | --- a/include/EGL/eglplatform.h | ||
60 | +++ /dev/null | ||
61 | @@ -1,146 +0,0 @@ | ||
62 | -#ifndef __eglplatform_h_ | ||
63 | -#define __eglplatform_h_ | ||
64 | - | ||
65 | -/* | ||
66 | -** Copyright (c) 2007-2009 The Khronos Group Inc. | ||
67 | -** | ||
68 | -** Permission is hereby granted, free of charge, to any person obtaining a | ||
69 | -** copy of this software and/or associated documentation files (the | ||
70 | -** "Materials"), to deal in the Materials without restriction, including | ||
71 | -** without limitation the rights to use, copy, modify, merge, publish, | ||
72 | -** distribute, sublicense, and/or sell copies of the Materials, and to | ||
73 | -** permit persons to whom the Materials are furnished to do so, subject to | ||
74 | -** the following conditions: | ||
75 | -** | ||
76 | -** The above copyright notice and this permission notice shall be included | ||
77 | -** in all copies or substantial portions of the Materials. | ||
78 | -** | ||
79 | -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
80 | -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
81 | -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
82 | -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY | ||
83 | -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, | ||
84 | -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | ||
85 | -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. | ||
86 | -*/ | ||
87 | - | ||
88 | -/* Platform-specific types and definitions for egl.h | ||
89 | - * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ | ||
90 | - * | ||
91 | - * Adopters may modify khrplatform.h and this file to suit their platform. | ||
92 | - * You are encouraged to submit all modifications to the Khronos group so that | ||
93 | - * they can be included in future versions of this file. Please submit changes | ||
94 | - * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) | ||
95 | - * by filing a bug against product "EGL" component "Registry". | ||
96 | - */ | ||
97 | - | ||
98 | -#include <KHR/khrplatform.h> | ||
99 | - | ||
100 | -/* Macros used in EGL function prototype declarations. | ||
101 | - * | ||
102 | - * EGL functions should be prototyped as: | ||
103 | - * | ||
104 | - * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); | ||
105 | - * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); | ||
106 | - * | ||
107 | - * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h | ||
108 | - */ | ||
109 | - | ||
110 | -#ifndef EGLAPI | ||
111 | -#define EGLAPI KHRONOS_APICALL | ||
112 | -#endif | ||
113 | - | ||
114 | -#ifndef EGLAPIENTRY | ||
115 | -#define EGLAPIENTRY KHRONOS_APIENTRY | ||
116 | -#endif | ||
117 | -#define EGLAPIENTRYP EGLAPIENTRY* | ||
118 | - | ||
119 | -/* The types NativeDisplayType, NativeWindowType, and NativePixmapType | ||
120 | - * are aliases of window-system-dependent types, such as X Display * or | ||
121 | - * Windows Device Context. They must be defined in platform-specific | ||
122 | - * code below. The EGL-prefixed versions of Native*Type are the same | ||
123 | - * types, renamed in EGL 1.3 so all types in the API start with "EGL". | ||
124 | - * | ||
125 | - * Khronos STRONGLY RECOMMENDS that you use the default definitions | ||
126 | - * provided below, since these changes affect both binary and source | ||
127 | - * portability of applications using EGL running on different EGL | ||
128 | - * implementations. | ||
129 | - */ | ||
130 | - | ||
131 | -#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ | ||
132 | -#ifndef WIN32_LEAN_AND_MEAN | ||
133 | -#define WIN32_LEAN_AND_MEAN 1 | ||
134 | -#endif | ||
135 | -#include <windows.h> | ||
136 | - | ||
137 | -typedef HDC EGLNativeDisplayType; | ||
138 | -typedef HBITMAP EGLNativePixmapType; | ||
139 | -typedef HWND EGLNativeWindowType; | ||
140 | - | ||
141 | -#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ | ||
142 | - | ||
143 | -typedef int EGLNativeDisplayType; | ||
144 | -typedef void *EGLNativeWindowType; | ||
145 | -typedef void *EGLNativePixmapType; | ||
146 | - | ||
147 | -#elif defined(WL_EGL_PLATFORM) | ||
148 | - | ||
149 | -typedef struct wl_display *EGLNativeDisplayType; | ||
150 | -typedef struct wl_egl_pixmap *EGLNativePixmapType; | ||
151 | -typedef struct wl_egl_window *EGLNativeWindowType; | ||
152 | - | ||
153 | -#elif defined(__GBM__) | ||
154 | - | ||
155 | -typedef struct gbm_device *EGLNativeDisplayType; | ||
156 | -typedef struct gbm_bo *EGLNativePixmapType; | ||
157 | -typedef void *EGLNativeWindowType; | ||
158 | - | ||
159 | -#elif defined(ANDROID) /* Android */ | ||
160 | - | ||
161 | -struct ANativeWindow; | ||
162 | -struct egl_native_pixmap_t; | ||
163 | - | ||
164 | -typedef struct ANativeWindow *EGLNativeWindowType; | ||
165 | -typedef struct egl_native_pixmap_t *EGLNativePixmapType; | ||
166 | -typedef void *EGLNativeDisplayType; | ||
167 | - | ||
168 | -#elif defined(__unix__) | ||
169 | - | ||
170 | -#ifdef MESA_EGL_NO_X11_HEADERS | ||
171 | - | ||
172 | -typedef void *EGLNativeDisplayType; | ||
173 | -typedef khronos_uint32_t EGLNativePixmapType; | ||
174 | -typedef khronos_uint32_t EGLNativeWindowType; | ||
175 | - | ||
176 | -#else | ||
177 | - | ||
178 | -/* X11 (tentative) */ | ||
179 | -#include <X11/Xlib.h> | ||
180 | -#include <X11/Xutil.h> | ||
181 | - | ||
182 | -typedef Display *EGLNativeDisplayType; | ||
183 | -typedef Pixmap EGLNativePixmapType; | ||
184 | -typedef Window EGLNativeWindowType; | ||
185 | - | ||
186 | -#endif /* MESA_EGL_NO_X11_HEADERS */ | ||
187 | - | ||
188 | -#else | ||
189 | -#error "Platform not recognized" | ||
190 | -#endif | ||
191 | - | ||
192 | -/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ | ||
193 | -typedef EGLNativeDisplayType NativeDisplayType; | ||
194 | -typedef EGLNativePixmapType NativePixmapType; | ||
195 | -typedef EGLNativeWindowType NativeWindowType; | ||
196 | - | ||
197 | - | ||
198 | -/* Define EGLint. This must be a signed integral type large enough to contain | ||
199 | - * all legal attribute names and values passed into and out of EGL, whether | ||
200 | - * their type is boolean, bitmask, enumerant (symbolic constant), integer, | ||
201 | - * handle, or other. While in general a 32-bit integer will suffice, if | ||
202 | - * handles are 64 bit types, then EGLint should be defined as a signed 64-bit | ||
203 | - * integer type. | ||
204 | - */ | ||
205 | -typedef khronos_int32_t EGLint; | ||
206 | - | ||
207 | -#endif /* __eglplatform_h */ | ||
208 | diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in | ||
209 | new file mode 100644 | ||
210 | index 0000000..5126c92 | ||
211 | --- /dev/null | ||
212 | +++ b/include/EGL/eglplatform.h.in | ||
213 | @@ -0,0 +1,146 @@ | ||
214 | +#ifndef __eglplatform_h_ | ||
215 | +#define __eglplatform_h_ | ||
216 | + | ||
217 | +/* | ||
218 | +** Copyright (c) 2007-2009 The Khronos Group Inc. | ||
219 | +** | ||
220 | +** Permission is hereby granted, free of charge, to any person obtaining a | ||
221 | +** copy of this software and/or associated documentation files (the | ||
222 | +** "Materials"), to deal in the Materials without restriction, including | ||
223 | +** without limitation the rights to use, copy, modify, merge, publish, | ||
224 | +** distribute, sublicense, and/or sell copies of the Materials, and to | ||
225 | +** permit persons to whom the Materials are furnished to do so, subject to | ||
226 | +** the following conditions: | ||
227 | +** | ||
228 | +** The above copyright notice and this permission notice shall be included | ||
229 | +** in all copies or substantial portions of the Materials. | ||
230 | +** | ||
231 | +** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
232 | +** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
233 | +** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
234 | +** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY | ||
235 | +** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, | ||
236 | +** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | ||
237 | +** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. | ||
238 | +*/ | ||
239 | + | ||
240 | +/* Platform-specific types and definitions for egl.h | ||
241 | + * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ | ||
242 | + * | ||
243 | + * Adopters may modify khrplatform.h and this file to suit their platform. | ||
244 | + * You are encouraged to submit all modifications to the Khronos group so that | ||
245 | + * they can be included in future versions of this file. Please submit changes | ||
246 | + * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) | ||
247 | + * by filing a bug against product "EGL" component "Registry". | ||
248 | + */ | ||
249 | + | ||
250 | +#include <KHR/khrplatform.h> | ||
251 | + | ||
252 | +/* Macros used in EGL function prototype declarations. | ||
253 | + * | ||
254 | + * EGL functions should be prototyped as: | ||
255 | + * | ||
256 | + * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); | ||
257 | + * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); | ||
258 | + * | ||
259 | + * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h | ||
260 | + */ | ||
261 | + | ||
262 | +#ifndef EGLAPI | ||
263 | +#define EGLAPI KHRONOS_APICALL | ||
264 | +#endif | ||
265 | + | ||
266 | +#ifndef EGLAPIENTRY | ||
267 | +#define EGLAPIENTRY KHRONOS_APIENTRY | ||
268 | +#endif | ||
269 | +#define EGLAPIENTRYP EGLAPIENTRY* | ||
270 | + | ||
271 | +/* The types NativeDisplayType, NativeWindowType, and NativePixmapType | ||
272 | + * are aliases of window-system-dependent types, such as X Display * or | ||
273 | + * Windows Device Context. They must be defined in platform-specific | ||
274 | + * code below. The EGL-prefixed versions of Native*Type are the same | ||
275 | + * types, renamed in EGL 1.3 so all types in the API start with "EGL". | ||
276 | + * | ||
277 | + * Khronos STRONGLY RECOMMENDS that you use the default definitions | ||
278 | + * provided below, since these changes affect both binary and source | ||
279 | + * portability of applications using EGL running on different EGL | ||
280 | + * implementations. | ||
281 | + */ | ||
282 | + | ||
283 | +#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ | ||
284 | +#ifndef WIN32_LEAN_AND_MEAN | ||
285 | +#define WIN32_LEAN_AND_MEAN 1 | ||
286 | +#endif | ||
287 | +#include <windows.h> | ||
288 | + | ||
289 | +typedef HDC EGLNativeDisplayType; | ||
290 | +typedef HBITMAP EGLNativePixmapType; | ||
291 | +typedef HWND EGLNativeWindowType; | ||
292 | + | ||
293 | +#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ | ||
294 | + | ||
295 | +typedef int EGLNativeDisplayType; | ||
296 | +typedef void *EGLNativeWindowType; | ||
297 | +typedef void *EGLNativePixmapType; | ||
298 | + | ||
299 | +#elif defined(WL_EGL_PLATFORM) | ||
300 | + | ||
301 | +typedef struct wl_display *EGLNativeDisplayType; | ||
302 | +typedef struct wl_egl_pixmap *EGLNativePixmapType; | ||
303 | +typedef struct wl_egl_window *EGLNativeWindowType; | ||
304 | + | ||
305 | +#elif defined(__GBM__) | ||
306 | + | ||
307 | +typedef struct gbm_device *EGLNativeDisplayType; | ||
308 | +typedef struct gbm_bo *EGLNativePixmapType; | ||
309 | +typedef void *EGLNativeWindowType; | ||
310 | + | ||
311 | +#elif defined(ANDROID) /* Android */ | ||
312 | + | ||
313 | +struct ANativeWindow; | ||
314 | +struct egl_native_pixmap_t; | ||
315 | + | ||
316 | +typedef struct ANativeWindow *EGLNativeWindowType; | ||
317 | +typedef struct egl_native_pixmap_t *EGLNativePixmapType; | ||
318 | +typedef void *EGLNativeDisplayType; | ||
319 | + | ||
320 | +#elif defined(__unix__) | ||
321 | + | ||
322 | +#if @MESA_EGL_NO_X11_HEADERS@ | ||
323 | + | ||
324 | +typedef void *EGLNativeDisplayType; | ||
325 | +typedef khronos_uint32_t EGLNativePixmapType; | ||
326 | +typedef khronos_uint32_t EGLNativeWindowType; | ||
327 | + | ||
328 | +#else | ||
329 | + | ||
330 | +/* X11 (tentative) */ | ||
331 | +#include <X11/Xlib.h> | ||
332 | +#include <X11/Xutil.h> | ||
333 | + | ||
334 | +typedef Display *EGLNativeDisplayType; | ||
335 | +typedef Pixmap EGLNativePixmapType; | ||
336 | +typedef Window EGLNativeWindowType; | ||
337 | + | ||
338 | +#endif /* MESA_EGL_NO_X11_HEADERS */ | ||
339 | + | ||
340 | +#else | ||
341 | +#error "Platform not recognized" | ||
342 | +#endif | ||
343 | + | ||
344 | +/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ | ||
345 | +typedef EGLNativeDisplayType NativeDisplayType; | ||
346 | +typedef EGLNativePixmapType NativePixmapType; | ||
347 | +typedef EGLNativeWindowType NativeWindowType; | ||
348 | + | ||
349 | + | ||
350 | +/* Define EGLint. This must be a signed integral type large enough to contain | ||
351 | + * all legal attribute names and values passed into and out of EGL, whether | ||
352 | + * their type is boolean, bitmask, enumerant (symbolic constant), integer, | ||
353 | + * handle, or other. While in general a 32-bit integer will suffice, if | ||
354 | + * handles are 64 bit types, then EGLint should be defined as a signed 64-bit | ||
355 | + * integer type. | ||
356 | + */ | ||
357 | +typedef khronos_int32_t EGLint; | ||
358 | + | ||
359 | +#endif /* __eglplatform_h */ | ||
360 | -- | ||
361 | 1.8.2.1 | ||
362 | |||
diff --git a/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch b/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch new file mode 100644 index 0000000000..88a4fb0636 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Fix out of tree compilation failure due to | ||
2 | 0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch. | ||
3 | |||
4 | Upstream-Status: Inappropriate (upstream has different solution to root problem) | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am | ||
8 | index 45f7dfa..ed0e777 100644 | ||
9 | --- a/src/egl/drivers/dri2/Makefile.am | ||
10 | +++ b/src/egl/drivers/dri2/Makefile.am | ||
11 | @@ -21,6 +21,7 @@ | ||
12 | |||
13 | AM_CFLAGS = \ | ||
14 | -I$(top_srcdir)/include \ | ||
15 | + -I$(top_builddir)/include \ | ||
16 | -I$(top_srcdir)/src/egl/main \ | ||
17 | -I$(top_srcdir)/src/gbm/main \ | ||
18 | -I$(top_srcdir)/src/gbm/backends/dri \ | ||
19 | diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am | ||
20 | index 6bf67ea..7b87047 100644 | ||
21 | --- a/src/egl/drivers/glx/Makefile.am | ||
22 | +++ b/src/egl/drivers/glx/Makefile.am | ||
23 | @@ -21,6 +21,7 @@ | ||
24 | |||
25 | AM_CFLAGS = \ | ||
26 | -I$(top_srcdir)/include \ | ||
27 | + -I$(top_builddir)/include \ | ||
28 | -I$(top_srcdir)/src/egl/main \ | ||
29 | $(X11_CFLAGS) \ | ||
30 | $(DEFINES) | ||
31 | diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am | ||
32 | index ca5257a..13a5734 100644 | ||
33 | --- a/src/egl/main/Makefile.am | ||
34 | +++ b/src/egl/main/Makefile.am | ||
35 | @@ -27,6 +27,7 @@ endif | ||
36 | |||
37 | AM_CFLAGS = \ | ||
38 | -I$(top_srcdir)/include \ | ||
39 | + -I$(top_builddir)/include \ | ||
40 | -I$(top_srcdir)/src/gbm/main \ | ||
41 | $(DEFINES) \ | ||
42 | $(EGL_CFLAGS) \ | ||
43 | @@ -135,4 +136,4 @@ egl_HEADERS = \ | ||
44 | $(top_srcdir)/include/EGL/eglext.h \ | ||
45 | $(top_srcdir)/include/EGL/egl.h \ | ||
46 | $(top_srcdir)/include/EGL/eglmesaext.h \ | ||
47 | - $(top_srcdir)/include/EGL/eglplatform.h | ||
48 | + $(top_builddir)/include/EGL/eglplatform.h | ||
diff --git a/meta/recipes-graphics/mesa/mesa_10.1.3.bb b/meta/recipes-graphics/mesa/mesa_10.1.3.bb new file mode 100644 index 0000000000..abc450a9c5 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_10.1.3.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ | ||
4 | file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ | ||
5 | file://0006-fix-out-of-tree-egl.patch \ | ||
6 | " | ||
7 | |||
8 | SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad" | ||
9 | SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3" | ||
10 | |||
11 | S = "${WORKDIR}/Mesa-${PV}" | ||
12 | |||
13 | #because we cannot rely on the fact that all apps will use pkgconfig, | ||
14 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER | ||
15 | do_install_append() { | ||
16 | if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then | ||
17 | sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h | ||
18 | fi | ||
19 | } | ||
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb new file mode 100644 index 0000000000..cda310a525 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_git.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | DEFAULT_PREFERENCE = "-1" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" | ||
6 | |||
7 | SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a" | ||
8 | PV = "10.1.3+git${SRCPV}" | ||
9 | |||
10 | SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.1 \ | ||
11 | file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ | ||
12 | file://0006-fix-out-of-tree-egl.patch \ | ||
13 | " | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | #because we cannot rely on the fact that all apps will use pkgconfig, | ||
18 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER | ||
19 | do_install_append() { | ||
20 | if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then | ||
21 | sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h | ||
22 | fi | ||
23 | } | ||
diff --git a/meta/recipes-graphics/mini-x-session/files/mini-x-session b/meta/recipes-graphics/mini-x-session/files/mini-x-session new file mode 100644 index 0000000000..dca655a913 --- /dev/null +++ b/meta/recipes-graphics/mini-x-session/files/mini-x-session | |||
@@ -0,0 +1,39 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Very simple session manager for Mini X | ||
4 | # | ||
5 | |||
6 | # Uncomment below to enable parsing of debian menu entrys | ||
7 | # export MB_USE_DEB_MENUS=1 | ||
8 | |||
9 | if [ -e $HOME/.mini_x/session ] | ||
10 | then | ||
11 | exec $HOME/.mini_x/session | ||
12 | fi | ||
13 | |||
14 | if [ -e /etc/mini_x/session ] | ||
15 | then | ||
16 | exec /etc/mini_x/session | ||
17 | fi | ||
18 | |||
19 | MINI_X_SESSION_DIR=/etc/mini_x/session.d | ||
20 | if [ -d "$MINI_X_SESSION_DIR" ]; then | ||
21 | # Execute session file on behalf of file owner | ||
22 | find $MINI_X_SESSION_DIR -type f | while read SESSIONFILE; do | ||
23 | set +e | ||
24 | USERNAME=`stat -c %U $SESSIONFILE` | ||
25 | # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] | ||
26 | # su -l -c '$SESSIONFILE&' $USERNAME | ||
27 | sudo -b -i -u $USERNAME $SESSIONFILE& | ||
28 | set -e | ||
29 | done | ||
30 | fi | ||
31 | |||
32 | # This resolution is big enough for hob2's max window size. | ||
33 | xrandr -s 1024x768 | ||
34 | |||
35 | # Default files to run if $HOME/.mini_x/session or /etc/mini_x/session | ||
36 | # dont exist. | ||
37 | |||
38 | matchbox-terminal& | ||
39 | exec matchbox-window-manager | ||
diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb new file mode 100644 index 0000000000..4e89d631c3 --- /dev/null +++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "Very simple session manager for X" | ||
2 | HOMEPAGE = "http://www.yoctoproject.org" | ||
3 | BUGTRACKER = "http://bugzilla.pokylinux.org" | ||
4 | |||
5 | PR = "r4" | ||
6 | |||
7 | LICENSE = "GPLv2" | ||
8 | LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487" | ||
9 | |||
10 | SECTION = "x11" | ||
11 | RCONFLICTS_${PN} = "matchbox-common" | ||
12 | |||
13 | SRC_URI = "file://mini-x-session" | ||
14 | S = "${WORKDIR}" | ||
15 | |||
16 | RDEPENDS_${PN} = "sudo" | ||
17 | |||
18 | inherit update-alternatives | ||
19 | |||
20 | ALTERNATIVE_${PN} = "x-session-manager" | ||
21 | ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/mini-x-session" | ||
22 | ALTERNATIVE_PRIORITY = "50" | ||
23 | |||
24 | do_install() { | ||
25 | install -d ${D}/${bindir} | ||
26 | install -m 0755 ${S}/mini-x-session ${D}/${bindir} | ||
27 | } | ||
diff --git a/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch new file mode 100644 index 0000000000..3c8a832021 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | Fix build for S != B | ||
2 | |||
3 | This patch is specific to version 1.4.x | ||
4 | Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81 | ||
5 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
6 | -- | ||
7 | Index: git/docs/reference/libmx-gtk/Makefile.am | ||
8 | =================================================================== | ||
9 | --- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 | ||
10 | +++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 | ||
11 | @@ -1,3 +1,6 @@ | ||
12 | +EXTRA_DIST= | ||
13 | +CLEANFILES= | ||
14 | + | ||
15 | ## Process this file with automake to produce Makefile.in | ||
16 | |||
17 | # We require automake 1.6 at least. | ||
18 | @@ -77,7 +80,7 @@ | ||
19 | GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la | ||
20 | |||
21 | # This includes the standard gtk-doc make rules, copied by gtkdocize. | ||
22 | -include $(top_srcdir)/gtk-doc.make | ||
23 | +include $(top_builddir)/gtk-doc.make | ||
24 | |||
25 | # Other files to distribute | ||
26 | EXTRA_DIST += version.xml.in | ||
27 | Index: git/docs/reference/libmx/Makefile.am | ||
28 | =================================================================== | ||
29 | --- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 | ||
30 | +++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 | ||
31 | @@ -1,3 +1,6 @@ | ||
32 | +EXTRA_DIST= | ||
33 | +CLEANFILES= | ||
34 | + | ||
35 | ## Process this file with automake to produce Makefile.in | ||
36 | |||
37 | # We require automake 1.6 at least. | ||
38 | @@ -106,7 +109,7 @@ | ||
39 | GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la | ||
40 | |||
41 | # This includes the standard gtk-doc make rules, copied by gtkdocize. | ||
42 | -include $(top_srcdir)/gtk-doc.make | ||
43 | +include $(top_builddir)/gtk-doc.make | ||
44 | |||
45 | # Other files to distribute | ||
46 | EXTRA_DIST += version.xml.in | ||
diff --git a/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch b/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch new file mode 100644 index 0000000000..82c93dd604 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Fix missing include directory when building tests | ||
2 | |||
3 | This patch is currently required for all versions of mx | ||
4 | Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/82 | ||
5 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
6 | -- | ||
7 | Index: git/tests/Makefile.am | ||
8 | =================================================================== | ||
9 | --- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 | ||
10 | +++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 | ||
11 | @@ -10,7 +10,8 @@ | ||
12 | |||
13 | INCLUDES = \ | ||
14 | -I$(top_srcdir) \ | ||
15 | - -I$(top_builddir) | ||
16 | + -I$(top_builddir)\ | ||
17 | + -I$(top_builddir)/mx | ||
18 | |||
19 | noinst_PROGRAMS = \ | ||
20 | test-deform-texture \ | ||
diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb new file mode 100644 index 0000000000..ce35b61eb1 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require mx.inc | ||
2 | |||
3 | # The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix | ||
4 | SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" | ||
5 | PV = "1.4.7+git${SRCPV}" | ||
6 | |||
7 | SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ | ||
8 | file://fix-build-dir.patch \ | ||
9 | file://fix-test-includes.patch \ | ||
10 | " | ||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ | ||
14 | file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879" | ||
diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc new file mode 100644 index 0000000000..ee7f18623c --- /dev/null +++ b/meta/recipes-graphics/mx/mx.inc | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "Clutter based UI widget library" | ||
2 | LICENSE = "LGPLv2.1" | ||
3 | |||
4 | inherit clutter autotools-brokensep | ||
5 | |||
6 | DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" | ||
7 | |||
8 | SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" | ||
9 | |||
10 | EXTRA_OECONF = "--disable-introspection \ | ||
11 | --disable-gtk-doc \ | ||
12 | --disable-gtk-widgets \ | ||
13 | --with-dbus \ | ||
14 | --with-winsys=none \ | ||
15 | --without-clutter-imcontext \ | ||
16 | --without-clutter-gesture \ | ||
17 | --without-startup-notification \ | ||
18 | --without-glade \ | ||
19 | " | ||
20 | |||
21 | FILES_${PN} += "${datadir}" | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb new file mode 100644 index 0000000000..7540821c4e --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | # | ||
2 | # Copyright (C) 2007 OpenedHand Ltd. | ||
3 | # | ||
4 | |||
5 | SUMMARY = "Clutter package groups" | ||
6 | LICENSE = "MIT" | ||
7 | |||
8 | PR = "r6" | ||
9 | |||
10 | inherit packagegroup | ||
11 | |||
12 | PACKAGES = "\ | ||
13 | ${PN}-core \ | ||
14 | " | ||
15 | |||
16 | SUMMARY_${PN}-core = "Clutter graphics library" | ||
17 | RDEPENDS_${PN}-core = "\ | ||
18 | clutter-1.0 \ | ||
19 | clutter-gst-1.0 \ | ||
20 | clutter-gtk-1.0 \ | ||
21 | " | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb new file mode 100644 index 0000000000..53dc0ae19e --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "DirectFB without X11" | ||
2 | LICENSE = "MIT" | ||
3 | |||
4 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
5 | |||
6 | inherit packagegroup | ||
7 | |||
8 | TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' | ||
9 | |||
10 | RDEPENDS_${PN} = " \ | ||
11 | directfb \ | ||
12 | directfb-examples \ | ||
13 | pango \ | ||
14 | pango-modules \ | ||
15 | fontconfig \ | ||
16 | ${TOUCH} \ | ||
17 | " | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb new file mode 100644 index 0000000000..2eff3713bc --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "Basic X11 session" | ||
2 | DESCRIPTION = "Packages required to set up a basic working X11 session" | ||
3 | LICENSE = "MIT" | ||
4 | PR = "r1" | ||
5 | |||
6 | inherit packagegroup | ||
7 | |||
8 | RDEPENDS_${PN} = "\ | ||
9 | packagegroup-core-x11-xserver \ | ||
10 | packagegroup-core-x11-utils \ | ||
11 | dbus \ | ||
12 | pointercal \ | ||
13 | matchbox-terminal \ | ||
14 | matchbox-wm \ | ||
15 | mini-x-session \ | ||
16 | liberation-fonts \ | ||
17 | " | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb new file mode 100644 index 0000000000..2d68e97383 --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | # | ||
2 | # Copyright (C) 2011 Intel Corporation | ||
3 | # | ||
4 | |||
5 | SUMMARY = "X11 display server" | ||
6 | LICENSE = "MIT" | ||
7 | PR = "r40" | ||
8 | |||
9 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
10 | |||
11 | inherit packagegroup | ||
12 | |||
13 | XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" | ||
14 | XSERVERCODECS ?= "" | ||
15 | |||
16 | RDEPENDS_${PN} = "\ | ||
17 | ${XSERVER} \ | ||
18 | ${XSERVERCODECS} \ | ||
19 | " | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb new file mode 100644 index 0000000000..fde5144b46 --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | |||
@@ -0,0 +1,32 @@ | |||
1 | # | ||
2 | # Copyright (C) 2011 Intel Corporation | ||
3 | # | ||
4 | |||
5 | LICENSE = "MIT" | ||
6 | PR = "r40" | ||
7 | |||
8 | inherit packagegroup | ||
9 | |||
10 | PACKAGES = "${PN} ${PN}-utils" | ||
11 | |||
12 | # xserver-common, x11-common | ||
13 | VIRTUAL-RUNTIME_xserver_common ?= "x11-common" | ||
14 | |||
15 | # elsa, xserver-nodm-init | ||
16 | VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" | ||
17 | |||
18 | SUMMARY = "X11 display server and basic utilities" | ||
19 | RDEPENDS_${PN} = "\ | ||
20 | ${PN}-xserver \ | ||
21 | ${PN}-utils \ | ||
22 | " | ||
23 | |||
24 | SUMMARY_${PN}-utils = "X11 basic utilities and init" | ||
25 | RDEPENDS_${PN}-utils = "\ | ||
26 | ${VIRTUAL-RUNTIME_xserver_common} \ | ||
27 | ${VIRTUAL-RUNTIME_graphical_init_manager} \ | ||
28 | xauth \ | ||
29 | xhost \ | ||
30 | xset \ | ||
31 | xrandr \ | ||
32 | " | ||
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc new file mode 100644 index 0000000000..b59d33d14f --- /dev/null +++ b/meta/recipes-graphics/pango/pango.inc | |||
@@ -0,0 +1,97 @@ | |||
1 | SUMMARY = "Framework for layout and rendering of internationalized text" | ||
2 | DESCRIPTION = "Pango is a library for laying out and rendering of text, \ | ||
3 | with an emphasis on internationalization. Pango can be used anywhere \ | ||
4 | that text layout is needed, though most of the work on Pango so far has \ | ||
5 | been done in the context of the GTK+ widget toolkit. Pango forms the \ | ||
6 | core of text and font handling for GTK+-2.x." | ||
7 | HOMEPAGE = "http://www.pango.org/" | ||
8 | BUGTRACKER = "http://bugzilla.gnome.org" | ||
9 | SECTION = "libs" | ||
10 | LICENSE = "LGPLv2.0+" | ||
11 | |||
12 | X11DEPENDS = "virtual/libx11 libxft" | ||
13 | DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native" | ||
14 | |||
15 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
16 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ptest', '', d)}" | ||
17 | |||
18 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" | ||
19 | PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-2.0-native" | ||
20 | |||
21 | BBCLASSEXTEND = "native" | ||
22 | DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" | ||
23 | |||
24 | PACKAGES_DYNAMIC += "^pango-module-.*" | ||
25 | |||
26 | RRECOMMENDS_${PN} = "pango-module-basic-fc" | ||
27 | |||
28 | inherit gnomebase gtk-doc qemu ptest | ||
29 | |||
30 | # Create a pango-modules package | ||
31 | ALLOW_EMPTY_${BPN}-modules = "1" | ||
32 | PACKAGES += "${BPN}-modules" | ||
33 | RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}" | ||
34 | |||
35 | |||
36 | EXTRA_AUTORECONF = "" | ||
37 | |||
38 | # seems to go wrong with default cflags | ||
39 | FULL_OPTIMIZATION_arm = "-O2" | ||
40 | |||
41 | EXTRA_OECONF = "--disable-introspection \ | ||
42 | --enable-explicit-deps=no \ | ||
43 | --disable-debug \ | ||
44 | --with-mlprefix=${MLPREFIX}" | ||
45 | |||
46 | LEAD_SONAME = "libpango-1.0*" | ||
47 | LIBV = "1.8.0" | ||
48 | |||
49 | postinst_prologue() { | ||
50 | if ! [ -e $D${sysconfdir}/pango ] ; then | ||
51 | mkdir -p $D${sysconfdir}/pango | ||
52 | fi | ||
53 | |||
54 | if [ "x$D" != "x" ]; then | ||
55 | ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ | ||
56 | $D${libdir}/pango/${LIBV}/modules/*.so \ | ||
57 | > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null | ||
58 | |||
59 | [ $? -ne 0 ] && exit 1 | ||
60 | |||
61 | sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules | ||
62 | |||
63 | exit 0 | ||
64 | fi | ||
65 | } | ||
66 | |||
67 | # This binary needs to be compiled for the host architecture. This isn't pretty! | ||
68 | do_compile_prepend () { | ||
69 | if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then | ||
70 | make CC="${BUILD_CC}" CFLAGS="" 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 | ||
71 | fi | ||
72 | } | ||
73 | |||
74 | do_install_append () { | ||
75 | if [ "${MLPREFIX}" != "" ]; then | ||
76 | mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules | ||
77 | fi | ||
78 | } | ||
79 | |||
80 | |||
81 | python populate_packages_prepend () { | ||
82 | prologue = d.getVar("postinst_prologue", True) | ||
83 | |||
84 | modules_root = d.expand('${libdir}/pango/${LIBV}/modules') | ||
85 | |||
86 | do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules') | ||
87 | } | ||
88 | |||
89 | FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" | ||
90 | FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" | ||
91 | FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" | ||
92 | |||
93 | FILES_${PN}-ptest += "${libexecdir}/installed-tests/* \ | ||
94 | ${datadir}/installed-tests/pango" | ||
95 | FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug" | ||
96 | |||
97 | RDEPENDS_${PN}-ptest += "gnome-desktop-testing liberation-fonts" | ||
diff --git a/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch new file mode 100644 index 0000000000..ad414ddf36 --- /dev/null +++ b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch | |||
@@ -0,0 +1,75 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Updated to apply to pango-1.32.5 | ||
4 | |||
5 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
6 | diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac | ||
7 | --- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200 | ||
8 | +++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200 | ||
9 | @@ -213,6 +213,11 @@ | ||
10 | |||
11 | AC_SUBST(PANGO_DEBUG_FLAGS) | ||
12 | |||
13 | +AC_ARG_WITH(mlprefix, | ||
14 | + AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]), | ||
15 | + mlprefix_str=$withval, mlprefix_str="") | ||
16 | +AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.]) | ||
17 | + | ||
18 | AC_ARG_ENABLE(rebuilds, | ||
19 | [AC_HELP_STRING([--disable-rebuilds], | ||
20 | [disable all source autogeneration rules])],, | ||
21 | diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c | ||
22 | --- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200 | ||
23 | +++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200 | ||
24 | @@ -555,11 +555,11 @@ | ||
25 | files = g_new (char *, 3); | ||
26 | |||
27 | files[0] = g_build_filename (pango_get_sysconf_subdirectory (), | ||
28 | - "pango.modules", | ||
29 | + MLPREFIX "pango.modules", | ||
30 | NULL); | ||
31 | files[1] = g_build_filename (pango_get_lib_subdirectory (), | ||
32 | MODULE_VERSION, | ||
33 | - "modules.cache", | ||
34 | + MLPREFIX "modules.cache", | ||
35 | NULL); | ||
36 | files[2] = NULL; | ||
37 | } | ||
38 | @@ -674,7 +674,8 @@ | ||
39 | if (!no_module_warning) | ||
40 | { | ||
41 | gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), | ||
42 | - "pango.modules", | ||
43 | +/* For multilib case, keep multiple config file for different libs */ | ||
44 | + MLPREFIX "pango.modules", | ||
45 | NULL); | ||
46 | g_critical ("No modules found:\n" | ||
47 | "No builtin or dynamically loaded modules were found.\n" | ||
48 | diff -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej | ||
49 | --- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200 | ||
50 | +++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200 | ||
51 | @@ -0,0 +1,12 @@ | ||
52 | +--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800 | ||
53 | ++++ pango/modules.c 2012-05-08 21:21:02.000000000 +0800 | ||
54 | +@@ -529,7 +529,8 @@ | ||
55 | + | ||
56 | + if (!file_str) | ||
57 | + file_str = g_build_filename (pango_get_sysconf_subdirectory (), | ||
58 | +- "pango.modules", | ||
59 | ++/* For multilib case, keep multiple config file for different libs */ | ||
60 | ++ MLPREFIX "pango.modules", | ||
61 | + NULL); | ||
62 | + | ||
63 | + files = pango_split_file_list (file_str); | ||
64 | diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c | ||
65 | --- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300 | ||
66 | +++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200 | ||
67 | @@ -304,7 +304,7 @@ | ||
68 | |||
69 | cache_file = g_build_filename (pango_get_lib_subdirectory (), | ||
70 | MODULE_VERSION, | ||
71 | - "modules.cache", | ||
72 | + MLPREFIX "modules.cache", | ||
73 | NULL); | ||
74 | err = NULL; | ||
75 | if (!g_file_set_contents (cache_file, contents->str, -1, &err)) | ||
diff --git a/meta/recipes-graphics/pango/pango/run-ptest b/meta/recipes-graphics/pango/pango/run-ptest new file mode 100644 index 0000000000..fa87a75779 --- /dev/null +++ b/meta/recipes-graphics/pango/pango/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | gnome-desktop-testing-runner pango | ||
diff --git a/meta/recipes-graphics/pango/pango_1.36.6.bb b/meta/recipes-graphics/pango/pango_1.36.6.bb new file mode 100644 index 0000000000..61ae359e93 --- /dev/null +++ b/meta/recipes-graphics/pango/pango_1.36.6.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require pango.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
4 | |||
5 | GNOME_COMPRESS_TYPE="xz" | ||
6 | |||
7 | SRC_URI += "file://run-ptest \ | ||
8 | file://multilib-fix-clean.patch \ | ||
9 | " | ||
10 | |||
11 | SRC_URI[archive.md5sum] = "1c27523c3f3a4efe4d9d303d0d240320" | ||
12 | SRC_URI[archive.sha256sum] = "4c53c752823723875078b91340f32136aadb99e91c0f6483f024f978a02c8624" \ No newline at end of file | ||
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb new file mode 100644 index 0000000000..f468120f80 --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit_git.bb | |||
@@ -0,0 +1,51 @@ | |||
1 | SUMMARY = "OpenGL driver testing framework" | ||
2 | LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" | ||
4 | |||
5 | SRC_URI = "git://anongit.freedesktop.org/piglit" | ||
6 | |||
7 | # From 2012/12/30. | ||
8 | SRCREV = "bbeff5d21b06d37338ad28e42d88f499bef13268" | ||
9 | # (when PV goes above 1.0 remove the trailing r) | ||
10 | PV = "1.0+gitr${SRCPV}" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native" | ||
15 | |||
16 | inherit cmake pythonnative | ||
17 | |||
18 | # As piglit doesn't install, enforce in-tree builds so that we can easily copy | ||
19 | # contents out of $S and $B. | ||
20 | B="${S}" | ||
21 | |||
22 | # CMake sets the rpath at build time with the source tree, and will reset it at | ||
23 | # install time. As we don't install this doesn't happen, so force the rpath to | ||
24 | # what we need. | ||
25 | EXTRA_OECMAKE = "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_RPATH=${libdir}/piglit/lib" | ||
26 | |||
27 | do_install() { | ||
28 | install -d ${D}${bindir} | ||
29 | install -m 0755 piglit-*.py ${D}${bindir} | ||
30 | |||
31 | install -d ${D}${libdir}/piglit/ | ||
32 | |||
33 | install -d ${D}${libdir}/piglit/bin | ||
34 | install -m 755 ${S}/bin/* ${D}${libdir}/piglit/bin | ||
35 | |||
36 | cp -Pr lib/ ${D}${libdir}/piglit/ | ||
37 | cp -Pr framework/ ${D}${libdir}/piglit/ | ||
38 | cp -Pr generated_tests/ ${D}${libdir}/piglit/ | ||
39 | cp -Pr tests/ ${D}${libdir}/piglit/ | ||
40 | cp -Pr templates/ ${D}${libdir}/piglit/ | ||
41 | |||
42 | sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|' ${D}${bindir}/piglit-*.py | ||
43 | sed -i -e 's|^templatedir = .*$|templatedir = "${libdir}/piglit/templates"|' ${D}${bindir}/piglit-summary-html.py | ||
44 | } | ||
45 | |||
46 | FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/" | ||
47 | |||
48 | RDEPENDS_${PN} = "python waffle python-json python-subprocess \ | ||
49 | python-multiprocessing python-textutils python-netserver python-shell \ | ||
50 | mesa-demos bash \ | ||
51 | " | ||
diff --git a/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c b/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c new file mode 100644 index 0000000000..41cebc58a7 --- /dev/null +++ b/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c | |||
@@ -0,0 +1,410 @@ | |||
1 | /* | ||
2 | * Pong Clock - A clock that plays pong. | ||
3 | * See http://mocoloco.com/archives/001766.php for the inspiration. | ||
4 | * | ||
5 | * Copyright (C) 2005 Matthew Allum | ||
6 | * | ||
7 | * Author: Matthew Allum mallum@openedhand.com | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License as published by | ||
11 | * the Free Software Foundation; either version 2 of the License, or | ||
12 | * (at your option) any later version. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License | ||
20 | * along with this program; if not, write to the Free Software | ||
21 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #include <stdlib.h> | ||
26 | #include <time.h> | ||
27 | #include <sys/time.h> | ||
28 | #include <sys/types.h> | ||
29 | #include <string.h> | ||
30 | #include <stdio.h> | ||
31 | #include <unistd.h> | ||
32 | #include <signal.h> | ||
33 | |||
34 | #include <X11/Xlib.h> | ||
35 | #include <X11/Xutil.h> | ||
36 | #include <X11/Xatom.h> | ||
37 | |||
38 | /* Tweak values for different hw setups */ | ||
39 | |||
40 | #define FPS 50 | ||
41 | #define RESX 40 | ||
42 | #define RESY 40 | ||
43 | #define TO_MISS_SECS 55 | ||
44 | #define BALLDX 16 | ||
45 | #define BALLDY 4 | ||
46 | |||
47 | |||
48 | typedef struct PongClock | ||
49 | { | ||
50 | Display *xdpy; | ||
51 | int xscreen; | ||
52 | Window xwin, xwin_root; | ||
53 | Pixmap backbuffer; | ||
54 | GC xgc; | ||
55 | int xwin_width, xwin_height; | ||
56 | int pixelw, pixelh; | ||
57 | |||
58 | int ball_x, ball_y, ball_dx, ball_dy; | ||
59 | int bata_y, batb_y; | ||
60 | Bool bata_to_miss, batb_to_miss; | ||
61 | |||
62 | } | ||
63 | PongClock; | ||
64 | |||
65 | void | ||
66 | get_time(int *hour, int *min, int *sec) | ||
67 | { | ||
68 | struct timeval tv; | ||
69 | struct tm *localTime = NULL; | ||
70 | time_t actualTime; | ||
71 | |||
72 | gettimeofday(&tv, 0); | ||
73 | actualTime = tv.tv_sec; | ||
74 | localTime = localtime(&actualTime); | ||
75 | |||
76 | if (hour) | ||
77 | *hour = localTime->tm_hour; | ||
78 | |||
79 | if (min) | ||
80 | *min = localTime->tm_min; | ||
81 | |||
82 | if (sec) | ||
83 | *sec = localTime->tm_sec; | ||
84 | } | ||
85 | |||
86 | void | ||
87 | draw_rect (PongClock *pong_clock, | ||
88 | int x, | ||
89 | int y, | ||
90 | int width, | ||
91 | int height) | ||
92 | { | ||
93 | XFillRectangle (pong_clock->xdpy, | ||
94 | pong_clock->backbuffer, | ||
95 | pong_clock->xgc, | ||
96 | x * pong_clock->pixelw, | ||
97 | y * pong_clock->pixelh, | ||
98 | width * pong_clock->pixelw, | ||
99 | height * pong_clock->pixelh); | ||
100 | } | ||
101 | |||
102 | void | ||
103 | draw_field (PongClock *pong_clock) | ||
104 | { | ||
105 | int i; | ||
106 | |||
107 | draw_rect (pong_clock, 0, 0, RESX+1, 1); | ||
108 | draw_rect (pong_clock, 0, RESY-1, RESX+1, 1); | ||
109 | |||
110 | for (i=0; i < RESY/2; i++) | ||
111 | draw_rect (pong_clock, (RESX/2)-1, i*2, 2, 1); | ||
112 | } | ||
113 | |||
114 | void | ||
115 | draw_digit (PongClock *pong_clock, | ||
116 | int x, | ||
117 | int y, | ||
118 | int digit) | ||
119 | { | ||
120 | int digits[] = { 0x1f8c63f, 0x1f21086, 0x1f0fe1f, 0x1f87e1f, 0x1087e31, | ||
121 | 0x1f87c3f, 0x1f8fc3f, 0x84421f, 0x1f8fe3f, 0x1087e3f }; | ||
122 | |||
123 | XRectangle rects[5*5]; | ||
124 | int i,j,k; | ||
125 | |||
126 | i = 0; | ||
127 | |||
128 | for (k=0; k<5; k++) | ||
129 | for (j=0; j<5; j++) | ||
130 | if (digits[digit] & (1 << ((k*5)+j))) | ||
131 | { | ||
132 | rects[i].x = (x + j) * pong_clock->pixelw; | ||
133 | rects[i].y = (y + k) * pong_clock->pixelh; | ||
134 | rects[i].width = pong_clock->pixelw; | ||
135 | rects[i].height = pong_clock->pixelh; | ||
136 | i++; | ||
137 | } | ||
138 | |||
139 | XFillRectangles (pong_clock->xdpy, | ||
140 | pong_clock->backbuffer, | ||
141 | pong_clock->xgc, | ||
142 | rects, i); | ||
143 | } | ||
144 | |||
145 | void | ||
146 | draw_time (PongClock *pong_clock) | ||
147 | { | ||
148 | int hour, min; | ||
149 | |||
150 | get_time(&hour, &min, NULL); | ||
151 | |||
152 | draw_digit (pong_clock, | ||
153 | (RESX/2) - 14, | ||
154 | 5, | ||
155 | hour / 10 ); | ||
156 | |||
157 | draw_digit (pong_clock, | ||
158 | (RESX/2) - 8, | ||
159 | 5, | ||
160 | hour % 10 ); | ||
161 | |||
162 | draw_digit (pong_clock, | ||
163 | (RESX/2) + 3, | ||
164 | 5, | ||
165 | min / 10 ); | ||
166 | |||
167 | draw_digit (pong_clock, | ||
168 | (RESX/2) + 9, | ||
169 | 5, | ||
170 | min % 10 ); | ||
171 | } | ||
172 | |||
173 | void | ||
174 | draw_bat_and_ball (PongClock *pong_clock) | ||
175 | { | ||
176 | /* ball */ | ||
177 | |||
178 | XFillRectangle (pong_clock->xdpy, | ||
179 | pong_clock->backbuffer, | ||
180 | pong_clock->xgc, | ||
181 | pong_clock->ball_x, | ||
182 | pong_clock->ball_y, | ||
183 | pong_clock->pixelw, | ||
184 | pong_clock->pixelh); | ||
185 | |||
186 | /* bat a */ | ||
187 | |||
188 | XFillRectangle (pong_clock->xdpy, | ||
189 | pong_clock->backbuffer, | ||
190 | pong_clock->xgc, | ||
191 | 0, | ||
192 | pong_clock->bata_y - (2 * pong_clock->pixelh), | ||
193 | pong_clock->pixelw, | ||
194 | pong_clock->pixelh * 5); | ||
195 | |||
196 | /* bat b */ | ||
197 | |||
198 | XFillRectangle (pong_clock->xdpy, | ||
199 | pong_clock->backbuffer, | ||
200 | pong_clock->xgc, | ||
201 | (pong_clock->xwin_width - pong_clock->pixelw), | ||
202 | pong_clock->batb_y - (2 * pong_clock->pixelh), | ||
203 | pong_clock->pixelw, | ||
204 | pong_clock->pixelh * 5); | ||
205 | |||
206 | } | ||
207 | |||
208 | void | ||
209 | update_state (PongClock *pong_clock) | ||
210 | { | ||
211 | int sec, min, hour; | ||
212 | |||
213 | get_time(&hour, &min, &sec); | ||
214 | |||
215 | /* Check ball is on field and no ones dues to miss a shot. | ||
216 | */ | ||
217 | if ( (pong_clock->ball_x < 0 && !pong_clock->bata_to_miss) | ||
218 | || (pong_clock->ball_x > (pong_clock->xwin_width - pong_clock->pixelw) | ||
219 | && !pong_clock->batb_to_miss) ) | ||
220 | pong_clock->ball_dx *= -1; | ||
221 | |||
222 | if ((pong_clock->ball_y < pong_clock->pixelh) | ||
223 | || pong_clock->ball_y > (pong_clock->xwin_height - (2*pong_clock->pixelh))) | ||
224 | pong_clock->ball_dy *= -1; | ||
225 | |||
226 | pong_clock->ball_x += pong_clock->ball_dx; | ||
227 | pong_clock->ball_y += pong_clock->ball_dy; | ||
228 | |||
229 | /* Set up someone to miss if we getting close to an hour or min. | ||
230 | */ | ||
231 | if (sec > TO_MISS_SECS) | ||
232 | { | ||
233 | if (min == 59) | ||
234 | pong_clock->batb_to_miss = True; | ||
235 | else | ||
236 | pong_clock->bata_to_miss = True; | ||
237 | } | ||
238 | else | ||
239 | { | ||
240 | /* Reset the game */ | ||
241 | if (pong_clock->bata_to_miss) | ||
242 | { | ||
243 | pong_clock->bata_to_miss = False; | ||
244 | pong_clock->ball_y = pong_clock->bata_y; | ||
245 | pong_clock->ball_x = pong_clock->pixelw; | ||
246 | pong_clock->ball_dx *= -1; | ||
247 | } | ||
248 | |||
249 | if (pong_clock->batb_to_miss) | ||
250 | { | ||
251 | pong_clock->batb_to_miss = False; | ||
252 | pong_clock->ball_y = pong_clock->batb_y; | ||
253 | pong_clock->ball_x = pong_clock->xwin_width - pong_clock->pixelw; | ||
254 | pong_clock->ball_dx *= -1; | ||
255 | } | ||
256 | } | ||
257 | |||
258 | /* Keep bats on field and only move in not setup to miss */ | ||
259 | if (pong_clock->ball_y >= (3*pong_clock->pixelh) | ||
260 | && pong_clock->ball_y <= (pong_clock->xwin_height - (5*pong_clock->pixelh))) | ||
261 | { | ||
262 | if (!pong_clock->batb_to_miss) | ||
263 | pong_clock->batb_y = pong_clock->ball_y; | ||
264 | |||
265 | if (!pong_clock->bata_to_miss) | ||
266 | pong_clock->bata_y = pong_clock->ball_y; | ||
267 | } | ||
268 | } | ||
269 | |||
270 | void | ||
271 | draw_frame (PongClock *pong_clock) | ||
272 | { | ||
273 | update_state (pong_clock); | ||
274 | |||
275 | /* Clear playfield */ | ||
276 | XSetForeground (pong_clock->xdpy, | ||
277 | pong_clock->xgc, | ||
278 | BlackPixel(pong_clock->xdpy, | ||
279 | pong_clock->xscreen)); | ||
280 | |||
281 | XFillRectangle (pong_clock->xdpy, | ||
282 | pong_clock->backbuffer, | ||
283 | pong_clock->xgc, | ||
284 | 0, 0, | ||
285 | pong_clock->xwin_width, | ||
286 | pong_clock->xwin_height); | ||
287 | |||
288 | XSetForeground (pong_clock->xdpy, | ||
289 | pong_clock->xgc, | ||
290 | WhitePixel(pong_clock->xdpy, | ||
291 | pong_clock->xscreen)); | ||
292 | |||
293 | draw_field (pong_clock); | ||
294 | |||
295 | draw_time (pong_clock); | ||
296 | |||
297 | draw_bat_and_ball (pong_clock); | ||
298 | |||
299 | /* flip 'backbuffer' */ | ||
300 | XSetWindowBackgroundPixmap (pong_clock->xdpy, | ||
301 | pong_clock->xwin, | ||
302 | pong_clock->backbuffer); | ||
303 | XClearWindow(pong_clock->xdpy, pong_clock->xwin); | ||
304 | |||
305 | XSync(pong_clock->xdpy, False); | ||
306 | } | ||
307 | |||
308 | int | ||
309 | main (int argc, char **argv) | ||
310 | { | ||
311 | XGCValues gcv; | ||
312 | Atom atoms_WINDOW_STATE, atoms_WINDOW_STATE_FULLSCREEN; | ||
313 | PongClock *pong_clock; | ||
314 | |||
315 | pong_clock = malloc(sizeof(PongClock)); | ||
316 | memset(pong_clock, 0, sizeof(PongClock)); | ||
317 | |||
318 | if ((pong_clock->xdpy = XOpenDisplay(getenv("DISPLAY"))) == NULL) { | ||
319 | fprintf(stderr, "Cannot connect to X server on display %s.", | ||
320 | getenv("DISPLAY")); | ||
321 | exit(-1); | ||
322 | } | ||
323 | |||
324 | pong_clock->xscreen = DefaultScreen(pong_clock->xdpy); | ||
325 | pong_clock->xwin_root = DefaultRootWindow(pong_clock->xdpy); | ||
326 | pong_clock->xwin_width = DisplayWidth(pong_clock->xdpy, | ||
327 | pong_clock->xscreen); | ||
328 | pong_clock->xwin_height = DisplayHeight(pong_clock->xdpy, | ||
329 | pong_clock->xscreen); | ||
330 | |||
331 | pong_clock->pixelw = pong_clock->xwin_width / RESX; | ||
332 | pong_clock->pixelh = pong_clock->xwin_height / RESY; | ||
333 | |||
334 | pong_clock->ball_x = 0; | ||
335 | pong_clock->ball_y = pong_clock->xwin_height / 2; | ||
336 | |||
337 | pong_clock->ball_dx = BALLDX; | ||
338 | pong_clock->ball_dy = BALLDY; | ||
339 | |||
340 | pong_clock->batb_y = pong_clock->bata_y = pong_clock->ball_y; | ||
341 | |||
342 | gcv.background = BlackPixel(pong_clock->xdpy, | ||
343 | pong_clock->xscreen); | ||
344 | gcv.foreground = WhitePixel(pong_clock->xdpy, | ||
345 | pong_clock->xscreen); | ||
346 | gcv.graphics_exposures = False; | ||
347 | |||
348 | pong_clock->xgc = XCreateGC (pong_clock->xdpy, pong_clock->xwin_root, | ||
349 | GCForeground|GCBackground|GCGraphicsExposures, | ||
350 | &gcv); | ||
351 | |||
352 | atoms_WINDOW_STATE | ||
353 | = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE",False); | ||
354 | atoms_WINDOW_STATE_FULLSCREEN | ||
355 | = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE_FULLSCREEN",False); | ||
356 | |||
357 | pong_clock->xwin = XCreateSimpleWindow(pong_clock->xdpy, | ||
358 | pong_clock->xwin_root, | ||
359 | 0, 0, | ||
360 | pong_clock->xwin_width, | ||
361 | pong_clock->xwin_height, | ||
362 | 0, | ||
363 | WhitePixel(pong_clock->xdpy, | ||
364 | pong_clock->xscreen), | ||
365 | BlackPixel(pong_clock->xdpy, | ||
366 | pong_clock->xscreen)); | ||
367 | |||
368 | pong_clock->backbuffer = XCreatePixmap(pong_clock->xdpy, | ||
369 | pong_clock->xwin_root, | ||
370 | pong_clock->xwin_width, | ||
371 | pong_clock->xwin_height, | ||
372 | DefaultDepth(pong_clock->xdpy, | ||
373 | pong_clock->xscreen)); | ||
374 | |||
375 | XSelectInput(pong_clock->xdpy, pong_clock->xwin, KeyPressMask); | ||
376 | |||
377 | |||
378 | /* Set the hints for fullscreen */ | ||
379 | XChangeProperty(pong_clock->xdpy, | ||
380 | pong_clock->xwin, | ||
381 | atoms_WINDOW_STATE, | ||
382 | XA_ATOM, | ||
383 | 32, | ||
384 | PropModeReplace, | ||
385 | (unsigned char *) &atoms_WINDOW_STATE_FULLSCREEN, 1); | ||
386 | |||
387 | XMapWindow(pong_clock->xdpy, pong_clock->xwin); | ||
388 | |||
389 | while (True) | ||
390 | { | ||
391 | struct timeval timeout; | ||
392 | XEvent xev; | ||
393 | |||
394 | timeout.tv_sec = 0; | ||
395 | timeout.tv_usec = 1000000 / FPS; | ||
396 | select (0, NULL, NULL, NULL, &timeout); | ||
397 | |||
398 | draw_frame (pong_clock); | ||
399 | |||
400 | XFlush(pong_clock->xdpy); | ||
401 | |||
402 | if (XPending(pong_clock->xdpy)) | ||
403 | { | ||
404 | if (XCheckMaskEvent(pong_clock->xdpy, | ||
405 | KeyPressMask, | ||
406 | &xev)) | ||
407 | exit(-1); | ||
408 | } | ||
409 | } | ||
410 | } | ||
diff --git a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb new file mode 100644 index 0000000000..fe886f536d --- /dev/null +++ b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "A clock combined with a game of pong" | ||
2 | LICENSE = "GPLv2+" | ||
3 | DEPENDS = "virtual/libx11 xdmcp xau" | ||
4 | |||
5 | SRC_URI = "file://pong-clock-no-flicker.c" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3" | ||
8 | |||
9 | S = "${WORKDIR}" | ||
10 | |||
11 | do_compile () { | ||
12 | ${CC} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp` | ||
13 | } | ||
14 | |||
15 | do_install () { | ||
16 | install -d ${D}${bindir} | ||
17 | install -m 0755 pong-clock ${D}${bindir} | ||
18 | } | ||
diff --git a/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch b/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch new file mode 100644 index 0000000000..9e86f2b2e5 --- /dev/null +++ b/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59097] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd startup-notification-0.12/configure.in startup-notification-0.12/configure.in | ||
5 | --- startup-notification-0.12/configure.in 2011-05-16 17:29:20.000000000 +0300 | ||
6 | +++ startup-notification-0.12/configure.in 2013-01-07 06:00:48.921905409 +0200 | ||
7 | @@ -3,7 +3,7 @@ | ||
8 | AC_CONFIG_SRCDIR(libsn/sn-launchee.c) | ||
9 | |||
10 | AM_INIT_AUTOMAKE | ||
11 | -AM_CONFIG_HEADER(config.h) | ||
12 | +AC_CONFIG_HEADERS(config.h) | ||
13 | |||
14 | # Honor aclocal flags | ||
15 | AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") | ||
diff --git a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb new file mode 100644 index 0000000000..363bdcd706 --- /dev/null +++ b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "Enables monitoring and display of application startup" | ||
2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/startup-notification/" | ||
3 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=Specifications" | ||
4 | |||
5 | # most files are under MIT, but libsn/sn-util.c is under LGPL, the | ||
6 | # effective license is LGPL | ||
7 | LICENSE = "LGPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=a2ae2cd47d6d2f238410f5364dfbc0f2 \ | ||
9 | file://libsn/sn-util.c;endline=18;md5=18a14dc1825d38e741d772311fea9ee1 \ | ||
10 | file://libsn/sn-common.h;endline=23;md5=6d05bc0ebdcf5513a6e77cb26e8cd7e2 \ | ||
11 | file://test/test-boilerplate.h;endline=23;md5=923e706b2a70586176eead261cc5bb98" | ||
12 | |||
13 | PR = "r2" | ||
14 | |||
15 | SECTION = "libs" | ||
16 | |||
17 | |||
18 | DEPENDS = "virtual/libx11 libsm xcb-util" | ||
19 | |||
20 | inherit autotools pkgconfig | ||
21 | |||
22 | SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz \ | ||
23 | file://obsolete_automake_macros.patch \ | ||
24 | " | ||
25 | |||
26 | SRC_URI[md5sum] = "2cd77326d4dcaed9a5a23a1232fb38e9" | ||
27 | SRC_URI[sha256sum] = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a" | ||
diff --git a/meta/recipes-graphics/tslib/tslib/ts.conf b/meta/recipes-graphics/tslib/tslib/ts.conf new file mode 100644 index 0000000000..1b0da937e8 --- /dev/null +++ b/meta/recipes-graphics/tslib/tslib/ts.conf | |||
@@ -0,0 +1,25 @@ | |||
1 | # Uncomment if you wish to use the linux input layer event interface | ||
2 | module_raw input | ||
3 | |||
4 | # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d | ||
5 | # module_raw collie | ||
6 | |||
7 | # Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 | ||
8 | # module_raw corgi | ||
9 | |||
10 | # Uncomment if you're using a device with a UCB1200/1300/1400 TS interface | ||
11 | # module_raw ucb1x00 | ||
12 | |||
13 | # Uncomment if you're using an HP iPaq h3600 or similar | ||
14 | # module_raw h3600 | ||
15 | |||
16 | # Uncomment if you're using a Hitachi Webpad | ||
17 | # module_raw mk712 | ||
18 | |||
19 | # Uncomment if you're using an IBM Arctic II | ||
20 | # module_raw arctic2 | ||
21 | |||
22 | module pthres pmin=1 | ||
23 | module variance delta=30 | ||
24 | module dejitter delta=100 | ||
25 | module linear | ||
diff --git a/meta/recipes-graphics/tslib/tslib/tslib.sh b/meta/recipes-graphics/tslib/tslib/tslib.sh new file mode 100644 index 0000000000..7068e8d922 --- /dev/null +++ b/meta/recipes-graphics/tslib/tslib/tslib.sh | |||
@@ -0,0 +1,8 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | if [ -e /dev/input/touchscreen0 ]; then | ||
4 | TSLIB_TSDEVICE=/dev/input/touchscreen0 | ||
5 | |||
6 | export TSLIB_TSDEVICE | ||
7 | fi | ||
8 | |||
diff --git a/meta/recipes-graphics/tslib/tslib_1.1.bb b/meta/recipes-graphics/tslib/tslib_1.1.bb new file mode 100644 index 0000000000..6d8c7dd7eb --- /dev/null +++ b/meta/recipes-graphics/tslib/tslib_1.1.bb | |||
@@ -0,0 +1,53 @@ | |||
1 | SUMMARY = "An abstraction layer for touchscreen panel events" | ||
2 | DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ | ||
3 | events, as well as a filter stack for the manipulation of those events. \ | ||
4 | Tslib is generally used on embedded devices to provide a common user \ | ||
5 | space interface to touchscreen functionality." | ||
6 | HOMEPAGE = "http://tslib.berlios.de/" | ||
7 | |||
8 | AUTHOR = "Russell King w/ plugins by Chris Larson et. al." | ||
9 | SECTION = "base" | ||
10 | LICENSE = "LGPLv2" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" | ||
12 | |||
13 | SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ | ||
14 | file://ts.conf \ | ||
15 | file://tslib.sh \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d" | ||
19 | SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" | ||
20 | |||
21 | |||
22 | inherit autotools pkgconfig | ||
23 | |||
24 | EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" | ||
25 | |||
26 | do_install_prepend() { | ||
27 | install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf | ||
28 | } | ||
29 | |||
30 | do_install_append() { | ||
31 | install -d ${D}${sysconfdir}/profile.d/ | ||
32 | install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ | ||
33 | } | ||
34 | |||
35 | # People should consider using udev's /dev/input/touchscreen0 symlink | ||
36 | # instead of detect-stylus | ||
37 | #RDEPENDS_tslib-conf_weird-machine = "detect-stylus" | ||
38 | RPROVIDES_tslib-conf = "libts-0.0-conf" | ||
39 | |||
40 | PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" | ||
41 | DEBIAN_NOAUTONAME_tslib-conf = "1" | ||
42 | DEBIAN_NOAUTONAME_tslib-tests = "1" | ||
43 | DEBIAN_NOAUTONAME_tslib-calibrate = "1" | ||
44 | |||
45 | RDEPENDS_${PN} = "tslib-conf" | ||
46 | RRECOMMENDS_${PN} = "pointercal" | ||
47 | |||
48 | FILES_${PN}-dbg += "${libdir}/ts/.debug*" | ||
49 | FILES_${PN}-dev += "${libdir}/ts/*.la" | ||
50 | FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" | ||
51 | FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" | ||
52 | FILES_tslib-calibrate += "${bindir}/ts_calibrate" | ||
53 | FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" | ||
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf b/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf new file mode 100644 index 0000000000..06094503cc --- /dev/null +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf | |||
@@ -0,0 +1,17 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> | ||
3 | <!-- conf.d/sub-pixel.conf --> | ||
4 | <fontconfig> | ||
5 | <alias> | ||
6 | <family>sans-serif</family> | ||
7 | <accept><family>Liberation Sans</family></accept> | ||
8 | </alias> | ||
9 | <alias> | ||
10 | <family>serif</family> | ||
11 | <accept><family>Liberation Serif</family></accept> | ||
12 | </alias> | ||
13 | <alias> | ||
14 | <family>monospace</family> | ||
15 | <accept><family>Liberation Mono</family></accept> | ||
16 | </alias> | ||
17 | </fontconfig> | ||
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb new file mode 100644 index 0000000000..89fa4b211d --- /dev/null +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | SUMMARY = "Liberation(tm) Fonts" | ||
2 | DESCRIPTION = "The Liberation(tm) Fonts is a font family originally \ | ||
3 | created by Ascender(c) which aims at metric compatibility with \ | ||
4 | Arial, Times New Roman, Courier New." | ||
5 | HOMEPAGE = "https://fedorahosted.org/liberation-fonts/" | ||
6 | BUGTRACKER = "https://bugzilla.redhat.com/" | ||
7 | |||
8 | SECTION = "x11/fonts" | ||
9 | LICENSE = "GPLv2" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
11 | PR = "r4" | ||
12 | PE = "1" | ||
13 | |||
14 | inherit fontcache | ||
15 | |||
16 | FONT_PACKAGES = "${PN}" | ||
17 | |||
18 | SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \ | ||
19 | file://30-liberation-aliases.conf" | ||
20 | |||
21 | SRC_URI[md5sum] = "4846797ef0fc70b0cbaede2514677c58" | ||
22 | SRC_URI[sha256sum] = "0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1" | ||
23 | |||
24 | do_install () { | ||
25 | install -d ${D}${datadir}/fonts/ttf/ | ||
26 | for i in *.ttf; do | ||
27 | install -m 0644 $i ${D}${prefix}/share/fonts/ttf/${i} | ||
28 | done | ||
29 | |||
30 | install -d ${D}${sysconfdir}/fonts/conf.d/ | ||
31 | install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ | ||
32 | |||
33 | install -d ${D}${prefix}/share/doc/${BPN}/ | ||
34 | install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/ | ||
35 | } | ||
36 | |||
37 | PACKAGES = "${PN}" | ||
38 | FILES_${PN} += "${sysconfdir} ${datadir}" | ||
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb new file mode 100644 index 0000000000..b2e4cef39d --- /dev/null +++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | SUMMARY = "The Bitstream Vera fonts - TTF Edition" | ||
2 | DESCRIPTION = "The Bitstream Vera fonts include four monospace and sans \ | ||
3 | faces (normal, oblique, bold, bold oblique) and two serif faces (normal \ | ||
4 | and bold). In addition Fontconfig/Xft2 can artificially oblique the \ | ||
5 | serif faces for you: this loses hinting and distorts the faces slightly, \ | ||
6 | but is visibly different than normal and bold, and reasonably pleasing." | ||
7 | SECTION = "x11/fonts" | ||
8 | LICENSE = "BitstreamVera" | ||
9 | LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" | ||
10 | PR = "r7" | ||
11 | |||
12 | inherit fontcache | ||
13 | |||
14 | FONT_PACKAGES = "${PN}" | ||
15 | |||
16 | SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" | ||
17 | |||
18 | do_install () { | ||
19 | install -d ${D}${prefix}/share/fonts/ttf/ | ||
20 | for i in *.ttf; do | ||
21 | install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i} | ||
22 | done | ||
23 | |||
24 | # fontconfig ships this too. not sure what to do about it. | ||
25 | #install -d ${D}${sysconfdir}/fonts | ||
26 | #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf | ||
27 | |||
28 | |||
29 | install -d ${D}${prefix}/share/doc/${BPN}/ | ||
30 | for i in *.TXT; do | ||
31 | install -m 644 $i ${D}${prefix}/share/doc/${BPN}/$i | ||
32 | done | ||
33 | } | ||
34 | |||
35 | FILES_${PN} = "/etc ${datadir}/fonts" | ||
36 | |||
37 | SRC_URI[md5sum] = "bb22bd5b4675f5dbe17c6963d8c00ed6" | ||
38 | SRC_URI[sha256sum] = "db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc" | ||
diff --git a/meta/recipes-graphics/waffle/waffle_1.3.0.bb b/meta/recipes-graphics/waffle/waffle_1.3.0.bb new file mode 100644 index 0000000000..a6d1acdf31 --- /dev/null +++ b/meta/recipes-graphics/waffle/waffle_1.3.0.bb | |||
@@ -0,0 +1,32 @@ | |||
1 | SUMMARY = "cross-platform C library to defer selection of GL API and of window system" | ||
2 | LICENSE = "BSD-2-Clause" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ | ||
4 | file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" | ||
5 | |||
6 | SRC_URI = "http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz" | ||
7 | SRC_URI[md5sum] = "5020ecc249096c881e1f59ee961f3d41" | ||
8 | SRC_URI[sha256sum] = "340ee04172dba878249469018cd7ec9d1ecd41af26b612c741b8b52e713bca8e" | ||
9 | |||
10 | inherit cmake | ||
11 | |||
12 | # This should be overridden per-machine to reflect the capabilities of the GL | ||
13 | # stack. | ||
14 | PACKAGECONFIG ??= "glx" | ||
15 | |||
16 | # I say virtual/libgl, actually wants gl.pc | ||
17 | PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11" | ||
18 | |||
19 | # I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland | ||
20 | # DISTRO_FEATURE. | ||
21 | PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,,virtual/libgl wayland" | ||
22 | |||
23 | # I say virtual/libgl, actually wants gbm.pc egl.pc | ||
24 | PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev" | ||
25 | |||
26 | # I say virtual/libgl, actually wants egl.pc | ||
27 | PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb" | ||
28 | |||
29 | # Take the flags added by PACKAGECONFIG and pass them to cmake. | ||
30 | EXTRA_OECMAKE = "${EXTRA_OECONF}" | ||
31 | |||
32 | FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake" | ||
diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta/recipes-graphics/wayland/mtdev_1.1.5.bb new file mode 100644 index 0000000000..ccd0ebbfce --- /dev/null +++ b/meta/recipes-graphics/wayland/mtdev_1.1.5.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Multitouch Protocol Translation Library" | ||
2 | |||
3 | DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ | ||
4 | multitouch events to the slotted type B protocol. The events put into mtdev may \ | ||
5 | be from any MT device, specifically type A without contact tracking, type A with \ | ||
6 | contact tracking, or type B with contact tracking" | ||
7 | |||
8 | HOMEPAGE = "http://bitmath.org/code/mtdev/" | ||
9 | SECTION = "libs" | ||
10 | |||
11 | LICENSE = "MIT" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" | ||
13 | |||
14 | SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" | ||
15 | SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" | ||
16 | SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" | ||
17 | |||
18 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch new file mode 100644 index 0000000000..cd8bc55842 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | disable macro checks not used for scanner | ||
2 | |||
3 | We only build wayland-native for the scanner, so disable the bits we don't | ||
4 | actually need. This avoid build issue on older distro such as Centos 5.x: | ||
5 | | error: 'O_CLOEXEC' undeclared (first use in this function) | ||
6 | | error: sys/timerfd.h: No such file or directory | ||
7 | | error: 'CLOCK_MONOTONIC' undeclared (first use in this function) | ||
8 | | error: 'TFD_CLOEXEC' undeclared (first use in this function) | ||
9 | | error: 'SFD_CLOEXEC' undeclared (first use in this function) | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Ting Liu <b28495@freescale.com> | ||
14 | --- | ||
15 | configure.ac | 20 ++++++++++---------- | ||
16 | 1 file changed, 10 insertions(+), 10 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) | ||
22 | |||
23 | AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate]) | ||
24 | |||
25 | -AC_CHECK_DECL(SFD_CLOEXEC,[], | ||
26 | - [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], | ||
27 | - [[#include <sys/signalfd.h>]]) | ||
28 | -AC_CHECK_DECL(TFD_CLOEXEC,[], | ||
29 | - [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")], | ||
30 | - [[#include <sys/timerfd.h>]]) | ||
31 | -AC_CHECK_DECL(CLOCK_MONOTONIC,[], | ||
32 | - [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")], | ||
33 | - [[#include <time.h>]]) | ||
34 | -AC_CHECK_HEADERS([execinfo.h]) | ||
35 | +##AC_CHECK_DECL(SFD_CLOEXEC,[], | ||
36 | +# [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], | ||
37 | +# [[#include <sys/signalfd.h>]]) | ||
38 | +#AC_CHECK_DECL(TFD_CLOEXEC,[], | ||
39 | +# [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")], | ||
40 | +# [[#include <sys/timerfd.h>]]) | ||
41 | +#AC_CHECK_DECL(CLOCK_MONOTONIC,[], | ||
42 | +# [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")], | ||
43 | +# [[#include <time.h>]]) | ||
44 | +#AC_CHECK_HEADERS([execinfo.h]) | ||
45 | |||
46 | AC_ARG_ENABLE([scanner], | ||
47 | [AC_HELP_STRING([--disable-scanner], | ||
48 | -- | ||
49 | 1.8.3.2 | ||
50 | |||
diff --git a/meta/recipes-graphics/wayland/wayland_1.5.0.bb b/meta/recipes-graphics/wayland/wayland_1.5.0.bb new file mode 100644 index 0000000000..b1ae59ef13 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland_1.5.0.bb | |||
@@ -0,0 +1,41 @@ | |||
1 | SUMMARY = "Wayland, a protocol between a compositor and clients" | ||
2 | DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ | ||
3 | as well as a C library implementation of that protocol. The compositor can be \ | ||
4 | a standalone display server running on Linux kernel modesetting and evdev \ | ||
5 | input devices, an X application, or a wayland client itself. The clients can \ | ||
6 | be traditional applications, X servers (rootless or fullscreen) or other \ | ||
7 | display servers." | ||
8 | HOMEPAGE = "http://wayland.freedesktop.org" | ||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ | ||
11 | file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" | ||
12 | |||
13 | SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" | ||
14 | SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d" | ||
15 | SRC_URI[sha256sum] = "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5" | ||
16 | SRC_URI_append_class-native = " \ | ||
17 | file://disable-macro-checks-not-used-for-scanner.patch \ | ||
18 | " | ||
19 | EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" | ||
20 | |||
21 | inherit autotools pkgconfig | ||
22 | |||
23 | # We need wayland-native for the wayland-scanner utility | ||
24 | BBCLASSEXTEND = "native" | ||
25 | |||
26 | DEPENDS_class-native = "expat-native libffi-native" | ||
27 | DEPENDS = "expat libffi wayland-native" | ||
28 | |||
29 | EXTRA_OECONF = "--disable-documentation --disable-scanner" | ||
30 | |||
31 | # Wayland installs a M4 macro for other projects to use, which uses the target | ||
32 | # pkg-config to find files. Replace pkg-config with pkg-config-native. | ||
33 | do_install_append_class-native() { | ||
34 | sed -e 's,PKG_CHECK_MODULES(.*),,g' \ | ||
35 | -e 's,$PKG_CONFIG,pkg-config-native,g' \ | ||
36 | -i ${D}/${datadir}/aclocal/wayland-scanner.m4 | ||
37 | } | ||
38 | |||
39 | sysroot_stage_all_append_class-target () { | ||
40 | cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ | ||
41 | } | ||
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb new file mode 100644 index 0000000000..38b78bcd02 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston-init.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | SUMMARY = "Startup script for the Weston Wayland compositor" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" | ||
4 | |||
5 | SRC_URI = "file://init" | ||
6 | |||
7 | S = "${WORKDIR}" | ||
8 | |||
9 | do_install() { | ||
10 | install -d ${D}/${sysconfdir}/init.d | ||
11 | install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston | ||
12 | } | ||
13 | |||
14 | inherit allarch update-rc.d | ||
15 | |||
16 | RDEPENDS_${PN} = "weston kbd" | ||
17 | |||
18 | INITSCRIPT_NAME = "weston" | ||
19 | INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." | ||
diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init new file mode 100644 index 0000000000..8e662e00a5 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston-init/init | |||
@@ -0,0 +1,56 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | ### BEGIN INIT INFO | ||
4 | # Provides: weston | ||
5 | # Required-Start: $local_fs $remote_fs | ||
6 | # Required-Stop: $local_fs $remote_fs | ||
7 | # Default-Start: 2 3 4 5 | ||
8 | # Default-Stop: 0 1 6 | ||
9 | ### END INIT INFO | ||
10 | |||
11 | killproc() { | ||
12 | pid=`/bin/pidof $1` | ||
13 | [ "$pid" != "" ] && kill $pid | ||
14 | } | ||
15 | |||
16 | read CMDLINE < /proc/cmdline | ||
17 | for x in $CMDLINE; do | ||
18 | case $x in | ||
19 | weston=false) | ||
20 | echo "Weston disabled" | ||
21 | exit 0; | ||
22 | ;; | ||
23 | esac | ||
24 | done | ||
25 | |||
26 | case "$1" in | ||
27 | start) | ||
28 | . /etc/profile | ||
29 | |||
30 | # This is all a nasty hack | ||
31 | if test -z "$XDG_RUNTIME_DIR"; then | ||
32 | export XDG_RUNTIME_DIR=/run/user/root | ||
33 | mkdir --parents $XDG_RUNTIME_DIR | ||
34 | chmod 0700 $XDG_RUNTIME_DIR | ||
35 | fi | ||
36 | |||
37 | openvt -s weston | ||
38 | ;; | ||
39 | |||
40 | stop) | ||
41 | echo "Stopping Weston" | ||
42 | killproc weston | ||
43 | ;; | ||
44 | |||
45 | restart) | ||
46 | $0 stop | ||
47 | sleep 1 | ||
48 | $0 start | ||
49 | ;; | ||
50 | |||
51 | *) | ||
52 | echo "usage: $0 { start | stop | restart }" | ||
53 | ;; | ||
54 | esac | ||
55 | |||
56 | exit 0 | ||
diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch new file mode 100644 index 0000000000..062da5cee5 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: weston-1.5.0/configure.ac | ||
2 | =================================================================== | ||
3 | --- weston-1.5.0.orig/configure.ac | ||
4 | +++ weston-1.5.0/configure.ac | ||
5 | @@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then | ||
6 | AC_MSG_ERROR([wayland-scanner is needed to compile weston]) | ||
7 | fi | ||
8 | |||
9 | -PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) | ||
10 | +#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) | ||
11 | |||
12 | AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) | ||
13 | |||
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch new file mode 100644 index 0000000000..35e6d6ff58 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | weston-1.5.0/configure.ac: make lcms explicitly configurable | ||
2 | |||
3 | The lcms package is outside of openembedded-core, so make it | ||
4 | explicitly configurable. Make it deterministic, so that if lcms | ||
5 | dependencies are missing, autoconf throws a fatal error. Follow | ||
6 | upstream style to make it more likely to be merged. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Index: weston-1.5.0/configure.ac | ||
11 | =================================================================== | ||
12 | --- weston-1.5.0.orig/configure.ac | ||
13 | +++ weston-1.5.0/configure.ac | ||
14 | @@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, | ||
15 | enable_demo_clients_install=no) | ||
16 | AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) | ||
17 | |||
18 | -PKG_CHECK_MODULES(LCMS, lcms2, | ||
19 | - [have_lcms=yes], [have_lcms=no]) | ||
20 | -if test "x$have_lcms" = xyes; then | ||
21 | - AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) | ||
22 | +AC_ARG_ENABLE(lcms, | ||
23 | + AS_HELP_STRING([--disable-lcms], | ||
24 | + [Disable lcms support]),, | ||
25 | + enable_lcms=auto) | ||
26 | +AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) | ||
27 | +if test "x$enable_lcms" != "xno"; then | ||
28 | + PKG_CHECK_MODULES(LCMS, | ||
29 | + lcms2, | ||
30 | + [have_lcms=yes], | ||
31 | + [have_lcms=no]) | ||
32 | + if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then | ||
33 | + AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) | ||
34 | + fi | ||
35 | + if test "x$have_lcms" = "xyes"; then | ||
36 | + enable_lcms=yes | ||
37 | + AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) | ||
38 | + fi | ||
39 | fi | ||
40 | -AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) | ||
41 | |||
42 | AC_PATH_PROG([wayland_scanner], [wayland-scanner]) | ||
43 | if test x$wayland_scanner = x; then | ||
diff --git a/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch new file mode 100644 index 0000000000..ad07d4fc2d --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | |||
2 | The libwebp package is outside of openembedded-core, so make it | ||
3 | explicitly configurable. Make it deterministic, so that if libwebp | ||
4 | dependencies are missing, autoconf throws a fatal error. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: weston-1.5.0/configure.ac | ||
9 | =================================================================== | ||
10 | --- weston-1.5.0.orig/configure.ac | ||
11 | +++ weston-1.5.0/configure.ac | ||
12 | @@ -268,9 +268,22 @@ fi | ||
13 | |||
14 | PKG_CHECK_MODULES(PIXMAN, [pixman-1]) | ||
15 | PKG_CHECK_MODULES(PNG, [libpng]) | ||
16 | -PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) | ||
17 | -AS_IF([test "x$have_webp" = "xyes"], | ||
18 | - [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) | ||
19 | +AC_ARG_ENABLE(webp, | ||
20 | + AS_HELP_STRING([--disable-webp], | ||
21 | + [Disable libwebp support]),, | ||
22 | + enable_webp=auto) | ||
23 | +AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes]) | ||
24 | +AS_IF([test "x$enable_webp" != "xno"], | ||
25 | + PKG_CHECK_MODULES(WEBP, | ||
26 | + [libwebp], | ||
27 | + [have_webp=yes], | ||
28 | + [have_webp=no]) | ||
29 | + AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"], | ||
30 | + AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found])) | ||
31 | + AS_IF([test "x$have_webp" = "xyes"], | ||
32 | + [enable_webp=yes] | ||
33 | + [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) | ||
34 | +) | ||
35 | |||
36 | AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],, | ||
37 | enable_vaapi_recorder=auto) | ||
diff --git a/meta/recipes-graphics/wayland/weston/weston.desktop b/meta/recipes-graphics/wayland/weston/weston.desktop new file mode 100644 index 0000000000..1086ae8bf6 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/weston.desktop | |||
@@ -0,0 +1,9 @@ | |||
1 | [Desktop Entry] | ||
2 | Encoding=UTF-8 | ||
3 | Type=Application | ||
4 | Name=Weston | ||
5 | Comment=Wayland Compostitor | ||
6 | Exec=weston | ||
7 | Icon=weston | ||
8 | Terminal=false | ||
9 | Categories=Utility; | ||
diff --git a/meta/recipes-graphics/wayland/weston/weston.png b/meta/recipes-graphics/wayland/weston/weston.png new file mode 100644 index 0000000000..ea8b7e0e23 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/weston.png | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/wayland/weston_1.5.0.bb b/meta/recipes-graphics/wayland/weston_1.5.0.bb new file mode 100644 index 0000000000..4a8584f79a --- /dev/null +++ b/meta/recipes-graphics/wayland/weston_1.5.0.bb | |||
@@ -0,0 +1,87 @@ | |||
1 | SUMMARY = "Weston, a Wayland compositor" | ||
2 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" | ||
3 | HOMEPAGE = "http://wayland.freedesktop.org" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ | ||
6 | file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" | ||
7 | |||
8 | SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | ||
9 | file://weston.png \ | ||
10 | file://weston.desktop \ | ||
11 | file://disable-wayland-scanner-pkg-check.patch \ | ||
12 | file://make-lcms-explicitly-configurable.patch \ | ||
13 | file://make-libwebp-explicitly-configurable.patch \ | ||
14 | " | ||
15 | SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" | ||
16 | SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" | ||
17 | |||
18 | inherit autotools pkgconfig useradd | ||
19 | |||
20 | DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" | ||
21 | DEPENDS += "wayland virtual/egl pango" | ||
22 | |||
23 | EXTRA_OECONF = "--enable-setuid-install \ | ||
24 | --disable-xwayland \ | ||
25 | --enable-simple-clients \ | ||
26 | --enable-clients \ | ||
27 | --enable-demo-clients-install \ | ||
28 | --disable-libunwind \ | ||
29 | --disable-rpi-compositor \ | ||
30 | --disable-rdp-compositor \ | ||
31 | " | ||
32 | |||
33 | |||
34 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ | ||
35 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
36 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ | ||
37 | " | ||
38 | # | ||
39 | # Compositor choices | ||
40 | # | ||
41 | # Weston on KMS | ||
42 | PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev" | ||
43 | # Weston on Wayland (nested Weston) | ||
44 | PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" | ||
45 | # Weston on X11 | ||
46 | PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" | ||
47 | # Headless Weston | ||
48 | PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" | ||
49 | # Weston on framebuffer | ||
50 | PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" | ||
51 | # weston-launch | ||
52 | PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" | ||
53 | # VA-API desktop recorder | ||
54 | PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" | ||
55 | # Weston with EGL support | ||
56 | PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" | ||
57 | # Weston with cairo glesv2 support | ||
58 | PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" | ||
59 | # Weston with lcms support | ||
60 | PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" | ||
61 | # Weston with webp support | ||
62 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | ||
63 | |||
64 | do_install_append() { | ||
65 | # Weston doesn't need the .la files to load modules, so wipe them | ||
66 | rm -f ${D}/${libdir}/weston/*.la | ||
67 | |||
68 | # If X11, ship a desktop file to launch it | ||
69 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then | ||
70 | install -d ${D}${datadir}/applications | ||
71 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications | ||
72 | |||
73 | install -d ${D}${datadir}/icons/hicolor/48x48/apps | ||
74 | install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps | ||
75 | fi | ||
76 | } | ||
77 | |||
78 | PACKAGES += "${PN}-examples" | ||
79 | |||
80 | FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}" | ||
81 | FILES_${PN}-examples = "${bindir}/*" | ||
82 | |||
83 | RDEPENDS_${PN} += "xkeyboard-config" | ||
84 | RRECOMMENDS_${PN} = "liberation-fonts" | ||
85 | |||
86 | USERADD_PACKAGES = "${PN}" | ||
87 | GROUPADD_PARAM_${PN} = "--system weston-launch" | ||
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults new file mode 100644 index 0000000000..f5b69dd516 --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults | |||
@@ -0,0 +1,3 @@ | |||
1 | Rxvt*scrollBar_right: true | ||
2 | Rxvt*font: xft:Mono:pixelsize=9 | ||
3 | |||
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver new file mode 100644 index 0000000000..73570dfeb5 --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver | |||
@@ -0,0 +1,12 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | |||
4 | XSERVER=/usr/bin/Xorg | ||
5 | |||
6 | . /etc/profile | ||
7 | |||
8 | ARGS=" -br -pn" | ||
9 | |||
10 | DISPLAY=':0' | ||
11 | |||
12 | exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* | ||
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession new file mode 100644 index 0000000000..0b73127ae1 --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession | |||
@@ -0,0 +1,38 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | if [ -x /usr/bin/dbus-launch ]; then | ||
4 | # As this is the X session script, always start a new DBus session. | ||
5 | eval `dbus-launch --sh-syntax --exit-with-session </dev/null` | ||
6 | echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS" | ||
7 | fi | ||
8 | |||
9 | . /etc/profile | ||
10 | |||
11 | if [ -f $HOME/.profile ]; then | ||
12 | . $HOME/.profile | ||
13 | fi | ||
14 | |||
15 | SYSSESSIONDIR=/etc/X11/Xsession.d | ||
16 | |||
17 | export CLUTTER_DISABLE_MIPMAPPED_TEXT=1 | ||
18 | |||
19 | for SESSIONFILE in $SYSSESSIONDIR/*; do | ||
20 | set +e | ||
21 | case "$SESSIONFILE" in | ||
22 | *.sh) | ||
23 | . "$SESSIONFILE" | ||
24 | ;; | ||
25 | *.shbg) | ||
26 | "$SESSIONFILE" & | ||
27 | ;; | ||
28 | *~) | ||
29 | # Ignore backup files | ||
30 | ;; | ||
31 | *) | ||
32 | "$SESSIONFILE" | ||
33 | ;; | ||
34 | esac | ||
35 | set -e | ||
36 | done | ||
37 | |||
38 | exit 0 | ||
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh new file mode 100644 index 0000000000..a9d102c746 --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh | |||
@@ -0,0 +1,4 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # kdrive 1.4 does not have default keymap in server | ||
4 | #xmodmap - </etc/X11/default.xmodmap | ||
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh new file mode 100644 index 0000000000..91594b9e3d --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh | |||
@@ -0,0 +1,13 @@ | |||
1 | # Minimal/stub implementation of the XDG Base Directory specification. | ||
2 | # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html | ||
3 | # | ||
4 | # Wayland needs XDG_RUNTIME_DIR, so set it to /tmp. This isn't compliant with | ||
5 | # the specification (wrong mode, wrong owner) but it's mostly sufficient. | ||
6 | # | ||
7 | # In the ideal case where SystemD is booting and userspace is initiated by a | ||
8 | # SystemD user session this will have been set already, so don't overwrite it. | ||
9 | |||
10 | if [ -z "$XGD_RUNTIME_DIR" ]; then | ||
11 | XDG_RUNTIME_DIR="/tmp" | ||
12 | export XDG_RUNTIME_DIR | ||
13 | fi | ||
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh new file mode 100644 index 0000000000..3d7008ca45 --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh | |||
@@ -0,0 +1,7 @@ | |||
1 | XDGAUTOSTART=/etc/xdg/autostart | ||
2 | if [ -d $XDGAUTOSTART ]; then | ||
3 | for SCRIPT in $XDGAUTOSTART/*; do | ||
4 | CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2` | ||
5 | $CMD & | ||
6 | done | ||
7 | fi | ||
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh new file mode 100644 index 0000000000..b936dedf3b --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh | |||
@@ -0,0 +1,7 @@ | |||
1 | if [ -x $HOME/.Xsession ]; then | ||
2 | exec $HOME/.Xsession | ||
3 | elif [ -x /usr/bin/x-session-manager ]; then | ||
4 | exec /usr/bin/x-session-manager | ||
5 | else | ||
6 | exec /usr/bin/x-window-manager | ||
7 | fi | ||
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap b/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap new file mode 100644 index 0000000000..05a13fa3c8 --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap | |||
@@ -0,0 +1,260 @@ | |||
1 | keycode 8 = | ||
2 | keycode 9 = Escape | ||
3 | keycode 10 = 1 exclam | ||
4 | keycode 11 = 2 at | ||
5 | keycode 12 = 3 numbersign | ||
6 | keycode 13 = 4 dollar | ||
7 | keycode 14 = 5 percent | ||
8 | keycode 15 = 6 asciicircum | ||
9 | keycode 16 = 7 ampersand braceleft | ||
10 | keycode 17 = 8 asterisk bracketleft | ||
11 | keycode 18 = 9 parenleft bracketright | ||
12 | keycode 19 = 0 parenright braceright | ||
13 | keycode 20 = minus underscore backslash | ||
14 | keycode 21 = equal plus | ||
15 | keycode 22 = BackSpace | ||
16 | keycode 23 = Tab | ||
17 | keycode 24 = q Q q | ||
18 | keycode 25 = w W w | ||
19 | keycode 26 = e E | ||
20 | keycode 27 = r R r | ||
21 | keycode 28 = t T t | ||
22 | keycode 29 = y Y y | ||
23 | keycode 30 = u U u | ||
24 | keycode 31 = i I i | ||
25 | keycode 32 = o O o | ||
26 | keycode 33 = p P p | ||
27 | keycode 34 = bracketleft braceleft | ||
28 | keycode 35 = bracketright braceright asciitilde | ||
29 | keycode 36 = Return | ||
30 | keycode 37 = Control_L | ||
31 | keycode 38 = a A | ||
32 | keycode 39 = s S s | ||
33 | keycode 40 = d D | ||
34 | keycode 41 = f F | ||
35 | keycode 42 = g G g | ||
36 | keycode 43 = h H h | ||
37 | keycode 44 = j J j | ||
38 | keycode 45 = k K k | ||
39 | keycode 46 = l L l | ||
40 | keycode 47 = semicolon colon | ||
41 | keycode 48 = apostrophe quotedbl | ||
42 | keycode 49 = grave asciitilde | ||
43 | keycode 50 = Shift_L | ||
44 | keycode 51 = backslash bar | ||
45 | keycode 52 = z Z z | ||
46 | keycode 53 = x X x | ||
47 | keycode 54 = c C | ||
48 | keycode 55 = v V v | ||
49 | keycode 56 = b B | ||
50 | keycode 57 = n N n | ||
51 | keycode 58 = m M m | ||
52 | keycode 59 = comma less | ||
53 | keycode 60 = period greater | ||
54 | keycode 61 = slash question | ||
55 | keycode 62 = Shift_R | ||
56 | keycode 63 = KP_Multiply | ||
57 | keycode 64 = Alt_L | ||
58 | keycode 65 = space | ||
59 | keycode 66 = Caps_Lock | ||
60 | keycode 67 = F1 F11 | ||
61 | keycode 68 = F2 F12 | ||
62 | keycode 69 = F3 F13 | ||
63 | keycode 70 = F4 F14 | ||
64 | keycode 71 = F5 F15 | ||
65 | keycode 72 = F6 F16 | ||
66 | keycode 73 = F7 F17 | ||
67 | keycode 74 = F8 F18 | ||
68 | keycode 75 = F9 F19 | ||
69 | keycode 76 = F10 F20 | ||
70 | keycode 77 = Num_Lock | ||
71 | keycode 78 = Scroll_Lock | ||
72 | keycode 79 = KP_7 | ||
73 | keycode 80 = KP_8 | ||
74 | keycode 81 = KP_9 | ||
75 | keycode 82 = KP_Subtract | ||
76 | keycode 83 = KP_4 | ||
77 | keycode 84 = KP_5 | ||
78 | keycode 85 = KP_6 | ||
79 | keycode 86 = KP_Add | ||
80 | keycode 87 = KP_1 | ||
81 | keycode 88 = KP_2 | ||
82 | keycode 89 = KP_3 | ||
83 | keycode 90 = KP_0 | ||
84 | keycode 91 = KP_Decimal | ||
85 | keycode 92 = | ||
86 | keycode 93 = | ||
87 | keycode 94 = less greater bar | ||
88 | keycode 95 = F11 | ||
89 | keycode 96 = F12 | ||
90 | keycode 97 = | ||
91 | keycode 98 = | ||
92 | keycode 99 = | ||
93 | keycode 100 = | ||
94 | keycode 101 = | ||
95 | keycode 102 = | ||
96 | keycode 103 = | ||
97 | keycode 104 = KP_Enter | ||
98 | keycode 105 = Control_R | ||
99 | keycode 106 = KP_Divide | ||
100 | keycode 107 = | ||
101 | keycode 108 = Mode_switch | ||
102 | keycode 109 = Break | ||
103 | keycode 110 = Home | ||
104 | keycode 111 = Up | ||
105 | keycode 112 = Prior | ||
106 | keycode 113 = Left | ||
107 | keycode 114 = Right | ||
108 | keycode 115 = End | ||
109 | keycode 116 = Down | ||
110 | keycode 117 = Next | ||
111 | keycode 118 = Insert | ||
112 | keycode 119 = Delete | ||
113 | keycode 120 = Menu | ||
114 | keycode 121 = F13 | ||
115 | keycode 122 = F14 | ||
116 | keycode 123 = Help | ||
117 | keycode 124 = Execute | ||
118 | keycode 125 = F17 | ||
119 | keycode 126 = KP_Subtract | ||
120 | keycode 127 = Pause | ||
121 | keycode 128 = | ||
122 | keycode 129 = | ||
123 | keycode 130 = | ||
124 | keycode 131 = | ||
125 | keycode 132 = | ||
126 | keycode 133 = | ||
127 | keycode 134 = | ||
128 | keycode 135 = | ||
129 | keycode 136 = | ||
130 | keycode 137 = | ||
131 | keycode 138 = | ||
132 | keycode 139 = | ||
133 | keycode 140 = | ||
134 | keycode 141 = | ||
135 | keycode 142 = | ||
136 | keycode 143 = | ||
137 | keycode 144 = | ||
138 | keycode 145 = | ||
139 | keycode 146 = | ||
140 | keycode 147 = | ||
141 | keycode 148 = | ||
142 | keycode 149 = | ||
143 | keycode 150 = | ||
144 | keycode 151 = | ||
145 | keycode 152 = | ||
146 | keycode 153 = | ||
147 | keycode 154 = | ||
148 | keycode 155 = | ||
149 | keycode 156 = | ||
150 | keycode 157 = | ||
151 | keycode 158 = | ||
152 | keycode 159 = | ||
153 | keycode 160 = | ||
154 | keycode 161 = | ||
155 | keycode 162 = | ||
156 | keycode 163 = | ||
157 | keycode 164 = | ||
158 | keycode 165 = | ||
159 | keycode 166 = | ||
160 | keycode 167 = | ||
161 | keycode 168 = | ||
162 | keycode 169 = | ||
163 | keycode 170 = | ||
164 | keycode 171 = | ||
165 | keycode 172 = | ||
166 | keycode 173 = | ||
167 | keycode 174 = | ||
168 | keycode 175 = | ||
169 | keycode 176 = | ||
170 | keycode 177 = | ||
171 | keycode 178 = | ||
172 | keycode 179 = | ||
173 | keycode 180 = | ||
174 | keycode 181 = | ||
175 | keycode 182 = | ||
176 | keycode 183 = | ||
177 | keycode 184 = | ||
178 | keycode 185 = | ||
179 | keycode 186 = | ||
180 | keycode 187 = | ||
181 | keycode 188 = | ||
182 | keycode 189 = | ||
183 | keycode 190 = | ||
184 | keycode 191 = | ||
185 | keycode 192 = | ||
186 | keycode 193 = | ||
187 | keycode 194 = | ||
188 | keycode 195 = | ||
189 | keycode 196 = | ||
190 | keycode 197 = | ||
191 | keycode 198 = | ||
192 | keycode 199 = | ||
193 | keycode 200 = | ||
194 | keycode 201 = | ||
195 | keycode 202 = | ||
196 | keycode 203 = | ||
197 | keycode 204 = | ||
198 | keycode 205 = | ||
199 | keycode 206 = | ||
200 | keycode 207 = | ||
201 | keycode 208 = | ||
202 | keycode 209 = | ||
203 | keycode 210 = | ||
204 | keycode 211 = | ||
205 | keycode 212 = | ||
206 | keycode 213 = | ||
207 | keycode 214 = | ||
208 | keycode 215 = | ||
209 | keycode 216 = | ||
210 | keycode 217 = | ||
211 | keycode 218 = | ||
212 | keycode 219 = | ||
213 | keycode 220 = | ||
214 | keycode 221 = | ||
215 | keycode 222 = | ||
216 | keycode 223 = | ||
217 | keycode 224 = | ||
218 | keycode 225 = | ||
219 | keycode 226 = | ||
220 | keycode 227 = | ||
221 | keycode 228 = | ||
222 | keycode 229 = | ||
223 | keycode 230 = | ||
224 | keycode 231 = | ||
225 | keycode 232 = | ||
226 | keycode 233 = | ||
227 | keycode 234 = | ||
228 | keycode 235 = | ||
229 | keycode 236 = | ||
230 | keycode 237 = | ||
231 | keycode 238 = | ||
232 | keycode 239 = | ||
233 | keycode 240 = | ||
234 | keycode 241 = | ||
235 | keycode 242 = | ||
236 | keycode 243 = | ||
237 | keycode 244 = | ||
238 | keycode 245 = | ||
239 | keycode 246 = | ||
240 | keycode 247 = | ||
241 | keycode 248 = | ||
242 | keycode 249 = | ||
243 | keycode 250 = | ||
244 | keycode 251 = | ||
245 | keycode 252 = | ||
246 | keycode 253 = | ||
247 | keycode 254 = | ||
248 | |||
249 | add shift = Shift_L | ||
250 | add shift = Shift_R | ||
251 | add shift = Menu | ||
252 | add lock = Caps_Lock | ||
253 | add control = Control_L | ||
254 | add control = Control_R | ||
255 | add mod1 = Alt_L | ||
256 | add mod2 = Num_Lock | ||
257 | !mod3 | ||
258 | add mod4 = Mode_switch | ||
259 | !mod5 | ||
260 | |||
diff --git a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch b/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch new file mode 100644 index 0000000000..eff975e341 --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch | |||
@@ -0,0 +1,355 @@ | |||
1 | COPYING: add GPLv2 license file | ||
2 | |||
3 | this is a local file recipe and the license file is missing.In order | ||
4 | to pass the license checksum checking, the license file is needed. So | ||
5 | this patch add the GPLv2 license file. | ||
6 | |||
7 | Upstream-Status: Inappropriate [licensing] | ||
8 | |||
9 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
10 | |||
11 | diff --git a/COPYING b/COPYING | ||
12 | new file mode 100644 | ||
13 | index 0000000..d511905 | ||
14 | --- /dev/null | ||
15 | +++ b/COPYING | ||
16 | @@ -0,0 +1,339 @@ | ||
17 | + GNU GENERAL PUBLIC LICENSE | ||
18 | + Version 2, June 1991 | ||
19 | + | ||
20 | + Copyright (C) 1989, 1991 Free Software Foundation, Inc., | ||
21 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
22 | + Everyone is permitted to copy and distribute verbatim copies | ||
23 | + of this license document, but changing it is not allowed. | ||
24 | + | ||
25 | + Preamble | ||
26 | + | ||
27 | + The licenses for most software are designed to take away your | ||
28 | +freedom to share and change it. By contrast, the GNU General Public | ||
29 | +License is intended to guarantee your freedom to share and change free | ||
30 | +software--to make sure the software is free for all its users. This | ||
31 | +General Public License applies to most of the Free Software | ||
32 | +Foundation's software and to any other program whose authors commit to | ||
33 | +using it. (Some other Free Software Foundation software is covered by | ||
34 | +the GNU Lesser General Public License instead.) You can apply it to | ||
35 | +your programs, too. | ||
36 | + | ||
37 | + When we speak of free software, we are referring to freedom, not | ||
38 | +price. Our General Public Licenses are designed to make sure that you | ||
39 | +have the freedom to distribute copies of free software (and charge for | ||
40 | +this service if you wish), that you receive source code or can get it | ||
41 | +if you want it, that you can change the software or use pieces of it | ||
42 | +in new free programs; and that you know you can do these things. | ||
43 | + | ||
44 | + To protect your rights, we need to make restrictions that forbid | ||
45 | +anyone to deny you these rights or to ask you to surrender the rights. | ||
46 | +These restrictions translate to certain responsibilities for you if you | ||
47 | +distribute copies of the software, or if you modify it. | ||
48 | + | ||
49 | + For example, if you distribute copies of such a program, whether | ||
50 | +gratis or for a fee, you must give the recipients all the rights that | ||
51 | +you have. You must make sure that they, too, receive or can get the | ||
52 | +source code. And you must show them these terms so they know their | ||
53 | +rights. | ||
54 | + | ||
55 | + We protect your rights with two steps: (1) copyright the software, and | ||
56 | +(2) offer you this license which gives you legal permission to copy, | ||
57 | +distribute and/or modify the software. | ||
58 | + | ||
59 | + Also, for each author's protection and ours, we want to make certain | ||
60 | +that everyone understands that there is no warranty for this free | ||
61 | +software. If the software is modified by someone else and passed on, we | ||
62 | +want its recipients to know that what they have is not the original, so | ||
63 | +that any problems introduced by others will not reflect on the original | ||
64 | +authors' reputations. | ||
65 | + | ||
66 | + Finally, any free program is threatened constantly by software | ||
67 | +patents. We wish to avoid the danger that redistributors of a free | ||
68 | +program will individually obtain patent licenses, in effect making the | ||
69 | +program proprietary. To prevent this, we have made it clear that any | ||
70 | +patent must be licensed for everyone's free use or not licensed at all. | ||
71 | + | ||
72 | + The precise terms and conditions for copying, distribution and | ||
73 | +modification follow. | ||
74 | + | ||
75 | + GNU GENERAL PUBLIC LICENSE | ||
76 | + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||
77 | + | ||
78 | + 0. This License applies to any program or other work which contains | ||
79 | +a notice placed by the copyright holder saying it may be distributed | ||
80 | +under the terms of this General Public License. The "Program", below, | ||
81 | +refers to any such program or work, and a "work based on the Program" | ||
82 | +means either the Program or any derivative work under copyright law: | ||
83 | +that is to say, a work containing the Program or a portion of it, | ||
84 | +either verbatim or with modifications and/or translated into another | ||
85 | +language. (Hereinafter, translation is included without limitation in | ||
86 | +the term "modification".) Each licensee is addressed as "you". | ||
87 | + | ||
88 | +Activities other than copying, distribution and modification are not | ||
89 | +covered by this License; they are outside its scope. The act of | ||
90 | +running the Program is not restricted, and the output from the Program | ||
91 | +is covered only if its contents constitute a work based on the | ||
92 | +Program (independent of having been made by running the Program). | ||
93 | +Whether that is true depends on what the Program does. | ||
94 | + | ||
95 | + 1. You may copy and distribute verbatim copies of the Program's | ||
96 | +source code as you receive it, in any medium, provided that you | ||
97 | +conspicuously and appropriately publish on each copy an appropriate | ||
98 | +copyright notice and disclaimer of warranty; keep intact all the | ||
99 | +notices that refer to this License and to the absence of any warranty; | ||
100 | +and give any other recipients of the Program a copy of this License | ||
101 | +along with the Program. | ||
102 | + | ||
103 | +You may charge a fee for the physical act of transferring a copy, and | ||
104 | +you may at your option offer warranty protection in exchange for a fee. | ||
105 | + | ||
106 | + 2. You may modify your copy or copies of the Program or any portion | ||
107 | +of it, thus forming a work based on the Program, and copy and | ||
108 | +distribute such modifications or work under the terms of Section 1 | ||
109 | +above, provided that you also meet all of these conditions: | ||
110 | + | ||
111 | + a) You must cause the modified files to carry prominent notices | ||
112 | + stating that you changed the files and the date of any change. | ||
113 | + | ||
114 | + b) You must cause any work that you distribute or publish, that in | ||
115 | + whole or in part contains or is derived from the Program or any | ||
116 | + part thereof, to be licensed as a whole at no charge to all third | ||
117 | + parties under the terms of this License. | ||
118 | + | ||
119 | + c) If the modified program normally reads commands interactively | ||
120 | + when run, you must cause it, when started running for such | ||
121 | + interactive use in the most ordinary way, to print or display an | ||
122 | + announcement including an appropriate copyright notice and a | ||
123 | + notice that there is no warranty (or else, saying that you provide | ||
124 | + a warranty) and that users may redistribute the program under | ||
125 | + these conditions, and telling the user how to view a copy of this | ||
126 | + License. (Exception: if the Program itself is interactive but | ||
127 | + does not normally print such an announcement, your work based on | ||
128 | + the Program is not required to print an announcement.) | ||
129 | + | ||
130 | +These requirements apply to the modified work as a whole. If | ||
131 | +identifiable sections of that work are not derived from the Program, | ||
132 | +and can be reasonably considered independent and separate works in | ||
133 | +themselves, then this License, and its terms, do not apply to those | ||
134 | +sections when you distribute them as separate works. But when you | ||
135 | +distribute the same sections as part of a whole which is a work based | ||
136 | +on the Program, the distribution of the whole must be on the terms of | ||
137 | +this License, whose permissions for other licensees extend to the | ||
138 | +entire whole, and thus to each and every part regardless of who wrote it. | ||
139 | + | ||
140 | +Thus, it is not the intent of this section to claim rights or contest | ||
141 | +your rights to work written entirely by you; rather, the intent is to | ||
142 | +exercise the right to control the distribution of derivative or | ||
143 | +collective works based on the Program. | ||
144 | + | ||
145 | +In addition, mere aggregation of another work not based on the Program | ||
146 | +with the Program (or with a work based on the Program) on a volume of | ||
147 | +a storage or distribution medium does not bring the other work under | ||
148 | +the scope of this License. | ||
149 | + | ||
150 | + 3. You may copy and distribute the Program (or a work based on it, | ||
151 | +under Section 2) in object code or executable form under the terms of | ||
152 | +Sections 1 and 2 above provided that you also do one of the following: | ||
153 | + | ||
154 | + a) Accompany it with the complete corresponding machine-readable | ||
155 | + source code, which must be distributed under the terms of Sections | ||
156 | + 1 and 2 above on a medium customarily used for software interchange; or, | ||
157 | + | ||
158 | + b) Accompany it with a written offer, valid for at least three | ||
159 | + years, to give any third party, for a charge no more than your | ||
160 | + cost of physically performing source distribution, a complete | ||
161 | + machine-readable copy of the corresponding source code, to be | ||
162 | + distributed under the terms of Sections 1 and 2 above on a medium | ||
163 | + customarily used for software interchange; or, | ||
164 | + | ||
165 | + c) Accompany it with the information you received as to the offer | ||
166 | + to distribute corresponding source code. (This alternative is | ||
167 | + allowed only for noncommercial distribution and only if you | ||
168 | + received the program in object code or executable form with such | ||
169 | + an offer, in accord with Subsection b above.) | ||
170 | + | ||
171 | +The source code for a work means the preferred form of the work for | ||
172 | +making modifications to it. For an executable work, complete source | ||
173 | +code means all the source code for all modules it contains, plus any | ||
174 | +associated interface definition files, plus the scripts used to | ||
175 | +control compilation and installation of the executable. However, as a | ||
176 | +special exception, the source code distributed need not include | ||
177 | +anything that is normally distributed (in either source or binary | ||
178 | +form) with the major components (compiler, kernel, and so on) of the | ||
179 | +operating system on which the executable runs, unless that component | ||
180 | +itself accompanies the executable. | ||
181 | + | ||
182 | +If distribution of executable or object code is made by offering | ||
183 | +access to copy from a designated place, then offering equivalent | ||
184 | +access to copy the source code from the same place counts as | ||
185 | +distribution of the source code, even though third parties are not | ||
186 | +compelled to copy the source along with the object code. | ||
187 | + | ||
188 | + 4. You may not copy, modify, sublicense, or distribute the Program | ||
189 | +except as expressly provided under this License. Any attempt | ||
190 | +otherwise to copy, modify, sublicense or distribute the Program is | ||
191 | +void, and will automatically terminate your rights under this License. | ||
192 | +However, parties who have received copies, or rights, from you under | ||
193 | +this License will not have their licenses terminated so long as such | ||
194 | +parties remain in full compliance. | ||
195 | + | ||
196 | + 5. You are not required to accept this License, since you have not | ||
197 | +signed it. However, nothing else grants you permission to modify or | ||
198 | +distribute the Program or its derivative works. These actions are | ||
199 | +prohibited by law if you do not accept this License. Therefore, by | ||
200 | +modifying or distributing the Program (or any work based on the | ||
201 | +Program), you indicate your acceptance of this License to do so, and | ||
202 | +all its terms and conditions for copying, distributing or modifying | ||
203 | +the Program or works based on it. | ||
204 | + | ||
205 | + 6. Each time you redistribute the Program (or any work based on the | ||
206 | +Program), the recipient automatically receives a license from the | ||
207 | +original licensor to copy, distribute or modify the Program subject to | ||
208 | +these terms and conditions. You may not impose any further | ||
209 | +restrictions on the recipients' exercise of the rights granted herein. | ||
210 | +You are not responsible for enforcing compliance by third parties to | ||
211 | +this License. | ||
212 | + | ||
213 | + 7. If, as a consequence of a court judgment or allegation of patent | ||
214 | +infringement or for any other reason (not limited to patent issues), | ||
215 | +conditions are imposed on you (whether by court order, agreement or | ||
216 | +otherwise) that contradict the conditions of this License, they do not | ||
217 | +excuse you from the conditions of this License. If you cannot | ||
218 | +distribute so as to satisfy simultaneously your obligations under this | ||
219 | +License and any other pertinent obligations, then as a consequence you | ||
220 | +may not distribute the Program at all. For example, if a patent | ||
221 | +license would not permit royalty-free redistribution of the Program by | ||
222 | +all those who receive copies directly or indirectly through you, then | ||
223 | +the only way you could satisfy both it and this License would be to | ||
224 | +refrain entirely from distribution of the Program. | ||
225 | + | ||
226 | +If any portion of this section is held invalid or unenforceable under | ||
227 | +any particular circumstance, the balance of the section is intended to | ||
228 | +apply and the section as a whole is intended to apply in other | ||
229 | +circumstances. | ||
230 | + | ||
231 | +It is not the purpose of this section to induce you to infringe any | ||
232 | +patents or other property right claims or to contest validity of any | ||
233 | +such claims; this section has the sole purpose of protecting the | ||
234 | +integrity of the free software distribution system, which is | ||
235 | +implemented by public license practices. Many people have made | ||
236 | +generous contributions to the wide range of software distributed | ||
237 | +through that system in reliance on consistent application of that | ||
238 | +system; it is up to the author/donor to decide if he or she is willing | ||
239 | +to distribute software through any other system and a licensee cannot | ||
240 | +impose that choice. | ||
241 | + | ||
242 | +This section is intended to make thoroughly clear what is believed to | ||
243 | +be a consequence of the rest of this License. | ||
244 | + | ||
245 | + 8. If the distribution and/or use of the Program is restricted in | ||
246 | +certain countries either by patents or by copyrighted interfaces, the | ||
247 | +original copyright holder who places the Program under this License | ||
248 | +may add an explicit geographical distribution limitation excluding | ||
249 | +those countries, so that distribution is permitted only in or among | ||
250 | +countries not thus excluded. In such case, this License incorporates | ||
251 | +the limitation as if written in the body of this License. | ||
252 | + | ||
253 | + 9. The Free Software Foundation may publish revised and/or new versions | ||
254 | +of the General Public License from time to time. Such new versions will | ||
255 | +be similar in spirit to the present version, but may differ in detail to | ||
256 | +address new problems or concerns. | ||
257 | + | ||
258 | +Each version is given a distinguishing version number. If the Program | ||
259 | +specifies a version number of this License which applies to it and "any | ||
260 | +later version", you have the option of following the terms and conditions | ||
261 | +either of that version or of any later version published by the Free | ||
262 | +Software Foundation. If the Program does not specify a version number of | ||
263 | +this License, you may choose any version ever published by the Free Software | ||
264 | +Foundation. | ||
265 | + | ||
266 | + 10. If you wish to incorporate parts of the Program into other free | ||
267 | +programs whose distribution conditions are different, write to the author | ||
268 | +to ask for permission. For software which is copyrighted by the Free | ||
269 | +Software Foundation, write to the Free Software Foundation; we sometimes | ||
270 | +make exceptions for this. Our decision will be guided by the two goals | ||
271 | +of preserving the free status of all derivatives of our free software and | ||
272 | +of promoting the sharing and reuse of software generally. | ||
273 | + | ||
274 | + NO WARRANTY | ||
275 | + | ||
276 | + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY | ||
277 | +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN | ||
278 | +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES | ||
279 | +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED | ||
280 | +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
281 | +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS | ||
282 | +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE | ||
283 | +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, | ||
284 | +REPAIR OR CORRECTION. | ||
285 | + | ||
286 | + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||
287 | +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR | ||
288 | +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, | ||
289 | +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING | ||
290 | +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED | ||
291 | +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY | ||
292 | +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER | ||
293 | +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE | ||
294 | +POSSIBILITY OF SUCH DAMAGES. | ||
295 | + | ||
296 | + END OF TERMS AND CONDITIONS | ||
297 | + | ||
298 | + How to Apply These Terms to Your New Programs | ||
299 | + | ||
300 | + If you develop a new program, and you want it to be of the greatest | ||
301 | +possible use to the public, the best way to achieve this is to make it | ||
302 | +free software which everyone can redistribute and change under these terms. | ||
303 | + | ||
304 | + To do so, attach the following notices to the program. It is safest | ||
305 | +to attach them to the start of each source file to most effectively | ||
306 | +convey the exclusion of warranty; and each file should have at least | ||
307 | +the "copyright" line and a pointer to where the full notice is found. | ||
308 | + | ||
309 | + <one line to give the program's name and a brief idea of what it does.> | ||
310 | + Copyright (C) <year> <name of author> | ||
311 | + | ||
312 | + This program is free software; you can redistribute it and/or modify | ||
313 | + it under the terms of the GNU General Public License as published by | ||
314 | + the Free Software Foundation; either version 2 of the License, or | ||
315 | + (at your option) any later version. | ||
316 | + | ||
317 | + This program is distributed in the hope that it will be useful, | ||
318 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
319 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
320 | + GNU General Public License for more details. | ||
321 | + | ||
322 | + You should have received a copy of the GNU General Public License along | ||
323 | + with this program; if not, write to the Free Software Foundation, Inc., | ||
324 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
325 | + | ||
326 | +Also add information on how to contact you by electronic and paper mail. | ||
327 | + | ||
328 | +If the program is interactive, make it output a short notice like this | ||
329 | +when it starts in an interactive mode: | ||
330 | + | ||
331 | + Gnomovision version 69, Copyright (C) year name of author | ||
332 | + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. | ||
333 | + This is free software, and you are welcome to redistribute it | ||
334 | + under certain conditions; type `show c' for details. | ||
335 | + | ||
336 | +The hypothetical commands `show w' and `show c' should show the appropriate | ||
337 | +parts of the General Public License. Of course, the commands you use may | ||
338 | +be called something other than `show w' and `show c'; they could even be | ||
339 | +mouse-clicks or menu items--whatever suits your program. | ||
340 | + | ||
341 | +You should also get your employer (if you work as a programmer) or your | ||
342 | +school, if any, to sign a "copyright disclaimer" for the program, if | ||
343 | +necessary. Here is a sample; alter the names: | ||
344 | + | ||
345 | + Yoyodyne, Inc., hereby disclaims all copyright interest in the program | ||
346 | + `Gnomovision' (which makes passes at compilers) written by James Hacker. | ||
347 | + | ||
348 | + <signature of Ty Coon>, 1 April 1989 | ||
349 | + Ty Coon, President of Vice | ||
350 | + | ||
351 | +This General Public License does not permit incorporating your program into | ||
352 | +proprietary programs. If your program is a subroutine library, you may | ||
353 | +consider it more useful to permit linking proprietary applications with the | ||
354 | +library. If this is what you want to do, use the GNU Lesser General | ||
355 | +Public License instead of this License. | ||
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb new file mode 100644 index 0000000000..a2d8885cc7 --- /dev/null +++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | SUMMARY = "Common X11 scripts and configuration files" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
4 | SECTION = "x11" | ||
5 | PR = "r47" | ||
6 | |||
7 | SRC_URI = "file://etc \ | ||
8 | file://gplv2-license.patch" | ||
9 | |||
10 | S = "${WORKDIR}" | ||
11 | |||
12 | do_install() { | ||
13 | cp -R ${S}/etc ${D}${sysconfdir} | ||
14 | chmod -R 755 ${D}${sysconfdir} | ||
15 | find ${D}${sysconfdir} -type f -name \*~ -exec rm -rf {} \; | ||
16 | } | ||
17 | |||
18 | RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" | ||
19 | |||
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb new file mode 100644 index 0000000000..b68d40e1be --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb | |||
@@ -0,0 +1,52 @@ | |||
1 | SUMMARY = "Simple Xserver Init Script (no dm)" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
4 | SECTION = "x11" | ||
5 | PR = "r31" | ||
6 | |||
7 | SRC_URI = "file://xserver-nodm \ | ||
8 | file://Xusername \ | ||
9 | file://gplv2-license.patch \ | ||
10 | file://xserver-nodm.service \ | ||
11 | file://xserver-nodm.conf \ | ||
12 | " | ||
13 | |||
14 | S = "${WORKDIR}" | ||
15 | |||
16 | # Since we refer to ROOTLESS_X which is normally enabled per-machine | ||
17 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
18 | |||
19 | inherit update-rc.d systemd | ||
20 | |||
21 | do_install() { | ||
22 | install -d ${D}${sysconfdir}/init.d | ||
23 | install xserver-nodm ${D}${sysconfdir}/init.d | ||
24 | |||
25 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
26 | install -d ${D}${sysconfdir}/default | ||
27 | install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm | ||
28 | install -d ${D}${systemd_unitdir}/system | ||
29 | install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system | ||
30 | if [ "${ROOTLESS_X}" = "1" ] ; then | ||
31 | sed -i 's!^HOME=.*!HOME=/home/xuser!' ${D}${sysconfdir}/default/xserver-nodm | ||
32 | sed -i 's!^User=.*!User=xuser!' ${D}${systemd_unitdir}/system/xserver-nodm.service | ||
33 | else | ||
34 | sed -i 's!^HOME=.*!HOME=${ROOT_HOME}!' ${D}${sysconfdir}/default/xserver-nodm | ||
35 | sed -i '/^User=/d' ${D}${systemd_unitdir}/system/xserver-nodm.service | ||
36 | fi | ||
37 | fi | ||
38 | |||
39 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | ||
40 | if [ "${ROOTLESS_X}" = "1" ] ; then | ||
41 | install -d ${D}${sysconfdir}/X11 | ||
42 | install Xusername ${D}${sysconfdir}/X11 | ||
43 | fi | ||
44 | fi | ||
45 | } | ||
46 | |||
47 | RDEPENDS_${PN} = "${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" | ||
48 | |||
49 | INITSCRIPT_NAME = "xserver-nodm" | ||
50 | INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." | ||
51 | SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" | ||
52 | |||
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername b/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername new file mode 100644 index 0000000000..7060e5ec16 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername | |||
@@ -0,0 +1 @@ | |||
xuser | |||
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch b/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch new file mode 100644 index 0000000000..eff975e341 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch | |||
@@ -0,0 +1,355 @@ | |||
1 | COPYING: add GPLv2 license file | ||
2 | |||
3 | this is a local file recipe and the license file is missing.In order | ||
4 | to pass the license checksum checking, the license file is needed. So | ||
5 | this patch add the GPLv2 license file. | ||
6 | |||
7 | Upstream-Status: Inappropriate [licensing] | ||
8 | |||
9 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
10 | |||
11 | diff --git a/COPYING b/COPYING | ||
12 | new file mode 100644 | ||
13 | index 0000000..d511905 | ||
14 | --- /dev/null | ||
15 | +++ b/COPYING | ||
16 | @@ -0,0 +1,339 @@ | ||
17 | + GNU GENERAL PUBLIC LICENSE | ||
18 | + Version 2, June 1991 | ||
19 | + | ||
20 | + Copyright (C) 1989, 1991 Free Software Foundation, Inc., | ||
21 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
22 | + Everyone is permitted to copy and distribute verbatim copies | ||
23 | + of this license document, but changing it is not allowed. | ||
24 | + | ||
25 | + Preamble | ||
26 | + | ||
27 | + The licenses for most software are designed to take away your | ||
28 | +freedom to share and change it. By contrast, the GNU General Public | ||
29 | +License is intended to guarantee your freedom to share and change free | ||
30 | +software--to make sure the software is free for all its users. This | ||
31 | +General Public License applies to most of the Free Software | ||
32 | +Foundation's software and to any other program whose authors commit to | ||
33 | +using it. (Some other Free Software Foundation software is covered by | ||
34 | +the GNU Lesser General Public License instead.) You can apply it to | ||
35 | +your programs, too. | ||
36 | + | ||
37 | + When we speak of free software, we are referring to freedom, not | ||
38 | +price. Our General Public Licenses are designed to make sure that you | ||
39 | +have the freedom to distribute copies of free software (and charge for | ||
40 | +this service if you wish), that you receive source code or can get it | ||
41 | +if you want it, that you can change the software or use pieces of it | ||
42 | +in new free programs; and that you know you can do these things. | ||
43 | + | ||
44 | + To protect your rights, we need to make restrictions that forbid | ||
45 | +anyone to deny you these rights or to ask you to surrender the rights. | ||
46 | +These restrictions translate to certain responsibilities for you if you | ||
47 | +distribute copies of the software, or if you modify it. | ||
48 | + | ||
49 | + For example, if you distribute copies of such a program, whether | ||
50 | +gratis or for a fee, you must give the recipients all the rights that | ||
51 | +you have. You must make sure that they, too, receive or can get the | ||
52 | +source code. And you must show them these terms so they know their | ||
53 | +rights. | ||
54 | + | ||
55 | + We protect your rights with two steps: (1) copyright the software, and | ||
56 | +(2) offer you this license which gives you legal permission to copy, | ||
57 | +distribute and/or modify the software. | ||
58 | + | ||
59 | + Also, for each author's protection and ours, we want to make certain | ||
60 | +that everyone understands that there is no warranty for this free | ||
61 | +software. If the software is modified by someone else and passed on, we | ||
62 | +want its recipients to know that what they have is not the original, so | ||
63 | +that any problems introduced by others will not reflect on the original | ||
64 | +authors' reputations. | ||
65 | + | ||
66 | + Finally, any free program is threatened constantly by software | ||
67 | +patents. We wish to avoid the danger that redistributors of a free | ||
68 | +program will individually obtain patent licenses, in effect making the | ||
69 | +program proprietary. To prevent this, we have made it clear that any | ||
70 | +patent must be licensed for everyone's free use or not licensed at all. | ||
71 | + | ||
72 | + The precise terms and conditions for copying, distribution and | ||
73 | +modification follow. | ||
74 | + | ||
75 | + GNU GENERAL PUBLIC LICENSE | ||
76 | + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||
77 | + | ||
78 | + 0. This License applies to any program or other work which contains | ||
79 | +a notice placed by the copyright holder saying it may be distributed | ||
80 | +under the terms of this General Public License. The "Program", below, | ||
81 | +refers to any such program or work, and a "work based on the Program" | ||
82 | +means either the Program or any derivative work under copyright law: | ||
83 | +that is to say, a work containing the Program or a portion of it, | ||
84 | +either verbatim or with modifications and/or translated into another | ||
85 | +language. (Hereinafter, translation is included without limitation in | ||
86 | +the term "modification".) Each licensee is addressed as "you". | ||
87 | + | ||
88 | +Activities other than copying, distribution and modification are not | ||
89 | +covered by this License; they are outside its scope. The act of | ||
90 | +running the Program is not restricted, and the output from the Program | ||
91 | +is covered only if its contents constitute a work based on the | ||
92 | +Program (independent of having been made by running the Program). | ||
93 | +Whether that is true depends on what the Program does. | ||
94 | + | ||
95 | + 1. You may copy and distribute verbatim copies of the Program's | ||
96 | +source code as you receive it, in any medium, provided that you | ||
97 | +conspicuously and appropriately publish on each copy an appropriate | ||
98 | +copyright notice and disclaimer of warranty; keep intact all the | ||
99 | +notices that refer to this License and to the absence of any warranty; | ||
100 | +and give any other recipients of the Program a copy of this License | ||
101 | +along with the Program. | ||
102 | + | ||
103 | +You may charge a fee for the physical act of transferring a copy, and | ||
104 | +you may at your option offer warranty protection in exchange for a fee. | ||
105 | + | ||
106 | + 2. You may modify your copy or copies of the Program or any portion | ||
107 | +of it, thus forming a work based on the Program, and copy and | ||
108 | +distribute such modifications or work under the terms of Section 1 | ||
109 | +above, provided that you also meet all of these conditions: | ||
110 | + | ||
111 | + a) You must cause the modified files to carry prominent notices | ||
112 | + stating that you changed the files and the date of any change. | ||
113 | + | ||
114 | + b) You must cause any work that you distribute or publish, that in | ||
115 | + whole or in part contains or is derived from the Program or any | ||
116 | + part thereof, to be licensed as a whole at no charge to all third | ||
117 | + parties under the terms of this License. | ||
118 | + | ||
119 | + c) If the modified program normally reads commands interactively | ||
120 | + when run, you must cause it, when started running for such | ||
121 | + interactive use in the most ordinary way, to print or display an | ||
122 | + announcement including an appropriate copyright notice and a | ||
123 | + notice that there is no warranty (or else, saying that you provide | ||
124 | + a warranty) and that users may redistribute the program under | ||
125 | + these conditions, and telling the user how to view a copy of this | ||
126 | + License. (Exception: if the Program itself is interactive but | ||
127 | + does not normally print such an announcement, your work based on | ||
128 | + the Program is not required to print an announcement.) | ||
129 | + | ||
130 | +These requirements apply to the modified work as a whole. If | ||
131 | +identifiable sections of that work are not derived from the Program, | ||
132 | +and can be reasonably considered independent and separate works in | ||
133 | +themselves, then this License, and its terms, do not apply to those | ||
134 | +sections when you distribute them as separate works. But when you | ||
135 | +distribute the same sections as part of a whole which is a work based | ||
136 | +on the Program, the distribution of the whole must be on the terms of | ||
137 | +this License, whose permissions for other licensees extend to the | ||
138 | +entire whole, and thus to each and every part regardless of who wrote it. | ||
139 | + | ||
140 | +Thus, it is not the intent of this section to claim rights or contest | ||
141 | +your rights to work written entirely by you; rather, the intent is to | ||
142 | +exercise the right to control the distribution of derivative or | ||
143 | +collective works based on the Program. | ||
144 | + | ||
145 | +In addition, mere aggregation of another work not based on the Program | ||
146 | +with the Program (or with a work based on the Program) on a volume of | ||
147 | +a storage or distribution medium does not bring the other work under | ||
148 | +the scope of this License. | ||
149 | + | ||
150 | + 3. You may copy and distribute the Program (or a work based on it, | ||
151 | +under Section 2) in object code or executable form under the terms of | ||
152 | +Sections 1 and 2 above provided that you also do one of the following: | ||
153 | + | ||
154 | + a) Accompany it with the complete corresponding machine-readable | ||
155 | + source code, which must be distributed under the terms of Sections | ||
156 | + 1 and 2 above on a medium customarily used for software interchange; or, | ||
157 | + | ||
158 | + b) Accompany it with a written offer, valid for at least three | ||
159 | + years, to give any third party, for a charge no more than your | ||
160 | + cost of physically performing source distribution, a complete | ||
161 | + machine-readable copy of the corresponding source code, to be | ||
162 | + distributed under the terms of Sections 1 and 2 above on a medium | ||
163 | + customarily used for software interchange; or, | ||
164 | + | ||
165 | + c) Accompany it with the information you received as to the offer | ||
166 | + to distribute corresponding source code. (This alternative is | ||
167 | + allowed only for noncommercial distribution and only if you | ||
168 | + received the program in object code or executable form with such | ||
169 | + an offer, in accord with Subsection b above.) | ||
170 | + | ||
171 | +The source code for a work means the preferred form of the work for | ||
172 | +making modifications to it. For an executable work, complete source | ||
173 | +code means all the source code for all modules it contains, plus any | ||
174 | +associated interface definition files, plus the scripts used to | ||
175 | +control compilation and installation of the executable. However, as a | ||
176 | +special exception, the source code distributed need not include | ||
177 | +anything that is normally distributed (in either source or binary | ||
178 | +form) with the major components (compiler, kernel, and so on) of the | ||
179 | +operating system on which the executable runs, unless that component | ||
180 | +itself accompanies the executable. | ||
181 | + | ||
182 | +If distribution of executable or object code is made by offering | ||
183 | +access to copy from a designated place, then offering equivalent | ||
184 | +access to copy the source code from the same place counts as | ||
185 | +distribution of the source code, even though third parties are not | ||
186 | +compelled to copy the source along with the object code. | ||
187 | + | ||
188 | + 4. You may not copy, modify, sublicense, or distribute the Program | ||
189 | +except as expressly provided under this License. Any attempt | ||
190 | +otherwise to copy, modify, sublicense or distribute the Program is | ||
191 | +void, and will automatically terminate your rights under this License. | ||
192 | +However, parties who have received copies, or rights, from you under | ||
193 | +this License will not have their licenses terminated so long as such | ||
194 | +parties remain in full compliance. | ||
195 | + | ||
196 | + 5. You are not required to accept this License, since you have not | ||
197 | +signed it. However, nothing else grants you permission to modify or | ||
198 | +distribute the Program or its derivative works. These actions are | ||
199 | +prohibited by law if you do not accept this License. Therefore, by | ||
200 | +modifying or distributing the Program (or any work based on the | ||
201 | +Program), you indicate your acceptance of this License to do so, and | ||
202 | +all its terms and conditions for copying, distributing or modifying | ||
203 | +the Program or works based on it. | ||
204 | + | ||
205 | + 6. Each time you redistribute the Program (or any work based on the | ||
206 | +Program), the recipient automatically receives a license from the | ||
207 | +original licensor to copy, distribute or modify the Program subject to | ||
208 | +these terms and conditions. You may not impose any further | ||
209 | +restrictions on the recipients' exercise of the rights granted herein. | ||
210 | +You are not responsible for enforcing compliance by third parties to | ||
211 | +this License. | ||
212 | + | ||
213 | + 7. If, as a consequence of a court judgment or allegation of patent | ||
214 | +infringement or for any other reason (not limited to patent issues), | ||
215 | +conditions are imposed on you (whether by court order, agreement or | ||
216 | +otherwise) that contradict the conditions of this License, they do not | ||
217 | +excuse you from the conditions of this License. If you cannot | ||
218 | +distribute so as to satisfy simultaneously your obligations under this | ||
219 | +License and any other pertinent obligations, then as a consequence you | ||
220 | +may not distribute the Program at all. For example, if a patent | ||
221 | +license would not permit royalty-free redistribution of the Program by | ||
222 | +all those who receive copies directly or indirectly through you, then | ||
223 | +the only way you could satisfy both it and this License would be to | ||
224 | +refrain entirely from distribution of the Program. | ||
225 | + | ||
226 | +If any portion of this section is held invalid or unenforceable under | ||
227 | +any particular circumstance, the balance of the section is intended to | ||
228 | +apply and the section as a whole is intended to apply in other | ||
229 | +circumstances. | ||
230 | + | ||
231 | +It is not the purpose of this section to induce you to infringe any | ||
232 | +patents or other property right claims or to contest validity of any | ||
233 | +such claims; this section has the sole purpose of protecting the | ||
234 | +integrity of the free software distribution system, which is | ||
235 | +implemented by public license practices. Many people have made | ||
236 | +generous contributions to the wide range of software distributed | ||
237 | +through that system in reliance on consistent application of that | ||
238 | +system; it is up to the author/donor to decide if he or she is willing | ||
239 | +to distribute software through any other system and a licensee cannot | ||
240 | +impose that choice. | ||
241 | + | ||
242 | +This section is intended to make thoroughly clear what is believed to | ||
243 | +be a consequence of the rest of this License. | ||
244 | + | ||
245 | + 8. If the distribution and/or use of the Program is restricted in | ||
246 | +certain countries either by patents or by copyrighted interfaces, the | ||
247 | +original copyright holder who places the Program under this License | ||
248 | +may add an explicit geographical distribution limitation excluding | ||
249 | +those countries, so that distribution is permitted only in or among | ||
250 | +countries not thus excluded. In such case, this License incorporates | ||
251 | +the limitation as if written in the body of this License. | ||
252 | + | ||
253 | + 9. The Free Software Foundation may publish revised and/or new versions | ||
254 | +of the General Public License from time to time. Such new versions will | ||
255 | +be similar in spirit to the present version, but may differ in detail to | ||
256 | +address new problems or concerns. | ||
257 | + | ||
258 | +Each version is given a distinguishing version number. If the Program | ||
259 | +specifies a version number of this License which applies to it and "any | ||
260 | +later version", you have the option of following the terms and conditions | ||
261 | +either of that version or of any later version published by the Free | ||
262 | +Software Foundation. If the Program does not specify a version number of | ||
263 | +this License, you may choose any version ever published by the Free Software | ||
264 | +Foundation. | ||
265 | + | ||
266 | + 10. If you wish to incorporate parts of the Program into other free | ||
267 | +programs whose distribution conditions are different, write to the author | ||
268 | +to ask for permission. For software which is copyrighted by the Free | ||
269 | +Software Foundation, write to the Free Software Foundation; we sometimes | ||
270 | +make exceptions for this. Our decision will be guided by the two goals | ||
271 | +of preserving the free status of all derivatives of our free software and | ||
272 | +of promoting the sharing and reuse of software generally. | ||
273 | + | ||
274 | + NO WARRANTY | ||
275 | + | ||
276 | + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY | ||
277 | +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN | ||
278 | +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES | ||
279 | +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED | ||
280 | +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
281 | +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS | ||
282 | +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE | ||
283 | +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, | ||
284 | +REPAIR OR CORRECTION. | ||
285 | + | ||
286 | + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||
287 | +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR | ||
288 | +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, | ||
289 | +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING | ||
290 | +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED | ||
291 | +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY | ||
292 | +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER | ||
293 | +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE | ||
294 | +POSSIBILITY OF SUCH DAMAGES. | ||
295 | + | ||
296 | + END OF TERMS AND CONDITIONS | ||
297 | + | ||
298 | + How to Apply These Terms to Your New Programs | ||
299 | + | ||
300 | + If you develop a new program, and you want it to be of the greatest | ||
301 | +possible use to the public, the best way to achieve this is to make it | ||
302 | +free software which everyone can redistribute and change under these terms. | ||
303 | + | ||
304 | + To do so, attach the following notices to the program. It is safest | ||
305 | +to attach them to the start of each source file to most effectively | ||
306 | +convey the exclusion of warranty; and each file should have at least | ||
307 | +the "copyright" line and a pointer to where the full notice is found. | ||
308 | + | ||
309 | + <one line to give the program's name and a brief idea of what it does.> | ||
310 | + Copyright (C) <year> <name of author> | ||
311 | + | ||
312 | + This program is free software; you can redistribute it and/or modify | ||
313 | + it under the terms of the GNU General Public License as published by | ||
314 | + the Free Software Foundation; either version 2 of the License, or | ||
315 | + (at your option) any later version. | ||
316 | + | ||
317 | + This program is distributed in the hope that it will be useful, | ||
318 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
319 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
320 | + GNU General Public License for more details. | ||
321 | + | ||
322 | + You should have received a copy of the GNU General Public License along | ||
323 | + with this program; if not, write to the Free Software Foundation, Inc., | ||
324 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
325 | + | ||
326 | +Also add information on how to contact you by electronic and paper mail. | ||
327 | + | ||
328 | +If the program is interactive, make it output a short notice like this | ||
329 | +when it starts in an interactive mode: | ||
330 | + | ||
331 | + Gnomovision version 69, Copyright (C) year name of author | ||
332 | + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. | ||
333 | + This is free software, and you are welcome to redistribute it | ||
334 | + under certain conditions; type `show c' for details. | ||
335 | + | ||
336 | +The hypothetical commands `show w' and `show c' should show the appropriate | ||
337 | +parts of the General Public License. Of course, the commands you use may | ||
338 | +be called something other than `show w' and `show c'; they could even be | ||
339 | +mouse-clicks or menu items--whatever suits your program. | ||
340 | + | ||
341 | +You should also get your employer (if you work as a programmer) or your | ||
342 | +school, if any, to sign a "copyright disclaimer" for the program, if | ||
343 | +necessary. Here is a sample; alter the names: | ||
344 | + | ||
345 | + Yoyodyne, Inc., hereby disclaims all copyright interest in the program | ||
346 | + `Gnomovision' (which makes passes at compilers) written by James Hacker. | ||
347 | + | ||
348 | + <signature of Ty Coon>, 1 April 1989 | ||
349 | + Ty Coon, President of Vice | ||
350 | + | ||
351 | +This General Public License does not permit incorporating your program into | ||
352 | +proprietary programs. If your program is a subroutine library, you may | ||
353 | +consider it more useful to permit linking proprietary applications with the | ||
354 | +library. If this is what you want to do, use the GNU Lesser General | ||
355 | +Public License instead of this License. | ||
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm new file mode 100755 index 0000000000..ef6c11c3f2 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | |||
@@ -0,0 +1,64 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | ### BEGIN INIT INFO | ||
4 | # Provides: xserver | ||
5 | # Required-Start: $local_fs $remote_fs dbus | ||
6 | # Required-Stop: $local_fs $remote_fs | ||
7 | # Default-Start: 5 | ||
8 | # Default-Stop: 0 1 2 3 6 | ||
9 | ### END INIT INFO | ||
10 | |||
11 | killproc() { # kill the named process(es) | ||
12 | pid=`/bin/pidof $1` | ||
13 | [ "$pid" != "" ] && kill $pid | ||
14 | } | ||
15 | |||
16 | read CMDLINE < /proc/cmdline | ||
17 | for x in $CMDLINE; do | ||
18 | case $x in | ||
19 | x11=false) | ||
20 | echo "X Server disabled" | ||
21 | exit 0; | ||
22 | ;; | ||
23 | esac | ||
24 | done | ||
25 | |||
26 | case "$1" in | ||
27 | start) | ||
28 | . /etc/profile | ||
29 | username=root | ||
30 | echo "Starting Xserver" | ||
31 | if [ -f /etc/X11/Xusername ]; then | ||
32 | username=`cat /etc/X11/Xusername` | ||
33 | # setting for rootless X | ||
34 | chmod o+w /var/log | ||
35 | chmod g+r /dev/tty[0-3] | ||
36 | # hidraw device is probably needed | ||
37 | if [ -e /dev/hidraw0 ]; then | ||
38 | chmod o+rw /dev/hidraw* | ||
39 | fi | ||
40 | fi | ||
41 | # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] | ||
42 | su -l -c '/etc/X11/Xserver&' $username | ||
43 | # Wait for the desktop to say its finished loading | ||
44 | # before loading the rest of the system | ||
45 | # dbus-wait org.matchbox_project.desktop Loaded | ||
46 | ;; | ||
47 | |||
48 | stop) | ||
49 | echo "Stopping XServer" | ||
50 | killproc xinit | ||
51 | ;; | ||
52 | |||
53 | restart) | ||
54 | $0 stop | ||
55 | sleep 1 | ||
56 | $0 start | ||
57 | ;; | ||
58 | |||
59 | *) | ||
60 | echo "usage: $0 { start | stop | restart }" | ||
61 | ;; | ||
62 | esac | ||
63 | |||
64 | exit 0 | ||
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf new file mode 100644 index 0000000000..3c0582a87e --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf | |||
@@ -0,0 +1 @@ | |||
HOME=/home/root | |||
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service new file mode 100644 index 0000000000..62d979f1d6 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service | |||
@@ -0,0 +1,10 @@ | |||
1 | [Unit] | ||
2 | Description=Xserver startup without a display manager | ||
3 | |||
4 | [Service] | ||
5 | User=root | ||
6 | EnvironmentFile=/etc/default/xserver-nodm | ||
7 | ExecStart=/etc/X11/Xserver | ||
8 | |||
9 | [Install] | ||
10 | Alias=display-manager.service | ||
diff --git a/meta/recipes-graphics/x11vnc/files/endian-fix.patch b/meta/recipes-graphics/x11vnc/files/endian-fix.patch new file mode 100644 index 0000000000..f2a538bf63 --- /dev/null +++ b/meta/recipes-graphics/x11vnc/files/endian-fix.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN | ||
2 | |||
3 | since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is | ||
4 | automatically set for different arch, it is better to use WORDS_BIGENDIAN | ||
5 | instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips. | ||
6 | |||
7 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | diff --git a/libvncserver/main.c b/libvncserver/main.c | ||
12 | index b6bd930..8bbb7bf 100644 | ||
13 | --- a/libvncserver/main.c | ||
14 | +++ b/libvncserver/main.c | ||
15 | @@ -47,7 +47,7 @@ static MUTEX(extMutex); | ||
16 | |||
17 | static int rfbEnableLogging=1; | ||
18 | |||
19 | -#ifdef LIBVNCSERVER_WORDS_BIGENDIAN | ||
20 | +#ifdef WORDS_BIGENDIAN | ||
21 | char rfbEndianTest = (1==0); | ||
22 | #else | ||
23 | char rfbEndianTest = (1==1); | ||
24 | |||
diff --git a/meta/recipes-graphics/x11vnc/files/starting-fix.patch b/meta/recipes-graphics/x11vnc/files/starting-fix.patch new file mode 100644 index 0000000000..f62e405dd1 --- /dev/null +++ b/meta/recipes-graphics/x11vnc/files/starting-fix.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | "-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start. | ||
2 | Removing these 2 parameters makes x11vnc works well on poky sato image. | ||
3 | |||
4 | Add also -skip_lockkeys option to ignore all Caps_Lock, Shift_Lock, Num_Lock, | ||
5 | Scroll_Lock keysyms received from viewers, in order to leave the lock state on | ||
6 | the server side unchanged. Yet, the keys will appear correctly. | ||
7 | |||
8 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
9 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop | ||
14 | =================================================================== | ||
15 | --- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800 | ||
16 | +++ x11vnc-0.9.12/x11vnc/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800 | ||
17 | @@ -1,7 +1,7 @@ | ||
18 | [Desktop Entry] | ||
19 | Name=X11VNC Server | ||
20 | Comment=Share this desktop by VNC | ||
21 | -Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY | ||
22 | +Exec=x11vnc -bg -rfbport 5900 -skip_lockkeys -o %%HOME/.x11vnc.log.%%VNCDISPLAY | ||
23 | Icon=computer | ||
24 | Terminal=false | ||
25 | Type=Application | ||
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb new file mode 100644 index 0000000000..3d98172442 --- /dev/null +++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "Exports your X session on-the-fly via VNC" | ||
2 | HOMEPAGE = "http://www.karlrunge.com/x11vnc/" | ||
3 | |||
4 | SECTION = "x11/utils" | ||
5 | AUTHOR = "Karl Runge" | ||
6 | LICENSE = "GPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ | ||
8 | file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e" | ||
9 | |||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ | ||
11 | file://starting-fix.patch \ | ||
12 | file://endian-fix.patch " | ||
13 | |||
14 | SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c" | ||
15 | SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b" | ||
16 | |||
17 | DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst" | ||
18 | |||
19 | inherit autotools-brokensep | ||
20 | |||
21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" | ||
22 | PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" | ||
23 | PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" | ||
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch new file mode 100644 index 0000000000..cfac55c7ba --- /dev/null +++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Fix typo in Makefile | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am | ||
6 | =================================================================== | ||
7 | --- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:04.001435305 +0000 | ||
8 | +++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:04.061435302 +0000 | ||
9 | @@ -79,7 +79,7 @@ | ||
10 | ul_angle \ | ||
11 | ur_angle \ | ||
12 | v_double_arrow \ | ||
13 | - watcha \ | ||
14 | + watch \ | ||
15 | xterm | ||
16 | |||
17 | CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors | ||
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch new file mode 100644 index 0000000000..5028fd6bf1 --- /dev/null +++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Use relative symlink for link rather than absolute path which | ||
2 | doesn't work well in DESTDIR setting. | ||
3 | |||
4 | Also fix out of tree builds to use correct srcdir. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | RP 2013/3/8 | ||
9 | |||
10 | Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am | ||
11 | =================================================================== | ||
12 | --- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:03.933435307 +0000 | ||
13 | +++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:27.293434755 +0000 | ||
14 | @@ -88,9 +88,9 @@ | ||
15 | |||
16 | install-data-local: | ||
17 | $(mkinstalldirs) $(DESTDIR)$(CURSOR_DIR); | ||
18 | - $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ | ||
19 | + $(INSTALL_DATA) $(srcdir)/$(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ | ||
20 | for CURSOR in $(CURSOR_NAMES); do \ | ||
21 | echo '-- Installing cursor '$$CURSOR; \ | ||
22 | - ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ | ||
23 | + ln -s transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ | ||
24 | done | ||
25 | |||
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb new file mode 100644 index 0000000000..5e668abd40 --- /dev/null +++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | SUMMARY = "Transparent X11 cursor theme for touchscreens" | ||
2 | HOMEPAGE = "http://www.matchbox-project.org/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
7 | |||
8 | SECTION = "x11/base" | ||
9 | PR = "r4" | ||
10 | |||
11 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz \ | ||
12 | file://use-relative-symlinks.patch \ | ||
13 | file://fix_watch_cursor.patch" | ||
14 | |||
15 | SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23" | ||
16 | SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4" | ||
17 | FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" | ||
18 | |||
19 | inherit autotools allarch | ||
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput new file mode 100644 index 0000000000..9633fc5f32 --- /dev/null +++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput | |||
@@ -0,0 +1 @@ | |||
# replace with valid machine specific pointercal.xinput | |||
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb new file mode 100644 index 0000000000..65348c3762 --- /dev/null +++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "Touchscreen calibration data from xinput-calibrator" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
4 | |||
5 | PR = "r7" | ||
6 | |||
7 | SRC_URI = "file://pointercal.xinput" | ||
8 | S = "${WORKDIR}" | ||
9 | |||
10 | do_install() { | ||
11 | # Only install file if it has a contents | ||
12 | if [ -s ${S}/pointercal.xinput ] &&\ | ||
13 | [ ! -n "$(head -n1 ${S}/pointercal.xinput|grep "replace.*pointercal\.xinput")" ]; then | ||
14 | install -d ${D}${sysconfdir}/ | ||
15 | install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/ | ||
16 | fi | ||
17 | } | ||
18 | |||
19 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
20 | CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput" | ||
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh new file mode 100644 index 0000000000..5290726784 --- /dev/null +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh | |||
@@ -0,0 +1,7 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . /etc/formfactor/config | ||
4 | |||
5 | if [ "$HAVE_TOUCHSCREEN" = "1" ]; then | ||
6 | /usr/bin/xinput_calibrator_once.sh | ||
7 | fi | ||
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch new file mode 100644 index 0000000000..86982924a8 --- /dev/null +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 | ||
4 | From: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
5 | Date: Mon, 1 Jul 2013 15:38:02 +0300 | ||
6 | Subject: [PATCH] Allow xinput_calibrator_pointercal.sh to be run as normal | ||
7 | user | ||
8 | |||
9 | Allow normal user to create their own pointercal.xinput files that | ||
10 | override the system pointercal file in /etc. | ||
11 | |||
12 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
13 | --- | ||
14 | scripts/xinput_calibrator_pointercal.sh | 33 +++++++++++++++++++++---------- | ||
15 | 1 file changed, 23 insertions(+), 10 deletions(-) | ||
16 | |||
17 | diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh | ||
18 | index fccb197..0ada7da 100755 | ||
19 | --- a/scripts/xinput_calibrator_pointercal.sh | ||
20 | +++ b/scripts/xinput_calibrator_pointercal.sh | ||
21 | @@ -11,19 +11,32 @@ | ||
22 | PATH="/usr/bin:$PATH" | ||
23 | |||
24 | BINARY="xinput_calibrator" | ||
25 | -CALFILE="/etc/pointercal.xinput" | ||
26 | -LOGFILE="/var/log/xinput_calibrator.pointercal.log" | ||
27 | +SYS_CALFILE="/etc/pointercal.xinput" | ||
28 | +USER_CALFILE="$HOME/.pointercal/pointercal.xinput" | ||
29 | |||
30 | -if [ -e $CALFILE ] ; then | ||
31 | - if grep replace $CALFILE ; then | ||
32 | - echo "Empty calibration file found, removing it" | ||
33 | - rm $CALFILE | ||
34 | - else | ||
35 | - echo "Using calibration data stored in $CALFILE" | ||
36 | - . $CALFILE && exit 0 | ||
37 | - fi | ||
38 | +if [ "$USER" = "root" ]; then | ||
39 | + LOGFILE="/var/log/xinput_calibrator.pointercal.log" | ||
40 | + CALFILES="$SYS_CALFILE" | ||
41 | +else | ||
42 | + LOGFILE="$HOME/.pointercal/xinput_calibrator.pointercal.log" | ||
43 | + CALFILES="$USER_CALFILE $SYS_CALFILE" | ||
44 | + mkdir -p "$HOME/.pointercal" | ||
45 | fi | ||
46 | |||
47 | +for CALFILE in $CALFILES; do | ||
48 | + if [ -e $CALFILE ]; then | ||
49 | + if grep replace $CALFILE ; then | ||
50 | + echo "Empty calibration file found, removing it" | ||
51 | + rm $CALFILE 2>/dev/null || true | ||
52 | + else | ||
53 | + echo "Using calibration data stored in $CALFILE" | ||
54 | + . $CALFILE && exit 0 | ||
55 | + fi | ||
56 | + fi | ||
57 | +done | ||
58 | + | ||
59 | +[ "$USER" != "root" ] && CALFILE=$USER_CALFILE | ||
60 | + | ||
61 | CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` | ||
62 | if [ ! -z "$CALDATA" ] ; then | ||
63 | echo $CALDATA > $CALFILE | ||
64 | -- | ||
65 | 1.7.9.5 | ||
66 | |||
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb new file mode 100644 index 0000000000..562434f16a --- /dev/null +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | SUMMARY = "Touchscreen calibration program for X11" | ||
2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" | ||
3 | LICENSE = "MIT-X" | ||
4 | LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a" | ||
5 | DEPENDS = "virtual/libx11 libxi" | ||
6 | |||
7 | PV = "0.7.5+git${SRCPV}" | ||
8 | PR = "r6" | ||
9 | |||
10 | inherit autotools pkgconfig | ||
11 | |||
12 | SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" | ||
13 | SRC_URI = "git://github.com/tias/xinput_calibrator.git \ | ||
14 | file://30xinput_calibrate.sh \ | ||
15 | file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | # force native X11 ui as we don't have gtk+ in DEPENDS | ||
20 | EXTRA_OECONF += "--with-gui=x11" | ||
21 | |||
22 | do_install_append() { | ||
23 | install -d ${D}${bindir} | ||
24 | install -m 0755 ${S}/scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh | ||
25 | |||
26 | install -d ${D}${sysconfdir}/X11/Xsession.d/ | ||
27 | install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ | ||
28 | |||
29 | install -d ${D}${sysconfdir}/xdg/autostart | ||
30 | sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' ${S}/scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop | ||
31 | } | ||
32 | |||
33 | FILES_${PN} += "${sysconfdir}/xdg/autostart" | ||
34 | RDEPENDS_${PN} = "xinput formfactor" | ||
35 | RRECOMMENDS_${PN} = "pointercal-xinput" | ||
diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb new file mode 100644 index 0000000000..a453e24876 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "A program to create an index of X font files in a directory" | ||
4 | |||
5 | DESCRIPTION = "For each directory argument, mkfontdir reads all of the \ | ||
6 | font files in the directory. The font names and related data are written \ | ||
7 | out to the files \"fonts.dir\", \"fonts.scale\", and \"fonts.alias\". \ | ||
8 | The X server and font server use these files to find the available font \ | ||
9 | files." | ||
10 | |||
11 | PE = "1" | ||
12 | PR = "${INC_PR}.0" | ||
13 | |||
14 | RDEPENDS_${PN} += "mkfontscale" | ||
15 | RDEPENDS_${PN}_class-native += "mkfontscale-native" | ||
16 | |||
17 | BBCLASSEXTEND = "native" | ||
18 | |||
19 | LIC_FILES_CHKSUM = "file://COPYING;md5=b4fcf2b90cadbfc15009b9e124dc3a3f" | ||
20 | |||
21 | SRC_URI[md5sum] = "18c429148c96c2079edda922a2b67632" | ||
22 | SRC_URI[sha256sum] = "56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530" | ||
diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb new file mode 100644 index 0000000000..65f74c21c5 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "A program to create an index of scalable font files for X" | ||
4 | |||
5 | DESCRIPTION = "For each directory argument, mkfontscale reads all of the \ | ||
6 | scalable font files in the directory. For every font file found, an X11 \ | ||
7 | font name (XLFD) is generated, and is written together with the file \ | ||
8 | name to a file fonts.scale in the directory. The resulting fonts.scale \ | ||
9 | is used by the mkfontdir program." | ||
10 | |||
11 | DEPENDS = "util-macros-native zlib libfontenc freetype xproto" | ||
12 | |||
13 | BBCLASSEXTEND = "native" | ||
14 | |||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" | ||
16 | |||
17 | SRC_URI[md5sum] = "03de3f15db678e277f5ef9c013aca1ad" | ||
18 | SRC_URI[sha256sum] = "244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731" | ||
diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb b/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb new file mode 100644 index 0000000000..26d4f1b5ba --- /dev/null +++ b/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "X11 color name database" | ||
4 | DESCRIPTION = "This package includes both the list mapping X color names \ | ||
5 | to RGB values (rgb.txt) and, if configured to use a database for color \ | ||
6 | lookup, the rgb program to convert the text file into the binary database \ | ||
7 | format." | ||
8 | |||
9 | DEPENDS += " xproto util-macros" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" | ||
11 | PE = "1" | ||
12 | PR = "${INC_PR}.0" | ||
13 | |||
14 | SRC_URI[md5sum] = "bcd820d967eaa51bd25b86c0ee682d4e" | ||
15 | SRC_URI[sha256sum] = "8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857" | ||
16 | |||
17 | FILES_${PN} += "${datadir}/X11" | ||
diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb b/meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb new file mode 100644 index 0000000000..cc0b323a88 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "X11 server performance test program" | ||
4 | |||
5 | DESCRIPTION = "The x11perf program runs one or more performance tests \ | ||
6 | and reports how fast an X server can execute the tests." | ||
7 | |||
8 | |||
9 | DEPENDS += "libxmu libxrender libxft libxext fontconfig" | ||
10 | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ | ||
12 | file://x11perf.h;endline=24;md5=29555066baf406a105ff917ac25b2d01" | ||
13 | |||
14 | PR = "${INC_PR}.0" | ||
15 | PE = "1" | ||
16 | |||
17 | FILES_${PN} += "${libdir}/X11/x11perfcomp/*" | ||
18 | |||
19 | SRC_URI[md5sum] = "5c3c7431a38775caaea6051312a49bc9" | ||
20 | SRC_URI[sha256sum] = "24ee8857a2bf414b360addabf1c27ef797f7f504ee9bc409c151760bfbe53184" | ||
diff --git a/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb b/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb new file mode 100644 index 0000000000..b173f4fe8d --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require xorg-app-common.inc | ||
2 | SUMMARY = "X authority utilities" | ||
3 | DESCRIPTION = "X application to edit and display the authorization \ | ||
4 | information used in connecting to the X server." | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" | ||
7 | |||
8 | DEPENDS += "libxau libxext libxmu" | ||
9 | PE = "1" | ||
10 | |||
11 | SRC_URI[md5sum] = "7d6003f32838d5b688e2c8a131083271" | ||
12 | SRC_URI[sha256sum] = "56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f" | ||
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch new file mode 100644 index 0000000000..1e8199cc66 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: xdpyinfo-1.3.0/configure.ac | ||
4 | =================================================================== | ||
5 | --- xdpyinfo-1.3.0.orig/configure.ac 2011-10-21 21:34:21.000000000 -0700 | ||
6 | +++ xdpyinfo-1.3.0/configure.ac 2011-11-28 20:06:56.554056935 -0800 | ||
7 | @@ -47,11 +47,15 @@ | ||
8 | AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) | ||
9 | CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) | ||
10 | |||
11 | +AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), | ||
12 | + XKB="$enableval", XKB="yes") | ||
13 | +if test "x$XKB" = "xyes" ; then | ||
14 | PKG_CHECK_MODULES(DPY_XKB, x11, | ||
15 | [SAVE_CPPFLAGS="$CPPFLAGS" | ||
16 | CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" | ||
17 | AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) | ||
18 | CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) | ||
19 | +fi | ||
20 | |||
21 | PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, | ||
22 | [SAVE_CPPFLAGS="$CPPFLAGS" | ||
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb new file mode 100644 index 0000000000..3688e1b579 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "Display information utility for X" | ||
4 | |||
5 | DESCRIPTION = "Xdpyinfo is a utility for displaying information about an \ | ||
6 | X server. It is used to examine the capabilities of a server, the \ | ||
7 | predefined values for various parameters used in communicating between \ | ||
8 | clients and the server, and the different types of screens and visuals \ | ||
9 | that are available." | ||
10 | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" | ||
12 | DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau libxcomposite" | ||
13 | PE = "1" | ||
14 | |||
15 | SRC_URI += "file://disable-xkb.patch" | ||
16 | |||
17 | SRC_URI[md5sum] = "cacc0733f16e4f2a97a5c430fcc4420e" | ||
18 | SRC_URI[sha256sum] = "aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94" | ||
19 | |||
20 | EXTRA_OECONF = "--disable-xkb" | ||
diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch new file mode 100644 index 0000000000..6130959f86 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | --- | ||
4 | xev.c | 16 ++++++++-------- | ||
5 | 1 file changed, 8 insertions(+), 8 deletions(-) | ||
6 | |||
7 | Index: xev-1.2.0/xev.c | ||
8 | =================================================================== | ||
9 | --- xev-1.2.0.orig/xev.c | ||
10 | +++ xev-1.2.0/xev.c | ||
11 | @@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp) | ||
12 | nbytes = XLookupString (e, str, 256, &ks, NULL); | ||
13 | |||
14 | /* not supposed to call XmbLookupString on a key release event */ | ||
15 | - if (e->type == KeyPress && xic) { | ||
16 | + /*if (e->type == KeyPress && xic) { | ||
17 | do { | ||
18 | nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); | ||
19 | buf[nmbbytes] = '\0'; | ||
20 | @@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp) | ||
21 | buf = realloc (buf, bsize); | ||
22 | } | ||
23 | } while (status == XBufferOverflow); | ||
24 | - } | ||
25 | + }*/ | ||
26 | |||
27 | if (ks == NoSymbol) | ||
28 | ksname = "NoSymbol"; | ||
29 | @@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp) | ||
30 | } | ||
31 | |||
32 | /* not supposed to call XmbLookupString on a key release event */ | ||
33 | - if (e->type == KeyPress && xic) { | ||
34 | + /*if (e->type == KeyPress && xic) { | ||
35 | printf (" XmbLookupString gives %d bytes: ", nmbbytes); | ||
36 | if (nmbbytes > 0) { | ||
37 | dump (buf, nmbbytes); | ||
38 | @@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp) | ||
39 | } else { | ||
40 | printf ("\n"); | ||
41 | } | ||
42 | - } | ||
43 | + } */ | ||
44 | |||
45 | printf (" XFilterEvent returns: %s\n", | ||
46 | XFilterEvent (eventp, e->window) ? "True" : "False"); | ||
47 | @@ -1015,7 +1015,7 @@ main (int argc, char **argv) | ||
48 | fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); | ||
49 | } | ||
50 | |||
51 | - xim = XOpenIM (dpy, NULL, NULL, NULL); | ||
52 | + /*xim = XOpenIM (dpy, NULL, NULL, NULL); | ||
53 | if (xim == NULL) { | ||
54 | fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); | ||
55 | } | ||
56 | @@ -1042,7 +1042,7 @@ main (int argc, char **argv) | ||
57 | } | ||
58 | XFree (xim_styles); | ||
59 | } | ||
60 | - } | ||
61 | + }*/ | ||
62 | |||
63 | screen = DefaultScreen (dpy); | ||
64 | |||
65 | @@ -1109,7 +1109,7 @@ main (int argc, char **argv) | ||
66 | printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); | ||
67 | } | ||
68 | |||
69 | - if (xim && xim_style) { | ||
70 | + /*if (xim && xim_style) { | ||
71 | xic = XCreateIC (xim, | ||
72 | XNInputStyle, xim_style, | ||
73 | XNClientWindow, w, | ||
74 | @@ -1119,7 +1119,7 @@ main (int argc, char **argv) | ||
75 | if (xic == NULL) { | ||
76 | fprintf (stderr, "XCreateIC failed\n"); | ||
77 | } | ||
78 | - } | ||
79 | + }*/ | ||
80 | |||
81 | have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base); | ||
82 | if (have_rr) { | ||
diff --git a/meta/recipes-graphics/xorg-app/xev_1.2.1.bb b/meta/recipes-graphics/xorg-app/xev_1.2.1.bb new file mode 100644 index 0000000000..8dcb1ec6a4 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xev_1.2.1.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "X Event Viewer" | ||
4 | DESCRIPTION = "Xev creates a window and then asks the X server to send it events \ | ||
5 | whenever anything happens to the window (such as it being moved, resized, \ | ||
6 | typed in, clicked in, etc.). You can also attach it to an existing window." | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://xev.c;beginline=1;endline=33;md5=577c99421f1803b891d2c79097ae4682" | ||
9 | LICENSE = "MIT" | ||
10 | |||
11 | PE = "1" | ||
12 | |||
13 | DEPENDS += "libxrandr xproto" | ||
14 | |||
15 | SRC_URI += "file://diet-x11.patch" | ||
16 | |||
17 | SRC_URI[md5sum] = "5b0a0b6f589441d546da21739fa75634" | ||
18 | SRC_URI[sha256sum] = "11f17fab097f17d9efc51ea9d0e3140bea3904eb3c486afa7c8c3eedab496243" | ||
diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb new file mode 100644 index 0000000000..84d0cb8044 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "X11 eyes that follow the mouse cursor demo" | ||
4 | DESCRIPTION = "Xeyes is a small X11 application that shows a pair of eyes that move to \ | ||
5 | follow the location of the mouse cursor around the screen." | ||
6 | |||
7 | PE = "1" | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6" | ||
10 | |||
11 | SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981" | ||
12 | SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521" | ||
13 | |||
14 | DEPENDS += "libxau libxt libxext libxmu libxrender" | ||
diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.6.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.6.bb new file mode 100644 index 0000000000..aba33f0fe8 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xhost_1.0.6.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "Server access control program for X" | ||
4 | |||
5 | DESCRIPTION = "The xhost program is used to add and delete host names or \ | ||
6 | user names to the list allowed to make connections to the X server. In \ | ||
7 | the case of hosts, this provides a rudimentary form of privacy control \ | ||
8 | and security. Environments which require more sophisticated measures \ | ||
9 | should implement the user-based mechanism or use the hooks in the \ | ||
10 | protocol for passing other authentication data to the server." | ||
11 | |||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199" | ||
13 | DEPENDS += "libxmu libxau" | ||
14 | PE = "1" | ||
15 | |||
16 | SRC_URI[md5sum] = "f1669af1fe0554e876f03319c678e79d" | ||
17 | SRC_URI[sha256sum] = "a6f5b922df0a7be5d3ba43f525fa8e69c539c738418f013a0b7adaa423a89dc2" | ||
diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb new file mode 100644 index 0000000000..583ea87eeb --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "X Window System initializer" | ||
4 | |||
5 | DESCRIPTION = "The xinit program is used to start the X Window System \ | ||
6 | server and a first client program on systems that cannot start X \ | ||
7 | directly from /etc/init or in environments that use multiple window \ | ||
8 | systems. When this first client exits, xinit will kill the X server and \ | ||
9 | then terminate." | ||
10 | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" | ||
12 | |||
13 | PE = "1" | ||
14 | |||
15 | SRC_URI[md5sum] = "3b8da0e6237aee9828cc809c647510a7" | ||
16 | SRC_URI[sha256sum] = "74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af" | ||
17 | |||
18 | EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" | ||
19 | |||
20 | RDEPENDS_${PN} += "util-linux-mcookie" | ||
diff --git a/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb b/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb new file mode 100644 index 0000000000..5befcc82d9 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "Runtime configuration and test of XInput devices" | ||
4 | |||
5 | DESCRIPTION = "Xinput is an utility for configuring and testing XInput devices" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=881525f89f99cad39c9832bcb72e6fa5" | ||
8 | |||
9 | DEPENDS += " libxi libxrandr libxinerama" | ||
10 | |||
11 | |||
12 | SRC_URI[md5sum] = "305980ac78a6954e306a14d80a54c441" | ||
13 | SRC_URI[sha256sum] = "b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f" | ||
14 | |||
diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb new file mode 100644 index 0000000000..5c274b133e --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "A program to compile XKB keyboard description" | ||
4 | |||
5 | DESCRIPTION = "The xkbcomp keymap compiler converts a description of an \ | ||
6 | XKB keymap into one of several output formats. The most common use for \ | ||
7 | xkbcomp is to create a compiled keymap file (.xkm extension) which can \ | ||
8 | be read directly by XKB-capable X servers or utilities." | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a" | ||
11 | |||
12 | PR = "${INC_PR}.0" | ||
13 | |||
14 | DEPENDS += "libxkbfile" | ||
15 | |||
16 | BBCLASSEXTEND = "native" | ||
17 | |||
18 | SRC_URI[md5sum] = "a0fc1ac3fc4fe479ade09674347c5aa0" | ||
19 | SRC_URI[sha256sum] = "91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d" | ||
diff --git a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch b/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch new file mode 100644 index 0000000000..40f81f0f74 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001 | ||
5 | From: Alan Coopersmith <alan.coopersmith@oracle.com> | ||
6 | Date: Mon, 23 Apr 2012 14:28:39 +0000 | ||
7 | Subject: include config.h before stdio.h & other system headers | ||
8 | |||
9 | Ensures definitions like _GNU_SOURCE are visible when needed. | ||
10 | |||
11 | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> | ||
12 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
13 | --- | ||
14 | diff --git a/exec.c b/exec.c | ||
15 | index dbcb669..419b10e 100644 | ||
16 | --- a/exec.c | ||
17 | +++ b/exec.c | ||
18 | @@ -54,6 +54,10 @@ from The Open Group. | ||
19 | * original xmodmap, written by David Rosenthal, of Sun Microsystems. | ||
20 | */ | ||
21 | |||
22 | +#ifdef HAVE_CONFIG_H | ||
23 | +# include "config.h" | ||
24 | +#endif | ||
25 | + | ||
26 | #include <X11/Xos.h> | ||
27 | #include <X11/Xlib.h> | ||
28 | #include <stdio.h> | ||
29 | diff --git a/pf.c b/pf.c | ||
30 | index 0eb0f55..3f0c3f4 100644 | ||
31 | --- a/pf.c | ||
32 | +++ b/pf.c | ||
33 | @@ -26,6 +26,10 @@ from The Open Group. | ||
34 | |||
35 | */ | ||
36 | |||
37 | +#ifdef HAVE_CONFIG_H | ||
38 | +# include "config.h" | ||
39 | +#endif | ||
40 | + | ||
41 | #include <X11/Xos.h> | ||
42 | #include <X11/Xlib.h> | ||
43 | #include <stdio.h> | ||
44 | diff --git a/xmodmap.c b/xmodmap.c | ||
45 | index 58a8e70..0f89629 100644 | ||
46 | --- a/xmodmap.c | ||
47 | +++ b/xmodmap.c | ||
48 | @@ -26,6 +26,10 @@ from The Open Group. | ||
49 | |||
50 | */ | ||
51 | |||
52 | +#ifdef HAVE_CONFIG_H | ||
53 | +# include "config.h" | ||
54 | +#endif | ||
55 | + | ||
56 | #include <X11/Xos.h> | ||
57 | #include <X11/Xlib.h> | ||
58 | #include <stdio.h> | ||
59 | -- | ||
60 | cgit v0.9.0.2-2-gbebe | ||
diff --git a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb new file mode 100644 index 0000000000..65a55e3560 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "Utility for modifying keymaps and pointer button mappings in X" | ||
4 | |||
5 | DESCRIPTION = "The xmodmap program is used to edit and display the \ | ||
6 | keyboard modifier map and keymap table that are used by client \ | ||
7 | applications to convert event keycodes into keysyms. It is usually run \ | ||
8 | from the user's session startup script to configure the keyboard \ | ||
9 | according to personal tastes." | ||
10 | |||
11 | LICENSE = "MIT" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" | ||
13 | |||
14 | PE = "1" | ||
15 | |||
16 | SRC_URI += "file://gnu-source.patch" | ||
17 | |||
18 | SRC_URI[md5sum] = "5511da3361eea4eaa21427652c559e1c" | ||
19 | SRC_URI[sha256sum] = "efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3" | ||
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc new file mode 100644 index 0000000000..59a04fa494 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc | |||
@@ -0,0 +1,19 @@ | |||
1 | SUMMARY = "X application" | ||
2 | HOMEPAGE = "http://www.x.org/" | ||
3 | BUGTRACKER = "https://bugs.freedesktop.org" | ||
4 | SECTION = "x11/apps" | ||
5 | LICENSE = "MIT-X" | ||
6 | DEPENDS = "util-macros-native virtual/libx11" | ||
7 | |||
8 | # depends on virtual/libx11 | ||
9 | REQUIRED_DISTRO_FEATURES = "x11" | ||
10 | |||
11 | INC_PR = "r8" | ||
12 | |||
13 | SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" | ||
14 | |||
15 | S = "${WORKDIR}/${BPN}-${PV}" | ||
16 | |||
17 | inherit autotools pkgconfig distro_features_check | ||
18 | |||
19 | FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" | ||
diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb new file mode 100644 index 0000000000..d78bf0451c --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "Utility to display window and font properties of an X server" | ||
4 | |||
5 | DESCRIPTION = "The xprop utility is for displaying window and font \ | ||
6 | properties in an X server. One window or font is selected using the \ | ||
7 | command line arguments or possibly in the case of a window, by clicking \ | ||
8 | on the desired window. A list of properties is then given, possibly with \ | ||
9 | formatting information." | ||
10 | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" | ||
12 | |||
13 | DEPENDS += "libxmu" | ||
14 | |||
15 | PE = "1" | ||
16 | |||
17 | SRC_URI[md5sum] = "fae3d2fda07684027a643ca783d595cc" | ||
18 | SRC_URI[sha256sum] = "9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6" | ||
diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb b/meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb new file mode 100644 index 0000000000..84f01b02dd --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "XRandR: X Resize, Rotate and Reflect extension command" | ||
4 | |||
5 | DESCRIPTION = "Xrandr is used to set the size, orientation and/or \ | ||
6 | reflection of the outputs for a screen. It can also set the screen \ | ||
7 | size." | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" | ||
11 | DEPENDS += "libxrandr libxrender" | ||
12 | PE = "1" | ||
13 | |||
14 | SRC_URI[md5sum] = "78fd973d9b532106f8777a3449176148" | ||
15 | SRC_URI[sha256sum] = "b2e76ee92ff827f1c52ded7c666fe6f2704ca81cdeef882397da4e3e8ab490bc" | ||
diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch new file mode 100644 index 0000000000..97d13a30df --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | add "-disable-xkb" option | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com> | ||
6 | |||
7 | diff --git a/configure.ac b/configure.ac | ||
8 | index 81c3ae4..26601bf 100644 | ||
9 | --- a/configure.ac | ||
10 | +++ b/configure.ac | ||
11 | @@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, | ||
12 | AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>]) | ||
13 | CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) | ||
14 | |||
15 | +AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), | ||
16 | + XKB="$enableval", XKB="yes") | ||
17 | +if test "x$XKB" = "xyes" ; then | ||
18 | PKG_CHECK_MODULES(SET_XKB, x11, | ||
19 | [SAVE_CPPFLAGS="$CPPFLAGS" | ||
20 | CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" | ||
21 | AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>]) | ||
22 | CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) | ||
23 | +fi | ||
24 | |||
25 | AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), | ||
26 | [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"]) | ||
diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.3.bb b/meta/recipes-graphics/xorg-app/xset_1.2.3.bb new file mode 100644 index 0000000000..f683b7603f --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xset_1.2.3.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "Utility for setting various user preference options of the display" | ||
4 | |||
5 | DESCRIPTION = "xset is a utility that is used to set various user \ | ||
6 | preference options of the display." | ||
7 | |||
8 | LICENSE = "MIT" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" | ||
10 | DEPENDS += "libxext libxxf86misc libxmu libxau" | ||
11 | PE = "1" | ||
12 | |||
13 | SRC_URI += "file://disable-xkb.patch" | ||
14 | |||
15 | SRC_URI[md5sum] = "dcd227388b57487d543cab2fd7a602d7" | ||
16 | SRC_URI[sha256sum] = "4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063" | ||
17 | |||
18 | CFLAGS += "-D_GNU_SOURCE" | ||
19 | EXTRA_OECONF = "--disable-xkb --without-fontcache" | ||
diff --git a/meta/recipes-graphics/xorg-app/xvinfo_1.1.2.bb b/meta/recipes-graphics/xorg-app/xvinfo_1.1.2.bb new file mode 100644 index 0000000000..8ea1ca0f29 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xvinfo_1.1.2.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "Print out X-Video extension adaptor information" | ||
4 | |||
5 | DESCRIPTION = "xvinfo prints out the capabilities of any video adaptors \ | ||
6 | associated with the display that are accessible through the X-Video \ | ||
7 | extension." | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68" | ||
10 | DEPENDS += " libxv" | ||
11 | PE = "1" | ||
12 | PR = "${INC_PR}.0" | ||
13 | |||
14 | SRC_URI[md5sum] = "1fbd65e81323a8c0a4b5e24db0058405" | ||
15 | SRC_URI[sha256sum] = "eed3d90ffd788ef728c4a5e7aa4bd86dc6bbcebac929caf7a0479cf8b53b50e3" | ||
diff --git a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb b/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb new file mode 100644 index 0000000000..7a452410b7 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require xorg-app-common.inc | ||
2 | |||
3 | SUMMARY = "Window information utility for X" | ||
4 | |||
5 | DESCRIPTION = "Xwininfo is a utility for displaying information about \ | ||
6 | windows. Information may include window position, size, color depth, \ | ||
7 | and a number of other items." | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e" | ||
10 | DEPENDS += "libxext libxmu" | ||
11 | |||
12 | PE = "0" | ||
13 | |||
14 | SRC_URI[md5sum] = "b777bafb674555e48fd8437618270931" | ||
15 | SRC_URI[sha256sum] = "218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.0.bb new file mode 100644 index 0000000000..4ab6ad1d66 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.0.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-driver-input.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- event devices (evdev) input driver" | ||
4 | |||
5 | DESCRIPTION = "evdev is an Xorg input driver for Linux's generic event \ | ||
6 | devices. It therefore supports all input devices that the kernel knows \ | ||
7 | about, including most mice and keyboards. \ | ||
8 | \ | ||
9 | The evdev driver can serve as both a pointer and a keyboard input \ | ||
10 | device, and may be used as both the core keyboard and the core pointer. \ | ||
11 | Multiple input devices are supported by multiple instances of this \ | ||
12 | driver, with one Load directive for evdev in the Module section of your \ | ||
13 | xorg.conf for each input device that will use this driver. " | ||
14 | |||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" | ||
16 | |||
17 | DEPENDS += "mtdev libevdev" | ||
18 | |||
19 | SRC_URI[md5sum] = "9076ae2646f7aeb30963056e0bbfccf0" | ||
20 | SRC_URI[sha256sum] = "0c0c4aa393cb027a2304967944867a21a340bcad2e5efe630291b6906c3abc35" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb new file mode 100644 index 0000000000..f138918096 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require xorg-driver-input.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- keyboard input driver" | ||
4 | |||
5 | DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ | ||
6 | driver supports the standard OS-provided keyboard interface. The driver \ | ||
7 | functions as a keyboard input device, and may be used as the X server's \ | ||
8 | core keyboard." | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10" | ||
11 | |||
12 | SRC_URI[md5sum] = "ce936e219682bacf5a4a9c4ab940edb8" | ||
13 | SRC_URI[sha256sum] = "41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb new file mode 100644 index 0000000000..dfb08f724b --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | require xorg-driver-input.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- keyboard input driver" | ||
4 | |||
5 | DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ | ||
6 | driver supports the standard OS-provided keyboard interface. The driver \ | ||
7 | functions as a keyboard input device, and may be used as the X server's \ | ||
8 | core keyboard." | ||
9 | |||
10 | SRCREV = "3e28d68b50d291938734e9684b8296ca864f3892" | ||
11 | PV = "1.3.2+git${SRCPV}" | ||
12 | PR = "${INC_PR}.0" | ||
13 | |||
14 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard" | ||
15 | S = "${WORKDIR}/git" | ||
16 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch new file mode 100644 index 0000000000..6930864ede --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Unbreak the linux mouse driver by using config.h | ||
2 | |||
3 | RP - 4/11/07 | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Index: git/src/lnx_mouse.c | ||
8 | =================================================================== | ||
9 | --- git.orig/src/lnx_mouse.c 2008-11-04 23:46:05.000000000 +0000 | ||
10 | +++ git/src/lnx_mouse.c 2008-11-04 23:46:15.000000000 +0000 | ||
11 | @@ -3,8 +3,8 @@ | ||
12 | * Copyright 1999 by The XFree86 Project, Inc. | ||
13 | */ | ||
14 | |||
15 | -#ifdef HAVE_XORG_CONFIG_H | ||
16 | -#include <xorg-config.h> | ||
17 | +#ifdef HAVE_CONFIG_H | ||
18 | +#include <config.h> | ||
19 | #endif | ||
20 | |||
21 | #include <X11/X.h> | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb new file mode 100644 index 0000000000..1f0b78a157 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require xorg-driver-input.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- mouse input driver" | ||
4 | |||
5 | DESCRIPTION = "mouse is an Xorg input driver for mice. The driver \ | ||
6 | supports most available mouse types and interfaces. The mouse driver \ | ||
7 | functions as a pointer input device, and may be used as the X server's \ | ||
8 | core pointer. Multiple mice are supported by multiple instances of this \ | ||
9 | driver." | ||
10 | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510" | ||
12 | |||
13 | SRC_URI[md5sum] = "77085b649c5c0b333565ba562f573951" | ||
14 | SRC_URI[sha256sum] = "3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce" | ||
15 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb new file mode 100644 index 0000000000..d79a2e4dde --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-driver-input.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- mouse input driver" | ||
4 | |||
5 | DESCRIPTION = "mouse is an Xorg input driver for mice. The driver \ | ||
6 | supports most available mouse types and interfaces. The mouse driver \ | ||
7 | functions as a pointer input device, and may be used as the X server's \ | ||
8 | core pointer. Multiple mice are supported by multiple instances of this \ | ||
9 | driver." | ||
10 | |||
11 | SRCREV = "ea5cfe804e112f320f14ad896c7802d53551d3e6" | ||
12 | PV = "1.3.0+git${SRCPV}" | ||
13 | PR = "${INC_PR}.0" | ||
14 | |||
15 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse \ | ||
16 | file://unbreak.patch" | ||
17 | S = "${WORKDIR}/git" | ||
18 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch new file mode 100644 index 0000000000..f36bb7579d --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Hutterer <peter.hutterer@who-t.net> | ||
3 | Date: Fri, 29 Aug 2014 07:57:41 +1000 | ||
4 | Subject: Include xorg-server.h to fix build errors on newest glibc | ||
5 | |||
6 | In file included from /usr/include/string.h:634:0, | ||
7 | from /usr/include/xorg/os.h:53, | ||
8 | from /usr/include/xorg/misc.h:115, | ||
9 | from /usr/include/xorg/xf86str.h:37, | ||
10 | from /usr/include/xorg/xf86Xinput.h:54, | ||
11 | from synproto.h:36, | ||
12 | from synproto.c:24: | ||
13 | /usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' | ||
14 | strndup(const char *str, size_t n); | ||
15 | |||
16 | See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html | ||
17 | |||
18 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
19 | |||
20 | Status: Backport | ||
21 | |||
22 | Index: xf86-input-synaptics-1.8.0/src/eventcomm.h | ||
23 | =================================================================== | ||
24 | --- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28 18:40:28.628070587 -0700 | ||
25 | +++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587 -0700 | ||
26 | @@ -27,6 +27,8 @@ | ||
27 | #ifndef _EVENTCOMM_H_ | ||
28 | #define _EVENTCOMM_H_ | ||
29 | |||
30 | +#include <xorg-server.h> | ||
31 | + | ||
32 | #include <linux/input.h> | ||
33 | #include <linux/version.h> | ||
34 | #include <xf86Xinput.h> | ||
35 | Index: xf86-input-synaptics-1.8.0/src/ps2comm.h | ||
36 | =================================================================== | ||
37 | --- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28 18:40:28.628070587 -0700 | ||
38 | +++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587 -0700 | ||
39 | @@ -22,6 +22,8 @@ | ||
40 | #ifndef _PS2COMM_H_ | ||
41 | #define _PS2COMM_H_ | ||
42 | |||
43 | +#include <xorg-server.h> | ||
44 | + | ||
45 | #include <unistd.h> | ||
46 | #include <sys/ioctl.h> | ||
47 | #include "xf86_OSproc.h" | ||
48 | Index: xf86-input-synaptics-1.8.0/src/synproto.h | ||
49 | =================================================================== | ||
50 | --- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28 18:40:28.628070587 -0700 | ||
51 | +++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587 -0700 | ||
52 | @@ -31,6 +31,8 @@ | ||
53 | #include "config.h" | ||
54 | #endif | ||
55 | |||
56 | +#include <xorg-server.h> | ||
57 | + | ||
58 | #include <unistd.h> | ||
59 | #include <sys/ioctl.h> | ||
60 | #include <xf86Xinput.h> | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb new file mode 100644 index 0000000000..90baf8fbf3 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | require xorg-driver-input.inc | ||
2 | |||
3 | #SRC_URI += "file://configurefix.patch" | ||
4 | |||
5 | SUMMARY = "X.Org X server -- synaptics touchpad input driver" | ||
6 | |||
7 | DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ | ||
8 | Synaptics Incorporated. Even though these touchpads (by default, \ | ||
9 | operating in a compatibility mode emulating a standard mouse) can be \ | ||
10 | handled by the normal evdev or mouse drivers, this driver allows more \ | ||
11 | advanced features of the touchpad to become available." | ||
12 | |||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" | ||
14 | |||
15 | SRC_URI += "file://always_include_xorg_server.h.patch" | ||
16 | |||
17 | SRC_URI[md5sum] = "27a3f2b31606a13dd6b58d419978d64f" | ||
18 | SRC_URI[sha256sum] = "9bf27632aaa6c5e62621ca9c2ca00f9b309c85b039ee33cd592b189fc872c37a" | ||
19 | |||
20 | DEPENDS += "libxi mtdev libxtst libevdev" | ||
21 | |||
22 | FILES_${PN} += "${datadir}/X11/xorg.conf.d" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb new file mode 100644 index 0000000000..140f633b42 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-driver-input.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- synaptics touchpad input driver" | ||
4 | |||
5 | DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ | ||
6 | Synaptics Incorporated. Even though these touchpads (by default, \ | ||
7 | operating in a compatibility mode emulating a standard mouse) can be \ | ||
8 | handled by the normal evdev or mouse drivers, this driver allows more \ | ||
9 | advanced features of the touchpad to become available." | ||
10 | |||
11 | SRCREV = "934bc0012f948c52aadc8eda912f7728fb7394a2" | ||
12 | PV = "0.15.2+git${SRCPV}" | ||
13 | PR = "${INC_PR}.1" | ||
14 | |||
15 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics" | ||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | DEPENDS += "libxi mtdev libxtst" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch new file mode 100644 index 0000000000..12fb9df2fd --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | From 336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> | ||
3 | Date: Thu, 28 Nov 2013 11:59:53 -0800 | ||
4 | Subject: Always include config.h first | ||
5 | |||
6 | This fixes some build warnings about CSRG_BASED being redefined due to | ||
7 | incorrect header include ordering. | ||
8 | |||
9 | Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c | ||
14 | =================================================================== | ||
15 | --- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_client.c 2014-08-28 18:33:16.168070587 -0700 | ||
16 | +++ xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c 2014-08-28 18:33:16.152070587 -0700 | ||
17 | @@ -39,6 +39,10 @@ | ||
18 | #endif | ||
19 | |||
20 | |||
21 | +#ifdef HAVE_CONFIG_H | ||
22 | +#include "config.h" | ||
23 | +#endif | ||
24 | + | ||
25 | #include "vmmouse_client.h" | ||
26 | #include "vmmouse_proto.h" | ||
27 | |||
28 | Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c | ||
29 | =================================================================== | ||
30 | --- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.c 2014-08-28 18:33:16.168070587 -0700 | ||
31 | +++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c 2014-08-28 18:33:16.156070587 -0700 | ||
32 | @@ -33,6 +33,10 @@ | ||
33 | */ | ||
34 | |||
35 | |||
36 | +#ifdef HAVE_CONFIG_H | ||
37 | +#include "config.h" | ||
38 | +#endif | ||
39 | + | ||
40 | #include "vmmouse_proto.h" | ||
41 | |||
42 | |||
43 | Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h | ||
44 | =================================================================== | ||
45 | --- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.h 2014-08-28 18:33:16.168070587 -0700 | ||
46 | +++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h 2014-08-28 18:33:16.156070587 -0700 | ||
47 | @@ -36,11 +36,6 @@ | ||
48 | #ifndef _VMMOUSE_PROTO_H_ | ||
49 | #define _VMMOUSE_PROTO_H_ | ||
50 | |||
51 | - | ||
52 | -#ifdef HAVE_CONFIG_H | ||
53 | -#include "config.h" | ||
54 | -#endif | ||
55 | - | ||
56 | #include <stdint.h> | ||
57 | |||
58 | #ifdef HAVE_XORG_SERVER_1_1_0 | ||
59 | Index: xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c | ||
60 | =================================================================== | ||
61 | --- xf86-input-vmmouse-13.0.0.orig/tools/vmmouse_detect.c 2014-08-28 18:33:16.168070587 -0700 | ||
62 | +++ xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c 2014-08-28 18:33:16.160070587 -0700 | ||
63 | @@ -26,14 +26,14 @@ | ||
64 | */ | ||
65 | |||
66 | |||
67 | -#include <stdlib.h> | ||
68 | -#include <signal.h> | ||
69 | -#include "vmmouse_client.h" | ||
70 | - | ||
71 | #ifdef HAVE_CONFIG_H | ||
72 | #include "config.h" | ||
73 | #endif | ||
74 | |||
75 | +#include <stdlib.h> | ||
76 | +#include <signal.h> | ||
77 | +#include "vmmouse_client.h" | ||
78 | + | ||
79 | void | ||
80 | segvCB(int sig) | ||
81 | { | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb new file mode 100644 index 0000000000..83ea960a88 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | require xorg-driver-input.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- VMWare mouse input driver" | ||
4 | DESCRIPTION = "The vmmouse driver enables support for the special VMMouse \ | ||
5 | protocol that is provided by VMware virtual machines to give absolute \ | ||
6 | pointer positioning. The vmmouse driver is capable of falling back to the \ | ||
7 | standard 'mouse' driver if a VMware virtual machine is not detected." | ||
8 | |||
9 | PR = "${INC_PR}.0" | ||
10 | |||
11 | SRC_URI += "file://always_include_config.h.patch" | ||
12 | |||
13 | SRC_URI[md5sum] = "34f9f64ee6a1a51fc8266a9af24e1e07" | ||
14 | SRC_URI[sha256sum] = "04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c" | ||
15 | |||
16 | RDEPENDS_${PN} += "xf86-input-mouse" | ||
17 | |||
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc" | ||
19 | |||
20 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | ||
21 | |||
22 | do_install_append () { | ||
23 | # We don't care about hal | ||
24 | rm -rf ${D}${datadir}/hal/ | ||
25 | rm -rf ${D}${libdir}/hal/ | ||
26 | } | ||
27 | |||
28 | FILES_${PN} += "${base_libdir}/udev/ ${datadir}/X11/xorg.conf.d" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.2.bb new file mode 100644 index 0000000000..01cd37e364 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.2.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- cirrus display driver" | ||
4 | DESCRIPTION = "cirrus is an Xorg driver for Cirrus Logic VGA adapters. These \ | ||
5 | devices are not so common in the wild anymore, but QEMU can emulate one, so \ | ||
6 | the driver is still useful." | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=6ddc7ca860dc5fd014e7f160ea699295" | ||
9 | |||
10 | SRC_URI[md5sum] = "91fd6b677d62027cd3001debb587a6a6" | ||
11 | SRC_URI[sha256sum] = "3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7" | ||
12 | |||
13 | DEPENDS += "libpciaccess" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb b/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb new file mode 100644 index 0000000000..52e9bd1dfa --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- fbdev display driver" | ||
4 | DESCRIPTION = "fbdev is an Xorg driver for framebuffer devices. This is a non-accelerated driver." | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" | ||
7 | |||
8 | SRC_URI[md5sum] = "3931c0e19d441cc576dc088f9eb9fd73" | ||
9 | SRC_URI[sha256sum] = "9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch new file mode 100644 index 0000000000..8a5dd39ae1 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Include xorg-server.h to fix build errors seen with glibc 2.20 | ||
2 | |||
3 | In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, | ||
4 | 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: | ||
5 | /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' | ||
6 | strndup(const char *str, size_t n); | ||
7 | ^ | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Index: xf86-video-intel-2.99.912/src/backlight.c | ||
14 | =================================================================== | ||
15 | --- xf86-video-intel-2.99.912.orig/src/backlight.c 2014-04-09 10:41:18.000000000 -0700 | ||
16 | +++ xf86-video-intel-2.99.912/src/backlight.c 2014-08-28 18:52:25.524070587 -0700 | ||
17 | @@ -29,6 +29,7 @@ | ||
18 | #include "config.h" | ||
19 | #endif | ||
20 | |||
21 | +#include <xorg-server.h> | ||
22 | #include <sys/types.h> | ||
23 | #include <sys/wait.h> | ||
24 | #include <sys/stat.h> | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch new file mode 100644 index 0000000000..3a42d1377c --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001 | ||
4 | From: Chris Wilson <chris@chris-wilson.co.uk> | ||
5 | Date: Sat, 5 Oct 2013 18:42:24 +0100 | ||
6 | Subject: [PATCH] compat-api: Map changes of DamageUnregister API in 1.14.99.2 | ||
7 | |||
8 | Reported-by: Emmanuel Benisty <benisty.e@gmail.com> | ||
9 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||
10 | --- | ||
11 | src/compat-api.h | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/src/compat-api.h b/src/compat-api.h | ||
15 | index 8eb46ef..244a486 100644 | ||
16 | --- a/src/compat-api.h | ||
17 | +++ b/src/compat-api.h | ||
18 | @@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap) | ||
19 | if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) | ||
20 | #endif | ||
21 | |||
22 | +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) | ||
23 | +#define DamageUnregister(d, dd) DamageUnregister(dd) | ||
24 | +#endif | ||
25 | + | ||
26 | #endif | ||
27 | -- | ||
28 | 1.7.9.5 | ||
29 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch new file mode 100644 index 0000000000..7fa9443d93 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch | |||
@@ -0,0 +1,166 @@ | |||
1 | Add the ability to enable/disable specific versions of the DRI support. | ||
2 | |||
3 | This is the following two commits from master squashed: | ||
4 | 7bc669dd4b7e3e5978e95e4131d1f9215afbc041 | ||
5 | 5a0cb1049c2fa0586708719210a2d2cffa7a4491 | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
9 | |||
10 | diff --git a/configure.ac b/configure.ac | ||
11 | index b3b6e8e..bd654f3 100644 | ||
12 | --- a/configure.ac | ||
13 | +++ b/configure.ac | ||
14 | @@ -296,6 +296,21 @@ AC_ARG_ENABLE(dri, | ||
15 | [Disable DRI support [[default=auto]]]), | ||
16 | [DRI=$enableval], | ||
17 | [DRI=auto]) | ||
18 | +AC_ARG_ENABLE(dri1, | ||
19 | + AS_HELP_STRING([--disable-dri1], | ||
20 | + [Disable DRI1 support [[default=yes]]]), | ||
21 | + [DRI1=$enableval], | ||
22 | + [DRI1=yes]) | ||
23 | +AC_ARG_ENABLE(dri2, | ||
24 | + AS_HELP_STRING([--disable-dri2], | ||
25 | + [Disable DRI2 support [[default=yes]]]), | ||
26 | + [DRI2=$enableval], | ||
27 | + [DRI2=yes]) | ||
28 | +AC_ARG_ENABLE(dri3, | ||
29 | + AS_HELP_STRING([--disable-dri3], | ||
30 | + [Disable DRI3 support [[default=yes]]]), | ||
31 | + [DRI3=$enableval], | ||
32 | + [DRI3=yes]) | ||
33 | |||
34 | AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc], | ||
35 | [Disable XvMC support [[default=yes]]]), | ||
36 | @@ -461,15 +476,15 @@ if test "x$UMS" = "xyes"; then | ||
37 | AC_DEFINE(UMS,1,[Assume UMS support]) | ||
38 | fi | ||
39 | |||
40 | -DRI1=no | ||
41 | +have_dri1=no | ||
42 | XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto) | ||
43 | -if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then | ||
44 | - PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1=$DRI], [DRI1=no]) | ||
45 | +if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$DRI1" != "xno" -a "x$UMS" = "xyes"; then | ||
46 | + PKG_CHECK_MODULES(DRI1, [xf86driproto], [have_dri1=$DRI], [have_dri1=no]) | ||
47 | save_CFLAGS="$CFLAGS" | ||
48 | save_CPPFLAGS="$CPPFLAGS" | ||
49 | CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" | ||
50 | CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" | ||
51 | - AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [DRI1=no], | ||
52 | + AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [have_dri1=no], | ||
53 | [/* for dri.h */ | ||
54 | #include <xf86str.h> | ||
55 | /* for dristruct.h */ | ||
56 | @@ -486,49 +501,55 @@ if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then | ||
57 | fi | ||
58 | |||
59 | AC_MSG_CHECKING([whether to include DRI1 support]) | ||
60 | -AC_MSG_RESULT([$DRI1]) | ||
61 | +AC_MSG_RESULT([$have_dri1]) | ||
62 | |||
63 | -AM_CONDITIONAL(DRI1, test "x$DRI1" != "xno") | ||
64 | -if test "x$DRI1" != "xno"; then | ||
65 | +AM_CONDITIONAL(DRI1, test "x$have_dri1" != "xno") | ||
66 | +if test "x$have_dri1" != "xno"; then | ||
67 | AC_DEFINE(HAVE_DRI1,1,[Enable DRI1 driver support]) | ||
68 | dri_msg="$dri_msg DRI1" | ||
69 | else | ||
70 | DRI1_CFLAGS="" | ||
71 | DRI1_LIBS="" | ||
72 | |||
73 | - if test "x$DRI" = "xyes" -a "x$UMS" = "xyes"; then | ||
74 | + if test "x$DRI" = "xyes" -a "x$UMS" = "xyes" -a "x$DRI1" != "xno"; then | ||
75 | AC_MSG_ERROR([DRI1 requested but prerequisites not found]) | ||
76 | fi | ||
77 | fi | ||
78 | |||
79 | -DRI2=no | ||
80 | -DRI3=no | ||
81 | +have_dri2=no | ||
82 | +have_dri3=no | ||
83 | if test "x$DRI" != "xno"; then | ||
84 | - PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [DRI2=$DRI], [DRI2=no]) | ||
85 | - dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` | ||
86 | - if test "x$dridriverdir" = "x"; then | ||
87 | - dridriverdir="$libdir/dri" | ||
88 | - fi | ||
89 | - AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI2 driver path]) | ||
90 | if test "x$DRI2" != "xno"; then | ||
91 | + PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [have_dri2=$DRI], [have_dri2=no]) | ||
92 | + fi | ||
93 | + if test "x$have_dri2" != "xno"; then | ||
94 | save_CFLAGS=$CFLAGS | ||
95 | CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI1_CFLAGS $DRI2_CFLAGS" | ||
96 | - AC_CHECK_HEADERS([dri2.h], [], [DRI2=no], [ | ||
97 | + AC_CHECK_HEADERS([dri2.h], [], [have_dri2=no], [ | ||
98 | #include <dixstruct.h> | ||
99 | #include <drm.h> | ||
100 | ]) | ||
101 | CFLAGS=$save_CFLAGS | ||
102 | fi | ||
103 | - | ||
104 | - XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) | ||
105 | - if test "x$_EXT_CHECK" != "xno"; then | ||
106 | - PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], []) | ||
107 | + if test "x$have_dri2" != "xno"; then | ||
108 | + dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` | ||
109 | + if test "x$dridriverdir" = "x"; then | ||
110 | + dridriverdir="$libdir/dri" | ||
111 | + fi | ||
112 | + AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default have_dri2 driver path]) | ||
113 | fi | ||
114 | + | ||
115 | if test "x$DRI3" != "xno"; then | ||
116 | + XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) | ||
117 | + if test "x$_EXT_CHECK" != "xno"; then | ||
118 | + PKG_CHECK_MODULES(DRI3, [dri3proto], [have_dri3=$DRI], []) | ||
119 | + fi | ||
120 | + fi | ||
121 | + if test "x$have_dri3" != "xno"; then | ||
122 | save_CFLAGS=$CFLAGS | ||
123 | CFLAGS="$XORG_CFLAGS $DRI3_CFLAGS" | ||
124 | - AC_CHECK_DECL(DRI3, [], [DRI3=no], [#include <xorg-server.h>]) | ||
125 | - AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [DRI3=no], [ | ||
126 | + AC_CHECK_DECL(DRI3, [], [have_dri3=no], [#include <xorg-server.h>]) | ||
127 | + AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [have_dri3=no], [ | ||
128 | #include <xorg-server.h> | ||
129 | #include <xf86str.h> | ||
130 | #include <misync.h> | ||
131 | @@ -538,13 +559,13 @@ if test "x$DRI" != "xno"; then | ||
132 | fi | ||
133 | |||
134 | AC_MSG_CHECKING([whether to include DRI2 support]) | ||
135 | -AM_CONDITIONAL(DRI2, test "x$DRI2" != "xno") | ||
136 | -AC_MSG_RESULT([$DRI2]) | ||
137 | -if test "x$DRI2" != "xno"; then | ||
138 | +AM_CONDITIONAL(DRI2, test "x$have_dri2" != "xno") | ||
139 | +AC_MSG_RESULT([$have_dri2]) | ||
140 | +if test "x$have_dri2" != "xno"; then | ||
141 | AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support]) | ||
142 | dri_msg="$dri_msg DRI2" | ||
143 | else | ||
144 | - if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then | ||
145 | + if test "x$DRI" = "xyes" -a "x$DRI2" != "xno" -a "x$KMS" = "xyes"; then | ||
146 | AC_MSG_ERROR([DRI2 requested but prerequisites not found]) | ||
147 | fi | ||
148 | |||
149 | @@ -553,13 +574,13 @@ else | ||
150 | fi | ||
151 | |||
152 | AC_MSG_CHECKING([whether to include DRI3 support]) | ||
153 | -AM_CONDITIONAL(DRI3, test "x$DRI3" != "xno") | ||
154 | -AC_MSG_RESULT([$DRI3]) | ||
155 | -if test "x$DRI3" != "xno"; then | ||
156 | +AM_CONDITIONAL(DRI3, test "x$have_dri3" != "xno") | ||
157 | +AC_MSG_RESULT([$have_dri3]) | ||
158 | +if test "x$have_dri3" != "xno"; then | ||
159 | AC_DEFINE(HAVE_DRI3,1,[Enable DRI3 driver support]) | ||
160 | dri_msg="$dri_msg DRI3" | ||
161 | else | ||
162 | - if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then | ||
163 | + if test "x$DRI" = "xyes" -a "x$DRI3" != "xno" -a "x$KMS" = "xyes"; then | ||
164 | AC_MSG_ERROR([DRI3 requested but prerequisites not found]) | ||
165 | fi | ||
166 | fi | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch new file mode 100644 index 0000000000..9e93ca875c --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From ec91cfe7e5efdd5e1b1fbb85eea8f07b50e24c4b Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Wed, 11 Sep 2013 21:12:37 +0100 | ||
7 | Subject: [PATCH] test: only build DRI2 tests if DRI2 is enabled | ||
8 | |||
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
10 | --- | ||
11 | test/Makefile.am | 10 ++++++++++ | ||
12 | 1 file changed, 10 insertions(+) | ||
13 | |||
14 | diff --git a/test/Makefile.am b/test/Makefile.am | ||
15 | index f51967b..18528a9 100644 | ||
16 | --- a/test/Makefile.am | ||
17 | +++ b/test/Makefile.am | ||
18 | @@ -16,9 +16,14 @@ stress_TESTS = \ | ||
19 | render-copyarea-size \ | ||
20 | render-copy-alphaless \ | ||
21 | mixed-stress \ | ||
22 | + $(NULL) | ||
23 | + | ||
24 | +if DRI2 | ||
25 | +stress_TESTS += \ | ||
26 | dri2-swap \ | ||
27 | dri2-race \ | ||
28 | $(NULL) | ||
29 | +endif | ||
30 | |||
31 | check_PROGRAMS = $(stress_TESTS) | ||
32 | |||
33 | @@ -34,9 +39,14 @@ libtest_la_SOURCES = \ | ||
34 | test_image.c \ | ||
35 | test_log.c \ | ||
36 | test_render.c \ | ||
37 | + $(NULL) | ||
38 | + | ||
39 | +if DRI2 | ||
40 | +libtest_la_SOURCES += \ | ||
41 | dri2.c \ | ||
42 | dri2.h \ | ||
43 | $(NULL) | ||
44 | +endif | ||
45 | |||
46 | vsync.avi: mkvsync.sh | ||
47 | ./mkvsync.sh $@ | ||
48 | -- | ||
49 | 1.7.10.4 | ||
50 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch new file mode 100644 index 0000000000..dda508dcfd --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | These modules are only used for tests that don't get installed, and the | ||
2 | automatic detection without explicit dependencies means that a build can find | ||
3 | e.g. xshmfence at configure time but then it's been removed from the sysroot by | ||
4 | the time compile happens. | ||
5 | |||
6 | As the tests don't get installed, just disable the checks. | ||
7 | |||
8 | Upstream-Status: Inappropriate [OE-specific] | ||
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
10 | |||
11 | diff --git a/configure.ac b/configure.ac | ||
12 | index bd654f3..78a0e0d 100644 | ||
13 | --- a/configure.ac | ||
14 | +++ b/configure.ac | ||
15 | @@ -251 +251 @@ fi | ||
16 | -PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) | ||
17 | +#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/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb new file mode 100644 index 0000000000..cd8fd63b51 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb | |||
@@ -0,0 +1,32 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver" | ||
4 | |||
5 | DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \ | ||
6 | chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \ | ||
7 | the driver supports hardware accelerated 3D via the Direct Rendering \ | ||
8 | Infrastructure (DRI)." | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" | ||
11 | |||
12 | DEPENDS += "virtual/libx11 drm libpciaccess pixman" | ||
13 | |||
14 | SRC_URI += "file://disable-dri2-tests.patch \ | ||
15 | file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ | ||
16 | " | ||
17 | |||
18 | PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" | ||
19 | |||
20 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" | ||
21 | PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" | ||
22 | PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" | ||
23 | PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" | ||
24 | PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" | ||
25 | |||
26 | # --enable-kms-only option is required by ROOTLESS_X | ||
27 | EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' | ||
28 | |||
29 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | ||
30 | |||
31 | SRC_URI[md5sum] = "8b646d257ace8197d6ab4e5ddeb8efb2" | ||
32 | SRC_URI[sha256sum] = "7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb new file mode 100644 index 0000000000..a10cd9e278 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver" | ||
4 | |||
5 | DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \ | ||
6 | chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \ | ||
7 | the driver supports hardware accelerated 3D via the Direct Rendering \ | ||
8 | Infrastructure (DRI)." | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" | ||
11 | |||
12 | SRC_URI += "file://configure-dri.patch \ | ||
13 | file://disable-x11-dri3.patch \ | ||
14 | file://always_include_xorg_server.h.patch \ | ||
15 | " | ||
16 | |||
17 | SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4" | ||
18 | SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501" | ||
19 | |||
20 | DEPENDS += "virtual/libx11 drm libpciaccess pixman" | ||
21 | |||
22 | PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}" | ||
23 | |||
24 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri" | ||
25 | PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1,xf86driproto" | ||
26 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" | ||
27 | PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" | ||
28 | PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" | ||
29 | PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" | ||
30 | PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" | ||
31 | PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" | ||
32 | PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxrandr libxdamage libxfixes libxcursor libxtst libxext libxrender" | ||
33 | |||
34 | # --enable-kms-only option is required by ROOTLESS_X | ||
35 | EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' | ||
36 | |||
37 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | ||
38 | |||
39 | FILES_${PN} += "${datadir}/polkit-1" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.1.bb new file mode 100644 index 0000000000..5bb89266cd --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.1.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=5e53d3fcadb1c23d122ad63cb099a918" | ||
3 | |||
4 | SUMMARY = "X.Org X server -- modesetting display driver" | ||
5 | DESCRIPTION = "Provides a generic kernel modesetting display driver for the X.Org X server." | ||
6 | |||
7 | SRC_URI[md5sum] = "eb275e1ff0031897bcf23e2e5cb8655a" | ||
8 | SRC_URI[sha256sum] = "3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch new file mode 100644 index 0000000000..d298d5d71e --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57386] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Wed, 21 Nov 2012 23:39:18 +0000 | ||
7 | Subject: [PATCH] build: rationalise DRI checks | ||
8 | |||
9 | The existing logic around DRI was complicated and defined a number of variables | ||
10 | that were not used, when in reality DRI is required. | ||
11 | |||
12 | Move the glproto check to the main pkg-config check, and remove everything else. | ||
13 | |||
14 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
15 | --- | ||
16 | configure.ac | 33 +-------------------------------- | ||
17 | 1 file changed, 1 insertion(+), 32 deletions(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index 11238b1..c321b98 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) | ||
24 | XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) | ||
25 | |||
26 | # Checks for pkg-config packages | ||
27 | -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES) | ||
28 | -sdkdir=$(pkg-config --variable=sdkdir xorg-server) | ||
29 | +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES) | ||
30 | |||
31 | # Checks for header files. | ||
32 | AC_HEADER_STDC | ||
33 | |||
34 | -save_CFLAGS="$CFLAGS" | ||
35 | -CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" | ||
36 | -CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" | ||
37 | -AC_MSG_CHECKING([whether to include DRI support]) | ||
38 | -if test x$DRI != xno; then | ||
39 | - AC_CHECK_FILE([${sdkdir}/dri.h], | ||
40 | - [have_dri_h="yes"], [have_dri_h="no"]) | ||
41 | - AC_CHECK_FILE([${sdkdir}/dristruct.h], | ||
42 | - [have_dristruct_h="yes"], [have_dristruct_h="no"]) | ||
43 | -fi | ||
44 | -AC_MSG_CHECKING([whether to include DRI support]) | ||
45 | -if test x$DRI = xauto; then | ||
46 | - if test "$have_dri_h" = yes -a \ | ||
47 | - "$have_dristruct_h" = yes; then | ||
48 | - DRI="yes" | ||
49 | - else | ||
50 | - DRI="no" | ||
51 | - fi | ||
52 | -fi | ||
53 | -AC_MSG_RESULT([$DRI]) | ||
54 | -CFLAGS="$save_CFLAGS $DEBUGFLAGS" | ||
55 | - | ||
56 | -AM_CONDITIONAL(DRI, test x$DRI = xyes) | ||
57 | -if test "$DRI" = yes; then | ||
58 | - PKG_CHECK_MODULES(DRI, [xf86driproto glproto]) | ||
59 | - AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) | ||
60 | - AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) | ||
61 | -fi | ||
62 | - | ||
63 | AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes) | ||
64 | if test "$VIDEO_DEBUG" = yes; then | ||
65 | AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support]) | ||
66 | fi | ||
67 | |||
68 | -AC_SUBST([DRI_CFLAGS]) | ||
69 | |||
70 | DRIVER_NAME=omap | ||
71 | AC_SUBST([DRIVER_NAME]) | ||
72 | -- | ||
73 | 1.7.10.4 | ||
74 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb new file mode 100644 index 0000000000..454d0a1fb2 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb | |||
@@ -0,0 +1,48 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver" | ||
4 | |||
5 | SUMMARY = "X.Org X server -- TI OMAP integrated graphics chipsets driver" | ||
6 | |||
7 | DESCRIPTION = "Open-source X.org graphics driver for TI OMAP graphics \ | ||
8 | Currently relies on a closed-source submodule for EXA acceleration on \ | ||
9 | the following chipsets: \ | ||
10 | + OMAP3430 \ | ||
11 | + OMAP3630 \ | ||
12 | + OMAP4430 \ | ||
13 | + OMAP4460 \ | ||
14 | + OMAP5430 \ | ||
15 | + OMAP5432 \ | ||
16 | \ | ||
17 | NOTE: this driver is work in progress.. you probably don't want to try \ | ||
18 | and use it yet. The API/ABI between driver and kernel, and driver and \ | ||
19 | acceleration submodules is not stable yet. This driver requires the \ | ||
20 | omapdrm kernel driver w/ GEM support. \ | ||
21 | " | ||
22 | |||
23 | LICENSE = "GPLv2+" | ||
24 | LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" | ||
25 | DEPENDS += "virtual/libx11 libdrm xf86driproto" | ||
26 | |||
27 | SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" | ||
28 | PR = "${INC_PR}.3" | ||
29 | PV = "0.4.2+gitr${SRCPV}" | ||
30 | |||
31 | SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \ | ||
32 | file://configure.patch \ | ||
33 | " | ||
34 | |||
35 | S = "${WORKDIR}/git" | ||
36 | |||
37 | CFLAGS += " -I${STAGING_INCDIR}/xorg " | ||
38 | |||
39 | # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) | ||
40 | do_compile_prepend_armv7a () { | ||
41 | sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c | ||
42 | } | ||
43 | |||
44 | python () { | ||
45 | if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d): | ||
46 | raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES") | ||
47 | } | ||
48 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch new file mode 100644 index 0000000000..9fb01d438a --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 8fb7d0f99d4afbb574b30cb4f1e66a8f89d94ad5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 26 Jan 2011 12:04:36 +0100 | ||
4 | Subject: [PATCH 1/6] Revert "Set a large CRTC upper limit to not prune larger | ||
5 | resolutions" | ||
6 | |||
7 | Picture is garbled after switching resolutions, so revert it. | ||
8 | Virtual size too big, revert the commit 9c4d7592dcb7dc20a48a6f941d9d94bd73d34153. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | src/omapfb-crtc.c | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c | ||
18 | index 9aaa52f..cbeff35 100644 | ||
19 | --- a/src/omapfb-crtc.c | ||
20 | +++ b/src/omapfb-crtc.c | ||
21 | @@ -190,13 +190,13 @@ OMAPFBCRTCInit(ScrnInfoPtr pScrn) | ||
22 | * In practise, this doesn't seem to be supported. | ||
23 | * (no way to setup the overlay offset/base address) | ||
24 | */ | ||
25 | - /* FIXME: figure out what makes sense here. A known max resolution? | ||
26 | - * framebuffer size? | ||
27 | - */ | ||
28 | xf86CrtcSetSizeRange(pScrn, | ||
29 | - 8, 8, 2048, 2048); | ||
30 | + 8, 8, | ||
31 | + ofb->state_info.xres_virtual, | ||
32 | + ofb->state_info.yres_virtual); | ||
33 | |||
34 | ofb->crtc = xf86CrtcCreate(pScrn, &OMAPFBCrtcFuncs); | ||
35 | + | ||
36 | } | ||
37 | |||
38 | |||
39 | -- | ||
40 | 1.8.0 | ||
41 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch new file mode 100644 index 0000000000..683a989832 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 855c333ac0d16350f895f1d1b9391e9cbb0b6db4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 26 Jan 2011 13:27:20 +0100 | ||
4 | Subject: [PATCH 2/6] Revert "Set virtual size when configuring framebuffer" | ||
5 | |||
6 | Virtual size too big, so revert it. | ||
7 | |||
8 | This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | src/omapfb-crtc.c | 2 -- | ||
15 | 1 file changed, 2 deletions(-) | ||
16 | |||
17 | diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c | ||
18 | index cbeff35..9655db2 100644 | ||
19 | --- a/src/omapfb-crtc.c | ||
20 | +++ b/src/omapfb-crtc.c | ||
21 | @@ -98,8 +98,6 @@ OMAPFBCrtcCommitChangeMode (xf86CrtcPtr crtc) | ||
22 | v = ofb->state_info; | ||
23 | v.xres = mode->HDisplay; | ||
24 | v.yres = mode->VDisplay; | ||
25 | - v.xres_virtual = crtc->scrn->virtualX; | ||
26 | - v.yres_virtual = crtc->scrn->virtualY; | ||
27 | v.activate = FB_ACTIVATE_NOW; | ||
28 | v.pixclock = KHZ2PICOS(mode->Clock ? mode->Clock : 56000); | ||
29 | v.left_margin = mode->HTotal - mode->HSyncEnd; | ||
30 | -- | ||
31 | 1.8.0 | ||
32 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch new file mode 100644 index 0000000000..67ea7c1a5f --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 252f44c072d3447a32127fc9afe5d0d40f3c510e Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 26 Jan 2011 13:20:20 +0100 | ||
4 | Subject: [PATCH 3/6] force 'plain' mode | ||
5 | |||
6 | The new DSS mode breaks XV, so force plain mode | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | src/omapfb-driver.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c | ||
17 | index 018e040..48aa09c 100644 | ||
18 | --- a/src/omapfb-driver.c | ||
19 | +++ b/src/omapfb-driver.c | ||
20 | @@ -326,7 +326,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) | ||
21 | OMAPFBProbeController(ofb->ctrl_name); | ||
22 | |||
23 | /* Do we have the DSS kernel API? */ | ||
24 | - if (stat(SYSFS_DSS_DIR, &st) == 0) { | ||
25 | + if (0) { //stat(SYSFS_DSS_DIR, &st) == 0) { | ||
26 | ofb->dss = TRUE; | ||
27 | } else { | ||
28 | ofb->dss = FALSE; | ||
29 | -- | ||
30 | 1.8.0 | ||
31 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch new file mode 100644 index 0000000000..b0ac9a44c8 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From cfa46b67f59115f6d8ef9414af60380749ff3eb3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 26 Jan 2011 13:21:12 +0100 | ||
4 | Subject: [PATCH 4/6] blacklist tv out | ||
5 | |||
6 | The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails. so blacklist it | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | src/omapfb-output-dss.c | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c | ||
17 | index 6cc52de..83cb711 100644 | ||
18 | --- a/src/omapfb-output-dss.c | ||
19 | +++ b/src/omapfb-output-dss.c | ||
20 | @@ -205,6 +205,10 @@ OMAPFBDSSOutputDetect (xf86OutputPtr output) | ||
21 | if(ofb->timings[idx][0] == '\0') | ||
22 | return XF86OutputStatusDisconnected; | ||
23 | |||
24 | + // Hack to disable the tv out | ||
25 | + if (strncmp(output->name, "tv", 2) == 0) | ||
26 | + return XF86OutputStatusDisconnected; | ||
27 | + | ||
28 | return XF86OutputStatusConnected; | ||
29 | } | ||
30 | |||
31 | -- | ||
32 | 1.8.0 | ||
33 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch new file mode 100644 index 0000000000..67b284023d --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch | |||
@@ -0,0 +1,325 @@ | |||
1 | From 8b1f697a60e35ab82fffdabfaefdb45e9a9df379 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eino-Ville Talvala <talvala@stanford.edu> | ||
3 | Date: Tue, 23 Aug 2011 18:37:01 +0200 | ||
4 | Subject: [PATCH 5/6] Attempt to fix VRFB | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | http://dominion.thruhere.net/git/cgit.cgi/xf86-video-omapfb/commit/?h=koen/fixups&id=6833fc9f795265e4943d248103fbaf3463b515d6 | ||
9 | |||
10 | Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | src/image-format-conversions.c | 4 +-- | ||
14 | src/image-format-conversions.h | 2 +- | ||
15 | src/omapfb-driver.c | 28 +++++++++++++--- | ||
16 | src/omapfb-xv-blizzard.c | 1 + | ||
17 | src/omapfb-xv-generic.c | 72 +++++++++++++++++++++++++++++++++--------- | ||
18 | src/omapfb-xv.c | 3 ++ | ||
19 | 6 files changed, 88 insertions(+), 22 deletions(-) | ||
20 | |||
21 | diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c | ||
22 | index dcefa9b..d43427d 100644 | ||
23 | --- a/src/image-format-conversions.c | ||
24 | +++ b/src/image-format-conversions.c | ||
25 | @@ -38,13 +38,13 @@ | ||
26 | #include "image-format-conversions.h" | ||
27 | |||
28 | /* Basic line-based copy for packed formats */ | ||
29 | -void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest) | ||
30 | +void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest) | ||
31 | { | ||
32 | int i; | ||
33 | int len = w * 2; | ||
34 | for (i = 0; i < h; i++) | ||
35 | { | ||
36 | - memcpy(dest + i * len, src + i * stride, len); | ||
37 | + memcpy(dest + i * dst_stride, src + i * src_stride, len); | ||
38 | } | ||
39 | } | ||
40 | |||
41 | diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h | ||
42 | index 584896a..ba7caf2 100644 | ||
43 | --- a/src/image-format-conversions.h | ||
44 | +++ b/src/image-format-conversions.h | ||
45 | @@ -27,7 +27,7 @@ | ||
46 | #include <stdint.h> | ||
47 | |||
48 | /* Basic line-based copy for packed formats */ | ||
49 | -void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest); | ||
50 | +void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest); | ||
51 | |||
52 | /* Basic C implementation of YV12/I420 to UYVY conversion */ | ||
53 | 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); | ||
54 | diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c | ||
55 | index 48aa09c..07989f5 100644 | ||
56 | --- a/src/omapfb-driver.c | ||
57 | +++ b/src/omapfb-driver.c | ||
58 | @@ -66,6 +66,7 @@ | ||
59 | #define OMAPFB_VERSION 1000 | ||
60 | #define OMAPFB_DRIVER_NAME "OMAPFB" | ||
61 | #define OMAPFB_NAME "omapfb" | ||
62 | +#define ENFORCE_MODES | ||
63 | |||
64 | static Bool OMAPFBProbe(DriverPtr drv, int flags); | ||
65 | static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); | ||
66 | @@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = { | ||
67 | typedef enum { | ||
68 | OPTION_ACCELMETHOD, | ||
69 | OPTION_FB, | ||
70 | + OPTION_ROTATE, | ||
71 | } FBDevOpts; | ||
72 | |||
73 | static const OptionInfoRec OMAPFBOptions[] = { | ||
74 | { OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE }, | ||
75 | { OPTION_FB, "fb", OPTV_STRING, {0}, FALSE }, | ||
76 | + { OPTION_ROTATE, "rotation", OPTV_STRING, {0}, FALSE }, | ||
77 | { -1, NULL, OPTV_NONE, {0}, FALSE } | ||
78 | }; | ||
79 | |||
80 | @@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) | ||
81 | { | ||
82 | OMAPFBPtr ofb; | ||
83 | EntityInfoPtr pEnt; | ||
84 | + char *rotate; | ||
85 | rgb zeros = { 0, 0, 0 }; | ||
86 | struct stat st; | ||
87 | |||
88 | @@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) | ||
89 | pScrn->progClock = TRUE; | ||
90 | pScrn->chipset = "omapfb"; | ||
91 | |||
92 | + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n"); | ||
93 | + | ||
94 | /* Start with configured virtual size */ | ||
95 | pScrn->virtualX = pScrn->display->virtualX; | ||
96 | pScrn->virtualY = pScrn->display->virtualY; | ||
97 | @@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
98 | ofb->CloseScreen = pScreen->CloseScreen; | ||
99 | pScreen->CloseScreen = OMAPFBCloseScreen; | ||
100 | |||
101 | + /* Enforce the default mode (this is silly I guess) */ | ||
102 | +#ifdef ENFORCE_MODES | ||
103 | + //xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n"); | ||
104 | + //set_mode(ofb, &ofb->default_mode); | ||
105 | + //pScrn->displayWidth = ofb->fixed_info.line_length / | ||
106 | + // (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres; | ||
107 | +#endif | ||
108 | + | ||
109 | /* Map our framebuffer memory */ | ||
110 | + ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres; | ||
111 | ofb->fb = mmap (NULL, ofb->mem_info.size, | ||
112 | PROT_READ | PROT_WRITE, MAP_SHARED, | ||
113 | ofb->fd, 0); | ||
114 | - if (ofb->fb == NULL) { | ||
115 | - xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n"); | ||
116 | + if (ofb->fb == MAP_FAILED) { | ||
117 | + xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); | ||
118 | return FALSE; | ||
119 | } | ||
120 | |||
121 | @@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
122 | } else if (!ofb->dss) { | ||
123 | |||
124 | ofb->plane_info.enabled = 1; | ||
125 | - ofb->plane_info.out_width = ofb->state_info.xres; | ||
126 | - ofb->plane_info.out_height = ofb->state_info.yres; | ||
127 | + if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) { | ||
128 | + ofb->plane_info.out_width = ofb->state_info.xres; | ||
129 | + ofb->plane_info.out_height = ofb->state_info.yres; | ||
130 | + } else { | ||
131 | + ofb->plane_info.out_width = ofb->state_info.yres; | ||
132 | + ofb->plane_info.out_height = ofb->state_info.xres; | ||
133 | + } | ||
134 | |||
135 | if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) { | ||
136 | xf86DrvMsg(scrnIndex, X_ERROR, | ||
137 | diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c | ||
138 | index 406ffc6..b71d2aa 100644 | ||
139 | --- a/src/omapfb-xv-blizzard.c | ||
140 | +++ b/src/omapfb-xv-blizzard.c | ||
141 | @@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn, | ||
142 | packed_line_copy(src_w & ~3, | ||
143 | src_h & ~3, | ||
144 | ((src_w + 1) & ~1) * 2, | ||
145 | + ofb->port->fixed_info.line_length, | ||
146 | (uint8_t*)buf, | ||
147 | (uint8_t*)ofb->port->fb); | ||
148 | break; | ||
149 | diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c | ||
150 | index e6f89fe..b33f344 100644 | ||
151 | --- a/src/omapfb-xv-generic.c | ||
152 | +++ b/src/omapfb-xv-generic.c | ||
153 | @@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) | ||
154 | { | ||
155 | OMAPFBPtr ofb = OMAPFB(pScrn); | ||
156 | |||
157 | - /* The memory size is already set in OMAPFBXVQueryImageAttributes */ | ||
158 | + /* The memory size is already set before we get here */ | ||
159 | if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) { | ||
160 | xf86DrvMsg(pScrn->scrnIndex, X_ERROR, | ||
161 | "Failed to allocate video plane memory\n"); | ||
162 | @@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) | ||
163 | ofb->port->fb = mmap (NULL, ofb->port->mem_info.size, | ||
164 | PROT_READ | PROT_WRITE, MAP_SHARED, | ||
165 | ofb->port->fd, 0); | ||
166 | - if (ofb->port->fb == NULL) { | ||
167 | + if (ofb->port->fb == MAP_FAILED) { | ||
168 | xf86DrvMsg(pScrn->scrnIndex, X_ERROR, | ||
169 | "Mapping video memory failed\n"); | ||
170 | return XvBadAlloc; | ||
171 | } | ||
172 | |||
173 | /* Update the state info */ | ||
174 | + /* Let's not - it's bad | ||
175 | if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info)) | ||
176 | { | ||
177 | xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); | ||
178 | return XvBadAlloc; | ||
179 | } | ||
180 | - | ||
181 | + */ | ||
182 | return Success; | ||
183 | } | ||
184 | |||
185 | @@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) | ||
186 | int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn) | ||
187 | { | ||
188 | OMAPFBPtr ofb = OMAPFB(pScrn); | ||
189 | + int ret; | ||
190 | |||
191 | if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info)) | ||
192 | { | ||
193 | @@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn) | ||
194 | xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); | ||
195 | return XvBadAlloc; | ||
196 | } | ||
197 | + /* Changing rotation/nonstd flags can change the fixed info! */ | ||
198 | + if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info)) | ||
199 | + { | ||
200 | + xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); | ||
201 | + return XvBadAlloc; | ||
202 | + } | ||
203 | + /* Correct fixed info requires recalculation of needed memory */ | ||
204 | + ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres; | ||
205 | + | ||
206 | + /* Allocate buffer memory */ | ||
207 | + ret = OMAPXVAllocPlane(pScrn); | ||
208 | + if (ret != Success) | ||
209 | + return ret; | ||
210 | + | ||
211 | + /* Workaround for reset of mode after memory allo */ | ||
212 | + if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info)) | ||
213 | + { | ||
214 | + xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__); | ||
215 | + return XvBadAlloc; | ||
216 | + } | ||
217 | + if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info)) | ||
218 | + { | ||
219 | + xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); | ||
220 | + return XvBadAlloc; | ||
221 | + } | ||
222 | |||
223 | if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE, | ||
224 | &ofb->port->plane_info) != 0) { | ||
225 | @@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, | ||
226 | DrawablePtr pDraw) | ||
227 | { | ||
228 | OMAPFBPtr ofb = OMAPFB(pScrn); | ||
229 | + short drw_temp; | ||
230 | + short rot_xres, rot_yres; | ||
231 | |||
232 | if (!ofb->port->plane_info.enabled | ||
233 | || ofb->port->update_window.x != src_x | ||
234 | @@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, | ||
235 | return Success; | ||
236 | } | ||
237 | |||
238 | - /* If we don't have the plane running, enable it */ | ||
239 | - if (!ofb->port->plane_info.enabled) { | ||
240 | - ret = OMAPXVAllocPlane(pScrn); | ||
241 | - if (ret != Success) | ||
242 | - return ret; | ||
243 | - } | ||
244 | - | ||
245 | /* Set up the state info, xres and yres will be used for | ||
246 | * scaling to the values in the plane info struct | ||
247 | */ | ||
248 | @@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, | ||
249 | ofb->port->state_info.yres_virtual = 0; | ||
250 | ofb->port->state_info.xoffset = 0; | ||
251 | ofb->port->state_info.yoffset = 0; | ||
252 | - ofb->port->state_info.rotate = 0; | ||
253 | + //ofb->port->state_info.rotate = 0; | ||
254 | ofb->port->state_info.grayscale = 0; | ||
255 | ofb->port->state_info.activate = FB_ACTIVATE_NOW; | ||
256 | ofb->port->state_info.bits_per_pixel = 0; | ||
257 | ofb->port->state_info.nonstd = xv_to_omapfb_format(image); | ||
258 | |||
259 | + /* Plane info does not rotate with state_info */ | ||
260 | + if (ofb->port->state_info.rotate == 1 || | ||
261 | + ofb->port->state_info.rotate == 3) { | ||
262 | + drw_temp = drw_x; | ||
263 | + drw_x = drw_y; | ||
264 | + drw_y = drw_temp; | ||
265 | + | ||
266 | + drw_temp = drw_w; | ||
267 | + drw_w = drw_h; | ||
268 | + drw_h = drw_temp; | ||
269 | + | ||
270 | + rot_xres = ofb->port->state_info.yres; | ||
271 | + rot_yres = ofb->port->state_info.xres; | ||
272 | + } else { | ||
273 | + rot_xres = ofb->port->state_info.xres; | ||
274 | + rot_yres = ofb->port->state_info.yres; | ||
275 | + } | ||
276 | + | ||
277 | + | ||
278 | /* Set up the video plane info */ | ||
279 | ofb->port->plane_info.enabled = 1; | ||
280 | ofb->port->plane_info.pos_x = drw_x; | ||
281 | @@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, | ||
282 | ofb->port->plane_info.out_height = drw_h & ~15; | ||
283 | |||
284 | /* Cap output to screen size */ | ||
285 | - if (ofb->port->plane_info.out_width > ofb->state_info.xres) { | ||
286 | + if (ofb->port->plane_info.out_width > rot_xres) { | ||
287 | ofb->port->plane_info.pos_x = 0; | ||
288 | - ofb->port->plane_info.out_width = ofb->state_info.xres; | ||
289 | + ofb->port->plane_info.out_width = rot_xres; | ||
290 | } | ||
291 | - if (ofb->port->plane_info.out_height > ofb->state_info.yres) { | ||
292 | + if (ofb->port->plane_info.out_height > rot_yres) { | ||
293 | ofb->port->plane_info.pos_y = 0; | ||
294 | - ofb->port->plane_info.out_height = ofb->state_info.yres; | ||
295 | + ofb->port->plane_info.out_height = rot_yres; | ||
296 | } | ||
297 | |||
298 | ret = OMAPXVSetupVideoPlane(pScrn); | ||
299 | @@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, | ||
300 | packed_line_copy(src_w & ~15, | ||
301 | src_h & ~15, | ||
302 | ((src_w + 1) & ~1) * 2, | ||
303 | + ofb->port->fixed_info.line_length, | ||
304 | (uint8_t*)buf, | ||
305 | (uint8_t*)ofb->port->fb); | ||
306 | break; | ||
307 | diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c | ||
308 | index 1df651e..0fee2c6 100644 | ||
309 | --- a/src/omapfb-xv.c | ||
310 | +++ b/src/omapfb-xv.c | ||
311 | @@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn, | ||
312 | h = *height; | ||
313 | |||
314 | w = (w + 1) & ~1; | ||
315 | + | ||
316 | + /* Can't calculate these here - don't know line length | ||
317 | ofb->port->mem_info.size = w << 1; | ||
318 | ofb->port->mem_info.size *= h; | ||
319 | + */ | ||
320 | |||
321 | return size; | ||
322 | } | ||
323 | -- | ||
324 | 1.8.0 | ||
325 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch new file mode 100644 index 0000000000..d56729987c --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch | |||
@@ -0,0 +1,272 @@ | |||
1 | From 803ecf2909949e6152f4a81b6cbb92a4430679ac Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 23 Nov 2012 00:31:06 +0100 | ||
4 | Subject: [PATCH 6/6] omapfb: port to new xserver video API | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | src/compat-api.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
11 | src/omapfb-driver.c | 41 ++++++++++++----------- | ||
12 | 2 files changed, 118 insertions(+), 19 deletions(-) | ||
13 | create mode 100644 src/compat-api.h | ||
14 | |||
15 | diff --git a/src/compat-api.h b/src/compat-api.h | ||
16 | new file mode 100644 | ||
17 | index 0000000..b1591b1 | ||
18 | --- /dev/null | ||
19 | +++ b/src/compat-api.h | ||
20 | @@ -0,0 +1,96 @@ | ||
21 | +/* | ||
22 | + * Copyright 2012 Red Hat, Inc. | ||
23 | + * | ||
24 | + * Permission is hereby granted, free of charge, to any person obtaining a | ||
25 | + * copy of this software and associated documentation files (the "Software"), | ||
26 | + * to deal in the Software without restriction, including without limitation | ||
27 | + * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
28 | + * and/or sell copies of the Software, and to permit persons to whom the | ||
29 | + * Software is furnished to do so, subject to the following conditions: | ||
30 | + * | ||
31 | + * The above copyright notice and this permission notice (including the next | ||
32 | + * paragraph) shall be included in all copies or substantial portions of the | ||
33 | + * Software. | ||
34 | + * | ||
35 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
36 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
37 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
38 | + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
39 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
40 | + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
41 | + * DEALINGS IN THE SOFTWARE. | ||
42 | + * | ||
43 | + * Author: Dave Airlie <airlied@redhat.com> | ||
44 | + */ | ||
45 | + | ||
46 | +/* this file provides API compat between server post 1.13 and pre it, | ||
47 | + it should be reused inside as many drivers as possible */ | ||
48 | +#ifndef COMPAT_API_H | ||
49 | +#define COMPAT_API_H | ||
50 | + | ||
51 | +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR | ||
52 | +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] | ||
53 | +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p | ||
54 | +#endif | ||
55 | + | ||
56 | +#ifndef XF86_HAS_SCRN_CONV | ||
57 | +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] | ||
58 | +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] | ||
59 | +#endif | ||
60 | + | ||
61 | +#ifndef XF86_SCRN_INTERFACE | ||
62 | + | ||
63 | +#define SCRN_ARG_TYPE int | ||
64 | +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] | ||
65 | + | ||
66 | +#define SCREEN_ARG_TYPE int | ||
67 | +#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] | ||
68 | + | ||
69 | +#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv | ||
70 | + | ||
71 | +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask | ||
72 | +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask | ||
73 | + | ||
74 | +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen | ||
75 | +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen | ||
76 | + | ||
77 | +#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags | ||
78 | + | ||
79 | +#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags | ||
80 | + | ||
81 | +#define FREE_SCREEN_ARGS_DECL int arg, int flags | ||
82 | +#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 | ||
83 | + | ||
84 | +#define VT_FUNC_ARGS_DECL int arg, int flags | ||
85 | +#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) | ||
86 | + | ||
87 | +#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) | ||
88 | +#else | ||
89 | +#define SCRN_ARG_TYPE ScrnInfoPtr | ||
90 | +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) | ||
91 | + | ||
92 | +#define SCREEN_ARG_TYPE ScreenPtr | ||
93 | +#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) | ||
94 | + | ||
95 | +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv | ||
96 | + | ||
97 | +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask | ||
98 | +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask | ||
99 | + | ||
100 | +#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen | ||
101 | +#define CLOSE_SCREEN_ARGS pScreen | ||
102 | + | ||
103 | +#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y | ||
104 | +#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode | ||
105 | + | ||
106 | +#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg | ||
107 | +#define FREE_SCREEN_ARGS(x) (x) | ||
108 | + | ||
109 | +#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg | ||
110 | +#define VT_FUNC_ARGS(flags) pScrn | ||
111 | + | ||
112 | +#define XF86_ENABLEDISABLEFB_ARG(x) (x) | ||
113 | + | ||
114 | +#endif | ||
115 | + | ||
116 | +#endif | ||
117 | diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c | ||
118 | index 07989f5..486ffa4 100644 | ||
119 | --- a/src/omapfb-driver.c | ||
120 | +++ b/src/omapfb-driver.c | ||
121 | @@ -44,6 +44,8 @@ | ||
122 | |||
123 | #include "exa.h" | ||
124 | |||
125 | +#include "compat-api.h" | ||
126 | + | ||
127 | #ifdef HAVE_XEXTPROTO_71 | ||
128 | #include <X11/extensions/dpmsconst.h> | ||
129 | #else | ||
130 | @@ -70,10 +72,10 @@ | ||
131 | |||
132 | static Bool OMAPFBProbe(DriverPtr drv, int flags); | ||
133 | static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); | ||
134 | -static Bool OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv); | ||
135 | -static Bool OMAPFBEnterVT(int scrnIndex, int flags); | ||
136 | -static void OMAPFBLeaveVT(int scrnIndex, int flags); | ||
137 | -static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); | ||
138 | +static Bool OMAPFBScreenInit(SCREEN_INIT_ARGS_DECL); | ||
139 | +static Bool OMAPFBEnterVT(VT_FUNC_ARGS_DECL); | ||
140 | +static void OMAPFBLeaveVT(VT_FUNC_ARGS_DECL); | ||
141 | +static Bool OMAPFBSwitchMode(SWITCH_MODE_ARGS_DECL); | ||
142 | |||
143 | static Bool | ||
144 | OMAPFBEnsureRec(ScrnInfoPtr pScrn) | ||
145 | @@ -481,7 +483,7 @@ OMAPFBXvScreenInit(ScreenPtr pScreen) | ||
146 | } | ||
147 | |||
148 | static Bool | ||
149 | -OMAPFBCloseScreen(int scrnIndex, ScreenPtr pScreen) | ||
150 | +OMAPFBCloseScreen(CLOSE_SCREEN_ARGS_DECL) | ||
151 | { | ||
152 | ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; | ||
153 | OMAPFBPtr ofb = OMAPFB(pScrn); | ||
154 | @@ -490,11 +492,11 @@ OMAPFBCloseScreen(int scrnIndex, ScreenPtr pScreen) | ||
155 | |||
156 | pScreen->CloseScreen = ofb->CloseScreen; | ||
157 | |||
158 | - return (*pScreen->CloseScreen)(scrnIndex, pScreen); | ||
159 | + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); | ||
160 | } | ||
161 | |||
162 | static Bool | ||
163 | -OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
164 | +OMAPFBScreenInit(SCREEN_INIT_ARGS_DECL) | ||
165 | { | ||
166 | ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; | ||
167 | OMAPFBPtr ofb = OMAPFB(pScrn); | ||
168 | @@ -516,7 +518,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
169 | PROT_READ | PROT_WRITE, MAP_SHARED, | ||
170 | ofb->fd, 0); | ||
171 | if (ofb->fb == MAP_FAILED) { | ||
172 | - xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); | ||
173 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); | ||
174 | return FALSE; | ||
175 | } | ||
176 | |||
177 | @@ -526,7 +528,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
178 | /* Only support TrueColor for now */ | ||
179 | if (!miSetVisualTypes(pScrn->depth, TrueColorMask, | ||
180 | pScrn->rgbBits, pScrn->defaultVisual)) { | ||
181 | - xf86DrvMsg(scrnIndex, X_ERROR, "visual type setup failed" | ||
182 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "visual type setup failed" | ||
183 | " for %d bits per pixel [1]\n", | ||
184 | pScrn->bitsPerPixel); | ||
185 | return FALSE; | ||
186 | @@ -534,7 +536,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
187 | |||
188 | /* Set up pixmap depth information */ | ||
189 | if (!miSetPixmapDepths()) { | ||
190 | - xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n"); | ||
191 | + xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n"); | ||
192 | return FALSE; | ||
193 | } | ||
194 | |||
195 | @@ -546,7 +548,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
196 | pScrn->virtualY, pScrn->xDpi, | ||
197 | pScrn->yDpi, pScrn->displayWidth, | ||
198 | pScrn->bitsPerPixel)) { | ||
199 | - xf86DrvMsg(scrnIndex, X_ERROR, "fbScreenInit failed\n"); | ||
200 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbScreenInit failed\n"); | ||
201 | return FALSE; | ||
202 | } | ||
203 | |||
204 | @@ -567,7 +569,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
205 | |||
206 | /* Initialize XRender fallbacks */ | ||
207 | if (!fbPictureInit(pScreen, NULL, 0)) { | ||
208 | - xf86DrvMsg(scrnIndex, X_ERROR, "fbPictureInit failed\n"); | ||
209 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbPictureInit failed\n"); | ||
210 | return FALSE; | ||
211 | } | ||
212 | |||
213 | @@ -579,7 +581,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
214 | |||
215 | /* Initialize default colormap */ | ||
216 | if (!miCreateDefColormap(pScreen)) { | ||
217 | - xf86DrvMsg(scrnIndex, X_ERROR, | ||
218 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, | ||
219 | "creating default colormap failed\n"); | ||
220 | return FALSE; | ||
221 | } | ||
222 | @@ -589,7 +591,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
223 | /* This is non-fatal since we might be running against older | ||
224 | * kernel driver in which case we only do basic 2D stuff... | ||
225 | */ | ||
226 | - xf86DrvMsg(scrnIndex, X_ERROR, "Reading plane info failed\n"); | ||
227 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Reading plane info failed\n"); | ||
228 | } else if (!ofb->dss) { | ||
229 | |||
230 | ofb->plane_info.enabled = 1; | ||
231 | @@ -602,7 +604,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
232 | } | ||
233 | |||
234 | if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) { | ||
235 | - xf86DrvMsg(scrnIndex, X_ERROR, | ||
236 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, | ||
237 | "%s: Plane setup failed: %s\n", | ||
238 | __FUNCTION__, strerror(errno)); | ||
239 | return FALSE; | ||
240 | @@ -645,9 +647,10 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
241 | return TRUE; | ||
242 | } | ||
243 | |||
244 | -static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) | ||
245 | +static Bool OMAPFBSwitchMode(SWITCH_MODE_ARGS_DECL) | ||
246 | { | ||
247 | - return xf86SetSingleMode (xf86Screens[scrnIndex], mode, RR_Rotate_0); | ||
248 | + SCRN_INFO_PTR(arg); | ||
249 | + return xf86SetSingleMode (pScrn, mode, RR_Rotate_0); | ||
250 | } | ||
251 | |||
252 | void | ||
253 | @@ -699,14 +702,14 @@ OMAPFBPrintCapabilities(ScrnInfoPtr pScrn, | ||
254 | /*** Unimplemented: */ | ||
255 | |||
256 | static Bool | ||
257 | -OMAPFBEnterVT(int scrnIndex, int flags) | ||
258 | +OMAPFBEnterVT(VT_FUNC_ARGS_DECL) | ||
259 | { | ||
260 | xf86Msg(X_NOT_IMPLEMENTED, "%s\n", __FUNCTION__); | ||
261 | return TRUE; | ||
262 | } | ||
263 | |||
264 | static void | ||
265 | -OMAPFBLeaveVT(int scrnIndex, int flags) | ||
266 | +OMAPFBLeaveVT(VT_FUNC_ARGS_DECL) | ||
267 | { | ||
268 | xf86Msg(X_NOT_IMPLEMENTED, "%s\n", __FUNCTION__); | ||
269 | } | ||
270 | -- | ||
271 | 1.8.0 | ||
272 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch new file mode 100644 index 0000000000..dc0b9b3f41 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Fix errors with glibc 2.20 | ||
2 | |||
3 | In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, | ||
4 | from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, | ||
5 | from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, | ||
6 | from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, | ||
7 | from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, | ||
8 | 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: | ||
9 | /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' | ||
10 | strndup(const char *str, size_t n); | ||
11 | ^ | ||
12 | In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, | ||
13 | from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, | ||
14 | from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, | ||
15 | from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, | ||
16 | from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, | ||
17 | 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: | ||
18 | /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' | ||
19 | strndup(const char *str, size_t n); | ||
20 | ^ | ||
21 | |||
22 | Singed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | |||
24 | Upstream-Status: Pending | ||
25 | Index: git/src/omapfb-xv-blizzard.c | ||
26 | =================================================================== | ||
27 | --- git.orig/src/omapfb-xv-blizzard.c 2014-08-28 05:16:25.684070587 -0700 | ||
28 | +++ git/src/omapfb-xv-blizzard.c 2014-08-28 19:05:39.440070587 -0700 | ||
29 | @@ -30,6 +30,7 @@ | ||
30 | * - | ||
31 | */ | ||
32 | |||
33 | +#include <xorg-server.h> | ||
34 | #include "xf86.h" | ||
35 | #include "xf86_OSlib.h" | ||
36 | #include "xf86xv.h" | ||
37 | Index: git/src/omapfb-xv-generic.c | ||
38 | =================================================================== | ||
39 | --- git.orig/src/omapfb-xv-generic.c 2014-08-28 05:16:25.684070587 -0700 | ||
40 | +++ git/src/omapfb-xv-generic.c 2014-08-28 19:05:51.780070587 -0700 | ||
41 | @@ -25,6 +25,7 @@ | ||
42 | * Generic functions for the XV driver | ||
43 | */ | ||
44 | |||
45 | +#include <xorg-server.h> | ||
46 | #include "xf86.h" | ||
47 | #include "xf86_OSlib.h" | ||
48 | #include "xf86xv.h" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb new file mode 100644 index 0000000000..4ad25389cd --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver" | ||
4 | |||
5 | DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \ | ||
6 | framebuffer." | ||
7 | |||
8 | LICENSE = "MIT-X & GPLv2+" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" | ||
10 | DEPENDS += "virtual/libx11" | ||
11 | |||
12 | SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" | ||
13 | PR = "${INC_PR}.7" | ||
14 | PV = "0.1.1+gitr${SRCPV}" | ||
15 | |||
16 | SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ | ||
17 | file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ | ||
18 | file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ | ||
19 | file://0003-force-plain-mode.patch \ | ||
20 | file://0004-blacklist-tv-out.patch \ | ||
21 | file://0005-Attempt-to-fix-VRFB.patch \ | ||
22 | file://0006-omapfb-port-to-new-xserver-video-API.patch \ | ||
23 | file://0007-always_include_xorg_server.h.patch \ | ||
24 | " | ||
25 | |||
26 | S = "${WORKDIR}/git" | ||
27 | |||
28 | EXTRA_OECONF_armv7a = " --enable-neon " | ||
29 | CFLAGS += " -I${STAGING_INCDIR}/xorg " | ||
30 | |||
31 | # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) | ||
32 | do_compile_prepend_armv7a () { | ||
33 | sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c | ||
34 | } | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb new file mode 100644 index 0000000000..4052f703b8 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a1f0610ebdc6f314a9fa5102a8c5c1b0" | ||
4 | |||
5 | SUMMARY = "X.Org X server -- Generic Vesa video driver" | ||
6 | |||
7 | DESCRIPTION = "vesa is an Xorg driver for generic VESA video cards. It \ | ||
8 | can drive most VESA-compatible video cards, but only makes use of the \ | ||
9 | basic standard VESA core that is common to these cards. The driver \ | ||
10 | supports depths 8, 15 16 and 24." | ||
11 | |||
12 | PR = "${INC_PR}.0" | ||
13 | |||
14 | DEPENDS += "virtual/libx11 randrproto libpciaccess" | ||
15 | |||
16 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | ||
17 | |||
18 | RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" | ||
19 | |||
20 | SRC_URI[md5sum] = "3690a5356ed121b1a7dfb59a6dcf4bf9" | ||
21 | SRC_URI[sha256sum] = "ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch new file mode 100644 index 0000000000..cf66403e89 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From bdaa9de44a197ba1297b990422ed9e515289f141 Mon Sep 17 00:00:00 2001 | ||
5 | From: Julien Cristau <jcristau@debian.org> | ||
6 | Date: Tue, 1 Apr 2014 10:11:13 +0200 | ||
7 | Subject: [PATCH 1/2] configure: fix build without xatracker | ||
8 | |||
9 | ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the | ||
10 | fifth. | ||
11 | |||
12 | Debian bug#743239 <https://bugs.debian.org/743239> | ||
13 | |||
14 | Reviewed-by: Thomas Klausner <wiz@NetBSD.org> | ||
15 | Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> | ||
16 | Signed-off-by: Julien Cristau <jcristau@debian.org> | ||
17 | Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> | ||
18 | --- | ||
19 | configure.ac | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index dd3ad4e..be40ed7 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -126,7 +126,7 @@ if test x$BUILD_VMWGFX = xyes; then | ||
27 | [PKG_CHECK_EXISTS([xatracker = 2.0.0], | ||
28 | [AC_DEFINE([HAVE_XA_2], 1, | ||
29 | [Has version 2 of XA])])], | ||
30 | - [],[BUILD_VMWGFX=no]) | ||
31 | + [BUILD_VMWGFX=no]) | ||
32 | # | ||
33 | # Check for prime. | ||
34 | # | ||
35 | -- | ||
36 | 1.7.10.4 | ||
37 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch new file mode 100644 index 0000000000..6039d089a1 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch | |||
@@ -0,0 +1,98 @@ | |||
1 | Upstream-Status:Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From f103d6f570671c649ccd7b225e6d6c9f14371888 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Wed, 25 Jun 2014 16:16:44 +0100 | ||
7 | Subject: [PATCH 2/2] add option for vmwgfx | ||
8 | |||
9 | --- | ||
10 | configure.ac | 49 ++++++++++++++++++++----------------------------- | ||
11 | 1 file changed, 20 insertions(+), 29 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index be40ed7..8e15307 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client, | ||
18 | [VMWARECTRL=$enableval], [VMWARECTRL=no]) | ||
19 | AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes]) | ||
20 | |||
21 | +# Define a configure option to build the vmwgfx driver | ||
22 | +AC_ARG_ENABLE(vmwgfx, | ||
23 | + AS_HELP_STRING([--disable-vmwgfx], | ||
24 | + [Disable vmwgfx driver (KMS/3D) (default: enabled)]), | ||
25 | + [VMWGFX="$enableval"], [VMWGFX="yes"]) | ||
26 | +AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes) | ||
27 | + | ||
28 | # Store the list of server defined optional extensions in REQUIRED_MODULES | ||
29 | XORG_DRIVER_CHECK_EXT(RANDR, randrproto) | ||
30 | XORG_DRIVER_CHECK_EXT(RENDER, renderproto) | ||
31 | @@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99], | ||
32 | [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1, | ||
33 | [Has version 1.5.0 or greater of the Xserver])]) | ||
34 | |||
35 | -PKG_CHECK_EXISTS([xorg-server >= 1.7.0], | ||
36 | - [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1, | ||
37 | - [Has version 1.7.0 or greater of the Xserver]) | ||
38 | - BUILD_VMWGFX=yes],[BUILD_VMWGFX=no]) | ||
39 | - | ||
40 | PKG_CHECK_EXISTS([xorg-server >= 1.12.0], | ||
41 | [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, | ||
42 | [Has version 1.12.0 or greater of the Xserver])]) | ||
43 | @@ -114,39 +116,28 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) | ||
44 | |||
45 | AC_SUBST([moduledir]) | ||
46 | |||
47 | -if test x$BUILD_VMWGFX = xyes; then | ||
48 | - PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) | ||
49 | -fi | ||
50 | -if test x$BUILD_VMWGFX = xyes; then | ||
51 | -# | ||
52 | -# Early versions of mesa 10 forgot to bump the XA major version number in | ||
53 | -# the xa_tracker.h header | ||
54 | -# | ||
55 | - PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], | ||
56 | - [PKG_CHECK_EXISTS([xatracker = 2.0.0], | ||
57 | - [AC_DEFINE([HAVE_XA_2], 1, | ||
58 | - [Has version 2 of XA])])], | ||
59 | - [BUILD_VMWGFX=no]) | ||
60 | -# | ||
61 | -# Check for prime. | ||
62 | -# | ||
63 | +AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) | ||
64 | +if test x$VMWGFX = xyes; then | ||
65 | + PKG_CHECK_MODULES([LIBDRM], [libdrm]) | ||
66 | + # Check for prime. | ||
67 | PKG_CHECK_EXISTS([libdrm >= 2.4.38], | ||
68 | [AC_DEFINE([HAVE_LIBDRM_2_4_38], 1, | ||
69 | [Has version 2.4.38 or greater of libdrm])]) | ||
70 | -fi | ||
71 | |||
72 | -DRIVER_NAME=vmware | ||
73 | -AC_SUBST([DRIVER_NAME]) | ||
74 | - | ||
75 | -AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) | ||
76 | -if test x$BUILD_VMWGFX = xyes; then | ||
77 | - AC_MSG_RESULT([yes]) | ||
78 | + # Early versions of mesa 10 forgot to bump the XA major version number | ||
79 | + # in the xa_tracker.h header | ||
80 | + PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], | ||
81 | + [PKG_CHECK_EXISTS([xatracker = 2.0.0], | ||
82 | + [AC_DEFINE([HAVE_XA_2], 1, | ||
83 | + [Has version 2 of XA])])]) | ||
84 | AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) | ||
85 | + AC_MSG_RESULT([yes]) | ||
86 | else | ||
87 | AC_MSG_RESULT([no]) | ||
88 | fi | ||
89 | |||
90 | -AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes) | ||
91 | +DRIVER_NAME=vmware | ||
92 | +AC_SUBST([DRIVER_NAME]) | ||
93 | |||
94 | AC_CONFIG_FILES([ | ||
95 | Makefile | ||
96 | -- | ||
97 | 1.7.10.4 | ||
98 | |||
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb new file mode 100644 index 0000000000..24041b5cad --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-driver-video.inc | ||
2 | |||
3 | SUMMARY = "X.Org X server -- VMware SVGA display driver" | ||
4 | |||
5 | DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" | ||
8 | |||
9 | DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" | ||
10 | |||
11 | SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \ | ||
12 | file://0002-add-option-for-vmwgfx.patch" | ||
13 | |||
14 | SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244" | ||
15 | SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54" | ||
16 | |||
17 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' | ||
18 | |||
19 | EXTRA_OECONF += "--disable-vmwgfx" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc new file mode 100644 index 0000000000..17fac8b8c0 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | |||
@@ -0,0 +1,41 @@ | |||
1 | SUMMARY = "X driver" | ||
2 | HOMEPAGE = "http://www.x.org" | ||
3 | BUGTRACKER = "https://bugs.freedesktop.org" | ||
4 | SECTION = "x11/drivers" | ||
5 | LICENSE = "MIT-X" | ||
6 | |||
7 | PE = "2" | ||
8 | INC_PR = "r21" | ||
9 | |||
10 | DEPENDS = "virtual/xserver xproto randrproto util-macros" | ||
11 | |||
12 | SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" | ||
13 | |||
14 | S = "${WORKDIR}/${BPN}-${PV}" | ||
15 | |||
16 | FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" | ||
17 | FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
21 | # FIXME: We don't want to include the libtool archives (*.la) from modules | ||
22 | # directory, as they serve no useful purpose. Upstream should fix Makefile.am | ||
23 | do_install_append() { | ||
24 | find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- | ||
25 | } | ||
26 | |||
27 | # Function to add the relevant ABI dependency to drivers, which should be called | ||
28 | # from a PACKAGEFUNC. | ||
29 | def _add_xorg_abi_depends(d, name): | ||
30 | # Map of ABI names exposed in the dependencies to pkg-config variables | ||
31 | abis = { | ||
32 | "video": "abi_videodrv", | ||
33 | "input": "abi_xinput" | ||
34 | } | ||
35 | |||
36 | output = os.popen("pkg-config xorg-server --variable=%s" % abis[name]).read() | ||
37 | mlprefix = d.getVar('MLPREFIX', True) or '' | ||
38 | abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) | ||
39 | |||
40 | pn = d.getVar("PN", True) | ||
41 | d.appendVar('RDEPENDS_' + pn, ' ' + abi) | ||
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc new file mode 100644 index 0000000000..fbec0643ff --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc | |||
@@ -0,0 +1,11 @@ | |||
1 | include xorg-driver-common.inc | ||
2 | |||
3 | DEPENDS += "inputproto kbproto " | ||
4 | |||
5 | python add_xorg_abi_depends() { | ||
6 | _add_xorg_abi_depends(d, "input") | ||
7 | } | ||
8 | PACKAGEFUNCS =+ "add_xorg_abi_depends" | ||
9 | |||
10 | FILES_${PN} += " ${libdir}/xorg/modules/input/*.so" | ||
11 | FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug" | ||
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc new file mode 100644 index 0000000000..38281e0f23 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc | |||
@@ -0,0 +1,8 @@ | |||
1 | include xorg-driver-common.inc | ||
2 | |||
3 | DEPENDS =+ "renderproto videoproto xextproto fontsproto" | ||
4 | |||
5 | python add_xorg_abi_depends() { | ||
6 | _add_xorg_abi_depends(d, "video") | ||
7 | } | ||
8 | PACKAGEFUNCS =+ "add_xorg_abi_depends" | ||
diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch new file mode 100644 index 0000000000..f330c185af --- /dev/null +++ b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | XORG_DEFAULT_OPTIONS pulls in the following dependency chains: | ||
4 | |||
5 | XORG_CWARNFLAGS -> AC_PROG_CC_C99 | ||
6 | XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS | ||
7 | XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host | ||
8 | |||
9 | each of which triggers the use of the host compiler. As an "all" | ||
10 | architecture package, it shouldn't need a compiler (and doesn't). | ||
11 | |||
12 | RP 17/5/2011 | ||
13 | |||
14 | Index: encodings-1.0.4/configure.ac | ||
15 | =================================================================== | ||
16 | --- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100 | ||
17 | +++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100 | ||
18 | @@ -4,12 +4,12 @@ | ||
19 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
20 | AM_MAINTAINER_MODE | ||
21 | |||
22 | -# Require xorg-macros: XORG_DEFAULT_OPTIONS | ||
23 | m4_ifndef([XORG_MACROS_VERSION], | ||
24 | [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) | ||
25 | XORG_MACROS_VERSION(1.3) | ||
26 | -XORG_DEFAULT_OPTIONS | ||
27 | - | ||
28 | +XORG_RELEASE_VERSION | ||
29 | +XORG_CHANGELOG | ||
30 | +XORG_INSTALL | ||
31 | AC_PROG_INSTALL | ||
32 | |||
33 | # Require X.Org's font util macros 1.2 or later | ||
diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb new file mode 100644 index 0000000000..90846d8185 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "The Xorg font encoding files" | ||
2 | |||
3 | DESCRIPTION = "The encodings that map to specific characters for a \ | ||
4 | number of Xorg and common fonts." | ||
5 | |||
6 | require xorg-font-common.inc | ||
7 | LICENSE = "PD" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" | ||
9 | PE = "1" | ||
10 | PR = "${INC_PR}.1" | ||
11 | |||
12 | DEPENDS = "mkfontscale-native font-util-native" | ||
13 | RDEPENDS_${PN} = "" | ||
14 | |||
15 | SRC_URI += "file://nocompiler.patch" | ||
16 | |||
17 | inherit allarch | ||
18 | |||
19 | EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" | ||
20 | |||
21 | SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" | ||
22 | SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" | ||
diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch new file mode 100644 index 0000000000..0b9fb8ccc0 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | XORG_DEFAULT_OPTIONS pulls in the following dependency chains: | ||
4 | |||
5 | XORG_CWARNFLAGS -> AC_PROG_CC_C99 | ||
6 | XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS | ||
7 | XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host | ||
8 | |||
9 | each of which triggers the use of the host compiler. As an "all" | ||
10 | architecture package, it shouldn't need a compiler (and doesn't). | ||
11 | |||
12 | RP 17/5/2011 | ||
13 | |||
14 | diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac | ||
15 | --- font-alias-1.0.3.orig//configure.ac 2011-05-18 21:29:18.378258643 +0200 | ||
16 | +++ font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200 | ||
17 | @@ -28,12 +28,12 @@ | ||
18 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
19 | AM_MAINTAINER_MODE | ||
20 | |||
21 | -# Require xorg-macros: XORG_DEFAULT_OPTIONS | ||
22 | m4_ifndef([XORG_MACROS_VERSION], | ||
23 | [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) | ||
24 | XORG_MACROS_VERSION(1.3) | ||
25 | -XORG_DEFAULT_OPTIONS | ||
26 | - | ||
27 | +XORG_RELEASE_VERSION | ||
28 | +XORG_CHANGELOG | ||
29 | +XORG_INSTALL | ||
30 | AC_PROG_INSTALL | ||
31 | |||
32 | XORG_FONTROOTDIR | ||
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb new file mode 100644 index 0000000000..15e101596a --- /dev/null +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | SUMMARY = "X font aliases" | ||
2 | |||
3 | require xorg-font-common.inc | ||
4 | |||
5 | LICENSE = "MIT" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ | ||
7 | file://cyrillic/fonts.alias;md5=f40795b0640d6785826aecd3b16f6124 \ | ||
8 | file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ | ||
9 | file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \ | ||
10 | file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" | ||
11 | |||
12 | SRC_URI += "file://nocompiler.patch" | ||
13 | |||
14 | DEPENDS = "util-macros-native font-util-native" | ||
15 | RDEPENDS_${PN} = "encodings font-util" | ||
16 | RDEPENDS_${PN}_class-native = "font-util-native" | ||
17 | |||
18 | inherit allarch | ||
19 | |||
20 | PE = "1" | ||
21 | PR = "${INC_PR}.3" | ||
22 | |||
23 | SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" | ||
24 | SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" | ||
diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb new file mode 100644 index 0000000000..cc4258ad7b --- /dev/null +++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "X.Org font package creation/installation utilities" | ||
2 | |||
3 | require xorg-font-common.inc | ||
4 | |||
5 | #Unicode is MIT | ||
6 | LICENSE = "BSD & MIT" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=c0067273d90f6336008cb2504e14bd32 \ | ||
8 | file://ucs2any.c;endline=28;md5=8357dc567fc628bd12696f15b2a33bcb \ | ||
9 | file://bdftruncate.c;endline=26;md5=4f82ffc101a1b165eae9c6998abff937 \ | ||
10 | file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34" | ||
11 | |||
12 | DEPENDS = "encodings util-macros" | ||
13 | DEPENDS_class-native = "util-macros-native" | ||
14 | RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" | ||
15 | RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" | ||
16 | |||
17 | PR = "${INC_PR}.0" | ||
18 | |||
19 | do_configure_prepend() { | ||
20 | sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkgconfig\" pkg-config#g" ${S}/fontutil.m4.in | ||
21 | } | ||
22 | |||
23 | BBCLASSEXTEND = "native" | ||
24 | |||
25 | SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b" | ||
26 | SRC_URI[sha256sum] = "dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195" | ||
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc new file mode 100644 index 0000000000..55adde3608 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc | |||
@@ -0,0 +1,44 @@ | |||
1 | HOMEPAGE = "http://www.x.org" | ||
2 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" | ||
3 | |||
4 | SECTION = "x11/fonts" | ||
5 | LICENSE = "MIT-X" | ||
6 | |||
7 | DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native" | ||
8 | RDEPENDS_${PN} = "encodings font-util font-alias" | ||
9 | |||
10 | XORG_PN = "${BPN}" | ||
11 | INC_PR = "r2" | ||
12 | |||
13 | SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" | ||
14 | S = "${WORKDIR}/${XORG_PN}-${PV}" | ||
15 | |||
16 | inherit autotools pkgconfig | ||
17 | |||
18 | EXTRA_OEMAKE += "FCCACHE=/bin/true" | ||
19 | |||
20 | do_configure_prepend() { | ||
21 | if [ -f "${S}"/configure.ac ] ; then | ||
22 | sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac | ||
23 | fi | ||
24 | } | ||
25 | |||
26 | do_install_append() { | ||
27 | find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f | ||
28 | find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f | ||
29 | find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f | ||
30 | find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f | ||
31 | } | ||
32 | |||
33 | FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" | ||
34 | |||
35 | pkg_postinst_${PN} () { | ||
36 | for fontdir in `find $D/usr/lib/X11/fonts -type d`; do | ||
37 | mkfontdir $fontdir | ||
38 | mkfontscale $fontdir | ||
39 | done | ||
40 | for fontdir in `find $D/usr/share/fonts/X11 -type d`; do | ||
41 | mkfontdir $fontdir | ||
42 | mkfontscale $fontdir | ||
43 | done | ||
44 | } | ||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb new file mode 100644 index 0000000000..3688685509 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "Xorg minimal fonts data" | ||
2 | DESCRIPTION = "Minimal fonts required by X.org." | ||
3 | HOMEPAGE = "http://www.x.org" | ||
4 | |||
5 | SECTION = "x11/fonts" | ||
6 | |||
7 | LICENSE = "PD" | ||
8 | LIC_FILES_CHKSUM = "file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519ab \ | ||
9 | file://../misc/cursor.pcf.gz;md5=40bc81001fef4c21ca08df4305014a2a" | ||
10 | |||
11 | SRC_URI = "file://misc" | ||
12 | |||
13 | PE = "1" | ||
14 | PR = "r2" | ||
15 | |||
16 | inherit allarch | ||
17 | |||
18 | PACKAGES = "${PN}" | ||
19 | FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" | ||
20 | RDEPENDS_${PN} += "font-alias" | ||
21 | |||
22 | do_install() { | ||
23 | install -d ${D}/${datadir}/fonts/X11/misc | ||
24 | install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/ | ||
25 | install -d ${D}/${libdir}/X11 | ||
26 | ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s | ||
27 | } | ||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz new file mode 100644 index 0000000000..8bc8570a4a --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz new file mode 100644 index 0000000000..8fa8290152 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz new file mode 100644 index 0000000000..bb1c5e138d --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz new file mode 100644 index 0000000000..842fa1b41a --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz new file mode 100644 index 0000000000..cd119b66da --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz new file mode 100644 index 0000000000..25fe84a0ed --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz new file mode 100644 index 0000000000..e362c70cea --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz new file mode 100644 index 0000000000..176a7591cc --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz new file mode 100644 index 0000000000..a4faf1a6cc --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz new file mode 100644 index 0000000000..96ddd15255 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz new file mode 100644 index 0000000000..541a2ad2c7 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz new file mode 100644 index 0000000000..a4986f4066 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz new file mode 100644 index 0000000000..3f89abe774 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz new file mode 100644 index 0000000000..432b536222 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz new file mode 100644 index 0000000000..e7fcb898e1 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz new file mode 100644 index 0000000000..2df6355374 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz new file mode 100644 index 0000000000..a263c5dd38 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz new file mode 100644 index 0000000000..a1a7d37e62 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz new file mode 100644 index 0000000000..a148e99bce --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz new file mode 100644 index 0000000000..8791b8ca34 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz new file mode 100644 index 0000000000..8604508684 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz new file mode 100644 index 0000000000..f28b1f1c4a --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz new file mode 100644 index 0000000000..fd1e6cfe9f --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz new file mode 100644 index 0000000000..672b759421 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz new file mode 100644 index 0000000000..d90a4330d6 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz new file mode 100644 index 0000000000..775e7c18b4 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz new file mode 100644 index 0000000000..ac12fd98a2 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz new file mode 100644 index 0000000000..42bbd52217 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz new file mode 100644 index 0000000000..690d31f860 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz new file mode 100644 index 0000000000..d4c3184c72 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz new file mode 100644 index 0000000000..884b5130c5 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz new file mode 100644 index 0000000000..cbb1a9d704 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz new file mode 100644 index 0000000000..78c8580cfe --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz new file mode 100644 index 0000000000..0e90f3ee16 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz new file mode 100644 index 0000000000..bd1273e1ff --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz new file mode 100644 index 0000000000..5100b429ac --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz new file mode 100644 index 0000000000..ec5bbed297 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz new file mode 100644 index 0000000000..06c835ee68 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz new file mode 100644 index 0000000000..478541c2af --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz new file mode 100644 index 0000000000..1c593ce0cf --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz new file mode 100644 index 0000000000..335cf5fc3e --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz new file mode 100644 index 0000000000..099423e640 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz new file mode 100644 index 0000000000..4a546ddb1a --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz new file mode 100644 index 0000000000..72eb72bbec --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz | |||
Binary files differ | |||
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir new file mode 100644 index 0000000000..0a2718f7ba --- /dev/null +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir | |||
@@ -0,0 +1,410 @@ | |||
1 | 409 | ||
2 | 10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1 | ||
3 | 10x20-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-10 | ||
4 | 10x20-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-11 | ||
5 | 10x20-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-13 | ||
6 | 10x20-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-14 | ||
7 | 10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15 | ||
8 | 10x20-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-16 | ||
9 | 10x20-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2 | ||
10 | 10x20-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-3 | ||
11 | 10x20-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-4 | ||
12 | 10x20-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-5 | ||
13 | 10x20-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-7 | ||
14 | 10x20-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-8 | ||
15 | 10x20-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-9 | ||
16 | 10x20-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r | ||
17 | 10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 | ||
18 | 12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1 | ||
19 | 12x24.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1 | ||
20 | 12x24rk.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0 | ||
21 | 18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1 | ||
22 | 18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1 | ||
23 | 4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1 | ||
24 | 4x6-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-10 | ||
25 | 4x6-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-13 | ||
26 | 4x6-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-14 | ||
27 | 4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15 | ||
28 | 4x6-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-16 | ||
29 | 4x6-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-2 | ||
30 | 4x6-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-3 | ||
31 | 4x6-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-4 | ||
32 | 4x6-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-5 | ||
33 | 4x6-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-7 | ||
34 | 4x6-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-8 | ||
35 | 4x6-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-9 | ||
36 | 4x6-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-koi8-r | ||
37 | 4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1 | ||
38 | 5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 | ||
39 | 5x7-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-10 | ||
40 | 5x7-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-13 | ||
41 | 5x7-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-14 | ||
42 | 5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15 | ||
43 | 5x7-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-16 | ||
44 | 5x7-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2 | ||
45 | 5x7-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-3 | ||
46 | 5x7-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-4 | ||
47 | 5x7-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-5 | ||
48 | 5x7-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-7 | ||
49 | 5x7-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-8 | ||
50 | 5x7-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-9 | ||
51 | 5x7-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-koi8-r | ||
52 | 5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1 | ||
53 | 5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 | ||
54 | 5x8-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-10 | ||
55 | 5x8-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-13 | ||
56 | 5x8-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-14 | ||
57 | 5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15 | ||
58 | 5x8-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-16 | ||
59 | 5x8-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2 | ||
60 | 5x8-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-3 | ||
61 | 5x8-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-4 | ||
62 | 5x8-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-5 | ||
63 | 5x8-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-7 | ||
64 | 5x8-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-8 | ||
65 | 5x8-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-9 | ||
66 | 5x8-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r | ||
67 | 5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 | ||
68 | 6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1 | ||
69 | 6x10-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-10 | ||
70 | 6x10-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-13 | ||
71 | 6x10-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-14 | ||
72 | 6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15 | ||
73 | 6x10-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-16 | ||
74 | 6x10-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2 | ||
75 | 6x10-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-3 | ||
76 | 6x10-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-4 | ||
77 | 6x10-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-5 | ||
78 | 6x10-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-7 | ||
79 | 6x10-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-8 | ||
80 | 6x10-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-9 | ||
81 | 6x10-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r | ||
82 | 6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1 | ||
83 | 6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1 | ||
84 | 6x12-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-10 | ||
85 | 6x12-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-13 | ||
86 | 6x12-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-14 | ||
87 | 6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15 | ||
88 | 6x12-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-16 | ||
89 | 6x12-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2 | ||
90 | 6x12-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-3 | ||
91 | 6x12-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-4 | ||
92 | 6x12-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-5 | ||
93 | 6x12-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-7 | ||
94 | 6x12-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-8 | ||
95 | 6x12-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-9 | ||
96 | 6x12-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-koi8-r | ||
97 | 6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1 | ||
98 | 6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 | ||
99 | 6x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-10 | ||
100 | 6x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-11 | ||
101 | 6x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-13 | ||
102 | 6x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-14 | ||
103 | 6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15 | ||
104 | 6x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-16 | ||
105 | 6x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2 | ||
106 | 6x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-3 | ||
107 | 6x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-4 | ||
108 | 6x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-5 | ||
109 | 6x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-7 | ||
110 | 6x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8 | ||
111 | 6x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-9 | ||
112 | 6x13-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r | ||
113 | 6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 | ||
114 | 6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 | ||
115 | 6x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-10 | ||
116 | 6x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-13 | ||
117 | 6x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-14 | ||
118 | 6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15 | ||
119 | 6x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-16 | ||
120 | 6x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2 | ||
121 | 6x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-3 | ||
122 | 6x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-4 | ||
123 | 6x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-5 | ||
124 | 6x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-7 | ||
125 | 6x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-8 | ||
126 | 6x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-9 | ||
127 | 6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1 | ||
128 | 6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1 | ||
129 | 6x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-10 | ||
130 | 6x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-13 | ||
131 | 6x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-14 | ||
132 | 6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15 | ||
133 | 6x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-16 | ||
134 | 6x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-2 | ||
135 | 6x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-3 | ||
136 | 6x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-4 | ||
137 | 6x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-5 | ||
138 | 6x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-7 | ||
139 | 6x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-9 | ||
140 | 6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1 | ||
141 | 6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 | ||
142 | 6x9-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-10 | ||
143 | 6x9-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-13 | ||
144 | 6x9-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-14 | ||
145 | 6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15 | ||
146 | 6x9-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-16 | ||
147 | 6x9-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2 | ||
148 | 6x9-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-3 | ||
149 | 6x9-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-4 | ||
150 | 6x9-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-5 | ||
151 | 6x9-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-7 | ||
152 | 6x9-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-8 | ||
153 | 6x9-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-9 | ||
154 | 6x9-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r | ||
155 | 6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1 | ||
156 | 7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 | ||
157 | 7x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-10 | ||
158 | 7x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-11 | ||
159 | 7x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-13 | ||
160 | 7x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-14 | ||
161 | 7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15 | ||
162 | 7x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-16 | ||
163 | 7x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2 | ||
164 | 7x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-3 | ||
165 | 7x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-4 | ||
166 | 7x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-5 | ||
167 | 7x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-7 | ||
168 | 7x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-8 | ||
169 | 7x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-9 | ||
170 | 7x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-koi8-r | ||
171 | 7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1 | ||
172 | 7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 | ||
173 | 7x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-10 | ||
174 | 7x13B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-11 | ||
175 | 7x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-13 | ||
176 | 7x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-14 | ||
177 | 7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15 | ||
178 | 7x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-16 | ||
179 | 7x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-2 | ||
180 | 7x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-3 | ||
181 | 7x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-4 | ||
182 | 7x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-5 | ||
183 | 7x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-7 | ||
184 | 7x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-8 | ||
185 | 7x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-9 | ||
186 | 7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1 | ||
187 | 7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1 | ||
188 | 7x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-10 | ||
189 | 7x13O-ISO8859-11.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-11 | ||
190 | 7x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-13 | ||
191 | 7x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-14 | ||
192 | 7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15 | ||
193 | 7x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-16 | ||
194 | 7x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-2 | ||
195 | 7x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-3 | ||
196 | 7x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-4 | ||
197 | 7x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-5 | ||
198 | 7x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-7 | ||
199 | 7x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-9 | ||
200 | 7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1 | ||
201 | 7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 | ||
202 | 7x14-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-10 | ||
203 | 7x14-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-11 | ||
204 | 7x14-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-13 | ||
205 | 7x14-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-14 | ||
206 | 7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15 | ||
207 | 7x14-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-16 | ||
208 | 7x14-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-2 | ||
209 | 7x14-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-3 | ||
210 | 7x14-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-4 | ||
211 | 7x14-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-5 | ||
212 | 7x14-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-7 | ||
213 | 7x14-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-8 | ||
214 | 7x14-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-9 | ||
215 | 7x14-JISX0201.1976-0.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 | ||
216 | 7x14-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r | ||
217 | 7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 | ||
218 | 7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 | ||
219 | 7x14B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-10 | ||
220 | 7x14B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-11 | ||
221 | 7x14B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-13 | ||
222 | 7x14B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-14 | ||
223 | 7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15 | ||
224 | 7x14B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-16 | ||
225 | 7x14B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-2 | ||
226 | 7x14B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-3 | ||
227 | 7x14B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-4 | ||
228 | 7x14B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-5 | ||
229 | 7x14B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-7 | ||
230 | 7x14B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-8 | ||
231 | 7x14B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-9 | ||
232 | 7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1 | ||
233 | 8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 | ||
234 | 8x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-10 | ||
235 | 8x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-13 | ||
236 | 8x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-14 | ||
237 | 8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15 | ||
238 | 8x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-16 | ||
239 | 8x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-2 | ||
240 | 8x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-3 | ||
241 | 8x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-4 | ||
242 | 8x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-5 | ||
243 | 8x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-7 | ||
244 | 8x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8 | ||
245 | 8x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-9 | ||
246 | 8x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r | ||
247 | 8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 | ||
248 | 8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1 | ||
249 | 8x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-10 | ||
250 | 8x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-13 | ||
251 | 8x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-14 | ||
252 | 8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15 | ||
253 | 8x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-16 | ||
254 | 8x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-2 | ||
255 | 8x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-3 | ||
256 | 8x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-4 | ||
257 | 8x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-5 | ||
258 | 8x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-7 | ||
259 | 8x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-8 | ||
260 | 8x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-9 | ||
261 | 8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1 | ||
262 | 8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1 | ||
263 | 8x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-10 | ||
264 | 8x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-13 | ||
265 | 8x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-14 | ||
266 | 8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15 | ||
267 | 8x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-16 | ||
268 | 8x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-2 | ||
269 | 8x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-3 | ||
270 | 8x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-4 | ||
271 | 8x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-5 | ||
272 | 8x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-7 | ||
273 | 8x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-9 | ||
274 | 8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1 | ||
275 | 8x16.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1 | ||
276 | 8x16rk.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 | ||
277 | 9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 | ||
278 | 9x15-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-10 | ||
279 | 9x15-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-11 | ||
280 | 9x15-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-13 | ||
281 | 9x15-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-14 | ||
282 | 9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15 | ||
283 | 9x15-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-16 | ||
284 | 9x15-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2 | ||
285 | 9x15-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-3 | ||
286 | 9x15-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-4 | ||
287 | 9x15-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-5 | ||
288 | 9x15-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-7 | ||
289 | 9x15-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-8 | ||
290 | 9x15-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-9 | ||
291 | 9x15-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r | ||
292 | 9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 | ||
293 | 9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1 | ||
294 | 9x15B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-10 | ||
295 | 9x15B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-11 | ||
296 | 9x15B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-13 | ||
297 | 9x15B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-14 | ||
298 | 9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15 | ||
299 | 9x15B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-16 | ||
300 | 9x15B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2 | ||
301 | 9x15B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-3 | ||
302 | 9x15B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-4 | ||
303 | 9x15B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-5 | ||
304 | 9x15B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-7 | ||
305 | 9x15B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-8 | ||
306 | 9x15B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-9 | ||
307 | 9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1 | ||
308 | 9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 | ||
309 | 9x18-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-10 | ||
310 | 9x18-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-11 | ||
311 | 9x18-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-13 | ||
312 | 9x18-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-14 | ||
313 | 9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15 | ||
314 | 9x18-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-16 | ||
315 | 9x18-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-2 | ||
316 | 9x18-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-3 | ||
317 | 9x18-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-4 | ||
318 | 9x18-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-5 | ||
319 | 9x18-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-7 | ||
320 | 9x18-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-8 | ||
321 | 9x18-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-9 | ||
322 | 9x18-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r | ||
323 | 9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 | ||
324 | 9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1 | ||
325 | 9x18B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-10 | ||
326 | 9x18B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-13 | ||
327 | 9x18B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-14 | ||
328 | 9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15 | ||
329 | 9x18B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-16 | ||
330 | 9x18B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-2 | ||
331 | 9x18B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-3 | ||
332 | 9x18B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-4 | ||
333 | 9x18B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-5 | ||
334 | 9x18B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-7 | ||
335 | 9x18B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-8 | ||
336 | 9x18B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-9 | ||
337 | 9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1 | ||
338 | arabic24.pcf.gz -arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1 | ||
339 | clB6x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-60-iso646.1991-irv | ||
340 | clB6x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-60-iso646.1991-irv | ||
341 | clB8x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-80-iso646.1991-irv | ||
342 | clB8x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-80-iso646.1991-irv | ||
343 | clB8x13.pcf.gz -schumacher-clean-bold-r-normal--13-130-75-75-c-80-iso646.1991-irv | ||
344 | clB8x14.pcf.gz -schumacher-clean-bold-r-normal--14-140-75-75-c-80-iso646.1991-irv | ||
345 | clB8x16.pcf.gz -schumacher-clean-bold-r-normal--16-160-75-75-c-80-iso646.1991-irv | ||
346 | clB8x8.pcf.gz -schumacher-clean-bold-r-normal--8-80-75-75-c-80-iso646.1991-irv | ||
347 | clB9x15.pcf.gz -schumacher-clean-bold-r-normal--15-150-75-75-c-90-iso646.1991-irv | ||
348 | clI6x12.pcf.gz -schumacher-clean-medium-i-normal--12-120-75-75-c-60-iso646.1991-irv | ||
349 | clI8x8.pcf.gz -schumacher-clean-medium-i-normal--8-80-75-75-c-80-iso646.1991-irv | ||
350 | clR4x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-40-iso646.1991-irv | ||
351 | clR5x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-50-iso646.1991-irv | ||
352 | clR5x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-50-iso646.1991-irv | ||
353 | clR5x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv | ||
354 | clR6x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-60-iso646.1991-irv | ||
355 | clR6x12-ISO8859-1.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-1 | ||
356 | clR6x12-ISO8859-10.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-10 | ||
357 | clR6x12-ISO8859-13.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-13 | ||
358 | clR6x12-ISO8859-14.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-14 | ||
359 | clR6x12-ISO8859-15.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-15 | ||
360 | clR6x12-ISO8859-16.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-16 | ||
361 | clR6x12-ISO8859-2.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-2 | ||
362 | clR6x12-ISO8859-3.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-3 | ||
363 | clR6x12-ISO8859-4.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-4 | ||
364 | clR6x12-ISO8859-5.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-5 | ||
365 | clR6x12-ISO8859-7.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-7 | ||
366 | clR6x12-ISO8859-8.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-8 | ||
367 | clR6x12-ISO8859-9.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-9 | ||
368 | clR6x12-KOI8-R.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-koi8-r | ||
369 | clR6x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso10646-1 | ||
370 | clR6x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-60-iso646.1991-irv | ||
371 | clR6x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-60-iso646.1991-irv | ||
372 | clR6x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-60-iso646.1991-irv | ||
373 | clR7x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-70-iso646.1991-irv | ||
374 | clR7x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-70-iso646.1991-irv | ||
375 | clR7x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-70-iso646.1991-irv | ||
376 | clR7x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-70-iso646.1991-irv | ||
377 | clR8x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-80-iso646.1991-irv | ||
378 | clR8x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-80-iso646.1991-irv | ||
379 | clR8x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-80-iso646.1991-irv | ||
380 | clR8x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-80-iso646.1991-irv | ||
381 | clR8x16.pcf.gz -schumacher-clean-medium-r-normal--16-160-75-75-c-80-iso646.1991-irv | ||
382 | clR8x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-80-iso646.1991-irv | ||
383 | clR9x15.pcf.gz -schumacher-clean-medium-r-normal--15-150-75-75-c-90-iso646.1991-irv | ||
384 | cu-alt12.pcf.gz -mutt-clearlyu alternate glyphs-medium-r-normal--17-120-100-100-p-122-iso10646-1 | ||
385 | cu-arabic12.pcf.gz -mutt-clearlyu arabic extra-medium-r-normal--17-120-100-100-p-101-fontspecific-0 | ||
386 | cu-devnag12.pcf.gz -mutt-clearlyu devangari extra-medium-r-normal--17-120-100-100-p-105-fontspecific-0 | ||
387 | cu-lig12.pcf.gz -mutt-clearlyu ligature-medium-r-normal--17-120-100-100-p-141-fontspecific-0 | ||
388 | cu-pua12.pcf.gz -mutt-clearlyu pua-medium-r-normal--17-120-100-100-p-110-iso10646-1 | ||
389 | cu12.pcf.gz -mutt-clearlyu-medium-r-normal--17-120-100-100-p-123-iso10646-1 | ||
390 | cuarabic12.pcf.gz -mutt-clearlyu arabic-medium-r-normal--17-120-100-100-p-93-iso10646-1 | ||
391 | cudevnag12.pcf.gz -mutt-clearlyu devanagari-medium-r-normal--15-120-90-90-p-104-fontspecific-0 | ||
392 | cursor.pcf.gz cursor | ||
393 | deccurs.pcf.gz decw$cursor | ||
394 | decsess.pcf.gz decw$session | ||
395 | gb16fs.pcf.gz -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0 | ||
396 | gb16st.pcf.gz -isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0 | ||
397 | gb24st.pcf.gz -isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0 | ||
398 | hanglg16.pcf.gz -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0 | ||
399 | hanglm16.pcf.gz -daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0 | ||
400 | hanglm24.pcf.gz -daewoo-mincho-medium-r-normal--24-170-100-100-c-240-ksc5601.1987-0 | ||
401 | jiskan16.pcf.gz -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 | ||
402 | jiskan24.pcf.gz -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0 | ||
403 | k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 | ||
404 | micro.pcf.gz micro | ||
405 | nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific | ||
406 | olcursor.pcf.gz -sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1 | ||
407 | olgl10.pcf.gz -sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1 | ||
408 | olgl12.pcf.gz -sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1 | ||
409 | olgl14.pcf.gz -sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1 | ||
410 | olgl19.pcf.gz -sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb new file mode 100644 index 0000000000..e623cee421 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | SUMMARY = "DMX: Distributed Multihead X extension library" | ||
4 | |||
5 | DESCRIPTION = "The DMX extension provides support for communication with \ | ||
6 | and control of Xdmx(1) server. Attributes of the Xdmx(1) server and of \ | ||
7 | the back-end screens attached to the server can be queried and modified \ | ||
8 | via this protocol." | ||
9 | |||
10 | LICENSE = "MIT" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ | ||
12 | file://src/dmx.c;endline=33;md5=c43f19af03c7c8619cadc9724ed9afe1" | ||
13 | |||
14 | DEPENDS += "libxext dmxproto" | ||
15 | |||
16 | PE = "1" | ||
17 | |||
18 | SRC_URI[md5sum] = "ba983eba5a9f05d152a0725b8e863151" | ||
19 | SRC_URI[sha256sum] = "c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201" | ||
20 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.2.bb new file mode 100644 index 0000000000..b79ab8fe27 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.2.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "X font encoding library" | ||
2 | |||
3 | DESCRIPTION = "libfontenc is a library which helps font libraries \ | ||
4 | portably determine and deal with different encodings of fonts." | ||
5 | |||
6 | require xorg-lib-common.inc | ||
7 | |||
8 | LICENSE = "MIT" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" | ||
10 | |||
11 | DEPENDS += "zlib xproto font-util" | ||
12 | PE = "1" | ||
13 | |||
14 | BBCLASSEXTEND = "native" | ||
15 | |||
16 | SRC_URI[md5sum] = "ad2919764933e075bb0361ad5caa3d19" | ||
17 | SRC_URI[sha256sum] = "a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb new file mode 100644 index 0000000000..5049b7ee02 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "ICE: Inter-Client Exchange library" | ||
2 | |||
3 | DESCRIPTION = "The Inter-Client Exchange (ICE) protocol provides a \ | ||
4 | generic framework for building protocols on top of reliable, byte-stream \ | ||
5 | transport connections. It provides basic mechanisms for setting up and \ | ||
6 | shutting down connections, for performing authentication, for \ | ||
7 | negotiating versions, and for reporting errors. " | ||
8 | |||
9 | require xorg-lib-common.inc | ||
10 | |||
11 | LICENSE = "MIT-style" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93" | ||
13 | |||
14 | DEPENDS += "xproto xtrans" | ||
15 | PROVIDES = "ice" | ||
16 | |||
17 | PE = "1" | ||
18 | |||
19 | XORG_PN = "libICE" | ||
20 | |||
21 | BBCLASSEXTEND = "native" | ||
22 | |||
23 | SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" | ||
24 | SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" | ||
25 | |||
26 | PACKAGECONFIG ??= "" | ||
27 | PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb new file mode 100644 index 0000000000..d837bbd047 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "Generic PCI access library for X" | ||
2 | |||
3 | DESCRIPTION = "libpciaccess provides functionality for X to access the \ | ||
4 | PCI bus and devices in a platform-independent way." | ||
5 | |||
6 | require xorg-lib-common.inc | ||
7 | |||
8 | LICENSE = "MIT & MIT-style" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" | ||
10 | |||
11 | SRC_URI[md5sum] = "b7c0d3afce14eedca57312a3141ec13a" | ||
12 | SRC_URI[sha256sum] = "abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19" | ||
13 | |||
14 | REQUIRED_DISTRO_FEATURES = "" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb new file mode 100644 index 0000000000..3e7ef27bed --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "Library that provides weak aliases for pthread functions" | ||
2 | DESCRIPTION = "This library provides weak aliases for pthread functions \ | ||
3 | not provided in libc or otherwise available by default." | ||
4 | HOMEPAGE = "http://xcb.freedesktop.org" | ||
5 | BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=XCB" | ||
6 | SECTION = "x11/libs" | ||
7 | LICENSE = "MIT" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" | ||
9 | |||
10 | PARALLEL_MAKE = "" | ||
11 | #DEPENDS = "xcb-proto xproto libxau libxslt-native" | ||
12 | # DEPENDS += "xsltproc-native gperf-native" | ||
13 | |||
14 | ALLOW_EMPTY_${PN} = "1" | ||
15 | |||
16 | SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" | ||
17 | |||
18 | SRC_URI[md5sum] = "e8fa31b42e13f87e8f5a7a2b731db7ee" | ||
19 | SRC_URI[sha256sum] = "35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299" | ||
20 | |||
21 | inherit autotools pkgconfig | ||
22 | |||
23 | RDEPENDS_${PN}-dev = "" | ||
24 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | ||
25 | |||
26 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb new file mode 100644 index 0000000000..180acfae0b --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "SM: Session Management library" | ||
2 | |||
3 | DESCRIPTION = "The Session Management Library (SMlib) is a low-level \"C\" \ | ||
4 | language interface to XSMP. The purpose of the X Session Management \ | ||
5 | Protocol (XSMP) is to provide a uniform mechanism for users to save and \ | ||
6 | restore their sessions. A session is a group of clients, each of which \ | ||
7 | has a particular state." | ||
8 | |||
9 | require xorg-lib-common.inc | ||
10 | |||
11 | LICENSE = "MIT-style" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" | ||
13 | |||
14 | DEPENDS += "libice xproto xtrans e2fsprogs" | ||
15 | |||
16 | PE = "1" | ||
17 | |||
18 | XORG_PN = "libSM" | ||
19 | |||
20 | BBCLASSEXTEND = "native" | ||
21 | |||
22 | SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" | ||
23 | SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb new file mode 100644 index 0000000000..89b07164c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require libx11.inc | ||
2 | |||
3 | DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ | ||
4 | this version." | ||
5 | |||
6 | SRC_URI += "file://X18NCMSstubs.diff \ | ||
7 | file://fix-disable-xlocale.diff \ | ||
8 | file://fix-utf8-wrong-define.patch \ | ||
9 | " | ||
10 | |||
11 | RPROVIDES_${PN}-dev = "libx11-dev" | ||
12 | RPROVIDES_${PN}-locale = "libx11-locale" | ||
13 | |||
14 | SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5" | ||
15 | SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16" | ||
16 | |||
17 | EXTRA_OECONF += "--disable-xlocale" | ||
18 | |||
19 | PACKAGECONFIG ??= "" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc new file mode 100644 index 0000000000..b04eafbdf2 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11.inc | |||
@@ -0,0 +1,41 @@ | |||
1 | SUMMARY = "Xlib: C Language X Interface library" | ||
2 | |||
3 | DESCRIPTION = "This package provides a client interface to the X Window \ | ||
4 | System, otherwise known as 'Xlib'. It provides a complete API for the \ | ||
5 | basic functions of the window system." | ||
6 | |||
7 | require xorg-lib-common.inc | ||
8 | |||
9 | inherit siteinfo | ||
10 | |||
11 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" | ||
12 | |||
13 | PE = "1" | ||
14 | |||
15 | PROVIDES = "virtual/libx11" | ||
16 | |||
17 | XORG_PN = "libX11" | ||
18 | LICENSE = "MIT & MIT-style & BSD" | ||
19 | LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" | ||
20 | |||
21 | DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" | ||
22 | DEPENDS += "xproto-native" | ||
23 | |||
24 | EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" | ||
25 | EXTRA_OEMAKE += 'CWARNFLAGS=""' | ||
26 | |||
27 | PACKAGECONFIG ??= "xcms" | ||
28 | PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" | ||
29 | |||
30 | # src/util/makekeys is built natively but needs -D_GNU_SOURCE defined. | ||
31 | CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE" | ||
32 | |||
33 | PACKAGES =+ "${PN}-xcb" | ||
34 | |||
35 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" | ||
36 | FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" | ||
37 | FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" | ||
38 | |||
39 | # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 | ||
40 | # A world build should only build the correct version, not all of them. | ||
41 | EXCLUDE_FROM_WORLD = "1" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff new file mode 100644 index 0000000000..744cedc777 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff | |||
@@ -0,0 +1,520 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | Index: libX11-1.3/src/imConv.c | ||
5 | =================================================================== | ||
6 | --- libX11-1.3.orig/src/imConv.c | ||
7 | +++ libX11-1.3/src/imConv.c | ||
8 | @@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[ | ||
9 | * from UCS char to specified charset char. | ||
10 | * This converter is needed for _XimGetCharCode subroutine. | ||
11 | */ | ||
12 | +#ifdef XLOCALE | ||
13 | XPointer | ||
14 | _XimGetLocaleCode ( | ||
15 | _Xconst char* encoding_name) | ||
16 | @@ -96,6 +97,7 @@ _XimGetLocaleCode ( | ||
17 | } | ||
18 | return cvt; | ||
19 | } | ||
20 | +#endif | ||
21 | |||
22 | /* | ||
23 | * Returns the locale dependent representation of a keysym. | ||
24 | @@ -106,6 +108,7 @@ _XimGetLocaleCode ( | ||
25 | * terminating NUL byte. Return 0 if the keysym is not representable in the | ||
26 | * locale | ||
27 | */ | ||
28 | +#ifdef XLOCALE | ||
29 | /*ARGSUSED*/ | ||
30 | int | ||
31 | _XimGetCharCode ( | ||
32 | @@ -135,6 +138,7 @@ _XimGetCharCode ( | ||
33 | buf[count]= '\0'; | ||
34 | return count; | ||
35 | } | ||
36 | +#endif | ||
37 | |||
38 | #ifdef XKB | ||
39 | static int lookup_string( | ||
40 | Index: libX11-1.3/src/X18NCMSstubs.c | ||
41 | =================================================================== | ||
42 | --- /dev/null | ||
43 | +++ libX11-1.3/src/X18NCMSstubs.c | ||
44 | @@ -0,0 +1,428 @@ | ||
45 | +/* | ||
46 | + * X18NCMSstubs.c | ||
47 | + * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed | ||
48 | + * | ||
49 | + * Copyright © 2003 Matthew Allum | ||
50 | + * | ||
51 | + * Permission to use, copy, modify, distribute, and sell this software and its | ||
52 | + * documentation for any purpose is hereby granted without fee, provided that | ||
53 | + * the above copyright notice appear in all copies and that both that | ||
54 | + * copyright notice and this permission notice appear in supporting | ||
55 | + * documentation, and that the name of Matthew Allum not be used in | ||
56 | + * advertising or publicity pertaining to distribution of the software without | ||
57 | + * specific, written prior permission. Keith Packard and Compaq makes no | ||
58 | + * representations about the suitability of this software for any purpose. It | ||
59 | + * is provided "as is" without express or implied warranty. | ||
60 | + * | ||
61 | + * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS | ||
62 | + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, | ||
63 | + * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR | ||
64 | + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, | ||
65 | + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER | ||
66 | + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
67 | + * PERFORMANCE OF THIS SOFTWARE. | ||
68 | + */ | ||
69 | + | ||
70 | +#include <stdlib.h> | ||
71 | +#include "Xlibint.h" | ||
72 | +#include "Xlcint.h" | ||
73 | +#include <X11/Xlocale.h> | ||
74 | +#include <X11/Xos.h> | ||
75 | +#ifdef WIN32 | ||
76 | +#undef close | ||
77 | +#endif | ||
78 | +#include <X11/Xutil.h> | ||
79 | +#include "XlcPubI.h" | ||
80 | + | ||
81 | +#include "Xcmsint.h" /* for XcmsCCC type */ | ||
82 | +#include "XlcPubI.h" /* for XLCd type */ | ||
83 | +#include "config.h" | ||
84 | + | ||
85 | +#if ! XLOCALE | ||
86 | + | ||
87 | +Bool | ||
88 | +XSupportsLocale() | ||
89 | +{ | ||
90 | + return False; | ||
91 | +} | ||
92 | + | ||
93 | +char * | ||
94 | +XSetLocaleModifiers( | ||
95 | + const char *modifiers) | ||
96 | +{ | ||
97 | + return NULL; | ||
98 | +} | ||
99 | + | ||
100 | +XLCd | ||
101 | +_XOpenLC( | ||
102 | + char *name) | ||
103 | +{ | ||
104 | + return NULL; | ||
105 | +} | ||
106 | + | ||
107 | +XLCd | ||
108 | +_XlcCurrentLC() | ||
109 | +{ | ||
110 | + return NULL; | ||
111 | +} | ||
112 | + | ||
113 | +void | ||
114 | +_XlcVaToArgList( | ||
115 | + va_list var, | ||
116 | + int count, | ||
117 | + XlcArgList *args_ret) | ||
118 | +{ | ||
119 | + return; | ||
120 | +} | ||
121 | + | ||
122 | +void | ||
123 | +_XlcCountVaList( | ||
124 | + va_list var, | ||
125 | + int *count_ret) | ||
126 | +{ | ||
127 | + return; | ||
128 | +} | ||
129 | + | ||
130 | +void | ||
131 | +_XCloseLC( | ||
132 | + XLCd lcd) | ||
133 | +{ | ||
134 | + return; | ||
135 | +} | ||
136 | + | ||
137 | +int | ||
138 | +_XlcConvert( | ||
139 | + XlcConv conv, | ||
140 | + XPointer *from, | ||
141 | + int *from_left, | ||
142 | + XPointer *to, | ||
143 | + int *to_left, | ||
144 | + XPointer *args, | ||
145 | + int num_args) | ||
146 | +{ | ||
147 | + return 0; | ||
148 | +} | ||
149 | + | ||
150 | +/* XIM Stubs */ | ||
151 | + | ||
152 | +XPointer | ||
153 | +_XimGetLocaleCode ( _Xconst char* encoding_name ) | ||
154 | +{ | ||
155 | + return NULL; | ||
156 | +} | ||
157 | + | ||
158 | +int | ||
159 | +_XimGetCharCode ( | ||
160 | + XPointer ucs_conv, | ||
161 | + KeySym keysym, | ||
162 | + unsigned char* buf, | ||
163 | + int nbytes) | ||
164 | +{ | ||
165 | + return 0; | ||
166 | +} | ||
167 | + | ||
168 | +/* Xrm Stubs */ | ||
169 | + | ||
170 | +XrmMethods | ||
171 | +_XrmInitParseInfo( | ||
172 | + XPointer *state) | ||
173 | +{ | ||
174 | + return (XrmMethods) NULL; | ||
175 | +} | ||
176 | + | ||
177 | +/* Xwc Stubs */ | ||
178 | + | ||
179 | +int | ||
180 | +XwcTextExtents( | ||
181 | + XFontSet font_set, | ||
182 | + _Xconst wchar_t *text, | ||
183 | + int text_len, | ||
184 | + XRectangle *overall_ink_extents, | ||
185 | + XRectangle *overall_logical_extents) | ||
186 | +{ | ||
187 | + return 0; | ||
188 | +} | ||
189 | + | ||
190 | +void | ||
191 | +XwcDrawString(Display *display, | ||
192 | + Drawable d, | ||
193 | + XFontSet font_set, | ||
194 | + GC gc, | ||
195 | + int x, int y, | ||
196 | + _Xconst wchar_t *string, | ||
197 | + int num_wchars) | ||
198 | +{ | ||
199 | + ; | ||
200 | +} | ||
201 | + | ||
202 | +void | ||
203 | +XwcDrawText( | ||
204 | + Display *dpy, | ||
205 | + Drawable d, | ||
206 | + GC gc, | ||
207 | + int x, | ||
208 | + int y, | ||
209 | + XwcTextItem *text_items, | ||
210 | + int nitems) | ||
211 | +{ | ||
212 | + ; | ||
213 | +} | ||
214 | + | ||
215 | +void | ||
216 | +XwcDrawImageString( | ||
217 | + Display *dpy, | ||
218 | + Drawable d, | ||
219 | + XFontSet font_set, | ||
220 | + GC gc, | ||
221 | + int x, | ||
222 | + int y, | ||
223 | + _Xconst wchar_t *text, | ||
224 | + int text_len) | ||
225 | +{ | ||
226 | + ; | ||
227 | +} | ||
228 | + | ||
229 | +int | ||
230 | +XwcTextEscapement( | ||
231 | + XFontSet font_set, | ||
232 | + _Xconst wchar_t *text, | ||
233 | + int text_len) | ||
234 | +{ | ||
235 | + return 0; | ||
236 | +} | ||
237 | + | ||
238 | +Status | ||
239 | +XwcTextPerCharExtents( | ||
240 | + XFontSet font_set, | ||
241 | + _Xconst wchar_t *text, | ||
242 | + int text_len, | ||
243 | + XRectangle *ink_extents_buffer, | ||
244 | + XRectangle *logical_extents_buffer, | ||
245 | + int buffer_size, | ||
246 | + int *num_chars, | ||
247 | + XRectangle *max_ink_extents, | ||
248 | + XRectangle *max_logical_extents) | ||
249 | +{ | ||
250 | + return(XcmsFailure); | ||
251 | +} | ||
252 | + | ||
253 | +int | ||
254 | +XwcTextPropertyToTextList( | ||
255 | + Display *dpy, | ||
256 | + const XTextProperty *text_prop, | ||
257 | + wchar_t ***list_ret, | ||
258 | + int *count_ret) | ||
259 | +{ | ||
260 | + return 0; | ||
261 | +} | ||
262 | + | ||
263 | +int | ||
264 | +XwcTextListToTextProperty( | ||
265 | + Display *dpy, | ||
266 | + wchar_t **list, | ||
267 | + int count, | ||
268 | + XICCEncodingStyle style, | ||
269 | + XTextProperty *text_prop) | ||
270 | +{ | ||
271 | + return 0; | ||
272 | +} | ||
273 | + | ||
274 | +void | ||
275 | +XwcFreeStringList(wchar_t **list) | ||
276 | +{ | ||
277 | + return; | ||
278 | +} | ||
279 | + | ||
280 | + | ||
281 | +void XmbSetWMProperties ( /* Actually from mbWMProps.c */ | ||
282 | + Display *dpy, | ||
283 | + Window w, | ||
284 | + _Xconst char *windowName, | ||
285 | + _Xconst char *iconName, | ||
286 | + char **argv, | ||
287 | + int argc, | ||
288 | + XSizeHints *sizeHints, | ||
289 | + XWMHints *wmHints, | ||
290 | + XClassHint *classHints) | ||
291 | +{ | ||
292 | + return; | ||
293 | +} | ||
294 | + | ||
295 | +int | ||
296 | +XmbTextPropertyToTextList( | ||
297 | + Display *dpy, | ||
298 | + const XTextProperty *text_prop, | ||
299 | + char ***list_ret, | ||
300 | + int *count_ret) | ||
301 | +{ | ||
302 | + return XLocaleNotSupported; | ||
303 | +} | ||
304 | + | ||
305 | +int | ||
306 | +XmbTextListToTextProperty( | ||
307 | + Display *dpy, | ||
308 | + char **list, | ||
309 | + int count, | ||
310 | + XICCEncodingStyle style, | ||
311 | + XTextProperty *text_prop) | ||
312 | +{ | ||
313 | + return XLocaleNotSupported; | ||
314 | +} | ||
315 | + | ||
316 | +int | ||
317 | +XmbTextExtents( | ||
318 | + XFontSet font_set, | ||
319 | + _Xconst char *text, | ||
320 | + int text_len, | ||
321 | + XRectangle *overall_ink_extents, | ||
322 | + XRectangle *overall_logical_extents) | ||
323 | +{ | ||
324 | + return 0; | ||
325 | +} | ||
326 | + | ||
327 | +void | ||
328 | +XmbDrawText( | ||
329 | + Display *dpy, | ||
330 | + Drawable d, | ||
331 | + GC gc, | ||
332 | + int x, | ||
333 | + int y, | ||
334 | + XmbTextItem *text_items, | ||
335 | + int nitems) | ||
336 | +{ | ||
337 | + ; | ||
338 | +} | ||
339 | + | ||
340 | +void | ||
341 | +XmbDrawString( | ||
342 | + Display *dpy, | ||
343 | + Drawable d, | ||
344 | + XFontSet font_set, | ||
345 | + GC gc, | ||
346 | + int x, | ||
347 | + int y, | ||
348 | + _Xconst char *text, | ||
349 | + int text_len) | ||
350 | +{ | ||
351 | + ; | ||
352 | +} | ||
353 | + | ||
354 | +void | ||
355 | +XmbDrawImageString( | ||
356 | + Display *dpy, | ||
357 | + Drawable d, | ||
358 | + XFontSet font_set, | ||
359 | + GC gc, | ||
360 | + int x, | ||
361 | + int y, | ||
362 | + _Xconst char *text, | ||
363 | + int text_len) | ||
364 | +{ | ||
365 | + ; | ||
366 | +} | ||
367 | + | ||
368 | +int | ||
369 | +XmbTextEscapement( | ||
370 | + XFontSet font_set, | ||
371 | + _Xconst char *text, | ||
372 | + int text_len) | ||
373 | +{ | ||
374 | + return 0; | ||
375 | +} | ||
376 | + | ||
377 | +Status | ||
378 | +XmbTextPerCharExtents( | ||
379 | + XFontSet font_set, | ||
380 | + _Xconst char *text, | ||
381 | + int text_len, | ||
382 | + XRectangle *ink_extents_buffer, | ||
383 | + XRectangle *logical_extents_buffer, | ||
384 | + int buffer_size, | ||
385 | + int *num_chars, | ||
386 | + XRectangle *max_ink_extents, | ||
387 | + XRectangle *max_logical_extents) | ||
388 | +{ | ||
389 | + return 0; | ||
390 | +} | ||
391 | + | ||
392 | +unsigned int | ||
393 | +KeySymToUcs4(KeySym keysym) | ||
394 | +{ | ||
395 | + return 0; | ||
396 | +} | ||
397 | + | ||
398 | +#endif | ||
399 | + | ||
400 | +#if ! XCMS | ||
401 | + | ||
402 | +XcmsCCC | ||
403 | +XcmsCCCOfColormap(dpy, cmap) | ||
404 | + Display *dpy; | ||
405 | + Colormap cmap; | ||
406 | +{ | ||
407 | + return NULL; | ||
408 | +} | ||
409 | + | ||
410 | +Status | ||
411 | +_XcmsResolveColorString ( | ||
412 | + XcmsCCC ccc, | ||
413 | + const char **color_string, | ||
414 | + XcmsColor *pColor_exact_return, | ||
415 | + XcmsColorFormat result_format) | ||
416 | +{ | ||
417 | + return(XcmsFailure); | ||
418 | +} | ||
419 | + | ||
420 | +void | ||
421 | +_XcmsUnresolveColor( | ||
422 | + XcmsCCC ccc, | ||
423 | + XcmsColor *pColor) | ||
424 | +{ | ||
425 | + return; | ||
426 | +} | ||
427 | + | ||
428 | +void | ||
429 | +_XUnresolveColor( | ||
430 | + XcmsCCC ccc, | ||
431 | + XColor *pXColor) | ||
432 | +{ | ||
433 | + return; | ||
434 | +} | ||
435 | + | ||
436 | +XcmsCmapRec * | ||
437 | +_XcmsAddCmapRec(dpy, cmap, windowID, visual) | ||
438 | + Display *dpy; | ||
439 | + Colormap cmap; | ||
440 | + Window windowID; | ||
441 | + Visual *visual; | ||
442 | +{ | ||
443 | + return NULL; | ||
444 | +} | ||
445 | + | ||
446 | +void | ||
447 | +_XcmsRGB_to_XColor( | ||
448 | + XcmsColor *pColors, | ||
449 | + XColor *pXColors, | ||
450 | + unsigned int nColors) | ||
451 | +{ | ||
452 | + return; | ||
453 | +} | ||
454 | + | ||
455 | +XcmsCmapRec * | ||
456 | +_XcmsCopyCmapRecAndFree( | ||
457 | + Display *dpy, | ||
458 | + Colormap src_cmap, | ||
459 | + Colormap copy_cmap) | ||
460 | +{ | ||
461 | + return NULL; | ||
462 | +} | ||
463 | + | ||
464 | +void | ||
465 | +_XcmsDeleteCmapRec( | ||
466 | + Display *dpy, | ||
467 | + Colormap cmap) | ||
468 | +{ | ||
469 | + return; | ||
470 | +} | ||
471 | + | ||
472 | +#endif | ||
473 | Index: libX11-1.3/src/Makefile.am | ||
474 | =================================================================== | ||
475 | --- libX11-1.3.orig/src/Makefile.am | ||
476 | +++ libX11-1.3/src/Makefile.am | ||
477 | @@ -335,6 +335,8 @@ if THRSTUBS | ||
478 | libX11_la_SOURCES+=UIThrStubs.c | ||
479 | endif | ||
480 | |||
481 | +libX11_la_SOURCES+=X18NCMSstubs.c | ||
482 | + | ||
483 | x11datadir = @X11_DATADIR@ | ||
484 | x11data_DATA = XKeysymDB XErrorDB | ||
485 | |||
486 | @@ -342,6 +344,7 @@ EXTRA_DIST = \ | ||
487 | $(x11data_DATA) \ | ||
488 | os2Stubs.c \ | ||
489 | - UIThrStubs.c | ||
490 | + UIThrStubs.c \ | ||
491 | + X18NCMSstubs.c | ||
492 | |||
493 | if XCB | ||
494 | libX11_la_SOURCES += \ | ||
495 | Index: libX11-1.3/src/locking.c | ||
496 | =================================================================== | ||
497 | --- libX11-1.3.orig/src/locking.c | ||
498 | +++ libX11-1.3/src/locking.c | ||
499 | @@ -66,7 +66,9 @@ in this Software without prior written a | ||
500 | #define NUM_FREE_CVLS 4 | ||
501 | |||
502 | /* in lcWrap.c */ | ||
503 | +#ifdef XLOCALE | ||
504 | extern LockInfoPtr _Xi18n_lock; | ||
505 | +#endif | ||
506 | |||
507 | #ifdef WIN32 | ||
508 | static DWORD _X_TlsIndex = (DWORD)-1; | ||
509 | @@ -594,9 +596,11 @@ Status XInitThreads(void) | ||
510 | _Xglobal_lock = &global_lock; | ||
511 | xmutex_init(_Xglobal_lock->lock); | ||
512 | xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); | ||
513 | +#ifdef XLOCALE | ||
514 | _Xi18n_lock = &i18n_lock; | ||
515 | xmutex_init(_Xi18n_lock->lock); | ||
516 | xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); | ||
517 | +#endif | ||
518 | _XLockMutex_fn = _XLockMutex; | ||
519 | _XUnlockMutex_fn = _XUnlockMutex; | ||
520 | _XCreateMutex_fn = _XCreateMutex; | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch new file mode 100644 index 0000000000..c1b6cde534 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | |||
5 | Update for 1.6.1 | ||
6 | |||
7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
8 | |||
9 | diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am | ||
10 | --- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 | ||
11 | +++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 | ||
12 | @@ -36,11 +36,6 @@ | ||
13 | < locale.dir.l1 > locale.dir.l2 | ||
14 | cat locale.dir.l2 locale.dir.l1 > locale.dir | ||
15 | |||
16 | -if HAVE_PERL | ||
17 | -LOG_COMPILER = $(PERL) | ||
18 | -TESTS = compose-check.pl | ||
19 | -endif HAVE_PERL | ||
20 | - | ||
21 | |||
22 | # Per-locale data files | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff new file mode 100644 index 0000000000..a7c3984fd5 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
4 | --- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 | ||
5 | +++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 | ||
6 | @@ -701,7 +701,11 @@ | ||
7 | } | ||
8 | if (l - 2 - (p - charset) < 0) | ||
9 | return 0; | ||
10 | +#ifdef XLOCALE | ||
11 | if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) | ||
12 | +#else | ||
13 | + if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) | ||
14 | +#endif | ||
15 | return 0; | ||
16 | if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) | ||
17 | return 0; | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch new file mode 100644 index 0000000000..c6347f5be1 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
4 | |||
5 | # | ||
6 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
7 | # | ||
8 | |||
9 | --- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define | ||
10 | +++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h | ||
11 | @@ -103,7 +103,7 @@ | ||
12 | |||
13 | /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in | ||
14 | November 2000. Its presence is indicated through the following macro. */ | ||
15 | -#define X_HAVE_UTF8_STRING 1 | ||
16 | +#undef X_HAVE_UTF8_STRING | ||
17 | |||
18 | typedef char *XPointer; | ||
19 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch b/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch new file mode 100644 index 0000000000..30686206ab --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From 4d85d5f3bd8afac893738fd88e19d8cb5cf998ff Mon Sep 17 00:00:00 2001 | ||
2 | From: Drew Moseley <drew_moseley@mentor.com> | ||
3 | Date: Sun, 27 Jul 2014 13:10:07 -0400 | ||
4 | Subject: [PATCH] libX11: Add missing NULL check on im and im->methods | ||
5 | |||
6 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=81822] | ||
7 | |||
8 | Signed-off-by: Drew Moseley <drew_moseley@mentor.com> | ||
9 | --- | ||
10 | src/xlibi18n/ICWrap.c | 5 +++-- | ||
11 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWrap.c | ||
14 | --- libX11-1.6.2-orig/src/xlibi18n/ICWrap.c 2014-07-27 13:38:29.586666449 -0400 | ||
15 | +++ libX11-1.6.2/src/xlibi18n/ICWrap.c 2014-07-27 13:41:39.671609030 -0400 | ||
16 | @@ -169,7 +169,7 @@ | ||
17 | va_list var; | ||
18 | int total_count; | ||
19 | XIMArg *args; | ||
20 | - char *ret; | ||
21 | + char *ret = NULL; | ||
22 | |||
23 | /* | ||
24 | * so count the stuff dangling here | ||
25 | @@ -185,7 +185,8 @@ | ||
26 | _XIMVaToNestedList(var, total_count, &args); | ||
27 | va_end(var); | ||
28 | |||
29 | - ret = (*im->methods->set_values) (im, args); | ||
30 | + if (im && im->methods) | ||
31 | + ret = (*im->methods->set_values) (im, args); | ||
32 | if (args) Xfree(args); | ||
33 | return ret; | ||
34 | } | ||
35 | @@ -196,7 +197,7 @@ | ||
36 | va_list var; | ||
37 | int total_count; | ||
38 | XIMArg *args; | ||
39 | - char *ret; | ||
40 | + char *ret = NULL; | ||
41 | |||
42 | /* | ||
43 | * so count the stuff dangling here | ||
44 | @@ -212,7 +213,8 @@ | ||
45 | _XIMVaToNestedList(var, total_count, &args); | ||
46 | va_end(var); | ||
47 | |||
48 | - ret = (*im->methods->get_values) (im, args); | ||
49 | + if (im && im->methods) | ||
50 | + ret = (*im->methods->get_values) (im, args); | ||
51 | if (args) Xfree(args); | ||
52 | return ret; | ||
53 | } | ||
54 | @@ -228,7 +230,7 @@ | ||
55 | va_list var; | ||
56 | int total_count; | ||
57 | XIMArg *args; | ||
58 | - XIC ic; | ||
59 | + XIC ic = NULL; | ||
60 | |||
61 | /* | ||
62 | * so count the stuff dangling here | ||
63 | @@ -244,7 +246,8 @@ | ||
64 | _XIMVaToNestedList(var, total_count, &args); | ||
65 | va_end(var); | ||
66 | |||
67 | - ic = (XIC) (*im->methods->create_ic) (im, args); | ||
68 | + if (im && im->methods) | ||
69 | + ic = (XIC) (*im->methods->create_ic) (im, args); | ||
70 | if (args) Xfree(args); | ||
71 | if (ic) { | ||
72 | ic->core.next = im->core.ic_chain; | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch b/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch new file mode 100644 index 0000000000..b7f5356e6c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch | |||
@@ -0,0 +1,101 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
4 | |||
5 | From b64bee2ddb7b96f00713a8b8435f11ad9ac1c9e0 Mon Sep 17 00:00:00 2001 | ||
6 | From: Ran Benita <ran234@gmail.com> | ||
7 | Date: Sun, 16 Feb 2014 15:24:58 +0200 | ||
8 | Subject: [PATCH] nls: always use XCOMM instead of # for comments in | ||
9 | Compose.pre files | ||
10 | |||
11 | Lines starting with # are considered as preprocessor directives in the | ||
12 | .pre files. | ||
13 | |||
14 | Fixes warnings like: | ||
15 | <stdin>:3:0: error: invalid preprocessing directive #Khmer | ||
16 | |||
17 | Signed-off-by: Ran Benita <ran234@gmail.com> | ||
18 | Signed-off-by: James Cloos <cloos@jhcloos.com> | ||
19 | --- | ||
20 | nls/km_KH.UTF-8/Compose.pre | 2 +- | ||
21 | nls/sr_CS.UTF-8/Compose.pre | 32 ++++++++++++++++---------------- | ||
22 | 2 files changed, 17 insertions(+), 17 deletions(-) | ||
23 | |||
24 | diff --git a/nls/km_KH.UTF-8/Compose.pre b/nls/km_KH.UTF-8/Compose.pre | ||
25 | index 77651d0..dc89119 100644 | ||
26 | --- a/nls/km_KH.UTF-8/Compose.pre | ||
27 | +++ b/nls/km_KH.UTF-8/Compose.pre | ||
28 | @@ -1,6 +1,6 @@ | ||
29 | include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" | ||
30 | |||
31 | -# Khmer digraphs | ||
32 | +XCOMM Khmer digraphs | ||
33 | <U17ff> : "ាំ" | ||
34 | <U17fe> : "ោះ" | ||
35 | <U17fd> : "áŸáŸ‡" | ||
36 | diff --git a/nls/sr_CS.UTF-8/Compose.pre b/nls/sr_CS.UTF-8/Compose.pre | ||
37 | index 119e23e..b2397f7 100644 | ||
38 | --- a/nls/sr_CS.UTF-8/Compose.pre | ||
39 | +++ b/nls/sr_CS.UTF-8/Compose.pre | ||
40 | @@ -1,17 +1,17 @@ | ||
41 | include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" | ||
42 | |||
43 | -# Serbian accented Cyrillic | ||
44 | -# а Р- U+0430, U+0410 Cyrillic_a, Cyrillic_A | ||
45 | -# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E | ||
46 | -# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O | ||
47 | -# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U | ||
48 | -# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I | ||
49 | -# | ||
50 | -# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> | ||
51 | -# Ì - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> | ||
52 | -# Ì‚ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum> | ||
53 | -# Ì - U+030F <dead_diaeresis>, <dead_doubleacute> | ||
54 | -# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> | ||
55 | +XCOMM Serbian accented Cyrillic | ||
56 | +XCOMM а Р- U+0430, U+0410 Cyrillic_a, Cyrillic_A | ||
57 | +XCOMM е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E | ||
58 | +XCOMM о О - U+043E, U+041E Cyrillic_o, Cyrillic_O | ||
59 | +XCOMM у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U | ||
60 | +XCOMM и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I | ||
61 | +XCOMM | ||
62 | +XCOMM ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> | ||
63 | +XCOMM Ì - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> | ||
64 | +XCOMM Ì‚ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum> | ||
65 | +XCOMM Ì - U+030F <dead_diaeresis>, <dead_doubleacute> | ||
66 | +XCOMM ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave> | ||
67 | <dead_grave> <Cyrillic_a> : "а̀" | ||
68 | <combining_grave> <Cyrillic_a> : "а̀" | ||
69 | <Multi_key> <grave> <Cyrillic_a> : "а̀" | ||
70 | @@ -42,7 +42,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" | ||
71 | <dead_grave> <Cyrillic_U> : "У̀" | ||
72 | <combining_grave> <Cyrillic_U> : "У̀" | ||
73 | <Multi_key> <grave> <Cyrillic_U> : "У̀" | ||
74 | -# Ì - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> | ||
75 | +XCOMM Ì - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute> | ||
76 | <dead_acute> <Cyrillic_a> : "аÌ" | ||
77 | <combining_acute> <Cyrillic_a> : "аÌ" | ||
78 | <Multi_key> <acute> <Cyrillic_a> : "аÌ" | ||
79 | @@ -83,7 +83,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" | ||
80 | <combining_acute> <Cyrillic_U> : "УÌ" | ||
81 | <Multi_key> <acute> <Cyrillic_U> : "УÌ" | ||
82 | <Multi_key> <apostrophe> <Cyrillic_U> : "УÌ" | ||
83 | -# Ì‚ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum> | ||
84 | +XCOMM Ì‚ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum> | ||
85 | <dead_circumflex> <Cyrillic_a> : "а̂" | ||
86 | <Multi_key> <asciicircum> <Cyrillic_a> : "а̂" | ||
87 | <dead_circumflex> <Cyrillic_A> : "ÐÌ‚" | ||
88 | @@ -104,8 +104,8 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" | ||
89 | <Multi_key> <asciicircum> <Cyrillic_u> : "у̂" | ||
90 | <dead_circumflex> <Cyrillic_U> : "У̂" | ||
91 | <Multi_key> <asciicircum> <Cyrillic_U> : "У̂" | ||
92 | -# Ì - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute> | ||
93 | -# there's no appropriate dead_doublegrave, so we use these two dead keys | ||
94 | +XCOMM Ì - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute> | ||
95 | +XCOMM there's no appropriate dead_doublegrave, so we use these two dead keys | ||
96 | <dead_diaeresis> <Cyrillic_a> : "аÌ" | ||
97 | <dead_doubleacute> <Cyrillic_a> : "аÌ" | ||
98 | <dead_diaeresis> <Cyrillic_A> : "ÐÌ" | ||
99 | -- | ||
100 | 1.7.9.5 | ||
101 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb new file mode 100644 index 0000000000..a7226480c2 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require libx11.inc | ||
2 | inherit gettext | ||
3 | |||
4 | BBCLASSEXTEND = "native nativesdk" | ||
5 | |||
6 | SRC_URI += "file://disable_tests.patch \ | ||
7 | file://nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch \ | ||
8 | file://libX11-Add-missing-NULL-check.patch \ | ||
9 | " | ||
10 | |||
11 | SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5" | ||
12 | SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb new file mode 100644 index 0000000000..2ef8bfa8b6 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | SUMMARY = "Xau: X Authority Database library" | ||
2 | |||
3 | DESCRIPTION = "libxau provides the main interfaces to the X11 \ | ||
4 | authorisation handling, which controls authorisation for X connections, \ | ||
5 | both client-side and server-side." | ||
6 | |||
7 | require xorg-lib-common.inc | ||
8 | |||
9 | inherit gettext | ||
10 | |||
11 | LICENSE = "MIT-style" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec" | ||
13 | |||
14 | DEPENDS += " xproto" | ||
15 | PROVIDES = "xau" | ||
16 | |||
17 | PE = "1" | ||
18 | |||
19 | XORG_PN = "libXau" | ||
20 | |||
21 | BBCLASSEXTEND = "native nativesdk" | ||
22 | |||
23 | SRC_URI[md5sum] = "685f8abbffa6d145c0f930f00703b21b" | ||
24 | SRC_URI[sha256sum] = "fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch new file mode 100644 index 0000000000..d6148834a6 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | There is no extra reply data and if we say not to disgard it, xcb | ||
4 | throws fatal asserts. | ||
5 | |||
6 | RP - 26/11/09 | ||
7 | |||
8 | Index: git/xcalibrate.c | ||
9 | =================================================================== | ||
10 | --- git.orig/xcalibrate.c 2009-11-26 08:11:48.000000000 +0000 | ||
11 | +++ git/xcalibrate.c 2009-11-26 08:09:55.000000000 +0000 | ||
12 | @@ -216,7 +216,7 @@ | ||
13 | req->reqType = info->codes->major_opcode; | ||
14 | req->xCalibrateReqType = X_XCalibrateRawMode; | ||
15 | req->on = enable; | ||
16 | - if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) | ||
17 | + if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) | ||
18 | { | ||
19 | UnlockDisplay (dpy); | ||
20 | SyncHandle (); | ||
21 | @@ -240,7 +240,7 @@ | ||
22 | req->xCalibrateReqType = X_XCalibrateScreenToCoord; | ||
23 | req->x = *x; | ||
24 | req->y = *y; | ||
25 | - if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) | ||
26 | + if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) | ||
27 | { | ||
28 | UnlockDisplay (dpy); | ||
29 | SyncHandle (); | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb new file mode 100644 index 0000000000..455e869c7a --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "XCalibrate: Touchscreen calibration library" | ||
2 | |||
3 | DESCRIPTION = "libXCalibrate is a library for performing touchscreen \ | ||
4 | calibration with the kdrive tslib touchscreen driver." | ||
5 | |||
6 | require xorg-lib-common.inc | ||
7 | |||
8 | LICENSE = "MIT-style" | ||
9 | LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \ | ||
10 | file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7" | ||
11 | |||
12 | DEPENDS = "virtual/libx11 calibrateproto libxext" | ||
13 | |||
14 | SRCREV = "209d83af61ed38a002c8096377deac292b3e396c" | ||
15 | PV = "0.0+git${SRCPV}" | ||
16 | |||
17 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate \ | ||
18 | file://fix-xcb.patch" | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
21 | |||
22 | FILES_${PN}-locale += "${datadir}/X11/locale" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc new file mode 100644 index 0000000000..453f5500c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb.inc | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "XCB: The X protocol C binding library" | ||
2 | DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \ | ||
3 | for Xlib featuring a small footprint, latency hiding, direct access to \ | ||
4 | the protocol, improved threading support, and extensibility." | ||
5 | HOMEPAGE = "http://xcb.freedesktop.org" | ||
6 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" | ||
7 | |||
8 | BBCLASSEXTEND = "native nativesdk" | ||
9 | |||
10 | SECTION = "x11/libs" | ||
11 | LICENSE = "MIT-X" | ||
12 | |||
13 | DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs" | ||
14 | |||
15 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ | ||
16 | file://xcbincludedir.patch \ | ||
17 | file://disable-check.patch" | ||
18 | |||
19 | PACKAGES_DYNAMIC = "^libxcb-.*" | ||
20 | |||
21 | FILES_${PN} = "${libdir}/libxcb.so.*" | ||
22 | |||
23 | inherit autotools pkgconfig pythonnative | ||
24 | |||
25 | python populate_packages_prepend () { | ||
26 | do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) | ||
27 | } | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch new file mode 100644 index 0000000000..5641c0fe95 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | The "check" package is checked for without an explicit enable/disable option, | ||
2 | which can lead to non-deterministic build issues with both check and libxslt. | ||
3 | |||
4 | As the unit test suite is minimal at present, simply disable the test suite. In | ||
5 | the future if the test suite is expanded this can be made conditional on the | ||
6 | ptest DISTRO_FEATURE. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
10 | |||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 6d7c9a5..22cceb9 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS | ||
17 | |||
18 | AM_PATH_PYTHON([2.6]) | ||
19 | |||
20 | -PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) | ||
21 | +dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) | ||
22 | +HAVE_CHECK=no | ||
23 | AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) | ||
24 | |||
25 | AC_CONFIG_HEADERS([src/config.h]) | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch b/meta/recipes-graphics/xorg-lib/libxcb/ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch new file mode 100644 index 0000000000..14cefa3f29 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb/ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch | |||
@@ -0,0 +1,121 @@ | |||
1 | From be0fe56c3bcad5124dcc6c47a2fad01acd16f71a Mon Sep 17 00:00:00 2001 | ||
2 | From: Keith Packard <keithp@keithp.com> | ||
3 | Date: Mon, 23 Dec 2013 21:15:20 -0800 | ||
4 | Subject: [PATCH] Ensure xcb owns socket and no other threads are writing | ||
5 | before send_request | ||
6 | |||
7 | send_request may only write to out.queue if no other thread is busy | ||
8 | writing to the network (as that thread may be writing from out.queue). | ||
9 | |||
10 | send_request may only allocate request sequence numbers if XCB owns | ||
11 | the socket. | ||
12 | |||
13 | Therefore, send_request must make sure that both conditions are true | ||
14 | when it holds iolock, which can only be done by looping until both | ||
15 | conditions are true without having dropped the lock waiting for the | ||
16 | second condition. | ||
17 | |||
18 | We choose to get the socket back from Xlib first as get_socket_back | ||
19 | has a complicated test and checking for other threads writing is a | ||
20 | simple in-lined check. | ||
21 | |||
22 | This also changes the sequence number checks (64k requests with no | ||
23 | reply, 4M request wrapping) to ensure that both conditions are true | ||
24 | before queueing the request. | ||
25 | |||
26 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
27 | Reviewed-by: Uli Schlachter <psychon@znc.in> | ||
28 | --- | ||
29 | src/xcb_out.c | 57 ++++++++++++++++++++++++++++++++++++++++----------------- | ||
30 | 1 file changed, 40 insertions(+), 17 deletions(-) | ||
31 | |||
32 | diff --git a/src/xcb_out.c b/src/xcb_out.c | ||
33 | index 18bb5f9..dc42954 100644 | ||
34 | --- a/src/xcb_out.c | ||
35 | +++ b/src/xcb_out.c | ||
36 | @@ -103,6 +103,33 @@ static void get_socket_back(xcb_connection_t *c) | ||
37 | _xcb_in_replies_done(c); | ||
38 | } | ||
39 | |||
40 | +static void prepare_socket_request(xcb_connection_t *c) | ||
41 | +{ | ||
42 | + /* We're about to append data to out.queue, so we need to | ||
43 | + * atomically test for an external socket owner *and* some other | ||
44 | + * thread currently writing. | ||
45 | + * | ||
46 | + * If we have an external socket owner, we have to get the socket back | ||
47 | + * before we can use it again. | ||
48 | + * | ||
49 | + * If some other thread is writing to the socket, we assume it's | ||
50 | + * writing from out.queue, and so we can't stick data there. | ||
51 | + * | ||
52 | + * We satisfy this condition by first calling get_socket_back | ||
53 | + * (which may drop the lock, but will return when XCB owns the | ||
54 | + * socket again) and then checking for another writing thread and | ||
55 | + * escaping the loop if we're ready to go. | ||
56 | + */ | ||
57 | + for (;;) { | ||
58 | + if(c->has_error) | ||
59 | + return; | ||
60 | + get_socket_back(c); | ||
61 | + if (!c->out.writing) | ||
62 | + break; | ||
63 | + pthread_cond_wait(&c->out.cond, &c->iolock); | ||
64 | + } | ||
65 | +} | ||
66 | + | ||
67 | /* Public interface */ | ||
68 | |||
69 | void xcb_prefetch_maximum_request_length(xcb_connection_t *c) | ||
70 | @@ -236,24 +263,23 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect | ||
71 | |||
72 | /* get a sequence number and arrange for delivery. */ | ||
73 | pthread_mutex_lock(&c->iolock); | ||
74 | - /* wait for other writing threads to get out of my way. */ | ||
75 | - while(c->out.writing) | ||
76 | - pthread_cond_wait(&c->out.cond, &c->iolock); | ||
77 | - get_socket_back(c); | ||
78 | + | ||
79 | + prepare_socket_request(c); | ||
80 | |||
81 | /* send GetInputFocus (sync_req) when 64k-2 requests have been sent without | ||
82 | - * a reply. */ | ||
83 | - if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) | ||
84 | - send_sync(c); | ||
85 | - /* Also send sync_req (could use NoOp) at 32-bit wrap to avoid having | ||
86 | + * a reply. | ||
87 | + * Also send sync_req (could use NoOp) at 32-bit wrap to avoid having | ||
88 | * applications see sequence 0 as that is used to indicate | ||
89 | - * an error in sending the request */ | ||
90 | - if((unsigned int) (c->out.request + 1) == 0) | ||
91 | + * an error in sending the request | ||
92 | + */ | ||
93 | + | ||
94 | + while ((req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) || | ||
95 | + (unsigned int) (c->out.request + 1) == 0) | ||
96 | + { | ||
97 | send_sync(c); | ||
98 | + prepare_socket_request(c); | ||
99 | + } | ||
100 | |||
101 | - /* The above send_sync calls could drop the I/O lock, but this | ||
102 | - * thread will still exclude any other thread that tries to write, | ||
103 | - * so the sequence number postconditions still hold. */ | ||
104 | send_request(c, req->isvoid, workaround, flags, vector, veclen); | ||
105 | request = c->has_error ? 0 : c->out.request; | ||
106 | pthread_mutex_unlock(&c->iolock); | ||
107 | @@ -373,10 +399,7 @@ int _xcb_out_send(xcb_connection_t *c, struct iovec *vector, int count) | ||
108 | |||
109 | void _xcb_out_send_sync(xcb_connection_t *c) | ||
110 | { | ||
111 | - /* wait for other writing threads to get out of my way. */ | ||
112 | - while(c->out.writing) | ||
113 | - pthread_cond_wait(&c->out.cond, &c->iolock); | ||
114 | - get_socket_back(c); | ||
115 | + prepare_socket_request(c); | ||
116 | send_sync(c); | ||
117 | } | ||
118 | |||
119 | -- | ||
120 | 1.9.1 | ||
121 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch new file mode 100644 index 0000000000..46297c33c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot | ||
2 | to the beginning of variables that are used later on the host. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/configure.ac b/configure.ac | ||
8 | index 94da4f7..d29cd6a 100644 | ||
9 | --- a/configure.ac | ||
10 | +++ b/configure.ac | ||
11 | @@ -64,7 +64,7 @@ AC_SUBST(NEEDED) | ||
12 | |||
13 | # Find the xcb-proto protocol descriptions | ||
14 | AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) | ||
15 | -XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` | ||
16 | +XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto` | ||
17 | AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) | ||
18 | AC_SUBST(XCBPROTO_XCBINCLUDEDIR) | ||
19 | |||
20 | @@ -74,7 +74,7 @@ AC_SUBST(XCBPROTO_VERSION) | ||
21 | |||
22 | # Find the xcbgen Python package | ||
23 | AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR) | ||
24 | -XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` | ||
25 | +XCBPROTO_XCBPYTHONDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=pythondir xcb-proto` | ||
26 | AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) | ||
27 | AC_SUBST(XCBPROTO_XCBPYTHONDIR) | ||
28 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb new file mode 100644 index 0000000000..5bb5f0be88 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | include libxcb.inc | ||
2 | |||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" | ||
5 | |||
6 | |||
7 | DEPENDS += "libxdmcp" | ||
8 | |||
9 | SRC_URI += "file://ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch \ | ||
10 | " | ||
11 | |||
12 | SRC_URI[md5sum] = "074c335cc4453467eeb234e3dadda700" | ||
13 | SRC_URI[sha256sum] = "98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_git.bb b/meta/recipes-graphics/xorg-lib/libxcb_git.bb new file mode 100644 index 0000000000..186636e1eb --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb_git.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | DEFAULT_PREFERENCE = "-1" | ||
2 | |||
3 | include libxcb.inc | ||
4 | |||
5 | SRCREV = "625ed596cae6dd8175aeb6cb6f26784928042f22" | ||
6 | PV = "1.1.90.1+gitr${SRCPV}" | ||
7 | PR = "r1" | ||
8 | |||
9 | SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb" | ||
10 | S = "${WORKDIR}/git" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch new file mode 100644 index 0000000000..60331f6e78 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | This patch makes the build use its own Xcomposite.h over rather than an | ||
4 | older Xcomposite.h that might already be installed in the staging dir. | ||
5 | |||
6 | Index: libXcomposite-0.4.3/src/Makefile.am | ||
7 | =================================================================== | ||
8 | --- libXcomposite-0.4.3.orig/src/Makefile.am 2010-06-30 22:42:53.000000000 -0700 | ||
9 | +++ libXcomposite-0.4.3/src/Makefile.am 2010-11-23 23:09:34.544322930 -0800 | ||
10 | @@ -19,7 +19,7 @@ | ||
11 | # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
12 | # PERFORMANCE OF THIS SOFTWARE. | ||
13 | |||
14 | -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) | ||
15 | +AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) | ||
16 | AM_CPPFLAGS = -I$(top_srcdir)/include | ||
17 | |||
18 | lib_LTLIBRARIES = libXcomposite.la | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb new file mode 100644 index 0000000000..70257194a9 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | SUMMARY = "Xcomposite: X Composite extension library" | ||
2 | |||
3 | DESCRIPTION = "The composite extension provides three related \ | ||
4 | mechanisms: per-hierarchy storage, automatic shadow update, and external \ | ||
5 | parent. In per-hierarchy storage, the rendering of an entire hierarchy \ | ||
6 | of windows is redirected to off-screen storage. In automatic shadow \ | ||
7 | update, when a hierarchy is rendered off-screen, the X server provides \ | ||
8 | an automatic mechanism for presenting those contents within the parent \ | ||
9 | window. In external parent, a mechanism for providing redirection of \ | ||
10 | compositing transformations through a client." | ||
11 | |||
12 | require xorg-lib-common.inc | ||
13 | |||
14 | LICENSE = "MIT-style" | ||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" | ||
16 | |||
17 | DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" | ||
18 | PROVIDES = "xcomposite" | ||
19 | BBCLASSEXTEND = "native" | ||
20 | |||
21 | PE = "1" | ||
22 | |||
23 | XORG_PN = "libXcomposite" | ||
24 | |||
25 | SRC_URI += " file://change-include-order.patch" | ||
26 | |||
27 | SRC_URI[md5sum] = "f7a218dcbf6f0848599c6c36fc65c51a" | ||
28 | SRC_URI[sha256sum] = "ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb b/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb new file mode 100644 index 0000000000..a8e4f24b6b --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "Xcursor: X Cursor management library" | ||
2 | |||
3 | DESCRIPTION = "Xcursor is a simple library designed to help locate and \ | ||
4 | load cursors. Cursors can be loaded from files or memory. A library of \ | ||
5 | common cursors exists which map to the standard X cursor names. Cursors \ | ||
6 | can exist in several sizes and the library automatically picks the best \ | ||
7 | size." | ||
8 | |||
9 | require xorg-lib-common.inc | ||
10 | |||
11 | LICENSE = "MIT-style" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=8902e6643f7bcd7793b23dcd5d8031a4" | ||
13 | |||
14 | DEPENDS += "libxrender libxfixes" | ||
15 | BBCLASSEXTEND = "native" | ||
16 | |||
17 | PE = "1" | ||
18 | |||
19 | XORG_PN = "libXcursor" | ||
20 | |||
21 | SRC_URI[md5sum] = "1e7c17afbbce83e2215917047c57d1b3" | ||
22 | SRC_URI[sha256sum] = "9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb new file mode 100644 index 0000000000..c3d70043ca --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | SUMMARY = "Xdamage: X Damage extension library" | ||
2 | |||
3 | DESCRIPTION = "'Damage' is a term that describes changes make to pixel \ | ||
4 | contents of windows and pixmaps. Damage accumulates as drawing occurs \ | ||
5 | in the drawable. Each drawing operation 'damages' one or more \ | ||
6 | rectangular areas within the drawable. The rectangles are guaranteed to \ | ||
7 | include the set of pixels modified by each operation, but may include \ | ||
8 | significantly more than just those pixels. The DAMAGE extension allows \ | ||
9 | applications to either receive the raw rectangles as a stream of events, \ | ||
10 | or to have them partially processed within the X server to reduce the \ | ||
11 | amount of data transmitted as well as reduce the processing latency once \ | ||
12 | the repaint operation has started." | ||
13 | |||
14 | require xorg-lib-common.inc | ||
15 | |||
16 | LICENSE = "MIT" | ||
17 | LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868" | ||
18 | |||
19 | DEPENDS += "virtual/libx11 damageproto libxfixes" | ||
20 | PROVIDES = "xdamage" | ||
21 | BBCLASSEXTEND = "native" | ||
22 | |||
23 | PE = "1" | ||
24 | |||
25 | XORG_PN = "libXdamage" | ||
26 | |||
27 | SRC_URI[md5sum] = "0cf292de2a9fa2e9a939aefde68fd34f" | ||
28 | SRC_URI[sha256sum] = "7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.1.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.1.bb new file mode 100644 index 0000000000..3529ead58b --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.1.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "XDMCP: X Display Manager Control Protocol library" | ||
2 | |||
3 | DESCRIPTION = "The purpose of the X Display Manager Control Protocol \ | ||
4 | (XDMCP) is to provide a uniform mechanism for an autonomous display to \ | ||
5 | request login service from a remote host. An X terminal (screen, \ | ||
6 | keyboard, mouse, processor, network interface) is a prime example of an \ | ||
7 | autonomous display." | ||
8 | |||
9 | require xorg-lib-common.inc | ||
10 | |||
11 | inherit gettext | ||
12 | |||
13 | LICENSE = "MIT-style" | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123" | ||
15 | |||
16 | DEPENDS += "xproto" | ||
17 | PROVIDES = "xdmcp" | ||
18 | |||
19 | PE = "1" | ||
20 | |||
21 | XORG_PN = "libXdmcp" | ||
22 | |||
23 | BBCLASSEXTEND = "native nativesdk" | ||
24 | |||
25 | SRC_URI[md5sum] = "b94af6cef211cf3ee256f7e81f70fcd9" | ||
26 | SRC_URI[sha256sum] = "9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb b/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb new file mode 100644 index 0000000000..ec66175684 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "XExt: X Extension library" | ||
2 | |||
3 | DESCRIPTION = "libXext provides an X Window System client interface to \ | ||
4 | several extensions to the X protocol. The supported protocol extensions \ | ||
5 | are DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT_SHM, \ | ||
6 | MIT_SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, \ | ||
7 | XC-APPGROUP, XC-MISC, XTEST. libXext also provides a small set of \ | ||
8 | utility functions to aid authors of client APIs for X protocol \ | ||
9 | extensions." | ||
10 | |||
11 | require xorg-lib-common.inc | ||
12 | |||
13 | LICENSE = "MIT-style" | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8" | ||
15 | |||
16 | DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" | ||
17 | PROVIDES = "xext" | ||
18 | |||
19 | PE = "1" | ||
20 | |||
21 | XORG_PN = "libXext" | ||
22 | |||
23 | BBCLASSEXTEND = "native nativesdk" | ||
24 | |||
25 | SRC_URI[md5sum] = "4376101e51bb2c6c44d9ab14344e85ad" | ||
26 | SRC_URI[sha256sum] = "f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxext_git.bb b/meta/recipes-graphics/xorg-lib/libxext_git.bb new file mode 100644 index 0000000000..b799186ef0 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxext_git.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | SUMMARY = "XExt: X Extension library" | ||
4 | |||
5 | DESCRIPTION = "libXext provides an X Window System client interface to \ | ||
6 | several extensions to the X protocol. The supported protocol extensions \ | ||
7 | are DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT_SHM, \ | ||
8 | MIT_SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, \ | ||
9 | XC-APPGROUP, XC-MISC, XTEST. libXext also provides a small set of \ | ||
10 | utility functions to aid authors of client APIs for X protocol \ | ||
11 | extensions." | ||
12 | |||
13 | DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" | ||
14 | PROVIDES = "xext" | ||
15 | SRCREV = "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" | ||
16 | PE = "1" | ||
17 | PV = "1.0.99.1+gitr${SRCPV}" | ||
18 | |||
19 | XORG_PN = "libXext" | ||
20 | |||
21 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN}" | ||
22 | S = "${WORKDIR}/git/" | ||
23 | |||
24 | BBCLASSEXTEND = "nativesdk" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb b/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb new file mode 100644 index 0000000000..6e2740c9a1 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "XFixes: X Fixes extension library" | ||
2 | |||
3 | DESCRIPTION = "X applications have often needed to work around various \ | ||
4 | shortcomings in the core X window system. This extension is designed to \ | ||
5 | provide the minimal server-side support necessary to eliminate problems \ | ||
6 | caused by these workarounds." | ||
7 | |||
8 | require xorg-lib-common.inc | ||
9 | |||
10 | LICENSE = "MIT-style" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" | ||
12 | |||
13 | DEPENDS += "virtual/libx11 xproto fixesproto xextproto" | ||
14 | |||
15 | PE = "1" | ||
16 | |||
17 | XORG_PN = "libXfixes" | ||
18 | |||
19 | BBCLASSEXTEND = "native nativesdk" | ||
20 | |||
21 | SRC_URI[md5sum] = "b985b85f8b9386c85ddcfe1073906b4d" | ||
22 | SRC_URI[sha256sum] = "63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb new file mode 100644 index 0000000000..ef0bde29fb --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "XFont: X Font rasterisation library" | ||
2 | |||
3 | DESCRIPTION = "libXfont provides various services for X servers, most \ | ||
4 | notably font selection and rasterisation (through external libraries \ | ||
5 | such as freetype)." | ||
6 | |||
7 | require xorg-lib-common.inc | ||
8 | |||
9 | LICENSE = "MIT & MIT-style & BSD" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" | ||
11 | |||
12 | DEPENDS += "freetype xtrans fontsproto libfontenc zlib" | ||
13 | PROVIDES = "xfont" | ||
14 | |||
15 | PE = "1" | ||
16 | |||
17 | XORG_PN = "libXfont" | ||
18 | |||
19 | BBCLASSEXTEND = "native" | ||
20 | |||
21 | SRC_URI[md5sum] = "664629bfa7cdf8b984155019fd395dcb" | ||
22 | SRC_URI[sha256sum] = "3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb b/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb new file mode 100644 index 0000000000..a967cdc585 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "XFt: X FreeType libary" | ||
2 | |||
3 | DESCRIPTION = "Xft was designed to provide good support for scalable \ | ||
4 | fonts, and to do so efficiently. Unlike the core fonts system, it \ | ||
5 | supports features such as anti-aliasing and sub-pixel rasterisation. \ | ||
6 | Perhaps more importantly, it gives applications full control over the \ | ||
7 | way glyphs are rendered, making fine typesetting and WYSIWIG display \ | ||
8 | possible. Finally, it allows applications to use fonts that are not \ | ||
9 | installed system-wide for displaying documents with embedded fonts. Xft \ | ||
10 | is not compatible with the core fonts system: usage of Xft requires \ | ||
11 | fairly extensive changes to toolkits (user-interface libraries)." | ||
12 | |||
13 | require xorg-lib-common.inc | ||
14 | |||
15 | LICENSE = "MIT" | ||
16 | LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" | ||
17 | |||
18 | DEPENDS += "virtual/libx11 libxrender freetype fontconfig" | ||
19 | PROVIDES = "xft" | ||
20 | |||
21 | PE = "1" | ||
22 | |||
23 | SRC_URI[md5sum] = "331b3a2a3a1a78b5b44cfbd43f86fcfe" | ||
24 | SRC_URI[sha256sum] = "f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c" | ||
25 | |||
26 | XORG_PN = "libXft" | ||
27 | |||
28 | BBCLASSEXTEND = "native" | ||
29 | |||
30 | python () { | ||
31 | if d.getVar('DEBIAN_NAMES', True): | ||
32 | d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') | ||
33 | } | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb b/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb new file mode 100644 index 0000000000..07033a3e78 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | SUMMARY = "XI: X Input extension library" | ||
4 | |||
5 | DESCRIPTION = "libxi is an extension to the X11 protocol to support \ | ||
6 | input devices other than the core X keyboard and pointer. It allows \ | ||
7 | client programs to select input from these devices independently from \ | ||
8 | each other and independently from the core devices." | ||
9 | |||
10 | LICENSE = "MIT & MIT-style" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \ | ||
12 | file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f" | ||
13 | |||
14 | DEPENDS += "libxext inputproto libxfixes" | ||
15 | |||
16 | PE = "1" | ||
17 | |||
18 | XORG_PN = "libXi" | ||
19 | |||
20 | SRC_URI[md5sum] = "9c4a69c34b19ec1e4212e849549544cb" | ||
21 | SRC_URI[sha256sum] = "2cffc2686618dc1803725636cd92b36342c512dc60a7a35cba34bf7192a42244" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb new file mode 100644 index 0000000000..027c8043d8 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | SUMMARY = "Xinerama: Xinerama extension library" | ||
4 | |||
5 | DESCRIPTION = "Xinerama is a simple library designed to interface the \ | ||
6 | Xinerama Extension for retrieving information about physical output \ | ||
7 | devices which may be combined into a single logical X screen." | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=6f4f634d1643a2e638bba3fcd19c2536 \ | ||
11 | file://src/Xinerama.c;beginline=2;endline=25;md5=fcef273bfb66339256411dd06ea79c02" | ||
12 | |||
13 | DEPENDS += "libxext xineramaproto" | ||
14 | PROVIDES = "xinerama" | ||
15 | PE = "1" | ||
16 | |||
17 | XORG_PN = "libXinerama" | ||
18 | |||
19 | SRC_URI[md5sum] = "9336dc46ae3bf5f81c247f7131461efd" | ||
20 | SRC_URI[sha256sum] = "7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb new file mode 100644 index 0000000000..0dd295678e --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "Generic XKB keymap library" | ||
2 | DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ | ||
3 | processes a reduced subset of keymaps as defined by the XKB specification." | ||
4 | HOMEPAGE = "http://www.xkbcommon.org" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc" | ||
6 | LICENSE = "MIT & MIT-style" | ||
7 | |||
8 | DEPENDS = "util-macros flex-native bison-native" | ||
9 | |||
10 | SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" | ||
11 | |||
12 | SRC_URI[md5sum] = "26c57ff21438ed45de2a4ca609177db9" | ||
13 | SRC_URI[sha256sum] = "9a52d5d0419e76c49c0ece86208c205ffacb1cf0ff8ffbaba98d3d4dd40c4e41" | ||
14 | |||
15 | inherit autotools pkgconfig | ||
16 | |||
17 | EXTRA_OECONF = "--disable-docs" | ||
18 | |||
19 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | ||
20 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.8.bb new file mode 100644 index 0000000000..620b414604 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.8.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "XKB: X Keyboard File manipulation library" | ||
2 | |||
3 | DESCRIPTION = "libxkbfile provides an interface to read and manipulate \ | ||
4 | description files for XKB, the X11 keyboard configuration extension." | ||
5 | |||
6 | require xorg-lib-common.inc | ||
7 | |||
8 | LICENSE = "MIT-style" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f" | ||
10 | |||
11 | DEPENDS += "virtual/libx11 kbproto" | ||
12 | |||
13 | PE = "1" | ||
14 | |||
15 | BBCLASSEXTEND = "native" | ||
16 | |||
17 | SRC_URI[md5sum] = "19e6533ae64abba0773816a23f2b9507" | ||
18 | SRC_URI[sha256sum] = "8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb new file mode 100644 index 0000000000..3922b52e41 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "Xmu and Xmuu: X Miscellaneous Utility libraries" | ||
2 | |||
3 | DESCRIPTION = "The Xmu Library is a collection of miscellaneous (some \ | ||
4 | might say random) utility functions that have been useful in building \ | ||
5 | various applications and widgets. This library is required by the Athena \ | ||
6 | Widgets. A subset of the functions that do not rely on the Athena \ | ||
7 | Widgets (libXaw) or X Toolkit Instrinsics (libXt) are provided in a \ | ||
8 | second library, libXmuu." | ||
9 | |||
10 | |||
11 | require xorg-lib-common.inc | ||
12 | |||
13 | LICENSE = "MIT & MIT-style" | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=def3d8e4e9c42004f1941fa22f01dc18" | ||
15 | |||
16 | DEPENDS += "libxt libxext" | ||
17 | PROVIDES = "xmu" | ||
18 | |||
19 | PE = "1" | ||
20 | |||
21 | XORG_PN = "libXmu" | ||
22 | |||
23 | LEAD_SONAME = "libXmu" | ||
24 | |||
25 | PACKAGES =+ "libxmuu libxmuu-dev" | ||
26 | |||
27 | FILES_libxmuu = "${libdir}/libXmuu.so.*" | ||
28 | FILES_libxmuu-dev = "${libdir}/libXmuu.so" | ||
29 | |||
30 | BBCLASSEXTEND = "native" | ||
31 | |||
32 | SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" | ||
33 | SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb new file mode 100644 index 0000000000..545874cdd4 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | # libxpm requires xgettext to build | ||
4 | inherit gettext | ||
5 | |||
6 | SUMMARY = "Xpm: X Pixmap extension library" | ||
7 | |||
8 | DESCRIPTION = "libXpm provides support and common operation for the XPM \ | ||
9 | pixmap format, which is commonly used in legacy X applications. XPM is \ | ||
10 | an extension of the monochrome XBM bitmap specificied in the X \ | ||
11 | protocol." | ||
12 | |||
13 | LICENSE = "BSD" | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" | ||
15 | DEPENDS += "libxext libsm libxt" | ||
16 | PE = "1" | ||
17 | |||
18 | XORG_PN = "libXpm" | ||
19 | |||
20 | PACKAGES =+ "sxpm cxpm" | ||
21 | FILES_cxpm = "${bindir}/cxpm" | ||
22 | FILES_sxpm = "${bindir}/sxpm" | ||
23 | |||
24 | SRC_URI[md5sum] = "769ee12a43611cdebd38094eaf83f3f0" | ||
25 | SRC_URI[sha256sum] = "c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c" | ||
26 | |||
27 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxrandr_1.4.2.bb b/meta/recipes-graphics/xorg-lib/libxrandr_1.4.2.bb new file mode 100644 index 0000000000..4df4b3a51d --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxrandr_1.4.2.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "XRandR: X Resize, Rotate and Reflect extension library" | ||
2 | |||
3 | DESCRIPTION = "The X Resize, Rotate and Reflect Extension, called RandR \ | ||
4 | for short, brings the ability to resize, rotate and reflect the root \ | ||
5 | window of a screen. It is based on the X Resize and Rotate Extension as \ | ||
6 | specified in the Proceedings of the 2001 Usenix Technical Conference \ | ||
7 | [RANDR]." | ||
8 | |||
9 | require xorg-lib-common.inc | ||
10 | |||
11 | LICENSE = "MIT-style" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=c9d1a2118a6cd5727521db8e7a2fee69" | ||
13 | |||
14 | DEPENDS += "virtual/libx11 randrproto libxrender libxext" | ||
15 | |||
16 | PE = "1" | ||
17 | |||
18 | XORG_PN = "libXrandr" | ||
19 | |||
20 | BBCLASSEXTEND = "native nativesdk" | ||
21 | |||
22 | SRC_URI[md5sum] = "210ed9499a3d9c96e3a221629b7d39b0" | ||
23 | SRC_URI[sha256sum] = "caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.8.bb b/meta/recipes-graphics/xorg-lib/libxrender_0.9.8.bb new file mode 100644 index 0000000000..abd7767597 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.8.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "XRender: X Rendering Extension library" | ||
2 | |||
3 | DESCRIPTION = "The X Rendering Extension (Render) introduces digital \ | ||
4 | image composition as the foundation of a new rendering model within the \ | ||
5 | X Window System. Rendering geometric figures is accomplished by \ | ||
6 | client-side tessellation into either triangles or trapezoids. Text is \ | ||
7 | drawn by loading glyphs into the server and rendering sets of them." | ||
8 | |||
9 | require xorg-lib-common.inc | ||
10 | |||
11 | LICENSE = "MIT-style" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196" | ||
13 | |||
14 | DEPENDS += "virtual/libx11 renderproto xproto xdmcp" | ||
15 | |||
16 | PE = "1" | ||
17 | |||
18 | XORG_PN = "libXrender" | ||
19 | |||
20 | BBCLASSEXTEND = "native nativesdk" | ||
21 | |||
22 | SRC_URI[md5sum] = "2bd9a15fcf64d216e63b8d129e4f1f1c" | ||
23 | SRC_URI[sha256sum] = "1d14b02f0060aec5d90dfdcf16a996f17002e515292906ed26e3dcbba0f4fc62" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb b/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb new file mode 100644 index 0000000000..8c04c44f80 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "XRes: X Resource extension library" | ||
2 | |||
3 | DESCRIPTION = "libXRes provides an X Window System client interface to \ | ||
4 | the Resource extension to the X protocol. The Resource extension allows \ | ||
5 | for X clients to see and monitor the X resource usage of various clients \ | ||
6 | (pixmaps, et al)." | ||
7 | |||
8 | require xorg-lib-common.inc | ||
9 | |||
10 | LICENSE = "MIT" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa" | ||
12 | |||
13 | DEPENDS += "libxext resourceproto" | ||
14 | |||
15 | PE = "1" | ||
16 | |||
17 | XORG_PN = "libXres" | ||
18 | |||
19 | SRC_URI[md5sum] = "45ef29206a6b58254c81bea28ec6c95f" | ||
20 | SRC_URI[sha256sum] = "26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb new file mode 100644 index 0000000000..354e5de7fd --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | SUMMARY = "Xscrnsaver: X Screen Saver extension library" | ||
4 | |||
5 | DESCRIPTION = "The X Window System provides support for changing the \ | ||
6 | image on a display screen after a user-settable period of inactivity to \ | ||
7 | avoid burning the cathode ray tube phosphors. However, no interfaces are \ | ||
8 | provided for the user to control the image that is drawn. This extension \ | ||
9 | allows an external \"screen saver\" client to detect when the alternate \ | ||
10 | image is to be displayed and to provide the graphics." | ||
11 | |||
12 | LICENSE = "MIT" | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb" | ||
14 | |||
15 | DEPENDS += "libxext scrnsaverproto" | ||
16 | PROVIDES = "libxss" | ||
17 | RREPLACES_${PN} = "libxss" | ||
18 | PE = "1" | ||
19 | |||
20 | XORG_PN = "libXScrnSaver" | ||
21 | |||
22 | SRC_URI[md5sum] = "7a773b16165e39e938650bcc9027c1d5" | ||
23 | SRC_URI[sha256sum] = "8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb new file mode 100644 index 0000000000..7dff0d49ec --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "Shared memory 'SyncFence' synchronization primitive" | ||
2 | |||
3 | DESCRIPTION = "This library offers a CPU-based synchronization primitive compatible \ | ||
4 | with the X SyncFence objects that can be shared between processes \ | ||
5 | using file descriptor passing." | ||
6 | |||
7 | require xorg-lib-common.inc | ||
8 | |||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" | ||
11 | |||
12 | DEPENDS += "virtual/libx11" | ||
13 | |||
14 | BBCLASSEXTEND = "native nativesdk" | ||
15 | |||
16 | SRC_URI[md5sum] = "2dd10448c1166e71a176206a8dfabe6d" | ||
17 | SRC_URI[sha256sum] = "dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch new file mode 100644 index 0000000000..ce6c756df9 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This fixes compilation with x32 toolchain. | ||
4 | |||
5 | Received this patch from H.J. Lu <hjl.tools@gmail.com> | ||
6 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 | ||
7 | |||
8 | |||
9 | --- libXt-1.1.1/include/X11/Xtos.h.x32 2011-02-08 07:56:40.000000000 -0800 | ||
10 | +++ libXt-1.1.1/include/X11/Xtos.h 2011-11-30 17:19:27.473349770 -0800 | ||
11 | @@ -62,7 +62,7 @@ SOFTWARE. | ||
12 | defined(__sparc64__) || \ | ||
13 | defined(__s390x__) || \ | ||
14 | (defined(__hppa__) && defined(__LP64__)) || \ | ||
15 | - defined(__amd64__) || defined(amd64) || \ | ||
16 | + ((defined(__amd64__) || defined(amd64)) && defined(__LP64__)) || \ | ||
17 | defined(__powerpc64__) || \ | ||
18 | (defined(sgi) && (_MIPS_SZLONG == 64)) | ||
19 | #define LONG64 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb new file mode 100644 index 0000000000..9c1aaa4370 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb | |||
@@ -0,0 +1,44 @@ | |||
1 | SUMMARY = "Xt: X Toolkit Intrinsics library" | ||
2 | |||
3 | DESCRIPTION = "The Intrinsics are a programming library tailored to the \ | ||
4 | special requirements of user interface construction within a network \ | ||
5 | window system, specifically the X Window System. The Intrinsics and a \ | ||
6 | widget set make up an X Toolkit. The Intrinsics provide the base \ | ||
7 | mechanism necessary to build a wide variety of interoperating widget \ | ||
8 | sets and application environments. The Intrinsics are a layer on top of \ | ||
9 | Xlib, the C Library X Interface. They extend the fundamental \ | ||
10 | abstractions provided by the X Window System while still remaining \ | ||
11 | independent of any particular user interface policy or style." | ||
12 | |||
13 | require xorg-lib-common.inc | ||
14 | |||
15 | LICENSE = "MIT & MIT-style" | ||
16 | LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" | ||
17 | |||
18 | |||
19 | DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp" | ||
20 | PROVIDES = "xt" | ||
21 | |||
22 | PE = "1" | ||
23 | |||
24 | XORG_PN = "libXt" | ||
25 | |||
26 | SRC_URI += "file://libxt_fix_for_x32.patch" | ||
27 | |||
28 | BBCLASSEXTEND = "native" | ||
29 | |||
30 | EXTRA_OECONF += "--disable-xkb" | ||
31 | |||
32 | do_compile() { | ||
33 | ( | ||
34 | unset CC LD CXX CCLD CFLAGS | ||
35 | oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs | ||
36 | ) | ||
37 | if [ "$?" != "0" ]; then | ||
38 | exit 1 | ||
39 | fi | ||
40 | oe_runmake | ||
41 | } | ||
42 | |||
43 | SRC_URI[md5sum] = "03149823ae57bb02d0cec90d5b97d56c" | ||
44 | SRC_URI[sha256sum] = "843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb new file mode 100644 index 0000000000..1b0bcf391c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | SUMMARY = "XTest: X Test extension library" | ||
4 | |||
5 | DESCRIPTION = "This extension is a minimal set of client and server \ | ||
6 | extensions required to completely test the X11 server with no user \ | ||
7 | intervention." | ||
8 | |||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=bb4f89972c3869f617f61c1a79ad1952 \ | ||
11 | file://src/XTest.c;beginline=2;endline=32;md5=b1c8c9dff842b4d5b89ca5fa32c40e99" | ||
12 | |||
13 | DEPENDS += "libxext recordproto inputproto libxi" | ||
14 | PROVIDES = "xtst" | ||
15 | PE = "1" | ||
16 | |||
17 | XORG_PN = "libXtst" | ||
18 | |||
19 | SRC_URI[md5sum] = "25c6b366ac3dc7a12c5d79816ce96a59" | ||
20 | SRC_URI[sha256sum] = "ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb b/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb new file mode 100644 index 0000000000..f02b8b64f5 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Xv: X Video extension library" | ||
2 | |||
3 | DESCRIPTION = "libXv provides an X Window System client interface to the \ | ||
4 | X Video extension to the X protocol. The X Video extension allows for \ | ||
5 | accelerated drawing of videos. Hardware adaptors are exposed to \ | ||
6 | clients, which may draw in a number of colourspaces, including YUV." | ||
7 | |||
8 | require xorg-lib-common.inc | ||
9 | |||
10 | LICENSE = "MIT-style" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c" | ||
12 | |||
13 | DEPENDS += "libxext videoproto" | ||
14 | |||
15 | XORG_PN = "libXv" | ||
16 | |||
17 | SRC_URI[md5sum] = "e0af49d7d758b990e6fef629722d4aca" | ||
18 | SRC_URI[sha256sum] = "55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.8.bb new file mode 100644 index 0000000000..b0d5e0ddbc --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.8.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | SUMMARY = "XvMC: X Video Motion Compensation extension library" | ||
2 | |||
3 | DESCRIPTION = "XvMC extends the X Video extension (Xv) and enables \ | ||
4 | hardware rendered motion compensation support." | ||
5 | |||
6 | require xorg-lib-common.inc | ||
7 | |||
8 | LICENSE = "MIT" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=0a207f08d4961489c55046c9a5e500da \ | ||
10 | file://wrapper/XvMCWrapper.c;endline=26;md5=5151daa8172a3f1bb0cb0e0ff157d9de" | ||
11 | |||
12 | DEPENDS += "libxext libxv videoproto" | ||
13 | |||
14 | PE = "1" | ||
15 | |||
16 | XORG_PN = "libXvMC" | ||
17 | |||
18 | SRC_URI[md5sum] = "2e4014e9d55c430e307999a6b3dd256d" | ||
19 | SRC_URI[sha256sum] = "5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb new file mode 100644 index 0000000000..695a39637c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension library" | ||
4 | |||
5 | DESCRIPTION = "libXxf86dga provides the XFree86-DGA extension, which \ | ||
6 | allows direct graphics access to a framebuffer-like region, and also \ | ||
7 | allows relative mouse reporting, et al. It is mainly used by games and \ | ||
8 | emulators for games." | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" | ||
11 | |||
12 | DEPENDS += "libxext xf86dgaproto" | ||
13 | |||
14 | PE = "1" | ||
15 | |||
16 | SRC_URI[md5sum] = "d7dd9b9df336b7dd4028b6b56542ff2c" | ||
17 | SRC_URI[sha256sum] = "8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e" | ||
18 | |||
19 | XORG_PN = "libXxf86dga" | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb new file mode 100644 index 0000000000..af6f1f76a2 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension library" | ||
2 | |||
3 | DESCRIPTION = "The XFree86-Misc extension, provides a means to access \ | ||
4 | input device configuration settings specific to the XFree86/Xorg DDX." | ||
5 | |||
6 | require xorg-lib-common.inc | ||
7 | |||
8 | LICENSE = "MIT" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45" | ||
10 | |||
11 | DEPENDS += "libxext xf86miscproto" | ||
12 | PROVIDES = "xxf86misc" | ||
13 | |||
14 | PE = "1" | ||
15 | |||
16 | XORG_PN = "libXxf86misc" | ||
17 | |||
18 | SRC_URI[md5sum] = "6bc0bf78909fd71021c466c793d4385c" | ||
19 | SRC_URI[sha256sum] = "563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b" | ||
20 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.3.bb new file mode 100644 index 0000000000..e276a761f8 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.3.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "XFree86-VM: XFree86 video mode extension library" | ||
2 | |||
3 | DESCRIPTION = "libXxf86vm provides an interface to the \ | ||
4 | XFree86-VidModeExtension extension, which allows client applications to \ | ||
5 | get and set video mode timings in extensive detail. It is used by the \ | ||
6 | xvidtune program in particular." | ||
7 | |||
8 | require xorg-lib-common.inc | ||
9 | |||
10 | LICENSE = "MIT" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=fa0b9c462d8f2f13eba26492d42ea63d" | ||
12 | |||
13 | DEPENDS += "libxext xf86vidmodeproto" | ||
14 | |||
15 | PE = "1" | ||
16 | |||
17 | XORG_PN = "libXxf86vm" | ||
18 | |||
19 | SRC_URI[md5sum] = "e46f6ee4f4567349a3189044fe1bb712" | ||
20 | SRC_URI[sha256sum] = "da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8" | ||
diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch new file mode 100644 index 0000000000..4569dca01e --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch | |||
@@ -0,0 +1,144 @@ | |||
1 | From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 23 Aug 2012 18:10:57 +0200 | ||
4 | Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection | ||
5 | code | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | This was ported from meta-oe's patch [1]. The original pixman patch is found | ||
11 | at [2]. | ||
12 | |||
13 | [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 | ||
14 | [2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html | ||
15 | |||
16 | Upstream-Status: Inappropriate [other] qemu fix | ||
17 | |||
18 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
19 | --- | ||
20 | pixman/pixman-arm.c | 82 ++++++++++++++++++++++++++++++++++++++++---------- | ||
21 | 1 files changed, 65 insertions(+), 17 deletions(-) | ||
22 | |||
23 | diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c | ||
24 | index 23374e4..d98bda6 100644 | ||
25 | --- a/pixman/pixman-arm.c | ||
26 | +++ b/pixman/pixman-arm.c | ||
27 | @@ -129,16 +129,35 @@ detect_cpu_features (void) | ||
28 | #include <sys/types.h> | ||
29 | #include <sys/stat.h> | ||
30 | #include <sys/mman.h> | ||
31 | +#include <sys/utsname.h> | ||
32 | #include <fcntl.h> | ||
33 | #include <string.h> | ||
34 | #include <elf.h> | ||
35 | |||
36 | +/* | ||
37 | + * The whole CPU capabilities detection is a bit ugly: when running in | ||
38 | + * userspace qemu, we see /proc/self/auxv from the host system. To make | ||
39 | + * everything even worse, the size of each value is 64-bit when running | ||
40 | + * on a 64-bit host system. So the data is totally bogus because we expect | ||
41 | + * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause | ||
42 | + * segfault (null pointer dereference on x86-64 host). So in order to be | ||
43 | + * on a safe side, we require that AT_PLATFORM value is found only once, | ||
44 | + * and it has non-zero value (this is still not totally reliable for a big | ||
45 | + * endian 64-bit host system running qemu and may theoretically fail). | ||
46 | + */ | ||
47 | +#define ARM_HWCAP_VFP 64 | ||
48 | +#define ARM_HWCAP_IWMMXT 512 | ||
49 | +#define ARM_HWCAP_NEON 4096 | ||
50 | + | ||
51 | static arm_cpu_features_t | ||
52 | detect_cpu_features (void) | ||
53 | { | ||
54 | arm_cpu_features_t features = 0; | ||
55 | Elf32_auxv_t aux; | ||
56 | int fd; | ||
57 | + uint32_t hwcap = 0; | ||
58 | + const char *plat = NULL; | ||
59 | + int plat_cnt = 0; | ||
60 | |||
61 | fd = open ("/proc/self/auxv", O_RDONLY); | ||
62 | if (fd >= 0) | ||
63 | @@ -147,32 +166,61 @@ detect_cpu_features (void) | ||
64 | { | ||
65 | if (aux.a_type == AT_HWCAP) | ||
66 | { | ||
67 | - uint32_t hwcap = aux.a_un.a_val; | ||
68 | - | ||
69 | - /* hardcode these values to avoid depending on specific | ||
70 | - * versions of the hwcap header, e.g. HWCAP_NEON | ||
71 | - */ | ||
72 | - if ((hwcap & 64) != 0) | ||
73 | - features |= ARM_VFP; | ||
74 | - if ((hwcap & 512) != 0) | ||
75 | - features |= ARM_IWMMXT; | ||
76 | - /* this flag is only present on kernel 2.6.29 */ | ||
77 | - if ((hwcap & 4096) != 0) | ||
78 | - features |= ARM_NEON; | ||
79 | + hwcap = aux.a_un.a_val; | ||
80 | } | ||
81 | else if (aux.a_type == AT_PLATFORM) | ||
82 | { | ||
83 | - const char *plat = (const char*) aux.a_un.a_val; | ||
84 | - | ||
85 | - if (strncmp (plat, "v7l", 3) == 0) | ||
86 | + plat = (const char*) aux.a_un.a_val; | ||
87 | + plat_cnt++; | ||
88 | + } | ||
89 | + } | ||
90 | + close (fd); | ||
91 | + if (plat == NULL || plat_cnt != 1 || *plat != 'v') | ||
92 | + { | ||
93 | + /* | ||
94 | + * Something seems to be really wrong, most likely we are | ||
95 | + * running under qemu. Let's use machine type from "uname" for | ||
96 | + * CPU capabilities detection: | ||
97 | + * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html | ||
98 | + */ | ||
99 | + struct utsname u; | ||
100 | + hwcap = 0; /* clear hwcap, because it is bogus */ | ||
101 | + if (uname (&u) == 0) | ||
102 | + { | ||
103 | + if (strcmp (u.machine, "armv7l") == 0) | ||
104 | + { | ||
105 | features |= (ARM_V7 | ARM_V6); | ||
106 | - else if (strncmp (plat, "v6l", 3) == 0) | ||
107 | + hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ | ||
108 | + hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */ | ||
109 | + } | ||
110 | + else if (strcmp (u.machine, "armv6l") == 0) | ||
111 | + { | ||
112 | features |= ARM_V6; | ||
113 | + hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ | ||
114 | + } | ||
115 | } | ||
116 | } | ||
117 | - close (fd); | ||
118 | + else if (strncmp (plat, "v7l", 3) == 0) | ||
119 | + { | ||
120 | + features |= (ARM_V7 | ARM_V6); | ||
121 | + } | ||
122 | + else if (strncmp (plat, "v6l", 3) == 0) | ||
123 | + { | ||
124 | + features |= ARM_V6; | ||
125 | + } | ||
126 | } | ||
127 | |||
128 | + /* hardcode these values to avoid depending on specific | ||
129 | + * versions of the hwcap header, e.g. HWCAP_NEON | ||
130 | + */ | ||
131 | + if ((hwcap & ARM_HWCAP_VFP) != 0) | ||
132 | + features |= ARM_VFP; | ||
133 | + if ((hwcap & ARM_HWCAP_IWMMXT) != 0) | ||
134 | + features |= ARM_IWMMXT; | ||
135 | + /* this flag is only present on kernel 2.6.29 */ | ||
136 | + if ((hwcap & ARM_HWCAP_NEON) != 0) | ||
137 | + features |= ARM_NEON; | ||
138 | + | ||
139 | return features; | ||
140 | } | ||
141 | |||
142 | -- | ||
143 | 1.7.6.5 | ||
144 | |||
diff --git a/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch b/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch new file mode 100644 index 0000000000..14a5fd209b --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with | ||
2 | errors such as: | ||
3 | |||
4 | pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267: | ||
5 | Error: invalid operands `mflo $14,$ac3' | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
9 | |||
10 | --- b/pixman/pixman-mips-dspr2-asm.h | ||
11 | +++ a/pixman/pixman-mips-dspr2-asm.h | ||
12 | @@ -72,10 +72,7 @@ | ||
13 | #define LEAF_MIPS32R2(symbol) \ | ||
14 | .globl symbol; \ | ||
15 | .align 2; \ | ||
16 | -#ifdef __ELF__ | ||
17 | - .hidden symbol; \ | ||
18 | .type symbol, @function; \ | ||
19 | -#endif | ||
20 | .ent symbol, 0; \ | ||
21 | symbol: .frame sp, 0, ra; \ | ||
22 | .set push; \ | ||
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb new file mode 100644 index 0000000000..467ba508ee --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | SUMMARY = "Pixman: Pixel Manipulation library" | ||
2 | |||
3 | DESCRIPTION = "Pixman provides a library for manipulating pixel regions \ | ||
4 | -- a set of Y-X banded rectangles, image compositing using the \ | ||
5 | Porter/Duff model and implicit mask generation for geometric primitives \ | ||
6 | including trapezoids, triangles, and rectangles." | ||
7 | |||
8 | require xorg-lib-common.inc | ||
9 | |||
10 | LICENSE = "MIT & MIT-style & PD" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ | ||
12 | file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ | ||
13 | file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ | ||
14 | " | ||
15 | DEPENDS += "zlib libpng" | ||
16 | BBCLASSEXTEND = "native nativesdk" | ||
17 | |||
18 | PE = "1" | ||
19 | |||
20 | IWMMXT = "--disable-arm-iwmmxt" | ||
21 | LOONGSON_MMI = "--disable-loongson-mmi" | ||
22 | NEON = " --disable-arm-neon " | ||
23 | NEON_class-nativesdk = " --disable-arm-neon " | ||
24 | NEON_armv7a = " " | ||
25 | NEON_armv7a-vfp-neon = " " | ||
26 | |||
27 | EXTRA_OECONF = "--disable-gtk ${IWMMXT} ${LOONGSON_MMI} ${NEON}" | ||
28 | EXTRA_OECONF_class-native = "--disable-gtk" | ||
29 | |||
30 | SRC_URI += "\ | ||
31 | file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ | ||
32 | file://mips-export-revert.patch \ | ||
33 | " | ||
34 | |||
35 | SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" | ||
36 | SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4" | ||
37 | |||
38 | REQUIRED_DISTRO_FEATURES = "" | ||
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb new file mode 100644 index 0000000000..1d36893f93 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require xcb-util.inc | ||
2 | |||
3 | DEPENDS += "xcb-util" | ||
4 | |||
5 | LICENSE = "MIT" | ||
6 | LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ | ||
7 | file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" | ||
8 | |||
9 | SRC_URI[md5sum] = "fabb80b36490b00fc91289e2c7f66770" | ||
10 | SRC_URI[sha256sum] = "d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df" | ||
11 | |||
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb new file mode 100644 index 0000000000..39ead34e92 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require xcb-util.inc | ||
2 | |||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[md5sum] = "64e4aad2d48cd4a92e2da13b9f35bfd2" | ||
8 | SRC_URI[sha256sum] = "7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e" | ||
9 | |||
10 | |||
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb new file mode 100644 index 0000000000..25c22e5fa7 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require xcb-util.inc | ||
2 | |||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://renderutil/glyph.c;endline=24;md5=c517c483b8d726234ec94f9169236661 \ | ||
5 | file://renderutil/util.c;endline=20;md5=6e0bfc44fb13298c0f4694eb70dc80d4 \ | ||
6 | file://renderutil/xcb_renderutil.h;endline=24;md5=d0ddab3052dd4949c93cfcb0891c96df \ | ||
7 | " | ||
8 | |||
9 | SRC_URI[md5sum] = "468b119c94da910e1291f3ffab91019a" | ||
10 | SRC_URI[sha256sum] = "c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b" | ||
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb b/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb new file mode 100644 index 0000000000..39f1383299 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require xcb-util.inc | ||
2 | |||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://ewmh/ewmh.c.m4;endline=27;md5=63fd80552d7dc886f4eb267610d5bb9d \ | ||
5 | file://ewmh/xcb_ewmh.h.m4;beginline=4;endline=30;md5=73b589f90ef90b4a43998955daad5cd8 \ | ||
6 | file://icccm/icccm.c;endline=28;md5=e2b3240a0c197e8977adde2a5cf18d50 \ | ||
7 | file://icccm/xcb_icccm.h;beginline=4;endline=31;md5=393772b7b07b9868d479d538238c1d8a \ | ||
8 | " | ||
9 | |||
10 | SRC_URI[md5sum] = "87b19a1cd7bfcb65a24e36c300e03129" | ||
11 | SRC_URI[sha256sum] = "28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f" | ||
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc new file mode 100644 index 0000000000..7dad545c33 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xcb-util.inc | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "XCB: The X protocol C binding utilities" | ||
2 | DESCRIPTION = "The xcb-util module provides a number of libraries which \ | ||
3 | sit on top of libxcb, the core X protocol library, and some of the \ | ||
4 | extension libraries. These experimental libraries provide convenience \ | ||
5 | functions and interfaces which make the raw X protocol more usable. Some \ | ||
6 | of the libraries also provide client-side code which is not strictly \ | ||
7 | part of the X protocol but which have traditionally been provided by \ | ||
8 | Xlib." | ||
9 | HOMEPAGE = "http://xcb.freedesktop.org/XcbUtil/" | ||
10 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" | ||
11 | |||
12 | LICENSE = "MIT" | ||
13 | |||
14 | SECTION = "x11/libs" | ||
15 | |||
16 | DEPENDS = "libxcb" | ||
17 | DEPENDS += "gperf-native" | ||
18 | |||
19 | PARALLEL_MAKE = "" | ||
20 | |||
21 | SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" | ||
22 | |||
23 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb new file mode 100644 index 0000000000..c5d8858115 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require xcb-util.inc | ||
2 | |||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \ | ||
5 | file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9" | ||
6 | |||
7 | SRC_URI[md5sum] = "01dcc7a16d5020530552712710646ea2" | ||
8 | SRC_URI[sha256sum] = "c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4" | ||
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb new file mode 100644 index 0000000000..adac0eedd8 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb | |||
@@ -0,0 +1,31 @@ | |||
1 | SUMMARY = "Keyboard configuration database for X Window" | ||
2 | |||
3 | DESCRIPTION = "The non-arch keyboard configuration database for X \ | ||
4 | Window. The goal is to provide the consistent, well-structured, \ | ||
5 | frequently released open source of X keyboard configuration data for X \ | ||
6 | Window System implementations. The project is targeted to XKB-based \ | ||
7 | systems." | ||
8 | |||
9 | HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig" | ||
10 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config" | ||
11 | |||
12 | LICENSE = "MIT & MIT-style" | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" | ||
14 | |||
15 | SRC_URI="${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" | ||
16 | SRC_URI[md5sum] = "1fd54ceb9092d1dbcaabaf03653092bc" | ||
17 | SRC_URI[sha256sum] = "65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44" | ||
18 | |||
19 | SECTION = "x11/libs" | ||
20 | DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" | ||
21 | |||
22 | EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" | ||
23 | |||
24 | FILES_${PN} += "${datadir}/X11/xkb" | ||
25 | |||
26 | inherit autotools pkgconfig gettext | ||
27 | |||
28 | do_install_append () { | ||
29 | install -d ${D}${datadir}/X11/xkb/compiled | ||
30 | cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg | ||
31 | } | ||
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc new file mode 100644 index 0000000000..09df0109cb --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | |||
@@ -0,0 +1,26 @@ | |||
1 | HOMEPAGE = "http://www.x.org" | ||
2 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" | ||
3 | |||
4 | SECTION = "x11/libs" | ||
5 | LICENSE = "MIT-X" | ||
6 | DEPENDS = "util-macros" | ||
7 | |||
8 | XORG_PN = "${BPN}" | ||
9 | |||
10 | SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" | ||
11 | |||
12 | S = "${WORKDIR}/${XORG_PN}-${PV}" | ||
13 | |||
14 | inherit autotools distro_features_check pkgconfig | ||
15 | |||
16 | EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop" | ||
17 | |||
18 | PACKAGECONFIG ??= "" | ||
19 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | ||
20 | |||
21 | UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ | ||
22 | --disable-specs --without-groff --without-ps2pdf --without-fop \ | ||
23 | --without-xmlto --with-xmlto \ | ||
24 | " | ||
25 | |||
26 | REQUIRED_DISTRO_FEATURES ?= "x11" | ||
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb new file mode 100644 index 0000000000..f2b89217bb --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | SUMMARY = "XTrans: X Transport library" | ||
2 | |||
3 | DESCRIPTION = "The X Transport Interface is intended to combine all \ | ||
4 | system and transport specific code into a single place. This API should \ | ||
5 | be used by all libraries, clients and servers of the X Window System. \ | ||
6 | Use of this API should allow the addition of new types of transports and \ | ||
7 | support for new platforms without making any changes to the source \ | ||
8 | except in the X Transport Interface code." | ||
9 | |||
10 | require xorg-lib-common.inc | ||
11 | |||
12 | LICENSE = "MIT & MIT-style" | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca" | ||
14 | |||
15 | PE = "1" | ||
16 | |||
17 | RDEPENDS_${PN}-dev = "" | ||
18 | |||
19 | inherit gettext | ||
20 | |||
21 | BBCLASSEXTEND = "native nativesdk" | ||
22 | |||
23 | SRC_URI[md5sum] = "a615e17d9fee6f097fc3b716eacb3dca" | ||
24 | SRC_URI[sha256sum] = "054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a" | ||
diff --git a/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb b/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb new file mode 100644 index 0000000000..f798a43538 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | PE = "1" | ||
4 | |||
5 | SUMMARY = "BigReqs: X Big Requests extension headers" | ||
6 | |||
7 | DESCRIPTION = "This package provides the wire protocol for the \ | ||
8 | BIG-REQUESTS extension, used to send larger requests that usual in order \ | ||
9 | to avoid fragmentation." | ||
10 | |||
11 | BBCLASSEXTEND = "native nativesdk" | ||
12 | |||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=b12715630da6f268d0d3712ee1a504f4" | ||
14 | |||
15 | SRC_URI[md5sum] = "1a05fb01fa1d5198894c931cf925c025" | ||
16 | SRC_URI[sha256sum] = "462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e" | ||
diff --git a/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch new file mode 100644 index 0000000000..ff8cb25cd5 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Add missing length fields to the replies. Without these, sanity checking in recent X | ||
4 | breaks things. | ||
5 | |||
6 | RP 11/2/10 | ||
7 | |||
8 | |||
9 | Index: git/xcalibrateproto.h | ||
10 | =================================================================== | ||
11 | --- git.orig/xcalibrateproto.h 2010-02-11 11:47:45.711985932 +0000 | ||
12 | +++ git/xcalibrateproto.h 2010-02-11 11:40:21.000000000 +0000 | ||
13 | @@ -67,13 +67,13 @@ | ||
14 | BYTE type; /* X_Reply */ | ||
15 | BYTE pad1; | ||
16 | CARD16 sequenceNumber B16; | ||
17 | + CARD32 length; | ||
18 | CARD32 status; | ||
19 | CARD32 pad2 B32; | ||
20 | CARD32 pad3 B32; | ||
21 | CARD32 pad4 B32; | ||
22 | CARD32 pad5 B32; | ||
23 | CARD32 pad6 B32; | ||
24 | - CARD32 pad7 B32; | ||
25 | } xXCalibrateRawModeReply; | ||
26 | |||
27 | #define sz_xXCalibrateRawModeReply 32 | ||
28 | @@ -92,13 +92,13 @@ | ||
29 | BYTE type; /* X_Reply */ | ||
30 | BYTE pad1; | ||
31 | CARD16 sequenceNumber B16; | ||
32 | + CARD32 length; | ||
33 | CARD32 x; | ||
34 | CARD32 y; | ||
35 | CARD32 pad2 B32; | ||
36 | CARD32 pad3 B32; | ||
37 | CARD32 pad4 B32; | ||
38 | CARD32 pad5 B32; | ||
39 | - CARD32 pad6 B32; | ||
40 | } xXCalibrateScreenToCoordReply; | ||
41 | |||
42 | #define sz_xXCalibrateScreenToCoordReply 32 | ||
diff --git a/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb b/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb new file mode 100644 index 0000000000..b88d157923 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XCalibrate: Touchscreen calibration headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the \ | ||
6 | Touchscreen calibration extension." | ||
7 | |||
8 | LICENSE = "MIT-style" | ||
9 | LIC_FILES_CHKSUM = "file://xcalibratewire.h;endline=23;md5=7f86ef7b03cce6c4c9ebd59d20ca485f \ | ||
10 | file://xcalibrateproto.h;endline=23;md5=e4490491edcc171ca24f98569ee580db" | ||
11 | |||
12 | SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c" | ||
13 | |||
14 | PV = "0.0+git${SRCPV}" | ||
15 | PR = "r2" | ||
16 | |||
17 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto \ | ||
18 | file://fix.patch;apply=yes" | ||
19 | S = "${WORKDIR}/git" | ||
diff --git a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb new file mode 100644 index 0000000000..adfee26306 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "Xcomposite: X composite extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X \ | ||
6 | composite extension. The X composite extension provides three related \ | ||
7 | mechanisms for compositing and off-screen storage." | ||
8 | |||
9 | LICENSE = "MIT & MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \ | ||
11 | file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926" | ||
12 | |||
13 | RCONFLICTS_${PN} = "compositeext" | ||
14 | BBCLASSEXTEND = "native" | ||
15 | |||
16 | PR = "r1" | ||
17 | PE = "1" | ||
18 | |||
19 | SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0" | ||
20 | SRC_URI[sha256sum] = "049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc" | ||
21 | |||
diff --git a/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb b/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb new file mode 100644 index 0000000000..75d0268108 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "Xdamage: X Damage extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the DAMAGE \ | ||
6 | extension. The DAMAGE extension allows applications to receive \ | ||
7 | information about changes made to pixel contents of windows and \ | ||
8 | pixmaps." | ||
9 | |||
10 | LICENSE = "MIT-style" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=d5f5a2de65c3a84cbde769f07a769608 \ | ||
12 | file://damagewire.h;endline=23;md5=4a4501a592dbc7de5ce89255e50d0296" | ||
13 | |||
14 | RCONFLICTS_${PN} = "damageext" | ||
15 | BBCLASSEXTEND = "native" | ||
16 | PR = "r1" | ||
17 | PE = "1" | ||
18 | |||
19 | SRC_URI[md5sum] = "998e5904764b82642cc63d97b4ba9e95" | ||
20 | SRC_URI[sha256sum] = "5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b" | ||
diff --git a/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb b/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb new file mode 100644 index 0000000000..d960e5d4cf --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "DMX: Distributed Multihead extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the DMX \ | ||
6 | extension. The DMX extension provides support for communication with \ | ||
7 | and control of Xdmx server. Attributes of the Xdmx server and of the \ | ||
8 | back-end screens attached to the server can be queried and modified via \ | ||
9 | this protocol." | ||
10 | |||
11 | LICENSE = "MIT" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ | ||
13 | file://dmxproto.h;endline=32;md5=ab8509955c3dd4c65fac728e1b367bc4" | ||
14 | |||
15 | PE = "1" | ||
16 | |||
17 | SRC_URI[md5sum] = "4ee175bbd44d05c34d43bb129be5098a" | ||
18 | SRC_URI[sha256sum] = "e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509" | ||
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb b/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb new file mode 100644 index 0000000000..f4c40c5719 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the Direct \ | ||
6 | Rendering Ifnrastructure 2. DIR is required for may hardware \ | ||
7 | accelerated OpenGL drivers." | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \ | ||
11 | file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca" | ||
12 | |||
13 | |||
14 | SRC_URI[md5sum] = "b2721d5d24c04d9980a0c6540cb5396a" | ||
15 | SRC_URI[sha256sum] = "f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04" | ||
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_git.bb b/meta/recipes-graphics/xorg-proto/dri2proto_git.bb new file mode 100644 index 0000000000..9074f48d47 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/dri2proto_git.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the Direct \ | ||
6 | Rendering Ifnrastructure 2. DIR is required for may hardware \ | ||
7 | accelerated OpenGL drivers." | ||
8 | |||
9 | SRCREV = "66c56ab10d917e3f47f93178d7eac6430970d3c4" | ||
10 | PV = "1.99.3+git${SRCPV}" | ||
11 | PR = "r2" | ||
12 | |||
13 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/dri2proto" | ||
14 | |||
15 | LIC_FILES_CHKSUM="file://COPYING;md5=2e396fa91834f8786032cad2da5638f3" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
diff --git a/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb b/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb new file mode 100644 index 0000000000..bed97b3f49 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "Direct Rendering Infrastructure 3 Extension" | ||
4 | |||
5 | DESCRIPTION = "The DRI3 extension provides mechanisms to translate between direct \ | ||
6 | rendered buffers and X pixmaps. When combined with the Present extension, \ | ||
7 | a complete direct rendering solution for OpenGL is provided." | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://dri3proto.h;endline=21;md5=ac90d1d416be3cb13e1d3c88cd5166bf" | ||
11 | |||
12 | |||
13 | SRC_URI[md5sum] = "a3d2cbe60a9ca1bf3aea6c93c817fee3" | ||
14 | SRC_URI[sha256sum] = "01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074" | ||
diff --git a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb b/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb new file mode 100644 index 0000000000..39fb88d84c --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XFixes: X Fixes extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X Fixes \ | ||
6 | extension. This extension is designed to provide server-side support \ | ||
7 | for application work arounds to shortcomings in the core X window \ | ||
8 | system." | ||
9 | |||
10 | |||
11 | LICENSE = "MIT & MIT-style" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \ | ||
13 | file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4" | ||
14 | |||
15 | RCONFLICTS_${PN} = "fixesext" | ||
16 | PR = "r1" | ||
17 | PE = "1" | ||
18 | |||
19 | BBCLASSEXTEND = "native nativesdk" | ||
20 | |||
21 | SRC_URI[md5sum] = "e7431ab84d37b2678af71e29355e101d" | ||
22 | SRC_URI[sha256sum] = "ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce" | ||
diff --git a/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb b/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb new file mode 100644 index 0000000000..27fc281748 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XFont: X Font rasterisation headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X Font \ | ||
6 | rasterisation extensions. These extensions are used to control \ | ||
7 | server-side font configurations." | ||
8 | |||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=c3e48aa9ce868c8e90f0401db41c11a2 \ | ||
11 | file://FSproto.h;endline=44;md5=d2e58e27095e5ea7d4ad456ccb91986c" | ||
12 | |||
13 | PE = "1" | ||
14 | |||
15 | BBCLASSEXTEND = "native" | ||
16 | |||
17 | SRC_URI[md5sum] = "36934d00b00555eaacde9f091f392f97" | ||
18 | SRC_URI[sha256sum] = "259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8" | ||
diff --git a/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb b/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb new file mode 100644 index 0000000000..eb03d33c2b --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "OpenGL: X OpenGL extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the \ | ||
6 | OpenGL-related extensions, used to enable the rendering of applications \ | ||
7 | using OpenGL." | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ | ||
11 | file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" | ||
12 | |||
13 | PE = "1" | ||
14 | |||
15 | BBCLASSEXTEND = "nativesdk" | ||
16 | |||
17 | SRC_URI[md5sum] = "5565f1b0facf4a59c2778229c1f70d10" | ||
18 | SRC_URI[sha256sum] = "adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40" | ||
diff --git a/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb b/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb new file mode 100644 index 0000000000..7e8e0c155f --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XI: X Input extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X Input \ | ||
6 | extension. The extension supports input devices other then the core X \ | ||
7 | keyboard and pointer." | ||
8 | |||
9 | LICENSE = "MIT & MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=e562cc0f6587b961f032211d8160f31e \ | ||
11 | file://XI2proto.h;endline=48;md5=1ac1581e61188da2885cc14ff49b20be" | ||
12 | |||
13 | PE = "1" | ||
14 | |||
15 | inherit gettext | ||
16 | |||
17 | BBCLASSEXTEND = "native nativesdk" | ||
18 | |||
19 | SRC_URI[md5sum] = "6caebead4b779ba031727f66a7ffa358" | ||
20 | SRC_URI[sha256sum] = "5a47ee62053a6acef3a83f506312494be1461068d0b9269d818839703b95c1d1" | ||
diff --git a/meta/recipes-graphics/xorg-proto/inputproto_git.bb b/meta/recipes-graphics/xorg-proto/inputproto_git.bb new file mode 100644 index 0000000000..6520f3bb03 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/inputproto_git.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XI: X Input extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X Input \ | ||
6 | extension. The extension supports input devices other then the core X \ | ||
7 | keyboard and pointer." | ||
8 | |||
9 | PR = "r1" | ||
10 | PE = "1" | ||
11 | SRCREV = "7203036522ba9d4b224d282d6afc2d0b947711ee" | ||
12 | PV = "1.9.99.12+git${SRCPV}" | ||
13 | |||
14 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto" | ||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | inherit gettext | ||
18 | |||
19 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-graphics/xorg-proto/kbproto_1.0.6.bb b/meta/recipes-graphics/xorg-proto/kbproto_1.0.6.bb new file mode 100644 index 0000000000..07c8e42483 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/kbproto_1.0.6.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XKB: X Keyboard extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X \ | ||
6 | Keyboard extension. This extension is used to control options related \ | ||
7 | to keyboard handling and layout." | ||
8 | |||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7dd6ea99e2a83a552c02c80963623c38 \ | ||
11 | file://XKBproto.h;beginline=1;endline=25;md5=5744eeff407aeb6e7a1346eebab486a2" | ||
12 | |||
13 | PE = "1" | ||
14 | |||
15 | BBCLASSEXTEND = "native nativesdk" | ||
16 | |||
17 | SRC_URI[md5sum] = "677ea8523eec6caca86121ad2dca0b71" | ||
18 | SRC_URI[sha256sum] = "037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479" | ||
diff --git a/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/meta/recipes-graphics/xorg-proto/presentproto_git.bb new file mode 100644 index 0000000000..7fca51d31e --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/presentproto_git.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "This package provides the basic headers for the X Window System" | ||
4 | DESCRIPTION = "The Present extension provides a way for applications to update their \ | ||
5 | window contents from a pixmap in a well defined fashion, synchronizing \ | ||
6 | with the display refresh and potentially using a more efficient \ | ||
7 | mechanism than copying the contents of the source pixmap.\ | ||
8 | " | ||
9 | |||
10 | LICENSE = "GPLv2" | ||
11 | |||
12 | SRCREV = "24f3a56e541b0a9e6c6ee76081f441221a120ef9" | ||
13 | PV = "1.0+git${SRCPV}" | ||
14 | |||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" | ||
16 | |||
17 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/presentproto" | ||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit autotools-brokensep | ||
21 | |||
22 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-graphics/xorg-proto/randrproto_1.4.0.bb b/meta/recipes-graphics/xorg-proto/randrproto_1.4.0.bb new file mode 100644 index 0000000000..638e39675e --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/randrproto_1.4.0.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XRandR: X Resize, Rotate and Reflect extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X Resize, \ | ||
6 | Rotate and Reflect extension. This extension provides the ability to \ | ||
7 | resize, rotate and reflect the root window of a screen." | ||
8 | |||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=00426d41bd3d9267cf9bbb2df9323a5e \ | ||
11 | file://randrproto.h;endline=30;md5=3885957c6048fdf3310ac8ba54ca2c3f" | ||
12 | |||
13 | RCONFLICTS_${PN} = "randrext" | ||
14 | PE = "1" | ||
15 | |||
16 | BBCLASSEXTEND = "native nativesdk" | ||
17 | |||
18 | SRC_URI[md5sum] = "ce4d0b05675968e4c83e003cc809660d" | ||
19 | SRC_URI[sha256sum] = "85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf" | ||
diff --git a/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb b/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb new file mode 100644 index 0000000000..ad2317c26e --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XRecord: X Record extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X Record \ | ||
6 | extension. This extension is used to record and play back event \ | ||
7 | sequences." | ||
8 | |||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=575827a0f554bbed332542976d5f3d40 \ | ||
11 | file://recordproto.h;endline=19;md5=1cbb0dd45a0b060ff833901620a3e738" | ||
12 | |||
13 | RCONFLICTS_${PN} = "recordext" | ||
14 | PR = "r1" | ||
15 | PE = "1" | ||
16 | |||
17 | SRC_URI[md5sum] = "1b4e5dede5ea51906f1530ca1e21d216" | ||
18 | SRC_URI[sha256sum] = "a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370" | ||
diff --git a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb new file mode 100644 index 0000000000..ff800ec831 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XRender: X rendering Extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X \ | ||
6 | Rendering extension. This is the basis the image composition within the \ | ||
7 | X window system." | ||
8 | |||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=f826d99765196352e6122a406cf0d024 \ | ||
11 | file://renderproto.h;beginline=4;endline=24;md5=3e5e2851dad240b0a3a27c4776b4fd1f" | ||
12 | |||
13 | RCONFLICTS_${PN} = "renderext" | ||
14 | PR = "r1" | ||
15 | PE = "1" | ||
16 | |||
17 | BBCLASSEXTEND = "native nativesdk" | ||
18 | |||
19 | SRC_URI[md5sum] = "a914ccc1de66ddeb4b611c6b0686e274" | ||
20 | SRC_URI[sha256sum] = "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537" | ||
21 | |||
diff --git a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb new file mode 100644 index 0000000000..08b610aea5 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XRes: X Resource extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X \ | ||
6 | Resource extension. XRes provides an interface that allows X clients to \ | ||
7 | see and monitor X resource usage of various clients." | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97" | ||
11 | |||
12 | RCONFLICTS_${PN} = "resourceext" | ||
13 | |||
14 | PR = "r1" | ||
15 | PE = "1" | ||
16 | |||
17 | SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4" | ||
18 | SRC_URI[sha256sum] = "3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818" | ||
19 | |||
diff --git a/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb b/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb new file mode 100644 index 0000000000..ab07f518cf --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "Xscrnsaver: X Screen Saver extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X Screen \ | ||
6 | Saver extension. This extension allows an external \"screen saver\" \ | ||
7 | client to detect when the alternative image is to be displayed and to \ | ||
8 | provide the graphics." | ||
9 | |||
10 | LICENSE = "MIT" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=eed49b78b15b436c933b6b8b054e3901 \ | ||
12 | file://saverproto.h;endline=26;md5=a84c0637305159f3c0ab173aaeede48d" | ||
13 | |||
14 | PE = "1" | ||
15 | |||
16 | EXTRA_OECONF_append = " --enable-specs=no" | ||
17 | |||
18 | SRC_URI[md5sum] = "edd8a73775e8ece1d69515dd17767bfb" | ||
19 | SRC_URI[sha256sum] = "8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65" | ||
diff --git a/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb b/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb new file mode 100644 index 0000000000..53aa7593b8 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "Xv: X Video extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the X Video \ | ||
6 | extension. This extension alows for accerlated drawing of videos." | ||
7 | |||
8 | LICENSE = "MIT & MIT-style" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=ce3472a119a864085fa4155cb0979a7b" | ||
10 | |||
11 | PE = "1" | ||
12 | |||
13 | SRC_URI[md5sum] = "e658641595327d3990eab70fdb55ca8b" | ||
14 | SRC_URI[sha256sum] = "8dae168cb820fcd32f564879afb3f24d27c176300d9af66819a18265539bd4b6" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto.inc b/meta/recipes-graphics/xorg-proto/xcb-proto.inc new file mode 100644 index 0000000000..2e1b57bae4 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto.inc | |||
@@ -0,0 +1,25 @@ | |||
1 | SUMMARY = "XCB: The X protocol C binding headers" | ||
2 | DESCRIPTION = "Function prototypes for the X protocol C-language Binding \ | ||
3 | (XCB). XCB is a replacement for Xlib featuring a small footprint, \ | ||
4 | latency hiding, direct access to the protocol, improved threading \ | ||
5 | support, and extensibility." | ||
6 | HOMEPAGE = "http://xcb.freedesktop.org" | ||
7 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" | ||
8 | |||
9 | SECTION = "x11/libs" | ||
10 | LICENSE = "MIT-X" | ||
11 | |||
12 | SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" | ||
13 | |||
14 | inherit autotools pkgconfig pythonnative | ||
15 | |||
16 | PACKAGES += "python-xcbgen" | ||
17 | |||
18 | FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" | ||
19 | FILES_python-xcbgen = "${libdir}/python*" | ||
20 | |||
21 | RDEPENDS_${PN}-dev = "" | ||
22 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | ||
23 | |||
24 | DEPENDS_append_class-native = " python-native" | ||
25 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb new file mode 100644 index 0000000000..0b67b5703e --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | include xcb-proto.inc | ||
2 | |||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ | ||
5 | file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" | ||
6 | |||
7 | |||
8 | SRC_URI[md5sum] = "ade74b8e9c870dc7515adfa209e66063" | ||
9 | SRC_URI[sha256sum] = "7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb new file mode 100644 index 0000000000..2ea4d04217 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | DEFAULT_PREFERENCE = "-1" | ||
2 | |||
3 | include xcb-proto.inc | ||
4 | SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66" | ||
5 | PV = "1.2+gitr${SRCPV}" | ||
6 | PR = "r4" | ||
7 | |||
8 | SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto" | ||
9 | S = "${WORKDIR}/git" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb b/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb new file mode 100644 index 0000000000..0751b94c9d --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XC-MISC: X XC-Miscellaneous extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the XC-MISC \ | ||
6 | extension, which is used to get details of XID allocations within the \ | ||
7 | server." | ||
8 | |||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=09d83047c15994e05db29b423ed6662e" | ||
11 | |||
12 | PE = "1" | ||
13 | |||
14 | BBCLASSEXTEND = "native nativesdk" | ||
15 | |||
16 | SRC_URI[md5sum] = "5f4847c78e41b801982c8a5e06365b24" | ||
17 | SRC_URI[sha256sum] = "b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb b/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb new file mode 100644 index 0000000000..dd0bd951b2 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XExt: X Extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for several X \ | ||
6 | extensions. These protocol extensions include DOUBLE-BUFFER, DPMS, \ | ||
7 | Extended-Visual-Information, LBX, MIT_SHM, MIT_SUNDRY-NONSTANDARD, \ | ||
8 | Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, XC-APPGROUP, XC-MISC, \ | ||
9 | XTEST. In addition a small set of utility functions are also \ | ||
10 | available." | ||
11 | |||
12 | LICENSE = "MIT & MIT-style" | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=86f273291759d0ba2a22585cd1c06c53" | ||
14 | |||
15 | PE = "1" | ||
16 | |||
17 | inherit gettext | ||
18 | |||
19 | EXTRA_OECONF_append = " --enable-specs=no" | ||
20 | |||
21 | BBCLASSEXTEND = "native nativesdk" | ||
22 | |||
23 | SRC_URI[md5sum] = "70c90f313b4b0851758ef77b95019584" | ||
24 | SRC_URI[sha256sum] = "f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb new file mode 100644 index 0000000000..86f3ce328f --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the XFree86 \ | ||
6 | Direct Graphics Access extension. This extension allows direct graphics \ | ||
7 | access to a framebuffer-like region, as well as relative mouse \ | ||
8 | reporting." | ||
9 | |||
10 | LICENSE = "MIT" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6" | ||
12 | |||
13 | RCONFLICTS_${PN} = "xxf86dgaext" | ||
14 | PR = "r2" | ||
15 | PE = "1" | ||
16 | |||
17 | SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1" | ||
18 | SRC_URI[sha256sum] = "ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb b/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb new file mode 100644 index 0000000000..b3f9210ccb --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XFree86-DRI: XFree86 Direct Rendering Infrastructure extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the XFree86 \ | ||
6 | Direct Rendering Infrastructure extension. The XFree86-DRI extension is \ | ||
7 | used to organize direct rendering support or 3D clients and help \ | ||
8 | arbitrate requests." | ||
9 | |||
10 | LICENSE = "MIT" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=ef103b9d951e39ff7e23d386e2011fa3 \ | ||
12 | file://xf86driproto.h;endline=35;md5=42be3d8e6d429ab79172572bb0cff544" | ||
13 | |||
14 | PE = "1" | ||
15 | |||
16 | SRC_URI[md5sum] = "1d716d0dac3b664e5ee20c69d34bc10e" | ||
17 | SRC_URI[sha256sum] = "9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb b/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb new file mode 100644 index 0000000000..d4663ea880 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the XFree \ | ||
6 | miscellaneous extension. The XFree86-Misc extension provides a means to \ | ||
7 | access input device configuration settings specific to the XFree86/Xorg \ | ||
8 | DDX." | ||
9 | |||
10 | LICENSE = "MIT" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6" | ||
12 | |||
13 | PR = "r1" | ||
14 | PE = "1" | ||
15 | |||
16 | SRC_URI[md5sum] = "ca63bbb31cf5b7f37b2237e923ff257a" | ||
17 | SRC_URI[sha256sum] = "45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb b/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb new file mode 100644 index 0000000000..0f31900a9e --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "XFree86-VM: XFree86 video mode extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the XFree86 \ | ||
6 | video mode extension. This extension allows client applications to get \ | ||
7 | and set video mode timings." | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=499be2ff387a42f84628c35f311f1502" | ||
11 | |||
12 | RCONFLICTS_${PN} = "xxf86vmext" | ||
13 | |||
14 | PR = "r1" | ||
15 | PE = "1" | ||
16 | |||
17 | SRC_URI[md5sum] = "e793ecefeaecfeabd1aed6a01095174e" | ||
18 | SRC_URI[sha256sum] = "45d9499aa7b73203fd6b3505b0259624afed5c16b941bd04fcf123e5de698770" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb b/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb new file mode 100644 index 0000000000..d00774ece5 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "Xinerama: Xinerama extension headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the wire protocol for the Xinerama \ | ||
6 | extension. This extension is used for retrieving information about \ | ||
7 | physical output devices which may be combined into a single logical X \ | ||
8 | screen." | ||
9 | |||
10 | LICENSE = "MIT & MIT-style" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=3e397a5326c83d5d0ebf5b3f87163ac6 \ | ||
12 | file://panoramiXproto.h;endline=24;md5=098e0bc089368a988092b3cbda617a57" | ||
13 | |||
14 | PE = "1" | ||
15 | |||
16 | SRC_URI[md5sum] = "9959fe0bfb22a0e7260433b8d199590a" | ||
17 | SRC_URI[sha256sum] = "977574bb3dc192ecd9c55f59f991ec1dff340be3e31392c95deff423da52485b" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc new file mode 100644 index 0000000000..7a417c9742 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "X protocol headers: ${XORG_PN}" | ||
2 | HOMEPAGE = "http://www.x.org" | ||
3 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" | ||
4 | |||
5 | SECTION = "x11/libs" | ||
6 | LICENSE = "MIT-X" | ||
7 | |||
8 | XORG_PN = "${BPN}" | ||
9 | |||
10 | SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2" | ||
11 | |||
12 | S = "${WORKDIR}/${XORG_PN}-${PV}" | ||
13 | |||
14 | DEPENDS = "util-macros" | ||
15 | |||
16 | inherit autotools pkgconfig | ||
17 | EXTRA_OECONF = "--without-fop" | ||
18 | |||
19 | UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto --with-xmlto" | ||
20 | |||
21 | PACKAGECONFIG ??= "" | ||
22 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | ||
23 | |||
24 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | ||
25 | RDEPENDS_${PN}-dev = "" | ||
26 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | ||
diff --git a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch new file mode 100644 index 0000000000..540ad27d43 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Don't always define LONG64 for AMD64 | ||
4 | |||
5 | X32 defines __amd64__/amd64 with 32bit long. We should simply check | ||
6 | __LP64__ before defining LONG64 without checking __amd64__/amd64. | ||
7 | |||
8 | This fixes compilation with x32 toolchain. | ||
9 | |||
10 | Received this patch from H.J. Lu <hjl.tools@gmail.com> | ||
11 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 | ||
12 | |||
13 | --- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 | ||
14 | +++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 | ||
15 | @@ -62,7 +62,6 @@ SOFTWARE. | ||
16 | defined(__ia64__) || defined(ia64) || \ | ||
17 | defined(__sparc64__) || \ | ||
18 | defined(__s390x__) || \ | ||
19 | - defined(__amd64__) || defined(amd64) || \ | ||
20 | defined(__powerpc64__) | ||
21 | # define LONG64 /* 32/64-bit architecture */ | ||
22 | # endif | ||
diff --git a/meta/recipes-graphics/xorg-proto/xproto_7.0.26.bb b/meta/recipes-graphics/xorg-proto/xproto_7.0.26.bb new file mode 100644 index 0000000000..0d591dcc57 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xproto_7.0.26.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | require xorg-proto-common.inc | ||
2 | |||
3 | SUMMARY = "Xlib: C Language X interface headers" | ||
4 | |||
5 | DESCRIPTION = "This package provides the basic headers for the X Window \ | ||
6 | System." | ||
7 | |||
8 | LICENSE = "MIT & MIT-style" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b9e051107d5628966739a0b2e9b32676" | ||
10 | |||
11 | PE = "1" | ||
12 | |||
13 | SRC_URI += "file://xproto_fix_for_x32.patch" | ||
14 | |||
15 | EXTRA_OECONF_append = " --enable-specs=no" | ||
16 | BBCLASSEXTEND = "native nativesdk" | ||
17 | |||
18 | SRC_URI[md5sum] = "4dc2464bfeade23dab5de38da0f6b1b5" | ||
19 | SRC_URI[sha256sum] = "636162c1759805a5a0114a369dffdeccb8af8c859ef6e1445f26a4e6e046514f" | ||
20 | |||
diff --git a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb new file mode 100644 index 0000000000..ccf2f4b451 --- /dev/null +++ b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "Program to create dependencies in makefiles" | ||
2 | |||
3 | DESCRIPTION = "The gccmakedep program calls 'gcc -M' to output makefile \ | ||
4 | rules describing the dependencies of each sourcefile, so that make knows \ | ||
5 | which object files must be recompiled when a dependency has changed." | ||
6 | |||
7 | require xorg-util-common.inc | ||
8 | LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" | ||
9 | DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" | ||
10 | DEPENDS = "util-macros" | ||
11 | RDEPENDS_${PN} = "gcc" | ||
12 | |||
13 | PR = "r3" | ||
14 | PE = "1" | ||
15 | |||
16 | SRC_URI[md5sum] = "127ddb6131eb4a56fdf6644a63ade788" | ||
17 | SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548" \ No newline at end of file | ||
diff --git a/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb b/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb new file mode 100644 index 0000000000..84a967a81e --- /dev/null +++ b/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require xorg-util-common.inc | ||
2 | |||
3 | SUMMARY = "create dependencies in makefiles" | ||
4 | |||
5 | DESCRIPTION = "The makedepend program reads each sourcefile in sequence \ | ||
6 | and parses it like a C-preprocessor, processing \ | ||
7 | all #include, #define, #undef, #ifdef, #ifndef, #endif, #if, #elif \ | ||
8 | and #else directives so that it can correctly tell which #include, \ | ||
9 | directives would be used in a compilation. Any #include, directives \ | ||
10 | can reference files having other #include directives, and parsing will \ | ||
11 | occur in these files as well." | ||
12 | |||
13 | DEPENDS = "xproto util-macros" | ||
14 | PE = "1" | ||
15 | |||
16 | BBCLASSEXTEND = "native" | ||
17 | |||
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=43a6eda34b48ee821b3b66f4f753ce4f" | ||
19 | |||
20 | SRC_URI[md5sum] = "efb2d7c7e22840947863efaedc175747" | ||
21 | SRC_URI[sha256sum] = "503903d41fb5badb73cb70d7b3740c8b30fe1cc68c504d3b6a85e6644c4e5004" | ||
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb new file mode 100644 index 0000000000..26cf50f2fd --- /dev/null +++ b/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | SUMMARY = "X autotools macros" | ||
2 | |||
3 | DESCRIPTION = "M4 autotools macros used by various X.org programs." | ||
4 | |||
5 | require xorg-util-common.inc | ||
6 | |||
7 | LICENSE = "MIT & MIT-style" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662" | ||
9 | |||
10 | PE = "1" | ||
11 | |||
12 | SRC_URI[md5sum] = "40e1caa49a71a26e0aa68ddd00203717" | ||
13 | SRC_URI[sha256sum] = "0d4df51b29023daf2f63aebf3ebc638ea88efedfd560ab5866741ab3f92acaa1" | ||
14 | |||
15 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | ||
16 | RDEPENDS_${PN}-dev = "" | ||
17 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | ||
18 | |||
19 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-graphics/xorg-util/xorg-util-common.inc b/meta/recipes-graphics/xorg-util/xorg-util-common.inc new file mode 100644 index 0000000000..18d022c49f --- /dev/null +++ b/meta/recipes-graphics/xorg-util/xorg-util-common.inc | |||
@@ -0,0 +1,13 @@ | |||
1 | HOMEPAGE = "http://www.x.org" | ||
2 | BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" | ||
3 | |||
4 | SECTION = "x11/utils" | ||
5 | LICENSE = "MIT-X" | ||
6 | |||
7 | XORG_PN = "${BPN}" | ||
8 | |||
9 | SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz" | ||
10 | |||
11 | S = "${WORKDIR}/${XORG_PN}-${PV}" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf new file mode 100644 index 0000000000..629ae214e8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf | |||
@@ -0,0 +1,69 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | SubSection "Display" | ||
58 | Modes "640x480" | ||
59 | EndSubSection | ||
60 | EndSection | ||
61 | |||
62 | Section "ServerLayout" | ||
63 | Identifier "Default Layout" | ||
64 | Screen "Default Screen" | ||
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | ||
69 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf new file mode 100644 index 0000000000..e6c8b514e3 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf | |||
@@ -0,0 +1,70 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | DefaultDepth 16 | ||
58 | SubSection "Display" | ||
59 | Modes "640x480" | ||
60 | EndSubSection | ||
61 | EndSection | ||
62 | |||
63 | Section "ServerLayout" | ||
64 | Identifier "Default Layout" | ||
65 | Screen "Default Screen" | ||
66 | InputDevice "Generic Keyboard" | ||
67 | # InputDevice "Configured Mouse" | ||
68 | InputDevice "QEMU Tablet" | ||
69 | Option "AllowEmptyInput" "no" | ||
70 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf new file mode 100644 index 0000000000..629ae214e8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf | |||
@@ -0,0 +1,69 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | SubSection "Display" | ||
58 | Modes "640x480" | ||
59 | EndSubSection | ||
60 | EndSection | ||
61 | |||
62 | Section "ServerLayout" | ||
63 | Identifier "Default Layout" | ||
64 | Screen "Default Screen" | ||
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | ||
69 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf new file mode 100644 index 0000000000..629ae214e8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf | |||
@@ -0,0 +1,69 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | SubSection "Display" | ||
58 | Modes "640x480" | ||
59 | EndSubSection | ||
60 | EndSection | ||
61 | |||
62 | Section "ServerLayout" | ||
63 | Identifier "Default Layout" | ||
64 | Screen "Default Screen" | ||
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | ||
69 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf new file mode 100644 index 0000000000..629ae214e8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf | |||
@@ -0,0 +1,69 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | ||
34 | Identifier "Graphics Controller" | ||
35 | Driver "fbdev" | ||
36 | EndSection | ||
37 | |||
38 | Section "Monitor" | ||
39 | Identifier "Generic Monitor" | ||
40 | Option "DPMS" | ||
41 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
42 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
43 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
44 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
45 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
46 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
47 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
48 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
49 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
50 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
51 | EndSection | ||
52 | |||
53 | Section "Screen" | ||
54 | Identifier "Default Screen" | ||
55 | Device "Graphics Controller" | ||
56 | Monitor "Generic Monitor" | ||
57 | SubSection "Display" | ||
58 | Modes "640x480" | ||
59 | EndSubSection | ||
60 | EndSection | ||
61 | |||
62 | Section "ServerLayout" | ||
63 | Identifier "Default Layout" | ||
64 | Screen "Default Screen" | ||
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | ||
69 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf new file mode 100644 index 0000000000..bbda9eaa63 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf | |||
@@ -0,0 +1,64 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "vmmouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Monitor" | ||
34 | Identifier "Generic Monitor" | ||
35 | Option "DPMS" | ||
36 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
37 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
38 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
39 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
40 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
41 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
42 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
43 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
44 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
45 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
46 | EndSection | ||
47 | |||
48 | Section "Screen" | ||
49 | Identifier "Default Screen" | ||
50 | Device "Graphics Controller" | ||
51 | Monitor "Generic Monitor" | ||
52 | SubSection "Display" | ||
53 | Modes "640x480" | ||
54 | EndSubSection | ||
55 | EndSection | ||
56 | |||
57 | Section "ServerLayout" | ||
58 | Identifier "Default Layout" | ||
59 | Screen "Default Screen" | ||
60 | InputDevice "Generic Keyboard" | ||
61 | # InputDevice "Configured Mouse" | ||
62 | InputDevice "QEMU Tablet" | ||
63 | Option "AllowEmptyInput" "no" | ||
64 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf new file mode 100644 index 0000000000..bbda9eaa63 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf | |||
@@ -0,0 +1,64 @@ | |||
1 | |||
2 | Section "Files" | ||
3 | EndSection | ||
4 | |||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "vmmouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Monitor" | ||
34 | Identifier "Generic Monitor" | ||
35 | Option "DPMS" | ||
36 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
37 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
38 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
39 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
40 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
41 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
42 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
43 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
44 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
45 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
46 | EndSection | ||
47 | |||
48 | Section "Screen" | ||
49 | Identifier "Default Screen" | ||
50 | Device "Graphics Controller" | ||
51 | Monitor "Generic Monitor" | ||
52 | SubSection "Display" | ||
53 | Modes "640x480" | ||
54 | EndSubSection | ||
55 | EndSection | ||
56 | |||
57 | Section "ServerLayout" | ||
58 | Identifier "Default Layout" | ||
59 | Screen "Default Screen" | ||
60 | InputDevice "Generic Keyboard" | ||
61 | # InputDevice "Configured Mouse" | ||
62 | InputDevice "QEMU Tablet" | ||
63 | Option "AllowEmptyInput" "no" | ||
64 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf | |||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb new file mode 100644 index 0000000000..549c7c89bf --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "X.Org X server configuration file" | ||
2 | HOMEPAGE = "http://www.x.org" | ||
3 | SECTION = "x11/base" | ||
4 | LICENSE = "MIT-X" | ||
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
6 | PR = "r33" | ||
7 | |||
8 | SRC_URI = "file://xorg.conf" | ||
9 | |||
10 | CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" | ||
11 | |||
12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
13 | ALLOW_EMPTY_${PN} = "1" | ||
14 | |||
15 | do_install () { | ||
16 | if test -s ${WORKDIR}/xorg.conf; then | ||
17 | install -d ${D}/${sysconfdir}/X11 | ||
18 | install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ | ||
19 | fi | ||
20 | } | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc new file mode 100644 index 0000000000..dd60884992 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -0,0 +1,159 @@ | |||
1 | SUMMARY = "The X.Org X server" | ||
2 | HOMEPAGE = "http://www.x.org" | ||
3 | SECTION = "x11/base" | ||
4 | LICENSE = "MIT-X" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=15b5bf9327341c81089137aec4830bfd" | ||
6 | |||
7 | # xf86-*-* packages depend on an X server built with the xfree86 DDX | ||
8 | # so we have a virtual to represent that: | ||
9 | # deprecated, we should use virtual/xserver instead | ||
10 | PROVIDES = "virtual/xserver-xf86" | ||
11 | |||
12 | # Other packages tend to just care that there is *an* X server: | ||
13 | PROVIDES += "virtual/xserver" | ||
14 | |||
15 | PE = "2" | ||
16 | INC_PR = "r8" | ||
17 | |||
18 | XORG_PN = "xorg-server" | ||
19 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" | ||
20 | SRC_URI += "file://macro_tweak.patch" | ||
21 | |||
22 | S = "${WORKDIR}/${XORG_PN}-${PV}" | ||
23 | |||
24 | inherit autotools pkgconfig | ||
25 | |||
26 | PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" | ||
27 | LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" | ||
28 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" | ||
29 | |||
30 | # Split out some modules and extensions from the main package | ||
31 | # These aren't needed for basic operations and only take up space: | ||
32 | # 32.0k libdri.so | ||
33 | # 91.0k libexa.so | ||
34 | # 336.0k libglx.so | ||
35 | # 1360k libint10.so | ||
36 | # 180.0k libwfb.so | ||
37 | # 320.0k libxaa.so | ||
38 | # 124.0k libxf1bpp.so | ||
39 | # 84.0k libxf4bpp.so | ||
40 | # librecord.so | ||
41 | # libextmod.so | ||
42 | # libdbe.so | ||
43 | |||
44 | PACKAGES =+ "${PN}-security-policy \ | ||
45 | ${PN}-sdl \ | ||
46 | ${PN}-fbdev \ | ||
47 | ${PN}-xvfb \ | ||
48 | ${PN}-utils \ | ||
49 | ${PN}-xephyr \ | ||
50 | ${PN}-multimedia-modules \ | ||
51 | ${PN}-extension-dri \ | ||
52 | ${PN}-extension-dri2 \ | ||
53 | ${PN}-extension-glx \ | ||
54 | ${PN}-extension-record \ | ||
55 | ${PN}-extension-extmod \ | ||
56 | ${PN}-extension-dbe \ | ||
57 | ${PN}-module-libint10 \ | ||
58 | ${PN}-module-libafb \ | ||
59 | ${PN}-module-libwfb \ | ||
60 | ${PN}-module-libmfb \ | ||
61 | ${PN}-module-libcfb \ | ||
62 | ${PN}-module-exa \ | ||
63 | ${PN}-module-xaa \ | ||
64 | ${PN}-module-libxf1bpp \ | ||
65 | ${PN}-module-libxf4bpp" | ||
66 | |||
67 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" | ||
68 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | ||
69 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" | ||
70 | |||
71 | 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" | ||
72 | FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" | ||
73 | FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" | ||
74 | FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ | ||
75 | ${libdir}/xorg/modules/*/.debug \ | ||
76 | ${libdir}/xorg/modules/*/*/.debug \ | ||
77 | " | ||
78 | FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" | ||
79 | FILES_${PN}-sdl = "${bindir}/Xsdl" | ||
80 | FILES_${PN}-fbdev = "${bindir}/Xfbdev" | ||
81 | FILES_${PN}-xvfb = "${bindir}/Xvfb" | ||
82 | 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" | ||
83 | FILES_${PN}-xephyr = "${bindir}/Xephyr" | ||
84 | FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" | ||
85 | FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" | ||
86 | FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" | ||
87 | FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" | ||
88 | FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" | ||
89 | FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" | ||
90 | FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" | ||
91 | FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" | ||
92 | FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" | ||
93 | FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" | ||
94 | FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" | ||
95 | FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" | ||
96 | FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" | ||
97 | FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" | ||
98 | FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" | ||
99 | FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" | ||
100 | |||
101 | EXTRA_OECONF += "--with-fop=no \ | ||
102 | --with-pic \ | ||
103 | --disable-static \ | ||
104 | --disable-xinerama \ | ||
105 | --disable-record \ | ||
106 | --disable-dmx \ | ||
107 | --disable-xnest \ | ||
108 | --enable-xvfb \ | ||
109 | --enable-composite \ | ||
110 | --without-dtrace \ | ||
111 | --with-int10=x86emu \ | ||
112 | --sysconfdir=/etc/X11 \ | ||
113 | --localstatedir=/var \ | ||
114 | --with-xkb-output=/var/lib/xkb \ | ||
115 | --with-sha1=libcrypto \ | ||
116 | ac_cv_file__usr_share_sgml_X11_defs_ent=no \ | ||
117 | " | ||
118 | |||
119 | PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" | ||
120 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" | ||
121 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" | ||
122 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" | ||
123 | # DRI3 requires xshmfence to also be enabled | ||
124 | PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" | ||
125 | PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" | ||
126 | PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" | ||
127 | PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" | ||
128 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | ||
129 | |||
130 | do_install_append () { | ||
131 | # Its assumed base-files creates this for us | ||
132 | rmdir ${D}${localstatedir}/log/ | ||
133 | } | ||
134 | |||
135 | # Add runtime provides for the ABI versions of the video and input subsystems, | ||
136 | # so that drivers can depend on the relevant version. | ||
137 | python populate_packages_prepend() { | ||
138 | import subprocess | ||
139 | |||
140 | # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going | ||
141 | # into the new package, not the staged ones. | ||
142 | newenv = dict(os.environ) | ||
143 | newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/") | ||
144 | |||
145 | def get_abi(name): | ||
146 | abis = { | ||
147 | "video": "abi_videodrv", | ||
148 | "input": "abi_xinput" | ||
149 | } | ||
150 | p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], | ||
151 | shell=True, env=newenv, stdout=subprocess.PIPE) | ||
152 | output = p.communicate()[0] | ||
153 | mlprefix = d.getVar('MLPREFIX', True) or '' | ||
154 | return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) | ||
155 | |||
156 | pn = d.getVar("PN", True) | ||
157 | d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) | ||
158 | d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) | ||
159 | } | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch new file mode 100644 index 0000000000..2f98bb8c89 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff --git a/configure.ac b/configure.ac | ||
4 | index b3b752c..600500b 100644 | ||
5 | --- a/configure.ac | ||
6 | +++ b/configure.ac | ||
7 | @@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, | ||
8 | dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross | ||
9 | dnl compiling, assume default font path uses standard FONTROOTDIR directories. | ||
10 | DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" | ||
11 | -if test "$cross_compiling" != yes; then | ||
12 | - AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], | ||
13 | - [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], | ||
14 | - [case $host_os in | ||
15 | + case $host_os in | ||
16 | darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; | ||
17 | - esac]) | ||
18 | -fi | ||
19 | + esac | ||
20 | AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), | ||
21 | [ FONTPATH="$withval" ], | ||
22 | [ FONTPATH="${DEFAULT_FONT_PATH}" ]) | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch new file mode 100644 index 0000000000..2f629724c9 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: git/os/osdep.h | ||
4 | =================================================================== | ||
5 | --- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 | ||
6 | +++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100 | ||
7 | @@ -92,7 +92,7 @@ | ||
8 | * like sysconf(_SC_OPEN_MAX) is not supported. | ||
9 | */ | ||
10 | |||
11 | -#if OPEN_MAX <= 256 | ||
12 | +#if 0 | ||
13 | #define MAXSOCKS (OPEN_MAX - 1) | ||
14 | #else | ||
15 | #define MAXSOCKS 256 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch new file mode 100644 index 0000000000..ec0eea6ca2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | This is the revised version of files/macro_tweak.patch for | ||
2 | xorg-server 1.8.99.904 and newer. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
7 | |||
8 | diff --git a/xorg-server.m4 b/xorg-server.m4 | ||
9 | index bdecf62..040fdb8 100644 | ||
10 | --- a/xorg-server.m4 | ||
11 | +++ b/xorg-server.m4 | ||
12 | @@ -28,10 +28,12 @@ dnl | ||
13 | # Checks for the $1 define in xorg-server.h (from the sdk). If it | ||
14 | # is defined, then add $1 to $REQUIRED_MODULES. | ||
15 | |||
16 | +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) | ||
17 | + | ||
18 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | ||
19 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
20 | SAVE_CFLAGS="$CFLAGS" | ||
21 | - CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
22 | + CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
23 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
24 | #include "xorg-server.h" | ||
25 | #if !defined $1 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch new file mode 100644 index 0000000000..168368e6c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well | ||
2 | so we end up with incompatible conversion errors | ||
3 | |||
4 | This patch choses the right values for mips64 | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h | ||
10 | =================================================================== | ||
11 | --- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 | ||
12 | +++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 | ||
13 | @@ -101,6 +101,7 @@ | ||
14 | #if defined(NO_INLINE) || defined(DO_PROTOTYPES) | ||
15 | #if !defined(__arm__) | ||
16 | #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ | ||
17 | + && !defined(__mips64) \ | ||
18 | && !(defined(__alpha__) && defined(linux)) \ | ||
19 | && !(defined(__ia64__) && defined(linux)) \ | ||
20 | |||
21 | @@ -721,7 +722,7 @@ | ||
22 | } | ||
23 | |||
24 | #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) | ||
25 | -#ifdef __arm32__ | ||
26 | +#if defined (__arm32__) || defined (__mips64) | ||
27 | #define PORT_SIZE long | ||
28 | #else | ||
29 | #define PORT_SIZE short | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch new file mode 100644 index 0000000000..13f3caf768 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | [ YOCTO #6583 ] | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001 | ||
7 | From: Chris Wilson <chris@chris-wilson.co.uk> | ||
8 | Date: Wed, 28 May 2014 08:13:59 +0100 | ||
9 | Subject: xfree86: Report DRI3 as a built-in module | ||
10 | |||
11 | This is so that drivers can do a runtime check that DRI3 is available, | ||
12 | similar to existing runtime checks performed by the drivers for DRI and | ||
13 | DRI2. | ||
14 | |||
15 | v2: Only add DRI3 to the list if the module was actually built into the | ||
16 | server (Mark Kettenis). | ||
17 | |||
18 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||
19 | Cc: Mark Kettenis <mark.kettenis@xs4all.nl> | ||
20 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
21 | |||
22 | diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c | ||
23 | index 092bf57..f92ad8d 100644 | ||
24 | --- a/hw/xfree86/loader/loadmod.c | ||
25 | +++ b/hw/xfree86/loader/loadmod.c | ||
26 | @@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = { | ||
27 | "extmod", | ||
28 | "dri", | ||
29 | "dri2", | ||
30 | +#if DRI3 | ||
31 | + "dri3", | ||
32 | +#endif | ||
33 | NULL | ||
34 | }; | ||
35 | |||
36 | -- | ||
37 | cgit v0.10.2 | ||
38 | |||
39 | |||
40 | From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001 | ||
41 | From: Chris Wilson <chris@chris-wilson.co.uk> | ||
42 | Date: Wed, 28 May 2014 08:14:00 +0100 | ||
43 | Subject: xfree86: Report Present as a built-in module | ||
44 | |||
45 | This is so that drivers can do a runtime check that Present is available, | ||
46 | similar to existing runtime checks performed by the drivers for DRI. | ||
47 | |||
48 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||
49 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
50 | |||
51 | diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c | ||
52 | index f92ad8d..e1f649a 100644 | ||
53 | --- a/hw/xfree86/loader/loadmod.c | ||
54 | +++ b/hw/xfree86/loader/loadmod.c | ||
55 | @@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = { | ||
56 | #if DRI3 | ||
57 | "dri3", | ||
58 | #endif | ||
59 | +#if PRESENT | ||
60 | + "present", | ||
61 | +#endif | ||
62 | NULL | ||
63 | }; | ||
64 | |||
65 | -- | ||
66 | cgit v0.10.2 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch new file mode 100644 index 0000000000..7c6153022f --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | This patch comes from: | ||
2 | http://lists.x.org/archives/xorg-devel/2013-October/037996.html | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | |||
6 | Signed-off-by: Baogen shang <baogen.shang@windriver.com> | ||
7 | diff -Naur xorg-server-1.14.0-orig/exa/exa_render.c xorg-server-1.14.0/exa/exa_render.c | ||
8 | --- xorg-server-1.14.0-orig/exa/exa_render.c 2014-02-27 14:32:38.000000000 +0800 | ||
9 | +++ xorg-server-1.14.0/exa/exa_render.c 2014-02-27 15:46:59.000000000 +0800 | ||
10 | @@ -1141,7 +1141,8 @@ | ||
11 | |||
12 | exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); | ||
13 | for (; ntrap; ntrap--, traps++) | ||
14 | - (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); | ||
15 | + if (xTrapezoidValid(traps)) | ||
16 | + (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); | ||
17 | exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); | ||
18 | |||
19 | xRel = bounds.x1 + xSrc - xDst; | ||
20 | diff -Naur xorg-server-1.14.0-orig/render/picture.h xorg-server-1.14.0/render/picture.h | ||
21 | --- xorg-server-1.14.0-orig/render/picture.h 2014-02-27 14:32:26.000000000 +0800 | ||
22 | +++ xorg-server-1.14.0/render/picture.h 2014-02-27 15:48:13.000000000 +0800 | ||
23 | @@ -211,7 +211,7 @@ | ||
24 | /* whether 't' is a well defined not obviously empty trapezoid */ | ||
25 | #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ | ||
26 | (t)->right.p1.y != (t)->right.p2.y && \ | ||
27 | - (int) ((t)->bottom - (t)->top) > 0) | ||
28 | + ((t)->bottom > (t)->top)) | ||
29 | |||
30 | /* | ||
31 | * Standard NTSC luminance conversions: | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch new file mode 100644 index 0000000000..682ddf7006 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | commit ca29a9f3e689f3840426897f58aaa3974932ae78 | ||
5 | Author: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Mon Jul 7 12:53:35 2014 +0100 | ||
7 | |||
8 | configure.ac: add option for xshmfence | ||
9 | |||
10 | xshmfence is usable outside of DRI3, and is currently autodetected which isn't | ||
11 | good for distributions where deterministic builds are aspired to. | ||
12 | |||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index c214638..a1ca9ec 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -648,6 +648,7 @@ AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd d | ||
20 | AC_ARG_ENABLE(kdrive-mouse, AS_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto]) | ||
21 | AC_ARG_ENABLE(kdrive-evdev, AS_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto]) | ||
22 | AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"]) | ||
23 | +AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [WANT_XSHMFENCE="$enableval"], [WANT_XSHMFENCE="auto"]) | ||
24 | |||
25 | |||
26 | dnl chown/chmod to be setuid root as part of build | ||
27 | @@ -1235,18 +1236,21 @@ esac | ||
28 | |||
29 | AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes) | ||
30 | |||
31 | -PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, | ||
32 | - [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) | ||
33 | |||
34 | -AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes) | ||
35 | +PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) | ||
36 | +if test "x$WANT_XSHMFENCE" = "xauto"; then | ||
37 | + WANT_XSHMFENCE="$HAVE_XSHMFENCE" | ||
38 | +fi | ||
39 | |||
40 | -case x"$HAVE_XSHMFENCE" in | ||
41 | - xyes) | ||
42 | - AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library]) | ||
43 | - REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" | ||
44 | - ;; | ||
45 | -esac | ||
46 | +if test "x$WANT_XSHMFENCE" = "xyes"; then | ||
47 | + if test "x$HAVE_XSHMFENCE" != "xyes"; then | ||
48 | + AC_MSG_ERROR([xshmfence requested but not installed.]) | ||
49 | + fi | ||
50 | + AC_DEFINE(HAVE_XSHMFENCE, 1, [Have xshmfence support]) | ||
51 | + REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" | ||
52 | +fi | ||
53 | |||
54 | +AM_CONDITIONAL(XSHMFENCE, [test "x$WANT_XSHMFENCE" = xyes]) | ||
55 | |||
56 | case "$DRI3,$HAVE_XSHMFENCE" in | ||
57 | yes,yes | auto,yes) | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb new file mode 100644 index 0000000000..3bba3ce0bf --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | require xserver-xorg.inc | ||
2 | |||
3 | # Misc build failure for master HEAD | ||
4 | SRC_URI += "file://crosscompile.patch \ | ||
5 | file://fix_open_max_preprocessor_error.patch \ | ||
6 | file://mips64-compiler.patch \ | ||
7 | file://xorg-CVE-2013-6424.patch \ | ||
8 | file://xshmfence-option.patch \ | ||
9 | file://present-module.patch \ | ||
10 | " | ||
11 | |||
12 | SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227" | ||
13 | SRC_URI[sha256sum] = "626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2" | ||
14 | |||
15 | # These extensions are now integrated into the server, so declare the migration | ||
16 | # path for in-place upgrades. | ||
17 | |||
18 | RREPLACES_${PN} = "${PN}-extension-dri \ | ||
19 | ${PN}-extension-dri2 \ | ||
20 | ${PN}-extension-record \ | ||
21 | ${PN}-extension-extmod \ | ||
22 | ${PN}-extension-dbe \ | ||
23 | " | ||
24 | RPROVIDES_${PN} = "${PN}-extension-dri \ | ||
25 | ${PN}-extension-dri2 \ | ||
26 | ${PN}-extension-record \ | ||
27 | ${PN}-extension-extmod \ | ||
28 | ${PN}-extension-dbe \ | ||
29 | " | ||
30 | RCONFLICTS_${PN} = "${PN}-extension-dri \ | ||
31 | ${PN}-extension-dri2 \ | ||
32 | ${PN}-extension-record \ | ||
33 | ${PN}-extension-extmod \ | ||
34 | ${PN}-extension-dbe \ | ||
35 | " | ||
diff --git a/meta/recipes-graphics/xrestop/xrestop_0.4.bb b/meta/recipes-graphics/xrestop/xrestop_0.4.bb new file mode 100644 index 0000000000..20d66be55b --- /dev/null +++ b/meta/recipes-graphics/xrestop/xrestop_0.4.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "XRes: A top-like resource usage tool for X" | ||
2 | |||
3 | DESCRIPTION = "top-like statistics of X11 server resource usage by clients" | ||
4 | |||
5 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop" | ||
6 | BUGTRACKER = "https://bugs.freedesktop.org/" | ||
7 | |||
8 | LICENSE = "GPLv2+" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
10 | file://xrestop.c;endline=18;md5=730876c30f0d8a928676bcd1242a3b35" | ||
11 | |||
12 | SECTION = "x11/utils" | ||
13 | PR = "r3" | ||
14 | |||
15 | DEPENDS = "libxres libxext virtual/libx11 ncurses" | ||
16 | |||
17 | SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-${PV}.tar.gz" | ||
18 | |||
19 | SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b" | ||
20 | SRC_URI[sha256sum] = "67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257" | ||
21 | |||
22 | inherit autotools pkgconfig | ||
diff --git a/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh b/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh new file mode 100644 index 0000000000..fa43617bd2 --- /dev/null +++ b/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh | |||
@@ -0,0 +1,13 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . /etc/formfactor/config | ||
4 | |||
5 | if [ "$HAVE_TOUCHSCREEN" = "1" ]; then | ||
6 | n=1 | ||
7 | while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] && [ $n -le 5 ] | ||
8 | do | ||
9 | /usr/bin/xtscal | ||
10 | sleep 1 | ||
11 | n=$(($n+1)) | ||
12 | done | ||
13 | fi | ||
diff --git a/meta/recipes-graphics/xtscal/xtscal/change-cross.patch b/meta/recipes-graphics/xtscal/xtscal/change-cross.patch new file mode 100644 index 0000000000..1da7717869 --- /dev/null +++ b/meta/recipes-graphics/xtscal/xtscal/change-cross.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- tmp/main.c.orig 2007-01-02 15:39:54.000000000 +0000 | ||
4 | +++ tmp/main.c 2007-01-02 15:39:54.000000000 +0000 | ||
5 | @@ -131,9 +131,10 @@ | ||
6 | { | ||
7 | XRenderFillRectangles (dpy, PictOpSrc, pict, &rect_color, rectangles, 2); | ||
8 | |||
9 | - XFillArc (dpy, crosshair_w, crosshair_gc, (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, | ||
10 | - (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, | ||
11 | - WIDTH + 1, WIDTH + 1, 0, 360 * 64); | ||
12 | + XFillRectangle (dpy, crosshair_w, crosshair_gc, | ||
13 | + (CROSSHAIR_SIZE / 2) - (WIDTH / 2), | ||
14 | + (CROSSHAIR_SIZE / 2) - (WIDTH / 2), | ||
15 | + WIDTH, WIDTH); | ||
16 | } | ||
17 | |||
18 | void | ||
diff --git a/meta/recipes-graphics/xtscal/xtscal/cleanup.patch b/meta/recipes-graphics/xtscal/xtscal/cleanup.patch new file mode 100644 index 0000000000..f7b0854c34 --- /dev/null +++ b/meta/recipes-graphics/xtscal/xtscal/cleanup.patch | |||
@@ -0,0 +1,621 @@ | |||
1 | --- | ||
2 | Makefile.am | 9 -- | ||
3 | configure.ac | 3 | ||
4 | gpe-dist.am | 12 --- | ||
5 | h3600_ts.h | 216 ----------------------------------------------------------- | ||
6 | main.c | 210 ++------------------------------------------------------- | ||
7 | xtscal.in | 19 ----- | ||
8 | 6 files changed, 14 insertions(+), 455 deletions(-) | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Index: xtscal-0.6.3/xtscal.in | ||
13 | =================================================================== | ||
14 | --- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100 | ||
15 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
16 | @@ -1,19 +0,0 @@ | ||
17 | -#!/bin/sh | ||
18 | - | ||
19 | -module_id() { | ||
20 | - # Get model name | ||
21 | - echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` | ||
22 | -} | ||
23 | - | ||
24 | -case `module_id` in | ||
25 | - "HP IPAQ H3100" | "HP IPAQ H3800" ) | ||
26 | - ARGS="-rotate 90" ;; | ||
27 | - "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE) | ||
28 | - ARGS="-rotate 270" ;; | ||
29 | - # H2200: works without rotation | ||
30 | -esac | ||
31 | - | ||
32 | -# the things we do for autoconf | ||
33 | -prefix=@prefix@ | ||
34 | -exec_prefix=@exec_prefix@ | ||
35 | -exec @libexecdir@/xtscal.bin $ARGS $* | ||
36 | Index: xtscal-0.6.3/main.c | ||
37 | =================================================================== | ||
38 | --- xtscal-0.6.3.orig/main.c 2007-07-01 01:12:52.000000000 +0100 | ||
39 | +++ xtscal-0.6.3/main.c 2007-07-01 01:12:55.000000000 +0100 | ||
40 | @@ -22,12 +22,10 @@ | ||
41 | #include <X11/Xlib.h> | ||
42 | |||
43 | #include <X11/extensions/Xrender.h> | ||
44 | -#include <X11/extensions/Xrandr.h> | ||
45 | #include <X11/Xft/Xft.h> | ||
46 | #include <X11/extensions/xcalibrate.h> | ||
47 | #include <X11/keysym.h> | ||
48 | |||
49 | -#include "h3600_ts.h" | ||
50 | #include "calibrate.h" | ||
51 | |||
52 | Display *dpy; | ||
53 | @@ -45,15 +43,11 @@ XftColor xftcol; | ||
54 | XftDraw *xftdraw; | ||
55 | XftFont *xftfont; | ||
56 | int screen_x, screen_y; | ||
57 | -int ts_fd; | ||
58 | int samples; | ||
59 | Pixmap bg_pixmap; | ||
60 | int flag_debug; | ||
61 | -int rotation = 0; | ||
62 | int error_base, event_base; | ||
63 | |||
64 | -int using_xcalibrate; | ||
65 | - | ||
66 | int moving; | ||
67 | |||
68 | #define CROSSHAIR_SIZE 25 | ||
69 | @@ -63,7 +57,6 @@ int moving; | ||
70 | #define ENOUGH 5 | ||
71 | #define MAX_SAMPLES 40 | ||
72 | |||
73 | -#define RAW_DEVICE "/dev/h3600_tsraw" | ||
74 | #define FONTNAME "sans-10" | ||
75 | |||
76 | struct point | ||
77 | @@ -287,12 +280,8 @@ sort_by_y (const void* a, const void *b) | ||
78 | void | ||
79 | set_calibration (calibration *cal) | ||
80 | { | ||
81 | - TS_CAL tc; | ||
82 | - int xtrans, ytrans, xscale, yscale, xyscale, yxscale; | ||
83 | calibration ocal = *cal; | ||
84 | |||
85 | - if (using_xcalibrate) | ||
86 | - { | ||
87 | FILE *fp; | ||
88 | if (flag_debug) | ||
89 | 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]); | ||
90 | @@ -304,29 +293,6 @@ set_calibration (calibration *cal) | ||
91 | } | ||
92 | 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]); | ||
93 | fclose (fp); | ||
94 | - return; | ||
95 | - } | ||
96 | - | ||
97 | - xtrans = cal->a[0] / cal->a[6]; | ||
98 | - ytrans = cal->a[3] / cal->a[6]; | ||
99 | - xscale = cal->a[1] * 256 / cal->a[6]; | ||
100 | - yscale = cal->a[5] * 256 / cal->a[6]; | ||
101 | - xyscale = cal->a[2] * 256 / cal->a[6]; | ||
102 | - yxscale = cal->a[4] * 256 / cal->a[6]; | ||
103 | - | ||
104 | - tc.xtrans = xtrans; | ||
105 | - tc.ytrans = ytrans; | ||
106 | - tc.xscale = xscale; | ||
107 | - tc.yscale = yscale; | ||
108 | - tc.xyswap = 0; | ||
109 | - | ||
110 | - printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); | ||
111 | - | ||
112 | - if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) | ||
113 | - { | ||
114 | - perror ("TS_SET_CAL"); | ||
115 | - exit (1); | ||
116 | - } | ||
117 | } | ||
118 | |||
119 | void | ||
120 | @@ -398,80 +364,13 @@ handle_ts_event (int x, int y, int press | ||
121 | } | ||
122 | |||
123 | void | ||
124 | -read_ts (void) | ||
125 | -{ | ||
126 | - TS_EVENT ts_ev; | ||
127 | - int r; | ||
128 | - | ||
129 | - r = read (ts_fd, &ts_ev, sizeof (ts_ev)); | ||
130 | - if (r == sizeof (ts_ev)) | ||
131 | - handle_ts_event (ts_ev.x, ts_ev.y, ts_ev.pressure); | ||
132 | -} | ||
133 | - | ||
134 | -void | ||
135 | -do_cal (char **args) | ||
136 | -{ | ||
137 | - TS_CAL tc; | ||
138 | - | ||
139 | - tc.xscale = atoi (args[0]); | ||
140 | - tc.xtrans = atoi (args[1]); | ||
141 | - tc.yscale = atoi (args[2]); | ||
142 | - tc.ytrans = atoi (args[3]); | ||
143 | - tc.xyswap = atoi (args[4]); | ||
144 | - | ||
145 | - if (flag_debug) | ||
146 | - fprintf (stderr, "setting: %d %d %d %d %d\n", | ||
147 | - tc.xtrans, tc.ytrans, tc.xscale, tc.yscale, tc.xyswap); | ||
148 | - | ||
149 | - if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) | ||
150 | - { | ||
151 | - perror ("TS_SET_CAL"); | ||
152 | - exit (1); | ||
153 | - } | ||
154 | - | ||
155 | - exit (0); | ||
156 | -} | ||
157 | - | ||
158 | -void | ||
159 | -show_cal (void) | ||
160 | -{ | ||
161 | - TS_CAL tc; | ||
162 | - | ||
163 | - if (ioctl (ts_fd, TS_GET_CAL, (void *)&tc) != 0) | ||
164 | - { | ||
165 | - perror ("TS_GET_CAL"); | ||
166 | - exit (1); | ||
167 | - } | ||
168 | - | ||
169 | - printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); | ||
170 | -} | ||
171 | - | ||
172 | -void | ||
173 | usage (const char *name) | ||
174 | { | ||
175 | - fprintf (stderr, "usage: %s -view\n", name); | ||
176 | - fprintf (stderr, " %s [-rotate <0 | 90 | 180 | 270>]\n", name); | ||
177 | - fprintf (stderr, " %s -cal <xs> <xt> <ys> <yt> <xyswap>\n", name); | ||
178 | - | ||
179 | + fprintf (stderr, "usage: %s [-debug]\n", name); | ||
180 | exit (1); | ||
181 | } | ||
182 | |||
183 | int | ||
184 | -xrr_supported (void) | ||
185 | -{ | ||
186 | - int xrr_event_base, xrr_error_base; | ||
187 | - int xrr_major, xrr_minor; | ||
188 | - | ||
189 | - if (XRRQueryExtension (dpy, &xrr_event_base, &xrr_error_base) == False | ||
190 | - || XRRQueryVersion (dpy, &xrr_major, &xrr_minor) == 0 | ||
191 | - || xrr_major != 1 | ||
192 | - || xrr_minor < 1) | ||
193 | - return 0; | ||
194 | - | ||
195 | - return 1; | ||
196 | -} | ||
197 | - | ||
198 | -int | ||
199 | main (int argc, char *argv[]) | ||
200 | { | ||
201 | XSetWindowAttributes attributes; | ||
202 | @@ -480,31 +379,11 @@ main (int argc, char *argv[]) | ||
203 | int max_fd; | ||
204 | GC bg_gc; | ||
205 | int i; | ||
206 | - int have_xrandr; | ||
207 | |||
208 | for (i = 1; i < argc; i++) | ||
209 | { | ||
210 | - if (!strcmp (argv[i], "-view")) | ||
211 | - { | ||
212 | - show_cal (); | ||
213 | - exit (0); | ||
214 | - } | ||
215 | - else if (!strcmp (argv[i], "-debug")) | ||
216 | + if (!strcmp (argv[i], "-debug")) | ||
217 | flag_debug = 1; | ||
218 | - else if (!strcmp (argv[i], "-cal")) | ||
219 | - { | ||
220 | - if (argc > (i + 5)) | ||
221 | - do_cal (argv + i + 1); | ||
222 | - else | ||
223 | - usage (argv[0]); | ||
224 | - } | ||
225 | - else if (!strcmp (argv[i], "-rotate")) | ||
226 | - { | ||
227 | - if (argc > (i + 1)) | ||
228 | - rotation = atoi (argv[++i]); | ||
229 | - else | ||
230 | - usage (argv[0]); | ||
231 | - } | ||
232 | else | ||
233 | usage (argv[0]); | ||
234 | } | ||
235 | @@ -531,48 +410,11 @@ main (int argc, char *argv[]) | ||
236 | fprintf (stderr, "failed to set raw mode: error %d\n", r); | ||
237 | exit (1); | ||
238 | } | ||
239 | - | ||
240 | - using_xcalibrate = 1; | ||
241 | - } | ||
242 | - | ||
243 | - have_xrandr = xrr_supported (); | ||
244 | - if (have_xrandr) | ||
245 | - { | ||
246 | - XRRScreenConfiguration *rr_screen; | ||
247 | - Rotation current_rotation; | ||
248 | - | ||
249 | - if (flag_debug) | ||
250 | - fprintf (stderr, "XRANDR is supported\n"); | ||
251 | - | ||
252 | - rr_screen = XRRGetScreenInfo (dpy, RootWindow (dpy, screen)); | ||
253 | - | ||
254 | - XRRRotations (dpy, screen, ¤t_rotation); | ||
255 | - | ||
256 | - XRRFreeScreenConfigInfo (rr_screen); | ||
257 | - | ||
258 | - if (flag_debug) | ||
259 | - fprintf (stderr, "Current RANDR rotation is %d\n", current_rotation); | ||
260 | - | ||
261 | - switch (current_rotation) | ||
262 | - { | ||
263 | - case RR_Rotate_270: | ||
264 | - rotation += 90; | ||
265 | - case RR_Rotate_180: | ||
266 | - rotation += 90; | ||
267 | - case RR_Rotate_90: | ||
268 | - rotation += 90; | ||
269 | - rotation %= 360; | ||
270 | - case RR_Rotate_0: | ||
271 | - break; | ||
272 | - default: | ||
273 | - fprintf (stderr, "Unknown RANDR rotation: %d\n", current_rotation); | ||
274 | - break; | ||
275 | - } | ||
276 | } | ||
277 | else | ||
278 | { | ||
279 | - if (flag_debug) | ||
280 | - fprintf (stderr, "XRANDR not supported\n"); | ||
281 | + perror ("XCALIBRATE extension missing"); | ||
282 | + exit (1); | ||
283 | } | ||
284 | |||
285 | attributes.override_redirect = flag_debug ? False : True; | ||
286 | @@ -666,45 +508,17 @@ main (int argc, char *argv[]) | ||
287 | |||
288 | for (i = 0; i < NR_POINTS; i++) | ||
289 | { | ||
290 | - switch (rotation) | ||
291 | - { | ||
292 | - case 0: | ||
293 | - cal.xfb[i] = cal.xscr[i]; | ||
294 | - cal.yfb[i] = cal.yscr[i]; | ||
295 | - break; | ||
296 | - case 90: | ||
297 | - cal.xfb[i] = cal.yscr[i]; | ||
298 | - cal.yfb[i] = screen_x - cal.xscr[i]; | ||
299 | - break; | ||
300 | - case 180: | ||
301 | - cal.xfb[i] = screen_x - cal.xscr[i]; | ||
302 | - cal.yfb[i] = screen_y - cal.yscr[i]; | ||
303 | - break; | ||
304 | - case 270: | ||
305 | - cal.xfb[i] = screen_y - cal.yscr[i]; | ||
306 | - cal.yfb[i] = cal.xscr[i]; | ||
307 | - break; | ||
308 | - } | ||
309 | + cal.xfb[i] = cal.xscr[i]; | ||
310 | + cal.yfb[i] = cal.yscr[i]; | ||
311 | + XCalibrateScreenToCoord (dpy, &cal.xfb[i], &cal.yfb[i]); | ||
312 | |||
313 | if (flag_debug) | ||
314 | - printf ("rotation %d: (%d,%d) -> (%d,%d)\n", rotation, | ||
315 | + printf ("rotation conversion: (%d,%d) -> (%d,%d)\n", | ||
316 | cal.xscr[i], cal.yscr[i], cal.xfb[i], cal.yfb[i]); | ||
317 | } | ||
318 | |||
319 | next_event (); | ||
320 | |||
321 | - if (!using_xcalibrate) | ||
322 | - { | ||
323 | - ts_fd = open (RAW_DEVICE, O_RDONLY); | ||
324 | - if (ts_fd < 0) | ||
325 | - { | ||
326 | - perror (RAW_DEVICE); | ||
327 | - exit (1); | ||
328 | - } | ||
329 | - } | ||
330 | - | ||
331 | - max_fd = (xfd > ts_fd) ? xfd : ts_fd; | ||
332 | - | ||
333 | for (;;) | ||
334 | { | ||
335 | fd_set fds; | ||
336 | @@ -713,12 +527,8 @@ main (int argc, char *argv[]) | ||
337 | |||
338 | FD_ZERO (&fds); | ||
339 | FD_SET (xfd, &fds); | ||
340 | - if (ts_fd != -1) | ||
341 | - FD_SET (ts_fd, &fds); | ||
342 | |||
343 | - select (max_fd + 1, &fds, NULL, NULL, NULL); | ||
344 | - | ||
345 | - if (ts_fd != -1 && FD_ISSET (ts_fd, &fds)) | ||
346 | - read_ts (); | ||
347 | + select (xfd + 1, &fds, NULL, NULL, NULL); | ||
348 | } | ||
349 | } | ||
350 | + | ||
351 | Index: xtscal-0.6.3/configure.ac | ||
352 | =================================================================== | ||
353 | --- xtscal-0.6.3.orig/configure.ac 2004-09-10 20:11:12.000000000 +0100 | ||
354 | +++ xtscal-0.6.3/configure.ac 2007-07-01 01:12:55.000000000 +0100 | ||
355 | @@ -9,8 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
356 | # Checks for programs. | ||
357 | AC_PROG_CC | ||
358 | |||
359 | -PKG_CHECK_MODULES(XTSCAL, x11 xft xext xrandr xcalibrate) | ||
360 | +PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) | ||
361 | |||
362 | AC_CONFIG_FILES([Makefile]) | ||
363 | -AC_CONFIG_FILES([xtscal]) | ||
364 | AC_OUTPUT | ||
365 | Index: xtscal-0.6.3/gpe-dist.am | ||
366 | =================================================================== | ||
367 | --- xtscal-0.6.3.orig/gpe-dist.am 2004-06-02 23:07:13.000000000 +0100 | ||
368 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
369 | @@ -1,12 +0,0 @@ | ||
370 | -CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) | ||
371 | - | ||
372 | -dist-upload: dist | ||
373 | - scp $(PACKAGE)-$(VERSION).tar.bz2 $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/ | ||
374 | - | ||
375 | -tag: | ||
376 | - cvs tag $(CVSTAG) | ||
377 | - | ||
378 | -retag: | ||
379 | - cvs tag -F $(CVSTAG) | ||
380 | - | ||
381 | -source: tag dist-upload | ||
382 | Index: xtscal-0.6.3/h3600_ts.h | ||
383 | =================================================================== | ||
384 | --- xtscal-0.6.3.orig/h3600_ts.h 2003-07-05 17:27:10.000000000 +0100 | ||
385 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
386 | @@ -1,216 +0,0 @@ | ||
387 | -/* | ||
388 | -* | ||
389 | -* Driver for the H3600 Touch Screen and other Atmel controlled devices. | ||
390 | -* | ||
391 | -* Copyright 2000 Compaq Computer Corporation. | ||
392 | -* | ||
393 | -* Use consistent with the GNU GPL is permitted, | ||
394 | -* provided that this copyright notice is | ||
395 | -* preserved in its entirety in all copies and derived works. | ||
396 | -* | ||
397 | -* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED, | ||
398 | -* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS | ||
399 | -* FITNESS FOR ANY PARTICULAR PURPOSE. | ||
400 | -* | ||
401 | -* Author: Charles Flynn. | ||
402 | -* | ||
403 | -*/ | ||
404 | - | ||
405 | - | ||
406 | -#ifndef __H3600_TS_H__ | ||
407 | -#define __H3600_TS_H__ | ||
408 | - | ||
409 | -#include <linux/ioctl.h> | ||
410 | - | ||
411 | -enum h3600_ts_minor_devices { | ||
412 | - TS_MINOR = 0, | ||
413 | - TSRAW_MINOR = 1, | ||
414 | - KEY_MINOR = 2 | ||
415 | -}; | ||
416 | - | ||
417 | -typedef struct h3600_ts_calibration { | ||
418 | - int xscale; | ||
419 | - int xtrans; | ||
420 | - int yscale; | ||
421 | - int ytrans; | ||
422 | - int xyswap; | ||
423 | -} TS_CAL; | ||
424 | - | ||
425 | -typedef struct h3600_ts_event { | ||
426 | - unsigned short pressure; | ||
427 | - unsigned short x; | ||
428 | - unsigned short y; | ||
429 | - unsigned short pad; | ||
430 | -} TS_EVENT; | ||
431 | - | ||
432 | -/* Deprecated - do not use */ | ||
433 | -typedef struct h3600_ts_return { | ||
434 | - unsigned short pressure; | ||
435 | - unsigned short x; | ||
436 | - unsigned short y; | ||
437 | - unsigned short pad; | ||
438 | -} TS_RET; | ||
439 | - | ||
440 | -enum power_button_mode { | ||
441 | - PBM_SUSPEND = 0, | ||
442 | - PBM_GENERATE_KEYPRESS = 1 | ||
443 | -}; | ||
444 | - | ||
445 | - | ||
446 | -/* ++++++++++++++ +++++++++++++++++++++++++++++++++++++ */ | ||
447 | - | ||
448 | -typedef struct therm_dev { | ||
449 | - short data; | ||
450 | -} THERM_DEV; | ||
451 | - | ||
452 | -#define H3600_BATT_CHEM_ALKALINE 0x01 | ||
453 | -#define H3600_BATT_CHEM_NICD 0x02 | ||
454 | -#define H3600_BATT_CHEM_NIMH 0x03 | ||
455 | -#define H3600_BATT_CHEM_LION 0x04 | ||
456 | -#define H3600_BATT_CHEM_LIPOLY 0x05 | ||
457 | -#define H3600_BATT_CHEM_NOT_INSTALLED 0x06 | ||
458 | -#define H3600_BATT_CHEM_UNKNOWN 0xff | ||
459 | - | ||
460 | -/* These should match the apm_bios.h definitions */ | ||
461 | -#define H3600_AC_STATUS_AC_OFFLINE 0x00 | ||
462 | -#define H3600_AC_STATUS_AC_ONLINE 0x01 | ||
463 | -#define H3600_AC_STATUS_AC_BACKUP 0x02 /* What does this mean? */ | ||
464 | -#define H3600_AC_STATUS_AC_UNKNOWN 0xff | ||
465 | - | ||
466 | -/* These bitfields are rarely "or'd" together */ | ||
467 | -#define H3600_BATT_STATUS_HIGH 0x01 | ||
468 | -#define H3600_BATT_STATUS_LOW 0x02 | ||
469 | -#define H3600_BATT_STATUS_CRITICAL 0x04 | ||
470 | -#define H3600_BATT_STATUS_CHARGING 0x08 | ||
471 | -#define H3600_BATT_STATUS_CHARGE_MAIN 0x10 | ||
472 | -#define H3600_BATT_STATUS_DEAD 0x20 /* Battery will not charge */ | ||
473 | -#define H3600_BATT_NOT_INSTALLED 0x20 /* For expansion pack batteries */ | ||
474 | -#define H3600_BATT_STATUS_FULL 0x40 /* Battery fully charged (and connected to AC) */ | ||
475 | -#define H3600_BATT_STATUS_NOBATT 0x80 | ||
476 | -#define H3600_BATT_STATUS_UNKNOWN 0xff | ||
477 | - | ||
478 | -struct battery_data { | ||
479 | - unsigned char chemistry; | ||
480 | - unsigned char status; | ||
481 | - unsigned short voltage; /* Voltage for battery #0; unknown for battery #1 */ | ||
482 | - unsigned short percentage; /* Percentage of full charge */ | ||
483 | - unsigned short life; /* Life remaining in minutes */ | ||
484 | -}; | ||
485 | - | ||
486 | -struct h3600_battery { | ||
487 | - unsigned char ac_status; | ||
488 | - unsigned char battery_count; /* How many batteries we have */ | ||
489 | - struct battery_data battery[2]; | ||
490 | -}; | ||
491 | - | ||
492 | -/* -------- EEPROM and SPI Interfaces ---------------*/ | ||
493 | - | ||
494 | -#define EEPROM_RD_BUFSIZ 6 /* EEPROM reads are 16 bits */ | ||
495 | -#define EEPROM_WR_BUFSIZ 5 /* Allow room for 8bit 'addr' field in buffer*/ | ||
496 | -#define SPI_RD_BUFSIZ 16 /* SPI reads are 8 bits */ | ||
497 | -#define SPI_WR_BUFSIZ 7 | ||
498 | - | ||
499 | -/* The EEPROM is where internal programs are stored on the Amtel. | ||
500 | - You probably don't want to read or write these values */ | ||
501 | - | ||
502 | -typedef struct h3600_eeprom_read_request { | ||
503 | - unsigned char addr; /* 8bit Address Offset 0-255 */ | ||
504 | - unsigned char len; /* Number of 16bit words to read 0-128 */ | ||
505 | - unsigned short buff[EEPROM_RD_BUFSIZ]; | ||
506 | -} EEPROM_READ; | ||
507 | - | ||
508 | -typedef struct h3600_eeprom_write_request { | ||
509 | - unsigned char len; /* used only to compute the number of bytes to send */ | ||
510 | - unsigned char addr; /* 0-128 */ | ||
511 | - unsigned short buff[EEPROM_WR_BUFSIZ]; | ||
512 | -} EEPROM_WRITE; | ||
513 | - | ||
514 | -/* The SPI bus connects to EEPROMs located on sleeves plugged into | ||
515 | - the iPAQ. You may want to read these values */ | ||
516 | - | ||
517 | -typedef struct h3600_spi_read_request { | ||
518 | - unsigned short addr; /* 16bit Address Offset 0-128 */ | ||
519 | - unsigned char len; /* Number of bytes to read */ | ||
520 | - unsigned char buff[SPI_RD_BUFSIZ]; | ||
521 | -} SPI_READ; | ||
522 | - | ||
523 | -#define SPI_READ_STATUS_BYTE 0xffff /* Use this address to read the status byte */ | ||
524 | - | ||
525 | -typedef struct h3600_spi_write_request { | ||
526 | - unsigned short len; /* used only to compute the number of bytes to send */ | ||
527 | - unsigned short addr; /* this 16bit address accesses a single byte */ | ||
528 | - unsigned char buff[SPI_WR_BUFSIZ]; | ||
529 | -} SPI_WRITE; | ||
530 | - | ||
531 | - | ||
532 | -/* -------- end of EEPROM and SPI Interfaces ---------------*/ | ||
533 | - | ||
534 | -/* User space structures for IOCTL calls */ | ||
535 | - | ||
536 | -typedef struct h3600_ts_version { | ||
537 | - unsigned char host_version[8]; /* ascii "x.yy" */ | ||
538 | - unsigned char pack_version[8]; /* ascii "x.yy" */ | ||
539 | - unsigned char boot_type; /* TODO ?? */ | ||
540 | -} VER_RET; | ||
541 | - | ||
542 | -typedef struct h3600_ts_led { | ||
543 | - unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ | ||
544 | - unsigned char TotalTime; /* Units of 5 seconds */ | ||
545 | - unsigned char OnTime; /* units of 100m/s */ | ||
546 | - unsigned char OffTime; /* units of 100m/s */ | ||
547 | -} LED_IN; | ||
548 | - | ||
549 | -enum flite_mode { | ||
550 | - FLITE_MODE1 = 1, | ||
551 | - FLITE_AUTO_MODE = 1, /* for reference only */ | ||
552 | - FLITE_MANUAL_MODE = 2, /* Use this normally? */ | ||
553 | - FLITE_GET_LIGHT_SENSOR = 3 /* Returns light reading in "brightness" field */ | ||
554 | -}; | ||
555 | -enum flite_pwr { | ||
556 | - FLITE_PWR_OFF = 0, | ||
557 | - FLITE_PWR_ON = 1 | ||
558 | -}; | ||
559 | - | ||
560 | -typedef struct h3600_ts_flite { | ||
561 | - unsigned char mode; | ||
562 | - unsigned char pwr; | ||
563 | - unsigned char brightness; | ||
564 | -} FLITE_IN; | ||
565 | - | ||
566 | -/*************************** Updated "universal" structures *******************/ | ||
567 | - | ||
568 | -/* Sets backlight for both H3100 and H3600 models - technically "frontlight" for H3600 */ | ||
569 | -struct h3600_ts_backlight { | ||
570 | - enum flite_pwr power; /* 0 = off, 1 = on */ | ||
571 | - unsigned char brightness; /* 0 - 255 */ | ||
572 | -}; | ||
573 | - | ||
574 | -struct h3600_ts_contrast { /* Only useful on H3100 model */ | ||
575 | - unsigned char contrast; /* 0 - 255 */ | ||
576 | -}; | ||
577 | - | ||
578 | -/* IOCTL cmds user or kernel space */ | ||
579 | - | ||
580 | -/* Use 'f' as magic number */ | ||
581 | -#define IOC_H3600_TS_MAGIC 'f' | ||
582 | - | ||
583 | -/* TODO: Some of these IOWR values are just plain wrong */ | ||
584 | -#define GET_VERSION _IOR(IOC_H3600_TS_MAGIC, 1, struct h3600_ts_version ) | ||
585 | -#define READ_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 2, struct h3600_eeprom_read_request) | ||
586 | -#define WRITE_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 3, struct h3600_eeprom_write_request) | ||
587 | -#define GET_THERMAL _IOR(IOC_H3600_TS_MAGIC, 4, struct therm_dev) | ||
588 | -#define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) | ||
589 | -#define GET_BATTERY_STATUS _IOR(IOC_H3600_TS_MAGIC, 6, struct h3600_battery) | ||
590 | -#define FLITE_ON _IOW(IOC_H3600_TS_MAGIC, 7, struct h3600_ts_flite) | ||
591 | -#define READ_SPI _IOWR(IOC_H3600_TS_MAGIC, 8, struct h3600_spi_read_request) | ||
592 | -#define WRITE_SPI _IOWR(IOC_H3600_TS_MAGIC, 9, struct h3600_spi_write_request) | ||
593 | -#define TS_GET_CAL _IOR(IOC_H3600_TS_MAGIC, 10, struct h3600_ts_calibration) | ||
594 | -#define TS_SET_CAL _IOW(IOC_H3600_TS_MAGIC, 11, struct h3600_ts_calibration) | ||
595 | - | ||
596 | -/* New IOCTL interfaces - defined to be more user friendly */ | ||
597 | -#define TS_GET_BACKLIGHT _IOR(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) | ||
598 | -#define TS_SET_BACKLIGHT _IOW(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) | ||
599 | -#define TS_GET_CONTRAST _IOR(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) | ||
600 | -#define TS_SET_CONTRAST _IOW(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) | ||
601 | - | ||
602 | -#endif | ||
603 | Index: xtscal-0.6.3/Makefile.am | ||
604 | =================================================================== | ||
605 | --- xtscal-0.6.3.orig/Makefile.am 2004-06-02 23:07:13.000000000 +0100 | ||
606 | +++ xtscal-0.6.3/Makefile.am 2007-07-02 12:51:02.000000000 +0100 | ||
607 | @@ -1,11 +1,8 @@ | ||
608 | -libexec_PROGRAMS = xtscal.bin | ||
609 | -bin_SCRIPTS = xtscal | ||
610 | +bin_PROGRAMS = xtscal | ||
611 | |||
612 | -xtscal_bin_SOURCES = main.c calibrate.c calibrate.h h3600_ts.h | ||
613 | +xtscal_SOURCES = main.c calibrate.c calibrate.h | ||
614 | |||
615 | -xtscal_bin_LDADD = @XTSCAL_LIBS@ | ||
616 | +xtscal_LDADD = @XTSCAL_LIBS@ | ||
617 | |||
618 | INCLUDES = @XTSCAL_CFLAGS@ -DNR_POINTS=5 | ||
619 | |||
620 | -include gpe-dist.am | ||
621 | - | ||
diff --git a/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch new file mode 100644 index 0000000000..3e4533f785 --- /dev/null +++ b/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | after gcc linking has changed, all the libraries must be explicitely specified | ||
2 | This patch avoids this linking error: | ||
3 | |||
4 | | 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 | ||
5 | | /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 | ||
6 | | /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M | ||
7 | | collect2: ld returned 1 exit status^M | ||
8 | | make: *** [xtscal] Error 1 | ||
9 | |||
10 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
11 | Date: 2011/01/11 | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Index: xtscal-0.6.3/configure.ac | ||
16 | =================================================================== | ||
17 | --- xtscal-0.6.3.orig/configure.ac | ||
18 | +++ xtscal-0.6.3/configure.ac | ||
19 | @@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
20 | # Checks for programs. | ||
21 | AC_PROG_CC | ||
22 | |||
23 | -PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) | ||
24 | +PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate xrender) | ||
25 | |||
26 | AC_CONFIG_FILES([Makefile]) | ||
27 | AC_OUTPUT | ||
diff --git a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb new file mode 100644 index 0000000000..7e01775ce4 --- /dev/null +++ b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | |||
@@ -0,0 +1,31 @@ | |||
1 | SUMMARY = "Touchscreen calibration utility" | ||
2 | |||
3 | DESCRIPTION = "Basic touchscreen calibration utility" | ||
4 | |||
5 | HOMEPAGE = "http://gpe.linuxtogo.org" | ||
6 | BUGTRACKER = "http://bugs.linuxtogo.org" | ||
7 | LICENSE = "GPLv2 & GPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
9 | file://main.c;endline=10;md5=8721bcb08ae9f24e5fe4c82941873c87" | ||
10 | |||
11 | SECTION = "x11/base" | ||
12 | |||
13 | DEPENDS = "virtual/libx11 libxft libxcalibrate" | ||
14 | |||
15 | PR = "r13" | ||
16 | |||
17 | SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ | ||
18 | file://change-cross.patch \ | ||
19 | file://cleanup.patch \ | ||
20 | file://dso_linking_change_build_fix.patch \ | ||
21 | file://30xTs_Calibrate.sh" | ||
22 | |||
23 | SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" | ||
24 | SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1" | ||
25 | |||
26 | inherit autotools pkgconfig | ||
27 | |||
28 | do_install_append() { | ||
29 | install -d ${D}${sysconfdir}/X11/Xsession.d/ | ||
30 | install -m 0755 ${WORKDIR}/30xTs_Calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ | ||
31 | } | ||
diff --git a/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb new file mode 100644 index 0000000000..27aacde837 --- /dev/null +++ b/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "Simple XVideo test application" | ||
2 | LICENSE = "GPLv2+" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | ||
4 | file://src/test-xvideo.c;beginline=1;endline=20;md5=6ae3b4c3c2ff9e51dbbc35bb237afa00" | ||
5 | DEPENDS = "libxv" | ||
6 | |||
7 | SRCREV = "f8f320d0254c09ce483fc1d8ee99ecf5bc940965" | ||
8 | PV = "0.1+git${SRCPV}" | ||
9 | |||
10 | SRC_URI = "git://git.yoctoproject.org/test-xvideo" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | inherit autotools | ||