cogl: upgrade to 1.16.0
PATCH 1/5 cogl: upgrade to 1.16.0
Drop two patches that were backported from upstream.
--- meta/recipes-graphics/cogl/cogl-1.0.inc | 4 --- meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb | 7 ----- meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb | 6 ++++ .../cogl/files/cogl-fixed-thumb.patch | 30 -------------------- .../cogl/files/cogl_fixed_mul-constraint.patch | 22 -------------- 5 files changed, 6 insertions(+), 63 deletions(-) delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb delete mode 100644 meta/recipes-graphics/cogl/files/cogl-fixed-thumb.patch delete mode 100644 meta/recipes-graphics/cogl/files/cogl_fixed_mul-constraint.patch
meta/recipes-graphics/cogl/cogl-1.0.inc +0 -4
@@ -2,10 +2,6 @@ DESCRIPTION = "a modern 3D graphics API with associated utility APIs" HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" LICENSE = "LGPLv2.1+" -SRC_URI += "file://cogl_fixed_mul-constraint.patch \ - file://cogl-fixed-thumb.patch \ - " - inherit clutter DEPENDS = "glib-2.0 gdk-pixbuf"
meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb deleted +0 -7
@@ -1,7 +0,0 @@ - -require cogl-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "7eabaf4241c0b87cc9e3b0fa23fd0315" -SRC_URI[archive.sha256sum] = "276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8"
meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb new file +6 -0
@@ -0,0 +1,6 @@ +require cogl-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "611a61bed04354cbfffa3dc27feb6d4f" +SRC_URI[archive.sha256sum] = "75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094"
meta/recipes-graphics/cogl/files/cogl-fixed-thumb.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Upstream-Status: Backport - -There are two asm() statements in cogl-fixed.c that can't be assembled -in Thumb mode. Add a patch to switch to the generic code in Thumb mode. - -Signed-off-by: Donn Seeley <[email protected]> ---- - cogl/cogl-fixed.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/cogl/cogl-fixed.c -+++ b/cogl/cogl-fixed.c -@@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x) - /* - * Find the highest bit set - */ --#if defined (__arm__) && !defined(__ARM_ARCH_4T__) -+#if defined (__arm__) && !defined(__ARM_ARCH_4T__) && !defined(__thumb__) - /* This actually requires at least arm v5, but gcc does not seem - * to set the architecture defines correctly, and it is I think - * very unlikely that anyone will want to use clutter on anything -@@ -804,7 +804,7 @@ CoglFixed - cogl_fixed_mul (CoglFixed a, - CoglFixed b) - { --#ifdef __arm__ -+#if defined(__arm__) && !defined(__thumb__) - /* This provides about 12% speedeup on the gcc -O2 optimised - * C version - *
meta/recipes-graphics/cogl/files/cogl_fixed_mul-constraint.patch deleted +0 -22
@@ -1,22 +0,0 @@ -Upstream-Status: Backport - -Add register constraints to prevent asm statement complaints like: - - {standard input}:382: rdhi, rdlo and rm must all be different - -Signed-off-by: Donn Seeley <[email protected]> ---- - cogl/cogl-fixed.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/cogl/cogl-fixed.c -+++ b/cogl/cogl-fixed.c -@@ -816,7 +816,7 @@ cogl_fixed_mul (CoglFixed a, - __asm__ ("smull %0, %1, %2, %3 \n" - "mov %0, %0, lsr %4 \n" - "add %1, %0, %1, lsl %5 \n" -- : "=r"(res_hi), "=r"(res_low) \ -+ : "=&r"(res_hi), "=&r"(res_low) \ - : "r"(a), "r"(b), "i"(COGL_FIXED_Q), "i"(32 - COGL_FIXED_Q)); - - return (CoglFixed) res_low;
Signature · 1 line
1.7.10.4
PATCH 2/5 clutter: upgrade
Delete fix-wayland-deps.patch, it was a backport from upstream.
Delete enable_tests which installed the non-inuititive interactive test suite, instead install the examples.
--- .../clutter/clutter-1.0-1.14.4/enable_tests.patch | 36 ------------- .../clutter-1.0-1.14.4/fix-wayland-deps.patch | 57 -------------------- meta/recipes-graphics/clutter/clutter-1.0.inc | 8 ++- .../clutter/clutter-1.0/install-examples.patch | 28 ++++++++++ .../recipes-graphics/clutter/clutter-1.0_1.14.4.bb | 7 --- .../recipes-graphics/clutter/clutter-1.0_1.16.0.bb | 8 +++ 6 files changed, 39 insertions(+), 105 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch create mode 100644 meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb
meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch deleted +0 -36
@@ -1,36 +0,0 @@ -Make tests installable - -The test applications are useful for image testing. - -Imported from clutter 1.8 package, git://git.openembedded.org/openembedded, -commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Tomas Frydrych <[email protected]> - -Index: git/tests/interactive/Makefile.am -=================================================================== ---- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000 -+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000 -@@ -88,7 +88,7 @@ - - common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@[email protected] - --noinst_PROGRAMS = test-interactive -+bin_PROGRAMS = test-interactive - - test_interactive_SOURCES = test-main.c $(UNIT_TESTS) - test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) -Index: git/tests/interactive/test-actors.c -=================================================================== ---- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000 -+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000 -@@ -178,7 +178,7 @@ - oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0); - oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5); - -- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); -+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL); - real_hand = clutter_texture_new_from_file (file, &error); - if (real_hand == NULL) - g_error ("image load failed: %s", error->message);
meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch deleted +0 -57
57 lines not on this page · raw message
meta/recipes-graphics/clutter/clutter-1.0.inc +3 -5
@@ -4,11 +4,8 @@ LICENSE = "LGPLv2.1+" inherit clutter -SRC_URI += "file://enable_tests.patch \ - file://fix-wayland-deps.patch" - DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" -PACKAGES =+ "${PN}-examples" +PACKAGE_BEFORE_PN += "${PN}-examples" AUTOTOOLS_AUXDIR = "${S}/build" EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
@@ -39,7 +36,8 @@ PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayla PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" -FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" +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
meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch new file +28 -0
@@ -0,0 +1,28 @@ +Install the examples to $libdir/clutter/. + +Signed-off-by: Ross Burton <[email protected]> +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 +@@ -31,7 +31,7 @@ LDADD = \ + AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS) + + AM_CPPFLAGS = \ +- -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \ ++ -DTESTS_DATADIR=\""$(exampledir)"\" \ + -DG_DISABLE_SINGLE_INCLUDES \ + -DGLIB_DISABLE_DEPRECATION_WARNINGS \ + -I$(top_srcdir) \ +@@ -39,6 +39,8 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter + +-noinst_PROGRAMS = $(all_examples) ++exampledir = $(pkglibdir)/examples ++example_PROGRAMS = $(all_examples) ++example_DATA = $(top_srcdir)/tests/data/redhand.png + + -include $(top_srcdir)/build/autotools/Makefile.am.gitignore
meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb deleted +0 -7
@@ -1,7 +0,0 @@ - -require clutter-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "c072e4c27e69368f2b877ea4f6da2cdf" -SRC_URI[archive.sha256sum] = "c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c"
meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb new file +8 -0
@@ -0,0 +1,8 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "873c97b825c366e13e1f281e8e1f549b" +SRC_URI[archive.sha256sum] = "a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae" + +SRC_URI += "file://install-examples.patch"
Signature · 1 line
1.7.10.4
PATCH 3/5 wayland: upgrade to 1.3.0
In reply to Ross Burtonwayland-scanner now uses pkg-config instead of hard-coding paths, so edit the script to use pkg-config-native.
Based on work by Ewan Le Bideau-Canevet <[email protected]>.
--- meta/recipes-graphics/wayland/wayland_1.1.0.bb | 39 ------------------------ meta/recipes-graphics/wayland/wayland_1.3.0.bb | 36 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 39 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland_1.1.0.bb create mode 100644 meta/recipes-graphics/wayland/wayland_1.3.0.bb
meta/recipes-graphics/wayland/wayland_1.1.0.bb deleted +0 -39
@@ -1,39 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ - file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "d2dc9398a83692cafc16eba6e45f85d8" -SRC_URI[sha256sum] = "2ef587cf1a0e52b6dee44eeb9c288110e8180819abf4e419d247dfe234867a5c" - -SRC_URI_append_class-native = " file://just-scanner.patch" - -inherit autotools pkgconfig - -# We need wayland-native for the wayland-scanner utility -BBCLASSEXTEND = "native" - -DEPENDS_virtclass-native = "expat-native libffi-native" -DEPENDS = "expat libffi wayland-native" - -EXTRA_OECONF_virtclass-native = "--disable-documentation" -EXTRA_OECONF = "--disable-documentation --disable-scanner" - -# Wayland installs a M4 macro for other projects to use. This M4 macro includes -# a path to a Makefile fragment to get the rules to generate stubs from protocol -# description files. The paths to the sysroot end up incorrect, so fix them. -do_configure_append_class-native() { - sed -e 's,@prefix@,${STAGING_DIR_NATIVE},g' \ - -e 's,@exec_prefix@,${STAGING_DIR_NATIVE},g' \ - -e 's,@bindir@,${STAGING_BINDIR_NATIVE},g' \ - -e 's,@datarootdir@,${STAGING_DATADIR_NATIVE},g' \ - ${S}/wayland-scanner.m4.in > ${B}/wayland-scanner.m4 -}
meta/recipes-graphics/wayland/wayland_1.3.0.bb new file +36 -0
@@ -0,0 +1,36 @@ +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] = "d16d27081e0871de82d08840c2f133fc" +SRC_URI[sha256sum] = "2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e" + +SRC_URI_append_class-native = " file://just-scanner.patch" + +inherit autotools pkgconfig + +# We need wayland-native for the wayland-scanner utility +BBCLASSEXTEND = "native" + +DEPENDS_virtclass-native = "expat-native libffi-native" +DEPENDS = "expat libffi wayland-native" + +EXTRA_OECONF_virtclass-native = "--disable-documentation" +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 +}
Signature · 1 line
1.7.10.4
PATCH 4/5 weston: upgrade to 1.3.0
In reply to Ross BurtonRemove backported patches that are now integrated.
No need to patch build to install examples with --enable-demo-clients, update FILES now that all examples are being installed.
Remove cairo-gl option as our cairo doesn't support GL (yet), remove --disable-android-compositor as it was dropped upstream, and add PACKAGECONFIG for the VAAPI-based recorder as otherwise it's a floating dependency (libva is in meta-intel).
Based on work by Ewan Le Bideau-Canevet <[email protected]>.
--- meta/recipes-graphics/wayland/weston/groups.patch | 47 ----------- .../wayland/weston/install-examples.patch | 18 ----- .../wayland/weston/weston-launch-shell.patch | 74 ----------------- meta/recipes-graphics/wayland/weston_1.1.0.bb | 83 -------------------- meta/recipes-graphics/wayland/weston_1.3.0.bb | 80 +++++++++++++++++++ 5 files changed, 80 insertions(+), 222 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston/groups.patch delete mode 100644 meta/recipes-graphics/wayland/weston/install-examples.patch delete mode 100644 meta/recipes-graphics/wayland/weston/weston-launch-shell.patch delete mode 100644 meta/recipes-graphics/wayland/weston_1.1.0.bb create mode 100644 meta/recipes-graphics/wayland/weston_1.3.0.bb
meta/recipes-graphics/wayland/weston/groups.patch deleted +0 -47
@@ -1,47 +0,0 @@ -Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=65933) -Signed-off-by: Ross Burton <[email protected]> - -From 42821739a228a85ce3432be1796858e5cc31688b Mon Sep 17 00:00:00 2001 -From: Quentin Glidic <[email protected]> -Date: Wed, 19 Jun 2013 15:27:11 +0200 -Subject: [PATCH weston] weston-launch: Set all groups for user - -Signed-off-by: Quentin Glidic <[email protected]> ---- - configure.ac | 2 +- - src/weston-launch.c | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b625221..db3feb0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,7 +52,7 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include <time.h>]]) - AC_CHECK_HEADERS([execinfo.h]) - --AC_CHECK_FUNCS([mkostemp strchrnul]) -+AC_CHECK_FUNCS([mkostemp strchrnul initgroups]) - - COMPOSITOR_MODULES="wayland-server >= 1.1.90 xkbcommon pixman-1" - -diff --git a/src/weston-launch.c b/src/weston-launch.c -index 76dcede..7d7b556 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -631,9 +631,13 @@ main(int argc, char *argv[]) - } - - if (setgid(wl.pw->pw_gid) < 0 || -+#ifdef HAVE_INITGROUPS -+ initgroups(wl.pw->pw_name, wl.pw->pw_gid) < 0 || -+#endif - setuid(wl.pw->pw_uid) < 0) - error(1, errno, "dropping privilidges failed"); - -+ - if (sleep_fork) { - if (wl.verbose) - printf("weston-launch: waiting %d seconds\n", sleep_fork); --- -1.8.3
meta/recipes-graphics/wayland/weston/install-examples.patch deleted +0 -18
@@ -1,18 +0,0 @@ -Install the examples so we can package them. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/clients/Makefile.am b/clients/Makefile.am -index 621c7c3..749ef20 100644 ---- a/clients/Makefile.am -+++ b/clients/Makefile.am -@@ -2,7 +2,7 @@ bin_PROGRAMS = \ - weston-info \ - $(terminal) - --noinst_PROGRAMS = \ -+bin_PROGRAMS += \ - $(clients_programs) \ - $(poppler_programs) \ - $(simple_clients_programs) \
meta/recipes-graphics/wayland/weston/weston-launch-shell.patch deleted +0 -74
74 lines not on this page · raw message
meta/recipes-graphics/wayland/weston_1.1.0.bb deleted +0 -83
83 lines not on this page · raw message
meta/recipes-graphics/wayland/weston_1.3.0.bb new file +80 -0
80 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 5/5 weston-init: start weston on a new VT
In reply to Ross BurtonWeston 1.3 needs to run on a VT, which is typically handled by weston-launch. Currently weston-init doesn't use weston-launch as that depends on the (non-default) pam DISTRO_FEATURE, so depend on kbd and use openvt directly.
This also fixes problems caused by the init script blocking until Weston exits, which meant that later init scripts were not actually running.
--- meta/recipes-graphics/wayland/weston-init.bb | 2 ++ meta/recipes-graphics/wayland/weston-init/init | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston-init.bb +2 -0
@@ -13,5 +13,7 @@ do_install() { inherit allarch update-rc.d +RDEPENDS_${PN} = "weston kbd" + INITSCRIPT_NAME = "weston" INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
meta/recipes-graphics/wayland/weston-init/init +1 -1
@@ -34,7 +34,7 @@ case "$1" in chmod 0700 $XDG_RUNTIME_DIR fi - weston + openvt -s weston ;; stop)
Signature · 1 line
1.7.10.4