diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-graphics')
67 files changed, 2438 insertions, 698 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc index bfbd9c29e..bd66a2820 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc @@ -41,16 +41,16 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,," PACKAGECONFIG[noinput] = "--with-inputdrivers=none,," +PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa," +PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,xserver-xorg," EXTRA_OECONF = "\ --with-gfxdrivers=none \ --enable-freetype=yes \ --enable-zlib \ --disable-imlib2 \ - --disable-mesa \ --disable-sdl \ --disable-vnc \ - --disable-x11 \ --disable-x11vdpau \ --disable-xine-vdpau \ " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch new file mode 100644 index 000000000..46d4dbde4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -0,0 +1,26 @@ +From 80179c297abb9de2829bd02356257241dd414d70 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Mon, 18 Dec 2017 16:25:54 +0900 +Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python. + +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c66b39..1489ef6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ else(NOT SPHINX_EXECUTABLE-NOTFOUND) + message(STATUS "Could NOT find sphinx-build.") + endif(NOT SPHINX_EXECUTABLE-NOTFOUND) + +-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++#execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) + string(REGEX REPLACE "\n$" "" ${PYTHON_INSTALL_DIR} "${PYTHON_INSTALL_DIR}") + execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION) + message(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch new file mode 100644 index 000000000..75b6b8fd9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch @@ -0,0 +1,25 @@ +From 15d0afcfa4868b7b072b3434bac0064617d61f99 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Tue, 19 Dec 2017 14:53:14 +0900 +Subject: [PATCH] Run python scripts using env + +Otherwise the build tools hardcode the python path into them. + +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +--- + bin/dnfdragora | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/dnfdragora b/bin/dnfdragora +index b8e0550..cd80f7f 100755 +--- a/bin/dnfdragora ++++ b/bin/dnfdragora +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # vim: set et ts=4 sw=4: + # Copyright 2016-2017 Angelo Naselli <anaselli@linux.it> + # +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch new file mode 100644 index 000000000..90ce1d0ac --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch @@ -0,0 +1,31 @@ +From 56d9b838b3475729d7ed9c6c156d72c28943c2b6 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Tue, 19 Dec 2017 11:15:29 +0900 +Subject: [PATCH] To fix error when do_package + +QA Issue: nativesdk-dnfdragora: Files/directories were installed but not shipped in any package: + /etc + /etc/dnfdragora + /etc/dnfdragora/dnfdragora.yaml + +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c66b39..a5659f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ endif(ENABLE_COMPS) + set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin") + set(CMAKE_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share") + set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale") +-set(CMAKE_INSTALL_FULL_SYSCONFDIR "/etc") ++set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/../etc") + + # Configure files + configure_file(${CMAKE_SOURCE_DIR}/etc/dnfdragora.yaml.in ${CMAKE_BINARY_DIR}/etc/dnfdragora.yaml @ONLY) +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch new file mode 100644 index 000000000..88bb63416 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch @@ -0,0 +1,25 @@ +From 2e6a0db24be373a5b7741dc5a0d322a28389fbf0 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Thu, 23 Nov 2017 16:35:44 +0900 +Subject: [PATCH] disable build manpages. + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c66b39..fc32750 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,6 @@ endif(GETTEXT_FOUND) + + # Build and install the man-pages + if(NOT SPHINX_EXECUTABLE-NOTFOUND) +- add_subdirectory(man) + endif(NOT SPHINX_EXECUTABLE-NOTFOUND) + + # Installing application code +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb new file mode 100644 index 000000000..9cd1efb8e --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb @@ -0,0 +1,30 @@ +SUMMARY = "dnfdragora is a DNF frontend, based on rpmdragora from Mageia (originally rpmdrake) Perl code." +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ + " + +SRC_URI = "git://github.com/manatools/dnfdragora.git \ + file://0001-disable-build-manpages.patch \ + file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ + file://0001-To-fix-error-when-do_package.patch \ + file://0001-Run-python-scripts-using-env.patch \ + " + +PV = "1.0.1+git${SRCPV}" +SRCREV = "4fef4ce889b8e4fa03191d414f63bfd50796152a" + +S = "${WORKDIR}/git" + +inherit cmake gettext pkgconfig python3-dir python3native distutils3-base + +DEPENDS += "dnf python3 " +#DEPENDS_class-nativesdk += "nativesdk-python3" + +RDEPENDS_${PN}_class-target = " python3-core libyui libyui-ncurses " + +# manpages generation requires http://www.sphinx-doc.org/ +EXTRA_OECMAKE = " -DWITH_MAN=OFF -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" + +BBCLASSEXTEND = "nativesdk" + +FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb index d9f086749..481fedf98 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=3f922b42ed0033fa0fd4cd3268f6429c \ " -DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gnulib" +DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gnulib gettext-native" DEPENDS_append_class-target = " libxi" inherit autotools pkgconfig pythonnative distro_features_check gettext diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch new file mode 100644 index 000000000..5a7647455 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch @@ -0,0 +1,69 @@ +From 60c17eb49121bf2aa485acd30750b2fc6c8eb61f Mon Sep 17 00:00:00 2001 +From: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> +Date: Mon, 19 Jun 2017 16:41:36 +0300 +Subject: [PATCH] Fix compilation for Helix. + +Gnome support, including GNOME_INIT_HOOK, has been removed, but it was +still being called. + +COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system +most definitely is not. It is accomplished by trying to execute +a program, which does not work when cross compiling. + +The fvwm(1) man page is created from Docbook XML which is set for +a Windows code page that is not available when compiling. Easiest is +to just not create the man page as those are not needed on the monitor. + +Upstream-Status: inappropriate [OE specific] +Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> +Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> +Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> +--- + configure.ac | 20 ++++---------------- + doc/fvwm/Makefile.am | 2 +- + 3 files changed, 7 insertions(+), 17 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 48ce264..fab7b44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1413,23 +1413,7 @@ else + problem_gdkimlib=": Failed on gdk-imlib, see config.log" + fi + +-GNOME_INIT_HOOK +- +-# Unfortunately we have 2 gnome supports: WM hints and gnome libs. +-# The $with_gnomehints below refers to the first, not GNOME_INIT_HOOK. +-if test ! x"$enable_gnome_hints" = xno; then +- with_gnomehints=yes +- problem_gnomehints="" +-else +- with_gnomehints=no +- problem_gnomehints=": Explicitly disabled" +-fi +- + # Define some compatibility macros needed for config.h. +-mg_DEFINE_IF_NOT([#include <X11/keysym.h>], +- [defined XK_Page_Up && defined XK_Page_Down], +- [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS], +- [Old AIX systems (3.2.5) don't define some common keysyms.]) + AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], + [#ifdef COMPAT_OLD_KEYSYMDEF + # define XK_Page_Up XK_Prior +diff --git a/doc/fvwm/Makefile.am b/doc/fvwm/Makefile.am +index cddb102..ff00149 100755 +--- a/doc/fvwm/Makefile.am ++++ b/doc/fvwm/Makefile.am +@@ -10,7 +10,7 @@ XSL_PROFILE = $(srcdir)/../docbook-xsl/profiling/profile.xsl + HTML_FILES = fvwm.man.html + XML_FILES = @DOC_SECTIONS_XML_PATH@ + EXTRA_DIST = @DOC_SECTIONS_XML@ $(man_MANS) sections +-man_MANS = fvwm.1 ++man_MANS = + + if FVWM_BUILD_HTMLDOC + doc_DATA = $(HTML_FILES) +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch new file mode 100644 index 000000000..756cc86e8 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch @@ -0,0 +1,27 @@ +From: Sebastian Reichel <sebastian.reichel@collabora.co.uk> +Date: Tue, 29 Auf 2017 16:08:42 +0200 +Subject: [PATCH] Avoid absolute symlinks + +Avoid usage of absolute symlinks, which breaks yocto builds +since pyro. + +Upstream-Status: Pending +Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> + +diff --git a/default-config/Makefile.am b/default-config/Makefile.am +index 5e16d095a137..5404145a742c 100644 +--- a/default-config/Makefile.am ++++ b/default-config/Makefile.am +@@ -17,9 +17,9 @@ EXTRA_DIST = images \ + + install-data-hook: + cp -r $(srcdir)/images $(inst_location) +- ln -sf $(inst_location)/FvwmScript-DateTime $(inst_location)/.. +- ln -sf $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/.. +- ln -sf $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/.. ++ ln -sf default-config/FvwmScript-DateTime $(inst_location)/.. ++ ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)/.. ++ ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/.. + + uninstall-hook: + rm -fr $(DESTDIR)/$(configdir) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb new file mode 100644 index 000000000..cb851bfd9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb @@ -0,0 +1,114 @@ +SUMMARY = "F Virtual Window Manager " +HOMEPAGE = "http://www.fvwm.org/" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=363fbcfb59124689af72c914560eaf6e" + +DEPENDS = " \ + bison-native \ + flex-native \ + freetype-native \ + gettext-native \ + libxslt-native \ + fontconfig \ + libice \ + libpng \ + librsvg \ + libsm \ + libxau \ + libxcb \ + libxcursor \ + libxdmcp \ + libxext \ + libxfixes \ + libxft \ + libxinerama \ + libxml2 \ + libxrender \ + libxt \ + virtual/libx11 \ + xrandr \ + zlib \ +" + +PV = "2.6.7+git${SRCPV}" + +SRC_URI = " \ + git://github.com/fvwmorg/fvwm.git;protocol=https \ + file://0001-Fix-compilation-for-disabled-gnome.patch \ + file://0002-Avoid-absolute-symlinks.patch \ +" + +SRCREV = "597a4e296da4f21e71a17facab297e016a3a80a8" + +S = "${WORKDIR}/git" + +inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/fvwm" +ALTERNATIVE_PRIORITY[x-window-manager] = "20" + +EXTRA_OECONF = " \ + --disable-bidi \ + --disable-fontconfigtest \ + --disable-freetypetest \ + --disable-htmldoc \ + --disable-imlibtest \ + --disable-mandoc \ + --disable-nls \ + --disable-perllib \ + --disable-rsvg \ + --disable-shape \ + --disable-sm \ + --disable-xfttest \ + --with-imlib-exec-prefix=/nonexistent \ + --with-imlib-prefix=/nonexistent \ + --without-ncurses-library \ + --without-readline-library \ + --without-rplay-library \ + --without-stroke-library \ + --without-termcap-library \ + --without-xpm-library \ + ac_cv_func_mkstemp=no \ + has_safety_mkstemp=yes \ +" + +# show the exact commands in the log file +EXTRA_OEMAKE = " \ + V=1 \ +" + +do_install_append() { + install -d -m 0755 ${D}/${sysconfdir}/xdg/fvwm + # You can install the config file here + + install -d -m 0755 ${D}/${datadir}/fvwm + touch ${D}/${datadir}/fvwm/ConfigFvwmDefaults +} + +# the only needed packages (note: locale packages are automatically generated +# as well) +PACKAGES = " \ + ${PN} \ + ${PN}-dbg \ +" + +# minimal set of binaries +FILES_${PN} = " \ + ${bindir}/fvwm \ + ${bindir}/fvwm-root \ + ${datadir}/fvwm/ConfigFvwmDefaults \ +" + +RDEPENDS_${PN} = " \ + xuser-account \ +" + +# by default a lot of stuff is installed and it's not easy to control what to +# install, so install everything, but skip the check +INSANE_SKIP_${PN} = " \ + installed-vs-shipped \ +" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb index 6cc20f5c6..0053c0c68 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb @@ -5,7 +5,9 @@ DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual EXTRA_OECONF = "--disable-docs" -inherit gnomebase vala gobject-introspection +inherit distro_features_check gnomebase vala gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "" PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb index cd7e27a19..943986e77 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb @@ -24,7 +24,9 @@ DEPENDS = " \ " DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" -inherit gnome gtk-doc +inherit distro_features_check gnome gtk-doc + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ file://0001-configure-ac-do-not-check-for-freetype-config.patch \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch new file mode 100644 index 000000000..d69c5af3a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch @@ -0,0 +1,860 @@ +From 99a9676a0193f6291d7202d7af72e24580abe565 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 16 Mar 2018 13:55:29 +0100 +Subject: [PATCH 1/2] Make GLM_ENABLE_EXPERIMENTAL a configurable option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It seems that erroring out if GLM_ENABLE_EXPERIMENTAL is not set turns into +packagers nightmare: There are packages around expecting glx headers. E.g +libgltf [1] fails during configure checking for usable headers AND during +compile. Paticularly fixing configure for those packages is time-consuming: +The only way (correct me if I am wrong) is creating a patch adding + +AC_DEFINE([GLM_ENABLE_EXPERIMENTAL], [1], [glm needs this for gtx headers]) + +By adding a configure option 'GLM_ENABLE_EXPERIMENTAL', the decision to use +glm/glx is done at one (and the right) place. + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +[1] https://gerrit.libreoffice.org/gitweb?p=libgltf.git + +Uptream-Status: Submitted [2] + +[2] https://github.com/g-truc/glm/pull/741 +--- + CMakeLists.txt | 6 ++++++ + glm/CMakeLists.txt | 2 ++ + glm/experimental.hpp.in | 1 + + glm/ext.hpp | 1 + + glm/gtx/associated_min_max.hpp | 1 + + glm/gtx/bit.hpp | 1 + + glm/gtx/closest_point.hpp | 1 + + glm/gtx/color_space.hpp | 1 + + glm/gtx/color_space_YCoCg.hpp | 1 + + glm/gtx/common.hpp | 1 + + glm/gtx/compatibility.hpp | 1 + + glm/gtx/component_wise.hpp | 1 + + glm/gtx/dual_quaternion.hpp | 1 + + glm/gtx/euler_angles.hpp | 1 + + glm/gtx/extend.hpp | 1 + + glm/gtx/extended_min_max.hpp | 1 + + glm/gtx/fast_exponential.hpp | 1 + + glm/gtx/fast_square_root.hpp | 1 + + glm/gtx/fast_trigonometry.hpp | 1 + + glm/gtx/gradient_paint.hpp | 1 + + glm/gtx/handed_coordinate_space.hpp | 1 + + glm/gtx/hash.hpp | 1 + + glm/gtx/integer.hpp | 1 + + glm/gtx/intersect.hpp | 1 + + glm/gtx/io.hpp | 1 + + glm/gtx/log_base.hpp | 1 + + glm/gtx/matrix_cross_product.hpp | 1 + + glm/gtx/matrix_decompose.hpp | 1 + + glm/gtx/matrix_factorisation.hpp | 1 + + glm/gtx/matrix_interpolation.hpp | 1 + + glm/gtx/matrix_major_storage.hpp | 1 + + glm/gtx/matrix_operation.hpp | 1 + + glm/gtx/matrix_query.hpp | 1 + + glm/gtx/matrix_transform_2d.hpp | 1 + + glm/gtx/mixed_product.hpp | 1 + + glm/gtx/norm.hpp | 1 + + glm/gtx/normal.hpp | 1 + + glm/gtx/normalize_dot.hpp | 1 + + glm/gtx/number_precision.hpp | 1 + + glm/gtx/optimum_pow.hpp | 1 + + glm/gtx/orthonormalize.hpp | 1 + + glm/gtx/perpendicular.hpp | 1 + + glm/gtx/polar_coordinates.hpp | 1 + + glm/gtx/projection.hpp | 1 + + glm/gtx/quaternion.hpp | 1 + + glm/gtx/range.hpp | 1 + + glm/gtx/raw_data.hpp | 1 + + glm/gtx/rotate_normalized_axis.hpp | 1 + + glm/gtx/rotate_vector.hpp | 1 + + glm/gtx/scalar_multiplication.hpp | 1 + + glm/gtx/scalar_relational.hpp | 1 + + glm/gtx/spline.hpp | 1 + + glm/gtx/std_based_type.hpp | 1 + + glm/gtx/string_cast.hpp | 1 + + glm/gtx/texture.hpp | 1 + + glm/gtx/transform.hpp | 1 + + glm/gtx/transform2.hpp | 1 + + glm/gtx/type_aligned.hpp | 1 + + glm/gtx/type_trait.hpp | 1 + + glm/gtx/vec_swizzle.hpp | 1 + + glm/gtx/vector_angle.hpp | 1 + + glm/gtx/vector_query.hpp | 1 + + glm/gtx/wrap.hpp | 1 + + 63 files changed, 69 insertions(+) + create mode 100644 glm/experimental.hpp.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e5159b0f..bd4dd654 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,6 +82,11 @@ option(GLM_TEST_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF) + option(GLM_TEST_ENABLE_SIMD_AVX2 "Enable AVX2 optimizations" OFF) + option(GLM_TEST_FORCE_PURE "Force 'pure' instructions" OFF) + ++option(GLM_ENABLE_EXPERIMENTAL "Enable experimental GLM_GTX" OFF) ++configure_file(glm/experimental.hpp.in experimental.hpp @ONLY) ++include_directories(${CMAKE_BINARY_DIR}/glm) ++include_directories(${CMAKE_BINARY_DIR}) ++ + if(GLM_TEST_FORCE_PURE) + add_definitions(-DGLM_FORCE_PURE) + +@@ -167,6 +172,7 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) + set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") + if (GLM_INSTALL_ENABLE) + install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) + endif() + + write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion) +diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt +index df9c9ee5..dc5db4bc 100644 +--- a/glm/CMakeLists.txt ++++ b/glm/CMakeLists.txt +@@ -43,6 +43,8 @@ source_group("SIMD Files" FILES ${SIMD_INLINE}) + source_group("SIMD Files" FILES ${SIMD_HEADER}) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) ++# make out-of tree builds find experimental.hpp ++include_directories(${CMAKE_BINARY_DIR}/glm) + + if(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE) + if(GLM_STATIC_LIBRARY_ENABLE) +diff --git a/glm/experimental.hpp.in b/glm/experimental.hpp.in +new file mode 100644 +index 00000000..bfab5138 +--- /dev/null ++++ b/glm/experimental.hpp.in +@@ -0,0 +1 @@ ++#cmakedefine GLM_ENABLE_EXPERIMENTAL +diff --git a/glm/ext.hpp b/glm/ext.hpp +index d085bfd5..a2948447 100644 +--- a/glm/ext.hpp ++++ b/glm/ext.hpp +@@ -39,6 +39,7 @@ + # include "./gtc/type_aligned.hpp" + #endif + ++#include "experimental.hpp" + #ifdef GLM_ENABLE_EXPERIMENTAL + #include "./gtx/associated_min_max.hpp" + #include "./gtx/bit.hpp" +diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp +index 0c9935f3..d00c2bc4 100644 +--- a/glm/gtx/associated_min_max.hpp ++++ b/glm/gtx/associated_min_max.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp +index 1447fa00..31957083 100644 +--- a/glm/gtx/bit.hpp ++++ b/glm/gtx/bit.hpp +@@ -15,6 +15,7 @@ + // Dependencies + #include "../gtc/bitfield.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp +index 6859bb96..ebd9fe5a 100644 +--- a/glm/gtx/closest_point.hpp ++++ b/glm/gtx/closest_point.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp +index d1e655c3..51416819 100644 +--- a/glm/gtx/color_space.hpp ++++ b/glm/gtx/color_space.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp +index e82cbd8b..7ae71041 100644 +--- a/glm/gtx/color_space_YCoCg.hpp ++++ b/glm/gtx/color_space_YCoCg.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp +index 8081bff7..57a68a8d 100644 +--- a/glm/gtx/common.hpp ++++ b/glm/gtx/common.hpp +@@ -18,6 +18,7 @@ + #include "../vec4.hpp" + #include "../gtc/vec1.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp +index e5b60399..9876669c 100644 +--- a/glm/gtx/compatibility.hpp ++++ b/glm/gtx/compatibility.hpp +@@ -16,6 +16,7 @@ + #include "../glm.hpp" + #include "../gtc/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp +index 39bab5d5..4fe0e4e2 100644 +--- a/glm/gtx/component_wise.hpp ++++ b/glm/gtx/component_wise.hpp +@@ -18,6 +18,7 @@ + #include "../detail/setup.hpp" + #include "../detail/qualifier.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp +index c4343e9d..d59fb459 100644 +--- a/glm/gtx/dual_quaternion.hpp ++++ b/glm/gtx/dual_quaternion.hpp +@@ -20,6 +20,7 @@ + #include "../gtc/constants.hpp" + #include "../gtc/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp +index e66e9281..ad5988c1 100644 +--- a/glm/gtx/euler_angles.hpp ++++ b/glm/gtx/euler_angles.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp +index eda4e470..cde6db63 100644 +--- a/glm/gtx/extend.hpp ++++ b/glm/gtx/extend.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp +index 3e767b0c..0bcffcc6 100644 +--- a/glm/gtx/extended_min_max.hpp ++++ b/glm/gtx/extended_min_max.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp +index 2d4918e7..e6d11f0a 100644 +--- a/glm/gtx/fast_exponential.hpp ++++ b/glm/gtx/fast_exponential.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp +index 1e1ec3cf..f758aeef 100644 +--- a/glm/gtx/fast_square_root.hpp ++++ b/glm/gtx/fast_square_root.hpp +@@ -19,6 +19,7 @@ + #include "../exponential.hpp" + #include "../geometric.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp +index 739065fb..f1332958 100644 +--- a/glm/gtx/fast_trigonometry.hpp ++++ b/glm/gtx/fast_trigonometry.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../gtc/constants.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp +index 2713cec0..d4703991 100644 +--- a/glm/gtx/gradient_paint.hpp ++++ b/glm/gtx/gradient_paint.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include "../gtx/optimum_pow.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp +index 1d0d4104..3a52ddcf 100644 +--- a/glm/gtx/handed_coordinate_space.hpp ++++ b/glm/gtx/handed_coordinate_space.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp +index fe8a3efd..92bfc9b2 100644 +--- a/glm/gtx/hash.hpp ++++ b/glm/gtx/hash.hpp +@@ -12,6 +12,7 @@ + + #pragma once + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp +index 96637a13..5d1a16c6 100644 +--- a/glm/gtx/integer.hpp ++++ b/glm/gtx/integer.hpp +@@ -16,6 +16,7 @@ + #include "../glm.hpp" + #include "../gtc/integer.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp +index 61e2226a..4895ba93 100644 +--- a/glm/gtx/intersect.hpp ++++ b/glm/gtx/intersect.hpp +@@ -21,6 +21,7 @@ + #include "../gtx/closest_point.hpp" + #include "../gtx/vector_query.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp +index 49a1ec11..ae39cd60 100644 +--- a/glm/gtx/io.hpp ++++ b/glm/gtx/io.hpp +@@ -23,6 +23,7 @@ + #include "../glm.hpp" + #include "../gtx/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp +index e873e356..45b8d53c 100644 +--- a/glm/gtx/log_base.hpp ++++ b/glm/gtx/log_base.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp +index 967743b8..52d6c173 100644 +--- a/glm/gtx/matrix_cross_product.hpp ++++ b/glm/gtx/matrix_cross_product.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp +index b7ec0e83..6793fee2 100644 +--- a/glm/gtx/matrix_decompose.hpp ++++ b/glm/gtx/matrix_decompose.hpp +@@ -20,6 +20,7 @@ + #include "../gtc/quaternion.hpp" + #include "../gtc/matrix_transform.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_factorisation.hpp b/glm/gtx/matrix_factorisation.hpp +index e30a7746..79c293be 100644 +--- a/glm/gtx/matrix_factorisation.hpp ++++ b/glm/gtx/matrix_factorisation.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp +index 89c4596c..799983bb 100644 +--- a/glm/gtx/matrix_interpolation.hpp ++++ b/glm/gtx/matrix_interpolation.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp +index 7f264a59..e68467cd 100644 +--- a/glm/gtx/matrix_major_storage.hpp ++++ b/glm/gtx/matrix_major_storage.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp +index bce938bb..1e85bb5e 100644 +--- a/glm/gtx/matrix_operation.hpp ++++ b/glm/gtx/matrix_operation.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp +index 5df5f52f..eec1eec0 100644 +--- a/glm/gtx/matrix_query.hpp ++++ b/glm/gtx/matrix_query.hpp +@@ -18,6 +18,7 @@ + #include "../gtx/vector_query.hpp" + #include <limits> + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp +index 239ab9f4..3ca8d2f2 100644 +--- a/glm/gtx/matrix_transform_2d.hpp ++++ b/glm/gtx/matrix_transform_2d.hpp +@@ -17,6 +17,7 @@ + #include "../mat3x3.hpp" + #include "../vec2.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp +index 58562aab..5c7460d5 100644 +--- a/glm/gtx/mixed_product.hpp ++++ b/glm/gtx/mixed_product.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp +index 46474e07..3cf2c3ea 100644 +--- a/glm/gtx/norm.hpp ++++ b/glm/gtx/norm.hpp +@@ -17,6 +17,7 @@ + #include "../geometric.hpp" + #include "../gtx/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp +index 15cec9c2..7bb4c096 100644 +--- a/glm/gtx/normal.hpp ++++ b/glm/gtx/normal.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp +index 86048e70..c6604da4 100644 +--- a/glm/gtx/normalize_dot.hpp ++++ b/glm/gtx/normalize_dot.hpp +@@ -16,6 +16,7 @@ + // Dependency: + #include "../gtx/fast_square_root.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp +index 3732a56c..b48845f7 100644 +--- a/glm/gtx/number_precision.hpp ++++ b/glm/gtx/number_precision.hpp +@@ -18,6 +18,7 @@ + #include "../glm.hpp" + #include "../gtc/type_precision.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp +index eb09f1c3..94a6bbb2 100644 +--- a/glm/gtx/optimum_pow.hpp ++++ b/glm/gtx/optimum_pow.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp +index 2a684ee4..4ff47e53 100644 +--- a/glm/gtx/orthonormalize.hpp ++++ b/glm/gtx/orthonormalize.hpp +@@ -18,6 +18,7 @@ + #include "../mat3x3.hpp" + #include "../geometric.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp +index 35601ac7..17251ebe 100644 +--- a/glm/gtx/perpendicular.hpp ++++ b/glm/gtx/perpendicular.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include "../gtx/projection.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp +index b8421db4..5125215d 100644 +--- a/glm/gtx/polar_coordinates.hpp ++++ b/glm/gtx/polar_coordinates.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp +index 9a24abf9..4d5bf76f 100644 +--- a/glm/gtx/projection.hpp ++++ b/glm/gtx/projection.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../geometric.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp +index c3d99a5c..808ba0fd 100644 +--- a/glm/gtx/quaternion.hpp ++++ b/glm/gtx/quaternion.hpp +@@ -19,6 +19,7 @@ + #include "../gtc/quaternion.hpp" + #include "../gtx/norm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp +index e0ef46af..03c797c3 100644 +--- a/glm/gtx/range.hpp ++++ b/glm/gtx/range.hpp +@@ -15,6 +15,7 @@ + // Dependencies + #include "../detail/setup.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp +index fb34c8cb..0084fec6 100644 +--- a/glm/gtx/raw_data.hpp ++++ b/glm/gtx/raw_data.hpp +@@ -16,6 +16,7 @@ + #include "../detail/setup.hpp" + #include "../detail/type_int.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp +index eee90d6e..82612928 100644 +--- a/glm/gtx/rotate_normalized_axis.hpp ++++ b/glm/gtx/rotate_normalized_axis.hpp +@@ -19,6 +19,7 @@ + #include "../gtc/epsilon.hpp" + #include "../gtc/quaternion.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp +index c8ace89e..e954b041 100644 +--- a/glm/gtx/rotate_vector.hpp ++++ b/glm/gtx/rotate_vector.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include "../gtx/transform.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp +index b73edf67..22baa52a 100644 +--- a/glm/gtx/scalar_multiplication.hpp ++++ b/glm/gtx/scalar_multiplication.hpp +@@ -16,6 +16,7 @@ + + #include "../detail/setup.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp +index 7fc8c1cc..f21f3b2b 100644 +--- a/glm/gtx/scalar_relational.hpp ++++ b/glm/gtx/scalar_relational.hpp +@@ -15,6 +15,7 @@ + // Dependency: + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp +index f96d7e07..76359cfd 100644 +--- a/glm/gtx/spline.hpp ++++ b/glm/gtx/spline.hpp +@@ -16,6 +16,7 @@ + #include "../glm.hpp" + #include "../gtx/optimum_pow.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp +index 55a2f074..92532b9e 100644 +--- a/glm/gtx/std_based_type.hpp ++++ b/glm/gtx/std_based_type.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include <cstdlib> + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp +index 4b4e280f..dfcd5085 100644 +--- a/glm/gtx/string_cast.hpp ++++ b/glm/gtx/string_cast.hpp +@@ -24,6 +24,7 @@ + #include <string> + #include <cmath> + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/texture.hpp b/glm/gtx/texture.hpp +index 312bf398..7af185f6 100644 +--- a/glm/gtx/texture.hpp ++++ b/glm/gtx/texture.hpp +@@ -17,6 +17,7 @@ + #include "../gtc/integer.hpp" + #include "../gtx/component_wise.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp +index d23b99ce..5a5d9619 100644 +--- a/glm/gtx/transform.hpp ++++ b/glm/gtx/transform.hpp +@@ -19,6 +19,7 @@ + #include "../glm.hpp" + #include "../gtc/matrix_transform.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp +index 85f5bea4..5d7c83fc 100644 +--- a/glm/gtx/transform2.hpp ++++ b/glm/gtx/transform2.hpp +@@ -17,6 +17,7 @@ + #include "../glm.hpp" + #include "../gtx/transform.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp +index 6ff9f276..6ad92fad 100644 +--- a/glm/gtx/type_aligned.hpp ++++ b/glm/gtx/type_aligned.hpp +@@ -18,6 +18,7 @@ + // Dependency: + #include "../gtc/type_precision.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp +index 637bbd19..65519cab 100644 +--- a/glm/gtx/type_trait.hpp ++++ b/glm/gtx/type_trait.hpp +@@ -12,6 +12,7 @@ + + #pragma once + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/vec_swizzle.hpp b/glm/gtx/vec_swizzle.hpp +index daebac38..13d523dc 100644 +--- a/glm/gtx/vec_swizzle.hpp ++++ b/glm/gtx/vec_swizzle.hpp +@@ -14,6 +14,7 @@ + + #include "../glm.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp +index 401a47eb..98c9d110 100644 +--- a/glm/gtx/vector_angle.hpp ++++ b/glm/gtx/vector_angle.hpp +@@ -20,6 +20,7 @@ + #include "../gtx/quaternion.hpp" + #include "../gtx/rotate_vector.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp +index 6560eaa5..5ab1ffda 100644 +--- a/glm/gtx/vector_query.hpp ++++ b/glm/gtx/vector_query.hpp +@@ -17,6 +17,7 @@ + #include <cfloat> + #include <limits> + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp +index 2c4b55df..5bf26a33 100644 +--- a/glm/gtx/wrap.hpp ++++ b/glm/gtx/wrap.hpp +@@ -16,6 +16,7 @@ + #include "../glm.hpp" + #include "../gtc/vec1.hpp" + ++#include "../experimental.hpp" + #ifndef GLM_ENABLE_EXPERIMENTAL + # error "GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." + #endif +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch new file mode 100644 index 000000000..1be3318cc --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch @@ -0,0 +1,46 @@ +From 7fdd36d7496238e03e43fcc32839f75588116c5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 16 Mar 2018 15:44:48 +0100 +Subject: [PATCH 2/2] glm: install headers only +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Plausibility check in root source path + +$ find glm -type f ! -name '*.hpp' ! -name '*.h' ! -name '*.inl' +glm/detail/glm.cpp +glm/detail/dummy.cpp +glm/experimental.hpp.in +glm/CMakeLists.txt + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +Uptream-Status: Submitted [1] + +[1] https://github.com/g-truc/glm/pull/741 +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd4dd654..113dd735 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -171,7 +171,12 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) + + set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") + if (GLM_INSTALL_ENABLE) +- install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ install(DIRECTORY glm ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++ FILES_MATCHING ++ PATTERN "*.h" ++ PATTERN "*.hpp" ++ PATTERN "*.inl") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) + endif() + +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.8.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb index a174f2af0..4e2ee2378 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.8.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb @@ -8,14 +8,20 @@ BUGTRACKER = "https://github.com/g-truc/glm/issues" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://copying.txt;md5=4431606d144252143c9c3df384a74cad" +LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29edccf97b93e72b790" -SRC_URI = "git://github.com/g-truc/glm;branch=0.9.8" -SRCREV = "6fa203eeb7fbcbb6f620501fad40359c8a456049" +SRC_URI = " \ + git://github.com/g-truc/glm;branch=master \ + file://0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch \ + file://0002-glm-install-headers-only.patch \ +" +SRCREV = "fcbedf5058ef8613dd02aac62ef00d55dcfeadd7" S = "${WORKDIR}/git" inherit cmake +EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON" + FILES_${PN}-dev += "${libdir}/cmake" RDEPENDS_${PN}-dev = "" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch index 7800fdd57..7800fdd57 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch index e6c7dd667..e6c7dd667 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb index 62d283b88..75ad7f4f0 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb @@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \ file://0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch \ " -SRC_URI[gphoto2.md5sum] = "bae369aee6881e590c5c91bdbb11a5f8" -SRC_URI[gphoto2.sha256sum] = "a9abcd15d95f205318d17e3ac12af7ce523d2bc4943709d50b0a12c30cc5ee4d" +SRC_URI[gphoto2.md5sum] = "6c6a21b5e879330cdd71ef92dce36399" +SRC_URI[gphoto2.sha256sum] = "9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c" inherit autotools pkgconfig gettext diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0001-scripts-remove-bashisms.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0001-scripts-remove-bashisms.patch deleted file mode 100644 index 0e0dc879b..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0001-scripts-remove-bashisms.patch +++ /dev/null @@ -1,149 +0,0 @@ -From c00e63e97d8718836ba011d9172128732eecf001 Mon Sep 17 00:00:00 2001 -From: Ismo Puustinen <ismo.puustinen@intel.com> -Date: Tue, 24 Jan 2017 22:24:05 +0200 -Subject: [PATCH] scripts: remove bashisms. - -Convert bash scripts to more generic shell scripts. This removes the -strict bash dependency and the scripts should now run with any posix -shell. Also fix the issues reported by shellcheck while at it. - -Upstream-status: Accepted [https://github.com/gphoto/libgphoto2/commit/39b4395532058c0edb9a56d0ff04e48a472e4743] - ---- - packaging/generic/check-ptp-camera | 12 ++++++------ - packaging/linux-hotplug/gphoto-set-procperm | 14 +++++++------- - packaging/linux-hotplug/usbcam.console | 4 ++-- - packaging/linux-hotplug/usbcam.group | 2 +- - packaging/linux-hotplug/usbcam.user | 2 +- - packaging/linux-hotplug/usbcam.x11-app | 4 ++-- - 6 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/packaging/generic/check-ptp-camera b/packaging/generic/check-ptp-camera -index 1793fc8..bc3c6ac 100644 ---- a/packaging/generic/check-ptp-camera -+++ b/packaging/generic/check-ptp-camera -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public - # License as published by the Free Software Foundation; either -@@ -20,13 +20,13 @@ INTERFACE="${1:-06/01/01}" - - BASENAME=${DEVPATH##*/} - for d in /sys/${DEVPATH}/${BASENAME}:*; do -- [[ -d ${d} ]] || continue -- INTERFACEID="$(< ${d}/bInterfaceClass)" -- INTERFACEID="${INTERFACEID}/$(< ${d}/bInterfaceSubClass)" -- INTERFACEID="${INTERFACEID}/$(< ${d}/bInterfaceProtocol)" -+ [ -d "${d}" ] || continue -+ INTERFACEID="$(cat "${d}"/bInterfaceClass)" -+ INTERFACEID="${INTERFACEID}/$(cat "${d}"/bInterfaceSubClass)" -+ INTERFACEID="${INTERFACEID}/$(cat "${d}"/bInterfaceProtocol)" - - #echo ${d}: ${INTERFACEID} -- if [[ ${INTERFACE} == ${INTERFACEID} ]]; then -+ if [ "${INTERFACE}" = "${INTERFACEID}" ]; then - # Found interface - exit 0 - fi -diff --git a/packaging/linux-hotplug/gphoto-set-procperm b/packaging/linux-hotplug/gphoto-set-procperm -index d72ee68..977cbf5 100644 ---- a/packaging/linux-hotplug/gphoto-set-procperm -+++ b/packaging/linux-hotplug/gphoto-set-procperm -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public - # License as published by the Free Software Foundation; either -@@ -18,22 +18,22 @@ - # This is taken from Fedora Core gphoto2 package. - # http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/gphoto2/gphoto-set-procperm - --console_user=`cat /var/run/console/console.lock` -+console_user=$(cat /var/run/console/console.lock) - - if [ -z "$console_user" ] ; then - exit 1 - fi - --if [ -z "$HAL_PROP_USB_BUS_NUMBER" -o -z "$HAL_PROP_USB_LINUX_DEVICE_NUMBER" ] ; then -+if [ -z "$HAL_PROP_USB_BUS_NUMBER" ] || [ -z "$HAL_PROP_USB_LINUX_DEVICE_NUMBER" ] ; then - exit 1 - fi - --if [ $HAL_PROP_USB_BUS_NUMBER -lt 0 -o $HAL_PROP_USB_LINUX_DEVICE_NUMBER -lt 0 ] ; then -+if [ "$HAL_PROP_USB_BUS_NUMBER" -lt 0 ] || [ "$HAL_PROP_USB_LINUX_DEVICE_NUMBER" -lt 0 ] ; then - exit 1 - fi - - --bus_num=`printf %.3u $HAL_PROP_USB_BUS_NUMBER` --dev_num=`printf %.3u $HAL_PROP_USB_LINUX_DEVICE_NUMBER` -+bus_num=$(printf %.3u "$HAL_PROP_USB_BUS_NUMBER") -+dev_num=$(printf %.3u "$HAL_PROP_USB_LINUX_DEVICE_NUMBER") - --chown $console_user /proc/bus/usb/$bus_num/$dev_num -+chown "$console_user" /proc/bus/usb/"$bus_num"/"$dev_num" -diff --git a/packaging/linux-hotplug/usbcam.console b/packaging/linux-hotplug/usbcam.console -index d72128f..7ac6dc5 100755 ---- a/packaging/linux-hotplug/usbcam.console -+++ b/packaging/linux-hotplug/usbcam.console -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public - # License as published by the Free Software Foundation; either -@@ -50,7 +50,7 @@ then - /var/lock/console.lock - do - if [ -f "$conlock" ]; then -- CONSOLEOWNER=`cat $conlock` -+ CONSOLEOWNER=$(cat $conlock) - fi - done - if [ -n "$CONSOLEOWNER" ] -diff --git a/packaging/linux-hotplug/usbcam.group b/packaging/linux-hotplug/usbcam.group -index f96c33d..8761fac 100755 ---- a/packaging/linux-hotplug/usbcam.group -+++ b/packaging/linux-hotplug/usbcam.group -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public - # License as published by the Free Software Foundation; either -diff --git a/packaging/linux-hotplug/usbcam.user b/packaging/linux-hotplug/usbcam.user -index c46f155..a3ba71a 100644 ---- a/packaging/linux-hotplug/usbcam.user -+++ b/packaging/linux-hotplug/usbcam.user -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public - # License as published by the Free Software Foundation; either -diff --git a/packaging/linux-hotplug/usbcam.x11-app b/packaging/linux-hotplug/usbcam.x11-app -index 023ae9b..618e7db 100644 ---- a/packaging/linux-hotplug/usbcam.x11-app -+++ b/packaging/linux-hotplug/usbcam.x11-app -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public - # License as published by the Free Software Foundation; either -@@ -69,7 +69,7 @@ then - if [ "${USER}" != "root" ] - then - # we don't want to run this as root. definitely not. -- cd "${DIRECTORY}" -+ cd "${DIRECTORY}" || exit 1 - usrhome=~${USER} - "${SU}" "${USER}" -c "${ENV} DISPLAY=${DISPLAY} HOME=${usrhome} ${X11_APP}" - fi --- -2.9.3 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0002-correct-jpeg-memsrcdest-support.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0002-correct-jpeg-memsrcdest-support.patch deleted file mode 100644 index cf2d86da1..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0002-correct-jpeg-memsrcdest-support.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.h.orig 2016-06-15 09:03:20.625774684 -0400 -+++ libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.h 2016-06-15 09:03:47.049774148 -0400 -@@ -1,5 +1,7 @@ - #include <jpeglib.h> - -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) -+ - void - jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - unsigned long bufsize); -@@ -7,3 +9,5 @@ - void - jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, - unsigned long * outsize); -+ -+#endif ---- libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.c.orig 2016-06-15 09:03:58.689773913 -0400 -+++ libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.c 2016-06-15 09:04:17.769773526 -0400 -@@ -26,7 +26,7 @@ - - /* libjpeg8 and later come with their own (API compatible) memory source - and dest */ --#if JPEG_LIB_VERSION < 80 -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) - - /* Expanded data source object for memory input */ - ---- libgphoto2-2.5.8/camlibs/jl2005c/jpeg_memsrcdest.h.orig 2016-06-15 09:05:01.893772632 -0400 -+++ libgphoto2-2.5.8/camlibs/jl2005c/jpeg_memsrcdest.h 2016-06-15 09:05:17.433772318 -0400 -@@ -1,5 +1,7 @@ - #include <jpeglib.h> - -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) -+ - void - jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - unsigned long bufsize); -@@ -7,3 +9,5 @@ - void - jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, - unsigned long * outsize); -+ -+#endif ---- libgphoto2-2.5.8/camlibs/jl2005c/jpeg_memsrcdest.c.orig 2016-06-15 09:04:42.641773022 -0400 -+++ libgphoto2-2.5.8/camlibs/jl2005c/jpeg_memsrcdest.c 2016-06-15 09:04:48.657772901 -0400 -@@ -26,7 +26,7 @@ - - /* libjpeg8 and later come with their own (API compatible) memory source - and dest */ --#if JPEG_LIB_VERSION < 80 -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) - - /* Expanded data source object for memory input */ - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/avoid_using_sprintf.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/avoid_using_sprintf.patch deleted file mode 100644 index fba4c6964..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/avoid_using_sprintf.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 4adfe5a6c9db07537df302f3c17713515bf23a2e Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Sat, 11 Jul 2015 09:38:13 +0000 -Subject: [PATCH] avoid use of sprintf to convert %% to %, duplicate the macro - -git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15490 67ed7778-7388-44ab-90cf-0a291f65f57c ---- - camlibs/ptp2/chdk.c | 8 ++--- - camlibs/ptp2/chdk_ptp.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 84 insertions(+), 6 deletions(-) - -diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c -index 5fb84ea..3b8a995 100644 ---- a/camlibs/ptp2/chdk.c -+++ b/camlibs/ptp2/chdk.c -@@ -1119,18 +1119,14 @@ chdk_camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *pat - int ret, retint; - char *table, *s; - PTPParams *params = &camera->pl->params; -- char *lua; -- const char *luascript = PTP_CHDK_LUA_SERIALIZE_MSGS \ -+ const char *luascript = PTP_CHDK_LUA_SERIALIZE_MSGS_SIMPLEQUOTE \ - PTP_CHDK_LUA_RLIB_SHOOT \ - "return rlib_shoot({info=true});\n"; - - ret = camera_prepare_chdk_capture(camera, context); - if (ret != GP_OK) return ret; - -- lua = malloc(strlen(luascript)+1); -- sprintf(lua,luascript); /* This expands the %q inside the string too ... do not optimize away. */ -- ret = chdk_generic_script_run (params, lua, &table, &retint, context); -- free (lua); -+ ret = chdk_generic_script_run (params, luascript, &table, &retint, context); - GP_LOG_D("rlib_shoot returned table %s, retint %d\n", table, retint); - s = strstr(table, "exp="); - if (s) { -diff --git a/camlibs/ptp2/chdk_ptp.h b/camlibs/ptp2/chdk_ptp.h -index d11e0b7..65dcfd7 100644 ---- a/camlibs/ptp2/chdk_ptp.h -+++ b/camlibs/ptp2/chdk_ptp.h -@@ -198,10 +198,92 @@ function serialize(v,opts)\n\ - return table.concat(r)\n\ - end\n" - -+#define PTP_CHDK_LUA_SERIALIZE_SIMPLEQUOTE "\n\ -+serialize_r = function(v,opts,r,seen,depth)\n\ -+ local vt = type(v)\n\ -+ if vt == 'nil' or vt == 'boolean' or vt == 'number' then\n\ -+ table.insert(r,tostring(v))\n\ -+ return\n\ -+ end\n\ -+ if vt == 'string' then\n\ -+ table.insert(r,string.format('%q',v))\n\ -+ return\n\ -+ end\n\ -+ if vt == 'table' then\n\ -+ if not depth then\n\ -+ depth = 1\n\ -+ end\n\ -+ if depth >= opts.maxdepth then\n\ -+ error('serialize: max depth')\n\ -+ end\n\ -+ if not seen then\n\ -+ seen={}\n\ -+ elseif seen[v] then\n\ -+ if opts.err_cycle then\n\ -+ error('serialize: cycle')\n\ -+ else\n\ -+ table.insert(r,'\"cycle:'..tostring(v)..'\"')\n\ -+ return\n\ -+ end\n\ -+ end\n\ -+ seen[v] = true;\n\ -+ table.insert(r,'{')\n\ -+ for k,v1 in pairs(v) do\n\ -+ if opts.pretty then\n\ -+ table.insert(r,'\\n'..string.rep(' ',depth))\n\ -+ end\n\ -+ if type(k) == 'string' and string.match(k,'^[_%a][%a%d_]*$') then\n\ -+ table.insert(r,k)\n\ -+ else\n\ -+ table.insert(r,'[')\n\ -+ serialize_r(k,opts,r,seen,depth+1)\n\ -+ table.insert(r,']')\n\ -+ end\n\ -+ table.insert(r,'=')\n\ -+ serialize_r(v1,opts,r,seen,depth+1)\n\ -+ table.insert(r,',')\n\ -+ end\n\ -+ if opts.pretty then\n\ -+ table.insert(r,'\\n'..string.rep(' ',depth-1))\n\ -+ end\n\ -+ table.insert(r,'}')\n\ -+ return\n\ -+ end\n\ -+ if opts.err_type then\n\ -+ error('serialize: unsupported type ' .. vt, 2)\n\ -+ else\n\ -+ table.insert(r,'\"'..tostring(v)..'\"')\n\ -+ end\n\ -+end\n\ -+serialize_defaults = {\n\ -+ maxdepth=10,\n\ -+ err_type=true,\n\ -+ err_cycle=true,\n\ -+ pretty=false,\n\ -+}\n\ -+function serialize(v,opts)\n\ -+ if opts then\n\ -+ for k,v in pairs(serialize_defaults) do\n\ -+ if not opts[k] then\n\ -+ opts[k]=v\n\ -+ end\n\ -+ end\n\ -+ else\n\ -+ opts=serialize_defaults\n\ -+ end\n\ -+ local r={}\n\ -+ serialize_r(v,opts,r)\n\ -+ return table.concat(r)\n\ -+end\n" -+ - #define PTP_CHDK_LUA_SERIALIZE_MSGS \ - PTP_CHDK_LUA_SERIALIZE\ - "usb_msg_table_to_string=serialize\n" - -+#define PTP_CHDK_LUA_SERIALIZE_MSGS_SIMPLEQUOTE \ -+PTP_CHDK_LUA_SERIALIZE_SIMPLEQUOTE\ -+"usb_msg_table_to_string=serialize\n" -+ - #define PTP_CHDK_LUA_EXTEND_TABLE \ - "function extend_table(target,source,deep)\n\ - if type(target) ~= 'table' then\n\ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch index 8093676ad..8093676ad 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/10-camera-libgphoto2-device.fdi b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi index 3977064fe..3977064fe 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/10-camera-libgphoto2-device.fdi +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/10-camera-libgphoto2.fdi b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi index 00427e7d9..00427e7d9 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/10-camera-libgphoto2.fdi +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/40-libgphoto2.rules b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/40-libgphoto2.rules index b9f04398d..b9f04398d 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/40-libgphoto2.rules +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/40-libgphoto2.rules diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb index 4434af930..7a691c611 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb @@ -14,13 +14,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 file://10-camera-libgphoto2.fdi \ file://40-libgphoto2.rules \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ - file://0002-correct-jpeg-memsrcdest-support.patch \ - file://avoid_using_sprintf.patch \ - file://0001-scripts-remove-bashisms.patch \ " -SRC_URI[libgphoto2.md5sum] = "873ab01aced49c6b92a98e515db5dcef" -SRC_URI[libgphoto2.sha256sum] = "031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6" +SRC_URI[libgphoto2.md5sum] = "084d220d078d28c0c7a3ba13f4476128" +SRC_URI[libgphoto2.sha256sum] = "e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906" inherit autotools pkgconfig gettext lib_package @@ -54,3 +51,4 @@ FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal" FILES_${PN}-dbg += "${libdir}/*/*/.debug" FILES_${PN}-dev += "${libdir}/*/*/*.la" +FILES_${PN}-doc += "${datadir}/libgphoto2_port/0.12.0/vcamera/README.txt" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index 2db91904f..4094513b2 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb @@ -16,7 +16,9 @@ DEPENDS = "gtk+" S = "${WORKDIR}/${BPN}" -inherit autotools binconfig pkgconfig gettext +inherit distro_features_check autotools binconfig pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend () { rm -f ${S}/m4/init.m4 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb index 457d72169..38dac06e6 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb @@ -12,7 +12,9 @@ PACKAGECONFIG[systemd] = ",,systemd" RDEPENDS_${PN} += "libpng gtk+ libgcrypt" -inherit autotools binconfig pkgconfig +inherit distro_features_check autotools binconfig pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz" SRC_URI[md5sum] = "7f06104d5c009813e95142932c4ddb06" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch new file mode 100644 index 000000000..045f3cafa --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch @@ -0,0 +1,101 @@ +From eb0086dc4ea8fe9cda069456287b3a29a2631d30 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Wed, 13 Dec 2017 16:18:45 +0900 +Subject: [PATCH] Fix the error of can't find header file + +Upstream-Status: Inappropriate [embedded specific] +This fix is just for yocto. + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + src/NCApplication.cc | 2 +- + src/NCstyle.h | 2 +- + src/NCurses.h | 2 +- + src/ncursesp.h | 2 +- + src/ncursesw.cc | 2 +- + src/ncursesw.h | 4 ++-- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/NCApplication.cc b/src/NCApplication.cc +index 5bcf969..510f034 100644 +--- a/src/NCApplication.cc ++++ b/src/NCApplication.cc +@@ -23,7 +23,7 @@ + + /-*/ + +-#include <ncursesw/curses.h> ++#include <curses.h> + + #define YUILogComponent "ncurses" + #include <yui/YUILog.h> +diff --git a/src/NCstyle.h b/src/NCstyle.h +index a40d5a8..3657917 100644 +--- a/src/NCstyle.h ++++ b/src/NCstyle.h +@@ -25,7 +25,7 @@ + #ifndef NCstyle_h + #define NCstyle_h + +-#include <ncursesw/ncurses.h> ++#include <ncurses.h> + + #include <iosfwd> + #include <string> +diff --git a/src/NCurses.h b/src/NCurses.h +index a07c6bf..d17d3c3 100644 +--- a/src/NCurses.h ++++ b/src/NCurses.h +@@ -34,7 +34,7 @@ + #include <yui/YWidget.h> + #include <yui/YMenuItem.h> + +-#include <ncursesw/curses.h> /* curses.h: #define NCURSES_CH_T cchar_t */ ++#include <curses.h> /* curses.h: #define NCURSES_CH_T cchar_t */ + #include <wchar.h> + + #include "ncursesw.h" +diff --git a/src/ncursesp.h b/src/ncursesp.h +index d478347..2fcfea5 100644 +--- a/src/ncursesp.h ++++ b/src/ncursesp.h +@@ -28,7 +28,7 @@ + #include <iosfwd> + + #include "ncursesw.h" +-#include <ncursesw/panel.h> ++#include <panel.h> + + class NCursesPanel : public NCursesWindow + { +diff --git a/src/ncursesw.cc b/src/ncursesw.cc +index 3c771af..bb83210 100644 +--- a/src/ncursesw.cc ++++ b/src/ncursesw.cc +@@ -47,7 +47,7 @@ + #include <iostream> + #include <stdlib.h> + #include <string.h> +-#include <ncursesw/term.h> ++#include <term.h> + #undef line + #undef columns + +diff --git a/src/ncursesw.h b/src/ncursesw.h +index d25923a..c140d37 100644 +--- a/src/ncursesw.h ++++ b/src/ncursesw.h +@@ -27,8 +27,8 @@ + + #include <iosfwd> + +-#include <ncursesw/curses.h> +-#include <ncursesw/etip.h> ++#include <curses.h> ++#include <etip.h> + #include <cstdio> + #include <cstdarg> + #include <climits> +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch new file mode 100644 index 000000000..8e3774c1a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch @@ -0,0 +1,40 @@ +From 4b84f243a70a8c07f6a38dad3c9411fa707f25c9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Mar 2018 17:08:43 -0800 +Subject: [PATCH] use _nl_msg_cat_cntr only with glibc + +The musl libc provides libintl (similar to glibc) +but does not use the same internals, +so even though we are using the GNU gettext +the libintl included with the libc does not define +_nl_msg_cat_cntr and it does not need to. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/NCi18n.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/NCi18n.h b/src/NCi18n.h +index 165b0e7..bfc4ed7 100644 +--- a/src/NCi18n.h ++++ b/src/NCi18n.h +@@ -59,12 +59,13 @@ inline void setTextdomain( const char * domain ) + bindtextdomain( domain, YSettings::localeDir().c_str() ); + bind_textdomain_codeset( domain, "UTF-8" ); + textdomain( domain ); +- ++#if defined(__GLIBC__) + // Make change known + { + extern int _nl_msg_cat_cntr; + ++_nl_msg_cat_cntr; + } ++#endif + } + + +-- +2.16.2 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb new file mode 100644 index 000000000..578c71301 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -0,0 +1,49 @@ +SUMMARY = "Character Based User Interface for libyui" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ +" + +SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ + file://0001-use-_nl_msg_cat_cntr-only-with-glibc.patch \ + " + +SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" + +PV = "2.48.3+git${SRCPV}" +SRCREV = "79b804b45ffc6a0d92e28e793ff389a20b63b54b" + +S = "${WORKDIR}/git" + +inherit cmake gettext pkgconfig + +DEPENDS += "boost libyui ncurses" + +BBCLASSEXTEND = "nativesdk" + +do_configure_prepend () { + cd ${S} + git checkout bootstrap.sh + sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh + ./bootstrap.sh + mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cd - + sed -i "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt + sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake +} + +do_install_append () { + if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then + mv ${D}/usr/lib64 ${D}/usr/lib + fi +} + +do_install_append_class-nativesdk () { + mkdir -p ${D}/${base_prefix} + mv ${D}/usr ${D}/${base_prefix} +} + +FILES_${PN} += "${datadir}/*" + +FILES_${PN}-dev += "${libdir}/*" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch new file mode 100644 index 000000000..c1ba42eee --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch @@ -0,0 +1,48 @@ +From 1e6d40fec16a94d1a4bd40634405267200b7e969 Mon Sep 17 00:00:00 2001 +From: marxin <mliska@suse.cz> +Date: Tue, 10 Apr 2018 15:21:40 +0200 +Subject: [PATCH] Fix GCC 8 warning: +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +/home/marxin/Programming/libyui/src/YDialog.cc: In static member function ‘static void YDialog::showText(const string&, bool)’: +/home/marxin/Programming/libyui/src/YDialog.cc:690:26: error: catching polymorphic type ‘class YUIException’ by value [-Werror=catch-value=] + catch ( YUIException exception ) + ^~~~~~~~~ +/home/marxin/Programming/libyui/src/YDialog.cc: In static member function ‘static bool YDialog::showRelNotesText()’: +/home/marxin/Programming/libyui/src/YDialog.cc:814:26: error: catching polymorphic type ‘class YUIException’ by value [-Werror=catch-value=] + catch ( YUIException exception ) + ^~~~~~~~~ +--- +Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/122] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + + src/YDialog.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/YDialog.cc b/src/YDialog.cc +index 92e5031..8ecff90 100644 +--- a/src/YDialog.cc ++++ b/src/YDialog.cc +@@ -687,7 +687,7 @@ YDialog::showText( const std::string & text, bool useRichText ) + dialog->waitForEvent(); + dialog->destroy(); + } +- catch ( YUIException exception ) ++ catch ( YUIException &exception ) + { + // Don't let the application die just because help couldn't be displayed. + +@@ -811,7 +811,7 @@ YDialog::showRelNotesText() + } + dialog->destroy(); + } +- catch ( YUIException exception ) ++ catch ( YUIException &exception ) + { + // Don't let the application die just because RN couldn't be displayed. + +-- +2.17.0 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch new file mode 100644 index 000000000..426901819 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch @@ -0,0 +1,687 @@ +From 18562671982ad97549bccb444fdbb5905b6e9335 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 24 Apr 2018 15:06:14 -0700 +Subject: [PATCH] Fix build with clang + +Fix warnings found with clang + +error: class 'YButtonBoxPrivate' was previously declared as a struct [-Werror,-Wmismatched-tags] +| friend class YButtonBoxPrivate; + +YTimezoneSelector.cc:35:9: error: private field 'dummy' is not used [-Werror,-Wunused-private-field] + bool dummy; + ^ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/123] + + src/YAlignment.h | 2 +- + src/YBarGraph.h | 2 +- + src/YBusyIndicator.h | 2 +- + src/YButtonBox.h | 4 ++-- + src/YCheckBox.h | 2 +- + src/YCheckBoxFrame.h | 2 +- + src/YComboBox.h | 2 +- + src/YCommandLine.h | 2 +- + src/YContextMenu.h | 2 +- + src/YDateField.h | 2 +- + src/YDialog.h | 2 +- + src/YDownloadProgress.h | 2 +- + src/YDumbTab.h | 2 +- + src/YEmpty.h | 2 +- + src/YEventFilter.h | 2 +- + src/YFrame.h | 2 +- + src/YGraph.h | 2 +- + src/YImage.h | 2 +- + src/YInputField.h | 2 +- + src/YIntField.h | 2 +- + src/YLabel.h | 2 +- + src/YLayoutBox.h | 2 +- + src/YLogView.h | 2 +- + src/YMenuButton.h | 2 +- + src/YMultiLineEdit.h | 2 +- + src/YMultiProgressMeter.h | 2 +- + src/YMultiSelectionBox.h | 2 +- + src/YPartitionSplitter.h | 2 +- + src/YProgressBar.h | 2 +- + src/YPushButton.h | 2 +- + src/YRadioButton.h | 2 +- + src/YRadioButtonGroup.h | 2 +- + src/YRichText.h | 2 +- + src/YSelectionBox.h | 2 +- + src/YSelectionWidget.h | 2 +- + src/YSimpleInputField.h | 2 +- + src/YSlider.h | 2 +- + src/YSpacing.h | 2 +- + src/YSquash.h | 2 +- + src/YTable.h | 2 +- + src/YTableHeader.h | 2 +- + src/YTimeField.h | 2 +- + src/YTimezoneSelector.cc | 2 +- + src/YTree.h | 2 +- + src/YUILog.h | 2 +- + src/YWidget.h | 2 +- + src/YWizard.h | 2 +- + 47 files changed, 48 insertions(+), 48 deletions(-) + +diff --git a/src/YAlignment.h b/src/YAlignment.h +index d716c77..7276944 100644 +--- a/src/YAlignment.h ++++ b/src/YAlignment.h +@@ -28,7 +28,7 @@ + #include "YSingleChildContainerWidget.h" + + +-class YAlignmentPrivate; ++struct YAlignmentPrivate; + + /** + * Implementation of all the alignment widgets: +diff --git a/src/YBarGraph.h b/src/YBarGraph.h +index 29f7f26..d7eaad2 100644 +--- a/src/YBarGraph.h ++++ b/src/YBarGraph.h +@@ -29,7 +29,7 @@ + #include "YColor.h" + + +-class YBarGraphPrivate; ++struct YBarGraphPrivate; + class YBarGraphSegment; + + /** +diff --git a/src/YBusyIndicator.h b/src/YBusyIndicator.h +index 9530fa5..75297d8 100644 +--- a/src/YBusyIndicator.h ++++ b/src/YBusyIndicator.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YBusyIndicatorPrivate; ++struct YBusyIndicatorPrivate; + + + /** +diff --git a/src/YButtonBox.h b/src/YButtonBox.h +index 84f8dbb..ca51f57 100644 +--- a/src/YButtonBox.h ++++ b/src/YButtonBox.h +@@ -30,7 +30,7 @@ + #include "YWidget.h" + #include "YPushButton.h" + +-class YButtonBoxPrivate; ++struct YButtonBoxPrivate; + class YPushButton; + + +@@ -147,7 +147,7 @@ struct YButtonBoxMargins + **/ + class YButtonBox : public YWidget + { +- friend class YButtonBoxPrivate; ++ friend struct YButtonBoxPrivate; + + protected: + /** +diff --git a/src/YCheckBox.h b/src/YCheckBox.h +index 793cc77..03f3faa 100644 +--- a/src/YCheckBox.h ++++ b/src/YCheckBox.h +@@ -30,7 +30,7 @@ + #include "YWidget.h" + #include "ImplPtr.h" + +-class YCheckBoxPrivate; ++struct YCheckBoxPrivate; + + enum YCheckBoxState + { +diff --git a/src/YCheckBoxFrame.h b/src/YCheckBoxFrame.h +index 243f1a0..7017110 100644 +--- a/src/YCheckBoxFrame.h ++++ b/src/YCheckBoxFrame.h +@@ -29,7 +29,7 @@ + #include "YSingleChildContainerWidget.h" + #include "ImplPtr.h" + +-class YCheckBoxFramePrivate; ++struct YCheckBoxFramePrivate; + + + /** +diff --git a/src/YComboBox.h b/src/YComboBox.h +index 416359a..ad0e550 100644 +--- a/src/YComboBox.h ++++ b/src/YComboBox.h +@@ -27,7 +27,7 @@ + + #include "YSelectionWidget.h" + +-class YComboBoxPrivate; ++struct YComboBoxPrivate; + + + /** +diff --git a/src/YCommandLine.h b/src/YCommandLine.h +index 70cb4fe..f344a3b 100644 +--- a/src/YCommandLine.h ++++ b/src/YCommandLine.h +@@ -28,7 +28,7 @@ + #include <string> + #include "ImplPtr.h" + +-class YCommandLinePrivate; ++struct YCommandLinePrivate; + + + /** +diff --git a/src/YContextMenu.h b/src/YContextMenu.h +index a4acb1c..1253002 100644 +--- a/src/YContextMenu.h ++++ b/src/YContextMenu.h +@@ -29,7 +29,7 @@ + #include "YMenuItem.h" + + class YMenuItem; +-class YContextMenuPrivate; ++struct YContextMenuPrivate; + + + /** +diff --git a/src/YDateField.h b/src/YDateField.h +index e5a468d..6164fba 100644 +--- a/src/YDateField.h ++++ b/src/YDateField.h +@@ -27,7 +27,7 @@ + + #include "YSimpleInputField.h" + +-class YDateFieldPrivate; ++struct YDateFieldPrivate; + + /** + * Input field for entering a date. +diff --git a/src/YDialog.h b/src/YDialog.h +index 66c25c0..371209b 100644 +--- a/src/YDialog.h ++++ b/src/YDialog.h +@@ -32,7 +32,7 @@ + + class YShortcutManager; + class YPushButton; +-class YDialogPrivate; ++struct YDialogPrivate; + class YEvent; + class YEventFilter; + +diff --git a/src/YDownloadProgress.h b/src/YDownloadProgress.h +index c47ec4f..fe09a9d 100644 +--- a/src/YDownloadProgress.h ++++ b/src/YDownloadProgress.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + + +-class YDownloadProgressPrivate; ++struct YDownloadProgressPrivate; + + /** + * DownloadProgress: A progress bar that monitors downloading a file by +diff --git a/src/YDumbTab.h b/src/YDumbTab.h +index aec17a3..f8fb250 100644 +--- a/src/YDumbTab.h ++++ b/src/YDumbTab.h +@@ -27,7 +27,7 @@ + + #include "YSelectionWidget.h" + +-class YDumbTabPrivate; ++struct YDumbTabPrivate; + + /** + * DumbTab: A very simple tab widget that can display and switch between a +diff --git a/src/YEmpty.h b/src/YEmpty.h +index 9a3cb36..9b88fbc 100644 +--- a/src/YEmpty.h ++++ b/src/YEmpty.h +@@ -29,7 +29,7 @@ + #include "ImplPtr.h" + + +-class YEmptyPrivate; ++struct YEmptyPrivate; + + /** + * A widget with zero size, useful as a placeholder. +diff --git a/src/YEventFilter.h b/src/YEventFilter.h +index 3dc1803..74aa62d 100644 +--- a/src/YEventFilter.h ++++ b/src/YEventFilter.h +@@ -32,7 +32,7 @@ + class YEvent; + class YDialog; + +-class YEventFilterPrivate; ++struct YEventFilterPrivate; + + + /** +diff --git a/src/YFrame.h b/src/YFrame.h +index 111e8ec..4f8c61e 100644 +--- a/src/YFrame.h ++++ b/src/YFrame.h +@@ -29,7 +29,7 @@ + #include "YSingleChildContainerWidget.h" + #include "ImplPtr.h" + +-class YFramePrivate; ++struct YFramePrivate; + + + /** +diff --git a/src/YGraph.h b/src/YGraph.h +index d90d1ae..287d800 100644 +--- a/src/YGraph.h ++++ b/src/YGraph.h +@@ -37,7 +37,7 @@ + * For that reason a lot of functions simply take a void* instead of graph_t*. + */ + +-class YGraphPrivate; ++struct YGraphPrivate; + + /** + * A graph with nodes and edges, rendered with Graphviz. +diff --git a/src/YImage.h b/src/YImage.h +index 17bea21..84eb674 100644 +--- a/src/YImage.h ++++ b/src/YImage.h +@@ -29,7 +29,7 @@ + #include <string> + + +-class YImagePrivate; ++struct YImagePrivate; + + /** + * A picture, possibly animated, loaded from a file. +diff --git a/src/YInputField.h b/src/YInputField.h +index 70641ce..fa29b42 100644 +--- a/src/YInputField.h ++++ b/src/YInputField.h +@@ -28,7 +28,7 @@ + #include <string> + #include "YWidget.h" + +-class YInputFieldPrivate; ++struct YInputFieldPrivate; + + + +diff --git a/src/YIntField.h b/src/YIntField.h +index 9da0537..8ad2949 100644 +--- a/src/YIntField.h ++++ b/src/YIntField.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YIntFieldPrivate; ++struct YIntFieldPrivate; + + + +diff --git a/src/YLabel.h b/src/YLabel.h +index d2fff61..bf06d8b 100644 +--- a/src/YLabel.h ++++ b/src/YLabel.h +@@ -30,7 +30,7 @@ + #include "ImplPtr.h" + + +-class YLabelPrivate; ++struct YLabelPrivate; + + /** + * Implementation of the Label, Heading and OutputField widgets +diff --git a/src/YLayoutBox.h b/src/YLayoutBox.h +index e652a45..070eaff 100644 +--- a/src/YLayoutBox.h ++++ b/src/YLayoutBox.h +@@ -29,7 +29,7 @@ + #include "YWidget.h" + + +-class YLayoutBoxPrivate; ++struct YLayoutBoxPrivate; + + /** + * A vertical or horizontal stacking of widgets, implementing HBox and VBox. +diff --git a/src/YLogView.h b/src/YLogView.h +index 53fb9ee..5b44229 100644 +--- a/src/YLogView.h ++++ b/src/YLogView.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YLogViewPrivate; ++struct YLogViewPrivate; + + + /** +diff --git a/src/YMenuButton.h b/src/YMenuButton.h +index 205e730..5df7efb 100644 +--- a/src/YMenuButton.h ++++ b/src/YMenuButton.h +@@ -29,7 +29,7 @@ + #include "YMenuItem.h" + + class YMenuItem; +-class YMenuButtonPrivate; ++struct YMenuButtonPrivate; + + + /** +diff --git a/src/YMultiLineEdit.h b/src/YMultiLineEdit.h +index c52a6ae..1f792f8 100644 +--- a/src/YMultiLineEdit.h ++++ b/src/YMultiLineEdit.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YMultiLineEditPrivate; ++struct YMultiLineEditPrivate; + + /** + * A multi-line plain-text area +diff --git a/src/YMultiProgressMeter.h b/src/YMultiProgressMeter.h +index 57c758d..f6bec91 100644 +--- a/src/YMultiProgressMeter.h ++++ b/src/YMultiProgressMeter.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + #include <vector> + +-class YMultiProgressMeterPrivate; ++struct YMultiProgressMeterPrivate; + + + /** +diff --git a/src/YMultiSelectionBox.h b/src/YMultiSelectionBox.h +index bbe5a20..f3a2947 100644 +--- a/src/YMultiSelectionBox.h ++++ b/src/YMultiSelectionBox.h +@@ -27,7 +27,7 @@ + + #include "YSelectionWidget.h" + +-class YMultiSelectionBoxPrivate; ++struct YMultiSelectionBoxPrivate; + + + /** +diff --git a/src/YPartitionSplitter.h b/src/YPartitionSplitter.h +index 2839bbc..9de1174 100644 +--- a/src/YPartitionSplitter.h ++++ b/src/YPartitionSplitter.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + + +-class YPartitionSplitterPrivate; ++struct YPartitionSplitterPrivate; + + + /** +diff --git a/src/YProgressBar.h b/src/YProgressBar.h +index 718352f..baab662 100644 +--- a/src/YProgressBar.h ++++ b/src/YProgressBar.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YProgressBarPrivate; ++struct YProgressBarPrivate; + + + /** +diff --git a/src/YPushButton.h b/src/YPushButton.h +index 5b65c98..e288252 100644 +--- a/src/YPushButton.h ++++ b/src/YPushButton.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YPushButtonPrivate; ++struct YPushButtonPrivate; + + + +diff --git a/src/YRadioButton.h b/src/YRadioButton.h +index 9dc62de..5a7c0dd 100644 +--- a/src/YRadioButton.h ++++ b/src/YRadioButton.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + + class YRadioButtonGroup; +-class YRadioButtonPrivate; ++struct YRadioButtonPrivate; + + + /** +diff --git a/src/YRadioButtonGroup.h b/src/YRadioButtonGroup.h +index 063a52e..671a257 100644 +--- a/src/YRadioButtonGroup.h ++++ b/src/YRadioButtonGroup.h +@@ -28,7 +28,7 @@ + #include "YSingleChildContainerWidget.h" + + class YRadioButton; +-class YRadioButtonGroupPrivate; ++struct YRadioButtonGroupPrivate; + + typedef std::list<YRadioButton *> YRadioButtonList; + typedef YRadioButtonList::iterator YRadioButtonListIterator; +diff --git a/src/YRichText.h b/src/YRichText.h +index 149bfb3..86b3f80 100644 +--- a/src/YRichText.h ++++ b/src/YRichText.h +@@ -30,7 +30,7 @@ + #include "ImplPtr.h" + + +-class YRichTextPrivate; ++struct YRichTextPrivate; + + + /** +diff --git a/src/YSelectionBox.h b/src/YSelectionBox.h +index 7fc4fb8..9bbf9f3 100644 +--- a/src/YSelectionBox.h ++++ b/src/YSelectionBox.h +@@ -27,7 +27,7 @@ + + #include "YSelectionWidget.h" + +-class YSelectionBoxPrivate; ++struct YSelectionBoxPrivate; + + + /** +diff --git a/src/YSelectionWidget.h b/src/YSelectionWidget.h +index abbdfb4..cf05afd 100644 +--- a/src/YSelectionWidget.h ++++ b/src/YSelectionWidget.h +@@ -29,7 +29,7 @@ + #include "YItem.h" + #include "ImplPtr.h" + +-class YSelectionWidgetPrivate; ++struct YSelectionWidgetPrivate; + + /** + * Base class for various kinds of multi-value widgets. +diff --git a/src/YSimpleInputField.h b/src/YSimpleInputField.h +index 6d926d4..b93fe6b 100644 +--- a/src/YSimpleInputField.h ++++ b/src/YSimpleInputField.h +@@ -27,7 +27,7 @@ + + #include "YWidget.h" + +-class YSimpleInputFieldPrivate; ++struct YSimpleInputFieldPrivate; + + + /** +diff --git a/src/YSlider.h b/src/YSlider.h +index d29f6b8..4bcd7d3 100644 +--- a/src/YSlider.h ++++ b/src/YSlider.h +@@ -27,7 +27,7 @@ + + #include "YIntField.h" + +-class YSliderPrivate; ++struct YSliderPrivate; + + + /** +diff --git a/src/YSpacing.h b/src/YSpacing.h +index e8aafd3..066cd68 100644 +--- a/src/YSpacing.h ++++ b/src/YSpacing.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + #include "ImplPtr.h" + +-class YSpacingPrivate; ++struct YSpacingPrivate; + + + /** +diff --git a/src/YSquash.h b/src/YSquash.h +index 4bd0fb6..3804cc4 100644 +--- a/src/YSquash.h ++++ b/src/YSquash.h +@@ -29,7 +29,7 @@ + #include "ImplPtr.h" + + +-class YSquashPrivate; ++struct YSquashPrivate; + + /** + * HSquash, VSquash HVSquash: reduce child to its preferred size. +diff --git a/src/YTable.h b/src/YTable.h +index 6694f10..469b8ca 100644 +--- a/src/YTable.h ++++ b/src/YTable.h +@@ -30,7 +30,7 @@ + #include "YTableItem.h" + #include "YTableHeader.h" + +-class YTablePrivate; ++struct YTablePrivate; + + + +diff --git a/src/YTableHeader.h b/src/YTableHeader.h +index 70166c2..4ae99b4 100644 +--- a/src/YTableHeader.h ++++ b/src/YTableHeader.h +@@ -31,7 +31,7 @@ + + + +-class YTableHeaderPrivate; ++struct YTableHeaderPrivate; + + /** + * Helper class for YTable for table column properties: +diff --git a/src/YTimeField.h b/src/YTimeField.h +index ab2f9a3..f3a7b94 100644 +--- a/src/YTimeField.h ++++ b/src/YTimeField.h +@@ -27,7 +27,7 @@ + + #include "YSimpleInputField.h" + +-class YTimeFieldPrivate; ++struct YTimeFieldPrivate; + + + /** +diff --git a/src/YTimezoneSelector.cc b/src/YTimezoneSelector.cc +index 9259b64..e2f9b6f 100644 +--- a/src/YTimezoneSelector.cc ++++ b/src/YTimezoneSelector.cc +@@ -32,7 +32,7 @@ + + class YTimezoneSelectorPrivate + { +- bool dummy; ++// bool dummy; + }; + + +diff --git a/src/YTree.h b/src/YTree.h +index 14fa279..70e1364 100644 +--- a/src/YTree.h ++++ b/src/YTree.h +@@ -28,7 +28,7 @@ + #include "YSelectionWidget.h" + + class YTreeItem; +-class YTreePrivate; ++struct YTreePrivate; + + + /** +diff --git a/src/YUILog.h b/src/YUILog.h +index 0890bc5..4a927a7 100644 +--- a/src/YUILog.h ++++ b/src/YUILog.h +@@ -64,7 +64,7 @@ + + + +-class YUILogPrivate; ++struct YUILogPrivate; + + enum YUILogLevel_t + { +diff --git a/src/YWidget.h b/src/YWidget.h +index 5b285d0..636a41b 100644 +--- a/src/YWidget.h ++++ b/src/YWidget.h +@@ -45,7 +45,7 @@ typedef YChildrenManager<YWidget> YWidgetChildrenManager; + typedef YSingleChildManager<YWidget> YSingleWidgetChildManager; + typedef YChildrenRejector<YWidget> YWidgetChildrenRejector; + +-class YWidgetPrivate; ++struct YWidgetPrivate; + + + /** +diff --git a/src/YWizard.h b/src/YWizard.h +index 7671cbf..975b597 100644 +--- a/src/YWizard.h ++++ b/src/YWizard.h +@@ -28,7 +28,7 @@ + #include "YWidget.h" + + class YMacroRecorder; +-class YWizardPrivate; ++struct YWizardPrivate; + class YPushButton; + class YReplacePoint; + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb new file mode 100644 index 000000000..42945288c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb @@ -0,0 +1,41 @@ +SUMMARY = "Libyui is a widget abstraction library providing Qt, GTK and ncurses frontends." +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + +SRC_URI = "git://github.com/libyui/libyui.git \ + file://0001-Fix-GCC-8-warning.patch \ + file://0001-Fix-build-with-clang.patch \ + " + +PV = "3.3.3+git" +SRCREV = "2b634cb7821e2e79dd4b7a73caf8e67c50189376" + +S = "${WORKDIR}/git" + +inherit cmake gettext pkgconfig + +DEPENDS += "boost" + +BBCLASSEXTEND = "native nativesdk" + +do_configure_prepend () { + cd ${S} + ./bootstrap.sh + cd - +} + +do_install_append () { + if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then + mv ${D}/usr/lib64 ${D}/usr/lib + fi +} + +do_install_append_class-nativesdk () { + mkdir -p ${D}/${base_prefix} + mv ${D}/usr ${D}/${base_prefix} +} + +FILES_${PN}-dev = "${libdir}/* ${includedir}/yui*" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index b354ae7a1..c35a0c723 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -16,9 +16,11 @@ inherit autotools gettext update-alternatives pkgconfig distro_features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -ALTERNATIVE_${PN}-core = "x-window-manager" +ALTERNATIVE_${PN}-core = "x-window-manager x-session-manager" ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox" ALTERNATIVE_PRIORITY[x-window-manager] = "10" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/openbox-session" +ALTERNATIVE_PRIORITY[x-session-manager] = "100" PACKAGECONFIG ??= "" PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" @@ -38,7 +40,7 @@ python populate_packages_prepend() { } RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks" -FILES_${PN}-core = "${bindir}/openbox ${libdir}/*${SOLIBS}" +FILES_${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" FILES_${PN}-lxde += "${datadir}/lxde/ \ ${datadir}/lxpanel \ @@ -46,6 +48,7 @@ FILES_${PN}-lxde += "${datadir}/lxde/ \ ${datadir}/icons" FILES_${PN}-gnome += " \ + ${bindir}/openbox-gnome-session \ ${datadir}/gnome \ ${datadir}/gnome-session \ " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb index 632e7d433..3069d2ded 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 PV = "1.0" PR = "r2" -inherit packagegroup allarch +inherit packagegroup PACKAGES += "\ ${PN}-core \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb index 02bb1cc93..e0f72cd58 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb @@ -12,7 +12,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${ SRC_URI[md5sum] = "874eadd9434613dbacf0272c82c3ac23" SRC_URI[sha256sum] = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = " --disable-documentation " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb index 6a159a73a..f5397750f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb @@ -4,9 +4,9 @@ HOMEPAGE = "http://fukuchi.org/works/qrencode/" SECTION = "libs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -PV = "3.4.4+git${SRCPV}" +PV = "4.0.0+git${SRCPV}" -SRCREV = "1b565c7b599029818fc596e7da4371a3083da36c" +SRCREV = "07f3c5d4bf9136711422cc7dbf28aff469da220a" SRC_URI = "git://github.com/fukuchi/libqrencode.git" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/Makefile.oe b/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/Makefile.oe deleted file mode 100644 index 2ee69346a..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/Makefile.oe +++ /dev/null @@ -1,64 +0,0 @@ -# Makefile for slim - OpenEmbedded -####################################################### - - -SLIMLDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt -lpthread -CUSTOM=-DHAVE_SHADOW - -USE_PAM=1 -ifdef USE_PAM -SLIMLDFLAGS+= -lpam -CUSTOM+= -DUSE_PAM -endif - -####################################################### - -NAME=slim -VERSION=1.3.2 - -DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \ - -DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\" - -OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \ - panel.o util.o -ifdef USE_PAM -OBJECTS+=PAM.o -endif - -all: slim - -slim: $(OBJECTS) - $(CXX) $(OBJECTS) $(LDFLAGS) $(SLIMLDFLAGS) -o $(NAME) - -.cpp.o: - $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ - -.c.o: - $(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ - -install: slim install-theme - install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim - install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1 - test -e $(DESTDIR)$(CFGDIR)/slim.conf || \ - install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf - -clean: - @rm -f slim *.o - -dist: - @rm -rf $(NAME)-$(VERSION) - @mkdir $(NAME)-$(VERSION) - @cp -r *.cpp *.h *.c Makefile Makefile.* COPYING ChangeLog INSTALL README TODO \ - xinitrc.sample slim.1 THEMES themes slim.conf $(NAME)-$(VERSION) - @rm -rf $(NAME)-$(VERSION)/themes/.svn $(NAME)-$(VERSION)/themes/default/.svn - @tar cvzf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) - @rm -rf $(NAME)-$(VERSION) - - -install-theme: - install -D -m 644 themes/default/slim.theme \ - $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme - install -D -m 644 themes/default/panel.png \ - $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png - install -D -m 644 themes/default/background.jpg \ - $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim-dynwm b/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim-dynwm deleted file mode 100644 index 49c9d47ec..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim-dynwm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -update_slim_wmlist -if [ "x$1" = "x-nodaemon" ]; then - shift - exec slim "$@" -else - slim -d "$@" -fi diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim.pamd b/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim.pamd deleted file mode 100644 index 80c34b1db..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim.pamd +++ /dev/null @@ -1,19 +0,0 @@ -# Begin /etc/pam.d/slim - -auth required pam_shells.so -auth include common-auth -auth optional pam_securetty.so -auth optional pam_gnome_keyring.so - -account required pam_nologin.so -account include common-account - -password include common-password - -session include common-session -session required pam_mkhomedir.so skel=/etc/skel/ umask=0022 -session optional pam_lastlog.so nowtmp -session optional pam_mail.so dir=/var/mail standard -session optional pam_gnome_keyring.so auto_start - -# End /etc/pam.d/slim diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim.service b/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim.service deleted file mode 100644 index 341351aad..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SLiM Simple Login Manager -Requires=dev-tty7.device -After=dev-tty7.device systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/slim -nodaemon -StandardOutput=syslog - -[Install] -WantedBy=graphical.target diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist b/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist deleted file mode 100644 index 0f116537f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/perl -w -# -# update_slim_wmlist, based on: -# update_wdm_wmlist, (c) 1998 Marcelo Magallón <mmagallo@debian.org> -# rewriten to use the x-window-manager alternative -# modified to also use the x-session-manager alternative by Arthur Korn -# Copyright 2000 Wichert Akkerman <wakkerma@debian.org> -# Modified to use the freedesktop.org .desktop like kdm and gdm -# -# This script will read the list of installed window managers from -# the freedesktop .desktop files in <etc>/X11/sessions/:<etc>/dm/Sessions/: -# <share>/xsessions/ -# and update the sessions line in /etc/slim.conf. -# BEWARE: It doesn't ask any questions about this. It just does it. It -# takes an optional list of window managers. - -use strict; -use File::DesktopEntry; - -my $wm_list=''; -my %desktop_files; - -unless (@ARGV) { - #my @wm_list = ('default'); - my @wm_list; - foreach my $dir ('/etc/X11/sessions/','/etc/dm/Sessions/','/usr/share/xsessions/') { - next unless (opendir DIR, $dir); - my @files; - @files = grep { /\.desktop$/ && -r "$dir/$_" } readdir(DIR); - foreach my $file (@files) { - push @{$desktop_files{$file}}, "$dir/$file"; - } - } - DESKTOP: foreach my $desktop_file (keys(%desktop_files)) { - foreach my $file (@{$desktop_files{$desktop_file}}) { - my $entry = File::DesktopEntry->new_from_file($file); - next DESKTOP if (defined($entry->get_value('Hidden')) - and $entry->get_value('Hidden') eq 'true'); - if ($entry->get_value('Name') =~ /^gnome$/i) { - push (@wm_list, 'gnome'); - } - elsif ($entry->get_value('Name') =~ /^kde$/i) { - push (@wm_list, 'kde'); - } - elsif (defined($entry->get_value('Exec'))) { - push (@wm_list, $entry->get_value('Exec')); - } - else { # not found, go to next file - next; - } - # found, proceed to next destop file - next DESKTOP; - } - } - $wm_list = join (',', sort @wm_list) . ',custom'; -} else { - $wm_list = join (',', sort @ARGV); -} - -open (SLIM_CONFIG_FILE, '</etc/slim.conf') - or die "Can't open /etc/slim.conf for reading: $!"; -open (NEW_SLIM_CONFIG_FILE, '>/etc/slim.conf.new') - or die "Can't open /etc/slim.conf.new for writing: $!"; - -while (<SLIM_CONFIG_FILE>) { - s|^(sessions\s*).*|$1$wm_list|; - print NEW_SLIM_CONFIG_FILE; -} - -close(SLIM_CONFIG_FILE); -close(NEW_SLIM_CONFIG_FILE); - -rename '/etc/slim.conf.new', '/etc/slim.conf' - or die "Can't rename /etc/slim.conf.new: $!"; - -exit 0; diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.1.bb deleted file mode 100644 index e7c48ff6c..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "An abstraction layer for touchscreen panel events" -DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ -events, as well as a filter stack for the manipulation of those events. \ -Tslib is generally used on embedded devices to provide a common user \ -space interface to touchscreen functionality." -HOMEPAGE = "http://tslib.org/" - -AUTHOR = "Russell King w/ plugins by Chris Larson et. al." -SECTION = "base" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" - -SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ - file://ts.conf \ - file://tslib.sh \ -" - -SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d" -SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" - -UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" - -do_install_prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ -} - -# People should consider using udev's /dev/input/touchscreen0 symlink -# instead of detect-stylus -#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" -RPROVIDES_tslib-conf = "libts-0.0-conf" - -PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" -DEBIAN_NOAUTONAME_tslib-conf = "1" -DEBIAN_NOAUTONAME_tslib-tests = "1" -DEBIAN_NOAUTONAME_tslib-calibrate = "1" - -RDEPENDS_${PN} = "tslib-conf" -RRECOMMENDS_${PN} = "pointercal" - -FILES_${PN}-dev += "${libdir}/ts/*.la" -FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" -FILES_tslib-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb new file mode 100644 index 000000000..7ae941a3c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb @@ -0,0 +1,82 @@ +SUMMARY = "An abstraction layer for touchscreen panel events" +DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ +events, as well as a filter stack for the manipulation of those events. \ +Tslib is generally used on embedded devices to provide a common user \ +space interface to touchscreen functionality." +HOMEPAGE = "http://tslib.org/" + +AUTHOR = "Martin Kepplinger <martink@posteo.de>" +SECTION = "base" +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594 \ + file://tests/COPYING;md5=a23a74b3f4caf9616230789d94217acb \ +" + +SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ + file://ts.conf \ + file://tslib.sh \ +" +SRC_URI[md5sum] = "9ff36788c9ab76a10b58422227b9629e" +SRC_URI[sha256sum] = "7ce48807cab655076d71a1ceef3ed0ab8a25df98074981d4a8fd1477ee5f710c" + +UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" +PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" +PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" +PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" +PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" +PACKAGECONFIG[median] = "--enable-median,--disable-median" +PACKAGECONFIG[pthres] = "--enable-pthres,--disable-pthres" +PACKAGECONFIG[skip] = "--enable-skip,--disable-skip" +PACKAGECONFIG[lowpass] = "--enable-lowpass,--disable-lowpass" +PACKAGECONFIG[invert] = "--enable-invert,--disable-invert" +PACKAGECONFIG[variance] = "--enable-variance,--disable-variance" +PACKAGECONFIG[input] = "--enable-input,--disable-input" +PACKAGECONFIG[tatung] = "--enable-tatung,--disable-tatung" +PACKAGECONFIG[touchkit] = "--enable-touchkit,--disable-touchkit" +PACKAGECONFIG[waveshare] = "--enable-waveshare,--disable-waveshare" +PACKAGECONFIG[ucb1x00] = "--enable-ucb1x00,--disable-ucb1x00" +PACKAGECONFIG[mk712] = "--enable-mk712,--disable-mk712" +PACKAGECONFIG[h3600] = "--enable-h3600,--disable-h3600" +PACKAGECONFIG[dmc] = "--enable-dmc,--disable-dmc" +PACKAGECONFIG[linear-h2200] = "--enable-linear-h2200,--disable-linear-h2200" +PACKAGECONFIG[corgi] = "--enable-corgi,--disable-corgi" +PACKAGECONFIG[collie] = "--enable-collie,--disable-collie" +PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" +PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" +PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" +PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ +} + +RPROVIDES_tslib-conf = "libts-0.0-conf" + +PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate tslib-uinput" +DEBIAN_NOAUTONAME_tslib-conf = "1" +DEBIAN_NOAUTONAME_tslib-tests = "1" +DEBIAN_NOAUTONAME_tslib-calibrate = "1" +DEBIAN_NOAUTONAME_tslib-uinput = "1" + +RDEPENDS_${PN} = "tslib-conf" +RRECOMMENDS_${PN} = "pointercal" + +FILES_${PN}-dev += "${libdir}/ts/*.la" +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-uinput += "${bindir}/ts_uinput" + +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ + ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb index 31f4df486..31bcce066 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb @@ -12,7 +12,9 @@ SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" do_install_append() { rm -f ${D}${libdir}/*/*.la diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb index 27a38c1aa..a21dc42a9 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb @@ -7,6 +7,8 @@ SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.b SRC_URI[md5sum] = "09f56978a62854534deacc8aa8ff3031" SRC_URI[sha256sum] = "bc7171a0fa212da866fca2301241630e2009aea8c4ddb75f21b51a31c2e4c581" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb index 35d500239..9116b5f74 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f9a35333adf75edd1eaef84bca65a490" DEPENDS = "libxfont" -SRC_URI[md5sum] = "53a48e1fdfec29ab2e89f86d4b7ca902" -SRC_URI[sha256sum] = "38f447be0c61f94c473f128cf519dd0cff63b5d7775240a2e895a183a61e2026" +SRC_URI[md5sum] = "2a455d3c02390597feb9cefb3fe97a45" +SRC_URI[sha256sum] = "4b4df05fc53f1e98993638d6f7e178d95b31745c4568cee407e167491fd311a2" BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb index 3885d613d..d2afa78f9 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb @@ -4,8 +4,8 @@ SUMMARY = "a simple program for managing utmp/wtmp entries" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" SRC_URI += "file://0001-Makefile.am-Error-Fix.patch" -SRC_URI[md5sum] = "e238c89dabc566e1835e1ecb61b605b9" -SRC_URI[sha256sum] = "551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c" +SRC_URI[md5sum] = "e475167a892b589da23edf8edf8c942d" +SRC_URI[sha256sum] = "78a76ae3f3f6a26547a34630d1b740f42344848b5fb6d7c9c7f7da255e35a6e1" CFLAGS_append_libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb index 583a531ba..42bda7ea3 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=350e1b718a56df39cfe8ca9345ea4575" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "9fbf6b174a5138a61738a42e707ad8f5" -SRC_URI[sha256sum] = "5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d" +SRC_URI[md5sum] = "4fa92377e0ddc137cd226a7a87b6b29a" +SRC_URI[sha256sum] = "773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb index 9feed754d..76b76e4b3 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb @@ -6,5 +6,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" -SRC_URI[md5sum] = "6f5711bef8c765857a0887a91476283b" -SRC_URI[sha256sum] = "40295bec35077cee93be2e4c26cc00268ed6ace779ae6e97766a866c1e3927fa" +SRC_URI[md5sum] = "5774fd4f518b3f338f2b28f270e04bfc" +SRC_URI[sha256sum] = "89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb index e3bb0fb6e..16f9b7882 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb @@ -27,3 +27,8 @@ do_configure() { } FILES_${PN} += "/usr/lib/X11" + +# busybox can supply resize too +inherit update-alternatives + +ALTERNATIVE_${PN} = "resize" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.4.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb index 33bd7f03f..7cb550d27 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.4.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb @@ -8,5 +8,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=31e8892c80b7a0c1c5f37c8e8ae6d794" -SRC_URI[md5sum] = "3025b152b4f13fdffd0c46d0be587be6" -SRC_URI[sha256sum] = "d6b3a09ccfe750868e26bd2384900ab5ff0d434f7f40cd272a50eda8aaa1f8bd" +SRC_URI[md5sum] = "79972093bb0766fcd0223b2bd6d11932" +SRC_URI[sha256sum] = "99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc index b23096225..cb6b5ac77 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc @@ -7,4 +7,6 @@ XORG_PN = "${BPN}" SRC_URI = "${XORG_MIRROR}/individual/data/${BP}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch index 29dd71ab0..2bfe85b28 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch @@ -1,7 +1,7 @@ -From 834fa06920f88ceedf752964c8e296c653d541e4 Mon Sep 17 00:00:00 2001 +From f919725918fad2b32504f89a28310fcae4ab0406 Mon Sep 17 00:00:00 2001 From: Yu Ke <ke.yu@intel.com> Date: Wed, 11 Apr 2012 14:26:16 +0200 -Subject: [PATCH 01/12] COPYING: add GPLv2 license file +Subject: [PATCH] COPYING: add GPLv2 license file this is a local file recipe and the license file is missing.In order to pass the license checksum checking, the license file is needed. So @@ -9,9 +9,10 @@ this patch add the GPLv2 license file. Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - COPYING | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 339 insertions(+), 0 deletions(-) + COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 339 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING @@ -359,6 +360,3 @@ index 0000000..d511905 +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch index 26288d6d1..0ed12d106 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch @@ -1,4 +1,4 @@ -From c92ce6a4b3622874f820b5ec487a2b63f519826c Mon Sep 17 00:00:00 2001 +From 1002a1137b140dad3319bf3206fec5b6c6b74fea Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Thu, 10 Nov 2016 14:33:05 +0200 Subject: [PATCH] Don't install Xsession or Xserver @@ -8,15 +8,16 @@ Xsession scripts and xserver-common from this recipe will still be used as before. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + --- - Makefile | 1 - - 1 file changed, 1 deletion(-) + Makefile | 2 -- + 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile -index caa5de1..7e36bbc 100644 +index caa5de1..9428205 100644 --- a/Makefile +++ b/Makefile -@@ -20,7 +20,5 @@ install-program: +@@ -20,8 +20,6 @@ install-program: install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit @@ -25,6 +26,3 @@ index caa5de1..7e36bbc 100644 install -m 755 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common install -m 755 X11/functions $(DESTDIR)/etc/X11/functions install -d $(DESTDIR)/etc/X11/xmodmap --- -2.1.4 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch index 23b5345a1..0be3fa5b3 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch @@ -1,12 +1,13 @@ -From 3d1a1a8273112668927a6c6bb3e361e896f5b229 Mon Sep 17 00:00:00 2001 +From 3b5f431a370054bfc090796e8d55de8c8cea46f4 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:28:45 +0200 -Subject: [PATCH 02/12] add setdpi Xinit.d script +Subject: [PATCH] add setdpi Xinit.d script Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 92 insertions(+), 0 deletions(-) + X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) create mode 100644 X11/Xinit.d/50setdpi diff --git a/X11/Xinit.d/50setdpi b/X11/Xinit.d/50setdpi @@ -107,6 +108,3 @@ index 0000000..04a2edd + +set_dpi "$SET_SCREEN_DPI" +set_rxvt_font "$SCREEN_DPI" --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch index 7ee8572b8..53a283fea 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch @@ -1,15 +1,16 @@ -From 0c42e1fb84cc2bfe768bed17f3b979aca868cf64 Mon Sep 17 00:00:00 2001 +From b60e364c35d56a2a3164254d98c9931bfa3feed4 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:34:43 +0200 -Subject: [PATCH 06/12] add support for /etc/X11/xserver-system +Subject: [PATCH] add support for /etc/X11/xserver-system Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + X11/xserver-common | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index 4c7ed6e..6d8c9df 100644 +index 52655cb..bb7c2ff 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -204,3 +204,8 @@ fi @@ -21,6 +22,3 @@ index 4c7ed6e..6d8c9df 100644 +if [ -e /etc/X11/xserver-system ] ; then + . /etc/X11/xserver-system +fi --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch index 8791226cd..94a35407a 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch @@ -1,17 +1,18 @@ -From 63e6b9a54e1f12dbf7ddbfe3376fff4c382421a5 Mon Sep 17 00:00:00 2001 +From 492c65a32a4ae44c34580ed8ac5d3f50a155cfef Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:36:02 +0200 -Subject: [PATCH 07/12] use own functions file instead /etc/init.d/functions +Subject: [PATCH] use own functions file instead /etc/init.d/functions * so we don't have to depend on initscripts Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - Makefile | 1 + - X11/Xinit.d/11zaurus | 2 +- - X11/Xinit.d/12keymap | 2 +- - X11/functions | 11 +++++++++++ - X11/xserver-common | 2 +- + Makefile | 1 + + X11/Xinit.d/11zaurus | 2 +- + X11/Xinit.d/12keymap | 2 +- + X11/functions | 11 +++++++++++ + X11/xserver-common | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 X11/functions @@ -70,7 +71,7 @@ index 0000000..a1311ad + { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo +} diff --git a/X11/xserver-common b/X11/xserver-common -index 6d8c9df..de92bb7 100644 +index bb7c2ff..d622f2a 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -30,7 +30,7 @@ if [ -f /etc/profile ]; then @@ -82,6 +83,3 @@ index 6d8c9df..de92bb7 100644 fallback_screen_arg() { geom=`fbset | grep geometry` --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch index e35e4a74a..90d0f2584 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch @@ -1,16 +1,17 @@ -From 0ee7bf87e0c83abc79de3a99dfa3c87dd5c5b229 Mon Sep 17 00:00:00 2001 +From e2abbe110e71a7b4b56564e6b9d58ffa7f34a9e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:37:29 +0200 -Subject: [PATCH 08/12] xserver-common: add dpi and nocursor params for gta01 - and gta02 +Subject: [PATCH] xserver-common: add dpi and nocursor params for gta01 and + gta02 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + X11/xserver-common | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/X11/xserver-common b/X11/xserver-common -index de92bb7..f76fa5f 100644 +index d622f2a..a2c0591 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -133,15 +133,19 @@ else @@ -35,6 +36,3 @@ index de92bb7..f76fa5f 100644 fi ;; "motorola_ezx_platform") --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch index 1a0bde894..8fb69b356 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch @@ -1,16 +1,16 @@ -From 6d6caecb7172b9b33e7364564b0e6eabf67b6e8b Mon Sep 17 00:00:00 2001 +From f2d808cea5b9f69158f82e16c06f882a6db10d63 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:40:14 +0200 -Subject: [PATCH 09/12] xserver-common: add support for n900 alias - nokia_rx-51_board +Subject: [PATCH] xserver-common: add support for n900 alias nokia_rx-51_board Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + X11/xserver-common | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index f76fa5f..86ed17f 100644 +index a2c0591..b8c37e6 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -132,6 +132,13 @@ else @@ -27,6 +27,3 @@ index f76fa5f..86ed17f 100644 "gta01" ) DPI="280" if [ "$XSERVER" != "Xorg" ] ; then --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch index 688be40da..d30c7bbdc 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch @@ -1,15 +1,16 @@ -From 52003e6b52b1417c1a0e57243d83349addcdacf6 Mon Sep 17 00:00:00 2001 +From a194ba2013f9e58cf73cd39b57be68386e501eda Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:40:44 +0200 -Subject: [PATCH 10/12] xserver-common: add support for nexus S alias herring +Subject: [PATCH] xserver-common: add support for nexus S alias herring Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + X11/xserver-common | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index 86ed17f..5c9a6eb 100644 +index b8c37e6..9aa6b24 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -126,6 +126,9 @@ else @@ -22,6 +23,3 @@ index 86ed17f..5c9a6eb 100644 "generic_omap1510/1610/1710") ARGS="$ARGS -screen ${SCREEN_SIZE}" DPI="225" ;; --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch index f80456dfd..23e17f098 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch @@ -1,16 +1,16 @@ -From 0ecc978b7d8cb6867646fb2a29523ebef3afa016 Mon Sep 17 00:00:00 2001 +From dfd832b35b6cb4cf2b6f2b51df7b0999f10c8ca1 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:41:06 +0200 -Subject: [PATCH 11/12] xserver-common: add support for nexus one alias - mahimahi +Subject: [PATCH] xserver-common: add support for nexus one alias mahimahi Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + X11/xserver-common | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index 5c9a6eb..55594fd 100644 +index 9aa6b24..8da926e 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -129,6 +129,9 @@ else @@ -23,6 +23,3 @@ index 5c9a6eb..55594fd 100644 "generic_omap1510/1610/1710") ARGS="$ARGS -screen ${SCREEN_SIZE}" DPI="225" ;; --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch index 54a032973..5e794f6b3 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch @@ -1,16 +1,16 @@ -From d194f0302582f1ca599f2ea58c15e15f4fd6bdef Mon Sep 17 00:00:00 2001 +From d9e05e53b30c66705852256ff5c603252aa94b2c Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 11 Apr 2012 14:41:52 +0200 -Subject: [PATCH 12/12] xserver-common: add support for gta04 alias - OpenPhoenux +Subject: [PATCH] xserver-common: add support for gta04 alias OpenPhoenux Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + X11/xserver-common | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common -index 55594fd..434333e 100644 +index 8da926e..d9325dd 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -161,6 +161,14 @@ else @@ -28,6 +28,3 @@ index 55594fd..434333e 100644 "motorola_ezx_platform") ARGS="$ARGS -screen 240x320" DPI="170" ;; --- -1.7.8.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch index 49321eb42..78d2e4029 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch @@ -1,13 +1,13 @@ -From 176c3bd3d86c223fd44b0f15b62d38526bb3b0d2 Mon Sep 17 00:00:00 2001 +From 57ab521ffc1024f21105ca14be2d041a477942b1 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 17 Aug 2012 13:00:56 +0200 -Subject: [PATCH 13/13] xserver-common: add support for tuna alias Galaxy - Nexus +Subject: [PATCH] xserver-common: add support for tuna alias Galaxy Nexus Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- - X11/xserver-common | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + X11/xserver-common | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/X11/xserver-common b/X11/xserver-common index d9325dd..017e5ae 100644 @@ -28,6 +28,3 @@ index d9325dd..017e5ae 100644 "motorola_ezx_platform") ARGS="$ARGS -screen 240x320" DPI="170" ;; --- -1.7.8.6 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch index 06df2618b..a73191700 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch @@ -1,3 +1,4 @@ +From 5236209e30e0f45113e140f0667c8ffcfe621536 Mon Sep 17 00:00:00 2001 From: Javier Viguera <javier.viguera@digi.com> Date: Wed, 26 Nov 2014 09:24:44 +0100 Subject: [PATCH] xserver-common: disable TCP connections @@ -5,12 +6,13 @@ Subject: [PATCH] xserver-common: disable TCP connections Upstream-Status: Inappropriate [configuration] Signed-off-by: Javier Viguera <javier.viguera@digi.com> + --- X11/xserver-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X11/xserver-common b/X11/xserver-common -index 017e5aee1ab0..4dc48c412741 100644 +index 017e5ae..4dc48c4 100644 --- a/X11/xserver-common +++ b/X11/xserver-common @@ -44,7 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg` diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index cc3054184..a5ed21d45 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" PR = "r9" # we are using a gpe-style Makefile -inherit gpe +inherit distro_features_check gpe + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[md5sum] = "82f2f84cd96610e8f7b92c700cd31c14" SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210" |