diff options
Diffstat (limited to 'meta-ivi')
94 files changed, 2342 insertions, 909 deletions
diff --git a/meta-ivi/conf/conf-notes.txt b/meta-ivi/conf/conf-notes.txt index 240178a..d1f98ca 100644 --- a/meta-ivi/conf/conf-notes.txt +++ b/meta-ivi/conf/conf-notes.txt @@ -1,4 +1,4 @@ Common targets are: - leviathan-image + miranda-image ivi-image diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf index 30ccb83..7d83670 100644 --- a/meta-ivi/conf/distro/poky-ivi-systemd.conf +++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf @@ -1,7 +1,7 @@ DISTRO = "poky-ivi-systemd" DISTRO_NAME = "Yocto GENIVI Baseline (Poky/meta-ivi)" -DISTRO_VERSION = "10.0.0" -DISTRO_CODENAME ="leviathan" +DISTRO_VERSION = "11.0+snapshot-${DATE}" +DISTRO_CODENAME ="miranda" MAINTAINER = "meta-ivi <genivi-meta-ivi@lists.genivi.org>" @@ -19,19 +19,13 @@ DISTRO_FEATURES_append = " bluetooth systemd opengl wayland pam bluez5" DISTRO_FEATURES_remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" -PREFERRED_VERSION_linux-yocto ?= "3.14%" -PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.14%" -PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.14%" -PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.14%" -PREFERRED_VERSION_linux-yocto_vexpressa9 ?= "3.14%" - -# prefer gstreamer 1.4.x over 1.2.3 -PREFERRED_VERSION_gstreamer1.0 ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.4.%" -PREFERRED_VERSION_gstreamer1.0-libav ?= "1.4.%" +# do not use gstreamer 1.2.3 by default +PREFERRED_VERSION_gstreamer1.0 ?= "1.6.%" +PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.6.%" +PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.6.%" +PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.6.%" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.6.%" +PREFERRED_VERSION_gstreamer1.0-libav ?= "1.6.%" PREFERRED_VERSION_gstreamer1.0-omx ?= "1.2.%" POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}" @@ -92,7 +86,7 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "8" +OELAYOUT_ABI = "11" # add poky sanity bbclass INHERIT += "poky-sanity" @@ -106,6 +100,13 @@ ERROR_QA = "dev-so debug-deps dev-deps debug-files arch pkgconfig la perms \ packages-list perm-config perm-line perm-link pkgv-undefined \ pn-overrides split-strip var-undefined version-going-backwards" +# Recent changes in siggen.py check for task hash and generate build errors +# called Taskhash mismatch when using variables with date and time. Exclude +# date variables as done. +# see https://lists.yoctoproject.org/pipermail/poky/2016-April/010470.html +DISTRO_VERSION[vardepsexclude] = "DATE" +SDK_VERSION[vardepsexclude] = "DATE" + # # TO DO # When bug is fixed: https://bugzilla.yoctoproject.org/show_bug.cgi?id=5968 diff --git a/meta-ivi/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-ivi/recipes-connectivity/bluez5/bluez5_%.bbappend index 70187dd..d313fd0 100644 --- a/meta-ivi/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-ivi/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -33,3 +33,9 @@ EXTRA_OECONF += "--enable-service --enable-sixaxis " PACKAGES =+ " libbluetooth-plugins-service " FILES_libbluetooth-plugins-service = "${libdir}/bluetooth/plugins/*.so" + +do_configure_prepend() { + if [ -f configure ]; then + rm -f configure + fi +} diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/build_fixup.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/build_fixup.patch new file mode 100644 index 0000000..e383b72 --- /dev/null +++ b/meta-ivi/recipes-core-ivi/dbus/dbus/build_fixup.patch @@ -0,0 +1,22 @@ +--- dbus-1.10.6/dbus/dbus-marshal-recursive.c.orig 2016-06-30 15:25:51.655302658 +0900 ++++ dbus-1.10.6/dbus/dbus-marshal-recursive.c 2016-06-30 15:26:51.559300885 +0900 +@@ -989,7 +989,7 @@ + _dbus_type_reader_recurse (DBusTypeReader *reader, + DBusTypeReader *sub) + { +- const DBusTypeReaderClass *klass; ++ const DBusTypeReaderClass *klass = NULL; + int t; + + t = _dbus_first_type_in_signature (reader->type_str, reader->type_pos); +--- dbus-1.10.6/dbus/dbus-message.c.orig 2016-07-01 20:24:23.884214520 +0900 ++++ dbus-1.10.6/dbus/dbus-message.c 2016-07-01 20:24:49.708213755 +0900 +@@ -4091,7 +4091,7 @@ + beginning. This sucks a bit, however unless SCM_RIGHTS is fixed + there is no better way. */ + +- if (loader->n_unix_fds_allocated < loader->max_message_unix_fds) ++ if (loader->n_unix_fds_allocated < (unsigned long)(loader->max_message_unix_fds)) + { + int *a = dbus_realloc(loader->unix_fds, + loader->max_message_unix_fds * sizeof(loader->unix_fds[0])); diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch index 78b073c..1ede7a4 100644 --- a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch +++ b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch @@ -13,11 +13,10 @@ Subject: [PATCH] Add functions to support querying and manipulating the dbus/dbus-string.h | 5 +++ 4 files changed, 134 insertions(+) -diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c -index 43cb1be..d34663a 100644 ---- a/dbus/dbus-message.c -+++ b/dbus/dbus-message.c -@@ -3445,6 +3445,47 @@ dbus_message_get_sender (DBusMessage *message) +diff -urN dbus-1.10.6.orig/dbus/dbus-message.c dbus-1.10.6/dbus/dbus-message.c +--- dbus-1.10.6.orig/dbus/dbus-message.c 2016-06-30 15:42:08.307273745 +0900 ++++ dbus-1.10.6/dbus/dbus-message.c 2016-06-30 15:42:38.939272838 +0900 +@@ -3558,6 +3558,47 @@ } /** @@ -65,7 +64,7 @@ index 43cb1be..d34663a 100644 * Gets the type signature of the message, i.e. the arguments in the * message payload. The signature includes only "in" arguments for * #DBUS_MESSAGE_TYPE_METHOD_CALL and only "out" arguments for -@@ -4632,6 +4673,64 @@ dbus_message_type_to_string (int type) +@@ -4742,6 +4783,64 @@ } /** @@ -130,11 +129,10 @@ index 43cb1be..d34663a 100644 * Turn a DBusMessage into the marshalled form as described in the D-Bus * specification. * -diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h -index 4fd44da..76377b8 100644 ---- a/dbus/dbus-message.h -+++ b/dbus/dbus-message.h -@@ -138,6 +138,9 @@ dbus_bool_t dbus_message_set_sender (DBusMessage *message, +diff -urN dbus-1.10.6.orig/dbus/dbus-message.h dbus-1.10.6/dbus/dbus-message.h +--- dbus-1.10.6.orig/dbus/dbus-message.h 2016-06-30 15:42:08.307273745 +0900 ++++ dbus-1.10.6/dbus/dbus-message.h 2016-06-30 15:42:38.939272838 +0900 +@@ -138,6 +138,9 @@ DBUS_EXPORT const char* dbus_message_get_sender (DBusMessage *message); DBUS_EXPORT @@ -144,7 +142,7 @@ index 4fd44da..76377b8 100644 const char* dbus_message_get_signature (DBusMessage *message); DBUS_EXPORT void dbus_message_set_no_reply (DBusMessage *message, -@@ -262,6 +265,17 @@ dbus_bool_t dbus_message_iter_close_container (DBusMessageIter *iter, +@@ -265,6 +268,17 @@ DBUS_EXPORT void dbus_message_iter_abandon_container (DBusMessageIter *iter, DBusMessageIter *sub); @@ -162,11 +160,10 @@ index 4fd44da..76377b8 100644 DBUS_EXPORT void dbus_message_lock (DBusMessage *message); -diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c -index 0f63612..a084eca 100644 ---- a/dbus/dbus-string.c -+++ b/dbus/dbus-string.c -@@ -730,6 +730,22 @@ _dbus_string_get_length (const DBusString *str) +diff -urN dbus-1.10.6.orig/dbus/dbus-string.c dbus-1.10.6/dbus/dbus-string.c +--- dbus-1.10.6.orig/dbus/dbus-string.c 2016-06-30 15:42:08.307273745 +0900 ++++ dbus-1.10.6/dbus/dbus-string.c 2016-06-30 15:42:38.939272838 +0900 +@@ -744,6 +744,22 @@ } #endif /* !_dbus_string_get_length */ @@ -189,11 +186,10 @@ index 0f63612..a084eca 100644 /** * Makes a string longer by the given number of bytes. Checks whether * adding additional_length to the current length would overflow an -diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h -index 86fb8c3..bfa2a39 100644 ---- a/dbus/dbus-string.h -+++ b/dbus/dbus-string.h -@@ -61,6 +61,7 @@ struct DBusString +diff -urN dbus-1.10.6.orig/dbus/dbus-string.h dbus-1.10.6/dbus/dbus-string.h +--- dbus-1.10.6.orig/dbus/dbus-string.h 2016-06-30 15:42:08.307273745 +0900 ++++ dbus-1.10.6/dbus/dbus-string.h 2016-06-30 15:43:01.027272184 +0900 +@@ -61,6 +61,7 @@ */ #define _dbus_string_get_data(s) ((char*)(((DBusString*)(s))->dummy1)) #define _dbus_string_get_length(s) (((DBusString*)(s))->dummy2) @@ -201,7 +197,7 @@ index 86fb8c3..bfa2a39 100644 #define _dbus_string_set_byte(s, i, b) ((((unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) = (unsigned char) (b)) #define _dbus_string_get_byte(s, i) (((const unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) #define _dbus_string_get_const_data(s) ((const char*)(((DBusString*)(s))->dummy1)) -@@ -131,6 +132,10 @@ void _dbus_string_copy_to_buffer_with_nul (const DBusString *str, +@@ -151,6 +152,10 @@ int _dbus_string_get_length (const DBusString *str); #endif /* !_dbus_string_get_length */ @@ -209,9 +205,6 @@ index 86fb8c3..bfa2a39 100644 +int _dbus_string_get_allocated (const DBusString *str); +#endif /* !_dbus_string_get_allocated */ + - dbus_bool_t _dbus_string_lengthen (DBusString *str, - int additional_length); - void _dbus_string_shorten (DBusString *str, --- -1.9.1 - + /** + * Get the string's length as an unsigned integer, for comparison with + * size_t and similar unsigned types that does not trigger compiler diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend b/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend index 4f0b25b..ac73e11 100644 --- a/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend +++ b/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend @@ -2,21 +2,14 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" # add support for GENIVI AF_Bus D-Bus Optimization # - http://projects.genivi.org/afbus-dbus-optimization/ -SRC_URI_AFBUS = "" -# currently disabled in preparation of the move to kdbus -# uncomment the next line to reenable #SRC_URI_AFBUS = "file://dbus_1.6-add-afbus-support.patch" # add support for GENIVI CommonAPI D-Bus runtime # - http://projects.genivi.org/commonapi/ -SRC_URI_COMMONAPI = " \ +SRC_URI_append = " \ file://capi-dbus-add-send-with-reply-set-notify.patch \ file://capi-dbus-add-support-for-custom-marshalling.patch \ file://capi-dbus-block-acquire-io-path-on-send.patch \ file://capi-dbus-correct-dbus-connection-block-pending-call.patch \ + file://build_fixup.patch \ " - -SRC_URI_append = "\ - ${SRC_URI_AFBUS} \ - ${SRC_URI_COMMONAPI} \ -" diff --git a/meta-ivi/recipes-core-ivi/vsomeip/vsomeip/build_fixup.patch b/meta-ivi/recipes-core-ivi/vsomeip/vsomeip/build_fixup.patch new file mode 100644 index 0000000..481896b --- /dev/null +++ b/meta-ivi/recipes-core-ivi/vsomeip/vsomeip/build_fixup.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf03c16..b102654 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -180,7 +180,7 @@ install ( + ) + + install ( +- FILES ${EXAMPLE_CONFIG_FILES} DESTINATION etc/vsomeip COMPONENT config ++ FILES ${EXAMPLE_CONFIG_FILES} DESTINATION /etc/vsomeip COMPONENT config + ) + + # Add all targets to the build-tree export set diff --git a/meta-ivi/recipes-core-ivi/vsomeip/vsomeip_2.0.1.bb b/meta-ivi/recipes-core-ivi/vsomeip/vsomeip_2.0.1.bb new file mode 100644 index 0000000..cbe7ba4 --- /dev/null +++ b/meta-ivi/recipes-core-ivi/vsomeip/vsomeip_2.0.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "the implementation of SOME/IP" +SECTION = "base" +LICENSE = "MPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + +DEPENDS = "boost dlt-daemon" + +SRCREV = "2b7442a4c2452f8f3bd9e0f09f829478256d39af" +SRC_URI = "git://git.projects.genivi.org/vSomeIP.git;protocol=http \ + file://build_fixup.patch \ + " + +S = "${WORKDIR}/git" + +inherit cmake lib_package gitpkgv + +CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" + +PACKAGES_remove += "${PN}-bin" +FILES_${PN} += "${bindir}/vsomeipd" +FILES_${PN}-dev += "${libdir}/cmake" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb b/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb new file mode 100644 index 0000000..3e9c36c --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-core-native_3.1.5p2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Common API C++ core generator" + +LAUNCHER_BASE = "commonapi-generator" +LAUNCHER_LINK = "capicxx-core-gen" + +require capicxx-native.inc + +SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi-generator.zip" +SRC_URI[md5sum] = "c12551e8f61da944b17a22c00d3e6559" +SRC_URI[sha256sum] = "538a923a1e596106b9f2ce0838fcf85fd81c4e09b0951c59ad2e2e72eb6d0534" diff --git a/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb b/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb new file mode 100644 index 0000000..66b90a8 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-dbus-native_3.1.5p2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Common API C++ D-Bus generator" + +LAUNCHER_BASE = "commonapi-dbus-generator" +LAUNCHER_LINK = "capicxx-dbus-gen" + +require capicxx-native.inc + +SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi_dbus_generator.zip" +SRC_URI[md5sum] = "70a6f1cf7e42a94260385281a569a486" +SRC_URI[sha256sum] = "de165298b1062951dff07d99f491c8d8a3ca3c1a087de56bc01c083cf71fa742" diff --git a/meta-ivi/recipes-extended/common-api/capicxx-native.inc b/meta-ivi/recipes-extended/common-api/capicxx-native.inc new file mode 100644 index 0000000..425d384 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-native.inc @@ -0,0 +1,53 @@ +SECTION = "devel" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = \ + "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" + +BASE_URL = "http://docs.projects.genivi.org/yamaica-update-site/CommonAPI" +BASE_VER = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}" + +def get_launcher_name(d): + BS = d.getVar('BUILD_SYS', True) + if BS == "x86_64-linux": + launcherName = "${LAUNCHER_BASE}-linux-x86_64" + elif BS == "i686-linux": + launcherName = "${LAUNCHER_BASE}-linux-x86" + else: + bb.fatal("Build system '%s' is not supported by ${PN}_${PV} recipe" % BS) + return launcherName + +LAUNCHER = "${@get_launcher_name(d)}" + +inherit native +SANITY_REQUIRED_UTILITIES += "java" + +S = "${WORKDIR}" +DD = "${D}${datadir}/${PN}-${PV}" + +do_install() { + # work around for java-8 + java_version=`java -version 2>&1 | head -n 1 | grep '[ "]1\.8[\. "$$]' || true;` + if [ "x${java_version}" != "x" ]; then + for i in x86 x86_64; do + perl -pi -e 's|-XX:PermSize=128m||' ${S}/${LAUNCHER_BASE}-linux-${i}.ini + done + fi + + install -d ${DD} + install -m 0644 ${S}/artifacts.xml ${DD} + install -m 0755 ${S}/${LAUNCHER_BASE}-linux-x86 ${DD} + install -m 0644 ${S}/${LAUNCHER_BASE}-linux-x86.ini ${DD} + install -m 0755 ${S}/${LAUNCHER_BASE}-linux-x86_64 ${DD} + install -m 0644 ${S}/${LAUNCHER_BASE}-linux-x86_64.ini ${DD} + for dir in ./configuration ./features ./plugins; do + for item in $(find ${dir} -name '*' -print); do + if [ -d ${item} ]; then + install -d ${DD}/${item} + else + install -m 0644 ${S}/${item} ${DD}/$(dirname ${item}) + fi + done + done + install -d "${D}${bindir}" + ln -sf -T "${DD}/${LAUNCHER}" ${D}${bindir}/${LAUNCHER_LINK} +} diff --git a/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb b/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb new file mode 100644 index 0000000..d4eccb0 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/capicxx-someip-native_3.1.5p2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Common API C++ SOME/IP generator" + +LAUNCHER_BASE = "commonapi-someip-generator" +LAUNCHER_LINK = "capicxx-someip-gen" + +require capicxx-native.inc + +SRC_URI = "${BASE_URL}/generator/${BASE_VER}/${PV}/commonapi_someip_generator.zip" +SRC_URI[md5sum] = "23196ec64737ea85b96aa754d17cf01c" +SRC_URI[sha256sum] = "5135d9df40a27d29f60785db9812a65395e077b3e61f3beaa15d08c6094f8e0d" diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.5.bb new file mode 100644 index 0000000..a35cef4 --- /dev/null +++ b/meta-ivi/recipes-extended/common-api/common-api-c++-someip_3.1.5.bb @@ -0,0 +1,22 @@ +SUMMARY = "Genivi CommonAPI-SomeIP" +SECTION = "libs" +LICENSE = "MPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + +DEPENDS = "boost common-api-c++ vsomeip" + +SRCREV = "e2b0e5cbf9a36be6896c5cef7b1ba4857e7111c4" +SRC_URI = "git://git.projects.genivi.org/common-api/cpp-someip-runtime.git;protocol=http " + +S = "${WORKDIR}/git" + +inherit cmake lib_package gitpkgv + +EXTRA_OECMAKE += "-DUSE_INSTALLED_COMMONAPI=ON" +CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" + +FILES_${PN}-dev += "${libdir}/cmake" + +RDEPENDS_${PN}-dev = "vsomeip-dev" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch deleted file mode 100644 index 5bf6bf8..0000000 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0001-Fix-build-with-systemd-209.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8080b7395c1638baee60fb3c46667f21e00b87fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Erik=20Bot=C3=B6?= <erik.boto@pelagicore.com> -Date: Fri, 4 Apr 2014 10:59:18 +0200 -Subject: [PATCH 1/4] Fix build with systemd >= 209 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [Configuration Specific] -Signed-off-by: Erik Botö <erik.boto@pelagicore.com> ---- - src/system/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt -index ce87914..1d0d224 100644 ---- a/src/system/CMakeLists.txt -+++ b/src/system/CMakeLists.txt -@@ -23,7 +23,7 @@ set(dlt_system_SRCS dlt-system.c dlt-system-options.c dlt-system-process-handlin - dlt-system-syslog.c dlt-system-watchdog.c dlt-system-journal.c) - add_executable(dlt-system ${dlt_system_SRCS} ${systemd_SRCS}) - if(WITH_SYSTEMD_JOURNAL) -- target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd-journal systemd-id128) -+ target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES} systemd) - else(WITH_SYSTEMD_JOURNAL) - target_link_libraries(dlt-system dlt ${ZLIB_LIBRARIES}) - endif(WITH_SYSTEMD_JOURNAL) --- -1.9.3 - diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch index 40c5afb..1688479 100644 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch +++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch @@ -7,85 +7,75 @@ Upstream-Status: Inappropriate [Configuration Specific] Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> --- systemd/dlt-adaptor-udp.service.cmake | 1 - - systemd/dlt-dbus.service.cmake | 1 - systemd/dlt-example-user.service.cmake | 1 - systemd/dlt-receive.service.cmake | 1 - systemd/dlt-system.service.cmake | 1 - systemd/dlt.service.cmake | 1 - - 6 files changed, 6 deletions(-) + 5 files changed, 5 deletions(-) diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake -index 0c39637..f446757 100644 +index 8dac1f2..ecf9f9e 100644 --- a/systemd/dlt-adaptor-udp.service.cmake +++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -20,7 +20,6 @@ Wants=dlt.service +@@ -21,9 +21,8 @@ Wants=dlt.service [Service] - Type=Simple --User=genivi + Type=simple +-User=@DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ LimitCORE=infinity -diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake -index 2727c2d..d1e3b12 100755 ---- a/systemd/dlt-dbus.service.cmake -+++ b/systemd/dlt-dbus.service.cmake -@@ -21,7 +21,6 @@ Wants=dlt.service -
- [Service]
- Type=Simple
--User=root
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
+ [Install] +-WantedBy=multi-user.target +\ No newline at end of file ++WantedBy=multi-user.target diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake -index 3652292..b67a83c 100644 +index b665742..35009b0 100644 --- a/systemd/dlt-example-user.service.cmake +++ b/systemd/dlt-example-user.service.cmake -@@ -20,6 +20,5 @@ Wants=dlt.service +@@ -21,6 +21,5 @@ Wants=dlt.service [Service] - Type=Simple --User=genivi + Type=simple +-User=@DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" - LimitCORE=infinity +-LimitCORE=infinity \ No newline at end of file ++LimitCORE=infinity diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake -index b92c8b2..4bbdfc2 100644 +index c07d447..8f88f00 100644 --- a/systemd/dlt-receive.service.cmake +++ b/systemd/dlt-receive.service.cmake -@@ -21,6 +21,5 @@ Wants=dlt.service +@@ -22,6 +22,5 @@ Wants=dlt.service [Service] - Type=Simple --User=genivi + Type=simple +-User=@DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost - LimitCORE=infinity +-LimitCORE=infinity \ No newline at end of file ++LimitCORE=infinity diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake -index f5e844b..7ec995c 100755 +index 0e91f42..1a5b913 100755 --- a/systemd/dlt-system.service.cmake +++ b/systemd/dlt-system.service.cmake -@@ -21,7 +21,6 @@ Wants=dlt.service -
- [Service]
- Type=Simple
--User=genivi
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
+@@ -22,7 +22,6 @@ Wants=dlt.service + + [Service] + Type=simple +-User=@DLT_USER@ + ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system + WatchdogSec=@DLT_WatchdogSec@ + NotifyAccess=main diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake -index 22279c4..7bb05bc 100755 +index 0b3ee2c..e4753a2 100755 --- a/systemd/dlt.service.cmake +++ b/systemd/dlt.service.cmake -@@ -20,7 +20,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) +@@ -21,7 +21,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) [Service] - Type=Simple --User=genivi + Type=simple +-User=@DLT_USER@ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon WatchdogSec=@DLT_WatchdogSec@ NotifyAccess=main --- -1.9.3 - diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch deleted file mode 100644 index 691a500..0000000 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 6804c68ed61f4436818c58cb0abe1c21b4d48aea Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei.gherzan@windriver.com> -Date: Tue, 18 Nov 2014 15:48:50 +0100 -Subject: [PATCH 3/4] systemd/*: unit type should be in lowercase, so use - Type=simple - -Upstream-Status: Submitted [http://lists.genivi.org/pipermail/genivi-diagnostic-log-and-trace/2014-October/000546.html] -Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> ---- - systemd/dlt-adaptor-udp.service.cmake | 2 +- - systemd/dlt-dbus.service.cmake | 2 +- - systemd/dlt-example-user.service.cmake | 2 +- - systemd/dlt-receive.service.cmake | 2 +- - systemd/dlt-system.service.cmake | 2 +- - systemd/dlt.service.cmake | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake -index f446757..81a7158 100644 ---- a/systemd/dlt-adaptor-udp.service.cmake -+++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -19,7 +19,7 @@ Description=GENIVI DLT adaptor stdin. Adaptor for forwarding received UDP messag - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@ - LimitCORE=infinity - -diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake -index d1e3b12..75dcdc3 100755 ---- a/systemd/dlt-dbus.service.cmake -+++ b/systemd/dlt-dbus.service.cmake -@@ -20,7 +20,7 @@ Documentation=man:dlt-dbus(1) man:dlt-dbus.conf(5) - Wants=dlt.service
-
- [Service]
--Type=Simple
-+Type=simple
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
-diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake -index b67a83c..fe9c567 100644 ---- a/systemd/dlt-example-user.service.cmake -+++ b/systemd/dlt-example-user.service.cmake -@@ -19,6 +19,6 @@ Description=GENIVI DLT example user. Generate DLT messages and store them to fil - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" - LimitCORE=infinity -\ No newline at end of file -diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake -index 4bbdfc2..3b47dd3 100644 ---- a/systemd/dlt-receive.service.cmake -+++ b/systemd/dlt-receive.service.cmake -@@ -20,6 +20,6 @@ Documentation=man:dlt-receive(1) - Wants=dlt.service - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost - LimitCORE=infinity -\ No newline at end of file -diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake -index 7ec995c..d4a4c96 100755 ---- a/systemd/dlt-system.service.cmake -+++ b/systemd/dlt-system.service.cmake -@@ -20,7 +20,7 @@ Documentation=man:dlt-system(1) man:dlt-system.conf(5) - Wants=dlt.service
-
- [Service]
--Type=Simple
-+Type=simple
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system
- WatchdogSec=@DLT_WatchdogSec@
- NotifyAccess=main
-diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake -index 7bb05bc..5386ffd 100755 ---- a/systemd/dlt.service.cmake -+++ b/systemd/dlt.service.cmake -@@ -19,7 +19,7 @@ Description=GENIVI DLT logging daemon - Documentation=man:dlt-daemon(1) man:dlt.conf(5) - - [Service] --Type=Simple -+Type=simple - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon - WatchdogSec=@DLT_WatchdogSec@ - NotifyAccess=main --- -1.9.3 - diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch index df762f3..685dfcd 100644 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch +++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch @@ -9,19 +9,16 @@ Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> systemd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt -index a9838e4..c8feae5 100644 ---- a/systemd/CMakeLists.txt -+++ b/systemd/CMakeLists.txt -@@ -16,7 +16,7 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6b44a2..0e885bf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,7 +175,7 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL) - if(WITH_SYSTEMD) + set( systemd_SRCS ${CMAKE_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c) -- set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${CMAKE_INSTALL_PREFIX}/lib/systemd/system ) -+ set(SYSTEMD_CONFIGURATIONS_FILES_DIR /lib/systemd/system ) - - if(WITH_SYSTEMD_WATCHDOG) - set( DLT_WatchdogSec 2 ) --- -1.9.3 - +- set(SYSTEMD_UNITDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" CACHE PATH ++ set(SYSTEMD_UNITDIR "/lib/systemd/system" CACHE PATH + "Set directory to install systemd unit files") + + add_subdirectory( systemd ) diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch deleted file mode 100644 index cbf049c..0000000 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 39a5c3136ee0f84e29fe3c8121b3b61142a8a76f Mon Sep 17 00:00:00 2001 -From: Clement Dransart <clement.dransart@awtce.be> -Date: Tue, 7 Jun 2016 11:02:12 +0200 -Subject: [meta-ivi][PATCH] Fix OE cmake installation dir - -Signed-off-by: Clement Dransart <clement.dransart@awtce.be> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 46beec0..ad62848 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,7 +112,7 @@ ELSE (${WITH_DOC} STREQUAL "OFF") - SET(PACKAGE_DOC "")
- ENDIF(${WITH_DOC} STREQUAL "OFF")
-
--set(LIB_INSTALL_DIR lib${LIB_SUFFIX})
-+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
-
- configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.spec)
- configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
--- -1.9.1 - diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb index e3ad60b..8ab95d1 100644 --- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb +++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb @@ -10,18 +10,15 @@ logging facility providing: \ HOMEPAGE = "https://www.genivi.org/" SECTION = "console/utils" LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \ - file://MPL.txt;md5=ccdb2761cef70c8b2612624c323f89dc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "dbus zlib" -SRCREV = "b8b3ea3a31f7deb681941a19878c82e7b7350ae7" -SRC_URI = "git://git.projects.genivi.org/${BPN}.git;branch=v2.11.x;protocol=http \ - file://0001-Fix-build-with-systemd-209.patch \ - file://0002-Don-t-execute-processes-as-a-specific-user.patch \ - file://0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch \ - file://0004-Modify-systemd-config-directory.patch \ - file://0005-Fix-OE-cmake-installation-dir.patch" +SRCREV = "e9a486a08fff6d3cc7133a350cec3ee10f463207" +SRC_URI = "git://git.projects.genivi.org/${BPN}.git;protocol=http \ + file://0002-Don-t-execute-processes-as-a-specific-user.patch \ + file://0004-Modify-systemd-config-directory.patch \ + " S = "${WORKDIR}/git" inherit gzipnative autotools gettext cmake systemd diff --git a/meta-ivi/recipes-extended/itzamc/libitzam/libitzam_pc.patch b/meta-ivi/recipes-extended/itzamc/libitzam/libitzam_pc.patch deleted file mode 100644 index 076eaff..0000000 --- a/meta-ivi/recipes-extended/itzamc/libitzam/libitzam_pc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libitzam-6.0.4/configure.ac -=================================================================== ---- libitzam-6.0.4.orig/configure.ac 2011-09-17 20:16:04.000000000 +0300 -+++ libitzam-6.0.4/configure.ac 2014-02-24 13:43:02.000000000 +0200 -@@ -1,7 +1,7 @@ - AC_INIT(src/itzam.h) - AC_CONFIG_MACRO_DIR([m4]) - --GENERIC_LIBRARY_NAME=libitzam -+GENERIC_LIBRARY_NAME=itzam - - #release versioning - GENERIC_MAJOR_VERSION=6 diff --git a/meta-ivi/recipes-extended/itzamc/libitzam_6.0.4.bb b/meta-ivi/recipes-extended/itzamc/libitzam_6.0.4.bb deleted file mode 100644 index 07b5a47..0000000 --- a/meta-ivi/recipes-extended/itzamc/libitzam_6.0.4.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "itzam/C" - -HOMEPAGE = "https://www.genivi.org/" -SECTION = "base" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LicenseOpenSource.txt;md5=757d512d8e160c938b85a8b6487cd126" - -SRC_URI = "http://coyotegulch.scottrobertladd.net/products/itzam/c/libitzam-6.0.4.tar.gz \ - file://libitzam_pc.patch \ - " - -SRC_URI[md5sum] = "333f680c21037e32b4000933eae27721" -SRC_URI[sha256sum] = "d5b565a9d96275e3bf39ea2dd0b121a92b578819650a09fc5add4f4113df734d" - -PR = "r2" - -inherit autotools - -do_configure_prepend() { - # Add necesary files - touch ${S}/INSTALL ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog -} - -do_install_prepend() { - mkdir -p ${D}/usr/lib/pkgconfig - cp ${B}/libitzam.pc ${D}/usr/lib/pkgconfig -} - -FILES_${PN}-dev += "/usr/lib/pkgconfig/*" diff --git a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb b/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb index 9d92364..755fe85 100644 --- a/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb +++ b/meta-ivi/recipes-extended/node-startup-controller/node-startup-controller_1.0.2.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" PR = "r4" SRCREV = "717e743c84ef9c168501dcbc012c4212f1903581" -SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;branch=genivi-excalibur;protocol=http \ +SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;nobranch=1;protocol=http \ file://use-systemd-unit-dir.patch \ file://fix-no-libsystemd-daemon.patch \ " diff --git a/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb b/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb index 58a3830..a2b0fdc 100644 --- a/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb +++ b/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb @@ -11,7 +11,7 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "dd4a86b9459537d2e85489b36abf80f34d12f098" +SRCREV = "0894ea63e0b86afcee3a45baa10abc6b8be4ad44" SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;protocol=http \ file://nsm-fix-systemd-service-dep.patch \ file://nsm-fix-no-libsystemd-daemon.patch \ @@ -19,7 +19,7 @@ SRC_URI = "git://git.projects.genivi.org/lifecycle/${BPN}.git;protocol=http \ " S = "${WORKDIR}/git" -PR = "r1" +PR = "r2" EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)}" @@ -49,7 +49,8 @@ FILES_${PN} += "\ " do_install_append() { - rm -f ${D}${bindir}/NodeStateTest - rm -f ${D}${libdir}/libNodeStateMachineTest.* - rm -f ${D}${datadir}/dbus-1/interfaces/org.genivi.NodeStateMachineTest.xml -} + T_XML=${D}/${datadir}/dbus-1/interfaces/org.genivi.NodeStateMachineTest.xml + if [ -f ${T_XML} ]; then + rm -f ${T_XML} + fi +}
\ No newline at end of file diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch deleted file mode 100644 index 99bb684..0000000 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/0001-Add-support-for-json-c-0.12.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 23b3053a7062ba38cf39e1b0caeb5ec006287d68 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei.gherzan@windriver.com> -Date: Mon, 22 Jun 2015 22:21:50 +0200 -Subject: [PATCH] Add support for json-c > 0.12 - -Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> -Upstream-Status: Submitted [http://bugs.genivi.org/show_bug.cgi?id=354] ---- - Administrator/src/ssw_pers_admin_config.c | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Administrator/src/ssw_pers_admin_config.c b/Administrator/src/ssw_pers_admin_config.c -index 62671a5..c52af16 100644 ---- a/Administrator/src/ssw_pers_admin_config.c -+++ b/Administrator/src/ssw_pers_admin_config.c -@@ -25,7 +25,7 @@ - * - **********************************************************************************************************************/ - --#include <json/json.h> -+#include <json-c/json.h> - - #include <sys/types.h> - #include <sys/stat.h> -diff --git a/configure.ac b/configure.ac -index 5207334..48ed91f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -114,7 +114,7 @@ PKG_CHECK_MODULES([DLT], [automotive-dlt >= 2.2.0]) - PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5]) - PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4]) - PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1]) --PKG_CHECK_MODULES([JSON], [json >= 0.9]) -+PKG_CHECK_MODULES([JSON], [json-c >= 0.9]) - PKG_CHECK_MODULES([NSM], [node-state-manager]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ]) - --- -2.1.0 - diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch deleted file mode 100644 index a52f88f..0000000 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/configure.ac-fix-typo-libperscommon.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 887c1367ba633357abe13dde39363f2a9da4c6c6 Mon Sep 17 00:00:00 2001 -From: Holger Behrens <holger.behrens@windriver.com> -Date: Mon, 17 Nov 2014 16:39:21 +0100 -Subject: [[PATCH] configure.ac: fix typo libperscommon - -Signed-off-by: Holger Behrens <holger.behrens@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 5207334..6e1b2dd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -113,7 +113,7 @@ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.4.10]) - PKG_CHECK_MODULES([DLT], [automotive-dlt >= 2.2.0]) - PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5]) - PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4]) --PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1]) -+PKG_CHECK_MODULES([PERSCOMMON], [persistence_client_library >= 1.0.1]) - PKG_CHECK_MODULES([JSON], [json >= 0.9]) - PKG_CHECK_MODULES([NSM], [node-state-manager]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ]) --- -2.1.3 - diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch deleted file mode 100644 index 866a2c3..0000000 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator/libsystemd_daemon.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index f1fde52..44a1045 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -116,7 +116,7 @@ PKG_CHECK_MODULES([ARCHIVELIB], [libarchive >= 3.0.4]) - PKG_CHECK_MODULES([PERSCOMMON], [libperscommon >= 1.0.1]) - PKG_CHECK_MODULES([JSON], [json >= 0.9]) - PKG_CHECK_MODULES([NSM], [node-state-manager]) --PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 37 ]) -+PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 37 ]) - - AC_SUBST(DEPS_CFLAGS) - AC_SUBST(DEPS_LIBS) diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.8.bb index 1d1adc5..9f6a280 100644 --- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb +++ b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.8.bb @@ -6,16 +6,14 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "68016b6762f9cbd87a7196df26d2b6fc8fcba2c1" +SRCREV = "47e5a424c8ef6e33565737f20d3bd81f69c8efc9" SRC_URI = " \ git://git.projects.genivi.org/persistence/persistence-administrator.git;protocol=http \ - file://libsystemd_daemon.patch \ - file://0001-Add-support-for-json-c-0.12.patch \ " S = "${WORKDIR}/git" DEPENDS = "glib-2.0 dbus dlt-daemon libarchive zlib json-c node-state-manager \ - systemd persistence-common-object libffi libitzam" + systemd persistence-common-object libffi" inherit autotools-brokensep systemd pkgconfig diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch index 5bf6aae..2c3958b 100644 --- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch +++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-load-correct-version-of-libpers_common.patch @@ -5,25 +5,22 @@ Subject: [PATCH] load correct version of libpers_common Signed-off-by: Igor Socec <igor.socec@pelagicore.com> --- - config/pclCustomLibConfigFile.cfg | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + config/pclCustomLibConfigFile.cfg.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg -index fe95ea0..f8e0877 100644 ---- a/config/pclCustomLibConfigFile.cfg -+++ b/config/pclCustomLibConfigFile.cfg -@@ -1,8 +1,8 @@ - hwinfo /usr/lib/libhwinfoperscustom.so init async - secure /usr/lib/libsecureperscustom.so od sync - custom3 /usr/lib/libcustom3perscustom.so init sync --default /usr/lib/libpers_common.so.1 init sync -+default /usr/lib/libpers_common.so.0 init sync - emergency /usr/lib/libemergencyperscustom.so od async - early /usr/lib/libearlyperscustom.so od sync +diff --git a/config/pclCustomLibConfigFile.cfg.in b/config/pclCustomLibConfigFile.cfg.in +index 185cab4..fe95b18 100644 +--- a/config/pclCustomLibConfigFile.cfg.in ++++ b/config/pclCustomLibConfigFile.cfg.in +@@ -1,7 +1,7 @@ + hwinfo @prefix@/lib/libhwinfoperscustom.so init async + secure @prefix@/lib/libsecureperscustom.so od sync + custom3 @prefix@/lib/libcustom3perscustom.so init sync +-default @prefix@/lib/libpers_common.so init sync ++default @prefix@/lib/libpers_common.so.0 init sync + emergency @prefix@/lib/libemergencyperscustom.so od async + early @prefix@/lib/libearlyperscustom.so od sync anInvalidEntry /wrongPath/wrongLib do cnys --custom2 /usr/lib/libcustom2perscustom.so init sync -\ No newline at end of file -+custom2 /usr/lib/libcustom2perscustom.so init sync --- -2.1.4 +-- +1.9.1 diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch deleted file mode 100644 index 8b60de1..0000000 --- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library/0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 9ee8b6a522e2b1f731799690ac78da40f26e1bb7 Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico.cadete@awtce.be> -Date: Wed, 8 Jun 2016 14:43:53 +0200 -Subject: [PATCH] plugin conf file: rework to use @libdir@ from autotools - -Signed-off-by: Frederico Cadete <frederico.cadete@awtce.be> ---- - Makefile.am | 15 ++++++++++++++- - config/pclCustomLibConfigFile.cfg | 8 -------- - config/pclCustomLibConfigFile.cfg.in | 8 ++++++++ - config/pclCustomLibConfigFileEmpty.cfg | 0 - config/pclCustomLibConfigFileEmpty.cfg.in | 0 - configure.ac | 1 + - 6 files changed, 23 insertions(+), 9 deletions(-) - delete mode 100644 config/pclCustomLibConfigFile.cfg - create mode 100644 config/pclCustomLibConfigFile.cfg.in - delete mode 100644 config/pclCustomLibConfigFileEmpty.cfg - create mode 100644 config/pclCustomLibConfigFileEmpty.cfg.in - -diff --git a/Makefile.am b/Makefile.am -index 51b4104..7e42f63 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,15 +6,28 @@ SUBDIRS+=test - endif - - # Write the config file for customer plugins to the config destination --sysconf_DATA = config/pclCustomLibConfigFile.cfg \ -+libconffiles = config/pclCustomLibConfigFile.cfg \ - config/pclCustomLibConfigFileEmpty.cfg - -+libconffiles_subst = $(SED) \ -+ -e 's|@libdir[@]|$(libdir)|g' -+ -+$(libconffiles): -+ $(libconffiles_subst) '$(abs_top_srcdir)/$@.in' > $@ -+ -+config/pclCustomLibConfigFile.cfg: config/pclCustomLibConfigFile.cfg.in -+config/pclCustomLibConfigFileEmpty.cfg: config/pclCustomLibConfigFileEmpty.cfg.in -+ - # Add config file to distribution -+sysconf_DATA = $(libconffiles) - EXTRA_DIST = $(sysconf_DATA) - - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA=persistence_client_library.pc - -+CLEANFILES = \ -+ $(libconffiles) -+ - MAINTAINERCLEANFILES = \ - Makefile.in aclocal.m4 compile config.guess config.h.in config.sub \ - configure depcomp install-sh ltmain.sh persistence_client_library.pc config.h.in~ Makefile missing -diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg -deleted file mode 100644 -index 305cb7c..0000000 ---- a/config/pclCustomLibConfigFile.cfg -+++ /dev/null -@@ -1,8 +0,0 @@ --hwinfo /usr/lib/libhwinfoperscustom.so init async --secure /usr/lib/libsecureperscustom.so od sync --custom3 /usr/lib/libcustom3perscustom.so init sync --default /usr/lib/libpers_common.so.0 init sync --emergency /usr/lib/libemergencyperscustom.so od async --early /usr/lib/libearlyperscustom.so od sync --anInvalidEntry /wrongPath/wrongLib do cnys --custom2 /usr/lib/libcustom2perscustom.so init sync -diff --git a/config/pclCustomLibConfigFile.cfg.in b/config/pclCustomLibConfigFile.cfg.in -new file mode 100644 -index 0000000..8527211 ---- /dev/null -+++ b/config/pclCustomLibConfigFile.cfg.in -@@ -0,0 +1,8 @@ -+hwinfo @libdir@/libhwinfoperscustom.so init async -+secure @libdir@/libsecureperscustom.so od sync -+custom3 @libdir@/libcustom3perscustom.so init sync -+default @libdir@/libpers_common.so.0 init sync -+emergency @libdir@/libemergencyperscustom.so od async -+early @libdir@/libearlyperscustom.so od sync -+anInvalidEntry /wrongPath/wrongLib do cnys -+custom2 @libdir@/libcustom2perscustom.so init sync -diff --git a/config/pclCustomLibConfigFileEmpty.cfg b/config/pclCustomLibConfigFileEmpty.cfg -deleted file mode 100644 -index e69de29..0000000 -diff --git a/config/pclCustomLibConfigFileEmpty.cfg.in b/config/pclCustomLibConfigFileEmpty.cfg.in -new file mode 100644 -index 0000000..e69de29 -diff --git a/configure.ac b/configure.ac -index 2ae0042..649f9c7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -193,6 +193,7 @@ esac], - - AM_CONDITIONAL(DEBUG, test x"$debug" = x"true") - -+AC_PROG_SED - - AC_CONFIG_FILES([Makefile - persistence_client_library.pc --- -1.9.1 - diff --git a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb index c423f70..1445a8d 100644 --- a/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb +++ b/meta-ivi/recipes-extended/persistence-client-library/persistence-client-library_1.1.0.bb @@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6161c6840f21a000e9b52af81d2ca823" DEPENDS = "dlt-daemon dbus libcheck persistence-common-object" -SRCREV = "4b503da99c6b04ad21a197dafe6e7243187c7c7e" +SRCREV = "fe4b73dcc282932ae3ebb8805e0b617a0016dc9a" SRC_URI = " \ git://git.projects.genivi.org/persistence/persistence-client-library.git;protocol=http \ file://0001-load-correct-version-of-libpers_common.patch \ file://0001-fix-exec-path.patch \ - file://0001-plugin-conf-file-rework-to-use-libdir-from-autotools.patch \ " S = "${WORKDIR}/git" diff --git a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/B251_typedef_uint64_t.patch b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/B251_typedef_uint64_t.patch deleted file mode 100644 index 1f75b2f..0000000 --- a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/B251_typedef_uint64_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0f5eca77f55f7236b51016e0d7573c078c895640 Mon Sep 17 00:00:00 2001 -From: Holger Behrens <holger.behrens@windriver.com> -Date: Mon, 17 Nov 2014 18:29:45 +0100 -Subject: [[PATCH] persComTypes.h: Bug 251 work around - -Signed-off-by: Holger Behrens <holger.behrens@windriver.com> ---- - inc/protected/persComTypes.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/inc/protected/persComTypes.h b/inc/protected/persComTypes.h -index 47a6664..7a312b4 100644 ---- a/inc/protected/persComTypes.h -+++ b/inc/protected/persComTypes.h -@@ -83,7 +83,7 @@ typedef __s64 INT64; - typedef __u8 uint8_t; - typedef __u16 uint16_t; - typedef __u32 uint32_t; --typedef __u64 uint64_t; -+//typedef __u64 uint64_t; - #endif - - /** -@@ -203,7 +203,7 @@ typedef sint32_t* psint32_t; - /** - * \brief Pointer to UNSIGNED-64-Bit - */ --typedef uint64_t* puint64_t; -+//typedef uint64_t* puint64_t; - /** - * \brief Pointer to SIGNED-64-Bit - */ --- -2.1.3 - diff --git a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/configure.ac-fix-typo.patch b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/configure.ac-fix-typo.patch deleted file mode 100644 index ac760ae..0000000 --- a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object/configure.ac-fix-typo.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d4aa6cf7344c3d1b244fdddfe95d8300f35aa157 Mon Sep 17 00:00:00 2001 -From: Holger Behrens <holger.behrens@windriver.com> -Date: Mon, 17 Nov 2014 17:08:08 +0100 -Subject: [[PATCH] configure.ac: fix typo - -Signed-off-by: Holger Behrens <holger.behrens@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index badd5c6..88e8a63 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,7 +25,7 @@ m4_define([PERSCOMMON_LIB_VERSION_N],[1001001]) - dnl *************************** - dnl *** Initialize autoconf *** - dnl *************************** --AC_INIT([persistence-common],[LIBPERSOCOMMON_VERSION_S()]) -+AC_INIT([persistence-common],[PERSCOMMON_PACKAGE_VERSION_S]) - AC_COPYRIGHT([Copyright (c) 2012 Continental Automotive GmbH]) - AC_PREREQ([2.50]) - --- -2.1.3 - diff --git a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb index 240c2a6..16ed3a5 100644 --- a/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb +++ b/meta-ivi/recipes-extended/persistence-common-object/persistence-common-object_1.0.3.bb @@ -5,15 +5,13 @@ SECTION = "base" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "b27fe577fcef7bf57d8d287f56e8dfd6ac60b1f0" +SRCREV = "395b0f504e05ee6c59c1b9d9267c793e072a19ba" SRC_URI = " \ git://git.projects.genivi.org/persistence/persistence-common-object.git;protocol=http \ - file://configure.ac-fix-typo.patch \ - file://B251_typedef_uint64_t.patch \ " S = "${WORKDIR}/git" -DEPENDS = "glib-2.0 libitzam dlt-daemon" +DEPENDS = "glib-2.0 dlt-daemon" inherit autotools-brokensep pkgconfig diff --git a/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty/vexpressa9/securetty-vea9 b/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty/vexpressa9/securetty-vea9 deleted file mode 100644 index 64d71cb..0000000 --- a/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty/vexpressa9/securetty-vea9 +++ /dev/null @@ -1,7 +0,0 @@ - -# vexpress A9 ports -ttyAMA0 -ttyAMA1 -ttyAMA2 -ttyAMA3 - diff --git a/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty_4.%.bbappend b/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty_4.%.bbappend deleted file mode 100644 index dda8d60..0000000 --- a/meta-ivi/recipes-extended/shadow-securetty/shadow-securetty_4.%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" - -SRC_URI_append_vexpressa9 = " file://securetty-vea9" - -do_configure_prepend_vexpressa9 () { - cat ${WORKDIR}/securetty-vea9 >> ${WORKDIR}/securetty -} diff --git a/meta-ivi/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch b/meta-ivi/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch new file mode 100644 index 0000000..97c63bd --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch @@ -0,0 +1,72 @@ +This is a workaround upstream suggests for use with kernel 4.1. + +Upstream-Status: Inappropriate [temporary work-around] +Signed-Off-By: Jussi Kukkonen <jussi.kukkonen@intel.com> + + + +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Aug 3 18:23:12 PDT 2015 +Subject: [PATCH v3 libinput] touchpad: serial synaptics need to fake new touches on TRIPLETAP + +On the 4.1 kernels synaptics pretends to have 3 slots (the serial fw only does +2). This was added to avoid cursor jumps but has since been reverted for 4.2 +(kernel commit dbf3c37086, 4.1.3 is still buggy). In some cases a TRIPLETAP +may be triggered without slot 2 ever activating. + +While there are still those kernels out there, work around this bug by opening +a new touch point where none exists if the fake finger count exceeds the slot +count. + +Reported-by: Jan Alexander Steffens <jan.steffens at gmail.com> +Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net> +Tested-by: Jan Alexander Steffens <jan.steffens at gmail.com> +Reviewed-by: Hans de Goede <hdegoede at redhat.com> +--- +Changes to v2: +- split out the handling instead of having a tmp state variable, see Hans' + comments from v2 + +Mainly sending this to the list again so I have a link to point people to. +If you're on 4.1.x add this patch to your distribution package. + + src/evdev-mt-touchpad.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index a683d9a..5ef03d5 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -369,13 +369,23 @@ tp_restore_synaptics_touches(struct tp_dispatch *tp, + for (i = 0; i < tp->num_slots; i++) { + struct tp_touch *t = tp_get_touch(tp, i); + +- if (t->state != TOUCH_END) ++ switch(t->state) { ++ case TOUCH_HOVERING: ++ case TOUCH_BEGIN: ++ case TOUCH_UPDATE: + continue; +- +- /* new touch, move it through begin to update immediately */ +- tp_new_touch(tp, t, time); +- tp_begin_touch(tp, t, time); +- t->state = TOUCH_UPDATE; ++ case TOUCH_NONE: ++ /* new touch, move it through to begin immediately */ ++ tp_new_touch(tp, t, time); ++ tp_begin_touch(tp, t, time); ++ break; ++ case TOUCH_END: ++ /* touch just ended ,we need need to restore it to update */ ++ tp_new_touch(tp, t, time); ++ tp_begin_touch(tp, t, time); ++ t->state = TOUCH_UPDATE; ++ break; ++ } + } + } + +-- +2.4.3 + diff --git a/meta-ivi/recipes-graphics/wayland/libinput_1.1.1.bb b/meta-ivi/recipes-graphics/wayland/libinput_1.3.0.bb index 1ab2859..13724d5 100644 --- a/meta-ivi/recipes-graphics/wayland/libinput_1.1.1.bb +++ b/meta-ivi/recipes-graphics/wayland/libinput_1.3.0.bb @@ -8,15 +8,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f" DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \ " -SRC_URI[md5sum] = "4a3fc842ac0b7bf0fa306ea7badc31a0" -SRC_URI[sha256sum] = "2de2b433ddc73ba1bfd4d309fd873d0ced6937cf1a7a94e4afbf18ddd8f8dd17" +SRC_URI[md5sum] = "5f8bc2c746bfbc9454143f78e5b477a9" +SRC_URI[sha256sum] = "998a75fb261d161efaa7da44411cdc9a32a953280e4ffc6322ca19f057d0c1ea" inherit autotools pkgconfig PACKAGECONFIG ??= "" PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" +PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom" PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3" FILES_${PN} += "${libdir}/udev/" -FILES_${PN}-dbg += "${libdir}/udev/.debug" diff --git a/meta-ivi/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta-ivi/recipes-graphics/wayland/mtdev_1.1.5.bb new file mode 100644 index 0000000..ccd0ebb --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/mtdev_1.1.5.bb @@ -0,0 +1,18 @@ +SUMMARY = "Multitouch Protocol Translation Library" + +DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ +multitouch events to the slotted type B protocol. The events put into mtdev may \ +be from any MT device, specifically type A without contact tracking, type A with \ +contact tracking, or type B with contact tracking" + +HOMEPAGE = "http://bitmath.org/code/mtdev/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" + +SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" +SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" +SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" + +inherit autotools pkgconfig diff --git a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bb b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.10.90.bb index f5810be..328d6e7 100644 --- a/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bb +++ b/meta-ivi/recipes-graphics/wayland/wayland-ivi-extension_1.10.90.bb @@ -5,14 +5,15 @@ BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Wayland%20IVI%20Exten LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=176cedb32f48dd58f07e0c1c717b3ea4" -SRCREV = "44598504503eea5ac7f94c88477a5a78bda01f30" -SRC_URI = "git://git.projects.genivi.org/${BPN}.git;protocol=http \ +PR = "r1" +SRCREV = "e232017e0906557f468823505a49e92d4c94591c" +SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ " S = "${WORKDIR}/git" DEPENDS = "weston" -inherit cmake autotools +inherit cmake EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1" diff --git a/meta-ivi/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch b/meta-ivi/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch new file mode 100644 index 0000000..6cc0f3b --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch @@ -0,0 +1,29 @@ +Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call +will fail if the host cpu is not recognised (which can happen when +e.g. Yocto builds for "allarch"). + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Backport [cc276dfa41] + +diff --git a/configure.ac b/configure.ac +index 5b48b1a..3d45a4b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4]) + + AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version]) + +-AC_CANONICAL_HOST +-AC_CANONICAL_BUILD +- + AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable]) + AC_PATH_PROG([wayland_scanner], [wayland-scanner]) + if test x$wayland_scanner = x; then +- if test x$host = x$build; then ++ if test "x$cross_compiling" != "xyes"; then + PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) + wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` + else +-- +cgit v0.10.2 + diff --git a/meta-ivi/recipes-graphics/wayland/wayland-protocols_1.3.bb b/meta-ivi/recipes-graphics/wayland/wayland-protocols_1.3.bb new file mode 100644 index 0000000..86e89b5 --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/wayland-protocols_1.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "Collection of additional Wayland protocols" +DESCRIPTION = "Wayland protocols that add functionality not \ +available in the Wayland core protocol. Such protocols either add \ +completely new functionality, or extend the functionality of some other \ +protocol either in Wayland core, or some other protocol in \ +wayland-protocols." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ + file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" + +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://dont-use-AC_CANONICAL.patch" +SRC_URI[md5sum] = "88b5e3dce52908c7e74fad3e2cf8abb0" +SRC_URI[sha256sum] = "6bcd0633fdf9225ef1c7d2831f542e947f7d79811c79fc37f57b2e5375ded82f" + +inherit allarch autotools pkgconfig + +PACKAGES = "${PN}" +FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" diff --git a/meta-ivi/recipes-graphics/wayland/wayland_1.9.0.bb b/meta-ivi/recipes-graphics/wayland/wayland_1.11.0.bb index 00d2a56..08d2b2c 100644 --- a/meta-ivi/recipes-graphics/wayland/wayland_1.9.0.bb +++ b/meta-ivi/recipes-graphics/wayland/wayland_1.11.0.bb @@ -10,17 +10,17 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "5e141b3f2a7005d6c89d6f233c87c317" -SRC_URI[sha256sum] = "9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa" +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "fccf680be066e234729d5b69e0bd0fa9" +SRC_URI[sha256sum] = "9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0" -EXTRA_OECONF_class-native = "--disable-documentation" +EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" inherit autotools pkgconfig BBCLASSEXTEND = "native nativesdk" -DEPENDS = "expat libffi wayland-native" +DEPENDS = "expat libxml2 libffi wayland-native" EXTRA_OECONF = "--disable-documentation --with-host-scanner" diff --git a/meta-ivi/recipes-graphics/wayland/weston-init.bb b/meta-ivi/recipes-graphics/wayland/weston-init.bb new file mode 100644 index 0000000..291cd16 --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/weston-init.bb @@ -0,0 +1,31 @@ +SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" + +SRC_URI = "file://init \ + file://weston.service \ + file://weston-start" + +S = "${WORKDIR}" + +do_install() { + install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + install -Dm0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service + + # Install weston-start script + install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start + sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start + sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start +} + +inherit allarch update-rc.d distro_features_check systemd + +# rdepends on weston which depends on virtual/egl +REQUIRED_DISTRO_FEATURES = "opengl" + +RDEPENDS_${PN} = "weston kbd" + +INITSCRIPT_NAME = "weston" +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." + +SYSTEMD_SERVICE_${PN} = "weston.service" diff --git a/meta-ivi/recipes-graphics/wayland/weston-init/init b/meta-ivi/recipes-graphics/wayland/weston-init/init new file mode 100644 index 0000000..5c925f4 --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/weston-init/init @@ -0,0 +1,53 @@ +#!/bin/sh +# +### BEGIN INIT INFO +# Provides: weston +# 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 + +if test -e /etc/default/weston ; then + . /etc/default/weston +fi + +killproc() { + pid=`/bin/pidof $1` + [ "$pid" != "" ] && kill $pid +} + +read CMDLINE < /proc/cmdline +for x in $CMDLINE; do + case $x in + weston=false) + echo "Weston disabled" + exit 0; + ;; + esac +done + +case "$1" in + start) + . /etc/profile + + weston-start -s -- $OPTARGS + ;; + + stop) + echo "Stopping Weston" + killproc weston + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 { start | stop | restart }" + ;; +esac + +exit 0 diff --git a/meta-ivi/recipes-graphics/wayland/weston-init/weston-start b/meta-ivi/recipes-graphics/wayland/weston-init/weston-start new file mode 100755 index 0000000..5b7604f --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/weston-init/weston-start @@ -0,0 +1,74 @@ +#!/bin/sh +# Copyright (C) 2016 O.S. Systems Software LTDA. + +export PATH="/sbin:/usr/sbin:/bin:/usr/bin" + +usage() { + cat <<EOF + $0 <openvt arguments> -- <weston options> +EOF +} + +## Module support +modules_dir=@DATADIR@/weston-start + +# Add weston extra argument +add_weston_argument() { + weston_args="$weston_args $1" +} + +# Add openvt extra argument +add_openvt_argument() { + openvt_args="$openvt_args $1" +} + +if test $# -lt 2; then + usage + exit 1 +fi + +if [ -n "$WAYLAND_DISPLAY" ]; then + echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." + exit 1 +fi +if [ -n "$DISPLAY" ]; then + launcher="weston" +else + launcher="weston-launch --" +fi + +openvt_args="" +while [ -n "$1" ]; do + openvt_args="$openvt_args $1" + shift + + if [ "$1" = "--" ]; then + shift + break + fi +done + +weston_args=$* + +# Load and run modules +if [ -d "$modules_dir" ]; then + for m in "$modules_dir"/*; do + # Skip backup files + if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then + continue + fi + + # process module + . $m + done +fi + +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 + +exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log diff --git a/meta-ivi/recipes-graphics/wayland/weston-init/weston.service b/meta-ivi/recipes-graphics/wayland/weston-init/weston.service new file mode 100644 index 0000000..689ce41 --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/weston-init/weston.service @@ -0,0 +1,12 @@ +[Unit] +Description=Weston Wayland Compositor +RequiresMountsFor=/run + +[Service] +User=root +EnvironmentFile=-/etc/default/weston +ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS + +[Install] +WantedBy=multi-user.target + diff --git a/meta-ivi/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta-ivi/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch new file mode 100644 index 0000000..bb1f1ef --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch @@ -0,0 +1,29 @@ +From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 11 May 2016 16:16:30 +0300 +Subject: [PATCH] configure.ac: Fix wayland-protocols path + +The wayland-protocols directory is used during build: Fix the path +to point to sysroot specified in recipe. + +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that +breaks multilib weston as it would point to multilib sysroot when the +(allarch) wayland-protocols is actually in the machine sysroot. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Inappropriate [embedded specific] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure.ac.orig 2016-06-30 18:28:23.586978429 +0900 ++++ a/configure.ac 2016-06-30 18:19:28.526994269 +0900 +@@ -187,7 +187,7 @@ + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) + + PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], +- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) ++ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) + + AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, diff --git a/meta-ivi/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-ivi/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch new file mode 100644 index 0000000..6bdd0c5 --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch @@ -0,0 +1,174 @@ +From 228349e796e9baa86f2ba8232c730c18ac41283d Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Fri, 13 May 2016 09:31:55 -0500 +Subject: [PATCH weston] weston-launch: Provide a default version that doesn't + require PAM + +weston-launch requires PAM for starting weston as a non-root user. + +Since starting weston as root is a valid use case by itself, if +PAM is not available, provide a default version of weston-launch +without non-root-user support. + +Upstream-Status: Pending + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +--- + Makefile.am | 3 --- + configure.ac | 12 +++++++----- + src/weston-launch.c | 20 ++++++++++++++++++++ + 3 files changed, 27 insertions(+), 8 deletions(-) + +--- a/configure.ac.orig 2016-06-30 18:30:49.058974122 +0900 ++++ a/configure.ac 2016-06-30 18:34:39.046967314 +0900 +@@ -418,11 +418,12 @@ + + AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes) + AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch == xyes) +-if test x$enable_weston_launch == xyes; then ++if test x$enable_weston_launch == xyes -a x$with_pam = xyes; then + WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no]) + if test x$have_pam == xno; then +- AC_ERROR([weston-launch requires pam]) ++ AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found]) + fi ++ AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available]) + fi + + AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") +@@ -519,6 +520,9 @@ + AS_IF([test "x$have_systemd_login_209" = "xyes"], + [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) + ++AC_ARG_WITH(pam, ++ AS_HELP_STRING([--with-pam], [Use PAM]), ++ [use_pam=$withval], [use_pam=yes]) + + # Note that other features might want libxml2, or this feature might use + # alternative xml libraries at some point. Therefore the feature and +@@ -673,6 +677,7 @@ + Enable developer documentation ${enable_devdocs} + + weston-launch utility ${enable_weston_launch} ++ PAM support ${with_pam} + systemd-login support ${have_systemd_login} + systemd notify support ${enable_systemd_notify} + +--- a/src/weston-launch.c.orig 2016-06-30 18:35:00.702966673 +0900 ++++ a/src/weston-launch.c 2016-06-30 18:38:29.186960500 +0900 +@@ -51,7 +51,9 @@ + + #include <pwd.h> + #include <grp.h> ++#ifdef HAVE_PAM + #include <security/pam_appl.h> ++#endif + + #ifdef HAVE_SYSTEMD_LOGIN + #include <systemd/sd-login.h> +@@ -93,8 +95,10 @@ + #endif + + struct weston_launch { ++#ifdef HAVE_PAM + struct pam_conv pc; + pam_handle_t *ph; ++#endif + int tty; + int ttynr; + int sock[2]; +@@ -181,6 +185,7 @@ + return false; + } + ++#ifdef HAVE_PAM + static int + pam_conversation_fn(int msg_count, + const struct pam_message **messages, +@@ -221,6 +226,7 @@ + + return 0; + } ++#endif + + static int + setup_launcher_socket(struct weston_launch *wl) +@@ -414,6 +420,7 @@ + close(wl->signalfd); + close(wl->sock[0]); + ++#ifdef HAVE_PAM + if (wl->new_user) { + err = pam_close_session(wl->ph, 0); + if (err) +@@ -421,6 +428,7 @@ + err, pam_strerror(wl->ph, err)); + pam_end(wl->ph, err); + } ++#endif + + if (ioctl(wl->tty, KDSKBMUTE, 0) && + ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) +@@ -600,6 +608,7 @@ + setenv("HOME", wl->pw->pw_dir, 1); + setenv("SHELL", wl->pw->pw_shell, 1); + ++#ifdef HAVE_PAM + env = pam_getenvlist(wl->ph); + if (env) { + for (i = 0; env[i]; ++i) { +@@ -608,6 +617,7 @@ + } + free(env); + } ++#endif + } + + static void +@@ -665,7 +675,9 @@ + help(const char *name) + { + fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); ++#ifdef HAVE_PAM + fprintf(stderr, " -u, --user Start session as specified username\n"); ++#endif + fprintf(stderr, " -t, --tty Start session on alternative tty\n"); + fprintf(stderr, " -v, --verbose Be verbose\n"); + fprintf(stderr, " -h, --help Display this help message\n"); +@@ -678,7 +690,9 @@ + int i, c; + char *tty = NULL; + struct option opts[] = { ++#ifdef HAVE_PAM + { "user", required_argument, NULL, 'u' }, ++#endif + { "tty", required_argument, NULL, 't' }, + { "verbose", no_argument, NULL, 'v' }, + { "help", no_argument, NULL, 'h' }, +@@ -690,9 +704,13 @@ + while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) { + switch (c) { + case 'u': ++#ifdef HAVE_PAM + wl.new_user = optarg; + if (getuid() != 0) + error(1, 0, "Permission denied. -u allowed for root only"); ++#else ++ error(1, 0, "-u is unsupported in this weston-launch build"); ++#endif + break; + case 't': + tty = optarg; +@@ -729,9 +747,11 @@ + + if (setup_tty(&wl, tty) < 0) + exit(EXIT_FAILURE); +- ++ ++#ifdef HAVE_PAM + if (wl.new_user && setup_pam(&wl) < 0) + exit(EXIT_FAILURE); ++#endif + + if (setup_launcher_socket(&wl) < 0) + exit(EXIT_FAILURE); diff --git a/meta-ivi/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta-ivi/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch deleted file mode 100644 index 68ba38b..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -501,12 +501,6 @@ if test "x$have_lcms" = xyes; then - fi - AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) - --AC_PATH_PROG([wayland_scanner], [wayland-scanner]) --if test x$wayland_scanner = x; then -- PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) -- wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` --fi -- - AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) - - AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD]) diff --git a/meta-ivi/recipes-graphics/wayland/weston/fix-up-for-signal-11-on-qemux86.patch b/meta-ivi/recipes-graphics/wayland/weston/fix-up-for-signal-11-on-qemux86.patch deleted file mode 100644 index a146708..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/fix-up-for-signal-11-on-qemux86.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/clients/ivi-shell-user-interface.c 2015-08-08 04:01:22.000000000 +0900 -+++ b/clients/ivi-shell-user-interface.c 2015-11-13 19:26:38.844430385 +0900 -@@ -21,6 +21,8 @@ - * DEALINGS IN THE SOFTWARE. - */ - -+#include "config.h" -+ - #include <sys/wait.h> - #include <unistd.h> - #include <stdlib.h> diff --git a/meta-ivi/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/meta-ivi/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch deleted file mode 100644 index 35e6d6f..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch +++ /dev/null @@ -1,43 +0,0 @@ -weston-1.5.0/configure.ac: make lcms explicitly configurable - -The lcms package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if lcms -dependencies are missing, autoconf throws a fatal error. Follow -upstream style to make it more likely to be merged. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, - enable_demo_clients_install=no) - AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) - --PKG_CHECK_MODULES(LCMS, lcms2, -- [have_lcms=yes], [have_lcms=no]) --if test "x$have_lcms" = xyes; then -- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+AC_ARG_ENABLE(lcms, -+ AS_HELP_STRING([--disable-lcms], -+ [Disable lcms support]),, -+ enable_lcms=auto) -+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) -+if test "x$enable_lcms" != "xno"; then -+ PKG_CHECK_MODULES(LCMS, -+ lcms2, -+ [have_lcms=yes], -+ [have_lcms=no]) -+ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then -+ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) -+ fi -+ if test "x$have_lcms" = "xyes"; then -+ enable_lcms=yes -+ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+ fi - fi --AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) - - AC_PATH_PROG([wayland_scanner], [wayland-scanner]) - if test x$wayland_scanner = x; then diff --git a/meta-ivi/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch b/meta-ivi/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch deleted file mode 100644 index ad07d4f..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch +++ /dev/null @@ -1,37 +0,0 @@ - -The libwebp package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if libwebp -dependencies are missing, autoconf throws a fatal error. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -268,9 +268,22 @@ fi - - PKG_CHECK_MODULES(PIXMAN, [pixman-1]) - PKG_CHECK_MODULES(PNG, [libpng]) --PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) --AS_IF([test "x$have_webp" = "xyes"], -- [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+AC_ARG_ENABLE(webp, -+ AS_HELP_STRING([--disable-webp], -+ [Disable libwebp support]),, -+ enable_webp=auto) -+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes]) -+AS_IF([test "x$enable_webp" != "xno"], -+ PKG_CHECK_MODULES(WEBP, -+ [libwebp], -+ [have_webp=yes], -+ [have_webp=no]) -+ AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"], -+ AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found])) -+ AS_IF([test "x$have_webp" = "xyes"], -+ [enable_webp=yes] -+ [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+) - - AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],, - enable_vaapi_recorder=auto) diff --git a/meta-ivi/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch b/meta-ivi/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch new file mode 100644 index 0000000..25c8683 --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch @@ -0,0 +1,33 @@ +From e8b615250f700f7854b423aaaf0a0aeea92c05a9 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Sat, 7 May 2016 08:51:58 -0300 +Subject: [PATCH] weston-launch: Handle invalid command line options +Organization: O.S. Systems Software LTDA. + +Exit the program if an unrecognized command line option is found. + +Upstream-Status: Submitted + +Signed-off-by; Tom Hochstein <tom.hochstein@nxp.com> +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +--- + + src/weston-launch.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/weston-launch.c b/src/weston-launch.c +index b8dfb17..9987d8e 100644 +--- a/src/weston-launch.c ++++ b/src/weston-launch.c +@@ -703,6 +703,8 @@ main(int argc, char *argv[]) + case 'h': + help("weston-launch"); + exit(EXIT_FAILURE); ++ default: ++ exit(EXIT_FAILURE); + } + } + +-- +2.8.2 + diff --git a/meta-ivi/recipes-graphics/wayland/weston/parallelmake.patch b/meta-ivi/recipes-graphics/wayland/weston/parallelmake.patch deleted file mode 100644 index 42b5efb..0000000 --- a/meta-ivi/recipes-graphics/wayland/weston/parallelmake.patch +++ /dev/null @@ -1,40 +0,0 @@ -Backport two patches from upstream to fix parallel builds - -- mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc) -- weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03) - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/Makefile.am b/Makefile.am -index 5819b19..ff13b19 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in - $< > $@ - - ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in -- $(AM_V_GEN)$(SED) \ -+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ - -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ -@@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in - $< > $@ - - tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in -- $(AM_V_GEN)$(SED) \ -+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ - -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ -@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = src/weston.pc - - wayland_sessiondir = $(datadir)/wayland-sessions --wayland_session_DATA = src/weston.desktop --dist_wayland_session_DATA = $(wayland_session_DATA) -+dist_wayland_session_DATA = src/weston.desktop - - westonincludedir = $(includedir)/weston - westoninclude_HEADERS = \ diff --git a/meta-ivi/recipes-graphics/wayland/weston/xwayland.weston-start b/meta-ivi/recipes-graphics/wayland/weston/xwayland.weston-start new file mode 100644 index 0000000..b483c97 --- /dev/null +++ b/meta-ivi/recipes-graphics/wayland/weston/xwayland.weston-start @@ -0,0 +1,7 @@ +#!/bin/sh + +if type Xwayland >/dev/null 2>/dev/null; then + mkdir -p /tmp/.X11-unix + + add_weston_argument "--modules=xwayland.so" +fi diff --git a/meta-ivi/recipes-graphics/wayland/weston_1.9.0.bbappend b/meta-ivi/recipes-graphics/wayland/weston_1.%.bbappend index ecb4099..ecb4099 100644 --- a/meta-ivi/recipes-graphics/wayland/weston_1.9.0.bbappend +++ b/meta-ivi/recipes-graphics/wayland/weston_1.%.bbappend diff --git a/meta-ivi/recipes-graphics/wayland/weston_1.9.0.bb b/meta-ivi/recipes-graphics/wayland/weston_1.11.0.bb index fb89288..391a3f1 100644 --- a/meta-ivi/recipes-graphics/wayland/weston_1.9.0.bb +++ b/meta-ivi/recipes-graphics/wayland/weston_1.11.0.bb @@ -3,32 +3,33 @@ DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" HOMEPAGE = "http://wayland.freedesktop.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://src/compositor.c;endline=26;md5=e342df749174a8ee11065583157c7a38" + file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331" -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ - file://make-lcms-explicitly-configurable.patch \ - file://make-libwebp-explicitly-configurable.patch \ file://0001-make-error-portable.patch \ - file://fix-up-for-signal-11-on-qemux86.patch \ + file://0001-configure.ac-Fix-wayland-protocols-path.patch \ + file://xwayland.weston-start \ + file://make-weston-launch-exit-for-unrecognized-option.patch \ + file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ " -SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" -SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" +SRC_URI[md5sum] = "bc6f90a2039163804aecfa663b69c4c2" +SRC_URI[sha256sum] = "05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125" -inherit autotools pkgconfig useradd +inherit autotools pkgconfig useradd distro_features_check +# depends on virtual/egl +REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland libinput virtual/egl pango" +DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" EXTRA_OECONF = "--enable-setuid-install \ - --disable-xwayland \ - --enable-simple-clients \ - --enable-clients \ - --enable-demo-clients-install \ --disable-rpi-compositor \ --disable-rdp-compositor \ + WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ " +EXTRA_OECONF[vardepsexclude] = "MACHINE" EXTRA_OECONF_append_qemux86 = "\ WESTON_NATIVE_BACKEND=fbdev-backend.so \ @@ -38,8 +39,10 @@ EXTRA_OECONF_append_qemux86-64 = "\ " PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ - " + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + clients launch" # # Compositor choices # @@ -54,7 +57,7 @@ PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compo # Weston on framebuffer PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" # weston-launch -PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" +PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,drm" # VA-API desktop recorder PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" # Weston with EGL support @@ -64,9 +67,19 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" # Weston with lcms support PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" # Weston with webp support -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" +PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" # Weston with unwinding support PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" +# Weston with systemd-login support +PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus" +# Weston with Xwayland support (requires X11 and Wayland) +PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland" +# colord CMS support +PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" +# Clients support +PACKAGECONFIG[clients] = "--enable-clients --enable-simple-clients --enable-demo-clients-install,--disable-clients --disable-simple-clients" +# Weston with PAM support +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them @@ -79,16 +92,25 @@ do_install_append() { install -d ${D}${datadir}/icons/hicolor/48x48/apps install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland + fi } +PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)}" PACKAGES += "${PN}-examples" FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so" +RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" + RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "liberation-fonts" +RRECOMMENDS_${PN}-dev += "wayland-protocols" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system weston-launch" diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch index 3f2c2ef..b44ad1c 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch @@ -9,52 +9,48 @@ Signed-off-by: Clement Dransart <clement.dransart@awtce.be> 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4e3cb5..0004b07 100755 +index b977b76..d5fbc4a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -169,13 +169,13 @@ if(USE_BUILD_LIBS) - endif(NOT DEFINED CONTROLLER_PLUGIN) - else(USE_BUILD_LIBS) - if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) -- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") -+ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command") - endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) - if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) -- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") -+ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing") - endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) - if(NOT DEFINED CONTROLLER_PLUGIN) -- set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so") -+ set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_LIBDIR}/control/libPluginControlInterface.so") - endif(NOT DEFINED CONTROLLER_PLUGIN) - endif(USE_BUILD_LIBS) +@@ -116,11 +116,11 @@ GET_ROUTING_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) + GET_CONTROL_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) -@@ -228,7 +228,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG") + if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) +- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") ++ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command") + endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) +- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") ++ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing") + endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + if(NOT DEFINED CONTROLLER_PLUGIN_DIR) +- set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control") ++ set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/control") + endif(NOT DEFINED CONTROLLER_PLUGIN_DIR) + + ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON) +@@ -149,7 +149,7 @@ endif(WITH_TESTS) configure_package_config_file ( - ${CMAKE_SOURCE_DIR}/cmake/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake + ${CMAKE_SOURCE_DIR}/cmake/AudioManagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerConfig.cmake - INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake PATH_VARS AUDIO_INCLUDE_FOLDER ) write_basic_package_version_file( -@@ -237,14 +237,14 @@ write_basic_package_version_file( - COMPATIBILITY SameMajorVersion ) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake -- DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake - COMPONENT dev) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/config.h +@@ -169,5 +169,5 @@ add_subdirectory (AudioManagerDaemon) + install( + FILES ${CMAKE_BINARY_DIR}/AudioManagerConfig.cmake + ${CMAKE_BINARY_DIR}/AudioManagerConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/AudioManager-${DAEMONVERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/AudioManager-${DAEMONVERSION} + ) + +-install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel) ++install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/audiomanagerconfig.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} COMPONENT dev) - - configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanager.pc.in ${CMAKE_BINARY_DIR}/audiomanager.pc @ONLY ) --install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel) -+install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) - - add_subdirectory (AudioManagerDaemon) - -- 1.9.1 diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch new file mode 100644 index 0000000..3f2c2ef --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch @@ -0,0 +1,60 @@ +From d214197c418945f8ae8ad72a7173c6b83a808ef0 Mon Sep 17 00:00:00 2001 +From: Clement Dransart <clement.dransart@awtce.be> +Date: Fri, 17 Jun 2016 10:40:36 +0200 +Subject: [audiomanager][PATCH] audiomanager: fix lib install path for multilib + +Signed-off-by: Clement Dransart <clement.dransart@awtce.be> +--- + CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4e3cb5..0004b07 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -169,13 +169,13 @@ if(USE_BUILD_LIBS) + endif(NOT DEFINED CONTROLLER_PLUGIN) + else(USE_BUILD_LIBS) + if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) +- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") ++ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command") + endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) +- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") ++ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing") + endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + if(NOT DEFINED CONTROLLER_PLUGIN) +- set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so") ++ set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_LIBDIR}/control/libPluginControlInterface.so") + endif(NOT DEFINED CONTROLLER_PLUGIN) + endif(USE_BUILD_LIBS) + +@@ -228,7 +228,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG") + + configure_package_config_file ( + ${CMAKE_SOURCE_DIR}/cmake/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake +- INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + PATH_VARS AUDIO_INCLUDE_FOLDER ) + + write_basic_package_version_file( +@@ -237,14 +237,14 @@ write_basic_package_version_file( + COMPATIBILITY SameMajorVersion ) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake +- DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + COMPONENT dev) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/config.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} + COMPONENT dev) + + configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanager.pc.in ${CMAKE_BINARY_DIR}/audiomanager.pc @ONLY ) +-install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel) ++install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) + + add_subdirectory (AudioManagerDaemon) + +-- +1.9.1 + diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb index 40dbff6..912076b 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb @@ -13,11 +13,11 @@ SRC_URI = " \ git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ file://AudioManager.service \ file://setup_amgr.sh \ - file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ + file://0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch \ " S = "${WORKDIR}/git" -inherit autotools gettext cmake pkgconfig systemd +inherit cmake pkgconfig systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "AudioManager.service" @@ -33,6 +33,7 @@ FILES_${PN} = " \ " FILES_${PN}-dev += " \ ${libdir}/* \ + /usr/share/cmake/Modules/* \ " do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then @@ -42,7 +43,25 @@ do_install_append() { install -m 0644 ${WORKDIR}/AudioManager.service ${D}${systemd_unitdir}/system fi - perl -pi -e \ - 's/set_and_check\(CMAKE_MODULE_PATH/#set_and_check\(CMAKE_MODULE_PATH/' \ - ${D}${libdir}/audiomanager/cmake/audiomanagerConfig.cmake + install -d 0755 ${D}/usr/share/cmake/Modules + for i in `ls ${S}/cmake/*.cmake`; do + install -m 0644 ${i} ${D}/usr/share/cmake/Modules + done + perl -pi -e 's|COMMAND find "/usr/local/share/CommonAPI-\${CommonAPI_VERSION}"|COMMAND find "${PSEUDO_PREFIX}/share"|' \ + ${D}/usr/share/cmake/Modules/CommonAPI.cmake + + C_CMAKE=${D}${libdir}/cmake/audiomanagerConfig.cmake + perl -pi -e 's|;${S}/cmake||' ${C_CMAKE} + perl -pi -e 's|;(.*)/usr/share/cmake/Modules/||' ${C_CMAKE} + perl -pi -e 's|set\(WITH_TESTS|#set\(WITH_TESTS|' ${C_CMAKE} + perl -pi -e 's|.*set_and_check\(GOOGLE_MOCK_PROJECT_FOLDER \"(.+)\"\)\n||' ${C_CMAKE} + perl -pi -e 's|GOOGLE_TEST_INCLUDE_DIR \"(.+)\"|GOOGLE_TEST_INCLUDE_DIR \"${PKG_CONFIG_SYSROOT_DIR}/usr/include/gtest\"|' ${C_CMAKE} + perl -pi -e 's|GMOCK_INCLUDE_DIR \"(.+)\"|GMOCK_INCLUDE_DIR \"${PKG_CONFIG_SYSROOT_DIR}/usr/include/gmock\"|' ${C_CMAKE} +# perl -pi -e \ +# 's/set_and_check\(CMAKE_MODULE_PATH/#set_and_check\(CMAKE_MODULE_PATH/' \ +# ${D}${libdir}/cmake/audiomanagerConfig.cmake +} + +python do_qa_staging() { + bb.note("QA checking staging - SKIP") } diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb new file mode 100644 index 0000000..4144bd9 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb @@ -0,0 +1,55 @@ +SUMMARY = "Genivi AudioManager" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "multimedia" + +LICENSE = "MPLv2" +LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" + +DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" + +SRCREV = "5bcd206b9270d9a79e212f91723ea1a08a4d4859" +SRC_URI = " \ + git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ + file://AudioManager.service \ + file://setup_amgr.sh \ + file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ + " +S = "${WORKDIR}/git" + +inherit gettext cmake pkgconfig systemd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "AudioManager.service" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_CXX_FLAGS +="-ldl" +EXTRA_OECMAKE = " -DWITH_DBUS_WRAPPER=ON -DWITH_TESTS=OFF" + +FILES_${PN} = " \ + ${bindir}/* \ + ${systemd_unitdir}/AudioManager.service \ + ${systemd_unitdir}/scripts/setup_amgr.sh \ + " +FILES_${PN}-dev += " \ + ${libdir}/* \ + " + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + mkdir -p ${D}${systemd_unitdir}/scripts/ + install -m 0755 ${WORKDIR}/setup_amgr.sh ${D}${systemd_unitdir}/scripts/setup_amgr.sh + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/AudioManager.service ${D}${systemd_unitdir}/system + fi + + perl -pi -e 's|set_and_check\(|#set_and_check\(|' ${D}${libdir}/cmake/*/*.cmake + +} + +# replace function in poky/meta/classes/insane.bbclass +python do_qa_staging() { + bb.note("[workaround] QA checking staging") + + if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}${STAGING_LIBDIR}'), d): + bb.fatal("QA staging was broken by the package built above") +} diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch new file mode 100644 index 0000000..7f9205a --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch @@ -0,0 +1,137 @@ +diff --git a/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake b/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake +index 3db1f4a..ab3d4d6 100644 +--- a/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake ++++ b/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake +@@ -351,7 +351,10 @@ + if(EXIT_CODE) + message(FATAL_ERROR "Failed to generate files from FIDL:${GENERATOR_OUTPUT}") + elseif(GENERATOR_ERR_OUTPUT) +- message(FATAL_ERROR "Common-API generator error:${GENERATOR_ERR_OUTPUT}") ++ STRING(FIND "${GENERATOR_ERR_OUTPUT}" "VM warning" VM_WARNING_POS) ++ IF( ${VM_WARNING_POS} EQUAL -1) ++ message(FATAL_ERROR "Common-API generator error:${GENERATOR_ERR_OUTPUT}") ++ ENDIF() + endif() + SET(TEMP_GEN_DST ${PARAMS_DESTINATION}) + ENDIF() +diff --git a/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake b/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake +index 3db1f4a..3746cfc 100644 +--- a/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake ++++ b/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake +@@ -41,18 +41,18 @@ + + # find the proper libs ... + MACRO(LOAD_COMMONAPI_LIB) +- FIND_PACKAGE(CommonAPI REQUIRED) +- FIND_LIBRARY(CommonAPI_LIBRARY +- REQUIRED +- NAMES CommonAPI +- PATHS +- "/usr/local/lib" +- "/usr/lib" +- ) +- message(STATUS "CommonAPI Version: ${CommonAPI_VERSION}") +- string(REPLACE "." "" COMMONAPI_VERSION_NUMBER ${CommonAPI_VERSION}) +- SET(COMMONAPI_VERSION_NUMBER ${COMMONAPI_VERSION_NUMBER} CACHE INTERNAL "hide this!" FORCE) +- SET(CommonAPI_VERSION ${CommonAPI_VERSION} PARENT_SCOPE) ++ FIND_PACKAGE(CommonAPI REQUIRED) ++ FIND_LIBRARY(CommonAPI_LIBRARY ++ REQUIRED ++ NAMES CommonAPI ++ PATHS ++ "/usr/local/lib" ++ "/usr/lib" ++ ) ++ message(STATUS "CommonAPI Version: ${CommonAPI_VERSION}") ++ string(REPLACE "." "" COMMONAPI_VERSION_NUMBER ${CommonAPI_VERSION}) ++ SET(COMMONAPI_VERSION_NUMBER ${COMMONAPI_VERSION_NUMBER} CACHE INTERNAL "hide this!" FORCE) ++ SET(CommonAPI_VERSION ${CommonAPI_VERSION} PARENT_SCOPE) + ENDMACRO() + + MACRO(LOAD_COMMONAPI_DBUS_LIB) +@@ -110,9 +110,9 @@ + # load the proper libs ... + LOAD_COMMONAPI_LIB() + IF(${SELECTED_CAPI_BINDING} EQUAL 1) +- LOAD_COMMONAPI_SOMEIP_LIB() ++ LOAD_COMMONAPI_SOMEIP_LIB() + ELSE() +- LOAD_COMMONAPI_DBUS_LIB() ++ LOAD_COMMONAPI_DBUS_LIB() + ENDIF() + + ENDMACRO() +@@ -304,7 +304,7 @@ + ERROR_VARIABLE OUT_ERROR + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_STRIP_TRAILING_WHITESPACE) +- ++ + IF(OUT_ERROR) + # in case of error just try to find the sources in the alternative folder + SET(TEMP_GEN_DST ${PARAMS_ALT_DESTINATION}) +@@ -317,7 +317,7 @@ + # the generator binary is found + MESSAGE(STATUS "Will execute common-api generator at path ${OUT_RESULT} with fidls:") + FOREACH(FIDL ${FIDLS}) +- MESSAGE(STATUS "${FIDL}") ++ MESSAGE(STATUS "${FIDL}") + ENDFOREACH() + + function(mktmpdir OUTVAR) +@@ -333,25 +333,28 @@ + # execute the generate command ... + IF(${SHOULD_GENERATE_STUB_DEFAULT} EQUAL 1) + execute_process(COMMAND ${OUT_RESULT} -sk Default -d ${PARAMS_DESTINATION} ${FIDLS} +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE EXIT_CODE +- OUTPUT_VARIABLE GENERATOR_OUTPUT +- ERROR_VARIABLE GENERATOR_ERR_OUTPUT +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_STRIP_TRAILING_WHITESPACE) ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++ RESULT_VARIABLE EXIT_CODE ++ OUTPUT_VARIABLE GENERATOR_OUTPUT ++ ERROR_VARIABLE GENERATOR_ERR_OUTPUT ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ERROR_STRIP_TRAILING_WHITESPACE) + ELSE() +- execute_process(COMMAND ${OUT_RESULT} -d ${PARAMS_DESTINATION} ${FIDLS} +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE EXIT_CODE +- OUTPUT_VARIABLE GENERATOR_OUTPUT +- ERROR_VARIABLE GENERATOR_ERR_OUTPUT +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_STRIP_TRAILING_WHITESPACE) ++ execute_process(COMMAND ${OUT_RESULT} -d ${PARAMS_DESTINATION} ${FIDLS} ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++ RESULT_VARIABLE EXIT_CODE ++ OUTPUT_VARIABLE GENERATOR_OUTPUT ++ ERROR_VARIABLE GENERATOR_ERR_OUTPUT ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ERROR_STRIP_TRAILING_WHITESPACE) + ENDIF() + if(EXIT_CODE) + message(FATAL_ERROR "Failed to generate files from FIDL:${GENERATOR_OUTPUT}") + elseif(GENERATOR_ERR_OUTPUT) +- message(FATAL_ERROR "Common-API generator error:${GENERATOR_ERR_OUTPUT}") ++ STRING(FIND "${GENERATOR_ERR_OUTPUT}" "VM warning" VM_WARNING_POS) ++ IF( ${VM_WARNING_POS} EQUAL -1) ++ message(FATAL_ERROR "Common-API generator error:${GENERATOR_ERR_OUTPUT}") ++ ENDIF() + endif() + SET(TEMP_GEN_DST ${PARAMS_DESTINATION}) + ENDIF() +@@ -371,10 +374,10 @@ + # prepare an additional compatibilty flag for generators prior 3.x.x ... + IF(${COMMONAPI_VERSION_NUMBER} GREATER 300 OR ${COMMONAPI_VERSION_NUMBER} EQUAL 300) + # >= 3.x.x the stubs are generated by the binding generator +- SET(GENERATE_STUB 1) ++ SET(GENERATE_STUB 1) + ELSE() + # < 3.0.0 the stubs are generated by the genric generator +- SET(GENERATE_STUB 0) ++ SET(GENERATE_STUB 0) + ENDIF() + SET(${PARAMS_TARGET}_GEN_INCLUDE_DIR ${PARAMS_DESTINATION} PARENT_SCOPE) + diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/build-fixup.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/build-fixup.patch new file mode 100644 index 0000000..46620d4 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/build-fixup.patch @@ -0,0 +1,245 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa885e5..70313f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,7 +54,7 @@ IF(WITH_ROUTING_INTERFACE_CAPI) + ENDIF(WITH_ROUTING_INTERFACE_CAPI) + + IF(WITH_ROUTING_INTERFACE_DBUS) +- add_subdirectory(PluginRoutingInterfaceDbus) ++ add_subdirectory(PluginRoutingInterfaceDBus) + ENDIF(WITH_ROUTING_INTERFACE_DBUS) + + add_custom_target(plugins-install +diff --git a/PluginCommandInterfaceCAPI/cmake/FindAudioManager.cmake b/PluginCommandInterfaceCAPI/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginCommandInterfaceCAPI/cmake/FindAudioManager.cmake ++++ b/PluginCommandInterfaceCAPI/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h b/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h +index 74af7ae..a12e65f 100644 +--- a/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h ++++ b/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h +@@ -20,11 +20,11 @@ + + #include <memory> + #include "audiomanagertypes.h" +-#include <v1_0/org/genivi/am/audiomanagertypes/__Anonymous__.hpp> ++#include <v1/org/genivi/am/audiomanagertypes/__Anonymous__.hpp> + + using namespace am; + +-#define am_types v1_0::org::genivi::am::audiomanagertypes::__Anonymous__ ++#define am_types v1::org::genivi::am::audiomanagertypes::__Anonymous__ + + /** + * The following functions convert the basics AudiomManager types from/to CommonAPI types. +diff --git a/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h b/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h +index 70c1397..73bad65 100644 +--- a/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h ++++ b/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h +@@ -18,7 +18,7 @@ + #ifndef CAMCOMMANDSENDERSERVICE_H_ + #define CAMCOMMANDSENDERSERVICE_H_ + +-#include <v1_0/org/genivi/am/commandinterface/CommandControlStubDefault.hpp> ++#include <v1/org/genivi/am/commandinterface/CommandControlStubDefault.hpp> + #include "CAmCommandSenderCommon.h" + #include "IAmCommand.h" + +@@ -30,7 +30,7 @@ namespace am { + /** + * A concrete stub implementation used by the command sender plug-in. + */ +-class CAmCommandSenderService: public v1_0::org::genivi::am::commandinterface::CommandControlStubDefault { ++class CAmCommandSenderService: public v1::org::genivi::am::commandinterface::CommandControlStubDefault { + IAmCommandReceive* mpIAmCommandReceive; + public: + CAmCommandSenderService(); +diff --git a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.h b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.h +index 1479d85..1c72fac 100644 +--- a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.h ++++ b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.h +@@ -24,10 +24,10 @@ + #include "CAmTestCAPIWrapper.h" + #include "../include/CAmCommandSenderCAPI.h" + #include "MockIAmCommandReceive.h" +-#include <v1_0/org/genivi/am/commandinterface/CommandControlProxy.hpp> ++#include <v1/org/genivi/am/commandinterface/CommandControlProxy.hpp> + + #define UNIT_TEST 1 +-#define am_commandcontrol v1_0::org::genivi::am::commandinterface ++#define am_commandcontrol v1::org::genivi::am::commandinterface + + using namespace testing; + +diff --git a/PluginCommandInterfaceCAPI/test/MockNotificationsClient.h b/PluginCommandInterfaceCAPI/test/MockNotificationsClient.h +index ea9f904..d716a2b 100644 +--- a/PluginCommandInterfaceCAPI/test/MockNotificationsClient.h ++++ b/PluginCommandInterfaceCAPI/test/MockNotificationsClient.h +@@ -22,7 +22,7 @@ + #include "gtest/gtest.h" + #include "gmock/gmock.h" + #include "../include/CAmCommandSenderCommon.h" +-#include <v1_0/org/genivi/am/commandinterface/CommandControlProxy.hpp> ++#include <v1/org/genivi/am/commandinterface/CommandControlProxy.hpp> + + + namespace am { +diff --git a/PluginCommandInterfaceDbus/cmake/FindAudioManager.cmake b/PluginCommandInterfaceDbus/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginCommandInterfaceDbus/cmake/FindAudioManager.cmake ++++ b/PluginCommandInterfaceDbus/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginControlInterface/cmake/FindAudioManager.cmake b/PluginControlInterface/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginControlInterface/cmake/FindAudioManager.cmake ++++ b/PluginControlInterface/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginRoutingInterfaceAsync/cmake/FindAudioManager.cmake b/PluginRoutingInterfaceAsync/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginRoutingInterfaceAsync/cmake/FindAudioManager.cmake ++++ b/PluginRoutingInterfaceAsync/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginRoutingInterfaceCAPI/cmake/FindAudioManager.cmake b/PluginRoutingInterfaceCAPI/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginRoutingInterfaceCAPI/cmake/FindAudioManager.cmake ++++ b/PluginRoutingInterfaceCAPI/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginRoutingInterfaceCAPI/include/CAmLookupData.h b/PluginRoutingInterfaceCAPI/include/CAmLookupData.h +index 773271f..6c1cd8d 100644 +--- a/PluginRoutingInterfaceCAPI/include/CAmLookupData.h ++++ b/PluginRoutingInterfaceCAPI/include/CAmLookupData.h +@@ -25,7 +25,7 @@ + #include "audiomanagertypes.h" + #include "IAmRouting.h" + #include "CAmRoutingSenderCommon.h" +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlProxy.hpp> + + #ifdef UNIT_TEST + #include "../test/IAmRoutingSenderBackdoor.h" //we need this for the unit test +diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h +index c7399b6..faf6687 100644 +--- a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h ++++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h +@@ -20,12 +20,12 @@ + + #include <memory> + #include "audiomanagertypes.h" +-#include <v1_0/org/genivi/am/audiomanagertypes/__Anonymous__.hpp> ++#include <v1/org/genivi/am/audiomanagertypes/__Anonymous__.hpp> + + using namespace am; + +-#define am_types v1_0::org::genivi::am::audiomanagertypes::__Anonymous__ +-#define am_routing_interface v0_1::org::genivi::am::routinginterface ++#define am_types v1::org::genivi::am::audiomanagertypes::__Anonymous__ ++#define am_routing_interface v0::org::genivi::am::routinginterface + + /** + * Utility functions +diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h +index b545d8d..9a95111 100644 +--- a/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h ++++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h +@@ -19,7 +19,7 @@ + #define CAMROUTINGSERVICE_H_ + + +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlObserverStubDefault.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlObserverStubDefault.hpp> + #include "IAmRouting.h" + #include "CAmCommonAPIWrapper.h" + #include "CAmLookupData.h" +diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.h b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.h +index a3ea056..a000fe5 100644 +--- a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.h ++++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.h +@@ -29,8 +29,8 @@ + #include "../include/CAmRoutingSenderCommon.h" + #include "../include/CAmRoutingSenderCAPI.h" + #include "MockIAmRoutingReceive.h" +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlObserverProxy.hpp> +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlObserverProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlProxy.hpp> + + using namespace testing; + +diff --git a/PluginRoutingInterfaceCAPI/test/CAmTestRoutingSenderService.h b/PluginRoutingInterfaceCAPI/test/CAmTestRoutingSenderService.h +index ce4c27a..08e462d 100644 +--- a/PluginRoutingInterfaceCAPI/test/CAmTestRoutingSenderService.h ++++ b/PluginRoutingInterfaceCAPI/test/CAmTestRoutingSenderService.h +@@ -20,9 +20,9 @@ + + #include "audiomanagertypes.h" + #include "../include/CAmRoutingSenderCommon.h" +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlStubDefault.hpp> +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlObserverProxy.hpp> +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlStubDefault.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlObserverProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlProxy.hpp> + + + namespace am { +diff --git a/PluginRoutingInterfaceDBus/cmake/FindAudioManager.cmake b/PluginRoutingInterfaceDBus/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginRoutingInterfaceDBus/cmake/FindAudioManager.cmake ++++ b/PluginRoutingInterfaceDBus/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/cmake/FindAudioManager.cmake b/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100755 +--- a/cmake/FindAudioManager.cmake ++++ b/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb new file mode 100644 index 0000000..035fa6b --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "Genivi AudioManager Plugins" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "multimedia" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" + +DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native" + +SRCREV = "a0ed3b8f05147e9240d941655488d505057bbae7" +SRC_URI = " \ + git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \ + file://build-fixup.patch \ + " +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " -DWITH_TESTS=OFF \ + -DWITH_COMMAND_INTERFACE_COMMON_CAPI=ON -DWITH_COMMAND_INTERFACE_DBUS=ON \ + -DWITH_ROUTING_INTERFACE_CAPI=ON -DWITH_ROUTING_INTERFACE_DBUS=ON \ + -DWITH_ROUTING_INTERFACE_ASYNC=ON \ + " + +FILES_${PN} += " \ + ${libdir}/* \ + /usr/share/* \ + " + +do_install_append() { + mv ${D}${libdir}/audiomanager/* ${D}${libdir} + rmdir ${D}${libdir}/audiomanager +} diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb new file mode 100644 index 0000000..aa731d7 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb @@ -0,0 +1,55 @@ +SUMMARY = "Genivi AudioManager Plugins" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "multimedia" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" + +DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native" +RDEPENDS_${PN} += "libxml2" + +SRCREV = "8096eee2649585d13464b23e9ab940f0e030c56a" +SRC_URI = " \ + git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \ + file://AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch \ + " +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DWITH_COMMAND_INTERFACE_CAPI=ON -DWITH_COMMAND_INTERFACE_DBUS=ON \ + -DWITH_ROUTING_INTERFACE_CAPI=ON -DWITH_ROUTING_INTERFACE_DBUS=ON \ + -DWITH_ROUTING_INTERFACE_ASYNC=ON \ + -DWITH_GENERIC_CONTROLLER=ON \ + " + +do_configure_prepend() { + perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager/AudioManagerUtilities\)|' ${S}/CMakeLists.txt + perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager/AudioManagerCore\)|' ${S}/CMakeLists.txt + perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager\)|' ${S}/CMakeLists.txt + + perl -pi -e 's|set\(LIBRARY_OUTPUT_PATH \${DEFAULT_PLUGIN_ROUTING_DIR}\)|set\(LIBRARY_OUTPUT_PATH ${B}\)|' ${S}/PluginRouting*/CMakeLists.txt + perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake + perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake +} + +do_configure_append() { + perl -pi -e 's|/\* #undef LIBRARY_OUTPUT_PATH \*/|#define LIBRARY_OUTPUT_PATH "/usr/lib/command"|' ${S}/PluginCommandInterfaceDbus/include/configCommandDbus.h +} + +FILES_${PN} += " \ + ${libdir}/* \ + /usr/share/* \ + " + +FILES_${PN}-dev = " \ + /usr/include/ \ + ${libdir}/pkgconfig/ \ + " + +do_install_append() { + mv ${D}${libdir}/audiomanager/routing/* ${D}${libdir}/routing/ + rmdir ${D}${libdir}/audiomanager/routing + rmdir ${D}${libdir}/audiomanager +} diff --git a/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc new file mode 100644 index 0000000..0503b34 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc @@ -0,0 +1,56 @@ +PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages " +PACKAGESPLITFUNCS_append = " set_metapkg_rdepends " + +python split_gstreamer10_packages () { + gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}') + postinst = d.getVar('plugin_postinst', True) + glibdir = d.getVar('libdir', True) + + do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) + do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev')) +} + +python set_metapkg_rdepends () { + import os + + pn = d.getVar('PN', True) + metapkg = pn + '-meta' + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + d.setVar('FILES_' + metapkg, "") + blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ] + metapkg_rdepends = [] + packages = d.getVar('PACKAGES', True).split() + pkgdest = d.getVar('PKGDEST', True) + 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.count('locale') and not pkg.count('-staticdev'): + # See if the package is empty by looking at the contents of its PKGDEST subdirectory. + # If this subdirectory is empty, then the package is. + # Empty packages do not get added to the meta package's RDEPENDS + pkgdir = os.path.join(pkgdest, pkg) + if os.path.exists(pkgdir): + dir_contents = os.listdir(pkgdir) or [] + else: + dir_contents = [] + is_empty = len(dir_contents) == 0 + if not is_empty: + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') +} + +# metapkg has runtime dependency on PN +# each plugin depends on PN, plugin-dev on PN-dev, plugin-staticdev on PN-staticdev +# so we need them even when empty (like in gst-plugins-good case) +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-dev = "1" +ALLOW_EMPTY_${PN}-staticdev = "1" + +PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib" +FILES_${PN}-apps = "${bindir}" + +FILES_${PN} = "${datadir}/gstreamer-${LIBV}" +FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" +FILES_${PN}-glib = "${datadir}/glib-2.0" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb index 0903f12..41ebdb2 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +include recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc new file mode 100644 index 0000000..4028a67 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc @@ -0,0 +1,42 @@ +SUMMARY = "OpenMAX IL plugins for GStreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2.1" +LICENSE_FLAGS = "commercial" +HOMEPAGE = "http://www.gstreamer.net/" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base" +RDEPENDS_${PN} = "libomxil" + +inherit autotools pkgconfig gettext + +acpaths = "-I ${S}/common/m4 -I ${S}/m4" + +PR = "r1" + +GSTREAMER_1_0_OMX_TARGET ?= "bellagio" +GSTREAMER_1_0_OMX_CORE_NAME ?= "/usr/lib/libomxil-bellagio.so.0" + +EXTRA_OECONF += "--disable-valgrind --disable-introspection --with-omx-target=${GSTREAMER_1_0_OMX_TARGET}" + +python __anonymous () { + omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET", True) + if omx_target in ['generic', 'bellagio']: + srcdir = d.getVar("S", True) + # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# + # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); + # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this + d.appendVar("CFLAGS", " -I%s/omx/openmax" % srcdir) + elif omx_target == "rpi": + # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific + d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH", True)) +} + +set_omx_core_name() { + sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}/etc/xdg/gstomx.conf" +} +do_install[postfuncs] += " set_omx_core_name " + +FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb index e11dd27..38bd0a9 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc #remove patch from poky that is not necessary in version 1.2.3 SRC_URI_remove = "file://configure-allow-to-disable-libssh2.patch" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc new file mode 100644 index 0000000..b755698 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc @@ -0,0 +1,121 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ " + +DEPENDS += "gstreamer1.0-plugins-base bzip2" + +S = "${WORKDIR}/gst-plugins-bad-${PV}" + +inherit gettext bluetooth + + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ + orc curl uvch264 neon \ + hls sbc dash bz2 smoothstreaming \ + " +# dash = Dynamic Adaptive Streaming over HTTP +PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" +PACKAGECONFIG[eglgles] = "--enable-eglgles,--disable-eglgles,virtual/egl virtual/libgles2" +PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" +PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" +PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" +PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" +PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" +PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" +PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 udev" +PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" +PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" +PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" +PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls" +PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" +PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" +PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" +PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" +PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger" +PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" +PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}" +PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" + +# these plugins have not been ported to 1.0 (yet): +# directdraw vcd apexsink cdaudio dc1394 lv2 linsys musepack mythtv +# nas timidity teletextdec sdl sndfile xvid wininet acm gsettings +# sndio cdxaparse dccp faceoverlay hdvparse ivfparse jp2kdecimator +# linsys mve nuvdemux osx_video patchdetect quicktime real sdi stereo +# tta videomeasure videosignal vmnc + +EXTRA_OECONF += " \ + --enable-dvb \ + --enable-shm \ + --enable-mfc \ + --enable-fbdev \ + --enable-decklink \ + --disable-acm \ + --disable-android_media \ + --disable-apexsink \ + --disable-apple_media \ + --disable-avc \ + --disable-cdaudio \ + --disable-chromaprint \ + --disable-daala \ + --disable-dc1394 \ + --disable-direct3d \ + --disable-directdraw \ + --disable-directshow \ + --disable-directsound \ + --disable-dts \ + --disable-gme \ + --disable-gsettings \ + --disable-gsm \ + --disable-kate \ + --disable-ladspa \ + --disable-linsys \ + --disable-lv2 \ + --disable-mimic \ + --disable-mpeg2enc \ + --disable-mplex \ + --disable-musepack \ + --disable-mythtv \ + --disable-nas \ + --disable-ofa \ + --disable-openjpeg \ + --disable-opensles \ + --disable-osx_video \ + --disable-pvr \ + --disable-quicktime \ + --disable-resindvd \ + --disable-rtmp \ + --disable-sdl \ + --disable-sdltest \ + --disable-sndfile \ + --disable-sndio \ + --disable-soundtouch \ + --disable-spandsp \ + --disable-spc \ + --disable-srtp \ + --disable-teletextdec \ + --disable-timidity \ + --disable-vcd \ + --disable-vdpau \ + --disable-voaacenc \ + --disable-voamrwbenc \ + --disable-wasapi \ + --disable-webp \ + --disable-wildmidi \ + --disable-wininet \ + --disable-winscreencap \ + --disable-xvid \ + --disable-zbar \ + ${GSTREAMER_1_0_ORC} \ + --disable-introspection \ + " + +ARM_INSTRUCTION_SET = "arm" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb index aa7c448..8827900 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc new file mode 100644 index 0000000..993b51f --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc @@ -0,0 +1,40 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2+" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" +DEPENDS += "freetype liboil util-linux" + +inherit gettext + +PACKAGES_DYNAMIC =+ "^libgst.*" + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + orc ivorbis ogg theora vorbis \ + " + +X11DEPENDS = "virtual/libx11 libsm libxrender" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" +PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" + + +# cdparanoia and libvisual do not seem to exist anywhere in OE +EXTRA_OECONF += " \ + --disable-freetypetest \ + --disable-cdparanoia \ + --disable-libvisual \ + ${GSTREAMER_1_0_ORC} \ + --disable-introspection \ +" + +FILES_${PN} += "${datadir}/gst-plugins-base" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb index 4c01d28..8012c09 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc new file mode 100644 index 0000000..54c3af1 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc @@ -0,0 +1,56 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2.1+" + +# libid3tag +DEPENDS += "gstreamer1.0-plugins-base zlib bzip2" + +inherit gettext + + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \ + " + +X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" +PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" +PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" +PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" +PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng" +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4" +PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" +PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" +PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" +PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" + +# the 1394 plugins require both libraw1394 and libiec61883 +# the former is included in meta-oe, the latter isn't +# -> disabled + +EXTRA_OECONF += " \ + --enable-oss \ + --enable-gst_v4l2 \ + --without-libv4l2 \ + --disable-directsound \ + --disable-waveform \ + --disable-oss4 \ + --disable-sunaudio \ + --disable-osx_audio \ + --disable-osx_video \ + --disable-aalib \ + --disable-libcaca \ + --disable-libdv \ + --disable-shout2 \ + --disable-examples \ + --disable-dv1394 \ + ${GSTREAMER_1_0_ORC} \ +" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb index 0ac7721..04f59fb 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc new file mode 100644 index 0000000..529d6cc --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc @@ -0,0 +1,31 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" +LICENSE_FLAGS = "commercial" + +DEPENDS += "gstreamer1.0-plugins-base libid3tag" + +inherit gettext + + +PACKAGECONFIG ??= " \ + orc a52dec lame mad mpeg2dec \ + " + +PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" +PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" +PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" +PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" +PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" + + +EXTRA_OECONF += " \ + --disable-amrnb \ + --disable-amrwb \ + --disable-sidplay \ + --disable-twolame \ + ${GSTREAMER_1_0_ORC} \ + " + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc new file mode 100644 index 0000000..7451b84 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc @@ -0,0 +1,59 @@ +SUMMARY = "Plugins for the GStreamer multimedia framework 1.x" +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +DEPENDS = "gstreamer1.0" + +inherit autotools pkgconfig + +FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" + +GSTREAMER_1_0_DEBUG ?= "--disable-debug" +GSTREAMER_1_0_GIT_BRANCH ?= "master" +EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples " + +acpaths = "-I ${S}/common/m4 -I ${S}/m4" + +LIBV = "1.0" +require gst-plugins-package_1.2.3.inc + +PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" + +PACKAGES_DYNAMIC = "^${PN}-.*" + +# apply gstreamer hack after Makefile.in.in in source is replaced by our version from +# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed +# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html +oe_runconf_prepend() { + if [ -e ${S}/po/Makefile.in.in ]; then + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in + fi +} + +SRC_URI = "${@get_gst_srcuri(d)}" + +def get_gst_srcuri(d): + # check if expected prefix is present + prefix = "gstreamer1.0-" + bpn = d.getVar("BPN", True) + if not bpn.startswith(prefix): + bb.fatal('Invalid GStreamer 1.0 plugin package name "%s" : must start with "%s"' % (bpn, prefix)) + + # replaced prefix with "gst-", which is what is used for the tarball and repository filenames + gstpkg_basename = "gst-" + bpn[len(prefix):] + pv = d.getVar("PV", True) + branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True) + + if pv == "git": + s = "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch) + else: + s = "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv) + return s + +delete_liblink_m4_file() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm "${S}/m4/lib-link.m4" || true +} + +do_configure[prefuncs] += " delete_liblink_m4_file " + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb index caacc34..9a294aa 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0.inc +include recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc new file mode 100644 index 0000000..a349926 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc @@ -0,0 +1,28 @@ +SUMMARY = "GStreamer 1.0 multimedia framework" +DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ +It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2+" +DEPENDS = "glib-2.0 libxml2 bison-native flex-native" + +inherit autotools pkgconfig gettext + +GSTREAMER_1_DEBUG ?= "--disable-debug" +EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \ + --disable-dependency-tracking --disable-check \ + --disable-examples --disable-tests \ + --disable-valgrind ${GSTREAMER_1_DEBUG} \ + --disable-introspection \ + " + +RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" + +CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" + +FILES_${PN} += " ${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dev += " ${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a" +FILES_${PN}-dbg += " ${libdir}/gstreamer-1.0/.debug/ ${libexecdir}/gstreamer-1.0/.debug/" + diff --git a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service b/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service deleted file mode 100644 index 6c10d5c..0000000 --- a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=pulseaudio server -Requires=dbus.service -After=dbus.service - -[Service] -Type=simple -ExecStart=/usr/bin/pulseaudio --log-level=0 -Restart=always -RestartSec=5 -TimeoutSec=5 - -[Install] -WantedBy=multi-user.target
\ No newline at end of file diff --git a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_6.0.bbappend b/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_6.0.bbappend deleted file mode 100644 index f016c40..0000000 --- a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_6.0.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append = " file://pulseaudio.service" - -PR = "r1" - -inherit systemd - -SYSTEMD_PACKAGES = "${PN}-server" -SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service" - -RDEPENDS_pulseaudio-module-systemd-login =+ "systemd" -RDEPENDS_pulseaudio-server += "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-systemd-login', '', d)}" - -python __anonymous () { - ''' - If DISTRO_FEATURES include systemd use pulseaudio-module-systemd-login as a - replacer for pulseaudio-module-console-kit. - ''' - distro_features = d.getVar('DISTRO_FEATURES', True).split() - if 'systemd' in distro_features: - new_rdeps = [] - old_rdeps = d.getVar('RDEPENDS_pulseaudio-server', True).split() - for rdep in old_rdeps: - if rdep != 'pulseaudio-module-console-kit': - new_rdeps.append(rdep) - d.setVar('RDEPENDS_pulseaudio-server', ' '.join(new_rdeps)) -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/pulseaudio.service ${D}${systemd_unitdir}/system - fi -} diff --git a/meta-ivi/recipes-qt/qt4/qt4-embedded_%.bbappend b/meta-ivi/recipes-qt/qt4/qt4-embedded_%.bbappend deleted file mode 100644 index 162c6ab..0000000 --- a/meta-ivi/recipes-qt/qt4/qt4-embedded_%.bbappend +++ /dev/null @@ -1,22 +0,0 @@ -OTHER_PACKAGES_ivi = "\ - ${QT_BASE_NAME}-tools \ - ${QT_BASE_NAME}-assistant \ - ${QT_BASE_NAME}-common \ - ${QT_BASE_NAME}-dbus \ - ${QT_BASE_NAME}-designer \ - ${QT_BASE_NAME}-fonts \ - ${QT_BASE_NAME}-fonts-ttf-vera \ - ${QT_BASE_NAME}-fonts-ttf-dejavu \ - ${QT_BASE_NAME}-fonts-pfa \ - ${QT_BASE_NAME}-fonts-pfb \ - ${QT_BASE_NAME}-fonts-qpf \ - ${QT_BASE_NAME}-linguist \ - ${QT_BASE_NAME}-makeqpf \ - ${QT_BASE_NAME}-mkspecs \ - ${QT_BASE_NAME}-pixeltool \ - ${QT_BASE_NAME}-qmlviewer \ - ${QT_BASE_NAME}-xmlpatterns \ - ${QT_BASE_NAME}-qt3to4 \ - ${QT_BASE_NAME}-qml-plugins" - -RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES_ivi}" diff --git a/meta-ivi/recipes-support-ivi/keyutils/keyutils/0001-Include-limits.h-for-UINT_MAX.patch b/meta-ivi/recipes-support-ivi/keyutils/keyutils/0001-Include-limits.h-for-UINT_MAX.patch new file mode 100644 index 0000000..a60af43 --- /dev/null +++ b/meta-ivi/recipes-support-ivi/keyutils/keyutils/0001-Include-limits.h-for-UINT_MAX.patch @@ -0,0 +1,28 @@ +From ab818a7f5818177a3da09fce6aa064ef648da372 Mon Sep 17 00:00:00 2001 +From: Felix Janda <felix.janda@posteo.de> +Date: Sat, 4 Apr 2015 00:13:21 +0200 +Subject: [PATCH] Include <limits.h> for UINT_MAX + +Fixes building with musl libc. + +Signed-off-by: Felix Janda <felix.janda@posteo.de> +Signed-off-by: David Howells <dhowells@redhat.com> +--- + key.dns_resolver.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/key.dns_resolver.c b/key.dns_resolver.c +index c2a9fe5..9c9d458 100644 +--- a/key.dns_resolver.c ++++ b/key.dns_resolver.c +@@ -42,6 +42,7 @@ + #include <netinet/in.h> + #include <arpa/nameser.h> + #include <arpa/inet.h> ++#include <limits.h> + #include <resolv.h> + #include <getopt.h> + #include <sys/types.h> +-- +1.9.1 + diff --git a/meta-ivi/recipes-support-ivi/keyutils/keyutils_1.5.9.bb b/meta-ivi/recipes-support-ivi/keyutils/keyutils_1.5.9.bb index 0c2013a..7c02d96 100644 --- a/meta-ivi/recipes-support-ivi/keyutils/keyutils_1.5.9.bb +++ b/meta-ivi/recipes-support-ivi/keyutils/keyutils_1.5.9.bb @@ -13,6 +13,7 @@ SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=git \ file://0001-keyutils-Use-libdir-from-the-Yocto-environment.patch \ + file://0001-Include-limits.h-for-UINT_MAX.patch \ " S = "${WORKDIR}/git" diff --git a/meta-ivi/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/meta-ivi/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch new file mode 100644 index 0000000..aff1cb1 --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch @@ -0,0 +1,41 @@ +Upstream-Status: Inappropriate [configuration] + +From 1921498bcc06408e8b051a3a9e9ce4182998f748 Mon Sep 17 00:00:00 2001 +From: David Schleef <ds@schleef.org> +Date: Fri, 8 Apr 2011 10:05:49 -0700 +Subject: [PATCH 10/10] Fix --enable-vfp flag + +Patch from Christophe Lyon, fixes #36084. +--- + configure.ac | 4 ++-- + liboil/arm/Makefile.am | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 98c81fb..407d88c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,8 +188,8 @@ fi + AC_ARG_ENABLE(vfp, + AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]), + enable_vfp=$enableval,enable_vfp=yes) +-if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then +- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], ++if test "x$enable_vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then ++ AS_COMPILER_FLAG(["-mfpu=vfp"], + [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"], + true) + #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], +diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am +index ead08ed..cd8d9fa 100644 +--- a/liboil/arm/Makefile.am ++++ b/liboil/arm/Makefile.am +@@ -6,4 +6,5 @@ libarm_la_SOURCES = \ + math_vfp_asm.S + + libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) ++libarm_la_CCASFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) + +-- +1.7.6 + diff --git a/meta-ivi/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/meta-ivi/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch new file mode 100644 index 0000000..c8e3c1f --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch @@ -0,0 +1,19 @@ +Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=31358 + +configure: fix whitelisting of x86_64 unaligned memory access + +Fix typo in whitelist so cross-compile works for x86_64. + +Upstream-Status: Inappropriate [configuration] + +--- liboil-0.3.17/m4/as-unaligned-access.m4.orig 2009-02-26 14:40:08.000000000 -0500 ++++ liboil-0.3.17/m4/as-unaligned-access.m4 2010-11-03 12:19:55.000000000 -0400 +@@ -9,7 +9,7 @@ + _AS_ECHO_N([(blacklisted) ]) + as_cv_unaligned_access=no + ;; +- i?86*|x86_64|amd64|powerpc*|m68k*|cris*) ++ i?86*|x86_64*|amd64*|powerpc*|m68k*|cris*) + _AS_ECHO_N([(whitelisted) ]) + as_cv_unaligned_access=yes + ;; diff --git a/meta-ivi/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch b/meta-ivi/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch new file mode 100644 index 0000000..473380e --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch @@ -0,0 +1,222 @@ +Upstream-Status: Pending + +Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors. + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2011/12/01 + + +Index: liboil-0.3.17/liboil/amd64/wavelet.c +=================================================================== +--- liboil-0.3.17.orig/liboil/amd64/wavelet.c ++++ liboil-0.3.17/liboil/amd64/wavelet.c +@@ -21,14 +21,14 @@ deinterleave2_asm (int16_t *d1, int16_t + asm volatile ("\n" + " sub $2, %%rcx\n" + "1:\n" +- " movw (%1,%%rcx,4), %%ax\n" +- " movw %%ax, (%0,%%rcx,2)\n" +- " movw 2(%1,%%rcx,4), %%ax\n" +- " movw %%ax, (%2,%%rcx,2)\n" +- " movw 4(%1,%%rcx,4), %%ax\n" +- " movw %%ax, 2(%0,%%rcx,2)\n" +- " movw 6(%1,%%rcx,4), %%ax\n" +- " movw %%ax, 2(%2,%%rcx,2)\n" ++ " movw (%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, (%q0,%%rcx,2)\n" ++ " movw 2(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, (%q2,%%rcx,2)\n" ++ " movw 4(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, 2(%q0,%%rcx,2)\n" ++ " movw 6(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, 2(%q2,%%rcx,2)\n" + " sub $2, %%rcx\n" + " jge 1b\n" + : "+r" (d1), "+r" (s_2xn), "+r" (d2), "+c" (n) +@@ -53,20 +53,20 @@ deinterleave2_mmx (int16_t *d1, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm0\n" +- " movq 8(%1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm0\n" ++ " movq 8(%q1,%%rcx,4), %%mm1\n" + " pslld $16, %%mm0\n" + " pslld $16, %%mm1\n" + " psrad $16, %%mm0\n" + " psrad $16, %%mm1\n" + " packssdw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" +- " movq (%1,%%rcx,4), %%mm0\n" +- " movq 8(%1,%%rcx,4), %%mm1\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" ++ " movq (%q1,%%rcx,4), %%mm0\n" ++ " movq 8(%q1,%%rcx,4), %%mm1\n" + " psrad $16, %%mm0\n" + " psrad $16, %%mm1\n" + " packssdw %%mm1, %%mm0\n" +- " movq %%mm0, (%2,%%rcx,2)\n" ++ " movq %%mm0, (%q2,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -93,10 +93,10 @@ deinterleave2_mmx_2 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " pshufw $0xd8, (%1,%%rcx,4), %%mm0\n" +- " movd %%mm0, (%0,%%rcx,2)\n" +- " pshufw $0x8d, (%1,%%rcx,4), %%mm0\n" +- " movd %%mm0, (%2,%%rcx,2)\n" ++ " pshufw $0xd8, (%q1,%%rcx,4), %%mm0\n" ++ " movd %%mm0, (%q0,%%rcx,2)\n" ++ " pshufw $0x8d, (%q1,%%rcx,4), %%mm0\n" ++ " movd %%mm0, (%q2,%%rcx,2)\n" + " add $2, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -123,16 +123,16 @@ deinterleave2_mmx_3 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm1\n" +- " movq (%1,%%rcx,4), %%mm2\n" +- " movq 8(%1,%%rcx,4), %%mm0\n" ++ " movq (%q1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm2\n" ++ " movq 8(%q1,%%rcx,4), %%mm0\n" + " punpcklwd %%mm0, %%mm1\n" + " punpckhwd %%mm0, %%mm2\n" + " movq %%mm1, %%mm0\n" + " punpcklwd %%mm2, %%mm0\n" + " punpckhwd %%mm2, %%mm1\n" +- " movq %%mm0, (%0,%%rcx,2)\n" +- " movq %%mm1, (%2,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" ++ " movq %%mm1, (%q2,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -159,26 +159,26 @@ deinterleave2_mmx_4 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm1\n" + " movq %%mm1, %%mm2\n" +- " movq 8(%1,%%rcx,4), %%mm0\n" +- " movq 16(%1,%%rcx,4), %%mm5\n" ++ " movq 8(%q1,%%rcx,4), %%mm0\n" ++ " movq 16(%q1,%%rcx,4), %%mm5\n" + " punpcklwd %%mm0, %%mm1\n" + " movq %%mm5, %%mm6\n" + " punpckhwd %%mm0, %%mm2\n" +- " movq 24(%1,%%rcx,4), %%mm4\n" ++ " movq 24(%q1,%%rcx,4), %%mm4\n" + " movq %%mm1, %%mm0\n" + " punpcklwd %%mm4, %%mm5\n" + " punpcklwd %%mm2, %%mm0\n" + " punpckhwd %%mm4, %%mm6\n" + " punpckhwd %%mm2, %%mm1\n" + " movq %%mm5, %%mm4\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " punpcklwd %%mm6, %%mm4\n" +- " movq %%mm1, (%2,%%rcx,2)\n" ++ " movq %%mm1, (%q2,%%rcx,2)\n" + " punpckhwd %%mm6, %%mm5\n" +- " movq %%mm4, 8(%0,%%rcx,2)\n" +- " movq %%mm5, 8(%2,%%rcx,2)\n" ++ " movq %%mm4, 8(%q0,%%rcx,2)\n" ++ " movq %%mm5, 8(%q2,%%rcx,2)\n" + " add $8, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -252,13 +252,13 @@ interleave2_mmx (int16_t *d_2xn, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,2), %%mm0\n" +- " movq (%2,%%rcx,2), %%mm1\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" + " movq %%mm0, %%mm2\n" + " punpckhwd %%mm1, %%mm0\n" + " punpcklwd %%mm1, %%mm2\n" +- " movq %%mm2, (%0,%%rcx,4)\n" +- " movq %%mm0, 8(%0,%%rcx,4)\n" ++ " movq %%mm2, (%q0,%%rcx,4)\n" ++ " movq %%mm0, 8(%q0,%%rcx,4)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -285,12 +285,12 @@ lift_add_shift1_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" + " paddw %%mm2, %%mm1\n" + " psraw $1, %%mm1\n" +- " paddw (%1,%%rcx,2), %%mm1\n" +- " movq %%mm1, (%0,%%rcx,2)\n" ++ " paddw (%q1,%%rcx,2), %%mm1\n" ++ " movq %%mm1, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -317,13 +317,13 @@ lift_sub_shift1_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" +- " movq (%1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" + " paddw %%mm2, %%mm1\n" + " psraw $1, %%mm1\n" + " psubw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -350,12 +350,12 @@ lift_add_shift2_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" + " paddw %%mm2, %%mm1\n" + " psraw $2, %%mm1\n" +- " paddw (%1,%%rcx,2), %%mm1\n" +- " movq %%mm1, (%0,%%rcx,2)\n" ++ " paddw (%q1,%%rcx,2), %%mm1\n" ++ " movq %%mm1, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -382,13 +382,13 @@ lift_sub_shift2_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" +- " movq (%1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" + " paddw %%mm2, %%mm1\n" + " psraw $2, %%mm1\n" + " psubw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" diff --git a/meta-ivi/recipes-support/liboil/liboil-0.3.17/no-tests.patch b/meta-ivi/recipes-support/liboil/liboil-0.3.17/no-tests.patch new file mode 100644 index 0000000..892d441 --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil-0.3.17/no-tests.patch @@ -0,0 +1,24 @@ +Upstream-Status: Inappropriate [disable feature] + +--- liboil-0.3.9/liboil/liboilfunction.c.old 2006-09-18 13:03:20.000000000 +0100 ++++ liboil-0.3.9/liboil/liboilfunction.c 2006-09-18 13:04:10.000000000 +0100 +@@ -345,7 +345,9 @@ + return; + } + +- test = oil_test_new (klass); ++ klass->chosen_impl = klass->reference_impl; ++ klass->func = klass->reference_impl->func; ++/* test = oil_test_new (klass); + if (test == NULL) { + OIL_ERROR ("failed to test function class %s", klass->name); + return; +@@ -385,7 +387,7 @@ + klass->chosen_impl = min_impl; + klass->func = min_impl->func; + +- oil_test_free (test); ++ oil_test_free (test);*/ + } + + static void diff --git a/meta-ivi/recipes-support/liboil/liboil_0.3.17.bb b/meta-ivi/recipes-support/liboil/liboil_0.3.17.bb new file mode 100644 index 0000000..03b7785 --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil_0.3.17.bb @@ -0,0 +1,27 @@ +SUMMARY = "Library of simple functions optimized for various CPUs" +HOMEPAGE = "http://liboil.freedesktop.org/" +BUGTRACKER = "https://bugs.freedesktop.org/" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \ + file://liboil/liboil.h;endline=28;md5=95c794a66b88800d949fed17e437d9fb \ + file://liboil/liboilcpu.c;endline=28;md5=89da69a61d88eedcba066f42353fb75a \ + file://examples/example1.c;endline=29;md5=9d4dad9fcbbdf0441ee063f8af5170c9 \ + file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d" + +DEPENDS = "glib-2.0" +PR = "r5" + +SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \ + file://no-tests.patch \ + file://fix-unaligned-whitelist.patch \ + file://0001-Fix-enable-vfp-flag.patch \ + file://liboil_fix_for_x32.patch \ + " + +SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701" +SRC_URI[sha256sum] = "105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" diff --git a/meta-ivi/recipes-yocto-ivi/images/ivi-image.bb b/meta-ivi/recipes-yocto-ivi/images/ivi-image.bb index ee88640..9628e0a 100644 --- a/meta-ivi/recipes-yocto-ivi/images/ivi-image.bb +++ b/meta-ivi/recipes-yocto-ivi/images/ivi-image.bb @@ -1,7 +1,7 @@ # Base this image on generic IVI image require recipes-yocto-ivi/images/ivi-image.inc -PV = "10.0.0" +PV ?= "snapshot+${DATE}" IMAGE_INSTALL_append = " \ packagegroup-abstract-component-p1 \ diff --git a/meta-ivi/recipes-yocto-ivi/images/ivi-image.inc b/meta-ivi/recipes-yocto-ivi/images/ivi-image.inc index 7e2c17b..195b505 100644 --- a/meta-ivi/recipes-yocto-ivi/images/ivi-image.inc +++ b/meta-ivi/recipes-yocto-ivi/images/ivi-image.inc @@ -22,4 +22,4 @@ BUILDHISTORY_COMMIT = "1" inherit extrausers ROOTPASSWORD = "root" ROOTUSERNAME = "root" -EXTRA_USERS_PARAMS = "usermod -P ${ROOTPASSWORD} ${ROOTUSERNAME};" +EXTRA_USERS_PARAMS ?= "usermod -P ${ROOTPASSWORD} ${ROOTUSERNAME};" diff --git a/meta-ivi/recipes-yocto-ivi/images/leviathan-image.bb b/meta-ivi/recipes-yocto-ivi/images/miranda-image.bb index da973a7..ac81d2a 100644 --- a/meta-ivi/recipes-yocto-ivi/images/leviathan-image.bb +++ b/meta-ivi/recipes-yocto-ivi/images/miranda-image.bb @@ -1,5 +1,5 @@ # Base this image on generic IVI image require recipes-yocto-ivi/images/ivi-image.bb -PV = "10.0.0" +PV = "11.0.0" diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p2.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p2.bb index 1b79dd7..64811b9 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p2.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-abstract-component-p2.bb @@ -16,4 +16,5 @@ RDEPENDS_${PN} += "\ node-health-monitor \ persistence-client-library \ persistence-administrator \ + audiomanagerplugins \ " diff --git a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p2.bb b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p2.bb index 0247e78..8c17b99 100644 --- a/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p2.bb +++ b/meta-ivi/recipes-yocto-ivi/packagegroups/packagegroup-specific-component-p2.bb @@ -13,6 +13,8 @@ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ common-api-c++-dbus \ + common-api-c++-someip \ + vsomeip \ fuse \ pulseaudio-server \ quota \ |