* [meta-arago 1/1] wayland/weston: Deprecate 1.3.0
@ 2015-02-16 8:53 Karthik Ramanan
2015-02-20 2:30 ` Denys Dmytriyenko
0 siblings, 1 reply; 3+ messages in thread
From: Karthik Ramanan @ 2015-02-16 8:53 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
.../wayland/wayland/just-scanner.patch | 36 --------
.../recipes-graphics/wayland/wayland_1.3.0.bb | 40 ---------
...tor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch | 26 ------
...e-Include-option-to-search-in-include-drm.patch | 47 ----------
...urce-prevent-input-disable-during-repaint.patch | 34 --------
.../0005-temp-hack-to-enable-weston-1.3.patch | 33 -------
.../0006-weston-drm-Enable-multiple-displays.patch | 43 ----------
.../recipes-graphics/wayland/weston_1.3.0.bb | 90 --------------------
8 files changed, 349 deletions(-)
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch b/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch
deleted file mode 100644
index 234a9c5..0000000
diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
deleted file mode 100644
index ae68dac..0000000
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
deleted file mode 100644
index cd0581a..0000000
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
deleted file mode 100644
index 557373d..0000000
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
deleted file mode 100644
index 74e82fb..0000000
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
deleted file mode 100644
index 0c860b3..0000000
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
deleted file mode 100644
index abc4295..0000000
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
deleted file mode 100644
index cf81a33..0000000
--
1.7.9.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-arago 1/1] wayland/weston: Deprecate 1.3.0
2015-02-16 8:53 [meta-arago 1/1] wayland/weston: Deprecate 1.3.0 Karthik Ramanan
@ 2015-02-20 2:30 ` Denys Dmytriyenko
2015-02-20 3:31 ` R, Karthik
0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2015-02-20 2:30 UTC (permalink / raw)
To: Karthik Ramanan; +Cc: meta-arago
Can you please send a patch that can be applied? Thanks.
On Mon, Feb 16, 2015 at 02:23:02PM +0530, Karthik Ramanan wrote:
> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
> ---
> .../wayland/wayland/just-scanner.patch | 36 --------
> .../recipes-graphics/wayland/wayland_1.3.0.bb | 40 ---------
> ...tor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch | 26 ------
> ...e-Include-option-to-search-in-include-drm.patch | 47 ----------
> ...urce-prevent-input-disable-during-repaint.patch | 34 --------
> .../0005-temp-hack-to-enable-weston-1.3.patch | 33 -------
> .../0006-weston-drm-Enable-multiple-displays.patch | 43 ----------
> .../recipes-graphics/wayland/weston_1.3.0.bb | 90 --------------------
> 8 files changed, 349 deletions(-)
> delete mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch
> delete mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
> delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
> delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
> delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
> delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
> delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
>
> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch b/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch
> deleted file mode 100644
> index 234a9c5..0000000
> diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> deleted file mode 100644
> index ae68dac..0000000
> diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
> deleted file mode 100644
> index cd0581a..0000000
> diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
> deleted file mode 100644
> index 557373d..0000000
> diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
> deleted file mode 100644
> index 74e82fb..0000000
> diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
> deleted file mode 100644
> index 0c860b3..0000000
> diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
> deleted file mode 100644
> index abc4295..0000000
> diff --git a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
> deleted file mode 100644
> index cf81a33..0000000
> --
> 1.7.9.5
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-arago 1/1] wayland/weston: Deprecate 1.3.0
2015-02-20 2:30 ` Denys Dmytriyenko
@ 2015-02-20 3:31 ` R, Karthik
0 siblings, 0 replies; 3+ messages in thread
From: R, Karthik @ 2015-02-20 3:31 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
[-- Attachment #1: Type: text/plain, Size: 4335 bytes --]
Denys,
I have attached the patch.
Regards
Karthik
-----Original Message-----
From: Dmytriyenko, Denys
Sent: Friday, February 20, 2015 8:01 AM
To: R, Karthik
Cc: meta-arago@arago-project.org
Subject: Re: [meta-arago] [meta-arago 1/1] wayland/weston: Deprecate 1.3.0
Can you please send a patch that can be applied? Thanks.
On Mon, Feb 16, 2015 at 02:23:02PM +0530, Karthik Ramanan wrote:
> Signed-off-by: Karthik Ramanan <a0393906@ti.com>
> ---
> .../wayland/wayland/just-scanner.patch | 36 --------
> .../recipes-graphics/wayland/wayland_1.3.0.bb | 40 ---------
> ...tor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch | 26 ------
> ...e-Include-option-to-search-in-include-drm.patch | 47 ----------
> ...urce-prevent-input-disable-during-repaint.patch | 34 --------
> .../0005-temp-hack-to-enable-weston-1.3.patch | 33 -------
> .../0006-weston-drm-Enable-multiple-displays.patch | 43 ----------
> .../recipes-graphics/wayland/weston_1.3.0.bb | 90 --------------------
> 8 files changed, 349 deletions(-)
> delete mode 100644
> meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch
> delete mode 100644
> meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> delete mode 100644
> meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-
> Change-path-of-gbm.h-to-gbm-gbm.h.patch
> delete mode 100644
> meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Includ
> e-option-to-search-in-include-drm.patch
> delete mode 100644
> meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-pr
> event-input-disable-during-repaint.patch
> delete mode 100644
> meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-en
> able-weston-1.3.patch delete mode 100644
> meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enab
> le-multiple-displays.patch delete mode 100644
> meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
>
> diff --git
> a/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patc
> h
> b/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patc
> h
> deleted file mode 100644
> index 234a9c5..0000000
> diff --git
> a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
> deleted file mode 100644
> index ae68dac..0000000
> diff --git
> a/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-dr
> m-Change-path-of-gbm.h-to-gbm-gbm.h.patch
> b/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-dr
> m-Change-path-of-gbm.h-to-gbm-gbm.h.patch
> deleted file mode 100644
> index cd0581a..0000000
> diff --git
> a/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Incl
> ude-option-to-search-in-include-drm.patch
> b/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Incl
> ude-option-to-search-in-include-drm.patch
> deleted file mode 100644
> index 557373d..0000000
> diff --git
> a/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-
> prevent-input-disable-during-repaint.patch
> b/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-
> prevent-input-disable-during-repaint.patch
> deleted file mode 100644
> index 74e82fb..0000000
> diff --git
> a/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-
> enable-weston-1.3.patch
> b/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-
> enable-weston-1.3.patch
> deleted file mode 100644
> index 0c860b3..0000000
> diff --git
> a/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-En
> able-multiple-displays.patch
> b/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-En
> able-multiple-displays.patch
> deleted file mode 100644
> index abc4295..0000000
> diff --git
> a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
> b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
> deleted file mode 100644
> index cf81a33..0000000
> --
> 1.7.9.5
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
[-- Attachment #2: 0001-wayland-weston-Deprecate-1.3.0.patch --]
[-- Type: application/octet-stream, Size: 17427 bytes --]
From aaefe0c2b8db07ac3f9a101569c48f7d6458612a Mon Sep 17 00:00:00 2001
From: Karthik Ramanan <a0393906@ti.com>
Date: Wed, 17 Dec 2014 09:16:29 +0530
Subject: [meta-arago][PATCH 1/2] wayland/weston: Deprecate 1.3.0
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
.../wayland/wayland/just-scanner.patch | 36 --------
.../recipes-graphics/wayland/wayland_1.3.0.bb | 40 ---------
...tor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch | 26 ------
...e-Include-option-to-search-in-include-drm.patch | 47 ----------
...urce-prevent-input-disable-during-repaint.patch | 34 --------
.../0005-temp-hack-to-enable-weston-1.3.patch | 33 -------
.../0006-weston-drm-Enable-multiple-displays.patch | 43 ----------
.../recipes-graphics/wayland/weston_1.3.0.bb | 90 --------------------
8 files changed, 349 deletions(-)
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
delete mode 100644 meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch b/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch
deleted file mode 100644
index 234a9c5..0000000
--- a/meta-arago-extras/recipes-graphics/wayland/wayland/just-scanner.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-We only build wayland-native for the scanner, so disable the bits we don't
-actually need. This gives us a small speed up but importantly should allow
-wayland-native to compile on older hosts such as CentOS 5 which currently fails:
-
-| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function)
-| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory
-| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function)
-| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function)
-| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function)
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/Makefile.am b/Makefile.am
-index 306d7b3..571fe89 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,7 @@ if BUILD_DOCS
- doc_subdir = doc
- endif
-
--SUBDIRS = src protocol $(doc_subdir) tests cursor
-+SUBDIRS = src protocol $(doc_subdir)
-
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e1d04ea..702342e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,4 @@
--lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
-+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
- noinst_LTLIBRARIES = libwayland-util.la
-
- include_HEADERS = \
diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
deleted file mode 100644
index ae68dac..0000000
--- a/meta-arago-extras/recipes-graphics/wayland/wayland_1.3.0.bb
+++ /dev/null
@@ -1,40 +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 = "git://anongit.freedesktop.org/wayland/wayland;protocol=git"
-SRCREV = "2c3dbb89031f120fb191492634e53a583f99d57d"
-
-S = "${WORKDIR}/git"
-
-PR = "r1"
-
-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
-}
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
deleted file mode 100644
index cd0581a..0000000
--- a/meta-arago-extras/recipes-graphics/wayland/weston/0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5f655cb89813e39d6410493b4725e447212ea3a3 Mon Sep 17 00:00:00 2001
-From: Mrinmayee Hingolikar <mrinmayee@ti.com>
-Date: Tue, 24 Sep 2013 19:13:50 +0530
-Subject: [PATCH] compositor-drm: Change path of gbm.h to gbm/gbm.h
-
-Signed-off-by: Mrinmayee Hingolikar <mrinmayee@ti.com>
----
- src/compositor-drm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/compositor-drm.c b/src/compositor-drm.c
-index f055118..7a59872 100644
---- a/src/compositor-drm.c
-+++ b/src/compositor-drm.c
-@@ -35,7 +35,7 @@
- #include <xf86drmMode.h>
- #include <drm_fourcc.h>
-
--#include <gbm.h>
-+#include <gbm/gbm.h>
- #include <libbacklight.h>
- #include <libudev.h>
-
---
-1.7.9.5
-
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
deleted file mode 100644
index 557373d..0000000
--- a/meta-arago-extras/recipes-graphics/wayland/weston/0002-Makefile-Include-option-to-search-in-include-drm.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c8b6fe71ad0231c4787836f4156e604cedfe45a8 Mon Sep 17 00:00:00 2001
-From: Mrinmayee Hingolikar <mrinmayee@ti.com>
-Date: Thu, 3 Jul 2014 15:06:31 +0530
-Subject: [PATCH] Makefile change to search for correct drm headers
-
-Signed-off-by: Mrinmayee Hingolikar <mrinmayee@ti.com>
----
- src/Makefile.am | 3 ++-
- tests/Makefile.am | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 749c074..a6e44e7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,6 +2,7 @@ bin_PROGRAMS = weston \
- $(weston_launch)
-
- AM_CPPFLAGS = \
-+ $(DRM_COMPOSITOR_CFLAGS) \
- -I$(top_srcdir)/shared \
- -DDATADIR='"$(datadir)"' \
- -DMODULEDIR='"$(moduledir)"' \
-@@ -9,7 +10,7 @@ AM_CPPFLAGS = \
- -DIN_WESTON
-
- weston_LDFLAGS = -export-dynamic
--weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS)
-+weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS)
- weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
- $(DLOPEN_LIBS) -lm ../shared/libshared.la
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 5be52c6..42ebd2b 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -47,6 +47,7 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/shared \
- -I$(top_builddir)/src \
- -DUNIT_TEST \
-+ $(DRM_COMPOSITOR_CFLAGS) \
- $(COMPOSITOR_CFLAGS)
-
- surface_global_test_la_SOURCES = surface-global-test.c
---
-2.0.1
-
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
deleted file mode 100644
index 74e82fb..0000000
--- a/meta-arago-extras/recipes-graphics/wayland/weston/0003-input-source-prevent-input-disable-during-repaint.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cdd9043580e0f0a6c60c21b955f1966c78b2098b Mon Sep 17 00:00:00 2001
-From: Karthik Ramanan <a0393906@ti.com>
-Date: Mon, 2 Dec 2013 15:52:41 +0530
-Subject: [PATCH] input source: prevent input disable during repaint
-
-Under certain race conditions, the input source was getting
-disabled which was preventing the evdev events from keyboard or
-mouse to reach Weston. The side effect of this issue was
-that after the screen gets locked, it was not possible to
-come to Weston desktop without killing Weston.
-
-Signed-off-by: Karthik Ramanan <a0393906@ti.com>
----
- src/compositor.c | 4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/src/compositor.c b/src/compositor.c
-index 0e0835f..ced3883 100644
---- a/src/compositor.c
-+++ b/src/compositor.c
-@@ -1084,10 +1084,6 @@ weston_output_schedule_repaint(struct weston_output *output)
- wl_event_loop_add_idle(loop, idle_repaint, output);
- output->repaint_scheduled = 1;
-
-- if (compositor->input_loop_source) {
-- wl_event_source_remove(compositor->input_loop_source);
-- compositor->input_loop_source = NULL;
-- }
- }
-
- WL_EXPORT void
---
-1.7.0.4
-
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
deleted file mode 100644
index 0c860b3..0000000
--- a/meta-arago-extras/recipes-graphics/wayland/weston/0005-temp-hack-to-enable-weston-1.3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 518fe5aea452a4660e07855716349a0c84e59b14 Mon Sep 17 00:00:00 2001
-From: Karthik Ramanan <a0393906@ti.com>
-Date: Tue, 21 Jan 2014 11:48:19 +0000
-Subject: [PATCH] temp-hack: to enable weston 1.3
-
-This patch resolves the issue with the black display seen
-when running weston 1.3 version on the dra7xx target.
-
-Known issues:
-1. simple-egl application does not work
-2. weston on multiple displays does not work
-
-Signed-off-by: Karthik Ramanan <a0393906@ti.com>
----
- src/compositor-drm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/compositor-drm.c b/src/compositor-drm.c
-index 0ac5efa..dd28f0f 100644
---- a/src/compositor-drm.c
-+++ b/src/compositor-drm.c
-@@ -616,7 +616,7 @@ drm_output_repaint(struct weston_output *output_base,
- .request.sequence = 1,
- };
-
-- if ((!s->current && !s->next) ||
-+ if ((!s->current && !s->next) &&
- !drm_sprite_crtc_supported(output_base, s->possible_crtcs))
- continue;
-
---
-1.7.9.5
-
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch b/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
deleted file mode 100644
index abc4295..0000000
--- a/meta-arago-extras/recipes-graphics/wayland/weston/0006-weston-drm-Enable-multiple-displays.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From dce69cadd858bd959dd41edf82860cd370ca1fa8 Mon Sep 17 00:00:00 2001
-From: Karthik Ramanan <a0393906@ti.com>
-Date: Fri, 14 Mar 2014 18:55:12 +0530
-Subject: [PATCH] weston-drm: Enable multiple displays
-
-We are currently seeing an issue with missing VBlanks for LCD and
-HDMI connectors which leads to display not getting refreshed.
-This patch can be considered as a workaround.
-
-Signed-off-by: Karthik Ramanan <a0393906@ti.com>
----
- src/compositor-drm.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/compositor-drm.c b/src/compositor-drm.c
-index 79dcc6c..ef2fbd2 100644
---- a/src/compositor-drm.c
-+++ b/src/compositor-drm.c
-@@ -709,6 +709,7 @@ page_flip_handler(int fd, unsigned int frame,
- {
- struct drm_output *output = (struct drm_output *) data;
- uint32_t msecs;
-+ uint32_t bail;
-
- /* We don't set page_flip_pending on start_repaint_loop, in that case
- * we just want to page flip to the current buffer to get an accurate
-@@ -721,7 +722,12 @@ page_flip_handler(int fd, unsigned int frame,
-
- output->page_flip_pending = 0;
-
-- if (!output->vblank_pending) {
-+ if (output->vblank_pending) {
-+ weston_log("VBlank is pending for connector = %d, frame = %d\n", output->connector_id, frame);
-+ bail = 1;
-+ }
-+
-+ if (!output->vblank_pending || bail) {
- msecs = sec * 1000 + usec / 1000;
- weston_output_finish_frame(&output->base, msecs);
-
---
-1.7.9.5
-
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb b/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
deleted file mode 100644
index cf81a33..0000000
--- a/meta-arago-extras/recipes-graphics/wayland/weston_1.3.0.bb
+++ /dev/null
@@ -1,90 +0,0 @@
-SUMMARY = "Weston, a Wayland compositor"
-DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
-HOMEPAGE = "http://wayland.freedesktop.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
- file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c"
-
-SRC_URI = "git://anongit.freedesktop.org/wayland/weston;protocol=git \
- file://weston.png \
- file://weston.desktop \
- file://0001-compositor-drm-Change-path-of-gbm.h-to-gbm-gbm.h.patch \
- file://0002-Makefile-Include-option-to-search-in-include-drm.patch \
- file://0003-input-source-prevent-input-disable-during-repaint.patch \
- file://0005-temp-hack-to-enable-weston-1.3.patch \
- file://0006-weston-drm-Enable-multiple-displays.patch "
-
-
-S = "${WORKDIR}/git"
-
-SRCREV = "95659c03219b057d9d703b04cf89bc0329ce947a"
-
-PR = "r2"
-
-inherit autotools pkgconfig useradd
-
-DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
-DEPENDS += "wayland libgbm virtual/egl pango"
-
-COMPATIBLE_MACHINE = "dra7xx-evm"
-
-EXTRA_OECONF = "--enable-setuid-install \
- --disable-tablet-shell \
- --disable-xwayland \
- --enable-simple-clients \
- --enable-clients \
- --enable-demo-clients \
- --disable-libunwind \
- --disable-rpi-compositor \
- --disable-rdp-compositor"
-
-
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
- "
-#
-# Compositor choices
-#
-# Weston on KMS
-PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
-# Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,libgbm"
-# 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"
-# VA-API desktop recorder
-PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
-
-do_install_append() {
- # Weston doesn't need the .la files to load modules, so wipe them
- rm -f ${D}/${libdir}/weston/*.la
-
- for feature in ${DISTRO_FEATURES}; do
- # If X11, ship a desktop file to launch it
- if [ "$feature" = "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
- done
-
-}
-
-
-FILES_${PN} = "${bindir}/* ${libexecdir} ${datadir}"
-
-RDEPENDS_${PN} += "xkeyboard-config"
-RRECOMMENDS_${PN} = "liberation-fonts"
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system weston-launch"
-
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-20 3:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-16 8:53 [meta-arago 1/1] wayland/weston: Deprecate 1.3.0 Karthik Ramanan
2015-02-20 2:30 ` Denys Dmytriyenko
2015-02-20 3:31 ` R, Karthik
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.