diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch index 1262dee237..8a98ba60d1 100644 --- a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch +++ b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch | |||
@@ -1,10 +1,11 @@ | |||
1 | From c8c3de5417d6b6c7d7579c528c0cab718f4bfdb6 Mon Sep 17 00:00:00 2001 | 1 | From 477ab6d90a17d8e4d3935be6ce8b8e154db0e3e5 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Thu, 10 Jul 2014 14:48:12 +0200 | 3 | Date: Thu, 10 Jul 2014 14:48:12 +0200 |
4 | Subject: [PATCH 9/9] glsl, perf: Install .glsl, .vert, .frag files | 4 | Subject: [PATCH] glsl, perf: Install .glsl, .vert, .frag files |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | src/fpglsl/Makefile.am | 3 ++- | 10 | src/fpglsl/Makefile.am | 3 ++- |
10 | src/glsl/Makefile.am | 3 ++- | 11 | src/glsl/Makefile.am | 3 ++- |
@@ -13,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
13 | 4 files changed, 8 insertions(+), 4 deletions(-) | 14 | 4 files changed, 8 insertions(+), 4 deletions(-) |
14 | 15 | ||
15 | diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am | 16 | diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am |
16 | index fd43c91..2bf51de 100644 | 17 | index fd43c919..2bf51de4 100644 |
17 | --- a/src/fpglsl/Makefile.am | 18 | --- a/src/fpglsl/Makefile.am |
18 | +++ b/src/fpglsl/Makefile.am | 19 | +++ b/src/fpglsl/Makefile.am |
19 | @@ -38,7 +38,8 @@ noinst_PROGRAMS = \ | 20 | @@ -38,7 +38,8 @@ noinst_PROGRAMS = \ |
@@ -27,7 +28,7 @@ index fd43c91..2bf51de 100644 | |||
27 | dowhile2.glsl \ | 28 | dowhile2.glsl \ |
28 | dowhile.glsl \ | 29 | dowhile.glsl \ |
29 | diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am | 30 | diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am |
30 | index 079a29d..f66ec29 100644 | 31 | index 079a29d8..f66ec299 100644 |
31 | --- a/src/glsl/Makefile.am | 32 | --- a/src/glsl/Makefile.am |
32 | +++ b/src/glsl/Makefile.am | 33 | +++ b/src/glsl/Makefile.am |
33 | @@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la | 34 | @@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la |
@@ -41,12 +42,12 @@ index 079a29d..f66ec29 100644 | |||
41 | CH06-brick.vert \ | 42 | CH06-brick.vert \ |
42 | CH11-bumpmap.frag \ | 43 | CH11-bumpmap.frag \ |
43 | diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am | 44 | diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am |
44 | index c5cca8d..140256d 100644 | 45 | index 60069396..469bdf45 100644 |
45 | --- a/src/perf/Makefile.am | 46 | --- a/src/perf/Makefile.am |
46 | +++ b/src/perf/Makefile.am | 47 | +++ b/src/perf/Makefile.am |
47 | @@ -58,7 +58,8 @@ endif | 48 | @@ -60,7 +60,8 @@ endif |
48 | |||
49 | glslstateschange_LDADD = libperf.la ../util/libutil.la | 49 | glslstateschange_LDADD = libperf.la ../util/libutil.la |
50 | glsl_compile_time_LDADD = ../util/libutil.la | ||
50 | 51 | ||
51 | -EXTRA_DIST = \ | 52 | -EXTRA_DIST = \ |
52 | +demosdatadir=$(datadir)/$(PACKAGE)/ | 53 | +demosdatadir=$(datadir)/$(PACKAGE)/ |
@@ -55,7 +56,7 @@ index c5cca8d..140256d 100644 | |||
55 | glslstateschange1.vert \ | 56 | glslstateschange1.vert \ |
56 | glslstateschange2.frag \ | 57 | glslstateschange2.frag \ |
57 | diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am | 58 | diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am |
58 | index 48b08f4..5526867 100644 | 59 | index 48b08f48..55268675 100644 |
59 | --- a/src/vpglsl/Makefile.am | 60 | --- a/src/vpglsl/Makefile.am |
60 | +++ b/src/vpglsl/Makefile.am | 61 | +++ b/src/vpglsl/Makefile.am |
61 | @@ -38,7 +38,8 @@ noinst_PROGRAMS = \ | 62 | @@ -38,7 +38,8 @@ noinst_PROGRAMS = \ |
@@ -68,6 +69,3 @@ index 48b08f4..5526867 100644 | |||
68 | for.glsl \ | 69 | for.glsl \ |
69 | func.glsl \ | 70 | func.glsl \ |
70 | func2.glsl \ | 71 | func2.glsl \ |
71 | -- | ||
72 | 2.0.0 | ||
73 | |||