diff options
Diffstat (limited to 'recipes-graphics')
30 files changed, 411 insertions, 256 deletions
diff --git a/recipes-graphics/cogl/cogl-1.0_%.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend index 85e6645..8dde652 100644 --- a/recipes-graphics/cogl/cogl-1.0_%.bbappend +++ b/recipes-graphics/cogl/cogl-1.0_%.bbappend @@ -1,3 +1,3 @@ # Workaround populate_sdk issue which depends on cogl-1.0 which can not be # found. -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" 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 cee82b7..170db77 100644 --- a/recipes-graphics/gpicview/gpicview_0.2.5.bb +++ b/recipes-graphics/gpicview/gpicview_0.2.5.bb @@ -2,15 +2,15 @@ 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" -RDEPENDS_${PN} = "adwaita-icon-theme" +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" @@ -21,4 +21,4 @@ PACKAGECONFIG[gtk3] = "--enable-gtk3,,gtk+3" inherit autotools gettext mime-xdg pkgconfig -FILES_${PN} += "${datadir}/icons/*" +FILES:${PN} += "${datadir}/icons/*" 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 2001d79..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/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index c82b27f..ef4e7c3 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu = " file://0001-xeglgears-drop-usage-of-fooEXT-functions.patch" -PACKAGE_ARCH_imxgpu = "${MACHINE_SOCARCH}" +SRC_URI:append:imxgpu = " file://0001-xeglgears-drop-usage-of-fooEXT-functions.patch" +PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}" diff --git a/recipes-graphics/packagegroups/packagegroup-core-x11.bbappend b/recipes-graphics/packagegroups/packagegroup-core-x11.bbappend index b3b082a..8647b87 100644 --- a/recipes-graphics/packagegroups/packagegroup-core-x11.bbappend +++ b/recipes-graphics/packagegroups/packagegroup-core-x11.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}-utils_remove = "${VIRTUAL-RUNTIME_graphical_init_manager}"
\ No newline at end of file +RDEPENDS:${PN}-utils:remove = "${VIRTUAL-RUNTIME_graphical_init_manager}"
\ No newline at end of file diff --git a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb b/recipes-graphics/rdesktop/rdesktop_1.8.3.bb index f1d09c3..78faa6c 100644 --- a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb +++ b/recipes-graphics/rdesktop/rdesktop_1.8.3.bb @@ -1,7 +1,7 @@ DESCRIPTION-${PN}-client = "A remote desktop protocol client" HOMEPAGE = "http://www.rdesktop.org/" SECTION = "utils" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" require rdesktop.inc 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 587c7fb..4dac98c 100644 --- a/recipes-graphics/scrot/giblib_1.2.4.bb +++ b/recipes-graphics/scrot/giblib_1.2.4.bb @@ -1,16 +1,17 @@ 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" -MIRRORS_prepend () { +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" @@ -18,14 +19,14 @@ SRC_URI[sha256sum] = "176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922eb PR = "r0" -do_compile_prepend () { +do_compile:prepend () { #remove linkerpath to host libraries sed -i -e 's:-L/usr/lib\s::' Makefile sed -i -e 's:-L/usr/lib\s::' giblib/Makefile export DESTDIR=${D} } -do_compile_append () { +do_compile:append () { for i in $(find ${B} -name "*?.pc") ; do sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ @@ -33,7 +34,7 @@ do_compile_append () { done } -FILES_${PN}-doc = "/usr/doc" +FILES:${PN}-doc = "/usr/doc" inherit autotools-brokensep binconfig pkgconfig diff --git a/recipes-graphics/scrot/imlib2_git.bb b/recipes-graphics/scrot/imlib2_git.bb index ee7f2e2..8abd7d7 100644 --- a/recipes-graphics/scrot/imlib2_git.bb +++ b/recipes-graphics/scrot/imlib2_git.bb @@ -1,5 +1,5 @@ SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" -LICENSE = "MIT & BSD" +LICENSE = "Imlib2" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" @@ -8,7 +8,7 @@ PV = "1.4.6+gitr${SRCPV}" SRCREV = "560a58e61778d84953944f744a025af6ce986334" inherit autotools binconfig pkgconfig -SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git" +SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;branch=master" S = "${WORKDIR}/git" # autotools-brokensep @@ -30,26 +30,26 @@ 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" +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-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" +PRIVATE_LIBS:imlib2-filters = "bumpmap.so colormod.so testfilter.so" -do_configure_prepend() { +do_configure:prepend() { autopoint || touch config.rpath } -do_install_prepend () { +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 6a0b6dc..e394658 100644 --- a/recipes-graphics/scrot/scrot_0.8.bb +++ b/recipes-graphics/scrot/scrot_0.8.bb @@ -2,16 +2,16 @@ 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" +RDEPENDS:${PN} = "imlib2-loaders" DEPENDS = "imlib2 giblib" -MIRRORS_prepend () { +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" @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "613d1cf524c2b62ce3c65f1232ea4f05c7daf248d5e82ff2a6892c9809 PR = "r0" -FILES_${PN}-doc += "/usr/doc" +FILES:${PN}-doc += "/usr/doc" inherit autotools diff --git a/recipes-graphics/vnc/directvnc_0.7.8.bb b/recipes-graphics/vnc/directvnc_0.7.8.bb index 42c56c5..6f82628 100644 --- a/recipes-graphics/vnc/directvnc_0.7.8.bb +++ b/recipes-graphics/vnc/directvnc_0.7.8.bb @@ -1,7 +1,7 @@ SUMMARY = "Provides a very thin VNC client for unix framebuffer systems" HOMEPAGE = "http://drinkmilk.github.com/directvnc/" SECTION = "utils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" DEPENDS = "zlib libpng jpeg directfb xproto" diff --git a/recipes-graphics/vnc/tightvnc_1.3.10.bb b/recipes-graphics/vnc/tightvnc_1.3.10.bb index 5bec3ce..29435d0 100644 --- a/recipes-graphics/vnc/tightvnc_1.3.10.bb +++ b/recipes-graphics/vnc/tightvnc_1.3.10.bb @@ -1,7 +1,7 @@ SUMMARY = "A lightweight VNC viewer" HOMEPAGE = "http://www.tightvnc.com/" SECTION = "utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://../LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" DEPENDS = "virtual/libx11 zlib libxmu libxaw jpeg libxt libxext libxmu" @@ -17,8 +17,8 @@ SRC_URI = " \ S = "${WORKDIR}/vnc_unixsrc/vncviewer" PACKAGES = "${PN}-viewer-dbg ${PN}-viewer" -FILES_${PN}-viewer-dbg = "${bindir}/.debug" -FILES_${PN}-viewer = "${bindir}/${PN}viewer ${sysconfdir}" +FILES:${PN}-viewer-dbg = "${bindir}/.debug" +FILES:${PN}-viewer = "${bindir}/${PN}viewer ${sysconfdir}" do_compile () { install ${WORKDIR}/Makefile ${S} @@ -32,12 +32,12 @@ do_install () { install -m 644 ${WORKDIR}/Vncviewer ${D}${sysconfdir}/X11/app-defaults/Vncviewer } -pkg_postinst_${PN}-viewer () { +pkg_postinst:${PN}-viewer () { update-alternatives --install ${bindir}/vncviewer vncviewer tightvncviewer 100 } -pkg_prerm_${PN}-viewer () { +pkg_prerm:${PN}-viewer () { update-alternatives --remove ${bindir}/vncviewer vncviewer tightvncviewer 100 } diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc index 18b6b29..588ca4b 100644 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc +++ b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc @@ -5,28 +5,27 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch systemd -RDEPENDS_${PN} += "weston-init ${INITIAL_APP_PKGS}" +RDEPENDS:${PN} += "weston-init ${INITIAL_APP_PKGS}" S = "${WORKDIR}" SRC_URI = " \ file://wayland-app-launch.service.in \ - file://wayland-app-launch.sh.in \ " -FILESEXTRAPATHS_prepend := "${THISDIR}/wayland-app-launch:" +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}" -SYSTEMD_SERVICE_${PN} = "wayland-app-launch.service" +SYSTEMD_SERVICE:${PN} = "wayland-app-launch.service" 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 index c9bfd7a..9543156 100644 --- 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 @@ -5,5 +5,5 @@ INITIAL_APP_PKGS ?= "qtbase-examples" INITIAL_PATH ?= "" X_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock" -FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:" +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 index f9a3f4d..4921351 100644 --- 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 @@ -5,5 +5,5 @@ INITIAL_APP_PKGS ?= "cinematicexperience" INITIAL_PATH ?= "/usr/share/cinematicexperience-1.0" X_APPLICATION ?= "${INITIAL_PATH}/Qt5_CinematicExperience" -FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:" +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 index 968c98e..098dec6 100644 --- 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 @@ -5,5 +5,5 @@ INITIAL_APP_PKGS ?= "qtsmarthome" INITIAL_PATH ?= "/usr/share/qtsmarthome-1.0" X_APPLICATION ?= "${INITIAL_PATH}/smarthome" -FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:" +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 index c9578ad..a96a0d5 100644 --- a/recipes-graphics/x-window-simple-app/x-window-simple-app.inc +++ b/recipes-graphics/x-window-simple-app/x-window-simple-app.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch -RDEPENDS_${PN} += "${INITIAL_APP_PKGS} xserver-nodm-init" +RDEPENDS:${PN} += "${INITIAL_APP_PKGS} xserver-nodm-init" S = "${WORKDIR}" @@ -31,6 +31,6 @@ do_install () { } # make sure xinput_calibrator is only started once -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { rm -f /etc/xdg/autostart/xinput_calibrator.desktop } 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 index 302a0c7..da711c7 100644 --- 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 @@ -5,5 +5,5 @@ INITIAL_APP_PKGS ?= "xterm" INITIAL_PATH ?= "" X_APPLICATION ?= "/usr/bin/xterm" -FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:" +FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend index 2b42880..72933f1 100644 --- a/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +++ b/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/xinput-calibrator:" +FILESEXTRAPATHS:prepend := "${THISDIR}/xinput-calibrator:" # menu entry should make the calibration permanent instead of printing cal data into a terminal -do_install_append() { +do_install:append() { install -m 0755 ${D}/${datadir}/applications/xinput_calibrator.desktop ${D}/${datadir}/applications/xinput_calibrator.desktop.old sed -i -e 's/xinput_calibrator; cat/rm -f \/etc\/pointercal.xinput; xinput_calibrator_once.sh/' ${D}/${datadir}/applications/xinput_calibrator.desktop sed -i -e 's/Terminal\=true/Terminal=false/' ${D}/${datadir}/applications/xinput_calibrator.desktop diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index 01a7948..8bfdd5c 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,3 +1,3 @@ # xinput-calibrator-once expects an evdev interface, so don't install # xf86-input-libinput which takes precedence over xf86-input-evdev -XSERVER_RRECOMMENDS_remove = "xf86-input-libinput" +XSERVER_RRECOMMENDS:remove = "xf86-input-libinput" |