diff options
-rw-r--r-- | recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch | 28 | ||||
-rw-r--r-- | recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb (renamed from recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb) | 3 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.1.0.bb) | 16 | ||||
-rw-r--r-- | recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb (renamed from recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.2.bb) | 7 |
4 files changed, 17 insertions, 37 deletions
diff --git a/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch b/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch deleted file mode 100644 index 490d3a2f..00000000 --- a/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 41825b11289be251fed64470893d18b89b0dd38b Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Rafael Giani <crg7475@mailbox.org> | ||
3 | Date: Sun, 8 May 2022 16:25:44 +0200 | ||
4 | Subject: [PATCH] g2d: Fix typo | ||
5 | |||
6 | Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> | ||
7 | |||
8 | Upstream-Status: Backport [41825b11289be251fed64470893d18b89b0dd38b] | ||
9 | --- | ||
10 | imxdmabuffer/imxdmabuffer_g2d_allocator.c | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/imxdmabuffer/imxdmabuffer_g2d_allocator.c b/imxdmabuffer/imxdmabuffer_g2d_allocator.c | ||
14 | index f10a909..497dcea 100644 | ||
15 | --- a/imxdmabuffer/imxdmabuffer_g2d_allocator.c | ||
16 | +++ b/imxdmabuffer/imxdmabuffer_g2d_allocator.c | ||
17 | @@ -139,7 +139,7 @@ static uint8_t* imx_dma_buffer_g2d_allocator_map(ImxDmaBufferAllocator *allocato | ||
18 | * (Other allocators perform more steps than this.) */ | ||
19 | if (imx_g2d_buffer->mapping_refcount > 0) | ||
20 | { | ||
21 | - assert((imx_dwl_buffer->map_flags & flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK) == (flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK)); | ||
22 | + assert((imx_g2d_buffer->map_flags & flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK) == (flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK)); | ||
23 | imx_g2d_buffer->mapping_refcount++; | ||
24 | } | ||
25 | else | ||
26 | -- | ||
27 | 2.32.0 | ||
28 | |||
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb index 090593be..b160c31d 100644 --- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb +++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb | |||
@@ -8,9 +8,8 @@ SECTION = "base" | |||
8 | PV .= "+git${SRCPV}" | 8 | PV .= "+git${SRCPV}" |
9 | 9 | ||
10 | SRCBRANCH ?= "master" | 10 | SRCBRANCH ?= "master" |
11 | SRCREV = "5410b44fb0c5bbd9fb1f3ba0681e65068d8cde57" | 11 | SRCREV = "faf547cc2345bfbf95507ab7e86530f85289bb5b" |
12 | SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \ | 12 | SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \ |
13 | file://0001-g2d-Fix-typo.patch \ | ||
14 | file://run-ptest \ | 13 | file://run-ptest \ |
15 | " | 14 | " |
16 | 15 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.1.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb index fb18f1bb..70ae8937 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.1.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb | |||
@@ -15,7 +15,7 @@ RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparser | |||
15 | PV .= "+git${SRCPV}" | 15 | PV .= "+git${SRCPV}" |
16 | 16 | ||
17 | SRCBRANCH ?= "master" | 17 | SRCBRANCH ?= "master" |
18 | SRCREV = "b1e5cca1a6df9d2c0dc505ae222775798108d340" | 18 | SRCREV = "cb3cd45676e808b222ac573e8a118f44fd70c288" |
19 | SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" | 19 | SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" |
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
@@ -31,18 +31,24 @@ LIBG2D_DEPENDENCIES = "virtual/libg2d" | |||
31 | LIBG2D_DPU_OPTION:imxdpu = "-Dg2d-based-on-dpu=true" | 31 | LIBG2D_DPU_OPTION:imxdpu = "-Dg2d-based-on-dpu=true" |
32 | LIBG2D_DEPENDENCIES:imxdpu = "virtual/libg2d libdrm" | 32 | LIBG2D_DEPENDENCIES:imxdpu = "virtual/libg2d libdrm" |
33 | 33 | ||
34 | EXTRA_OEMESON += "-Dimx-headers-path=${STAGING_INCDIR_IMX}" | 34 | # v4l2-amphion and v4l2-isi are meant for the Amphion Malone |
35 | # VPU decoder and the ISI drivers in older kernels, which had | ||
36 | # lots of bugs that required nontrivial workarounds. In the | ||
37 | # kernels in this release, newer drivers are present, which | ||
38 | # obviate the need for these special elements. | ||
39 | EXTRA_OEMESON += "-Dimx-headers-path=${STAGING_INCDIR_IMX} -Dv4l2-amphion=disabled -Dv4l2-isi=false" | ||
35 | 40 | ||
36 | PACKAGECONFIG ?= "uniaudiodec" | 41 | PACKAGECONFIG ?= "uniaudiodec" |
37 | PACKAGECONFIG:append:imxgpu2d = " g2d" | 42 | PACKAGECONFIG:append:imxgpu2d = " g2d" |
38 | PACKAGECONFIG:append:imxvpu = " vpu" | 43 | PACKAGECONFIG:append:imxvpu = " vpu" |
39 | PACKAGECONFIG:append:imxipu = " ipu" | 44 | PACKAGECONFIG:append:imxipu = " ipu" |
40 | PACKAGECONFIG:append:imxpxp = " pxp" | 45 | PACKAGECONFIG:append:imxpxp = " pxp" |
41 | # The custom imxv4l2 elements are only available on the i.MX6. | 46 | # The custom imxv4l2 source and sink elements are only |
47 | # available on the i.MX6. | ||
42 | # The 2D blitter sinks require an MXC framebuffer, which | 48 | # The 2D blitter sinks require an MXC framebuffer, which |
43 | # is not available anymore on the i.MX8 (since these SoCs | 49 | # is not available anymore on the i.MX8 (since these SoCs |
44 | # now use KMS instead of the old Linux framebuffer). | 50 | # now use KMS instead of the old Linux framebuffer). |
45 | PACKAGECONFIG:append:mx6-nxp-bsp = " imx2dvideosink v4l2" | 51 | PACKAGECONFIG:append:mx6-nxp-bsp = " imx2dvideosink v4l2-mxc-source-sink" |
46 | PACKAGECONFIG:append:mx7-nxp-bsp = " imx2dvideosink" | 52 | PACKAGECONFIG:append:mx7-nxp-bsp = " imx2dvideosink" |
47 | 53 | ||
48 | PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}" | 54 | PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}" |
@@ -50,7 +56,7 @@ PACKAGECONFIG[pxp] = "-Dpxp=enabled,-Dpxp=disabled," | |||
50 | PACKAGECONFIG[ipu] = "-Dipu=enabled,-Dipu=disabled," | 56 | PACKAGECONFIG[ipu] = "-Dipu=enabled,-Dipu=disabled," |
51 | PACKAGECONFIG[vpu] = "-Dvpu=enabled,-Dvpu=disabled,libimxvpuapi2" | 57 | PACKAGECONFIG[vpu] = "-Dvpu=enabled,-Dvpu=disabled,libimxvpuapi2" |
52 | PACKAGECONFIG[imx2dvideosink] = "-Dimx2d-videosink=true,-Dimx2d-videosink=false," | 58 | PACKAGECONFIG[imx2dvideosink] = "-Dimx2d-videosink=true,-Dimx2d-videosink=false," |
53 | PACKAGECONFIG[v4l2] = "-Dv4l2=true,-Dv4l2=false," | 59 | PACKAGECONFIG[v4l2-mxc-source-sink] = "-Dv4l2-mxc-source-sink=true,-Dv4l2-mxc-source-sink=false," |
54 | PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec" | 60 | PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec" |
55 | PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec" | 61 | PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec" |
56 | 62 | ||
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.2.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb index b7f43a61..1e7d8252 100644 --- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.2.bb +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb | |||
@@ -4,11 +4,14 @@ LICENSE = "LGPL-2.1-only" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324" |
5 | SECTION = "multimedia" | 5 | SECTION = "multimedia" |
6 | DEPENDS = "virtual/imxvpu libimxdmabuffer" | 6 | DEPENDS = "virtual/imxvpu libimxdmabuffer" |
7 | # Add imx-vpu-hantro-vc as dependency for being | ||
8 | # able to encode video using the VC8000E encoder | ||
9 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" | ||
7 | 10 | ||
8 | PV .= "+git${SRCPV}" | 11 | PV .= "+git${SRCPV}" |
9 | 12 | ||
10 | SRCBRANCH ?= "master" | 13 | SRCBRANCH ?= "master" |
11 | SRCREV = "b6486118d47937cd717c4881158dda6e72cf2855" | 14 | SRCREV = "6f803f46d6b53a08cf02fc3d440072e01e2f3a09" |
12 | SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https" | 15 | SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https" |
13 | 16 | ||
14 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
@@ -18,7 +21,7 @@ inherit waf pkgconfig use-imx-headers | |||
18 | IMX_PLATFORM:mx6-nxp-bsp = "imx6" | 21 | IMX_PLATFORM:mx6-nxp-bsp = "imx6" |
19 | IMX_PLATFORM:mx8mq-nxp-bsp = "imx8m" | 22 | IMX_PLATFORM:mx8mq-nxp-bsp = "imx8m" |
20 | IMX_PLATFORM:mx8mm-nxp-bsp = "imx8mm" | 23 | IMX_PLATFORM:mx8mm-nxp-bsp = "imx8mm" |
21 | IMX_PLATFORM:mx8mp-nxp-bsp = "imx8m" | 24 | IMX_PLATFORM:mx8mp-nxp-bsp = "imx8mp" |
22 | 25 | ||
23 | EXTRA_OECONF = "--imx-platform=${IMX_PLATFORM} --libdir=${libdir} --imx-headers=${STAGING_INCDIR_IMX} --sysroot-path=${RECIPE_SYSROOT}" | 26 | EXTRA_OECONF = "--imx-platform=${IMX_PLATFORM} --libdir=${libdir} --imx-headers=${STAGING_INCDIR_IMX} --sysroot-path=${RECIPE_SYSROOT}" |
24 | 27 | ||