diff options
| author |   Stephen Lawrence <stephen.lawrence@renesas.com> | 2015-06-09 16:54:13 +0100 |
|---|---|---|
| committer | Stephen Lawrence <stephen.lawrence@renesas.com> | 2015-06-19 22:07:28 +0100 |
| commit | d3eafa63999cc90351e0831c6178947c6d881fb1 (patch) | |
| tree | e62afff6c7c5235043d796ec30212dbe254bc132 | |
| parent | 6e829fe6e422793bbb05ec563c8544154c0e9bd8 (diff) | |
r-car m2: set PREFERRED_VERSION_gstreamer1.0* to 1.2.% when h/w acceleration enabled
The R-Car M2 multimedia acceleration provides acceleration support for GStreamer 1.2.3,
so set the preferred version to 1.2.%. Required for meta-ivi which supports both 1.2.3
and 1.4.x but defaults to 1.4.x.
Both M2 Koelsch and M2 Porter boards are supported, so generalise the previous
Kolesch only setting to all M2 boards. Also make the setting dependent on h/w
acceleration being enabled, else use 1.4.x. This solves a build issue when the
s/w rendered 1.2.x was built when h/w acceleration was not enabled.
| -rw-r--r-- | meta-rcar-gen2/conf/machine/include/r8a7791.inc | 9 | ||||
| -rw-r--r-- | meta-rcar-gen2/conf/machine/koelsch.conf | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/meta-rcar-gen2/conf/machine/include/r8a7791.inc b/meta-rcar-gen2/conf/machine/include/r8a7791.inc index d831024..4f91462 100644 --- a/meta-rcar-gen2/conf/machine/include/r8a7791.inc +++ b/meta-rcar-gen2/conf/machine/include/r8a7791.inc @@ -2,6 +2,7 @@ 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" @@ -10,3 +11,11 @@ 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-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/koelsch.conf b/meta-rcar-gen2/conf/machine/koelsch.conf index 5622777..00431f2 100644 --- a/meta-rcar-gen2/conf/machine/koelsch.conf +++ b/meta-rcar-gen2/conf/machine/koelsch.conf @@ -25,12 +25,4 @@ PREFERRED_VERSION_nativesdk-linux-libc-headers = "3.10%" PREFERRED_VERSION_u-boot = "v2013.01%" PREFERRED_VERSION_libdrm = "2.4.45%" -# koelsch multimedia acceleration uses Gst version 1.2.x -PREFERRED_VERSION_gstreamer1.0 = "1.2.%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.2.%" -PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.2.%" -PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.2.%" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.2.%" -PREFERRED_VERSION_gstreamer1.0-libav = "1.2.%" - MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa ethernet" |