3 files changed, 18 insertions, 47 deletions

diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch
deleted file mode 100644
index ab8b50de4..000000000
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a57daf8f58cf69be06de8ebc9eab3a3077143760 Mon Sep 17 00:00:00 2001
-From: Hiago De Franco <hiago.franco@toradex.com>
-Date: Fri, 26 Jul 2024 14:43:55 -0300
-Subject: [PATCH] vpu_wrapper_hantro_VCencoder: add sys/time.h for gettimeofday
-
-Fixes:
-| ../git/vpu_wrapper_hantro_VCencoder.c:1965:5: error: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration]
-|  1965 |     gettimeofday (&pObj->tvBegin, NULL);
-|       |     ^~~~~~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-vpuwrap/pull/2]
-Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
----
- vpu_wrapper_hantro_VCencoder.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/vpu_wrapper_hantro_VCencoder.c b/vpu_wrapper_hantro_VCencoder.c
-index efae31a77ca4..6185cfc067d1 100755
---- a/vpu_wrapper_hantro_VCencoder.c
-+++ b/vpu_wrapper_hantro_VCencoder.c
-@@ -17,6 +17,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/time.h>
- #include <time.h>
- #include <math.h>
- #include <fcntl.h>
---
-2.39.2
-
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_encoder-add-sys-time.h-for-gettim.patch b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch
index cbf37417e..74ea5206c 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_encoder-add-sys-time.h-for-gettim.patch
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap/0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch
@@ -1,10 +1,13 @@
-From 482c639a0da4b093cfc029009604e9653ced33c4 Mon Sep 17 00:00:00 2001
+From a3c2f61649afd05e4bab457370f0b32d7644505c Mon Sep 17 00:00:00 2001
 From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Thu, 13 Jun 2024 07:15:12 +0000
-Subject: [PATCH] vpu_wrapper_hantro_encoder: add sys/time.h for gettimeofday
+Date: Mon, 3 Mar 2025 08:24:51 +0000
+Subject: [PATCH] vpu_wrapper_hantro_encoder: fix missing include
 
-Fixes:
+gettimeofday is declared in sys/time.h. Add the include.
+
+Fixes the build error:
 | ../git/vpu_wrapper_hantro_encoder.c:953:3: error: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration]
+|   953 |   gettimeofday (&pObj->tvEnd, NULL);
 
 Upstream-Status: Pending
 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
@@ -13,17 +16,17 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/vpu_wrapper_hantro_encoder.c b/vpu_wrapper_hantro_encoder.c
-index 3819c389320c..635c98bf1f19 100755
+index 3819c389320c..a0bdb2f4f6c0 100755
 --- a/vpu_wrapper_hantro_encoder.c
 +++ b/vpu_wrapper_hantro_encoder.c
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
+@@ -25,6 +25,7 @@
  #include <string.h>
  #include <time.h>
-+#include <sys/time.h>
  #include <semaphore.h>
++#include <sys/time.h>
  
  #include "headers/OMX_Video.h"
+ #include "headers/OMX_VideoExt.h"
 -- 
 2.42.0
 
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index f7a8e3521..39729f712 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -1,27 +1,26 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright (C) 2017-2023 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 
 SRC_URI = " \
     git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH} \
-    file://0001-vpu_wrapper_hantro_encoder-add-sys-time.h-for-gettim.patch \
-    file://0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch \
+    file://0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch \
 "
-SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
-SRCREV = "73093da30dc4053c9f69813a6447091bfca5429b"
-
-S = "${WORKDIR}/git"
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
+SRCREV = "d8703ee3245797111ad21c52982efa8b6db33241"
 
 inherit autotools pkgconfig
 
+CFLAGS += " -Wno-error=implicit-function-declaration"
+
 do_install:append() {
     # FIXME: Drop examples for now
     rm -r ${D}${datadir}