All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/ffmpeg: fix build error
@ 2024-09-14 18:38 Thomas Perale via buildroot
  2024-09-14 19:56 ` Thomas Petazzoni via buildroot
  2024-10-11 12:52 ` Peter Korsgaard
  0 siblings, 2 replies; 5+ messages in thread
From: Thomas Perale via buildroot @ 2024-09-14 18:38 UTC (permalink / raw)
  To: buildroot
  Cc: Thomas Petazzoni, Thomas Perale, Christian Stewart, Anisse Astier

ffmpeg builds with `--enable-vaapi` opt made GCC v14 and 32 bit target
will throw an 'Wincompatible-pointer-types' error.

This is a downport of an upstreamed commit but not yet present in any
ffmpeg version that fix the pointer type.

Fixes:
 - http://autobuild.buildroot.org/results/f5f/f5f2d16226ad9500ecf046779d5282ee071a54d3/

Signed-off-by: Thomas Perale <thomas.perale@mind.be>
---
 ...hwcontext-vaapi-use-the-correct-type.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch

diff --git a/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch b/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch
new file mode 100644
index 0000000000..177b4f1885
--- /dev/null
+++ b/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch
@@ -0,0 +1,28 @@
+From 6f8e365a2af2b6b21701d41eed3b2e3f8a436eeb Mon Sep 17 00:00:00 2001
+From: James Almer <jamrial@gmail.com>
+Date: Wed, 31 Jul 2024 10:00:54 -0300
+Subject: [PATCH] avutil/hwcontext_vaapi: use the correct type for
+ VASurfaceAttribExternalBuffers.buffers
+
+Should fix ticket #11115.
+
+Signed-off-by: James Almer <jamrial@gmail.com>
+Upstream: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/6f8e365a2af2b6b21701d41eed3b2e3f8a436eeb
+Signed-off-by: Thomas Perale <thomas.perale@mind.be>
+---
+ libavutil/hwcontext_vaapi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
+index 4cb25dd03212e..15fd84aa40679 100644
+--- a/libavutil/hwcontext_vaapi.c
++++ b/libavutil/hwcontext_vaapi.c
+@@ -1225,7 +1225,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
+ 
+     if (!use_prime2 || vas != VA_STATUS_SUCCESS) {
+         int k;
+-        unsigned long buffer_handle;
++        uintptr_t buffer_handle;
+         VASurfaceAttribExternalBuffers buffer_desc;
+         VASurfaceAttrib buffer_attrs[2] = {
+             {
-- 
2.46.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/ffmpeg: fix build error
@ 2024-09-14 15:36 Thomas Perale via buildroot
  2024-09-14 16:23 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Perale via buildroot @ 2024-09-14 15:36 UTC (permalink / raw)
  To: buildroot
  Cc: Thomas Petazzoni, Thomas Perale, Christian Stewart, Anisse Astier

ffmpeg builds with `--enable-vaapi` opt made GCC v14 and 32 bit target
will throw an 'Wincompatible-pointer-types' error.

This is a downport of an upstreamed commit but not yet present in any
ffmpeg version that fix the pointer type.

Fixes:
 - http://autobuild.buildroot.org/results/f5f/f5f2d16226ad9500ecf046779d5282ee071a54d3/

Signed-off-by: Thomas Perale <thomas.perale@mind.be>
---
 ...hwcontext-vaapi-use-the-correct-type.patch | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch

diff --git a/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch b/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch
new file mode 100644
index 0000000000..e455654b2e
--- /dev/null
+++ b/package/ffmpeg/0007-avutil-hwcontext-vaapi-use-the-correct-type.patch
@@ -0,0 +1,26 @@
+From 6f8e365a2af2b6b21701d41eed3b2e3f8a436eeb Mon Sep 17 00:00:00 2001
+From: James Almer <jamrial@gmail.com>
+Date: Wed, 31 Jul 2024 10:00:54 -0300
+Subject: [PATCH] avutil/hwcontext_vaapi: use the correct type for
+ VASurfaceAttribExternalBuffers.buffers
+
+Should fix ticket #11115.
+
+Signed-off-by: James Almer <jamrial@gmail.com>
+---
+ libavutil/hwcontext_vaapi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
+index 4cb25dd03212e..15fd84aa40679 100644
+--- a/libavutil/hwcontext_vaapi.c
++++ b/libavutil/hwcontext_vaapi.c
+@@ -1225,7 +1225,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
+ 
+     if (!use_prime2 || vas != VA_STATUS_SUCCESS) {
+         int k;
+-        unsigned long buffer_handle;
++        uintptr_t buffer_handle;
+         VASurfaceAttribExternalBuffers buffer_desc;
+         VASurfaceAttrib buffer_attrs[2] = {
+             {
-- 
2.46.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-11 12:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-14 18:38 [Buildroot] [PATCH 1/1] package/ffmpeg: fix build error Thomas Perale via buildroot
2024-09-14 19:56 ` Thomas Petazzoni via buildroot
2024-10-11 12:52 ` Peter Korsgaard
  -- strict thread matches above, loose matches on Subject: below --
2024-09-14 15:36 Thomas Perale via buildroot
2024-09-14 16:23 ` Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.