| Message ID | 20240707164602.320774-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hello Dario, Le 07/07/2024 à 18:46, Dario Binacchi a écrit : > 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. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> Applied to master, thanks. Best regards, Romain > --- > ...e-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch > index fc66e9a9f92d..9fd3fda2eccd 100644 > --- a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch > +++ b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch > @@ -19,6 +19,8 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > [Fabrice: updated for 4.3.1] > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > +[Dario: make the patch to be applied with fuzz factor 0] > +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > 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 To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff --git a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch index fc66e9a9f92d..9fd3fda2eccd 100644 --- a/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch +++ b/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch @@ -19,6 +19,8 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [Fabrice: updated for 4.3.1] Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- 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
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. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- ...e-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)