[PATCH 0/3] add glfw3 version 3.2

[PATCH 0/3] add glfw3 version 3.2

[Hongmei Gou]

Add glfw3 version 3.2, which requires two new dependencis:
1. wayland-protocols
2. extra-cmake-modules

Also a patch has been created for glfw3 to specify WaylandProtocols_PKGDATADIR with the correct prefix

Hongmei Gou (3):
  wayland-protocols: add version 1.5
  extra-cmake-modules: add version 1.5.0+gitrX
  glfw3: add version 3.2

 .../wayland/wayland-protocols_1.5.bb               | 20 +++++++++++++++++
 .../recipes-devtools/cmake/extra-cmake-modules.bb  | 18 +++++++++++++++
 ...in-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch | 26 ++++++++++++++++++++++
 ...IR-prefix-for-WaylandProtocols_PKGDATADIR.patch | 11 +++++++++
 .../recipes-graphics/glfw3/glfw3_git.bb            | 24 ++++++++++++++++++++
 5 files changed, 99 insertions(+)
 create mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-protocols_1.5.bb
 create mode 100644 meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
 create mode 100644 meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules/0001-Search-within-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch
 create mode 100644 meta-arago-extras/recipes-graphics/glfw3/files/0001-add-PKG_CONFIG_SYSROOT_DIR-prefix-for-WaylandProtocols_PKGDATADIR.patch
 create mode 100644 meta-arago-extras/recipes-graphics/glfw3/glfw3_git.bb

-- 
1.9.1

[PATCH 1/3] wayland-protocols: add version 1.5

[Hongmei Gou]

* wayland-protocols is required for building glfw3: version 3.2.
* This recipe exists in upstream under the master branch:
  http://cgit.openembedded.org/cgit.cgi/openembedded-core/tree/meta/
  recipes-graphics/wayland/wayland-protocols_1.5.bb?h=master

Signed-off-by: Hongmei Gou <h-gou@ti.com>
---
 .../wayland/wayland-protocols_1.5.bb                 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-protocols_1.5.bb

diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-protocols_1.5.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-protocols_1.5.bb
new file mode 100644
index 0000000..3a40fb2
--- /dev/null
+++ b/meta-arago-distro/recipes-graphics/wayland/wayland-protocols_1.5.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Collection of additional Wayland protocols"
+DESCRIPTION = "Wayland protocols that add functionality not \
+available in the Wayland core protocol. Such protocols either add \
+completely new functionality, or extend the functionality of some other \
+protocol either in Wayland core, or some other protocol in \
+wayland-protocols."
+HOMEPAGE = "http://wayland.freedesktop.org"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
+                    file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
+
+SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+           "
+SRC_URI[md5sum] = "e4279fec1283067706373d4d975be333"
+SRC_URI[sha256sum] = "7d0b426ccaeafc084fc579bb2a139f8ad4ea3492d54b7b0210d124c61fbeb2bf"
+
+inherit allarch autotools pkgconfig
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"
-- 
1.9.1

[PATCH 2/3] extra-cmake-modules: add version 1.5.0+gitrX

[Hongmei Gou]

* extra-cmake-modules is required for building glfw3: version 3.2.
* This recipe exists in upstream under meta-luneui (master branch)
  https://layers.openembedded.org/layerindex/recipe/32503/

Signed-off-by: Hongmei Gou <h-gou@ti.com>
---
 .../recipes-devtools/cmake/extra-cmake-modules.bb  | 18 +++++++++++++++
 ...in-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch | 26 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
 create mode 100644 meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules/0001-Search-within-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch

diff --git a/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb b/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
new file mode 100644
index 0000000..c12c0e2
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
@@ -0,0 +1,18 @@
+UMMARY = "Extra modules and scripts for CMake"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1"
+
+PV = "1.5.0+gitr${SRCPV}"
+SRCREV = "8dc36cfa882f07a60b3ebdf16d9aac57871bd382"
+
+SRC_URI = " \
+    git://anongit.kde.org/extra-cmake-modules;protocol=git;branch=master \
+    file://0001-Search-within-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch \
+"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DBUILD_TESTING=off"
+
+inherit cmake
+
+FILES_${PN}-dev += "${datadir}/ECM"
diff --git a/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules/0001-Search-within-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch b/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules/0001-Search-within-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch
new file mode 100644
index 0000000..964dbbf
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules/0001-Search-within-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch
@@ -0,0 +1,26 @@
+From 90d6c2bce5a50d2c05af25978bccbe047705eed7 Mon Sep 17 00:00:00 2001
+From: Simon Busch <morphis@gravedo.de>
+Date: Mon, 29 Dec 2014 12:05:20 +0100
+Subject: [PATCH] Search within OE_QMAKE_PATH_EXTERNAL_HOST_BINS for
+ qtwaylandscanner
+
+Signed-off-by: Simon Busch <morphis@gravedo.de>
+---
+ find-modules/FindQtWaylandScanner.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake
+index 7fb8a00..f782275 100644
+--- a/find-modules/FindQtWaylandScanner.cmake
++++ b/find-modules/FindQtWaylandScanner.cmake
+@@ -88,7 +88,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+ ecm_find_package_version_check(QtWaylandScanner)
+ 
+ # Find qtwaylandscanner
+-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner)
++find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS})
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(QtWaylandScanner
+-- 
+2.1.0
-- 
1.9.1

[PATCH 3/3] glfw3: add version 3.2

[Hongmei Gou]

* glfw3 is a multi-platform library for OpenGL, OpenGL ES, windown and input. It provides
  cross-platform graphics environment to create and setup context for OpenGL-enabled
  applications.
* Patch 0001-add-PKG_CONFIG_SYSROOT_DIR-prefix-for-WaylandProtocols_PKGDATADIR.patch
  is added to specify WaylandProtocols_PKGDATADIR with the correct prefix

Signed-off-by: Hongmei Gou <h-gou@ti.com>
---
 ...IR-prefix-for-WaylandProtocols_PKGDATADIR.patch | 11 ++++++++++
 .../recipes-graphics/glfw3/glfw3_git.bb            | 24 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 meta-arago-extras/recipes-graphics/glfw3/files/0001-add-PKG_CONFIG_SYSROOT_DIR-prefix-for-WaylandProtocols_PKGDATADIR.patch
 create mode 100644 meta-arago-extras/recipes-graphics/glfw3/glfw3_git.bb

diff --git a/meta-arago-extras/recipes-graphics/glfw3/files/0001-add-PKG_CONFIG_SYSROOT_DIR-prefix-for-WaylandProtocols_PKGDATADIR.patch b/meta-arago-extras/recipes-graphics/glfw3/files/0001-add-PKG_CONFIG_SYSROOT_DIR-prefix-for-WaylandProtocols_PKGDATADIR.patch
new file mode 100644
index 0000000..fce7a45
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/glfw3/files/0001-add-PKG_CONFIG_SYSROOT_DIR-prefix-for-WaylandProtocols_PKGDATADIR.patch
@@ -0,0 +1,11 @@
+diff --git a/CMake/modules/FindWaylandProtocols.cmake b/CMake/modules/FindWaylandProtocols.cmake
+index 8eb83f2..1e64fa9 100644
+--- a/CMake/modules/FindWaylandProtocols.cmake
++++ b/CMake/modules/FindWaylandProtocols.cmake
+@@ -22,5 +22,5 @@ find_package_handle_standard_args(WaylandProtocols
+ )
+ 
+ set(WAYLAND_PROTOCOLS_FOUND ${WaylandProtocols_FOUND})
+-set(WAYLAND_PROTOCOLS_PKGDATADIR ${WaylandProtocols_PKGDATADIR})
++set(WAYLAND_PROTOCOLS_PKGDATADIR $ENV{PKG_CONFIG_SYSROOT_DIR}/${WaylandProtocols_PKGDATADIR})
+ set(WAYLAND_PROTOCOLS_VERSION ${WaylandProtocols_VERSION})
diff --git a/meta-arago-extras/recipes-graphics/glfw3/glfw3_git.bb b/meta-arago-extras/recipes-graphics/glfw3/glfw3_git.bb
new file mode 100644
index 0000000..5736594
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/glfw3/glfw3_git.bb
@@ -0,0 +1,24 @@
+SUMMARY = "GLFW cross platform graphics framework"
+DESCRIPTION = "A multi-platform library for OpenGL and OpenGLES, window and input"
+HOMEPAGE = "http://glfw.org/"
+LICENSE = "Zlib & Libpng"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=352912f8ce21ff7d8b592a4edbe48f50"
+
+PV = "3.2"
+PR = "r0"
+
+BRANCH = "master"
+SRC_URI = "git://github.com/glfw/glfw.git;branch=${BRANCH}"
+SRCREV = "f6ec835599123c3c970d34534ed7ddc69a1fc6af"
+
+SRC_URI += "file://0001-add-PKG_CONFIG_SYSROOT_DIR-prefix-for-WaylandProtocols_PKGDATADIR.patch"
+
+DEPENDS = "extra-cmake-modules glib-2.0 virtual/libgles2 virtual/egl weston wayland wayland-native wayland-protocols"
+
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE += "-DGLFW_USE_WAYLAND=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF"
+
+FILES_${PN} += "/usr/lib/cmake/*"
-- 
1.9.1

Re: [PATCH 0/3] add glfw3 version 3.2

[Denys Dmytriyenko]

Thanks! I'll give it a try and will push if everything works fine.


On Tue, Aug 16, 2016 at 06:04:44PM -0400, Hongmei Gou wrote:
> Add glfw3 version 3.2, which requires two new dependencis:
> 1. wayland-protocols
> 2. extra-cmake-modules
> 
> Also a patch has been created for glfw3 to specify WaylandProtocols_PKGDATADIR with the correct prefix
> 
> Hongmei Gou (3):
>   wayland-protocols: add version 1.5
>   extra-cmake-modules: add version 1.5.0+gitrX
>   glfw3: add version 3.2
> 
>  .../wayland/wayland-protocols_1.5.bb               | 20 +++++++++++++++++
>  .../recipes-devtools/cmake/extra-cmake-modules.bb  | 18 +++++++++++++++
>  ...in-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch | 26 ++++++++++++++++++++++
>  ...IR-prefix-for-WaylandProtocols_PKGDATADIR.patch | 11 +++++++++
>  .../recipes-graphics/glfw3/glfw3_git.bb            | 24 ++++++++++++++++++++
>  5 files changed, 99 insertions(+)
>  create mode 100644 meta-arago-distro/recipes-graphics/wayland/wayland-protocols_1.5.bb
>  create mode 100644 meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
>  create mode 100644 meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules/0001-Search-within-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-for-q.patch
>  create mode 100644 meta-arago-extras/recipes-graphics/glfw3/files/0001-add-PKG_CONFIG_SYSROOT_DIR-prefix-for-WaylandProtocols_PKGDATADIR.patch
>  create mode 100644 meta-arago-extras/recipes-graphics/glfw3/glfw3_git.bb
> 
> -- 
> 1.9.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago