diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-05-05 17:09:08 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-05-23 15:49:35 +0200 |
commit | 9ac340ed5e94b31718f31e4a90f3610a3d7a8e13 (patch) | |
tree | f8cd0c242bf06af752ec4498a72ef49af1475a0a /meta-oe/recipes-graphics | |
parent | b629d9dbd3c22fca92ebd2205bb744562e8ca7ae (diff) | |
download | meta-openembedded-9ac340ed5e94b31718f31e4a90f3610a3d7a8e13.tar.gz |
glcompbench: remove the recipe
It hasn't been updated upstream since 2012, and relies on outdated libpng 1.2
(which is being removed from oe-core).
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
7 files changed, 0 insertions, 193 deletions
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-build-Specify-std-c-11-on-cmdline.patch b/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-build-Specify-std-c-11-on-cmdline.patch deleted file mode 100644 index ffbc297f0..000000000 --- a/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-build-Specify-std-c-11-on-cmdline.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 47bfef0dd83ed2e10ec4c615908ec926c4d5fe2e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 19 Oct 2016 00:56:54 +0000 | ||
4 | Subject: [PATCH] build: Specify -std=c++11 on cmdline | ||
5 | |||
6 | We use c++11 features so demand it explicitly from compiler | ||
7 | |||
8 | Fixes | ||
9 | | ../src/libmatrix/shader-source.cc:37:10: error: no member named 'unique_ptr' in namespace 'std' | ||
10 | | std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); | ||
11 | | ~~~~~^ | ||
12 | | ../src/libmatrix/shader-source.cc:37:33: error: expected '(' for function-style cast or type construction | ||
13 | | std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); | ||
14 | | ~~~~~~~~~~~~^ | ||
15 | | ../src/libmatrix/shader-source.cc:37:35: error: use of undeclared identifier 'is_ptr' | ||
16 | | std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); | ||
17 | | ^ | ||
18 | | ../src/libmatrix/shader-source.cc:38:30: error: use of undeclared identifier 'is_ptr' | ||
19 | | std::istream& inputFile(*is_ptr); | ||
20 | | ^ | ||
21 | | 4 errors generated. | ||
22 | |||
23 | Upstream-Status: Pending | ||
24 | |||
25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
26 | --- | ||
27 | wscript | 2 +- | ||
28 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
29 | |||
30 | diff --git a/wscript b/wscript | ||
31 | index dcaf298..485a9fb 100644 | ||
32 | --- a/wscript | ||
33 | +++ b/wscript | ||
34 | @@ -79,7 +79,7 @@ def configure(ctx): | ||
35 | ctx.check_cfg(package = pkg, uselib_store = uselib, args = '--cflags --libs', | ||
36 | mandatory = True) | ||
37 | |||
38 | - ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -Wextra'.split(' ')) | ||
39 | + ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra'.split(' ')) | ||
40 | |||
41 | # Prepend -O# and -g flags so that they can be overriden by the CFLAGS environment variable | ||
42 | if Options.options.opt: | ||
43 | -- | ||
44 | 1.9.1 | ||
45 | |||
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch b/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch deleted file mode 100644 index deb60161c..000000000 --- a/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 49297e2fbe0420a255cbe67989d0ec539125412c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 23 Apr 2017 10:38:24 -0700 | ||
4 | Subject: [PATCH] waf: Disable errors due to -Wdeprecated | ||
5 | |||
6 | throw() has been deprecated in c++11 and removed | ||
7 | from c++17, gcc7 is more pedandic about this warning | ||
8 | we therefore add a workaround to ignore this warning | ||
9 | for now. | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | wscript | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/wscript b/wscript | ||
17 | index 485a9fb..7f59761 100644 | ||
18 | --- a/wscript | ||
19 | +++ b/wscript | ||
20 | @@ -79,7 +79,7 @@ def configure(ctx): | ||
21 | ctx.check_cfg(package = pkg, uselib_store = uselib, args = '--cflags --libs', | ||
22 | mandatory = True) | ||
23 | |||
24 | - ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra'.split(' ')) | ||
25 | + ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra -Wno-error=deprecated'.split(' ')) | ||
26 | |||
27 | # Prepend -O# and -g flags so that they can be overriden by the CFLAGS environment variable | ||
28 | if Options.options.opt: | ||
29 | -- | ||
30 | 2.12.2 | ||
31 | |||
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix-configure-for-sqrt-check.patch b/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix-configure-for-sqrt-check.patch deleted file mode 100755 index 4831c401f..000000000 --- a/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix-configure-for-sqrt-check.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Index: git/wscript | ||
2 | =================================================================== | ||
3 | --- git.orig/wscript 2016-07-29 13:15:44.954249796 -0500 | ||
4 | +++ git/wscript 2016-07-29 15:52:06.196768865 -0500 | ||
5 | @@ -56,7 +56,7 @@ | ||
6 | ctx.check_cxx(lib = lib, uselib_store = uselib) | ||
7 | |||
8 | # Check required functions | ||
9 | - req_funcs = [('gettimeofday', 'sys/time.h', []) ,('sqrt', 'math.h', ['m']), | ||
10 | + req_funcs = [('gettimeofday', 'sys/time.h', []), | ||
11 | ('strtol', 'stdlib.h', []), ('strtoul', 'stdlib.h', [])] | ||
12 | for func, header, uselib in req_funcs: | ||
13 | ctx.check_cxx(function_name = func, header_name = header, uselib = uselib, mandatory = True) | ||
14 | |||
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix_auto_ptr_deprecated.patch b/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix_auto_ptr_deprecated.patch deleted file mode 100755 index 930c7cb50..000000000 --- a/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix_auto_ptr_deprecated.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | diff -aur glcompbench-2012.08/src/libmatrix/shader-source.cc Fixed/src/libmatrix/shader-source.cc | ||
2 | --- glcompbench-2012.08/src/libmatrix/shader-source.cc 2012-08-22 13:41:36.000000000 -0500 | ||
3 | +++ Fixed/src/libmatrix/shader-source.cc 2016-08-24 14:23:49.576023317 -0500 | ||
4 | @@ -34,7 +34,7 @@ | ||
5 | bool | ||
6 | ShaderSource::load_file(const std::string& filename, std::string& str) | ||
7 | { | ||
8 | - std::auto_ptr<std::istream> is_ptr(Util::get_resource(filename)); | ||
9 | + std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); | ||
10 | std::istream& inputFile(*is_ptr); | ||
11 | |||
12 | if (!inputFile) | ||
13 | diff -aur glcompbench-2012.08/src/texture.cc Fixed/src/texture.cc | ||
14 | --- glcompbench-2012.08/src/texture.cc 2012-08-22 13:41:36.000000000 -0500 | ||
15 | +++ Fixed/src/texture.cc 2016-08-24 14:23:28.223917438 -0500 | ||
16 | @@ -52,7 +52,7 @@ | ||
17 | |||
18 | Log::debug("Reading PNG file %s\n", filename.c_str()); | ||
19 | |||
20 | - const std::auto_ptr<std::istream> is_ptr(Util::get_resource(filename)); | ||
21 | + const std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); | ||
22 | if (!(*is_ptr)) { | ||
23 | Log::error("Cannot open file %s!\n", filename.c_str()); | ||
24 | return false; | ||
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix_space_issues.patch b/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix_space_issues.patch deleted file mode 100755 index 516baadae..000000000 --- a/meta-oe/recipes-graphics/glcompbench/glcompbench/Fix_space_issues.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | diff -aur glcompbench-2012.08/src/composite-canvas.cc Fixed/src/composite-canvas.cc | ||
2 | --- glcompbench-2012.08/src/composite-canvas.cc 2012-08-22 13:41:36.000000000 -0500 | ||
3 | +++ Fixed/src/composite-canvas.cc 2016-08-24 14:05:28.970565709 -0500 | ||
4 | @@ -41,7 +41,7 @@ | ||
5 | #include "log.h" | ||
6 | #include "profiler.h" | ||
7 | |||
8 | -const std::string glcompbench_version_string("glcompbench "GLCOMPBENCH_VERSION); | ||
9 | +const std::string glcompbench_version_string("glcompbench " GLCOMPBENCH_VERSION); | ||
10 | |||
11 | /******************* | ||
12 | * Private methods * | ||
13 | @@ -495,7 +495,7 @@ | ||
14 | // When we complete an iteration, reset the count and tell the caller. | ||
15 | |||
16 | if (stats.total >= current_test_duration_) { | ||
17 | - Log::info("FPS: %"PRIu64"\n", (uint64_t)(1000 * stats.nsamples / stats.total)); | ||
18 | + Log::info("FPS: %" PRIu64 "\n", (uint64_t)(1000 * stats.nsamples / stats.total)); | ||
19 | |||
20 | for (Profiler::Point p = 0; p < profiler.get_num_points(); p += 2) { | ||
21 | profiler.get_stats(p, p + 1, stats); | ||
22 | |||
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench/glbench-compile-fix.patch b/meta-oe/recipes-graphics/glcompbench/glcompbench/glbench-compile-fix.patch deleted file mode 100644 index 374a6cf66..000000000 --- a/meta-oe/recipes-graphics/glcompbench/glcompbench/glbench-compile-fix.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From c4bc44c3abf69f26e4c2b7684f4da4670a51f993 Mon Sep 17 00:00:00 2001 | ||
2 | From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> | ||
3 | Date: Tue, 5 Nov 2013 11:03:04 -0600 | ||
4 | Subject: [PATCH] to make compilable | ||
5 | |||
6 | Upstream Status: Inappropriate [workaround] | ||
7 | |||
8 | Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> | ||
9 | --- | ||
10 | src/composite-test-simple-blur.cc | 2 ++ | ||
11 | 1 file changed, 2 insertions(+) | ||
12 | |||
13 | diff --git a/src/composite-test-simple-blur.cc b/src/composite-test-simple-blur.cc | ||
14 | index 170ad64..d7f77cf 100644 | ||
15 | --- a/src/composite-test-simple-blur.cc | ||
16 | +++ b/src/composite-test-simple-blur.cc | ||
17 | @@ -347,6 +347,7 @@ CompositeTestSimpleBlur::CompositeTestSimpleBlur() : | ||
18 | |||
19 | CompositeTestSimpleBlur::~CompositeTestSimpleBlur() | ||
20 | { | ||
21 | +#if 0 | ||
22 | for (BlurWindowMapType::iterator winIt = priv_->windowMap.begin(); | ||
23 | winIt != priv_->windowMap.end(); | ||
24 | winIt++) | ||
25 | @@ -354,6 +355,7 @@ CompositeTestSimpleBlur::~CompositeTestSimpleBlur() | ||
26 | RenderWindowBlur* ro = winIt->second; | ||
27 | delete ro; | ||
28 | } | ||
29 | +#endif | ||
30 | delete priv_; | ||
31 | } | ||
32 | |||
33 | -- | ||
34 | 1.8.1.2 | ||
35 | |||
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb b/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb deleted file mode 100755 index e8465855d..000000000 --- a/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | SUMMARY = "A benchmark for GL(ES)2 based compositing operations" | ||
2 | LICENSE = "GPLv3" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" | ||
4 | |||
5 | DEPENDS = "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2 \ | ||
6 | virtual/libx11 libxcomposite pixman libxrender libpng12" | ||
7 | |||
8 | SRC_URI = "https://launchpad.net/glcompbench/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \ | ||
9 | file://glbench-compile-fix.patch \ | ||
10 | file://Fix-configure-for-sqrt-check.patch \ | ||
11 | file://Fix_space_issues.patch \ | ||
12 | file://Fix_auto_ptr_deprecated.patch \ | ||
13 | file://0001-build-Specify-std-c-11-on-cmdline.patch \ | ||
14 | file://0001-waf-Disable-errors-due-to-Wdeprecated.patch \ | ||
15 | " | ||
16 | |||
17 | SRC_URI[md5sum] = "c939d9156fe940960098f38707fea827" | ||
18 | SRC_URI[sha256sum] = "b04b738cec06c6786ceafa86e4735fd8b971c078265754854ef356b0379542ee" | ||
19 | |||
20 | inherit pkgconfig waf distro_features_check | ||
21 | # depends on virtual/libx11 | ||
22 | REQUIRED_DISTRO_FEATURES = "x11" | ||