Skip to contentSkip to conversation

package/mediastreamer: fix patch fuzz

PATCH Applied Dario Binacchi 2 participants 2 messages Jul 7, 2024 – Jul 12, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/mediastreamer: fix patch fuzz

Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor.

Due to this change, mediastreamer fails to build with output:

Applying 0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch using patch:
patching file src/utils/ffmpeg-priv.h
Hunk #1 FAILED at 102.
1 out of 1 hunk FAILED -- saving rejects to file src/utils/ffmpeg-priv.h.rej

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

---
 ...e-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch +4 -2
index fc66e9a9f92d..9fd3fda2eccd 100644
@@ -19,6 +19,8 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735
 Signed-off-by: Bernd Kuhls <[email protected]>
 [Fabrice: updated for 4.3.1]
 Signed-off-by: Fabrice Fontaine <[email protected]>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <[email protected]>
 ---
  src/utils/ffmpeg-priv.h     | 4 ++++
  src/videofilters/nowebcam.c | 4 ++--
@@ -28,8 +30,8 @@ diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h
 index c0745a9a..d59ea0e1 100644
 --- a/src/utils/ffmpeg-priv.h
 +++ b/src/utils/ffmpeg-priv.h
-@@ -102,6 +102,10 @@ static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
- #endif
+@@ -115,6 +115,10 @@
+ extern "C" {
  #endif
  
 +#ifndef AV_INPUT_BUFFER_PADDING_SIZE
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello Dario,

Le 07/07/2024 à 18:46, Dario Binacchi a écrit :

Quoted 5 lines

Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor.

Due to this change, mediastreamer fails to build with output:

Quoted 8 lines

Applying 0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch using patch:
patching file src/utils/ffmpeg-priv.h
Hunk #1 FAILED at 102.
1 out of 1 hunk FAILED -- saving rejects to file src/utils/ffmpeg-priv.h.rej

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

Applied to master, thanks.

Best regards,
Romain

Quoted 18 lines
---
 ...e-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch +2 -0
index fc66e9a9f92d..9fd3fda2eccd 100644
@@ -19,6 +19,8 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735
 Signed-off-by: Bernd Kuhls <[email protected]>
 [Fabrice: updated for 4.3.1]
 Signed-off-by: Fabrice Fontaine <[email protected]>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <[email protected]>
 ---
  src/utils/ffmpeg-priv.h     | 4 ++++
  src/videofilters/nowebcam.c | 4 ++--

package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h · line 37

Quoted 10 lines
package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch +2 -2
@@ -28,8 +30,8 @@ diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h
 index c0745a9a..d59ea0e1 100644
 --- a/src/utils/ffmpeg-priv.h
 +++ b/src/utils/ffmpeg-priv.h
-@@ -102,6 +102,10 @@ static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
- #endif
+@@ -115,6 +115,10 @@
+ extern "C" {
  #endif
 
 +#ifndef AV_INPUT_BUFFER_PADDING_SIZE

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot