diff options
Diffstat (limited to 'meta-rcar-gen2')
6 files changed, 25 insertions, 14 deletions
diff --git a/meta-rcar-gen2/conf/machine/include/r8a7791.inc b/meta-rcar-gen2/conf/machine/include/r8a7791.inc index f77c74a..d831024 100644 --- a/meta-rcar-gen2/conf/machine/include/r8a7791.inc +++ b/meta-rcar-gen2/conf/machine/include/r8a7791.inc @@ -2,7 +2,6 @@ SOC_FAMILY = "rcar-gen2:r8a7791" require conf/machine/include/soc-family.inc DEFAULTTUNE ?= "cortexa15hf-neon" require conf/machine/include/tune-cortexa15.inc -require ../../../include/multimedia-control.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-renesas" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" @@ -11,12 +10,3 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot" KERNEL_IMAGETYPE ?= "uImage" EXTRA_IMAGEDEPENDS += "u-boot" - -# multimedia acceleration uses Gst version 1.2.x, otherwise meta-ivi currently uses 1.4.x -PREFERRED_VERSION_gstreamer1.0 = "${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}" -PREFERRED_VERSION_gstreamer1.0-omx = "${@base_conditional("USE_MULTIMEDIA", "1", "1.0.%", "1.2.%", d )}" -PREFERRED_VERSION_gstreamer1.0-plugins-bad = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -PREFERRED_VERSION_gstreamer1.0-plugins-base = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -PREFERRED_VERSION_gstreamer1.0-plugins-good = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -PREFERRED_VERSION_gstreamer1.0-plugins-ugly = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -PREFERRED_VERSION_gstreamer1.0-libav = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' diff --git a/meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc b/meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc index 6ce0204..89eba92 100644 --- a/meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc +++ b/meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc @@ -1,3 +1,14 @@ # From Intrepid the Genivi Yocto baseline meta-ivi adopted 3.14 as the default kernel for QEMU. # Override that to avoid a long list of build messages stating it is switching from 3.14 to 3.10. PREFERRED_VERSION_linux-yocto ?= "3.10%" + +# multimedia acceleration uses Gst version 1.2.x, otherwise meta-ivi currently uses 1.4.x +require ../../../include/multimedia-control.inc + +PREFERRED_VERSION_gstreamer1.0 = "${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}" +PREFERRED_VERSION_gstreamer1.0-omx = "${@base_conditional("USE_MULTIMEDIA", "1", "1.0.%", "1.2.%", d )}" +PREFERRED_VERSION_gstreamer1.0-plugins-bad = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' +PREFERRED_VERSION_gstreamer1.0-plugins-base = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' +PREFERRED_VERSION_gstreamer1.0-plugins-good = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' +PREFERRED_VERSION_gstreamer1.0-plugins-ugly = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' +PREFERRED_VERSION_gstreamer1.0-libav = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' diff --git a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc index 169c5f6..bea1510 100644 --- a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc +++ b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc @@ -8,7 +8,7 @@ IMAGE_INSTALL_append_rcar-gen2 = " \ bash \ " -IMAGE_INSTALL_append_rcar-gen2 = " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_conditional("USE_MULTIMEDIA", "1", " \ gstreamer1.0-plugins-base-videorate \ gstreamer1.0-plugins-base-videotestsrc \ gstreamer1.0-plugins-base-audiotestsrc \ @@ -21,7 +21,7 @@ IMAGE_INSTALL_append_rcar-gen2 = " \ gstreamer1.0-plugins-bad-fbdevsink \ gstreamer1.0-plugins-bad-faad \ gstreamer1.0-plugins-bad-videoparsersbad \ -" + ", "", d)}' IMAGE_INSTALL_append_rcar-gen2 = '${@base_conditional("USE_GLES", "1", \ "gles-kernel-module gles-user-module", "", d)}' diff --git a/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc b/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc index 782752c..8c1342a 100644 --- a/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc +++ b/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc @@ -1,8 +1,10 @@ include core-image-renesas-base.inc IMAGE_INSTALL_append_rcar-gen2 = '${@base_conditional("USE_GLES", "1", \ - " libegl libegl-dev libgbm-dev", "", d)} \ - gstreamer1.0-plugins-bad-waylandsink' + " libegl libegl-dev libgbm-dev", "", d)}' + +IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_conditional("USE_MULTIMEDIA", "1", \ + " gstreamer1.0-plugins-bad-waylandsink", "", d)}' # pkg groups for oss codecs IMAGE_INSTALL_append_silk = ' ${@base_conditional("USE_MULTIMEDIA", "1", " \ diff --git a/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend b/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend new file mode 100644 index 0000000..5c4ad5d --- /dev/null +++ b/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend @@ -0,0 +1,2 @@ +# Add R-Car gfx and multimedia packages to the image when enabled +include core-image-weston.inc diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend index a881d76..8262f16 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend @@ -7,6 +7,10 @@ SRCREV_rcar-gen2 = "${@'eda7155f94981ace11b866fc02daca6ad4869221' \ LIC_FILES_CHKSUM_remove_rcar-gen2 = "\ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" +SRC_URI += " \ + file://0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch \ + file://configure-allow-to-disable-libssh2.patch" + S = "${WORKDIR}/git" do_configure_prepend() { @@ -18,6 +22,8 @@ do_configure_prepend() { # for wayland PACKAGECONFIG_remove_rcar-gen2 = "${@'orc' if '1' in '${USE_GLES_WAYLAND}' else ''}" PACKAGECONFIG_append_rcar-gen2 = " faad ${@base_contains('USE_GLES_WAYLAND', '1', 'wayland', '', d)}" +DEPENDS += "wayland-kms" +RDEPENDS_${PN} = "libwayland-egl" # for lcb DEPENDS_append_silk = " ${@base_conditional('USE_MULTIMEDIA', '1', 'faac', '', d)}" |