summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r--meta-oe/recipes-graphics/clutter/clutter-box2d.inc15
-rw-r--r--meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb19
-rw-r--r--meta-oe/recipes-graphics/fim/files/cross_cc.patch29
-rw-r--r--meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb52
-rw-r--r--meta-oe/recipes-graphics/libsexy/libsexy.inc15
-rw-r--r--meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch15
-rw-r--r--meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb8
-rw-r--r--meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch21
-rw-r--r--meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch343
-rw-r--r--meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch37
-rw-r--r--meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch50
-rw-r--r--meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch30
-rw-r--r--meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch32
-rw-r--r--meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch47
-rw-r--r--meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch161
-rw-r--r--meta-oe/recipes-graphics/slim/slim_1.3.2.bb82
-rwxr-xr-xmeta-oe/recipes-graphics/wayland/wayland-fits_git.bb35
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch153
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb22
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch41
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb16
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch29
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch48
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch35
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch279
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch29
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb25
27 files changed, 0 insertions, 1668 deletions
diff --git a/meta-oe/recipes-graphics/clutter/clutter-box2d.inc b/meta-oe/recipes-graphics/clutter/clutter-box2d.inc
deleted file mode 100644
index 646b785ca..000000000
--- a/meta-oe/recipes-graphics/clutter/clutter-box2d.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1DESCRIPTION = "Clutter Box2D"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2.1+"
4
5# The main clutter lib is machine specific so we need to be too
6PACKAGE_ARCH = "${MACHINE_ARCH}"
7
8inherit autotools pkgconfig gtk-doc
9
10do_install_append () {
11 install -d ${D}${bindir}
12 install ${S}/examples/.libs/blockbox ${D}${bindir}
13}
14
15FILESPATH = "${FILE_DIRNAME}/clutter-box2d"
diff --git a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb b/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
deleted file mode 100644
index d73e2f15e..000000000
--- a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1require clutter-box2d.inc
2
3LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6b"
4
5# 0.12.1+gitAUTOINC+de5452e56b-r1/git/clutter-box2d/clutter-box2d.h:226:47:
6# fatal error: clutter-box2d/clutter-box2d-child.h: No such file or directory
7# | #include <clutter-box2d/clutter-box2d-child.h>
8PNBLACKLIST[clutter-box2d] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed"
9
10SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2"
11PV = "0.12.1+git${SRCPV}"
12PR = "r1"
13
14SRC_URI = "git://git.gnome.org/clutter-box2d.git"
15
16S = "${WORKDIR}/git"
17
18DEPENDS += "clutter-1.0"
19PROVIDES = "clutter-box2d-1.6"
diff --git a/meta-oe/recipes-graphics/fim/files/cross_cc.patch b/meta-oe/recipes-graphics/fim/files/cross_cc.patch
deleted file mode 100644
index 85ab1ef4a..000000000
--- a/meta-oe/recipes-graphics/fim/files/cross_cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 9b0b322d86c7b2d2cddaa62f7dab4aa669739a48 Mon Sep 17 00:00:00 2001
2From: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
3Date: Wed, 19 Mar 2014 13:18:21 +0100
4Subject: [PATCH] Upstream-Status: Pending
5
6b2ba should be built by BUILD_CC in cross environment
7This is only used when configured with --enable-hardcoded-font
8
9Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
10---
11 src/Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/Makefile.am b/src/Makefile.am
15index a1d4330..a8150b9 100644
16--- a/src/Makefile.am
17+++ b/src/Makefile.am
18@@ -63,7 +63,7 @@ help-acm.cpp: fim.h
19 $(ECHO) '//#endif' >> $@
20
21 b2ba:
22- $(CC) -o b2ba b2ba.c
23+ $(BUILD_CC) -o b2ba b2ba.c
24
25 if FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT
26 default_font_byte_array.h: $(FIM_CUSTOM_HARDCODED_CONSOLEFONT) b2ba
27--
281.8.5.4
29
diff --git a/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb b/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
deleted file mode 100644
index 7d1a3aaa8..000000000
--- a/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
+++ /dev/null
@@ -1,52 +0,0 @@
1SUMMARY = "Framebuffer (scriptable) image viewer"
2DESCRIPTION = "FIM (Fbi IMproved) aims to be a highly customizable and scriptable \
3 image viewer targeted at users who are comfortable with software \
4 like the Vim text editor or the Mutt mail user agent."
5SECTION = "utils"
6HOMEPAGE = "http://www.autistici.org/dezperado/fim/"
7
8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://COPYING;md5=fa01bff138cc98a62b8840a157951c88"
10
11PNBLACKLIST[fim] ?= "BROKEN: doesn't build with B!=S (flex: can't open lex.lex) - the recipe will be removed on 2017-09-01 unless the issue is fixed"
12
13# flex with provide /usr/include/FlexLexer.h
14DEPENDS = "flex-native bison-native flex"
15
16SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/fbi-improved/${BPN}-${PV}.tar.gz \
17 file://cross_cc.patch"
18SRC_URI[md5sum] = "d7362dde5541c2b6439c35c6e2bd5046"
19SRC_URI[sha256sum] = "3f6bf2de2952b9adcbeb3db12c2a979e999a81dd1e314a03bc58e24f1ea9f686"
20
21PARALLEL_MAKE = ""
22
23inherit autotools pkgconfig
24
25# Don't use provided regex.c
26EXTRA_OECONF = "fim_cv_regex=no fim_cv_regex_broken=no \
27 --enable-framebuffer \
28 --disable-djvu \
29 --disable-ps \
30 --disable-xcftopnm \
31 --disable-convert \
32 --disable-inkscape \
33 --disable-xfig \
34 --disable-dia \
35 --disable-aa \
36 --disable-sdl \
37 --enable-read-dirs \
38 --enable-recursive-dirs \
39 --enable-custom-status-bar \
40"
41
42# Note: imlib2 is located in meta-efl layer.
43PACKAGECONFIG ?= "jpeg rl hf"
44PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
45PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
46PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff"
47PACKAGECONFIG[gif] = "--enable-gif,--disable-gif,giflib"
48PACKAGECONFIG[pdf] = "--enable-poppler,--disable-poppler,poppler"
49PACKAGECONFIG[magick] = "--enable-graphicsmagick,--disable-graphicsmagick,imagemagick"
50PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2"
51PACKAGECONFIG[rl] = "--enable-readline,--disable-readline,readline"
52PACKAGECONFIG[hf] = "--enable-hardcoded-font,--disable-hardcoded-font"
diff --git a/meta-oe/recipes-graphics/libsexy/libsexy.inc b/meta-oe/recipes-graphics/libsexy/libsexy.inc
deleted file mode 100644
index 5a11ca06a..000000000
--- a/meta-oe/recipes-graphics/libsexy/libsexy.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
2HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
3AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
4SECTION = "x11/libs"
5
6LICENSE = "LGPLv2.1"
7LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
8
9DEPENDS = "gtk+ enchant libxml2"
10
11SRC_URI = "http://releases.chipx86.com/libsexy/${BPN}/${BP}.tar.gz \
12 file://libsexy-pkgconfig-fixes.patch"
13
14inherit autotools pkgconfig
15
diff --git a/meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch b/meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch
deleted file mode 100644
index 61da9474d..000000000
--- a/meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: libsexy-0.1.11/libsexy.pc.in
2===================================================================
3--- libsexy-0.1.11.orig/libsexy.pc.in 2005-11-10 10:21:18.000000000 +0000
4+++ libsexy-0.1.11/libsexy.pc.in 2008-03-05 14:36:39.000000000 +0000
5@@ -6,7 +6,8 @@
6 Name: libsexy
7 Description: Doing naughty things to good widgets
8 Version: @VERSION@
9-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
10-Cflags: -I${includedir} @PACKAGE_CFLAGS@
11
12+Requires: pango glib-2.0 gtk+-2.0 libxml-2.0
13+Libs: -L${libdir} -lsexy
14+Cflags: -I${includedir}
15
diff --git a/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb b/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb
deleted file mode 100644
index 2ba1ebbb7..000000000
--- a/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require libsexy.inc
2
3PR = "r2"
4
5SRC_URI[md5sum] = "33c079a253270ec8bfb9508e4bb30754"
6SRC_URI[sha256sum] = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e"
7
8PNBLACKLIST[libsexy] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130607/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch b/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch
deleted file mode 100644
index 566a2087c..000000000
--- a/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1From: Luca Falavigna <dktrkranz@debian.org>
2Date: Tue, 27 Jan 2015 01:26:04 +0000
3Subject: format_string
4
5---
6 client_examples/gtkvncviewer.c | 2 +-
7 1 file changed, 1 insertion(+), 1 deletion(-)
8
9diff --git a/client_examples/gtkvncviewer.c b/client_examples/gtkvncviewer.c
10index 261b2da..861e4e3 100644
11--- a/client_examples/gtkvncviewer.c
12+++ b/client_examples/gtkvncviewer.c
13@@ -588,7 +588,7 @@ static void GtkDefaultLog (const char *format, ...)
14
15 time (&log_clock);
16 strftime (buf, 255, "%d/%m/%Y %X ", localtime (&log_clock));
17- fprintf (stdout, buf);
18+ fprintf (stdout, "%s", buf);
19
20 vfprintf (stdout, format, args);
21 fflush (stdout);
diff --git a/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch b/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch
deleted file mode 100644
index de82d6303..000000000
--- a/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch
+++ /dev/null
@@ -1,343 +0,0 @@
1From 24e548a222f0aab4313d5ba8b04f0840b173000f Mon Sep 17 00:00:00 2001
2From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
3Date: Mon, 30 Aug 2010 01:24:54 +0000
4Subject: [PATCH 2/8] Fix image handling integer overflows
5
6Image loading memory allocation is based on the image width and height:
7 malloc(heigth * width * 3). Providing an image with large height and
8width values can cause the result of this calculation to exceed the
9maximum value of an unsigned int and thus causes an integer overflow.
10The result: too little memory is allocated and an heap overflow occurs.
11
12This patch was based by Niels Heinen <niels@freebsd.org>
13Thanks!
14
15Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16
17git-svn-id: svn://svn.berlios.de/slim/trunk@176 7c53e7cc-98ea-0310-8f1f-a0b24da60408
18---
19 const.h | 3 ++
20 jpeg.c | 51 +++++++++++++++-----------
21 png.c | 122 ++++++++++++++++++++++++++++++++------------------------------
22 3 files changed, 96 insertions(+), 80 deletions(-)
23
24diff --git a/const.h b/const.h
25index df0989c..a18c6f3 100644
26--- a/const.h
27+++ b/const.h
28@@ -42,4 +42,7 @@
29 // variables replaced in pre-session_cmd and post-session_cmd
30 #define USER_VAR "%user"
31
32+// max height/width for images
33+#define MAX_DIMENSION 10000
34+
35 #endif
36diff --git a/jpeg.c b/jpeg.c
37index 1cf106c..e1f8352 100644
38--- a/jpeg.c
39+++ b/jpeg.c
40@@ -22,16 +22,22 @@
41 #include <string.h>
42
43 #include <jpeglib.h>
44+#include "const.h"
45
46 int
47 read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb)
48 {
49+ int ret = 0;
50 struct jpeg_decompress_struct cinfo;
51 struct jpeg_error_mgr jerr;
52 unsigned char *ptr = NULL;
53 unsigned int i, ipos;
54
55 FILE *infile = fopen(filename, "rb");
56+ if (infile == NULL) {
57+ fprintf(stderr, "Can not fopen file: %s\n",filename);
58+ return ret;
59+ }
60
61 cinfo.err = jpeg_std_error(&jerr);
62 jpeg_create_decompress(&cinfo);
63@@ -39,43 +45,39 @@ read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb)
64 jpeg_read_header(&cinfo, TRUE);
65 jpeg_start_decompress(&cinfo);
66
67+ /* Prevent against integer overflow */
68+ if(cinfo.output_width >= MAX_DIMENSION || cinfo.output_height >= MAX_DIMENSION) {
69+ fprintf(stderr, "Unreasonable dimension found in file: %s\n",filename);
70+ goto close_file;
71+ }
72+
73 *width = cinfo.output_width;
74 *height = cinfo.output_height;
75
76 rgb[0] = malloc(3 * cinfo.output_width * cinfo.output_height);
77- if (rgb[0] == NULL)
78- {
79+ if (rgb[0] == NULL) {
80 fprintf(stderr, "Can't allocate memory for JPEG file.\n");
81- fclose(infile);
82- return(0);
83+ goto close_file;
84 }
85
86- if (cinfo.output_components == 3)
87- {
88+ if (cinfo.output_components == 3) {
89 ptr = rgb[0];
90- while (cinfo.output_scanline < cinfo.output_height)
91- {
92+ while (cinfo.output_scanline < cinfo.output_height) {
93 jpeg_read_scanlines(&cinfo, &ptr, 1);
94 ptr += 3 * cinfo.output_width;
95 }
96- }
97- else if (cinfo.output_components == 1)
98- {
99+ } else if (cinfo.output_components == 1) {
100 ptr = malloc(cinfo.output_width);
101- if (ptr == NULL)
102- {
103+ if (ptr == NULL) {
104 fprintf(stderr, "Can't allocate memory for JPEG file.\n");
105- fclose(infile);
106- return(0);
107+ goto rgb_free;
108 }
109
110 ipos = 0;
111- while (cinfo.output_scanline < cinfo.output_height)
112- {
113+ while (cinfo.output_scanline < cinfo.output_height) {
114 jpeg_read_scanlines(&cinfo, &ptr, 1);
115
116- for (i = 0; i < cinfo.output_width; i++)
117- {
118+ for (i = 0; i < cinfo.output_width; i++) {
119 memset(rgb[0] + ipos, ptr[i], 3);
120 ipos += 3;
121 }
122@@ -85,9 +87,16 @@ read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb)
123 }
124
125 jpeg_finish_decompress(&cinfo);
126- jpeg_destroy_decompress(&cinfo);
127
128+ ret = 1;
129+ goto close_file;
130+
131+rgb_free:
132+ free(rgb[0]);
133+
134+close_file:
135+ jpeg_destroy_decompress(&cinfo);
136 fclose(infile);
137
138- return(1);
139+ return(ret);
140 }
141diff --git a/png.c b/png.c
142index a2661c6..5c086c6 100644
143--- a/png.c
144+++ b/png.c
145@@ -22,12 +22,13 @@
146 #include <stdlib.h>
147
148 #include <png.h>
149+#include "const.h"
150
151 int
152 read_png(const char *filename, int *width, int *height, unsigned char **rgb,
153 unsigned char **alpha)
154 {
155- FILE *infile = fopen(filename, "rb");
156+ int ret = 0;
157
158 png_structp png_ptr;
159 png_infop info_ptr;
160@@ -38,31 +39,27 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb,
161 int bit_depth, color_type, interlace_type;
162 int i;
163
164+ FILE *infile = fopen(filename, "rb");
165+ if (infile == NULL) {
166+ fprintf(stderr, "Can not fopen file: %s\n",filename);
167+ return ret;
168+ }
169+
170 png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
171 (png_voidp) NULL,
172 (png_error_ptr) NULL,
173 (png_error_ptr) NULL);
174- if (!png_ptr)
175- {
176- fclose(infile);
177- return(0);
178- }
179+ if (!png_ptr)
180+ goto file_close;
181
182 info_ptr = png_create_info_struct(png_ptr);
183- if (!info_ptr)
184- {
185+ if (!info_ptr) {
186 png_destroy_read_struct(&png_ptr, (png_infopp) NULL,
187 (png_infopp) NULL);
188- fclose(infile);
189- return(0);
190 }
191
192 if (setjmp(png_ptr->jmpbuf))
193- {
194- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
195- fclose(infile);
196- return(0);
197- }
198+ goto png_destroy;
199
200 png_init_io(png_ptr, infile);
201 png_read_info(png_ptr, info_ptr);
202@@ -70,18 +67,23 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb,
203 png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
204 &interlace_type, (int *) NULL, (int *) NULL);
205
206+ /* Prevent against integer overflow */
207+ if(w >= MAX_DIMENSION || h >= MAX_DIMENSION) {
208+ fprintf(stderr, "Unreasonable dimension found in file: %s\n",filename);
209+ goto png_destroy;
210+ }
211+
212 *width = (int) w;
213 *height = (int) h;
214
215 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA
216- || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
217- {
218- alpha[0] = malloc(*width * *height);
219- if (alpha[0] == NULL)
220- {
221- fprintf(stderr, "Can't allocate memory for alpha channel in PNG file.\n");
222- return(0);
223- }
224+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
225+ alpha[0] = malloc(*width * *height);
226+ if (alpha[0] == NULL)
227+ {
228+ fprintf(stderr, "Can't allocate memory for alpha channel in PNG file.\n");
229+ goto png_destroy;
230+ }
231 }
232
233 /* Change a paletted/grayscale image to RGB */
234@@ -94,68 +96,70 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb,
235 png_set_gray_to_rgb(png_ptr);
236
237 /* If the PNG file has 16 bits per channel, strip them down to 8 */
238- if (bit_depth == 16) png_set_strip_16(png_ptr);
239+ if (bit_depth == 16)
240+ png_set_strip_16(png_ptr);
241
242 /* use 1 byte per pixel */
243 png_set_packing(png_ptr);
244
245 row_pointers = malloc(*height * sizeof(png_bytep));
246- if (row_pointers == NULL)
247- {
248+ if (row_pointers == NULL) {
249 fprintf(stderr, "Can't allocate memory for PNG file.\n");
250- return(0);
251+ goto png_destroy;
252 }
253
254- for (i = 0; i < *height; i++)
255- {
256+ for (i = 0; i < *height; i++) {
257 row_pointers[i] = malloc(4 * *width);
258- if (row_pointers == NULL)
259- {
260+ if (row_pointers == NULL) {
261 fprintf(stderr, "Can't allocate memory for PNG line.\n");
262- return(0);
263+ goto rows_free;
264 }
265 }
266
267 png_read_image(png_ptr, row_pointers);
268
269 rgb[0] = malloc(3 * *width * *height);
270- if (rgb[0] == NULL)
271- {
272+ if (rgb[0] == NULL) {
273 fprintf(stderr, "Can't allocate memory for PNG file.\n");
274- return(0);
275+ goto rows_free;
276 }
277
278 if (alpha[0] == NULL)
279 {
280- ptr = rgb[0];
281- for (i = 0; i < *height; i++)
282- {
283- memcpy(ptr, row_pointers[i], 3 * *width);
284- ptr += 3 * *width;
285- }
286- }
287- else
288- {
289- int j;
290- ptr = rgb[0];
291- for (i = 0; i < *height; i++)
292- {
293- int ipos = 0;
294- for (j = 0; j < *width; j++)
295- {
296- *ptr++ = row_pointers[i][ipos++];
297- *ptr++ = row_pointers[i][ipos++];
298- *ptr++ = row_pointers[i][ipos++];
299- alpha[0][i * *width + j] = row_pointers[i][ipos++];
300+ ptr = rgb[0];
301+ for (i = 0; i < *height; i++) {
302+ memcpy(ptr, row_pointers[i], 3 * *width);
303+ ptr += 3 * *width;
304+ }
305+ } else {
306+ int j;
307+ ptr = rgb[0];
308+ for (i = 0; i < *height; i++) {
309+ int ipos = 0;
310+ for (j = 0; j < *width; j++) {
311+ *ptr++ = row_pointers[i][ipos++];
312+ *ptr++ = row_pointers[i][ipos++];
313+ *ptr++ = row_pointers[i][ipos++];
314+ alpha[0][i * *width + j] = row_pointers[i][ipos++];
315+ }
316 }
317- }
318 }
319
320- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
321+ ret = 1; /* data reading is OK */
322+
323+rows_free:
324+ for (i = 0; i < *height; i++) {
325+ if (row_pointers[i] != NULL ) {
326+ free(row_pointers[i]);
327+ }
328+ }
329
330- for (i = 0; i < *height; i++) free(row_pointers[i]);
331 free(row_pointers);
332
333+png_destroy:
334+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
335+
336+file_close:
337 fclose(infile);
338- return(1);
339+ return(ret);
340 }
341--
3421.6.6.1
343
diff --git a/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch b/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch
deleted file mode 100644
index 471c4f51e..000000000
--- a/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 6aad913ddd5cdb473db9fa21a5e8ecec58de172b Mon Sep 17 00:00:00 2001
2From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
3Date: Wed, 12 Jan 2011 04:41:02 +0000
4Subject: [PATCH 3/8] Fix build failure with ld --as-needed.
5
6Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
7
8git-svn-id: svn://svn.berlios.de/slim/trunk@177 7c53e7cc-98ea-0310-8f1f-a0b24da60408
9---
10 Makefile | 4 ++--
11 1 files changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/Makefile b/Makefile
14index 1219de4..fafa0ef 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -4,7 +4,7 @@
18 # to fit into your operating system / distribution
19 #######################################################
20 CXX=/usr/bin/g++
21-CC=/usr/bin/gcc
22+CC=/usr/bin/gcc-4.5
23 CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
24 CXXFLAGS=$(CFLAGS)
25 LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
26@@ -33,7 +33,7 @@ endif
27 all: slim
28
29 slim: $(OBJECTS)
30- $(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME)
31+ $(CXX) $(OBJECTS) $(LDFLAGS) -o $(NAME)
32
33 .cpp.o:
34 $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
35--
361.6.6.1
37
diff --git a/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch b/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch
deleted file mode 100644
index f2087c010..000000000
--- a/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From c2067e8c16bfb721d339718ae0c99c70a994936b Mon Sep 17 00:00:00 2001
2From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
3Date: Fri, 17 Jun 2011 20:35:07 +0000
4Subject: [PATCH 4/8] Add support libpng15
5
6Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
7
8git-svn-id: svn://svn.berlios.de/slim/trunk@178 7c53e7cc-98ea-0310-8f1f-a0b24da60408
9---
10 Makefile | 4 ++--
11 png.c | 6 +++++-
12 2 files changed, 7 insertions(+), 3 deletions(-)
13
14diff --git a/Makefile b/Makefile
15index fafa0ef..1202614 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -5,9 +5,9 @@
19 #######################################################
20 CXX=/usr/bin/g++
21 CC=/usr/bin/gcc-4.5
22-CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
23+CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include
24 CXXFLAGS=$(CFLAGS)
25-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
26+LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
27 CUSTOM=-DHAVE_SHADOW
28 ifdef USE_PAM
29 LDFLAGS+= -lpam
30diff --git a/png.c b/png.c
31index 5c086c6..aa0f5e5 100644
32--- a/png.c
33+++ b/png.c
34@@ -57,8 +57,12 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb,
35 png_destroy_read_struct(&png_ptr, (png_infopp) NULL,
36 (png_infopp) NULL);
37 }
38-
39+
40+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
41+ if (setjmp(png_jmpbuf((data->png_ptr))))
42+#else
43 if (setjmp(png_ptr->jmpbuf))
44+#endif
45 goto png_destroy;
46
47 png_init_io(png_ptr, infile);
48--
491.6.6.1
50
diff --git a/meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch b/meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch
deleted file mode 100644
index 566ae355e..000000000
--- a/meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 4f69eb1aa85fbb395a0474b1f376505fab81ee22 Mon Sep 17 00:00:00 2001
2From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
3Date: Fri, 17 Jun 2011 20:35:10 +0000
4Subject: [PATCH 5/8] Remove path of gcc amd g++, and version of g++
5
6Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
7
8git-svn-id: svn://svn.berlios.de/slim/trunk@179 7c53e7cc-98ea-0310-8f1f-a0b24da60408
9---
10 Makefile | 4 ++--
11 1 files changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/Makefile b/Makefile
14index 1202614..5c5fde1 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -3,8 +3,8 @@
18 # Edit the following section to adjust the options
19 # to fit into your operating system / distribution
20 #######################################################
21-CXX=/usr/bin/g++
22-CC=/usr/bin/gcc-4.5
23+CXX=g++
24+CC=gcc
25 CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include
26 CXXFLAGS=$(CFLAGS)
27 LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
28--
291.6.6.1
30
diff --git a/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch b/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch
deleted file mode 100644
index a5b812584..000000000
--- a/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From e188d5fd3e3c0e40c3e35729fd8b81b138191a75 Mon Sep 17 00:00:00 2001
2From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
3Date: Fri, 17 Jun 2011 20:35:13 +0000
4Subject: [PATCH 6/8] Remove localhost from Authenticator of pam
5
6http://bugs.gentoo.org/346037
7https://developer.berlios.de/bugs/?func=detailbug&bug_id=17757&group_id=2663
8http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch?view=log
9
10Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
11
12git-svn-id: svn://svn.berlios.de/slim/trunk@180 7c53e7cc-98ea-0310-8f1f-a0b24da60408
13---
14 app.cpp | 2 --
15 1 files changed, 0 insertions(+), 2 deletions(-)
16
17diff --git a/app.cpp b/app.cpp
18index c80a73e..7177363 100644
19--- a/app.cpp
20+++ b/app.cpp
21@@ -236,8 +236,6 @@ void App::Run() {
22 pam.start("slim");
23 pam.set_item(PAM::Authenticator::TTY, DisplayName);
24 pam.set_item(PAM::Authenticator::Requestor, "root");
25- pam.set_item(PAM::Authenticator::Host, "localhost");
26-
27 }
28 catch(PAM::Exception& e){
29 cerr << APPNAME << ": " << e << endl;
30--
311.6.6.1
32
diff --git a/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch b/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch
deleted file mode 100644
index fa2502bf0..000000000
--- a/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From da172fd6234b3b2b487ab36d63da72758829cb1d Mon Sep 17 00:00:00 2001
2From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
3Date: Fri, 17 Jun 2011 20:35:15 +0000
4Subject: [PATCH 7/8] Fix tty slowness
5
6Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
7
8git-svn-id: svn://svn.berlios.de/slim/trunk@181 7c53e7cc-98ea-0310-8f1f-a0b24da60408
9---
10 app.cpp | 10 ++++++----
11 1 files changed, 6 insertions(+), 4 deletions(-)
12
13diff --git a/app.cpp b/app.cpp
14index 7177363..44ab099 100644
15--- a/app.cpp
16+++ b/app.cpp
17@@ -278,21 +278,23 @@ void App::Run() {
18 signal(SIGALRM, AlarmSignal);
19
20 #ifndef XNEST_DEBUG
21- OpenLog();
22-
23 if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
24 daemonmode = true;
25 }
26
27 // Daemonize
28 if (daemonmode) {
29- if (daemon(0, 1) == -1) {
30+ if (daemon(0, 0) == -1) {
31 cerr << APPNAME << ": " << strerror(errno) << endl;
32 exit(ERR_EXIT);
33 }
34- UpdatePid();
35 }
36
37+ OpenLog();
38+
39+ if (daemonmode)
40+ UpdatePid();
41+
42 CreateServerAuth();
43 StartServer();
44 alarm(2);
45--
461.6.6.1
47
diff --git a/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch b/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch
deleted file mode 100644
index 0c5cfb742..000000000
--- a/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch
+++ /dev/null
@@ -1,161 +0,0 @@
1From ee77a3d154443d2823ecbf2141daa1b5924f629f Mon Sep 17 00:00:00 2001
2From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408>
3Date: Fri, 17 Jun 2011 20:38:34 +0000
4Subject: [PATCH 8/8] restart Xserver if killed
5
6Patch from http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663.
7
8Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
9
10git-svn-id: svn://svn.berlios.de/slim/trunk@182 7c53e7cc-98ea-0310-8f1f-a0b24da60408
11---
12 app.cpp | 36 +++++++++---------------------------
13 app.h | 2 +-
14 2 files changed, 10 insertions(+), 28 deletions(-)
15
16diff --git a/app.cpp b/app.cpp
17index 44ab099..358a98f 100644
18--- a/app.cpp
19+++ b/app.cpp
20@@ -104,6 +104,11 @@ int conv(int num_msg, const struct pam_message **msg,
21
22 extern App* LoginApp;
23
24+int xioerror(Display *disp) {
25+ LoginApp->RestartServer();
26+ return 0;
27+}
28+
29 void CatchSignal(int sig) {
30 cerr << APPNAME << ": unexpected signal " << sig << endl;
31
32@@ -114,19 +119,6 @@ void CatchSignal(int sig) {
33 exit(ERR_EXIT);
34 }
35
36-
37-void AlarmSignal(int sig) {
38- int pid = LoginApp->GetServerPID();
39- if(waitpid(pid, NULL, WNOHANG) == pid) {
40- LoginApp->StopServer();
41- LoginApp->RemoveLock();
42- exit(OK_EXIT);
43- }
44- signal(sig, AlarmSignal);
45- alarm(2);
46-}
47-
48-
49 void User1Signal(int sig) {
50 signal(sig, User1Signal);
51 }
52@@ -275,7 +267,6 @@ void App::Run() {
53 signal(SIGHUP, CatchSignal);
54 signal(SIGPIPE, CatchSignal);
55 signal(SIGUSR1, User1Signal);
56- signal(SIGALRM, AlarmSignal);
57
58 #ifndef XNEST_DEBUG
59 if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
60@@ -297,7 +288,6 @@ void App::Run() {
61
62 CreateServerAuth();
63 StartServer();
64- alarm(2);
65 #endif
66
67 }
68@@ -613,6 +603,8 @@ void App::Login() {
69 int status;
70 while (wpid != pid) {
71 wpid = wait(&status);
72+ if (wpid == ServerPID)
73+ xioerror(Dpy); // Server died, simulate IO error
74 }
75 if (WIFEXITED(status) && WEXITSTATUS(status)) {
76 LoginPanel->Message("Failed to execute login command");
77@@ -658,9 +650,6 @@ void App::Login() {
78
79
80 void App::Reboot() {
81- // Stop alarm clock
82- alarm(0);
83-
84 #ifdef USE_PAM
85 try{
86 pam.end();
87@@ -683,9 +672,6 @@ void App::Reboot() {
88
89
90 void App::Halt() {
91- // Stop alarm clock
92- alarm(0);
93-
94 #ifdef USE_PAM
95 try{
96 pam.end();
97@@ -771,6 +757,7 @@ void App::RestartServer() {
98
99 StopServer();
100 RemoveLock();
101+ while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens
102 Run();
103 }
104
105@@ -841,6 +828,7 @@ int App::WaitForServer() {
106
107 for(cycles = 0; cycles < ncycles; cycles++) {
108 if((Dpy = XOpenDisplay(DisplayName))) {
109+ XSetIOErrorHandler(xioerror);
110 return 1;
111 } else {
112 if(!ServerTimeout(1, (char *) "X server to begin accepting connections"))
113@@ -925,9 +913,6 @@ int App::StartServer() {
114 ServerPID = -1;
115 break;
116 }
117- alarm(15);
118- pause();
119- alarm(0);
120
121 // Wait for server to start up
122 if(WaitForServer() == 0) {
123@@ -962,15 +947,12 @@ int IgnoreXIO(Display *d) {
124
125
126 void App::StopServer() {
127- // Stop alars clock and ignore signals
128- alarm(0);
129 signal(SIGQUIT, SIG_IGN);
130 signal(SIGINT, SIG_IGN);
131 signal(SIGHUP, SIG_IGN);
132 signal(SIGPIPE, SIG_IGN);
133 signal(SIGTERM, SIG_DFL);
134 signal(SIGKILL, SIG_DFL);
135- signal(SIGALRM, SIG_DFL);
136
137 // Catch X error
138 XSetIOErrorHandler(IgnoreXIO);
139diff --git a/app.h b/app.h
140index dd7c281..2db1038 100644
141--- a/app.h
142+++ b/app.h
143@@ -34,6 +34,7 @@ public:
144 ~App();
145 void Run();
146 int GetServerPID();
147+ void RestartServer();
148 void StopServer();
149
150 bool serverStarted;
151@@ -49,7 +50,6 @@ private:
152 void Console();
153 void Exit();
154 void KillAllClients(Bool top);
155- void RestartServer();
156 void ReadConfig();
157 void OpenLog();
158 void CloseLog();
159--
1601.6.6.1
161
diff --git a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb b/meta-oe/recipes-graphics/slim/slim_1.3.2.bb
deleted file mode 100644
index 2fbdcab46..000000000
--- a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb
+++ /dev/null
@@ -1,82 +0,0 @@
1DESCRIPTION="Simple Login Manager"
2HOMEPAGE="http://slim.berlios.de"
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
5
6PR = "r1"
7
8DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
9
10SRC_URI = " \
11 http://download.berlios.de/${BPN}/${BP}.tar.gz \
12 file://0002-Fix-image-handling-integer-overflows.patch \
13 file://0003-Fix-build-failure-with-ld-as-needed.patch \
14 file://0004-Add-support-libpng15.patch \
15 file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \
16 file://0006-Remove-localhost-from-Authenticator-of-pam.patch \
17 file://0007-Fix-tty-slowness.patch \
18 file://0008-restart-Xserver-if-killed.patch \
19 file://slim-dynwm \
20 file://update_slim_wmlist \
21 file://Makefile.oe \
22 file://slim.pamd \
23 file://slim.service \
24"
25
26SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42"
27SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8"
28
29
30EXTRA_OEMAKE += " \
31 USE_PAM=${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \
32 PREFIX=${prefix} \
33 CFGDIR=${sysconfdir} \
34 MANDIR=${mandir} \
35 DESTDIR=${D} \
36 CFLAGS+=-I${STAGING_INCDIR}/freetype2 \
37 CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \
38"
39
40do_compile_prepend() {
41 cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile
42}
43
44do_install() {
45 oe_runmake install
46 install -d ${D}${bindir}
47 install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/
48 install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/
49 install -d ${D}${sysconfdir}/pam.d/
50 install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim
51
52 install -d ${D}${systemd_unitdir}/system/
53 install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/
54
55 echo 'sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
56 echo 'sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
57}
58
59
60RDEPENDS_${PN} = "perl xauth freetype sessreg "
61FILES_${PN} += "${systemd_unitdir}/system/"
62
63pkg_postinst_${PN} () {
64if test "x$D" != "x"; then
65 exit 1
66fi
67systemctl enable slim.service
68
69# Register SLiM as default DM
70mkdir -p ${sysconfdir}/X11/
71echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager
72}
73
74pkg_postrm_${PN} () {
75if test "x$D" != "x"; then
76 exit 1
77fi
78systemctl disable slim.service
79sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true
80}
81
82PNBLACKLIST[slim] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them - the recipe will be removed on 2017-09-01 unless the issue is fixed"
diff --git a/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb b/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb
deleted file mode 100755
index 2af669770..000000000
--- a/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1SUMMARY = "Wayland-fits, the Wayland Functional Integration Test Suite"
2DESCRIPTION = "Wayland-fits is a fully automated functional integration \
3test suite. Its main purpose is to test the functionality and integration of \
4client-side (i.e. toolkit) and server-side (compositor) implementations of \
5the Wayland protocol."
6HOMEPAGE = "https://github.com/01org/wayland-fits"
7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://COPYING;md5=f8d34cadaf891753c0f00c6cd48f08f5 \
9 file://src/extensions/weston/weston-wfits.cpp;endline=21;md5=848c81e55cf3a30a9f6ed75f0dba7a97"
10
11SRC_URI = "git://github.com/01org/wayland-fits.git"
12SRCREV = "f108335e374772ae2818a30ae37fe6fcda81980f"
13
14S = "${WORKDIR}/git"
15
16inherit autotools pkgconfig
17
18DEPENDS = "libcheck boost wayland weston"
19RDEPENDS_${PN} = "weston"
20
21EXTRA_OECONF += "--enable-shared --disable-static --with-boost-libdir=${STAGING_LIBDIR}"
22
23PACKAGECONFIG ?= "gtk+3"
24
25PACKAGECONFIG[elementary] = "--enable-efl-tests,--disable-efl-tests,elementary"
26PACKAGECONFIG[gtk+3] = "--enable-gtk-tests,--disable-gtk-tests,gtk+3"
27
28do_install_append() {
29 rm -f ${D}/${libdir}/weston/*.la
30}
31
32FILES_${PN} += "${bindir}/wfits ${libdir}/weston/*.so"
33FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/weston/.debug ${prefix}/src"
34
35PNBLACKLIST[wayland-fits] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130632/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch
deleted file mode 100644
index 771a2a8e1..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch
+++ /dev/null
@@ -1,153 +0,0 @@
1diff --git a/src/multitouch.c b/src/multitouch.c
2index c55d742..4a8192d 100644
3--- a/src/multitouch.c
4+++ b/src/multitouch.c
5@@ -114,7 +114,7 @@ static int init_properties(DeviceIntPtr dev)
6 return Success;
7 }
8
9-static int device_init(DeviceIntPtr dev, LocalDevicePtr local)
10+static int device_init(DeviceIntPtr dev, InputInfoPtr local)
11 {
12 struct mtev_mtouch *mt = local->private;
13 Atom atom;
14@@ -222,7 +222,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local)
15 xf86InitValuatorAxisStruct(dev, val, axes_labels[val],
16 min,
17 max,
18- 1, 0, 1);
19+ 1, 0, 1,Absolute);
20 xf86InitValuatorDefaults(dev, val);
21 }
22 }
23@@ -232,7 +232,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local)
24 return Success;
25 }
26
27-static int device_on(LocalDevicePtr local)
28+static int device_on(InputInfoPtr local)
29 {
30 struct mtev_mtouch *mt = local->private;
31 local->fd = xf86OpenSerial(local->options);
32@@ -248,7 +248,7 @@ static int device_on(LocalDevicePtr local)
33 return Success;
34 }
35
36-static int device_off(LocalDevicePtr local)
37+static int device_off(InputInfoPtr local)
38 {
39 struct mtev_mtouch *mt = local->private;
40 xf86RemoveEnabledDevice(local);
41@@ -259,12 +259,12 @@ static int device_off(LocalDevicePtr local)
42 return Success;
43 }
44
45-static int device_close(LocalDevicePtr local)
46+static int device_close(InputInfoPtr local)
47 {
48 return Success;
49 }
50
51-static void process_state(LocalDevicePtr local,
52+static void process_state(InputInfoPtr local,
53 const struct mtev_mtouch *mt)
54 {
55
56@@ -321,22 +321,22 @@ static void process_state(LocalDevicePtr local,
57 }
58
59 /* Some x-clients assume they get motion events before button down */
60+ xf86Msg(X_INFO,"down %d|pdown %d\n", down, pdown);
61 if (down)
62 xf86PostMotionEventP(local->dev, TRUE,
63 0, down * MT_AXIS_PER_FINGER, valuators);
64-
65 if(down && pdown == 0)
66 xf86PostButtonEventP(local->dev, TRUE,
67 1, 1,
68 0, down * MT_AXIS_PER_FINGER, valuators);
69- else if (down == 0 && pdown)
70- xf86PostButtonEvent(local->dev, TRUE, 1, 0, 0, 0);
71-
72+ else if (down == 0 && pdown){
73+ xf86PostButtonEvent(local->dev, TRUE, 1, 1, 0, 0);
74+ }
75 pdown = !!down;
76 }
77
78 /* called for each full received packet from the touchpad */
79-static void read_input(LocalDevicePtr local)
80+static void read_input(InputInfoPtr local)
81 {
82 struct mtev_mtouch *mt = local->private;
83 while (mtouch_read_synchronized_event(mt, local->fd)) {
84@@ -346,7 +346,7 @@ static void read_input(LocalDevicePtr local)
85
86 static Bool device_control(DeviceIntPtr dev, int mode)
87 {
88- LocalDevicePtr local = dev->public.devicePrivate;
89+ InputInfoPtr local = dev->public.devicePrivate;
90 switch (mode) {
91 case DEVICE_INIT:
92 xf86Msg(X_INFO, "device control: init\n");
93@@ -366,39 +366,29 @@ static Bool device_control(DeviceIntPtr dev, int mode)
94 }
95 }
96
97-static InputInfoPtr preinit(InputDriverPtr drv, IDevPtr dev, int flags)
98+static InputInfoPtr preinit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
99 {
100 struct mtev_mtouch *mt;
101- InputInfoPtr local = xf86AllocateInput(drv, 0);
102- if (!local)
103- goto error;
104+ int rc;
105+
106 mt = calloc(1, sizeof(struct mtev_mtouch));
107+
108 if (!mt)
109 goto error;
110
111- local->name = dev->identifier;
112- local->type_name = XI_TOUCHSCREEN;
113- local->device_control = device_control;
114- local->read_input = read_input;
115- local->private = mt;
116- local->flags = XI86_POINTER_CAPABLE |
117- XI86_SEND_DRAG_EVENTS;
118-
119- local->conf_idev = dev;
120-
121- xf86CollectInputOptions(local, NULL, NULL);
122- //xf86OptionListReport(local->options);
123- xf86ProcessCommonOptions(local, local->options);
124+ pInfo->private = mt;
125+ pInfo->type_name = "UNKNOWN";
126+ pInfo->device_control = device_control;
127+ pInfo->read_input = read_input;
128
129+ mt->swap_xy = xf86SetBoolOption(pInfo->options, "SwapAxes", FALSE);
130+ mt->invert_x = xf86SetBoolOption(pInfo->options, "InvertX", FALSE);
131+ mt->invert_y = xf86SetBoolOption(pInfo->options, "InvertY", FALSE);
132
133- mt->swap_xy = xf86SetBoolOption(local->options, "SwapAxes", FALSE);
134- mt->invert_x = xf86SetBoolOption(local->options, "InvertX", FALSE);
135- mt->invert_y = xf86SetBoolOption(local->options, "InvertY", FALSE);
136-
137- local->flags |= XI86_CONFIGURED;
138+ return Success;
139
140 error:
141- return local;
142+ return !Success;
143 }
144
145 static void uninit(InputDriverPtr drv, InputInfoPtr local, int flags)
146@@ -415,7 +405,6 @@ static InputDriverRec MTEV = {
147 .PreInit = preinit,
148 .UnInit = uninit,
149 .module = NULL,
150- .refCount = 0
151 };
152
153 static XF86ModuleVersionInfo VERSION = {
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb
deleted file mode 100644
index 5f2adec1a..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1require recipes-graphics/xorg-driver/xorg-driver-input.inc
2SUMMARY = "X.Org X server -- multitouch input driver"
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543"
5
6DEPENDS += "pixman"
7
8PNBLACKLIST[xf86-input-mtev] ?= "BROKEN: doesn't build with B!=S (Makefile without ${S} in sed call) - the recipe will be removed on 2017-09-01 unless the issue is fixed"
9
10SRC_URI = "git://gitorious.org/xorg/xf86-input-mtev.git file://fix-it.patch"
11SRCREV = "1eb469166ffc095c5801475f057f911f97a6e641"
12S = "${WORKDIR}/git"
13PV = "1.0.0+gitr${SRCPV}"
14PR = "${INC_PR}.0"
15
16EXTRA_OEMAKE = "'INCLUDE=-I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/pixman-1'"
17
18#skip xorg-driver-common.inc AC_CHECK_FILE mangling
19do_configure_prepend () {
20 sed 's#gcc#${CC}#g' -i Makefile
21 return
22}
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch
deleted file mode 100644
index fcd2f684b..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 621d946e56efac2c779b83b1a5c6b645169c4ebd Mon Sep 17 00:00:00 2001
2From: "Brian A. Lloyd" <brian.lloyd@familyhonor.net>
3Date: Wed, 1 Oct 2014 12:35:18 +0300
4Subject: [PATCH] Add config.h include to src/lx_memory.c
5
6The src/lx_memory.c file uses the xf86.h header file. This file must have
7HAVE_STRNDUP defined before calling it when the building platform has a strndup
8function. When using config.h, this file doesn't have that define and so fails
9to compile.
10
11The attached patch adds the conditional config.h to this file so it may compile
12on the affected platforms.
13
14The patch is trivial and may be included and used under whatever licensing
15desired.
16
17Closes: Free Desktop Bug #84541
18
19Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net>
20Upstream-Status: Backport
21---
22 src/lx_memory.c | 3 +++
23 1 file changed, 3 insertions(+)
24
25diff --git a/src/lx_memory.c b/src/lx_memory.c
26index f26d280..992446f 100644
27--- a/src/lx_memory.c
28+++ b/src/lx_memory.c
29@@ -22,6 +22,9 @@
30 * contributors may be used to endorse or promote products derived from this
31 * software without specific prior written permission.
32 */
33+#if HAVE_CONFIG_H
34+#include "config.h"
35+#endif
36
37 #include "xf86.h"
38 #include "geode.h"
39--
402.1.1
41
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb
deleted file mode 100644
index e543413ad..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1require recipes-graphics/xorg-driver/xorg-driver-video.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
3
4SUMMARY = "X.org server -- Geode GX2/LX display driver"
5PR = "${INC_PR}.0"
6
7SRC_URI += "file://0001-Add-config.h-include-to-src-lx_memory.c.patch"
8SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392"
9SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7"
10
11COMPATIBLE_HOST = "i.86.*-linux"
12
13RDEPENDS_${PN} += "xserver-xorg-module-exa"
14
15# 2_2.11.16-r21.0/xf86-video-geode-2.11.16/src/gx_driver.c:376:20: error: implicit declaration of function 'xf86MapVidMem' [-Werror=implicit-function-declaration]
16PNBLACKLIST[xf86-video-geode] ?= "BROKEN, fails to build - the recipe will be removed on 2017-09-01 unless the issue is fixed"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch
deleted file mode 100644
index 25e83209d..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From f485e878bc8bb0e381a38a30009308c82fa8d672 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 16 Aug 2012 08:18:56 +0200
4Subject: [PATCH] fix build with KMS disabled
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/glamo.h | 3 +++
9 1 files changed, 3 insertions(+), 0 deletions(-)
10
11diff --git a/src/glamo.h b/src/glamo.h
12index d4a2f19..5fd5c04 100644
13--- a/src/glamo.h
14+++ b/src/glamo.h
15@@ -37,8 +37,11 @@
16 #include "xf86.h"
17 #include "exa.h"
18 #include <linux/fb.h>
19+
20+#ifdef HAVE_KMS
21 #include <libdrm/drm.h>
22 #include <libdrm/glamo_bo.h>
23+#endif
24
25 #define GLAMO_REG_BASE(c) ((c)->attr.address[0])
26 #define GLAMO_REG_SIZE(c) (0x2400)
27--
281.7.8.6
29
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch
deleted file mode 100644
index fab0b238f..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 040ade8bb86a771fa4e71b41d2080254830ca9f3 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Mar 2013 17:44:37 +0100
4Subject: [PATCH] glamo*driver: remove references to mibstore
5
6* fix build with xserver-1.14
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 src/glamo-driver.c | 2 --
11 src/glamo-kms-driver.c | 1 -
12 2 files changed, 3 deletions(-)
13
14diff --git a/src/glamo-driver.c b/src/glamo-driver.c
15index 10b7762..22f57d7 100644
16--- a/src/glamo-driver.c
17+++ b/src/glamo-driver.c
18@@ -14,7 +14,6 @@
19 #include "xf86_OSproc.h"
20
21 #include "mipointer.h"
22-#include "mibstore.h"
23 #include "micmap.h"
24 #include "colormapst.h"
25 #include "xf86cmap.h"
26@@ -612,7 +611,6 @@ GlamoScreenInit(SCREEN_INIT_ARGS_DECL)
27 }
28
29 xf86SetBlackWhitePixels(pScreen);
30- miInitializeBackingStore(pScreen);
31 xf86SetBackingStore(pScreen);
32
33 /* software cursor */
34diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c
35index c5c7a00..f192398 100644
36--- a/src/glamo-kms-driver.c
37+++ b/src/glamo-kms-driver.c
38@@ -415,7 +415,6 @@ Bool GlamoKMSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
39
40 GlamoKMSExaInit(pScrn);
41
42- miInitializeBackingStore(pScreen);
43 xf86SetBackingStore(pScreen);
44 xf86SetSilkenMouse(pScreen);
45 miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
46--
471.8.1.5
48
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch
deleted file mode 100644
index 0d6374363..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 963c221aa01be2ea99d39578d91e4aa08ec3ab0a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 23 May 2011 14:29:38 +0200
4Subject: [PATCH] glamo-kms-driver: drop unused xf86_config
5
6* gcc-4.6 doesn't like unused variables which are only set and never read
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 src/glamo-kms-driver.c | 2 --
11 1 files changed, 0 insertions(+), 2 deletions(-)
12
13diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c
14index ce87caa..c5c7a00 100644
15--- a/src/glamo-kms-driver.c
16+++ b/src/glamo-kms-driver.c
17@@ -208,7 +208,6 @@ static const xf86CrtcConfigFuncsRec crtc_config_funcs = {
18
19 Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags)
20 {
21- xf86CrtcConfigPtr xf86_config;
22 GlamoPtr pGlamo;
23 rgb defaultWeight = { 0, 0, 0 };
24 int max_width, max_height;
25@@ -254,7 +253,6 @@ Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags)
26
27 /* Allocate an xf86CrtcConfig */
28 xf86CrtcConfigInit(pScrn, &crtc_config_funcs);
29- xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
30
31 max_width = 480;
32 max_height = 640;
33--
341.7.5.rc3
35
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch
deleted file mode 100644
index cbdc6e762..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch
+++ /dev/null
@@ -1,279 +0,0 @@
1From 57e8944e3cced03b9526bd075649d74d97c24899 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 20 Nov 2012 22:18:23 +0100
4Subject: [PATCH 3/3] glamo-driver: adapt to xserver-0.13 video API
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/compat-api.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
9 src/glamo-driver.c | 43 ++++++++++++------------
10 2 files changed, 118 insertions(+), 21 deletions(-)
11 create mode 100644 src/compat-api.h
12
13diff --git a/src/compat-api.h b/src/compat-api.h
14new file mode 100644
15index 0000000..b1591b1
16--- /dev/null
17+++ b/src/compat-api.h
18@@ -0,0 +1,96 @@
19+/*
20+ * Copyright 2012 Red Hat, Inc.
21+ *
22+ * Permission is hereby granted, free of charge, to any person obtaining a
23+ * copy of this software and associated documentation files (the "Software"),
24+ * to deal in the Software without restriction, including without limitation
25+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
26+ * and/or sell copies of the Software, and to permit persons to whom the
27+ * Software is furnished to do so, subject to the following conditions:
28+ *
29+ * The above copyright notice and this permission notice (including the next
30+ * paragraph) shall be included in all copies or substantial portions of the
31+ * Software.
32+ *
33+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
36+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
38+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
39+ * DEALINGS IN THE SOFTWARE.
40+ *
41+ * Author: Dave Airlie <airlied@redhat.com>
42+ */
43+
44+/* this file provides API compat between server post 1.13 and pre it,
45+ it should be reused inside as many drivers as possible */
46+#ifndef COMPAT_API_H
47+#define COMPAT_API_H
48+
49+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
50+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
51+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
52+#endif
53+
54+#ifndef XF86_HAS_SCRN_CONV
55+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
56+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
57+#endif
58+
59+#ifndef XF86_SCRN_INTERFACE
60+
61+#define SCRN_ARG_TYPE int
62+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
63+
64+#define SCREEN_ARG_TYPE int
65+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
66+
67+#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv
68+
69+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
70+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
71+
72+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
73+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
74+
75+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
76+
77+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
78+
79+#define FREE_SCREEN_ARGS_DECL int arg, int flags
80+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
81+
82+#define VT_FUNC_ARGS_DECL int arg, int flags
83+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
84+
85+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
86+#else
87+#define SCRN_ARG_TYPE ScrnInfoPtr
88+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
89+
90+#define SCREEN_ARG_TYPE ScreenPtr
91+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
92+
93+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
94+
95+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
96+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
97+
98+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
99+#define CLOSE_SCREEN_ARGS pScreen
100+
101+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
102+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
103+
104+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
105+#define FREE_SCREEN_ARGS(x) (x)
106+
107+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
108+#define VT_FUNC_ARGS(flags) pScrn
109+
110+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
111+
112+#endif
113+
114+#endif
115diff --git a/src/glamo-driver.c b/src/glamo-driver.c
116index b13caae..10b7762 100644
117--- a/src/glamo-driver.c
118+++ b/src/glamo-driver.c
119@@ -43,6 +43,7 @@
120
121 #include <sys/mman.h>
122
123+#include "compat-api.h"
124
125 static Bool debug = 0;
126
127@@ -68,10 +69,10 @@ static Bool
128 GlamoPreInit(ScrnInfoPtr pScrn, int flags);
129
130 static Bool
131-GlamoScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv);
132+GlamoScreenInit(SCREEN_INIT_ARGS_DECL);
133
134 static Bool
135-GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen);
136+GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL);
137
138 static Bool
139 GlamoCrtcResize(ScrnInfoPtr scrn, int width, int height);
140@@ -86,10 +87,10 @@ static void
141 GlamoRestoreHW(ScrnInfoPtr pScren);
142
143 static Bool
144-GlamoEnterVT(int scrnIndex, int flags);
145+GlamoEnterVT(VT_FUNC_ARGS_DECL);
146
147 static void
148-GlamoLeaveVT(int scrnIndex, int flags);
149+GlamoLeaveVT(VT_FUNC_ARGS_DECL);
150
151 static void
152 GlamoLoadColormap(ScrnInfoPtr pScrn, int numColors, int *indices,
153@@ -248,8 +249,8 @@ GlamoUnmapMMIO(ScrnInfoPtr pScrn) {
154 }
155
156 static Bool
157-GlamoSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) {
158- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
159+GlamoSwitchMode(SWITCH_MODE_ARGS_DECL) {
160+ SCRN_INFO_PTR(arg);
161 xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn);
162 xf86OutputPtr output = config->output[config->compat_output];
163 Rotation rotation;
164@@ -286,7 +287,7 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
165
166 for (i = 0; i < numDevSections; i++) {
167
168- dev = xf86FindOptionValue(devSections[i]->options, "Device");
169+ dev = (char *) xf86FindOptionValue(devSections[i]->options, "Device");
170 if (fbdevHWProbe(NULL, dev, NULL)) {
171 int entity;
172 pScrn = NULL;
173@@ -430,7 +431,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags)
174
175 pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
176
177- fb_device = xf86FindOptionValue(pGlamo->pEnt->device->options, "Device");
178+ fb_device = (char *) xf86FindOptionValue(pGlamo->pEnt->device->options, "Device");
179
180 /* open device */
181 if (!fbdevHWInit(pScrn, NULL, fb_device))
182@@ -523,7 +524,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags)
183
184
185 static Bool
186-GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
187+GlamoScreenInit(SCREEN_INIT_ARGS_DECL)
188 {
189 ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
190 GlamoPtr pGlamo = GlamoPTR(pScrn);
191@@ -545,7 +546,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
192 #endif
193
194 if (NULL == (pGlamo->fbmem = fbdevHWMapVidmem(pScrn))) {
195- xf86DrvMsg(scrnIndex, X_ERROR, "mapping of video memory failed\n");
196+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mapping of video memory failed\n");
197 return FALSE;
198 }
199
200@@ -556,13 +557,13 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
201 /* mi layer */
202 miClearVisualTypes();
203 if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) {
204- xf86DrvMsg(scrnIndex, X_ERROR,
205+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
206 "visual type setup failed for %d bits per pixel [1]\n",
207 pScrn->bitsPerPixel);
208 return FALSE;
209 }
210 if (!miSetPixmapDepths()) {
211- xf86DrvMsg(scrnIndex, X_ERROR, "pixmap depth setup failed\n");
212+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "pixmap depth setup failed\n");
213 return FALSE;
214 }
215
216@@ -617,7 +618,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
217 /* software cursor */
218 miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
219
220- GlamoEnterVT(scrnIndex, 0);
221+ GlamoEnterVT(VT_FUNC_ARGS(0));
222
223 xf86CrtcScreenInit(pScreen);
224 #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0)
225@@ -627,7 +628,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
226 /* colormap */
227 pGlamo->colormap = NULL;
228 if (!miCreateDefColormap(pScreen)) {
229- xf86DrvMsg(scrnIndex, X_ERROR,
230+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
231 "internal error: miCreateDefColormap failed "
232 "in GlamoScreenInit()\n");
233 return FALSE;
234@@ -652,9 +653,9 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
235 }
236
237 static Bool
238-GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen)
239+GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL)
240 {
241- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
242+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
243 GlamoPtr pGlamo = GlamoPTR(pScrn);
244
245 if (pGlamo->accel)
246@@ -675,7 +676,7 @@ GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen)
247
248 pScreen->CreateScreenResources = pGlamo->CreateScreenResources;
249 pScreen->CloseScreen = pGlamo->CloseScreen;
250- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
251+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
252 }
253
254 static Bool
255@@ -826,8 +827,8 @@ GlamoRestoreHW(ScrnInfoPtr pScrn) {
256 }
257
258 static Bool
259-GlamoEnterVT(int scrnIndex, int flags) {
260- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
261+GlamoEnterVT(VT_FUNC_ARGS_DECL) {
262+ SCRN_INFO_PTR(arg);
263 GlamoPtr pGlamo = GlamoPTR(pScrn);
264
265 GlamoSaveHW(pScrn);
266@@ -842,8 +843,8 @@ GlamoEnterVT(int scrnIndex, int flags) {
267 }
268
269 static void
270-GlamoLeaveVT(int scrnIndex, int flags) {
271- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
272+GlamoLeaveVT(VT_FUNC_ARGS_DECL) {
273+ SCRN_INFO_PTR(arg);
274 GlamoPtr pGlamo = GlamoPTR(pScrn);
275
276 if (pGlamo->accel)
277--
2781.8.0
279
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
deleted file mode 100644
index a82037109..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 12 Dec 2014 12:00:10 +0100
4Subject: [PATCH] glamo.h: use const for jbt6k74_state_path
5
6* fix build issue with xserver 1.16:
7 glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror]
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 src/glamo.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/glamo.h b/src/glamo.h
15index 5fd5c04..5e072be 100644
16--- a/src/glamo.h
17+++ b/src/glamo.h
18@@ -148,7 +148,7 @@ typedef struct {
19 #endif
20
21 #ifdef JBT6K74_SET_STATE
22- char *jbt6k74_state_path;
23+ const char *jbt6k74_state_path;
24 char saved_jbt6k74_state[14];
25 #endif
26
27--
282.1.3
29
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
deleted file mode 100644
index 5818d0cc9..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1require recipes-graphics/xorg-driver/xorg-driver-video.inc
2SUMMARY = "X.Org X server -- Glamo display driver with KMS support"
3DEPENDS += "libdrm"
4RDEPENDS_${PN} += "xserver-xorg-module-exa"
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
7
8PE = "2"
9PV = "1.0.0+gitr${SRCPV}"
10PR = "${INC_PR}.4"
11
12SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \
13 file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \
14 file://0001-fix-build-with-KMS-disabled.patch \
15 file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \
16 file://0001-glamo-driver-remove-references-to-mibstore.patch \
17 file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \
18"
19
20S = "${WORKDIR}/git"
21SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b"
22
23EXTRA_OECONF = " --disable-kms "
24
25PNBLACKLIST[xf86-video-glamo] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130629/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 06:29:55 +0000