Skip to content

Commit

Permalink
package/freescale-imx/imx-vpu-hantro: fix patch fuzz
Browse files Browse the repository at this point in the history
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, imx-vpu-hantro fails to build with output:

    Applying 0001-Fix-ion.h-header-inclusion-to-be-standard.patch using patch:
    patching file Makefile_G1G2
    patching file Makefile_H1
    patching file decoder_sw/software/linux/dwl/dwl_linux.c
    Hunk #1 FAILED at 50.
    1 out of 1 hunk FAILED -- saving rejects to file decoder_sw/software/linux/dwl/dwl_linux.c.rej
    patching file h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
    Hunk #1 FAILED at 52.
    1 out of 1 hunk FAILED -- saving rejects to file h1_encoder/software/linux_reference/ewl/ewl_x280_common.c.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
  • Loading branch information
passgat authored and tpetazzoni committed Jul 8, 2024
1 parent 1da5466 commit 34cc250
Showing 1 changed file with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h

Signed-off-by: Gary Bisson <[email protected]>
Signed-off-by: Chris Dimich <[email protected]>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <[email protected]>
---
Makefile_G1G2 | 4 ++--
Makefile_H1 | 4 ++--
Expand Down Expand Up @@ -51,20 +53,20 @@ index 7d5e33b..c0e5727 100755
--- a/decoder_sw/software/linux/dwl/dwl_linux.c
+++ b/decoder_sw/software/linux/dwl/dwl_linux.c
@@ -50,7 +50,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(ENABLE_DMABUF_HEAP)
#include <linux/dma-heap.h>
#else
-#include <linux/ion.h>
+#include <ion.h>
#endif
#ifdef ANDROID
#include <linux/mxc_ion.h>
#if !defined(ENABLE_DMABUF_HEAP)
diff --git a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
index 312e4cc..70630c3 100755
--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
+++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
@@ -52,7 +52,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
@@ -51,7 +51,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(ENABLE_DMABUF_HEAP)
#include <linux/dma-heap.h>
#else
-#include <linux/ion.h>
Expand Down

0 comments on commit 34cc250

Please sign in to comment.