[oe-commits] [openembedded-core] branch master-next updated: eglinfo: remove the recipe
git at git.openembedded.org
git at git.openembedded.org
Mon Sep 2 14:31:12 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
The following commit(s) were added to refs/heads/master-next by this push:
new 8da4a98 eglinfo: remove the recipe
8da4a98 is described below
commit 8da4a98e863a6ef0e0bd1d9ed91a2484e1b026b9
Author: Alexander Kanavin <alex.kanavin at gmail.com>
AuthorDate: Thu Aug 29 18:30:19 2019 +0200
eglinfo: remove the recipe
Last commit upstream was in Sep 2014; pull requests have been ignored since.
I believe eglinfo from mesa-demos is an adequate and maintained alternative.
Also this recipe was using an ugly waf blob placed directly into oe-core, which
was also dependent on python 2.
Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb | 7 -
.../eglinfo/eglinfo-wayland_1.0.0.bb | 13 --
meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb | 13 --
meta/recipes-graphics/eglinfo/eglinfo.inc | 38 -----
...GING_INCDIR-to-searchpath-for-egl-headers.patch | 33 ----
.../0001-Check-for-libegl-using-pkg-config.patch | 36 -----
meta/recipes-graphics/eglinfo/files/waf | 169 ---------------------
7 files changed, 309 deletions(-)
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
deleted file mode 100644
index cccdd20..0000000
--- a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-EGLINFO_PLATFORM ?= "fb"
-EGLINFO_BINARY_NAME ?= "eglinfo-fb"
-
-require eglinfo.inc
-
-SUMMARY += "(Framebuffer version)"
-CXXFLAGS += "-DMESA_EGL_NO_X11_HEADERS=1"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb
deleted file mode 100644
index 87a131a..0000000
--- a/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-EGLINFO_PLATFORM ?= "wayland"
-EGLINFO_BINARY_NAME ?= "eglinfo-wayland"
-
-require eglinfo.inc
-
-DEPENDS += "wayland"
-
-inherit distro_features_check
-
-# depends on wayland
-REQUIRED_DISTRO_FEATURES += "wayland"
-
-SUMMARY += "(Wayland version)"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
deleted file mode 100644
index 48ab880..0000000
--- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-EGLINFO_PLATFORM ?= "x11"
-EGLINFO_BINARY_NAME ?= "eglinfo-x11"
-
-require eglinfo.inc
-
-DEPENDS += "virtual/libx11"
-
-inherit distro_features_check
-
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES += "x11"
-
-SUMMARY += "(X11 version)"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/meta/recipes-graphics/eglinfo/eglinfo.inc
deleted file mode 100644
index 6dcb0c5..0000000
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-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 \
- file://waf \
- file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \
- file://0001-Check-for-libegl-using-pkg-config.patch \
- "
-SRCREV = "223817ee37988042db7873cfb5b2e899dfe35c10"
-
-CVE_PRODUCT = "eglinfo"
-
-S = "${WORKDIR}/git"
-
-inherit waf distro_features_check pkgconfig
-# depends on virtual/egl
-REQUIRED_DISTRO_FEATURES ?= "opengl"
-
-# 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_configure_prepend() {
- install -D -m 0755 ${WORKDIR}/waf ${S}/waf
-}
-do_install_append() {
- mv ${D}/${bindir}/eglinfo ${D}/${bindir}/${EGLINFO_BINARY_NAME}
-}
diff --git a/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch b/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
deleted file mode 100644
index 61327eb..0000000
--- a/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 99a5784d33ad5e0e6fa00338d2732cbccad7661c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Wed, 13 Jan 2016 16:08:22 -0800
-Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers
-
-bcm_host.h is in standard includedir in sysroot
-add that to header search paths.
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
-Upstream-Status: Submitted
-
- wscript | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index 195e247..0f6ec53 100644
---- a/wscript
-+++ b/wscript
-@@ -177,9 +177,10 @@ def configure_raspberrypi_device(conf, platform):
- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
- import os
- sysroot = conf.options.sysroot + conf.options.prefix
-+ std_include_path = os.path.join(sysroot, 'include')
- vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads')
- vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux')
-- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path], uselib_store = 'EGL'):
-+ if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'):
- conf.fatal('Check if --prefix and --sysroot are set correctly.')
- conf.env['WITH_APIS'] = []
- if check_gles2(conf):
---
-2.19.1
diff --git a/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch b/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch
deleted file mode 100644
index 572c801..0000000
--- a/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 17f5d2f574236f8c3459f9efadef2f0f6220a4dd Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Mon, 13 Aug 2018 15:46:53 -0700
-Subject: [PATCH] Check for libegl using pkg-config
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
-[Roman: patch has been rebased to 223817ee3798 ("Add Wayland support")
- trivial merge conflicts resolved]
-Signed-off-by: Roman Stratiienko <roman.stratiienko at globallogic.com>
----
- wscript | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/wscript b/wscript
-index 0f6ec53..401f62e 100644
---- a/wscript
-+++ b/wscript
-@@ -174,14 +174,9 @@ def configure_raspberrypi_device(conf, platform):
- else:
- conf.fatal('Unsupported Raspberry Pi platform "%s"' % platform)
- return
-- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
-+ conf.check_cfg(package='egl', args='--libs --cflags')
- import os
- sysroot = conf.options.sysroot + conf.options.prefix
-- std_include_path = os.path.join(sysroot, 'include')
-- vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads')
-- vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux')
-- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'):
-- conf.fatal('Check if --prefix and --sysroot are set correctly.')
- conf.env['WITH_APIS'] = []
- if check_gles2(conf):
- conf.env['WITH_APIS'] += ['GLES1', 'GLES2']
---
-2.19.1
diff --git a/meta/recipes-graphics/eglinfo/files/waf b/meta/recipes-graphics/eglinfo/files/waf
deleted file mode 100755
index 04ddd9f..0000000
--- a/meta/recipes-graphics/eglinfo/files/waf
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/usr/bin/env python
-# encoding: latin-1
-# Thomas Nagy, 2005-2018
-#
-"""
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-"""
-
-import os, sys, inspect
-
-VERSION="2.0.11"
-REVISION="41b69b45f8aa445dce066a4aec3cdb75"
-GIT="fe03c6fa470f0bc3c086baafed8c6b4b6d28a245"
-INSTALL=''
-C1='#4'
-C2='#*'
-C3='#)'
-cwd = os.getcwd()
-join = os.path.join
-
-
-WAF='waf'
-def b(x):
- return x
-if sys.hexversion>0x300000f:
- WAF='waf3'
- def b(x):
- return x.encode()
-
-def err(m):
- print(('\033[91mError: %s\033[0m' % m))
- sys.exit(1)
-
-def unpack_wafdir(dir, src):
- f = open(src,'rb')
- c = 'corrupt archive (%d)'
- while 1:
- line = f.readline()
- if not line: err('run waf-light from a folder containing waflib')
- if line == b('#==>\n'):
- txt = f.readline()
- if not txt: err(c % 1)
- if f.readline() != b('#<==\n'): err(c % 2)
- break
- if not txt: err(c % 3)
- txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r')).replace(b(C3), b('\x00'))
-
- import shutil, tarfile
- try: shutil.rmtree(dir)
- except OSError: pass
- try:
- for x in ('Tools', 'extras'):
- os.makedirs(join(dir, 'waflib', x))
- except OSError:
- err("Cannot unpack waf lib into %s\nMove waf in a writable directory" % dir)
-
- os.chdir(dir)
- tmp = 't.gz'
- t = open(tmp,'wb')
- try: t.write(txt)
- finally: t.close()
-
- try:
- t = tarfile.open(tmp)
- except:
- try:
- os.system('gzip -d t.gz')
- t = tarfile.open('t')
- tmp = 't'
- except:
- os.chdir(cwd)
- try: shutil.rmtree(dir)
- except OSError: pass
- err("Waf cannot be unpacked, check that bzip2 support is present")
-
- try:
- for x in t: t.extract(x)
- finally:
- t.close()
-
- for x in ('Tools', 'extras'):
- os.chmod(join('waflib',x), 493)
-
- if sys.hexversion<0x300000f:
- sys.path = [join(dir, 'waflib')] + sys.path
- import fixpy2
- fixpy2.fixdir(dir)
-
- os.remove(tmp)
- os.chdir(cwd)
-
- try: dir = unicode(dir, 'mbcs')
- except: pass
- try:
- from ctypes import windll
- windll.kernel32.SetFileAttributesW(dir, 2)
- except:
- pass
-
-def test(dir):
- try:
- os.stat(join(dir, 'waflib'))
- return os.path.abspath(dir)
- except OSError:
- pass
-
-def find_lib():
- src = os.path.abspath(inspect.getfile(inspect.getmodule(err)))
- base, name = os.path.split(src)
-
- #devs use $WAFDIR
- w=test(os.environ.get('WAFDIR', ''))
- if w: return w
-
- #waf-light
- if name.endswith('waf-light'):
- w = test(base)
- if w: return w
- err('waf-light requires waflib -> export WAFDIR=/folder')
-
- dirname = '%s-%s-%s' % (WAF, VERSION, REVISION)
- for i in (INSTALL,'/usr','/usr/local','/opt'):
- w = test(i + '/lib/' + dirname)
- if w: return w
-
- #waf-local
- dir = join(base, (sys.platform != 'win32' and '.' or '') + dirname)
- w = test(dir)
- if w: return w
-
- #unpack
- unpack_wafdir(dir, src)
- return dir
-
-wafdir = find_lib()
-sys.path.insert(0, wafdir)
-
-if __name__ == '__main__':
-
- from waflib import Scripting
- Scripting.waf_entry_point(cwd, VERSION, wafdir)
-
-#==>
-# ����[�tmp-waf-2.0.11.tar#)�kc�Ʊ0ܯ�`��#)� Z�/iu����$>q$?�ӴGfq(�� ��&�o�#)��6i��4n#�������\n�����`^N����������ÿ�� �/���
|��G�
?z������
?~��W��_��-�jPt��*�ڔ�����?��� u .����d�0���.n��|��u7���d~y�]V��Bʷ�ޜ�<��;ϫn6�T u��jQ
=|x3�&�Ë<�~8���U漢M���`2@iu���+
O�Y�3�-���e\dqy[v�E>���t���o�ɴ��L��uBϽ���V�$�Q�*n�:[TvX�.�R˞U�rX-�#*�3��ô���4�|~ ��y_���o�W�"~}�����x�,�l5�U�%�>.���J��AYv���y +'�/�ˆU �Fٸ��I��a�M�qY�3��� =NH�S�!�9�:���*I�E�yVU��bYe��[#)J�
B �$#4�7�{ƱZ [...]
-#<==
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list