diff options
Diffstat (limited to 'meta-rcar-gen3-adas')
62 files changed, 349 insertions, 3980 deletions
diff --git a/meta-rcar-gen3-adas/conf/layer.conf b/meta-rcar-gen3-adas/conf/layer.conf index 666405a..a091d3a 100644 --- a/meta-rcar-gen3-adas/conf/layer.conf +++ b/meta-rcar-gen3-adas/conf/layer.conf @@ -10,120 +10,3 @@ BBFILES += " \ BBFILE_COLLECTIONS += "rcar-gen3-adas" BBFILE_PATTERN_rcar-gen3-adas := "^${LAYERDIR}/" BBFILE_PRIORITY_rcar-gen3-adas = "7" - -# Custom packages -IMAGE_INSTALL_append_rcar-gen3 = " \ - kernel-modules \ - kernel-devicetree \ - can-utils \ - libsocketcan \ - iproute2 \ - iproute2-tc \ - linuxptp \ - spidev-dbg spidev-test \ - e2fsprogs \ - e2fsprogs-tune2fs \ - ethtool \ - pciutils \ - usbutils \ - util-linux \ - mtd-utils \ - capture \ - v4l2-fw \ - iperf \ - bonnie++ \ - lmbench \ - strace \ - libpcap \ - eglibc-utils \ - ldd \ - procps \ - rsync \ - mm-init \ - iio-utils \ - pulseaudio-server \ - pulseaudio-misc \ - pulseaudio-module-cli \ - pulseaudio-module-remap-sink \ - pulseaudio-module-remap-source \ - pulseaudio-module-loopback \ - gstreamer1.0-plugins-good-pulse \ - gdbserver \ - most-tools \ - perf \ - dropbear \ - opkg \ - git \ - git-perltools \ - subversion \ - nano \ - cmake \ - make \ - gcc \ - g++ \ - gdb \ - vim \ - trace-cmd \ -" - -# Radio packages -IMAGE_INSTALL_append_rcar-gen3 += " \ - si-tools \ - linux-firmware-wl18xx \ - wireless-tools \ - ti-bt \ - ti-bt-firmware \ - bluez5 \ - bluez5-testtools \ - pulseaudio-module-bluez5-device \ - pulseaudio-module-bluez5-discover \ - pulseaudio-module-bluetooth-discover \ - pulseaudio-module-bluetooth-policy \ - ofono \ - ofono-tests \ - br-test \ -" - -# IMP -IMAGE_INSTALL_append_r8a7797 += " \ - kernel-module-uio-imp \ - kernel-module-cmemdrv \ - udev-rules-cvlib \ -" - -IMAGE_INSTALL_append_r8a7798 += " \ - kernel-module-uio-imp \ - kernel-module-cmemdrv \ - udev-rules-cvlib \ -" - -# ISP -IMAGE_INSTALL_append_r8a7797 += " \ - kernel-module-uio-isp \ -" - -IMAGE_INSTALL_append_r8a7798 += " \ - kernel-module-uio-isp \ -" - -DISTRO_FEATURES_remove="x11" -DISTRO_FEATURES_append = " surroundview " -DISTRO_FEATURES_append = " opencv-sdk " -DISTRO_FEATURES_append = " bluetooth" -DISTRO_FEATURES_append = " pulseaudio" - -IMAGE_INSTALL_remove = "gtk+3-demo clutter-1.0-examples" - -EXTRA_IMAGE_FEATURES_append_rcar-gen3 = " eclipse-debug" - -EX_IMG_FEATURES = " \ - dev-pkgs \ - tools-sdk \ - tools-profile \ - tools-debug \ - package-management \ -" -EXTRA_IMAGE_FEATURES_append_r8a7797 += " ${EX_IMG_FEATURES}" -EXTRA_IMAGE_FEATURES_append_r8a7798 += " ${EX_IMG_FEATURES}" - -PREFERRED_VERSION_opencv = "2.4%" diff --git a/meta-rcar-gen3-adas/recipes-bsp/linux-firmware/linux-firmware_git.bbappend b/meta-rcar-gen3-adas/recipes-bsp/linux-firmware/linux-firmware_git.bbappend deleted file mode 100644 index fdee4b0..0000000 --- a/meta-rcar-gen3-adas/recipes-bsp/linux-firmware/linux-firmware_git.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE_${PN}-rtl8188eu = "Firmware-rtlwifi_firmware" - -FILES_${PN}-rtl8188eu = " \ - /lib/firmware/rtlwifi/rtl8188eufw*.bin \ -" - -RDEPENDS_${PN}-rtl8188eu += "${PN}-rtl-license" - -PACKAGES =+ " ${PN}-rtl8188eu" - -FILES_${PN}-ath9k += " \ - /lib/firmware/ath9k_htc/htc*.fw \ -" - - diff --git a/meta-rcar-gen3-adas/recipes-bsp/si-tools/files/si-tools-fm-improvements.patch b/meta-rcar-gen3-adas/recipes-bsp/si-tools/files/si-tools-fm-improvements.patch new file mode 100644 index 0000000..9bbccad --- /dev/null +++ b/meta-rcar-gen3-adas/recipes-bsp/si-tools/files/si-tools-fm-improvements.patch @@ -0,0 +1,184 @@ +FM configuration improvements + +Changes include: +- Add command-line option for selecting FM band plan. The default + band plan is US / Canada. +- Add command-line options for setting FM scanning valid SNR and RSSI + thresholds to allow tweaking sensitivity in poor radio environments. +- Increased seeking scan timeout to 3 seconds, which seems to improve + behavior in poor radio environments where powerful stations may be + far apart. +- Removed explicit setting of FM_SOFTMUTE_SNR_LIMITS, as it seemed + like it might be resulting in odd muting behavior when scanning. +- Changed initial FM frequency if not specified to the minimum of the + band plan. + +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +diff --git a/si46xx.h b/si46xx.h +index 172ea8b..c32fca4 100644 +--- a/si46xx.h ++++ b/si46xx.h +@@ -83,6 +83,7 @@ + #define SI46XX_PIN_CONFIG_ENABLE 0x0800 + #define SI46XX_FM_SEEK_BAND_BOTTOM 0x3100 + #define SI46XX_FM_SEEK_BAND_TOP 0x3101 ++#define SI46XX_FM_SEEK_FREQUENCY_SPACING 0x3102 + #define SI46XX_FM_VALID_MAX_TUNE_ERROR 0x3200 + #define SI46XX_FM_VALID_RSSI_TIME 0x3201 + #define SI46XX_FM_VALID_RSSI_THRESHOLD 0x3202 +@@ -150,7 +151,7 @@ + #define MAX_SERVICES 32 + #define MAX_COMPONENTS 15 + +-#define TIMEOUT_SEEK 2000 /* mS = 2S */ ++#define TIMEOUT_SEEK 3000 /* mS = 3S */ + #define TIMEOUT_TUNE 500 /* mS = .5S */ + + struct dab_service_t{ +diff --git a/si_ctl.c b/si_ctl.c +index 59dfaf2..f168218 100644 +--- a/si_ctl.c ++++ b/si_ctl.c +@@ -101,6 +101,26 @@ uint32_t frequency_list_ch[] = { CHAN_12A, + CHAN_9D, + CHAN_8B}; + ++// Structure to describe FM band plans, all values in Hz. ++typedef struct { ++ char *name; ++ uint32_t min; ++ uint32_t max; ++ uint32_t step; ++} fm_band_plan_t; ++ ++static fm_band_plan_t known_fm_band_plans[5] = { ++ { .name = "US", .min = 87900000, .max = 107900000, .step = 200000 }, ++ { .name = "JP", .min = 76000000, .max = 95000000, .step = 100000 }, ++ { .name = "EU", .min = 87500000, .max = 108000000, .step = 50000 }, ++ { .name = "ITU-1", .min = 87500000, .max = 108000000, .step = 50000 }, ++ { .name = "ITU-2", .min = 87900000, .max = 107900000, .step = 50000 } ++}; ++ ++static unsigned int fm_band_plan; ++static int fm_snr_threshold = 128; ++static int fm_rssi_threshold = 128; ++ + int init_am(int offset) + { + int ret; +@@ -160,12 +180,32 @@ int init_fm(int offset) + * enable I2S output + */ + si46xx_set_property(SI46XX_PIN_CONFIG_ENABLE, 0x0003); +- //si46xx_set_property(SI46XX_FM_VALID_RSSI_THRESHOLD,0x0000); +- //si46xx_set_property(SI46XX_FM_VALID_SNR_THRESHOLD,0x0000); +- si46xx_set_property(SI46XX_FM_SOFTMUTE_SNR_LIMITS, 0x0000); // set the SNR limits for soft mute attenuation ++ //si46xx_set_property(SI46XX_FM_SOFTMUTE_SNR_LIMITS, 0x0000); // set the SNR limits for soft mute attenuation + si46xx_set_property(SI46XX_FM_TUNE_FE_CFG, 0x0000); // front end switch open +- si46xx_set_property(SI46XX_FM_SEEK_BAND_BOTTOM, 88000 / 10); +- si46xx_set_property(SI46XX_FM_SEEK_BAND_TOP, 108000 / 10); ++ ++ //si46xx_set_property(SI46XX_FM_SEEK_BAND_BOTTOM, 88000 / 10); ++ //si46xx_set_property(SI46XX_FM_SEEK_BAND_TOP, 108000 / 10); ++ if (verbose) ++ fprintf(stderr, "Using FM Bandplan: %s\n", known_fm_band_plans[fm_band_plan].name); ++ si46xx_set_property(SI46XX_FM_SEEK_BAND_BOTTOM, known_fm_band_plans[fm_band_plan].min / 10000); ++ si46xx_set_property(SI46XX_FM_SEEK_BAND_TOP, known_fm_band_plans[fm_band_plan].max / 10000); ++ if (verbose) ++ fprintf(stderr, "Using FM band: %d - %d, %d spacing\n", ++ known_fm_band_plans[fm_band_plan].min / 10000, ++ known_fm_band_plans[fm_band_plan].max / 10000, ++ known_fm_band_plans[fm_band_plan].step / 10000); ++ si46xx_set_property(SI46XX_FM_SEEK_FREQUENCY_SPACING, known_fm_band_plans[fm_band_plan].step / 10000); ++ if (fm_snr_threshold != 128) { ++ if (verbose) ++ fprintf(stderr, "Setting FM valid SNR threshold to %d dB\n", fm_snr_threshold); ++ si46xx_set_property(SI46XX_FM_VALID_SNR_THRESHOLD, fm_snr_threshold); ++ } ++ if (fm_rssi_threshold != 128) { ++ if (verbose) ++ fprintf(stderr, "Setting FM valid RSSI threshold to %d dB\n", fm_rssi_threshold); ++ si46xx_set_property(SI46XX_FM_VALID_RSSI_THRESHOLD, fm_rssi_threshold); ++ } ++ + /* + * rate + */ +@@ -190,6 +230,7 @@ int init_fm(int offset) + + return 0; + } ++ + int init_dab(int offset) + { + int ret; +@@ -245,6 +286,10 @@ int output_help(char *prog_name) + printf(" -l up|down FM/AM seek next station\n"); + printf(" -d FM/AM RSQ status\n"); + printf(" -m FM rds status\n"); ++ printf("Common FM:\n"); ++ printf(" -p bandplan FM bandplan (us, jp, eu, itu-1, itu-2\n"); ++ printf(" -t SNR FM scan valid SNR threshold (-127 to 127 dB)\n"); ++ printf(" -u RSSI FM scan valid RSSI threshold (-127 to 127 dBuV)\n"); + printf("DAB only:\n"); + printf(" -e dab status\n"); + printf(" -f service start service of dab service list\n"); +@@ -354,6 +399,7 @@ int main(int argc, char **argv) + int offset = - 1; + int mode; + int tmp; ++ unsigned int i; + struct dab_digrad_status_t dab_digrad_status; + bool init = false; + bool seek_up = false; +@@ -374,7 +420,7 @@ int main(int argc, char **argv) + + optind = 0; + while (optind < argc) { +- if ((c = getopt(argc, argv, "a:b:c:def:ghi:j:k:l:mnosv")) != -1) { ++ if ((c = getopt(argc, argv, "a:b:c:def:ghi:j:k:l:mnop:st:u:v")) != -1) { + switch(c){ + /* init */ + case 'a': +@@ -422,6 +468,31 @@ int main(int argc, char **argv) + case 'c': + frequency = atoi(optarg); + break; ++ /* FM */ ++ case 'p': ++ for(i = 0; ++ i < sizeof(known_fm_band_plans) / sizeof(fm_band_plan_t); ++ i++) { ++ if(!strcasecmp(optarg, known_fm_band_plans[i].name)) { ++ fm_band_plan = i; ++ break; ++ } ++ } ++ if(i >= (sizeof(known_fm_band_plans) / sizeof(fm_band_plan_t))) { ++ printf("Invalid mode: %s\n", optarg); ++ return -EINVAL; ++ } ++ break; ++ case 't': ++ fm_snr_threshold = atoi(optarg); ++ if(fm_snr_threshold < -128 || fm_snr_threshold > 127) ++ fm_snr_threshold = 128; // use firmware default ++ break; ++ case 'u': ++ fm_rssi_threshold = atoi(optarg); ++ if(fm_rssi_threshold < -128 || fm_rssi_threshold > 127) ++ fm_rssi_threshold = 128; // use firmware default ++ break; + /* DAB stuff. TODO: rework */ + case 'e': + si46xx_dab_digrad_status(&dab_digrad_status); +@@ -473,7 +544,7 @@ int main(int argc, char **argv) + case SI46XX_MODE_FM: + ret = init_fm(offset); + if (frequency < 0) +- frequency = 105500; ++ frequency = known_fm_band_plans[fm_band_plan].min / 1000; + break; + case SI46XX_MODE_AM: + ret = init_am(offset); diff --git a/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bb b/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bb index 5db9408..634000a 100644 --- a/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bb +++ b/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bb @@ -8,10 +8,13 @@ PV = "0.2" SRC_URI = " \ file://si-tools.tar.gz \ + file://si-tools-fm-improvements.patch \ " S = "${WORKDIR}/si-tools" +EXTRA_OEMAKE_append = " 'LDFLAGS=${LDFLAGS}'" + do_install() { install -d ${D}${bindir} install -d ${D}/lib/firmware/radio/ diff --git a/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bb b/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bb deleted file mode 100644 index 3251662..0000000 --- a/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Bluetooth firmare files for WL18xx combo modules" -SECTION = "misc" - -LICENSE = "CLOSED" - -PE = "1" -PV = "0.0" - -SRC_URI = "git://github.com/TI-ECS/bt-firmware.git;protocol=git " -SRCREV = "169b2df5b968f0ede32ea9044859942fc220c435" - -S = "${WORKDIR}/git" - -CLEANBROKEN = "1" - -do_populate_lic[noexec] = "1" -do_compile[noexec] = "1" -do_configure[noexec] = "1" - -do_install() { - install -d ${D}/lib/firmware/ti-connectivity/ - cp *.bts ${D}/lib/firmware/ti-connectivity/ -} - -FILES_${PN} = "/lib/firmware/ti-connectivity/*"
\ No newline at end of file diff --git a/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot/0016-tools-fix-build-fail.patch b/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot/0016-tools-fix-build-fail.patch deleted file mode 100644 index ab66851..0000000 --- a/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot/0016-tools-fix-build-fail.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 34b8d92c5139b37322548cc41c5c3a788c51d3ad Mon Sep 17 00:00:00 2001 -From: Vladimir Barinov <vladimir.barinov@cogentembedded.com> -Date: Tue, 2 May 2017 12:55:23 +0300 -Subject: [PATCH] tools: fix build fail - -Build fail fix for CONFIG_ENV_IS_IN_SPI_FLASH - -Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com> ---- - tools/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index 4bbb153..12719ac 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -211,7 +211,8 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ - -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ - -DUSE_HOSTCC \ - -D__KERNEL_STRICT_NAMES \ -- -D_GNU_SOURCE -+ -D_GNU_SOURCE \ -+ -include $(srctree)/include/generated/autoconf.h - - __build: $(LOGO-y) - --- -1.9.1 - diff --git a/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend b/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend index 0896fde..9653201 100644 --- a/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend +++ b/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend @@ -1,5 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +BRANCH = "v2015.04/rcar-3.5.9" +SRCREV = "24add58d915191d901915a6a8cc44faa748fcaa2" + SRC_URI_append = " \ file://0001-net-phy-support-fixed-PHY.patch \ ${@bb.utils.contains('MACHINE_FEATURES', 'h3ulcb-had', ' file://0002-net-ravb-remove-APSR-quirk.patch', '', d)} \ @@ -17,7 +20,6 @@ SRC_URI_append = " \ file://0013-mtd-spi-QSPI-flash-support.patch \ file://0014-arm-renesas-Add-Renesas-R8A7797-SoC-support.patch \ file://0015-board-renesas-Add-V3M-Eagle-board.patch \ - file://0016-tools-fix-build-fail.patch \ file://0017-board-renesas-Add-V3MSK-board.patch \ file://0018-arm-renesas-Add-Renesas-R8A7798-SoC-support.patch \ file://0019-board-renesas-Add-Condor-board.patch \ diff --git a/meta-rcar-gen3-adas/recipes-bsp/utest-apps/files/0001-utest-utest-common.c-Check-return-value-of-write.patch b/meta-rcar-gen3-adas/recipes-bsp/utest-apps/files/0001-utest-utest-common.c-Check-return-value-of-write.patch new file mode 100644 index 0000000..80cf032 --- /dev/null +++ b/meta-rcar-gen3-adas/recipes-bsp/utest-apps/files/0001-utest-utest-common.c-Check-return-value-of-write.patch @@ -0,0 +1,44 @@ +From 1fd2e6ce6a443d20e6a103261860816fa5600591 Mon Sep 17 00:00:00 2001 +From: Tom Rini <trini@konsulko.com> +Date: Wed, 20 Dec 2017 09:58:47 -0500 +Subject: [PATCH 1/1] utest/utest-common.c: Check return value of write() + +Signed-off-by: Tom Rini <trini@konsulko.com> +--- + utest/utest-common.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/utest/utest-common.c b/utest/utest-common.c +index 38bd4714bccc..922b4bdc40a9 100644 +--- a/utest/utest-common.c ++++ b/utest/utest-common.c +@@ -66,7 +66,7 @@ int intern_trace(const char *format, ...) + struct timespec ts; + static char buffer[4096]; + char *p = buffer; +- int n = sizeof(buffer), k; ++ int n = sizeof(buffer), k, ret; + + /* ...retrieve value of monotonic clock */ + clock_gettime(CLOCK_MONOTONIC, &ts); +@@ -88,12 +88,15 @@ int intern_trace(const char *format, ...) + /* ...output string terminator */ + (n > 0 ? *p++ = '\n' : 0); + +- write(intern_trace_fd, buffer, p - buffer); ++ ret = write(intern_trace_fd, buffer, p - buffer); + + /* ...release tracing lock */ + pthread_mutex_unlock(&intern_trace_mutex); + +- return 0; ++ if (ret != -1) ++ return 0; ++ else ++ return -1; + } + + /* ...tracing facility initialization */ +-- +2.7.4 + diff --git a/meta-rcar-gen3-adas/recipes-bsp/utest-apps/utest-cam-imr-drm.bb b/meta-rcar-gen3-adas/recipes-bsp/utest-apps/utest-cam-imr-drm.bb index 48747ea..4c6be5b 100644 --- a/meta-rcar-gen3-adas/recipes-bsp/utest-apps/utest-cam-imr-drm.bb +++ b/meta-rcar-gen3-adas/recipes-bsp/utest-apps/utest-cam-imr-drm.bb @@ -7,6 +7,7 @@ S = "${WORKDIR}/utest-cam-imr-drm" SRC_URI = " \ file://utest-cam-imr-drm.tar.gz \ + file://0001-utest-utest-common.c-Check-return-value-of-write.patch \ " DEPENDS = " \ diff --git a/meta-rcar-gen3-adas/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-rcar-gen3-adas/recipes-connectivity/bluez5/bluez5_%.bbappend deleted file mode 100644 index 99b0ede..0000000 --- a/meta-rcar-gen3-adas/recipes-connectivity/bluez5/bluez5_%.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" - -SRC_URI_append_rcar-gen3 = " \ - file://main.conf \ -" - -PACKAGECONFIG_append = " experimental" - -NOINST_TOOLS_EXPERIMENTAL_remove = " tools/bdaddr" - - -do_install_append_rcar-gen3() { - install -d ${D}/etc/bluetooth - - install -m 644 ${WORKDIR}/main.conf ${D}/${sysconfdir}/bluetooth/ -} diff --git a/meta-rcar-gen3-adas/recipes-connectivity/bluez5/files/main.conf b/meta-rcar-gen3-adas/recipes-connectivity/bluez5/files/main.conf deleted file mode 100644 index d3e19f7..0000000 --- a/meta-rcar-gen3-adas/recipes-connectivity/bluez5/files/main.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Policy] -AutoEnable=true diff --git a/meta-rcar-gen3-adas/recipes-core/systemd/systemd/dummy0.network b/meta-rcar-gen3-adas/recipes-core/systemd/systemd/dummy0.network deleted file mode 100644 index 054e17b..0000000 --- a/meta-rcar-gen3-adas/recipes-core/systemd/systemd/dummy0.network +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Name=dummy0 - -[Network] -DHCP=no - diff --git a/meta-rcar-gen3-adas/recipes-core/systemd/systemd/eth0.network b/meta-rcar-gen3-adas/recipes-core/systemd/systemd/eth0.network deleted file mode 100644 index 74951b4..0000000 --- a/meta-rcar-gen3-adas/recipes-core/systemd/systemd/eth0.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Name=eth0 - -[Network] -DHCP=ipv4 - -[DHCP] -CriticalConnection=true diff --git a/meta-rcar-gen3-adas/recipes-core/systemd/systemd_229.bbappend b/meta-rcar-gen3-adas/recipes-core/systemd/systemd_229.bbappend deleted file mode 100644 index f4dc296..0000000 --- a/meta-rcar-gen3-adas/recipes-core/systemd/systemd_229.bbappend +++ /dev/null @@ -1,22 +0,0 @@ -FILESEXTRAPATHS_append := '${THISDIR}/${PN}:' - -PACKAGECONFIG += " networkd resolved " - -SRC_URI_append = "file://eth0.network" - -SRC_URI_append= '${@ " \ - file://dummy0.network \ -" if 'surroundview' in '${DISTRO_FEATURES}' else ""}' - -FILES_${PN} += "${sysconfdir}/systemd/network/*" - -USERADD_PARAM_${PN} += "; --system systemd-network " - -do_install_append() { - - install -d ${D}${sysconfdir}/systemd/network/ - - install -m 0644 ${WORKDIR}/*.network ${D}${sysconfdir}/systemd/network/ -} - -PR="r2" diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch deleted file mode 100644 index a78e195..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9762fd23e1f1db66d4b977c694a17d3bca3fe99a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 8 Jan 2016 16:36:29 +0200 -Subject: [PATCH] Remove tests that fail to build on some PPC32 configurations - -Failures are documented here: -http://errors.yoctoproject.org/Errors/Search/?items=10&query=862d702fbb99e484631315aa44b9e46f8fc567da&filter=valgrind&type=recipe - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -Upstream-Status: Pending ---- - memcheck/tests/ppc32/Makefile.am | 2 +- - none/tests/ppc32/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am -index 26b95a2..8f05743 100644 ---- a/memcheck/tests/ppc32/Makefile.am -+++ b/memcheck/tests/ppc32/Makefile.am -@@ -10,7 +10,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ - power_ISA2_07.stderr.exp power_ISA2_07.vgtest - - check_PROGRAMS = \ -- power_ISA2_05 power_ISA2_07 -+ power_ISA2_07 - - power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \ - -I$(top_srcdir)/include @FLAG_M32@ -diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am -index 196239e..0fe3425 100644 ---- a/none/tests/ppc32/Makefile.am -+++ b/none/tests/ppc32/Makefile.am -@@ -50,13 +50,13 @@ EXTRA_DIST = \ - - check_PROGRAMS = \ - allexec \ -- lsw jm-insns round \ -+ lsw \ - test_isa_2_06_part1 test_isa_2_06_part2 test_isa_2_06_part3 \ - test_dfp1 test_dfp2 test_dfp3 test_dfp4 test_dfp5 \ - test_isa_2_07_part1 test_isa_2_07_part2 \ - test_tm test_touch_tm ldst_multiple data-cache-instructions \ - test_fx test_gx \ -- testVMX twi tw xlc_dbl_u32 power5+_round power6_bcmp \ -+ twi tw xlc_dbl_u32 power6_bcmp \ - bug129390-ppc32 bug139050-ppc32 \ - ldstrev mftocrf mcrfs - --- -2.6.4 - diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0001-fix-build-for-musl-targets.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0001-fix-build-for-musl-targets.patch deleted file mode 100644 index dc6feff..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0001-fix-build-for-musl-targets.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 1b1a024efd18d44294e184e792c1e039cab02bfe Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 14 Feb 2016 09:14:12 +0000 -Subject: [PATCH] fix build for musl targets - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 2 -- - coregrind/vg_preloaded.c | 2 +- - include/pub_tool_redir.h | 7 +++++-- - 3 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9366dc7..679f514 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in - ;; - 2.0|2.1|*) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,]) -- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc]) - ;; - esac - -diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c -index 2ea7a7a..e49c832 100644 ---- a/coregrind/vg_preloaded.c -+++ b/coregrind/vg_preloaded.c -@@ -56,7 +56,7 @@ - void VG_NOTIFY_ON_LOAD(freeres)( void ); - void VG_NOTIFY_ON_LOAD(freeres)( void ) - { --# if !defined(__UCLIBC__) \ -+# if !defined(__UCLIBC__) && defined(__GLIBC__) \ - && !defined(VGPV_arm_linux_android) \ - && !defined(VGPV_x86_linux_android) \ - && !defined(VGPV_mips32_linux_android) \ -diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h -index bac00d7..fbb2ef2 100644 ---- a/include/pub_tool_redir.h -+++ b/include/pub_tool_redir.h -@@ -242,8 +242,7 @@ - /* --- Soname of the standard C library. --- */ - - #if defined(VGO_linux) || defined(VGO_solaris) --# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so* -- -+# define VG_Z_LIBC_SONAME libcZdZa // libc.* - #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6) - # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib - -@@ -274,7 +273,11 @@ - /* --- Soname of the pthreads library. --- */ - - #if defined(VGO_linux) -+# if defined(__GLIBC__) || defined(__UCLIBC__) - # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0 -+# else -+# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.* -+#endif - #elif defined(VGO_darwin) - # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib - #elif defined(VGO_solaris) --- -2.7.1 - diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch deleted file mode 100644 index e9112da..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f96cf1f4eaa72860ab8b5e18ad10fdc704d78c5f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 15 Dec 2015 15:01:34 +0200 -Subject: [PATCH 2/5] remove rpath - -Upstream-Status: Inappropriate [embedded config] -Signed-off-by: Saul Wold <sgw@linux.intel.com> ---- - none/tests/Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am -index 54f2a7e..25b0f49 100644 ---- a/none/tests/Makefile.am -+++ b/none/tests/Makefile.am -@@ -326,7 +326,6 @@ threadederrno_CFLAGS += --std=c99 - endif - tls_SOURCES = tls.c tls2.c - tls_DEPENDENCIES = tls.so tls2.so --tls_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests - tls_LDADD = tls.so tls2.so -lpthread - tls_so_SOURCES = tls_so.c - tls_so_DEPENDENCIES = tls2.so -@@ -334,7 +333,7 @@ if VGCONF_OS_IS_DARWIN - tls_so_LDFLAGS = -dynamic -dynamiclib -all_load -fpic - tls_so_LDADD = `pwd`/tls2.so - else -- tls_so_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests -shared -fPIC -+ tls_so_LDFLAGS = -shared -fPIC - tls_so_LDADD = tls2.so - endif - tls_so_CFLAGS = $(AM_CFLAGS) -fPIC --- -2.6.2 - diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch deleted file mode 100644 index ed313d6..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 38ae233b6893a4eec7f9ed6d8ad02392bca8eaed Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 15 Dec 2015 15:31:50 +0200 -Subject: [PATCH 1/2] Fix out of tree builds. - -The paths to these files need to be fully specified in -the out of tree build case. glibc-2.X.supp is a generated file so the full path -is deliberately not specified in that case. - -RP 2013/03/23 - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - configure.ac | 64 ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 32 insertions(+), 32 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8ab7f9b..9366dc7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -377,44 +377,44 @@ case "${host_os}" in - 9.*) - AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" - ;; - 10.*) - AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 11.*) - AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 12.*) - AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 13.*) - AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 14.*) - AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 15.*) - AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - *) - AC_MSG_RESULT([unsupported (${kernel})]) -@@ -426,13 +426,13 @@ case "${host_os}" in - solaris2.11*) - AC_MSG_RESULT([ok (${host_os})]) - VGCONF_OS="solaris" -- DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" - ;; - - solaris2.12*) - AC_MSG_RESULT([ok (${host_os})]) - VGCONF_OS="solaris" -- DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}" - ;; - - *) -@@ -1015,29 +1015,29 @@ AC_MSG_CHECKING([the glibc version]) - case "${GLIBC_VERSION}" in - 2.2) - AC_MSG_RESULT(${GLIBC_VERSION} family) -- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.[[3-6]]) - AC_MSG_RESULT(${GLIBC_VERSION} family) -- DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.[[7-9]]) - AC_MSG_RESULT(${GLIBC_VERSION} family) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.10|2.11) - AC_MSG_RESULT(${GLIBC_VERSION} family) - AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1, - [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)]) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.*) - AC_MSG_RESULT(${GLIBC_VERSION} family) -@@ -1046,8 +1046,8 @@ case "${GLIBC_VERSION}" in - AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, - [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - darwin) - AC_MSG_RESULT(Darwin) -@@ -1057,7 +1057,7 @@ case "${GLIBC_VERSION}" in - bionic) - AC_MSG_RESULT(Bionic) - AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) -- DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}" - ;; - solaris) - AC_MSG_RESULT(Solaris) -@@ -1079,11 +1079,11 @@ if test "$VGCONF_OS" != "solaris"; then - # attempt to detect whether such libraries are installed on the - # build machine (or even if any X facilities are present); just - # add the suppressions antidisirregardless. -- DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" - - # Add glibc and X11 suppressions for exp-sgcheck -- DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}" - fi - - --- -2.6.2 - diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch deleted file mode 100644 index 7985308..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch +++ /dev/null @@ -1,252 +0,0 @@ -From f49f27f1bc67d07440b0ac9a7d767a8ea1589bfe Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 15 Dec 2015 15:50:44 +0200 -Subject: [PATCH 5/5] Modify vg_test wrapper to support PTEST formats - -Change the valgrind regression test script vg_regtest to -support the yocto ptest stdout reporting format. The commit adds -'--yocto-ptest' as an optional argument to vg_regtest, which alters -the output to use the ptest infrastructure reporting format: - "[PASS|SKIP|FAIL]: testname" -instead of valgrind's internal test reporting format. Without the added -option, --yocto-ptest, the valgrind regression test output is unchanged. - -Enforce 30 seconds limit for the test. -This resume execution of the remaining tests when valgrind hangs. - -Upstream-Status: Pending - -Signed-off-by: Dave Lerner <dave.lerner@windriver.com> -Signed-off-by: Tudor Florea <tudor.florea@enea.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 55 insertions(+), 20 deletions(-) - -diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in -index a441f42..cb05b52 100755 ---- a/tests/vg_regtest.in -+++ b/tests/vg_regtest.in -@@ -47,6 +47,7 @@ - # --loop-till-fail: loops on the test(s) till one fail, then exit - # This is useful to obtain detailed trace or --keep-unfiltered - # output of a non deterministic test failure -+# --yocto-ptest: output in yocto ptest format - # - # The easiest way is to run all tests in valgrind/ with (assuming you installed - # in $PREFIX): -@@ -139,7 +140,7 @@ my $usage="\n" - . "Usage:\n" - . " vg_regtest [--all, --valgrind, --valgrind-lib, --keep-unfiltered\n" - . " --outer-valgrind, --outer-tool, --outer-args\n" -- . " --loop-till-fail]\n" -+ . " --loop-till-fail, --yocto-ptest]\n" - . " Use EXTRA_REGTEST_OPTS to supply extra args for all tests\n" - . "\n"; - -@@ -186,6 +187,7 @@ my $outer_args; - my $valgrind_lib = "$tests_dir/.in_place"; - my $keepunfiltered = 0; - my $looptillfail = 0; -+my $yoctoptest = 0; - - # default filter is the one named "filter_stderr" in the test's directory - my $default_stderr_filter = "filter_stderr"; -@@ -244,6 +246,8 @@ sub process_command_line() - $keepunfiltered = 1; - } elsif ($arg =~ /^--loop-till-fail$/) { - $looptillfail = 1; -+ } elsif ($arg =~ /^--yocto-ptest$/) { -+ $yoctoptest = 1; - } else { - die $usage; - } -@@ -365,13 +369,28 @@ sub read_vgtest_file($) - #---------------------------------------------------------------------------- - # Since most of the program time is spent in system() calls, need this to - # propagate a Ctrl-C enabling us to quit. --sub mysystem($) -+# Enforce 30 seconds limit for the test. -+# This resume execution of the remaining tests if valgrind hangs. -+sub mysystem($) - { -- my $exit_code = system($_[0]); -- ($exit_code == 2) and exit 1; # 2 is SIGINT -- return $exit_code; -+ my $exit_code=0; -+ eval { -+ local $SIG{'ALRM'} = sub { die "timed out\n" }; -+ alarm(30); -+ $exit_code = system($_[0]); -+ alarm (0); -+ ($exit_code == 2) and die "SIGINT\n"; # 2 is SIGINT -+ }; -+ if ($@) { -+ if ($@ eq "timed out\n") { -+ print "timed out\n"; -+ return 1; -+ } -+ if ($@ eq "SIGINT\n") { -+ exit 1; -+ } -+ } - } -- - # if $keepunfiltered, copies $1 to $1.unfiltered.out - # renames $0 tp $1 - sub filtered_rename($$) -@@ -419,23 +438,25 @@ sub do_diffs($$$$) - # A match; remove .out and any previously created .diff files. - unlink("$name.$mid.out"); - unlink(<$name.$mid.diff*>); -- return; -+ return 0; - } - } - } - # If we reach here, none of the .exp files matched. -- print "*** $name failed ($mid) ***\n"; -+ print "*** $name failed ($mid) ***\n" if ($yoctoptest == 0) ; - push(@failures, sprintf("%-40s ($mid)", "$fullname")); - $num_failures{$mid}++; - if ($looptillfail == 1) { - print "Failure encountered, stopping to loop\n"; - exit 1 - } -+ return 1; - } - - sub do_one_test($$) - { - my ($dir, $vgtest) = @_; -+ my $diffStatus = 0; - $vgtest =~ /^(.*)\.vgtest/; - my $name = $1; - my $fullname = "$dir/$name"; -@@ -454,7 +475,11 @@ sub do_one_test($$) - } elsif (256 == $prereq_res) { - # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256... - # Prereq failed, skip. -- printf("%-16s (skipping, prereq failed: $prereq)\n", "$name:"); -+ if ($yoctoptest == 0) { -+ printf("%-16s (skipping, prereq failed: $prereq)\n", "$name:"); -+ } else { -+ printf("SKIP: $fullname\n"); -+ } - return; - } else { - # Bad prereq; abort. -@@ -472,7 +497,7 @@ sub do_one_test($$) - } - # If there is a progB, let's start it in background: - printf("%-16s valgrind $extraopts $vgopts $prog $args (progB: $progB $argsB)\n", -- "$name:"); -+ "$name:") if ($yoctoptest == 0); - # progB.done used to detect child has finished. See below. - # Note: redirection of stdout and stderr is before $progB to allow argsB - # to e.g. redirect stdoutB to stderrB -@@ -488,7 +513,8 @@ sub do_one_test($$) - . "touch progB.done) &"); - } - } else { -- printf("%-16s valgrind $extraopts $vgopts $prog $args\n", "$name:"); -+ printf("%-16s valgrind $extraopts $vgopts $prog $args\n", "$name:") -+ if ($yoctoptest == 0); - } - - # Collect environment variables, if any. -@@ -529,7 +555,7 @@ sub do_one_test($$) - # Find all the .stdout.exp files. If none, use /dev/null. - my @stdout_exps = <$name.stdout.exp*>; - @stdout_exps = ( "/dev/null" ) if (0 == scalar @stdout_exps); -- do_diffs($fullname, $name, "stdout", \@stdout_exps); -+ $diffStatus |= do_diffs($fullname, $name, "stdout", \@stdout_exps); - - # Filter stderr - $stderr_filter_args = $name if (! defined $stderr_filter_args); -@@ -538,7 +564,7 @@ sub do_one_test($$) - # Find all the .stderr.exp files. At least one must exist. - my @stderr_exps = <$name.stderr.exp*>; - (0 != scalar @stderr_exps) or die "Could not find `$name.stderr.exp*'\n"; -- do_diffs($fullname, $name, "stderr", \@stderr_exps); -+ $diffStatus |= do_diffs($fullname, $name, "stderr", \@stderr_exps); - - if (defined $progB) { - # wait for the child to be finished -@@ -562,7 +588,7 @@ sub do_one_test($$) - # Find all the .stdoutB.exp files. If none, use /dev/null. - my @stdoutB_exps = <$name.stdoutB.exp*>; - @stdoutB_exps = ( "/dev/null" ) if (0 == scalar @stdoutB_exps); -- do_diffs($fullname, $name, "stdoutB", \@stdoutB_exps); -+ $diffStatus |= do_diffs($fullname, $name, "stdoutB", \@stdoutB_exps); - - # Filter stderr - $stderrB_filter_args = $name if (! defined $stderrB_filter_args); -@@ -571,7 +597,7 @@ sub do_one_test($$) - # Find all the .stderrB.exp files. At least one must exist. - my @stderrB_exps = <$name.stderrB.exp*>; - (0 != scalar @stderrB_exps) or die "Could not find `$name.stderrB.exp*'\n"; -- do_diffs($fullname, $name, "stderrB", \@stderrB_exps); -+ $diffStatus |= do_diffs($fullname, $name, "stderrB", \@stderrB_exps); - } - - # Maybe do post-test check -@@ -583,7 +609,7 @@ sub do_one_test($$) - # Find all the .post.exp files. If none, use /dev/null. - my @post_exps = <$name.post.exp*>; - @post_exps = ( "/dev/null" ) if (0 == scalar @post_exps); -- do_diffs($fullname, $name, "post", \@post_exps); -+ $diffStatus |= do_diffs($fullname, $name, "post", \@post_exps); - } - } - -@@ -592,6 +618,13 @@ sub do_one_test($$) - print("(cleanup operation failed: $cleanup)\n"); - } - -+ if ($yoctoptest == 1) { -+ if ($diffStatus == 0) { -+ print("PASS: $fullname\n"); -+ } else { -+ print("FAIL: $fullname\n"); -+ } -+ } - $num_tests_done++; - } - -@@ -631,7 +664,7 @@ sub test_one_dir($$) - my $found_tests = (0 != (grep { $_ =~ /\.vgtest$/ } @fs)); - - if ($found_tests) { -- print "-- Running tests in $full_dir $dashes\n"; -+ print "-- Running tests in $full_dir $dashes\n" if ($yoctoptest == 0); - } - foreach my $f (@fs) { - if (-d $f) { -@@ -641,7 +674,7 @@ sub test_one_dir($$) - } - } - if ($found_tests) { -- print "-- Finished tests in $full_dir $dashes\n"; -+ print "-- Finished tests in $full_dir $dashes\n" if ($yoctoptest == 0); - } - - chdir(".."); -@@ -667,10 +700,12 @@ sub summarise_results - $num_failures{"stdout"}, plural($num_failures{"stdout"}), - $num_failures{"stderrB"}, plural($num_failures{"stderrB"}), - $num_failures{"stdoutB"}, plural($num_failures{"stdoutB"}), -- $num_failures{"post"}, plural($num_failures{"post"})); -+ $num_failures{"post"}, plural($num_failures{"post"})) -+ if ($yoctoptest == 0); - - foreach my $failure (@failures) { -- print "$failure\n"; -+ print "$failure\n" -+ if ($yoctoptest == 0); - } - print "\n"; - } --- -2.6.2 - diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch deleted file mode 100644 index 07774f3..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0bf4b0ac18d1ea41b32ad781d214b295ca1998f3 Mon Sep 17 00:00:00 2001 -From: Aneesh Bansal <aneesh.bansal@freescale.com> -Date: Mon, 21 Nov 2011 17:31:39 +0530 -Subject: [PATCH] Added support for PPC instructions mfatbu, mfatbl. - -Upstream-Status: Pending - -Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com> ---- -Currently Valgrind 3.7.0 does not have support for PPC instructions mfatbu and mfatbl. When we run a USDPAA application with VALGRIND, the following error is given by valgrind : -dis_proc_ctl(ppc)(mfspr,SPR)(0x20F) -disInstr(ppc): unhandled instruction: 0x7C0F82A6 - - - VEX/priv/guest_ppc_defs.h | 2 ++ - VEX/priv/guest_ppc_helpers.c | 18 ++++++++++++++++++ - VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++ - 3 files changed, 42 insertions(+), 0 deletions(-) - -diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h -index dd3c62e..11a34aa 100644 ---- a/VEX/priv/guest_ppc_defs.h -+++ b/VEX/priv/guest_ppc_defs.h -@@ -146,6 +146,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt ); - - extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void ); - -+extern UInt ppc32g_dirtyhelper_MFSPR_526_527 ( UInt ); -+ - extern void ppc32g_dirtyhelper_LVS ( VexGuestPPC32State* gst, - UInt vD_idx, UInt sh, - UInt shift_right ); -diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c -index 11aa428..b49ea3f 100644 ---- a/VEX/priv/guest_ppc_helpers.c -+++ b/VEX/priv/guest_ppc_helpers.c -@@ -119,6 +119,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void ) - # endif - } - -+/* CALLED FROM GENERATED CODE */ -+/* DIRTY HELPER (non-referentially transparent) */ -+UInt ppc32g_dirtyhelper_MFSPR_526_527 ( UInt r527 ) -+{ -+# if defined(__powerpc__) || defined(_AIX) -+ UInt spr; -+ if (r527) { -+ __asm__ __volatile__("mfspr %0,527" : "=b"(spr)); -+ } else { -+ __asm__ __volatile__("mfspr %0,526" : "=b"(spr)); -+ } -+ return spr; -+# else -+ return 0; -+# endif -+} -+ -+ - - /* CALLED FROM GENERATED CODE */ - /* DIRTY HELPER (reads guest state, writes guest mem) */ -diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c -index f8d220d..37c8974 100644 ---- a/VEX/priv/guest_ppc_toIR.c -+++ b/VEX/priv/guest_ppc_toIR.c -@@ -5657,6 +5657,28 @@ static Bool dis_proc_ctl ( VexAbiInfo* vbi, UInt theInstr ) - break; - } - -+ -+ case 526 /* 0x20E */: -+ case 527 /* 0x20F */: { -+ UInt arg = SPR==526 ? 0 : 1; -+ IRTemp val = newTemp(Ity_I32); -+ IRExpr** args = mkIRExprVec_1( mkU32(arg) ); -+ IRDirty* d = unsafeIRDirty_1_N( -+ val, -+ 0/*regparms*/, -+ "ppc32g_dirtyhelper_MFSPR_526_527", -+ fnptr_to_fnentry -+ (vbi, &ppc32g_dirtyhelper_MFSPR_526_527), -+ args -+ ); -+ /* execute the dirty call, dumping the result in val. */ -+ stmt( IRStmt_Dirty(d) ); -+ putIReg( rD_addr, -+ mkWidenFrom32(ty, mkexpr(val), False/*unsigned*/) ); -+ DIP("mfspr r%u,%u", rD_addr, (UInt)SPR); -+ break; -+ } -+ - default: - vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR); - return False; --- -1.7.0.4 diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch deleted file mode 100644 index 5fcfec0..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8facc29c3c56e6cf9cfef70986cf73876044a3fb Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Tue, 19 Jan 2016 16:42:36 -0800 -Subject: [PATCH] avoid neon for targets which don't support it - -The sh-mem-random.c test app tries to use neon loads and stores to -test 64-bit float copies when building for ARM. Allow it to do so if -possible, but fallback to C when building for ARM targets which don't -support neon. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - memcheck/tests/sh-mem-random.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/memcheck/tests/sh-mem-random.c b/memcheck/tests/sh-mem-random.c -index ae82248..816e139 100644 ---- a/memcheck/tests/sh-mem-random.c -+++ b/memcheck/tests/sh-mem-random.c -@@ -191,7 +191,7 @@ void do_test_at ( U1* arr ) - "emms" - : : "r"(arr+dst), "r"(arr+src) : "memory" - ); --#elif defined(__linux__) && defined(__arm__) && !defined(__aarch64__) -+#elif defined(__linux__) && defined(__arm__) && defined(__ARM_NEON__) && !defined(__aarch64__) - /* On arm32, many compilers generate a 64-bit float move - using two 32 bit integer registers, which completely - defeats this test. Hence force a 64-bit NEON load and --- -1.9.1 - diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch deleted file mode 100644 index b431d33..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 67e7a690107efb16d6d5aebfe420b64a552accdf Mon Sep 17 00:00:00 2001 -From: Qing He <qing.he@intel.com> -Date: Tue, 31 Aug 2010 22:51:58 +0800 -Subject: [PATCH] valgrind: fix perl scripts - -this is a temporary patch to workaround cross compilation. -otherwise @PERL@ will be replaced to perl-native binary, -this creates unusable scripts and fails FILERDEPENDS mechanism -(esp. rpm) - -a better fix would need: - 1. configure.ac should differentiate PERL and HOSTPERL - 2. optionally remove ${STAGING_DIR} in #! line before do_install - -8/31/2010 - created by Qing He <qing.he@intel.com> - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - cachegrind/cg_annotate.in | 2 +- - cachegrind/cg_diff.in | 2 +- - massif/ms_print.in | 2 +- - perf/vg_perf.in | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in -index 69365e8..978265d 100644 ---- a/cachegrind/cg_annotate.in -+++ b/cachegrind/cg_annotate.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Cachegrind's annotator. cg_annotate.in ---## -diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in -index 395460b..05873cc 100755 ---- a/cachegrind/cg_diff.in -+++ b/cachegrind/cg_diff.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Cachegrind's differencer. cg_diff.in ---## -diff --git a/massif/ms_print.in b/massif/ms_print.in -index e6fae89..3b85b40 100755 ---- a/massif/ms_print.in -+++ b/massif/ms_print.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Massif's results printer ms_print.in ---## -diff --git a/perf/vg_perf.in b/perf/vg_perf.in -index 7a80cb0..28f6156 100644 ---- a/perf/vg_perf.in -+++ b/perf/vg_perf.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - ##--------------------------------------------------------------------## - ##--- Valgrind performance testing script vg_perf ---## - ##--------------------------------------------------------------------## -diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in -index cb05b52..032e947 100755 ---- a/tests/vg_regtest.in -+++ b/tests/vg_regtest.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - ##--------------------------------------------------------------------## - ##--- Valgrind regression testing script vg_regtest ---## - ##--------------------------------------------------------------------## ---- -2.4.0 diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/run-ptest b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/run-ptest deleted file mode 100755 index f9a72ec..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/run-ptest +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# run-ptest - 'ptest' test infrastructure shell script that -# wraps the valgrind regression script vg_regtest. -# Must be run in the /usr/lib/valgrind/ptest directory. -# -# Dave Lerner <dave.lerner@windriver.com> -############################################################### -VALGRINDLIB=@libdir@/valgrind -tests/vg_regtest --all \ - --valgrind=/usr/bin/valgrind --valgrind-lib=$VALGRINDLIB \ - --yocto-ptest diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch deleted file mode 100644 index adea405..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d134dafc2f11e0d247420a0ba360bcdef77b4093 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Tue, 19 Jan 2016 16:00:00 -0800 -Subject: [PATCH] use appropriate -march/-mcpu/-mfpu for ARM test apps - -Ensure that test apps in none/tests/arm are compiled with appropriate --march/-mcpu/-mfpu flags to support the instructions being tested. -The aim is to build all tests, even ones which may not run correctly -on all target CPUs. - -For tests requiring armv7ve instructions, ensure that we set both --march=armv7ve and -mcpu=cortex-a15 (since some TUNE_CCARGS may set --march=armv7-a and adding -mcpu=cortex-a15 alone is not enough to -over-ride that). - -See similar cases in none/tests/arm/Makefile.am - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - none/tests/arm/Makefile.am | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am -index 4507a20..825290f 100644 ---- a/none/tests/arm/Makefile.am -+++ b/none/tests/arm/Makefile.am -@@ -62,8 +62,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ - -mfpu=neon \ - -mthumb - --intdiv_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a15 -mthumb -+intdiv_CFLAGS = $(AM_CFLAGS) -g -march=armv7ve -mcpu=cortex-a15 -mthumb - ldrt_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb - ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm - --vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a15 -mfpu=vfpv4 -marm -+vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3 -+ -+vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm --- -1.9.1 - diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch deleted file mode 100644 index d04297d..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 005bd11809a1ce65e9f2c28e884354a4741650b9 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Tue, 13 Dec 2016 11:29:55 +0800 -Subject: [PATCH] make ld-XXX.so strlen intercept optional - -Hack: Depending on how glibc was compiled (e.g. optimised for size or -built with _FORTIFY_SOURCE enabled) the strlen symbol might not be -found in ld-XXX.so. Therefore although we should still try to -intercept it, don't make it mandatory to do so. - -Upstream-Status: Inappropriate - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - coregrind/m_redir.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c -index ff35009..d7d6816 100644 ---- a/coregrind/m_redir.c -+++ b/coregrind/m_redir.c -@@ -1275,7 +1275,18 @@ static void add_hardwired_spec (const HChar* sopatt, const HChar* fnpatt, - spec->to_addr = to_addr; - spec->isWrap = False; - spec->isGlobal = False; -- spec->mandatory = mandatory; -+ -+ /* Hack: Depending on how glibc was compiled (e.g. optimised for size or -+ built with _FORTIFY_SOURCE enabled) the strlen symbol might not be found. -+ Therefore although we should still try to intercept it, don't make it -+ mandatory to do so. We over-ride "mandatory" here to avoid the need to -+ patch the many different architecture specific callers to -+ add_hardwired_spec(). */ -+ if (0==VG_(strcmp)("strlen", fnpatt)) -+ spec->mandatory = NULL; -+ else -+ spec->mandatory = mandatory; -+ - /* VARIABLE PARTS */ - spec->mark = False; /* not significant */ - spec->done = False; /* not significant */ --- -1.9.1 - diff --git a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind_3.12.0.bb deleted file mode 100644 index 7a1c3c6..0000000 --- a/meta-rcar-gen3-adas/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ /dev/null @@ -1,127 +0,0 @@ -SUMMARY = "Valgrind memory debugger and instrumentation framework" -HOMEPAGE = "http://valgrind.org/" -BUGTRACKER = "http://valgrind.org/support/bug_reports.html" -LICENSE = "GPLv2 & GPLv2+ & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://include/pub_tool_basics.h;beginline=1;endline=29;md5=ebb8e640ef633f940c425686c873f9fa \ - file://include/valgrind.h;beginline=1;endline=56;md5=4b5e24908e53016ea561c45f4234a327 \ - file://COPYING.DOCS;md5=24ea4c7092233849b4394699333b5c56" - -X11DEPENDS = "virtual/libx11" -DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} \ - " - -SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ - file://fixed-perl-path.patch \ - file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ - file://run-ptest \ - file://0002-remove-rpath.patch \ - file://0004-Fix-out-of-tree-builds.patch \ - file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ - file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ - file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ - file://avoid-neon-for-targets-which-don-t-support-it.patch \ - file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ -" -SRC_URI_append_libc-musl = "\ - file://0001-fix-build-for-musl-targets.patch \ -" -SRC_URI[md5sum] = "6eb03c0c10ea917013a7622e483d61bb" -SRC_URI[sha256sum] = "67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1" - -COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' - -# valgrind supports armv7 and above -COMPATIBLE_HOST_armv4 = 'null' -COMPATIBLE_HOST_armv5 = 'null' -COMPATIBLE_HOST_armv6 = 'null' - -# X32 isn't supported by valgrind at this time -COMPATIBLE_HOST_linux-gnux32 = 'null' - -# Disable for some MIPS variants -COMPATIBLE_HOST_mipsarcho32 = "${@bb.utils.contains("TARGET_FPU", "soft", "null", ".*-linux", d)}" -COMPATIBLE_HOST_mipsarchn32 = 'null' -COMPATIBLE_HOST_mipsarchn64 = "${@bb.utils.contains("TARGET_FPU", "soft", "null", ".*-linux", d)}" -COMPATIBLE_HOST_mipsarchr6 = 'null' - -inherit autotools ptest - -EXTRA_OECONF = "--enable-tls --without-mpicc" -EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][${SITEINFO_BITS} != '32']}" - -# valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option -EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" - -EXTRA_OEMAKE = "-w" - -# valgrind likes to control its own optimisation flags. It generally defaults -# to -O2 but uses -O0 for some specific test apps etc. Passing our own flags -# (via CFLAGS) means we interfere with that. Only pass DEBUG_FLAGS to it -# which fixes build path issue in DWARF. -SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" - -CFLAGS_append_libc-uclibc = " -D__UCLIBC__ " - -do_install_append () { - install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ -} - -RDEPENDS_${PN} += "perl" - -# valgrind needs debug information for ld.so at runtime in order to -# redirect functions like strlen. -RRECOMMENDS_${PN} += "${TCLIBC}-dbg" - -RDEPENDS_${PN}-ptest += " sed perl perl-module-file-glob" -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" - -# One of the tests contains a bogus interpreter path on purpose. -# Skip file dependency check -SKIP_FILEDEPS_${PN}-ptest = '1' - -do_compile_ptest() { - oe_runmake check -} - -do_install_ptest() { - chmod +x ${B}/tests/vg_regtest - - # The test application binaries are not automatically installed. - # Grab them from the build directory. - # - # The regression tests require scripts and data files that are not - # copied to the build directory. They must be copied from the - # source directory. - saved_dir=$PWD - for parent_dir in ${S} ${B} ; do - cd $parent_dir - - # exclude shell or the package won't install - rm -rf none/tests/shell* 2>/dev/null - - subdirs="tests cachegrind/tests callgrind/tests drd/tests helgrind/tests massif/tests memcheck/tests none/tests" - - # Get the vg test scripts, filters, and expected files - for dir in $subdirs ; do - find $dir | cpio -pvdu ${D}${PTEST_PATH} - done - cd $saved_dir - done - - # clean out build artifacts before building the rpm - find ${D}${PTEST_PATH} \ - \( -name "Makefile*" \ - -o -name "*.o" \ - -o -name "*.c" \ - -o -name "*.S" \ - -o -name "*.h" \) \ - -exec rm {} \; - - # needed by massif tests - cp ${B}/massif/ms_print ${D}${PTEST_PATH}/massif/ms_print - - # handle multilib - sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest -} diff --git a/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.14.6.bbappend b/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.14.6.bbappend deleted file mode 100644 index fa555a8..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.14.6.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -require include/gles-control.inc - -PACKAGECONFIG_pn-cairo_append = "${@' egl glesv2' if '${USE_GLES_WAYLAND}' == '1' else ''}" -PACKAGECONFIG_pn-cairo_append += "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" diff --git a/meta-rcar-gen3-adas/recipes-graphics/libpng/libpng_%.bbappend b/meta-rcar-gen3-adas/recipes-graphics/libpng/libpng_%.bbappend deleted file mode 100644 index 252fec3..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/libpng/libpng_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# ...use neon acceleration -EXTRA_OECONF_append_aarch64 = " --enable-arm-neon=on" diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv-samples_2.4.bb b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv-samples_2.4.bb deleted file mode 100644 index 9d862fe..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv-samples_2.4.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.willowgarage.com/wiki/" -SECTION = "libs" -LICENSE = "BSD" - -DEPENDS = "opencv" - -LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \ -" -SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e" -SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \ - " -PV = "2.4.3+git${SRCPV}" - -S = "${WORKDIR}/git" - -do_install() { - cd samples/c - install -d ${D}/${bindir} - install -d ${D}/${datadir}/opencv/samples - - cp * ${D}/${datadir}/opencv/samples || true - - for i in *.c; do - echo "compiling $i" - ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv` || true - install -m 0755 `basename $i .c` ${D}/${bindir} || true - rm ${D}/${datadir}/opencv/samples/`basename $i .c` || true - done - for i in *.cpp; do - echo "compiling $i" - ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv` || true - install -m 0755 `basename $i .cpp` ${D}/${bindir} || true - rm ${D}/${datadir}/opencv/samples/`basename $i .cpp` || true - done -} - -FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" -FILES_${PN} += "${bindir} ${datadir}/opencv" diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch deleted file mode 100644 index 1077d05..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 049f931207631aa54af55a2917318d032b2ef3fa Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Date: Thu, 31 Mar 2016 00:20:15 +0200 -Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp - -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> ---- - 3rdparty/ippicv/downloader.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/3rdparty/ippicv/downloader.cmake b/3rdparty/ippicv/downloader.cmake -index a6016dbe10bc..af4062c8e95e 100644 ---- a/3rdparty/ippicv/downloader.cmake -+++ b/3rdparty/ippicv/downloader.cmake -@@ -31,8 +31,10 @@ function(_icv_downloader) - return() # Not supported - endif() - -+ if(NOT DEFINED OPENCV_ICV_PATH) - set(OPENCV_ICV_UNPACK_PATH "${CMAKE_BINARY_DIR}/3rdparty/ippicv") - set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}") -+ endif() - - if(DEFINED OPENCV_ICV_PACKAGE_DOWNLOADED - AND OPENCV_ICV_PACKAGE_DOWNLOADED STREQUAL OPENCV_ICV_PACKAGE_HASH --- -2.8.0.rc3 - diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch deleted file mode 100644 index 507d796..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 69f9707678190f6a0948a547dce948251f972676 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod <Randy.MacLeod@windriver.com> -Date: Wed, 26 Apr 2017 14:57:30 -0400 -Subject: [PATCH 1/2] Revert "cuda: fix fp16 compilation" - -This reverts commit 12e00827be40576b686ea4438a6e6ef85208743d. ---- - modules/core/include/opencv2/core/cvdef.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h -index 699b166..efc24ca 100644 ---- a/modules/core/include/opencv2/core/cvdef.h -+++ b/modules/core/include/opencv2/core/cvdef.h -@@ -303,8 +303,7 @@ enum CpuFeatures { - #define CV_2PI 6.283185307179586476925286766559 - #define CV_LOG2 0.69314718055994530941723212145818 - --#if defined __ARM_FP16_FORMAT_IEEE \ -- && !defined __CUDACC__ -+#if defined (__ARM_FP16_FORMAT_IEEE) - # define CV_FP16_TYPE 1 - #else - # define CV_FP16_TYPE 0 --- -2.9.3 - diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/fixpkgconfig.patch b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/fixpkgconfig.patch deleted file mode 100644 index 3aeda7d..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/fixpkgconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake -index b8cb8777c06b..75281ee964fd 100644 ---- a/cmake/OpenCVGenPkgconfig.cmake -+++ b/cmake/OpenCVGenPkgconfig.cmake -@@ -27,7 +27,7 @@ macro(fix_prefix lst isown) - get_filename_component(libdir "${item}" PATH) - get_filename_component(libname "${item}" NAME_WE) - string(REGEX REPLACE "^lib(.*)" "\\1" libname "${libname}") -- list(APPEND _lst "-L${libdir}" "-l${libname}") -+ list(APPEND _lst "-l${libname}") - else() - list(APPEND _lst "-l${item}") - endif() -@@ -66,10 +66,14 @@ ocv_list_unique(_3rdparty) - - set(OPENCV_PC_LIBS - "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" -+ "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" - "${_modules}" - ) - if (BUILD_SHARED_LIBS) -- set(OPENCV_PC_LIBS_PRIVATE "${_extra}") -+ set(OPENCV_PC_LIBS_PRIVATE -+ "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" -+ "${_extra}" -+ ) - else() - set(OPENCV_PC_LIBS_PRIVATE - "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/opencv-fix-pkgconfig-generation.patch b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/opencv-fix-pkgconfig-generation.patch deleted file mode 100644 index d352778..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/opencv-fix-pkgconfig-generation.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix pkg-config generation - -Replace absolute library path with library name spec and library search -path option. - -The fix has been provided by Ray Rashif (code.opencv.org/issues/1925) - -Upstream-Status: Pending - -diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake ---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:14.243505926 +0000 -+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:42.286649120 +0000 -@@ -10,7 +10,7 @@ - # ------------------------------------------------------------------------------------------- - set(prefix "${CMAKE_INSTALL_PREFIX}") - set(exec_prefix "\${prefix}") --set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS -+set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}") - set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") - set(VERSION ${OPENCV_VERSION}) - -@@ -36,10 +36,11 @@ - ocv_list_reverse(OpenCV_EXTRA_COMPONENTS) - - #build the list of components --set(OpenCV_LIB_COMPONENTS_ "") -+set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}") - foreach(CVLib ${OpenCV_LIB_COMPONENTS}) - get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE}) - get_filename_component(libname "${libpath}" NAME) -+ get_filename_component(lname "${libpath}" NAME_WE) - - if(INSTALL_TO_MANGLED_PATHS) - set(libname "${libname}.${OPENCV_VERSION}") -@@ -52,7 +53,8 @@ - set(installDir "${OPENCV_LIB_INSTALL_PATH}") - endif() - -- set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}") -+ string(REPLACE "libopencv" "-lopencv" lname "${lname}") -+ set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}") - endforeach() - - # add extra dependencies required for OpenCV diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/uselocalxfeatures.patch b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/uselocalxfeatures.patch deleted file mode 100644 index a2db48d..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/uselocalxfeatures.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt -index f295bddaed66..6086e75ec37b 100644 ---- a/modules/xfeatures2d/CMakeLists.txt -+++ b/modules/xfeatures2d/CMakeLists.txt -@@ -1,5 +1,5 @@ - set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection") - ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml - OPTIONAL opencv_cudaarithm WRAP python java) --include(cmake/download_vgg.cmake) --include(cmake/download_boostdesc.cmake) -+#include(cmake/download_vgg.cmake) -+#include(cmake/download_boostdesc.cmake) diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch deleted file mode 100644 index 3068bd4..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake -index eb2a729cc2eb..8717736484de 100644 ---- a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake -+++ b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake -@@ -24,7 +24,7 @@ if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF - find_package(Protobuf QUIET) - endif() - --if(PROTOBUF_FOUND) -+if(PROTOBUF_FOUND OR (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES)) - # nothing - else() - include(${CMAKE_CURRENT_LIST_DIR}/download_protobuf.cmake) diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_2.4.bb b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_2.4.bb deleted file mode 100644 index f4239f7..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_2.4.bb +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.willowgarage.com/wiki/" -SECTION = "libs" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14" - -ARM_INSTRUCTION_SET = "arm" - -DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" - -SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 " -SRCREV = "707d10f11526afee1e1a35ec7fdaa8b05f7e1656" -PV = "2.4.11+git${SRCPV}" - -S = "${WORKDIR}/git" - -# Do an out-of-tree build -#OECMAKE_SOURCEPATH = "${S}" -#OECMAKE_BUILDPATH = "${WORKDIR}/build-${TARGET_ARCH}" - -EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ - -DBUILD_PYTHON_SUPPORT=ON \ - -DWITH_GSTREAMER=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DBUILD_EXAMPLES=ON \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64 -DPYTHON_PACKAGES_PATH:PATH=lib64/python2.7/site-packages", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32 -DPYTHON_PACKAGES_PATH:PATH=lib32/python2.7/site-packages", "", d)} \ -" - -PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer opengl neon ${@bb.utils.contains( 'DISTRO_FEATURES', 'qt5', 'qt5','', d)}" -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+," -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," -PACKAGECONFIG[jasper] = "-DBUILD_JASPER=ON,-DBUILD_JASPER=OFF," -PACKAGECONFIG[neon] = "-DENABLE_NEON=ON,-DENABLE_NEON=OFF,," -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good," -PACKAGECONFIG[opengl] = "-DWITH_OPENGL=ON,-DWITH_OPENGL=OFF,," -PACKAGECONFIG[qt5] = "-DWITH_QT=ON,-DWITH_QT=OFF,qtbase," - -inherit distutils-base pkgconfig cmake ${@bb.utils.contains( 'DISTRO_FEATURES', 'qt5', 'cmake_qt5','', d)} - -export BUILD_SYS -export HOST_SYS -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/python" - -TARGET_CC_ARCH += "-I${S}/include " - -PACKAGES += "${PN}-apps python-opencv" - -python populate_packages_prepend () { - cv_libdir = d.expand('${libdir}') - cv_libdir_dbg = d.expand('${libdir}/.debug') - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - - pn = d.getVar('PN', 1) - metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES', 1).split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): - metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) -} - -PACKAGES_DYNAMIC += "^libopencv-.*" - -FILES_${PN} = "" -FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" -FILES_${PN}-dbg += "${libdir}/.debug" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" -FILES_${PN}-doc = "${datadir}/OpenCV/doc" - -ALLOW_EMPTY_${PN} = "1" - -INSANE_SKIP_python-opencv = "True" -SUMMARY_python-opencv = "Python bindings to opencv" -FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-opencv = "python-core python-numpy" - -do_install_append() { - cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ - sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h -} diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_3.2.bb b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_3.2.bb deleted file mode 100644 index a5ef014..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_3.2.bb +++ /dev/null @@ -1,176 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.org/" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -DEPENDS = "libtool swig-native bzip2 zlib glib-2.0" - -#DEPENDS = "libwebp" - -SRCREV_opencv = "70bbf17b133496bd7d54d034b0f94bd869e0e810" -SRCREV_contrib = "86342522b0eb2b16fa851c020cc4e0fef4e010b7" -SRCREV_ipp = "81a676001ca8075ada498583e4166079e5744668" -SRCREV_bootdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" -SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" -IPP_MD5 = "808b791a6eac9ed78d32a7666804320e" - -SRCREV_FORMAT = "opencv" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=bootdesc;name=bootdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://fixpkgconfig.patch \ - file://uselocalxfeatures.patch;patchdir=../contrib/ \ - file://useoeprotobuf.patch;patchdir=../contrib/ \ - file://0001-Revert-cuda-fix-fp16-compilation.patch \ -" -# file://0002-Revert-check-FP16-build-condition-correctly.patch \ -# - -PV = "3.2+git${SRCPV}" - -S = "${WORKDIR}/git" - -do_unpack_extra() { - tar xzf ${WORKDIR}/ipp/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR} - cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src - cp ${WORKDIR}/bootdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src -} -addtask unpack_extra after do_unpack before do_patch - -EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ - -DWITH_1394=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \ - -DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ -" -EXTRA_OECMAKE_append_x86 = " -DX86=ON" - -PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "qt5", "qt5", "", d)}" - -PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," -PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DUPDATE_PROTO_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,lapack protobuf protobuf-native," -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," -PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," -PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," -PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," -PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," -PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," -PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," -PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," -PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," -PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," -PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," -PACKAGECONFIG[qt5] = "-DWITH_QT=ON,-DWITH_QT=OFF,qtbase," - -inherit pkgconfig cmake ${@bb.utils.contains( 'DISTRO_FEATURES', 'qt5', 'cmake_qt5','', d)} - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} - -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" -export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" -export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" -export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" - -TARGET_CC_ARCH += "-I${S}/include " - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ - ${PN}-apps" - -python populate_packages_prepend () { - cv_libdir = d.expand('${libdir}') - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - - pn = d.getVar('PN', 1) - metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES', 1).split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): - metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) - - metapkg = pn - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - -} - -PACKAGES_DYNAMIC += "^libopencv-.*" - -FILES_${PN} = "" -FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake" -FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a" -FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" -FILES_${PN}-java = "${datadir}/OpenCV/java" -FILES_${PN}-samples = "${datadir}/OpenCV/samples/" - -INSANE_SKIP_${PN}-java = "libdir" -INSANE_SKIP_${PN}-dbg = "libdir" - -ALLOW_EMPTY_${PN} = "1" - -SUMMARY_python-opencv = "Python bindings to opencv" -FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-opencv = "python-core python-numpy" - -SUMMARY_python3-opencv = "Python bindings to opencv" -FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python3-opencv = "python3-core python3-numpy" - -do_install_append() { - cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ - sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h - - # Move Python files into correct library folder (for multilib build) - if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then - mv ${D}/usr/lib/* ${D}/${libdir}/ - rm -rf ${D}/usr/lib - fi - - if ${@bb.utils.contains("PACKAGECONFIG", "samples", "true", "false", d)}; then - install -d ${D}${datadir}/OpenCV/samples/bin/ - cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ - fi -} diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0001-Allow-to-boot-without-input-device.patch b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0001-Allow-to-boot-without-input-device.patch deleted file mode 100644 index ff7dd0c..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0001-Allow-to-boot-without-input-device.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d04c556bc8eac439cc87c7cdf9b4446d4a9cecaa Mon Sep 17 00:00:00 2001 -From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> -Date: Fri, 17 Feb 2017 03:06:27 +0300 -Subject: [PATCH] Allow to boot without input device - ---- - src/libinput-seat.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/libinput-seat.c b/src/libinput-seat.c -index c9f9ed2..20fcaa6 100644 ---- a/src/libinput-seat.c -+++ b/src/libinput-seat.c -@@ -258,7 +258,6 @@ udev_input_enable(struct udev_input *input) - "\t- seats misconfigured " - "(Weston backend option 'seat', " - "udev device property ID_SEAT)\n"); -- return -1; - } - - return 0; --- -2.7.4 - diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0002-Share-toytoolkit-lib.patch b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0002-Share-toytoolkit-lib.patch deleted file mode 100644 index 58e5b2a..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0002-Share-toytoolkit-lib.patch +++ /dev/null @@ -1,1394 +0,0 @@ -From 32bb2f9f31945fda4d3a530c7e48632f3249d3a6 Mon Sep 17 00:00:00 2001 -From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> -Date: Tue, 13 Jun 2017 23:51:22 +0300 -Subject: [PATCH 1/4] Share toytoolkit lib - ---- - Makefile.am | 35 +++ - clients/toytoolkit.h | 650 +++++++++++++++++++++++++++++++++++++++++++++++++++ - clients/window.h | 621 ------------------------------------------------ - configure.ac | 2 +- - 4 files changed, 686 insertions(+), 622 deletions(-) - create mode 100644 clients/toytoolkit.h - -diff --git a/Makefile.am b/Makefile.am -index 98cd683..530b868 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,6 +6,7 @@ libexec_PROGRAMS = - moduledir = $(libdir)/weston - module_LTLIBRARIES = - noinst_LTLIBRARIES = -+lib_LTLIBRARIES = - BUILT_SOURCES = - - AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install -@@ -100,6 +101,7 @@ weston_SOURCES = \ - shared/matrix.h \ - shared/timespec-util.h \ - shared/zalloc.h \ -+ clients/toytoolkit.h \ - shared/platform.h \ - src/weston-egl-ext.h - -@@ -212,6 +214,7 @@ dist_wayland_session_DATA = src/weston.desktop - - westonincludedir = $(includedir)/weston - westoninclude_HEADERS = \ -+ clients/toytoolkit.h \ - src/version.h \ - src/compositor.h \ - src/compositor-drm.h \ -@@ -603,6 +606,7 @@ noinst_LTLIBRARIES += libtoytoolkit.la - libtoytoolkit_la_SOURCES = \ - clients/window.c \ - clients/window.h \ -+ clients/toytoolkit.h \ - shared/helpers.h - - nodist_libtoytoolkit_la_SOURCES = \ -@@ -624,6 +628,37 @@ libtoytoolkit_la_LIBADD = \ - libshared-cairo.la $(CLOCK_GETTIME_LIBS) -lm - libtoytoolkit_la_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) $(CAIRO_EGL_CFLAGS) - -+lib_LTLIBRARIES += libweston-toytoolkit.la -+ -+libweston_toytoolkit_la_SOURCES = \ -+ clients/window.c \ -+ clients/window.h \ -+ clients/toytoolkit.h \ -+ protocol/text-cursor-position-protocol.c \ -+ protocol/text-cursor-position-client-protocol.h \ -+ protocol/scaler-protocol.c \ -+ protocol/scaler-client-protocol.h \ -+ protocol/xdg-shell-unstable-v5-protocol.c \ -+ protocol/xdg-shell-unstable-v5-client-protocol.h \ -+ \ -+ \ -+ protocol/ivi-application-protocol.c \ -+ protocol/ivi-application-client-protocol.h -+ -+BUILT_SOURCES += $(libweston_toytoolkit_la_SOURCES) -+ -+libweston_toytoolkit_la_CFLAGS = \ -+ $(AM_CFLAGS) $(CLIENT_CFLAGS) $(CAIRO_EGL_CFLAGS) \ -+ $(GCC_CFLAGS) -pthread -fvisibility=default -+libweston_toytoolkit_la_LIBADD = \ -+ $(CLIENT_LIBS) \ -+ $(CAIRO_EGL_LIBS) \ -+ libshared-cairo.la -lrt -lm -+libweston_toytoolkit_la_LDFLAGS = -version-info 1:0:1 -+ -+ -+ -+ - weston_flower_SOURCES = clients/flower.c - weston_flower_LDADD = libtoytoolkit.la - weston_flower_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) -diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -new file mode 100644 -index 0000000..f75b671 ---- /dev/null -+++ b/clients/toytoolkit.h -@@ -0,0 +1,650 @@ -+/* -+ * Copyright © 2008 Kristian Høgsberg -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#ifndef _TOYTOOLKIT_H_ -+#define _TOYTOOLKIT_H_ -+ -+#include <xkbcommon/xkbcommon.h> -+#include <wayland-client.h> -+#include <cairo.h> -+ -+ -+struct window; -+struct widget; -+struct display; -+struct input; -+struct output; -+ -+struct task { -+ void (*run)(struct task *task, uint32_t events); -+ struct wl_list link; -+}; -+ -+struct rectangle { -+ int32_t x; -+ int32_t y; -+ int32_t width; -+ int32_t height; -+}; -+ -+struct display * -+display_create(int *argc, char *argv[]); -+ -+void -+display_destroy(struct display *display); -+ -+void -+display_set_user_data(struct display *display, void *data); -+ -+void * -+display_get_user_data(struct display *display); -+ -+struct wl_display * -+display_get_display(struct display *display); -+ -+int -+display_has_subcompositor(struct display *display); -+ -+cairo_device_t * -+display_get_cairo_device(struct display *display); -+ -+struct wl_compositor * -+display_get_compositor(struct display *display); -+ -+struct output * -+display_get_output(struct display *display); -+ -+uint32_t -+display_get_serial(struct display *display); -+ -+typedef void (*display_global_handler_t)(struct display *display, -+ uint32_t name, -+ const char *interface, -+ uint32_t version, void *data); -+ -+void -+display_set_global_handler(struct display *display, -+ display_global_handler_t handler); -+void -+display_set_global_handler_remove(struct display *display, -+ display_global_handler_t remove_handler); -+void * -+display_bind(struct display *display, uint32_t name, -+ const struct wl_interface *interface, uint32_t version); -+ -+typedef void (*display_output_handler_t)(struct output *output, void *data); -+ -+/* -+ * The output configure handler is called, when a new output is connected -+ * and we know its current mode, or when the current mode changes. -+ * Test and set the output user data in your handler to know, if the -+ * output is new. Note: 'data' in the configure handler is the display -+ * user data. -+ */ -+void -+display_set_output_configure_handler(struct display *display, -+ display_output_handler_t handler); -+ -+struct wl_data_source * -+display_create_data_source(struct display *display); -+ -+#ifdef EGL_NO_DISPLAY -+EGLDisplay -+display_get_egl_display(struct display *d); -+ -+EGLConfig -+display_get_argb_egl_config(struct display *d); -+ -+int -+display_acquire_window_surface(struct display *display, -+ struct window *window, -+ EGLContext ctx); -+void -+display_release_window_surface(struct display *display, -+ struct window *window); -+#endif -+ -+#define SURFACE_OPAQUE 0x01 -+#define SURFACE_SHM 0x02 -+ -+#define SURFACE_HINT_RESIZE 0x10 -+ -+#define SURFACE_HINT_RGB565 0x100 -+ -+cairo_surface_t * -+display_create_surface(struct display *display, -+ struct wl_surface *surface, -+ struct rectangle *rectangle, -+ uint32_t flags); -+ -+struct wl_buffer * -+display_get_buffer_for_surface(struct display *display, -+ cairo_surface_t *surface); -+ -+struct wl_cursor_image * -+display_get_pointer_image(struct display *display, int pointer); -+ -+void -+display_defer(struct display *display, struct task *task); -+ -+void -+display_watch_fd(struct display *display, -+ int fd, uint32_t events, struct task *task); -+ -+void -+display_unwatch_fd(struct display *display, int fd); -+ -+void -+display_run(struct display *d); -+ -+void -+display_exit(struct display *d); -+ -+int -+display_get_data_device_manager_version(struct display *d); -+ -+enum cursor_type { -+ CURSOR_BOTTOM_LEFT, -+ CURSOR_BOTTOM_RIGHT, -+ CURSOR_BOTTOM, -+ CURSOR_DRAGGING, -+ CURSOR_LEFT_PTR, -+ CURSOR_LEFT, -+ CURSOR_RIGHT, -+ CURSOR_TOP_LEFT, -+ CURSOR_TOP_RIGHT, -+ CURSOR_TOP, -+ CURSOR_IBEAM, -+ CURSOR_HAND1, -+ CURSOR_WATCH, -+ CURSOR_DND_MOVE, -+ CURSOR_DND_COPY, -+ CURSOR_DND_FORBIDDEN, -+ -+ CURSOR_BLANK -+}; -+ -+typedef void (*window_key_handler_t)(struct window *window, struct input *input, -+ uint32_t time, uint32_t key, uint32_t unicode, -+ enum wl_keyboard_key_state state, void *data); -+ -+typedef void (*window_keyboard_focus_handler_t)(struct window *window, -+ struct input *device, void *data); -+ -+typedef void (*window_data_handler_t)(struct window *window, -+ struct input *input, -+ float x, float y, -+ const char **types, -+ void *data); -+ -+typedef void (*window_drop_handler_t)(struct window *window, -+ struct input *input, -+ int32_t x, int32_t y, void *data); -+ -+typedef void (*window_close_handler_t)(void *data); -+typedef void (*window_fullscreen_handler_t)(struct window *window, void *data); -+ -+typedef void (*window_output_handler_t)(struct window *window, struct output *output, -+ int enter, void *data); -+typedef void (*window_state_changed_handler_t)(struct window *window, -+ void *data); -+ -+typedef void (*widget_resize_handler_t)(struct widget *widget, -+ int32_t width, int32_t height, -+ void *data); -+typedef void (*widget_redraw_handler_t)(struct widget *widget, void *data); -+ -+typedef int (*widget_enter_handler_t)(struct widget *widget, -+ struct input *input, -+ float x, float y, void *data); -+typedef void (*widget_leave_handler_t)(struct widget *widget, -+ struct input *input, void *data); -+typedef int (*widget_motion_handler_t)(struct widget *widget, -+ struct input *input, uint32_t time, -+ float x, float y, void *data); -+typedef void (*widget_button_handler_t)(struct widget *widget, -+ struct input *input, uint32_t time, -+ uint32_t button, -+ enum wl_pointer_button_state state, -+ void *data); -+typedef void (*widget_touch_down_handler_t)(struct widget *widget, -+ struct input *input, -+ uint32_t serial, -+ uint32_t time, -+ int32_t id, -+ float x, -+ float y, -+ void *data); -+typedef void (*widget_touch_up_handler_t)(struct widget *widget, -+ struct input *input, -+ uint32_t serial, -+ uint32_t time, -+ int32_t id, -+ void *data); -+typedef void (*widget_touch_motion_handler_t)(struct widget *widget, -+ struct input *input, -+ uint32_t time, -+ int32_t id, -+ float x, -+ float y, -+ void *data); -+typedef void (*widget_touch_frame_handler_t)(struct widget *widget, -+ struct input *input, void *data); -+typedef void (*widget_touch_cancel_handler_t)(struct widget *widget, -+ struct input *input, void *data); -+typedef void (*widget_axis_handler_t)(struct widget *widget, -+ struct input *input, uint32_t time, -+ uint32_t axis, -+ wl_fixed_t value, -+ void *data); -+ -+typedef void (*widget_pointer_frame_handler_t)(struct widget *widget, -+ struct input *input, -+ void *data); -+ -+typedef void (*widget_axis_source_handler_t)(struct widget *widget, -+ struct input *input, -+ uint32_t source, -+ void *data); -+ -+typedef void (*widget_axis_stop_handler_t)(struct widget *widget, -+ struct input *input, -+ uint32_t time, -+ uint32_t axis, -+ void *data); -+ -+typedef void (*widget_axis_discrete_handler_t)(struct widget *widget, -+ struct input *input, -+ uint32_t axis, -+ int32_t discrete, -+ void *data); -+ -+struct window * -+window_create(struct display *display); -+struct window * -+window_create_custom(struct display *display); -+ -+void -+window_set_parent(struct window *window, struct window *parent_window); -+struct window * -+window_get_parent(struct window *window); -+ -+int -+window_has_focus(struct window *window); -+ -+typedef void (*menu_func_t)(void *data, struct input *input, int index); -+ -+struct window * -+window_create_menu(struct display *display, -+ struct input *input, uint32_t time, -+ menu_func_t func, const char **entries, int count, -+ void *user_data); -+void -+window_show_menu(struct display *display, -+ struct input *input, uint32_t time, struct window *parent, -+ int32_t x, int32_t y, -+ menu_func_t func, const char **entries, int count); -+ -+void -+window_show_frame_menu(struct window *window, -+ struct input *input, uint32_t time); -+ -+int -+window_get_buffer_transform(struct window *window); -+ -+void -+window_set_buffer_transform(struct window *window, -+ enum wl_output_transform transform); -+ -+uint32_t -+window_get_buffer_scale(struct window *window); -+ -+void -+window_set_buffer_scale(struct window *window, -+ int32_t scale); -+ -+uint32_t -+window_get_output_scale(struct window *window); -+ -+void -+window_destroy(struct window *window); -+ -+struct widget * -+window_add_widget(struct window *window, void *data); -+ -+enum subsurface_mode { -+ SUBSURFACE_SYNCHRONIZED, -+ SUBSURFACE_DESYNCHRONIZED -+}; -+ -+struct widget * -+window_add_subsurface(struct window *window, void *data, -+ enum subsurface_mode default_mode); -+ -+typedef void (*data_func_t)(void *data, size_t len, -+ int32_t x, int32_t y, void *user_data); -+ -+struct display * -+window_get_display(struct window *window); -+void -+window_move(struct window *window, struct input *input, uint32_t time); -+void -+window_get_allocation(struct window *window, struct rectangle *allocation); -+void -+window_schedule_redraw(struct window *window); -+void -+window_schedule_resize(struct window *window, int width, int height); -+ -+cairo_surface_t * -+window_get_surface(struct window *window); -+ -+struct wl_surface * -+window_get_wl_surface(struct window *window); -+ -+struct wl_subsurface * -+widget_get_wl_subsurface(struct widget *widget); -+ -+enum window_buffer_type { -+ WINDOW_BUFFER_TYPE_EGL_WINDOW, -+ WINDOW_BUFFER_TYPE_SHM, -+}; -+ -+void -+display_surface_damage(struct display *display, cairo_surface_t *cairo_surface, -+ int32_t x, int32_t y, int32_t width, int32_t height); -+ -+void -+window_set_buffer_type(struct window *window, enum window_buffer_type type); -+ -+enum window_buffer_type -+window_get_buffer_type(struct window *window); -+ -+int -+window_is_fullscreen(struct window *window); -+ -+void -+window_set_fullscreen(struct window *window, int fullscreen); -+ -+int -+window_is_maximized(struct window *window); -+ -+void -+window_set_maximized(struct window *window, int maximized); -+ -+int -+window_is_resizing(struct window *window); -+ -+void -+window_set_minimized(struct window *window); -+ -+void -+window_set_user_data(struct window *window, void *data); -+ -+void * -+window_get_user_data(struct window *window); -+ -+void -+window_set_key_handler(struct window *window, -+ window_key_handler_t handler); -+ -+void -+window_set_keyboard_focus_handler(struct window *window, -+ window_keyboard_focus_handler_t handler); -+ -+void -+window_set_data_handler(struct window *window, -+ window_data_handler_t handler); -+ -+void -+window_set_drop_handler(struct window *window, -+ window_drop_handler_t handler); -+ -+void -+window_set_close_handler(struct window *window, -+ window_close_handler_t handler); -+void -+window_set_fullscreen_handler(struct window *window, -+ window_fullscreen_handler_t handler); -+void -+window_set_output_handler(struct window *window, -+ window_output_handler_t handler); -+void -+window_set_state_changed_handler(struct window *window, -+ window_state_changed_handler_t handler); -+ -+void -+window_set_title(struct window *window, const char *title); -+ -+const char * -+window_get_title(struct window *window); -+ -+void -+window_set_text_cursor_position(struct window *window, int32_t x, int32_t y); -+ -+enum preferred_format { -+ WINDOW_PREFERRED_FORMAT_NONE, -+ WINDOW_PREFERRED_FORMAT_RGB565 -+}; -+ -+void -+window_set_preferred_format(struct window *window, -+ enum preferred_format format); -+ -+int -+widget_set_tooltip(struct widget *parent, char *entry, float x, float y); -+ -+void -+widget_destroy_tooltip(struct widget *parent); -+ -+struct widget * -+widget_add_widget(struct widget *parent, void *data); -+ -+void -+widget_destroy(struct widget *widget); -+void -+widget_set_default_cursor(struct widget *widget, int cursor); -+void -+widget_get_allocation(struct widget *widget, struct rectangle *allocation); -+ -+void -+widget_set_allocation(struct widget *widget, -+ int32_t x, int32_t y, int32_t width, int32_t height); -+void -+widget_set_size(struct widget *widget, int32_t width, int32_t height); -+void -+widget_set_transparent(struct widget *widget, int transparent); -+void -+widget_schedule_resize(struct widget *widget, int32_t width, int32_t height); -+ -+void * -+widget_get_user_data(struct widget *widget); -+ -+cairo_t * -+widget_cairo_create(struct widget *widget); -+ -+struct wl_surface * -+widget_get_wl_surface(struct widget *widget); -+ -+uint32_t -+widget_get_last_time(struct widget *widget); -+ -+void -+widget_input_region_add(struct widget *widget, const struct rectangle *rect); -+ -+void -+widget_set_redraw_handler(struct widget *widget, -+ widget_redraw_handler_t handler); -+void -+widget_set_resize_handler(struct widget *widget, -+ widget_resize_handler_t handler); -+void -+widget_set_enter_handler(struct widget *widget, -+ widget_enter_handler_t handler); -+void -+widget_set_leave_handler(struct widget *widget, -+ widget_leave_handler_t handler); -+void -+widget_set_motion_handler(struct widget *widget, -+ widget_motion_handler_t handler); -+void -+widget_set_button_handler(struct widget *widget, -+ widget_button_handler_t handler); -+void -+widget_set_touch_down_handler(struct widget *widget, -+ widget_touch_down_handler_t handler); -+void -+widget_set_touch_up_handler(struct widget *widget, -+ widget_touch_up_handler_t handler); -+void -+widget_set_touch_motion_handler(struct widget *widget, -+ widget_touch_motion_handler_t handler); -+void -+widget_set_touch_frame_handler(struct widget *widget, -+ widget_touch_frame_handler_t handler); -+void -+widget_set_touch_cancel_handler(struct widget *widget, -+ widget_touch_cancel_handler_t handler); -+void -+widget_set_axis_handler(struct widget *widget, -+ widget_axis_handler_t handler); -+void -+widget_set_pointer_frame_handler(struct widget *widget, -+ widget_pointer_frame_handler_t handler); -+void -+widget_set_axis_handlers(struct widget *widget, -+ widget_axis_handler_t axis_handler, -+ widget_axis_source_handler_t axis_source_handler, -+ widget_axis_stop_handler_t axis_stop_handler, -+ widget_axis_discrete_handler_t axis_discrete_handler); -+ -+void -+widget_schedule_redraw(struct widget *widget); -+void -+widget_set_use_cairo(struct widget *widget, int use_cairo); -+ -+struct widget * -+window_frame_create(struct window *window, void *data); -+ -+void -+window_frame_set_child_size(struct widget *widget, int child_width, -+ int child_height); -+ -+void -+input_set_pointer_image(struct input *input, int pointer); -+ -+void -+input_get_position(struct input *input, int32_t *x, int32_t *y); -+ -+int -+input_get_touch(struct input *input, int32_t id, float *x, float *y); -+ -+#define MOD_SHIFT_MASK 0x01 -+#define MOD_ALT_MASK 0x02 -+#define MOD_CONTROL_MASK 0x04 -+ -+uint32_t -+input_get_modifiers(struct input *input); -+ -+void -+touch_grab(struct input *input, int32_t touch_id); -+ -+void -+touch_ungrab(struct input *input); -+ -+void -+input_grab(struct input *input, struct widget *widget, uint32_t button); -+ -+void -+input_ungrab(struct input *input); -+ -+struct widget * -+input_get_focus_widget(struct input *input); -+ -+struct display * -+input_get_display(struct input *input); -+ -+struct wl_seat * -+input_get_seat(struct input *input); -+ -+struct wl_data_device * -+input_get_data_device(struct input *input); -+ -+void -+input_set_selection(struct input *input, -+ struct wl_data_source *source, uint32_t time); -+ -+void -+input_accept(struct input *input, const char *type); -+ -+ -+void -+input_receive_drag_data(struct input *input, const char *mime_type, -+ data_func_t func, void *user_data); -+int -+input_receive_drag_data_to_fd(struct input *input, -+ const char *mime_type, int fd); -+ -+int -+input_receive_selection_data(struct input *input, const char *mime_type, -+ data_func_t func, void *data); -+int -+input_receive_selection_data_to_fd(struct input *input, -+ const char *mime_type, int fd); -+ -+void -+output_set_user_data(struct output *output, void *data); -+ -+void * -+output_get_user_data(struct output *output); -+ -+void -+output_set_destroy_handler(struct output *output, -+ display_output_handler_t handler); -+ -+void -+output_get_allocation(struct output *output, struct rectangle *allocation); -+ -+struct wl_output * -+output_get_wl_output(struct output *output); -+ -+enum wl_output_transform -+output_get_transform(struct output *output); -+ -+uint32_t -+output_get_scale(struct output *output); -+ -+const char * -+output_get_make(struct output *output); -+ -+const char * -+output_get_model(struct output *output); -+ -+void -+keysym_modifiers_add(struct wl_array *modifiers_map, -+ const char *name); -+ -+xkb_mod_mask_t -+keysym_modifiers_get_mask(struct wl_array *modifiers_map, -+ const char *name); -+ -+#endif -diff --git a/clients/window.h b/clients/window.h -index 8c8568f..3a16017 100644 ---- a/clients/window.h -+++ b/clients/window.h -@@ -26,629 +26,9 @@ - - #include "config.h" - --#include <xkbcommon/xkbcommon.h> --#include <wayland-client.h> --#include <cairo.h> -+#include "toytoolkit.h" - #include "shared/config-parser.h" - #include "shared/zalloc.h" - #include "shared/platform.h" - --struct window; --struct widget; --struct display; --struct input; --struct output; -- --struct task { -- void (*run)(struct task *task, uint32_t events); -- struct wl_list link; --}; -- --struct rectangle { -- int32_t x; -- int32_t y; -- int32_t width; -- int32_t height; --}; -- --struct display * --display_create(int *argc, char *argv[]); -- --void --display_destroy(struct display *display); -- --void --display_set_user_data(struct display *display, void *data); -- --void * --display_get_user_data(struct display *display); -- --struct wl_display * --display_get_display(struct display *display); -- --int --display_has_subcompositor(struct display *display); -- --cairo_device_t * --display_get_cairo_device(struct display *display); -- --struct wl_compositor * --display_get_compositor(struct display *display); -- --struct output * --display_get_output(struct display *display); -- --uint32_t --display_get_serial(struct display *display); -- --typedef void (*display_global_handler_t)(struct display *display, -- uint32_t name, -- const char *interface, -- uint32_t version, void *data); -- --void --display_set_global_handler(struct display *display, -- display_global_handler_t handler); --void --display_set_global_handler_remove(struct display *display, -- display_global_handler_t remove_handler); --void * --display_bind(struct display *display, uint32_t name, -- const struct wl_interface *interface, uint32_t version); -- --typedef void (*display_output_handler_t)(struct output *output, void *data); -- --/* -- * The output configure handler is called, when a new output is connected -- * and we know its current mode, or when the current mode changes. -- * Test and set the output user data in your handler to know, if the -- * output is new. Note: 'data' in the configure handler is the display -- * user data. -- */ --void --display_set_output_configure_handler(struct display *display, -- display_output_handler_t handler); -- --struct wl_data_source * --display_create_data_source(struct display *display); -- --#ifdef EGL_NO_DISPLAY --EGLDisplay --display_get_egl_display(struct display *d); -- --EGLConfig --display_get_argb_egl_config(struct display *d); -- --int --display_acquire_window_surface(struct display *display, -- struct window *window, -- EGLContext ctx); --void --display_release_window_surface(struct display *display, -- struct window *window); --#endif -- --#define SURFACE_OPAQUE 0x01 --#define SURFACE_SHM 0x02 -- --#define SURFACE_HINT_RESIZE 0x10 -- --#define SURFACE_HINT_RGB565 0x100 -- --cairo_surface_t * --display_create_surface(struct display *display, -- struct wl_surface *surface, -- struct rectangle *rectangle, -- uint32_t flags); -- --struct wl_buffer * --display_get_buffer_for_surface(struct display *display, -- cairo_surface_t *surface); -- --struct wl_cursor_image * --display_get_pointer_image(struct display *display, int pointer); -- --void --display_defer(struct display *display, struct task *task); -- --void --display_watch_fd(struct display *display, -- int fd, uint32_t events, struct task *task); -- --void --display_unwatch_fd(struct display *display, int fd); -- --void --display_run(struct display *d); -- --void --display_exit(struct display *d); -- --int --display_get_data_device_manager_version(struct display *d); -- --enum cursor_type { -- CURSOR_BOTTOM_LEFT, -- CURSOR_BOTTOM_RIGHT, -- CURSOR_BOTTOM, -- CURSOR_DRAGGING, -- CURSOR_LEFT_PTR, -- CURSOR_LEFT, -- CURSOR_RIGHT, -- CURSOR_TOP_LEFT, -- CURSOR_TOP_RIGHT, -- CURSOR_TOP, -- CURSOR_IBEAM, -- CURSOR_HAND1, -- CURSOR_WATCH, -- CURSOR_DND_MOVE, -- CURSOR_DND_COPY, -- CURSOR_DND_FORBIDDEN, -- -- CURSOR_BLANK --}; -- --typedef void (*window_key_handler_t)(struct window *window, struct input *input, -- uint32_t time, uint32_t key, uint32_t unicode, -- enum wl_keyboard_key_state state, void *data); -- --typedef void (*window_keyboard_focus_handler_t)(struct window *window, -- struct input *device, void *data); -- --typedef void (*window_data_handler_t)(struct window *window, -- struct input *input, -- float x, float y, -- const char **types, -- void *data); -- --typedef void (*window_drop_handler_t)(struct window *window, -- struct input *input, -- int32_t x, int32_t y, void *data); -- --typedef void (*window_close_handler_t)(void *data); --typedef void (*window_fullscreen_handler_t)(struct window *window, void *data); -- --typedef void (*window_output_handler_t)(struct window *window, struct output *output, -- int enter, void *data); --typedef void (*window_state_changed_handler_t)(struct window *window, -- void *data); -- --typedef void (*widget_resize_handler_t)(struct widget *widget, -- int32_t width, int32_t height, -- void *data); --typedef void (*widget_redraw_handler_t)(struct widget *widget, void *data); -- --typedef int (*widget_enter_handler_t)(struct widget *widget, -- struct input *input, -- float x, float y, void *data); --typedef void (*widget_leave_handler_t)(struct widget *widget, -- struct input *input, void *data); --typedef int (*widget_motion_handler_t)(struct widget *widget, -- struct input *input, uint32_t time, -- float x, float y, void *data); --typedef void (*widget_button_handler_t)(struct widget *widget, -- struct input *input, uint32_t time, -- uint32_t button, -- enum wl_pointer_button_state state, -- void *data); --typedef void (*widget_touch_down_handler_t)(struct widget *widget, -- struct input *input, -- uint32_t serial, -- uint32_t time, -- int32_t id, -- float x, -- float y, -- void *data); --typedef void (*widget_touch_up_handler_t)(struct widget *widget, -- struct input *input, -- uint32_t serial, -- uint32_t time, -- int32_t id, -- void *data); --typedef void (*widget_touch_motion_handler_t)(struct widget *widget, -- struct input *input, -- uint32_t time, -- int32_t id, -- float x, -- float y, -- void *data); --typedef void (*widget_touch_frame_handler_t)(struct widget *widget, -- struct input *input, void *data); --typedef void (*widget_touch_cancel_handler_t)(struct widget *widget, -- struct input *input, void *data); --typedef void (*widget_axis_handler_t)(struct widget *widget, -- struct input *input, uint32_t time, -- uint32_t axis, -- wl_fixed_t value, -- void *data); -- --typedef void (*widget_pointer_frame_handler_t)(struct widget *widget, -- struct input *input, -- void *data); -- --typedef void (*widget_axis_source_handler_t)(struct widget *widget, -- struct input *input, -- uint32_t source, -- void *data); -- --typedef void (*widget_axis_stop_handler_t)(struct widget *widget, -- struct input *input, -- uint32_t time, -- uint32_t axis, -- void *data); -- --typedef void (*widget_axis_discrete_handler_t)(struct widget *widget, -- struct input *input, -- uint32_t axis, -- int32_t discrete, -- void *data); -- --struct window * --window_create(struct display *display); --struct window * --window_create_custom(struct display *display); -- --void --window_set_parent(struct window *window, struct window *parent_window); --struct window * --window_get_parent(struct window *window); -- --int --window_has_focus(struct window *window); -- --typedef void (*menu_func_t)(void *data, struct input *input, int index); -- --struct window * --window_create_menu(struct display *display, -- struct input *input, uint32_t time, -- menu_func_t func, const char **entries, int count, -- void *user_data); --void --window_show_menu(struct display *display, -- struct input *input, uint32_t time, struct window *parent, -- int32_t x, int32_t y, -- menu_func_t func, const char **entries, int count); -- --void --window_show_frame_menu(struct window *window, -- struct input *input, uint32_t time); -- --int --window_get_buffer_transform(struct window *window); -- --void --window_set_buffer_transform(struct window *window, -- enum wl_output_transform transform); -- --uint32_t --window_get_buffer_scale(struct window *window); -- --void --window_set_buffer_scale(struct window *window, -- int32_t scale); -- --uint32_t --window_get_output_scale(struct window *window); -- --void --window_destroy(struct window *window); -- --struct widget * --window_add_widget(struct window *window, void *data); -- --enum subsurface_mode { -- SUBSURFACE_SYNCHRONIZED, -- SUBSURFACE_DESYNCHRONIZED --}; -- --struct widget * --window_add_subsurface(struct window *window, void *data, -- enum subsurface_mode default_mode); -- --typedef void (*data_func_t)(void *data, size_t len, -- int32_t x, int32_t y, void *user_data); -- --struct display * --window_get_display(struct window *window); --void --window_move(struct window *window, struct input *input, uint32_t time); --void --window_get_allocation(struct window *window, struct rectangle *allocation); --void --window_schedule_redraw(struct window *window); --void --window_schedule_resize(struct window *window, int width, int height); -- --cairo_surface_t * --window_get_surface(struct window *window); -- --struct wl_surface * --window_get_wl_surface(struct window *window); -- --struct wl_subsurface * --widget_get_wl_subsurface(struct widget *widget); -- --enum window_buffer_type { -- WINDOW_BUFFER_TYPE_EGL_WINDOW, -- WINDOW_BUFFER_TYPE_SHM, --}; -- --void --display_surface_damage(struct display *display, cairo_surface_t *cairo_surface, -- int32_t x, int32_t y, int32_t width, int32_t height); -- --void --window_set_buffer_type(struct window *window, enum window_buffer_type type); -- --enum window_buffer_type --window_get_buffer_type(struct window *window); -- --int --window_is_fullscreen(struct window *window); -- --void --window_set_fullscreen(struct window *window, int fullscreen); -- --int --window_is_maximized(struct window *window); -- --void --window_set_maximized(struct window *window, int maximized); -- --int --window_is_resizing(struct window *window); -- --void --window_set_minimized(struct window *window); -- --void --window_set_user_data(struct window *window, void *data); -- --void * --window_get_user_data(struct window *window); -- --void --window_set_key_handler(struct window *window, -- window_key_handler_t handler); -- --void --window_set_keyboard_focus_handler(struct window *window, -- window_keyboard_focus_handler_t handler); -- --void --window_set_data_handler(struct window *window, -- window_data_handler_t handler); -- --void --window_set_drop_handler(struct window *window, -- window_drop_handler_t handler); -- --void --window_set_close_handler(struct window *window, -- window_close_handler_t handler); --void --window_set_fullscreen_handler(struct window *window, -- window_fullscreen_handler_t handler); --void --window_set_output_handler(struct window *window, -- window_output_handler_t handler); --void --window_set_state_changed_handler(struct window *window, -- window_state_changed_handler_t handler); -- --void --window_set_title(struct window *window, const char *title); -- --const char * --window_get_title(struct window *window); -- --void --window_set_text_cursor_position(struct window *window, int32_t x, int32_t y); -- --enum preferred_format { -- WINDOW_PREFERRED_FORMAT_NONE, -- WINDOW_PREFERRED_FORMAT_RGB565 --}; -- --void --window_set_preferred_format(struct window *window, -- enum preferred_format format); -- --int --widget_set_tooltip(struct widget *parent, char *entry, float x, float y); -- --void --widget_destroy_tooltip(struct widget *parent); -- --struct widget * --widget_add_widget(struct widget *parent, void *data); -- --void --widget_destroy(struct widget *widget); --void --widget_set_default_cursor(struct widget *widget, int cursor); --void --widget_get_allocation(struct widget *widget, struct rectangle *allocation); -- --void --widget_set_allocation(struct widget *widget, -- int32_t x, int32_t y, int32_t width, int32_t height); --void --widget_set_size(struct widget *widget, int32_t width, int32_t height); --void --widget_set_transparent(struct widget *widget, int transparent); --void --widget_schedule_resize(struct widget *widget, int32_t width, int32_t height); -- --void * --widget_get_user_data(struct widget *widget); -- --cairo_t * --widget_cairo_create(struct widget *widget); -- --struct wl_surface * --widget_get_wl_surface(struct widget *widget); -- --uint32_t --widget_get_last_time(struct widget *widget); -- --void --widget_input_region_add(struct widget *widget, const struct rectangle *rect); -- --void --widget_set_redraw_handler(struct widget *widget, -- widget_redraw_handler_t handler); --void --widget_set_resize_handler(struct widget *widget, -- widget_resize_handler_t handler); --void --widget_set_enter_handler(struct widget *widget, -- widget_enter_handler_t handler); --void --widget_set_leave_handler(struct widget *widget, -- widget_leave_handler_t handler); --void --widget_set_motion_handler(struct widget *widget, -- widget_motion_handler_t handler); --void --widget_set_button_handler(struct widget *widget, -- widget_button_handler_t handler); --void --widget_set_touch_down_handler(struct widget *widget, -- widget_touch_down_handler_t handler); --void --widget_set_touch_up_handler(struct widget *widget, -- widget_touch_up_handler_t handler); --void --widget_set_touch_motion_handler(struct widget *widget, -- widget_touch_motion_handler_t handler); --void --widget_set_touch_frame_handler(struct widget *widget, -- widget_touch_frame_handler_t handler); --void --widget_set_touch_cancel_handler(struct widget *widget, -- widget_touch_cancel_handler_t handler); --void --widget_set_axis_handler(struct widget *widget, -- widget_axis_handler_t handler); --void --widget_set_pointer_frame_handler(struct widget *widget, -- widget_pointer_frame_handler_t handler); --void --widget_set_axis_handlers(struct widget *widget, -- widget_axis_handler_t axis_handler, -- widget_axis_source_handler_t axis_source_handler, -- widget_axis_stop_handler_t axis_stop_handler, -- widget_axis_discrete_handler_t axis_discrete_handler); -- --void --widget_schedule_redraw(struct widget *widget); --void --widget_set_use_cairo(struct widget *widget, int use_cairo); -- --struct widget * --window_frame_create(struct window *window, void *data); -- --void --window_frame_set_child_size(struct widget *widget, int child_width, -- int child_height); -- --void --input_set_pointer_image(struct input *input, int pointer); -- --void --input_get_position(struct input *input, int32_t *x, int32_t *y); -- --int --input_get_touch(struct input *input, int32_t id, float *x, float *y); -- --#define MOD_SHIFT_MASK 0x01 --#define MOD_ALT_MASK 0x02 --#define MOD_CONTROL_MASK 0x04 -- --uint32_t --input_get_modifiers(struct input *input); -- --void --touch_grab(struct input *input, int32_t touch_id); -- --void --touch_ungrab(struct input *input); -- --void --input_grab(struct input *input, struct widget *widget, uint32_t button); -- --void --input_ungrab(struct input *input); -- --struct widget * --input_get_focus_widget(struct input *input); -- --struct display * --input_get_display(struct input *input); -- --struct wl_seat * --input_get_seat(struct input *input); -- --struct wl_data_device * --input_get_data_device(struct input *input); -- --void --input_set_selection(struct input *input, -- struct wl_data_source *source, uint32_t time); -- --void --input_accept(struct input *input, const char *type); -- -- --void --input_receive_drag_data(struct input *input, const char *mime_type, -- data_func_t func, void *user_data); --int --input_receive_drag_data_to_fd(struct input *input, -- const char *mime_type, int fd); -- --int --input_receive_selection_data(struct input *input, const char *mime_type, -- data_func_t func, void *data); --int --input_receive_selection_data_to_fd(struct input *input, -- const char *mime_type, int fd); -- --void --output_set_user_data(struct output *output, void *data); -- --void * --output_get_user_data(struct output *output); -- --void --output_set_destroy_handler(struct output *output, -- display_output_handler_t handler); -- --void --output_get_allocation(struct output *output, struct rectangle *allocation); -- --struct wl_output * --output_get_wl_output(struct output *output); -- --enum wl_output_transform --output_get_transform(struct output *output); -- --uint32_t --output_get_scale(struct output *output); -- --const char * --output_get_make(struct output *output); -- --const char * --output_get_model(struct output *output); -- --void --keysym_modifiers_add(struct wl_array *modifiers_map, -- const char *name); -- --xkb_mod_mask_t --keysym_modifiers_get_mask(struct wl_array *modifiers_map, -- const char *name); -- - #endif -diff --git a/configure.ac b/configure.ac -index 1d11864..15057df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -35,7 +35,7 @@ AC_PROG_SED - - # Initialize libtool - LT_PREREQ([2.2]) --LT_INIT([disable-static]) -+LT_INIT([shared static]) - - AC_ARG_VAR([WESTON_NATIVE_BACKEND], - [Set the native backend to use, if Weston is not running under Wayland nor X11. @<:@default=drm-backend.so@:>@]) --- -2.7.4 - diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0003-add-window-set-fullscreen-at-output.patch b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0003-add-window-set-fullscreen-at-output.patch deleted file mode 100644 index d519a49..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0003-add-window-set-fullscreen-at-output.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -index fdf9b57..402836d 100644 ---- a/clients/toytoolkit.h -+++ b/clients/toytoolkit.h -@@ -84,6 +84,12 @@ display_get_compositor(struct display *display); - struct output * - display_get_output(struct display *display); - -+unsigned int -+display_get_outputs_number(struct display *display); -+ -+struct output * -+display_get_output_by_index(struct display *display, unsigned int index); -+ - uint32_t - display_get_serial(struct display *display); - -@@ -372,6 +378,9 @@ window_is_fullscreen(struct window *window); - void - window_set_fullscreen(struct window *window, int fullscreen); - -+void -+window_set_fullscreen_at_output(struct window *window, int fullscreen, struct output *output); -+ - int - window_is_maximized(struct window *window); - -diff --git a/clients/window.c b/clients/window.c -index 0e73f5b..2d38796 100644 ---- a/clients/window.c -+++ b/clients/window.c -@@ -4364,6 +4364,21 @@ window_set_fullscreen(struct window *window, int fullscreen) - xdg_surface_unset_fullscreen(window->xdg_surface); - } - -+void -+window_set_fullscreen_at_output(struct window *window, int fullscreen, struct output *output) -+{ -+ if (!window->xdg_surface) -+ return; -+ -+ if (window->fullscreen == fullscreen) -+ return; -+ -+ if (fullscreen) -+ xdg_surface_set_fullscreen(window->xdg_surface, output ? output_get_wl_output(output) : NULL); -+ else -+ xdg_surface_unset_fullscreen(window->xdg_surface); -+} -+ - int - window_is_maximized(struct window *window) - { -@@ -5743,6 +5758,29 @@ display_get_output(struct display *display) - return container_of(display->output_list.next, struct output, link); - } - -+unsigned int -+display_get_outputs_number(struct display *display) -+{ -+ return wl_list_length(&display->output_list); -+} -+ -+struct output * -+display_get_output_by_index(struct display *display, unsigned int index) -+{ -+ int i; -+ int n = wl_list_length(&display->output_list); -+ struct wl_list *item; -+ -+ if (index >= n) -+ return NULL; -+ -+ item = display->output_list.next; -+ for (i = 0; i < index; i++) -+ item = item->next; -+ -+ return container_of(item, struct output, link); -+} -+ - struct wl_compositor * - display_get_compositor(struct display *display) - { diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0004-Add-display_poll-function.patch b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0004-Add-display_poll-function.patch deleted file mode 100644 index d1a9725..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0004-Add-display_poll-function.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -index 402836d..767a84e 100644 ---- a/clients/toytoolkit.h -+++ b/clients/toytoolkit.h -@@ -173,6 +173,9 @@ display_unwatch_fd(struct display *display, int fd); - void - display_run(struct display *d); - -+int -+display_poll(struct display *display, int timeout); -+ - void - display_exit(struct display *d); - -diff --git a/clients/window.c b/clients/window.c -index 2d38796..8540553 100644 ---- a/clients/window.c -+++ b/clients/window.c -@@ -6011,6 +6011,58 @@ display_run(struct display *display) - } - } - -+int -+display_poll(struct display *display, int timeout) -+{ -+ struct task *task; -+ struct epoll_event ep[16]; -+ int i, count, ret; -+ -+ display->running = 1; -+ while (!wl_list_empty(&display->deferred_list)) { -+ task = container_of(display->deferred_list.prev, -+ struct task, link); -+ wl_list_remove(&task->link); -+ task->run(task, 0); -+ } -+ -+ /* ...prepare for a reading */ -+ while (wl_display_prepare_read(display->display) != 0) -+ { -+ /* ...dispatch all pending events and repeat attempt */ -+ wl_display_dispatch_pending(display->display); -+ } -+ -+ /* ...flush all outstanding commands to a display */ -+ if (wl_display_flush(display->display) < 0) { -+ return -1; -+ } -+ -+ if (!display->running) -+ return -1; -+ -+ count = epoll_wait(display->epoll_fd, ep, ARRAY_LENGTH(ep), timeout); -+ if (!count) { -+ wl_display_cancel_read(display->display); -+ return 0; -+ } -+ -+ if (count > 0) { -+ /* ...read display events (if any) before we do any drawing */ -+ if (wl_display_read_events(display->display) < 0) { -+ return -1; -+ } -+ -+ /* ...process pending display events (if any) */ -+ if (wl_display_dispatch_pending(display->display) < 0) { -+ return -1; -+ } -+ } else if (count < 0) { -+ wl_display_cancel_read(display->display); -+ return count; -+ } -+} -+ - void - display_exit(struct display *display) - { diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0005-Add-wl-ivi-shell-surface-creating-support.patch b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0005-Add-wl-ivi-shell-surface-creating-support.patch deleted file mode 100644 index 5c732b1..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0005-Add-wl-ivi-shell-surface-creating-support.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 626341e48f4159d91ff39af2d0dc7bc720521121 Mon Sep 17 00:00:00 2001 -From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> -Date: Tue, 13 Jun 2017 23:58:37 +0300 -Subject: [PATCH 4/4] Add wl ivi shell sirface creating support - ---- - ivi-shell/ivi-layout-export.h | 19 +++++++++++++++++++ - ivi-shell/ivi-layout.c | 2 ++ - 2 files changed, 21 insertions(+) - -diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h -index 33aa820..78dab61 100644 ---- a/ivi-shell/ivi-layout-export.h -+++ b/ivi-shell/ivi-layout-export.h -@@ -149,6 +149,25 @@ struct ivi_layout_interface { - */ - int32_t (*commit_changes)(void); - -+ /** -+ * \brief Creates an ivi_layout_surface. -+ * -+ * \return IVI_SUCCEEDED if the method call was successful -+ * \return IVI_FAILED if the method call was failed -+ */ -+ struct ivi_layout_surface* (*surface_create)( -+ struct weston_surface *wl_surface, -+ uint32_t id_surface); -+ -+ /** -+ * \brief Configure an ivi_layout_surface -+ * -+ * \return IVI_SUCCEEDED if the method call was successful -+ * \return IVI_FAILED if the method call was failed -+ */ -+ void (*surface_configure)(struct ivi_layout_surface *ivisurf, -+ int32_t width, int32_t height); -+ - /** - * surface controller interface - */ -diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c -index 7fa8b33..161694d 100644 ---- a/ivi-shell/ivi-layout.c -+++ b/ivi-shell/ivi-layout.c -@@ -1985,6 +1985,8 @@ static struct ivi_layout_interface ivi_layout_interface = { - * commit all changes - */ - .commit_changes = ivi_layout_commit_changes, -+ .surface_create = ivi_layout_surface_create, -+ .surface_configure = ivi_layout_surface_configure, - - /** - * surface controller interfaces --- -2.7.4 - diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0006-Add-widget_set_surface_allocation-func.patch b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0006-Add-widget_set_surface_allocation-func.patch deleted file mode 100644 index 7fb1ce6..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0006-Add-widget_set_surface_allocation-func.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e513edbcb6d870c9ce956f0a092d01540073b750 Mon Sep 17 00:00:00 2001 -From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> -Date: Tue, 13 Dec 2016 00:43:11 +0300 -Subject: [PATCH] Add widget_set_surface_allocation func - ---- - clients/toytoolkit.h | 3 +++ - clients/window.c | 12 ++++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -index 767a84e..d0e73ab 100644 ---- a/clients/toytoolkit.h -+++ b/clients/toytoolkit.h -@@ -469,6 +469,9 @@ void - widget_set_allocation(struct widget *widget, - int32_t x, int32_t y, int32_t width, int32_t height); - void -+widget_set_surface_allocation(struct widget *widget, -+ int32_t x, int32_t y, int32_t width, int32_t height); -+void - widget_set_size(struct widget *widget, int32_t width, int32_t height); - void - widget_set_transparent(struct widget *widget, int transparent); -diff --git a/clients/window.c b/clients/window.c -index 0114ece..820cd78 100644 ---- a/clients/window.c -+++ b/clients/window.c -@@ -1695,6 +1695,18 @@ widget_set_allocation(struct widget *widget, - } - - void -+widget_set_surface_allocation(struct widget *widget, -+ int32_t x, int32_t y, int32_t width, int32_t height) -+{ -+ if (widget->surface) { -+ widget->surface->allocation.x = x; -+ widget->surface->allocation.y = y; -+ widget->surface->allocation.width = width; -+ widget->surface->allocation.height = height; -+ } -+} -+ -+void - widget_set_transparent(struct widget *widget, int transparent) - { - widget->opaque = !transparent; --- -2.7.4 - diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch deleted file mode 100644 index dcecbde..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-1.11.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9f1228fad3e549fd0ead4fd37573e02b874d1661 Mon Sep 17 00:00:00 2001 -From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> -Date: Tue, 13 Dec 2016 18:20:11 +0300 -Subject: [PATCH] Add call for setting fullscreen with IVI - ---- - clients/toytoolkit.h | 3 +++ - clients/window.c | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -index d0e73ab..1759a52 100644 ---- a/clients/toytoolkit.h -+++ b/clients/toytoolkit.h -@@ -384,6 +384,9 @@ window_set_fullscreen(struct window *window, int fullscreen); - void - window_set_fullscreen_at_output(struct window *window, int fullscreen, struct output *output); - -+void -+window_set_fullscreen_hack(struct window *window, int fullscreen); -+ - int - window_is_maximized(struct window *window); - -diff --git a/clients/window.c b/clients/window.c -index 820cd78..638e2ff 100644 ---- a/clients/window.c -+++ b/clients/window.c -@@ -4391,6 +4391,12 @@ window_set_fullscreen_at_output(struct window *window, int fullscreen, struct ou - xdg_surface_unset_fullscreen(window->xdg_surface); - } - -+void -+window_set_fullscreen_hack(struct window *window, int fullscreen) -+{ -+ window->fullscreen = fullscreen; -+} -+ - int - window_is_maximized(struct window *window) - { --- -2.7.4 - diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init.bbappend b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init.bbappend deleted file mode 100644 index 35bafac..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append = " \ - file://weston_exp.sh \ -" - -# Add Weston configuration script -do_install_append() { - install -d ${D}/etc/profile.d - install -m 0755 ${WORKDIR}/weston_exp.sh ${D}/etc/profile.d -} diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init/weston_exp.sh b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init/weston_exp.sh deleted file mode 100755 index 18be2ad..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init/weston_exp.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi -fi - -export QT_QPA_PLATFORM=wayland diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_1.11.0.bbappend b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_1.11.0.bbappend deleted file mode 100644 index 254657f..0000000 --- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_1.11.0.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS_prepend := '${THISDIR}/${PN}-${PV}:' - -SRC_URI_append = " \ - file://0001-Allow-to-boot-without-input-device.patch \ - file://0002-Share-toytoolkit-lib.patch \ - file://0003-add-window-set-fullscreen-at-output.patch \ - file://0004-Add-display_poll-function.patch \ - file://0005-Add-wl-ivi-shell-surface-creating-support.patch \ - file://0006-Add-widget_set_surface_allocation-func.patch \ - file://0007-Add-call-for-setting-fullscreen-with-IVI.patch \ -" - -FILES_${PN} += " ${libdir}/libweston-toytoolkit*"
\ No newline at end of file diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-rcar-gen3-adas/recipes-kernel/linux-firmware/linux-firmware_git.bbappend index e494b0c..c620ef4 100644 --- a/meta-rcar-gen3-adas/recipes-kernel/linux-firmware/linux-firmware_git.bbappend +++ b/meta-rcar-gen3-adas/recipes-kernel/linux-firmware/linux-firmware_git.bbappend @@ -1,63 +1,14 @@ -SRCREV = "dbb85a5154a5da7fa94bf9caa3658d4b6999cee6" +# Support additional firmware for WiLink8 modules +# +# TIInit_11.8.32.bts V4.2 is not in the linux-firmware repository. -# Changing SRCREV cause some license files to change. -# As a result we need to change md5 for some these files. -# The only way to do this is to overwrite whole LIC_FILES_CHKSUM - -LIC_FILES_CHKSUM = "\ - file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ - file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ - file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amd-ucode;md5=3a0de451253cc1edbf30a3c621effee3 \ - file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ - file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ - file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \ - file://LICENCE.ca0132;md5=209b33e66ee5be0461f13d31da392198 \ - file://LICENCE.cavium;md5=c37aaffb1ebe5939b2580d073a95daea \ - file://LICENCE.chelsio_firmware;md5=819aa8c3fa453f1b258ed8d168a9d903 \ - file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \ - file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ - file://LICENCE.e100;md5=ec0f84136766df159a3ae6d02acdf5a8 \ - file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ - file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ - file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \ - file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ - file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ - file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ - file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ - file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ - file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ - file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ - file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ - file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ - file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ - file://LICENCE.mwl8335;md5=9a6271ee0e644404b2ff3c61fd070983 \ - file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ - file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ - file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ - file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ - file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ - file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ - file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ - file://LICENCE.qla2xxx;md5=f5ce8529ec5c17cb7f911d2721d90e91 \ - file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ - file://LICENSE.QualcommAtheros_ath10k;md5=b5fe244fb2b532311de1472a3bc06da5 \ - file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ - file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \ - file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ - file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ - file://LICENCE.siano;md5=602c79ae3f98f1e73d880fd9f940a418 \ - file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0dddd695c7d9103e \ - file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ - file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ - file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \ - file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \ - file://LICENCE.wl1251;md5=ad3f81922bb9e197014bb187289d3b5b \ - file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ - file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ - file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - \ - file://LICENSE.amdgpu;md5=3fe8a3430700a518990c3b3d75297209 \ - file://LICENSE.radeon;md5=69612f4f7b141a97659cb1d609a1bde2 \ - file://WHENCE;md5=39dbb62d53262685b8bd977329dc4c10 \ +SRC_URI_append = " \ + https://git.ti.com/ti-bt/service-packs/blobs/raw/3acb49e97179320cb7564d202d0dde23ad7bd0a2/initscripts/TIInit_11.8.32.bts \ " + +SRC_URI[md5sum] = "b1e142773e8ef0537b93895ebe2fcae3" +SRC_URI[sha256sum] = "962322c05857ad6b1fb81467bdfc59c125e04a6a8eaabf7f24b742ddd68c3bfa" + +do_install_append() { + install -m 644 ${WORKDIR}/TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/ +} diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch new file mode 100644 index 0000000..31a66b7 --- /dev/null +++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch @@ -0,0 +1,34 @@ +From 9f2cf209ef8235f33683ca941fd0d7bdcca4078d Mon Sep 17 00:00:00 2001 +From: Matt Porter <mporter@konsulko.com> +Date: Sun, 17 Dec 2017 21:44:41 -0500 +Subject: [PATCH] arm64: dts: renesas: disable r8a7796 hscif0 dma + +When streaming A2DP audio on WiLink8, DMA errors are +seen from the rcar-dmac driver servicing hscif0. As +a result, data corruption is seen by the UIM service +managing the link to the Wilink8 device. This data +corruption manifests as dropped frames and audibly as +"skips" in the audio playback. + +Workaround this issue by disabling DMA for hscif0. + +Signed-off-by: Matt Porter <mporter@konsulko.com> +--- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi +index e3a5c25bc3da..dd97af4bdd60 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi ++++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi +@@ -1282,7 +1282,6 @@ + <&scif_clk>; + clock-names = "fck", "brg_int", "scif_clk"; + dmas = <&dmac1 0x31>, <&dmac1 0x30>; +- dma-names = "tx", "rx"; + power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; + status = "disabled"; + }; +-- +2.11.0 + diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch new file mode 100644 index 0000000..4f87f30 --- /dev/null +++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch @@ -0,0 +1,54 @@ +From df5348a8ec6f611fe3fc51d7c12898b8830d89d3 Mon Sep 17 00:00:00 2001 +From: Matt Porter <mporter@konsulko.com> +Date: Wed, 13 Dec 2017 12:49:20 -0500 +Subject: [PATCH] arm64: dts: renesas: preserve drm HDMI connector naming on KF + +Kingfisher adds encoders on ports 0 and 2 of the R-Car +display unit. The bare ULCB SK has only an HDMI encoder +in use on port 1. When the system is booted with an SK +dtb, port 1's HDMI encoder is assigned as HDMI-A-1 because +it is the first (and only) encoder present. When booting +a KF dtb, port 0's HDMI encoder preceeds port1 in the dtb due +to incremental ordering of the endpoint port nodes. This causes +the KF HDMI to be assigned HDMI-A-1 and the SK HDMI to be assigned +as HDMI-A-2. In order to preserve the SK's HDMI output naming as +connector HDMI-A-1, reorder the endpoint port nodes so that port1 +is first. + +Change-Id: Ibbb1975c2383a526a54c257fb7d68d32a042d468 +Signed-off-by: Matt Porter <mporter@konsulko.com> +--- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi +index bf37b8aa0e2f..e3a5c25bc3da 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi ++++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi +@@ -2391,11 +2391,6 @@ + #address-cells = <1>; + #size-cells = <0>; + +- port@0 { +- reg = <0>; +- du_out_rgb: endpoint { +- }; +- }; + port@1 { + reg = <1>; + du_out_hdmi0: endpoint { +@@ -2406,6 +2401,11 @@ + du_out_lvds0: endpoint { + }; + }; ++ port@0 { ++ reg = <0>; ++ du_out_rgb: endpoint { ++ }; ++ }; + }; + }; + +-- +2.11.0 + diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/ulcb.cfg b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/ulcb.cfg index 2714452..a821c24 100644 --- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/ulcb.cfg +++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/ulcb.cfg @@ -71,13 +71,6 @@ CONFIG_DRM_I2C_ADV7511=y CONFIG_TOUCHSCREEN_EDT_FT5X06=y CONFIG_SERIAL_SH_SCI_DMA=y CONFIG_STAGING=y -CONFIG_MOST=y -CONFIG_MOSTCORE=y -CONFIG_AIM_CDEV=y -CONFIG_AIM_NETWORK=y -CONFIG_AIM_SOUND=y -CONFIG_AIM_V4L2=y -CONFIG_HDM_DIM2=y CONFIG_UIO=y CONFIG_SENSORS_EMC2103=y CONFIG_PMBUS=y @@ -87,3 +80,4 @@ CONFIG_SENSORS_LM63=y CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_RAID0=y +CONFIG_MMC_SDHI_SEQ_WORKAROUND=y diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend index b35a8e1..e782c9f 100644 --- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend +++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend @@ -6,6 +6,17 @@ COMPATIBLE_MACHINE_condor = "condor" COMPATIBLE_MACHINE_v3mzf = "v3mzf" COMPATIBLE_MACHINE_v3hsk = "v3hsk" +BRANCH = "v4.9/rcar-3.5.9" +SRCREV = "2c20c9881d53f1b5c7a3ebf55bb83ec15902d0d0" + +KERNEL_MODULE_PROBECONF += "btwilink" +module_conf_btwilink = "blacklist btwilink" + +SRC_URI_remove = " \ + file://0001-dmaengine-rcar-dmac-ensure-CHCR-DE-bit-is-actually-0.patch \ + file://0002-dmaengine-rcar-dmac-use-TCRB-instead-of-TCR-for-resi.patch \ +" + SRC_URI_append = " \ ${@bb.utils.contains('MACHINE_FEATURES', 'h3ulcb-had', ' file://hyperflash.cfg', '', d)} \ ${@base_conditional("SDHI_SEQ", "1", " file://sdhi_seq.cfg", "", d)} \ @@ -45,7 +56,6 @@ SRC_URI_append = " \ file://0033-media-soc-camera-fix-parallel-i-f-in-VIN.patch \ file://0034-media-soc_camera-Fix-VIDIOC_S_SELECTION-ioctl-miscal.patch \ file://0040-arm64-dts-renesas-add-ADAS-boards.patch \ - file://0041-arm64-dts-renesas-ulcb-enlarge-cma-region.patch \ file://0042-arm64-dts-renesas-r8a7795-es1-h3ulcb-disable-eMMC.patch \ file://0043-arm64-dts-renesas-ulcb-use-versaclock-for-du-rgb-and-lvds.patch \ file://0044-pinctrl-r8a779x-add-mlb-pinmux.patch \ @@ -111,6 +121,8 @@ SRC_URI_append = " \ file://0129-Add-cropping-handling-to-VSP-alpha-planes.patch \ file://0130-Add-RAW-sensors-MBUS-formats.patch \ file://0131-ARM64-dts-renesas-ulcb-Make-AK4613-sound-device-name.patch \ + file://0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch \ + file://0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch \ " SRC_URI_append_h3ulcb = " file://ulcb.cfg" diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/client.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/client.conf deleted file mode 100644 index a17325b..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/client.conf +++ /dev/null @@ -1,36 +0,0 @@ -# This file is part of PulseAudio. -# -# PulseAudio 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 version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. - -## Configuration file for PulseAudio clients. See pulse-client.conf(5) for -## more information. Default values are commented out. Use either ; or # for -## commenting. - -; default-sink = -; default-source = -; default-server = -; default-dbus-server = - -; autospawn = yes -; allow-autospawn-for-root = no -; daemon-binary = /usr/bin/pulseaudio -; extra-arguments = --log-target=syslog - -; cookie-file = - -; enable-shm = yes -; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB - -; auto-connect-localhost = no -; auto-connect-display = no diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/daemon.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/daemon.conf deleted file mode 100644 index 5d42a9e..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/daemon.conf +++ /dev/null @@ -1,87 +0,0 @@ -# This file is part of PulseAudio. -# -# PulseAudio 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 version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. - -## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for -## more information. Default values are commented out. Use either ; or # for -## commenting. - -; daemonize = no -; fail = yes -; allow-module-loading = yes -; allow-exit = yes -; use-pid-file = yes -; system-instance = no -; local-server-type = user -; enable-shm = yes -; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB -; lock-memory = no -; cpu-limit = no - -; high-priority = yes -; nice-level = -11 - -; realtime-scheduling = yes -; realtime-priority = 5 - -; exit-idle-time = 20 -; scache-idle-time = 20 - -; dl-search-path = (depends on architecture) - -; load-default-script-file = yes -; default-script-file = /etc/pulse/default.pa - -log-target = null -; log-level = notice -; log-meta = no -; log-time = no -; log-backtrace = 0 - -; resample-method = speex-float-1 -; enable-remixing = yes -; enable-lfe-remixing = no - -; flat-volumes = yes - -; rlimit-fsize = -1 -; rlimit-data = -1 -; rlimit-stack = -1 -; rlimit-core = -1 -; rlimit-as = -1 -; rlimit-rss = -1 -; rlimit-nproc = -1 -; rlimit-nofile = 256 -; rlimit-memlock = -1 -; rlimit-locks = -1 -; rlimit-sigpending = -1 -; rlimit-msgqueue = -1 -; rlimit-nice = 31 -; rlimit-rtprio = 9 -; rlimit-rttime = 1000000 - -; default-sample-format = s16le -default-sample-rate = 48000 -; alternate-sample-rate = 48000 -; default-sample-channels = 2 -; default-channel-map = front-left,front-right - -; default-fragments = 4 -; default-fragment-size-msec = 25 - -; enable-deferred-volume = yes -; deferred-volume-safety-margin-usec = 8000 -; deferred-volume-extra-delay-usec = 0 diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi deleted file mode 100644 index e897b98..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi +++ /dev/null @@ -1,50 +0,0 @@ -# Use case Configuration for Renesas H3 board - -SectionVerb { - EnableSequence [ - exec "echo Setting defaults for ak4613" - cdev "hw:ak4613" - cset "name='DVC Out Playback Volume' 30%" - cset "name='DVC In Capture Volume' 10%" - ] - DisableSequence [ - ] -} - - -SectionDevice."Headphone".0 { - Value { - JackName "Headphone Jack" - PlaybackChannels 2 - PlaybackPCM "hw:0" - } - - EnableSequence [ - cdev "hw:ak4613" - cset "name='DVC Out Playback Volume' 30%" - ] - DisableSequence [ - cdev "hw:ak4613" - cset "name='DVC Out Playback Volume' 0%" - ] -} - -SectionDevice."Mic".0 { - Value { - JackName "Mic Jack" - CaptureChannels 2 - CapturePCM "hw:0" - } - - EnableSequence [ - cdev "hw:ak4613" - cset "name='DVC In Capture Volume' 10%" - ] - - DisableSequence [ - cdev "hw:ak4613" - cset "name='DVC In Capture Volume' 0%" - ] -} - - diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-bluetooth.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-bluetooth.conf deleted file mode 100644 index 925b9b1..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-bluetooth.conf +++ /dev/null @@ -1,7 +0,0 @@ -<busconfig> - - <policy user="pulse"> - <allow send_destination="org.bluez"/> - </policy> - -</busconfig> diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf deleted file mode 100644 index e526d77..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf +++ /dev/null @@ -1,15 +0,0 @@ -<busconfig> - - <policy user="pulse"> - <allow own="org.pulseaudio.Server"/> - <allow send_destination="org.bluez"/> - <allow send_destination="org.ofono"/> - <allow send_interface="org.ofono.SimToolkitAgent"/> - <allow send_interface="org.ofono.PushNotificationAgent"/> - <allow send_interface="org.ofono.SmartMessagingAgent"/> - <allow send_interface="org.ofono.PositioningRequestAgent"/> - <allow send_interface="org.ofono.HandsfreeAudioAgent"/> - <allow send_interface="org.ofono.HandsfreeAudioManager"/> - </policy> - -</busconfig> diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init deleted file mode 100755 index db8f965..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: pulseaudio-server -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -killproc() { - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - pulseaudio=false) - echo "pulseaudio disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - echo "Starting pulseaudio" - start-stop-daemon -S -x pulseaudio -- -D --system --disallow-exit --log-level=3 --log-target=file:/var/log/pa.log - ;; - - stop) - echo "Stopping pulseaudio" - start-stop-daemon -K -x pulseaudio - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/rsnddai0ak4613h.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/rsnddai0ak4613h.conf deleted file mode 100644 index 1c084de..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/rsnddai0ak4613h.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Use case Configuration for Renesas H3 board - -Comment "Renesas H3 board ak4613 audio card" - -SectionUseCase."HiFi" { - File "hifi" - Comment "Default" -} - diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa deleted file mode 100644 index 963a7c9..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/pulseaudio -nF -# -# This file is part of PulseAudio. -# -# PulseAudio 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 version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - -# This startup script is used only if PulseAudio is started in system -# mode. - -## use static load order to prevent pulseaudio to auto probe MOST devices -## MOST drivers does not like how pulse probing it and crashes system - -## Onboard sound (All R-Car 3 boards) -## use ALSA card plugin to run UCM and initial controls setup -.fail -load-module module-alsa-card device_id=ak4613 rate=48000 use_ucm=1 tsched=yes sink_name=ak4613_output source_name=ak4613_input - -## Kingfisher specific devices (may not present) -.nofail -## PCM3168A card (Kingfisher only) -load-module module-alsa-card device_id=pcm3168a sink_name=pcm3168a_output source_name=pcm3168a_input format=s24-32le rate=48000 -## Radio input (Kingfisher only) -load-module module-alsa-card device_id=radio source_name=radio rate=48000 -## WL18xx PCM interface (Kingfisher only) -load-module module-alsa-card device_id=wl18xx rate=48000 sink_name=bt_output source_name=bt_input - -### Load several protocols -.ifexists module-esound-protocol-unix.so -load-module module-esound-protocol-unix -.endif -load-module module-native-protocol-unix auth-anonymous=1 - -### Automatically restore the volume of streams and devices -load-module module-stream-restore -load-module module-device-restore - -### Automatically restore the default sink/source when changed by the user -### during runtime -### NOTE: This should be loaded as early as possible so that subsequent modules -### that look up the default sink/source get the right value -load-module module-default-device-restore - -### Automatically move streams to the default sink if the sink they are -### connected to dies, similar for sources -load-module module-rescue-streams - -### Make sure we always have a sink around, even if it is a null sink. -load-module module-always-sink - -### Automatically suspend sinks/sources that become idle for too long -# load-module module-suspend-on-idle - -### Enable positioned event sounds -# load-module module-position-event-sounds - -### Automatically load driver modules for Bluetooth hardware -.ifexists module-bluetooth-policy.so -load-module module-bluetooth-policy -.endif - -.ifexists module-bluetooth-discover.so -load-module module-bluetooth-discover headset=auto -.endif - -set-default-sink ak4613_output -set-default-source ak4613_input - -# For Kingfisher board set default source and sink to multichannel soundcard -set-default-sink pcm3168a_output -set-default-source pcm3168a_input diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend deleted file mode 100644 index 7d28801..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend +++ /dev/null @@ -1,42 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" - -PR="r2" - -SRC_URI_append_rcar-gen3 = " \ - file://pulseaudio.init \ - file://rsnddai0ak4613h.conf \ - file://hifi \ - file://system.pa \ - file://daemon.conf \ - file://pulseaudio-bluetooth.conf \ - file://pulseaudio-ofono.conf \ -" - -inherit update-rc.d - -INITSCRIPT_PACKAGES = "${PN}-server" -INITSCRIPT_NAME_${PN}-server = "pulseaudio" -INITSCRIPT_PARAMS_${PN}-server = "defaults 30" - -do_install_append_rcar-gen3() { - install -d ${D}/etc/init.d - install -d ${D}/etc/pulse - install -d ${D}/usr/share/alsa/ucm/rsnddai0ak4613h/ - - install -m 0755 ${WORKDIR}/pulseaudio.init ${D}/etc/init.d/pulseaudio - - install -m 0644 ${WORKDIR}/system.pa ${D}/etc/pulse/system.pa - install -m 0644 ${WORKDIR}/daemon.conf ${D}/etc/pulse/daemon.conf - - install -m 0644 ${WORKDIR}/rsnddai0ak4613h.conf ${D}${datadir}/alsa/ucm/rsnddai0ak4613h/rsnddai0ak4613h.conf - install -m 0644 ${WORKDIR}/hifi ${D}${datadir}/alsa/ucm/rsnddai0ak4613h/hifi - - install -d ${D}/${sysconfdir}/dbus-1/system.d - install -m 644 ${WORKDIR}/pulseaudio-bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ - install -m 644 ${WORKDIR}/pulseaudio-ofono.conf ${D}/${sysconfdir}/dbus-1/system.d/ -} - -FILES_${PN}-server += " \ - ${datadir}/alsa/ucm \ - ${datadir}/dbus-1/ \ -" diff --git a/meta-rcar-gen3-adas/recipes-support/glog/glog-0.3.3/0001-Use-pkg-config-for-locating-gflags-and-gmock.patch b/meta-rcar-gen3-adas/recipes-support/glog/glog-0.3.3/0001-Use-pkg-config-for-locating-gflags-and-gmock.patch deleted file mode 100644 index 7208bfe..0000000 --- a/meta-rcar-gen3-adas/recipes-support/glog/glog-0.3.3/0001-Use-pkg-config-for-locating-gflags-and-gmock.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ca8570bad0bbefb450a2cbe40c17eb5a5565f829 Mon Sep 17 00:00:00 2001 -From: Petr Nechaev <petr.nechaev@cogentembedded.com> -Date: Wed, 22 Nov 2017 00:21:45 +0300 -Subject: [PATCH 1/1] Use pkg-config for locating gflags and gmock - -Binaries gflags-config and gmock-config are not generated during -cross-compilation of gflags and gmock so use pkg-config instead. ---- - configure.ac | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8b458fa..16a6c7e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -138,17 +138,19 @@ LIBS="$SAVE_LIBS" - # TODO(hamaji): Use official m4 macros provided by testing libraries - # once the m4 macro of Google Mocking becomes ready. - # Check if there is Google Test library installed. --AC_CHECK_PROG(GTEST_CONFIG, gtest-config, "yes") -+# Use pkg-config instead of gtest-config with Yocto -+AC_CHECK_PROG(GTEST_CONFIG, pkg-config, "yes") - if test x"$GTEST_CONFIG" = "xyes"; then -- GTEST_CFLAGS=`gtest-config --cppflags --cxxflags` -- GTEST_LIBS=`gtest-config --ldflags --libs` -+ GTEST_CFLAGS=`pkg-config --cppflags --cxxflags gtest` -+ GTEST_LIBS=`pkg-config --libs gtest` - AC_DEFINE(HAVE_LIB_GTEST, 1, [define if you have google gtest library]) - - # Check if there is Google Mocking library installed. -- AC_CHECK_PROG(GMOCK_CONFIG, gmock-config, "yes") -+ # Use pkg-config instead of gmock-config with Yocto -+ AC_CHECK_PROG(GMOCK_CONFIG, pkg-config, "yes") - if test x"$GMOCK_CONFIG" = "xyes"; then -- GMOCK_CFLAGS=`gmock-config --cppflags --cxxflags` -- GMOCK_LIBS=`gmock-config --ldflags --libs` -+ GMOCK_CFLAGS=`pkg-config --cppflags --cxxflags gmock` -+ GMOCK_LIBS=`pkg-config --libs gmock` - AC_DEFINE(HAVE_LIB_GMOCK, 1, [define if you have google gmock library]) - else - # We don't run test cases which use Google Mocking framework. --- -2.9.5 - |