From 972dcfcdbfe75dcfeb777150c136576cf1a71e99 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 9 Oct 2015 22:59:03 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- meta/recipes-graphics/cairo/cairo-fpu.inc | 6 + meta/recipes-graphics/cairo/cairo.inc | 39 + .../cairo/cairo/0001-Remove-LTO-support.patch | 60 ++ meta/recipes-graphics/cairo/cairo_1.12.16.bb | 47 + meta/recipes-graphics/clutter/clutter-1.0.inc | 45 + .../clutter/clutter-1.0/install-examples.patch | 18 + .../recipes-graphics/clutter/clutter-1.0_1.18.2.bb | 8 + .../clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | 48 + .../clutter-gst-1.0-1.6.0/enable-tests.patch | 23 + meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 18 + .../clutter/clutter-gst-1.0_1.6.0.bb | 9 + meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 + .../clutter/clutter-gtk-1.0_1.4.4.bb | 6 + meta/recipes-graphics/cogl/cogl-1.0.inc | 88 ++ meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb | 6 + .../configure.in-Fix-string-argument-syntax.patch | 28 + .../directfb/directfb-examples_1.7.0.bb | 21 + meta/recipes-graphics/directfb/directfb.inc | 76 ++ .../directfb/directfb/configurefix.patch | 60 ++ .../directfb/directfb/fixsepbuild.patch | 19 + .../directfb/directfb/fusion.patch | 36 + .../rename-no-instrument-function-macro.patch | 345 ++++++ meta/recipes-graphics/directfb/directfb_1.7.4.bb | 23 + meta/recipes-graphics/drm/libdrm.inc | 42 + .../drm/libdrm/GNU_SOURCE_definition.patch | 30 + .../recipes-graphics/drm/libdrm/installtests.patch | 23 + meta/recipes-graphics/drm/libdrm_2.4.54.bb | 8 + meta/recipes-graphics/drm/libdrm_git.bb | 12 + meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb | 6 + meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb | 8 + meta/recipes-graphics/eglinfo/eglinfo.inc | 27 + .../fontconfig/fontconfig_2.11.1.bb | 44 + meta/recipes-graphics/freetype/freetype_2.5.3.bb | 60 ++ meta/recipes-graphics/fstests/fstests_git.bb | 16 + meta/recipes-graphics/glew/glew/autotools.patch | 149 +++ .../glew/glew/fix-glew.pc-install.patch | 46 + .../glew/glew/glew_fix_for_automake-1.12.patch | 25 + meta/recipes-graphics/glew/glew_1.11.0.bb | 21 + meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb | 34 + meta/recipes-graphics/images/core-image-clutter.bb | 13 + .../recipes-graphics/images/core-image-directfb.bb | 17 + meta/recipes-graphics/images/core-image-weston.bb | 11 + meta/recipes-graphics/images/core-image-x11.bb | 9 + meta/recipes-graphics/libfakekey/libfakekey_git.bb | 20 + .../libmatchbox/libmatchbox/libpng.patch | 69 ++ .../libmatchbox/libmatchbox_1.11.bb | 26 + .../libsdl/libsdl-1.2.15/configure_tweak.patch | 1111 ++++++++++++++++++++ .../libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | 19 + .../libsdl/libsdl-1.2.15/pkgconfig.patch | 187 ++++ meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 69 ++ meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb | 56 + .../libxsettings-client/MIT-style-license | 22 + .../libxsettings-client/disable_Os_option.patch | 19 + .../libxsettings-client/link-x11.patch | 13 + .../obsolete_automake_macros.patch | 14 + .../libxsettings-client_0.10.bb | 39 + .../matchbox-session/matchbox-session | 24 + .../matchbox-session/matchbox-session_0.1.bb | 25 + .../matchbox-wm/matchbox-wm/configure_fix.patch | 15 + .../matchbox-wm/matchbox-wm/gconf-2.m4 | 39 + .../matchbox-wm/matchbox-wm/kbdconfig | 42 + .../matchbox-wm/matchbox-wm_1.2.bb | 39 + .../matchbox-wm/matchbox-wm_git.bb | 38 + .../menu-cache/files/Fix-segfault.patch | 31 + .../menu-cache/menu-cache_0.4.1.bb | 21 + meta/recipes-graphics/mesa/libglu_9.0.0.bb | 27 + .../0001-mesa-demos-Add-missing-data-files.patch | 624 +++++++++++ ...mplement-with-AC_WITH-glut-so-that-withou.patch | 54 + ...llow-to-disable-demos-which-require-GLEW-.patch | 424 ++++++++ ...4-Use-DEMOS_DATA_DIR-to-locate-data-files.patch | 234 +++++ ...hen-EGL_MESA_screen_surface-extension-isn.patch | 267 +++++ ...ay-for-EGL_MESA_screen_surface-extension-.patch | 41 + .../0007-Install-few-more-test-programs.patch | 74 ++ ...dd-few-missing-.glsl-.vert-.frag-files-to.patch | 101 ++ ...glsl-perf-Install-.glsl-.vert-.frag-files.patch | 73 ++ meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb | 53 + meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb | 11 + meta/recipes-graphics/mesa/mesa.inc | 189 ++++ ..._sw-include-xlib_sw_winsys.h-only-when-HA.patch | 52 + ...ate-NativeDisplayType-depending-on-config.patch | 362 +++++++ .../mesa/mesa/0006-fix-out-of-tree-egl.patch | 48 + meta/recipes-graphics/mesa/mesa_10.1.3.bb | 19 + meta/recipes-graphics/mesa/mesa_git.bb | 23 + .../mini-x-session/files/mini-x-session | 39 + .../mini-x-session/mini-x-session_0.1.bb | 27 + .../recipes-graphics/mx/mx-1.0/fix-build-dir.patch | 46 + .../mx/mx-1.0/fix-test-includes.patch | 20 + meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 14 + meta/recipes-graphics/mx/mx.inc | 21 + .../packagegroups/packagegroup-core-clutter.bb | 21 + .../packagegroups/packagegroup-core-directfb.bb | 17 + .../packagegroups/packagegroup-core-x11-base.bb | 17 + .../packagegroups/packagegroup-core-x11-xserver.bb | 19 + .../packagegroups/packagegroup-core-x11.bb | 32 + meta/recipes-graphics/pango/pango.inc | 97 ++ .../pango/pango/multilib-fix-clean.patch | 75 ++ meta/recipes-graphics/pango/pango/run-ptest | 3 + meta/recipes-graphics/pango/pango_1.36.6.bb | 12 + meta/recipes-graphics/piglit/piglit_git.bb | 51 + .../pong-clock/pong-clock/pong-clock-no-flicker.c | 410 ++++++++ meta/recipes-graphics/pong-clock/pong-clock_1.0.bb | 18 + .../obsolete_automake_macros.patch | 15 + .../startup-notification_0.12.bb | 27 + meta/recipes-graphics/tslib/tslib/ts.conf | 25 + meta/recipes-graphics/tslib/tslib/tslib.sh | 8 + meta/recipes-graphics/tslib/tslib_1.1.bb | 53 + .../liberation-fonts/30-liberation-aliases.conf | 17 + .../ttf-fonts/liberation-fonts_1.04.bb | 38 + .../ttf-fonts/ttf-bitstream-vera_1.10.bb | 38 + meta/recipes-graphics/waffle/waffle_1.3.0.bb | 32 + meta/recipes-graphics/wayland/mtdev_1.1.5.bb | 18 + ...disable-macro-checks-not-used-for-scanner.patch | 50 + meta/recipes-graphics/wayland/wayland_1.5.0.bb | 41 + meta/recipes-graphics/wayland/weston-init.bb | 19 + meta/recipes-graphics/wayland/weston-init/init | 56 + .../weston/disable-wayland-scanner-pkg-check.patch | 13 + .../weston/make-lcms-explicitly-configurable.patch | 43 + .../make-libwebp-explicitly-configurable.patch | 37 + .../recipes-graphics/wayland/weston/weston.desktop | 9 + meta/recipes-graphics/wayland/weston/weston.png | Bin 0 -> 2383 bytes meta/recipes-graphics/wayland/weston_1.5.0.bb | 87 ++ .../x11-common/x11-common/etc/X11/Xdefaults | 3 + .../x11-common/x11-common/etc/X11/Xserver | 12 + .../x11-common/x11-common/etc/X11/Xsession | 38 + .../x11-common/etc/X11/Xsession.d/12keymap.sh | 4 + .../x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh | 13 + .../etc/X11/Xsession.d/89xdgautostart.sh | 7 + .../etc/X11/Xsession.d/90XWindowManager.sh | 7 + .../x11-common/x11-common/etc/X11/default.xmodmap | 260 +++++ .../x11-common/x11-common/gplv2-license.patch | 355 +++++++ meta/recipes-graphics/x11-common/x11-common_0.1.bb | 19 + .../x11-common/xserver-nodm-init.bb | 52 + .../x11-common/xserver-nodm-init/Xusername | 1 + .../xserver-nodm-init/gplv2-license.patch | 355 +++++++ .../x11-common/xserver-nodm-init/xserver-nodm | 64 ++ .../x11-common/xserver-nodm-init/xserver-nodm.conf | 1 + .../xserver-nodm-init/xserver-nodm.service | 10 + .../recipes-graphics/x11vnc/files/endian-fix.patch | 24 + .../x11vnc/files/starting-fix.patch | 25 + meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 23 + .../fix_watch_cursor.patch | 17 + .../use-relative-symlinks.patch | 25 + .../xcursor-transparent-theme_0.1.1.bb | 19 + .../pointercal-xinput/pointercal.xinput | 1 + .../xinput-calibrator/pointercal-xinput_0.0.bb | 20 + .../xinput-calibrator/30xinput_calibrate.sh | 7 + ...t_calibrator_pointercal.sh-to-be-run-as-n.patch | 66 ++ .../xinput-calibrator/xinput-calibrator_git.bb | 35 + meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 22 + .../recipes-graphics/xorg-app/mkfontscale_1.1.1.bb | 18 + meta/recipes-graphics/xorg-app/rgb_1.0.5.bb | 17 + meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb | 20 + meta/recipes-graphics/xorg-app/xauth_1.0.9.bb | 12 + .../xorg-app/xdpyinfo/disable-xkb.patch | 22 + meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb | 20 + meta/recipes-graphics/xorg-app/xev/diet-x11.patch | 82 ++ meta/recipes-graphics/xorg-app/xev_1.2.1.bb | 18 + meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb | 14 + meta/recipes-graphics/xorg-app/xhost_1.0.6.bb | 17 + meta/recipes-graphics/xorg-app/xinit_1.3.3.bb | 20 + meta/recipes-graphics/xorg-app/xinput_1.6.1.bb | 14 + meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb | 19 + .../xorg-app/xmodmap/gnu-source.patch | 60 ++ meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb | 19 + meta/recipes-graphics/xorg-app/xorg-app-common.inc | 19 + meta/recipes-graphics/xorg-app/xprop_1.2.2.bb | 18 + meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb | 15 + .../xorg-app/xset/disable-xkb.patch | 26 + meta/recipes-graphics/xorg-app/xset_1.2.3.bb | 19 + meta/recipes-graphics/xorg-app/xvinfo_1.1.2.bb | 15 + meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb | 15 + .../xorg-driver/xf86-input-evdev_2.9.0.bb | 20 + .../xorg-driver/xf86-input-keyboard_1.8.0.bb | 13 + .../xorg-driver/xf86-input-keyboard_git.bb | 16 + .../xorg-driver/xf86-input-mouse/unbreak.patch | 21 + .../xorg-driver/xf86-input-mouse_1.9.1.bb | 15 + .../xorg-driver/xf86-input-mouse_git.bb | 18 + .../always_include_xorg_server.h.patch | 60 ++ .../xorg-driver/xf86-input-synaptics_1.8.0.bb | 22 + .../xorg-driver/xf86-input-synaptics_git.bb | 18 + .../always_include_config.h.patch | 81 ++ .../xorg-driver/xf86-input-vmmouse_13.0.0.bb | 28 + .../xorg-driver/xf86-video-cirrus_1.5.2.bb | 13 + .../xorg-driver/xf86-video-fbdev_0.4.4.bb | 9 + .../always_include_xorg_server.h.patch | 24 + ...Map-changes-of-DamageUnregister-API-in-1..patch | 29 + .../xf86-video-intel/configure-dri.patch | 166 +++ .../xf86-video-intel/disable-dri2-tests.patch | 50 + .../xf86-video-intel/disable-x11-dri3.patch | 17 + .../xorg-driver/xf86-video-intel_2.21.15.bb | 32 + .../xorg-driver/xf86-video-intel_2.99.912.bb | 39 + .../xorg-driver/xf86-video-modesetting_0.8.1.bb | 8 + .../xorg-driver/xf86-video-omap/configure.patch | 74 ++ .../xorg-driver/xf86-video-omap_git.bb | 48 + ...a-large-CRTC-upper-limit-to-not-prune-lar.patch | 41 + ...virtual-size-when-configuring-framebuffer.patch | 32 + .../xf86-video-omapfb/0003-force-plain-mode.patch | 31 + .../xf86-video-omapfb/0004-blacklist-tv-out.patch | 33 + .../0005-Attempt-to-fix-VRFB.patch | 325 ++++++ ...0006-omapfb-port-to-new-xserver-video-API.patch | 272 +++++ .../0007-always_include_xorg_server.h.patch | 48 + .../xorg-driver/xf86-video-omapfb_git.bb | 34 + .../xorg-driver/xf86-video-vesa_2.3.3.bb | 21 + ...001-configure-fix-build-without-xatracker.patch | 37 + .../0002-add-option-for-vmwgfx.patch | 98 ++ .../xorg-driver/xf86-video-vmware_13.0.2.bb | 19 + .../xorg-driver/xorg-driver-common.inc | 41 + .../xorg-driver/xorg-driver-input.inc | 11 + .../xorg-driver/xorg-driver-video.inc | 8 + .../xorg-font/encodings/nocompiler.patch | 33 + meta/recipes-graphics/xorg-font/encodings_1.0.4.bb | 22 + .../xorg-font/font-alias-1.0.3/nocompiler.patch | 32 + .../recipes-graphics/xorg-font/font-alias_1.0.3.bb | 24 + meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 26 + .../xorg-font/xorg-font-common.inc | 44 + .../xorg-font/xorg-minimal-fonts.bb | 27 + .../xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz | Bin 0 -> 4637 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz | Bin 0 -> 4551 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz | Bin 0 -> 4409 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz | Bin 0 -> 4689 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz | Bin 0 -> 4502 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz | Bin 0 -> 4614 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz | Bin 0 -> 4547 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz | Bin 0 -> 4519 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz | Bin 0 -> 4418 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz | Bin 0 -> 4572 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz | Bin 0 -> 4541 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz | Bin 0 -> 4550 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz | Bin 0 -> 4035 bytes .../xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz | Bin 0 -> 4645 bytes .../xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz | Bin 0 -> 5057 bytes .../xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz | Bin 0 -> 76746 bytes .../xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz | Bin 0 -> 4643 bytes .../misc/6x13B-ISO8859-10.pcf.gz | Bin 0 -> 4569 bytes .../misc/6x13B-ISO8859-13.pcf.gz | Bin 0 -> 4700 bytes .../misc/6x13B-ISO8859-14.pcf.gz | Bin 0 -> 4494 bytes .../misc/6x13B-ISO8859-15.pcf.gz | Bin 0 -> 4638 bytes .../misc/6x13B-ISO8859-16.pcf.gz | Bin 0 -> 4539 bytes .../xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz | Bin 0 -> 4498 bytes .../xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz | Bin 0 -> 4362 bytes .../xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz | Bin 0 -> 4584 bytes .../xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz | Bin 0 -> 4500 bytes .../xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz | Bin 0 -> 4529 bytes .../xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz | Bin 0 -> 4008 bytes .../xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz | Bin 0 -> 4653 bytes .../xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz | Bin 0 -> 23787 bytes .../xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz | Bin 0 -> 4219 bytes .../misc/6x13O-ISO8859-10.pcf.gz | Bin 0 -> 4152 bytes .../misc/6x13O-ISO8859-13.pcf.gz | Bin 0 -> 4275 bytes .../misc/6x13O-ISO8859-14.pcf.gz | Bin 0 -> 4083 bytes .../misc/6x13O-ISO8859-15.pcf.gz | Bin 0 -> 4209 bytes .../misc/6x13O-ISO8859-16.pcf.gz | Bin 0 -> 4111 bytes .../xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz | Bin 0 -> 4115 bytes .../xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz | Bin 0 -> 3959 bytes .../xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz | Bin 0 -> 4154 bytes .../xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz | Bin 0 -> 4075 bytes .../xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz | Bin 0 -> 4124 bytes .../xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz | Bin 0 -> 4206 bytes .../xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz | Bin 0 -> 15495 bytes .../xorg-minimal-fonts/misc/cursor.pcf.gz | Bin 0 -> 5225 bytes .../xorg-font/xorg-minimal-fonts/misc/fonts.dir | 410 ++++++++ meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb | 20 + meta/recipes-graphics/xorg-lib/libfontenc_1.1.2.bb | 17 + meta/recipes-graphics/xorg-lib/libice_1.0.9.bb | 27 + .../xorg-lib/libpciaccess_0.13.2.bb | 14 + .../xorg-lib/libpthread-stubs_0.3.bb | 26 + meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb | 23 + .../recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb | 19 + meta/recipes-graphics/xorg-lib/libx11.inc | 41 + .../xorg-lib/libx11/X18NCMSstubs.diff | 520 +++++++++ .../xorg-lib/libx11/disable_tests.patch | 22 + .../xorg-lib/libx11/fix-disable-xlocale.diff | 17 + .../xorg-lib/libx11/fix-utf8-wrong-define.patch | 19 + .../libx11/libX11-Add-missing-NULL-check.patch | 72 ++ ...use-XCOMM-instead-of-for-comments-in-Comp.patch | 101 ++ meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb | 12 + meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb | 24 + .../xorg-lib/libxcalibrate/fix-xcb.patch | 29 + .../recipes-graphics/xorg-lib/libxcalibrate_git.bb | 22 + meta/recipes-graphics/xorg-lib/libxcb.inc | 27 + .../xorg-lib/libxcb/disable-check.patch | 25 + ...owns-socket-and-no-other-threads-are-writ.patch | 121 +++ .../xorg-lib/libxcb/xcbincludedir.patch | 28 + meta/recipes-graphics/xorg-lib/libxcb_1.10.bb | 13 + meta/recipes-graphics/xorg-lib/libxcb_git.bb | 10 + .../libxcomposite/change-include-order.patch | 18 + .../xorg-lib/libxcomposite_0.4.4.bb | 28 + .../recipes-graphics/xorg-lib/libxcursor_1.1.14.bb | 22 + meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb | 28 + meta/recipes-graphics/xorg-lib/libxdmcp_1.1.1.bb | 26 + meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb | 26 + meta/recipes-graphics/xorg-lib/libxext_git.bb | 24 + meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb | 22 + meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb | 22 + meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb | 33 + meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb | 21 + .../recipes-graphics/xorg-lib/libxinerama_1.1.3.bb | 20 + .../xorg-lib/libxkbcommon_0.4.3.bb | 20 + meta/recipes-graphics/xorg-lib/libxkbfile_1.0.8.bb | 18 + meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb | 33 + meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb | 27 + meta/recipes-graphics/xorg-lib/libxrandr_1.4.2.bb | 23 + meta/recipes-graphics/xorg-lib/libxrender_0.9.8.bb | 23 + meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb | 20 + .../xorg-lib/libxscrnsaver_1.2.2.bb | 23 + meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb | 17 + .../xorg-lib/libxt/libxt_fix_for_x32.patch | 19 + meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb | 44 + meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb | 20 + meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb | 18 + meta/recipes-graphics/xorg-lib/libxvmc_1.0.8.bb | 19 + .../recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb | 19 + .../xorg-lib/libxxf86misc_1.0.3.bb | 20 + meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.3.bb | 20 + ...lated-workarounds-in-cpu-features-detecti.patch | 144 +++ .../xorg-lib/pixman/mips-export-revert.patch | 22 + meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb | 38 + .../xorg-lib/xcb-util-image_0.3.9.bb | 11 + .../xorg-lib/xcb-util-keysyms_0.3.9.bb | 10 + .../xorg-lib/xcb-util-renderutil_0.3.9.bb | 10 + .../recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb | 11 + meta/recipes-graphics/xorg-lib/xcb-util.inc | 23 + meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb | 8 + .../xorg-lib/xkeyboard-config_2.12.bb | 31 + meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 26 + meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb | 24 + .../xorg-proto/bigreqsproto_1.1.2.bb | 16 + .../xorg-proto/calibrateproto/fix.patch | 42 + .../xorg-proto/calibrateproto_git.bb | 19 + .../xorg-proto/compositeproto_0.4.2.bb | 21 + .../xorg-proto/damageproto_1.2.1.bb | 20 + meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb | 18 + meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb | 15 + meta/recipes-graphics/xorg-proto/dri2proto_git.bb | 18 + meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb | 14 + meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb | 22 + .../xorg-proto/fontsproto_2.1.3.bb | 18 + meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb | 18 + .../xorg-proto/inputproto_2.3.1.bb | 20 + meta/recipes-graphics/xorg-proto/inputproto_git.bb | 19 + meta/recipes-graphics/xorg-proto/kbproto_1.0.6.bb | 18 + .../xorg-proto/presentproto_git.bb | 22 + .../xorg-proto/randrproto_1.4.0.bb | 19 + .../xorg-proto/recordproto_1.14.2.bb | 18 + .../xorg-proto/renderproto_0.11.1.bb | 21 + .../xorg-proto/resourceproto_1.2.0.bb | 19 + .../xorg-proto/scrnsaverproto_1.2.2.bb | 19 + .../xorg-proto/videoproto_2.3.2.bb | 14 + meta/recipes-graphics/xorg-proto/xcb-proto.inc | 25 + meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb | 9 + meta/recipes-graphics/xorg-proto/xcb-proto_git.bb | 9 + .../xorg-proto/xcmiscproto_1.2.2.bb | 17 + .../recipes-graphics/xorg-proto/xextproto_7.3.0.bb | 24 + .../xorg-proto/xf86dgaproto_2.1.bb | 18 + .../xorg-proto/xf86driproto_2.1.1.bb | 17 + .../xorg-proto/xf86miscproto_0.9.3.bb | 17 + .../xorg-proto/xf86vidmodeproto_2.3.1.bb | 18 + .../xorg-proto/xineramaproto_1.2.1.bb | 17 + .../xorg-proto/xorg-proto-common.inc | 26 + .../xorg-proto/xproto/xproto_fix_for_x32.patch | 22 + meta/recipes-graphics/xorg-proto/xproto_7.0.26.bb | 20 + .../recipes-graphics/xorg-util/gccmakedep_1.0.3.bb | 17 + .../recipes-graphics/xorg-util/makedepend_1.0.5.bb | 21 + .../xorg-util/util-macros_1.19.0.bb | 19 + .../xorg-util/xorg-util-common.inc | 13 + .../xserver-xf86-config/qemuarm/xorg.conf | 69 ++ .../xserver-xf86-config/qemumips/xorg.conf | 70 ++ .../xserver-xf86-config/qemumips64/xorg.conf | 69 ++ .../xserver-xf86-config/qemuppc/xorg.conf | 69 ++ .../xserver-xf86-config/qemush4/xorg.conf | 69 ++ .../xserver-xf86-config/qemux86-64/xorg.conf | 64 ++ .../xserver-xf86-config/qemux86/xorg.conf | 64 ++ .../xorg-xserver/xserver-xf86-config/xorg.conf | 0 .../xorg-xserver/xserver-xf86-config_0.1.bb | 20 + .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 159 +++ .../xorg-xserver/xserver-xorg/crosscompile.patch | 22 + .../fix_open_max_preprocessor_error.patch | 15 + .../xorg-xserver/xserver-xorg/macro_tweak.patch | 25 + .../xserver-xorg/mips64-compiler.patch | 29 + .../xorg-xserver/xserver-xorg/present-module.patch | 66 ++ .../xserver-xorg/xorg-CVE-2013-6424.patch | 31 + .../xserver-xorg/xshmfence-option.patch | 57 + .../xorg-xserver/xserver-xorg_1.15.1.bb | 35 + meta/recipes-graphics/xrestop/xrestop_0.4.bb | 22 + .../xtscal/xtscal/30xTs_Calibrate.sh | 13 + .../xtscal/xtscal/change-cross.patch | 18 + meta/recipes-graphics/xtscal/xtscal/cleanup.patch | 621 +++++++++++ .../xtscal/dso_linking_change_build_fix.patch | 27 + meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 31 + .../xvideo-tests/xvideo-tests_git.bb | 14 + 390 files changed, 16993 insertions(+) create mode 100644 meta/recipes-graphics/cairo/cairo-fpu.inc create mode 100644 meta/recipes-graphics/cairo/cairo.inc create mode 100644 meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch create mode 100644 meta/recipes-graphics/cairo/cairo_1.12.16.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.4.bb create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb create mode 100644 meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch create mode 100644 meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb create mode 100644 meta/recipes-graphics/directfb/directfb.inc create mode 100644 meta/recipes-graphics/directfb/directfb/configurefix.patch create mode 100644 meta/recipes-graphics/directfb/directfb/fixsepbuild.patch create mode 100644 meta/recipes-graphics/directfb/directfb/fusion.patch create mode 100644 meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch create mode 100644 meta/recipes-graphics/directfb/directfb_1.7.4.bb create mode 100644 meta/recipes-graphics/drm/libdrm.inc create mode 100644 meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch create mode 100644 meta/recipes-graphics/drm/libdrm/installtests.patch create mode 100644 meta/recipes-graphics/drm/libdrm_2.4.54.bb create mode 100644 meta/recipes-graphics/drm/libdrm_git.bb create mode 100644 meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb create mode 100644 meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb create mode 100644 meta/recipes-graphics/eglinfo/eglinfo.inc create mode 100644 meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb create mode 100644 meta/recipes-graphics/freetype/freetype_2.5.3.bb create mode 100644 meta/recipes-graphics/fstests/fstests_git.bb create mode 100644 meta/recipes-graphics/glew/glew/autotools.patch create mode 100644 meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch create mode 100644 meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch create mode 100644 meta/recipes-graphics/glew/glew_1.11.0.bb create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb create mode 100644 meta/recipes-graphics/images/core-image-clutter.bb create mode 100644 meta/recipes-graphics/images/core-image-directfb.bb create mode 100644 meta/recipes-graphics/images/core-image-weston.bb create mode 100644 meta/recipes-graphics/images/core-image-x11.bb create mode 100644 meta/recipes-graphics/libfakekey/libfakekey_git.bb create mode 100644 meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch create mode 100644 meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb create mode 100644 meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch create mode 100644 meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch create mode 100644 meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch create mode 100644 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb create mode 100644 meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb create mode 100644 meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license create mode 100644 meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch create mode 100644 meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch create mode 100644 meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch create mode 100644 meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb create mode 100644 meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session create mode 100644 meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb create mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch create mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 create mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig create mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb create mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb create mode 100644 meta/recipes-graphics/menu-cache/files/Fix-segfault.patch create mode 100644 meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb create mode 100644 meta/recipes-graphics/mesa/libglu_9.0.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch create mode 100644 meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb create mode 100644 meta/recipes-graphics/mesa/mesa.inc create mode 100644 meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch create mode 100644 meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch create mode 100644 meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch create mode 100644 meta/recipes-graphics/mesa/mesa_10.1.3.bb create mode 100644 meta/recipes-graphics/mesa/mesa_git.bb create mode 100644 meta/recipes-graphics/mini-x-session/files/mini-x-session create mode 100644 meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb create mode 100644 meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch create mode 100644 meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch create mode 100644 meta/recipes-graphics/mx/mx-1.0_1.4.7.bb create mode 100644 meta/recipes-graphics/mx/mx.inc create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb create mode 100644 meta/recipes-graphics/pango/pango.inc create mode 100644 meta/recipes-graphics/pango/pango/multilib-fix-clean.patch create mode 100644 meta/recipes-graphics/pango/pango/run-ptest create mode 100644 meta/recipes-graphics/pango/pango_1.36.6.bb create mode 100644 meta/recipes-graphics/piglit/piglit_git.bb create mode 100644 meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c create mode 100644 meta/recipes-graphics/pong-clock/pong-clock_1.0.bb create mode 100644 meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch create mode 100644 meta/recipes-graphics/startup-notification/startup-notification_0.12.bb create mode 100644 meta/recipes-graphics/tslib/tslib/ts.conf create mode 100644 meta/recipes-graphics/tslib/tslib/tslib.sh create mode 100644 meta/recipes-graphics/tslib/tslib_1.1.bb create mode 100644 meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf create mode 100644 meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb create mode 100644 meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb create mode 100644 meta/recipes-graphics/waffle/waffle_1.3.0.bb create mode 100644 meta/recipes-graphics/wayland/mtdev_1.1.5.bb create mode 100644 meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch create mode 100644 meta/recipes-graphics/wayland/wayland_1.5.0.bb create mode 100644 meta/recipes-graphics/wayland/weston-init.bb create mode 100644 meta/recipes-graphics/wayland/weston-init/init create mode 100644 meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch create mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch create mode 100644 meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch create mode 100644 meta/recipes-graphics/wayland/weston/weston.desktop create mode 100644 meta/recipes-graphics/wayland/weston/weston.png create mode 100644 meta/recipes-graphics/wayland/weston_1.5.0.bb create mode 100644 meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults create mode 100644 meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver create mode 100644 meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession create mode 100644 meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh create mode 100644 meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh create mode 100644 meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh create mode 100644 meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh create mode 100644 meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap create mode 100644 meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch create mode 100644 meta/recipes-graphics/x11-common/x11-common_0.1.bb create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init.bb create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch create mode 100755 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service create mode 100644 meta/recipes-graphics/x11vnc/files/endian-fix.patch create mode 100644 meta/recipes-graphics/x11vnc/files/starting-fix.patch create mode 100644 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb create mode 100644 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch create mode 100644 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch create mode 100644 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb create mode 100644 meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb create mode 100644 meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb create mode 100644 meta/recipes-graphics/xorg-app/rgb_1.0.5.bb create mode 100644 meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb create mode 100644 meta/recipes-graphics/xorg-app/xauth_1.0.9.bb create mode 100644 meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch create mode 100644 meta/recipes-graphics/xorg-app/xdpyinfo_1.3.1.bb create mode 100644 meta/recipes-graphics/xorg-app/xev/diet-x11.patch create mode 100644 meta/recipes-graphics/xorg-app/xev_1.2.1.bb create mode 100644 meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb create mode 100644 meta/recipes-graphics/xorg-app/xhost_1.0.6.bb create mode 100644 meta/recipes-graphics/xorg-app/xinit_1.3.3.bb create mode 100644 meta/recipes-graphics/xorg-app/xinput_1.6.1.bb create mode 100644 meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb create mode 100644 meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch create mode 100644 meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb create mode 100644 meta/recipes-graphics/xorg-app/xorg-app-common.inc create mode 100644 meta/recipes-graphics/xorg-app/xprop_1.2.2.bb create mode 100644 meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb create mode 100644 meta/recipes-graphics/xorg-app/xset/disable-xkb.patch create mode 100644 meta/recipes-graphics/xorg-app/xset_1.2.3.bb create mode 100644 meta/recipes-graphics/xorg-app/xvinfo_1.1.2.bb create mode 100644 meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.0.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.1.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.2.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.1.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb create mode 100644 meta/recipes-graphics/xorg-driver/xorg-driver-common.inc create mode 100644 meta/recipes-graphics/xorg-driver/xorg-driver-input.inc create mode 100644 meta/recipes-graphics/xorg-driver/xorg-driver-video.inc create mode 100644 meta/recipes-graphics/xorg-font/encodings/nocompiler.patch create mode 100644 meta/recipes-graphics/xorg-font/encodings_1.0.4.bb create mode 100644 meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch create mode 100644 meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb create mode 100644 meta/recipes-graphics/xorg-font/font-util_1.3.0.bb create mode 100644 meta/recipes-graphics/xorg-font/xorg-font-common.inc create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz create mode 100644 meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir create mode 100644 meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb create mode 100644 meta/recipes-graphics/xorg-lib/libfontenc_1.1.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libice_1.0.9.bb create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb create mode 100644 meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11.inc create mode 100644 meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff create mode 100644 meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxcb.inc create mode 100644 meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxcb/ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxcb_1.10.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxcb_git.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxdmcp_1.1.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxext_git.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxkbfile_1.0.8.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxpm_3.5.11.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxrandr_1.4.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxrender_0.9.8.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxtst_1.2.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxv_1.0.10.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxvmc_1.0.8.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.3.bb create mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch create mode 100644 meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch create mode 100644 meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util.inc create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb create mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb create mode 100644 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc create mode 100644 meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb create mode 100644 meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb create mode 100644 meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch create mode 100644 meta/recipes-graphics/xorg-proto/calibrateproto_git.bb create mode 100644 meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb create mode 100644 meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb create mode 100644 meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb create mode 100644 meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb create mode 100644 meta/recipes-graphics/xorg-proto/dri2proto_git.bb create mode 100644 meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb create mode 100644 meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb create mode 100644 meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb create mode 100644 meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb create mode 100644 meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb create mode 100644 meta/recipes-graphics/xorg-proto/inputproto_git.bb create mode 100644 meta/recipes-graphics/xorg-proto/kbproto_1.0.6.bb create mode 100644 meta/recipes-graphics/xorg-proto/presentproto_git.bb create mode 100644 meta/recipes-graphics/xorg-proto/randrproto_1.4.0.bb create mode 100644 meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb create mode 100644 meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb create mode 100644 meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb create mode 100644 meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb create mode 100644 meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb create mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto.inc create mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb create mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto_git.bb create mode 100644 meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb create mode 100644 meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb create mode 100644 meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb create mode 100644 meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb create mode 100644 meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb create mode 100644 meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb create mode 100644 meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb create mode 100644 meta/recipes-graphics/xorg-proto/xorg-proto-common.inc create mode 100644 meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch create mode 100644 meta/recipes-graphics/xorg-proto/xproto_7.0.26.bb create mode 100644 meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb create mode 100644 meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb create mode 100644 meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb create mode 100644 meta/recipes-graphics/xorg-util/xorg-util-common.inc create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb create mode 100644 meta/recipes-graphics/xrestop/xrestop_0.4.bb create mode 100644 meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh create mode 100644 meta/recipes-graphics/xtscal/xtscal/change-cross.patch create mode 100644 meta/recipes-graphics/xtscal/xtscal/cleanup.patch create mode 100644 meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch create mode 100644 meta/recipes-graphics/xtscal/xtscal_0.6.3.bb create mode 100644 meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb (limited to 'meta/recipes-graphics') 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 @@ + +def get_cairo_fpu_setting(bb, d): + if d.getVar('TARGET_FPU', True) in [ 'soft' ]: + return "--disable-some-floating-point" + return "" + 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 @@ +SUMMARY = "The Cairo 2D vector graphics library" +DESCRIPTION = "Cairo is a multi-platform library providing anti-aliased \ +vector-based rendering for multiple target backends. Paths consist \ +of line segments and cubic splines and can be rendered at any width \ +with various join and cap styles. All colors may be specified with \ +optional translucence (opacity/alpha) and combined using the \ +extended Porter/Duff compositing algebra as found in the X Render \ +Extension." +HOMEPAGE = "http://cairographics.org" +BUGTRACKER = "http://bugs.freedesktop.org" +SECTION = "libs" +LICENSE = "MPL-1 & LGPLv2.1" +X11DEPENDS = "virtual/libx11 libsm libxrender libxext" +DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" +PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" +PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" +PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" +PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" +PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" + +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require cairo-fpu.inc +EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \ + --enable-tee \ + " + +inherit autotools pkgconfig + +# We don't depend on binutils so we need to disable this +export ac_cv_lib_bfd_bfd_openr="no" +# Ensure we don't depend on LZO +export ac_cv_lib_lzo2_lzo2a_decompress="no" + +BBCLASSEXTEND = "native" + +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 @@ +From bdf15c249130568093676ed3b6c91f6f5e06f089 Mon Sep 17 00:00:00 2001 +From: Uli Schlachter +Date: Mon, 21 Jul 2014 17:10:16 +0200 +Subject: [PATCH] Remove LTO support + +This just never worked too well and caused too many issues. I don't think anyone +will miss this. + +As mentioned in the below bug report, proper LTO support also requires using +special versions of ranlib, nm and ar which support the LTO object files. +Otherwise, calling the normal ranlib on an .a library breaks the list of +exported symbols and thus completely breaks the static library. + +This (partly) reverts the following commits: + +c3645d97ebd24c6f7ad850785d585aebc706a11c configure.ac: Add a --disable-lto configure option +d486ea30f1a58640a1178de74f705a73845b1cda configure: Conditionally include -flto +0870c6fb5b39dcc04fa376123848adde2d06d2ce gcc-4.5 warnings and optimisation flags. + +(The last commit is the one which brought us -flto in the first place even +though it doesn't talk about this. It's also the one which is only reverted +partly.) + +Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=77060 +CC: Chris Wilson +Signed-off-by: Uli Schlachter +Reviewed-by: Bryce Harrington +Signed-off-by: Martin Jansa + +Upstream-Status: Backport (will be in 1.14*) +Signed-off-by: Martin Jansa +--- + build/configure.ac.warnings | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings +index f984eb2..2c4e34d 100644 +--- a/build/configure.ac.warnings ++++ b/build/configure.ac.warnings +@@ -35,17 +35,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ + + dnl We also abuse the warning-flag facility to enable other compiler + dnl options. Namely, the following: +- +-dnl -flto working really needs a test link, not just a compile +- +-safe_MAYBE_WARN="$MAYBE_WARN" +-MAYBE_WARN="$MAYBE_WARN -flto" +-AC_TRY_LINK([],[ +- int main(int argc, char **argv) { return 0; } +-],[],[ +- MAYBE_WARN="$safe_MAYBE_WARN" +-]) +- + MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" + + dnl Also to turn various gcc/glibc-specific preprocessor checks +-- +2.0.2 + 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 @@ +require cairo.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ + file://0001-Remove-LTO-support.patch \ +" + +SRC_URI[md5sum] = "a1304edcdc99282f478b995ee5f8f854" +SRC_URI[sha256sum] = "2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846" + +PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" + +SUMMARY_${PN} = "The Cairo 2D vector graphics library" +DESCRIPTION_${PN} = "Cairo is a multi-platform library providing anti-aliased \ +vector-based rendering for multiple target backends. Paths consist \ +of line segments and cubic splines and can be rendered at any width \ +with various join and cap styles. All colors may be specified with \ +optional translucence (opacity/alpha) and combined using the \ +extended Porter/Duff compositing algebra as found in the X Render \ +Extension." + +SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library" +DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API." + +SUMMARY_cairo-script-interpreter = "The Cairo library script interpreter" +DESCRIPTION_cairo-script-interpreter = "The Cairo script interpreter implements \ +CairoScript. CairoScript is used by tracing utilities to enable the ability \ +to replay rendering." + +DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" + +FILES_${PN} = "${libdir}/libcairo.so.*" +FILES_${PN}-dev += "${libdir}/cairo/*.la ${libdir}/cairo/*.so" +#FILES_${PN}-dbg += "${libdir}/cairo/.debug" +#FILES_${PN}-staticdev += "${libdir}/cairo/*.a" +FILES_cairo-gobject = "${libdir}/libcairo-gobject.so.*" +FILES_cairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" +FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*" + +do_install_append () { + rm -rf ${D}${bindir}/cairo-sphinx + rm -rf ${D}${libdir}/cairo/cairo-fdr* + rm -rf ${D}${libdir}/cairo/cairo-sphinx* + rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* + rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* +} diff --git a/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 @@ +SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPLv2.1+" + +inherit clutter + +DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" +PACKAGE_BEFORE_PN += "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build" + +EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" +EDEPENDS_GLX = "virtual/libgl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf" + +EDEPENDS_EVDEV = "libxkbcommon" +ERDEPENDS_EVDEV = "xkeyboard-config" + +# Disable pretty much everything, override in platform specific set up +EXTRA_OECONF += "--disable-introspection \ + --disable-quartz-backend \ + --disable-win32-backend \ + --disable-gdk-backend \ + --disable-cex100-backend \ + --disable-tslib-input \ + " + +PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" +PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" +PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" +PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}" +PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" + +# Default configuration, distros might want to override +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" + +FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug" +FILES_${PN}-examples = "${libdir}/clutter/examples" + +do_configure_prepend() { + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 200001010000 ${S}/po/clutter-1.0.pot +} diff --git a/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 @@ +Install the examples to $libdir/clutter/. + +Signed-off-by: Ross Burton +Upstream-Status: Inappropriate + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 4b9b449..232cd19 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -38,6 +38,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter + +-noinst_PROGRAMS = $(all_examples) ++exampledir = $(pkglibdir)/examples ++example_PROGRAMS = $(all_examples) + + EXTRA_DIST = redhand.png diff --git a/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 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29" +SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63" + +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 @@ +From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 +From: Tomas Frydrych +Date: Thu, 11 Oct 2012 08:53:03 +0100 +Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against + cogl-1.14 + +Cogl 1.14 exposes various GL types through the public API but it does not +pull in the GL type definitions through its public headers; specifically +compilation will fail due to undefined GL_TEXTURE_2D. So include the headers +the hard way. + +Upstream-Status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 +Signed-off-by: Tomas Frydrych +--- + clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +index 9b4b53c..f092581 100644 +--- a/clutter-gst/clutter-gst-video-sink.c ++++ b/clutter-gst/clutter-gst-video-sink.c +@@ -42,6 +42,23 @@ + #include "config.h" + #endif + ++/* ++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. ++ */ ++#include ++ ++#ifdef COGL_HAS_GLES1 ++#include ++#include ++#elif COGL_HAS_GLES2 ++#include ++#include ++#elif COGL_HAS_GL ++#include ++#else ++#error Unknown cogl configuration ++#endif ++ + #include "clutter-gst-video-sink.h" + #include "clutter-gst-util.h" + #include "clutter-gst-private.h" +-- +1.7.10.4 + 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 @@ +Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin + +Upstream-Status: Inappropriate [configuration] + +Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 + +Signed-off-by: Tomas Frydrych + +Index: git/examples/Makefile.am +=================================================================== +--- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800 ++++ git/examples/Makefile.am 2011-01-31 10:14:34.000000000 +0800 +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = video-player video-sink video-sink-navigation ++bin_PROGRAMS = video-player video-sink video-sink-navigation + + INCLUDES = -I$(top_srcdir) \ + $(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 @@ +SUMMARY = "GStreamer integration library for Clutter" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPLv2+" + +inherit clutter + +SRC_URI += "file://enable-tests.patch" + +DEPENDS = "gst-plugins-base gst-plugins-bad clutter-1.0" +RDEPENDS_${PN} += "gst-meta-base" +PACKAGES =+ "${PN}-examples" + +EXTRA_OECONF += "--disable-introspection" + +FILES_${PN} += "${libdir}/gstreamer-0.10/lib*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/lib*.so" +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 @@ +require clutter-gst-1.0.inc + +SRC_URI += "file://cogl-1.14.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" + +SRC_URI[archive.md5sum] = "d60ab0118730cecd5dd9988ad7da034b" +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 @@ +SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPLv2+" + +inherit clutter + +DEPENDS = "clutter-1.0 gtk+3" +PACKAGES =+ "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build" + +EXTRA_OECONF += "--disable-introspection" + 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 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI[archive.md5sum] = "ef50b52ffc2a18704eb62f13dd8d6198" +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 @@ +SUMMARY = "Modern 3D graphics API with associated utility APIs" +HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" +LICENSE = "MIT" + +inherit clutter + +DEPENDS = "glib-2.0 gdk-pixbuf" +PACKAGES =+ "${PN}-examples \ + libcogl libcogl-dev \ + libcogl-gles2 libcogl-gles2-dev \ + libcogl-pango libcogl-pango-dev \ + libcogl-path libcogl-path-dev" +AUTOTOOLS_AUXDIR = "${S}/build" + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL = "virtual/libgl libdrm" +EDEPENDS_GLES2 = "virtual/libgles2" +EDEPENDS_KMS = "libdrm virtual/egl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" +EDEPENDS_WAYLAND = "virtual/mesa wayland" + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +ERDEPENDS_GL = "libgl" +ERDEPENDS_GLES2 = "libgles2" + +# GLESv1 is rarely tested, so disable it +EXTRA_OECONF += "--disable-introspection \ + --enable-examples-install \ + --enable-debug \ + --disable-gles1 \ + --disable-cairo \ + " + +# OpenGL/GLX +PACKAGECONFIG[glx] = "--enable-gl --enable-glx,--disable-gl --disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11},${ERDEPENDS_GL}" + +# GLESv2 +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" + +# EGL backends +PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" +PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" +PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" + +# Wayland (server-side) +PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" + +# Support rendering text directly with Pango +PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" + +# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by +# default. +PACKAGECONFIG ??= "cogl-pango gles2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" + +FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" +FILES_libcogl = "${libdir}/libcogl${SOLIBS}" +FILES_libcogl-dev = "${includedir}/cogl/cogl \ + ${libdir}/libcogl${SOLIBSDEV} \ + ${libdir}/libcogl.la \ + ${libdir}/pkgconfig/cogl-1.0.pc \ + ${libdir}/pkgconfig/cogl-2.0-experimental.pc \ + ${libdir}/pkgconfig/cogl-gl-1.0.pc" +FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" +FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \ + ${libdir}/libcogl-gles2${SOLIBSDEV} \ + ${libdir}/libcogl-gles2.la \ + ${libdir}/pkgconfig/cogl-gles2-experimental.pc" +FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" +FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \ + ${libdir}/libcogl-pango${SOLIBSDEV} \ + ${libdir}/libcogl-pango.la \ + ${libdir}/pkgconfig/cogl-pango-1.0.pc" + +FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" +FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \ + ${libdir}/libcogl-path${SOLIBSDEV} \ + ${libdir}/libcogl-path.la \ + ${libdir}/pkgconfig/cogl-path-1.0.pc" + +# For backwards compatibility after Debian-renaming +RPROVIDES_libcogl = "cogl-1.0" +RCONFLICTS_libcogl = "cogl-1.0" +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 @@ +require cogl-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" + +SRC_URI[archive.md5sum] = "952155d526d35f297737266408e842b5" +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 @@ +From 88077ed156a714f32bb408f422278d61611ffd41 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Sat, 26 Jul 2014 16:57:46 -0300 +Subject: [PATCH] configure.in: Fix string argument syntax + +Upstream-Status: Submitted + +Signed-off-by: Otavio Salvador +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index bfe1b82..e939bbd 100644 +--- a/configure.in ++++ b/configure.in +@@ -65,7 +65,7 @@ fi) + + DIRECTFB_REQUIRED_VERSION=1.4.14 + +-PKG_CHECK_MODULES(DIRECTFB, directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], ++PKG_CHECK_MODULES([DIRECTFB], directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], + AC_MSG_ERROR([$DIRECTFB_PKG_ERRORS + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest version + *** of DirectFB is available from http://www.directfb.org/.])) +-- +1.7.10.4 + diff --git a/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 @@ +SUMMARY = "Example DirectFB applications" +DESCRIPTION = "The DirectFB-examples package contains a set of simple DirectFB \ + applications that can be used to test and demonstrate various DirectFB \ + features" +DEPENDS = "directfb" +SECTION = "libs" +LICENSE = "MIT" + +SRC_URI = " \ + http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \ + file://configure.in-Fix-string-argument-syntax.patch \ + " + +LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f" + +S = "${WORKDIR}/DirectFB-examples-${PV}" + +inherit autotools pkgconfig + +SRC_URI[md5sum] = "8b60c867af295481c32a8c7fc5802307" +SRC_URI[sha256sum] = "9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a" diff --git a/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 @@ +SUMMARY = "Graphics abstraction library for the Linux Framebuffer Device" +DESCRIPTION = "DirectFB is a thin library that provides developers \ +with hardware graphics acceleration, input device handling and \ +abstraction, an integrated windowing system with support for \ +translucent windows and multiple display layers on top of the \ +Linux framebuffer device." +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" + +HOMEPAGE = "http://directfb.org" +DEPENDS = "jpeg libpng freetype zlib tslib" + +SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ + file://configurefix.patch \ + file://fusion.patch" + +S = "${WORKDIR}/DirectFB-${PV}" + +LDFLAGS_append =" -lts -lm" + +BINCONFIG = "${bindir}/directfb-config" + +inherit autotools binconfig-disabled pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" +PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" +PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" +PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" + +EXTRA_OECONF = "\ + --with-gfxdrivers=none \ + --enable-libmpeg3=no \ + --enable-freetype=yes \ + --enable-sdl=no \ + --enable-vnc=no \ + --disable-x11 \ + --disable-mesa \ +" + +#Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default +#this will cause directfb build failure on x86 arch, so filter out it. +TARGET_CFLAGS_x86 := "${@oe_filter_out('-fno-omit-frame-pointer', '${TARGET_CFLAGS}', d)}" + +#PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*" +# +#python populate_packages_prepend () { +# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') +# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') +#} + +# NOTE: monolithic packaging for now, should improve that eventually + + + +FILES_${PN}-dbg += "\ + ${libdir}/directfb-${RV}/*/*/.debug/*.so \ + ${libdir}/directfb-${RV}/*/.debug/*.so \ +" + +FILES_${PN}-dev += "\ + ${bindir}/directfb-config \ + ${libdir}/directfb-${RV}/systems/*.la \ + ${libdir}/directfb-${RV}/inputdrivers/*.la \ + ${libdir}/directfb-${RV}/interfaces/*/*.la \ + ${libdir}/directfb-${RV}/wm/*.la \ +" + +FILES_${PN} += "\ + ${libdir}/directfb-${RV}/systems/*.so \ + ${libdir}/directfb-${RV}/inputdrivers/*.so \ + ${libdir}/directfb-${RV}/interfaces/*/*.so \ + ${libdir}/directfb-${RV}/wm/*.so \ + ${datadir}/directfb-${PV} \ +" diff --git a/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 @@ +Libtool needs these set correctly else we end up with pointless rpaths +such as the QA warnings: + +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfblayer contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbmaster contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgifft contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbdump contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinput contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbfx contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbscreen contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgiff contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinspector contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdfiff contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinfo contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbpenmount contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbg contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6 contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6 contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_fbdev.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_devmem.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_dummy.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_ft2.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/wm/libdirectfbwm_default.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_zytronic.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_penmount.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_linux_input.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_serialmouse.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_mutouch.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_tslib.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_joystick.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_sonypi.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_lirc.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_wm97xx_ts.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_ps2mouse.so contains probably-redundant RPATH /usr/lib +WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_keyboard.so contains probably-redundant RPATH /usr/lib + +Upstream-Status: Pending + +RP 2012/03/16 + +Index: DirectFB-1.4.15/configure.in +=================================================================== +--- DirectFB-1.4.15.orig/configure.in 2012-03-16 13:32:23.692402879 +0000 ++++ DirectFB-1.4.15/configure.in 2012-03-16 13:33:22.312400960 +0000 +@@ -97,13 +97,6 @@ + AC_CHECK_SIZEOF(long long) + AC_CHECK_FUNCS(fork) + +- +-## Work around libstuhl during cross build... +-if test "$host" != "$build"; then +- sys_lib_dlsearch_path_spec="" +- sys_lib_search_path_spec="" +-fi +- + AC_PATH_PROGS(PERL, perl5 perl) + + AC_PATH_PROG(MAN2HTML, man2html, no) diff --git a/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 @@ +Fix out of tree builds + +Upstream-Status: Pending + +RP 2013/03/21 + +Index: DirectFB-1.6.1/configure.in +=================================================================== +--- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 ++++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 +@@ -111,7 +111,7 @@ + AC_PATH_TOOL(FLUXCOMP, fluxcomp) + AC_SUBST(FLUXCOMP) + if test -z "$FLUXCOMP"; then +- if ! test -e src/core/CoreDFB.cpp; then ++ if ! test -e $srcdir/src/core/CoreDFB.cpp; then + AC_MSG_ERROR([ + *** DirectFB compilation requires fluxcomp *** + 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 @@ +directfb: Fix for hangs in direct_test, fusion_skirmish on exit + +Upstream-Status: Pending +Signed-off-by: Lauren Post + +--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800 ++++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800 +@@ -2853,9 +2853,14 @@ + direct_mutex_lock( &world->event_dispatcher_mutex ); + + while (1) { +- if (!world->event_dispatcher_buffers) ++ if (!world->event_dispatcher_buffers){ + direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); +- ++ if (world->dispatch_stop) { ++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); ++ direct_mutex_unlock( &world->event_dispatcher_mutex ); ++ return NULL; ++ } ++ } + buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; + D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer ); + +@@ -2872,6 +2877,11 @@ + //D_INFO("waiting...\n"); + D_ASSERT( buf->read_pos == buf->write_pos ); + direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); ++ if (world->dispatch_stop) { ++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); ++ direct_mutex_unlock( &world->event_dispatcher_mutex ); ++ return NULL; ++ } + } + + buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; diff --git a/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 @@ +Rename __no_instrument_function__ macro to avoid conficting redefinitions +of the same symbol. + +Upstream-Status: Pending +Signed-off-by: Andrei Gherzan + +Index: DirectFB-1.6.1/lib/direct/clock.c +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200 +@@ -36,28 +36,28 @@ + + /**********************************************************************************************************************/ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + long long + direct_clock_get_micros( void ) + { + return direct_clock_get_time( DIRECT_CLOCK_SESSION ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + long long + direct_clock_get_millis( void ) + { + return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL; + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + long long + direct_clock_get_abs_micros( void ) + { + return direct_clock_get_time( DIRECT_CLOCK_REALTIME ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + long long + direct_clock_get_abs_millis( void ) + { +Index: DirectFB-1.6.1/lib/direct/debug.c +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200 +@@ -48,7 +48,7 @@ + + #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_debug_log( DirectLogDomain *domain, + unsigned int debug_level, /* 1-9, 0 = info */ +@@ -63,7 +63,7 @@ + va_end( ap ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_debug_at( DirectLogDomain *domain, + const char *format, ... ) +@@ -77,7 +77,7 @@ + + #endif /* DIRECT_BUILD_DEBUGS */ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_debug_at_always( DirectLogDomain *domain, + const char *format, ... ) +@@ -93,7 +93,7 @@ + + #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_break( const char *func, + const char *file, +@@ -123,7 +123,7 @@ + direct_trap( "Break", SIGABRT ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_assertion( const char *exp, + const char *func, +@@ -144,7 +144,7 @@ + direct_trap( "Assertion", SIGTRAP ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_assumption( const char *exp, + const char *func, +Index: DirectFB-1.6.1/lib/direct/interface.c +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200 +@@ -522,7 +522,7 @@ + + /**************************************************************************************************/ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + static InterfaceDesc * + allocate_interface_desc( void ) + { +@@ -543,7 +543,7 @@ + return &alloc_list[alloc_count++]; + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + static __inline__ void + fill_interface_desc( InterfaceDesc *desc, + const void *interface_ptr, +@@ -565,7 +565,7 @@ + + /**************************************************************************************************/ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_dbg_interface_add( const char *func, + const char *file, +@@ -586,7 +586,7 @@ + direct_mutex_unlock( &alloc_lock ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_dbg_interface_remove( const char *func, + const char *file, +Index: DirectFB-1.6.1/lib/direct/log.c +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200 +@@ -128,7 +128,7 @@ + return DR_OK; + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + DirectResult + direct_log_printf( DirectLog *log, + const char *format, ... ) +@@ -197,7 +197,7 @@ + return DR_OK; + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_log_lock( DirectLog *log ) + { +@@ -211,7 +211,7 @@ + direct_mutex_lock( &log->lock ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_log_unlock( DirectLog *log ) + { +@@ -262,7 +262,7 @@ + + /**********************************************************************************************************************/ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + DirectLog * + direct_log_default( void ) + { +Index: DirectFB-1.6.1/lib/direct/log_domain.c +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200 +@@ -69,7 +69,7 @@ + + /**********************************************************************************************************************/ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + static __inline__ LogDomainEntry * + lookup_domain( const char *name, bool sub ); + +@@ -104,7 +104,7 @@ + return NULL; + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + static DirectLogLevel + check_domain( DirectLogDomain *domain ); + +@@ -207,7 +207,7 @@ + /* FIXME: merge following */ + + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + DirectResult + direct_log_domain_vprintf( DirectLogDomain *domain, + DirectLogLevel level, +@@ -268,7 +268,7 @@ + return DR_OK; + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + DirectResult + direct_log_domain_log( DirectLogDomain *domain, + DirectLogLevel level, +Index: DirectFB-1.6.1/lib/direct/mem.c +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200 +@@ -121,7 +121,7 @@ + + /**********************************************************************************************************************/ + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + static __inline__ MemDesc * + fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace ) + { +Index: DirectFB-1.6.1/lib/direct/messages.c +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200 +@@ -40,7 +40,7 @@ + + #if DIRECT_BUILD_TEXT + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_info( const char *format, ... ) + { +@@ -57,7 +57,7 @@ + direct_log_printf( NULL, "(*) %s", buf ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_error( const char *format, ... ) + { +@@ -76,7 +76,7 @@ + direct_trace_print_stack( NULL ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_derror( DirectResult result, const char *format, ... ) + { +@@ -95,7 +95,7 @@ + direct_trace_print_stack( NULL ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_perror( int erno, const char *format, ... ) + { +@@ -114,7 +114,7 @@ + direct_trace_print_stack( NULL ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_dlerror( const char *dlerr, const char *format, ... ) + { +@@ -133,7 +133,7 @@ + direct_trace_print_stack( NULL ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_once( const char *func, + const char *file, +@@ -155,7 +155,7 @@ + direct_trace_print_stack( NULL ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_unimplemented( const char *func, + const char *file, +@@ -166,7 +166,7 @@ + direct_trace_print_stack( NULL ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_bug( const char *func, + const char *file, +@@ -188,7 +188,7 @@ + direct_trace_print_stack( NULL ); + } + +-__no_instrument_function__ ++__dfb_no_instrument_function__ + void + direct_messages_warn( const char *func, + const char *file, +Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200 +@@ -74,7 +74,7 @@ + + #define __inline__ inline + #define D_UNUSED __attribute__((unused)) +-#define __no_instrument_function__ __attribute__((no_instrument_function)) ++#define __dfb_no_instrument_function__ __attribute__((no_instrument_function)) + #define __constructor__ __attribute__((constructor)) + #define __destructor__ __attribute__((destructor)) + #define __typeof__(x) typeof(x) +Index: DirectFB-1.6.1/lib/direct/util.c +=================================================================== +--- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300 ++++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200 +@@ -110,7 +110,7 @@ + /* + * translates errno to DirectResult + */ +-__no_instrument_function__ ++__dfb_no_instrument_function__ + DirectResult + errno2result( int erno ) + { 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 @@ +require directfb.inc + +RV = "1.7-4" + +DEPENDS += "sysfsutils" + +SRC_URI += "file://fixsepbuild.patch" + +EXTRA_OECONF = "\ + --enable-freetype=yes \ + --enable-zlib \ + --with-gfxdrivers=none \ + --disable-sdl \ + --disable-vnc \ + --disable-x11 \ + --disable-imlib2 \ + --disable-mesa \ +" + +LEAD_SONAME = "libdirectfb-1.7.so.0" + +SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" +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 @@ +SUMMARY = "Userspace interface to the kernel DRM services" +DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \ +stands for \"Direct Rendering Manager\", which is the kernel portion of the \ +\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \ +accelerated OpenGL drivers." +HOMEPAGE = "http://dri.freedesktop.org" +SECTION = "x11/base" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" +SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" +PROVIDES = "drm" +DEPENDS = "libpthread-stubs udev" + +# be aware that libdrm_2.4.44.bb ignores this +INC_PR = "r4" + +#libpciaccess is required starting from libdrm 2.4.26 +DEPENDS += " libpciaccess" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--disable-cairo-tests \ + --enable-omap-experimental-api \ + --enable-freedreno-experimental-api \ + --enable-install-test-programs \ + --disable-manpages \ + " +ALLOW_EMPTY_${PN}-drivers = "1" +PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ + ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno" + +RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ + ${PN}-exynos ${PN}-freedreno" + +FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" +FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" +FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" +FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" +FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" +FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" +FILES_${PN}-kms = "${libdir}/libkms*.so.*" +FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" 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 @@ +uclibc headers need to know if _GNU_SOURCE is defined or not and its defined +in config.h so include it first to get the definition if its there fixed build +problems on uclibc + +test_decode.c:107:2: error: implicit declaration of function 'open_memstream' [-Werror=implicit-function-declaration] + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +Index: libdrm-2.4.30/intel/test_decode.c +=================================================================== +--- libdrm-2.4.30.orig/intel/test_decode.c 2012-02-03 14:28:46.409355918 -0800 ++++ libdrm-2.4.30/intel/test_decode.c 2012-02-03 14:29:02.357356689 -0800 +@@ -21,6 +21,8 @@ + * IN THE SOFTWARE. + */ + ++#include "config.h" ++ + #include + #include + #include +@@ -31,7 +33,6 @@ + #include + #include + +-#include "config.h" + #include "intel_bufmgr.h" + #include "intel_chipset.h" + 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 @@ +tests: also install tests app + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Yu Ke + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index bf1987f..d909e19 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -6,10 +6,11 @@ AM_CPPFLAGS = \ + + LDADD = $(top_builddir)/libdrm.la + +-check_PROGRAMS = \ ++bin_PROGRAMS = \ + dristat \ + drmstat + ++check_PROGRAMS = + SUBDIRS = modeprint + + 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 @@ +require libdrm.inc + +SRC_URI += "file://installtests.patch \ + file://GNU_SOURCE_definition.patch \ + " +SRC_URI[md5sum] = "56e98a9c2073c3fab7f95e003b657f46" +SRC_URI[sha256sum] = "d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9" + 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 @@ +require libdrm.inc + +SRC_URI = "git://anongit.freedesktop.org/git/mesa/drm" + +S = "${WORKDIR}/git" + +DEFAULT_PREFERENCE = "-1" + +SRCREV = "e01d68f9f3acfc35fe164283904b5d058c2ab378" +PV = "2.4.40+git${SRCPV}" +PR = "${INC_PR}.0" + 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 @@ +EGLINFO_PLATFORM ?= "fb" +EGLINFO_BINARY_NAME ?= "eglinfo-fb" + +include eglinfo.inc + +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 @@ +EGLINFO_PLATFORM ?= "x11" +EGLINFO_BINARY_NAME ?= "eglinfo-x11" + +include eglinfo.inc + +DEPENDS += "virtual/libx11" + +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 @@ +SUMMARY = "Utility for printing information EGL and its client APIs (OpenGL, OpenGL ES, OpenVG)" +SECTION = "graphics" +LICENSE = "Zlib" +HOMEPAGE = "https://github.com/dv1/eglinfo" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c" + +DEPENDS = "virtual/egl" + +SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master" +SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de" + +S = "${WORKDIR}/git" + +inherit waf + +# BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, which +# append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS and set +# EGL_DEVICE as appropriate. +EGLINFO_DEVICE ?= "generic" + +EXTRA_OECONF = "--platform=${EGLINFO_PLATFORM} \ + --device=${EGLINFO_DEVICE} \ + --sysroot ${STAGING_DIR_TARGET}" + +do_install_append() { + mv ${D}/${bindir}/eglinfo ${D}/${bindir}/${EGLINFO_BINARY_NAME} +} diff --git a/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 @@ +SUMMARY = "Generic font configuration library" +DESCRIPTION = "Fontconfig is a font configuration and customization library, which \ +does not depend on the X Window System. It is designed to locate \ +fonts within the system and select them according to requirements \ +specified by applications. \ +Fontconfig is not a rasterization library, nor does it impose a \ +particular rasterization library on the application. The X-specific \ +library 'Xft' uses fontconfig along with freetype to specify and \ +rasterize fonts." + +HOMEPAGE = "http://www.fontconfig.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" + +LICENSE = "MIT-style & MIT & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \ + file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \ + file://src/fccache.c;beginline=1143;endline=1158;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" + +SECTION = "libs" + +DEPENDS = "expat freetype zlib" + +SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ + " +SRC_URI[md5sum] = "e75e303b4f7756c2b16203a57ac87eba" +SRC_URI[sha256sum] = "b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d" + +PACKAGES =+ "fontconfig-utils" +FILES_${PN} =+ "${datadir}/xml/*" +FILES_fontconfig-utils = "${bindir}/*" + +# Work around past breakage in debian.bbclass +RPROVIDES_fontconfig-utils = "libfontconfig-utils" +RREPLACES_fontconfig-utils = "libfontconfig-utils" +RCONFLICTS_fontconfig-utils = "libfontconfig-utils" +DEBIAN_NOAUTONAME_fontconfig-utils = "1" + +inherit autotools pkgconfig + +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" + +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}" + +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 @@ +SUMMARY = "Freetype font rendering library" +DESCRIPTION = "FreeType is a software font engine that is designed to be small, efficient, \ +highly customizable, and portable while capable of producing high-quality output (glyph \ +images). It can be used in graphics libraries, display servers, font conversion tools, text \ +image generation tools, and many other products as well." +HOMEPAGE = "http://www.freetype.org/" +BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" + +LICENSE = "FreeType | GPLv2+" +LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \ + file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ + file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" + +SECTION = "libs" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2" +SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65" +SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" + +BINCONFIG = "${bindir}/freetype-config" + +inherit autotools-brokensep pkgconfig binconfig-disabled multilib_header + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OEMAKE_class-native = "" +EXTRA_OECONF = "--without-zlib --without-bzip2 CC_BUILD='${BUILD_CC}'" +TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64" + + +PACKAGECONFIG ??= "" +PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" +# This results in a circular dependency so enabling is non-trivial +PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz" + +do_configure() { + cd builds/unix + libtoolize --force --copy + aclocal -I . + gnu-configize --force + autoconf + cd ${S} + oe_runconf +} + +do_configure_class-native() { + (cd builds/unix && gnu-configize) || die "failure running gnu-configize" + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +do_install_append() { + oe_multilib_header freetype2/config/ftconfig.h +} + +BBCLASSEXTEND = "native" + 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 @@ +SUMMARY = "Various benchmarning tests for X" +HOMEPAGE = "http://www.o-hand.com" +SECTION = "devel" +LICENSE = "Zlib" +DEPENDS = "pango libxext libxft virtual/libx11 gtk+" + +SRCREV = "e5939ff608b95cdd4d0ab0e1935781ab9a276ac0" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/${BPN}" + +LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655" + +S = "${WORKDIR}/git/tests" + +inherit autotools pkgconfig 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 @@ + +Upstream-Status: Inappropriate [configuration] + +Index: glew/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/Makefile.am 2009-12-02 00:30:23.296641663 +0100 +@@ -0,0 +1,5 @@ ++ ++ACLOCAL_AMFLAGS = -I m4 --install ++ ++SUBDIRS = include src ++ +Index: glew/configure.ac +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/configure.ac 2009-12-02 00:30:23.296641663 +0100 +@@ -0,0 +1,67 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.62]) ++AC_INIT([glew], [1.9.0], [BUG-REPORT-ADDRESS]) ++AC_CONFIG_SRCDIR([src/glew.c]) ++AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++LT_INIT ++ ++# Checks for programs. ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++ ++# Checks for libraries. ++ ++# Checks for header files. ++AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_TYPE_INT32_T ++AC_TYPE_INT64_T ++AC_TYPE_UINT64_T ++AC_CHECK_TYPES([ptrdiff_t]) ++ ++# Checks for library functions. ++AC_FUNC_MALLOC ++AC_CHECK_FUNCS([strtol]) ++ ++# Check for pkgconfig libs ++ ++PKG_CHECK_MODULES([X11], [x11]) ++AC_SUBST([X11_LIBS]) ++AC_SUBST([X11_CFLAGS]) ++ ++PKG_CHECK_MODULES([XMU], [xmu]) ++AC_SUBST([XMU_LIBS]) ++AC_SUBST([XMU_CFLAGS]) ++ ++PKG_CHECK_MODULES([XI], [xi]) ++AC_SUBST([XI_LIBS]) ++AC_SUBST([XI_CFLAGS]) ++ ++PKG_CHECK_MODULES([XEXT], [xext]) ++AC_SUBST([XEXT_LIBS]) ++AC_SUBST([XEXT_CFLAGS]) ++ ++# Check for GLU is enough and imples gl so no doubled -lGL in LDFLAGS ++PKG_CHECK_MODULES([GLU], [glu]) ++AC_SUBST([GLU_LIBS]) ++AC_SUBST([GLU_CFLAGS]) ++ ++# ENABLE option for Multiple Rendering Contexts support ++AC_CHECK_ENABLE_GLEWMX ++ ++# for now we use the same version as the package, but that should be avoided ++# in the future ++ ++AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) ++ ++AC_CONFIG_FILES([Makefile ++ include/Makefile ++ src/Makefile]) ++AC_OUTPUT +Index: glew/src/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/src/Makefile.am 2009-12-02 00:33:48.690786110 +0100 +@@ -0,0 +1,35 @@ ++ ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ ++if ENABLE_GLEWMX ++AM_CPPFLAGS += -DGLEW_MX ++endif ++ ++AM_CFLAGS = @X11_CFLAGS@ \ ++ @XMU_CFLAGS@ \ ++ @XI_CFLAGS@ \ ++ @XEXT_CFLAGS@ \ ++ @GLU_CFLAGS@ ++ ++lib_LTLIBRARIES = libGLEW.la ++ ++libGLEW_la_SOURCES = glew.c ++ ++libGLEW_la_LIBADD = @X11_LIBS@ \ ++ @XMU_LIBS@ \ ++ @XI_LIBS@ \ ++ @XEXT_LIBS@ \ ++ @GLU_LIBS@ ++ ++libGLEW_la_LDFLAGS = -version-number @LIBGLEW_SO_VERSION@ ++ ++bin_PROGRAMS = glewinfo visualinfo ++ ++glewinfo_SOURCES = glewinfo.c ++ ++glewinfo_LDADD = libGLEW.la ++ ++visualinfo_SOURCES = visualinfo.c ++ ++visualinfo_LDADD = libGLEW.la ++ +Index: glew/m4/glewmx.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/m4/glewmx.m4 2009-12-02 00:30:23.296641663 +0100 +@@ -0,0 +1,11 @@ ++ ++AC_DEFUN([AC_CHECK_ENABLE_GLEWMX],[ ++AC_MSG_CHECKING([whether to include Multiple Rendering Contexts support]) ++AC_ARG_ENABLE([glewmx], ++ [AS_HELP_STRING([--enable-glewmx], [enable GLEW Multiple Rendering Contexts (default is no)])], ++ [ENABLE_GLEWMX="$enableval"], ++ [ENABLE_GLEWMX="no"]) ++AC_MSG_RESULT([${ENABLE_GLEWMX}]) ++AM_CONDITIONAL([ENABLE_GLEWMX], [test x"${ENABLE_GLEWMX}" = "xyes"]) ++]) ++ +Index: glew/include/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/include/Makefile.am 2009-12-02 00:30:23.296641663 +0100 +@@ -0,0 +1,3 @@ ++ ++nobase_include_HEADERS = GL/glew.h GL/glxew.h GL/wglew.h ++ 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 @@ + +We maintain the autotools configure.ac and Makefile.am, to correctly +provide the glew.pc, the following patch is needed. + +Upstream-Status: Inappropriate + +Signed-off-by: Saul Wold + +Index: glew-1.11.0/Makefile.am +=================================================================== +--- glew-1.11.0.orig/Makefile.am ++++ glew-1.11.0/Makefile.am +@@ -3,3 +3,5 @@ ACLOCAL_AMFLAGS = -I m4 --install + + SUBDIRS = include src + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glew.pc +Index: glew-1.11.0/configure.ac +=================================================================== +--- glew-1.11.0.orig/configure.ac ++++ glew-1.11.0/configure.ac +@@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) + + AC_CONFIG_FILES([Makefile + include/Makefile +- src/Makefile]) ++ src/Makefile ++ glew.pc]) + AC_OUTPUT +Index: glew-1.11.0/glew.pc.in +=================================================================== +--- glew-1.11.0.orig/glew.pc.in ++++ glew-1.11.0/glew.pc.in +@@ -5,7 +5,7 @@ includedir=${prefix}/include/GL + + Name: glew + Description: The OpenGL Extension Wrangler library +-Version: @version@ +-Cflags: -I${includedir} @cflags@ +-Libs: -L${libdir} -l@libname@ +-Requires: @requireslib@ ++Version: @VERSION@ ++Cflags: -I${includedir} @CFLAGS@ ++Libs: -L${libdir} -lGLEW ++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 @@ +Upstream-Status: Pending + +This patch fixes following issue with automake 1.12 + +| automake: warnings are treated as errors +| /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 +| /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' + +Signed-Off-By: Nitin A Kamble +2012/05/03 + +Index: glew-1.7.0/configure.ac +=================================================================== +--- glew-1.7.0.orig/configure.ac ++++ glew-1.7.0/configure.ac +@@ -14,6 +14,9 @@ LT_INIT + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_LN_S ++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR + + # Checks for libraries. + 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 @@ +SUMMARY = "OpenGL extension loading library" +DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." +HOMEPAGE = "http://glew.sourceforge.net/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586" +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" + +DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" + + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ + file://autotools.patch \ + file://glew_fix_for_automake-1.12.patch \ + file://fix-glew.pc-install.patch \ + " + +SRC_URI[md5sum] = "f6d72c7426a5f66580ad09e50816450a" +SRC_URI[sha256sum] = "69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6" + +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 @@ +SUMMARY = "Text shaping library" +DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ + file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ +" + +SECTION = "libs" + +SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" +SRC_URI[md5sum] = "531ee8650626ecddcd90b2a4637e31d4" +SRC_URI[sha256sum] = "0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed" +inherit autotools pkgconfig lib_package + +DEPENDS = "glib-2.0 cairo freetype" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" + +PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev" + +FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" +FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*" +FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ + ${libdir}/libharfbuzz-icu.so \ + ${libdir}/pkgconfig/harfbuzz-icu.pc \ +" 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 @@ +DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \ +which enables development of rich and animated graphical user interfaces." + +IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear" + +LICENSE = "MIT" + +IMAGE_INSTALL = "\ + ${CORE_IMAGE_BASE_INSTALL} \ + packagegroup-core-clutter-core \ + " + +inherit core-image diff --git a/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 @@ +SUMMARY = "An image that uses DirectFB instead of X11" +LICENSE = "MIT" + + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit core-image distro_features_check + +REQUIRED_DISTRO_FEATURES = "directfb" +CONFLICT_DISTRO_FEATURES = "x11" + +IMAGE_INSTALL += "\ + ${CORE_IMAGE_BASE_INSTALL} \ + packagegroup-core-full-cmdline \ + packagegroup-core-directfb \ +" diff --git a/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 @@ +SUMMARY = "A very basic Wayland image with a terminal" + +IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs" + +LICENSE = "MIT" + +inherit core-image distro_features_check + +REQUIRED_DISTRO_FEATURES = "wayland" + +CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples" diff --git a/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 @@ +SUMMARY = "A very basic X11 image with a terminal" + +IMAGE_FEATURES += "splash package-management x11-base" + +LICENSE = "MIT" + +inherit core-image distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/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 @@ +SUMMARY = "Library for converting characters to X key-presses" +DESCRIPTION = "libfakekey is a simple library for converting UTF-8 characters into 'fake' X \ +key-presses." +HOMEPAGE = "http://matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://src/libfakekey.c;endline=30;md5=602b5ccd48f64407510867f3373b448c" + +DEPENDS = "libxtst" +SECTION = "x11/wm" + +SRCREV = "e327ff049b8503af2dadffa84370a0860b9fb682" +PV = "0.0+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/${BPN}" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig gettext 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 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 19c3d242034748b3c60765683e1ff4e2df970205 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 10 Dec 2013 11:37:32 +0000 +Subject: [PATCH] configure: improve libpng detection + +Instead of looking for "libpng12" explicitly though pkg-config and then falling +back to library hunting, just use pkg-config to find "libpng" which is provided +by both libpng12 and libpng16. + +This also makes the libpng detection deterministic. + +Signed-off-by: Ross Burton +--- + configure.ac | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8a28076..65d7c79 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,7 @@ AC_ARG_ENABLE(jpeg, + enable_jpeg=$enableval, enable_jpeg=no) + + AC_ARG_ENABLE(png, +- [ --disable-png disable png support [default=no]], ++ [ --disable-png disable PNG support [default=enabled]], + enable_png=$enableval, enable_png=yes ) + + AC_ARG_ENABLE(doxygen-docs, +@@ -156,29 +156,10 @@ fi + dnl ------ Check for PNG --------------------------------------------------- + + if test x$enable_png != xno; then +- AC_MSG_CHECKING(for libpng12) +- if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng12; then +- AC_MSG_RESULT(yes) +- PNG_LIBS=`$PKG_CONFIG --libs libpng12` +- PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12` +- AC_DEFINE(USE_PNG, [1], [Use Png]) +- SUPPORTS_PNG=1 +- PNG_REQUIRED="libpng12" +- else +- AC_MSG_RESULT(no) +- # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] ) +- AC_CHECK_LIB([png], [png_create_read_struct], [have_png="yes"], [have_png="no"]) +- +- if test x$have_png=xyes && test x$have_png_h=xyes; then +- AC_DEFINE(USE_PNG, [1], [Use Png]) +- SUPPORTS_PNG=1 +- PNG_LIBS="-lpng -lz" +- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS" +- else +- AC_MSG_WARN([*** Cannot find PNG, disabling support]) +- enable_png=no +- fi +- fi ++ PKG_CHECK_MODULES(PNG, libpng) ++ AC_DEFINE(USE_PNG, [1], [Use PNG]) ++ SUPPORTS_PNG=1 ++ PNG_REQUIRED="libpng" + fi + + +-- +1.8.5 + diff --git a/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 @@ +SUMMARY = "Matchbox window manager core library" +SECTION = "x11/libs" +HOMEPAGE = "http://matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.com/" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ + file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \ + file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51" + +DEPENDS = "virtual/libx11 libxext" + +SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \ + file://libpng.patch" + +SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" +SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "jpeg png xft xsettings" +PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" +PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,libxft" +PACKAGECONFIG[xsettings] = "--enable-xsettings,--disable-xsettings,libxsettings-client" diff --git a/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 @@ +Upstream-Status: Inappropriate [configuration] + +Index: SDL-1.2.15/configure.in +=================================================================== +--- SDL-1.2.15.orig/configure.in ++++ SDL-1.2.15/configure.in +@@ -48,9 +48,9 @@ AC_CONFIG_AUX_DIR([build-scripts]) + dnl AC_CANONICAL_HOST + AC_C_BIGENDIAN + if test x$ac_cv_c_bigendian = xyes; then +- AC_DEFINE(SDL_BYTEORDER, 4321) ++ AC_DEFINE(SDL_BYTEORDER, 4321, "Byte Order") + else +- AC_DEFINE(SDL_BYTEORDER, 1234) ++ AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order") + fi + + dnl Check for tools +@@ -134,7 +134,7 @@ AC_ARG_ENABLE(libc, + AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]), + , enable_libc=yes) + if test x$enable_libc = xyes; then +- AC_DEFINE(HAVE_LIBC) ++ AC_DEFINE(HAVE_LIBC,1,"") + + dnl Check for C library headers + AC_HEADER_STDC +@@ -145,7 +145,7 @@ if test x$enable_libc = xyes; then + if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then + AC_CHECK_TYPE(int64_t) + if test x$ac_cv_type_int64_t = xyes; then +- AC_DEFINE(SDL_HAS_64BIT_TYPE) ++ AC_DEFINE(SDL_HAS_64BIT_TYPE,1,"") + fi + have_inttypes=yes + fi +@@ -161,11 +161,11 @@ if test x$enable_libc = xyes; then + + AC_FUNC_MEMCMP + if test x$ac_cv_func_memcmp_working = xyes; then +- AC_DEFINE(HAVE_MEMCMP) ++ AC_DEFINE(HAVE_MEMCMP,1,"") + fi + AC_FUNC_STRTOD + if test x$ac_cv_func_strtod = xyes; then +- AC_DEFINE(HAVE_STRTOD) ++ AC_DEFINE(HAVE_STRTOD,1,"") + fi + AC_CHECK_FUNC(mprotect, + AC_TRY_COMPILE([ +@@ -191,40 +191,40 @@ if test x$have_inttypes != xyes; then + AC_CHECK_SIZEOF(long, 4) + AC_CHECK_SIZEOF(long long, 8) + if test x$ac_cv_sizeof_char = x1; then +- AC_DEFINE(int8_t, signed char) +- AC_DEFINE(uint8_t, unsigned char) ++ AC_DEFINE(int8_t, signed char,"") ++ AC_DEFINE(uint8_t, unsigned char,"") + fi + if test x$ac_cv_sizeof_short = x2; then +- AC_DEFINE(int16_t, signed short) +- AC_DEFINE(uint16_t, unsigned short) ++ AC_DEFINE(int16_t, signed short,"") ++ AC_DEFINE(uint16_t, unsigned short,"") + else + if test x$ac_cv_sizeof_int = x2; then +- AC_DEFINE(int16_t, signed int) +- AC_DEFINE(uint16_t, unsigned int) ++ AC_DEFINE(int16_t, signed int,"") ++ AC_DEFINE(uint16_t, unsigned int,"") + fi + fi + if test x$ac_cv_sizeof_int = x4; then +- AC_DEFINE(int32_t, signed int) +- AC_DEFINE(uint32_t, unsigned int) ++ AC_DEFINE(int32_t, signed int,"") ++ AC_DEFINE(uint32_t, unsigned int,"") + else + if test x$ac_cv_sizeof_long = x4; then +- AC_DEFINE(int32_t, signed long) +- AC_DEFINE(uint32_t, unsigned long) ++ AC_DEFINE(int32_t, signed long,"") ++ AC_DEFINE(uint32_t, unsigned long,"") + fi + fi + if test x$ac_cv_sizeof_long = x8; then +- AC_DEFINE(int64_t, signed long) +- AC_DEFINE(uint64_t, unsigned long) +- AC_DEFINE(SDL_HAS_64BIT_TYPE) ++ AC_DEFINE(int64_t, signed long,"") ++ AC_DEFINE(uint64_t, unsigned long,"") ++ AC_DEFINE(SDL_HAS_64BIT_TYPE,"") + else + if test x$ac_cv_sizeof_long_long = x8; then +- AC_DEFINE(int64_t, signed long long) +- AC_DEFINE(uint64_t, unsigned long long) +- AC_DEFINE(SDL_HAS_64BIT_TYPE) ++ AC_DEFINE(int64_t, signed long long,"") ++ AC_DEFINE(uint64_t, unsigned long long,"") ++ AC_DEFINE(SDL_HAS_64BIT_TYPE,"") + fi + fi +- AC_DEFINE(size_t, unsigned int) +- AC_DEFINE(uintptr_t, unsigned long) ++ AC_DEFINE(size_t, unsigned int,"") ++ AC_DEFINE(uintptr_t, unsigned long,"") + fi + + # Standard C sources +@@ -245,25 +245,25 @@ AC_ARG_ENABLE(audio, + AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]), + , enable_audio=yes) + if test x$enable_audio != xyes; then +- AC_DEFINE(SDL_AUDIO_DISABLED) ++ AC_DEFINE(SDL_AUDIO_DISABLED,1,"") + fi + AC_ARG_ENABLE(video, + AC_HELP_STRING([--enable-video], [Enable the video subsystem [[default=yes]]]), + , enable_video=yes) + if test x$enable_video != xyes; then +- AC_DEFINE(SDL_VIDEO_DISABLED) ++ AC_DEFINE(SDL_VIDEO_DISABLED,1,"") + fi + AC_ARG_ENABLE(events, + AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]), + , enable_events=yes) + if test x$enable_events != xyes; then +- AC_DEFINE(SDL_EVENTS_DISABLED) ++ AC_DEFINE(SDL_EVENTS_DISABLED,1,"") + fi + AC_ARG_ENABLE(joystick, + AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]), + , enable_joystick=yes) + if test x$enable_joystick != xyes; then +- AC_DEFINE(SDL_JOYSTICK_DISABLED) ++ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"") + else + SOURCES="$SOURCES $srcdir/src/joystick/*.c" + fi +@@ -271,43 +271,43 @@ AC_ARG_ENABLE(cdrom, + AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]), + , enable_cdrom=yes) + if test x$enable_cdrom != xyes; then +- AC_DEFINE(SDL_CDROM_DISABLED) ++ AC_DEFINE(SDL_CDROM_DISABLED,1,"") + fi + AC_ARG_ENABLE(threads, + AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]), + , enable_threads=yes) + if test x$enable_threads != xyes; then +- AC_DEFINE(SDL_THREADS_DISABLED) ++ AC_DEFINE(SDL_THREADS_DISABLED,1,"") + fi + AC_ARG_ENABLE(timers, + AC_HELP_STRING([--enable-timers], [Enable the timer subsystem [[default=yes]]]), + , enable_timers=yes) + if test x$enable_timers != xyes; then +- AC_DEFINE(SDL_TIMERS_DISABLED) ++ AC_DEFINE(SDL_TIMERS_DISABLED,1,"") + fi + AC_ARG_ENABLE(file, + AC_HELP_STRING([--enable-file], [Enable the file subsystem [[default=yes]]]), + , enable_file=yes) + if test x$enable_file != xyes; then +- AC_DEFINE(SDL_FILE_DISABLED) ++ AC_DEFINE(SDL_FILE_DISABLED,1,"") + fi + AC_ARG_ENABLE(loadso, + AC_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [[default=yes]]]), + , enable_loadso=yes) + if test x$enable_loadso != xyes; then +- AC_DEFINE(SDL_LOADSO_DISABLED) ++ AC_DEFINE(SDL_LOADSO_DISABLED,1,"") + fi + AC_ARG_ENABLE(cpuinfo, + AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [[default=yes]]]), + , enable_cpuinfo=yes) + if test x$enable_cpuinfo != xyes; then +- AC_DEFINE(SDL_CPUINFO_DISABLED) ++ AC_DEFINE(SDL_CPUINFO_DISABLED,1,"") + fi + AC_ARG_ENABLE(assembly, + AC_HELP_STRING([--enable-assembly], [Enable assembly routines [[default=yes]]]), + , enable_assembly=yes) + if test x$enable_assembly = xyes; then +- AC_DEFINE(SDL_ASSEMBLY_ROUTINES) ++ AC_DEFINE(SDL_ASSEMBLY_ROUTINES,1,"") + fi + + dnl See if the OSS audio interface is supported +@@ -335,12 +335,12 @@ AC_HELP_STRING([--enable-oss], [support + int arg = SNDCTL_DSP_SETFRAGMENT; + ],[ + have_oss=yes +- AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H) ++ AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H,1,"") + ]) + fi + AC_MSG_RESULT($have_oss) + if test x$have_oss = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_OSS) ++ AC_DEFINE(SDL_AUDIO_DRIVER_OSS,1,"") + SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c" + SOURCES="$SOURCES $srcdir/src/audio/dma/*.c" + have_audio=yes +@@ -407,7 +407,7 @@ CheckDMEDIA() + AC_MSG_RESULT($have_dmedia) + # Set up files for the audio library + if test x$have_dmedia = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA) ++ AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA,1,"") + SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio" + have_audio=yes +@@ -444,7 +444,7 @@ CheckMME() + AC_MSG_RESULT($have_mme) + # Set up files for the audio library + if test x$have_mme = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO) ++ AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO,1,"") + SOURCES="$SOURCES $srcdir/src/audio/mme/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS" +@@ -467,7 +467,7 @@ AC_HELP_STRING([--enable-esd-shared], [d + , enable_esd_shared=yes) + esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] + +- AC_DEFINE(SDL_AUDIO_DRIVER_ESD) ++ AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"") + SOURCES="$SOURCES $srcdir/src/audio/esd/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS" + if test x$have_loadso != xyes && \ +@@ -477,7 +477,7 @@ AC_HELP_STRING([--enable-esd-shared], [d + if test x$have_loadso = xyes && \ + test x$enable_esd_shared = xyes && test x$esd_lib != x; then + echo "-- dynamic libesd -> $esd_lib" +- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib") ++ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "") + else + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS" + fi +@@ -564,7 +564,7 @@ AC_HELP_STRING([--enable-arts-shared], [ + , enable_arts_shared=yes) + arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] + +- AC_DEFINE(SDL_AUDIO_DRIVER_ARTS) ++ AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "") + SOURCES="$SOURCES $srcdir/src/audio/arts/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS" + if test x$have_loadso != xyes && \ +@@ -574,7 +574,7 @@ AC_HELP_STRING([--enable-arts-shared], [ + if test x$have_loadso = xyes && \ + test x$enable_arts_shared = xyes && test x$arts_lib != x; then + echo "-- dynamic libartsc -> $arts_lib" +- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib") ++ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"") + else + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS" + fi +@@ -634,7 +634,7 @@ AC_HELP_STRING([--enable-nas-shared], [d + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS" + fi + +- AC_DEFINE(SDL_AUDIO_DRIVER_NAS) ++ AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"") + SOURCES="$SOURCES $srcdir/src/audio/nas/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS" + have_audio=yes +@@ -649,7 +649,7 @@ CheckDiskAudio() + AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]), + , enable_diskaudio=yes) + if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_DISK) ++ AC_DEFINE(SDL_AUDIO_DRIVER_DISK,1,"") + SOURCES="$SOURCES $srcdir/src/audio/disk/*.c" + fi + } +@@ -661,7 +661,7 @@ CheckDummyAudio() + AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]), + , enable_dummyaudio=yes) + if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY) ++ AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY,1,"") + SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c" + fi + } +@@ -677,7 +677,7 @@ AC_HELP_STRING([--enable-mintaudio], [su + AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes) + if test x$have_mint_falcon_hdr = xyes; then + mintaudio=yes +- AC_DEFINE(SDL_AUDIO_DRIVER_MINT) ++ AC_DEFINE(SDL_AUDIO_DRIVER_MINT,1,"") + SOURCES="$SOURCES $srcdir/src/audio/mint/*.c" + SOURCES="$SOURCES $srcdir/src/audio/mint/*.S" + have_audio=yes +@@ -746,7 +746,7 @@ AC_HELP_STRING([--enable-nasm], [use nas + CompileNASM unquoted-sections || NASM="" + + if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then +- AC_DEFINE(SDL_HERMES_BLITTERS) ++ AC_DEFINE(SDL_HERMES_BLITTERS,1,"") + SOURCES="$SOURCES $srcdir/src/hermes/*.asm" + NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/" + +@@ -840,9 +840,9 @@ AC_HELP_STRING([--enable-altivec], [use + CFLAGS="$save_CFLAGS" + + if test x$have_gcc_altivec = xyes; then +- AC_DEFINE(SDL_ALTIVEC_BLITTERS) ++ AC_DEFINE(SDL_ALTIVEC_BLITTERS,1,"") + if test x$have_altivec_h_hdr = xyes; then +- AC_DEFINE(HAVE_ALTIVEC_H) ++ AC_DEFINE(HAVE_ALTIVEC_H,1,"") + fi + EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS" + fi +@@ -920,7 +920,7 @@ AC_HELP_STRING([--enable-ipod], [configu + + if test x$enable_ipod = xyes; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD" +- AC_DEFINE(SDL_VIDEO_DRIVER_IPOD) ++ AC_DEFINE(SDL_VIDEO_DRIVER_IPOD,1,"") + SOURCES="$SOURCES $srcdir/src/video/ipod/*.c" + fi + } +@@ -954,7 +954,7 @@ CheckNANOX() + EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB" + fi + +- AC_DEFINE(SDL_VIDEO_DRIVER_NANOX) ++ AC_DEFINE(SDL_VIDEO_DRIVER_NANOX,1,"") + SOURCES="$SOURCES $srcdir/src/video/nanox/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X" + have_video=yes +@@ -1020,7 +1020,7 @@ AC_HELP_STRING([--enable-x11-shared], [d + CFLAGS="$CFLAGS $X_CFLAGS" + LDFLAGS="$LDFLAGS $X_LIBS" + +- AC_DEFINE(SDL_VIDEO_DRIVER_X11) ++ AC_DEFINE(SDL_VIDEO_DRIVER_X11,1,"") + SOURCES="$SOURCES $srcdir/src/video/x11/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" + +@@ -1042,8 +1042,8 @@ AC_HELP_STRING([--enable-x11-shared], [d + test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then + echo "-- dynamic libX11 -> $x11_lib" + echo "-- dynamic libX11ext -> $x11ext_lib" +- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib") +- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib") ++ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib","") ++ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib","") + else + enable_x11_shared=no + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" +@@ -1060,20 +1060,20 @@ AC_HELP_STRING([--enable-dga], [allow us + AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]), + , enable_video_dga=yes) + if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_DGA) ++ AC_DEFINE(SDL_VIDEO_DRIVER_DGA,1,"") + SOURCES="$SOURCES $srcdir/src/video/dga/*.c" + fi + AC_ARG_ENABLE(video-x11-dgamouse, + AC_HELP_STRING([--enable-video-x11-dgamouse], [use X11 DGA for mouse events [[default=yes]]]), + , enable_video_x11_dgamouse=yes) + if test x$enable_dga = xyes -a x$enable_video_x11_dgamouse = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE) ++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE,1,"") + fi + AC_ARG_ENABLE(video-x11-vm, + AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]), + , enable_video_x11_vm=yes) + if test x$enable_video_x11_vm = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE) ++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE,1,"") + SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c" + fi + AC_ARG_ENABLE(video-x11-xv, +@@ -1087,14 +1087,14 @@ AC_HELP_STRING([--enable-video-x11-xv], + AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]), + , enable_video_x11_xinerama=yes) + if test x$enable_video_x11_xinerama = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA) ++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA,1,"") + SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c" + fi + AC_ARG_ENABLE(video-x11-xme, + AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]), + , enable_video_x11_xme=yes) + if test x$enable_video_x11_xme = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME) ++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME,1,"") + SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c" + fi + AC_ARG_ENABLE(video-x11-xrandr, +@@ -1111,8 +1111,8 @@ AC_HELP_STRING([--enable-video-x11-xrand + if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then + echo "-- dynamic libXrender -> $xrender_lib" + echo "-- dynamic libXrandr -> $xrandr_lib" +- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib") +- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib") ++ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib","") ++ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib","") + definitely_enable_video_x11_xrandr=yes + else + AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes) +@@ -1125,7 +1125,7 @@ AC_HELP_STRING([--enable-video-x11-xrand + fi + fi + if test x$definitely_enable_video_x11_xrandr = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) ++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"") + fi + fi + fi +@@ -1152,7 +1152,7 @@ AC_HELP_STRING([--enable-video-photon], + ]) + AC_MSG_RESULT($video_photon) + if test x$video_photon = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON) ++ AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON,1,"") + SOURCES="$SOURCES $srcdir/src/video/photon/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph" + have_video=yes +@@ -1166,7 +1166,7 @@ dnl Set up the BWindow video driver if e + CheckBWINDOW() + { + if test x$enable_video = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW) ++ AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW,1,"") + SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc" + have_video=yes + fi +@@ -1189,7 +1189,7 @@ AC_HELP_STRING([--enable-video-carbon], + ]) + AC_MSG_RESULT($have_carbon) + if test x$have_carbon = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX) ++ AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX,1,"") + SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c" + SOURCES="$SOURCES $srcdir/src/video/macrom/*.c" + have_video=yes +@@ -1218,7 +1218,7 @@ AC_HELP_STRING([--enable-video-cocoa], [ + AC_MSG_RESULT($have_cocoa) + CFLAGS="$save_CFLAGS" + if test x$have_cocoa = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ) ++ AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ,1,"") + SOURCES="$SOURCES $srcdir/src/video/quartz/*.m" + have_video=yes + fi +@@ -1245,7 +1245,7 @@ AC_HELP_STRING([--enable-video-fbcon], [ + AC_MSG_RESULT($video_fbcon) + if test x$video_fbcon = xyes; then + AC_CHECK_FUNCS(getpagesize) +- AC_DEFINE(SDL_VIDEO_DRIVER_FBCON) ++ AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"") + SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c" + have_video=yes + fi +@@ -1296,7 +1296,7 @@ AC_HELP_STRING([--enable-video-directfb] + AC_MSG_RESULT($video_directfb) + + if test x$video_directfb = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB) ++ AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB,1,"") + SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" +@@ -1323,7 +1323,7 @@ AC_HELP_STRING([--enable-video-ps2gs], [ + ]) + AC_MSG_RESULT($video_ps2gs) + if test x$video_ps2gs = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS) ++ AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS,1,"") + SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c" + have_video=yes + fi +@@ -1376,7 +1376,7 @@ AC_HELP_STRING([--enable-video-ggi], [us + ]) + AC_MSG_RESULT($video_ggi) + if test x$video_ggi = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_GGI) ++ AC_DEFINE(SDL_VIDEO_DRIVER_GGI,1,"") + SOURCES="$SOURCES $srcdir/src/video/ggi/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg" + have_video=yes +@@ -1406,7 +1406,7 @@ AC_HELP_STRING([--enable-video-svga], [u + ]) + AC_MSG_RESULT($video_svga) + if test x$video_svga = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB) ++ AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB,1,"") + SOURCES="$SOURCES $srcdir/src/video/svga/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga" + have_video=yes +@@ -1438,7 +1438,7 @@ AC_HELP_STRING([--enable-video-vgl], [us + ]) + AC_MSG_RESULT($video_vgl) + if test x$video_vgl = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_VGL) ++ AC_DEFINE(SDL_VIDEO_DRIVER_VGL,1,"") + SOURCES="$SOURCES $srcdir/src/video/vgl/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl" + have_video=yes +@@ -1466,7 +1466,7 @@ AC_HELP_STRING([--enable-video-wscons], + ]) + AC_MSG_RESULT($video_wscons) + if test x$video_wscons = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS) ++ AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS,1,"") + SOURCES="$SOURCES $srcdir/src/video/wscons/*.c" + have_video=yes + fi +@@ -1491,7 +1491,7 @@ AC_HELP_STRING([--enable-video-aalib], [ + ]) + AC_MSG_RESULT($video_aalib) + if test x$video_aalib = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_AALIB) ++ AC_DEFINE(SDL_VIDEO_DRIVER_AALIB,1,"") + SOURCES="$SOURCES $srcdir/src/video/aalib/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa" + have_video=yes +@@ -1553,7 +1553,7 @@ AC_HELP_STRING([--enable-video-qtopia], + CXXFLAGS="$OLD_CXX" + AC_MSG_RESULT($video_qtopia) + if test x$video_qtopia = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA) ++ AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"") + SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc" + SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc" + SDLMAIN_LDFLAGS="-static" +@@ -1583,7 +1583,7 @@ AC_HELP_STRING([--enable-video-picogui], + ]) + AC_MSG_RESULT($video_picogui) + if test x$video_picogui = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI) ++ AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI,1,"") + SOURCES="$SOURCES $srcdir/src/video/picogui/*.c" + SDL_LIBS="$SDL_LIBS -lpgui" + have_video=yes +@@ -1607,7 +1607,7 @@ AC_HELP_STRING([--enable-video-xbios], [ + video_xbios=no + if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then + video_xbios=yes +- AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS) ++ AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS,1,"") + SOURCES="$SOURCES $srcdir/src/video/xbios/*.c" + have_video=yes + fi +@@ -1625,7 +1625,7 @@ AC_HELP_STRING([--enable-video-gem], [us + AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes) + if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then + video_gem=yes +- AC_DEFINE(SDL_VIDEO_DRIVER_GEM) ++ AC_DEFINE(SDL_VIDEO_DRIVER_GEM,1,"") + SOURCES="$SOURCES $srcdir/src/video/gem/*.c" + SDL_LIBS="$SDL_LIBS -lgem" + have_video=yes +@@ -1640,7 +1640,7 @@ CheckDummyVideo() + AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]), + , enable_video_dummy=yes) + if test x$enable_video_dummy = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY) ++ AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY,1,"") + SOURCES="$SOURCES $srcdir/src/video/dummy/*.c" + have_video=yes + fi +@@ -1667,8 +1667,8 @@ CheckOpenGLX11() + ]) + AC_MSG_RESULT($video_opengl) + if test x$video_opengl = xyes; then +- AC_DEFINE(SDL_VIDEO_OPENGL) +- AC_DEFINE(SDL_VIDEO_OPENGL_GLX) ++ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") ++ AC_DEFINE(SDL_VIDEO_OPENGL_GLX,1,"") + fi + fi + } +@@ -1687,7 +1687,7 @@ CheckOpenGLQNX() + ]) + AC_MSG_RESULT($video_opengl) + if test x$video_opengl = xyes; then +- AC_DEFINE(SDL_VIDEO_OPENGL) ++ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" + fi + fi +@@ -1697,8 +1697,8 @@ dnl Check for Win32 OpenGL + CheckWIN32GL() + { + if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then +- AC_DEFINE(SDL_VIDEO_OPENGL) +- AC_DEFINE(SDL_VIDEO_OPENGL_WGL) ++ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") ++ AC_DEFINE(SDL_VIDEO_OPENGL_WGL,1,"") + fi + } + +@@ -1706,7 +1706,7 @@ dnl Check for BeOS OpenGL + CheckBeGL() + { + if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then +- AC_DEFINE(SDL_VIDEO_OPENGL) ++ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" + fi + } +@@ -1715,7 +1715,7 @@ dnl Check for MacOS OpenGL + CheckMacGL() + { + if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then +- AC_DEFINE(SDL_VIDEO_OPENGL) ++ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") + case "$host" in + *-*-darwin*) + if test x$enable_video_cocoa = xyes; then +@@ -1747,8 +1747,8 @@ CheckAtariOSMesa() + OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags` + OSMESA_LIBS=`$OSMESA_CONFIG --libs` + fi +- AC_DEFINE(SDL_VIDEO_OPENGL) +- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA) ++ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") ++ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA,1,"") + SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS" + SDL_LIBS="$SDL_LIBS $OSMESA_LIBS" + +@@ -1758,7 +1758,7 @@ AC_HELP_STRING([--enable-osmesa-shared], + if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then + # Dynamic linking + if test "x$have_osmesa_hdr" = "xyes"; then +- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC) ++ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC,1,"") + fi + fi + fi +@@ -1792,7 +1792,7 @@ AC_HELP_STRING([--enable-input-events], + ]) + AC_MSG_RESULT($use_input_events) + if test x$use_input_events = xyes; then +- AC_DEFINE(SDL_INPUT_LINUXEV) ++ AC_DEFINE(SDL_INPUT_LINUXEV,1,"") + fi + fi + } +@@ -1814,7 +1814,7 @@ AC_HELP_STRING([--enable-input-tslib], [ + ]) + AC_MSG_RESULT($enable_input_tslib) + if test x$enable_input_tslib = xyes; then +- AC_DEFINE(SDL_INPUT_TSLIB) ++ AC_DEFINE(SDL_INPUT_TSLIB,1,"") + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts" + fi + fi +@@ -1837,7 +1837,7 @@ AC_HELP_STRING([--enable-pth], [use GNU + AC_MSG_CHECKING(pth) + AC_MSG_RESULT($use_pth) + if test "x$use_pth" = xyes; then +- AC_DEFINE(SDL_THREAD_PTH) ++ AC_DEFINE(SDL_THREAD_PTH,1,"") + SOURCES="$SOURCES $srcdir/src/thread/pth/*.c" + SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c" + SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`" +@@ -1943,7 +1943,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ + + # Do futher testing if we have pthread support... + if test x$use_pthreads = xyes; then +- AC_DEFINE(SDL_THREAD_PTHREAD) ++ AC_DEFINE(SDL_THREAD_PTHREAD,1,"") + EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib" + SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags" +@@ -1965,7 +1965,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + ],[ + has_recursive_mutexes=yes +- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX) ++ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX,1,"") + ]) + fi + if test x$has_recursive_mutexes = xno; then +@@ -1976,7 +1976,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ + pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP); + ],[ + has_recursive_mutexes=yes +- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP) ++ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP,1,"") + ]) + fi + AC_MSG_RESULT($has_recursive_mutexes) +@@ -2065,7 +2065,7 @@ AC_HELP_STRING([--enable-stdio-redirect] + fi + + if test x$enable_video = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB) ++ AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB,1,"") + SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c" + SOURCES="$SOURCES $srcdir/src/video/windib/*.c" + have_video=yes +@@ -2087,7 +2087,7 @@ AC_HELP_STRING([--enable-directx], [use + have_directx=yes + fi + if test x$enable_video = xyes -a x$have_directx = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW) ++ AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW,1,"") + SOURCES="$SOURCES $srcdir/src/video/windx5/*.c" + have_video=yes + fi +@@ -2118,7 +2118,7 @@ AC_HELP_STRING([--enable-sdl-dlopen], [u + AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS", + AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl", + AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl"))) +- AC_DEFINE(SDL_LOADSO_DLOPEN) ++ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") + SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" + have_loadso=yes + fi +@@ -2135,7 +2135,7 @@ AC_HELP_STRING([--enable-atari-ldg], [us + AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes) + AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem) + if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then +- AC_DEFINE(SDL_LOADSO_LDG) ++ AC_DEFINE(SDL_LOADSO_LDG,1,"") + SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c" + SDL_LIBS="$SDL_LIBS -lldg -lgem" + have_loadso=yes +@@ -2266,11 +2266,11 @@ CheckUSBHID() + have_machine_joystick=yes + ]) + if test x$have_machine_joystick = xyes; then +- AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H) ++ AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H,1,"") + fi + AC_MSG_RESULT($have_machine_joystick) + +- AC_DEFINE(SDL_JOYSTICK_USBHID) ++ AC_DEFINE(SDL_JOYSTICK_USBHID,1,"") + SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS" +@@ -2289,7 +2289,7 @@ AC_HELP_STRING([--enable-clock_gettime], + if test x$enable_clock_gettime = xyes; then + AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes) + if test x$have_clock_gettime = xyes; then +- AC_DEFINE(HAVE_CLOCK_GETTIME) ++ AC_DEFINE(HAVE_CLOCK_GETTIME,1,"") + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt" + fi + fi +@@ -2320,7 +2320,7 @@ case "$host" in + CheckIPod + # Set up files for the timer library + if test x$enable_timers = xyes; then +- AC_DEFINE(SDL_TIMER_UNIX) ++ AC_DEFINE(SDL_TIMER_UNIX,1,"") + SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" + have_timers=yes + fi +@@ -2386,17 +2386,17 @@ case "$host" in + if test x$enable_audio = xyes; then + case $ARCH in + sysv5|solaris|hpux) +- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO) ++ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"") + SOURCES="$SOURCES $srcdir/src/audio/sun/*.c" + have_audio=yes + ;; + netbsd|openbsd) +- AC_DEFINE(SDL_AUDIO_DRIVER_BSD) ++ AC_DEFINE(SDL_AUDIO_DRIVER_BSD,1,"") + SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c" + have_audio=yes + ;; + aix) +- AC_DEFINE(SDL_AUDIO_DRIVER_PAUD) ++ AC_DEFINE(SDL_AUDIO_DRIVER_PAUD,1,"") + SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c" + have_audio=yes + ;; +@@ -2406,7 +2406,7 @@ case "$host" in + if test x$enable_joystick = xyes; then + case $ARCH in + linux) +- AC_DEFINE(SDL_JOYSTICK_LINUX) ++ AC_DEFINE(SDL_JOYSTICK_LINUX,1,"") + SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c" + have_joystick=yes + ;; +@@ -2416,32 +2416,32 @@ case "$host" in + if test x$enable_cdrom = xyes; then + case $ARCH in + linux|solaris) +- AC_DEFINE(SDL_CDROM_LINUX) ++ AC_DEFINE(SDL_CDROM_LINUX,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c" + have_cdrom=yes + ;; + *freebsd*) +- AC_DEFINE(SDL_CDROM_FREEBSD) ++ AC_DEFINE(SDL_CDROM_FREEBSD,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c" + have_cdrom=yes + ;; + *openbsd*|*netbsd*) +- AC_DEFINE(SDL_CDROM_OPENBSD) ++ AC_DEFINE(SDL_CDROM_OPENBSD,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c" + have_cdrom=yes + ;; + bsdi) +- AC_DEFINE(SDL_CDROM_BSDI) ++ AC_DEFINE(SDL_CDROM_BSDI,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c" + have_cdrom=yes + ;; + aix) +- AC_DEFINE(SDL_CDROM_AIX) ++ AC_DEFINE(SDL_CDROM_AIX,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c" + have_cdrom=yes + ;; + osf) +- AC_DEFINE(SDL_CDROM_OSF) ++ AC_DEFINE(SDL_CDROM_OSF,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c" + have_cdrom=yes + ;; +@@ -2449,7 +2449,7 @@ case "$host" in + fi + # Set up files for the thread library + if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then +- AC_DEFINE(SDL_THREAD_SPROC) ++ AC_DEFINE(SDL_THREAD_SPROC,1,"") + SOURCES="$SOURCES $srcdir/src/thread/irix/*.c" + SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" + SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" +@@ -2457,7 +2457,7 @@ case "$host" in + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then +- AC_DEFINE(SDL_TIMER_UNIX) ++ AC_DEFINE(SDL_TIMER_UNIX,1,"") + SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" + have_timers=yes + fi +@@ -2476,20 +2476,20 @@ case "$host" in + CheckPTHREAD + # Set up files for the audio library + if test x$enable_audio = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO) ++ AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO,1,"") + SOURCES="$SOURCES $srcdir/src/audio/nto/*.c" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound" + have_audio=yes + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then +- AC_DEFINE(SDL_CDROM_QNX) ++ AC_DEFINE(SDL_CDROM_QNX,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c" + have_cdrom=yes + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then +- AC_DEFINE(SDL_TIMER_UNIX) ++ AC_DEFINE(SDL_TIMER_UNIX,1,"") + SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" + have_timers=yes + fi +@@ -2514,29 +2514,29 @@ case "$host" in + CheckNASM + # Set up files for the audio library + if test x$enable_audio = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT) ++ AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT,1,"") + SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" + if test x$have_directx = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND) ++ AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND,1,"") + SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c" + fi + have_audio=yes + fi + # Set up files for the joystick library + if test x$enable_joystick = xyes; then +- AC_DEFINE(SDL_JOYSTICK_WINMM) ++ AC_DEFINE(SDL_JOYSTICK_WINMM,1,"") + SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c" + have_joystick=yes + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then +- AC_DEFINE(SDL_CDROM_WIN32) ++ AC_DEFINE(SDL_CDROM_WIN32,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c" + have_cdrom=yes + fi + # Set up files for the thread library + if test x$enable_threads = xyes; then +- AC_DEFINE(SDL_THREAD_WIN32) ++ AC_DEFINE(SDL_THREAD_WIN32,1,"") + SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" + SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" + SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" +@@ -2545,13 +2545,13 @@ case "$host" in + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then +- AC_DEFINE(SDL_TIMER_WIN32) ++ AC_DEFINE(SDL_TIMER_WIN32,1,"") + SOURCES="$SOURCES $srcdir/src/timer/win32/*.c" + have_timers=yes + fi + # Set up files for the shared object loading library + if test x$enable_loadso = xyes; then +- AC_DEFINE(SDL_LOADSO_WIN32) ++ AC_DEFINE(SDL_LOADSO_WIN32,1,"") + SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" + have_loadso=yes + fi +@@ -2622,25 +2622,25 @@ case "$host" in + CheckBeGL + # Set up files for the audio library + if test x$enable_audio = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO) ++ AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO,1,"") + SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc" + have_audio=yes + fi + # Set up files for the joystick library + if test x$enable_joystick = xyes; then +- AC_DEFINE(SDL_JOYSTICK_BEOS) ++ AC_DEFINE(SDL_JOYSTICK_BEOS,1,"") + SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc" + have_joystick=yes + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then +- AC_DEFINE(SDL_CDROM_BEOS) ++ AC_DEFINE(SDL_CDROM_BEOS,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc" + have_cdrom=yes + fi + # Set up files for the thread library + if test x$enable_threads = xyes; then +- AC_DEFINE(SDL_THREAD_BEOS) ++ AC_DEFINE(SDL_THREAD_BEOS,1,"") + SOURCES="$SOURCES $srcdir/src/thread/beos/*.c" + SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" + SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" +@@ -2648,7 +2648,7 @@ case "$host" in + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then +- AC_DEFINE(SDL_TIMER_BEOS) ++ AC_DEFINE(SDL_TIMER_BEOS,1,"") + SOURCES="$SOURCES $srcdir/src/timer/beos/*.c" + have_timers=yes + fi +@@ -2656,11 +2656,11 @@ case "$host" in + if test x$enable_loadso = xyes; then + case "$host" in + *-*-beos*) +- AC_DEFINE(SDL_LOADSO_BEOS) ++ AC_DEFINE(SDL_LOADSO_BEOS,1,"") + SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c" + ;; + *-*-haiku*) +- AC_DEFINE(SDL_LOADSO_DLOPEN) ++ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") + SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" + ;; + esac +@@ -2696,7 +2696,7 @@ case "$host" in + # Set up files for the shared object loading library + # (this needs to be done before the dynamic X11 check) + if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then +- AC_DEFINE(SDL_LOADSO_DLCOMPAT) ++ AC_DEFINE(SDL_LOADSO_DLCOMPAT,1,"") + SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c" + have_loadso=yes + fi +@@ -2714,26 +2714,26 @@ case "$host" in + + # Set up files for the audio library + if test x$enable_audio = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO) ++ AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"") + SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c" + have_audio=yes + fi + # Set up files for the joystick library + if test x$enable_joystick = xyes; then +- AC_DEFINE(SDL_JOYSTICK_IOKIT) ++ AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"") + SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c" + have_joystick=yes + need_iokit_framework=yes + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then +- AC_DEFINE(SDL_CDROM_MACOSX) ++ AC_DEFINE(SDL_CDROM_MACOSX,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c" + have_cdrom=yes + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then +- AC_DEFINE(SDL_TIMER_UNIX) ++ AC_DEFINE(SDL_TIMER_UNIX,1,"") + SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" + have_timers=yes + fi +@@ -2775,30 +2775,30 @@ case "$host" in + # Set up files for the audio library + if test x$enable_threads = xyes -a x$enable_pth = xyes; then + if test x$enable_audio = xyes; then +- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO) ++ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"") + SOURCES="$SOURCES $srcdir/src/audio/sun/*.c" + have_audio=yes + fi + fi + # Set up files for the joystick library + if test x$enable_joystick = xyes; then +- AC_DEFINE(SDL_JOYSTICK_MINT) ++ AC_DEFINE(SDL_JOYSTICK_MINT,1,"") + SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c" + have_joystick=yes + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then +- AC_DEFINE(SDL_CDROM_MINT) ++ AC_DEFINE(SDL_CDROM_MINT,1,"") + SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c" + have_cdrom=yes + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then + if test x$enable_threads = xyes -a x$enable_pth = xyes; then +- AC_DEFINE(SDL_TIMER_UNIX) ++ AC_DEFINE(SDL_TIMER_UNIX,1,"") + SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" + else +- AC_DEFINE(SDL_TIMER_MINT) ++ AC_DEFINE(SDL_TIMER_MIN,1,""T) + SOURCES="$SOURCES $srcdir/src/timer/mint/*.c" + SOURCES="$SOURCES $srcdir/src/timer/mint/*.S" + fi +@@ -2811,20 +2811,20 @@ case "$host" in + CheckPTHREAD + # Set up files for the video library + if test x$enable_video = xyes; then +- AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS) ++ AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS,1,"") + SOURCES="$SOURCES $srcdir/src/video/riscos/*.c" + SOURCES="$SOURCES $srcdir/src/video/riscos/*.S" + have_video=yes + fi + # Set up files for the joystick library + if test x$enable_joystick = xyes; then +- AC_DEFINE(SDL_JOYSTICK_RISCOS) ++ AC_DEFINE(SDL_JOYSTICK_RISCOS,1,"") + SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c" + have_joystick=yes + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then +- AC_DEFINE(SDL_TIMER_RISCOS) ++ AC_DEFINE(SDL_TIMER_RISCOS,1,"") + SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c" + have_timers=yes + fi +@@ -2846,31 +2846,31 @@ CheckWarnAll + if test x$enable_joystick = xyes; then + if test x$have_joystick != xyes; then + # Wants joystick subsystem, but doesn't have a platform-specific backend... +- AC_DEFINE(SDL_JOYSTICK_DUMMY) ++ AC_DEFINE(SDL_JOYSTICK_DUMMY,1,"") + SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c" + fi + fi + if test x$have_cdrom != xyes; then + if test x$enable_cdrom = xyes; then +- AC_DEFINE(SDL_CDROM_DISABLED) ++ AC_DEFINE(SDL_CDROM_DISABLED,1,"") + fi + SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c" + fi + if test x$have_threads != xyes; then + if test x$enable_threads = xyes; then +- AC_DEFINE(SDL_THREADS_DISABLED) ++ AC_DEFINE(SDL_THREADS_DISABLED,1,"") + fi + SOURCES="$SOURCES $srcdir/src/thread/generic/*.c" + fi + if test x$have_timers != xyes; then + if test x$enable_timers = xyes; then +- AC_DEFINE(SDL_TIMERS_DISABLED) ++ AC_DEFINE(SDL_TIMERS_DISABLED,1,"") + fi + SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c" + fi + if test x$have_loadso != xyes; then + if test x$enable_loadso = xyes; then +- AC_DEFINE(SDL_LOADSO_DISABLED) ++ AC_DEFINE(SDL_LOADSO_DISABLED,1,"") + fi + SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c" + 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 @@ +libX11-1.5.99.901 has changed prototype of _XData32 + +Upstream-Status: Backport + + +Signed-off-by: Saul Wold + +diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h +--- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800 ++++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100 +@@ -165,7 +165,7 @@ + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) +-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + diff --git a/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 @@ +Rather than code which doesn't even work properly when cross compiling, +lets just use pkg-config instead. Its a little simpler. + +RP 2014/6/20 + +Upstream-Status: Pending + +Index: SDL-1.2.15/sdl.m4 +=================================================================== +--- SDL-1.2.15.orig/sdl.m4 ++++ SDL-1.2.15/sdl.m4 +@@ -12,174 +12,8 @@ dnl Test for SDL, and define SDL_CFLAGS + dnl + AC_DEFUN([AM_PATH_SDL], + [dnl +-dnl Get the cflags and libraries from the sdl-config script +-dnl +-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], +- sdl_prefix="$withval", sdl_prefix="") +-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], +- sdl_exec_prefix="$withval", sdl_exec_prefix="") +-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], +- , enable_sdltest=yes) +- +- if test x$sdl_exec_prefix != x ; then +- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" +- if test x${SDL_CONFIG+set} != xset ; then +- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config +- fi +- fi +- if test x$sdl_prefix != x ; then +- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" +- if test x${SDL_CONFIG+set} != xset ; then +- SDL_CONFIG=$sdl_prefix/bin/sdl-config +- fi +- fi +- +- as_save_PATH="$PATH" +- if test "x$prefix" != xNONE; then +- PATH="$prefix/bin:$prefix/usr/bin:$PATH" +- fi +- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) +- PATH="$as_save_PATH" + min_sdl_version=ifelse([$1], ,0.11.0,$1) +- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) +- no_sdl="" +- if test "$SDL_CONFIG" = "no" ; then +- no_sdl=yes +- else +- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` +- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` +- +- sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +- if test "x$enable_sdltest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_CXXFLAGS="$CXXFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $SDL_CFLAGS" +- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" +- LIBS="$LIBS $SDL_LIBS" +-dnl +-dnl Now check if the installed SDL is sufficiently new. (Also sanity +-dnl checks the results of sdl-config to some extent +-dnl +- rm -f conf.sdltest +- AC_TRY_RUN([ +-#include +-#include +-#include +-#include "SDL.h" +- +-char* +-my_strdup (char *str) +-{ +- char *new_str; +- +- if (str) +- { +- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); +- strcpy (new_str, str); +- } +- else +- new_str = NULL; +- +- return new_str; +-} +- +-int main (int argc, char *argv[]) +-{ +- int major, minor, micro; +- char *tmp_version; +- +- /* This hangs on some systems (?) +- system ("touch conf.sdltest"); +- */ +- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } +- +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = my_strdup("$min_sdl_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_sdl_version"); +- exit(1); +- } +- +- if (($sdl_major_version > major) || +- (($sdl_major_version == major) && ($sdl_minor_version > minor)) || +- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); +- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); +- printf("*** best to upgrade to the required version.\n"); +- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); +- printf("*** to point to the correct copy of sdl-config, and remove the file\n"); +- printf("*** config.cache before re-running configure\n"); +- return 1; +- } +-} +- +-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- CXXFLAGS="$ac_save_CXXFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_sdl" = x ; then +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +- else +- AC_MSG_RESULT(no) +- if test "$SDL_CONFIG" = "no" ; then +- echo "*** The sdl-config script installed by SDL could not be found" +- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" +- echo "*** your path, or set the SDL_CONFIG environment variable to the" +- echo "*** full path to sdl-config." +- else +- if test -f conf.sdltest ; then +- : +- else +- echo "*** Could not run SDL test program, checking why..." +- CFLAGS="$CFLAGS $SDL_CFLAGS" +- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" +- LIBS="$LIBS $SDL_LIBS" +- AC_TRY_LINK([ +-#include +-#include "SDL.h" +- +-int main(int argc, char *argv[]) +-{ return 0; } +-#undef main +-#define main K_and_R_C_main +-], [ return 0; ], +- [ echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding SDL or finding the wrong" +- echo "*** version of SDL. If it is not finding SDL, you'll need to set your" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], +- [ echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means SDL was incorrectly installed" +- echo "*** or that you have moved SDL since it was installed. In the latter case, you" +- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) +- CFLAGS="$ac_save_CFLAGS" +- CXXFLAGS="$ac_save_CXXFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- SDL_CFLAGS="" +- SDL_LIBS="" +- ifelse([$3], , :, [$3]) +- fi ++ PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version]) + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) +- rm -f conf.sdltest + ]) diff --git a/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 @@ +SUMMARY = "Simple DirectMedia Layer" +DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \ +library designed to provide low level access to audio, keyboard, mouse, \ +joystick, 3D hardware via OpenGL, and 2D video framebuffer." +HOMEPAGE = "http://www.libsdl.org" +BUGTRACKER = "http://bugzilla.libsdl.org/" + +SECTION = "libs" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" + +PROVIDES = "virtual/libsdl" + +DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ + tslib" +DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" + +PR = "r3" + +SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ + file://configure_tweak.patch \ + file://libsdl-1.2.15-xdata32.patch \ + file://pkgconfig.patch \ + " + +S = "${WORKDIR}/SDL-${PV}" + +SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85" +SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00" + +BINCONFIG = "${bindir}/sdl-config" + +inherit autotools lib_package binconfig-disabled pkgconfig + +EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ + --enable-file --disable-oss --disable-esd --disable-arts \ + --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ + --disable-mintaudio --disable-nasm --disable-video-dga \ + --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \ + --disable-xbios --disable-gem --disable-video-dummy \ + --enable-input-events --enable-input-tslib --enable-pthreads \ + ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ + --disable-video-svga \ + --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ + --disable-rpath \ + --disable-pulseaudio" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," + +PARALLEL_MAKE = "" + +EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" + +do_configure_prepend() { + # Remove old libtool macros. + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + for i in ${MACROS}; do + rm -f ${S}/acinclude/$i + done + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR +} + +BBCLASSEXTEND = "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 @@ +SUMMARY = "Simple DirectMedia Layer" +DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \ +library designed to provide low level access to audio, keyboard, mouse, \ +joystick, 3D hardware via OpenGL, and 2D video framebuffer." +HOMEPAGE = "http://www.libsdl.org" +BUGTRACKER = "http://bugzilla.libsdl.org/" + +SECTION = "libs" + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=67dcb7fae16952557bc5f96e9eb5d188" + +PROVIDES = "virtual/libsdl2" + +DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ + tslib" +DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" + +SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ + " + +S = "${WORKDIR}/SDL2-${PV}" + +SRC_URI[md5sum] = "fe6c61d2e9df9ef570e7e80c6e822537" +SRC_URI[sha256sum] = "a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c" + +inherit autotools lib_package binconfig pkgconfig + +EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ + --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ + --disable-video-dummy \ + --enable-input-tslib --enable-pthreads \ + ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ + --enable-sdl-dlopen \ + --disable-rpath \ + --disable-pulseaudio" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," + +PARALLEL_MAKE = "" + +EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" + +do_configure_prepend() { + # Remove old libtool macros. + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + for i in ${MACROS}; do + rm -f ${S}/acinclude/$i + done + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR +} 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 @@ +/* + * Copyright © 2001 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Red Hat not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. Red Hat makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT + * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Owen Taylor, Red Hat, Inc. + */ diff --git a/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 @@ +Upstream-Status: Inappropriate [configuration] + +Do not set Os optimization in target APP CFLAGS, since it may have potential +error if "--enable-target-optspace" is not set when configuring GCC. + +Signed-off-by: Dongxiao Xu + +diff -ruN Xsettings-client-0.10-orig/configure.ac Xsettings-client-0.10/configure.ac +--- Xsettings-client-0.10-orig/configure.ac 2010-09-21 14:01:47.000000000 +0800 ++++ Xsettings-client-0.10/configure.ac 2010-09-21 14:02:01.000000000 +0800 +@@ -3,7 +3,7 @@ + AM_INIT_AUTOMAKE(Xsettings-client, 0.10) + AM_CONFIG_HEADER(config.h) + +-CFLAGS="-Os -Wall" ++CFLAGS="-O2 -Wall" + + # Checks for programs. + 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 @@ +Upstream-Status: Inappropriate [configuration] + +Index: Xsettings-client-0.10/Makefile.am +=================================================================== +--- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000 ++++ Xsettings-client-0.10/Makefile.am 2008-02-07 14:50:00.000000000 +0000 +@@ -9,4 +9,4 @@ + + libXsettings_client_la_SOURCES= $(source_c) $(source_h) + +-libXsettings_client_la_LIBADD = @X_LIBS@ +\ No newline at end of file ++libXsettings_client_la_LIBADD = @X_LIBS@ -lX11 diff --git a/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 @@ +Upstream-Status: Pending + +Signed-off-by: Marko Lindqvist +diff -Nurd Xsettings-client-0.10/configure.ac Xsettings-client-0.10/configure.ac +--- Xsettings-client-0.10/configure.ac 2003-03-28 12:39:51.000000000 +0200 ++++ Xsettings-client-0.10/configure.ac 2013-01-11 07:37:21.491597743 +0200 +@@ -1,7 +1,7 @@ + # Process this file with autoconf to produce a configure script. + AC_INIT(xsettings-client.c) + AM_INIT_AUTOMAKE(Xsettings-client, 0.10) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + CFLAGS="-Os -Wall" diff --git a/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 @@ +SUMMARY = "utility functions for the Xsettings protocol" +DESCRIPTION = "Libraries used for applications making use of the Xsettings configuration \ +setting propagation protocol. Controls setting of double click timeout, drag-and-drop \ +threshold, and default foreground and background colors for all applications running within a \ +desktop." +HOMEPAGE = "http://matchbox-project.org/sources/optional-dependencies/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" +SECTION = "x/libs" +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ + file://xsettings-client.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ + file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" +DEPENDS = "virtual/libx11" + +PR = "r5" + +headers = "xsettings-common.h xsettings-client.h" + +SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-0.10.tar.gz \ + file://MIT-style-license \ + file://link-x11.patch;apply=yes \ + file://disable_Os_option.patch \ + file://obsolete_automake_macros.patch \ +" + +SRC_URI[md5sum] = "c14aa9db6c097e0306dac97fb7da1add" +SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43" + +S = "${WORKDIR}/Xsettings-client-0.10" + +inherit autotools gettext + +do_configure_prepend() { + # This package doesn't ship with its own COPYING file and + # autotools will install a GPLv2 one instead of the actual MIT-style license here. + # Add the correct license here to avoid confusion. + cp -f ${WORKDIR}/MIT-style-license ${S}/COPYING +} + diff --git a/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 @@ +#!/bin/sh +# +# Very simple session manager for matchbox tools +# + +# Uncomment below to enable parsing of debian menu entrys +# export MB_USE_DEB_MENUS=1 + +if [ -e $HOME/.matchbox/session ] +then +exec $HOME/.matchbox/session +fi + +if [ -e /etc/matchbox/session ] +then +exec /etc/matchbox/session +fi + +# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session +# dont exist. + +matchbox-desktop & +matchbox-panel & +exec matchbox-window-manager $@ diff --git a/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 @@ +SUMMARY = "Custom Matchbox session files" +HOMEPAGE = "http://www.matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea" + +SECTION = "x11" +RCONFLICTS_${PN} = "matchbox-common" + +SRC_URI = "file://matchbox-session" +S = "${WORKDIR}" + +PR = "r4" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "x-session-manager" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/matchbox-session" +ALTERNATIVE_PRIORITY = "100" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/matchbox-session ${D}/${bindir} +} diff --git a/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 @@ +Upstream-Status: Inappropriate [configuration] + +Index: matchbox-window-manager/configure.ac +=================================================================== +--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 ++++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000 +@@ -283,7 +283,7 @@ + yes) + + case "$expat" in +- yes) ++ yes|"") + EXPAT_LIBS="-lexpat" + ;; + *) 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 @@ +dnl AM_GCONF_SOURCE_2 +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +dnl (i.e. pass to gconftool-2 +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +dnl you should install foo.schemas files +dnl + +AC_DEFUN([AM_GCONF_SOURCE_2], +[ + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` + else + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi + + AC_ARG_WITH(gconf-source, + [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + fi + + AC_ARG_WITH(gconf-schema-file-dir, + [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) + + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + + AC_ARG_ENABLE(schemas-install, + [ --disable-schemas-install Disable the schemas installation], + [case ${enableval} in + yes|no) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; + esac]) + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +]) 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 @@ +# +# This is an example keyboard config file for matchbox +# +# You can edit this file or change per user by copying to +# ~/.matchbox/kbdconfig +# +# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) + +### Window operation short cuts + +n=next +p=prev +c=close +d=desktop +m=!matchbox-remote -mbmenu + +### App launching. + +x=!xterm +r=!rxvt + +### poky additions + +XF86Calendar=!$contacts +telephone=!$dates +XF86Start=!matchbox-remote -desktop +F2=!matchbox-remote -mbmenu + +#XF86Mail=!$tasks +#Escape=close + +### windows style key shortcuts + +Tab=next +Tab=prev + +space=taskmenu +escape=!matchbox-remote -mbmenu +f4=close + +f11=fullscreen + 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 @@ +SUMMARY = "Matchbox lightweight window manager" +SECTION = "x11/wm" +LICENSE = "GPLv2.0+" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat" +PR = "r5" + +SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \ + file://configure_fix.patch \ + file://kbdconfig \ + file://gconf-2.m4" + +SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb" +SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff" + +S = "${WORKDIR}/matchbox-window-manager-${PV}" + +inherit autotools pkgconfig + +FILES_${PN} = "${bindir}/* \ + ${datadir}/matchbox \ + ${sysconfdir}/matchbox \ + ${datadir}/themes/blondie/matchbox \ + ${datadir}/themes/Default/matchbox \ + ${datadir}/themes/MBOpus/matchbox" + +EXTRA_OECONF = " --enable-startup-notification \ + --disable-xrm \ + --enable-expat \ + --with-expat-lib=${STAGING_LIBDIR} \ + --with-expat-includes=${STAGING_INCDIR}" + + +do_configure_prepend () { + cp ${WORKDIR}/gconf-2.m4 ${S}/ +} + +do_install_prepend() { + install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig +} 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 @@ +SUMMARY = "Matchbox lightweight window manager" +HOMEPAGE = "http://matchbox-project.org" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa835 \ + file://src/main.c;endline=21;md5=3e5d9f832b527b0d72dbe8e3c4c60b95 \ + file://src/wm.c;endline=21;md5=8dc9d24477d87ef5dfbc2e4927146aab" + +SECTION = "x11/wm" +DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes" + +SRCREV = "29544f0e61cc281fc60061443a537271e1081b78" +PV = "1.2+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ + file://kbdconfig" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +FILES_${PN} = "${bindir}/* \ + ${datadir}/matchbox \ + ${sysconfdir}/matchbox \ + ${datadir}/themes/blondie/matchbox \ + ${datadir}/themes/Default/matchbox \ + ${datadir}/themes/MBOpus/matchbox" + +EXTRA_OECONF = " --enable-startup-notification \ + --disable-xrm \ + --enable-expat \ + --with-expat-lib=${STAGING_LIBDIR} \ + --with-expat-includes=${STAGING_INCDIR}" + +do_install_prepend() { + install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig +} diff --git a/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 @@ +From a497ea6aae3994b7f6527ef7599dd95baf2ad841 Mon Sep 17 00:00:00 2001 +From: Laurentiu Palcu +Date: Mon, 29 Apr 2013 12:04:20 +0300 +Subject: [PATCH] Fix segfault + +Apparently, g_io_channel_unref() was called twice: once in the +menu-cache's on_client_closed() callback and once from the finalize +function, g_io_unix_finalize()/g_io_win32_finalize(), which is called +anyway when the source is removed. + +Upstream-Status: Pending +Signed-off-by: Laurentiu Palcu +--- + menu-cache-daemon/menu-cached.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c +index e246bb4..a10b6db 100644 +--- a/menu-cache-daemon/menu-cached.c ++++ b/menu-cache-daemon/menu-cached.c +@@ -579,7 +579,6 @@ static void on_client_closed(gpointer user_data) + } + } + /* DEBUG("client closed"); */ +- g_io_channel_unref(ch); + } + + static gboolean on_client_data_in(GIOChannel* ch, GIOCondition cond, gpointer user_data) +-- +1.7.9.5 + 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 @@ +SUMMARY = "Library for caching application menus" +DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus" +HOMEPAGE = "http://lxde.sourceforge.net/" + +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://libmenu-cache/menu-cache.h;endline=29;md5=26571532593adb17a37eac396260532c \ + file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111" + +SECTION = "x11/libs" +DEPENDS = "glib-2.0 zlib" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz \ + file://Fix-segfault.patch \ + " + +SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0" +SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e" + + +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 @@ +SUMMARY = "The OpenGL utility toolkit" +DESCRIPTION = "GLU is a utility toolkit used with OpenGL implementations" + +HOMEPAGE = "http://mesa3d.org" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \ + file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9" + +# Epoch as this used to be part of mesa +PE = "2" +PR = "0" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${PV}.tar.bz2" + +SRC_URI[md5sum] = "be9249132ff49275461cf92039083030" +SRC_URI[sha256sum] = "1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12" + +S = "${WORKDIR}/glu-${PV}" + +DEPENDS = "virtual/libgl" + +inherit autotools pkgconfig + +# Remove the mesa-glu dependency in mesa-glu-dev, as mesa-glu is empty +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 @@ +From b695c3a3fa3f4cd48c13aa26542110de27075518 Mon Sep 17 00:00:00 2001 +From: Drew Moseley +Date: Mon, 12 May 2014 15:22:32 -0400 +Subject: [PATCH 1/9] mesa-demos: Add missing data files. + +Add some data files that are present in the git repository: + http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0 +but not in the release tarball + ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2 + +Upstream-Status: Backport +Signed-off-by: Drew Moseley +Signed-off-by: Martin Jansa +--- + src/fpglsl/depth-read.glsl | 4 + + src/fpglsl/infinite-loop.glsl | 7 + + src/glsl/CH11-bumpmaptex.frag | 47 +++++++ + src/glsl/blinking-teapot.frag | 31 +++++ + src/glsl/blinking-teapot.vert | 16 +++ + src/glsl/convolution.frag | 21 +++ + src/glsl/simplex-noise.glsl | 279 ++++++++++++++++++++++++++++++++++++++++ + src/glsl/skinning.vert | 24 ++++ + src/perf/glslstateschange1.frag | 19 +++ + src/perf/glslstateschange1.vert | 14 ++ + src/perf/glslstateschange2.frag | 17 +++ + src/perf/glslstateschange2.vert | 14 ++ + src/vpglsl/infinite-loop.glsl | 8 ++ + 13 files changed, 501 insertions(+) + create mode 100644 src/fpglsl/depth-read.glsl + create mode 100644 src/fpglsl/infinite-loop.glsl + create mode 100644 src/glsl/CH11-bumpmaptex.frag + create mode 100644 src/glsl/blinking-teapot.frag + create mode 100644 src/glsl/blinking-teapot.vert + create mode 100644 src/glsl/convolution.frag + create mode 100644 src/glsl/simplex-noise.glsl + create mode 100644 src/glsl/skinning.vert + create mode 100644 src/perf/glslstateschange1.frag + create mode 100644 src/perf/glslstateschange1.vert + create mode 100644 src/perf/glslstateschange2.frag + create mode 100644 src/perf/glslstateschange2.vert + create mode 100644 src/vpglsl/infinite-loop.glsl + +diff --git a/src/fpglsl/depth-read.glsl b/src/fpglsl/depth-read.glsl +new file mode 100644 +index 0000000..86d298e +--- /dev/null ++++ b/src/fpglsl/depth-read.glsl +@@ -0,0 +1,4 @@ ++void main() ++{ ++ gl_FragColor = gl_FragCoord.zzzz; ++} +diff --git a/src/fpglsl/infinite-loop.glsl b/src/fpglsl/infinite-loop.glsl +new file mode 100644 +index 0000000..c6dc6ee +--- /dev/null ++++ b/src/fpglsl/infinite-loop.glsl +@@ -0,0 +1,7 @@ ++void main() { ++ vec4 sum = vec4(0); ++ for (int i = 1; i != 2; i += 2) { ++ sum += vec4(0.1, 0.1, 0.1, 0.1); ++ } ++ gl_FragColor = sum; ++} +diff --git a/src/glsl/CH11-bumpmaptex.frag b/src/glsl/CH11-bumpmaptex.frag +new file mode 100644 +index 0000000..b5dabb4 +--- /dev/null ++++ b/src/glsl/CH11-bumpmaptex.frag +@@ -0,0 +1,47 @@ ++// ++// Fragment shader for procedural bumps ++// ++// Authors: John Kessenich, Randi Rost ++// ++// Copyright (c) 2002-2006 3Dlabs Inc. Ltd. ++// ++// See 3Dlabs-License.txt for license information ++// ++// Texture mapping/modulation added by Brian Paul ++// ++ ++varying vec3 LightDir; ++varying vec3 EyeDir; ++ ++uniform float BumpDensity; // = 16.0 ++uniform float BumpSize; // = 0.15 ++uniform float SpecularFactor; // = 0.5 ++ ++uniform sampler2D Tex; ++ ++void main() ++{ ++ vec3 ambient = vec3(0.25); ++ vec3 litColor; ++ vec2 c = BumpDensity * gl_TexCoord[0].st; ++ vec2 p = fract(c) - vec2(0.5); ++ ++ float d, f; ++ d = p.x * p.x + p.y * p.y; ++ f = inversesqrt(d + 1.0); ++ ++ if (d >= BumpSize) ++ { p = vec2(0.0); f = 1.0; } ++ ++ vec3 SurfaceColor = texture2D(Tex, gl_TexCoord[0].st).xyz; ++ ++ vec3 normDelta = vec3(p.x, p.y, 1.0) * f; ++ litColor = SurfaceColor * (ambient + max(dot(normDelta, LightDir), 0.0)); ++ vec3 reflectDir = reflect(LightDir, normDelta); ++ ++ float spec = max(dot(EyeDir, reflectDir), 0.0); ++ spec *= SpecularFactor; ++ litColor = min(litColor + spec, vec3(1.0)); ++ ++ gl_FragColor = vec4(litColor, 1.0); ++} +diff --git a/src/glsl/blinking-teapot.frag b/src/glsl/blinking-teapot.frag +new file mode 100644 +index 0000000..0db060b +--- /dev/null ++++ b/src/glsl/blinking-teapot.frag +@@ -0,0 +1,31 @@ ++#extension GL_ARB_uniform_buffer_object : enable ++ ++layout(std140) uniform colors0 ++{ ++ float DiffuseCool; ++ float DiffuseWarm; ++ vec3 SurfaceColor; ++ vec3 WarmColor; ++ vec3 CoolColor; ++ vec4 some[8]; ++}; ++ ++varying float NdotL; ++varying vec3 ReflectVec; ++varying vec3 ViewVec; ++ ++void main (void) ++{ ++ ++ vec3 kcool = min(CoolColor + DiffuseCool * SurfaceColor, 1.0); ++ vec3 kwarm = min(WarmColor + DiffuseWarm * SurfaceColor, 1.0); ++ vec3 kfinal = mix(kcool, kwarm, NdotL); ++ ++ vec3 nreflect = normalize(ReflectVec); ++ vec3 nview = normalize(ViewVec); ++ ++ float spec = max(dot(nreflect, nview), 0.0); ++ spec = pow(spec, 32.0); ++ ++ gl_FragColor = vec4 (min(kfinal + spec, 1.0), 1.0); ++} +diff --git a/src/glsl/blinking-teapot.vert b/src/glsl/blinking-teapot.vert +new file mode 100644 +index 0000000..397d733 +--- /dev/null ++++ b/src/glsl/blinking-teapot.vert +@@ -0,0 +1,16 @@ ++vec3 LightPosition = vec3(0.0, 10.0, 4.0); ++ ++varying float NdotL; ++varying vec3 ReflectVec; ++varying vec3 ViewVec; ++ ++void main(void) ++{ ++ vec3 ecPos = vec3 (gl_ModelViewMatrix * gl_Vertex); ++ vec3 tnorm = normalize(gl_NormalMatrix * gl_Normal); ++ vec3 lightVec = normalize(LightPosition - ecPos); ++ ReflectVec = normalize(reflect(-lightVec, tnorm)); ++ ViewVec = normalize(-ecPos); ++ NdotL = (dot(lightVec, tnorm) + 1.0) * 0.5; ++ gl_Position = ftransform(); ++} +diff --git a/src/glsl/convolution.frag b/src/glsl/convolution.frag +new file mode 100644 +index 0000000..e49b8ac +--- /dev/null ++++ b/src/glsl/convolution.frag +@@ -0,0 +1,21 @@ ++ ++const int KernelSize = 9; ++ ++//texture offsets ++uniform vec2 Offset[KernelSize]; ++//convolution kernel ++uniform vec4 KernelValue[KernelSize]; ++uniform sampler2D srcTex; ++uniform vec4 ScaleFactor; ++uniform vec4 BaseColor; ++ ++void main(void) ++{ ++ int i; ++ vec4 sum = vec4(0.0); ++ for (i = 0; i < KernelSize; ++i) { ++ vec4 tmp = texture2D(srcTex, gl_TexCoord[0].st + Offset[i]); ++ sum += tmp * KernelValue[i]; ++ } ++ gl_FragColor = sum * ScaleFactor + BaseColor; ++} +diff --git a/src/glsl/simplex-noise.glsl b/src/glsl/simplex-noise.glsl +new file mode 100644 +index 0000000..b6833cb +--- /dev/null ++++ b/src/glsl/simplex-noise.glsl +@@ -0,0 +1,279 @@ ++// ++// Description : Array and textureless GLSL 2D/3D/4D simplex ++// noise functions. ++// Author : Ian McEwan, Ashima Arts. ++// Maintainer : ijm ++// Lastmod : 20110223 ++// License : Copyright (C) 2011 Ashima Arts. All rights reserved. ++// Distributed under the Artistic License 2.0; See LICENCE file. ++// ++ ++#define NORMALIZE_GRADIENTS ++#undef USE_CIRCLE ++#define COLLAPSE_SORTNET ++ ++float permute(float x0,vec3 p) { ++ float x1 = mod(x0 * p.y, p.x); ++ return floor( mod( (x1 + p.z) *x0, p.x )); ++ } ++vec2 permute(vec2 x0,vec3 p) { ++ vec2 x1 = mod(x0 * p.y, p.x); ++ return floor( mod( (x1 + p.z) *x0, p.x )); ++ } ++vec3 permute(vec3 x0,vec3 p) { ++ vec3 x1 = mod(x0 * p.y, p.x); ++ return floor( mod( (x1 + p.z) *x0, p.x )); ++ } ++vec4 permute(vec4 x0,vec3 p) { ++ vec4 x1 = mod(x0 * p.y, p.x); ++ return floor( mod( (x1 + p.z) *x0, p.x )); ++ } ++ ++uniform vec4 pParam; ++// Example ++// const vec4 pParam = vec4( 17.* 17., 34., 1., 7.); ++ ++float taylorInvSqrt(float r) ++ { ++ return ( 0.83666002653408 + 0.7*0.85373472095314 - 0.85373472095314 * r ); ++ } ++ ++float simplexNoise2(vec2 v) ++ { ++ const vec2 C = vec2(0.211324865405187134, // (3.0-sqrt(3.0))/6.; ++ 0.366025403784438597); // 0.5*(sqrt(3.0)-1.); ++ const vec3 D = vec3( 0., 0.5, 2.0) * 3.14159265358979312; ++// First corner ++ vec2 i = floor(v + dot(v, C.yy) ); ++ vec2 x0 = v - i + dot(i, C.xx); ++ ++// Other corners ++ vec2 i1 = (x0.x > x0.y) ? vec2(1.,0.) : vec2(0.,1.) ; ++ ++ // x0 = x0 - 0. + 0. * C ++ vec2 x1 = x0 - i1 + 1. * C.xx ; ++ vec2 x2 = x0 - 1. + 2. * C.xx ; ++ ++// Permutations ++ i = mod(i, pParam.x); ++ vec3 p = permute( permute( ++ i.y + vec3(0., i1.y, 1. ), pParam.xyz) ++ + i.x + vec3(0., i1.x, 1. ), pParam.xyz); ++ ++#ifndef USE_CIRCLE ++// ( N points uniformly over a line, mapped onto a diamond.) ++ vec3 x = fract(p / pParam.w) ; ++ vec3 h = 0.5 - abs(x) ; ++ ++ vec3 sx = vec3(lessThan(x,D.xxx)) *2. -1.; ++ vec3 sh = vec3(lessThan(h,D.xxx)); ++ ++ vec3 a0 = x + sx*sh; ++ vec2 p0 = vec2(a0.x,h.x); ++ vec2 p1 = vec2(a0.y,h.y); ++ vec2 p2 = vec2(a0.z,h.z); ++ ++#ifdef NORMALISE_GRADIENTS ++ p0 *= taylorInvSqrt(dot(p0,p0)); ++ p1 *= taylorInvSqrt(dot(p1,p1)); ++ p2 *= taylorInvSqrt(dot(p2,p2)); ++#endif ++ ++ vec3 g = 2.0 * vec3( dot(p0, x0), dot(p1, x1), dot(p2, x2) ); ++#else ++// N points around a unit circle. ++ vec3 phi = D.z * mod(p,pParam.w) /pParam.w ; ++ vec4 a0 = sin(phi.xxyy+D.xyxy); ++ vec2 a1 = sin(phi.zz +D.xy); ++ vec3 g = vec3( dot(a0.xy, x0), dot(a0.zw, x1), dot(a1.xy, x2) ); ++#endif ++// mix ++ vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); ++ m = m*m ; ++ return 1.66666* 70.*dot(m*m, g); ++ } ++ ++float simplexNoise3(vec3 v) ++ { ++ const vec2 C = vec2(1./6. , 1./3. ) ; ++ const vec4 D = vec4(0., 0.5, 1.0, 2.0); ++ ++// First corner ++ vec3 i = floor(v + dot(v, C.yyy) ); ++ vec3 x0 = v - i + dot(i, C.xxx) ; ++ ++// Other corners ++#ifdef COLLAPSE_SORTNET ++ vec3 g = vec3( greaterThan( x0.xyz, x0.yzx) ); ++ vec3 l = vec3( lessThanEqual( x0.xyz, x0.yzx) ); ++ ++ vec3 i1 = g.xyz * l.zxy; ++ vec3 i2 = max( g.xyz, l.zxy); ++#else ++// Keeping this clean - let the compiler optimize. ++ vec3 q1; ++ q1.x = max(x0.x, x0.y); ++ q1.y = min(x0.x, x0.y); ++ q1.z = x0.z; ++ ++ vec3 q2; ++ q2.x = max(q1.x,q1.z); ++ q2.z = min(q1.x,q1.z); ++ q2.y = q1.y; ++ ++ vec3 q3; ++ q3.y = max(q2.y, q2.z); ++ q3.z = min(q2.y, q2.z); ++ q3.x = q2.x; ++ ++ vec3 i1 = vec3(equal(q3.xxx, x0)); ++ vec3 i2 = i1 + vec3(equal(q3.yyy, x0)); ++#endif ++ ++ // x0 = x0 - 0. + 0. * C ++ vec3 x1 = x0 - i1 + 1. * C.xxx; ++ vec3 x2 = x0 - i2 + 2. * C.xxx; ++ vec3 x3 = x0 - 1. + 3. * C.xxx; ++ ++// Permutations ++ i = mod(i, pParam.x ); ++ vec4 p = permute( permute( permute( ++ i.z + vec4(0., i1.z, i2.z, 1. ), pParam.xyz) ++ + i.y + vec4(0., i1.y, i2.y, 1. ), pParam.xyz) ++ + i.x + vec4(0., i1.x, i2.x, 1. ), pParam.xyz); ++ ++// Gradients ++// ( N*N points uniformly over a square, mapped onto a octohedron.) ++ float n_ = 1.0/pParam.w ; ++ vec3 ns = n_ * D.wyz - D.xzx ; ++ ++ vec4 j = p - pParam.w*pParam.w*floor(p * ns.z *ns.z); // mod(p,N*N) ++ ++ vec4 x_ = floor(j * ns.z) ; ++ vec4 y_ = floor(j - pParam.w * x_ ) ; // mod(j,N) ++ ++ vec4 x = x_ *ns.x + ns.yyyy; ++ vec4 y = y_ *ns.x + ns.yyyy; ++ vec4 h = 1. - abs(x) - abs(y); ++ ++ vec4 b0 = vec4( x.xy, y.xy ); ++ vec4 b1 = vec4( x.zw, y.zw ); ++ ++ vec4 s0 = vec4(lessThan(b0,D.xxxx)) *2. -1.; ++ vec4 s1 = vec4(lessThan(b1,D.xxxx)) *2. -1.; ++ vec4 sh = vec4(lessThan(h, D.xxxx)); ++ ++ vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ; ++ vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ; ++ ++ vec3 p0 = vec3(a0.xy,h.x); ++ vec3 p1 = vec3(a0.zw,h.y); ++ vec3 p2 = vec3(a1.xy,h.z); ++ vec3 p3 = vec3(a1.zw,h.w); ++ ++#ifdef NORMALISE_GRADIENTS ++ p0 *= taylorInvSqrt(dot(p0,p0)); ++ p1 *= taylorInvSqrt(dot(p1,p1)); ++ p2 *= taylorInvSqrt(dot(p2,p2)); ++ p3 *= taylorInvSqrt(dot(p3,p3)); ++#endif ++ ++// Mix ++ vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.); ++ m = m * m; ++//used to be 64. ++ return 48.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1), ++ dot(p2,x2), dot(p3,x3) ) ); ++ } ++ ++vec4 grad4(float j, vec4 ip) ++ { ++ const vec4 ones = vec4(1.,1.,1.,-1.); ++ vec4 p,s; ++ ++ p.xyz = floor( fract (vec3(j) * ip.xyz) *pParam.w) * ip.z -1.0; ++ p.w = 1.5 - dot(abs(p.xyz), ones.xyz); ++ s = vec4(lessThan(p,vec4(0.))); ++ p.xyz = p.xyz + (s.xyz*2.-1.) * s.www; ++ ++ return p; ++ } ++ ++float simplexNoise4(vec4 v) ++ { ++ const vec2 C = vec2( 0.138196601125010504, // (5 - sqrt(5))/20 G4 ++ 0.309016994374947451); // (sqrt(5) - 1)/4 F4 ++// First corner ++ vec4 i = floor(v + dot(v, C.yyyy) ); ++ vec4 x0 = v - i + dot(i, C.xxxx); ++ ++// Other corners ++ ++// Force existance of strict total ordering in sort. ++ vec4 q0 = floor(x0 * 1024.0) + vec4( 0., 1./4., 2./4. , 3./4.); ++ vec4 q1; ++ q1.xy = max(q0.xy,q0.zw); // x:z y:w ++ q1.zw = min(q0.xy,q0.zw); ++ ++ vec4 q2; ++ q2.xz = max(q1.xz,q1.yw); // x:y z:w ++ q2.yw = min(q1.xz,q1.yw); ++ ++ vec4 q3; ++ q3.y = max(q2.y,q2.z); // y:z ++ q3.z = min(q2.y,q2.z); ++ q3.xw = q2.xw; ++ ++ vec4 i1 = vec4(lessThanEqual(q3.xxxx, q0)); ++ vec4 i2 = vec4(lessThanEqual(q3.yyyy, q0)); ++ vec4 i3 = vec4(lessThanEqual(q3.zzzz, q0)); ++ ++ // x0 = x0 - 0. + 0. * C ++ vec4 x1 = x0 - i1 + 1. * C.xxxx; ++ vec4 x2 = x0 - i2 + 2. * C.xxxx; ++ vec4 x3 = x0 - i3 + 3. * C.xxxx; ++ vec4 x4 = x0 - 1. + 4. * C.xxxx; ++ ++// Permutations ++ i = mod(i, pParam.x ); ++ float j0 = permute( permute( permute( permute ( ++ i.w, pParam.xyz) + i.z, pParam.xyz) ++ + i.y, pParam.xyz) + i.x, pParam.xyz); ++ vec4 j1 = permute( permute( permute( permute ( ++ i.w + vec4(i1.w, i2.w, i3.w, 1. ), pParam.xyz) ++ + i.z + vec4(i1.z, i2.z, i3.z, 1. ), pParam.xyz) ++ + i.y + vec4(i1.y, i2.y, i3.y, 1. ), pParam.xyz) ++ + i.x + vec4(i1.x, i2.x, i3.x, 1. ), pParam.xyz); ++// Gradients ++// ( N*N*N points uniformly over a cube, mapped onto a 4-octohedron.) ++ vec4 ip = pParam ; ++ ip.xy *= pParam.w ; ++ ip.x *= pParam.w ; ++ ip = vec4(1.,1.,1.,2.) / ip ; ++ ++ vec4 p0 = grad4(j0, ip); ++ vec4 p1 = grad4(j1.x, ip); ++ vec4 p2 = grad4(j1.y, ip); ++ vec4 p3 = grad4(j1.z, ip); ++ vec4 p4 = grad4(j1.w, ip); ++ ++#ifdef NORMALISE_GRADIENTS ++ p0 *= taylorInvSqrt(dot(p0,p0)); ++ p1 *= taylorInvSqrt(dot(p1,p1)); ++ p2 *= taylorInvSqrt(dot(p2,p2)); ++ p3 *= taylorInvSqrt(dot(p3,p3)); ++ p4 *= taylorInvSqrt(dot(p4,p4)); ++#endif ++ ++// Mix ++ vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); ++ vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4) ), 0.); ++ m0 = m0 * m0; ++ m1 = m1 * m1; ++ return 32. * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 ))) ++ + dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ; ++ ++ } ++ ++ ++ +diff --git a/src/glsl/skinning.vert b/src/glsl/skinning.vert +new file mode 100644 +index 0000000..28970ee +--- /dev/null ++++ b/src/glsl/skinning.vert +@@ -0,0 +1,24 @@ ++// Vertex weighting/blendin shader ++// Brian Paul ++// 4 Nov 2008 ++ ++uniform mat4 mat0, mat1; ++attribute float weight; ++ ++void main() ++{ ++ // simple diffuse shading ++ // Note that we should really transform the normal vector along with ++ // the postion below... someday. ++ vec3 lightVec = vec3(0, 0, 1); ++ vec3 norm = gl_NormalMatrix * gl_Normal; ++ float dot = 0.2 + max(0.0, dot(norm, lightVec)); ++ gl_FrontColor = vec4(dot); ++ ++ // compute sum of weighted transformations ++ vec4 pos0 = mat0 * gl_Vertex; ++ vec4 pos1 = mat1 * gl_Vertex; ++ vec4 pos = mix(pos0, pos1, weight); ++ ++ gl_Position = gl_ModelViewProjectionMatrix * pos; ++} +diff --git a/src/perf/glslstateschange1.frag b/src/perf/glslstateschange1.frag +new file mode 100644 +index 0000000..0839436 +--- /dev/null ++++ b/src/perf/glslstateschange1.frag +@@ -0,0 +1,19 @@ ++// Multi-texture fragment shader ++// Brian Paul ++ ++// Composite second texture over first. ++// We're assuming the 2nd texture has a meaningful alpha channel. ++ ++uniform sampler2D tex1; ++uniform sampler2D tex2; ++uniform vec4 UniV1; ++uniform vec4 UniV2; ++ ++void main() ++{ ++ vec4 t3; ++ vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); ++ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); ++ t3 = mix(t1, t2, t2.w); ++ gl_FragColor = t3 + UniV1 + UniV2; ++} +diff --git a/src/perf/glslstateschange1.vert b/src/perf/glslstateschange1.vert +new file mode 100644 +index 0000000..cef50db +--- /dev/null ++++ b/src/perf/glslstateschange1.vert +@@ -0,0 +1,14 @@ ++// Multi-texture vertex shader ++// Brian Paul ++ ++ ++attribute vec4 TexCoord0, TexCoord1; ++attribute vec4 VertCoord; ++ ++void main() ++{ ++ gl_TexCoord[0] = TexCoord0; ++ gl_TexCoord[1] = TexCoord1; ++ // note: may use gl_Vertex or VertCoord here for testing: ++ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; ++} +diff --git a/src/perf/glslstateschange2.frag b/src/perf/glslstateschange2.frag +new file mode 100644 +index 0000000..0df0319 +--- /dev/null ++++ b/src/perf/glslstateschange2.frag +@@ -0,0 +1,17 @@ ++// Multi-texture fragment shader ++// Brian Paul ++ ++// Composite second texture over first. ++// We're assuming the 2nd texture has a meaningful alpha channel. ++ ++uniform sampler2D tex1; ++uniform sampler2D tex2; ++uniform vec4 UniV1; ++uniform vec4 UniV2; ++ ++void main() ++{ ++ vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); ++ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); ++ gl_FragColor = t1 + t2 + UniV1 + UniV2; ++} +diff --git a/src/perf/glslstateschange2.vert b/src/perf/glslstateschange2.vert +new file mode 100644 +index 0000000..cef50db +--- /dev/null ++++ b/src/perf/glslstateschange2.vert +@@ -0,0 +1,14 @@ ++// Multi-texture vertex shader ++// Brian Paul ++ ++ ++attribute vec4 TexCoord0, TexCoord1; ++attribute vec4 VertCoord; ++ ++void main() ++{ ++ gl_TexCoord[0] = TexCoord0; ++ gl_TexCoord[1] = TexCoord1; ++ // note: may use gl_Vertex or VertCoord here for testing: ++ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; ++} +diff --git a/src/vpglsl/infinite-loop.glsl b/src/vpglsl/infinite-loop.glsl +new file mode 100644 +index 0000000..bc7ae4b +--- /dev/null ++++ b/src/vpglsl/infinite-loop.glsl +@@ -0,0 +1,8 @@ ++void main() { ++ gl_Position = gl_Vertex; ++ vec4 sum = vec4(0); ++ for (int i = 1; i != 2; i += 2) { ++ sum += vec4(0.1, 0.1, 0.1, 0.1); ++ } ++ gl_FrontColor = sum; ++} +-- +2.0.0 + diff --git a/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 @@ +From 36829a8d7ad2888515fbee95c2a70b3d636d7538 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Wed, 9 Jul 2014 14:30:33 +0200 +Subject: [PATCH 2/9] Correctly implement with AC_WITH(glut) so that + --without-glut works. + +--- + configure.ac | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c4ee12b..9445424 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -67,21 +67,25 @@ DEMO_CFLAGS="$DEMO_CFLAGS $GL_CFLAGS" + DEMO_LIBS="$DEMO_LIBS $GL_LIBS" + + dnl Check for GLUT +-GLUT_CFLAGS="" +-GLUT_LIBS=-lglut +-glut_enabled=yes ++glut_enabled=no + AC_ARG_WITH([glut], + [AS_HELP_STRING([--with-glut=DIR], + [glut install directory])], + [GLUT_CFLAGS="-I$withval/include" +- GLUT_LIBS="-L$withval/lib -lglut"]) +-AC_CHECK_HEADER([GL/glut.h], +- [], +- [glut_enabled=no]) +-AC_CHECK_LIB([glut], +- [glutInit], +- [], +- [glut_enabled=no]) ++ GLUT_LIBS="-L$withval/lib -lglut"], ++ [GLUT_CFLAGS="" ++ GLUT_LIBS="-lglut"] ++ ) ++AS_IF([test "x$with_glut" != xno], ++ [AC_CHECK_HEADER([GL/glut.h], ++ [], ++ [glut_enabled=no]) ++ AC_CHECK_LIB([glut], ++ [glutInit], ++ [], ++ [glut_enabled=no]) ++ glut_enabled=yes ++]) + + dnl Check for FreeGLUT 2.6 or later + AC_EGREP_HEADER([glutInitContextProfile], +-- +2.0.0 + diff --git a/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 @@ +From b25e9c675cf560b8b037dc855c6b3b1d09957867 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 9 Jul 2014 14:23:41 +0200 +Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or + GLU + +* in some systems without X11 support we don't have GLEW, but + mesa-demos are still useful + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure.ac | 49 ++++++++++++++++++++--------- + src/Makefile.am | 14 ++++++--- + src/demos/Makefile.am | 73 ++++++++++++++++++++++++------------------- + src/egl/Makefile.am | 8 +++-- + src/egl/opengles1/Makefile.am | 44 +++++++++++++++----------- + src/egl/opengles2/Makefile.am | 33 ++++++++++--------- + 6 files changed, 135 insertions(+), 86 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9445424..bc4c8d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -93,25 +93,44 @@ AC_EGREP_HEADER([glutInitContextProfile], + [AC_DEFINE(HAVE_FREEGLUT)], + []) + +-dnl Check for GLEW +-PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4]) +-DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" +-DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" ++AC_ARG_ENABLE([glew], ++ [AS_HELP_STRING([--enable-glew], ++ [build demos which require glew @<:@default=yes@:>@])], ++ [enable_glew="$enableval"], ++ [enable_glew=yes] ++) ++ ++if test "x$enable_glew" = xyes; then ++ dnl Check for GLEW ++ PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4], [glew_enabled=yes], [glew_enabled=no]) ++ DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" ++ DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" ++fi + + # LIBS was set by AC_CHECK_LIB above + LIBS="" + +-PKG_CHECK_MODULES(GLU, [glu], [], +- [AC_CHECK_HEADER([GL/glu.h], +- [], +- AC_MSG_ERROR([GLU not found])) +- AC_CHECK_LIB([GLU], +- [gluBeginCurve], +- [GLU_LIBS=-lGLU], +- AC_MSG_ERROR([GLU required])) ]) ++AC_ARG_ENABLE([glu], ++ [AS_HELP_STRING([--enable-glu], ++ [build demos which require glu @<:@default=yes@:>@])], ++ [enable_glu="$enableval"], ++ [enable_glu=yes] ++) + +-DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" +-DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" ++if test "x$enable_glu" = xyes; then ++ PKG_CHECK_MODULES(GLU, [glu], [], ++ [AC_CHECK_HEADER([GL/glu.h], ++ [], ++ AC_MSG_ERROR([GLU not found])) ++ AC_CHECK_LIB([GLU], ++ [gluBeginCurve], ++ [GLU_LIBS=-lGLU ++ glu_enabled=yes], ++ AC_MSG_ERROR([GLU required])) ]) ++ ++ DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" ++ DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" ++fi + + AC_ARG_ENABLE([egl], + [AS_HELP_STRING([--enable-egl], +@@ -304,6 +323,8 @@ AC_SUBST([WAYLAND_CFLAGS]) + AC_SUBST([WAYLAND_LIBS]) + + ++AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes") ++AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes") + AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") + AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") + AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") +diff --git a/src/Makefile.am b/src/Makefile.am +index 1647d64..754c47c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -23,14 +23,18 @@ + # Eric Anholt + ++if HAVE_GLEW ++UTIL = util ++endif ++ + SUBDIRS = \ +- util \ ++ $(UTIL) \ + data \ + demos \ + egl \ + fp \ + fpglsl \ + glsl \ +- gs \ ++ gs \ + objviewer \ + osdemos \ + perf \ +@@ -40,8 +39,12 @@ SUBDIRS = \ + slang \ + tests \ + tools \ +- trivial \ +- vp \ +- vpglsl \ + wgl \ + xdemos ++ ++if HAVE_GLEW ++SUBDIRS += \ ++ vp \ ++ vpglsl \ ++ trivial ++endif +diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am +index 41603fa..ab1e3ab 100644 +--- a/src/demos/Makefile.am ++++ b/src/demos/Makefile.am +@@ -30,91 +30,100 @@ AM_LDFLAGS = \ + $(DEMO_LIBS) \ + $(GLUT_LIBS) + ++bin_PROGRAMS = ++ + if HAVE_GLUT +-bin_PROGRAMS = \ ++if HAVE_GLEW ++bin_PROGRAMS += \ + arbfplight \ + arbfslight \ + arbocclude \ + arbocclude2 \ +- bounce \ +- clearspd \ + copypix \ + cubemap \ + cuberender \ + dinoshade \ +- dissolve \ +- drawpix \ + engine \ + fbo_firecube \ + fbotexture \ +- fire \ + fogcoord \ + fplight \ + fslight \ ++ gloss \ ++ isosurf \ ++ multiarb \ ++ paltex \ ++ pointblast \ ++ projtex \ ++ shadowtex \ ++ spriteblast \ ++ stex3d \ ++ textures \ ++ vao_demo \ ++ winpos ++ ++copypix_LDADD = ../util/libutil.la ++cubemap_LDADD = ../util/libutil.la ++cuberender_LDADD = ../util/libutil.la ++engine_LDADD = ../util/libutil.la ++fbo_firecube_LDADD = ../util/libutil.la ++gloss_LDADD = ../util/libutil.la ++isosurf_LDADD = ../util/libutil.la ++multiarb_LDADD = ../util/libutil.la ++projtex_LDADD = ../util/libutil.la ++textures_LDADD = ../util/libutil.la ++winpos_LDADD = ../util/libutil.la ++endif ++ ++if HAVE_GLU ++bin_PROGRAMS += \ ++ bounce \ ++ clearspd \ ++ dissolve \ ++ drawpix \ ++ fire \ + gamma \ + gearbox \ + gears \ + geartrain \ + glinfo \ +- gloss \ + gltestperf \ + ipers \ +- isosurf \ + lodbias \ + morph3d \ +- multiarb \ +- paltex \ + pixeltest \ +- pointblast \ +- projtex \ + ray \ + readpix \ + reflect \ + renormal \ +- shadowtex \ + singlebuffer \ + spectex \ +- spriteblast \ +- stex3d \ + teapot \ + terrain \ + tessdemo \ + texcyl \ + texenv \ +- textures \ + trispd \ + tunnel2 \ +- tunnel \ +- vao_demo \ +- winpos +-endif ++ tunnel + + tunnel_SOURCES = \ + tunnel.c \ + tunneldat.h + +-copypix_LDADD = ../util/libutil.la +-cubemap_LDADD = ../util/libutil.la +-cuberender_LDADD = ../util/libutil.la +-drawpix_LDADD = ../util/libutil.la + dissolve_LDADD = ../util/libutil.la +-engine_LDADD = ../util/libutil.la +-fbo_firecube_LDADD = ../util/libutil.la ++drawpix_LDADD = ../util/libutil.la + fire_LDADD = ../util/libutil.la +-gloss_LDADD = ../util/libutil.la + ipers_LDADD = ../util/libutil.la +-isosurf_LDADD = ../util/libutil.la + lodbias_LDADD = ../util/libutil.la +-multiarb_LDADD = ../util/libutil.la +-projtex_LDADD = ../util/libutil.la + readpix_LDADD = ../util/libutil.la + reflect_LDADD = ../util/libutil.la + teapot_LDADD = ../util/libutil.la + texcyl_LDADD = ../util/libutil.la +-textures_LDADD = ../util/libutil.la + tunnel_LDADD = ../util/libutil.la + tunnel2_LDADD = ../util/libutil.la +-winpos_LDADD = ../util/libutil.la ++endif ++endif + + EXTRA_DIST = \ + README +diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am +index d64a49e..4fe1ca8 100644 +--- a/src/egl/Makefile.am ++++ b/src/egl/Makefile.am +@@ -24,8 +24,12 @@ + + SUBDIRS = \ + eglut \ +- opengl \ +- openvg \ + opengles1 \ + opengles2 \ + oes_vg ++ ++if HAVE_GLU ++SUBDIRS += \ ++ opengl \ ++ openvg ++endif +diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am +index 7a9828d..3455e75 100644 +--- a/src/egl/opengles1/Makefile.am ++++ b/src/egl/opengles1/Makefile.am +@@ -36,28 +36,43 @@ AM_LDFLAGS = \ + $(EGL_LIBS) \ + -lm + ++noinst_PROGRAMS = ++ + if HAVE_EGL + if HAVE_GLESV1 +-noinst_PROGRAMS = \ +- bindtex \ +- clear \ ++noinst_PROGRAMS += \ + drawtex_screen \ ++ gears_screen \ ++ torus_screen \ ++ tri_screen ++ ++drawtex_screen_SOURCES = drawtex.c ++gears_screen_SOURCES = gears.c ++torus_screen_SOURCES = torus.c ++tri_screen_SOURCES = tri.c ++ ++drawtex_screen_LDADD = ../eglut/libeglut_screen.la ++gears_screen_LDADD = ../eglut/libeglut_screen.la ++torus_screen_LDADD = ../eglut/libeglut_screen.la ++tri_screen_LDADD = ../eglut/libeglut_screen.la ++ ++if HAVE_X11 ++noinst_PROGRAMS += \ ++ clear ++ ++bin_PROGRAMS = \ ++ bindtex \ + drawtex_x11 \ + eglfbdev \ + es1_info \ +- gears_screen \ + gears_x11 \ + msaa \ + pbuffer\ + render_tex \ + texture_from_pixmap \ +- torus_screen \ + torus_x11 \ +- tri_screen \ + tri_x11 \ + two_win +-endif +-endif + + bindtex_LDADD = $(X11_LIBS) + es1_info_LDADD = $(X11_LIBS) +@@ -71,22 +86,15 @@ two_win_LDADD = $(X11_LIBS) + clear_LDADD = ../eglut/libeglut_x11.la $(EGL_LIBS) $(X11_LIBS) + clear_LDFLAGS = + +-drawtex_screen_SOURCES = drawtex.c +-gears_screen_SOURCES = gears.c +-torus_screen_SOURCES = torus.c +-tri_screen_SOURCES = tri.c +- + drawtex_x11_SOURCES = drawtex.c + gears_x11_SOURCES = gears.c + torus_x11_SOURCES = torus.c + tri_x11_SOURCES = tri.c + +-drawtex_screen_LDADD = ../eglut/libeglut_screen.la +-gears_screen_LDADD = ../eglut/libeglut_screen.la +-torus_screen_LDADD = ../eglut/libeglut_screen.la +-tri_screen_LDADD = ../eglut/libeglut_screen.la +- + drawtex_x11_LDADD = ../eglut/libeglut_x11.la + gears_x11_LDADD = ../eglut/libeglut_x11.la + torus_x11_LDADD = ../eglut/libeglut_x11.la + tri_x11_LDADD = ../eglut/libeglut_x11.la ++endif ++endif ++endif +diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am +index 41c1b80..74af460 100644 +--- a/src/egl/opengles2/Makefile.am ++++ b/src/egl/opengles2/Makefile.am +@@ -36,26 +36,29 @@ AM_LDFLAGS = \ + if HAVE_EGL + if HAVE_GLESV2 + bin_PROGRAMS = \ +- es2_info \ +- es2gears_screen \ +- es2gears_x11 \ +- es2tri ++ es2gears_screen ++ ++es2gears_screen_SOURCES = es2gears.c ++es2gears_screen_LDADD = ../eglut/libeglut_screen.la ++ + if HAVE_WAYLAND + bin_PROGRAMS += es2gears_wayland +-endif +-endif +-endif + +-es2_info_LDADD = $(X11_LIBS) +-es2tri_LDADD = $(X11_LIBS) ++es2gears_wayland_SOURCES = es2gears.c ++es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la ++endif + +-es2gears_screen_SOURCES = es2gears.c ++if HAVE_X11 ++bin_PROGRAMS += \ ++ es2tri \ ++ es2_info \ ++ es2gears_x11 + ++es2_info_LDADD = $(X11_LIBS) + es2gears_x11_SOURCES = es2gears.c +- +-es2gears_screen_LDADD = ../eglut/libeglut_screen.la +- + es2gears_x11_LDADD = ../eglut/libeglut_x11.la ++es2tri_LDADD = $(X11_LIBS) ++endif ++endif ++endif + +-es2gears_wayland_SOURCES = es2gears.c +-es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la +-- +2.0.0 + diff --git a/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 @@ +From 5e10108d76a59abac21c7e540bcfd2ddaccca2cb Mon Sep 17 00:00:00 2001 +From: Drew Moseley +Date: Fri, 9 May 2014 11:50:24 -0400 +Subject: [PATCH 4/9] Use DEMOS_DATA_DIR to locate data files + +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=78496] +Signed-off-by: Drew Moseley +--- + src/glsl/bezier.c | 2 +- + src/glsl/blinking-teapot.c | 4 ++-- + src/glsl/brick.c | 4 ++-- + src/glsl/bump.c | 6 +++--- + src/glsl/convolutions.c | 2 +- + src/glsl/mandelbrot.c | 4 ++-- + src/glsl/multitex.c | 4 ++-- + src/glsl/simplex-noise.c | 2 +- + src/glsl/skinning.c | 4 ++-- + src/glsl/texdemo1.c | 8 ++++---- + src/glsl/toyball.c | 4 ++-- + src/objviewer/objview.c | 12 ++++++------ + src/perf/glslstateschange.c | 8 ++++---- + 13 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c +index 0b56bc1..e01603d 100644 +--- a/src/glsl/bezier.c ++++ b/src/glsl/bezier.c +@@ -13,7 +13,7 @@ + #include "glut_wrap.h" + #include "shaderutil.h" + +-static const char *filename = "bezier.geom"; ++static const char *filename = DEMOS_DATA_DIR "bezier.geom"; + + static GLuint fragShader; + static GLuint vertShader; +diff --git a/src/glsl/blinking-teapot.c b/src/glsl/blinking-teapot.c +index e3bf24d..7662b1f 100644 +--- a/src/glsl/blinking-teapot.c ++++ b/src/glsl/blinking-teapot.c +@@ -63,8 +63,8 @@ init_opengl (void) + exit(1); + } + +- vshad_id = CompileShaderFile (GL_VERTEX_SHADER, "blinking-teapot.vert"); +- fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, "blinking-teapot.frag"); ++ vshad_id = CompileShaderFile (GL_VERTEX_SHADER, DEMOS_DATA_DIR "blinking-teapot.vert"); ++ fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, DEMOS_DATA_DIR "blinking-teapot.frag"); + prog_id = LinkShaders (vshad_id, fshad_id); + + UseProgram (prog_id); +diff --git a/src/glsl/brick.c b/src/glsl/brick.c +index 3021856..fe5f190 100644 +--- a/src/glsl/brick.c ++++ b/src/glsl/brick.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH06-brick.frag"; +-static char *VertProgFile = "CH06-brick.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH06-brick.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH06-brick.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/bump.c b/src/glsl/bump.c +index 59f62cd..3a1b20a 100644 +--- a/src/glsl/bump.c ++++ b/src/glsl/bump.c +@@ -15,9 +15,9 @@ + #include "readtex.h" + + +-static char *FragProgFile = "CH11-bumpmap.frag"; +-static char *FragTexProgFile = "CH11-bumpmaptex.frag"; +-static char *VertProgFile = "CH11-bumpmap.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH11-bumpmap.frag"; ++static char *FragTexProgFile = DEMOS_DATA_DIR "CH11-bumpmaptex.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH11-bumpmap.vert"; + static char *TextureFile = DEMOS_DATA_DIR "tile.rgb"; + + /* program/shader objects */ +diff --git a/src/glsl/convolutions.c b/src/glsl/convolutions.c +index a120cfe..9312f00 100644 +--- a/src/glsl/convolutions.c ++++ b/src/glsl/convolutions.c +@@ -340,7 +340,7 @@ static void init(void) + + menuInit(); + readTexture(textureLocation); +- createProgram("convolution.vert", "convolution.frag"); ++ createProgram(DEMOS_DATA_DIR "convolution.vert", DEMOS_DATA_DIR "convolution.frag"); + + glEnable(GL_TEXTURE_2D); + glClearColor(1.0, 1.0, 1.0, 1.0); +diff --git a/src/glsl/mandelbrot.c b/src/glsl/mandelbrot.c +index 31ede1d..ab34a0f 100644 +--- a/src/glsl/mandelbrot.c ++++ b/src/glsl/mandelbrot.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH18-mandel.frag"; +-static char *VertProgFile = "CH18-mandel.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH18-mandel.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH18-mandel.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/multitex.c b/src/glsl/multitex.c +index 262ea50..546bd27 100644 +--- a/src/glsl/multitex.c ++++ b/src/glsl/multitex.c +@@ -35,8 +35,8 @@ + + static const char *Demo = "multitex"; + +-static const char *VertFile = "multitex.vert"; +-static const char *FragFile = "multitex.frag"; ++static const char *VertFile = DEMOS_DATA_DIR "multitex.vert"; ++static const char *FragFile = DEMOS_DATA_DIR "multitex.frag"; + + static const char *TexFiles[2] = + { +diff --git a/src/glsl/simplex-noise.c b/src/glsl/simplex-noise.c +index 13fdd5d..885f01e 100644 +--- a/src/glsl/simplex-noise.c ++++ b/src/glsl/simplex-noise.c +@@ -169,7 +169,7 @@ SpecialKey(int key, int x, int y) + static void + Init(void) + { +- const char *filename = "simplex-noise.glsl"; ++ const char *filename = DEMOS_DATA_DIR "simplex-noise.glsl"; + char noiseText[10000]; + FILE *f; + int len; +diff --git a/src/glsl/skinning.c b/src/glsl/skinning.c +index bf38d77..536d475 100644 +--- a/src/glsl/skinning.c ++++ b/src/glsl/skinning.c +@@ -20,8 +20,8 @@ + #define M_PI 3.1415926535 + #endif + +-static char *FragProgFile = "skinning.frag"; +-static char *VertProgFile = "skinning.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "skinning.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "skinning.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/texdemo1.c b/src/glsl/texdemo1.c +index 6cde239..a082342 100644 +--- a/src/glsl/texdemo1.c ++++ b/src/glsl/texdemo1.c +@@ -35,11 +35,11 @@ + + static const char *Demo = "texdemo1"; + +-static const char *ReflectVertFile = "reflect.vert"; +-static const char *CubeFragFile = "cubemap.frag"; ++static const char *ReflectVertFile = DEMOS_DATA_DIR "reflect.vert"; ++static const char *CubeFragFile = DEMOS_DATA_DIR "cubemap.frag"; + +-static const char *SimpleVertFile = "simple.vert"; +-static const char *SimpleTexFragFile = "shadowtex.frag"; ++static const char *SimpleVertFile = DEMOS_DATA_DIR "simple.vert"; ++static const char *SimpleTexFragFile = DEMOS_DATA_DIR "shadowtex.frag"; + + static const char *GroundImage = DEMOS_DATA_DIR "tile.rgb"; + +diff --git a/src/glsl/toyball.c b/src/glsl/toyball.c +index 5f27951..4e7e832 100644 +--- a/src/glsl/toyball.c ++++ b/src/glsl/toyball.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH11-toyball.frag"; +-static char *VertProgFile = "CH11-toyball.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH11-toyball.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH11-toyball.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/objviewer/objview.c b/src/objviewer/objview.c +index 6def726..78a6acf 100644 +--- a/src/objviewer/objview.c ++++ b/src/objviewer/objview.c +@@ -162,12 +162,12 @@ init_model(void) + static void + init_skybox(void) + { +- SkyboxTex = LoadSkyBoxCubeTexture("alpine_east.rgb", +- "alpine_west.rgb", +- "alpine_up.rgb", +- "alpine_down.rgb", +- "alpine_south.rgb", +- "alpine_north.rgb"); ++ SkyboxTex = LoadSkyBoxCubeTexture(DEMOS_DATA_DIR "alpine_east.rgb", ++ DEMOS_DATA_DIR "alpine_west.rgb", ++ DEMOS_DATA_DIR "alpine_up.rgb", ++ DEMOS_DATA_DIR "alpine_down.rgb", ++ DEMOS_DATA_DIR "alpine_south.rgb", ++ DEMOS_DATA_DIR "alpine_north.rgb"); + glmSpecularTexture(Model, SkyboxTex); + } + +diff --git a/src/perf/glslstateschange.c b/src/perf/glslstateschange.c +index 7422b78..dbf8332 100644 +--- a/src/perf/glslstateschange.c ++++ b/src/perf/glslstateschange.c +@@ -33,10 +33,10 @@ + #include "glmain.h" + #include "common.h" + +-static const char *VertFile1 = "glslstateschange1.vert"; +-static const char *FragFile1 = "glslstateschange1.frag"; +-static const char *VertFile2 = "glslstateschange2.vert"; +-static const char *FragFile2 = "glslstateschange2.frag"; ++static const char *VertFile1 = DEMOS_DATA_DIR "glslstateschange1.vert"; ++static const char *FragFile1 = DEMOS_DATA_DIR "glslstateschange1.frag"; ++static const char *VertFile2 = DEMOS_DATA_DIR "glslstateschange2.vert"; ++static const char *FragFile2 = DEMOS_DATA_DIR "glslstateschange2.frag"; + static struct uniform_info Uniforms1[] = { + { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, + { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 }, +-- +2.0.0 + diff --git a/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 @@ +From 453353a221de9c64479f4372565d2cd8591b36cc Mon Sep 17 00:00:00 2001 +From: Frank Binns +Date: Fri, 29 Jun 2012 11:26:04 +0100 +Subject: [PATCH 5/9] Fix build when EGL_MESA_screen_surface extension isn't + present + +The EGL demos won't build against EGL implementations that don't support +the EGL_MESA_screen_surface extension. Fix this, in most cases, by +wrapping relevant bits of code in #ifdef EGL_MESA_screen_surface. + +Signed-off-by: Frank Binns + +Applied and fixed up in Yocto by... + +Integrated-by: Tom Zanussi + +Upstream-Status: Pending +--- + src/egl/eglut/eglut.c | 9 +++++++-- + src/egl/eglut/eglut_screen.c | 14 ++++++++++++++ + src/egl/opengl/demo1.c | 2 ++ + src/egl/opengl/demo2.c | 7 ++++++- + src/egl/opengl/demo3.c | 7 ++++++- + 5 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c +index 2ee6f15..f6a2ad4 100644 +--- a/src/egl/eglut/eglut.c ++++ b/src/egl/eglut/eglut.c +@@ -76,8 +76,9 @@ _eglutNow(void) + static void + _eglutDestroyWindow(struct eglut_window *win) + { +- if (_eglut->surface_type != EGL_PBUFFER_BIT && +- _eglut->surface_type != EGL_SCREEN_BIT_MESA) ++ ++ if (_eglut->surface_type == EGL_WINDOW_BIT || ++ _eglut->surface_type == EGL_PIXMAP_BIT) + eglDestroySurface(_eglut->dpy, win->surface); + + _eglutNativeFiniWindow(win); +@@ -175,7 +176,9 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h) + win->config, win->native.u.pixmap, NULL); + break; + case EGL_PBUFFER_BIT: ++#ifdef EGL_MESA_screen_surface + case EGL_SCREEN_BIT_MESA: ++#endif + win->surface = win->native.u.surface; + break; + default: +@@ -289,8 +292,10 @@ eglutDestroyWindow(int win) + if (window->index != win) + return; + ++#ifdef EGL_MESA_screen_surface + /* XXX it causes some bug in st/egl KMS backend */ + if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA) ++#endif + eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + + _eglutDestroyWindow(_eglut->current); +diff --git a/src/egl/eglut/eglut_screen.c b/src/egl/eglut/eglut_screen.c +index 021a8f1..094a4e2 100644 +--- a/src/egl/eglut/eglut_screen.c ++++ b/src/egl/eglut/eglut_screen.c +@@ -35,26 +35,33 @@ + + #define MAX_MODES 100 + ++#ifdef EGL_MESA_screen_surface + static EGLScreenMESA kms_screen; + static EGLModeMESA kms_mode; + static EGLint kms_width, kms_height; ++#endif + + void + _eglutNativeInitDisplay(void) + { ++#ifdef EGL_MESA_screen_surface + _eglut->native_dpy = EGL_DEFAULT_DISPLAY; + _eglut->surface_type = EGL_SCREEN_BIT_MESA; ++#endif + } + + void + _eglutNativeFiniDisplay(void) + { ++#ifdef EGL_MESA_screen_surface + kms_screen = 0; + kms_mode = 0; + kms_width = 0; + kms_height = 0; ++#endif + } + ++#ifdef EGL_MESA_screen_surface + static void + init_kms(void) + { +@@ -94,19 +101,23 @@ init_kms(void) + kms_width = width; + kms_height = height; + } ++#endif + + void + _eglutNativeInitWindow(struct eglut_window *win, const char *title, + int x, int y, int w, int h) + { ++#ifdef EGL_MESA_screen_surface + EGLint surf_attribs[16]; + EGLint i; ++#endif + const char *exts; + + exts = eglQueryString(_eglut->dpy, EGL_EXTENSIONS); + if (!exts || !strstr(exts, "EGL_MESA_screen_surface")) + _eglutFatal("EGL_MESA_screen_surface is not supported\n"); + ++#ifdef EGL_MESA_screen_surface + init_kms(); + + i = 0; +@@ -128,14 +139,17 @@ _eglutNativeInitWindow(struct eglut_window *win, const char *title, + + win->native.width = kms_width; + win->native.height = kms_height; ++#endif + } + + void + _eglutNativeFiniWindow(struct eglut_window *win) + { ++#ifdef EGL_MESA_screen_surface + eglShowScreenSurfaceMESA(_eglut->dpy, + kms_screen, EGL_NO_SURFACE, 0); + eglDestroySurface(_eglut->dpy, win->native.u.surface); ++#endif + } + + void +diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c +index d892734..3a3564c 100644 +--- a/src/egl/opengl/demo1.c ++++ b/src/egl/opengl/demo1.c +@@ -18,6 +18,7 @@ + static void + TestScreens(EGLDisplay dpy) + { ++#ifdef EGL_MESA_screen_surface + #define MAX 8 + EGLScreenMESA screens[MAX]; + EGLint numScreens; +@@ -28,6 +29,7 @@ TestScreens(EGLDisplay dpy) + for (i = 0; i < numScreens; i++) { + printf(" Screen %d handle: %d\n", i, (int) screens[i]); + } ++#endif + } + + /** +diff --git a/src/egl/opengl/demo2.c b/src/egl/opengl/demo2.c +index 505b474..bfef59e 100644 +--- a/src/egl/opengl/demo2.c ++++ b/src/egl/opengl/demo2.c +@@ -16,6 +16,7 @@ + + /*#define FRONTBUFFER*/ + ++#ifdef EGL_MESA_screen_surface + static void _subset_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2, + GLfloat r, GLfloat g, GLfloat b) + { +@@ -95,12 +96,13 @@ TestScreens(EGLDisplay dpy) + printf(" Screen %d handle: %d\n", i, (int) screens[i]); + } + } +- ++#endif + + int + main(int argc, char *argv[]) + { + int maj, min; ++#ifdef EGL_MESA_screen_surface + EGLContext ctx; + EGLSurface pbuffer, screen_surf; + EGLConfig configs[10]; +@@ -115,6 +117,7 @@ main(int argc, char *argv[]) + EGLModeMESA mode; + EGLScreenMESA screen; + EGLint count; ++#endif + + EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY); + assert(d); +@@ -132,6 +135,7 @@ main(int argc, char *argv[]) + exit(1); + } + ++#ifdef EGL_MESA_screen_surface + eglGetConfigs(d, configs, 10, &numConfigs); + printf("Got %d EGL configs:\n", numConfigs); + for (i = 0; i < numConfigs; i++) { +@@ -211,6 +215,7 @@ main(int argc, char *argv[]) + eglDestroySurface(d, pbuffer); + eglDestroyContext(d, ctx); + eglTerminate(d); ++#endif + + return 0; + } +diff --git a/src/egl/opengl/demo3.c b/src/egl/opengl/demo3.c +index f84ca23..31b5d8b 100644 +--- a/src/egl/opengl/demo3.c ++++ b/src/egl/opengl/demo3.c +@@ -46,7 +46,7 @@ GLubyte OpenGL_bits[] = { + 0x3e, 0x00, 0x00, 0xf8, 0x0c, 0x00, + }; + +- ++#ifdef EGL_MESA_screen_surface + static void Init(void) + { + +@@ -551,11 +551,13 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height) + fclose(f); + } + } ++#endif + + int + main(int argc, char *argv[]) + { + int maj, min; ++#ifdef EGL_MESA_screen_surface + EGLContext ctx; + EGLSurface screen_surf; + EGLConfig configs[10]; +@@ -566,6 +568,7 @@ main(int argc, char *argv[]) + const GLubyte *bitmap; + EGLint screenAttribs[32]; + EGLint i; ++#endif + + EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY); + assert(d); +@@ -583,6 +586,7 @@ main(int argc, char *argv[]) + exit(1); + } + ++#ifdef EGL_MESA_screen_surface + eglGetConfigs(d, configs, 10, &numConfigs); + eglGetScreensMESA(d, &screen, 1, &count); + eglGetModesMESA(d, screen, &mode, 1, &count); +@@ -642,6 +646,7 @@ main(int argc, char *argv[]) + eglDestroySurface(d, screen_surf); + eglDestroyContext(d, ctx); + eglTerminate(d); ++#endif + + return 0; + } +-- +2.0.0 + diff --git a/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 @@ +From 6a19dba1d275579c73e7763b0554410ff4e1e650 Mon Sep 17 00:00:00 2001 +From: Frank Binns +Date: Fri, 29 Jun 2012 12:00:26 +0100 +Subject: [PATCH 6/9] Query display for EGL_MESA_screen_surface extension + before using it + +This code makes heavy use of the EGL_MESA_screen_surface extension so +check the display to determine if it's supported by the underlying EGL +implementation. If it doesn't then bail. + +Signed-off-by: Frank Binns + +Applied and fixed up in Yocto by... + +Integrated-by: Tom Zanussi + +Upstream-Status: Pending +--- + src/egl/opengl/demo1.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c +index 3a3564c..06e2138 100644 +--- a/src/egl/opengl/demo1.c ++++ b/src/egl/opengl/demo1.c +@@ -110,6 +110,12 @@ main(int argc, char *argv[]) + printf("EGL version = %d.%d\n", maj, min); + printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); + ++ if (!strstr(eglQueryString(d, EGL_EXTENSIONS), ++ "EGL_MESA_screen_surface")) { ++ printf("EGL_MESA_screen_surface is not supported\n"); ++ exit(1); ++ } ++ + eglGetConfigs(d, NULL, 0, &numConfigs); + configs = malloc(sizeof(*configs) *numConfigs); + eglGetConfigs(d, configs, numConfigs, &numConfigs); +-- +2.0.0 + diff --git a/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 @@ +From d930b2da57f7c9efb80c8cef8f8adad15bbbc0d3 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 10 Jul 2014 14:30:52 +0200 +Subject: [PATCH 7/9] Install few more test programs + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + src/egl/opengl/Makefile.am | 2 +- + src/egl/opengles1/Makefile.am | 10 ++++------ + src/egl/openvg/Makefile.am | 2 +- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am +index 0c7228f..87b2f1a 100644 +--- a/src/egl/opengl/Makefile.am ++++ b/src/egl/opengl/Makefile.am +@@ -50,7 +50,7 @@ endif + endif + + if HAVE_EGL +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + demo1 \ + demo2 \ + demo3 \ +diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am +index 3455e75..516e516 100644 +--- a/src/egl/opengles1/Makefile.am ++++ b/src/egl/opengles1/Makefile.am +@@ -36,11 +36,11 @@ AM_LDFLAGS = \ + $(EGL_LIBS) \ + -lm + +-noinst_PROGRAMS = ++bin_PROGRAMS = + + if HAVE_EGL + if HAVE_GLESV1 +-noinst_PROGRAMS += \ ++bin_PROGRAMS += \ + drawtex_screen \ + gears_screen \ + torus_screen \ +@@ -57,10 +57,8 @@ torus_screen_LDADD = ../eglut/libeglut_screen.la + tri_screen_LDADD = ../eglut/libeglut_screen.la + + if HAVE_X11 +-noinst_PROGRAMS += \ +- clear +- +-bin_PROGRAMS = \ ++bin_PROGRAMS += \ ++ clear \ + bindtex \ + drawtex_x11 \ + eglfbdev \ +diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am +index 7318a43..b545225 100644 +--- a/src/egl/openvg/Makefile.am ++++ b/src/egl/openvg/Makefile.am +@@ -49,7 +49,7 @@ endif + + if HAVE_EGL + if HAVE_VG +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + lion_screen \ + sp_screen \ + $(EGL_X11_DEMOS) +-- +2.0.0 + diff --git a/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 @@ +From 0b6f95f9b8ece22e9856c150e4be29fd86eaf546 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 10 Jul 2014 14:29:27 +0200 +Subject: [PATCH 8/9] glsl, perf: Add few missing .glsl, .vert, .frag files to + EXTRA_DATA + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + src/fpglsl/Makefile.am | 2 ++ + src/glsl/Makefile.am | 10 ++++++++-- + src/perf/Makefile.am | 6 ++++++ + src/vpglsl/Makefile.am | 1 + + 4 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am +index 47c1039..fd43c91 100644 +--- a/src/fpglsl/Makefile.am ++++ b/src/fpglsl/Makefile.am +@@ -39,10 +39,12 @@ noinst_PROGRAMS = \ + endif + + EXTRA_DIST = \ ++ depth-read.glsl \ + dowhile2.glsl \ + dowhile.glsl \ + forbreak.glsl \ + for.glsl \ ++ infinite-loop.glsl \ + mov.glsl \ + mov-imm.glsl \ + simpleif.glsl \ +diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am +index 4faa8db..079a29d 100644 +--- a/src/glsl/Makefile.am ++++ b/src/glsl/Makefile.am +@@ -37,7 +37,7 @@ AM_LDFLAGS = \ + if HAVE_GLUT + bin_PROGRAMS = \ + array \ +- bezier \ ++ bezier \ + bitmap \ + brick \ + bump \ +@@ -123,12 +123,16 @@ EXTRA_DIST = \ + CH06-brick.vert \ + CH11-bumpmap.frag \ + CH11-bumpmap.vert \ ++ CH11-bumpmaptex.frag \ + CH11-toyball.frag \ + CH11-toyball.vert \ + CH18-mandel.frag \ + CH18-mandel.vert \ +- bezier.geom \ ++ bezier.geom \ + brick.shtest \ ++ blinking-teapot.frag \ ++ blinking-teapot.vert \ ++ convolution.frag \ + convolution.vert \ + cubemap.frag \ + mandelbrot.shtest \ +@@ -138,5 +142,7 @@ EXTRA_DIST = \ + reflect.vert \ + shadowtex.frag \ + simple.vert \ ++ simplex-noise.glsl \ + skinning.frag \ ++ skinning.vert \ + toyball.shtest +diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am +index 5363c58..c5cca8d 100644 +--- a/src/perf/Makefile.am ++++ b/src/perf/Makefile.am +@@ -57,3 +57,9 @@ bin_PROGRAMS = \ + endif + + glslstateschange_LDADD = libperf.la ../util/libutil.la ++ ++EXTRA_DIST = \ ++ glslstateschange1.frag \ ++ glslstateschange1.vert \ ++ glslstateschange2.frag \ ++ glslstateschange2.vert +diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am +index 4a85ed4..48b08f4 100644 +--- a/src/vpglsl/Makefile.am ++++ b/src/vpglsl/Makefile.am +@@ -44,6 +44,7 @@ EXTRA_DIST = \ + func2.glsl \ + ifelse.glsl \ + if.glsl \ ++ infinite-loop.glsl \ + mov.glsl \ + nestedifs.glsl \ + nestedswizzle.glsl \ +-- +2.0.0 + diff --git a/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 @@ +From c8c3de5417d6b6c7d7579c528c0cab718f4bfdb6 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 10 Jul 2014 14:48:12 +0200 +Subject: [PATCH 9/9] glsl, perf: Install .glsl, .vert, .frag files + +Upstream-Status: Pending +Signed-off-by: Martin Jansa +--- + src/fpglsl/Makefile.am | 3 ++- + src/glsl/Makefile.am | 3 ++- + src/perf/Makefile.am | 3 ++- + src/vpglsl/Makefile.am | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am +index fd43c91..2bf51de 100644 +--- a/src/fpglsl/Makefile.am ++++ b/src/fpglsl/Makefile.am +@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ + fp-tri + endif + +-EXTRA_DIST = \ ++demosdatadir=$(datadir)/$(PACKAGE)/ ++dist_demosdata_DATA= \ + depth-read.glsl \ + dowhile2.glsl \ + dowhile.glsl \ +diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am +index 079a29d..f66ec29 100644 +--- a/src/glsl/Makefile.am ++++ b/src/glsl/Makefile.am +@@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la + vert_tex_LDADD = ../util/libutil.la + vsraytrace_LDADD = ../util/libutil.la + +-EXTRA_DIST = \ ++demosdatadir=$(datadir)/$(PACKAGE)/ ++dist_demosdata_DATA= \ + CH06-brick.frag \ + CH06-brick.vert \ + CH11-bumpmap.frag \ +diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am +index c5cca8d..140256d 100644 +--- a/src/perf/Makefile.am ++++ b/src/perf/Makefile.am +@@ -58,7 +58,8 @@ endif + + glslstateschange_LDADD = libperf.la ../util/libutil.la + +-EXTRA_DIST = \ ++demosdatadir=$(datadir)/$(PACKAGE)/ ++dist_demosdata_DATA= \ + glslstateschange1.frag \ + glslstateschange1.vert \ + glslstateschange2.frag \ +diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am +index 48b08f4..5526867 100644 +--- a/src/vpglsl/Makefile.am ++++ b/src/vpglsl/Makefile.am +@@ -38,7 +38,8 @@ noinst_PROGRAMS = \ + vp-tris + endif + +-EXTRA_DIST = \ ++demosdatadir=$(datadir)/$(PACKAGE)/ ++dist_demosdata_DATA= \ + for.glsl \ + func.glsl \ + func2.glsl \ +-- +2.0.0 + diff --git a/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 @@ +SUMMARY = "Mesa demo applications" +DESCRIPTION = "This package includes the demonstration application, such as glxgears. \ +These applications can be used for Mesa validation and benchmarking." +HOMEPAGE = "http://mesa3d.org" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11" + +LICENSE = "MIT & PD" +LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \ + file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ + file://0001-mesa-demos-Add-missing-data-files.patch \ + file://0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch \ + file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \ + file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ + file://0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch \ + file://0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch \ + file://0007-Install-few-more-test-programs.patch \ + file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \ + file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \ +" +SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061" +SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92" + +inherit autotools pkgconfig + +PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 glu \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew', '', d)}" + +# The Wayland code doesn't work with Wayland 1.0, so disable it for now +#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" + +EXTRA_OECONF = "--with-system-data-files" + +PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" +PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype" +PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl" +PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1" +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" +PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut," +PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa," +PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland" +PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" +PACKAGECONFIG[glew] = "--enable-glew,--disable-glew,glew" +PACKAGECONFIG[glu] = "--enable-glu,--disable-glu,virtual/libgl" + +do_install_append() { + # it can be completely empty when all PACKAGECONFIG options are disabled + rmdir --ignore-fail-on-non-empty ${D}${bindir} +} 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 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" + +PROVIDES = "virtual/libgl virtual/mesa" + +PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +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 @@ +SUMMARY = "A free implementation of the OpenGL API" +DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \ +a system for rendering interactive 3D graphics. \ +A variety of device drivers allows Mesa to be used in many different environments \ +ranging from software emulation to complete hardware acceleration for modern GPUs. \ +Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \ +environment." + +HOMEPAGE = "http://mesa3d.org" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" + +PE = "2" + +DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" + +PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" + +inherit autotools pkgconfig pythonnative gettext distro_features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +EXTRA_OECONF = "--enable-shared-glapi" + +PACKAGECONFIG ??= "egl gles dri \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ + " + +X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" +PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" +PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" +PACKAGECONFIG[wayland] = ",,wayland" + +DRIDRIVERS = "swrast" +DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" +DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" +PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" + +EXTRA_OECONF += "--enable-gbm" + +PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" + +EGL_PLATFORMS = "drm" +EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" +EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" +PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" + +PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" + +GALLIUMDRIVERS = "swrast" +GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" +GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" +GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" +GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" +GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" +# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers +PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" +PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" +PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" +MESA_LLVM_RELEASE ?= "3.3" +PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ + ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" +export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" + +# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) +FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" + +# Multiple virtual/gl providers being built breaks staging +EXCLUDE_FROM_WORLD = "1" + +# Remove the mesa dependency on mesa-dev, as mesa is empty +RDEPENDS_${PN}-dev = "" + +PACKAGES =+ "libegl-mesa libegl-mesa-dev \ + libosmesa libosmesa-dev \ + libgl-mesa libgl-mesa-dev \ + libglapi libglapi-dev \ + libgbm libgbm-dev \ + libgles1-mesa libgles1-mesa-dev \ + libgles2-mesa libgles2-mesa-dev \ + libgles3-mesa libgles3-mesa-dev \ + libwayland-egl libwayland-egl-dev \ + libegl-gallium libgbm-gallium \ + libopenvg libopenvg-dev \ + libxvmcsoftpipe libxvmcsoftpipe-dev \ + mesa-megadriver \ + " + +do_install_append () { + # Drivers never need libtool .la files + rm -f ${D}${libdir}/dri/*.la + rm -f ${D}${libdir}/egl/*.la + rm -f ${D}${libdir}/gallium-pipe/*.la + rm -f ${D}${libdir}/gbm/*.la + + # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used + rm -f ${D}${sysconfdir}/drirc +} + +# For the packages that make up the OpenGL interfaces, inject variables so that +# they don't get Debian-renamed (which would remove the -mesa suffix), and +# RPROVIDEs/RCONFLICTs on the generic libgl name. +python __anonymous() { + pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() + for p in (("egl", "libegl", "libegl1"), + ("dri", "libgl", "libgl1"), + ("gles", "libgles1", "libglesv1-cm1"), + ("gles", "libgles2", "libglesv2-2"), + ("gles", "libgles3",)): + if not p[0] in pkgconfig: + continue + fullp = p[1] + "-mesa" + pkgs = " ".join(p[1:]) + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) + + # For -dev, the first element is both the Debian and original name + fullp += "-dev" + pkgs = p[1] + "-dev" + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) +} + +python mesa_populate_packages() { + pkgs = ['mesa', 'mesa-dev', 'mesa-dbg'] + for pkg in pkgs: + d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) + d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) + d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) + + import re + dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") + dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root) + lib_name = d.expand("${MLPREFIX}mesa-megadriver") + for p in dri_pkgs: + m = re.match('^(.*)_dri\.so$', p) + if m: + pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) + d.appendVar("RPROVIDES_%s" % lib_name, pkg_name) + d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) + d.appendVar("RREPLACES_%s" % lib_name, pkg_name) + + pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") + do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') +} + +PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " + +PACKAGES_DYNAMIC += "^mesa-driver-.*" + +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN} += "${sysconfdir}/drirc" +FILES_mesa-megadriver = "${libdir}/dri/*" +FILES_libegl-mesa = "${libdir}/libEGL.so.*" +FILES_libgbm = "${libdir}/libgbm.so.*" +FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" +FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*" +FILES_libgl-mesa = "${libdir}/libGL.so.*" +FILES_libglapi = "${libdir}/libglapi.so.*" +FILES_libosmesa = "${libdir}/libOSMesa.so.*" +FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" +FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*" +FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*" +FILES_libopenvg = "${libdir}/libOpenVG.so.*" +FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" + +FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" +FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" +FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" +FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" +FILES_libglapi-dev = "${libdir}/libglapi.*" +FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" +FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" +FILES_libgles3-mesa-dev = "${includedir}/GLES3" +FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" +FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" +FILES_libopenvg-dev = "${libdir}/libOpenVG.so ${libdir}/libOpenVG.la* \ + ${includedir}/VG ${libdir}/pkgconfig/vg.pc" +FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" + +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 @@ +From debac5531f7107d239530ff6e29eeda72b9ec1e9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 29 Jun 2013 11:20:51 +0200 +Subject: [PATCH 2/4] pipe_loader_sw: include xlib_sw_winsys.h only when + HAVE_PIPE_LOADER_XLIB + +* HAVE_WINSYS_XLIB was removed in + commit b3f1f665b0fef178ae193e6b111f14c9a5ad3b25 + Author: Matt Turner + Date: Sun Jan 20 15:32:08 2013 -0800 + build: Get rid of GALLIUM_WINSYS_DIRS + +* HAVE_PIPE_LOADER_XLIB is set correctly: + if test "x$NEED_WINSYS_XLIB" = xyes; then + GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB" + GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la" + fi + +* fixes build of pipe_loader_sw without libx11 headers available + +Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=66357 +Signed-off-by: Martin Jansa +--- + src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c +index c2b78c6..0da3f4d 100644 +--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c ++++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c +@@ -31,7 +31,9 @@ + #include "util/u_dl.h" + #include "sw/null/null_sw_winsys.h" + #include "target-helpers/inline_sw_helper.h" ++#ifdef HAVE_PIPE_LOADER_XLIB + #include "state_tracker/xlib_sw_winsys.h" ++#endif + + struct pipe_loader_sw_device { + struct pipe_loader_device base; +@@ -44,7 +46,7 @@ struct pipe_loader_sw_device { + static struct pipe_loader_ops pipe_loader_sw_ops; + + static struct sw_winsys *(*backends[])() = { +-#ifdef HAVE_WINSYS_XLIB ++#ifdef HAVE_PIPE_LOADER_XLIB + x11_sw_create, + #endif + null_sw_create +-- +1.8.2.1 + 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 @@ +From 06c1ba29de8a26fffb73ee99f0fc54c704e9fee4 Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Fri, 24 May 2013 17:20:27 +0100 +Subject: [PATCH 3/5] EGL: Mutate NativeDisplayType depending on config + +If we go through ./configure without enabling X11 anywhere, then set the +fallback types for EGL NativeDisplay and friends, rather than assuming +X11/Xlib. + +Upstream-Status: Backport (slightly different solution was applied in master +https://bugs.freedesktop.org/show_bug.cgi?id=64959) + +Signed-off-by: Daniel Stone +Signed-off-by: Martin Jansa +--- + configure.ac | 9 +++ + include/EGL/eglplatform.h | 146 ------------------------------------------- + include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 155 insertions(+), 146 deletions(-) + delete mode 100644 include/EGL/eglplatform.h + create mode 100644 include/EGL/eglplatform.h.in + +diff --git a/configure.ac b/configure.ac +index 2b4a374..d4c7a95 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1565,12 +1565,20 @@ fi + + EGL_PLATFORMS="$egl_platforms" + ++if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then ++ MESA_EGL_NO_X11_HEADERS=0 ++else ++ MESA_EGL_NO_X11_HEADERS=1 ++fi ++ + AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) + AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) + AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1) + AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1) + AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1) + ++AC_SUBST([MESA_EGL_NO_X11_HEADERS]) ++ + AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") + AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") + +@@ -2042,6 +2050,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" + + dnl Substitute the config + AC_CONFIG_FILES([Makefile ++ include/EGL/eglplatform.h + src/Makefile + src/egl/Makefile + src/egl/drivers/Makefile +diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h +deleted file mode 100644 +index 17fdc61..0000000 +--- a/include/EGL/eglplatform.h ++++ /dev/null +@@ -1,146 +0,0 @@ +-#ifndef __eglplatform_h_ +-#define __eglplatform_h_ +- +-/* +-** Copyright (c) 2007-2009 The Khronos Group Inc. +-** +-** Permission is hereby granted, free of charge, to any person obtaining a +-** copy of this software and/or associated documentation files (the +-** "Materials"), to deal in the Materials without restriction, including +-** without limitation the rights to use, copy, modify, merge, publish, +-** distribute, sublicense, and/or sell copies of the Materials, and to +-** permit persons to whom the Materials are furnished to do so, subject to +-** the following conditions: +-** +-** The above copyright notice and this permission notice shall be included +-** in all copies or substantial portions of the Materials. +-** +-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +-*/ +- +-/* Platform-specific types and definitions for egl.h +- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ +- * +- * Adopters may modify khrplatform.h and this file to suit their platform. +- * You are encouraged to submit all modifications to the Khronos group so that +- * they can be included in future versions of this file. Please submit changes +- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) +- * by filing a bug against product "EGL" component "Registry". +- */ +- +-#include +- +-/* Macros used in EGL function prototype declarations. +- * +- * EGL functions should be prototyped as: +- * +- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); +- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); +- * +- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h +- */ +- +-#ifndef EGLAPI +-#define EGLAPI KHRONOS_APICALL +-#endif +- +-#ifndef EGLAPIENTRY +-#define EGLAPIENTRY KHRONOS_APIENTRY +-#endif +-#define EGLAPIENTRYP EGLAPIENTRY* +- +-/* The types NativeDisplayType, NativeWindowType, and NativePixmapType +- * are aliases of window-system-dependent types, such as X Display * or +- * Windows Device Context. They must be defined in platform-specific +- * code below. The EGL-prefixed versions of Native*Type are the same +- * types, renamed in EGL 1.3 so all types in the API start with "EGL". +- * +- * Khronos STRONGLY RECOMMENDS that you use the default definitions +- * provided below, since these changes affect both binary and source +- * portability of applications using EGL running on different EGL +- * implementations. +- */ +- +-#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ +-#ifndef WIN32_LEAN_AND_MEAN +-#define WIN32_LEAN_AND_MEAN 1 +-#endif +-#include +- +-typedef HDC EGLNativeDisplayType; +-typedef HBITMAP EGLNativePixmapType; +-typedef HWND EGLNativeWindowType; +- +-#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ +- +-typedef int EGLNativeDisplayType; +-typedef void *EGLNativeWindowType; +-typedef void *EGLNativePixmapType; +- +-#elif defined(WL_EGL_PLATFORM) +- +-typedef struct wl_display *EGLNativeDisplayType; +-typedef struct wl_egl_pixmap *EGLNativePixmapType; +-typedef struct wl_egl_window *EGLNativeWindowType; +- +-#elif defined(__GBM__) +- +-typedef struct gbm_device *EGLNativeDisplayType; +-typedef struct gbm_bo *EGLNativePixmapType; +-typedef void *EGLNativeWindowType; +- +-#elif defined(ANDROID) /* Android */ +- +-struct ANativeWindow; +-struct egl_native_pixmap_t; +- +-typedef struct ANativeWindow *EGLNativeWindowType; +-typedef struct egl_native_pixmap_t *EGLNativePixmapType; +-typedef void *EGLNativeDisplayType; +- +-#elif defined(__unix__) +- +-#ifdef MESA_EGL_NO_X11_HEADERS +- +-typedef void *EGLNativeDisplayType; +-typedef khronos_uint32_t EGLNativePixmapType; +-typedef khronos_uint32_t EGLNativeWindowType; +- +-#else +- +-/* X11 (tentative) */ +-#include +-#include +- +-typedef Display *EGLNativeDisplayType; +-typedef Pixmap EGLNativePixmapType; +-typedef Window EGLNativeWindowType; +- +-#endif /* MESA_EGL_NO_X11_HEADERS */ +- +-#else +-#error "Platform not recognized" +-#endif +- +-/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ +-typedef EGLNativeDisplayType NativeDisplayType; +-typedef EGLNativePixmapType NativePixmapType; +-typedef EGLNativeWindowType NativeWindowType; +- +- +-/* Define EGLint. This must be a signed integral type large enough to contain +- * all legal attribute names and values passed into and out of EGL, whether +- * their type is boolean, bitmask, enumerant (symbolic constant), integer, +- * handle, or other. While in general a 32-bit integer will suffice, if +- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit +- * integer type. +- */ +-typedef khronos_int32_t EGLint; +- +-#endif /* __eglplatform_h */ +diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in +new file mode 100644 +index 0000000..5126c92 +--- /dev/null ++++ b/include/EGL/eglplatform.h.in +@@ -0,0 +1,146 @@ ++#ifndef __eglplatform_h_ ++#define __eglplatform_h_ ++ ++/* ++** Copyright (c) 2007-2009 The Khronos Group Inc. ++** ++** Permission is hereby granted, free of charge, to any person obtaining a ++** copy of this software and/or associated documentation files (the ++** "Materials"), to deal in the Materials without restriction, including ++** without limitation the rights to use, copy, modify, merge, publish, ++** distribute, sublicense, and/or sell copies of the Materials, and to ++** permit persons to whom the Materials are furnished to do so, subject to ++** the following conditions: ++** ++** The above copyright notice and this permission notice shall be included ++** in all copies or substantial portions of the Materials. ++** ++** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. ++*/ ++ ++/* Platform-specific types and definitions for egl.h ++ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ ++ * ++ * Adopters may modify khrplatform.h and this file to suit their platform. ++ * You are encouraged to submit all modifications to the Khronos group so that ++ * they can be included in future versions of this file. Please submit changes ++ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) ++ * by filing a bug against product "EGL" component "Registry". ++ */ ++ ++#include ++ ++/* Macros used in EGL function prototype declarations. ++ * ++ * EGL functions should be prototyped as: ++ * ++ * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); ++ * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); ++ * ++ * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h ++ */ ++ ++#ifndef EGLAPI ++#define EGLAPI KHRONOS_APICALL ++#endif ++ ++#ifndef EGLAPIENTRY ++#define EGLAPIENTRY KHRONOS_APIENTRY ++#endif ++#define EGLAPIENTRYP EGLAPIENTRY* ++ ++/* The types NativeDisplayType, NativeWindowType, and NativePixmapType ++ * are aliases of window-system-dependent types, such as X Display * or ++ * Windows Device Context. They must be defined in platform-specific ++ * code below. The EGL-prefixed versions of Native*Type are the same ++ * types, renamed in EGL 1.3 so all types in the API start with "EGL". ++ * ++ * Khronos STRONGLY RECOMMENDS that you use the default definitions ++ * provided below, since these changes affect both binary and source ++ * portability of applications using EGL running on different EGL ++ * implementations. ++ */ ++ ++#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN 1 ++#endif ++#include ++ ++typedef HDC EGLNativeDisplayType; ++typedef HBITMAP EGLNativePixmapType; ++typedef HWND EGLNativeWindowType; ++ ++#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ ++ ++typedef int EGLNativeDisplayType; ++typedef void *EGLNativeWindowType; ++typedef void *EGLNativePixmapType; ++ ++#elif defined(WL_EGL_PLATFORM) ++ ++typedef struct wl_display *EGLNativeDisplayType; ++typedef struct wl_egl_pixmap *EGLNativePixmapType; ++typedef struct wl_egl_window *EGLNativeWindowType; ++ ++#elif defined(__GBM__) ++ ++typedef struct gbm_device *EGLNativeDisplayType; ++typedef struct gbm_bo *EGLNativePixmapType; ++typedef void *EGLNativeWindowType; ++ ++#elif defined(ANDROID) /* Android */ ++ ++struct ANativeWindow; ++struct egl_native_pixmap_t; ++ ++typedef struct ANativeWindow *EGLNativeWindowType; ++typedef struct egl_native_pixmap_t *EGLNativePixmapType; ++typedef void *EGLNativeDisplayType; ++ ++#elif defined(__unix__) ++ ++#if @MESA_EGL_NO_X11_HEADERS@ ++ ++typedef void *EGLNativeDisplayType; ++typedef khronos_uint32_t EGLNativePixmapType; ++typedef khronos_uint32_t EGLNativeWindowType; ++ ++#else ++ ++/* X11 (tentative) */ ++#include ++#include ++ ++typedef Display *EGLNativeDisplayType; ++typedef Pixmap EGLNativePixmapType; ++typedef Window EGLNativeWindowType; ++ ++#endif /* MESA_EGL_NO_X11_HEADERS */ ++ ++#else ++#error "Platform not recognized" ++#endif ++ ++/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ ++typedef EGLNativeDisplayType NativeDisplayType; ++typedef EGLNativePixmapType NativePixmapType; ++typedef EGLNativeWindowType NativeWindowType; ++ ++ ++/* Define EGLint. This must be a signed integral type large enough to contain ++ * all legal attribute names and values passed into and out of EGL, whether ++ * their type is boolean, bitmask, enumerant (symbolic constant), integer, ++ * handle, or other. While in general a 32-bit integer will suffice, if ++ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit ++ * integer type. ++ */ ++typedef khronos_int32_t EGLint; ++ ++#endif /* __eglplatform_h */ +-- +1.8.2.1 + 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 @@ +Fix out of tree compilation failure due to +0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch. + +Upstream-Status: Inappropriate (upstream has different solution to root problem) +Signed-off-by: Ross Burton + +diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am +index 45f7dfa..ed0e777 100644 +--- a/src/egl/drivers/dri2/Makefile.am ++++ b/src/egl/drivers/dri2/Makefile.am +@@ -21,6 +21,7 @@ + + AM_CFLAGS = \ + -I$(top_srcdir)/include \ ++ -I$(top_builddir)/include \ + -I$(top_srcdir)/src/egl/main \ + -I$(top_srcdir)/src/gbm/main \ + -I$(top_srcdir)/src/gbm/backends/dri \ +diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am +index 6bf67ea..7b87047 100644 +--- a/src/egl/drivers/glx/Makefile.am ++++ b/src/egl/drivers/glx/Makefile.am +@@ -21,6 +21,7 @@ + + AM_CFLAGS = \ + -I$(top_srcdir)/include \ ++ -I$(top_builddir)/include \ + -I$(top_srcdir)/src/egl/main \ + $(X11_CFLAGS) \ + $(DEFINES) +diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am +index ca5257a..13a5734 100644 +--- a/src/egl/main/Makefile.am ++++ b/src/egl/main/Makefile.am +@@ -27,6 +27,7 @@ endif + + AM_CFLAGS = \ + -I$(top_srcdir)/include \ ++ -I$(top_builddir)/include \ + -I$(top_srcdir)/src/gbm/main \ + $(DEFINES) \ + $(EGL_CFLAGS) \ +@@ -135,4 +136,4 @@ egl_HEADERS = \ + $(top_srcdir)/include/EGL/eglext.h \ + $(top_srcdir)/include/EGL/egl.h \ + $(top_srcdir)/include/EGL/eglmesaext.h \ +- $(top_srcdir)/include/EGL/eglplatform.h ++ $(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 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ + file://0006-fix-out-of-tree-egl.patch \ + " + +SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad" +SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3" + +S = "${WORKDIR}/Mesa-${PV}" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} 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 @@ +require ${BPN}.inc + +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" + +SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a" +PV = "10.1.3+git${SRCPV}" + +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.1 \ + file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ + file://0006-fix-out-of-tree-egl.patch \ + " + +S = "${WORKDIR}/git" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} 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 @@ +#!/bin/sh +# +# Very simple session manager for Mini X +# + +# Uncomment below to enable parsing of debian menu entrys +# export MB_USE_DEB_MENUS=1 + +if [ -e $HOME/.mini_x/session ] +then +exec $HOME/.mini_x/session +fi + +if [ -e /etc/mini_x/session ] +then +exec /etc/mini_x/session +fi + +MINI_X_SESSION_DIR=/etc/mini_x/session.d +if [ -d "$MINI_X_SESSION_DIR" ]; then + # Execute session file on behalf of file owner + find $MINI_X_SESSION_DIR -type f | while read SESSIONFILE; do + set +e + USERNAME=`stat -c %U $SESSIONFILE` + # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] +# su -l -c '$SESSIONFILE&' $USERNAME + sudo -b -i -u $USERNAME $SESSIONFILE& + set -e + done +fi + +# This resolution is big enough for hob2's max window size. +xrandr -s 1024x768 + +# Default files to run if $HOME/.mini_x/session or /etc/mini_x/session +# dont exist. + +matchbox-terminal& +exec matchbox-window-manager diff --git a/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 @@ +SUMMARY = "Very simple session manager for X" +HOMEPAGE = "http://www.yoctoproject.org" +BUGTRACKER = "http://bugzilla.pokylinux.org" + +PR = "r4" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487" + +SECTION = "x11" +RCONFLICTS_${PN} = "matchbox-common" + +SRC_URI = "file://mini-x-session" +S = "${WORKDIR}" + +RDEPENDS_${PN} = "sudo" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "x-session-manager" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/mini-x-session" +ALTERNATIVE_PRIORITY = "50" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/mini-x-session ${D}/${bindir} +} diff --git a/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 @@ +Fix build for S != B + +This patch is specific to version 1.4.x +Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81 +Signed-off-by: Tomas Frydrych +-- +Index: git/docs/reference/libmx-gtk/Makefile.am +=================================================================== +--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 ++++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -77,7 +80,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in +Index: git/docs/reference/libmx/Makefile.am +=================================================================== +--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 ++++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -106,7 +109,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in diff --git a/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 @@ +Fix missing include directory when building tests + +This patch is currently required for all versions of mx +Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/82 +Signed-off-by: Tomas Frydrych +-- +Index: git/tests/Makefile.am +=================================================================== +--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 ++++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 +@@ -10,7 +10,8 @@ + + INCLUDES = \ + -I$(top_srcdir) \ +- -I$(top_builddir) ++ -I$(top_builddir)\ ++ -I$(top_builddir)/mx + + noinst_PROGRAMS = \ + test-deform-texture \ diff --git a/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 @@ +require mx.inc + +# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix +SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" +PV = "1.4.7+git${SRCPV}" + +SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ + file://fix-build-dir.patch \ + file://fix-test-includes.patch \ + " +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ + file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879" diff --git a/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 @@ +SUMMARY = "Clutter based UI widget library" +LICENSE = "LGPLv2.1" + +inherit clutter autotools-brokensep + +DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" + +SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" + +EXTRA_OECONF = "--disable-introspection \ + --disable-gtk-doc \ + --disable-gtk-widgets \ + --with-dbus \ + --with-winsys=none \ + --without-clutter-imcontext \ + --without-clutter-gesture \ + --without-startup-notification \ + --without-glade \ + " + +FILES_${PN} += "${datadir}" diff --git a/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 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +SUMMARY = "Clutter package groups" +LICENSE = "MIT" + +PR = "r6" + +inherit packagegroup + +PACKAGES = "\ + ${PN}-core \ + " + +SUMMARY_${PN}-core = "Clutter graphics library" +RDEPENDS_${PN}-core = "\ + clutter-1.0 \ + clutter-gst-1.0 \ + clutter-gtk-1.0 \ + " 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 @@ +SUMMARY = "DirectFB without X11" +LICENSE = "MIT" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit packagegroup + +TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' + +RDEPENDS_${PN} = " \ + directfb \ + directfb-examples \ + pango \ + pango-modules \ + fontconfig \ + ${TOUCH} \ +" 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 @@ +SUMMARY = "Basic X11 session" +DESCRIPTION = "Packages required to set up a basic working X11 session" +LICENSE = "MIT" +PR = "r1" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + packagegroup-core-x11-xserver \ + packagegroup-core-x11-utils \ + dbus \ + pointercal \ + matchbox-terminal \ + matchbox-wm \ + mini-x-session \ + liberation-fonts \ + " 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 @@ +# +# Copyright (C) 2011 Intel Corporation +# + +SUMMARY = "X11 display server" +LICENSE = "MIT" +PR = "r40" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit packagegroup + +XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" +XSERVERCODECS ?= "" + +RDEPENDS_${PN} = "\ + ${XSERVER} \ + ${XSERVERCODECS} \ + " 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 @@ +# +# Copyright (C) 2011 Intel Corporation +# + +LICENSE = "MIT" +PR = "r40" + +inherit packagegroup + +PACKAGES = "${PN} ${PN}-utils" + +# xserver-common, x11-common +VIRTUAL-RUNTIME_xserver_common ?= "x11-common" + +# elsa, xserver-nodm-init +VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" + +SUMMARY = "X11 display server and basic utilities" +RDEPENDS_${PN} = "\ + ${PN}-xserver \ + ${PN}-utils \ + " + +SUMMARY_${PN}-utils = "X11 basic utilities and init" +RDEPENDS_${PN}-utils = "\ + ${VIRTUAL-RUNTIME_xserver_common} \ + ${VIRTUAL-RUNTIME_graphical_init_manager} \ + xauth \ + xhost \ + xset \ + xrandr \ + " diff --git a/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 @@ +SUMMARY = "Framework for layout and rendering of internationalized text" +DESCRIPTION = "Pango is a library for laying out and rendering of text, \ +with an emphasis on internationalization. Pango can be used anywhere \ +that text layout is needed, though most of the work on Pango so far has \ +been done in the context of the GTK+ widget toolkit. Pango forms the \ +core of text and font handling for GTK+-2.x." +HOMEPAGE = "http://www.pango.org/" +BUGTRACKER = "http://bugzilla.gnome.org" +SECTION = "libs" +LICENSE = "LGPLv2.0+" + +X11DEPENDS = "virtual/libx11 libxft" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ptest', '', d)}" + +PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" +PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-2.0-native" + +BBCLASSEXTEND = "native" +DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" + +PACKAGES_DYNAMIC += "^pango-module-.*" + +RRECOMMENDS_${PN} = "pango-module-basic-fc" + +inherit gnomebase gtk-doc qemu ptest + +# Create a pango-modules package +ALLOW_EMPTY_${BPN}-modules = "1" +PACKAGES += "${BPN}-modules" +RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}" + + +EXTRA_AUTORECONF = "" + +# seems to go wrong with default cflags +FULL_OPTIMIZATION_arm = "-O2" + +EXTRA_OECONF = "--disable-introspection \ + --enable-explicit-deps=no \ + --disable-debug \ + --with-mlprefix=${MLPREFIX}" + +LEAD_SONAME = "libpango-1.0*" +LIBV = "1.8.0" + +postinst_prologue() { +if ! [ -e $D${sysconfdir}/pango ] ; then + mkdir -p $D${sysconfdir}/pango +fi + +if [ "x$D" != "x" ]; then + ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ + $D${libdir}/pango/${LIBV}/modules/*.so \ + > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null + + [ $? -ne 0 ] && exit 1 + + sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules + + exit 0 +fi +} + +# This binary needs to be compiled for the host architecture. This isn't pretty! +do_compile_prepend () { + if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then + 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 + fi +} + +do_install_append () { + if [ "${MLPREFIX}" != "" ]; then + mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules + fi +} + + +python populate_packages_prepend () { + prologue = d.getVar("postinst_prologue", True) + + modules_root = d.expand('${libdir}/pango/${LIBV}/modules') + + do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules') +} + +FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + +FILES_${PN}-ptest += "${libexecdir}/installed-tests/* \ + ${datadir}/installed-tests/pango" +FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug" + +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 @@ +Upstream-Status: Pending + +Updated to apply to pango-1.32.5 + +Signed-off-by: Marko Lindqvist +diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac +--- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200 ++++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200 +@@ -213,6 +213,11 @@ + + AC_SUBST(PANGO_DEBUG_FLAGS) + ++AC_ARG_WITH(mlprefix, ++ AC_HELP_STRING([--with-mlprefix=], [multilib prefix]), ++ mlprefix_str=$withval, mlprefix_str="") ++AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.]) ++ + AC_ARG_ENABLE(rebuilds, + [AC_HELP_STRING([--disable-rebuilds], + [disable all source autogeneration rules])],, +diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c +--- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200 ++++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200 +@@ -555,11 +555,11 @@ + files = g_new (char *, 3); + + files[0] = g_build_filename (pango_get_sysconf_subdirectory (), +- "pango.modules", ++ MLPREFIX "pango.modules", + NULL); + files[1] = g_build_filename (pango_get_lib_subdirectory (), + MODULE_VERSION, +- "modules.cache", ++ MLPREFIX "modules.cache", + NULL); + files[2] = NULL; + } +@@ -674,7 +674,8 @@ + if (!no_module_warning) + { + gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), +- "pango.modules", ++/* For multilib case, keep multiple config file for different libs */ ++ MLPREFIX "pango.modules", + NULL); + g_critical ("No modules found:\n" + "No builtin or dynamically loaded modules were found.\n" +diff -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej +--- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200 ++++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200 +@@ -0,0 +1,12 @@ ++--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800 +++++ pango/modules.c 2012-05-08 21:21:02.000000000 +0800 ++@@ -529,7 +529,8 @@ ++ ++ if (!file_str) ++ file_str = g_build_filename (pango_get_sysconf_subdirectory (), ++- "pango.modules", +++/* For multilib case, keep multiple config file for different libs */ +++ MLPREFIX "pango.modules", ++ NULL); ++ ++ files = pango_split_file_list (file_str); +diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c +--- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300 ++++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200 +@@ -304,7 +304,7 @@ + + cache_file = g_build_filename (pango_get_lib_subdirectory (), + MODULE_VERSION, +- "modules.cache", ++ MLPREFIX "modules.cache", + NULL); + err = NULL; + 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 @@ +#! /bin/sh + +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 @@ +require pango.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +GNOME_COMPRESS_TYPE="xz" + +SRC_URI += "file://run-ptest \ + file://multilib-fix-clean.patch \ +" + +SRC_URI[archive.md5sum] = "1c27523c3f3a4efe4d9d303d0d240320" +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 @@ +SUMMARY = "OpenGL driver testing framework" +LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" + +SRC_URI = "git://anongit.freedesktop.org/piglit" + +# From 2012/12/30. +SRCREV = "bbeff5d21b06d37338ad28e42d88f499bef13268" +# (when PV goes above 1.0 remove the trailing r) +PV = "1.0+gitr${SRCPV}" + +S = "${WORKDIR}/git" + +DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native" + +inherit cmake pythonnative + +# As piglit doesn't install, enforce in-tree builds so that we can easily copy +# contents out of $S and $B. +B="${S}" + +# CMake sets the rpath at build time with the source tree, and will reset it at +# install time. As we don't install this doesn't happen, so force the rpath to +# what we need. +EXTRA_OECMAKE = "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_RPATH=${libdir}/piglit/lib" + +do_install() { + install -d ${D}${bindir} + install -m 0755 piglit-*.py ${D}${bindir} + + install -d ${D}${libdir}/piglit/ + + install -d ${D}${libdir}/piglit/bin + install -m 755 ${S}/bin/* ${D}${libdir}/piglit/bin + + cp -Pr lib/ ${D}${libdir}/piglit/ + cp -Pr framework/ ${D}${libdir}/piglit/ + cp -Pr generated_tests/ ${D}${libdir}/piglit/ + cp -Pr tests/ ${D}${libdir}/piglit/ + cp -Pr templates/ ${D}${libdir}/piglit/ + + sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|' ${D}${bindir}/piglit-*.py + sed -i -e 's|^templatedir = .*$|templatedir = "${libdir}/piglit/templates"|' ${D}${bindir}/piglit-summary-html.py +} + +FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/" + +RDEPENDS_${PN} = "python waffle python-json python-subprocess \ + python-multiprocessing python-textutils python-netserver python-shell \ + mesa-demos bash \ + " 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 @@ +/* + * Pong Clock - A clock that plays pong. + * See http://mocoloco.com/archives/001766.php for the inspiration. + * + * Copyright (C) 2005 Matthew Allum + * + * Author: Matthew Allum mallum@openedhand.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +/* Tweak values for different hw setups */ + +#define FPS 50 +#define RESX 40 +#define RESY 40 +#define TO_MISS_SECS 55 +#define BALLDX 16 +#define BALLDY 4 + + +typedef struct PongClock +{ + Display *xdpy; + int xscreen; + Window xwin, xwin_root; + Pixmap backbuffer; + GC xgc; + int xwin_width, xwin_height; + int pixelw, pixelh; + + int ball_x, ball_y, ball_dx, ball_dy; + int bata_y, batb_y; + Bool bata_to_miss, batb_to_miss; + +} +PongClock; + +void +get_time(int *hour, int *min, int *sec) +{ + struct timeval tv; + struct tm *localTime = NULL; + time_t actualTime; + + gettimeofday(&tv, 0); + actualTime = tv.tv_sec; + localTime = localtime(&actualTime); + + if (hour) + *hour = localTime->tm_hour; + + if (min) + *min = localTime->tm_min; + + if (sec) + *sec = localTime->tm_sec; +} + +void +draw_rect (PongClock *pong_clock, + int x, + int y, + int width, + int height) +{ + XFillRectangle (pong_clock->xdpy, + pong_clock->backbuffer, + pong_clock->xgc, + x * pong_clock->pixelw, + y * pong_clock->pixelh, + width * pong_clock->pixelw, + height * pong_clock->pixelh); +} + +void +draw_field (PongClock *pong_clock) +{ + int i; + + draw_rect (pong_clock, 0, 0, RESX+1, 1); + draw_rect (pong_clock, 0, RESY-1, RESX+1, 1); + + for (i=0; i < RESY/2; i++) + draw_rect (pong_clock, (RESX/2)-1, i*2, 2, 1); +} + +void +draw_digit (PongClock *pong_clock, + int x, + int y, + int digit) +{ + int digits[] = { 0x1f8c63f, 0x1f21086, 0x1f0fe1f, 0x1f87e1f, 0x1087e31, + 0x1f87c3f, 0x1f8fc3f, 0x84421f, 0x1f8fe3f, 0x1087e3f }; + + XRectangle rects[5*5]; + int i,j,k; + + i = 0; + + for (k=0; k<5; k++) + for (j=0; j<5; j++) + if (digits[digit] & (1 << ((k*5)+j))) + { + rects[i].x = (x + j) * pong_clock->pixelw; + rects[i].y = (y + k) * pong_clock->pixelh; + rects[i].width = pong_clock->pixelw; + rects[i].height = pong_clock->pixelh; + i++; + } + + XFillRectangles (pong_clock->xdpy, + pong_clock->backbuffer, + pong_clock->xgc, + rects, i); +} + +void +draw_time (PongClock *pong_clock) +{ + int hour, min; + + get_time(&hour, &min, NULL); + + draw_digit (pong_clock, + (RESX/2) - 14, + 5, + hour / 10 ); + + draw_digit (pong_clock, + (RESX/2) - 8, + 5, + hour % 10 ); + + draw_digit (pong_clock, + (RESX/2) + 3, + 5, + min / 10 ); + + draw_digit (pong_clock, + (RESX/2) + 9, + 5, + min % 10 ); +} + +void +draw_bat_and_ball (PongClock *pong_clock) +{ + /* ball */ + + XFillRectangle (pong_clock->xdpy, + pong_clock->backbuffer, + pong_clock->xgc, + pong_clock->ball_x, + pong_clock->ball_y, + pong_clock->pixelw, + pong_clock->pixelh); + + /* bat a */ + + XFillRectangle (pong_clock->xdpy, + pong_clock->backbuffer, + pong_clock->xgc, + 0, + pong_clock->bata_y - (2 * pong_clock->pixelh), + pong_clock->pixelw, + pong_clock->pixelh * 5); + + /* bat b */ + + XFillRectangle (pong_clock->xdpy, + pong_clock->backbuffer, + pong_clock->xgc, + (pong_clock->xwin_width - pong_clock->pixelw), + pong_clock->batb_y - (2 * pong_clock->pixelh), + pong_clock->pixelw, + pong_clock->pixelh * 5); + +} + +void +update_state (PongClock *pong_clock) +{ + int sec, min, hour; + + get_time(&hour, &min, &sec); + + /* Check ball is on field and no ones dues to miss a shot. + */ + if ( (pong_clock->ball_x < 0 && !pong_clock->bata_to_miss) + || (pong_clock->ball_x > (pong_clock->xwin_width - pong_clock->pixelw) + && !pong_clock->batb_to_miss) ) + pong_clock->ball_dx *= -1; + + if ((pong_clock->ball_y < pong_clock->pixelh) + || pong_clock->ball_y > (pong_clock->xwin_height - (2*pong_clock->pixelh))) + pong_clock->ball_dy *= -1; + + pong_clock->ball_x += pong_clock->ball_dx; + pong_clock->ball_y += pong_clock->ball_dy; + + /* Set up someone to miss if we getting close to an hour or min. + */ + if (sec > TO_MISS_SECS) + { + if (min == 59) + pong_clock->batb_to_miss = True; + else + pong_clock->bata_to_miss = True; + } + else + { + /* Reset the game */ + if (pong_clock->bata_to_miss) + { + pong_clock->bata_to_miss = False; + pong_clock->ball_y = pong_clock->bata_y; + pong_clock->ball_x = pong_clock->pixelw; + pong_clock->ball_dx *= -1; + } + + if (pong_clock->batb_to_miss) + { + pong_clock->batb_to_miss = False; + pong_clock->ball_y = pong_clock->batb_y; + pong_clock->ball_x = pong_clock->xwin_width - pong_clock->pixelw; + pong_clock->ball_dx *= -1; + } + } + + /* Keep bats on field and only move in not setup to miss */ + if (pong_clock->ball_y >= (3*pong_clock->pixelh) + && pong_clock->ball_y <= (pong_clock->xwin_height - (5*pong_clock->pixelh))) + { + if (!pong_clock->batb_to_miss) + pong_clock->batb_y = pong_clock->ball_y; + + if (!pong_clock->bata_to_miss) + pong_clock->bata_y = pong_clock->ball_y; + } +} + +void +draw_frame (PongClock *pong_clock) +{ + update_state (pong_clock); + + /* Clear playfield */ + XSetForeground (pong_clock->xdpy, + pong_clock->xgc, + BlackPixel(pong_clock->xdpy, + pong_clock->xscreen)); + + XFillRectangle (pong_clock->xdpy, + pong_clock->backbuffer, + pong_clock->xgc, + 0, 0, + pong_clock->xwin_width, + pong_clock->xwin_height); + + XSetForeground (pong_clock->xdpy, + pong_clock->xgc, + WhitePixel(pong_clock->xdpy, + pong_clock->xscreen)); + + draw_field (pong_clock); + + draw_time (pong_clock); + + draw_bat_and_ball (pong_clock); + + /* flip 'backbuffer' */ + XSetWindowBackgroundPixmap (pong_clock->xdpy, + pong_clock->xwin, + pong_clock->backbuffer); + XClearWindow(pong_clock->xdpy, pong_clock->xwin); + + XSync(pong_clock->xdpy, False); +} + +int +main (int argc, char **argv) +{ + XGCValues gcv; + Atom atoms_WINDOW_STATE, atoms_WINDOW_STATE_FULLSCREEN; + PongClock *pong_clock; + + pong_clock = malloc(sizeof(PongClock)); + memset(pong_clock, 0, sizeof(PongClock)); + + if ((pong_clock->xdpy = XOpenDisplay(getenv("DISPLAY"))) == NULL) { + fprintf(stderr, "Cannot connect to X server on display %s.", + getenv("DISPLAY")); + exit(-1); + } + + pong_clock->xscreen = DefaultScreen(pong_clock->xdpy); + pong_clock->xwin_root = DefaultRootWindow(pong_clock->xdpy); + pong_clock->xwin_width = DisplayWidth(pong_clock->xdpy, + pong_clock->xscreen); + pong_clock->xwin_height = DisplayHeight(pong_clock->xdpy, + pong_clock->xscreen); + + pong_clock->pixelw = pong_clock->xwin_width / RESX; + pong_clock->pixelh = pong_clock->xwin_height / RESY; + + pong_clock->ball_x = 0; + pong_clock->ball_y = pong_clock->xwin_height / 2; + + pong_clock->ball_dx = BALLDX; + pong_clock->ball_dy = BALLDY; + + pong_clock->batb_y = pong_clock->bata_y = pong_clock->ball_y; + + gcv.background = BlackPixel(pong_clock->xdpy, + pong_clock->xscreen); + gcv.foreground = WhitePixel(pong_clock->xdpy, + pong_clock->xscreen); + gcv.graphics_exposures = False; + + pong_clock->xgc = XCreateGC (pong_clock->xdpy, pong_clock->xwin_root, + GCForeground|GCBackground|GCGraphicsExposures, + &gcv); + + atoms_WINDOW_STATE + = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE",False); + atoms_WINDOW_STATE_FULLSCREEN + = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE_FULLSCREEN",False); + + pong_clock->xwin = XCreateSimpleWindow(pong_clock->xdpy, + pong_clock->xwin_root, + 0, 0, + pong_clock->xwin_width, + pong_clock->xwin_height, + 0, + WhitePixel(pong_clock->xdpy, + pong_clock->xscreen), + BlackPixel(pong_clock->xdpy, + pong_clock->xscreen)); + + pong_clock->backbuffer = XCreatePixmap(pong_clock->xdpy, + pong_clock->xwin_root, + pong_clock->xwin_width, + pong_clock->xwin_height, + DefaultDepth(pong_clock->xdpy, + pong_clock->xscreen)); + + XSelectInput(pong_clock->xdpy, pong_clock->xwin, KeyPressMask); + + + /* Set the hints for fullscreen */ + XChangeProperty(pong_clock->xdpy, + pong_clock->xwin, + atoms_WINDOW_STATE, + XA_ATOM, + 32, + PropModeReplace, + (unsigned char *) &atoms_WINDOW_STATE_FULLSCREEN, 1); + + XMapWindow(pong_clock->xdpy, pong_clock->xwin); + + while (True) + { + struct timeval timeout; + XEvent xev; + + timeout.tv_sec = 0; + timeout.tv_usec = 1000000 / FPS; + select (0, NULL, NULL, NULL, &timeout); + + draw_frame (pong_clock); + + XFlush(pong_clock->xdpy); + + if (XPending(pong_clock->xdpy)) + { + if (XCheckMaskEvent(pong_clock->xdpy, + KeyPressMask, + &xev)) + exit(-1); + } + } +} diff --git a/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 @@ +SUMMARY = "A clock combined with a game of pong" +LICENSE = "GPLv2+" +DEPENDS = "virtual/libx11 xdmcp xau" + +SRC_URI = "file://pong-clock-no-flicker.c" + +LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3" + +S = "${WORKDIR}" + +do_compile () { + ${CC} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp` +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 pong-clock ${D}${bindir} +} diff --git a/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 @@ +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59097] + +Signed-off-by: Marko Lindqvist +diff -Nurd startup-notification-0.12/configure.in startup-notification-0.12/configure.in +--- startup-notification-0.12/configure.in 2011-05-16 17:29:20.000000000 +0300 ++++ startup-notification-0.12/configure.in 2013-01-07 06:00:48.921905409 +0200 +@@ -3,7 +3,7 @@ + AC_CONFIG_SRCDIR(libsn/sn-launchee.c) + + AM_INIT_AUTOMAKE +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + # Honor aclocal flags + AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") diff --git a/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 @@ +SUMMARY = "Enables monitoring and display of application startup" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/startup-notification/" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=Specifications" + +# most files are under MIT, but libsn/sn-util.c is under LGPL, the +# effective license is LGPL +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a2ae2cd47d6d2f238410f5364dfbc0f2 \ + file://libsn/sn-util.c;endline=18;md5=18a14dc1825d38e741d772311fea9ee1 \ + file://libsn/sn-common.h;endline=23;md5=6d05bc0ebdcf5513a6e77cb26e8cd7e2 \ + file://test/test-boilerplate.h;endline=23;md5=923e706b2a70586176eead261cc5bb98" + +PR = "r2" + +SECTION = "libs" + + +DEPENDS = "virtual/libx11 libsm xcb-util" + +inherit autotools pkgconfig + +SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz \ + file://obsolete_automake_macros.patch \ +" + +SRC_URI[md5sum] = "2cd77326d4dcaed9a5a23a1232fb38e9" +SRC_URI[sha256sum] = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a" diff --git a/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 @@ +# Uncomment if you wish to use the linux input layer event interface +module_raw input + +# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d +# module_raw collie + +# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 +# module_raw corgi + +# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface +# module_raw ucb1x00 + +# Uncomment if you're using an HP iPaq h3600 or similar +# module_raw h3600 + +# Uncomment if you're using a Hitachi Webpad +# module_raw mk712 + +# Uncomment if you're using an IBM Arctic II +# module_raw arctic2 + +module pthres pmin=1 +module variance delta=30 +module dejitter delta=100 +module linear diff --git a/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 @@ +#!/bin/sh + +if [ -e /dev/input/touchscreen0 ]; then + TSLIB_TSDEVICE=/dev/input/touchscreen0 + + export TSLIB_TSDEVICE +fi + 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 @@ +SUMMARY = "An abstraction layer for touchscreen panel events" +DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ +events, as well as a filter stack for the manipulation of those events. \ +Tslib is generally used on embedded devices to provide a common user \ +space interface to touchscreen functionality." +HOMEPAGE = "http://tslib.berlios.de/" + +AUTHOR = "Russell King w/ plugins by Chris Larson et. al." +SECTION = "base" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" + +SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ + file://ts.conf \ + file://tslib.sh \ +" + +SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d" +SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" + + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ +} + +# People should consider using udev's /dev/input/touchscreen0 symlink +# instead of detect-stylus +#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" +RPROVIDES_tslib-conf = "libts-0.0-conf" + +PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" +DEBIAN_NOAUTONAME_tslib-conf = "1" +DEBIAN_NOAUTONAME_tslib-tests = "1" +DEBIAN_NOAUTONAME_tslib-calibrate = "1" + +RDEPENDS_${PN} = "tslib-conf" +RRECOMMENDS_${PN} = "pointercal" + +FILES_${PN}-dbg += "${libdir}/ts/.debug*" +FILES_${PN}-dev += "${libdir}/ts/*.la" +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/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 @@ + + + + + + sans-serif + Liberation Sans + + + serif + Liberation Serif + + + monospace + Liberation Mono + + 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 @@ +SUMMARY = "Liberation(tm) Fonts" +DESCRIPTION = "The Liberation(tm) Fonts is a font family originally \ +created by Ascender(c) which aims at metric compatibility with \ +Arial, Times New Roman, Courier New." +HOMEPAGE = "https://fedorahosted.org/liberation-fonts/" +BUGTRACKER = "https://bugzilla.redhat.com/" + +SECTION = "x11/fonts" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r4" +PE = "1" + +inherit fontcache + +FONT_PACKAGES = "${PN}" + +SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \ + file://30-liberation-aliases.conf" + +SRC_URI[md5sum] = "4846797ef0fc70b0cbaede2514677c58" +SRC_URI[sha256sum] = "0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1" + +do_install () { + install -d ${D}${datadir}/fonts/ttf/ + for i in *.ttf; do + install -m 0644 $i ${D}${prefix}/share/fonts/ttf/${i} + done + + install -d ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ + + install -d ${D}${prefix}/share/doc/${BPN}/ + install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/ +} + +PACKAGES = "${PN}" +FILES_${PN} += "${sysconfdir} ${datadir}" diff --git a/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 @@ +SUMMARY = "The Bitstream Vera fonts - TTF Edition" +DESCRIPTION = "The Bitstream Vera fonts include four monospace and sans \ +faces (normal, oblique, bold, bold oblique) and two serif faces (normal \ +and bold). In addition Fontconfig/Xft2 can artificially oblique the \ +serif faces for you: this loses hinting and distorts the faces slightly, \ +but is visibly different than normal and bold, and reasonably pleasing." +SECTION = "x11/fonts" +LICENSE = "BitstreamVera" +LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" +PR = "r7" + +inherit fontcache + +FONT_PACKAGES = "${PN}" + +SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" + +do_install () { + install -d ${D}${prefix}/share/fonts/ttf/ + for i in *.ttf; do + install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i} + done + + # fontconfig ships this too. not sure what to do about it. + #install -d ${D}${sysconfdir}/fonts + #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf + + + install -d ${D}${prefix}/share/doc/${BPN}/ + for i in *.TXT; do + install -m 644 $i ${D}${prefix}/share/doc/${BPN}/$i + done +} + +FILES_${PN} = "/etc ${datadir}/fonts" + +SRC_URI[md5sum] = "bb22bd5b4675f5dbe17c6963d8c00ed6" +SRC_URI[sha256sum] = "db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc" diff --git a/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 @@ +SUMMARY = "cross-platform C library to defer selection of GL API and of window system" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ + file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" + +SRC_URI = "http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "5020ecc249096c881e1f59ee961f3d41" +SRC_URI[sha256sum] = "340ee04172dba878249469018cd7ec9d1ecd41af26b612c741b8b52e713bca8e" + +inherit cmake + +# This should be overridden per-machine to reflect the capabilities of the GL +# stack. +PACKAGECONFIG ??= "glx" + +# I say virtual/libgl, actually wants gl.pc +PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11" + +# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland +# DISTRO_FEATURE. +PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,,virtual/libgl wayland" + +# I say virtual/libgl, actually wants gbm.pc egl.pc +PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev" + +# I say virtual/libgl, actually wants egl.pc +PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb" + +# Take the flags added by PACKAGECONFIG and pass them to cmake. +EXTRA_OECMAKE = "${EXTRA_OECONF}" + +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 @@ +SUMMARY = "Multitouch Protocol Translation Library" + +DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ +multitouch events to the slotted type B protocol. The events put into mtdev may \ +be from any MT device, specifically type A without contact tracking, type A with \ +contact tracking, or type B with contact tracking" + +HOMEPAGE = "http://bitmath.org/code/mtdev/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" + +SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" +SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" +SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" + +inherit autotools pkgconfig diff --git a/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 @@ +disable macro checks not used for scanner + +We only build wayland-native for the scanner, so disable the bits we don't +actually need. This avoid build issue on older distro such as Centos 5.x: +| error: 'O_CLOEXEC' undeclared (first use in this function) +| error: sys/timerfd.h: No such file or directory +| error: 'CLOCK_MONOTONIC' undeclared (first use in this function) +| error: 'TFD_CLOEXEC' undeclared (first use in this function) +| error: 'SFD_CLOEXEC' undeclared (first use in this function) + +Upstream-Status: Pending + +Signed-off-by: Ting Liu +--- + configure.ac | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) + + AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate]) + +-AC_CHECK_DECL(SFD_CLOEXEC,[], +- [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], +- [[#include ]]) +-AC_CHECK_DECL(TFD_CLOEXEC,[], +- [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")], +- [[#include ]]) +-AC_CHECK_DECL(CLOCK_MONOTONIC,[], +- [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")], +- [[#include ]]) +-AC_CHECK_HEADERS([execinfo.h]) ++##AC_CHECK_DECL(SFD_CLOEXEC,[], ++# [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], ++# [[#include ]]) ++#AC_CHECK_DECL(TFD_CLOEXEC,[], ++# [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")], ++# [[#include ]]) ++#AC_CHECK_DECL(CLOCK_MONOTONIC,[], ++# [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")], ++# [[#include ]]) ++#AC_CHECK_HEADERS([execinfo.h]) + + AC_ARG_ENABLE([scanner], + [AC_HELP_STRING([--disable-scanner], +-- +1.8.3.2 + 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 @@ +SUMMARY = "Wayland, a protocol between a compositor and clients" +DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ +as well as a C library implementation of that protocol. The compositor can be \ +a standalone display server running on Linux kernel modesetting and evdev \ +input devices, an X application, or a wayland client itself. The clients can \ +be traditional applications, X servers (rootless or fullscreen) or other \ +display servers." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ + file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d" +SRC_URI[sha256sum] = "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5" +SRC_URI_append_class-native = " \ + file://disable-macro-checks-not-used-for-scanner.patch \ + " +EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" + +inherit autotools pkgconfig + +# We need wayland-native for the wayland-scanner utility +BBCLASSEXTEND = "native" + +DEPENDS_class-native = "expat-native libffi-native" +DEPENDS = "expat libffi wayland-native" + +EXTRA_OECONF = "--disable-documentation --disable-scanner" + +# Wayland installs a M4 macro for other projects to use, which uses the target +# pkg-config to find files. Replace pkg-config with pkg-config-native. +do_install_append_class-native() { + sed -e 's,PKG_CHECK_MODULES(.*),,g' \ + -e 's,$PKG_CONFIG,pkg-config-native,g' \ + -i ${D}/${datadir}/aclocal/wayland-scanner.m4 +} + +sysroot_stage_all_append_class-target () { + cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ +} 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 @@ +SUMMARY = "Startup script for the Weston Wayland compositor" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" + +SRC_URI = "file://init" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}/${sysconfdir}/init.d + install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston +} + +inherit allarch update-rc.d + +RDEPENDS_${PN} = "weston kbd" + +INITSCRIPT_NAME = "weston" +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 @@ +#!/bin/sh +# +### BEGIN INIT INFO +# Provides: weston +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +killproc() { + pid=`/bin/pidof $1` + [ "$pid" != "" ] && kill $pid +} + +read CMDLINE < /proc/cmdline +for x in $CMDLINE; do + case $x in + weston=false) + echo "Weston disabled" + exit 0; + ;; + esac +done + +case "$1" in + start) + . /etc/profile + + # This is all a nasty hack + if test -z "$XDG_RUNTIME_DIR"; then + export XDG_RUNTIME_DIR=/run/user/root + mkdir --parents $XDG_RUNTIME_DIR + chmod 0700 $XDG_RUNTIME_DIR + fi + + openvt -s weston + ;; + + stop) + echo "Stopping Weston" + killproc weston + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 { start | stop | restart }" + ;; +esac + +exit 0 diff --git a/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 @@ +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then + AC_MSG_ERROR([wayland-scanner is needed to compile weston]) + fi + +-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) ++#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) + + AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) + 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 @@ +weston-1.5.0/configure.ac: make lcms explicitly configurable + +The lcms package is outside of openembedded-core, so make it +explicitly configurable. Make it deterministic, so that if lcms +dependencies are missing, autoconf throws a fatal error. Follow +upstream style to make it more likely to be merged. + +Upstream-Status: Pending + +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, + enable_demo_clients_install=no) + AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) + +-PKG_CHECK_MODULES(LCMS, lcms2, +- [have_lcms=yes], [have_lcms=no]) +-if test "x$have_lcms" = xyes; then +- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) ++AC_ARG_ENABLE(lcms, ++ AS_HELP_STRING([--disable-lcms], ++ [Disable lcms support]),, ++ enable_lcms=auto) ++AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) ++if test "x$enable_lcms" != "xno"; then ++ PKG_CHECK_MODULES(LCMS, ++ lcms2, ++ [have_lcms=yes], ++ [have_lcms=no]) ++ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then ++ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) ++ fi ++ if test "x$have_lcms" = "xyes"; then ++ enable_lcms=yes ++ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) ++ fi + fi +-AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) + + AC_PATH_PROG([wayland_scanner], [wayland-scanner]) + if test x$wayland_scanner = x; then diff --git a/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 @@ + +The libwebp package is outside of openembedded-core, so make it +explicitly configurable. Make it deterministic, so that if libwebp +dependencies are missing, autoconf throws a fatal error. + +Upstream-Status: Pending + +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -268,9 +268,22 @@ fi + + PKG_CHECK_MODULES(PIXMAN, [pixman-1]) + PKG_CHECK_MODULES(PNG, [libpng]) +-PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) +-AS_IF([test "x$have_webp" = "xyes"], +- [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) ++AC_ARG_ENABLE(webp, ++ AS_HELP_STRING([--disable-webp], ++ [Disable libwebp support]),, ++ enable_webp=auto) ++AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes]) ++AS_IF([test "x$enable_webp" != "xno"], ++ PKG_CHECK_MODULES(WEBP, ++ [libwebp], ++ [have_webp=yes], ++ [have_webp=no]) ++ AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"], ++ AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found])) ++ AS_IF([test "x$have_webp" = "xyes"], ++ [enable_webp=yes] ++ [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) ++) + + AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],, + enable_vaapi_recorder=auto) diff --git a/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 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=Weston +Comment=Wayland Compostitor +Exec=weston +Icon=weston +Terminal=false +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 Binary files /dev/null and b/meta/recipes-graphics/wayland/weston/weston.png 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 @@ +SUMMARY = "Weston, a Wayland compositor" +DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ + file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://weston.png \ + file://weston.desktop \ + file://disable-wayland-scanner-pkg-check.patch \ + file://make-lcms-explicitly-configurable.patch \ + file://make-libwebp-explicitly-configurable.patch \ +" +SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" +SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" + +inherit autotools pkgconfig useradd + +DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" +DEPENDS += "wayland virtual/egl pango" + +EXTRA_OECONF = "--enable-setuid-install \ + --disable-xwayland \ + --enable-simple-clients \ + --enable-clients \ + --enable-demo-clients-install \ + --disable-libunwind \ + --disable-rpi-compositor \ + --disable-rdp-compositor \ + " + + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ + " +# +# Compositor choices +# +# Weston on KMS +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev" +# Weston on Wayland (nested Weston) +PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" +# Weston on X11 +PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" +# Headless Weston +PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" +# Weston on framebuffer +PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" +# weston-launch +PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" +# VA-API desktop recorder +PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" +# Weston with EGL support +PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" +# Weston with cairo glesv2 support +PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" +# Weston with lcms support +PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" +# Weston with webp support +PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" + +do_install_append() { + # Weston doesn't need the .la files to load modules, so wipe them + rm -f ${D}/${libdir}/weston/*.la + + # If X11, ship a desktop file to launch it + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then + install -d ${D}${datadir}/applications + install ${WORKDIR}/weston.desktop ${D}${datadir}/applications + + install -d ${D}${datadir}/icons/hicolor/48x48/apps + install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps + fi +} + +PACKAGES += "${PN}-examples" + +FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}" +FILES_${PN}-examples = "${bindir}/*" + +RDEPENDS_${PN} += "xkeyboard-config" +RRECOMMENDS_${PN} = "liberation-fonts" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system weston-launch" diff --git a/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 @@ +Rxvt*scrollBar_right: true +Rxvt*font: xft:Mono:pixelsize=9 + 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 @@ +#!/bin/sh +# + +XSERVER=/usr/bin/Xorg + +. /etc/profile + +ARGS=" -br -pn" + +DISPLAY=':0' + +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 @@ +#!/bin/sh + +if [ -x /usr/bin/dbus-launch ]; then + # As this is the X session script, always start a new DBus session. + eval `dbus-launch --sh-syntax --exit-with-session ++ Copyright (C) ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ , 1 April 1989 ++ Ty Coon, President of Vice ++ ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Lesser General ++Public License instead of this License. diff --git a/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 @@ +SUMMARY = "Common X11 scripts and configuration files" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +SECTION = "x11" +PR = "r47" + +SRC_URI = "file://etc \ + file://gplv2-license.patch" + +S = "${WORKDIR}" + +do_install() { + cp -R ${S}/etc ${D}${sysconfdir} + chmod -R 755 ${D}${sysconfdir} + find ${D}${sysconfdir} -type f -name \*~ -exec rm -rf {} \; +} + +RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" + 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 @@ +SUMMARY = "Simple Xserver Init Script (no dm)" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +SECTION = "x11" +PR = "r31" + +SRC_URI = "file://xserver-nodm \ + file://Xusername \ + file://gplv2-license.patch \ + file://xserver-nodm.service \ + file://xserver-nodm.conf \ +" + +S = "${WORKDIR}" + +# Since we refer to ROOTLESS_X which is normally enabled per-machine +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit update-rc.d systemd + +do_install() { + install -d ${D}${sysconfdir}/init.d + install xserver-nodm ${D}${sysconfdir}/init.d + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/default + install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system + if [ "${ROOTLESS_X}" = "1" ] ; then + sed -i 's!^HOME=.*!HOME=/home/xuser!' ${D}${sysconfdir}/default/xserver-nodm + sed -i 's!^User=.*!User=xuser!' ${D}${systemd_unitdir}/system/xserver-nodm.service + else + sed -i 's!^HOME=.*!HOME=${ROOT_HOME}!' ${D}${sysconfdir}/default/xserver-nodm + sed -i '/^User=/d' ${D}${systemd_unitdir}/system/xserver-nodm.service + fi + fi + + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then + if [ "${ROOTLESS_X}" = "1" ] ; then + install -d ${D}${sysconfdir}/X11 + install Xusername ${D}${sysconfdir}/X11 + fi + fi +} + +RDEPENDS_${PN} = "${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" + +INITSCRIPT_NAME = "xserver-nodm" +INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." +SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" + diff --git a/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 @@ +COPYING: add GPLv2 license file + +this is a local file recipe and the license file is missing.In order +to pass the license checksum checking, the license file is needed. So +this patch add the GPLv2 license file. + +Upstream-Status: Inappropriate [licensing] + +Signed-off-by: Yu Ke + +diff --git a/COPYING b/COPYING +new file mode 100644 +index 0000000..d511905 +--- /dev/null ++++ b/COPYING +@@ -0,0 +1,339 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Lesser General Public License instead.) You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++this service if you wish), that you receive source code or can get it ++if you want it, that you can change the software or use pieces of it ++in new free programs; and that you know you can do these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. You must make sure that they, too, receive or can get the ++source code. And you must show them these terms so they know their ++rights. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute verbatim copies of the Program's ++source code as you receive it, in any medium, provided that you ++conspicuously and appropriately publish on each copy an appropriate ++copyright notice and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Program ++specifies a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ++REPAIR OR CORRECTION. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ++POSSIBILITY OF SUCH DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ , 1 April 1989 ++ Ty Coon, President of Vice ++ ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Lesser General ++Public License instead of this License. diff --git a/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 @@ +#!/bin/sh +# +### BEGIN INIT INFO +# Provides: xserver +# Required-Start: $local_fs $remote_fs dbus +# Required-Stop: $local_fs $remote_fs +# Default-Start: 5 +# Default-Stop: 0 1 2 3 6 +### END INIT INFO + +killproc() { # kill the named process(es) + pid=`/bin/pidof $1` + [ "$pid" != "" ] && kill $pid +} + +read CMDLINE < /proc/cmdline +for x in $CMDLINE; do + case $x in + x11=false) + echo "X Server disabled" + exit 0; + ;; + esac +done + +case "$1" in + start) + . /etc/profile + username=root + echo "Starting Xserver" + if [ -f /etc/X11/Xusername ]; then + username=`cat /etc/X11/Xusername` + # setting for rootless X + chmod o+w /var/log + chmod g+r /dev/tty[0-3] + # hidraw device is probably needed + if [ -e /dev/hidraw0 ]; then + chmod o+rw /dev/hidraw* + fi + fi + # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] + su -l -c '/etc/X11/Xserver&' $username + # Wait for the desktop to say its finished loading + # before loading the rest of the system + # dbus-wait org.matchbox_project.desktop Loaded + ;; + + stop) + echo "Stopping XServer" + killproc xinit + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 { start | stop | restart }" + ;; +esac + +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 @@ +[Unit] +Description=Xserver startup without a display manager + +[Service] +User=root +EnvironmentFile=/etc/default/xserver-nodm +ExecStart=/etc/X11/Xserver + +[Install] +Alias=display-manager.service diff --git a/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 @@ +libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN + +since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is +automatically set for different arch, it is better to use WORDS_BIGENDIAN +instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips. + +Signed-off-by: Yu Ke + +Upstream-Status: Pending + +diff --git a/libvncserver/main.c b/libvncserver/main.c +index b6bd930..8bbb7bf 100644 +--- a/libvncserver/main.c ++++ b/libvncserver/main.c +@@ -47,7 +47,7 @@ static MUTEX(extMutex); + + static int rfbEnableLogging=1; + +-#ifdef LIBVNCSERVER_WORDS_BIGENDIAN ++#ifdef WORDS_BIGENDIAN + char rfbEndianTest = (1==0); + #else + char rfbEndianTest = (1==1); + 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 @@ +"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start. +Removing these 2 parameters makes x11vnc works well on poky sato image. + +Add also -skip_lockkeys option to ignore all Caps_Lock, Shift_Lock, Num_Lock, +Scroll_Lock keysyms received from viewers, in order to leave the lock state on +the server side unchanged. Yet, the keys will appear correctly. + +Signed-off-by: Zhai Edwin +Signed-off-by: Laurentiu Palcu + +Upstream-Status: Inappropriate [configuration] + +Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop +=================================================================== +--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800 ++++ x11vnc-0.9.12/x11vnc/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Name=X11VNC Server + Comment=Share this desktop by VNC +-Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY ++Exec=x11vnc -bg -rfbport 5900 -skip_lockkeys -o %%HOME/.x11vnc.log.%%VNCDISPLAY + Icon=computer + Terminal=false + 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 @@ +SUMMARY = "Exports your X session on-the-fly via VNC" +HOMEPAGE = "http://www.karlrunge.com/x11vnc/" + +SECTION = "x11/utils" +AUTHOR = "Karl Runge" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ + file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ + file://starting-fix.patch \ + file://endian-fix.patch " + +SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c" +SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b" + +DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst" + +inherit autotools-brokensep + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" +PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" +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 @@ +Fix typo in Makefile + +Upstream-Status: Pending + +Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am +=================================================================== +--- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:04.001435305 +0000 ++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:04.061435302 +0000 +@@ -79,7 +79,7 @@ + ul_angle \ + ur_angle \ + v_double_arrow \ +- watcha \ ++ watch \ + xterm + + 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 @@ +Use relative symlink for link rather than absolute path which +doesn't work well in DESTDIR setting. + +Also fix out of tree builds to use correct srcdir. + +Upstream-Status: Pending + +RP 2013/3/8 + +Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am +=================================================================== +--- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:03.933435307 +0000 ++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:27.293434755 +0000 +@@ -88,9 +88,9 @@ + + install-data-local: + $(mkinstalldirs) $(DESTDIR)$(CURSOR_DIR); +- $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ ++ $(INSTALL_DATA) $(srcdir)/$(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ + for CURSOR in $(CURSOR_NAMES); do \ + echo '-- Installing cursor '$$CURSOR; \ +- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ ++ ln -s transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ + done + 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 @@ +SUMMARY = "Transparent X11 cursor theme for touchscreens" +HOMEPAGE = "http://www.matchbox-project.org/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SECTION = "x11/base" +PR = "r4" + +SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz \ + file://use-relative-symlinks.patch \ + file://fix_watch_cursor.patch" + +SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23" +SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4" +FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" + +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 @@ +SUMMARY = "Touchscreen calibration data from xinput-calibrator" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PR = "r7" + +SRC_URI = "file://pointercal.xinput" +S = "${WORKDIR}" + +do_install() { + # Only install file if it has a contents + if [ -s ${S}/pointercal.xinput ] &&\ + [ ! -n "$(head -n1 ${S}/pointercal.xinput|grep "replace.*pointercal\.xinput")" ]; then + install -d ${D}${sysconfdir}/ + install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/ + fi +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput" diff --git a/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 @@ +#!/bin/sh + +. /etc/formfactor/config + +if [ "$HAVE_TOUCHSCREEN" = "1" ]; then + /usr/bin/xinput_calibrator_once.sh +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 @@ +Upstream-Status: Pending + +From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 +From: Laurentiu Palcu +Date: Mon, 1 Jul 2013 15:38:02 +0300 +Subject: [PATCH] Allow xinput_calibrator_pointercal.sh to be run as normal + user + +Allow normal user to create their own pointercal.xinput files that +override the system pointercal file in /etc. + +Signed-off-by: Laurentiu Palcu +--- + scripts/xinput_calibrator_pointercal.sh | 33 +++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) + +diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh +index fccb197..0ada7da 100755 +--- a/scripts/xinput_calibrator_pointercal.sh ++++ b/scripts/xinput_calibrator_pointercal.sh +@@ -11,19 +11,32 @@ + PATH="/usr/bin:$PATH" + + BINARY="xinput_calibrator" +-CALFILE="/etc/pointercal.xinput" +-LOGFILE="/var/log/xinput_calibrator.pointercal.log" ++SYS_CALFILE="/etc/pointercal.xinput" ++USER_CALFILE="$HOME/.pointercal/pointercal.xinput" + +-if [ -e $CALFILE ] ; then +- if grep replace $CALFILE ; then +- echo "Empty calibration file found, removing it" +- rm $CALFILE +- else +- echo "Using calibration data stored in $CALFILE" +- . $CALFILE && exit 0 +- fi ++if [ "$USER" = "root" ]; then ++ LOGFILE="/var/log/xinput_calibrator.pointercal.log" ++ CALFILES="$SYS_CALFILE" ++else ++ LOGFILE="$HOME/.pointercal/xinput_calibrator.pointercal.log" ++ CALFILES="$USER_CALFILE $SYS_CALFILE" ++ mkdir -p "$HOME/.pointercal" + fi + ++for CALFILE in $CALFILES; do ++ if [ -e $CALFILE ]; then ++ if grep replace $CALFILE ; then ++ echo "Empty calibration file found, removing it" ++ rm $CALFILE 2>/dev/null || true ++ else ++ echo "Using calibration data stored in $CALFILE" ++ . $CALFILE && exit 0 ++ fi ++ fi ++done ++ ++[ "$USER" != "root" ] && CALFILE=$USER_CALFILE ++ + CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` + if [ ! -z "$CALDATA" ] ; then + echo $CALDATA > $CALFILE +-- +1.7.9.5 + diff --git a/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 @@ +SUMMARY = "Touchscreen calibration program for X11" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a" +DEPENDS = "virtual/libx11 libxi" + +PV = "0.7.5+git${SRCPV}" +PR = "r6" + +inherit autotools pkgconfig + +SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" +SRC_URI = "git://github.com/tias/xinput_calibrator.git \ + file://30xinput_calibrate.sh \ + file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch" + +S = "${WORKDIR}/git" + +# force native X11 ui as we don't have gtk+ in DEPENDS +EXTRA_OECONF += "--with-gui=x11" + +do_install_append() { + install -d ${D}${bindir} + install -m 0755 ${S}/scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh + + install -d ${D}${sysconfdir}/X11/Xsession.d/ + install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ + + install -d ${D}${sysconfdir}/xdg/autostart + sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' ${S}/scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop +} + +FILES_${PN} += "${sysconfdir}/xdg/autostart" +RDEPENDS_${PN} = "xinput formfactor" +RRECOMMENDS_${PN} = "pointercal-xinput" diff --git a/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 @@ +require xorg-app-common.inc + +SUMMARY = "A program to create an index of X font files in a directory" + +DESCRIPTION = "For each directory argument, mkfontdir reads all of the \ +font files in the directory. The font names and related data are written \ +out to the files \"fonts.dir\", \"fonts.scale\", and \"fonts.alias\". \ +The X server and font server use these files to find the available font \ +files." + +PE = "1" +PR = "${INC_PR}.0" + +RDEPENDS_${PN} += "mkfontscale" +RDEPENDS_${PN}_class-native += "mkfontscale-native" + +BBCLASSEXTEND = "native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b4fcf2b90cadbfc15009b9e124dc3a3f" + +SRC_URI[md5sum] = "18c429148c96c2079edda922a2b67632" +SRC_URI[sha256sum] = "56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530" diff --git a/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 @@ +require xorg-app-common.inc + +SUMMARY = "A program to create an index of scalable font files for X" + +DESCRIPTION = "For each directory argument, mkfontscale reads all of the \ +scalable font files in the directory. For every font file found, an X11 \ +font name (XLFD) is generated, and is written together with the file \ +name to a file fonts.scale in the directory. The resulting fonts.scale \ +is used by the mkfontdir program." + +DEPENDS = "util-macros-native zlib libfontenc freetype xproto" + +BBCLASSEXTEND = "native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" + +SRC_URI[md5sum] = "03de3f15db678e277f5ef9c013aca1ad" +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 @@ +require xorg-app-common.inc + +SUMMARY = "X11 color name database" +DESCRIPTION = "This package includes both the list mapping X color names \ +to RGB values (rgb.txt) and, if configured to use a database for color \ +lookup, the rgb program to convert the text file into the binary database \ +format." + +DEPENDS += " xproto util-macros" +LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "bcd820d967eaa51bd25b86c0ee682d4e" +SRC_URI[sha256sum] = "8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857" + +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 @@ +require xorg-app-common.inc + +SUMMARY = "X11 server performance test program" + +DESCRIPTION = "The x11perf program runs one or more performance tests \ +and reports how fast an X server can execute the tests." + + +DEPENDS += "libxmu libxrender libxft libxext fontconfig" + +LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ + file://x11perf.h;endline=24;md5=29555066baf406a105ff917ac25b2d01" + +PR = "${INC_PR}.0" +PE = "1" + +FILES_${PN} += "${libdir}/X11/x11perfcomp/*" + +SRC_URI[md5sum] = "5c3c7431a38775caaea6051312a49bc9" +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 @@ +require xorg-app-common.inc +SUMMARY = "X authority utilities" +DESCRIPTION = "X application to edit and display the authorization \ +information used in connecting to the X server." + +LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" + +DEPENDS += "libxau libxext libxmu" +PE = "1" + +SRC_URI[md5sum] = "7d6003f32838d5b688e2c8a131083271" +SRC_URI[sha256sum] = "56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f" diff --git a/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 @@ +Upstream-Status: Pending + +Index: xdpyinfo-1.3.0/configure.ac +=================================================================== +--- xdpyinfo-1.3.0.orig/configure.ac 2011-10-21 21:34:21.000000000 -0700 ++++ xdpyinfo-1.3.0/configure.ac 2011-11-28 20:06:56.554056935 -0800 +@@ -47,11 +47,15 @@ + AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + ++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), ++ XKB="$enableval", XKB="yes") ++if test "x$XKB" = "xyes" ; then + PKG_CHECK_MODULES(DPY_XKB, x11, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) ++fi + + PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, + [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 @@ +require xorg-app-common.inc + +SUMMARY = "Display information utility for X" + +DESCRIPTION = "Xdpyinfo is a utility for displaying information about an \ +X server. It is used to examine the capabilities of a server, the \ +predefined values for various parameters used in communicating between \ +clients and the server, and the different types of screens and visuals \ +that are available." + +LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" +DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau libxcomposite" +PE = "1" + +SRC_URI += "file://disable-xkb.patch" + +SRC_URI[md5sum] = "cacc0733f16e4f2a97a5c430fcc4420e" +SRC_URI[sha256sum] = "aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94" + +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 @@ +Upstream-Status: Inappropriate [disable feature] + +--- + xev.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +Index: xev-1.2.0/xev.c +=================================================================== +--- xev-1.2.0.orig/xev.c ++++ xev-1.2.0/xev.c +@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp) + nbytes = XLookupString (e, str, 256, &ks, NULL); + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + do { + nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); + buf[nmbbytes] = '\0'; +@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp) + buf = realloc (buf, bsize); + } + } while (status == XBufferOverflow); +- } ++ }*/ + + if (ks == NoSymbol) + ksname = "NoSymbol"; +@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp) + } + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + printf (" XmbLookupString gives %d bytes: ", nmbbytes); + if (nmbbytes > 0) { + dump (buf, nmbbytes); +@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp) + } else { + printf ("\n"); + } +- } ++ } */ + + printf (" XFilterEvent returns: %s\n", + XFilterEvent (eventp, e->window) ? "True" : "False"); +@@ -1015,7 +1015,7 @@ main (int argc, char **argv) + fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); + } + +- xim = XOpenIM (dpy, NULL, NULL, NULL); ++ /*xim = XOpenIM (dpy, NULL, NULL, NULL); + if (xim == NULL) { + fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); + } +@@ -1042,7 +1042,7 @@ main (int argc, char **argv) + } + XFree (xim_styles); + } +- } ++ }*/ + + screen = DefaultScreen (dpy); + +@@ -1109,7 +1109,7 @@ main (int argc, char **argv) + printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); + } + +- if (xim && xim_style) { ++ /*if (xim && xim_style) { + xic = XCreateIC (xim, + XNInputStyle, xim_style, + XNClientWindow, w, +@@ -1119,7 +1119,7 @@ main (int argc, char **argv) + if (xic == NULL) { + fprintf (stderr, "XCreateIC failed\n"); + } +- } ++ }*/ + + have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base); + if (have_rr) { diff --git a/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 @@ +require xorg-app-common.inc + +SUMMARY = "X Event Viewer" +DESCRIPTION = "Xev creates a window and then asks the X server to send it events \ +whenever anything happens to the window (such as it being moved, resized, \ +typed in, clicked in, etc.). You can also attach it to an existing window." + +LIC_FILES_CHKSUM = "file://xev.c;beginline=1;endline=33;md5=577c99421f1803b891d2c79097ae4682" +LICENSE = "MIT" + +PE = "1" + +DEPENDS += "libxrandr xproto" + +SRC_URI += "file://diet-x11.patch" + +SRC_URI[md5sum] = "5b0a0b6f589441d546da21739fa75634" +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 @@ +require xorg-app-common.inc + +SUMMARY = "X11 eyes that follow the mouse cursor demo" +DESCRIPTION = "Xeyes is a small X11 application that shows a pair of eyes that move to \ +follow the location of the mouse cursor around the screen." + +PE = "1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6" + +SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981" +SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521" + +DEPENDS += "libxau libxt libxext libxmu libxrender" diff --git a/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 @@ +require xorg-app-common.inc + +SUMMARY = "Server access control program for X" + +DESCRIPTION = "The xhost program is used to add and delete host names or \ +user names to the list allowed to make connections to the X server. In \ +the case of hosts, this provides a rudimentary form of privacy control \ +and security. Environments which require more sophisticated measures \ +should implement the user-based mechanism or use the hooks in the \ +protocol for passing other authentication data to the server." + +LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199" +DEPENDS += "libxmu libxau" +PE = "1" + +SRC_URI[md5sum] = "f1669af1fe0554e876f03319c678e79d" +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 @@ +require xorg-app-common.inc + +SUMMARY = "X Window System initializer" + +DESCRIPTION = "The xinit program is used to start the X Window System \ +server and a first client program on systems that cannot start X \ +directly from /etc/init or in environments that use multiple window \ +systems. When this first client exits, xinit will kill the X server and \ +then terminate." + +LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" + +PE = "1" + +SRC_URI[md5sum] = "3b8da0e6237aee9828cc809c647510a7" +SRC_URI[sha256sum] = "74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af" + +EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" + +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 @@ +require xorg-app-common.inc + +SUMMARY = "Runtime configuration and test of XInput devices" + +DESCRIPTION = "Xinput is an utility for configuring and testing XInput devices" + +LIC_FILES_CHKSUM = "file://COPYING;md5=881525f89f99cad39c9832bcb72e6fa5" + +DEPENDS += " libxi libxrandr libxinerama" + + +SRC_URI[md5sum] = "305980ac78a6954e306a14d80a54c441" +SRC_URI[sha256sum] = "b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f" + 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 @@ +require xorg-app-common.inc + +SUMMARY = "A program to compile XKB keyboard description" + +DESCRIPTION = "The xkbcomp keymap compiler converts a description of an \ +XKB keymap into one of several output formats. The most common use for \ +xkbcomp is to create a compiled keymap file (.xkm extension) which can \ +be read directly by XKB-capable X servers or utilities." + +LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a" + +PR = "${INC_PR}.0" + +DEPENDS += "libxkbfile" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "a0fc1ac3fc4fe479ade09674347c5aa0" +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 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Mon, 23 Apr 2012 14:28:39 +0000 +Subject: include config.h before stdio.h & other system headers + +Ensures definitions like _GNU_SOURCE are visible when needed. + +Signed-off-by: Alan Coopersmith +Reviewed-by: Peter Hutterer +--- +diff --git a/exec.c b/exec.c +index dbcb669..419b10e 100644 +--- a/exec.c ++++ b/exec.c +@@ -54,6 +54,10 @@ from The Open Group. + * original xmodmap, written by David Rosenthal, of Sun Microsystems. + */ + ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ + #include + #include + #include +diff --git a/pf.c b/pf.c +index 0eb0f55..3f0c3f4 100644 +--- a/pf.c ++++ b/pf.c +@@ -26,6 +26,10 @@ from The Open Group. + + */ + ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ + #include + #include + #include +diff --git a/xmodmap.c b/xmodmap.c +index 58a8e70..0f89629 100644 +--- a/xmodmap.c ++++ b/xmodmap.c +@@ -26,6 +26,10 @@ from The Open Group. + + */ + ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ + #include + #include + #include +-- +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 @@ +require xorg-app-common.inc + +SUMMARY = "Utility for modifying keymaps and pointer button mappings in X" + +DESCRIPTION = "The xmodmap program is used to edit and display the \ +keyboard modifier map and keymap table that are used by client \ +applications to convert event keycodes into keysyms. It is usually run \ +from the user's session startup script to configure the keyboard \ +according to personal tastes." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" + +PE = "1" + +SRC_URI += "file://gnu-source.patch" + +SRC_URI[md5sum] = "5511da3361eea4eaa21427652c559e1c" +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 @@ +SUMMARY = "X application" +HOMEPAGE = "http://www.x.org/" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11/apps" +LICENSE = "MIT-X" +DEPENDS = "util-macros-native virtual/libx11" + +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +INC_PR = "r8" + +SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit autotools pkgconfig distro_features_check + +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 @@ +require xorg-app-common.inc + +SUMMARY = "Utility to display window and font properties of an X server" + +DESCRIPTION = "The xprop utility is for displaying window and font \ +properties in an X server. One window or font is selected using the \ +command line arguments or possibly in the case of a window, by clicking \ +on the desired window. A list of properties is then given, possibly with \ +formatting information." + +LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" + +DEPENDS += "libxmu" + +PE = "1" + +SRC_URI[md5sum] = "fae3d2fda07684027a643ca783d595cc" +SRC_URI[sha256sum] = "9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6" diff --git a/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 @@ +require xorg-app-common.inc + +SUMMARY = "XRandR: X Resize, Rotate and Reflect extension command" + +DESCRIPTION = "Xrandr is used to set the size, orientation and/or \ +reflection of the outputs for a screen. It can also set the screen \ +size." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" +DEPENDS += "libxrandr libxrender" +PE = "1" + +SRC_URI[md5sum] = "78fd973d9b532106f8777a3449176148" +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 @@ +add "-disable-xkb" option + +Upstream-Status: Pending + +Rebase for 1.2.1 by: Yu Ke + +diff --git a/configure.ac b/configure.ac +index 81c3ae4..26601bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, + AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + ++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), ++ XKB="$enableval", XKB="yes") ++if test "x$XKB" = "xyes" ; then + PKG_CHECK_MODULES(SET_XKB, x11, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" + AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) ++fi + + AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), + [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"]) diff --git a/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 @@ +require xorg-app-common.inc + +SUMMARY = "Utility for setting various user preference options of the display" + +DESCRIPTION = "xset is a utility that is used to set various user \ +preference options of the display." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" +DEPENDS += "libxext libxxf86misc libxmu libxau" +PE = "1" + +SRC_URI += "file://disable-xkb.patch" + +SRC_URI[md5sum] = "dcd227388b57487d543cab2fd7a602d7" +SRC_URI[sha256sum] = "4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063" + +CFLAGS += "-D_GNU_SOURCE" +EXTRA_OECONF = "--disable-xkb --without-fontcache" diff --git a/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 @@ +require xorg-app-common.inc + +SUMMARY = "Print out X-Video extension adaptor information" + +DESCRIPTION = "xvinfo prints out the capabilities of any video adaptors \ +associated with the display that are accessible through the X-Video \ +extension." + +LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68" +DEPENDS += " libxv" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "1fbd65e81323a8c0a4b5e24db0058405" +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 @@ +require xorg-app-common.inc + +SUMMARY = "Window information utility for X" + +DESCRIPTION = "Xwininfo is a utility for displaying information about \ +windows. Information may include window position, size, color depth, \ +and a number of other items." + +LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e" +DEPENDS += "libxext libxmu" + +PE = "0" + +SRC_URI[md5sum] = "b777bafb674555e48fd8437618270931" +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 @@ +require xorg-driver-input.inc + +SUMMARY = "X.Org X server -- event devices (evdev) input driver" + +DESCRIPTION = "evdev is an Xorg input driver for Linux's generic event \ +devices. It therefore supports all input devices that the kernel knows \ +about, including most mice and keyboards. \ +\ +The evdev driver can serve as both a pointer and a keyboard input \ +device, and may be used as both the core keyboard and the core pointer. \ +Multiple input devices are supported by multiple instances of this \ +driver, with one Load directive for evdev in the Module section of your \ +xorg.conf for each input device that will use this driver. " + +LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" + +DEPENDS += "mtdev libevdev" + +SRC_URI[md5sum] = "9076ae2646f7aeb30963056e0bbfccf0" +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 @@ +require xorg-driver-input.inc + +SUMMARY = "X.Org X server -- keyboard input driver" + +DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ +driver supports the standard OS-provided keyboard interface. The driver \ +functions as a keyboard input device, and may be used as the X server's \ +core keyboard." + +LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10" + +SRC_URI[md5sum] = "ce936e219682bacf5a4a9c4ab940edb8" +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 @@ +require xorg-driver-input.inc + +SUMMARY = "X.Org X server -- keyboard input driver" + +DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ +driver supports the standard OS-provided keyboard interface. The driver \ +functions as a keyboard input device, and may be used as the X server's \ +core keyboard." + +SRCREV = "3e28d68b50d291938734e9684b8296ca864f3892" +PV = "1.3.2+git${SRCPV}" +PR = "${INC_PR}.0" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard" +S = "${WORKDIR}/git" + diff --git a/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 @@ +Unbreak the linux mouse driver by using config.h + +RP - 4/11/07 + +Upstream-Status: Pending + +Index: git/src/lnx_mouse.c +=================================================================== +--- git.orig/src/lnx_mouse.c 2008-11-04 23:46:05.000000000 +0000 ++++ git/src/lnx_mouse.c 2008-11-04 23:46:15.000000000 +0000 +@@ -3,8 +3,8 @@ + * Copyright 1999 by The XFree86 Project, Inc. + */ + +-#ifdef HAVE_XORG_CONFIG_H +-#include ++#ifdef HAVE_CONFIG_H ++#include + #endif + + #include 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 @@ +require xorg-driver-input.inc + +SUMMARY = "X.Org X server -- mouse input driver" + +DESCRIPTION = "mouse is an Xorg input driver for mice. The driver \ +supports most available mouse types and interfaces. The mouse driver \ +functions as a pointer input device, and may be used as the X server's \ +core pointer. Multiple mice are supported by multiple instances of this \ +driver." + +LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510" + +SRC_URI[md5sum] = "77085b649c5c0b333565ba562f573951" +SRC_URI[sha256sum] = "3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce" + diff --git a/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 @@ +require xorg-driver-input.inc + +SUMMARY = "X.Org X server -- mouse input driver" + +DESCRIPTION = "mouse is an Xorg input driver for mice. The driver \ +supports most available mouse types and interfaces. The mouse driver \ +functions as a pointer input device, and may be used as the X server's \ +core pointer. Multiple mice are supported by multiple instances of this \ +driver." + +SRCREV = "ea5cfe804e112f320f14ad896c7802d53551d3e6" +PV = "1.3.0+git${SRCPV}" +PR = "${INC_PR}.0" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse \ + file://unbreak.patch" +S = "${WORKDIR}/git" + diff --git a/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 @@ +From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 29 Aug 2014 07:57:41 +1000 +Subject: Include xorg-server.h to fix build errors on newest glibc + +In file included from /usr/include/string.h:634:0, + from /usr/include/xorg/os.h:53, + from /usr/include/xorg/misc.h:115, + from /usr/include/xorg/xf86str.h:37, + from /usr/include/xorg/xf86Xinput.h:54, + from synproto.h:36, + from synproto.c:24: +/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' + strndup(const char *str, size_t n); + +See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html + +Signed-off-by: Peter Hutterer + +Status: Backport + +Index: xf86-input-synaptics-1.8.0/src/eventcomm.h +=================================================================== +--- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28 18:40:28.628070587 -0700 ++++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587 -0700 +@@ -27,6 +27,8 @@ + #ifndef _EVENTCOMM_H_ + #define _EVENTCOMM_H_ + ++#include ++ + #include + #include + #include +Index: xf86-input-synaptics-1.8.0/src/ps2comm.h +=================================================================== +--- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28 18:40:28.628070587 -0700 ++++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587 -0700 +@@ -22,6 +22,8 @@ + #ifndef _PS2COMM_H_ + #define _PS2COMM_H_ + ++#include ++ + #include + #include + #include "xf86_OSproc.h" +Index: xf86-input-synaptics-1.8.0/src/synproto.h +=================================================================== +--- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28 18:40:28.628070587 -0700 ++++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587 -0700 +@@ -31,6 +31,8 @@ + #include "config.h" + #endif + ++#include ++ + #include + #include + #include 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 @@ +require xorg-driver-input.inc + +#SRC_URI += "file://configurefix.patch" + +SUMMARY = "X.Org X server -- synaptics touchpad input driver" + +DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ +Synaptics Incorporated. Even though these touchpads (by default, \ +operating in a compatibility mode emulating a standard mouse) can be \ +handled by the normal evdev or mouse drivers, this driver allows more \ +advanced features of the touchpad to become available." + +LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" + +SRC_URI += "file://always_include_xorg_server.h.patch" + +SRC_URI[md5sum] = "27a3f2b31606a13dd6b58d419978d64f" +SRC_URI[sha256sum] = "9bf27632aaa6c5e62621ca9c2ca00f9b309c85b039ee33cd592b189fc872c37a" + +DEPENDS += "libxi mtdev libxtst libevdev" + +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 @@ +require xorg-driver-input.inc + +SUMMARY = "X.Org X server -- synaptics touchpad input driver" + +DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ +Synaptics Incorporated. Even though these touchpads (by default, \ +operating in a compatibility mode emulating a standard mouse) can be \ +handled by the normal evdev or mouse drivers, this driver allows more \ +advanced features of the touchpad to become available." + +SRCREV = "934bc0012f948c52aadc8eda912f7728fb7394a2" +PV = "0.15.2+git${SRCPV}" +PR = "${INC_PR}.1" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics" +S = "${WORKDIR}/git" + +DEPENDS += "libxi mtdev libxtst" diff --git a/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 @@ +From 336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia +Date: Thu, 28 Nov 2013 11:59:53 -0800 +Subject: Always include config.h first + +This fixes some build warnings about CSRG_BASED being redefined due to +incorrect header include ordering. + +Signed-off-by: Jeremy Huddleston Sequoia + +Upstream-Status: Backport + +Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c +=================================================================== +--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_client.c 2014-08-28 18:33:16.168070587 -0700 ++++ xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c 2014-08-28 18:33:16.152070587 -0700 +@@ -39,6 +39,10 @@ + #endif + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "vmmouse_client.h" + #include "vmmouse_proto.h" + +Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c +=================================================================== +--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.c 2014-08-28 18:33:16.168070587 -0700 ++++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c 2014-08-28 18:33:16.156070587 -0700 +@@ -33,6 +33,10 @@ + */ + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "vmmouse_proto.h" + + +Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h +=================================================================== +--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.h 2014-08-28 18:33:16.168070587 -0700 ++++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h 2014-08-28 18:33:16.156070587 -0700 +@@ -36,11 +36,6 @@ + #ifndef _VMMOUSE_PROTO_H_ + #define _VMMOUSE_PROTO_H_ + +- +-#ifdef HAVE_CONFIG_H +-#include "config.h" +-#endif +- + #include + + #ifdef HAVE_XORG_SERVER_1_1_0 +Index: xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c +=================================================================== +--- xf86-input-vmmouse-13.0.0.orig/tools/vmmouse_detect.c 2014-08-28 18:33:16.168070587 -0700 ++++ xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c 2014-08-28 18:33:16.160070587 -0700 +@@ -26,14 +26,14 @@ + */ + + +-#include +-#include +-#include "vmmouse_client.h" +- + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + ++#include ++#include ++#include "vmmouse_client.h" ++ + void + segvCB(int sig) + { 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 @@ +require xorg-driver-input.inc + +SUMMARY = "X.Org X server -- VMWare mouse input driver" +DESCRIPTION = "The vmmouse driver enables support for the special VMMouse \ +protocol that is provided by VMware virtual machines to give absolute \ +pointer positioning. The vmmouse driver is capable of falling back to the \ +standard 'mouse' driver if a VMware virtual machine is not detected." + +PR = "${INC_PR}.0" + +SRC_URI += "file://always_include_config.h.patch" + +SRC_URI[md5sum] = "34f9f64ee6a1a51fc8266a9af24e1e07" +SRC_URI[sha256sum] = "04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c" + +RDEPENDS_${PN} += "xf86-input-mouse" + +LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +do_install_append () { + # We don't care about hal + rm -rf ${D}${datadir}/hal/ + rm -rf ${D}${libdir}/hal/ +} + +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 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- cirrus display driver" +DESCRIPTION = "cirrus is an Xorg driver for Cirrus Logic VGA adapters. These \ +devices are not so common in the wild anymore, but QEMU can emulate one, so \ +the driver is still useful." + +LIC_FILES_CHKSUM = "file://COPYING;md5=6ddc7ca860dc5fd014e7f160ea699295" + +SRC_URI[md5sum] = "91fd6b677d62027cd3001debb587a6a6" +SRC_URI[sha256sum] = "3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7" + +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 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- fbdev display driver" +DESCRIPTION = "fbdev is an Xorg driver for framebuffer devices. This is a non-accelerated driver." + +LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" + +SRC_URI[md5sum] = "3931c0e19d441cc576dc088f9eb9fd73" +SRC_URI[sha256sum] = "9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b" diff --git a/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 @@ +Include xorg-server.h to fix build errors seen with glibc 2.20 + +In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-intel/2_2.99.912-r0/xf86-video-intel-2.99.912/src/backlight.c:39: +/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' + strndup(const char *str, size_t n); + ^ + +Signed-off-by: Khem Raj + +Upstream-Status: Pending + +Index: xf86-video-intel-2.99.912/src/backlight.c +=================================================================== +--- xf86-video-intel-2.99.912.orig/src/backlight.c 2014-04-09 10:41:18.000000000 -0700 ++++ xf86-video-intel-2.99.912/src/backlight.c 2014-08-28 18:52:25.524070587 -0700 +@@ -29,6 +29,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include 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 @@ +Upstream-Status: Backport + +From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Sat, 5 Oct 2013 18:42:24 +0100 +Subject: [PATCH] compat-api: Map changes of DamageUnregister API in 1.14.99.2 + +Reported-by: Emmanuel Benisty +Signed-off-by: Chris Wilson +--- + src/compat-api.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index 8eb46ef..244a486 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap) + if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) + #endif + ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) ++#define DamageUnregister(d, dd) DamageUnregister(dd) ++#endif ++ + #endif +-- +1.7.9.5 + 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 @@ +Add the ability to enable/disable specific versions of the DRI support. + +This is the following two commits from master squashed: + 7bc669dd4b7e3e5978e95e4131d1f9215afbc041 + 5a0cb1049c2fa0586708719210a2d2cffa7a4491 + +Upstream-Status: Backport +Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index b3b6e8e..bd654f3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -296,6 +296,21 @@ AC_ARG_ENABLE(dri, + [Disable DRI support [[default=auto]]]), + [DRI=$enableval], + [DRI=auto]) ++AC_ARG_ENABLE(dri1, ++ AS_HELP_STRING([--disable-dri1], ++ [Disable DRI1 support [[default=yes]]]), ++ [DRI1=$enableval], ++ [DRI1=yes]) ++AC_ARG_ENABLE(dri2, ++ AS_HELP_STRING([--disable-dri2], ++ [Disable DRI2 support [[default=yes]]]), ++ [DRI2=$enableval], ++ [DRI2=yes]) ++AC_ARG_ENABLE(dri3, ++ AS_HELP_STRING([--disable-dri3], ++ [Disable DRI3 support [[default=yes]]]), ++ [DRI3=$enableval], ++ [DRI3=yes]) + + AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc], + [Disable XvMC support [[default=yes]]]), +@@ -461,15 +476,15 @@ if test "x$UMS" = "xyes"; then + AC_DEFINE(UMS,1,[Assume UMS support]) + fi + +-DRI1=no ++have_dri1=no + XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto) +-if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then +- PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1=$DRI], [DRI1=no]) ++if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$DRI1" != "xno" -a "x$UMS" = "xyes"; then ++ PKG_CHECK_MODULES(DRI1, [xf86driproto], [have_dri1=$DRI], [have_dri1=no]) + save_CFLAGS="$CFLAGS" + save_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" + CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" +- AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [DRI1=no], ++ AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [have_dri1=no], + [/* for dri.h */ + #include + /* for dristruct.h */ +@@ -486,49 +501,55 @@ if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then + fi + + AC_MSG_CHECKING([whether to include DRI1 support]) +-AC_MSG_RESULT([$DRI1]) ++AC_MSG_RESULT([$have_dri1]) + +-AM_CONDITIONAL(DRI1, test "x$DRI1" != "xno") +-if test "x$DRI1" != "xno"; then ++AM_CONDITIONAL(DRI1, test "x$have_dri1" != "xno") ++if test "x$have_dri1" != "xno"; then + AC_DEFINE(HAVE_DRI1,1,[Enable DRI1 driver support]) + dri_msg="$dri_msg DRI1" + else + DRI1_CFLAGS="" + DRI1_LIBS="" + +- if test "x$DRI" = "xyes" -a "x$UMS" = "xyes"; then ++ if test "x$DRI" = "xyes" -a "x$UMS" = "xyes" -a "x$DRI1" != "xno"; then + AC_MSG_ERROR([DRI1 requested but prerequisites not found]) + fi + fi + +-DRI2=no +-DRI3=no ++have_dri2=no ++have_dri3=no + if test "x$DRI" != "xno"; then +- PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [DRI2=$DRI], [DRI2=no]) +- dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` +- if test "x$dridriverdir" = "x"; then +- dridriverdir="$libdir/dri" +- fi +- AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI2 driver path]) + if test "x$DRI2" != "xno"; then ++ PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [have_dri2=$DRI], [have_dri2=no]) ++ fi ++ if test "x$have_dri2" != "xno"; then + save_CFLAGS=$CFLAGS + CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI1_CFLAGS $DRI2_CFLAGS" +- AC_CHECK_HEADERS([dri2.h], [], [DRI2=no], [ ++ AC_CHECK_HEADERS([dri2.h], [], [have_dri2=no], [ + #include + #include + ]) + CFLAGS=$save_CFLAGS + fi +- +- XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) +- if test "x$_EXT_CHECK" != "xno"; then +- PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], []) ++ if test "x$have_dri2" != "xno"; then ++ dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` ++ if test "x$dridriverdir" = "x"; then ++ dridriverdir="$libdir/dri" ++ fi ++ AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default have_dri2 driver path]) + fi ++ + if test "x$DRI3" != "xno"; then ++ XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) ++ if test "x$_EXT_CHECK" != "xno"; then ++ PKG_CHECK_MODULES(DRI3, [dri3proto], [have_dri3=$DRI], []) ++ fi ++ fi ++ if test "x$have_dri3" != "xno"; then + save_CFLAGS=$CFLAGS + CFLAGS="$XORG_CFLAGS $DRI3_CFLAGS" +- AC_CHECK_DECL(DRI3, [], [DRI3=no], [#include ]) +- AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [DRI3=no], [ ++ AC_CHECK_DECL(DRI3, [], [have_dri3=no], [#include ]) ++ AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [have_dri3=no], [ + #include + #include + #include +@@ -538,13 +559,13 @@ if test "x$DRI" != "xno"; then + fi + + AC_MSG_CHECKING([whether to include DRI2 support]) +-AM_CONDITIONAL(DRI2, test "x$DRI2" != "xno") +-AC_MSG_RESULT([$DRI2]) +-if test "x$DRI2" != "xno"; then ++AM_CONDITIONAL(DRI2, test "x$have_dri2" != "xno") ++AC_MSG_RESULT([$have_dri2]) ++if test "x$have_dri2" != "xno"; then + AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support]) + dri_msg="$dri_msg DRI2" + else +- if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then ++ if test "x$DRI" = "xyes" -a "x$DRI2" != "xno" -a "x$KMS" = "xyes"; then + AC_MSG_ERROR([DRI2 requested but prerequisites not found]) + fi + +@@ -553,13 +574,13 @@ else + fi + + AC_MSG_CHECKING([whether to include DRI3 support]) +-AM_CONDITIONAL(DRI3, test "x$DRI3" != "xno") +-AC_MSG_RESULT([$DRI3]) +-if test "x$DRI3" != "xno"; then ++AM_CONDITIONAL(DRI3, test "x$have_dri3" != "xno") ++AC_MSG_RESULT([$have_dri3]) ++if test "x$have_dri3" != "xno"; then + AC_DEFINE(HAVE_DRI3,1,[Enable DRI3 driver support]) + dri_msg="$dri_msg DRI3" + else +- if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then ++ if test "x$DRI" = "xyes" -a "x$DRI3" != "xno" -a "x$KMS" = "xyes"; then + AC_MSG_ERROR([DRI3 requested but prerequisites not found]) + fi + 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 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From ec91cfe7e5efdd5e1b1fbb85eea8f07b50e24c4b Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Wed, 11 Sep 2013 21:12:37 +0100 +Subject: [PATCH] test: only build DRI2 tests if DRI2 is enabled + +Signed-off-by: Ross Burton +--- + test/Makefile.am | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/test/Makefile.am b/test/Makefile.am +index f51967b..18528a9 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -16,9 +16,14 @@ stress_TESTS = \ + render-copyarea-size \ + render-copy-alphaless \ + mixed-stress \ ++ $(NULL) ++ ++if DRI2 ++stress_TESTS += \ + dri2-swap \ + dri2-race \ + $(NULL) ++endif + + check_PROGRAMS = $(stress_TESTS) + +@@ -34,9 +39,14 @@ libtest_la_SOURCES = \ + test_image.c \ + test_log.c \ + test_render.c \ ++ $(NULL) ++ ++if DRI2 ++libtest_la_SOURCES += \ + dri2.c \ + dri2.h \ + $(NULL) ++endif + + vsync.avi: mkvsync.sh + ./mkvsync.sh $@ +-- +1.7.10.4 + 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 @@ +These modules are only used for tests that don't get installed, and the +automatic detection without explicit dependencies means that a build can find +e.g. xshmfence at configure time but then it's been removed from the sysroot by +the time compile happens. + +As the tests don't get installed, just disable the checks. + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index bd654f3..78a0e0d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -251 +251 @@ fi +-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) ++#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) diff --git a/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 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver" + +DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \ +chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \ +the driver supports hardware accelerated 3D via the Direct Rendering \ +Infrastructure (DRI)." + +LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" + +DEPENDS += "virtual/libx11 drm libpciaccess pixman" + +SRC_URI += "file://disable-dri2-tests.patch \ + file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ + " + +PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" + +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" +PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" +PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" +PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" + +# --enable-kms-only option is required by ROOTLESS_X +EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +SRC_URI[md5sum] = "8b646d257ace8197d6ab4e5ddeb8efb2" +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 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver" + +DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \ +chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \ +the driver supports hardware accelerated 3D via the Direct Rendering \ +Infrastructure (DRI)." + +LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" + +SRC_URI += "file://configure-dri.patch \ + file://disable-x11-dri3.patch \ + file://always_include_xorg_server.h.patch \ + " + +SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4" +SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501" + +DEPENDS += "virtual/libx11 drm libpciaccess pixman" + +PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}" + +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri" +PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1,xf86driproto" +PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" +PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" +PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" +PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" +PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" +PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxrandr libxdamage libxfixes libxcursor libxtst libxext libxrender" + +# --enable-kms-only option is required by ROOTLESS_X +EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +FILES_${PN} += "${datadir}/polkit-1" diff --git a/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 @@ +require xorg-driver-video.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5e53d3fcadb1c23d122ad63cb099a918" + +SUMMARY = "X.Org X server -- modesetting display driver" +DESCRIPTION = "Provides a generic kernel modesetting display driver for the X.Org X server." + +SRC_URI[md5sum] = "eb275e1ff0031897bcf23e2e5cb8655a" +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 @@ +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57386] +Signed-off-by: Ross Burton + +From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Wed, 21 Nov 2012 23:39:18 +0000 +Subject: [PATCH] build: rationalise DRI checks + +The existing logic around DRI was complicated and defined a number of variables +that were not used, when in reality DRI is required. + +Move the glproto check to the main pkg-config check, and remove everything else. + +Signed-off-by: Ross Burton +--- + configure.ac | 33 +-------------------------------- + 1 file changed, 1 insertion(+), 32 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 11238b1..c321b98 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) + XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + + # Checks for pkg-config packages +-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES) +-sdkdir=$(pkg-config --variable=sdkdir xorg-server) ++PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES) + + # Checks for header files. + AC_HEADER_STDC + +-save_CFLAGS="$CFLAGS" +-CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" +-CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" +-AC_MSG_CHECKING([whether to include DRI support]) +-if test x$DRI != xno; then +- AC_CHECK_FILE([${sdkdir}/dri.h], +- [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) +-fi +-AC_MSG_CHECKING([whether to include DRI support]) +-if test x$DRI = xauto; then +- if test "$have_dri_h" = yes -a \ +- "$have_dristruct_h" = yes; then +- DRI="yes" +- else +- DRI="no" +- fi +-fi +-AC_MSG_RESULT([$DRI]) +-CFLAGS="$save_CFLAGS $DEBUGFLAGS" +- +-AM_CONDITIONAL(DRI, test x$DRI = xyes) +-if test "$DRI" = yes; then +- PKG_CHECK_MODULES(DRI, [xf86driproto glproto]) +- AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) +- AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) +-fi +- + AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes) + if test "$VIDEO_DEBUG" = yes; then + AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support]) + fi + +-AC_SUBST([DRI_CFLAGS]) + + DRIVER_NAME=omap + AC_SUBST([DRIVER_NAME]) +-- +1.7.10.4 + 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 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver" + +SUMMARY = "X.Org X server -- TI OMAP integrated graphics chipsets driver" + +DESCRIPTION = "Open-source X.org graphics driver for TI OMAP graphics \ +Currently relies on a closed-source submodule for EXA acceleration on \ +the following chipsets: \ + + OMAP3430 \ + + OMAP3630 \ + + OMAP4430 \ + + OMAP4460 \ + + OMAP5430 \ + + OMAP5432 \ +\ +NOTE: this driver is work in progress.. you probably don't want to try \ +and use it yet. The API/ABI between driver and kernel, and driver and \ +acceleration submodules is not stable yet. This driver requires the \ +omapdrm kernel driver w/ GEM support. \ +" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" +DEPENDS += "virtual/libx11 libdrm xf86driproto" + +SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" +PR = "${INC_PR}.3" +PV = "0.4.2+gitr${SRCPV}" + +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \ + file://configure.patch \ +" + +S = "${WORKDIR}/git" + +CFLAGS += " -I${STAGING_INCDIR}/xorg " + +# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) +do_compile_prepend_armv7a () { + sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c +} + +python () { + if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d): + raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES") +} + diff --git a/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 @@ +From 8fb7d0f99d4afbb574b30cb4f1e66a8f89d94ad5 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 26 Jan 2011 12:04:36 +0100 +Subject: [PATCH 1/6] Revert "Set a large CRTC upper limit to not prune larger + resolutions" + +Picture is garbled after switching resolutions, so revert it. +Virtual size too big, revert the commit 9c4d7592dcb7dc20a48a6f941d9d94bd73d34153. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + src/omapfb-crtc.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c +index 9aaa52f..cbeff35 100644 +--- a/src/omapfb-crtc.c ++++ b/src/omapfb-crtc.c +@@ -190,13 +190,13 @@ OMAPFBCRTCInit(ScrnInfoPtr pScrn) + * In practise, this doesn't seem to be supported. + * (no way to setup the overlay offset/base address) + */ +- /* FIXME: figure out what makes sense here. A known max resolution? +- * framebuffer size? +- */ + xf86CrtcSetSizeRange(pScrn, +- 8, 8, 2048, 2048); ++ 8, 8, ++ ofb->state_info.xres_virtual, ++ ofb->state_info.yres_virtual); + + ofb->crtc = xf86CrtcCreate(pScrn, &OMAPFBCrtcFuncs); ++ + } + + +-- +1.8.0 + diff --git a/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 @@ +From 855c333ac0d16350f895f1d1b9391e9cbb0b6db4 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 26 Jan 2011 13:27:20 +0100 +Subject: [PATCH 2/6] Revert "Set virtual size when configuring framebuffer" + +Virtual size too big, so revert it. + +This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + src/omapfb-crtc.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c +index cbeff35..9655db2 100644 +--- a/src/omapfb-crtc.c ++++ b/src/omapfb-crtc.c +@@ -98,8 +98,6 @@ OMAPFBCrtcCommitChangeMode (xf86CrtcPtr crtc) + v = ofb->state_info; + v.xres = mode->HDisplay; + v.yres = mode->VDisplay; +- v.xres_virtual = crtc->scrn->virtualX; +- v.yres_virtual = crtc->scrn->virtualY; + v.activate = FB_ACTIVATE_NOW; + v.pixclock = KHZ2PICOS(mode->Clock ? mode->Clock : 56000); + v.left_margin = mode->HTotal - mode->HSyncEnd; +-- +1.8.0 + diff --git a/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 @@ +From 252f44c072d3447a32127fc9afe5d0d40f3c510e Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 26 Jan 2011 13:20:20 +0100 +Subject: [PATCH 3/6] force 'plain' mode + +The new DSS mode breaks XV, so force plain mode + +Upstream-Status: Pending + +Signed-off-by: Koen Kooi +Signed-off-by: Martin Jansa +--- + src/omapfb-driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c +index 018e040..48aa09c 100644 +--- a/src/omapfb-driver.c ++++ b/src/omapfb-driver.c +@@ -326,7 +326,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) + OMAPFBProbeController(ofb->ctrl_name); + + /* Do we have the DSS kernel API? */ +- if (stat(SYSFS_DSS_DIR, &st) == 0) { ++ if (0) { //stat(SYSFS_DSS_DIR, &st) == 0) { + ofb->dss = TRUE; + } else { + ofb->dss = FALSE; +-- +1.8.0 + diff --git a/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 @@ +From cfa46b67f59115f6d8ef9414af60380749ff3eb3 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 26 Jan 2011 13:21:12 +0100 +Subject: [PATCH 4/6] blacklist tv out + +The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails. so blacklist it + +Upstream-Status: Pending + +Signed-off-by: Koen Kooi +Signed-off-by: Martin Jansa +--- + src/omapfb-output-dss.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c +index 6cc52de..83cb711 100644 +--- a/src/omapfb-output-dss.c ++++ b/src/omapfb-output-dss.c +@@ -205,6 +205,10 @@ OMAPFBDSSOutputDetect (xf86OutputPtr output) + if(ofb->timings[idx][0] == '\0') + return XF86OutputStatusDisconnected; + ++ // Hack to disable the tv out ++ if (strncmp(output->name, "tv", 2) == 0) ++ return XF86OutputStatusDisconnected; ++ + return XF86OutputStatusConnected; + } + +-- +1.8.0 + diff --git a/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 @@ +From 8b1f697a60e35ab82fffdabfaefdb45e9a9df379 Mon Sep 17 00:00:00 2001 +From: Eino-Ville Talvala +Date: Tue, 23 Aug 2011 18:37:01 +0200 +Subject: [PATCH 5/6] Attempt to fix VRFB + +Upstream-Status: Pending + +http://dominion.thruhere.net/git/cgit.cgi/xf86-video-omapfb/commit/?h=koen/fixups&id=6833fc9f795265e4943d248103fbaf3463b515d6 + +Signed-off-by: Sebastian Krzyszkowiak +Signed-off-by: Martin Jansa +--- + src/image-format-conversions.c | 4 +-- + src/image-format-conversions.h | 2 +- + src/omapfb-driver.c | 28 +++++++++++++--- + src/omapfb-xv-blizzard.c | 1 + + src/omapfb-xv-generic.c | 72 +++++++++++++++++++++++++++++++++--------- + src/omapfb-xv.c | 3 ++ + 6 files changed, 88 insertions(+), 22 deletions(-) + +diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c +index dcefa9b..d43427d 100644 +--- a/src/image-format-conversions.c ++++ b/src/image-format-conversions.c +@@ -38,13 +38,13 @@ + #include "image-format-conversions.h" + + /* Basic line-based copy for packed formats */ +-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest) ++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest) + { + int i; + int len = w * 2; + for (i = 0; i < h; i++) + { +- memcpy(dest + i * len, src + i * stride, len); ++ memcpy(dest + i * dst_stride, src + i * src_stride, len); + } + } + +diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h +index 584896a..ba7caf2 100644 +--- a/src/image-format-conversions.h ++++ b/src/image-format-conversions.h +@@ -27,7 +27,7 @@ + #include + + /* Basic line-based copy for packed formats */ +-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest); ++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest); + + /* Basic C implementation of YV12/I420 to UYVY conversion */ + void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest); +diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c +index 48aa09c..07989f5 100644 +--- a/src/omapfb-driver.c ++++ b/src/omapfb-driver.c +@@ -66,6 +66,7 @@ + #define OMAPFB_VERSION 1000 + #define OMAPFB_DRIVER_NAME "OMAPFB" + #define OMAPFB_NAME "omapfb" ++#define ENFORCE_MODES + + static Bool OMAPFBProbe(DriverPtr drv, int flags); + static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); +@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = { + typedef enum { + OPTION_ACCELMETHOD, + OPTION_FB, ++ OPTION_ROTATE, + } FBDevOpts; + + static const OptionInfoRec OMAPFBOptions[] = { + { OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE }, + { OPTION_FB, "fb", OPTV_STRING, {0}, FALSE }, ++ { OPTION_ROTATE, "rotation", OPTV_STRING, {0}, FALSE }, + { -1, NULL, OPTV_NONE, {0}, FALSE } + }; + +@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) + { + OMAPFBPtr ofb; + EntityInfoPtr pEnt; ++ char *rotate; + rgb zeros = { 0, 0, 0 }; + struct stat st; + +@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) + pScrn->progClock = TRUE; + pScrn->chipset = "omapfb"; + ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n"); ++ + /* Start with configured virtual size */ + pScrn->virtualX = pScrn->display->virtualX; + pScrn->virtualY = pScrn->display->virtualY; +@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + ofb->CloseScreen = pScreen->CloseScreen; + pScreen->CloseScreen = OMAPFBCloseScreen; + ++ /* Enforce the default mode (this is silly I guess) */ ++#ifdef ENFORCE_MODES ++ //xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n"); ++ //set_mode(ofb, &ofb->default_mode); ++ //pScrn->displayWidth = ofb->fixed_info.line_length / ++ // (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres; ++#endif ++ + /* Map our framebuffer memory */ ++ ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres; + ofb->fb = mmap (NULL, ofb->mem_info.size, + PROT_READ | PROT_WRITE, MAP_SHARED, + ofb->fd, 0); +- if (ofb->fb == NULL) { +- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n"); ++ if (ofb->fb == MAP_FAILED) { ++ xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); + return FALSE; + } + +@@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + } else if (!ofb->dss) { + + ofb->plane_info.enabled = 1; +- ofb->plane_info.out_width = ofb->state_info.xres; +- ofb->plane_info.out_height = ofb->state_info.yres; ++ if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) { ++ ofb->plane_info.out_width = ofb->state_info.xres; ++ ofb->plane_info.out_height = ofb->state_info.yres; ++ } else { ++ ofb->plane_info.out_width = ofb->state_info.yres; ++ ofb->plane_info.out_height = ofb->state_info.xres; ++ } + + if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) { + xf86DrvMsg(scrnIndex, X_ERROR, +diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c +index 406ffc6..b71d2aa 100644 +--- a/src/omapfb-xv-blizzard.c ++++ b/src/omapfb-xv-blizzard.c +@@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn, + packed_line_copy(src_w & ~3, + src_h & ~3, + ((src_w + 1) & ~1) * 2, ++ ofb->port->fixed_info.line_length, + (uint8_t*)buf, + (uint8_t*)ofb->port->fb); + break; +diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c +index e6f89fe..b33f344 100644 +--- a/src/omapfb-xv-generic.c ++++ b/src/omapfb-xv-generic.c +@@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) + { + OMAPFBPtr ofb = OMAPFB(pScrn); + +- /* The memory size is already set in OMAPFBXVQueryImageAttributes */ ++ /* The memory size is already set before we get here */ + if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to allocate video plane memory\n"); +@@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) + ofb->port->fb = mmap (NULL, ofb->port->mem_info.size, + PROT_READ | PROT_WRITE, MAP_SHARED, + ofb->port->fd, 0); +- if (ofb->port->fb == NULL) { ++ if (ofb->port->fb == MAP_FAILED) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Mapping video memory failed\n"); + return XvBadAlloc; + } + + /* Update the state info */ ++ /* Let's not - it's bad + if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info)) + { + xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); + return XvBadAlloc; + } +- ++ */ + return Success; + } + +@@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) + int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn) + { + OMAPFBPtr ofb = OMAPFB(pScrn); ++ int ret; + + if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info)) + { +@@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn) + xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); + return XvBadAlloc; + } ++ /* Changing rotation/nonstd flags can change the fixed info! */ ++ if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info)) ++ { ++ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); ++ return XvBadAlloc; ++ } ++ /* Correct fixed info requires recalculation of needed memory */ ++ ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres; ++ ++ /* Allocate buffer memory */ ++ ret = OMAPXVAllocPlane(pScrn); ++ if (ret != Success) ++ return ret; ++ ++ /* Workaround for reset of mode after memory allo */ ++ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info)) ++ { ++ xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__); ++ return XvBadAlloc; ++ } ++ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info)) ++ { ++ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); ++ return XvBadAlloc; ++ } + + if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE, + &ofb->port->plane_info) != 0) { +@@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, + DrawablePtr pDraw) + { + OMAPFBPtr ofb = OMAPFB(pScrn); ++ short drw_temp; ++ short rot_xres, rot_yres; + + if (!ofb->port->plane_info.enabled + || ofb->port->update_window.x != src_x +@@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, + return Success; + } + +- /* If we don't have the plane running, enable it */ +- if (!ofb->port->plane_info.enabled) { +- ret = OMAPXVAllocPlane(pScrn); +- if (ret != Success) +- return ret; +- } +- + /* Set up the state info, xres and yres will be used for + * scaling to the values in the plane info struct + */ +@@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, + ofb->port->state_info.yres_virtual = 0; + ofb->port->state_info.xoffset = 0; + ofb->port->state_info.yoffset = 0; +- ofb->port->state_info.rotate = 0; ++ //ofb->port->state_info.rotate = 0; + ofb->port->state_info.grayscale = 0; + ofb->port->state_info.activate = FB_ACTIVATE_NOW; + ofb->port->state_info.bits_per_pixel = 0; + ofb->port->state_info.nonstd = xv_to_omapfb_format(image); + ++ /* Plane info does not rotate with state_info */ ++ if (ofb->port->state_info.rotate == 1 || ++ ofb->port->state_info.rotate == 3) { ++ drw_temp = drw_x; ++ drw_x = drw_y; ++ drw_y = drw_temp; ++ ++ drw_temp = drw_w; ++ drw_w = drw_h; ++ drw_h = drw_temp; ++ ++ rot_xres = ofb->port->state_info.yres; ++ rot_yres = ofb->port->state_info.xres; ++ } else { ++ rot_xres = ofb->port->state_info.xres; ++ rot_yres = ofb->port->state_info.yres; ++ } ++ ++ + /* Set up the video plane info */ + ofb->port->plane_info.enabled = 1; + ofb->port->plane_info.pos_x = drw_x; +@@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, + ofb->port->plane_info.out_height = drw_h & ~15; + + /* Cap output to screen size */ +- if (ofb->port->plane_info.out_width > ofb->state_info.xres) { ++ if (ofb->port->plane_info.out_width > rot_xres) { + ofb->port->plane_info.pos_x = 0; +- ofb->port->plane_info.out_width = ofb->state_info.xres; ++ ofb->port->plane_info.out_width = rot_xres; + } +- if (ofb->port->plane_info.out_height > ofb->state_info.yres) { ++ if (ofb->port->plane_info.out_height > rot_yres) { + ofb->port->plane_info.pos_y = 0; +- ofb->port->plane_info.out_height = ofb->state_info.yres; ++ ofb->port->plane_info.out_height = rot_yres; + } + + ret = OMAPXVSetupVideoPlane(pScrn); +@@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, + packed_line_copy(src_w & ~15, + src_h & ~15, + ((src_w + 1) & ~1) * 2, ++ ofb->port->fixed_info.line_length, + (uint8_t*)buf, + (uint8_t*)ofb->port->fb); + break; +diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c +index 1df651e..0fee2c6 100644 +--- a/src/omapfb-xv.c ++++ b/src/omapfb-xv.c +@@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn, + h = *height; + + w = (w + 1) & ~1; ++ ++ /* Can't calculate these here - don't know line length + ofb->port->mem_info.size = w << 1; + ofb->port->mem_info.size *= h; ++ */ + + return size; + } +-- +1.8.0 + diff --git a/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 @@ +From 803ecf2909949e6152f4a81b6cbb92a4430679ac Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Fri, 23 Nov 2012 00:31:06 +0100 +Subject: [PATCH 6/6] omapfb: port to new xserver video API + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + src/compat-api.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/omapfb-driver.c | 41 ++++++++++++----------- + 2 files changed, 118 insertions(+), 19 deletions(-) + create mode 100644 src/compat-api.h + +diff --git a/src/compat-api.h b/src/compat-api.h +new file mode 100644 +index 0000000..b1591b1 +--- /dev/null ++++ b/src/compat-api.h +@@ -0,0 +1,96 @@ ++/* ++ * Copyright 2012 Red Hat, Inc. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Dave Airlie ++ */ ++ ++/* this file provides API compat between server post 1.13 and pre it, ++ it should be reused inside as many drivers as possible */ ++#ifndef COMPAT_API_H ++#define COMPAT_API_H ++ ++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR ++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] ++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p ++#endif ++ ++#ifndef XF86_HAS_SCRN_CONV ++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] ++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] ++#endif ++ ++#ifndef XF86_SCRN_INTERFACE ++ ++#define SCRN_ARG_TYPE int ++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] ++ ++#define SCREEN_ARG_TYPE int ++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] ++ ++#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv ++ ++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask ++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask ++ ++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen ++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen ++ ++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags ++ ++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags ++ ++#define FREE_SCREEN_ARGS_DECL int arg, int flags ++#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 ++ ++#define VT_FUNC_ARGS_DECL int arg, int flags ++#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) ++ ++#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) ++#else ++#define SCRN_ARG_TYPE ScrnInfoPtr ++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) ++ ++#define SCREEN_ARG_TYPE ScreenPtr ++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) ++ ++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv ++ ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask ++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++ ++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen ++#define CLOSE_SCREEN_ARGS pScreen ++ ++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y ++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode ++ ++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg ++#define FREE_SCREEN_ARGS(x) (x) ++ ++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg ++#define VT_FUNC_ARGS(flags) pScrn ++ ++#define XF86_ENABLEDISABLEFB_ARG(x) (x) ++ ++#endif ++ ++#endif +diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c +index 07989f5..486ffa4 100644 +--- a/src/omapfb-driver.c ++++ b/src/omapfb-driver.c +@@ -44,6 +44,8 @@ + + #include "exa.h" + ++#include "compat-api.h" ++ + #ifdef HAVE_XEXTPROTO_71 + #include + #else +@@ -70,10 +72,10 @@ + + static Bool OMAPFBProbe(DriverPtr drv, int flags); + static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); +-static Bool OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv); +-static Bool OMAPFBEnterVT(int scrnIndex, int flags); +-static void OMAPFBLeaveVT(int scrnIndex, int flags); +-static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); ++static Bool OMAPFBScreenInit(SCREEN_INIT_ARGS_DECL); ++static Bool OMAPFBEnterVT(VT_FUNC_ARGS_DECL); ++static void OMAPFBLeaveVT(VT_FUNC_ARGS_DECL); ++static Bool OMAPFBSwitchMode(SWITCH_MODE_ARGS_DECL); + + static Bool + OMAPFBEnsureRec(ScrnInfoPtr pScrn) +@@ -481,7 +483,7 @@ OMAPFBXvScreenInit(ScreenPtr pScreen) + } + + static Bool +-OMAPFBCloseScreen(int scrnIndex, ScreenPtr pScreen) ++OMAPFBCloseScreen(CLOSE_SCREEN_ARGS_DECL) + { + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + OMAPFBPtr ofb = OMAPFB(pScrn); +@@ -490,11 +492,11 @@ OMAPFBCloseScreen(int scrnIndex, ScreenPtr pScreen) + + pScreen->CloseScreen = ofb->CloseScreen; + +- return (*pScreen->CloseScreen)(scrnIndex, pScreen); ++ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); + } + + static Bool +-OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ++OMAPFBScreenInit(SCREEN_INIT_ARGS_DECL) + { + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + OMAPFBPtr ofb = OMAPFB(pScrn); +@@ -516,7 +518,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + PROT_READ | PROT_WRITE, MAP_SHARED, + ofb->fd, 0); + if (ofb->fb == MAP_FAILED) { +- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); + return FALSE; + } + +@@ -526,7 +528,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + /* Only support TrueColor for now */ + if (!miSetVisualTypes(pScrn->depth, TrueColorMask, + pScrn->rgbBits, pScrn->defaultVisual)) { +- xf86DrvMsg(scrnIndex, X_ERROR, "visual type setup failed" ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "visual type setup failed" + " for %d bits per pixel [1]\n", + pScrn->bitsPerPixel); + return FALSE; +@@ -534,7 +536,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + + /* Set up pixmap depth information */ + if (!miSetPixmapDepths()) { +- xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n"); ++ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n"); + return FALSE; + } + +@@ -546,7 +548,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + pScrn->virtualY, pScrn->xDpi, + pScrn->yDpi, pScrn->displayWidth, + pScrn->bitsPerPixel)) { +- xf86DrvMsg(scrnIndex, X_ERROR, "fbScreenInit failed\n"); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbScreenInit failed\n"); + return FALSE; + } + +@@ -567,7 +569,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + + /* Initialize XRender fallbacks */ + if (!fbPictureInit(pScreen, NULL, 0)) { +- xf86DrvMsg(scrnIndex, X_ERROR, "fbPictureInit failed\n"); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbPictureInit failed\n"); + return FALSE; + } + +@@ -579,7 +581,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + + /* Initialize default colormap */ + if (!miCreateDefColormap(pScreen)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "creating default colormap failed\n"); + return FALSE; + } +@@ -589,7 +591,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + /* This is non-fatal since we might be running against older + * kernel driver in which case we only do basic 2D stuff... + */ +- xf86DrvMsg(scrnIndex, X_ERROR, "Reading plane info failed\n"); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Reading plane info failed\n"); + } else if (!ofb->dss) { + + ofb->plane_info.enabled = 1; +@@ -602,7 +604,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + } + + if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "%s: Plane setup failed: %s\n", + __FUNCTION__, strerror(errno)); + return FALSE; +@@ -645,9 +647,10 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + return TRUE; + } + +-static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) ++static Bool OMAPFBSwitchMode(SWITCH_MODE_ARGS_DECL) + { +- return xf86SetSingleMode (xf86Screens[scrnIndex], mode, RR_Rotate_0); ++ SCRN_INFO_PTR(arg); ++ return xf86SetSingleMode (pScrn, mode, RR_Rotate_0); + } + + void +@@ -699,14 +702,14 @@ OMAPFBPrintCapabilities(ScrnInfoPtr pScrn, + /*** Unimplemented: */ + + static Bool +-OMAPFBEnterVT(int scrnIndex, int flags) ++OMAPFBEnterVT(VT_FUNC_ARGS_DECL) + { + xf86Msg(X_NOT_IMPLEMENTED, "%s\n", __FUNCTION__); + return TRUE; + } + + static void +-OMAPFBLeaveVT(int scrnIndex, int flags) ++OMAPFBLeaveVT(VT_FUNC_ARGS_DECL) + { + xf86Msg(X_NOT_IMPLEMENTED, "%s\n", __FUNCTION__); + } +-- +1.8.0 + diff --git a/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 @@ +Fix errors with glibc 2.20 + +In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-omapfb/2_0.1.1+gitrAUTOINC+28c006c94e-r21.7/git/src/omapfb-xv-blizzard.c:33: +/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' + strndup(const char *str, size_t n); + ^ +In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-omapfb/2_0.1.1+gitrAUTOINC+28c006c94e-r21.7/git/src/omapfb-xv-generic.c:28: +/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' + strndup(const char *str, size_t n); + ^ + +Singed-off-by: Khem Raj + +Upstream-Status: Pending +Index: git/src/omapfb-xv-blizzard.c +=================================================================== +--- git.orig/src/omapfb-xv-blizzard.c 2014-08-28 05:16:25.684070587 -0700 ++++ git/src/omapfb-xv-blizzard.c 2014-08-28 19:05:39.440070587 -0700 +@@ -30,6 +30,7 @@ + * - + */ + ++#include + #include "xf86.h" + #include "xf86_OSlib.h" + #include "xf86xv.h" +Index: git/src/omapfb-xv-generic.c +=================================================================== +--- git.orig/src/omapfb-xv-generic.c 2014-08-28 05:16:25.684070587 -0700 ++++ git/src/omapfb-xv-generic.c 2014-08-28 19:05:51.780070587 -0700 +@@ -25,6 +25,7 @@ + * Generic functions for the XV driver + */ + ++#include + #include "xf86.h" + #include "xf86_OSlib.h" + #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 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver" + +DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \ +framebuffer." + +LICENSE = "MIT-X & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" +DEPENDS += "virtual/libx11" + +SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" +PR = "${INC_PR}.7" +PV = "0.1.1+gitr${SRCPV}" + +SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ + file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ + file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ + file://0003-force-plain-mode.patch \ + file://0004-blacklist-tv-out.patch \ + file://0005-Attempt-to-fix-VRFB.patch \ + file://0006-omapfb-port-to-new-xserver-video-API.patch \ + file://0007-always_include_xorg_server.h.patch \ +" + +S = "${WORKDIR}/git" + +EXTRA_OECONF_armv7a = " --enable-neon " +CFLAGS += " -I${STAGING_INCDIR}/xorg " + +# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) +do_compile_prepend_armv7a () { + sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c +} diff --git a/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 @@ +require xorg-driver-video.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a1f0610ebdc6f314a9fa5102a8c5c1b0" + +SUMMARY = "X.Org X server -- Generic Vesa video driver" + +DESCRIPTION = "vesa is an Xorg driver for generic VESA video cards. It \ +can drive most VESA-compatible video cards, but only makes use of the \ +basic standard VESA core that is common to these cards. The driver \ +supports depths 8, 15 16 and 24." + +PR = "${INC_PR}.0" + +DEPENDS += "virtual/libx11 randrproto libpciaccess" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" + +SRC_URI[md5sum] = "3690a5356ed121b1a7dfb59a6dcf4bf9" +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 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From bdaa9de44a197ba1297b990422ed9e515289f141 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Tue, 1 Apr 2014 10:11:13 +0200 +Subject: [PATCH 1/2] configure: fix build without xatracker + +ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the +fifth. + +Debian bug#743239 + +Reviewed-by: Thomas Klausner +Reviewed-by: Jakob Bornecrantz +Signed-off-by: Julien Cristau +Signed-off-by: Jakob Bornecrantz +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index dd3ad4e..be40ed7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -126,7 +126,7 @@ if test x$BUILD_VMWGFX = xyes; then + [PKG_CHECK_EXISTS([xatracker = 2.0.0], + [AC_DEFINE([HAVE_XA_2], 1, + [Has version 2 of XA])])], +- [],[BUILD_VMWGFX=no]) ++ [BUILD_VMWGFX=no]) + # + # Check for prime. + # +-- +1.7.10.4 + 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 @@ +Upstream-Status:Submitted +Signed-off-by: Ross Burton + +From f103d6f570671c649ccd7b225e6d6c9f14371888 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Wed, 25 Jun 2014 16:16:44 +0100 +Subject: [PATCH 2/2] add option for vmwgfx + +--- + configure.ac | 49 ++++++++++++++++++++----------------------------- + 1 file changed, 20 insertions(+), 29 deletions(-) + +diff --git a/configure.ac b/configure.ac +index be40ed7..8e15307 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client, + [VMWARECTRL=$enableval], [VMWARECTRL=no]) + AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes]) + ++# Define a configure option to build the vmwgfx driver ++AC_ARG_ENABLE(vmwgfx, ++ AS_HELP_STRING([--disable-vmwgfx], ++ [Disable vmwgfx driver (KMS/3D) (default: enabled)]), ++ [VMWGFX="$enableval"], [VMWGFX="yes"]) ++AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes) ++ + # Store the list of server defined optional extensions in REQUIRED_MODULES + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + XORG_DRIVER_CHECK_EXT(RENDER, renderproto) +@@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99], + [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1, + [Has version 1.5.0 or greater of the Xserver])]) + +-PKG_CHECK_EXISTS([xorg-server >= 1.7.0], +- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1, +- [Has version 1.7.0 or greater of the Xserver]) +- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no]) +- + PKG_CHECK_EXISTS([xorg-server >= 1.12.0], + [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, + [Has version 1.12.0 or greater of the Xserver])]) +@@ -114,39 +116,28 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + + AC_SUBST([moduledir]) + +-if test x$BUILD_VMWGFX = xyes; then +- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) +-fi +-if test x$BUILD_VMWGFX = xyes; then +-# +-# Early versions of mesa 10 forgot to bump the XA major version number in +-# the xa_tracker.h header +-# +- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], +- [PKG_CHECK_EXISTS([xatracker = 2.0.0], +- [AC_DEFINE([HAVE_XA_2], 1, +- [Has version 2 of XA])])], +- [BUILD_VMWGFX=no]) +-# +-# Check for prime. +-# ++AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) ++if test x$VMWGFX = xyes; then ++ PKG_CHECK_MODULES([LIBDRM], [libdrm]) ++ # Check for prime. + PKG_CHECK_EXISTS([libdrm >= 2.4.38], + [AC_DEFINE([HAVE_LIBDRM_2_4_38], 1, + [Has version 2.4.38 or greater of libdrm])]) +-fi + +-DRIVER_NAME=vmware +-AC_SUBST([DRIVER_NAME]) +- +-AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) +-if test x$BUILD_VMWGFX = xyes; then +- AC_MSG_RESULT([yes]) ++ # Early versions of mesa 10 forgot to bump the XA major version number ++ # in the xa_tracker.h header ++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], ++ [PKG_CHECK_EXISTS([xatracker = 2.0.0], ++ [AC_DEFINE([HAVE_XA_2], 1, ++ [Has version 2 of XA])])]) + AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) ++ AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + +-AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes) ++DRIVER_NAME=vmware ++AC_SUBST([DRIVER_NAME]) + + AC_CONFIG_FILES([ + Makefile +-- +1.7.10.4 + diff --git a/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 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- VMware SVGA display driver" + +DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." + +LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" + +DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" + +SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \ + file://0002-add-option-for-vmwgfx.patch" + +SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244" +SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54" + +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' + +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 @@ +SUMMARY = "X driver" +HOMEPAGE = "http://www.x.org" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11/drivers" +LICENSE = "MIT-X" + +PE = "2" +INC_PR = "r21" + +DEPENDS = "virtual/xserver xproto randrproto util-macros" + +SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" + +S = "${WORKDIR}/${BPN}-${PV}" + +FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" +FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" + +inherit autotools pkgconfig + +# FIXME: We don't want to include the libtool archives (*.la) from modules +# directory, as they serve no useful purpose. Upstream should fix Makefile.am +do_install_append() { + find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- +} + +# Function to add the relevant ABI dependency to drivers, which should be called +# from a PACKAGEFUNC. +def _add_xorg_abi_depends(d, name): + # Map of ABI names exposed in the dependencies to pkg-config variables + abis = { + "video": "abi_videodrv", + "input": "abi_xinput" + } + + output = os.popen("pkg-config xorg-server --variable=%s" % abis[name]).read() + mlprefix = d.getVar('MLPREFIX', True) or '' + abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) + + pn = d.getVar("PN", True) + d.appendVar('RDEPENDS_' + pn, ' ' + abi) diff --git a/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 @@ +include xorg-driver-common.inc + +DEPENDS += "inputproto kbproto " + +python add_xorg_abi_depends() { + _add_xorg_abi_depends(d, "input") +} +PACKAGEFUNCS =+ "add_xorg_abi_depends" + +FILES_${PN} += " ${libdir}/xorg/modules/input/*.so" +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 @@ +include xorg-driver-common.inc + +DEPENDS =+ "renderproto videoproto xextproto fontsproto" + +python add_xorg_abi_depends() { + _add_xorg_abi_depends(d, "video") +} +PACKAGEFUNCS =+ "add_xorg_abi_depends" diff --git a/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 @@ +Upstream-Status: Inappropriate [configuration] + +XORG_DEFAULT_OPTIONS pulls in the following dependency chains: + +XORG_CWARNFLAGS -> AC_PROG_CC_C99 +XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS +XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host + +each of which triggers the use of the host compiler. As an "all" +architecture package, it shouldn't need a compiler (and doesn't). + +RP 17/5/2011 + +Index: encodings-1.0.4/configure.ac +=================================================================== +--- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100 ++++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100 +@@ -4,12 +4,12 @@ + AM_INIT_AUTOMAKE([foreign dist-bzip2]) + AM_MAINTAINER_MODE + +-# Require xorg-macros: XORG_DEFAULT_OPTIONS + m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) + XORG_MACROS_VERSION(1.3) +-XORG_DEFAULT_OPTIONS +- ++XORG_RELEASE_VERSION ++XORG_CHANGELOG ++XORG_INSTALL + AC_PROG_INSTALL + + # Require X.Org's font util macros 1.2 or later diff --git a/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 @@ +SUMMARY = "The Xorg font encoding files" + +DESCRIPTION = "The encodings that map to specific characters for a \ +number of Xorg and common fonts." + +require xorg-font-common.inc +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" +PE = "1" +PR = "${INC_PR}.1" + +DEPENDS = "mkfontscale-native font-util-native" +RDEPENDS_${PN} = "" + +SRC_URI += "file://nocompiler.patch" + +inherit allarch + +EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" + +SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" +SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" diff --git a/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 @@ +Upstream-Status: Inappropriate [configuration] + +XORG_DEFAULT_OPTIONS pulls in the following dependency chains: + +XORG_CWARNFLAGS -> AC_PROG_CC_C99 +XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS +XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host + +each of which triggers the use of the host compiler. As an "all" +architecture package, it shouldn't need a compiler (and doesn't). + +RP 17/5/2011 + +diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac +--- font-alias-1.0.3.orig//configure.ac 2011-05-18 21:29:18.378258643 +0200 ++++ font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200 +@@ -28,12 +28,12 @@ + AM_INIT_AUTOMAKE([foreign dist-bzip2]) + AM_MAINTAINER_MODE + +-# Require xorg-macros: XORG_DEFAULT_OPTIONS + m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) + XORG_MACROS_VERSION(1.3) +-XORG_DEFAULT_OPTIONS +- ++XORG_RELEASE_VERSION ++XORG_CHANGELOG ++XORG_INSTALL + AC_PROG_INSTALL + + XORG_FONTROOTDIR diff --git a/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 @@ +SUMMARY = "X font aliases" + +require xorg-font-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ + file://cyrillic/fonts.alias;md5=f40795b0640d6785826aecd3b16f6124 \ + file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ + file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \ + file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" + +SRC_URI += "file://nocompiler.patch" + +DEPENDS = "util-macros-native font-util-native" +RDEPENDS_${PN} = "encodings font-util" +RDEPENDS_${PN}_class-native = "font-util-native" + +inherit allarch + +PE = "1" +PR = "${INC_PR}.3" + +SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" +SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" diff --git a/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 @@ +SUMMARY = "X.Org font package creation/installation utilities" + +require xorg-font-common.inc + +#Unicode is MIT +LICENSE = "BSD & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c0067273d90f6336008cb2504e14bd32 \ + file://ucs2any.c;endline=28;md5=8357dc567fc628bd12696f15b2a33bcb \ + file://bdftruncate.c;endline=26;md5=4f82ffc101a1b165eae9c6998abff937 \ + file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34" + +DEPENDS = "encodings util-macros" +DEPENDS_class-native = "util-macros-native" +RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" +RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" + +PR = "${INC_PR}.0" + +do_configure_prepend() { + sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkgconfig\" pkg-config#g" ${S}/fontutil.m4.in +} + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b" +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 @@ +HOMEPAGE = "http://www.x.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" + +SECTION = "x11/fonts" +LICENSE = "MIT-X" + +DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native" +RDEPENDS_${PN} = "encodings font-util font-alias" + +XORG_PN = "${BPN}" +INC_PR = "r2" + +SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig + +EXTRA_OEMAKE += "FCCACHE=/bin/true" + +do_configure_prepend() { + if [ -f "${S}"/configure.ac ] ; then + sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac + fi +} + +do_install_append() { + find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f + find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f + find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f + find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f +} + +FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" + +pkg_postinst_${PN} () { + for fontdir in `find $D/usr/lib/X11/fonts -type d`; do + mkfontdir $fontdir + mkfontscale $fontdir + done + for fontdir in `find $D/usr/share/fonts/X11 -type d`; do + mkfontdir $fontdir + mkfontscale $fontdir + done +} diff --git a/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 @@ +SUMMARY = "Xorg minimal fonts data" +DESCRIPTION = "Minimal fonts required by X.org." +HOMEPAGE = "http://www.x.org" + +SECTION = "x11/fonts" + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519ab \ + file://../misc/cursor.pcf.gz;md5=40bc81001fef4c21ca08df4305014a2a" + +SRC_URI = "file://misc" + +PE = "1" +PR = "r2" + +inherit allarch + +PACKAGES = "${PN}" +FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" +RDEPENDS_${PN} += "font-alias" + +do_install() { + install -d ${D}/${datadir}/fonts/X11/misc + install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/ + install -d ${D}/${libdir}/X11 + ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s +} 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz 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 Binary files /dev/null and b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz 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 @@ +409 +10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1 +10x20-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-10 +10x20-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-11 +10x20-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-13 +10x20-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-14 +10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15 +10x20-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-16 +10x20-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2 +10x20-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-3 +10x20-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-4 +10x20-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-5 +10x20-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-7 +10x20-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-8 +10x20-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-9 +10x20-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r +10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 +12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1 +12x24.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1 +12x24rk.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0 +18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1 +18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1 +4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1 +4x6-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-10 +4x6-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-13 +4x6-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-14 +4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15 +4x6-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-16 +4x6-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-2 +4x6-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-3 +4x6-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-4 +4x6-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-5 +4x6-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-7 +4x6-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-8 +4x6-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-9 +4x6-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-koi8-r +4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1 +5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 +5x7-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-10 +5x7-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-13 +5x7-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-14 +5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15 +5x7-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-16 +5x7-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2 +5x7-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-3 +5x7-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-4 +5x7-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-5 +5x7-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-7 +5x7-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-8 +5x7-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-9 +5x7-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-koi8-r +5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1 +5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 +5x8-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-10 +5x8-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-13 +5x8-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-14 +5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15 +5x8-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-16 +5x8-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2 +5x8-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-3 +5x8-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-4 +5x8-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-5 +5x8-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-7 +5x8-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-8 +5x8-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-9 +5x8-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r +5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 +6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1 +6x10-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-10 +6x10-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-13 +6x10-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-14 +6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15 +6x10-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-16 +6x10-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2 +6x10-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-3 +6x10-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-4 +6x10-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-5 +6x10-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-7 +6x10-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-8 +6x10-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-9 +6x10-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r +6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1 +6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1 +6x12-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-10 +6x12-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-13 +6x12-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-14 +6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15 +6x12-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-16 +6x12-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2 +6x12-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-3 +6x12-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-4 +6x12-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-5 +6x12-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-7 +6x12-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-8 +6x12-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-9 +6x12-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-koi8-r +6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1 +6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-10 +6x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-11 +6x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-13 +6x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-14 +6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-16 +6x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2 +6x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-3 +6x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-4 +6x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-5 +6x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-7 +6x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8 +6x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-9 +6x13-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 +6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-10 +6x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-13 +6x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-14 +6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-16 +6x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2 +6x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-3 +6x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-4 +6x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-5 +6x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-7 +6x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-8 +6x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-9 +6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1 +6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-10 +6x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-13 +6x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-14 +6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-16 +6x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-2 +6x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-3 +6x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-4 +6x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-5 +6x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-7 +6x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-9 +6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1 +6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 +6x9-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-10 +6x9-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-13 +6x9-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-14 +6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15 +6x9-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-16 +6x9-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2 +6x9-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-3 +6x9-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-4 +6x9-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-5 +6x9-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-7 +6x9-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-8 +6x9-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-9 +6x9-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r +6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1 +7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 +7x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-10 +7x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-11 +7x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-13 +7x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-14 +7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15 +7x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-16 +7x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2 +7x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-3 +7x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-4 +7x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-5 +7x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-7 +7x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-8 +7x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-9 +7x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-koi8-r +7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1 +7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 +7x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-10 +7x13B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-11 +7x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-13 +7x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-14 +7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15 +7x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-16 +7x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-2 +7x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-3 +7x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-4 +7x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-5 +7x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-7 +7x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-8 +7x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-9 +7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1 +7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1 +7x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-10 +7x13O-ISO8859-11.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-11 +7x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-13 +7x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-14 +7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15 +7x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-16 +7x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-2 +7x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-3 +7x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-4 +7x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-5 +7x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-7 +7x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-9 +7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1 +7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 +7x14-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-10 +7x14-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-11 +7x14-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-13 +7x14-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-14 +7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15 +7x14-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-16 +7x14-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-2 +7x14-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-3 +7x14-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-4 +7x14-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-5 +7x14-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-7 +7x14-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-8 +7x14-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-9 +7x14-JISX0201.1976-0.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 +7x14-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r +7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 +7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 +7x14B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-10 +7x14B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-11 +7x14B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-13 +7x14B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-14 +7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15 +7x14B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-16 +7x14B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-2 +7x14B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-3 +7x14B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-4 +7x14B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-5 +7x14B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-7 +7x14B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-8 +7x14B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-9 +7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1 +8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 +8x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-10 +8x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-13 +8x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-14 +8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15 +8x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-16 +8x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-2 +8x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-3 +8x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-4 +8x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-5 +8x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-7 +8x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8 +8x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-9 +8x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r +8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 +8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1 +8x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-10 +8x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-13 +8x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-14 +8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15 +8x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-16 +8x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-2 +8x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-3 +8x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-4 +8x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-5 +8x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-7 +8x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-8 +8x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-9 +8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1 +8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1 +8x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-10 +8x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-13 +8x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-14 +8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15 +8x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-16 +8x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-2 +8x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-3 +8x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-4 +8x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-5 +8x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-7 +8x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-9 +8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1 +8x16.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1 +8x16rk.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 +9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 +9x15-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-10 +9x15-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-11 +9x15-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-13 +9x15-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-14 +9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15 +9x15-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-16 +9x15-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2 +9x15-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-3 +9x15-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-4 +9x15-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-5 +9x15-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-7 +9x15-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-8 +9x15-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-9 +9x15-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r +9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 +9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1 +9x15B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-10 +9x15B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-11 +9x15B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-13 +9x15B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-14 +9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15 +9x15B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-16 +9x15B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2 +9x15B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-3 +9x15B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-4 +9x15B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-5 +9x15B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-7 +9x15B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-8 +9x15B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-9 +9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1 +9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 +9x18-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-10 +9x18-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-11 +9x18-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-13 +9x18-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-14 +9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15 +9x18-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-16 +9x18-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-2 +9x18-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-3 +9x18-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-4 +9x18-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-5 +9x18-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-7 +9x18-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-8 +9x18-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-9 +9x18-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r +9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1 +9x18B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-10 +9x18B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-13 +9x18B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-14 +9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15 +9x18B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-16 +9x18B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-2 +9x18B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-3 +9x18B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-4 +9x18B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-5 +9x18B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-7 +9x18B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-8 +9x18B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-9 +9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1 +arabic24.pcf.gz -arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1 +clB6x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-60-iso646.1991-irv +clB6x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-60-iso646.1991-irv +clB8x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-80-iso646.1991-irv +clB8x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-80-iso646.1991-irv +clB8x13.pcf.gz -schumacher-clean-bold-r-normal--13-130-75-75-c-80-iso646.1991-irv +clB8x14.pcf.gz -schumacher-clean-bold-r-normal--14-140-75-75-c-80-iso646.1991-irv +clB8x16.pcf.gz -schumacher-clean-bold-r-normal--16-160-75-75-c-80-iso646.1991-irv +clB8x8.pcf.gz -schumacher-clean-bold-r-normal--8-80-75-75-c-80-iso646.1991-irv +clB9x15.pcf.gz -schumacher-clean-bold-r-normal--15-150-75-75-c-90-iso646.1991-irv +clI6x12.pcf.gz -schumacher-clean-medium-i-normal--12-120-75-75-c-60-iso646.1991-irv +clI8x8.pcf.gz -schumacher-clean-medium-i-normal--8-80-75-75-c-80-iso646.1991-irv +clR4x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-40-iso646.1991-irv +clR5x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-50-iso646.1991-irv +clR5x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-50-iso646.1991-irv +clR5x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv +clR6x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-60-iso646.1991-irv +clR6x12-ISO8859-1.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-1 +clR6x12-ISO8859-10.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-10 +clR6x12-ISO8859-13.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-13 +clR6x12-ISO8859-14.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-14 +clR6x12-ISO8859-15.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-15 +clR6x12-ISO8859-16.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-16 +clR6x12-ISO8859-2.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-2 +clR6x12-ISO8859-3.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-3 +clR6x12-ISO8859-4.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-4 +clR6x12-ISO8859-5.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-5 +clR6x12-ISO8859-7.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-7 +clR6x12-ISO8859-8.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-8 +clR6x12-ISO8859-9.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-9 +clR6x12-KOI8-R.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-koi8-r +clR6x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso10646-1 +clR6x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-60-iso646.1991-irv +clR6x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-60-iso646.1991-irv +clR6x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-60-iso646.1991-irv +clR7x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-70-iso646.1991-irv +clR7x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-70-iso646.1991-irv +clR7x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-70-iso646.1991-irv +clR7x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-70-iso646.1991-irv +clR8x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-80-iso646.1991-irv +clR8x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-80-iso646.1991-irv +clR8x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-80-iso646.1991-irv +clR8x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-80-iso646.1991-irv +clR8x16.pcf.gz -schumacher-clean-medium-r-normal--16-160-75-75-c-80-iso646.1991-irv +clR8x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-80-iso646.1991-irv +clR9x15.pcf.gz -schumacher-clean-medium-r-normal--15-150-75-75-c-90-iso646.1991-irv +cu-alt12.pcf.gz -mutt-clearlyu alternate glyphs-medium-r-normal--17-120-100-100-p-122-iso10646-1 +cu-arabic12.pcf.gz -mutt-clearlyu arabic extra-medium-r-normal--17-120-100-100-p-101-fontspecific-0 +cu-devnag12.pcf.gz -mutt-clearlyu devangari extra-medium-r-normal--17-120-100-100-p-105-fontspecific-0 +cu-lig12.pcf.gz -mutt-clearlyu ligature-medium-r-normal--17-120-100-100-p-141-fontspecific-0 +cu-pua12.pcf.gz -mutt-clearlyu pua-medium-r-normal--17-120-100-100-p-110-iso10646-1 +cu12.pcf.gz -mutt-clearlyu-medium-r-normal--17-120-100-100-p-123-iso10646-1 +cuarabic12.pcf.gz -mutt-clearlyu arabic-medium-r-normal--17-120-100-100-p-93-iso10646-1 +cudevnag12.pcf.gz -mutt-clearlyu devanagari-medium-r-normal--15-120-90-90-p-104-fontspecific-0 +cursor.pcf.gz cursor +deccurs.pcf.gz decw$cursor +decsess.pcf.gz decw$session +gb16fs.pcf.gz -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0 +gb16st.pcf.gz -isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0 +gb24st.pcf.gz -isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0 +hanglg16.pcf.gz -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0 +hanglm16.pcf.gz -daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0 +hanglm24.pcf.gz -daewoo-mincho-medium-r-normal--24-170-100-100-c-240-ksc5601.1987-0 +jiskan16.pcf.gz -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 +jiskan24.pcf.gz -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0 +k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 +micro.pcf.gz micro +nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific +olcursor.pcf.gz -sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1 +olgl10.pcf.gz -sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1 +olgl12.pcf.gz -sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1 +olgl14.pcf.gz -sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1 +olgl19.pcf.gz -sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1 diff --git a/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 @@ +require xorg-lib-common.inc + +SUMMARY = "DMX: Distributed Multihead X extension library" + +DESCRIPTION = "The DMX extension provides support for communication with \ +and control of Xdmx(1) server. Attributes of the Xdmx(1) server and of \ +the back-end screens attached to the server can be queried and modified \ +via this protocol." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ + file://src/dmx.c;endline=33;md5=c43f19af03c7c8619cadc9724ed9afe1" + +DEPENDS += "libxext dmxproto" + +PE = "1" + +SRC_URI[md5sum] = "ba983eba5a9f05d152a0725b8e863151" +SRC_URI[sha256sum] = "c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201" + diff --git a/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 @@ +SUMMARY = "X font encoding library" + +DESCRIPTION = "libfontenc is a library which helps font libraries \ +portably determine and deal with different encodings of fonts." + +require xorg-lib-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" + +DEPENDS += "zlib xproto font-util" +PE = "1" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "ad2919764933e075bb0361ad5caa3d19" +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 @@ +SUMMARY = "ICE: Inter-Client Exchange library" + +DESCRIPTION = "The Inter-Client Exchange (ICE) protocol provides a \ +generic framework for building protocols on top of reliable, byte-stream \ +transport connections. It provides basic mechanisms for setting up and \ +shutting down connections, for performing authentication, for \ +negotiating versions, and for reporting errors. " + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93" + +DEPENDS += "xproto xtrans" +PROVIDES = "ice" + +PE = "1" + +XORG_PN = "libICE" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" +SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" diff --git a/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 @@ +SUMMARY = "Generic PCI access library for X" + +DESCRIPTION = "libpciaccess provides functionality for X to access the \ +PCI bus and devices in a platform-independent way." + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" + +SRC_URI[md5sum] = "b7c0d3afce14eedca57312a3141ec13a" +SRC_URI[sha256sum] = "abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19" + +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 @@ +SUMMARY = "Library that provides weak aliases for pthread functions" +DESCRIPTION = "This library provides weak aliases for pthread functions \ +not provided in libc or otherwise available by default." +HOMEPAGE = "http://xcb.freedesktop.org" +BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=XCB" +SECTION = "x11/libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" + +PARALLEL_MAKE = "" +#DEPENDS = "xcb-proto xproto libxau libxslt-native" +# DEPENDS += "xsltproc-native gperf-native" + +ALLOW_EMPTY_${PN} = "1" + +SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" + +SRC_URI[md5sum] = "e8fa31b42e13f87e8f5a7a2b731db7ee" +SRC_URI[sha256sum] = "35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299" + +inherit autotools pkgconfig + +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/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 @@ +SUMMARY = "SM: Session Management library" + +DESCRIPTION = "The Session Management Library (SMlib) is a low-level \"C\" \ +language interface to XSMP. The purpose of the X Session Management \ +Protocol (XSMP) is to provide a uniform mechanism for users to save and \ +restore their sessions. A session is a group of clients, each of which \ +has a particular state." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" + +DEPENDS += "libice xproto xtrans e2fsprogs" + +PE = "1" + +XORG_PN = "libSM" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" +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 @@ +require libx11.inc + +DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ +this version." + +SRC_URI += "file://X18NCMSstubs.diff \ + file://fix-disable-xlocale.diff \ + file://fix-utf8-wrong-define.patch \ + " + +RPROVIDES_${PN}-dev = "libx11-dev" +RPROVIDES_${PN}-locale = "libx11-locale" + +SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5" +SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16" + +EXTRA_OECONF += "--disable-xlocale" + +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 @@ +SUMMARY = "Xlib: C Language X Interface library" + +DESCRIPTION = "This package provides a client interface to the X Window \ +System, otherwise known as 'Xlib'. It provides a complete API for the \ +basic functions of the window system." + +require xorg-lib-common.inc + +inherit siteinfo + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" + +PE = "1" + +PROVIDES = "virtual/libx11" + +XORG_PN = "libX11" +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" + +DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" +DEPENDS += "xproto-native" + +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" +EXTRA_OEMAKE += 'CWARNFLAGS=""' + +PACKAGECONFIG ??= "xcms" +PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" + +# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined. +CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE" + +PACKAGES =+ "${PN}-xcb" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" +FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + +# Multiple libx11 derivatives from from this file and are selected by virtual/libx11 +# A world build should only build the correct version, not all of them. +EXCLUDE_FROM_WORLD = "1" diff --git a/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 @@ +Upstream-Status: Pending + +Upstream-Status: Inappropriate [configuration] +Index: libX11-1.3/src/imConv.c +=================================================================== +--- libX11-1.3.orig/src/imConv.c ++++ libX11-1.3/src/imConv.c +@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[ + * from UCS char to specified charset char. + * This converter is needed for _XimGetCharCode subroutine. + */ ++#ifdef XLOCALE + XPointer + _XimGetLocaleCode ( + _Xconst char* encoding_name) +@@ -96,6 +97,7 @@ _XimGetLocaleCode ( + } + return cvt; + } ++#endif + + /* + * Returns the locale dependent representation of a keysym. +@@ -106,6 +108,7 @@ _XimGetLocaleCode ( + * terminating NUL byte. Return 0 if the keysym is not representable in the + * locale + */ ++#ifdef XLOCALE + /*ARGSUSED*/ + int + _XimGetCharCode ( +@@ -135,6 +138,7 @@ _XimGetCharCode ( + buf[count]= '\0'; + return count; + } ++#endif + + #ifdef XKB + static int lookup_string( +Index: libX11-1.3/src/X18NCMSstubs.c +=================================================================== +--- /dev/null ++++ libX11-1.3/src/X18NCMSstubs.c +@@ -0,0 +1,428 @@ ++/* ++ * X18NCMSstubs.c ++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed ++ * ++ * Copyright © 2003 Matthew Allum ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Matthew Allum not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Keith Packard and Compaq makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS ++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, ++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include ++#include "Xlibint.h" ++#include "Xlcint.h" ++#include ++#include ++#ifdef WIN32 ++#undef close ++#endif ++#include ++#include "XlcPubI.h" ++ ++#include "Xcmsint.h" /* for XcmsCCC type */ ++#include "XlcPubI.h" /* for XLCd type */ ++#include "config.h" ++ ++#if ! XLOCALE ++ ++Bool ++XSupportsLocale() ++{ ++ return False; ++} ++ ++char * ++XSetLocaleModifiers( ++ const char *modifiers) ++{ ++ return NULL; ++} ++ ++XLCd ++_XOpenLC( ++ char *name) ++{ ++ return NULL; ++} ++ ++XLCd ++_XlcCurrentLC() ++{ ++ return NULL; ++} ++ ++void ++_XlcVaToArgList( ++ va_list var, ++ int count, ++ XlcArgList *args_ret) ++{ ++ return; ++} ++ ++void ++_XlcCountVaList( ++ va_list var, ++ int *count_ret) ++{ ++ return; ++} ++ ++void ++_XCloseLC( ++ XLCd lcd) ++{ ++ return; ++} ++ ++int ++_XlcConvert( ++ XlcConv conv, ++ XPointer *from, ++ int *from_left, ++ XPointer *to, ++ int *to_left, ++ XPointer *args, ++ int num_args) ++{ ++ return 0; ++} ++ ++/* XIM Stubs */ ++ ++XPointer ++_XimGetLocaleCode ( _Xconst char* encoding_name ) ++{ ++ return NULL; ++} ++ ++int ++_XimGetCharCode ( ++ XPointer ucs_conv, ++ KeySym keysym, ++ unsigned char* buf, ++ int nbytes) ++{ ++ return 0; ++} ++ ++/* Xrm Stubs */ ++ ++XrmMethods ++_XrmInitParseInfo( ++ XPointer *state) ++{ ++ return (XrmMethods) NULL; ++} ++ ++/* Xwc Stubs */ ++ ++int ++XwcTextExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XwcDrawString(Display *display, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, int y, ++ _Xconst wchar_t *string, ++ int num_wchars) ++{ ++ ; ++} ++ ++void ++XwcDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XwcTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XwcDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XwcTextEscapement( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XwcTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ return(XcmsFailure); ++} ++ ++int ++XwcTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ wchar_t ***list_ret, ++ int *count_ret) ++{ ++ return 0; ++} ++ ++int ++XwcTextListToTextProperty( ++ Display *dpy, ++ wchar_t **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return 0; ++} ++ ++void ++XwcFreeStringList(wchar_t **list) ++{ ++ return; ++} ++ ++ ++void XmbSetWMProperties ( /* Actually from mbWMProps.c */ ++ Display *dpy, ++ Window w, ++ _Xconst char *windowName, ++ _Xconst char *iconName, ++ char **argv, ++ int argc, ++ XSizeHints *sizeHints, ++ XWMHints *wmHints, ++ XClassHint *classHints) ++{ ++ return; ++} ++ ++int ++XmbTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ char ***list_ret, ++ int *count_ret) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextListToTextProperty( ++ Display *dpy, ++ char **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XmbDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XmbTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XmbDrawString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++void ++XmbDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XmbTextEscapement( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XmbTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ return 0; ++} ++ ++unsigned int ++KeySymToUcs4(KeySym keysym) ++{ ++ return 0; ++} ++ ++#endif ++ ++#if ! XCMS ++ ++XcmsCCC ++XcmsCCCOfColormap(dpy, cmap) ++ Display *dpy; ++ Colormap cmap; ++{ ++ return NULL; ++} ++ ++Status ++_XcmsResolveColorString ( ++ XcmsCCC ccc, ++ const char **color_string, ++ XcmsColor *pColor_exact_return, ++ XcmsColorFormat result_format) ++{ ++ return(XcmsFailure); ++} ++ ++void ++_XcmsUnresolveColor( ++ XcmsCCC ccc, ++ XcmsColor *pColor) ++{ ++ return; ++} ++ ++void ++_XUnresolveColor( ++ XcmsCCC ccc, ++ XColor *pXColor) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsAddCmapRec(dpy, cmap, windowID, visual) ++ Display *dpy; ++ Colormap cmap; ++ Window windowID; ++ Visual *visual; ++{ ++ return NULL; ++} ++ ++void ++_XcmsRGB_to_XColor( ++ XcmsColor *pColors, ++ XColor *pXColors, ++ unsigned int nColors) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsCopyCmapRecAndFree( ++ Display *dpy, ++ Colormap src_cmap, ++ Colormap copy_cmap) ++{ ++ return NULL; ++} ++ ++void ++_XcmsDeleteCmapRec( ++ Display *dpy, ++ Colormap cmap) ++{ ++ return; ++} ++ ++#endif +Index: libX11-1.3/src/Makefile.am +=================================================================== +--- libX11-1.3.orig/src/Makefile.am ++++ libX11-1.3/src/Makefile.am +@@ -335,6 +335,8 @@ if THRSTUBS + libX11_la_SOURCES+=UIThrStubs.c + endif + ++libX11_la_SOURCES+=X18NCMSstubs.c ++ + x11datadir = @X11_DATADIR@ + x11data_DATA = XKeysymDB XErrorDB + +@@ -342,6 +344,7 @@ EXTRA_DIST = \ + $(x11data_DATA) \ + os2Stubs.c \ +- UIThrStubs.c ++ UIThrStubs.c \ ++ X18NCMSstubs.c + + if XCB + libX11_la_SOURCES += \ +Index: libX11-1.3/src/locking.c +=================================================================== +--- libX11-1.3.orig/src/locking.c ++++ libX11-1.3/src/locking.c +@@ -66,7 +66,9 @@ in this Software without prior written a + #define NUM_FREE_CVLS 4 + + /* in lcWrap.c */ ++#ifdef XLOCALE + extern LockInfoPtr _Xi18n_lock; ++#endif + + #ifdef WIN32 + static DWORD _X_TlsIndex = (DWORD)-1; +@@ -594,9 +596,11 @@ Status XInitThreads(void) + _Xglobal_lock = &global_lock; + xmutex_init(_Xglobal_lock->lock); + xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); ++#ifdef XLOCALE + _Xi18n_lock = &i18n_lock; + xmutex_init(_Xi18n_lock->lock); + xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); ++#endif + _XLockMutex_fn = _XLockMutex; + _XUnlockMutex_fn = _XUnlockMutex; + _XCreateMutex_fn = _XCreateMutex; diff --git a/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 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist + +Update for 1.6.1 + +Signed-off-by: Kai Kang + +diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am +--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 ++++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 +@@ -36,11 +36,6 @@ + < locale.dir.l1 > locale.dir.l2 + cat locale.dir.l2 locale.dir.l1 > locale.dir + +-if HAVE_PERL +-LOG_COMPILER = $(PERL) +-TESTS = compose-check.pl +-endif HAVE_PERL +- + + # Per-locale data files diff --git a/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 @@ +Upstream-Status: Pending + +Signed-off-by: Xiaofeng Yan +--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 +@@ -701,7 +701,11 @@ + } + if (l - 2 - (p - charset) < 0) + return 0; ++#ifdef XLOCALE + if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) ++#else ++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) ++#endif + return 0; + if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) + return 0; diff --git a/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 @@ +Upstream-Status: Pending + +Signed-off-by: Xiaofeng Yan + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h +@@ -103,7 +103,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/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 @@ +From 4d85d5f3bd8afac893738fd88e19d8cb5cf998ff Mon Sep 17 00:00:00 2001 +From: Drew Moseley +Date: Sun, 27 Jul 2014 13:10:07 -0400 +Subject: [PATCH] libX11: Add missing NULL check on im and im->methods + +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=81822] + +Signed-off-by: Drew Moseley +--- + src/xlibi18n/ICWrap.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWrap.c +--- libX11-1.6.2-orig/src/xlibi18n/ICWrap.c 2014-07-27 13:38:29.586666449 -0400 ++++ libX11-1.6.2/src/xlibi18n/ICWrap.c 2014-07-27 13:41:39.671609030 -0400 +@@ -169,7 +169,7 @@ + va_list var; + int total_count; + XIMArg *args; +- char *ret; ++ char *ret = NULL; + + /* + * so count the stuff dangling here +@@ -185,7 +185,8 @@ + _XIMVaToNestedList(var, total_count, &args); + va_end(var); + +- ret = (*im->methods->set_values) (im, args); ++ if (im && im->methods) ++ ret = (*im->methods->set_values) (im, args); + if (args) Xfree(args); + return ret; + } +@@ -196,7 +197,7 @@ + va_list var; + int total_count; + XIMArg *args; +- char *ret; ++ char *ret = NULL; + + /* + * so count the stuff dangling here +@@ -212,7 +213,8 @@ + _XIMVaToNestedList(var, total_count, &args); + va_end(var); + +- ret = (*im->methods->get_values) (im, args); ++ if (im && im->methods) ++ ret = (*im->methods->get_values) (im, args); + if (args) Xfree(args); + return ret; + } +@@ -228,7 +230,7 @@ + va_list var; + int total_count; + XIMArg *args; +- XIC ic; ++ XIC ic = NULL; + + /* + * so count the stuff dangling here +@@ -244,7 +246,8 @@ + _XIMVaToNestedList(var, total_count, &args); + va_end(var); + +- ic = (XIC) (*im->methods->create_ic) (im, args); ++ if (im && im->methods) ++ ic = (XIC) (*im->methods->create_ic) (im, args); + if (args) Xfree(args); + if (ic) { + 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 @@ +Upstream-Status: Backport + +Signed-off-by: Chong Lu + +From b64bee2ddb7b96f00713a8b8435f11ad9ac1c9e0 Mon Sep 17 00:00:00 2001 +From: Ran Benita +Date: Sun, 16 Feb 2014 15:24:58 +0200 +Subject: [PATCH] nls: always use XCOMM instead of # for comments in + Compose.pre files + +Lines starting with # are considered as preprocessor directives in the +.pre files. + +Fixes warnings like: +:3:0: error: invalid preprocessing directive #Khmer + +Signed-off-by: Ran Benita +Signed-off-by: James Cloos +--- + nls/km_KH.UTF-8/Compose.pre | 2 +- + nls/sr_CS.UTF-8/Compose.pre | 32 ++++++++++++++++---------------- + 2 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/nls/km_KH.UTF-8/Compose.pre b/nls/km_KH.UTF-8/Compose.pre +index 77651d0..dc89119 100644 +--- a/nls/km_KH.UTF-8/Compose.pre ++++ b/nls/km_KH.UTF-8/Compose.pre +@@ -1,6 +1,6 @@ + include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" + +-# Khmer digraphs ++XCOMM Khmer digraphs + : "ាំ" + : "ោះ" + : "áŸáŸ‡" +diff --git a/nls/sr_CS.UTF-8/Compose.pre b/nls/sr_CS.UTF-8/Compose.pre +index 119e23e..b2397f7 100644 +--- a/nls/sr_CS.UTF-8/Compose.pre ++++ b/nls/sr_CS.UTF-8/Compose.pre +@@ -1,17 +1,17 @@ + include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" + +-# Serbian accented Cyrillic +-# а Ð - U+0430, U+0410 Cyrillic_a, Cyrillic_A +-# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E +-# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O +-# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U +-# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I +-# +-# Ì€ - U+0300 , , +-# Ì - U+0301 , , , +-# Ì‚ - U+0302 , +-# Ì - U+030F , +-# Ì€ - kratkouzlazni, U+0300 , , ++XCOMM Serbian accented Cyrillic ++XCOMM а Ð - U+0430, U+0410 Cyrillic_a, Cyrillic_A ++XCOMM е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E ++XCOMM о О - U+043E, U+041E Cyrillic_o, Cyrillic_O ++XCOMM у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U ++XCOMM и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I ++XCOMM ++XCOMM Ì€ - U+0300 , , ++XCOMM Ì - U+0301 , , , ++XCOMM Ì‚ - U+0302 , ++XCOMM Ì - U+030F , ++XCOMM Ì€ - kratkouzlazni, U+0300 , , + : "а̀" + : "а̀" + : "а̀" +@@ -42,7 +42,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" + : "У̀" + : "У̀" + : "У̀" +-# Ì - dugouzlazni, U+0301 , , , ++XCOMM Ì - dugouzlazni, U+0301 , , , + : "аÌ" + : "аÌ" + : "аÌ" +@@ -83,7 +83,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" + : "УÌ" + : "УÌ" + : "УÌ" +-# Ì‚ - dugosilazni, U+0302 , ++XCOMM Ì‚ - dugosilazni, U+0302 , + : "а̂" + : "а̂" + : "ÐÌ‚" +@@ -104,8 +104,8 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" + : "у̂" + : "У̂" + : "У̂" +-# Ì - kratkosilazni, U+030F , +-# there's no appropriate dead_doublegrave, so we use these two dead keys ++XCOMM Ì - kratkosilazni, U+030F , ++XCOMM there's no appropriate dead_doublegrave, so we use these two dead keys + : "аÌ" + : "аÌ" + : "ÐÌ" +-- +1.7.9.5 + 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 @@ +require libx11.inc +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += "file://disable_tests.patch \ + file://nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch \ + file://libX11-Add-missing-NULL-check.patch \ + " + +SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5" +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 @@ +SUMMARY = "Xau: X Authority Database library" + +DESCRIPTION = "libxau provides the main interfaces to the X11 \ +authorisation handling, which controls authorisation for X connections, \ +both client-side and server-side." + +require xorg-lib-common.inc + +inherit gettext + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec" + +DEPENDS += " xproto" +PROVIDES = "xau" + +PE = "1" + +XORG_PN = "libXau" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "685f8abbffa6d145c0f930f00703b21b" +SRC_URI[sha256sum] = "fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2" diff --git a/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 @@ +Upstream-Status: Pending + +There is no extra reply data and if we say not to disgard it, xcb +throws fatal asserts. + +RP - 26/11/09 + +Index: git/xcalibrate.c +=================================================================== +--- git.orig/xcalibrate.c 2009-11-26 08:11:48.000000000 +0000 ++++ git/xcalibrate.c 2009-11-26 08:09:55.000000000 +0000 +@@ -216,7 +216,7 @@ + req->reqType = info->codes->major_opcode; + req->xCalibrateReqType = X_XCalibrateRawMode; + req->on = enable; +- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) ++ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) + { + UnlockDisplay (dpy); + SyncHandle (); +@@ -240,7 +240,7 @@ + req->xCalibrateReqType = X_XCalibrateScreenToCoord; + req->x = *x; + req->y = *y; +- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) ++ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) + { + UnlockDisplay (dpy); + SyncHandle (); diff --git a/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 @@ +SUMMARY = "XCalibrate: Touchscreen calibration library" + +DESCRIPTION = "libXCalibrate is a library for performing touchscreen \ +calibration with the kdrive tslib touchscreen driver." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \ + file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7" + +DEPENDS = "virtual/libx11 calibrateproto libxext" + +SRCREV = "209d83af61ed38a002c8096377deac292b3e396c" +PV = "0.0+git${SRCPV}" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate \ + file://fix-xcb.patch" + +S = "${WORKDIR}/git" + +FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/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 @@ +SUMMARY = "XCB: The X protocol C binding library" +DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \ +for Xlib featuring a small footprint, latency hiding, direct access to \ +the protocol, improved threading support, and extensibility." +HOMEPAGE = "http://xcb.freedesktop.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" + +BBCLASSEXTEND = "native nativesdk" + +SECTION = "x11/libs" +LICENSE = "MIT-X" + +DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ + file://xcbincludedir.patch \ + file://disable-check.patch" + +PACKAGES_DYNAMIC = "^libxcb-.*" + +FILES_${PN} = "${libdir}/libxcb.so.*" + +inherit autotools pkgconfig pythonnative + +python populate_packages_prepend () { + do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) +} 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 @@ +The "check" package is checked for without an explicit enable/disable option, +which can lead to non-deterministic build issues with both check and libxslt. + +As the unit test suite is minimal at present, simply disable the test suite. In +the future if the test suite is expanded this can be made conditional on the +ptest DISTRO_FEATURE. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton + + +diff --git a/configure.ac b/configure.ac +index 6d7c9a5..22cceb9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS + + AM_PATH_PYTHON([2.6]) + +-PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) ++dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) ++HAVE_CHECK=no + AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) + + AC_CONFIG_HEADERS([src/config.h]) diff --git a/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 @@ +From be0fe56c3bcad5124dcc6c47a2fad01acd16f71a Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Mon, 23 Dec 2013 21:15:20 -0800 +Subject: [PATCH] Ensure xcb owns socket and no other threads are writing + before send_request + +send_request may only write to out.queue if no other thread is busy +writing to the network (as that thread may be writing from out.queue). + +send_request may only allocate request sequence numbers if XCB owns +the socket. + +Therefore, send_request must make sure that both conditions are true +when it holds iolock, which can only be done by looping until both +conditions are true without having dropped the lock waiting for the +second condition. + +We choose to get the socket back from Xlib first as get_socket_back +has a complicated test and checking for other threads writing is a +simple in-lined check. + +This also changes the sequence number checks (64k requests with no +reply, 4M request wrapping) to ensure that both conditions are true +before queueing the request. + +Signed-off-by: Keith Packard +Reviewed-by: Uli Schlachter +--- + src/xcb_out.c | 57 ++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 40 insertions(+), 17 deletions(-) + +diff --git a/src/xcb_out.c b/src/xcb_out.c +index 18bb5f9..dc42954 100644 +--- a/src/xcb_out.c ++++ b/src/xcb_out.c +@@ -103,6 +103,33 @@ static void get_socket_back(xcb_connection_t *c) + _xcb_in_replies_done(c); + } + ++static void prepare_socket_request(xcb_connection_t *c) ++{ ++ /* We're about to append data to out.queue, so we need to ++ * atomically test for an external socket owner *and* some other ++ * thread currently writing. ++ * ++ * If we have an external socket owner, we have to get the socket back ++ * before we can use it again. ++ * ++ * If some other thread is writing to the socket, we assume it's ++ * writing from out.queue, and so we can't stick data there. ++ * ++ * We satisfy this condition by first calling get_socket_back ++ * (which may drop the lock, but will return when XCB owns the ++ * socket again) and then checking for another writing thread and ++ * escaping the loop if we're ready to go. ++ */ ++ for (;;) { ++ if(c->has_error) ++ return; ++ get_socket_back(c); ++ if (!c->out.writing) ++ break; ++ pthread_cond_wait(&c->out.cond, &c->iolock); ++ } ++} ++ + /* Public interface */ + + void xcb_prefetch_maximum_request_length(xcb_connection_t *c) +@@ -236,24 +263,23 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect + + /* get a sequence number and arrange for delivery. */ + pthread_mutex_lock(&c->iolock); +- /* wait for other writing threads to get out of my way. */ +- while(c->out.writing) +- pthread_cond_wait(&c->out.cond, &c->iolock); +- get_socket_back(c); ++ ++ prepare_socket_request(c); + + /* send GetInputFocus (sync_req) when 64k-2 requests have been sent without +- * a reply. */ +- if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) +- send_sync(c); +- /* Also send sync_req (could use NoOp) at 32-bit wrap to avoid having ++ * a reply. ++ * Also send sync_req (could use NoOp) at 32-bit wrap to avoid having + * applications see sequence 0 as that is used to indicate +- * an error in sending the request */ +- if((unsigned int) (c->out.request + 1) == 0) ++ * an error in sending the request ++ */ ++ ++ while ((req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) || ++ (unsigned int) (c->out.request + 1) == 0) ++ { + send_sync(c); ++ prepare_socket_request(c); ++ } + +- /* The above send_sync calls could drop the I/O lock, but this +- * thread will still exclude any other thread that tries to write, +- * so the sequence number postconditions still hold. */ + send_request(c, req->isvoid, workaround, flags, vector, veclen); + request = c->has_error ? 0 : c->out.request; + pthread_mutex_unlock(&c->iolock); +@@ -373,10 +399,7 @@ int _xcb_out_send(xcb_connection_t *c, struct iovec *vector, int count) + + void _xcb_out_send_sync(xcb_connection_t *c) + { +- /* wait for other writing threads to get out of my way. */ +- while(c->out.writing) +- pthread_cond_wait(&c->out.cond, &c->iolock); +- get_socket_back(c); ++ prepare_socket_request(c); + send_sync(c); + } + +-- +1.9.1 + 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 @@ +As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot +to the beginning of variables that are used later on the host. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index 94da4f7..d29cd6a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,7 +64,7 @@ AC_SUBST(NEEDED) + + # Find the xcb-proto protocol descriptions + AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) +-XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` ++XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto` + AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) + AC_SUBST(XCBPROTO_XCBINCLUDEDIR) + +@@ -74,7 +74,7 @@ AC_SUBST(XCBPROTO_VERSION) + + # Find the xcbgen Python package + AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR) +-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` ++XCBPROTO_XCBPYTHONDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=pythondir xcb-proto` + AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) + AC_SUBST(XCBPROTO_XCBPYTHONDIR) + diff --git a/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 @@ +include libxcb.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" + + +DEPENDS += "libxdmcp" + +SRC_URI += "file://ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch \ +" + +SRC_URI[md5sum] = "074c335cc4453467eeb234e3dadda700" +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 @@ +DEFAULT_PREFERENCE = "-1" + +include libxcb.inc + +SRCREV = "625ed596cae6dd8175aeb6cb6f26784928042f22" +PV = "1.1.90.1+gitr${SRCPV}" +PR = "r1" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb" +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 @@ +Upstream-Status: Inappropriate [configuration] + +This patch makes the build use its own Xcomposite.h over rather than an +older Xcomposite.h that might already be installed in the staging dir. + +Index: libXcomposite-0.4.3/src/Makefile.am +=================================================================== +--- libXcomposite-0.4.3.orig/src/Makefile.am 2010-06-30 22:42:53.000000000 -0700 ++++ libXcomposite-0.4.3/src/Makefile.am 2010-11-23 23:09:34.544322930 -0800 +@@ -19,7 +19,7 @@ + # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + +-AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) ++AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) + AM_CPPFLAGS = -I$(top_srcdir)/include + + lib_LTLIBRARIES = libXcomposite.la diff --git a/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 @@ +SUMMARY = "Xcomposite: X Composite extension library" + +DESCRIPTION = "The composite extension provides three related \ +mechanisms: per-hierarchy storage, automatic shadow update, and external \ +parent. In per-hierarchy storage, the rendering of an entire hierarchy \ +of windows is redirected to off-screen storage. In automatic shadow \ +update, when a hierarchy is rendered off-screen, the X server provides \ +an automatic mechanism for presenting those contents within the parent \ +window. In external parent, a mechanism for providing redirection of \ +compositing transformations through a client." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" + +DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" +PROVIDES = "xcomposite" +BBCLASSEXTEND = "native" + +PE = "1" + +XORG_PN = "libXcomposite" + +SRC_URI += " file://change-include-order.patch" + +SRC_URI[md5sum] = "f7a218dcbf6f0848599c6c36fc65c51a" +SRC_URI[sha256sum] = "ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178" diff --git a/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 @@ +SUMMARY = "Xcursor: X Cursor management library" + +DESCRIPTION = "Xcursor is a simple library designed to help locate and \ +load cursors. Cursors can be loaded from files or memory. A library of \ +common cursors exists which map to the standard X cursor names. Cursors \ +can exist in several sizes and the library automatically picks the best \ +size." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=8902e6643f7bcd7793b23dcd5d8031a4" + +DEPENDS += "libxrender libxfixes" +BBCLASSEXTEND = "native" + +PE = "1" + +XORG_PN = "libXcursor" + +SRC_URI[md5sum] = "1e7c17afbbce83e2215917047c57d1b3" +SRC_URI[sha256sum] = "9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df" diff --git a/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 @@ +SUMMARY = "Xdamage: X Damage extension library" + +DESCRIPTION = "'Damage' is a term that describes changes make to pixel \ +contents of windows and pixmaps. Damage accumulates as drawing occurs \ +in the drawable. Each drawing operation 'damages' one or more \ +rectangular areas within the drawable. The rectangles are guaranteed to \ +include the set of pixels modified by each operation, but may include \ +significantly more than just those pixels. The DAMAGE extension allows \ +applications to either receive the raw rectangles as a stream of events, \ +or to have them partially processed within the X server to reduce the \ +amount of data transmitted as well as reduce the processing latency once \ +the repaint operation has started." + +require xorg-lib-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868" + +DEPENDS += "virtual/libx11 damageproto libxfixes" +PROVIDES = "xdamage" +BBCLASSEXTEND = "native" + +PE = "1" + +XORG_PN = "libXdamage" + +SRC_URI[md5sum] = "0cf292de2a9fa2e9a939aefde68fd34f" +SRC_URI[sha256sum] = "7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad" diff --git a/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 @@ +SUMMARY = "XDMCP: X Display Manager Control Protocol library" + +DESCRIPTION = "The purpose of the X Display Manager Control Protocol \ +(XDMCP) is to provide a uniform mechanism for an autonomous display to \ +request login service from a remote host. An X terminal (screen, \ +keyboard, mouse, processor, network interface) is a prime example of an \ +autonomous display." + +require xorg-lib-common.inc + +inherit gettext + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123" + +DEPENDS += "xproto" +PROVIDES = "xdmcp" + +PE = "1" + +XORG_PN = "libXdmcp" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "b94af6cef211cf3ee256f7e81f70fcd9" +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 @@ +SUMMARY = "XExt: X Extension library" + +DESCRIPTION = "libXext provides an X Window System client interface to \ +several extensions to the X protocol. The supported protocol extensions \ +are DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT_SHM, \ +MIT_SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, \ +XC-APPGROUP, XC-MISC, XTEST. libXext also provides a small set of \ +utility functions to aid authors of client APIs for X protocol \ +extensions." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8" + +DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" +PROVIDES = "xext" + +PE = "1" + +XORG_PN = "libXext" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "4376101e51bb2c6c44d9ab14344e85ad" +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 @@ +require xorg-lib-common.inc + +SUMMARY = "XExt: X Extension library" + +DESCRIPTION = "libXext provides an X Window System client interface to \ +several extensions to the X protocol. The supported protocol extensions \ +are DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT_SHM, \ +MIT_SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, \ +XC-APPGROUP, XC-MISC, XTEST. libXext also provides a small set of \ +utility functions to aid authors of client APIs for X protocol \ +extensions." + +DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" +PROVIDES = "xext" +SRCREV = "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" +PE = "1" +PV = "1.0.99.1+gitr${SRCPV}" + +XORG_PN = "libXext" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN}" +S = "${WORKDIR}/git/" + +BBCLASSEXTEND = "nativesdk" diff --git a/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 @@ +SUMMARY = "XFixes: X Fixes extension library" + +DESCRIPTION = "X applications have often needed to work around various \ +shortcomings in the core X window system. This extension is designed to \ +provide the minimal server-side support necessary to eliminate problems \ +caused by these workarounds." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" + +DEPENDS += "virtual/libx11 xproto fixesproto xextproto" + +PE = "1" + +XORG_PN = "libXfixes" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "b985b85f8b9386c85ddcfe1073906b4d" +SRC_URI[sha256sum] = "63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767" diff --git a/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 @@ +SUMMARY = "XFont: X Font rasterisation library" + +DESCRIPTION = "libXfont provides various services for X servers, most \ +notably font selection and rasterisation (through external libraries \ +such as freetype)." + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" + +DEPENDS += "freetype xtrans fontsproto libfontenc zlib" +PROVIDES = "xfont" + +PE = "1" + +XORG_PN = "libXfont" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "664629bfa7cdf8b984155019fd395dcb" +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 @@ +SUMMARY = "XFt: X FreeType libary" + +DESCRIPTION = "Xft was designed to provide good support for scalable \ +fonts, and to do so efficiently. Unlike the core fonts system, it \ +supports features such as anti-aliasing and sub-pixel rasterisation. \ +Perhaps more importantly, it gives applications full control over the \ +way glyphs are rendered, making fine typesetting and WYSIWIG display \ +possible. Finally, it allows applications to use fonts that are not \ +installed system-wide for displaying documents with embedded fonts. Xft \ +is not compatible with the core fonts system: usage of Xft requires \ +fairly extensive changes to toolkits (user-interface libraries)." + +require xorg-lib-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" + +DEPENDS += "virtual/libx11 libxrender freetype fontconfig" +PROVIDES = "xft" + +PE = "1" + +SRC_URI[md5sum] = "331b3a2a3a1a78b5b44cfbd43f86fcfe" +SRC_URI[sha256sum] = "f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c" + +XORG_PN = "libXft" + +BBCLASSEXTEND = "native" + +python () { + if d.getVar('DEBIAN_NAMES', True): + d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') +} diff --git a/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 @@ +require xorg-lib-common.inc + +SUMMARY = "XI: X Input extension library" + +DESCRIPTION = "libxi is an extension to the X11 protocol to support \ +input devices other than the core X keyboard and pointer. It allows \ +client programs to select input from these devices independently from \ +each other and independently from the core devices." + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \ + file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f" + +DEPENDS += "libxext inputproto libxfixes" + +PE = "1" + +XORG_PN = "libXi" + +SRC_URI[md5sum] = "9c4a69c34b19ec1e4212e849549544cb" +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 @@ +require xorg-lib-common.inc + +SUMMARY = "Xinerama: Xinerama extension library" + +DESCRIPTION = "Xinerama is a simple library designed to interface the \ +Xinerama Extension for retrieving information about physical output \ +devices which may be combined into a single logical X screen." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=6f4f634d1643a2e638bba3fcd19c2536 \ + file://src/Xinerama.c;beginline=2;endline=25;md5=fcef273bfb66339256411dd06ea79c02" + +DEPENDS += "libxext xineramaproto" +PROVIDES = "xinerama" +PE = "1" + +XORG_PN = "libXinerama" + +SRC_URI[md5sum] = "9336dc46ae3bf5f81c247f7131461efd" +SRC_URI[sha256sum] = "7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2" diff --git a/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 @@ +SUMMARY = "Generic XKB keymap library" +DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ +processes a reduced subset of keymaps as defined by the XKB specification." +HOMEPAGE = "http://www.xkbcommon.org" +LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc" +LICENSE = "MIT & MIT-style" + +DEPENDS = "util-macros flex-native bison-native" + +SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" + +SRC_URI[md5sum] = "26c57ff21438ed45de2a4ca609177db9" +SRC_URI[sha256sum] = "9a52d5d0419e76c49c0ece86208c205ffacb1cf0ff8ffbaba98d3d4dd40c4e41" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-docs" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," diff --git a/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 @@ +SUMMARY = "XKB: X Keyboard File manipulation library" + +DESCRIPTION = "libxkbfile provides an interface to read and manipulate \ +description files for XKB, the X11 keyboard configuration extension." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f" + +DEPENDS += "virtual/libx11 kbproto" + +PE = "1" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "19e6533ae64abba0773816a23f2b9507" +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 @@ +SUMMARY = "Xmu and Xmuu: X Miscellaneous Utility libraries" + +DESCRIPTION = "The Xmu Library is a collection of miscellaneous (some \ +might say random) utility functions that have been useful in building \ +various applications and widgets. This library is required by the Athena \ +Widgets. A subset of the functions that do not rely on the Athena \ +Widgets (libXaw) or X Toolkit Instrinsics (libXt) are provided in a \ +second library, libXmuu." + + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=def3d8e4e9c42004f1941fa22f01dc18" + +DEPENDS += "libxt libxext" +PROVIDES = "xmu" + +PE = "1" + +XORG_PN = "libXmu" + +LEAD_SONAME = "libXmu" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" +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 @@ +require xorg-lib-common.inc + +# libxpm requires xgettext to build +inherit gettext + +SUMMARY = "Xpm: X Pixmap extension library" + +DESCRIPTION = "libXpm provides support and common operation for the XPM \ +pixmap format, which is commonly used in legacy X applications. XPM is \ +an extension of the monochrome XBM bitmap specificied in the X \ +protocol." + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" +DEPENDS += "libxext libsm libxt" +PE = "1" + +XORG_PN = "libXpm" + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" + +SRC_URI[md5sum] = "769ee12a43611cdebd38094eaf83f3f0" +SRC_URI[sha256sum] = "c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c" + +BBCLASSEXTEND = "native" diff --git a/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 @@ +SUMMARY = "XRandR: X Resize, Rotate and Reflect extension library" + +DESCRIPTION = "The X Resize, Rotate and Reflect Extension, called RandR \ +for short, brings the ability to resize, rotate and reflect the root \ +window of a screen. It is based on the X Resize and Rotate Extension as \ +specified in the Proceedings of the 2001 Usenix Technical Conference \ +[RANDR]." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9d1a2118a6cd5727521db8e7a2fee69" + +DEPENDS += "virtual/libx11 randrproto libxrender libxext" + +PE = "1" + +XORG_PN = "libXrandr" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "210ed9499a3d9c96e3a221629b7d39b0" +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 @@ +SUMMARY = "XRender: X Rendering Extension library" + +DESCRIPTION = "The X Rendering Extension (Render) introduces digital \ +image composition as the foundation of a new rendering model within the \ +X Window System. Rendering geometric figures is accomplished by \ +client-side tessellation into either triangles or trapezoids. Text is \ +drawn by loading glyphs into the server and rendering sets of them." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196" + +DEPENDS += "virtual/libx11 renderproto xproto xdmcp" + +PE = "1" + +XORG_PN = "libXrender" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "2bd9a15fcf64d216e63b8d129e4f1f1c" +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 @@ +SUMMARY = "XRes: X Resource extension library" + +DESCRIPTION = "libXRes provides an X Window System client interface to \ +the Resource extension to the X protocol. The Resource extension allows \ +for X clients to see and monitor the X resource usage of various clients \ +(pixmaps, et al)." + +require xorg-lib-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa" + +DEPENDS += "libxext resourceproto" + +PE = "1" + +XORG_PN = "libXres" + +SRC_URI[md5sum] = "45ef29206a6b58254c81bea28ec6c95f" +SRC_URI[sha256sum] = "26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5" diff --git a/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 @@ +require xorg-lib-common.inc + +SUMMARY = "Xscrnsaver: X Screen Saver extension library" + +DESCRIPTION = "The X Window System provides support for changing the \ +image on a display screen after a user-settable period of inactivity to \ +avoid burning the cathode ray tube phosphors. However, no interfaces are \ +provided for the user to control the image that is drawn. This extension \ +allows an external \"screen saver\" client to detect when the alternate \ +image is to be displayed and to provide the graphics." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb" + +DEPENDS += "libxext scrnsaverproto" +PROVIDES = "libxss" +RREPLACES_${PN} = "libxss" +PE = "1" + +XORG_PN = "libXScrnSaver" + +SRC_URI[md5sum] = "7a773b16165e39e938650bcc9027c1d5" +SRC_URI[sha256sum] = "8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d" diff --git a/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 @@ +SUMMARY = "Shared memory 'SyncFence' synchronization primitive" + +DESCRIPTION = "This library offers a CPU-based synchronization primitive compatible \ +with the X SyncFence objects that can be shared between processes \ +using file descriptor passing." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" + +DEPENDS += "virtual/libx11" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "2dd10448c1166e71a176206a8dfabe6d" +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 @@ +Upstream-Status: Pending + +This fixes compilation with x32 toolchain. + +Received this patch from H.J. Lu +Signed-Off-By: Nitin A Kamble 2011/12/1 + + +--- libXt-1.1.1/include/X11/Xtos.h.x32 2011-02-08 07:56:40.000000000 -0800 ++++ libXt-1.1.1/include/X11/Xtos.h 2011-11-30 17:19:27.473349770 -0800 +@@ -62,7 +62,7 @@ SOFTWARE. + defined(__sparc64__) || \ + defined(__s390x__) || \ + (defined(__hppa__) && defined(__LP64__)) || \ +- defined(__amd64__) || defined(amd64) || \ ++ ((defined(__amd64__) || defined(amd64)) && defined(__LP64__)) || \ + defined(__powerpc64__) || \ + (defined(sgi) && (_MIPS_SZLONG == 64)) + #define LONG64 diff --git a/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 @@ +SUMMARY = "Xt: X Toolkit Intrinsics library" + +DESCRIPTION = "The Intrinsics are a programming library tailored to the \ +special requirements of user interface construction within a network \ +window system, specifically the X Window System. The Intrinsics and a \ +widget set make up an X Toolkit. The Intrinsics provide the base \ +mechanism necessary to build a wide variety of interoperating widget \ +sets and application environments. The Intrinsics are a layer on top of \ +Xlib, the C Library X Interface. They extend the fundamental \ +abstractions provided by the X Window System while still remaining \ +independent of any particular user interface policy or style." + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" + + +DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp" +PROVIDES = "xt" + +PE = "1" + +XORG_PN = "libXt" + +SRC_URI += "file://libxt_fix_for_x32.patch" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF += "--disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS + 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 + ) + if [ "$?" != "0" ]; then + exit 1 + fi + oe_runmake +} + +SRC_URI[md5sum] = "03149823ae57bb02d0cec90d5b97d56c" +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 @@ +require xorg-lib-common.inc + +SUMMARY = "XTest: X Test extension library" + +DESCRIPTION = "This extension is a minimal set of client and server \ +extensions required to completely test the X11 server with no user \ +intervention." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=bb4f89972c3869f617f61c1a79ad1952 \ + file://src/XTest.c;beginline=2;endline=32;md5=b1c8c9dff842b4d5b89ca5fa32c40e99" + +DEPENDS += "libxext recordproto inputproto libxi" +PROVIDES = "xtst" +PE = "1" + +XORG_PN = "libXtst" + +SRC_URI[md5sum] = "25c6b366ac3dc7a12c5d79816ce96a59" +SRC_URI[sha256sum] = "ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9" diff --git a/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 @@ +SUMMARY = "Xv: X Video extension library" + +DESCRIPTION = "libXv provides an X Window System client interface to the \ +X Video extension to the X protocol. The X Video extension allows for \ +accelerated drawing of videos. Hardware adaptors are exposed to \ +clients, which may draw in a number of colourspaces, including YUV." + +require xorg-lib-common.inc + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c" + +DEPENDS += "libxext videoproto" + +XORG_PN = "libXv" + +SRC_URI[md5sum] = "e0af49d7d758b990e6fef629722d4aca" +SRC_URI[sha256sum] = "55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525" diff --git a/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 @@ +SUMMARY = "XvMC: X Video Motion Compensation extension library" + +DESCRIPTION = "XvMC extends the X Video extension (Xv) and enables \ +hardware rendered motion compensation support." + +require xorg-lib-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=0a207f08d4961489c55046c9a5e500da \ + file://wrapper/XvMCWrapper.c;endline=26;md5=5151daa8172a3f1bb0cb0e0ff157d9de" + +DEPENDS += "libxext libxv videoproto" + +PE = "1" + +XORG_PN = "libXvMC" + +SRC_URI[md5sum] = "2e4014e9d55c430e307999a6b3dd256d" +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 @@ +require xorg-lib-common.inc + +SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension library" + +DESCRIPTION = "libXxf86dga provides the XFree86-DGA extension, which \ +allows direct graphics access to a framebuffer-like region, and also \ +allows relative mouse reporting, et al. It is mainly used by games and \ +emulators for games." + +LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" + +DEPENDS += "libxext xf86dgaproto" + +PE = "1" + +SRC_URI[md5sum] = "d7dd9b9df336b7dd4028b6b56542ff2c" +SRC_URI[sha256sum] = "8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e" + +XORG_PN = "libXxf86dga" diff --git a/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 @@ +SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension library" + +DESCRIPTION = "The XFree86-Misc extension, provides a means to access \ +input device configuration settings specific to the XFree86/Xorg DDX." + +require xorg-lib-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45" + +DEPENDS += "libxext xf86miscproto" +PROVIDES = "xxf86misc" + +PE = "1" + +XORG_PN = "libXxf86misc" + +SRC_URI[md5sum] = "6bc0bf78909fd71021c466c793d4385c" +SRC_URI[sha256sum] = "563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b" + diff --git a/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 @@ +SUMMARY = "XFree86-VM: XFree86 video mode extension library" + +DESCRIPTION = "libXxf86vm provides an interface to the \ +XFree86-VidModeExtension extension, which allows client applications to \ +get and set video mode timings in extensive detail. It is used by the \ +xvidtune program in particular." + +require xorg-lib-common.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=fa0b9c462d8f2f13eba26492d42ea63d" + +DEPENDS += "libxext xf86vidmodeproto" + +PE = "1" + +XORG_PN = "libXxf86vm" + +SRC_URI[md5sum] = "e46f6ee4f4567349a3189044fe1bb712" +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 @@ +From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 23 Aug 2012 18:10:57 +0200 +Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection + code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was ported from meta-oe's patch [1]. The original pixman patch is found +at [2]. + +[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch +[2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html + +Upstream-Status: Inappropriate [other] qemu fix + +Signed-off-by: Andreas Müller +--- + pixman/pixman-arm.c | 82 ++++++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 65 insertions(+), 17 deletions(-) + +diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c +index 23374e4..d98bda6 100644 +--- a/pixman/pixman-arm.c ++++ b/pixman/pixman-arm.c +@@ -129,16 +129,35 @@ detect_cpu_features (void) + #include + #include + #include ++#include + #include + #include + #include + ++/* ++ * The whole CPU capabilities detection is a bit ugly: when running in ++ * userspace qemu, we see /proc/self/auxv from the host system. To make ++ * everything even worse, the size of each value is 64-bit when running ++ * on a 64-bit host system. So the data is totally bogus because we expect ++ * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause ++ * segfault (null pointer dereference on x86-64 host). So in order to be ++ * on a safe side, we require that AT_PLATFORM value is found only once, ++ * and it has non-zero value (this is still not totally reliable for a big ++ * endian 64-bit host system running qemu and may theoretically fail). ++ */ ++#define ARM_HWCAP_VFP 64 ++#define ARM_HWCAP_IWMMXT 512 ++#define ARM_HWCAP_NEON 4096 ++ + static arm_cpu_features_t + detect_cpu_features (void) + { + arm_cpu_features_t features = 0; + Elf32_auxv_t aux; + int fd; ++ uint32_t hwcap = 0; ++ const char *plat = NULL; ++ int plat_cnt = 0; + + fd = open ("/proc/self/auxv", O_RDONLY); + if (fd >= 0) +@@ -147,32 +166,61 @@ detect_cpu_features (void) + { + if (aux.a_type == AT_HWCAP) + { +- uint32_t hwcap = aux.a_un.a_val; +- +- /* hardcode these values to avoid depending on specific +- * versions of the hwcap header, e.g. HWCAP_NEON +- */ +- if ((hwcap & 64) != 0) +- features |= ARM_VFP; +- if ((hwcap & 512) != 0) +- features |= ARM_IWMMXT; +- /* this flag is only present on kernel 2.6.29 */ +- if ((hwcap & 4096) != 0) +- features |= ARM_NEON; ++ hwcap = aux.a_un.a_val; + } + else if (aux.a_type == AT_PLATFORM) + { +- const char *plat = (const char*) aux.a_un.a_val; +- +- if (strncmp (plat, "v7l", 3) == 0) ++ plat = (const char*) aux.a_un.a_val; ++ plat_cnt++; ++ } ++ } ++ close (fd); ++ if (plat == NULL || plat_cnt != 1 || *plat != 'v') ++ { ++ /* ++ * Something seems to be really wrong, most likely we are ++ * running under qemu. Let's use machine type from "uname" for ++ * CPU capabilities detection: ++ * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html ++ */ ++ struct utsname u; ++ hwcap = 0; /* clear hwcap, because it is bogus */ ++ if (uname (&u) == 0) ++ { ++ if (strcmp (u.machine, "armv7l") == 0) ++ { + features |= (ARM_V7 | ARM_V6); +- else if (strncmp (plat, "v6l", 3) == 0) ++ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ ++ hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */ ++ } ++ else if (strcmp (u.machine, "armv6l") == 0) ++ { + features |= ARM_V6; ++ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ ++ } + } + } +- close (fd); ++ else if (strncmp (plat, "v7l", 3) == 0) ++ { ++ features |= (ARM_V7 | ARM_V6); ++ } ++ else if (strncmp (plat, "v6l", 3) == 0) ++ { ++ features |= ARM_V6; ++ } + } + ++ /* hardcode these values to avoid depending on specific ++ * versions of the hwcap header, e.g. HWCAP_NEON ++ */ ++ if ((hwcap & ARM_HWCAP_VFP) != 0) ++ features |= ARM_VFP; ++ if ((hwcap & ARM_HWCAP_IWMMXT) != 0) ++ features |= ARM_IWMMXT; ++ /* this flag is only present on kernel 2.6.29 */ ++ if ((hwcap & ARM_HWCAP_NEON) != 0) ++ features |= ARM_NEON; ++ + return features; + } + +-- +1.7.6.5 + diff --git a/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 @@ +Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with +errors such as: + +pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267: +Error: invalid operands `mflo $14,$ac3' + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +--- b/pixman/pixman-mips-dspr2-asm.h ++++ a/pixman/pixman-mips-dspr2-asm.h +@@ -72,10 +72,7 @@ + #define LEAF_MIPS32R2(symbol) \ + .globl symbol; \ + .align 2; \ +-#ifdef __ELF__ +- .hidden symbol; \ + .type symbol, @function; \ +-#endif + .ent symbol, 0; \ + symbol: .frame sp, 0, ra; \ + .set push; \ diff --git a/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 @@ +SUMMARY = "Pixman: Pixel Manipulation library" + +DESCRIPTION = "Pixman provides a library for manipulating pixel regions \ +-- a set of Y-X banded rectangles, image compositing using the \ +Porter/Duff model and implicit mask generation for geometric primitives \ +including trapezoids, triangles, and rectangles." + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ + file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ + file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ + " +DEPENDS += "zlib libpng" +BBCLASSEXTEND = "native nativesdk" + +PE = "1" + +IWMMXT = "--disable-arm-iwmmxt" +LOONGSON_MMI = "--disable-loongson-mmi" +NEON = " --disable-arm-neon " +NEON_class-nativesdk = " --disable-arm-neon " +NEON_armv7a = " " +NEON_armv7a-vfp-neon = " " + +EXTRA_OECONF = "--disable-gtk ${IWMMXT} ${LOONGSON_MMI} ${NEON}" +EXTRA_OECONF_class-native = "--disable-gtk" + +SRC_URI += "\ + file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ + file://mips-export-revert.patch \ +" + +SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" +SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4" + +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 @@ +require xcb-util.inc + +DEPENDS += "xcb-util" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ + file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" + +SRC_URI[md5sum] = "fabb80b36490b00fc91289e2c7f66770" +SRC_URI[sha256sum] = "d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df" + 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 @@ +require xcb-util.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \ + " + +SRC_URI[md5sum] = "64e4aad2d48cd4a92e2da13b9f35bfd2" +SRC_URI[sha256sum] = "7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e" + + 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 @@ +require xcb-util.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://renderutil/glyph.c;endline=24;md5=c517c483b8d726234ec94f9169236661 \ + file://renderutil/util.c;endline=20;md5=6e0bfc44fb13298c0f4694eb70dc80d4 \ + file://renderutil/xcb_renderutil.h;endline=24;md5=d0ddab3052dd4949c93cfcb0891c96df \ + " + +SRC_URI[md5sum] = "468b119c94da910e1291f3ffab91019a" +SRC_URI[sha256sum] = "c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b" diff --git a/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 @@ +require xcb-util.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://ewmh/ewmh.c.m4;endline=27;md5=63fd80552d7dc886f4eb267610d5bb9d \ + file://ewmh/xcb_ewmh.h.m4;beginline=4;endline=30;md5=73b589f90ef90b4a43998955daad5cd8 \ + file://icccm/icccm.c;endline=28;md5=e2b3240a0c197e8977adde2a5cf18d50 \ + file://icccm/xcb_icccm.h;beginline=4;endline=31;md5=393772b7b07b9868d479d538238c1d8a \ + " + +SRC_URI[md5sum] = "87b19a1cd7bfcb65a24e36c300e03129" +SRC_URI[sha256sum] = "28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f" diff --git a/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 @@ +SUMMARY = "XCB: The X protocol C binding utilities" +DESCRIPTION = "The xcb-util module provides a number of libraries which \ +sit on top of libxcb, the core X protocol library, and some of the \ +extension libraries. These experimental libraries provide convenience \ +functions and interfaces which make the raw X protocol more usable. Some \ +of the libraries also provide client-side code which is not strictly \ +part of the X protocol but which have traditionally been provided by \ +Xlib." +HOMEPAGE = "http://xcb.freedesktop.org/XcbUtil/" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" + +LICENSE = "MIT" + +SECTION = "x11/libs" + +DEPENDS = "libxcb" +DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" + +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 @@ +require xcb-util.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \ + file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9" + +SRC_URI[md5sum] = "01dcc7a16d5020530552712710646ea2" +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 @@ +SUMMARY = "Keyboard configuration database for X Window" + +DESCRIPTION = "The non-arch keyboard configuration database for X \ +Window. The goal is to provide the consistent, well-structured, \ +frequently released open source of X keyboard configuration data for X \ +Window System implementations. The project is targeted to XKB-based \ +systems." + +HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config" + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" + +SRC_URI="${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "1fd54ceb9092d1dbcaabaf03653092bc" +SRC_URI[sha256sum] = "65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44" + +SECTION = "x11/libs" +DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" + +EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" + +FILES_${PN} += "${datadir}/X11/xkb" + +inherit autotools pkgconfig gettext + +do_install_append () { + install -d ${D}${datadir}/X11/xkb/compiled + cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg +} diff --git a/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 @@ +HOMEPAGE = "http://www.x.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" + +SECTION = "x11/libs" +LICENSE = "MIT-X" +DEPENDS = "util-macros" + +XORG_PN = "${BPN}" + +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" + +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools distro_features_check pkgconfig + +EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" + +UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ + --disable-specs --without-groff --without-ps2pdf --without-fop \ + --without-xmlto --with-xmlto \ +" + +REQUIRED_DISTRO_FEATURES ?= "x11" 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 @@ +SUMMARY = "XTrans: X Transport library" + +DESCRIPTION = "The X Transport Interface is intended to combine all \ +system and transport specific code into a single place. This API should \ +be used by all libraries, clients and servers of the X Window System. \ +Use of this API should allow the addition of new types of transports and \ +support for new platforms without making any changes to the source \ +except in the X Transport Interface code." + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca" + +PE = "1" + +RDEPENDS_${PN}-dev = "" + +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "a615e17d9fee6f097fc3b716eacb3dca" +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 @@ +require xorg-proto-common.inc + +PE = "1" + +SUMMARY = "BigReqs: X Big Requests extension headers" + +DESCRIPTION = "This package provides the wire protocol for the \ +BIG-REQUESTS extension, used to send larger requests that usual in order \ +to avoid fragmentation." + +BBCLASSEXTEND = "native nativesdk" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b12715630da6f268d0d3712ee1a504f4" + +SRC_URI[md5sum] = "1a05fb01fa1d5198894c931cf925c025" +SRC_URI[sha256sum] = "462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e" diff --git a/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 @@ +Upstream-Status: Pending + +Add missing length fields to the replies. Without these, sanity checking in recent X +breaks things. + +RP 11/2/10 + + +Index: git/xcalibrateproto.h +=================================================================== +--- git.orig/xcalibrateproto.h 2010-02-11 11:47:45.711985932 +0000 ++++ git/xcalibrateproto.h 2010-02-11 11:40:21.000000000 +0000 +@@ -67,13 +67,13 @@ + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; ++ CARD32 length; + CARD32 status; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +- CARD32 pad7 B32; + } xXCalibrateRawModeReply; + + #define sz_xXCalibrateRawModeReply 32 +@@ -92,13 +92,13 @@ + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; ++ CARD32 length; + CARD32 x; + CARD32 y; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +- CARD32 pad6 B32; + } xXCalibrateScreenToCoordReply; + + #define sz_xXCalibrateScreenToCoordReply 32 diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XCalibrate: Touchscreen calibration headers" + +DESCRIPTION = "This package provides the wire protocol for the \ +Touchscreen calibration extension." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://xcalibratewire.h;endline=23;md5=7f86ef7b03cce6c4c9ebd59d20ca485f \ + file://xcalibrateproto.h;endline=23;md5=e4490491edcc171ca24f98569ee580db" + +SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c" + +PV = "0.0+git${SRCPV}" +PR = "r2" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto \ + file://fix.patch;apply=yes" +S = "${WORKDIR}/git" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "Xcomposite: X composite extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X \ +composite extension. The X composite extension provides three related \ +mechanisms for compositing and off-screen storage." + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \ + file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926" + +RCONFLICTS_${PN} = "compositeext" +BBCLASSEXTEND = "native" + +PR = "r1" +PE = "1" + +SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0" +SRC_URI[sha256sum] = "049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc" + diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "Xdamage: X Damage extension headers" + +DESCRIPTION = "This package provides the wire protocol for the DAMAGE \ +extension. The DAMAGE extension allows applications to receive \ +information about changes made to pixel contents of windows and \ +pixmaps." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=d5f5a2de65c3a84cbde769f07a769608 \ + file://damagewire.h;endline=23;md5=4a4501a592dbc7de5ce89255e50d0296" + +RCONFLICTS_${PN} = "damageext" +BBCLASSEXTEND = "native" +PR = "r1" +PE = "1" + +SRC_URI[md5sum] = "998e5904764b82642cc63d97b4ba9e95" +SRC_URI[sha256sum] = "5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "DMX: Distributed Multihead extension headers" + +DESCRIPTION = "This package provides the wire protocol for the DMX \ +extension. The DMX extension provides support for communication with \ +and control of Xdmx server. Attributes of the Xdmx server and of the \ +back-end screens attached to the server can be queried and modified via \ +this protocol." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ + file://dmxproto.h;endline=32;md5=ab8509955c3dd4c65fac728e1b367bc4" + +PE = "1" + +SRC_URI[md5sum] = "4ee175bbd44d05c34d43bb129be5098a" +SRC_URI[sha256sum] = "e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers" + +DESCRIPTION = "This package provides the wire protocol for the Direct \ +Rendering Ifnrastructure 2. DIR is required for may hardware \ +accelerated OpenGL drivers." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \ + file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca" + + +SRC_URI[md5sum] = "b2721d5d24c04d9980a0c6540cb5396a" +SRC_URI[sha256sum] = "f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers" + +DESCRIPTION = "This package provides the wire protocol for the Direct \ +Rendering Ifnrastructure 2. DIR is required for may hardware \ +accelerated OpenGL drivers." + +SRCREV = "66c56ab10d917e3f47f93178d7eac6430970d3c4" +PV = "1.99.3+git${SRCPV}" +PR = "r2" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/dri2proto" + +LIC_FILES_CHKSUM="file://COPYING;md5=2e396fa91834f8786032cad2da5638f3" + +S = "${WORKDIR}/git" + diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "Direct Rendering Infrastructure 3 Extension" + +DESCRIPTION = "The DRI3 extension provides mechanisms to translate between direct \ +rendered buffers and X pixmaps. When combined with the Present extension, \ +a complete direct rendering solution for OpenGL is provided." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://dri3proto.h;endline=21;md5=ac90d1d416be3cb13e1d3c88cd5166bf" + + +SRC_URI[md5sum] = "a3d2cbe60a9ca1bf3aea6c93c817fee3" +SRC_URI[sha256sum] = "01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XFixes: X Fixes extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X Fixes \ +extension. This extension is designed to provide server-side support \ +for application work arounds to shortcomings in the core X window \ +system." + + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \ + file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4" + +RCONFLICTS_${PN} = "fixesext" +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "e7431ab84d37b2678af71e29355e101d" +SRC_URI[sha256sum] = "ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XFont: X Font rasterisation headers" + +DESCRIPTION = "This package provides the wire protocol for the X Font \ +rasterisation extensions. These extensions are used to control \ +server-side font configurations." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=c3e48aa9ce868c8e90f0401db41c11a2 \ + file://FSproto.h;endline=44;md5=d2e58e27095e5ea7d4ad456ccb91986c" + +PE = "1" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "36934d00b00555eaacde9f091f392f97" +SRC_URI[sha256sum] = "259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "OpenGL: X OpenGL extension headers" + +DESCRIPTION = "This package provides the wire protocol for the \ +OpenGL-related extensions, used to enable the rendering of applications \ +using OpenGL." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \ + file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9" + +PE = "1" + +BBCLASSEXTEND = "nativesdk" + +SRC_URI[md5sum] = "5565f1b0facf4a59c2778229c1f70d10" +SRC_URI[sha256sum] = "adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XI: X Input extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X Input \ +extension. The extension supports input devices other then the core X \ +keyboard and pointer." + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=e562cc0f6587b961f032211d8160f31e \ + file://XI2proto.h;endline=48;md5=1ac1581e61188da2885cc14ff49b20be" + +PE = "1" + +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "6caebead4b779ba031727f66a7ffa358" +SRC_URI[sha256sum] = "5a47ee62053a6acef3a83f506312494be1461068d0b9269d818839703b95c1d1" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XI: X Input extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X Input \ +extension. The extension supports input devices other then the core X \ +keyboard and pointer." + +PR = "r1" +PE = "1" +SRCREV = "7203036522ba9d4b224d282d6afc2d0b947711ee" +PV = "1.9.99.12+git${SRCPV}" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto" +S = "${WORKDIR}/git" + +inherit gettext + +BBCLASSEXTEND = "native nativesdk" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XKB: X Keyboard extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X \ +Keyboard extension. This extension is used to control options related \ +to keyboard handling and layout." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=7dd6ea99e2a83a552c02c80963623c38 \ + file://XKBproto.h;beginline=1;endline=25;md5=5744eeff407aeb6e7a1346eebab486a2" + +PE = "1" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "677ea8523eec6caca86121ad2dca0b71" +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 @@ +require xorg-proto-common.inc + +SUMMARY = "This package provides the basic headers for the X Window System" +DESCRIPTION = "The Present extension provides a way for applications to update their \ + window contents from a pixmap in a well defined fashion, synchronizing \ + with the display refresh and potentially using a more efficient \ + mechanism than copying the contents of the source pixmap.\ + " + +LICENSE = "GPLv2" + +SRCREV = "24f3a56e541b0a9e6c6ee76081f441221a120ef9" +PV = "1.0+git${SRCPV}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/presentproto" +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +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 @@ +require xorg-proto-common.inc + +SUMMARY = "XRandR: X Resize, Rotate and Reflect extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X Resize, \ +Rotate and Reflect extension. This extension provides the ability to \ +resize, rotate and reflect the root window of a screen." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=00426d41bd3d9267cf9bbb2df9323a5e \ + file://randrproto.h;endline=30;md5=3885957c6048fdf3310ac8ba54ca2c3f" + +RCONFLICTS_${PN} = "randrext" +PE = "1" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "ce4d0b05675968e4c83e003cc809660d" +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 @@ +require xorg-proto-common.inc + +SUMMARY = "XRecord: X Record extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X Record \ +extension. This extension is used to record and play back event \ +sequences." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=575827a0f554bbed332542976d5f3d40 \ + file://recordproto.h;endline=19;md5=1cbb0dd45a0b060ff833901620a3e738" + +RCONFLICTS_${PN} = "recordext" +PR = "r1" +PE = "1" + +SRC_URI[md5sum] = "1b4e5dede5ea51906f1530ca1e21d216" +SRC_URI[sha256sum] = "a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XRender: X rendering Extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X \ +Rendering extension. This is the basis the image composition within the \ +X window system." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=f826d99765196352e6122a406cf0d024 \ + file://renderproto.h;beginline=4;endline=24;md5=3e5e2851dad240b0a3a27c4776b4fd1f" + +RCONFLICTS_${PN} = "renderext" +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "a914ccc1de66ddeb4b611c6b0686e274" +SRC_URI[sha256sum] = "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537" + diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XRes: X Resource extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X \ +Resource extension. XRes provides an interface that allows X clients to \ +see and monitor X resource usage of various clients." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97" + +RCONFLICTS_${PN} = "resourceext" + +PR = "r1" +PE = "1" + +SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4" +SRC_URI[sha256sum] = "3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818" + diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "Xscrnsaver: X Screen Saver extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X Screen \ +Saver extension. This extension allows an external \"screen saver\" \ +client to detect when the alternative image is to be displayed and to \ +provide the graphics." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=eed49b78b15b436c933b6b8b054e3901 \ + file://saverproto.h;endline=26;md5=a84c0637305159f3c0ab173aaeede48d" + +PE = "1" + +EXTRA_OECONF_append = " --enable-specs=no" + +SRC_URI[md5sum] = "edd8a73775e8ece1d69515dd17767bfb" +SRC_URI[sha256sum] = "8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "Xv: X Video extension headers" + +DESCRIPTION = "This package provides the wire protocol for the X Video \ +extension. This extension alows for accerlated drawing of videos." + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=ce3472a119a864085fa4155cb0979a7b" + +PE = "1" + +SRC_URI[md5sum] = "e658641595327d3990eab70fdb55ca8b" +SRC_URI[sha256sum] = "8dae168cb820fcd32f564879afb3f24d27c176300d9af66819a18265539bd4b6" diff --git a/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 @@ +SUMMARY = "XCB: The X protocol C binding headers" +DESCRIPTION = "Function prototypes for the X protocol C-language Binding \ +(XCB). XCB is a replacement for Xlib featuring a small footprint, \ +latency hiding, direct access to the protocol, improved threading \ +support, and extensibility." +HOMEPAGE = "http://xcb.freedesktop.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" + +SECTION = "x11/libs" +LICENSE = "MIT-X" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" + +inherit autotools pkgconfig pythonnative + +PACKAGES += "python-xcbgen" + +FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" +FILES_python-xcbgen = "${libdir}/python*" + +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +DEPENDS_append_class-native = " python-native" +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 @@ +include xcb-proto.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ + file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" + + +SRC_URI[md5sum] = "ade74b8e9c870dc7515adfa209e66063" +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 @@ +DEFAULT_PREFERENCE = "-1" + +include xcb-proto.inc +SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66" +PV = "1.2+gitr${SRCPV}" +PR = "r4" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto" +S = "${WORKDIR}/git" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XC-MISC: X XC-Miscellaneous extension headers" + +DESCRIPTION = "This package provides the wire protocol for the XC-MISC \ +extension, which is used to get details of XID allocations within the \ +server." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=09d83047c15994e05db29b423ed6662e" + +PE = "1" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "5f4847c78e41b801982c8a5e06365b24" +SRC_URI[sha256sum] = "b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XExt: X Extension headers" + +DESCRIPTION = "This package provides the wire protocol for several X \ +extensions. These protocol extensions include DOUBLE-BUFFER, DPMS, \ +Extended-Visual-Information, LBX, MIT_SHM, MIT_SUNDRY-NONSTANDARD, \ +Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, XC-APPGROUP, XC-MISC, \ +XTEST. In addition a small set of utility functions are also \ +available." + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=86f273291759d0ba2a22585cd1c06c53" + +PE = "1" + +inherit gettext + +EXTRA_OECONF_append = " --enable-specs=no" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "70c90f313b4b0851758ef77b95019584" +SRC_URI[sha256sum] = "f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension headers" + +DESCRIPTION = "This package provides the wire protocol for the XFree86 \ +Direct Graphics Access extension. This extension allows direct graphics \ +access to a framebuffer-like region, as well as relative mouse \ +reporting." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6" + +RCONFLICTS_${PN} = "xxf86dgaext" +PR = "r2" +PE = "1" + +SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1" +SRC_URI[sha256sum] = "ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XFree86-DRI: XFree86 Direct Rendering Infrastructure extension headers" + +DESCRIPTION = "This package provides the wire protocol for the XFree86 \ +Direct Rendering Infrastructure extension. The XFree86-DRI extension is \ +used to organize direct rendering support or 3D clients and help \ +arbitrate requests." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=ef103b9d951e39ff7e23d386e2011fa3 \ + file://xf86driproto.h;endline=35;md5=42be3d8e6d429ab79172572bb0cff544" + +PE = "1" + +SRC_URI[md5sum] = "1d716d0dac3b664e5ee20c69d34bc10e" +SRC_URI[sha256sum] = "9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension headers" + +DESCRIPTION = "This package provides the wire protocol for the XFree \ +miscellaneous extension. The XFree86-Misc extension provides a means to \ +access input device configuration settings specific to the XFree86/Xorg \ +DDX." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6" + +PR = "r1" +PE = "1" + +SRC_URI[md5sum] = "ca63bbb31cf5b7f37b2237e923ff257a" +SRC_URI[sha256sum] = "45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "XFree86-VM: XFree86 video mode extension headers" + +DESCRIPTION = "This package provides the wire protocol for the XFree86 \ +video mode extension. This extension allows client applications to get \ +and set video mode timings." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=499be2ff387a42f84628c35f311f1502" + +RCONFLICTS_${PN} = "xxf86vmext" + +PR = "r1" +PE = "1" + +SRC_URI[md5sum] = "e793ecefeaecfeabd1aed6a01095174e" +SRC_URI[sha256sum] = "45d9499aa7b73203fd6b3505b0259624afed5c16b941bd04fcf123e5de698770" diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "Xinerama: Xinerama extension headers" + +DESCRIPTION = "This package provides the wire protocol for the Xinerama \ +extension. This extension is used for retrieving information about \ +physical output devices which may be combined into a single logical X \ +screen." + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=3e397a5326c83d5d0ebf5b3f87163ac6 \ + file://panoramiXproto.h;endline=24;md5=098e0bc089368a988092b3cbda617a57" + +PE = "1" + +SRC_URI[md5sum] = "9959fe0bfb22a0e7260433b8d199590a" +SRC_URI[sha256sum] = "977574bb3dc192ecd9c55f59f991ec1dff340be3e31392c95deff423da52485b" diff --git a/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 @@ +SUMMARY = "X protocol headers: ${XORG_PN}" +HOMEPAGE = "http://www.x.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" + +SECTION = "x11/libs" +LICENSE = "MIT-X" + +XORG_PN = "${BPN}" + +SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2" + +S = "${WORKDIR}/${XORG_PN}-${PV}" + +DEPENDS = "util-macros" + +inherit autotools pkgconfig +EXTRA_OECONF = "--without-fop" + +UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto --with-xmlto" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" + +# ${PN} is empty so we need to tweak -dev and -dbg package dependencies +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/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 @@ +Upstream-Status: Pending + +Don't always define LONG64 for AMD64 + +X32 defines __amd64__/amd64 with 32bit long. We should simply check +__LP64__ before defining LONG64 without checking __amd64__/amd64. + +This fixes compilation with x32 toolchain. + +Received this patch from H.J. Lu +Signed-Off-By: Nitin A Kamble 2011/12/1 + +--- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 ++++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 +@@ -62,7 +62,6 @@ SOFTWARE. + defined(__ia64__) || defined(ia64) || \ + defined(__sparc64__) || \ + defined(__s390x__) || \ +- defined(__amd64__) || defined(amd64) || \ + defined(__powerpc64__) + # define LONG64 /* 32/64-bit architecture */ + # endif diff --git a/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 @@ +require xorg-proto-common.inc + +SUMMARY = "Xlib: C Language X interface headers" + +DESCRIPTION = "This package provides the basic headers for the X Window \ +System." + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=b9e051107d5628966739a0b2e9b32676" + +PE = "1" + +SRC_URI += "file://xproto_fix_for_x32.patch" + +EXTRA_OECONF_append = " --enable-specs=no" +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "4dc2464bfeade23dab5de38da0f6b1b5" +SRC_URI[sha256sum] = "636162c1759805a5a0114a369dffdeccb8af8c859ef6e1445f26a4e6e046514f" + 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 @@ +SUMMARY = "Program to create dependencies in makefiles" + +DESCRIPTION = "The gccmakedep program calls 'gcc -M' to output makefile \ +rules describing the dependencies of each sourcefile, so that make knows \ +which object files must be recompiled when a dependency has changed." + +require xorg-util-common.inc +LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" +DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" +DEPENDS = "util-macros" +RDEPENDS_${PN} = "gcc" + +PR = "r3" +PE = "1" + +SRC_URI[md5sum] = "127ddb6131eb4a56fdf6644a63ade788" +SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548" \ 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 @@ +require xorg-util-common.inc + +SUMMARY = "create dependencies in makefiles" + +DESCRIPTION = "The makedepend program reads each sourcefile in sequence \ +and parses it like a C-preprocessor, processing \ +all #include, #define, #undef, #ifdef, #ifndef, #endif, #if, #elif \ +and #else directives so that it can correctly tell which #include, \ +directives would be used in a compilation. Any #include, directives \ +can reference files having other #include directives, and parsing will \ +occur in these files as well." + +DEPENDS = "xproto util-macros" +PE = "1" + +BBCLASSEXTEND = "native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=43a6eda34b48ee821b3b66f4f753ce4f" + +SRC_URI[md5sum] = "efb2d7c7e22840947863efaedc175747" +SRC_URI[sha256sum] = "503903d41fb5badb73cb70d7b3740c8b30fe1cc68c504d3b6a85e6644c4e5004" diff --git a/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 @@ +SUMMARY = "X autotools macros" + +DESCRIPTION = "M4 autotools macros used by various X.org programs." + +require xorg-util-common.inc + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662" + +PE = "1" + +SRC_URI[md5sum] = "40e1caa49a71a26e0aa68ddd00203717" +SRC_URI[sha256sum] = "0d4df51b29023daf2f63aebf3ebc638ea88efedfd560ab5866741ab3f92acaa1" + +# ${PN} is empty so we need to tweak -dev and -dbg package dependencies +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/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 @@ +HOMEPAGE = "http://www.x.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" + +SECTION = "x11/utils" +LICENSE = "MIT-X" + +XORG_PN = "${BPN}" + +SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz" + +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig diff --git a/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 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "evdev" + Option "CoreKeyboard" + Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "evdev" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Qemu Tablet" + Driver "evdev" + Option "CorePointer" + Option "Device" "/dev/input/touchscreen0" + Option "USB" "on" +EndSection + +Section "Device" + Identifier "Graphics Controller" + Driver "fbdev" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" + # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz + Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz + ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync + # 640x480 @ 72Hz (VESA) hsync: 37.9kHz + ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync + # 640x480 @ 75Hz (VESA) hsync: 37.5kHz + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync + # 640x480 @ 85Hz (VESA) hsync: 43.3kHz + ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Graphics Controller" + Monitor "Generic Monitor" + SubSection "Display" + Modes "640x480" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + # InputDevice "Configured Mouse" + InputDevice "QEMU Tablet" + Option "AllowEmptyInput" "no" +EndSection diff --git a/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 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "evdev" + Option "CoreKeyboard" + Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "evdev" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Qemu Tablet" + Driver "evdev" + Option "CorePointer" + Option "Device" "/dev/input/touchscreen0" + Option "USB" "on" +EndSection + +Section "Device" + Identifier "Graphics Controller" + Driver "fbdev" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" + # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz + Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz + ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync + # 640x480 @ 72Hz (VESA) hsync: 37.9kHz + ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync + # 640x480 @ 75Hz (VESA) hsync: 37.5kHz + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync + # 640x480 @ 85Hz (VESA) hsync: 43.3kHz + ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Graphics Controller" + Monitor "Generic Monitor" + DefaultDepth 16 + SubSection "Display" + Modes "640x480" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + # InputDevice "Configured Mouse" + InputDevice "QEMU Tablet" + Option "AllowEmptyInput" "no" +EndSection diff --git a/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 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "evdev" + Option "CoreKeyboard" + Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "evdev" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Qemu Tablet" + Driver "evdev" + Option "CorePointer" + Option "Device" "/dev/input/touchscreen0" + Option "USB" "on" +EndSection + +Section "Device" + Identifier "Graphics Controller" + Driver "fbdev" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" + # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz + Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz + ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync + # 640x480 @ 72Hz (VESA) hsync: 37.9kHz + ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync + # 640x480 @ 75Hz (VESA) hsync: 37.5kHz + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync + # 640x480 @ 85Hz (VESA) hsync: 43.3kHz + ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Graphics Controller" + Monitor "Generic Monitor" + SubSection "Display" + Modes "640x480" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + # InputDevice "Configured Mouse" + InputDevice "QEMU Tablet" + Option "AllowEmptyInput" "no" +EndSection diff --git a/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 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "evdev" + Option "CoreKeyboard" + Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "evdev" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Qemu Tablet" + Driver "evdev" + Option "CorePointer" + Option "Device" "/dev/input/touchscreen0" + Option "USB" "on" +EndSection + +Section "Device" + Identifier "Graphics Controller" + Driver "fbdev" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" + # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz + Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz + ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync + # 640x480 @ 72Hz (VESA) hsync: 37.9kHz + ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync + # 640x480 @ 75Hz (VESA) hsync: 37.5kHz + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync + # 640x480 @ 85Hz (VESA) hsync: 43.3kHz + ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Graphics Controller" + Monitor "Generic Monitor" + SubSection "Display" + Modes "640x480" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + # InputDevice "Configured Mouse" + InputDevice "QEMU Tablet" + Option "AllowEmptyInput" "no" +EndSection diff --git a/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 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "evdev" + Option "CoreKeyboard" + Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "evdev" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Qemu Tablet" + Driver "evdev" + Option "CorePointer" + Option "Device" "/dev/input/touchscreen0" + Option "USB" "on" +EndSection + +Section "Device" + Identifier "Graphics Controller" + Driver "fbdev" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" + # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz + Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz + ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync + # 640x480 @ 72Hz (VESA) hsync: 37.9kHz + ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync + # 640x480 @ 75Hz (VESA) hsync: 37.5kHz + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync + # 640x480 @ 85Hz (VESA) hsync: 43.3kHz + ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Graphics Controller" + Monitor "Generic Monitor" + SubSection "Display" + Modes "640x480" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + # InputDevice "Configured Mouse" + InputDevice "QEMU Tablet" + Option "AllowEmptyInput" "no" +EndSection diff --git a/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 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "evdev" + Option "CoreKeyboard" + Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "evdev" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "vmmouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Qemu Tablet" + Driver "evdev" + Option "CorePointer" + Option "Device" "/dev/input/touchscreen0" + Option "USB" "on" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" + # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz + Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz + ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync + # 640x480 @ 72Hz (VESA) hsync: 37.9kHz + ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync + # 640x480 @ 75Hz (VESA) hsync: 37.5kHz + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync + # 640x480 @ 85Hz (VESA) hsync: 43.3kHz + ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Graphics Controller" + Monitor "Generic Monitor" + SubSection "Display" + Modes "640x480" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + # InputDevice "Configured Mouse" + InputDevice "QEMU Tablet" + Option "AllowEmptyInput" "no" +EndSection diff --git a/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 @@ + +Section "Files" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "evdev" + Option "CoreKeyboard" + Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "evdev" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "vmmouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" +EndSection + +Section "InputDevice" + Identifier "Qemu Tablet" + Driver "evdev" + Option "CorePointer" + Option "Device" "/dev/input/touchscreen0" + Option "USB" "on" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" + # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz + Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz + ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync + # 640x480 @ 72Hz (VESA) hsync: 37.9kHz + ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync + # 640x480 @ 75Hz (VESA) hsync: 37.5kHz + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync + # 640x480 @ 85Hz (VESA) hsync: 43.3kHz + ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Graphics Controller" + Monitor "Generic Monitor" + SubSection "Display" + Modes "640x480" + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + # InputDevice "Configured Mouse" + InputDevice "QEMU Tablet" + Option "AllowEmptyInput" "no" +EndSection diff --git a/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 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 @@ +SUMMARY = "X.Org X server configuration file" +HOMEPAGE = "http://www.x.org" +SECTION = "x11/base" +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r33" + +SRC_URI = "file://xorg.conf" + +CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +ALLOW_EMPTY_${PN} = "1" + +do_install () { + if test -s ${WORKDIR}/xorg.conf; then + install -d ${D}/${sysconfdir}/X11 + install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ + fi +} 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 @@ +SUMMARY = "The X.Org X server" +HOMEPAGE = "http://www.x.org" +SECTION = "x11/base" +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=15b5bf9327341c81089137aec4830bfd" + +# xf86-*-* packages depend on an X server built with the xfree86 DDX +# so we have a virtual to represent that: +# deprecated, we should use virtual/xserver instead +PROVIDES = "virtual/xserver-xf86" + +# Other packages tend to just care that there is *an* X server: +PROVIDES += "virtual/xserver" + +PE = "2" +INC_PR = "r8" + +XORG_PN = "xorg-server" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI += "file://macro_tweak.patch" + +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig + +PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" +LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" + +# Split out some modules and extensions from the main package +# These aren't needed for basic operations and only take up space: +# 32.0k libdri.so +# 91.0k libexa.so +# 336.0k libglx.so +# 1360k libint10.so +# 180.0k libwfb.so +# 320.0k libxaa.so +# 124.0k libxf1bpp.so +# 84.0k libxf4bpp.so +# librecord.so +# libextmod.so +# libdbe.so + +PACKAGES =+ "${PN}-security-policy \ + ${PN}-sdl \ + ${PN}-fbdev \ + ${PN}-xvfb \ + ${PN}-utils \ + ${PN}-xephyr \ + ${PN}-multimedia-modules \ + ${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-glx \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + ${PN}-module-libint10 \ + ${PN}-module-libafb \ + ${PN}-module-libwfb \ + ${PN}-module-libmfb \ + ${PN}-module-libcfb \ + ${PN}-module-exa \ + ${PN}-module-xaa \ + ${PN}-module-libxf1bpp \ + ${PN}-module-libxf4bpp" + +RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" +RDEPENDS_${PN}-xvfb += "xkeyboard-config" +RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" + +FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" +FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" +FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" +FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ + ${libdir}/xorg/modules/*/.debug \ + ${libdir}/xorg/modules/*/*/.debug \ + " +FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" +FILES_${PN}-sdl = "${bindir}/Xsdl" +FILES_${PN}-fbdev = "${bindir}/Xfbdev" +FILES_${PN}-xvfb = "${bindir}/Xvfb" +FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" +FILES_${PN}-xephyr = "${bindir}/Xephyr" +FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" +FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" +FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" +FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" +FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" +FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" +FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" +FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" +FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" +FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" +FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" +FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" +FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" +FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" +FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" +FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" + +EXTRA_OECONF += "--with-fop=no \ + --with-pic \ + --disable-static \ + --disable-xinerama \ + --disable-record \ + --disable-dmx \ + --disable-xnest \ + --enable-xvfb \ + --enable-composite \ + --without-dtrace \ + --with-int10=x86emu \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-xkb-output=/var/lib/xkb \ + --with-sha1=libcrypto \ + ac_cv_file__usr_share_sgml_X11_defs_ent=no \ +" + +PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" +PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" +PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" +# DRI3 requires xshmfence to also be enabled +PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" +PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" +PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" +PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" +PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" + +do_install_append () { + # Its assumed base-files creates this for us + rmdir ${D}${localstatedir}/log/ +} + +# Add runtime provides for the ABI versions of the video and input subsystems, +# so that drivers can depend on the relevant version. +python populate_packages_prepend() { + import subprocess + + # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going + # into the new package, not the staged ones. + newenv = dict(os.environ) + newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/") + + def get_abi(name): + abis = { + "video": "abi_videodrv", + "input": "abi_xinput" + } + p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], + shell=True, env=newenv, stdout=subprocess.PIPE) + output = p.communicate()[0] + mlprefix = d.getVar('MLPREFIX', True) or '' + return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) + + pn = d.getVar("PN", True) + d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) + d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) +} diff --git a/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 @@ +Upstream-Status: Inappropriate [configuration] + +diff --git a/configure.ac b/configure.ac +index b3b752c..600500b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross + dnl compiling, assume default font path uses standard FONTROOTDIR directories. + DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" +-if test "$cross_compiling" != yes; then +- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], +- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], +- [case $host_os in ++ case $host_os in + darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; +- esac]) +-fi ++ esac + AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), + [ FONTPATH="$withval" ], + [ FONTPATH="${DEFAULT_FONT_PATH}" ]) diff --git a/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 @@ +Upstream-Status: Pending + +Index: git/os/osdep.h +=================================================================== +--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 ++++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100 +@@ -92,7 +92,7 @@ + * like sysconf(_SC_OPEN_MAX) is not supported. + */ + +-#if OPEN_MAX <= 256 ++#if 0 + #define MAXSOCKS (OPEN_MAX - 1) + #else + #define MAXSOCKS 256 diff --git a/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 @@ +This is the revised version of files/macro_tweak.patch for +xorg-server 1.8.99.904 and newer. + +Upstream-Status: Pending + +Signed-off-by: Yu Ke + +diff --git a/xorg-server.m4 b/xorg-server.m4 +index bdecf62..040fdb8 100644 +--- a/xorg-server.m4 ++++ b/xorg-server.m4 +@@ -28,10 +28,12 @@ dnl + # Checks for the $1 define in xorg-server.h (from the sdk). If it + # is defined, then add $1 to $REQUIRED_MODULES. + ++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) ++ + AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" ++ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "xorg-server.h" + #if !defined $1 diff --git a/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 @@ +on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well +so we end up with incompatible conversion errors + +This patch choses the right values for mips64 + +Signed-off-by: Khem Raj + +Upstream-Status: Pending +Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h +=================================================================== +--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 ++++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 +@@ -101,6 +101,7 @@ + #if defined(NO_INLINE) || defined(DO_PROTOTYPES) + #if !defined(__arm__) + #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ ++ && !defined(__mips64) \ + && !(defined(__alpha__) && defined(linux)) \ + && !(defined(__ia64__) && defined(linux)) \ + +@@ -721,7 +722,7 @@ + } + + #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) +-#ifdef __arm32__ ++#if defined (__arm32__) || defined (__mips64) + #define PORT_SIZE long + #else + #define PORT_SIZE short diff --git a/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 @@ +[ YOCTO #6583 ] + +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 28 May 2014 08:13:59 +0100 +Subject: xfree86: Report DRI3 as a built-in module + +This is so that drivers can do a runtime check that DRI3 is available, +similar to existing runtime checks performed by the drivers for DRI and +DRI2. + +v2: Only add DRI3 to the list if the module was actually built into the +server (Mark Kettenis). + +Signed-off-by: Chris Wilson +Cc: Mark Kettenis +Signed-off-by: Keith Packard + +diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c +index 092bf57..f92ad8d 100644 +--- a/hw/xfree86/loader/loadmod.c ++++ b/hw/xfree86/loader/loadmod.c +@@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = { + "extmod", + "dri", + "dri2", ++#if DRI3 ++ "dri3", ++#endif + NULL + }; + +-- +cgit v0.10.2 + + +From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 28 May 2014 08:14:00 +0100 +Subject: xfree86: Report Present as a built-in module + +This is so that drivers can do a runtime check that Present is available, +similar to existing runtime checks performed by the drivers for DRI. + +Signed-off-by: Chris Wilson +Signed-off-by: Keith Packard + +diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c +index f92ad8d..e1f649a 100644 +--- a/hw/xfree86/loader/loadmod.c ++++ b/hw/xfree86/loader/loadmod.c +@@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = { + #if DRI3 + "dri3", + #endif ++#if PRESENT ++ "present", ++#endif + NULL + }; + +-- +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 @@ +This patch comes from: +http://lists.x.org/archives/xorg-devel/2013-October/037996.html + +Upstream-Status: Backport + +Signed-off-by: Baogen shang +diff -Naur xorg-server-1.14.0-orig/exa/exa_render.c xorg-server-1.14.0/exa/exa_render.c +--- xorg-server-1.14.0-orig/exa/exa_render.c 2014-02-27 14:32:38.000000000 +0800 ++++ xorg-server-1.14.0/exa/exa_render.c 2014-02-27 15:46:59.000000000 +0800 +@@ -1141,7 +1141,8 @@ + + exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); + for (; ntrap; ntrap--, traps++) +- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); ++ if (xTrapezoidValid(traps)) ++ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); + exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); + + xRel = bounds.x1 + xSrc - xDst; +diff -Naur xorg-server-1.14.0-orig/render/picture.h xorg-server-1.14.0/render/picture.h +--- xorg-server-1.14.0-orig/render/picture.h 2014-02-27 14:32:26.000000000 +0800 ++++ xorg-server-1.14.0/render/picture.h 2014-02-27 15:48:13.000000000 +0800 +@@ -211,7 +211,7 @@ + /* whether 't' is a well defined not obviously empty trapezoid */ + #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ + (t)->right.p1.y != (t)->right.p2.y && \ +- (int) ((t)->bottom - (t)->top) > 0) ++ ((t)->bottom > (t)->top)) + + /* + * 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 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +commit ca29a9f3e689f3840426897f58aaa3974932ae78 +Author: Ross Burton +Date: Mon Jul 7 12:53:35 2014 +0100 + + configure.ac: add option for xshmfence + + xshmfence is usable outside of DRI3, and is currently autodetected which isn't + good for distributions where deterministic builds are aspired to. + + Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index c214638..a1ca9ec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -648,6 +648,7 @@ AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd d + AC_ARG_ENABLE(kdrive-mouse, AS_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto]) + AC_ARG_ENABLE(kdrive-evdev, AS_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto]) + AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"]) ++AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [WANT_XSHMFENCE="$enableval"], [WANT_XSHMFENCE="auto"]) + + + dnl chown/chmod to be setuid root as part of build +@@ -1235,18 +1236,21 @@ esac + + AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes) + +-PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, +- [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) + +-AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes) ++PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) ++if test "x$WANT_XSHMFENCE" = "xauto"; then ++ WANT_XSHMFENCE="$HAVE_XSHMFENCE" ++fi + +-case x"$HAVE_XSHMFENCE" in +- xyes) +- AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library]) +- REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" +- ;; +-esac ++if test "x$WANT_XSHMFENCE" = "xyes"; then ++ if test "x$HAVE_XSHMFENCE" != "xyes"; then ++ AC_MSG_ERROR([xshmfence requested but not installed.]) ++ fi ++ AC_DEFINE(HAVE_XSHMFENCE, 1, [Have xshmfence support]) ++ REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" ++fi + ++AM_CONDITIONAL(XSHMFENCE, [test "x$WANT_XSHMFENCE" = xyes]) + + case "$DRI3,$HAVE_XSHMFENCE" in + 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 @@ +require xserver-xorg.inc + +# Misc build failure for master HEAD +SRC_URI += "file://crosscompile.patch \ + file://fix_open_max_preprocessor_error.patch \ + file://mips64-compiler.patch \ + file://xorg-CVE-2013-6424.patch \ + file://xshmfence-option.patch \ + file://present-module.patch \ + " + +SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227" +SRC_URI[sha256sum] = "626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2" + +# These extensions are now integrated into the server, so declare the migration +# path for in-place upgrades. + +RREPLACES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RPROVIDES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RCONFLICTS_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " diff --git a/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 @@ +SUMMARY = "XRes: A top-like resource usage tool for X" + +DESCRIPTION = "top-like statistics of X11 server resource usage by clients" + +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop" +BUGTRACKER = "https://bugs.freedesktop.org/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://xrestop.c;endline=18;md5=730876c30f0d8a928676bcd1242a3b35" + +SECTION = "x11/utils" +PR = "r3" + +DEPENDS = "libxres libxext virtual/libx11 ncurses" + +SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-${PV}.tar.gz" + +SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b" +SRC_URI[sha256sum] = "67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257" + +inherit autotools pkgconfig 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 @@ +#!/bin/sh + +. /etc/formfactor/config + +if [ "$HAVE_TOUCHSCREEN" = "1" ]; then + n=1 + while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] && [ $n -le 5 ] + do + /usr/bin/xtscal + sleep 1 + n=$(($n+1)) + done +fi diff --git a/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 @@ +Upstream-Status: Pending + +--- tmp/main.c.orig 2007-01-02 15:39:54.000000000 +0000 ++++ tmp/main.c 2007-01-02 15:39:54.000000000 +0000 +@@ -131,9 +131,10 @@ + { + XRenderFillRectangles (dpy, PictOpSrc, pict, &rect_color, rectangles, 2); + +- XFillArc (dpy, crosshair_w, crosshair_gc, (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, +- (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, +- WIDTH + 1, WIDTH + 1, 0, 360 * 64); ++ XFillRectangle (dpy, crosshair_w, crosshair_gc, ++ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), ++ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), ++ WIDTH, WIDTH); + } + + void diff --git a/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 @@ +--- + Makefile.am | 9 -- + configure.ac | 3 + gpe-dist.am | 12 --- + h3600_ts.h | 216 ----------------------------------------------------------- + main.c | 210 ++------------------------------------------------------- + xtscal.in | 19 ----- + 6 files changed, 14 insertions(+), 455 deletions(-) + +Upstream-Status: Pending + +Index: xtscal-0.6.3/xtscal.in +=================================================================== +--- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,19 +0,0 @@ +-#!/bin/sh +- +-module_id() { +- # Get model name +- echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` +-} +- +-case `module_id` in +- "HP IPAQ H3100" | "HP IPAQ H3800" ) +- ARGS="-rotate 90" ;; +- "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE) +- ARGS="-rotate 270" ;; +- # H2200: works without rotation +-esac +- +-# the things we do for autoconf +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-exec @libexecdir@/xtscal.bin $ARGS $* +Index: xtscal-0.6.3/main.c +=================================================================== +--- xtscal-0.6.3.orig/main.c 2007-07-01 01:12:52.000000000 +0100 ++++ xtscal-0.6.3/main.c 2007-07-01 01:12:55.000000000 +0100 +@@ -22,12 +22,10 @@ + #include + + #include +-#include + #include + #include + #include + +-#include "h3600_ts.h" + #include "calibrate.h" + + Display *dpy; +@@ -45,15 +43,11 @@ XftColor xftcol; + XftDraw *xftdraw; + XftFont *xftfont; + int screen_x, screen_y; +-int ts_fd; + int samples; + Pixmap bg_pixmap; + int flag_debug; +-int rotation = 0; + int error_base, event_base; + +-int using_xcalibrate; +- + int moving; + + #define CROSSHAIR_SIZE 25 +@@ -63,7 +57,6 @@ int moving; + #define ENOUGH 5 + #define MAX_SAMPLES 40 + +-#define RAW_DEVICE "/dev/h3600_tsraw" + #define FONTNAME "sans-10" + + struct point +@@ -287,12 +280,8 @@ sort_by_y (const void* a, const void *b) + void + set_calibration (calibration *cal) + { +- TS_CAL tc; +- int xtrans, ytrans, xscale, yscale, xyscale, yxscale; + calibration ocal = *cal; + +- if (using_xcalibrate) +- { + FILE *fp; + if (flag_debug) + printf ("constants are: %d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); +@@ -304,29 +293,6 @@ set_calibration (calibration *cal) + } + fprintf (fp, "%d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); + fclose (fp); +- return; +- } +- +- xtrans = cal->a[0] / cal->a[6]; +- ytrans = cal->a[3] / cal->a[6]; +- xscale = cal->a[1] * 256 / cal->a[6]; +- yscale = cal->a[5] * 256 / cal->a[6]; +- xyscale = cal->a[2] * 256 / cal->a[6]; +- yxscale = cal->a[4] * 256 / cal->a[6]; +- +- tc.xtrans = xtrans; +- tc.ytrans = ytrans; +- tc.xscale = xscale; +- tc.yscale = yscale; +- tc.xyswap = 0; +- +- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); +- +- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) +- { +- perror ("TS_SET_CAL"); +- exit (1); +- } + } + + void +@@ -398,80 +364,13 @@ handle_ts_event (int x, int y, int press + } + + void +-read_ts (void) +-{ +- TS_EVENT ts_ev; +- int r; +- +- r = read (ts_fd, &ts_ev, sizeof (ts_ev)); +- if (r == sizeof (ts_ev)) +- handle_ts_event (ts_ev.x, ts_ev.y, ts_ev.pressure); +-} +- +-void +-do_cal (char **args) +-{ +- TS_CAL tc; +- +- tc.xscale = atoi (args[0]); +- tc.xtrans = atoi (args[1]); +- tc.yscale = atoi (args[2]); +- tc.ytrans = atoi (args[3]); +- tc.xyswap = atoi (args[4]); +- +- if (flag_debug) +- fprintf (stderr, "setting: %d %d %d %d %d\n", +- tc.xtrans, tc.ytrans, tc.xscale, tc.yscale, tc.xyswap); +- +- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) +- { +- perror ("TS_SET_CAL"); +- exit (1); +- } +- +- exit (0); +-} +- +-void +-show_cal (void) +-{ +- TS_CAL tc; +- +- if (ioctl (ts_fd, TS_GET_CAL, (void *)&tc) != 0) +- { +- perror ("TS_GET_CAL"); +- exit (1); +- } +- +- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); +-} +- +-void + usage (const char *name) + { +- fprintf (stderr, "usage: %s -view\n", name); +- fprintf (stderr, " %s [-rotate <0 | 90 | 180 | 270>]\n", name); +- fprintf (stderr, " %s -cal \n", name); +- ++ fprintf (stderr, "usage: %s [-debug]\n", name); + exit (1); + } + + int +-xrr_supported (void) +-{ +- int xrr_event_base, xrr_error_base; +- int xrr_major, xrr_minor; +- +- if (XRRQueryExtension (dpy, &xrr_event_base, &xrr_error_base) == False +- || XRRQueryVersion (dpy, &xrr_major, &xrr_minor) == 0 +- || xrr_major != 1 +- || xrr_minor < 1) +- return 0; +- +- return 1; +-} +- +-int + main (int argc, char *argv[]) + { + XSetWindowAttributes attributes; +@@ -480,31 +379,11 @@ main (int argc, char *argv[]) + int max_fd; + GC bg_gc; + int i; +- int have_xrandr; + + for (i = 1; i < argc; i++) + { +- if (!strcmp (argv[i], "-view")) +- { +- show_cal (); +- exit (0); +- } +- else if (!strcmp (argv[i], "-debug")) ++ if (!strcmp (argv[i], "-debug")) + flag_debug = 1; +- else if (!strcmp (argv[i], "-cal")) +- { +- if (argc > (i + 5)) +- do_cal (argv + i + 1); +- else +- usage (argv[0]); +- } +- else if (!strcmp (argv[i], "-rotate")) +- { +- if (argc > (i + 1)) +- rotation = atoi (argv[++i]); +- else +- usage (argv[0]); +- } + else + usage (argv[0]); + } +@@ -531,48 +410,11 @@ main (int argc, char *argv[]) + fprintf (stderr, "failed to set raw mode: error %d\n", r); + exit (1); + } +- +- using_xcalibrate = 1; +- } +- +- have_xrandr = xrr_supported (); +- if (have_xrandr) +- { +- XRRScreenConfiguration *rr_screen; +- Rotation current_rotation; +- +- if (flag_debug) +- fprintf (stderr, "XRANDR is supported\n"); +- +- rr_screen = XRRGetScreenInfo (dpy, RootWindow (dpy, screen)); +- +- XRRRotations (dpy, screen, ¤t_rotation); +- +- XRRFreeScreenConfigInfo (rr_screen); +- +- if (flag_debug) +- fprintf (stderr, "Current RANDR rotation is %d\n", current_rotation); +- +- switch (current_rotation) +- { +- case RR_Rotate_270: +- rotation += 90; +- case RR_Rotate_180: +- rotation += 90; +- case RR_Rotate_90: +- rotation += 90; +- rotation %= 360; +- case RR_Rotate_0: +- break; +- default: +- fprintf (stderr, "Unknown RANDR rotation: %d\n", current_rotation); +- break; +- } + } + else + { +- if (flag_debug) +- fprintf (stderr, "XRANDR not supported\n"); ++ perror ("XCALIBRATE extension missing"); ++ exit (1); + } + + attributes.override_redirect = flag_debug ? False : True; +@@ -666,45 +508,17 @@ main (int argc, char *argv[]) + + for (i = 0; i < NR_POINTS; i++) + { +- switch (rotation) +- { +- case 0: +- cal.xfb[i] = cal.xscr[i]; +- cal.yfb[i] = cal.yscr[i]; +- break; +- case 90: +- cal.xfb[i] = cal.yscr[i]; +- cal.yfb[i] = screen_x - cal.xscr[i]; +- break; +- case 180: +- cal.xfb[i] = screen_x - cal.xscr[i]; +- cal.yfb[i] = screen_y - cal.yscr[i]; +- break; +- case 270: +- cal.xfb[i] = screen_y - cal.yscr[i]; +- cal.yfb[i] = cal.xscr[i]; +- break; +- } ++ cal.xfb[i] = cal.xscr[i]; ++ cal.yfb[i] = cal.yscr[i]; ++ XCalibrateScreenToCoord (dpy, &cal.xfb[i], &cal.yfb[i]); + + if (flag_debug) +- printf ("rotation %d: (%d,%d) -> (%d,%d)\n", rotation, ++ printf ("rotation conversion: (%d,%d) -> (%d,%d)\n", + cal.xscr[i], cal.yscr[i], cal.xfb[i], cal.yfb[i]); + } + + next_event (); + +- if (!using_xcalibrate) +- { +- ts_fd = open (RAW_DEVICE, O_RDONLY); +- if (ts_fd < 0) +- { +- perror (RAW_DEVICE); +- exit (1); +- } +- } +- +- max_fd = (xfd > ts_fd) ? xfd : ts_fd; +- + for (;;) + { + fd_set fds; +@@ -713,12 +527,8 @@ main (int argc, char *argv[]) + + FD_ZERO (&fds); + FD_SET (xfd, &fds); +- if (ts_fd != -1) +- FD_SET (ts_fd, &fds); + +- select (max_fd + 1, &fds, NULL, NULL, NULL); +- +- if (ts_fd != -1 && FD_ISSET (ts_fd, &fds)) +- read_ts (); ++ select (xfd + 1, &fds, NULL, NULL, NULL); + } + } ++ +Index: xtscal-0.6.3/configure.ac +=================================================================== +--- xtscal-0.6.3.orig/configure.ac 2004-09-10 20:11:12.000000000 +0100 ++++ xtscal-0.6.3/configure.ac 2007-07-01 01:12:55.000000000 +0100 +@@ -9,8 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) + # Checks for programs. + AC_PROG_CC + +-PKG_CHECK_MODULES(XTSCAL, x11 xft xext xrandr xcalibrate) ++PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) + + AC_CONFIG_FILES([Makefile]) +-AC_CONFIG_FILES([xtscal]) + AC_OUTPUT +Index: xtscal-0.6.3/gpe-dist.am +=================================================================== +--- xtscal-0.6.3.orig/gpe-dist.am 2004-06-02 23:07:13.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,12 +0,0 @@ +-CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) +- +-dist-upload: dist +- scp $(PACKAGE)-$(VERSION).tar.bz2 $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/ +- +-tag: +- cvs tag $(CVSTAG) +- +-retag: +- cvs tag -F $(CVSTAG) +- +-source: tag dist-upload +Index: xtscal-0.6.3/h3600_ts.h +=================================================================== +--- xtscal-0.6.3.orig/h3600_ts.h 2003-07-05 17:27:10.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,216 +0,0 @@ +-/* +-* +-* Driver for the H3600 Touch Screen and other Atmel controlled devices. +-* +-* Copyright 2000 Compaq Computer Corporation. +-* +-* Use consistent with the GNU GPL is permitted, +-* provided that this copyright notice is +-* preserved in its entirety in all copies and derived works. +-* +-* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED, +-* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS +-* FITNESS FOR ANY PARTICULAR PURPOSE. +-* +-* Author: Charles Flynn. +-* +-*/ +- +- +-#ifndef __H3600_TS_H__ +-#define __H3600_TS_H__ +- +-#include +- +-enum h3600_ts_minor_devices { +- TS_MINOR = 0, +- TSRAW_MINOR = 1, +- KEY_MINOR = 2 +-}; +- +-typedef struct h3600_ts_calibration { +- int xscale; +- int xtrans; +- int yscale; +- int ytrans; +- int xyswap; +-} TS_CAL; +- +-typedef struct h3600_ts_event { +- unsigned short pressure; +- unsigned short x; +- unsigned short y; +- unsigned short pad; +-} TS_EVENT; +- +-/* Deprecated - do not use */ +-typedef struct h3600_ts_return { +- unsigned short pressure; +- unsigned short x; +- unsigned short y; +- unsigned short pad; +-} TS_RET; +- +-enum power_button_mode { +- PBM_SUSPEND = 0, +- PBM_GENERATE_KEYPRESS = 1 +-}; +- +- +-/* ++++++++++++++ +++++++++++++++++++++++++++++++++++++ */ +- +-typedef struct therm_dev { +- short data; +-} THERM_DEV; +- +-#define H3600_BATT_CHEM_ALKALINE 0x01 +-#define H3600_BATT_CHEM_NICD 0x02 +-#define H3600_BATT_CHEM_NIMH 0x03 +-#define H3600_BATT_CHEM_LION 0x04 +-#define H3600_BATT_CHEM_LIPOLY 0x05 +-#define H3600_BATT_CHEM_NOT_INSTALLED 0x06 +-#define H3600_BATT_CHEM_UNKNOWN 0xff +- +-/* These should match the apm_bios.h definitions */ +-#define H3600_AC_STATUS_AC_OFFLINE 0x00 +-#define H3600_AC_STATUS_AC_ONLINE 0x01 +-#define H3600_AC_STATUS_AC_BACKUP 0x02 /* What does this mean? */ +-#define H3600_AC_STATUS_AC_UNKNOWN 0xff +- +-/* These bitfields are rarely "or'd" together */ +-#define H3600_BATT_STATUS_HIGH 0x01 +-#define H3600_BATT_STATUS_LOW 0x02 +-#define H3600_BATT_STATUS_CRITICAL 0x04 +-#define H3600_BATT_STATUS_CHARGING 0x08 +-#define H3600_BATT_STATUS_CHARGE_MAIN 0x10 +-#define H3600_BATT_STATUS_DEAD 0x20 /* Battery will not charge */ +-#define H3600_BATT_NOT_INSTALLED 0x20 /* For expansion pack batteries */ +-#define H3600_BATT_STATUS_FULL 0x40 /* Battery fully charged (and connected to AC) */ +-#define H3600_BATT_STATUS_NOBATT 0x80 +-#define H3600_BATT_STATUS_UNKNOWN 0xff +- +-struct battery_data { +- unsigned char chemistry; +- unsigned char status; +- unsigned short voltage; /* Voltage for battery #0; unknown for battery #1 */ +- unsigned short percentage; /* Percentage of full charge */ +- unsigned short life; /* Life remaining in minutes */ +-}; +- +-struct h3600_battery { +- unsigned char ac_status; +- unsigned char battery_count; /* How many batteries we have */ +- struct battery_data battery[2]; +-}; +- +-/* -------- EEPROM and SPI Interfaces ---------------*/ +- +-#define EEPROM_RD_BUFSIZ 6 /* EEPROM reads are 16 bits */ +-#define EEPROM_WR_BUFSIZ 5 /* Allow room for 8bit 'addr' field in buffer*/ +-#define SPI_RD_BUFSIZ 16 /* SPI reads are 8 bits */ +-#define SPI_WR_BUFSIZ 7 +- +-/* The EEPROM is where internal programs are stored on the Amtel. +- You probably don't want to read or write these values */ +- +-typedef struct h3600_eeprom_read_request { +- unsigned char addr; /* 8bit Address Offset 0-255 */ +- unsigned char len; /* Number of 16bit words to read 0-128 */ +- unsigned short buff[EEPROM_RD_BUFSIZ]; +-} EEPROM_READ; +- +-typedef struct h3600_eeprom_write_request { +- unsigned char len; /* used only to compute the number of bytes to send */ +- unsigned char addr; /* 0-128 */ +- unsigned short buff[EEPROM_WR_BUFSIZ]; +-} EEPROM_WRITE; +- +-/* The SPI bus connects to EEPROMs located on sleeves plugged into +- the iPAQ. You may want to read these values */ +- +-typedef struct h3600_spi_read_request { +- unsigned short addr; /* 16bit Address Offset 0-128 */ +- unsigned char len; /* Number of bytes to read */ +- unsigned char buff[SPI_RD_BUFSIZ]; +-} SPI_READ; +- +-#define SPI_READ_STATUS_BYTE 0xffff /* Use this address to read the status byte */ +- +-typedef struct h3600_spi_write_request { +- unsigned short len; /* used only to compute the number of bytes to send */ +- unsigned short addr; /* this 16bit address accesses a single byte */ +- unsigned char buff[SPI_WR_BUFSIZ]; +-} SPI_WRITE; +- +- +-/* -------- end of EEPROM and SPI Interfaces ---------------*/ +- +-/* User space structures for IOCTL calls */ +- +-typedef struct h3600_ts_version { +- unsigned char host_version[8]; /* ascii "x.yy" */ +- unsigned char pack_version[8]; /* ascii "x.yy" */ +- unsigned char boot_type; /* TODO ?? */ +-} VER_RET; +- +-typedef struct h3600_ts_led { +- unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ +- unsigned char TotalTime; /* Units of 5 seconds */ +- unsigned char OnTime; /* units of 100m/s */ +- unsigned char OffTime; /* units of 100m/s */ +-} LED_IN; +- +-enum flite_mode { +- FLITE_MODE1 = 1, +- FLITE_AUTO_MODE = 1, /* for reference only */ +- FLITE_MANUAL_MODE = 2, /* Use this normally? */ +- FLITE_GET_LIGHT_SENSOR = 3 /* Returns light reading in "brightness" field */ +-}; +-enum flite_pwr { +- FLITE_PWR_OFF = 0, +- FLITE_PWR_ON = 1 +-}; +- +-typedef struct h3600_ts_flite { +- unsigned char mode; +- unsigned char pwr; +- unsigned char brightness; +-} FLITE_IN; +- +-/*************************** Updated "universal" structures *******************/ +- +-/* Sets backlight for both H3100 and H3600 models - technically "frontlight" for H3600 */ +-struct h3600_ts_backlight { +- enum flite_pwr power; /* 0 = off, 1 = on */ +- unsigned char brightness; /* 0 - 255 */ +-}; +- +-struct h3600_ts_contrast { /* Only useful on H3100 model */ +- unsigned char contrast; /* 0 - 255 */ +-}; +- +-/* IOCTL cmds user or kernel space */ +- +-/* Use 'f' as magic number */ +-#define IOC_H3600_TS_MAGIC 'f' +- +-/* TODO: Some of these IOWR values are just plain wrong */ +-#define GET_VERSION _IOR(IOC_H3600_TS_MAGIC, 1, struct h3600_ts_version ) +-#define READ_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 2, struct h3600_eeprom_read_request) +-#define WRITE_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 3, struct h3600_eeprom_write_request) +-#define GET_THERMAL _IOR(IOC_H3600_TS_MAGIC, 4, struct therm_dev) +-#define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) +-#define GET_BATTERY_STATUS _IOR(IOC_H3600_TS_MAGIC, 6, struct h3600_battery) +-#define FLITE_ON _IOW(IOC_H3600_TS_MAGIC, 7, struct h3600_ts_flite) +-#define READ_SPI _IOWR(IOC_H3600_TS_MAGIC, 8, struct h3600_spi_read_request) +-#define WRITE_SPI _IOWR(IOC_H3600_TS_MAGIC, 9, struct h3600_spi_write_request) +-#define TS_GET_CAL _IOR(IOC_H3600_TS_MAGIC, 10, struct h3600_ts_calibration) +-#define TS_SET_CAL _IOW(IOC_H3600_TS_MAGIC, 11, struct h3600_ts_calibration) +- +-/* New IOCTL interfaces - defined to be more user friendly */ +-#define TS_GET_BACKLIGHT _IOR(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) +-#define TS_SET_BACKLIGHT _IOW(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) +-#define TS_GET_CONTRAST _IOR(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) +-#define TS_SET_CONTRAST _IOW(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) +- +-#endif +Index: xtscal-0.6.3/Makefile.am +=================================================================== +--- xtscal-0.6.3.orig/Makefile.am 2004-06-02 23:07:13.000000000 +0100 ++++ xtscal-0.6.3/Makefile.am 2007-07-02 12:51:02.000000000 +0100 +@@ -1,11 +1,8 @@ +-libexec_PROGRAMS = xtscal.bin +-bin_SCRIPTS = xtscal ++bin_PROGRAMS = xtscal + +-xtscal_bin_SOURCES = main.c calibrate.c calibrate.h h3600_ts.h ++xtscal_SOURCES = main.c calibrate.c calibrate.h + +-xtscal_bin_LDADD = @XTSCAL_LIBS@ ++xtscal_LDADD = @XTSCAL_LIBS@ + + INCLUDES = @XTSCAL_CFLAGS@ -DNR_POINTS=5 + +-include gpe-dist.am +- diff --git a/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 @@ +after gcc linking has changed, all the libraries must be explicitely specified +This patch avoids this linking error: + +| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o xtscal main.o calibrate.o -lX11 -lXft -lXext -lXcalibrate^M +| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: ^?: invalid DSO for symbol `XRenderChangePicture' definition^M +| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M +| collect2: ld returned 1 exit status^M +| make: *** [xtscal] Error 1 + +Nitin A Kamble +Date: 2011/01/11 + +Upstream-Status: Pending + +Index: xtscal-0.6.3/configure.ac +=================================================================== +--- xtscal-0.6.3.orig/configure.ac ++++ xtscal-0.6.3/configure.ac +@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) + # Checks for programs. + AC_PROG_CC + +-PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) ++PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate xrender) + + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT diff --git a/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 @@ +SUMMARY = "Touchscreen calibration utility" + +DESCRIPTION = "Basic touchscreen calibration utility" + +HOMEPAGE = "http://gpe.linuxtogo.org" +BUGTRACKER = "http://bugs.linuxtogo.org" +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://main.c;endline=10;md5=8721bcb08ae9f24e5fe4c82941873c87" + +SECTION = "x11/base" + +DEPENDS = "virtual/libx11 libxft libxcalibrate" + +PR = "r13" + +SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ + file://change-cross.patch \ + file://cleanup.patch \ + file://dso_linking_change_build_fix.patch \ + file://30xTs_Calibrate.sh" + +SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" +SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1" + +inherit autotools pkgconfig + +do_install_append() { + install -d ${D}${sysconfdir}/X11/Xsession.d/ + install -m 0755 ${WORKDIR}/30xTs_Calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ +} diff --git a/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 @@ +SUMMARY = "Simple XVideo test application" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://src/test-xvideo.c;beginline=1;endline=20;md5=6ae3b4c3c2ff9e51dbbc35bb237afa00" +DEPENDS = "libxv" + +SRCREV = "f8f320d0254c09ce483fc1d8ee99ecf5bc940965" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/test-xvideo" + +S = "${WORKDIR}/git" + +inherit autotools -- cgit v1.2.3-54-g00ecf