diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-27 11:04:51 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 10:18:33 +0200 |
| commit | ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 (patch) | |
| tree | e16d2a838f4561d5538928a58f805e5f1373225a /meta-oe/recipes-graphics | |
| parent | 6775acb048dabd624c5c8197b683aba45ed91569 (diff) | |
| download | meta-openembedded-ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3.tar.gz | |
recipes: remove blacklisted recipes
* as PNBLACKLIST message says, these recipes are blacklisted for long
time and nobody showed any interest to fix them
* remove all unused .patch and .inc files as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
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 646b785ca7..0000000000 --- a/meta-oe/recipes-graphics/clutter/clutter-box2d.inc +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Clutter Box2D" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2.1+" - -# The main clutter lib is machine specific so we need to be too -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit autotools pkgconfig gtk-doc - -do_install_append () { - install -d ${D}${bindir} - install ${S}/examples/.libs/blockbox ${D}${bindir} -} - -FILESPATH = "${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 d73e2f15e0..0000000000 --- a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -require clutter-box2d.inc - -LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6b" - -# 0.12.1+gitAUTOINC+de5452e56b-r1/git/clutter-box2d/clutter-box2d.h:226:47: -# fatal error: clutter-box2d/clutter-box2d-child.h: No such file or directory -# | #include <clutter-box2d/clutter-box2d-child.h> -PNBLACKLIST[clutter-box2d] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2" -PV = "0.12.1+git${SRCPV}" -PR = "r1" - -SRC_URI = "git://git.gnome.org/clutter-box2d.git" - -S = "${WORKDIR}/git" - -DEPENDS += "clutter-1.0" -PROVIDES = "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 85ab1ef4a0..0000000000 --- a/meta-oe/recipes-graphics/fim/files/cross_cc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9b0b322d86c7b2d2cddaa62f7dab4aa669739a48 Mon Sep 17 00:00:00 2001 -From: Matthieu Crapet <Matthieu.Crapet@ingenico.com> -Date: Wed, 19 Mar 2014 13:18:21 +0100 -Subject: [PATCH] Upstream-Status: Pending - -b2ba should be built by BUILD_CC in cross environment -This is only used when configured with --enable-hardcoded-font - -Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index a1d4330..a8150b9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -63,7 +63,7 @@ help-acm.cpp: fim.h - $(ECHO) '//#endif' >> $@ - - b2ba: -- $(CC) -o b2ba b2ba.c -+ $(BUILD_CC) -o b2ba b2ba.c - - if FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT - default_font_byte_array.h: $(FIM_CUSTOM_HARDCODED_CONSOLEFONT) b2ba --- -1.8.5.4 - 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 7d1a3aaa86..0000000000 --- a/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Framebuffer (scriptable) image viewer" -DESCRIPTION = "FIM (Fbi IMproved) aims to be a highly customizable and scriptable \ - image viewer targeted at users who are comfortable with software \ - like the Vim text editor or the Mutt mail user agent." -SECTION = "utils" -HOMEPAGE = "http://www.autistici.org/dezperado/fim/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=fa01bff138cc98a62b8840a157951c88" - -PNBLACKLIST[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" - -# flex with provide /usr/include/FlexLexer.h -DEPENDS = "flex-native bison-native flex" - -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/fbi-improved/${BPN}-${PV}.tar.gz \ - file://cross_cc.patch" -SRC_URI[md5sum] = "d7362dde5541c2b6439c35c6e2bd5046" -SRC_URI[sha256sum] = "3f6bf2de2952b9adcbeb3db12c2a979e999a81dd1e314a03bc58e24f1ea9f686" - -PARALLEL_MAKE = "" - -inherit autotools pkgconfig - -# Don't use provided regex.c -EXTRA_OECONF = "fim_cv_regex=no fim_cv_regex_broken=no \ - --enable-framebuffer \ - --disable-djvu \ - --disable-ps \ - --disable-xcftopnm \ - --disable-convert \ - --disable-inkscape \ - --disable-xfig \ - --disable-dia \ - --disable-aa \ - --disable-sdl \ - --enable-read-dirs \ - --enable-recursive-dirs \ - --enable-custom-status-bar \ -" - -# Note: imlib2 is located in meta-efl layer. -PACKAGECONFIG ?= "jpeg rl hf" -PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" -PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" -PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" -PACKAGECONFIG[gif] = "--enable-gif,--disable-gif,giflib" -PACKAGECONFIG[pdf] = "--enable-poppler,--disable-poppler,poppler" -PACKAGECONFIG[magick] = "--enable-graphicsmagick,--disable-graphicsmagick,imagemagick" -PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" -PACKAGECONFIG[rl] = "--enable-readline,--disable-readline,readline" -PACKAGECONFIG[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 5a11ca06aa..0000000000 --- a/meta-oe/recipes-graphics/libsexy/libsexy.inc +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond <chipx86@chipx86.com>" -SECTION = "x11/libs" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://releases.chipx86.com/libsexy/${BPN}/${BP}.tar.gz \ - file://libsexy-pkgconfig-fixes.patch" - -inherit autotools pkgconfig - 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 61da9474df..0000000000 --- a/meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: libsexy-0.1.11/libsexy.pc.in -=================================================================== ---- libsexy-0.1.11.orig/libsexy.pc.in 2005-11-10 10:21:18.000000000 +0000 -+++ libsexy-0.1.11/libsexy.pc.in 2008-03-05 14:36:39.000000000 +0000 -@@ -6,7 +6,8 @@ - Name: libsexy - Description: Doing naughty things to good widgets - Version: @VERSION@ --Libs: -L${libdir} -lsexy @PACKAGE_LIBS@ --Cflags: -I${includedir} @PACKAGE_CFLAGS@ - -+Requires: pango glib-2.0 gtk+-2.0 libxml-2.0 -+Libs: -L${libdir} -lsexy -+Cflags: -I${includedir} - 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 2ba1ebbb74..0000000000 --- a/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libsexy.inc - -PR = "r2" - -SRC_URI[md5sum] = "33c079a253270ec8bfb9508e4bb30754" -SRC_URI[sha256sum] = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e" - -PNBLACKLIST[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 566a2087c8..0000000000 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Luca Falavigna <dktrkranz@debian.org> -Date: Tue, 27 Jan 2015 01:26:04 +0000 -Subject: format_string - ---- - client_examples/gtkvncviewer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client_examples/gtkvncviewer.c b/client_examples/gtkvncviewer.c -index 261b2da..861e4e3 100644 ---- a/client_examples/gtkvncviewer.c -+++ b/client_examples/gtkvncviewer.c -@@ -588,7 +588,7 @@ static void GtkDefaultLog (const char *format, ...) - - time (&log_clock); - strftime (buf, 255, "%d/%m/%Y %X ", localtime (&log_clock)); -- fprintf (stdout, buf); -+ fprintf (stdout, "%s", buf); - - vfprintf (stdout, format, args); - 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 de82d63033..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch +++ /dev/null @@ -1,343 +0,0 @@ -From 24e548a222f0aab4313d5ba8b04f0840b173000f Mon Sep 17 00:00:00 2001 -From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> -Date: Mon, 30 Aug 2010 01:24:54 +0000 -Subject: [PATCH 2/8] Fix image handling integer overflows - -Image loading memory allocation is based on the image width and height: - malloc(heigth * width * 3). Providing an image with large height and -width values can cause the result of this calculation to exceed the -maximum value of an unsigned int and thus causes an integer overflow. -The result: too little memory is allocated and an heap overflow occurs. - -This patch was based by Niels Heinen <niels@freebsd.org> -Thanks! - -Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - -git-svn-id: svn://svn.berlios.de/slim/trunk@176 7c53e7cc-98ea-0310-8f1f-a0b24da60408 ---- - const.h | 3 ++ - jpeg.c | 51 +++++++++++++++----------- - png.c | 122 ++++++++++++++++++++++++++++++++------------------------------ - 3 files changed, 96 insertions(+), 80 deletions(-) - -diff --git a/const.h b/const.h -index df0989c..a18c6f3 100644 ---- a/const.h -+++ b/const.h -@@ -42,4 +42,7 @@ - // variables replaced in pre-session_cmd and post-session_cmd - #define USER_VAR "%user" - -+// max height/width for images -+#define MAX_DIMENSION 10000 -+ - #endif -diff --git a/jpeg.c b/jpeg.c -index 1cf106c..e1f8352 100644 ---- a/jpeg.c -+++ b/jpeg.c -@@ -22,16 +22,22 @@ - #include <string.h> - - #include <jpeglib.h> -+#include "const.h" - - int - read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb) - { -+ int ret = 0; - struct jpeg_decompress_struct cinfo; - struct jpeg_error_mgr jerr; - unsigned char *ptr = NULL; - unsigned int i, ipos; - - FILE *infile = fopen(filename, "rb"); -+ if (infile == NULL) { -+ fprintf(stderr, "Can not fopen file: %s\n",filename); -+ return ret; -+ } - - cinfo.err = jpeg_std_error(&jerr); - jpeg_create_decompress(&cinfo); -@@ -39,43 +45,39 @@ read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb) - jpeg_read_header(&cinfo, TRUE); - jpeg_start_decompress(&cinfo); - -+ /* Prevent against integer overflow */ -+ if(cinfo.output_width >= MAX_DIMENSION || cinfo.output_height >= MAX_DIMENSION) { -+ fprintf(stderr, "Unreasonable dimension found in file: %s\n",filename); -+ goto close_file; -+ } -+ - *width = cinfo.output_width; - *height = cinfo.output_height; - - rgb[0] = malloc(3 * cinfo.output_width * cinfo.output_height); -- if (rgb[0] == NULL) -- { -+ if (rgb[0] == NULL) { - fprintf(stderr, "Can't allocate memory for JPEG file.\n"); -- fclose(infile); -- return(0); -+ goto close_file; - } - -- if (cinfo.output_components == 3) -- { -+ if (cinfo.output_components == 3) { - ptr = rgb[0]; -- while (cinfo.output_scanline < cinfo.output_height) -- { -+ while (cinfo.output_scanline < cinfo.output_height) { - jpeg_read_scanlines(&cinfo, &ptr, 1); - ptr += 3 * cinfo.output_width; - } -- } -- else if (cinfo.output_components == 1) -- { -+ } else if (cinfo.output_components == 1) { - ptr = malloc(cinfo.output_width); -- if (ptr == NULL) -- { -+ if (ptr == NULL) { - fprintf(stderr, "Can't allocate memory for JPEG file.\n"); -- fclose(infile); -- return(0); -+ goto rgb_free; - } - - ipos = 0; -- while (cinfo.output_scanline < cinfo.output_height) -- { -+ while (cinfo.output_scanline < cinfo.output_height) { - jpeg_read_scanlines(&cinfo, &ptr, 1); - -- for (i = 0; i < cinfo.output_width; i++) -- { -+ for (i = 0; i < cinfo.output_width; i++) { - memset(rgb[0] + ipos, ptr[i], 3); - ipos += 3; - } -@@ -85,9 +87,16 @@ read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb) - } - - jpeg_finish_decompress(&cinfo); -- jpeg_destroy_decompress(&cinfo); - -+ ret = 1; -+ goto close_file; -+ -+rgb_free: -+ free(rgb[0]); -+ -+close_file: -+ jpeg_destroy_decompress(&cinfo); - fclose(infile); - -- return(1); -+ return(ret); - } -diff --git a/png.c b/png.c -index a2661c6..5c086c6 100644 ---- a/png.c -+++ b/png.c -@@ -22,12 +22,13 @@ - #include <stdlib.h> - - #include <png.h> -+#include "const.h" - - int - read_png(const char *filename, int *width, int *height, unsigned char **rgb, - unsigned char **alpha) - { -- FILE *infile = fopen(filename, "rb"); -+ int ret = 0; - - png_structp png_ptr; - png_infop info_ptr; -@@ -38,31 +39,27 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb, - int bit_depth, color_type, interlace_type; - int i; - -+ FILE *infile = fopen(filename, "rb"); -+ if (infile == NULL) { -+ fprintf(stderr, "Can not fopen file: %s\n",filename); -+ return ret; -+ } -+ - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, - (png_voidp) NULL, - (png_error_ptr) NULL, - (png_error_ptr) NULL); -- if (!png_ptr) -- { -- fclose(infile); -- return(0); -- } -+ if (!png_ptr) -+ goto file_close; - - info_ptr = png_create_info_struct(png_ptr); -- if (!info_ptr) -- { -+ if (!info_ptr) { - png_destroy_read_struct(&png_ptr, (png_infopp) NULL, - (png_infopp) NULL); -- fclose(infile); -- return(0); - } - - if (setjmp(png_ptr->jmpbuf)) -- { -- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); -- fclose(infile); -- return(0); -- } -+ goto png_destroy; - - png_init_io(png_ptr, infile); - png_read_info(png_ptr, info_ptr); -@@ -70,18 +67,23 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb, - png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, - &interlace_type, (int *) NULL, (int *) NULL); - -+ /* Prevent against integer overflow */ -+ if(w >= MAX_DIMENSION || h >= MAX_DIMENSION) { -+ fprintf(stderr, "Unreasonable dimension found in file: %s\n",filename); -+ goto png_destroy; -+ } -+ - *width = (int) w; - *height = (int) h; - - if (color_type == PNG_COLOR_TYPE_RGB_ALPHA -- || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -- { -- alpha[0] = malloc(*width * *height); -- if (alpha[0] == NULL) -- { -- fprintf(stderr, "Can't allocate memory for alpha channel in PNG file.\n"); -- return(0); -- } -+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -+ alpha[0] = malloc(*width * *height); -+ if (alpha[0] == NULL) -+ { -+ fprintf(stderr, "Can't allocate memory for alpha channel in PNG file.\n"); -+ goto png_destroy; -+ } - } - - /* Change a paletted/grayscale image to RGB */ -@@ -94,68 +96,70 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb, - png_set_gray_to_rgb(png_ptr); - - /* If the PNG file has 16 bits per channel, strip them down to 8 */ -- if (bit_depth == 16) png_set_strip_16(png_ptr); -+ if (bit_depth == 16) -+ png_set_strip_16(png_ptr); - - /* use 1 byte per pixel */ - png_set_packing(png_ptr); - - row_pointers = malloc(*height * sizeof(png_bytep)); -- if (row_pointers == NULL) -- { -+ if (row_pointers == NULL) { - fprintf(stderr, "Can't allocate memory for PNG file.\n"); -- return(0); -+ goto png_destroy; - } - -- for (i = 0; i < *height; i++) -- { -+ for (i = 0; i < *height; i++) { - row_pointers[i] = malloc(4 * *width); -- if (row_pointers == NULL) -- { -+ if (row_pointers == NULL) { - fprintf(stderr, "Can't allocate memory for PNG line.\n"); -- return(0); -+ goto rows_free; - } - } - - png_read_image(png_ptr, row_pointers); - - rgb[0] = malloc(3 * *width * *height); -- if (rgb[0] == NULL) -- { -+ if (rgb[0] == NULL) { - fprintf(stderr, "Can't allocate memory for PNG file.\n"); -- return(0); -+ goto rows_free; - } - - if (alpha[0] == NULL) - { -- ptr = rgb[0]; -- for (i = 0; i < *height; i++) -- { -- memcpy(ptr, row_pointers[i], 3 * *width); -- ptr += 3 * *width; -- } -- } -- else -- { -- int j; -- ptr = rgb[0]; -- for (i = 0; i < *height; i++) -- { -- int ipos = 0; -- for (j = 0; j < *width; j++) -- { -- *ptr++ = row_pointers[i][ipos++]; -- *ptr++ = row_pointers[i][ipos++]; -- *ptr++ = row_pointers[i][ipos++]; -- alpha[0][i * *width + j] = row_pointers[i][ipos++]; -+ ptr = rgb[0]; -+ for (i = 0; i < *height; i++) { -+ memcpy(ptr, row_pointers[i], 3 * *width); -+ ptr += 3 * *width; -+ } -+ } else { -+ int j; -+ ptr = rgb[0]; -+ for (i = 0; i < *height; i++) { -+ int ipos = 0; -+ for (j = 0; j < *width; j++) { -+ *ptr++ = row_pointers[i][ipos++]; -+ *ptr++ = row_pointers[i][ipos++]; -+ *ptr++ = row_pointers[i][ipos++]; -+ alpha[0][i * *width + j] = row_pointers[i][ipos++]; -+ } - } -- } - } - -- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); -+ ret = 1; /* data reading is OK */ -+ -+rows_free: -+ for (i = 0; i < *height; i++) { -+ if (row_pointers[i] != NULL ) { -+ free(row_pointers[i]); -+ } -+ } - -- for (i = 0; i < *height; i++) free(row_pointers[i]); - free(row_pointers); - -+png_destroy: -+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); -+ -+file_close: - fclose(infile); -- return(1); -+ return(ret); - } --- -1.6.6.1 - 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 471c4f51e5..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6aad913ddd5cdb473db9fa21a5e8ecec58de172b Mon Sep 17 00:00:00 2001 -From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> -Date: Wed, 12 Jan 2011 04:41:02 +0000 -Subject: [PATCH 3/8] Fix build failure with ld --as-needed. - -Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - -git-svn-id: svn://svn.berlios.de/slim/trunk@177 7c53e7cc-98ea-0310-8f1f-a0b24da60408 ---- - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1219de4..fafa0ef 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ - # to fit into your operating system / distribution - ####################################################### - CXX=/usr/bin/g++ --CC=/usr/bin/gcc -+CC=/usr/bin/gcc-4.5 - CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include - CXXFLAGS=$(CFLAGS) - LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt -@@ -33,7 +33,7 @@ endif - all: slim - - slim: $(OBJECTS) -- $(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME) -+ $(CXX) $(OBJECTS) $(LDFLAGS) -o $(NAME) - - .cpp.o: - $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ --- -1.6.6.1 - 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 f2087c0103..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c2067e8c16bfb721d339718ae0c99c70a994936b Mon Sep 17 00:00:00 2001 -From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> -Date: Fri, 17 Jun 2011 20:35:07 +0000 -Subject: [PATCH 4/8] Add support libpng15 - -Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - -git-svn-id: svn://svn.berlios.de/slim/trunk@178 7c53e7cc-98ea-0310-8f1f-a0b24da60408 ---- - Makefile | 4 ++-- - png.c | 6 +++++- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index fafa0ef..1202614 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,9 +5,9 @@ - ####################################################### - CXX=/usr/bin/g++ - CC=/usr/bin/gcc-4.5 --CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include -+CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include - CXXFLAGS=$(CFLAGS) --LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt -+LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt - CUSTOM=-DHAVE_SHADOW - ifdef USE_PAM - LDFLAGS+= -lpam -diff --git a/png.c b/png.c -index 5c086c6..aa0f5e5 100644 ---- a/png.c -+++ b/png.c -@@ -57,8 +57,12 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb, - png_destroy_read_struct(&png_ptr, (png_infopp) NULL, - (png_infopp) NULL); - } -- -+ -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(png_ptr->jmpbuf)) -+#endif - goto png_destroy; - - png_init_io(png_ptr, infile); --- -1.6.6.1 - 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 566ae355e7..0000000000 --- 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 @@ -From 4f69eb1aa85fbb395a0474b1f376505fab81ee22 Mon Sep 17 00:00:00 2001 -From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> -Date: Fri, 17 Jun 2011 20:35:10 +0000 -Subject: [PATCH 5/8] Remove path of gcc amd g++, and version of g++ - -Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - -git-svn-id: svn://svn.berlios.de/slim/trunk@179 7c53e7cc-98ea-0310-8f1f-a0b24da60408 ---- - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1202614..5c5fde1 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,8 +3,8 @@ - # Edit the following section to adjust the options - # to fit into your operating system / distribution - ####################################################### --CXX=/usr/bin/g++ --CC=/usr/bin/gcc-4.5 -+CXX=g++ -+CC=gcc - CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include - CXXFLAGS=$(CFLAGS) - LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt --- -1.6.6.1 - 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 a5b812584c..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e188d5fd3e3c0e40c3e35729fd8b81b138191a75 Mon Sep 17 00:00:00 2001 -From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> -Date: Fri, 17 Jun 2011 20:35:13 +0000 -Subject: [PATCH 6/8] Remove localhost from Authenticator of pam - -http://bugs.gentoo.org/346037 -https://developer.berlios.de/bugs/?func=detailbug&bug_id=17757&group_id=2663 -http://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 - -Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - -git-svn-id: svn://svn.berlios.de/slim/trunk@180 7c53e7cc-98ea-0310-8f1f-a0b24da60408 ---- - app.cpp | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/app.cpp b/app.cpp -index c80a73e..7177363 100644 ---- a/app.cpp -+++ b/app.cpp -@@ -236,8 +236,6 @@ void App::Run() { - pam.start("slim"); - pam.set_item(PAM::Authenticator::TTY, DisplayName); - pam.set_item(PAM::Authenticator::Requestor, "root"); -- pam.set_item(PAM::Authenticator::Host, "localhost"); -- - } - catch(PAM::Exception& e){ - cerr << APPNAME << ": " << e << endl; --- -1.6.6.1 - 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 fa2502bf05..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch +++ /dev/null @@ -1,47 +0,0 @@ -From da172fd6234b3b2b487ab36d63da72758829cb1d Mon Sep 17 00:00:00 2001 -From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> -Date: Fri, 17 Jun 2011 20:35:15 +0000 -Subject: [PATCH 7/8] Fix tty slowness - -Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - -git-svn-id: svn://svn.berlios.de/slim/trunk@181 7c53e7cc-98ea-0310-8f1f-a0b24da60408 ---- - app.cpp | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/app.cpp b/app.cpp -index 7177363..44ab099 100644 ---- a/app.cpp -+++ b/app.cpp -@@ -278,21 +278,23 @@ void App::Run() { - signal(SIGALRM, AlarmSignal); - - #ifndef XNEST_DEBUG -- OpenLog(); -- - if (!force_nodaemon && cfg->getOption("daemon") == "yes") { - daemonmode = true; - } - - // Daemonize - if (daemonmode) { -- if (daemon(0, 1) == -1) { -+ if (daemon(0, 0) == -1) { - cerr << APPNAME << ": " << strerror(errno) << endl; - exit(ERR_EXIT); - } -- UpdatePid(); - } - -+ OpenLog(); -+ -+ if (daemonmode) -+ UpdatePid(); -+ - CreateServerAuth(); - StartServer(); - alarm(2); --- -1.6.6.1 - 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 0c5cfb742f..0000000000 --- a/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch +++ /dev/null @@ -1,161 +0,0 @@ -From ee77a3d154443d2823ecbf2141daa1b5924f629f Mon Sep 17 00:00:00 2001 -From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> -Date: Fri, 17 Jun 2011 20:38:34 +0000 -Subject: [PATCH 8/8] restart Xserver if killed - -Patch from http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663. - -Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> - -git-svn-id: svn://svn.berlios.de/slim/trunk@182 7c53e7cc-98ea-0310-8f1f-a0b24da60408 ---- - app.cpp | 36 +++++++++--------------------------- - app.h | 2 +- - 2 files changed, 10 insertions(+), 28 deletions(-) - -diff --git a/app.cpp b/app.cpp -index 44ab099..358a98f 100644 ---- a/app.cpp -+++ b/app.cpp -@@ -104,6 +104,11 @@ int conv(int num_msg, const struct pam_message **msg, - - extern App* LoginApp; - -+int xioerror(Display *disp) { -+ LoginApp->RestartServer(); -+ return 0; -+} -+ - void CatchSignal(int sig) { - cerr << APPNAME << ": unexpected signal " << sig << endl; - -@@ -114,19 +119,6 @@ void CatchSignal(int sig) { - exit(ERR_EXIT); - } - -- --void AlarmSignal(int sig) { -- int pid = LoginApp->GetServerPID(); -- if(waitpid(pid, NULL, WNOHANG) == pid) { -- LoginApp->StopServer(); -- LoginApp->RemoveLock(); -- exit(OK_EXIT); -- } -- signal(sig, AlarmSignal); -- alarm(2); --} -- -- - void User1Signal(int sig) { - signal(sig, User1Signal); - } -@@ -275,7 +267,6 @@ void App::Run() { - signal(SIGHUP, CatchSignal); - signal(SIGPIPE, CatchSignal); - signal(SIGUSR1, User1Signal); -- signal(SIGALRM, AlarmSignal); - - #ifndef XNEST_DEBUG - if (!force_nodaemon && cfg->getOption("daemon") == "yes") { -@@ -297,7 +288,6 @@ void App::Run() { - - CreateServerAuth(); - StartServer(); -- alarm(2); - #endif - - } -@@ -613,6 +603,8 @@ void App::Login() { - int status; - while (wpid != pid) { - wpid = wait(&status); -+ if (wpid == ServerPID) -+ xioerror(Dpy); // Server died, simulate IO error - } - if (WIFEXITED(status) && WEXITSTATUS(status)) { - LoginPanel->Message("Failed to execute login command"); -@@ -658,9 +650,6 @@ void App::Login() { - - - void App::Reboot() { -- // Stop alarm clock -- alarm(0); -- - #ifdef USE_PAM - try{ - pam.end(); -@@ -683,9 +672,6 @@ void App::Reboot() { - - - void App::Halt() { -- // Stop alarm clock -- alarm(0); -- - #ifdef USE_PAM - try{ - pam.end(); -@@ -771,6 +757,7 @@ void App::RestartServer() { - - StopServer(); - RemoveLock(); -+ while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens - Run(); - } - -@@ -841,6 +828,7 @@ int App::WaitForServer() { - - for(cycles = 0; cycles < ncycles; cycles++) { - if((Dpy = XOpenDisplay(DisplayName))) { -+ XSetIOErrorHandler(xioerror); - return 1; - } else { - if(!ServerTimeout(1, (char *) "X server to begin accepting connections")) -@@ -925,9 +913,6 @@ int App::StartServer() { - ServerPID = -1; - break; - } -- alarm(15); -- pause(); -- alarm(0); - - // Wait for server to start up - if(WaitForServer() == 0) { -@@ -962,15 +947,12 @@ int IgnoreXIO(Display *d) { - - - void App::StopServer() { -- // Stop alars clock and ignore signals -- alarm(0); - signal(SIGQUIT, SIG_IGN); - signal(SIGINT, SIG_IGN); - signal(SIGHUP, SIG_IGN); - signal(SIGPIPE, SIG_IGN); - signal(SIGTERM, SIG_DFL); - signal(SIGKILL, SIG_DFL); -- signal(SIGALRM, SIG_DFL); - - // Catch X error - XSetIOErrorHandler(IgnoreXIO); -diff --git a/app.h b/app.h -index dd7c281..2db1038 100644 ---- a/app.h -+++ b/app.h -@@ -34,6 +34,7 @@ public: - ~App(); - void Run(); - int GetServerPID(); -+ void RestartServer(); - void StopServer(); - - bool serverStarted; -@@ -49,7 +50,6 @@ private: - void Console(); - void Exit(); - void KillAllClients(Bool top); -- void RestartServer(); - void ReadConfig(); - void OpenLog(); - void CloseLog(); --- -1.6.6.1 - 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 2fbdcab46e..0000000000 --- a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb +++ /dev/null @@ -1,82 +0,0 @@ -DESCRIPTION="Simple Login Manager" -HOMEPAGE="http://slim.berlios.de" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -PR = "r1" - -DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -SRC_URI = " \ - http://download.berlios.de/${BPN}/${BP}.tar.gz \ - file://0002-Fix-image-handling-integer-overflows.patch \ - file://0003-Fix-build-failure-with-ld-as-needed.patch \ - file://0004-Add-support-libpng15.patch \ - file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \ - file://0006-Remove-localhost-from-Authenticator-of-pam.patch \ - file://0007-Fix-tty-slowness.patch \ - file://0008-restart-Xserver-if-killed.patch \ - file://slim-dynwm \ - file://update_slim_wmlist \ - file://Makefile.oe \ - file://slim.pamd \ - file://slim.service \ -" - -SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42" -SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8" - - -EXTRA_OEMAKE += " \ - USE_PAM=${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \ - PREFIX=${prefix} \ - CFGDIR=${sysconfdir} \ - MANDIR=${mandir} \ - DESTDIR=${D} \ - CFLAGS+=-I${STAGING_INCDIR}/freetype2 \ - CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \ -" - -do_compile_prepend() { - cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile -} - -do_install() { - oe_runmake install - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/ - install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/ - install -d ${D}${sysconfdir}/pam.d/ - install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/ - - echo 'sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf - echo 'sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf -} - - -RDEPENDS_${PN} = "perl xauth freetype sessreg " -FILES_${PN} += "${systemd_unitdir}/system/" - -pkg_postinst_${PN} () { -if test "x$D" != "x"; then - exit 1 -fi -systemctl enable slim.service - -# Register SLiM as default DM -mkdir -p ${sysconfdir}/X11/ -echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager -} - -pkg_postrm_${PN} () { -if test "x$D" != "x"; then - exit 1 -fi -systemctl disable slim.service -sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true -} - -PNBLACKLIST[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 2af669770e..0000000000 --- a/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Wayland-fits, the Wayland Functional Integration Test Suite" -DESCRIPTION = "Wayland-fits is a fully automated functional integration \ -test suite. Its main purpose is to test the functionality and integration of \ -client-side (i.e. toolkit) and server-side (compositor) implementations of \ -the Wayland protocol." -HOMEPAGE = "https://github.com/01org/wayland-fits" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f8d34cadaf891753c0f00c6cd48f08f5 \ - file://src/extensions/weston/weston-wfits.cpp;endline=21;md5=848c81e55cf3a30a9f6ed75f0dba7a97" - -SRC_URI = "git://github.com/01org/wayland-fits.git" -SRCREV = "f108335e374772ae2818a30ae37fe6fcda81980f" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -DEPENDS = "libcheck boost wayland weston" -RDEPENDS_${PN} = "weston" - -EXTRA_OECONF += "--enable-shared --disable-static --with-boost-libdir=${STAGING_LIBDIR}" - -PACKAGECONFIG ?= "gtk+3" - -PACKAGECONFIG[elementary] = "--enable-efl-tests,--disable-efl-tests,elementary" -PACKAGECONFIG[gtk+3] = "--enable-gtk-tests,--disable-gtk-tests,gtk+3" - -do_install_append() { - rm -f ${D}/${libdir}/weston/*.la -} - -FILES_${PN} += "${bindir}/wfits ${libdir}/weston/*.so" -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/weston/.debug ${prefix}/src" - -PNBLACKLIST[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 771a2a8e12..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff --git a/src/multitouch.c b/src/multitouch.c -index c55d742..4a8192d 100644 ---- a/src/multitouch.c -+++ b/src/multitouch.c -@@ -114,7 +114,7 @@ static int init_properties(DeviceIntPtr dev) - return Success; - } - --static int device_init(DeviceIntPtr dev, LocalDevicePtr local) -+static int device_init(DeviceIntPtr dev, InputInfoPtr local) - { - struct mtev_mtouch *mt = local->private; - Atom atom; -@@ -222,7 +222,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local) - xf86InitValuatorAxisStruct(dev, val, axes_labels[val], - min, - max, -- 1, 0, 1); -+ 1, 0, 1,Absolute); - xf86InitValuatorDefaults(dev, val); - } - } -@@ -232,7 +232,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local) - return Success; - } - --static int device_on(LocalDevicePtr local) -+static int device_on(InputInfoPtr local) - { - struct mtev_mtouch *mt = local->private; - local->fd = xf86OpenSerial(local->options); -@@ -248,7 +248,7 @@ static int device_on(LocalDevicePtr local) - return Success; - } - --static int device_off(LocalDevicePtr local) -+static int device_off(InputInfoPtr local) - { - struct mtev_mtouch *mt = local->private; - xf86RemoveEnabledDevice(local); -@@ -259,12 +259,12 @@ static int device_off(LocalDevicePtr local) - return Success; - } - --static int device_close(LocalDevicePtr local) -+static int device_close(InputInfoPtr local) - { - return Success; - } - --static void process_state(LocalDevicePtr local, -+static void process_state(InputInfoPtr local, - const struct mtev_mtouch *mt) - { - -@@ -321,22 +321,22 @@ static void process_state(LocalDevicePtr local, - } - - /* Some x-clients assume they get motion events before button down */ -+ xf86Msg(X_INFO,"down %d|pdown %d\n", down, pdown); - if (down) - xf86PostMotionEventP(local->dev, TRUE, - 0, down * MT_AXIS_PER_FINGER, valuators); -- - if(down && pdown == 0) - xf86PostButtonEventP(local->dev, TRUE, - 1, 1, - 0, down * MT_AXIS_PER_FINGER, valuators); -- else if (down == 0 && pdown) -- xf86PostButtonEvent(local->dev, TRUE, 1, 0, 0, 0); -- -+ else if (down == 0 && pdown){ -+ xf86PostButtonEvent(local->dev, TRUE, 1, 1, 0, 0); -+ } - pdown = !!down; - } - - /* called for each full received packet from the touchpad */ --static void read_input(LocalDevicePtr local) -+static void read_input(InputInfoPtr local) - { - struct mtev_mtouch *mt = local->private; - while (mtouch_read_synchronized_event(mt, local->fd)) { -@@ -346,7 +346,7 @@ static void read_input(LocalDevicePtr local) - - static Bool device_control(DeviceIntPtr dev, int mode) - { -- LocalDevicePtr local = dev->public.devicePrivate; -+ InputInfoPtr local = dev->public.devicePrivate; - switch (mode) { - case DEVICE_INIT: - xf86Msg(X_INFO, "device control: init\n"); -@@ -366,39 +366,29 @@ static Bool device_control(DeviceIntPtr dev, int mode) - } - } - --static InputInfoPtr preinit(InputDriverPtr drv, IDevPtr dev, int flags) -+static InputInfoPtr preinit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - { - struct mtev_mtouch *mt; -- InputInfoPtr local = xf86AllocateInput(drv, 0); -- if (!local) -- goto error; -+ int rc; -+ - mt = calloc(1, sizeof(struct mtev_mtouch)); -+ - if (!mt) - goto error; - -- local->name = dev->identifier; -- local->type_name = XI_TOUCHSCREEN; -- local->device_control = device_control; -- local->read_input = read_input; -- local->private = mt; -- local->flags = XI86_POINTER_CAPABLE | -- XI86_SEND_DRAG_EVENTS; -- -- local->conf_idev = dev; -- -- xf86CollectInputOptions(local, NULL, NULL); -- //xf86OptionListReport(local->options); -- xf86ProcessCommonOptions(local, local->options); -+ pInfo->private = mt; -+ pInfo->type_name = "UNKNOWN"; -+ pInfo->device_control = device_control; -+ pInfo->read_input = read_input; - -+ mt->swap_xy = xf86SetBoolOption(pInfo->options, "SwapAxes", FALSE); -+ mt->invert_x = xf86SetBoolOption(pInfo->options, "InvertX", FALSE); -+ mt->invert_y = xf86SetBoolOption(pInfo->options, "InvertY", FALSE); - -- mt->swap_xy = xf86SetBoolOption(local->options, "SwapAxes", FALSE); -- mt->invert_x = xf86SetBoolOption(local->options, "InvertX", FALSE); -- mt->invert_y = xf86SetBoolOption(local->options, "InvertY", FALSE); -- -- local->flags |= XI86_CONFIGURED; -+ return Success; - - error: -- return local; -+ return !Success; - } - - static void uninit(InputDriverPtr drv, InputInfoPtr local, int flags) -@@ -415,7 +405,6 @@ static InputDriverRec MTEV = { - .PreInit = preinit, - .UnInit = uninit, - .module = NULL, -- .refCount = 0 - }; - - 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 5f2adec1a1..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-input.inc -SUMMARY = "X.Org X server -- multitouch input driver" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" - -DEPENDS += "pixman" - -PNBLACKLIST[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" - -SRC_URI = "git://gitorious.org/xorg/xf86-input-mtev.git file://fix-it.patch" -SRCREV = "1eb469166ffc095c5801475f057f911f97a6e641" -S = "${WORKDIR}/git" -PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.0" - -EXTRA_OEMAKE = "'INCLUDE=-I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/pixman-1'" - -#skip xorg-driver-common.inc AC_CHECK_FILE mangling -do_configure_prepend () { - sed 's#gcc#${CC}#g' -i Makefile - return -} 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 fcd2f684b1..0000000000 --- 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 @@ -From 621d946e56efac2c779b83b1a5c6b645169c4ebd Mon Sep 17 00:00:00 2001 -From: "Brian A. Lloyd" <brian.lloyd@familyhonor.net> -Date: Wed, 1 Oct 2014 12:35:18 +0300 -Subject: [PATCH] Add config.h include to src/lx_memory.c - -The src/lx_memory.c file uses the xf86.h header file. This file must have -HAVE_STRNDUP defined before calling it when the building platform has a strndup -function. When using config.h, this file doesn't have that define and so fails -to compile. - -The attached patch adds the conditional config.h to this file so it may compile -on the affected platforms. - -The patch is trivial and may be included and used under whatever licensing -desired. - -Closes: Free Desktop Bug #84541 - -Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net> -Upstream-Status: Backport ---- - src/lx_memory.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/lx_memory.c b/src/lx_memory.c -index f26d280..992446f 100644 ---- a/src/lx_memory.c -+++ b/src/lx_memory.c -@@ -22,6 +22,9 @@ - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - */ -+#if HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include "xf86.h" - #include "geode.h" --- -2.1.1 - 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 e543413add..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb +++ /dev/null @@ -1,16 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-video.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36" - -SUMMARY = "X.org server -- Geode GX2/LX display driver" -PR = "${INC_PR}.0" - -SRC_URI += "file://0001-Add-config.h-include-to-src-lx_memory.c.patch" -SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392" -SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7" - -COMPATIBLE_HOST = "i.86.*-linux" - -RDEPENDS_${PN} += "xserver-xorg-module-exa" - -# 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] -PNBLACKLIST[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 25e83209d7..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f485e878bc8bb0e381a38a30009308c82fa8d672 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 16 Aug 2012 08:18:56 +0200 -Subject: [PATCH] fix build with KMS disabled - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/glamo.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/glamo.h b/src/glamo.h -index d4a2f19..5fd5c04 100644 ---- a/src/glamo.h -+++ b/src/glamo.h -@@ -37,8 +37,11 @@ - #include "xf86.h" - #include "exa.h" - #include <linux/fb.h> -+ -+#ifdef HAVE_KMS - #include <libdrm/drm.h> - #include <libdrm/glamo_bo.h> -+#endif - - #define GLAMO_REG_BASE(c) ((c)->attr.address[0]) - #define GLAMO_REG_SIZE(c) (0x2400) --- -1.7.8.6 - 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 fab0b238f6..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 040ade8bb86a771fa4e71b41d2080254830ca9f3 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 16 Mar 2013 17:44:37 +0100 -Subject: [PATCH] glamo*driver: remove references to mibstore - -* fix build with xserver-1.14 - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/glamo-driver.c | 2 -- - src/glamo-kms-driver.c | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/src/glamo-driver.c b/src/glamo-driver.c -index 10b7762..22f57d7 100644 ---- a/src/glamo-driver.c -+++ b/src/glamo-driver.c -@@ -14,7 +14,6 @@ - #include "xf86_OSproc.h" - - #include "mipointer.h" --#include "mibstore.h" - #include "micmap.h" - #include "colormapst.h" - #include "xf86cmap.h" -@@ -612,7 +611,6 @@ GlamoScreenInit(SCREEN_INIT_ARGS_DECL) - } - - xf86SetBlackWhitePixels(pScreen); -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ -diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c -index c5c7a00..f192398 100644 ---- a/src/glamo-kms-driver.c -+++ b/src/glamo-kms-driver.c -@@ -415,7 +415,6 @@ Bool GlamoKMSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, - - GlamoKMSExaInit(pScrn); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); --- -1.8.1.5 - 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 0d63743638..0000000000 --- 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 @@ -From 963c221aa01be2ea99d39578d91e4aa08ec3ab0a Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Mon, 23 May 2011 14:29:38 +0200 -Subject: [PATCH] glamo-kms-driver: drop unused xf86_config - -* gcc-4.6 doesn't like unused variables which are only set and never read - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/glamo-kms-driver.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c -index ce87caa..c5c7a00 100644 ---- a/src/glamo-kms-driver.c -+++ b/src/glamo-kms-driver.c -@@ -208,7 +208,6 @@ static const xf86CrtcConfigFuncsRec crtc_config_funcs = { - - Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags) - { -- xf86CrtcConfigPtr xf86_config; - GlamoPtr pGlamo; - rgb defaultWeight = { 0, 0, 0 }; - int max_width, max_height; -@@ -254,7 +253,6 @@ Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags) - - /* Allocate an xf86CrtcConfig */ - xf86CrtcConfigInit(pScrn, &crtc_config_funcs); -- xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - - max_width = 480; - max_height = 640; --- -1.7.5.rc3 - 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 cbdc6e762b..0000000000 --- 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 @@ -From 57e8944e3cced03b9526bd075649d74d97c24899 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 20 Nov 2012 22:18:23 +0100 -Subject: [PATCH 3/3] glamo-driver: adapt to xserver-0.13 video API - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/compat-api.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/glamo-driver.c | 43 ++++++++++++------------ - 2 files changed, 118 insertions(+), 21 deletions(-) - create mode 100644 src/compat-api.h - -diff --git a/src/compat-api.h b/src/compat-api.h -new file mode 100644 -index 0000000..b1591b1 ---- /dev/null -+++ b/src/compat-api.h -@@ -0,0 +1,96 @@ -+/* -+ * Copyright 2012 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Dave Airlie <airlied@redhat.com> -+ */ -+ -+/* this file provides API compat between server post 1.13 and pre it, -+ it should be reused inside as many drivers as possible */ -+#ifndef COMPAT_API_H -+#define COMPAT_API_H -+ -+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -+#endif -+ -+#ifndef XF86_HAS_SCRN_CONV -+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -+#endif -+ -+#ifndef XF86_SCRN_INTERFACE -+ -+#define SCRN_ARG_TYPE int -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] -+ -+#define SCREEN_ARG_TYPE int -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -+ -+#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -+ -+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -+ -+#define FREE_SCREEN_ARGS_DECL int arg, int flags -+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 -+ -+#define VT_FUNC_ARGS_DECL int arg, int flags -+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) -+ -+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) -+#else -+#define SCRN_ARG_TYPE ScrnInfoPtr -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) -+ -+#define SCREEN_ARG_TYPE ScreenPtr -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -+ -+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -+ -+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -+#define FREE_SCREEN_ARGS(x) (x) -+ -+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -+#define VT_FUNC_ARGS(flags) pScrn -+ -+#define XF86_ENABLEDISABLEFB_ARG(x) (x) -+ -+#endif -+ -+#endif -diff --git a/src/glamo-driver.c b/src/glamo-driver.c -index b13caae..10b7762 100644 ---- a/src/glamo-driver.c -+++ b/src/glamo-driver.c -@@ -43,6 +43,7 @@ - - #include <sys/mman.h> - -+#include "compat-api.h" - - static Bool debug = 0; - -@@ -68,10 +69,10 @@ static Bool - GlamoPreInit(ScrnInfoPtr pScrn, int flags); - - static Bool --GlamoScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv); -+GlamoScreenInit(SCREEN_INIT_ARGS_DECL); - - static Bool --GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen); -+GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL); - - static Bool - GlamoCrtcResize(ScrnInfoPtr scrn, int width, int height); -@@ -86,10 +87,10 @@ static void - GlamoRestoreHW(ScrnInfoPtr pScren); - - static Bool --GlamoEnterVT(int scrnIndex, int flags); -+GlamoEnterVT(VT_FUNC_ARGS_DECL); - - static void --GlamoLeaveVT(int scrnIndex, int flags); -+GlamoLeaveVT(VT_FUNC_ARGS_DECL); - - static void - GlamoLoadColormap(ScrnInfoPtr pScrn, int numColors, int *indices, -@@ -248,8 +249,8 @@ GlamoUnmapMMIO(ScrnInfoPtr pScrn) { - } - - static Bool --GlamoSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+GlamoSwitchMode(SWITCH_MODE_ARGS_DECL) { -+ SCRN_INFO_PTR(arg); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn); - xf86OutputPtr output = config->output[config->compat_output]; - Rotation rotation; -@@ -286,7 +287,7 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections) - - for (i = 0; i < numDevSections; i++) { - -- dev = xf86FindOptionValue(devSections[i]->options, "Device"); -+ dev = (char *) xf86FindOptionValue(devSections[i]->options, "Device"); - if (fbdevHWProbe(NULL, dev, NULL)) { - int entity; - pScrn = NULL; -@@ -430,7 +431,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags) - - pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); - -- fb_device = xf86FindOptionValue(pGlamo->pEnt->device->options, "Device"); -+ fb_device = (char *) xf86FindOptionValue(pGlamo->pEnt->device->options, "Device"); - - /* open device */ - if (!fbdevHWInit(pScrn, NULL, fb_device)) -@@ -523,7 +524,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags) - - - static Bool --GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+GlamoScreenInit(SCREEN_INIT_ARGS_DECL) - { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - GlamoPtr pGlamo = GlamoPTR(pScrn); -@@ -545,7 +546,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - #endif - - if (NULL == (pGlamo->fbmem = fbdevHWMapVidmem(pScrn))) { -- xf86DrvMsg(scrnIndex, X_ERROR, "mapping of video memory failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mapping of video memory failed\n"); - return FALSE; - } - -@@ -556,13 +557,13 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* mi layer */ - miClearVisualTypes(); - if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) { -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "visual type setup failed for %d bits per pixel [1]\n", - pScrn->bitsPerPixel); - return FALSE; - } - if (!miSetPixmapDepths()) { -- xf86DrvMsg(scrnIndex, X_ERROR, "pixmap depth setup failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "pixmap depth setup failed\n"); - return FALSE; - } - -@@ -617,7 +618,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* software cursor */ - miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); - -- GlamoEnterVT(scrnIndex, 0); -+ GlamoEnterVT(VT_FUNC_ARGS(0)); - - xf86CrtcScreenInit(pScreen); - #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0) -@@ -627,7 +628,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* colormap */ - pGlamo->colormap = NULL; - if (!miCreateDefColormap(pScreen)) { -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: miCreateDefColormap failed " - "in GlamoScreenInit()\n"); - return FALSE; -@@ -652,9 +653,9 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - static Bool --GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen) -+GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - GlamoPtr pGlamo = GlamoPTR(pScrn); - - if (pGlamo->accel) -@@ -675,7 +676,7 @@ GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen) - - pScreen->CreateScreenResources = pGlamo->CreateScreenResources; - pScreen->CloseScreen = pGlamo->CloseScreen; -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - static Bool -@@ -826,8 +827,8 @@ GlamoRestoreHW(ScrnInfoPtr pScrn) { - } - - static Bool --GlamoEnterVT(int scrnIndex, int flags) { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+GlamoEnterVT(VT_FUNC_ARGS_DECL) { -+ SCRN_INFO_PTR(arg); - GlamoPtr pGlamo = GlamoPTR(pScrn); - - GlamoSaveHW(pScrn); -@@ -842,8 +843,8 @@ GlamoEnterVT(int scrnIndex, int flags) { - } - - static void --GlamoLeaveVT(int scrnIndex, int flags) { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+GlamoLeaveVT(VT_FUNC_ARGS_DECL) { -+ SCRN_INFO_PTR(arg); - GlamoPtr pGlamo = GlamoPTR(pScrn); - - if (pGlamo->accel) --- -1.8.0 - 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 a82037109e..0000000000 --- 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 @@ -From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Fri, 12 Dec 2014 12:00:10 +0100 -Subject: [PATCH] glamo.h: use const for jbt6k74_state_path - -* fix build issue with xserver 1.16: - glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/glamo.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/glamo.h b/src/glamo.h -index 5fd5c04..5e072be 100644 ---- a/src/glamo.h -+++ b/src/glamo.h -@@ -148,7 +148,7 @@ typedef struct { - #endif - - #ifdef JBT6K74_SET_STATE -- char *jbt6k74_state_path; -+ const char *jbt6k74_state_path; - char saved_jbt6k74_state[14]; - #endif - --- -2.1.3 - 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 5818d0cc9f..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-video.inc -SUMMARY = "X.Org X server -- Glamo display driver with KMS support" -DEPENDS += "libdrm" -RDEPENDS_${PN} += "xserver-xorg-module-exa" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" - -PE = "2" -PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.4" - -SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \ - file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \ - file://0001-fix-build-with-KMS-disabled.patch \ - file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \ - file://0001-glamo-driver-remove-references-to-mibstore.patch \ - file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \ -" - -S = "${WORKDIR}/git" -SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b" - -EXTRA_OECONF = " --disable-kms " - -PNBLACKLIST[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" |