diff options
Diffstat (limited to 'recipes-graphics')
35 files changed, 363 insertions, 667 deletions
diff --git a/recipes-graphics/gpicview/gpicview/0001-gpicview-allow-to-build-for-gtk-wayland.patch b/recipes-graphics/gpicview/gpicview/0001-gpicview-allow-to-build-for-gtk-wayland.patch new file mode 100644 index 0000000..8cf74c1 --- /dev/null +++ b/recipes-graphics/gpicview/gpicview/0001-gpicview-allow-to-build-for-gtk-wayland.patch @@ -0,0 +1,276 @@ +From aa2f81a3e78e7da505bdab465eacce9b37b035e6 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Mon, 6 Nov 2023 10:43:46 +0000 +Subject: [PATCH] gpicview: allow to build for gtk/wayland + +For wayland gdk/gdkx.h does not work, even with xwayland. +Remove the more elaborate gf_display_get_workarea function and use the +existing fallback. +With the removal of gdk from the code also remove the dependency +check on x11 from configure. + +Upstream-Status: Inappropriate [Toradex specific] +Upstream targets X11. Removing the use of gdk would remove +functionaliy. + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + Makefile.in | 2 - + configure.ac | 4 -- + data/Makefile.in | 2 - + src/Makefile.am | 5 +- + src/Makefile.in | 7 +-- + src/working-area.c | 123 ++------------------------------------------- + 6 files changed, 6 insertions(+), 137 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 6ecf74a..cad90b7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -317,8 +317,6 @@ SHELL = @SHELL@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-X11_CFLAGS = @X11_CFLAGS@ +-X11_LIBS = @X11_LIBS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff --git a/configure.ac b/configure.ac +index 2fb2469..1591584 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,15 +56,11 @@ AC_SUBST(GTK_LIBS) + + pkg_modules="x11" + +-PKG_CHECK_MODULES(X11, [$pkg_modules]) + AC_CHECK_LIB(jpeg, jpeg_start_decompress, [], + [AC_MSG_ERROR([libjpeg not found])], -lm) + AC_CHECK_HEADER(jpeglib.h, , [AC_MSG_ERROR([libjpeg not found])]) + LIBJPEG='-ljpeg' + +-AC_SUBST(X11_CFLAGS) +-AC_SUBST(X11_LIBS) +- + # Generate po/LINGUAS on the fly rather than relying on translators + # to maintain it manually. This also overcome the problem that Transifex + # cannot add a language to po/LINGUAS if a new po file is submitted. +diff --git a/data/Makefile.in b/data/Makefile.in +index c8c142b..ea2e4ff 100644 +--- a/data/Makefile.in ++++ b/data/Makefile.in +@@ -234,8 +234,6 @@ SHELL = @SHELL@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-X11_CFLAGS = @X11_CFLAGS@ +-X11_LIBS = @X11_LIBS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 44ecb19..6c7a683 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,6 @@ + + # set the include path found by configure + gpicview_CPPFLAGS = $(all_includes) \ +- $(X11_CFLAGS) \ + $(GTK_CFLAGS) \ + $(ADDITIONAL_FLAGS) \ + -I$(top_srcdir) \ +@@ -27,7 +26,7 @@ gpicview_SOURCES = \ + + # the library search path. + # use -nodefaultlibs to prevent linking libstdc++ +-gpicview_LDADD = $(X11_LIBS) $(GTK_LIBS) -lm ++gpicview_LDADD = $(GTK_LIBS) -lm + + noinst_HEADERS = \ + glib-mem.h \ +@@ -44,6 +43,4 @@ noinst_HEADERS = \ + + noinst_PROGRAMS=xml-purge + xml_purge_SOURCES=xml-purge.c +-xml_purge_CFLAGS=@X11_CFLAGS@ +-xml_purge_LDADD=@X11_LIBS@ + +diff --git a/src/Makefile.in b/src/Makefile.in +index 24cfe1f..65fea48 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -271,8 +271,6 @@ SHELL = @SHELL@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-X11_CFLAGS = @X11_CFLAGS@ +-X11_LIBS = @X11_LIBS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +@@ -331,7 +329,6 @@ top_srcdir = @top_srcdir@ + + # set the include path found by configure + gpicview_CPPFLAGS = $(all_includes) \ +- $(X11_CFLAGS) \ + $(GTK_CFLAGS) \ + $(ADDITIONAL_FLAGS) \ + -I$(top_srcdir) \ +@@ -356,7 +353,7 @@ gpicview_SOURCES = \ + + # the library search path. + # use -nodefaultlibs to prevent linking libstdc++ +-gpicview_LDADD = $(X11_LIBS) $(GTK_LIBS) -lm ++gpicview_LDADD = $(GTK_LIBS) -lm + noinst_HEADERS = \ + glib-mem.h \ + image-list.h \ +@@ -371,8 +368,6 @@ noinst_HEADERS = \ + jhead.h + + xml_purge_SOURCES = xml-purge.c +-xml_purge_CFLAGS = @X11_CFLAGS@ +-xml_purge_LDADD = @X11_LIBS@ + all: all-am + + .SUFFIXES: +diff --git a/src/working-area.c b/src/working-area.c +index 86a1fa5..2fa9474 100644 +--- a/src/working-area.c ++++ b/src/working-area.c +@@ -23,126 +23,11 @@ + */ + + # include <gdk/gdk.h> +-# include <gdk/gdkx.h> +-# include <X11/Xlib.h> +-# include <X11/Xutil.h> +-# include <X11/Xatom.h> +- +-void get_working_area(GdkScreen* screen, GdkRectangle *rect); +- +-static gboolean gf_display_get_workarea(GdkScreen* g_screen, GdkRectangle *rect) { +- Atom xa_desktops, xa_current, xa_workarea, xa_type; +- Display *x_display; +- Window x_root; +- guint32 desktops = 0, current = 0; +- gulong *workareas, len, fill; +- guchar *data; +- gint format; +- +- GdkDisplay *g_display; +- Screen *x_screen; +- +- /* get the gdk display */ +- g_display = gdk_display_get_default(); +- if(!g_display) +- return FALSE; +- +- /* get the x display from the gdk display */ +- x_display = gdk_x11_display_get_xdisplay(g_display); +- if(!x_display) +- return FALSE; +- +- /* get the x screen from the gdk screen */ +- x_screen = gdk_x11_screen_get_xscreen(g_screen); +- if(!x_screen) +- return FALSE; +- +- /* get the root window from the screen */ +- x_root = XRootWindowOfScreen(x_screen); +- +- /* find the _NET_NUMBER_OF_DESKTOPS atom */ +- xa_desktops = XInternAtom(x_display, "_NET_NUMBER_OF_DESKTOPS", True); +- if(xa_desktops == None) +- return FALSE; +- +- /* get the number of desktops */ +- if(XGetWindowProperty(x_display, x_root, xa_desktops, 0, 1, False, +- XA_CARDINAL, &xa_type, &format, &len, &fill, +- &data) != Success) +- { +- return FALSE; +- } +- +- if(!data) +- return FALSE; +- +- desktops = *(guint32 *)data; +- XFree(data); +- +- /* find the _NET_CURRENT_DESKTOP atom */ +- xa_current = XInternAtom(x_display, "_NET_CURRENT_DESKTOP", True); +- if(xa_current == None) +- return FALSE; +- +- /* get the current desktop */ +- if(XGetWindowProperty(x_display, x_root, xa_current, 0, 1, False, +- XA_CARDINAL, &xa_type, &format, &len, &fill, +- &data) != Success) +- { +- return FALSE; +- } +- +- if(!data) +- return FALSE; +- +- current = *(guint32 *)data; +- XFree(data); +- +- /* find the _NET_WORKAREA atom */ +- xa_workarea = XInternAtom(x_display, "_NET_WORKAREA", True); +- if(xa_workarea == None) +- return FALSE; +- +- if(XGetWindowProperty(x_display, x_root, xa_workarea, 0, (glong)(4 * 32), +- False, AnyPropertyType, &xa_type, &format, &len, +- &fill, &data) != Success) +- { +- return FALSE; +- } +- +- /* make sure the type and format are good */ +- if(xa_type == None || format == 0) +- return FALSE; +- +- /* make sure we don't have any leftovers */ +- if(fill) +- return FALSE; +- +- /* make sure len divides evenly by 4 */ +- if(len % 4) +- return FALSE; +- +- /* it's good, lets use it */ +- workareas = (gulong *)(guint32 *)data; +- +- rect->x = (guint32)workareas[current * 4]; +- rect->y = (guint32)workareas[current * 4 + 1]; +- rect->width = (guint32)workareas[current * 4 + 2]; +- rect->height = (guint32)workareas[current * 4 + 3]; +- +- /* clean up our memory */ +- XFree(data); +- +- return TRUE; +-} + + void get_working_area(GdkScreen* screen, GdkRectangle *rect) + { +- if( !gf_display_get_workarea(screen, rect) ) +- { +- rect->x = 0; +- rect->y = 0; +- rect->width = gdk_screen_width(); +- rect->height = gdk_screen_height(); +- } ++ rect->x = 0; ++ rect->y = 0; ++ rect->width = gdk_screen_width(); ++ rect->height = gdk_screen_height(); + } +-- +2.35.3 + diff --git a/recipes-graphics/gpicview/gpicview/remove-gdk-x11.patch b/recipes-graphics/gpicview/gpicview/remove-gdk-x11.patch deleted file mode 100644 index a1f97b3..0000000 --- a/recipes-graphics/gpicview/gpicview/remove-gdk-x11.patch +++ /dev/null @@ -1,136 +0,0 @@ -For xwayland gdk/gdkx.h does not work. -Remove the more elaborate gf_display_get_workarea function and use only -the fallback. ---- ./src/working-area.c.orig 2016-02-20 22:38:31.000000000 +0000 -+++ ./src/working-area.c 2020-01-07 13:37:47.023817524 +0000 -@@ -23,126 +23,11 @@ - */ - - # include <gdk/gdk.h> --# include <gdk/gdkx.h> --# include <X11/Xlib.h> --# include <X11/Xutil.h> --# include <X11/Xatom.h> -- --void get_working_area(GdkScreen* screen, GdkRectangle *rect); -- --static gboolean gf_display_get_workarea(GdkScreen* g_screen, GdkRectangle *rect) { -- Atom xa_desktops, xa_current, xa_workarea, xa_type; -- Display *x_display; -- Window x_root; -- guint32 desktops = 0, current = 0; -- gulong *workareas, len, fill; -- guchar *data; -- gint format; -- -- GdkDisplay *g_display; -- Screen *x_screen; -- -- /* get the gdk display */ -- g_display = gdk_display_get_default(); -- if(!g_display) -- return FALSE; -- -- /* get the x display from the gdk display */ -- x_display = gdk_x11_display_get_xdisplay(g_display); -- if(!x_display) -- return FALSE; -- -- /* get the x screen from the gdk screen */ -- x_screen = gdk_x11_screen_get_xscreen(g_screen); -- if(!x_screen) -- return FALSE; -- -- /* get the root window from the screen */ -- x_root = XRootWindowOfScreen(x_screen); -- -- /* find the _NET_NUMBER_OF_DESKTOPS atom */ -- xa_desktops = XInternAtom(x_display, "_NET_NUMBER_OF_DESKTOPS", True); -- if(xa_desktops == None) -- return FALSE; -- -- /* get the number of desktops */ -- if(XGetWindowProperty(x_display, x_root, xa_desktops, 0, 1, False, -- XA_CARDINAL, &xa_type, &format, &len, &fill, -- &data) != Success) -- { -- return FALSE; -- } -- -- if(!data) -- return FALSE; -- -- desktops = *(guint32 *)data; -- XFree(data); -- -- /* find the _NET_CURRENT_DESKTOP atom */ -- xa_current = XInternAtom(x_display, "_NET_CURRENT_DESKTOP", True); -- if(xa_current == None) -- return FALSE; -- -- /* get the current desktop */ -- if(XGetWindowProperty(x_display, x_root, xa_current, 0, 1, False, -- XA_CARDINAL, &xa_type, &format, &len, &fill, -- &data) != Success) -- { -- return FALSE; -- } -- -- if(!data) -- return FALSE; -- -- current = *(guint32 *)data; -- XFree(data); -- -- /* find the _NET_WORKAREA atom */ -- xa_workarea = XInternAtom(x_display, "_NET_WORKAREA", True); -- if(xa_workarea == None) -- return FALSE; -- -- if(XGetWindowProperty(x_display, x_root, xa_workarea, 0, (glong)(4 * 32), -- False, AnyPropertyType, &xa_type, &format, &len, -- &fill, &data) != Success) -- { -- return FALSE; -- } -- -- /* make sure the type and format are good */ -- if(xa_type == None || format == 0) -- return FALSE; -- -- /* make sure we don't have any leftovers */ -- if(fill) -- return FALSE; -- -- /* make sure len divides evenly by 4 */ -- if(len % 4) -- return FALSE; -- -- /* it's good, lets use it */ -- workareas = (gulong *)(guint32 *)data; -- -- rect->x = (guint32)workareas[current * 4]; -- rect->y = (guint32)workareas[current * 4 + 1]; -- rect->width = (guint32)workareas[current * 4 + 2]; -- rect->height = (guint32)workareas[current * 4 + 3]; -- -- /* clean up our memory */ -- XFree(data); -- -- return TRUE; --} - - void get_working_area(GdkScreen* screen, GdkRectangle *rect) - { -- if( !gf_display_get_workarea(screen, rect) ) -- { -- rect->x = 0; -- rect->y = 0; -- rect->width = gdk_screen_width(); -- rect->height = gdk_screen_height(); -- } -+ rect->x = 0; -+ rect->y = 0; -+ rect->width = gdk_screen_width(); -+ rect->height = gdk_screen_height(); - } diff --git a/recipes-graphics/gpicview/gpicview_0.2.5.bb b/recipes-graphics/gpicview/gpicview_0.2.5.bb index 53d996f..170db77 100644 --- a/recipes-graphics/gpicview/gpicview_0.2.5.bb +++ b/recipes-graphics/gpicview/gpicview_0.2.5.bb @@ -2,7 +2,7 @@ SUMMARY = "Simple Image Viewer for X" HOMEPAGE = "http://lxde.sourceforge.net/gpicview" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "glib-2.0-native intltool-native jpeg" @@ -10,7 +10,7 @@ RDEPENDS:${PN} = "adwaita-icon-theme" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/lxde/${P}.tar.xz \ - file://remove-gdk-x11.patch \ + file://0001-gpicview-allow-to-build-for-gtk-wayland.patch \ " SRC_URI[md5sum] = "26be9b0c5a234f1afe7d83d02a4a33f4" SRC_URI[sha256sum] = "38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942" diff --git a/recipes-graphics/graphviz/files/cross_compile.patch b/recipes-graphics/graphviz/files/cross_compile.patch deleted file mode 100644 index 85042c4..0000000 --- a/recipes-graphics/graphviz/files/cross_compile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- graphviz-2.32.0/lib/gvpr/Makefile.am~ 2013-08-14 15:13:03.000000000 +0200 -+++ graphviz-2.32.0git/lib/gvpr/Makefile.am 2013-08-14 15:17:26.039087759 +0200 -@@ -46,6 +46,9 @@ - - mkdefs_SOURCES = mkdefs.c - -+mkdefs: $(mkdefs_SOURCES) -+ $(BUILD_CC) -o $@ $< -+ - gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs - ./mkdefs gdefs.h < $(top_srcdir)/lib/gvpr/gprdata - diff --git a/recipes-graphics/graphviz/graphviz_2.38.0.bb b/recipes-graphics/graphviz/graphviz_2.38.0.bb deleted file mode 100644 index fa547ed..0000000 --- a/recipes-graphics/graphviz/graphviz_2.38.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "graphical" -SUMMARY = "Graphviz - Graph Visualization Software" -HOMEPAGE = "http://www.graphviz.org" -LICENSE = "EPL-1.0" -DEPENDS = "cairo pango expat intltool-native gtk-doc gettext-native python" - -SRC_URI = " \ - http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-${PV}.tar.gz \ - file://cross_compile.patch \ -" -LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04" -SRC_URI[md5sum] = "5b6a829b2ac94efcd5fa3c223ed6d3ae" -SRC_URI[sha256sum] = "81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e" - -PR = "r1" - -FILES:${PN}-dev += " \ - /usr/lib/graphviz/*.so \ -" - -inherit autotools-brokensep pkgconfig diff --git a/recipes-graphics/rdesktop/rdesktop.inc b/recipes-graphics/rdesktop/rdesktop.inc deleted file mode 100644 index 025c4e9..0000000 --- a/recipes-graphics/rdesktop/rdesktop.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Rdesktop rdp client for X" -HOMEPAGE = "http://www.rdesktop.org" -DEPENDS = "virtual/libx11 openssl pcsc-lite" -SECTION = "x11/network" -LICENSE = "GPL" - -INC_PR = "r2" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \ - file://add_ioctl_serial_get_properties.patch \ -"
\ No newline at end of file diff --git a/recipes-graphics/rdesktop/rdesktop/add_ioctl_serial_get_properties.patch b/recipes-graphics/rdesktop/rdesktop/add_ioctl_serial_get_properties.patch deleted file mode 100644 index 8214f2b..0000000 --- a/recipes-graphics/rdesktop/rdesktop/add_ioctl_serial_get_properties.patch +++ /dev/null @@ -1,22 +0,0 @@ -If an application on the windows host uses rdesktops serial forwarding -the SERIAL_GET_PROPERTIES might get called and leads to an error returned. - -This patch implements the ioctl without giving back any data, however no -error state is returned either. - -Taken from: -http://sourceforge.net/p/rdesktop/bugs/372/#20fd - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- rdesktop-1.8.3/serial.c.orig 2015-01-21 12:46:35.222209021 +0100 -+++ rdesktop-1.8.3/serial.c 2015-01-21 12:52:53.739897582 +0100 -@@ -935,6 +935,9 @@ - DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_XON\n")); - tcflow(handle, TCION); - break; -+ case SERIAL_GET_PROPERTIES: -+ DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_PROPERTIES\n")); -+ break; - default: - unimpl("SERIAL IOCTL %d\n", request); - return RD_STATUS_INVALID_PARAMETER; diff --git a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb b/recipes-graphics/rdesktop/rdesktop_1.8.3.bb deleted file mode 100644 index f1d09c3..0000000 --- a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION-${PN}-client = "A remote desktop protocol client" -HOMEPAGE = "http://www.rdesktop.org/" -SECTION = "utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -require rdesktop.inc - -PR = "${INC_PR}.3" - -inherit autotools - -EXTRA_OECONF = "--disable-credssp --with-openssl=${STAGING_EXECPREFIXDIR} " - -SRC_URI[md5sum] = "86e8b368a7c715e74ded92e0d7912dc5" -SRC_URI[sha256sum] = "88b20156b34eff5f1b453f7c724e0a3ff9370a599e69c01dc2bf0b5e650eece4" diff --git a/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch new file mode 100644 index 0000000..5590085 --- /dev/null +++ b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch @@ -0,0 +1,29 @@ +From f064b60df5ebf11a0d3e0ed632a6b989690773f6 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Mon, 21 Feb 2022 22:32:54 +0100 +Subject: [PATCH] pkgconfig: don't include ldflags + +This leaks the cross build environment. +Prevents: +| ERROR: giblib-1.2.4-r0 do_populate_sysroot: QA Issue: giblib.pc failed sanity test (tmpdir) in path ../giblib/1.2.4-r0/sysroot-destdir/usr/lib/ pkgconfig [pkgconfig] + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + giblib.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/giblib.pc.in b/giblib.pc.in +index df520ae..3049603 100644 +--- a/giblib.pc.in ++++ b/giblib.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: giblib + Description: wrapper library for imlib2, and other stuff + Version: @VERSION@ +-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@ ++Libs: -L${libdir} -lgiblib @IMLIB_LIBS@ + Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@ + +-- +2.20.1 + diff --git a/recipes-graphics/scrot/giblib_1.2.4.bb b/recipes-graphics/scrot/giblib_1.2.4.bb index 8cc6835..4dac98c 100644 --- a/recipes-graphics/scrot/giblib_1.2.4.bb +++ b/recipes-graphics/scrot/giblib_1.2.4.bb @@ -1,7 +1,7 @@ SECTION = "graphic/utils" SUMMARY = "giblib is a simple library which wraps imlib2" HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE = "BSD" +LICENSE = "MIT-feh" DEPENDS = "imlib2" @@ -9,8 +9,9 @@ MIRRORS:prepend () { } SRC_URI = " \ - http://pkgs.fedoraproject.org/repo/pkgs/giblib/giblib-${PV}.tar.gz/c810ef5389baf24882a1caca2954385e/giblib-${PV}.tar.gz \ + https://pkgs.fedoraproject.org/repo/pkgs/giblib/giblib-${PV}.tar.gz/c810ef5389baf24882a1caca2954385e/giblib-${PV}.tar.gz \ file://fix-giblib-binconfig-paths.patch \ + file://0001-pkgconfig-don-t-include-ldflags.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011" SRC_URI[md5sum] = "c810ef5389baf24882a1caca2954385e" diff --git a/recipes-graphics/scrot/imlib2_git.bb b/recipes-graphics/scrot/imlib2_git.bb deleted file mode 100644 index df3109b..0000000 --- a/recipes-graphics/scrot/imlib2_git.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" -LICENSE = "MIT & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" - -DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" -PROVIDES = "virtual/imlib2" -PV = "1.4.6+gitr${SRCPV}" -SRCREV = "560a58e61778d84953944f744a025af6ce986334" - -inherit autotools binconfig pkgconfig -SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git" -S = "${WORKDIR}/git" - -# autotools-brokensep -B = "${S}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib" -PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" -PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" -PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag" - -EXTRA_OECONF = "--with-x \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} " - -# TODO: Use more fine granular version -#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" -OE_LT_RPATH_ALLOW = "any" -OE_LT_RPATH_ALLOW[export]="1" - -PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters ${PN}-bin imlib2-themes " -FILES:${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" -FILES:${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/" -FILES:${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES:${PN}-bin = "${bindir}" -FILES:imlib2-themes = "${datadir}/imlib2/data" -FILES:imlib2-loaders = "${libdir}/imlib2/loaders/*.so" -FILES:imlib2-filters = "${libdir}/imlib2/filters/*.so" -FILES:imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" -FILES:imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" - -# png.so jpeg.so id3.so are also provided by lightmediascanner -PRIVATE_LIBS:imlib2-loaders = "pnm.so lbm.so argb.so tiff.so zlib.so bmp.so tga.so gif.so xpm.so bz2.so" - -PRIVATE_LIBS:imlib2-filters = "bumpmap.so colormod.so testfilter.so" - -do_configure:prepend() { - autopoint || touch config.rpath -} - -do_install:prepend () { - for i in `find ${B}/ -name "*.pc" -type f` ; do \ - sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i - done -} diff --git a/recipes-graphics/scrot/scrot_0.8.bb b/recipes-graphics/scrot/scrot_0.8.bb index 91b5638..e394658 100644 --- a/recipes-graphics/scrot/scrot_0.8.bb +++ b/recipes-graphics/scrot/scrot_0.8.bb @@ -2,7 +2,7 @@ SECTION = "graphic/utils" SUMMARY = "scrot (SCReen shOT), screen capture utility" DESCRIPTION = "scrot (SCReen shOT) is a simple commandline screen capture utility that uses imlib2 to grab and save images" HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE = "BSD" +LICENSE = "MIT-feh" RDEPENDS:${PN} = "imlib2-loaders" DEPENDS = "imlib2 giblib" @@ -11,7 +11,7 @@ MIRRORS:prepend () { } SRC_URI = " \ - http://pkgs.fedoraproject.org/repo/pkgs/scrot/scrot-${PV}.tar.gz/ccae904d225609571bdd3b03445c1e88/scrot-${PV}.tar.gz \ + https://pkgs.fedoraproject.org/repo/pkgs/scrot/scrot-${PV}.tar.gz/ccae904d225609571bdd3b03445c1e88/scrot-${PV}.tar.gz \ file://fix-scrot-include-paths.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011" diff --git a/recipes-graphics/unclutter/files/cross-compile.patch b/recipes-graphics/unclutter/files/cross-compile.patch deleted file mode 100644 index f1277f5..0000000 --- a/recipes-graphics/unclutter/files/cross-compile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Dont hardcode CC. Thus allow to use a cross-compiler - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- unclutter-1.09/Makefile.orig 2007-02-05 23:52:40.000000000 +0100 -+++ unclutter-1.09/Makefile 2013-05-14 19:08:13.612112758 +0200 -@@ -1,7 +1,6 @@ - # Makefile for unclutter. Throw this away and use the Imakefile if you can. - TOP = . - CURRENT_DIR = . -- CC = gcc - LKED = $(CC) - INSTALL = install - MAKE = make diff --git a/recipes-graphics/unclutter/files/fix_include_path.patch b/recipes-graphics/unclutter/files/fix_include_path.patch deleted file mode 100644 index 618cee8..0000000 --- a/recipes-graphics/unclutter/files/fix_include_path.patch +++ /dev/null @@ -1,26 +0,0 @@ -Remove include path to /usr/include. -Fixes bitbake warning: -| WARNING: unclutter-1.09-r0 do_package_qa: QA Issue: unclutter: The compile log indicates that host include and/or library paths were used. -| Please check the log '/mnt/sdc2/oe-disk/oe-core_master/build/out-glibc/work/armv7at2hf-neon-angstrom-linux-gnueabi/unclutter/1.09-r0/temp/log.do_compile' for more information. [compile-host-path] - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> -diff -Naur unclutter-1.09.orig/Makefile unclutter-1.09/Makefile ---- unclutter-1.09.orig/Makefile 2016-07-30 16:43:56.730859141 +0200 -+++ unclutter-1.09/Makefile 2016-07-30 16:49:19.603890691 +0200 -@@ -10,7 +10,7 @@ - MFLAGS = -$(MAKEFLAGS) - INSTPGMFLAGS = -c -s - INSTMANFLAGS = -c -- TOP_INCLUDES = -I$(INCROOT) -+ TOP_INCLUDES = - CDEBUGFLAGS = -O - ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS) -@@ -21,7 +21,6 @@ - IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) - BINDIR = $(DESTDIR)/usr/bin/X11 -- INCROOT = $(DESTDIR)/usr/include - MANPATH = $(DESTDIR)/usr/catman/x11_man - MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)1 diff --git a/recipes-graphics/unclutter/files/fix_missing_int_declarators.patch b/recipes-graphics/unclutter/files/fix_missing_int_declarators.patch deleted file mode 100644 index f2acc6a..0000000 --- a/recipes-graphics/unclutter/files/fix_missing_int_declarators.patch +++ /dev/null @@ -1,61 +0,0 @@ -Modern C compiler warn about the usage of declaring variables with out type -which then default to int. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- unclutter-1.09.orig/unclutter.c 2007-02-06 00:13:12.000000000 +0100 -+++ unclutter-1.09/unclutter.c 2016-07-30 16:44:37.462489217 +0200 -@@ -37,14 +37,15 @@ - #include <X11/Xutil.h> - #include <X11/Xproto.h> - #include <stdio.h> -+#include <stdlib.h> - #include "vroot.h" - - char *progname; --pexit(str)char *str;{ -+int pexit(str)char *str;{ - fprintf(stderr,"%s: %s\n",progname,str); - exit(1); - } --usage(){ -+void usage(void){ - pexit("usage:\n\ - -display <display>\n\ - -idle <seconds> time between polls to detect idleness.\n\ -@@ -87,7 +88,7 @@ - * return true if window has a wm_name and the start of it matches - * one of the given names to avoid - */ --nameinlist(display,window) -+int nameinlist(display,window) - Display *display; - Window window; - { -@@ -109,7 +110,7 @@ - * return true if window has a wm_name and one of the given names to avoid - * matches anywhere in that string - */ --matchinlist(display,window) -+int matchinlist(display,window) - Display *display; - Window window; - { -@@ -131,7 +132,7 @@ - /* - * create a small 1x1 cursor with all pixels masked out on the given screen. - */ --createnullcursor(display,root) -+Cursor createnullcursor(display,root) - Display *display; - Window root; - { -@@ -155,7 +156,8 @@ - return cursor; - } - --main(argc,argv)char **argv;{ -+int main(argc,argv) -+int argc; char **argv;{ - Display *display; - int screen,oldx = -99,oldy = -99,numscreens; - int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0, diff --git a/recipes-graphics/unclutter/unclutter_1.09.bb b/recipes-graphics/unclutter/unclutter_1.09.bb deleted file mode 100644 index 80dc8d3..0000000 --- a/recipes-graphics/unclutter/unclutter_1.09.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Hides the cursor after inactivity" -LICENSE = "PD" - -DEPENDS = "virtual/xserver" - -S = "${WORKDIR}/unclutter-${PV}" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/unclutter/unclutter-${PV}.tar.gz \ - file://cross-compile.patch \ - file://fix_include_path.patch \ - file://fix_missing_int_declarators.patch \ -" -LIC_FILES_CHKSUM = "file://README;md5=7c9b6681ac4b35194de7d5f3585702b6" -SRC_URI[md5sum] = "8c4464367b2db1d15fe36a8752e917c8" -SRC_URI[sha256sum] = "3a53575fe2a75a34bc9a2b0ad92ee0f8a7dbedc05d8783f191c500060a40a9bd" - -# link for hash-style=gnu -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install () { - install -d ${D}${bindir}/ ${D}${mandir}/man1 - install -m 0755 ${S}/unclutter ${D}${bindir}/ - install -m 0644 ${S}/unclutter.man ${D}${mandir}/man1/unclutter.1 -} diff --git a/recipes-graphics/vnc/directvnc_0.7.8.bb b/recipes-graphics/vnc/directvnc_0.7.8.bb deleted file mode 100644 index 42c56c5..0000000 --- a/recipes-graphics/vnc/directvnc_0.7.8.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Provides a very thin VNC client for unix framebuffer systems" -HOMEPAGE = "http://drinkmilk.github.com/directvnc/" -SECTION = "utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" - -DEPENDS = "zlib libpng jpeg directfb xproto" - -SRC_URI = "https://github.com/downloads/drinkmilk/directvnc/directvnc-${PV}.tar.gz" -SRC_URI[md5sum] = "063f9d98956006f230dcbc05f822525b" -SRC_URI[sha256sum] = "07d6109aef5bba2df86f0dd658be7ed9d828801be0878eba3d32f041189d3330" - -inherit autotools diff --git a/recipes-graphics/vnc/tightvnc/Makefile b/recipes-graphics/vnc/tightvnc/Makefile deleted file mode 100644 index 3f720f8..0000000 --- a/recipes-graphics/vnc/tightvnc/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -OBJS = argsresources.o \ -caps.o \ -colour.o \ -cursor.o \ -desktop.o \ -dialogs.o \ -fullscreen.o \ -listen.o \ -misc.o \ -popup.o \ -rfbproto.o \ -selection.o \ -shm.o \ -sockets.o \ -tunnel.o \ -vncviewer.o \ -../libvncauth/vncauth.o \ -../libvncauth/d3des.o - -tightvncviewer : $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -lX11 -lXaw6 -ljpeg -lz -lXt -lXmu -lXext -o tightvncviewer - -%.o: %.c Makefile - $(CC) -c $(CFLAGS) -I. -I../include -I../libvncauth/ -o $@ $< diff --git a/recipes-graphics/vnc/tightvnc/Vncviewer b/recipes-graphics/vnc/tightvnc/Vncviewer deleted file mode 100644 index ed60ecd..0000000 --- a/recipes-graphics/vnc/tightvnc/Vncviewer +++ /dev/null @@ -1,66 +0,0 @@ -Vncviewer.title: TightVNC: %s -Vncviewer.translations:\ - <Enter>: SelectionToVNC()\n\ - <Leave>: SelectionFromVNC() -*form.background: black -*viewport.allowHoriz: True -*viewport.allowVert: True -*viewport.useBottom: True -*viewport.useRight: True -*viewport*Scrollbar*thumb: None -*desktop.baseTranslations:\ - <Key>F8: ShowPopup()\n\ - <ButtonPress>: SendRFBEvent()\n\ - <ButtonRelease>: SendRFBEvent()\n\ - <Motion>: SendRFBEvent()\n\ - <KeyPress>: SendRFBEvent()\n\ - <KeyRelease>: SendRFBEvent() -*serverDialog.dialog.label: VNC server: -*serverDialog.dialog.value: -*serverDialog.dialog.value.translations: #override\n\ - <Key>Return: ServerDialogDone() -*passwordDialog.dialog.label: Password: -*passwordDialog.dialog.value: -*passwordDialog.dialog.value.AsciiSink.echo: False -*passwordDialog.dialog.value.translations: #override\n\ - <Key>Return: PasswordDialogDone() -*popup.title: TightVNC popup -*popup*background: grey -*popup*font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 -*popup.buttonForm.Command.borderWidth: 0 -*popup.buttonForm.Toggle.borderWidth: 0 -*popup.translations: #override <Message>WM_PROTOCOLS: HidePopup() -*popup.buttonForm.translations: #override\n\ - <KeyPress>: SendRFBEvent() HidePopup() -*popupButtonCount: 8 -*popup*button1.label: Dismiss popup -*popup*button1.translations: #override\n\ - <Btn1Down>,<Btn1Up>: HidePopup() -*popup*button2.label: Quit viewer -*popup*button2.translations: #override\n\ - <Btn1Down>,<Btn1Up>: Quit() -*popup*button3.label: Full screen -*popup*button3.type: toggle -*popup*button3.translations: #override\n\ - <Visible>: SetFullScreenState()\n\ - <Btn1Down>,<Btn1Up>: toggle() HidePopup() ToggleFullScreen() -*popup*button4.label: Clipboard: local -> remote -*popup*button4.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SelectionToVNC(always) HidePopup() -*popup*button5.label: Clipboard: local <- remote -*popup*button5.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SelectionFromVNC(always) HidePopup() -*popup*button6.label: Request refresh -*popup*button6.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SendRFBEvent(fbupdate) HidePopup() -*popup*button7.label: Send ctrl-alt-del -*popup*button7.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SendRFBEvent(keydown,Control_L)\ - SendRFBEvent(keydown,Alt_L)\ - SendRFBEvent(key,Delete)\ - SendRFBEvent(keyup,Alt_L)\ - SendRFBEvent(keyup,Control_L)\ - HidePopup() -*popup*button8.label: Send F8 -*popup*button8.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SendRFBEvent(key,F8) HidePopup() diff --git a/recipes-graphics/vnc/tightvnc_1.3.10.bb b/recipes-graphics/vnc/tightvnc_1.3.10.bb deleted file mode 100644 index 4a707b7..0000000 --- a/recipes-graphics/vnc/tightvnc_1.3.10.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "A lightweight VNC viewer" -HOMEPAGE = "http://www.tightvnc.com/" -SECTION = "utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://../LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" - -DEPENDS = "virtual/libx11 zlib libxmu libxaw jpeg libxt libxext libxmu" - -PR = "r2" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-${PV}_unixsrc.tar.bz2 \ - file://Makefile \ - file://Vncviewer \ -" - -S = "${WORKDIR}/vnc_unixsrc/vncviewer" - -PACKAGES = "${PN}-viewer-dbg ${PN}-viewer" -FILES:${PN}-viewer-dbg = "${bindir}/.debug" -FILES:${PN}-viewer = "${bindir}/${PN}viewer ${sysconfdir}" - -do_compile () { - install ${WORKDIR}/Makefile ${S} - oe_runmake -} - -do_install () { - install -d ${D}${bindir} - install ${PN}viewer ${D}${bindir} - install -d ${D}${sysconfdir}/X11/app-defaults - install -m 644 ${WORKDIR}/Vncviewer ${D}${sysconfdir}/X11/app-defaults/Vncviewer -} - -pkg_postinst:${PN}-viewer () { - update-alternatives --install ${bindir}/vncviewer vncviewer tightvncviewer 100 -} - - -pkg_prerm:${PN}-viewer () { - update-alternatives --remove ${bindir}/vncviewer vncviewer tightvncviewer 100 -} - -SRC_URI[md5sum] = "397b35faad32d5246b6d44b142f8304f" -SRC_URI[sha256sum] = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d" diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc index 946b4cc..588ca4b 100644 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc +++ b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc @@ -11,21 +11,20 @@ S = "${WORKDIR}" SRC_URI = " \ file://wayland-app-launch.service.in \ - file://wayland-app-launch.sh.in \ " FILESEXTRAPATHS:prepend := "${THISDIR}/wayland-app-launch:" APPLICATION_ENVIRONMENT ??= "" do_compile () { - sed -e "s:@@wayland-application@@:${WAYLAND_APPLICATION}:" -e "s:@@initial-path@@:${INITIAL_PATH}:" wayland-app-launch.sh.in > wayland-app-launch.sh - sed -e "s:@@application-environment@@:${APPLICATION_ENVIRONMENT}:" wayland-app-launch.service.in > wayland-app-launch.service + sed -e "s:@@wayland-application@@:${WAYLAND_APPLICATION}:" \ + -e "s:@@application-environment@@:${APPLICATION_ENVIRONMENT}:" \ + wayland-app-launch.service.in > wayland-app-launch.service } do_install () { - install -d ${D}/${bindir} ${D}${systemd_unitdir}/system/ + install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/wayland-app-launch.service ${D}${systemd_unitdir}/system - install -m 0755 ${S}/wayland-app-launch.sh ${D}/${bindir} } SYSTEMD_PACKAGES = "${PN}" diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in index 4be53a4..31499c1 100644 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in +++ b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in @@ -1,14 +1,17 @@ [Unit] Description=Start a wayland application -After=weston@root.service -Requires=weston@root.service +After=weston.service +Requires=weston.service [Service] -Restart=on-failure -Type=forking +Type=simple +User=root +PAMName=login +Environment=WAYLAND_DISPLAY=/run/wayland-0 Environment=@@application-environment@@ -ExecStart=/usr/bin/wayland-app-launch.sh +ExecStart=@@wayland-application@@ +Restart=on-failure RestartSec=1 [Install] -WantedBy=multi-user.target +WantedBy=graphical.target diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in deleted file mode 100644 index 87349aa..0000000 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi -fi - -# wait for weston -while [ ! -e $XDG_RUNTIME_DIR/wayland-0 ] ; do sleep 0.1; done -sleep 1 - -cd @@initial-path@@ -@@wayland-application@@ & diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb index d11611e..73c7dd1 100644 --- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb +++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb @@ -2,8 +2,7 @@ # be launched right after weston started INITIAL_APP_PKGS ?= "qtbase-examples qtwayland" -INITIAL_PATH ?= "" -APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"' +APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl' WAYLAND_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock" require wayland-app-launch.inc diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb index bd27da8..7eff903 100644 --- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb +++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb @@ -2,8 +2,7 @@ # be launched right after weston started INITIAL_APP_PKGS ?= "cinematicexperience qtwayland" -INITIAL_PATH ?= "" -APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"' +APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl' WAYLAND_APPLICATION ?= "/usr/share/cinematicexperience-1.0/Qt5_CinematicExperience --fullscreen" require wayland-app-launch.inc diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb index b85fdf0..2e1a2b0 100644 --- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb +++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb @@ -2,8 +2,7 @@ # be launched right after weston started INITIAL_APP_PKGS ?= "qtsmarthome qtwayland" -INITIAL_PATH ?= "/usr/share/qtsmarthome-1.0/" -APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"' -WAYLAND_APPLICATION ?= "${INITIAL_PATH}/smarthome" +APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl' +WAYLAND_APPLICATION ?= "/usr/share/qtsmarthome-1.0/smarthome" require wayland-app-launch.inc diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend new file mode 100644 index 0000000..223eb2c --- /dev/null +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -0,0 +1,23 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://toradex-save-touchscreen-calibration.sh" + +PACKAGECONFIG[touchscreen-calibration] = ",," +PACKAGECONFIG:append:tdx = " touchscreen-calibration" + +do_install:append:tdx() { + if [ "${@bb.utils.contains('PACKAGECONFIG', 'touchscreen-calibration', 'yes', 'no', d)}" = "yes" ]; then + sed -i -e "s/^#\\[libinput\\]/[libinput]/g" ${D}${sysconfdir}/xdg/weston/weston.ini + + sed -i -e "/calibration_helper=/d" ${D}${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[libinput\]/a calibration_helper=${bindir}/toradex-save-touchscreen-calibration" ${D}${sysconfdir}/xdg/weston/weston.ini + + sed -i -e "/touchscreen_calibrator=/d" ${D}${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[libinput\]/a touchscreen_calibrator=true" ${D}${sysconfdir}/xdg/weston/weston.ini + + sed -i -e "/enable_tap=/d" ${D}${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[libinput\]/a enable_tap=true" ${D}${sysconfdir}/xdg/weston/weston.ini + + install -Dm0755 ${WORKDIR}/toradex-save-touchscreen-calibration.sh ${D}${bindir}/toradex-save-touchscreen-calibration + fi +} diff --git a/recipes-graphics/wayland/weston-init/toradex-save-touchscreen-calibration.sh b/recipes-graphics/wayland/weston-init/toradex-save-touchscreen-calibration.sh new file mode 100755 index 0000000..e2871fc --- /dev/null +++ b/recipes-graphics/wayland/weston-init/toradex-save-touchscreen-calibration.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$#" -ne 7 ]; then + echo "This script is to be called by weston with new touch calibration data, it requires 7 parameters." + exit 1 +fi + +echo 'ACTION=="add|change", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_TOUCHSCREEN}=="1", ENV{LIBINPUT_CALIBRATION_MATRIX}=''"'"$2 $3 $4 $5 $6 $7"'"' > /etc/udev/rules.d/libinput.rules + +# Make udev process the new rule by triggering a "change" event: +udevadm trigger "$1" diff --git a/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb deleted file mode 100644 index 9543156..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# set the following variable to your one and only application which should -# be started - -INITIAL_APP_PKGS ?= "qtbase-examples" -INITIAL_PATH ?= "" -X_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock" - -FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" -require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb deleted file mode 100644 index 4921351..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# set the following variable to your one and only application which should -# be started - -INITIAL_APP_PKGS ?= "cinematicexperience" -INITIAL_PATH ?= "/usr/share/cinematicexperience-1.0" -X_APPLICATION ?= "${INITIAL_PATH}/Qt5_CinematicExperience" - -FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" -require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb deleted file mode 100644 index 098dec6..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# set the following variable to your one and only application which should -# be started - -INITIAL_APP_PKGS ?= "qtsmarthome" -INITIAL_PATH ?= "/usr/share/qtsmarthome-1.0" -X_APPLICATION ?= "${INITIAL_PATH}/smarthome" - -FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" -require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-simple-app.inc b/recipes-graphics/x-window-simple-app/x-window-simple-app.inc deleted file mode 100644 index a96a0d5..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-simple-app.inc +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "x11/libs" -SUMMARY = "x11 application autostart" -DESCRIPTION = \ -"This installs a /usr/bin/x-window-manager script. The script will start the \ -one and only application X_APPLICATION as the last step of the \ -xserver-nodm-init X initialization. \ -If the script ever returns, X will be killed." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit allarch - -RDEPENDS:${PN} += "${INITIAL_APP_PKGS} xserver-nodm-init" - -S = "${WORKDIR}" - -SRC_URI = " \ - file://x-window-manager.in \ - file://set_have_touch.sh \ -" - -do_compile () { - sed -e "s:@PATH@:${INITIAL_PATH}:" -e "s:@APP@:${X_APPLICATION}:" x-window-manager.in > x-window-manager -} - -do_install () { - install -d ${D}/${bindir} ${D}${sysconfdir}/X11/Xsession.d - install -m 0755 ${S}/x-window-manager ${D}/${bindir} - install -m 0644 ${S}/set_have_touch.sh ${D}/${sysconfdir}/X11/Xsession.d/29set_have_touch.sh -} - -# make sure xinput_calibrator is only started once -pkg_postinst:${PN}() { - rm -f /etc/xdg/autostart/xinput_calibrator.desktop -} diff --git a/recipes-graphics/x-window-simple-app/x-window-simple-app/set_have_touch.sh b/recipes-graphics/x-window-simple-app/x-window-simple-app/set_have_touch.sh deleted file mode 100644 index d4d49d5..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-simple-app/set_have_touch.sh +++ /dev/null @@ -1,2 +0,0 @@ -# force have touchscreen -HAVE_TOUCHSCREEN=1 diff --git a/recipes-graphics/x-window-simple-app/x-window-simple-app/x-window-manager.in b/recipes-graphics/x-window-simple-app/x-window-simple-app/x-window-manager.in deleted file mode 100644 index b3e0e8f..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-simple-app/x-window-manager.in +++ /dev/null @@ -1,6 +0,0 @@ -RET=1 -while [ $RET -ne 0 ]; do - cd @PATH@ - @APP@ - RET=$? -done diff --git a/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb deleted file mode 100644 index da711c7..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# set the following variable to your one and only application which should -# be started - -INITIAL_APP_PKGS ?= "xterm" -INITIAL_PATH ?= "" -X_APPLICATION ?= "/usr/bin/xterm" - -FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" -require recipes-graphics/x-window-simple-app/x-window-simple-app.inc |