diff options
-rw-r--r-- | classes/use-imx-headers.bbclass | 19 | ||||
-rw-r--r-- | recipes-bsp/imx-lib/imx-lib_git.bb | 7 | ||||
-rw-r--r-- | recipes-bsp/imx-test/imx-test_git.bb | 11 | ||||
-rw-r--r-- | recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb | 5 | ||||
-rw-r--r-- | recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb | 7 | ||||
-rw-r--r-- | recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb | 7 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb | 6 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb | 6 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.2.bb | 6 |
9 files changed, 42 insertions, 32 deletions
diff --git a/classes/use-imx-headers.bbclass b/classes/use-imx-headers.bbclass new file mode 100644 index 00000000..9dcd864d --- /dev/null +++ b/classes/use-imx-headers.bbclass | |||
@@ -0,0 +1,19 @@ | |||
1 | # Easy use of linux-imx-headers by packages | ||
2 | # | ||
3 | # This allow to easy reuse of binary packages among similar SoCs. The | ||
4 | # usual use for this is to share SoC specific packages among different | ||
5 | # boards independently of the kernel version it is using, as far it is | ||
6 | # ABI compatible with the official version it will just work. | ||
7 | # | ||
8 | # All recipes using this class ought to depend on linux-imx-headers | ||
9 | # and by default to use MACHINE_SOCARCH. | ||
10 | # | ||
11 | # Please use the STAGING_INCDIR_IMX variable to refer to the installed | ||
12 | # headers. | ||
13 | # | ||
14 | # Copyright 2018 (C) O.S. Systems Software LTDA. | ||
15 | |||
16 | DEPENDS_append_imx = " linux-imx-headers" | ||
17 | PACKAGE_ARCH_imx ?= "${MACHINE_SOCARCH}" | ||
18 | |||
19 | STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx" | ||
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index d9258a1c..d94b2daa 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb | |||
@@ -6,8 +6,6 @@ DESCRIPTION = "Platform specific libraries for imx platform" | |||
6 | LICENSE = "LGPLv2.1" | 6 | LICENSE = "LGPLv2.1" |
7 | SECTION = "multimedia" | 7 | SECTION = "multimedia" |
8 | 8 | ||
9 | DEPENDS = "linux-imx-headers" | ||
10 | |||
11 | LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" | 9 | LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" |
12 | 10 | ||
13 | PE = "1" | 11 | PE = "1" |
@@ -20,6 +18,8 @@ SRCREV = "3f777974c0c146817e2ff5cb0340ca66a1f99e57" | |||
20 | 18 | ||
21 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
22 | 20 | ||
21 | inherit use-imx-headers | ||
22 | |||
23 | PLATFORM_mx6q = "IMX6Q" | 23 | PLATFORM_mx6q = "IMX6Q" |
24 | PLATFORM_mx6dl = "IMX6Q" | 24 | PLATFORM_mx6dl = "IMX6Q" |
25 | PLATFORM_mx6sl = "IMX6S" | 25 | PLATFORM_mx6sl = "IMX6S" |
@@ -33,7 +33,7 @@ PARALLEL_MAKE="-j 1" | |||
33 | EXTRA_OEMAKE = "" | 33 | EXTRA_OEMAKE = "" |
34 | 34 | ||
35 | do_compile () { | 35 | do_compile () { |
36 | INCLUDE_DIR="-I${STAGING_INCDIR}/imx" | 36 | INCLUDE_DIR="-I${STAGING_INCDIR_IMX}" |
37 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all | 37 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all |
38 | } | 38 | } |
39 | 39 | ||
@@ -42,4 +42,3 @@ do_install () { | |||
42 | } | 42 | } |
43 | 43 | ||
44 | COMPATIBLE_MACHINE = "(mx6|mx7)" | 44 | COMPATIBLE_MACHINE = "(mx6|mx7)" |
45 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index 729e2670..fae459ca 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb | |||
@@ -8,7 +8,7 @@ SECTION = "base" | |||
8 | LICENSE = "GPLv2" | 8 | LICENSE = "GPLv2" |
9 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | 9 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" |
10 | 10 | ||
11 | DEPENDS = "linux-imx-headers alsa-lib libdrm" | 11 | DEPENDS = "alsa-lib libdrm" |
12 | DEPENDS_append_mx6 = " imx-lib" | 12 | DEPENDS_append_mx6 = " imx-lib" |
13 | DEPENDS_append_mx7 = " imx-lib" | 13 | DEPENDS_append_mx7 = " imx-lib" |
14 | 14 | ||
@@ -24,7 +24,7 @@ SRC_URI = " \ | |||
24 | SRCREV = "3a87347ae408ef0234314a279ee74d9b015f06be" | 24 | SRCREV = "3a87347ae408ef0234314a279ee74d9b015f06be" |
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | 26 | ||
27 | inherit module-base | 27 | inherit module-base use-imx-headers |
28 | 28 | ||
29 | INHIBIT_PACKAGE_STRIP = "1" | 29 | INHIBIT_PACKAGE_STRIP = "1" |
30 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | 30 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |
@@ -55,9 +55,9 @@ do_compile() { | |||
55 | CFLAGS="${TOOLCHAIN_OPTIONS}" | 55 | CFLAGS="${TOOLCHAIN_OPTIONS}" |
56 | oe_runmake V=1 VERBOSE='' \ | 56 | oe_runmake V=1 VERBOSE='' \ |
57 | CROSS_COMPILE=${TARGET_PREFIX} \ | 57 | CROSS_COMPILE=${TARGET_PREFIX} \ |
58 | INC="-I${STAGING_INCDIR} \ | 58 | INC="-I${S}/include \ |
59 | -I${S}/include \ | 59 | -I${STAGING_INCDIR} \ |
60 | -I${STAGING_INCDIR}/imx" \ | 60 | -I${STAGING_INCDIR_IMX}" \ |
61 | CC="${CC} -L${STAGING_LIBDIR} ${LDFLAGS}" \ | 61 | CC="${CC} -L${STAGING_LIBDIR} ${LDFLAGS}" \ |
62 | SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ | 62 | SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ |
63 | LINUXPATH=${STAGING_KERNEL_DIR} \ | 63 | LINUXPATH=${STAGING_KERNEL_DIR} \ |
@@ -82,5 +82,4 @@ RDEPENDS_${PN} = "bash" | |||
82 | 82 | ||
83 | FILES_${PN}-dbg += "/unit_tests/.debug" | 83 | FILES_${PN}-dbg += "/unit_tests/.debug" |
84 | 84 | ||
85 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
86 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" | 85 | COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" |
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb index 25ef41ed..c49f90db 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.8.0.bb | |||
@@ -4,8 +4,6 @@ DESCRIPTION = "i.MX Hantro VPU library" | |||
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db" |
6 | 6 | ||
7 | DEPENDS = "linux-imx-headers" | ||
8 | |||
9 | PROVIDES = "virtual/imxvpu" | 7 | PROVIDES = "virtual/imxvpu" |
10 | 8 | ||
11 | SRC_URI = " \ | 9 | SRC_URI = " \ |
@@ -15,7 +13,7 @@ SRC_URI = " \ | |||
15 | SRC_URI[md5sum] = "140796ddd6f1be47cffb7e5e2bfe0fb6" | 13 | SRC_URI[md5sum] = "140796ddd6f1be47cffb7e5e2bfe0fb6" |
16 | SRC_URI[sha256sum] = "c092a5b0f8897bae54154f58e47b6d2de033da01ee231a8cd779a51bbe962606" | 14 | SRC_URI[sha256sum] = "c092a5b0f8897bae54154f58e47b6d2de033da01ee231a8cd779a51bbe962606" |
17 | 15 | ||
18 | inherit fsl-eula-unpack | 16 | inherit fsl-eula-unpack use-imx-headers |
19 | 17 | ||
20 | PARALLEL_MAKE="-j 1" | 18 | PARALLEL_MAKE="-j 1" |
21 | 19 | ||
@@ -34,5 +32,4 @@ do_install () { | |||
34 | 32 | ||
35 | FILES_${PN} += "/unit_tests" | 33 | FILES_${PN} += "/unit_tests" |
36 | 34 | ||
37 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
38 | COMPATIBLE_MACHINE = "(mx8mq|mx8mm)" | 35 | COMPATIBLE_MACHINE = "(mx8mq|mx8mm)" |
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb index aebee4f0..185bb3d1 100644 --- a/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb +++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.38.bb | |||
@@ -6,8 +6,6 @@ DESCRIPTION = "Freescale Chips&Media VPU library" | |||
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=75abe2fa1d16ca79f87cde926f05f72d" |
8 | 8 | ||
9 | DEPENDS = "linux-imx-headers" | ||
10 | |||
11 | PROVIDES = "virtual/imxvpu" | 9 | PROVIDES = "virtual/imxvpu" |
12 | 10 | ||
13 | PE = "1" | 11 | PE = "1" |
@@ -17,12 +15,12 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" | |||
17 | SRC_URI[md5sum] = "521d5f839829f8d1f2a6a0e60270243e" | 15 | SRC_URI[md5sum] = "521d5f839829f8d1f2a6a0e60270243e" |
18 | SRC_URI[sha256sum] = "34bed0ddf6c797f444bddfa5d5495adc751ff268b6431d8beb48129c89c9e47f" | 16 | SRC_URI[sha256sum] = "34bed0ddf6c797f444bddfa5d5495adc751ff268b6431d8beb48129c89c9e47f" |
19 | 17 | ||
20 | inherit fsl-eula-unpack | 18 | inherit fsl-eula-unpack use-imx-headers |
21 | 19 | ||
22 | PLATFORM_mx6 = "IMX6Q" | 20 | PLATFORM_mx6 = "IMX6Q" |
23 | 21 | ||
24 | do_compile () { | 22 | do_compile () { |
25 | INCLUDE_DIR="-I${STAGING_INCDIR}/imx" | 23 | INCLUDE_DIR="-I${STAGING_INCDIR_IMX}" |
26 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all | 24 | oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all |
27 | } | 25 | } |
28 | 26 | ||
@@ -30,5 +28,4 @@ do_install () { | |||
30 | oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install | 28 | oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install |
31 | } | 29 | } |
32 | 30 | ||
33 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
34 | COMPATIBLE_MACHINE = "(mx6q|mx6dl)" | 31 | COMPATIBLE_MACHINE = "(mx6q|mx6dl)" |
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb index 62aff0fb..c96a8835 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb | |||
@@ -4,7 +4,7 @@ | |||
4 | DESCRIPTION = "Freescale alsa-lib plugins" | 4 | DESCRIPTION = "Freescale alsa-lib plugins" |
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
6 | SECTION = "multimedia" | 6 | SECTION = "multimedia" |
7 | DEPENDS = "alsa-lib linux-imx-headers" | 7 | DEPENDS = "alsa-lib" |
8 | 8 | ||
9 | # For backwards compatibility | 9 | # For backwards compatibility |
10 | PROVIDES += "fsl-alsa-plugins" | 10 | PROVIDES += "fsl-alsa-plugins" |
@@ -14,7 +14,7 @@ RCONFLICTS_${PN} = "fsl-alsa-plugins" | |||
14 | 14 | ||
15 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f" | 15 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f" |
16 | 16 | ||
17 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig use-imx-headers |
18 | 18 | ||
19 | SRCBRANCH = "nxp/master" | 19 | SRCBRANCH = "nxp/master" |
20 | SRC_URI = "git://source.codeaurora.org/external/imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" | 20 | SRC_URI = "git://source.codeaurora.org/external/imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" |
@@ -22,7 +22,7 @@ SRCREV = "9a63071e7734bd164017f3761b8d1944c017611f" | |||
22 | 22 | ||
23 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
24 | 24 | ||
25 | INCLUDE_DIR = "-I${STAGING_INCDIR}/imx" | 25 | INCLUDE_DIR = "-I${STAGING_INCDIR_IMX}" |
26 | 26 | ||
27 | EXTRA_OECONF = "CFLAGS="${INCLUDE_DIR}"" | 27 | EXTRA_OECONF = "CFLAGS="${INCLUDE_DIR}"" |
28 | 28 | ||
@@ -33,4 +33,3 @@ FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" | |||
33 | FILES_${PN}-dev += "${libdir}/alsa-lib/*.la" | 33 | FILES_${PN}-dev += "${libdir}/alsa-lib/*.la" |
34 | 34 | ||
35 | COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d|mx7ulp)" | 35 | COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d|mx7ulp)" |
36 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb index 21807911..0da9a2ea 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ | |||
5 | file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ | 5 | file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ |
6 | file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" | 6 | file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" |
7 | 7 | ||
8 | DEPENDS += "iso-codes util-linux linux-imx-headers" | 8 | DEPENDS += "iso-codes util-linux" |
9 | 9 | ||
10 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" | 10 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" |
11 | SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA" | 11 | SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA" |
@@ -33,7 +33,7 @@ PACKAGECONFIG_append = " pango " | |||
33 | # Disable introspection to fix [GstGL-1.0.gir] Error | 33 | # Disable introspection to fix [GstGL-1.0.gir] Error |
34 | EXTRA_OECONF_append = " --disable-introspection --disable-opengl --enable-wayland" | 34 | EXTRA_OECONF_append = " --disable-introspection --disable-opengl --enable-wayland" |
35 | 35 | ||
36 | inherit gettext | 36 | inherit gettext use-imx-headers |
37 | 37 | ||
38 | PACKAGES_DYNAMIC =+ "^libgst.*" | 38 | PACKAGES_DYNAMIC =+ "^libgst.*" |
39 | 39 | ||
@@ -60,7 +60,7 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" | |||
60 | 60 | ||
61 | EXTRA_OECONF += " \ | 61 | EXTRA_OECONF += " \ |
62 | --enable-zlib \ | 62 | --enable-zlib \ |
63 | CPPFLAGS="-I${STAGING_INCDIR}/imx" \ | 63 | CPPFLAGS="-I${STAGING_INCDIR_IMX}" \ |
64 | " | 64 | " |
65 | 65 | ||
66 | CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" | 66 | CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb index 45016618..a74ff64b 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_git.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" | |||
5 | SECTION = "multimedia" | 5 | SECTION = "multimedia" |
6 | # gstreamer1.0-plugins-bad is in DEPENDS because the build script scans for the | 6 | # gstreamer1.0-plugins-bad is in DEPENDS because the build script scans for the |
7 | # GstPhotography headers and libraries | 7 | # GstPhotography headers and libraries |
8 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad linux-imx-headers" | 8 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" |
9 | # add the audioparsers and the videoparsersbad plugins as RDEPENDS ; audioparsers | 9 | # add the audioparsers and the videoparsersbad plugins as RDEPENDS ; audioparsers |
10 | # for the uniaudio decoder, videoparsersbad for the VPU video decoder | 10 | # for the uniaudio decoder, videoparsersbad for the VPU video decoder |
11 | # the gstreamer1.0-plugins-imx RDEPENDS is necessary to ensure the -good recipe is | 11 | # the gstreamer1.0-plugins-imx RDEPENDS is necessary to ensure the -good recipe is |
@@ -22,7 +22,7 @@ SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH}" | |||
22 | 22 | ||
23 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
24 | 24 | ||
25 | inherit pkgconfig waf | 25 | inherit pkgconfig waf use-imx-headers |
26 | 26 | ||
27 | # configure the eglvivsink element to use the appropriate EGL platform code | 27 | # configure the eglvivsink element to use the appropriate EGL platform code |
28 | # Wayland if 'wayland' is present in DISTRO_FEATURES, if not, | 28 | # Wayland if 'wayland' is present in DISTRO_FEATURES, if not, |
@@ -34,7 +34,7 @@ EGLVIVSINK_PLATFORM = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayla | |||
34 | 34 | ||
35 | EGL_PLATFORM_CONF = "--egl-platform=${EGLVIVSINK_PLATFORM}" | 35 | EGL_PLATFORM_CONF = "--egl-platform=${EGLVIVSINK_PLATFORM}" |
36 | 36 | ||
37 | EXTRA_OECONF = "--kernel-headers=${STAGING_INCDIR}/imx ${PACKAGECONFIG_CONFARGS}" | 37 | EXTRA_OECONF = "--kernel-headers=${STAGING_INCDIR_IMX} ${PACKAGECONFIG_CONFARGS}" |
38 | 38 | ||
39 | EGLVIVSINK_DEPENDS = " \ | 39 | EGLVIVSINK_DEPENDS = " \ |
40 | virtual/egl virtual/libgles2 \ | 40 | virtual/egl virtual/libgles2 \ |
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.2.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.2.bb index 55275ab9..986d4a1d 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.2.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.2.bb | |||
@@ -7,7 +7,7 @@ DESCRIPTION = "Gstreamer freescale plugins" | |||
7 | LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" | 7 | LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" |
8 | SECTION = "multimedia" | 8 | SECTION = "multimedia" |
9 | 9 | ||
10 | DEPENDS = "imx-codec imx-parser linux-imx-headers gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | 10 | DEPENDS = "imx-codec imx-parser gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" |
11 | DEPENDS_append_mx6 = " imx-lib" | 11 | DEPENDS_append_mx6 = " imx-lib" |
12 | DEPENDS_append_mx7 = " imx-lib" | 12 | DEPENDS_append_mx7 = " imx-lib" |
13 | DEPENDS_append_imxvpu = " imx-vpuwrap libdrm" | 13 | DEPENDS_append_imxvpu = " imx-vpuwrap libdrm" |
@@ -28,7 +28,7 @@ SRCREV = "23dd0315c7087e1c8eba836b9a458d7906187c7e" | |||
28 | 28 | ||
29 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
30 | 30 | ||
31 | inherit autotools pkgconfig | 31 | inherit autotools pkgconfig use-imx-headers |
32 | 32 | ||
33 | PLATFORM_mx6 = "MX6" | 33 | PLATFORM_mx6 = "MX6" |
34 | PLATFORM_mx6sl = "MX6SL" | 34 | PLATFORM_mx6sl = "MX6SL" |
@@ -41,7 +41,7 @@ PLATFORM_mx8 = "MX8" | |||
41 | 41 | ||
42 | # Todo add a mechanism to map possible build targets | 42 | # Todo add a mechanism to map possible build targets |
43 | EXTRA_OECONF = "PLATFORM=${PLATFORM} \ | 43 | EXTRA_OECONF = "PLATFORM=${PLATFORM} \ |
44 | CPPFLAGS="-I${STAGING_INCDIR}/imx" \ | 44 | CPPFLAGS="-I${STAGING_INCDIR_IMX}" \ |
45 | CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR} \ | 45 | CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR} \ |
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', bb.utils.contains('DISTRO_FEATURES', 'x11', '--disable-x11', '', d), '', d)}" | 46 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', bb.utils.contains('DISTRO_FEATURES', 'x11', '--disable-x11', '', d), '', d)}" |
47 | 47 | ||