[PATCH xf86-video-intel] meson: Add dependency on xv

[PATCH xf86-video-intel] meson: Add dependency on xv

[Povilas Kanapickas]

Symbols such as XvCreateImage, XvPutImage, XvGetPortAttribute come from
libXv.so. Linking to this dependency directly fixes build errors on
Debian Bookworm against xserver 21.1.
---
 meson.build                      | 1 +
 src/legacy/i810/xvmc/meson.build | 1 +
 xvmc/meson.build                 | 1 +
 3 files changed, 3 insertions(+)

diff --git a/meson.build b/meson.build
index 227ca2eb..553902bb 100644
--- a/meson.build
+++ b/meson.build
@@ -157,6 +157,7 @@ endif
 
 with_xvmc = get_option('xvmc')
 if with_xvmc
+  dependency('xv', required : true)
   dependency('xvmc', required : true)
   dependency('dri2proto', required : true)
   dependency('x11', required : true)
diff --git a/src/legacy/i810/xvmc/meson.build b/src/legacy/i810/xvmc/meson.build
index cd05f3ef..3505f15b 100644
--- a/src/legacy/i810/xvmc/meson.build
+++ b/src/legacy/i810/xvmc/meson.build
@@ -4,6 +4,7 @@ shared_library('I810XvMC',
 	       sources : 'I810XvMC.c',
 	       dependencies : [
 		 dependency('x11', required : true),
+		 dependency('xv', required : true),
 		 dependency('xvmc', required : true),
 		 dependency('xorg-server', required : true),
 		 dependency('libdrm', required : true),
diff --git a/xvmc/meson.build b/xvmc/meson.build
index 0ecc51e5..eeba2b66 100644
--- a/xvmc/meson.build
+++ b/xvmc/meson.build
@@ -14,6 +14,7 @@ shared_library('IntelXvMC',
 	       dependencies : [
 		 dependency('threads', required : true),
 		 dependency('x11', required : true),
+		 dependency('xv', required : true),
 		 dependency('xvmc', required : true),
 		 dependency('xorg-server', required : true),
 		 dependency('x11-xcb', required : true),
-- 
2.39.5

Re: [PATCH xf86-video-intel] meson: Add dependency on xv

[Ville Syrjälä]

On Sat, Feb 08, 2025 at 12:24:26AM +0200, Povilas Kanapickas wrote:
> Symbols such as XvCreateImage, XvPutImage, XvGetPortAttribute come from
> libXv.so. Linking to this dependency directly fixes build errors on
> Debian Bookworm against xserver 21.1.

Thanks, pushed to master.

> ---
>  meson.build                      | 1 +
>  src/legacy/i810/xvmc/meson.build | 1 +
>  xvmc/meson.build                 | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/meson.build b/meson.build
> index 227ca2eb..553902bb 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -157,6 +157,7 @@ endif
>  
>  with_xvmc = get_option('xvmc')
>  if with_xvmc
> +  dependency('xv', required : true)
>    dependency('xvmc', required : true)
>    dependency('dri2proto', required : true)
>    dependency('x11', required : true)
> diff --git a/src/legacy/i810/xvmc/meson.build b/src/legacy/i810/xvmc/meson.build
> index cd05f3ef..3505f15b 100644
> --- a/src/legacy/i810/xvmc/meson.build
> +++ b/src/legacy/i810/xvmc/meson.build
> @@ -4,6 +4,7 @@ shared_library('I810XvMC',
>  	       sources : 'I810XvMC.c',
>  	       dependencies : [
>  		 dependency('x11', required : true),
> +		 dependency('xv', required : true),
>  		 dependency('xvmc', required : true),
>  		 dependency('xorg-server', required : true),
>  		 dependency('libdrm', required : true),
> diff --git a/xvmc/meson.build b/xvmc/meson.build
> index 0ecc51e5..eeba2b66 100644
> --- a/xvmc/meson.build
> +++ b/xvmc/meson.build
> @@ -14,6 +14,7 @@ shared_library('IntelXvMC',
>  	       dependencies : [
>  		 dependency('threads', required : true),
>  		 dependency('x11', required : true),
> +		 dependency('xv', required : true),
>  		 dependency('xvmc', required : true),
>  		 dependency('xorg-server', required : true),
>  		 dependency('x11-xcb', required : true),
> -- 
> 2.39.5

-- 
Ville Syrjälä
Intel

✗ Fi.CI.BUILD: failure for meson: Add dependency on xv

[Patchwork]

== Series Details ==

Series: meson: Add dependency on xv
URL   : https://patchwork.freedesktop.org/series/144614/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/144614/revisions/1/mbox/ not applied
Applying: meson: Add dependency on xv
error: sha1 information is lacking or useless (meson.build).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 meson: Add dependency on xv
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced