include vc4-kms-dpi-generic.dtbo to overlays

bblayers.conf.example

@@ -0,0 +1,17 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  /home/dany/experiments/poky/meta \
+  /home/dany/experiments/poky/meta-poky \
+  /home/dany/experiments/poky/meta-yocto-bsp \
+  /home/dany/experiments/yocto-layers/meta-raspberrypi \
+  /home/dany/workspace/meta-rpi-diya \
+  /home/dany/experiments/yocto-layers/meta-openembedded/meta-oe \
+  /home/dany/experiments/yocto-layers/meta-openembedded/meta-python \
+  /home/dany/experiments/yocto-layers/meta-openembedded/meta-multimedia \
+  "

conf/layer.conf

@@ -5,12 +5,12 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-rpi-pharo"
-BBFILE_PATTERN_meta-rpi-pharo = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-rpi-pharo = "11"
+BBFILE_COLLECTIONS += "meta-rpi-diya"
+BBFILE_PATTERN_meta-rpi-diya = "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-rpi-diya = "11"
 
-LAYERDEPENDS_meta-rpi-pharo = "core raspberrypi"
-LAYERSERIES_COMPAT_meta-rpi-pharo = "honister"
+LAYERDEPENDS_meta-rpi-diya = "core raspberrypi"
+LAYERSERIES_COMPAT_meta-rpi-diya = "mickledore"
 
 PACKAGE_CLASSES = "package_ipk"
 INHERIT += "rm_work"
@@ -19,7 +19,7 @@ EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
 # ssh-server-dropbear
 DISTRO_FEATURES:append := " vc4-gfx opengl "
 # DISTRO_FEATURES:append := " vc4-gfx opengl directfb "
-MACHINE ?= "raspberrypi4-64"
+MACHINE ?= "raspberrypi0-2w-64"
 
 WKS_FILE="rpi.wks.in"
 ROOT_HOME = "/root"
@@ -31,6 +31,8 @@ ROOT_HOME = "/root"
 RPI_USE_U_BOOT = "0"
 RPI_USE_wS_28_DPI_LCD = "1"
 # enable usb boot in uboot
+ENABLE_DWC2_PERIPHERAL = "1"
+ENABLE_DWC2_HOST = "1"
 ENABLE_USB_U_BOOT = "0"
 ENABLE_UART = "0"
 DISABLE_SPLASH = "1"
@@ -40,23 +42,25 @@ ENABLE_SPI_BUS = "0"
 ENABLE_I2C = "0"
 KERNEL_MODULE_AUTOLOAD:rpi += " i2c-dev "
 
-VC4DTBO = "vc4-kms-v3d,nocomposite,noaudio"
+VC4DTBO = "vc4-kms-v3d"
 
-KERNEL_DEVICETREE:append = " overlays/vc4-kms-dpi-generic.dtbo "
+KERNEL_DEVICETREE:append = " overlays/vc4-kms-dpi-generic.dtbo overlays/dpi24.dtbo "
 
 
 RPI_EXTRA_CONFIG += "${@['','\n\
-dtoverlay=vc4-kms-dpi-generic,hactive=480,hfp=26,hsync=16,hbp=10 \n\
-dtparam=vactive=640,vfp=25,vsync=10,vbp=15 \n\
-dtparam=clock-frequency=32000000,rgb666-padhi \n\
+dtoverlay=vc4-kms-DPI-28inch \n\
 dtoverlay=waveshare-28dpi-3b-4b \n\
 dtoverlay=waveshare-28dpi-3b \n\
-dtoverlay=waveshare-28dpi-4b \n\
-display_rotate=1 #1：90；2: 180； 3: 270 \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}"
+dtoverlay=waveshare-28dpi-4b \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}"
 
 RPI_EXTRA_CONFIG += '\n\
-start_x=1             # essential \n\
-dtparam=audio=on \n\
-gpu_mem=128           # at least, or maybe more if you wish \n\
-disable_camera_led=1  # optional \n\
-'
+#start_x=1             # essential \n\
+#dtparam=audio=on \n\
+#gpu_mem=128           # at least, or maybe more if you wish \n\
+#disable_camera_led=1  # optional \n\
+'
+
+# extra kernel CMDLINE_RNDIS option
+# CMDLINE_RNDIS += ""
+# accept license for wifi and bluetooth firmware
+LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"

local.conf.example

@@ -0,0 +1,272 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at local.conf.extended
+# which contains other examples of configuration which can be placed in this file
+# but new users likely won't need any of them initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemumips64"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for 
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone-yocto"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86-64 if no other machine is selected:
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing 
+# these defaults.
+#
+DISTRO ?= "poky"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream 
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends
+# can be enabled at once and the first item listed in the variable will be used
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+
+#
+# SDK target architecture
+#
+# This variable specifies the architecture to build SDK items for and means
+# you can build the SDK packages for architectures other than the machine you are
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686, x86_64, aarch64
+#SDKMACHINE ?= "i686"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "src-pkgs"       - add -src packages for all installed packages
+#                     (adds source code for debugging)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable
+# are:
+#   - 'buildstats' collect build statistics
+USER_CLASSES ?= "buildstats"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. It can also
+# run tests against any SDK that are built. To enable this uncomment these lines.
+# See classes/test{image,sdk}.bbclass for further details.
+#IMAGE_CLASSES += "testimage testsdk"
+#TESTIMAGE_AUTO:qemuall = "1"
+
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it
+# can launch an interactive shell. It needs to do this since the build is
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necessary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS ??= "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can be
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as http or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+#
+# Yocto Project SState Mirror
+#
+# The Yocto Project has prebuilt artefacts available for its releases, you can enable
+# use of these by uncommenting the following lines. This will mean the build uses
+# the network to check for artefacts at the start of builds, which does slow it down
+# equally, it will also speed up the builds by not having to build things if they are
+# present in the cache. It assumes you can download something faster than you can build it
+# which will depend on your network.
+# Note: For this to work you also need hash-equivalence passthrough to the matching server
+#
+#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687"
+#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/3.4/PATH;downloadfilename=PATH"
+
+#
+# Qemu configuration
+#
+# By default native qemu will build with a builtin VNC server where graphical output can be
+# seen. The line below enables the SDL UI frontend too.
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
+# By default libsdl2-native will be built, if you want to use your host's libSDL instead of 
+# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
+#ASSUME_PROVIDED += "libsdl2-native"
+
+# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
+# a handy set of menus for controlling the emulator.
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
+
+#
+# Hash Equivalence
+#
+# Enable support for automatically running a local hash equivalence server and
+# instruct bitbake to use a hash equivalence aware signature generator. Hash
+# equivalence improves reuse of sstate by detecting when a given sstate
+# artifact can be reused as equivalent, even if the current task hash doesn't
+# match the one that generated the artifact.
+#
+# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
+#
+#BB_HASHSERVE = "auto"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+#
+# Memory Resident Bitbake
+#
+# Bitbake's server component can stay in memory after the UI for the current command
+# has completed. This means subsequent commands can run faster since there is no need
+# for bitbake to reload cache files and so on. Number is in seconds, after which the
+# server will shut down.
+#
+#BB_SERVER_TIMEOUT = "60"
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "2"

recipes-bsp/waveshare-2.8-lcd/files/dts/ads1115-i2c-gpio.dts

@@ -0,0 +1,103 @@
+/*
+ * TI ADS1115 multi-channel ADC overlay
+ */
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "brcm,bcm2835";
+
+	fragment@0 {
+		target = <&i2c_gpio>;
+		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
+			ads1115: ads1115@48 {
+				compatible = "ti,ads1115";
+				status = "okay";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x48>;
+			};
+		};
+	};
+
+	fragment@1 {
+		target = <&ads1115>;
+		__dormant__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			channel_a: channel_a {
+				reg = <4>;
+				ti,gain = <1>;
+				ti,datarate = <7>;
+			};
+		};
+	};
+
+	fragment@2 {
+		target = <&ads1115>;
+		__dormant__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			channel_b: channel_b {
+				reg = <5>;
+				ti,gain = <1>;
+				ti,datarate = <7>;
+			};
+		};
+	};
+
+	fragment@3 {
+		target = <&ads1115>;
+		__dormant__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			channel_c: channel_c {
+				reg = <6>;
+				ti,gain = <1>;
+				ti,datarate = <7>;
+			};
+		};
+	};
+
+	fragment@4 {
+		target = <&ads1115>;
+		__dormant__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			channel_d: channel_d {
+				reg = <7>;
+				ti,gain = <1>;
+				ti,datarate = <7>;
+			};
+		};
+	};
+
+	__overrides__ {
+		addr =            <&ads1115>,"reg:0";
+		cha_enable =      <0>,"=1";
+		cha_cfg =         <&channel_a>,"reg:0";
+		cha_gain =        <&channel_a>,"ti,gain:0";
+		cha_datarate =    <&channel_a>,"ti,datarate:0";
+		chb_enable =      <0>,"=2";
+		chb_cfg =         <&channel_b>,"reg:0";
+		chb_gain =        <&channel_b>,"ti,gain:0";
+		chb_datarate =    <&channel_b>,"ti,datarate:0";
+		chc_enable =      <0>,"=3";
+		chc_cfg =         <&channel_c>,"reg:0";
+		chc_gain =        <&channel_c>,"ti,gain:0";
+		chc_datarate =    <&channel_c>,"ti,datarate:0";
+		chd_enable =      <0>,"=4";
+		chd_cfg =         <&channel_d>,"reg:0";
+		chd_gain =        <&channel_d>,"ti,gain:0";
+		chd_datarate =    <&channel_d>,"ti,datarate:0";
+	};
+};

recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb

@@ -2,13 +2,24 @@ SUMMARY = "Waveshare 2.8 inch DPI"
 DESCRIPTION = "support overlay layer for Waveshare 2.8 inch DPI"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+inherit devicetree
 
-do_deploy () {
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI = " file://dts/ads1115-i2c-gpio.dts "
+
+S = "${WORKDIR}/dts"
+DT_FILES = "ads1115-i2c-gpio.dtbo"
+
+COMPATIBLE_MACHINE = "raspberrypi.*"
+
+do_deploy:append () {
     install -d ${DEPLOY_DIR_IMAGE}
+    install -m 0755 ${B}/ads1115-i2c-gpio.dtbo ${DEPLOY_DIR_IMAGE}/ads1115-i2c-gpio.dtbo
+    install -m 0755 ${THISDIR}/files/vc4-kms-DPI-28inch.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-DPI-28inch.dtbo
     install -m 0755 ${THISDIR}/files/waveshare-28dpi-3b-4b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-3b-4b.dtbo
     install -m 0755 ${THISDIR}/files/waveshare-28dpi-3b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-3b.dtbo
     install -m 0755 ${THISDIR}/files/waveshare-28dpi-4b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-4b.dtbo
     # install -m 0755 ${THISDIR}/files/start.mp3 ${DEPLOY_DIR_IMAGE}/start.mp3
 }
 
-addtask deploy
+# addtask deploy

recipes-core/images/README.md

@@ -9,6 +9,7 @@ pulseaudio-module-cli \
 pulseaudio-module-echo-cancel \
 pulseaudio-misc \
 i2c-tools \
+mpg123
 #tslib 
 #tslib-tests 
 #tslib-calibrate 

recipes-core/images/core-image-minimal.bbappend

@@ -1,6 +1,6 @@
 inherit extrausers
 
-KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}"
+KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/dpi24.dtbo overlays/vc4-kms-dpi-generic.dtbo overlays/ads1115-i2c-gpio.dtbo overlays/ads1115-i2c-gpio.dtbo overlays/vc4-kms-DPI-28inch.dtbo overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}"
 
 
 EXTRA_USERS_PARAMS = "usermod -p BJpK8ADNDLsGg root; \
@@ -8,15 +8,11 @@ EXTRA_USERS_PARAMS = "usermod -p BJpK8ADNDLsGg root; \
                         usermod -a -G video diya; \
                         usermod -a -G tty diya; \
                         usermod -a -G input diya; \
-                        usermod -a -G dialout diya; \
-                        usermod -a -G audio diya; \
-                        usermod -a -G avahi diya \
+                        usermod -a -G dialout diya \
                         "
 IMAGE_BOOT_FILES:append = "fs_resize"
-# KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/vc4-kms-dpi-generic.dtbo overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}"
 
-IMAGE_INSTALL:append = "mpg123 \
-                        libcurl \
+IMAGE_INSTALL:append = "libcurl \
                         libdrm \
                         libgbm \
                         libgles2 \
@@ -37,6 +33,11 @@ IMAGE_INSTALL:append = "mpg123 \
                         waveshare-2.8-lcd \
                         realtekfw \
                         diya-overlay \
-                        opensmalltalk-cog-vm \
-                        libvncserver \
-                        " 
+                        i2c-tools \
+                        bash \
+                        nano \
+                        " 
+
+# 
+# usermod -a -G audio diya;
+# usermod -a -G avahi diya

recipes-diya/diya-overlay/files/confd

@@ -6,6 +6,8 @@ DESC="Auto deployment configuration from media"
 case "$1" in
     start)
         echo -n "Start $DESC: "
+        dmesg | tee /boot/kern.log
+        lsmod | tee /boot/lsmod.txt
         if [ -f "/boot/fs_resize" ]; then
             /usr/bin/expandfs.sh
             touch /boot/home_partition_should_be_formated

recipes-example/example/example_0.1.bb

@@ -3,16 +3,17 @@ DESCRIPTION = "Recipe created by bitbake-layers"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-DEPENDS += "libsdl2 libvncserver"
+inherit pkgconfig
+
+DEPENDS += "libsdl2"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI = "file://sdl_test.cpp file://sdlgl.c file://sdlglshader.c file://sdlvncviewer.c"
+SRC_URI = "file://sdl_test.cpp file://sdlgl.c file://sdlglshader.c"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_compile() {
     ${CXX} ${WORKDIR}/sdl_test.cpp `pkg-config --cflags --libs sdl2` -o ${WORKDIR}/sdl_test
     ${CC} ${WORKDIR}/sdlgl.c `pkg-config --cflags --libs sdl2` -lGL -o ${WORKDIR}/sdlgl
     ${CC} ${WORKDIR}/sdlglshader.c `pkg-config --cflags --libs sdl2` -lGL -o ${WORKDIR}/sdlglshader
-    ${CC} ${WORKDIR}/sdlvncviewer.c `pkg-config --cflags --libs sdl2` -lvncclient -o ${WORKDIR}/sdlvncviewer
 }
 
 do_install() {
@@ -20,10 +21,8 @@ do_install() {
     install  -m 0755 ${WORKDIR}/sdl_test ${D}/usr/bin
     install  -m 0755 ${WORKDIR}/sdlgl ${D}/usr/bin
     install  -m 0755 ${WORKDIR}/sdlglshader ${D}/usr/bin
-    install  -m 0755 ${WORKDIR}/sdlvncviewer ${D}/usr/bin
     # for manual copy test applications on target from tmp dir
     install  -m 0755 ${WORKDIR}/sdl_test /tmp
     install  -m 0755 ${WORKDIR}/sdlgl /tmp
     install  -m 0755 ${WORKDIR}/sdlglshader /tmp
-    install  -m 0755 ${WORKDIR}/sdlvncviewer /tmp
 }

recipes-example/example/files/sdlvncviewer.c

@@ -1,478 +0,0 @@
-#include <SDL.h>
-#include <signal.h>
-#include <rfb/rfbclient.h>
-struct { int sdl; int rfb; } buttonMapping[]={
-        {1, rfbButton1Mask},
-        {2, rfbButton2Mask},
-        {3, rfbButton3Mask},
-        {4, rfbButton4Mask},
-        {5, rfbButton5Mask},
-        {0,0}
-};
-struct { char mask; int bits_stored; } utf8Mapping[]= {
-        {0b00111111, 6},
-        {0b01111111, 7},
-        {0b00011111, 5},
-        {0b00001111, 4},
-        {0b00000111, 3},
-        {0,0}
-};
-static int enableResizable = 1, viewOnly, listenLoop, buttonMask;
-int sdlFlags;
-SDL_Texture *sdlTexture;
-SDL_Renderer *sdlRenderer;
-SDL_Window *sdlWindow;
-/* client's pointer position */
-int x,y;
-static int rightAltKeyDown, leftAltKeyDown;
-static rfbBool resize(rfbClient* client) {
-        int width=client->width,height=client->height,
-                depth=client->format.bitsPerPixel;
-        if (enableResizable)
-                sdlFlags |= SDL_WINDOW_RESIZABLE;
-        client->updateRect.x = client->updateRect.y = 0;
-        client->updateRect.w = width; client->updateRect.h = height;
-        /* (re)create the surface used as the client's framebuffer */
-        SDL_FreeSurface(rfbClientGetClientData(client, SDL_Init));
-        SDL_Surface* sdl=SDL_CreateRGBSurface(0,
-                                              width,
-                                              height,
-                                              depth,
-                                              0,0,0,0);
-        if(!sdl)
-            rfbClientErr("resize: error creating surface: %s\n", SDL_GetError());
-        rfbClientSetClientData(client, SDL_Init, sdl);
-        client->width = sdl->pitch / (depth / 8);
-        client->frameBuffer=sdl->pixels;
-        client->format.bitsPerPixel=depth;
-        client->format.redShift=sdl->format->Rshift;
-        client->format.greenShift=sdl->format->Gshift;
-        client->format.blueShift=sdl->format->Bshift;
-        client->format.redMax=sdl->format->Rmask>>client->format.redShift;
-        client->format.greenMax=sdl->format->Gmask>>client->format.greenShift;
-        client->format.blueMax=sdl->format->Bmask>>client->format.blueShift;
-        SetFormatAndEncodings(client);
-        /* create or resize the window */
-        if(!sdlWindow) {
-            sdlWindow = SDL_CreateWindow(client->desktopName,
-                                         SDL_WINDOWPOS_UNDEFINED,
-                                         SDL_WINDOWPOS_UNDEFINED,
-                                         width,
-                                         height,
-                                         sdlFlags);
-            if(!sdlWindow)
-                rfbClientErr("resize: error creating window: %s\n", SDL_GetError());
-        } else {
-            SDL_SetWindowSize(sdlWindow, width, height);
-        }
-        /* create the renderer if it does not already exist */
-        if(!sdlRenderer) {
-            sdlRenderer = SDL_CreateRenderer(sdlWindow, -1, 0);
-            if(!sdlRenderer)
-                rfbClientErr("resize: error creating renderer: %s\n", SDL_GetError());
-            SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");  /* make the scaled rendering look smoother. */
-        }
-        SDL_RenderSetLogicalSize(sdlRenderer, width, height);  /* this is a departure from the SDL1.2-based version, but more in the sense of a VNC viewer in keeeping aspect ratio */
-        /* (re)create the texture that sits in between the surface->pixels and the renderer */
-        if(sdlTexture)
-            SDL_DestroyTexture(sdlTexture);
-        sdlTexture = SDL_CreateTexture(sdlRenderer,
-                                       SDL_PIXELFORMAT_ARGB8888,
-                                       SDL_TEXTUREACCESS_STREAMING,
-                                       width, height);
-        if(!sdlTexture)
-            rfbClientErr("resize: error creating texture: %s\n", SDL_GetError());
-        return TRUE;
-}
-static rfbKeySym SDL_key2rfbKeySym(SDL_KeyboardEvent* e) {
-        rfbKeySym k = 0;
-        SDL_Keycode sym = e->keysym.sym;
-        switch (sym) {
-        case SDLK_BACKSPACE: k = XK_BackSpace; break;
-        case SDLK_TAB: k = XK_Tab; break;
-        case SDLK_CLEAR: k = XK_Clear; break;
-        case SDLK_RETURN: k = XK_Return; break;
-        case SDLK_PAUSE: k = XK_Pause; break;
-        case SDLK_ESCAPE: k = XK_Escape; break;
-        case SDLK_DELETE: k = XK_Delete; break;
-        case SDLK_KP_0: k = XK_KP_0; break;
-        case SDLK_KP_1: k = XK_KP_1; break;
-        case SDLK_KP_2: k = XK_KP_2; break;
-        case SDLK_KP_3: k = XK_KP_3; break;
-        case SDLK_KP_4: k = XK_KP_4; break;
-        case SDLK_KP_5: k = XK_KP_5; break;
-        case SDLK_KP_6: k = XK_KP_6; break;
-        case SDLK_KP_7: k = XK_KP_7; break;
-        case SDLK_KP_8: k = XK_KP_8; break;
-        case SDLK_KP_9: k = XK_KP_9; break;
-        case SDLK_KP_PERIOD: k = XK_KP_Decimal; break;
-        case SDLK_KP_DIVIDE: k = XK_KP_Divide; break;
-        case SDLK_KP_MULTIPLY: k = XK_KP_Multiply; break;
-        case SDLK_KP_MINUS: k = XK_KP_Subtract; break;
-        case SDLK_KP_PLUS: k = XK_KP_Add; break;
-        case SDLK_KP_ENTER: k = XK_KP_Enter; break;
-        case SDLK_KP_EQUALS: k = XK_KP_Equal; break;
-        case SDLK_UP: k = XK_Up; break;
-        case SDLK_DOWN: k = XK_Down; break;
-        case SDLK_RIGHT: k = XK_Right; break;
-        case SDLK_LEFT: k = XK_Left; break;
-        case SDLK_INSERT: k = XK_Insert; break;
-        case SDLK_HOME: k = XK_Home; break;
-        case SDLK_END: k = XK_End; break;
-        case SDLK_PAGEUP: k = XK_Page_Up; break;
-        case SDLK_PAGEDOWN: k = XK_Page_Down; break;
-        case SDLK_F1: k = XK_F1; break;
-        case SDLK_F2: k = XK_F2; break;
-        case SDLK_F3: k = XK_F3; break;
-        case SDLK_F4: k = XK_F4; break;
-        case SDLK_F5: k = XK_F5; break;
-        case SDLK_F6: k = XK_F6; break;
-        case SDLK_F7: k = XK_F7; break;
-        case SDLK_F8: k = XK_F8; break;
-        case SDLK_F9: k = XK_F9; break;
-        case SDLK_F10: k = XK_F10; break;
-        case SDLK_F11: k = XK_F11; break;
-        case SDLK_F12: k = XK_F12; break;
-        case SDLK_F13: k = XK_F13; break;
-        case SDLK_F14: k = XK_F14; break;
-        case SDLK_F15: k = XK_F15; break;
-        case SDLK_NUMLOCKCLEAR: k = XK_Num_Lock; break;
-        case SDLK_CAPSLOCK: k = XK_Caps_Lock; break;
-        case SDLK_SCROLLLOCK: k = XK_Scroll_Lock; break;
-        case SDLK_RSHIFT: k = XK_Shift_R; break;
-        case SDLK_LSHIFT: k = XK_Shift_L; break;
-        case SDLK_RCTRL: k = XK_Control_R; break;
-        case SDLK_LCTRL: k = XK_Control_L; break;
-        case SDLK_RALT: k = XK_Alt_R; break;
-        case SDLK_LALT: k = XK_Alt_L; break;
-        case SDLK_LGUI: k = XK_Super_L; break;
-        case SDLK_RGUI: k = XK_Super_R; break;
-#if 0
-        case SDLK_COMPOSE: k = XK_Compose; break;
-#endif
-        case SDLK_MODE: k = XK_Mode_switch; break;
-        case SDLK_HELP: k = XK_Help; break;
-        case SDLK_PRINTSCREEN: k = XK_Print; break;
-        case SDLK_SYSREQ: k = XK_Sys_Req; break;
-        default: break;
-        }
-        /* SDL_TEXTINPUT does not generate characters if ctrl is down, so handle those here */
-        if (k == 0 && sym > 0x0 && sym < 0x100 && e->keysym.mod & KMOD_CTRL)
-               k = sym;
-        return k;
-}
-/* UTF-8 decoding is from https://rosettacode.org/wiki/UTF-8_encode_and_decode which is under GFDL 1.2 */
-static rfbKeySym utf8char2rfbKeySym(const char chr[4]) {
-        int bytes = strlen(chr);
-        int shift = utf8Mapping[0].bits_stored * (bytes - 1);
-        rfbKeySym codep = (*chr++ & utf8Mapping[bytes].mask) << shift;
-        int i;
-        for(i = 1; i < bytes; ++i, ++chr) {
-                shift -= utf8Mapping[0].bits_stored;
-                codep |= ((char)*chr & utf8Mapping[0].mask) << shift;
-        }
-        return codep;
-}
-static void update(rfbClient* cl,int x,int y,int w,int h) {
-        SDL_Surface *sdl = rfbClientGetClientData(cl, SDL_Init);
-        /* update texture from surface->pixels */
-        SDL_Rect r = {x,y,w,h};
-        if(SDL_UpdateTexture(sdlTexture, &r, sdl->pixels + y*sdl->pitch + x*4, sdl->pitch) < 0)
-            rfbClientErr("update: failed to update texture: %s\n", SDL_GetError());
-        /* copy texture to renderer and show */
-        if(SDL_RenderClear(sdlRenderer) < 0)
-            rfbClientErr("update: failed to clear renderer: %s\n", SDL_GetError());
-        if(SDL_RenderCopy(sdlRenderer, sdlTexture, NULL, NULL) < 0)
-            rfbClientErr("update: failed to copy texture to renderer: %s\n", SDL_GetError());
-        SDL_RenderPresent(sdlRenderer);
-}
-static void kbd_leds(rfbClient* cl, int value, int pad) {
-        /* note: pad is for future expansion 0=unused */
-        fprintf(stderr,"Led State= 0x%02X\n", value);
-        fflush(stderr);
-}
-/* trivial support for textchat */
-static void text_chat(rfbClient* cl, int value, char *text) {
-        switch(value) {
-        case rfbTextChatOpen:
-                fprintf(stderr,"TextChat: We should open a textchat window!\n");
-                TextChatOpen(cl);
-                break;
-        case rfbTextChatClose:
-                fprintf(stderr,"TextChat: We should close our window!\n");
-                break;
-        case rfbTextChatFinished:
-                fprintf(stderr,"TextChat: We should close our window!\n");
-                break;
-        default:
-                fprintf(stderr,"TextChat: Received \"%s\"\n", text);
-                break;
-        }
-        fflush(stderr);
-}
-#ifdef __MINGW32__
-#define LOG_TO_FILE
-#endif
-#ifdef LOG_TO_FILE
-#include <stdarg.h>
-static void
-log_to_file(const char *format, ...)
-{
-    FILE* logfile;
-    static char* logfile_str=0;
-    va_list args;
-    char buf[256];
-    time_t log_clock;
-    if(!rfbEnableClientLogging)
-      return;
-    if(logfile_str==0) {
-        logfile_str=getenv("VNCLOG");
-        if(logfile_str==0)
-            logfile_str="vnc.log";
-    }
-    logfile=fopen(logfile_str,"a");
-    va_start(args, format);
-    time(&log_clock);
-    strftime(buf, 255, "%d/%m/%Y %X ", localtime(&log_clock));
-    fprintf(logfile,buf);
-    vfprintf(logfile, format, args);
-    fflush(logfile);
-    va_end(args);
-    fclose(logfile);
-}
-#endif
-static void cleanup(rfbClient* cl)
-{
-  /*
-    just in case we're running in listenLoop:
-    close viewer window by restarting SDL video subsystem
-  */
-  SDL_QuitSubSystem(SDL_INIT_VIDEO);
-  SDL_InitSubSystem(SDL_INIT_VIDEO);
-  if(cl)
-    rfbClientCleanup(cl);
-}
-static rfbBool handleSDLEvent(rfbClient *cl, SDL_Event *e)
-{
-        switch(e->type) {
-        case SDL_WINDOWEVENT:
-            switch (e->window.event) {
-            case SDL_WINDOWEVENT_EXPOSED:
-                SendFramebufferUpdateRequest(cl, 0, 0,
-                                        cl->width, cl->height, FALSE);
-                break;
-            case SDL_WINDOWEVENT_FOCUS_GAINED:
-                if (SDL_HasClipboardText()) {
-                        char *text = SDL_GetClipboardText();
-                        if(text) {
-                            rfbClientLog("sending clipboard text '%s'\n", text);
-                            SendClientCutText(cl, text, strlen(text));
-                        }
-                }
-                break;
-            case SDL_WINDOWEVENT_FOCUS_LOST:
-                if (rightAltKeyDown) {
-                        SendKeyEvent(cl, XK_Alt_R, FALSE);
-                        rightAltKeyDown = FALSE;
-                        rfbClientLog("released right Alt key\n");
-                }
-                if (leftAltKeyDown) {
-                        SendKeyEvent(cl, XK_Alt_L, FALSE);
-                        leftAltKeyDown = FALSE;
-                        rfbClientLog("released left Alt key\n");
-                }
-                break;
-            }
-            break;
-        case SDL_MOUSEWHEEL:
-        {
-                int steps;
-                if (viewOnly)
-                        break;
-                if(e->wheel.y > 0)
-                    for(steps = 0; steps < e->wheel.y; ++steps) {
-                        SendPointerEvent(cl, x, y, rfbButton4Mask);
-                        SendPointerEvent(cl, x, y, 0);
-                    }
-                if(e->wheel.y < 0)
-                    for(steps = 0; steps > e->wheel.y; --steps) {
-                        SendPointerEvent(cl, x, y, rfbButton5Mask);
-                        SendPointerEvent(cl, x, y, 0);
-                    }
-                if(e->wheel.x > 0)
-                    for(steps = 0; steps < e->wheel.x; ++steps) {
-                        SendPointerEvent(cl, x, y, 0b01000000);
-                        SendPointerEvent(cl, x, y, 0);
-                    }
-                if(e->wheel.x < 0)
-                    for(steps = 0; steps > e->wheel.x; --steps) {
-                        SendPointerEvent(cl, x, y, 0b00100000);
-                        SendPointerEvent(cl, x, y, 0);
-                    }
-                break;
-        }
-        case SDL_MOUSEBUTTONUP:
-        case SDL_MOUSEBUTTONDOWN:
-        case SDL_MOUSEMOTION:
-        {
-                int state, i;
-                if (viewOnly)
-                        break;
-                if (e->type == SDL_MOUSEMOTION) {
-                        x = e->motion.x;
-                        y = e->motion.y;
-                        state = e->motion.state;
-                }
-                else {
-                        x = e->button.x;
-                        y = e->button.y;
-                        state = e->button.button;
-                        for (i = 0; buttonMapping[i].sdl; i++)
-                                if (state == buttonMapping[i].sdl) {
-                                        state = buttonMapping[i].rfb;
-                                        if (e->type == SDL_MOUSEBUTTONDOWN)
-                                                buttonMask |= state;
-                                        else
-                                                buttonMask &= ~state;
-                                        break;
-                                }
-                }
-                SendPointerEvent(cl, x, y, buttonMask);
-                buttonMask &= ~(rfbButton4Mask | rfbButton5Mask);
-                break;
-        }
-        case SDL_KEYUP:
-        case SDL_KEYDOWN:
-                if (viewOnly)
-                        break;
-                SendKeyEvent(cl, SDL_key2rfbKeySym(&e->key),
-                        e->type == SDL_KEYDOWN ? TRUE : FALSE);
-                if (e->key.keysym.sym == SDLK_RALT)
-                        rightAltKeyDown = e->type == SDL_KEYDOWN;
-                if (e->key.keysym.sym == SDLK_LALT)
-                        leftAltKeyDown = e->type == SDL_KEYDOWN;
-                break;
-        case SDL_TEXTINPUT:
-                if (viewOnly)
-                        break;
-                rfbKeySym sym = utf8char2rfbKeySym(e->text.text);
-                SendKeyEvent(cl, sym, TRUE);
-                SendKeyEvent(cl, sym, FALSE);
-                break;
-        case SDL_QUIT:
-                if(listenLoop)
-                  {
-                    cleanup(cl);
-                    return FALSE;
-                  }
-                else
-                  {
-                    rfbClientCleanup(cl);
-                    exit(0);
-                  }
-        default:
-                rfbClientLog("ignore SDL event: 0x%x\n", e->type);
-        }
-        return TRUE;
-}
-static void got_selection(rfbClient *cl, const char *text, int len)
-{
-        rfbClientLog("received clipboard text '%s'\n", text);
-        if(SDL_SetClipboardText(text) != 0)
-            rfbClientErr("could not set received clipboard text: %s\n", SDL_GetError());
-}
-static rfbCredential* get_credential(rfbClient* cl, int credentialType){
-        rfbCredential *c = malloc(sizeof(rfbCredential));
-        c->userCredential.username = malloc(RFB_BUF_SIZE);
-        c->userCredential.password = malloc(RFB_BUF_SIZE);
-        if(credentialType != rfbCredentialTypeUser) {
-            rfbClientErr("something else than username and password required for authentication\n");
-            return NULL;
-        }
-        rfbClientLog("username and password required for authentication!\n");
-        printf("user: ");
-        fgets(c->userCredential.username, RFB_BUF_SIZE, stdin);
-        printf("pass: ");
-        fgets(c->userCredential.password, RFB_BUF_SIZE, stdin);
-        /* remove trailing newlines */
-        c->userCredential.username[strcspn(c->userCredential.username, "\n")] = 0;
-        c->userCredential.password[strcspn(c->userCredential.password, "\n")] = 0;
-        return c;
-}
-#ifdef mac
-#define main SDLmain
-#endif
-int main(int argc,char** argv) {
-        rfbClient* cl;
-        int i, j;
-        SDL_Event e;
-#ifdef LOG_TO_FILE
-        rfbClientLog=rfbClientErr=log_to_file;
-#endif
-        for (i = 1, j = 1; i < argc; i++)
-                if (!strcmp(argv[i], "-viewonly"))
-                        viewOnly = 1;
-                else if (!strcmp(argv[i], "-resizable"))
-                        enableResizable = 1;
-                else if (!strcmp(argv[i], "-no-resizable"))
-                        enableResizable = 0;
-                else if (!strcmp(argv[i], "-listen")) {
-                        listenLoop = 1;
-                        argv[i] = "-listennofork";
-                        ++j;
-                }
-                else {
-                        if (i != j)
-                                argv[j] = argv[i];
-                        j++;
-                }
-        argc = j;
-        SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
-        atexit(SDL_Quit);
-        signal(SIGINT, exit);
-        do {
-          /* 16-bit: cl=rfbGetClient(5,3,2); */
-          cl=rfbGetClient(8,3,4);
-          cl->MallocFrameBuffer=resize;
-          cl->canHandleNewFBSize = TRUE;
-          cl->GotFrameBufferUpdate=update;
-          cl->HandleKeyboardLedState=kbd_leds;
-          cl->HandleTextChat=text_chat;
-          cl->GotXCutText = got_selection;
-          cl->GetCredential = get_credential;
-          cl->listenPort = LISTEN_PORT_OFFSET;
-          cl->listen6Port = LISTEN_PORT_OFFSET;
-          if(!rfbInitClient(cl,&argc,argv))
-            {
-              cl = NULL; /* rfbInitClient has already freed the client struct */
-              cleanup(cl);
-              break;
-            }
-          while(1) {
-            if(SDL_PollEvent(&e)) {
-              /*
-                handleSDLEvent() return 0 if user requested window close.
-                In this case, handleSDLEvent() will have called cleanup().
-              */
-              if(!handleSDLEvent(cl, &e))
-                break;
-            }
-            else {
-              i=WaitForMessage(cl,500);
-              if(i<0)
-                {
-                  cleanup(cl);
-                  break;
-                }
-              if(i)
-                if(!HandleRFBServerMessage(cl))
-                  {
-                    cleanup(cl);
-                    break;
-                  }
-            }
-          }
-        }
-        while(listenLoop);
-        return 0;
-}