Patchwork xf86-video-intel: drop libxvmc dependency

login
register
mail settings
Submitter Ross Burton
Date Oct. 1, 2012, 10:18 a.m.
Message ID <1349086731-2818-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/37513/
State Accepted
Commit eb96be4db46039752c44dc37ef676eaac04e3dba
Headers show

Comments

Ross Burton - Oct. 1, 2012, 10:18 a.m.
xvmc is explicitly disabled, so remove the dependency.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb |    4 ++--
 meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
Richard Purdie - Oct. 3, 2012, 9:07 a.m.
On Mon, 2012-10-01 at 11:18 +0100, Ross Burton wrote:
> xvmc is explicitly disabled, so remove the dependency.

and also add some new dependencies. I'm left wondering if that was
intentional?

Cheers,

Richard


> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb |    4 ++--
>  meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb    |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
> index fe7408b..fe4dfbd 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
> @@ -9,9 +9,9 @@ Infrastructure (DRI)."
>  
>  LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
>  
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>  
> -DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
> +DEPENDS += "virtual/libx11 drm xf86driproto glproto \
>  	    virtual/libgl xineramaproto xf86driproto libpciaccess"
>  
> 
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> index ed1f269..83a24ce 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> @@ -7,12 +7,12 @@ chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
>  the driver supports hardware accelerated 3D via the Direct Rendering \
>  Infrastructure (DRI)."
>  
> -DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
> +DEPENDS += "virtual/libx11 drm dri2proto glproto \
>  	    virtual/libgl xineramaproto libpciaccess"
>  
>  SRCREV = "87ea531c5dc5b39809395b277c330854aaaaf019"
>  PV = "2.10.0+git${SRCPV}"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>  
>  EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static"
>
Ross Burton - Oct. 3, 2012, 9:39 a.m.
On 3 October 2012 10:07, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2012-10-01 at 11:18 +0100, Ross Burton wrote:
>> xvmc is explicitly disabled, so remove the dependency.
>
> and also add some new dependencies. I'm left wondering if that was
> intentional?

No, that's fallout from cherry-picking.  I'll re-send.

Ross
Ross Burton - Oct. 3, 2012, 9:57 a.m.
On 3 October 2012 10:39, Burton, Ross <ross.burton@intel.com> wrote:
> On 3 October 2012 10:07, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> On Mon, 2012-10-01 at 11:18 +0100, Ross Burton wrote:
>>> xvmc is explicitly disabled, so remove the dependency.
>>
>> and also add some new dependencies. I'm left wondering if that was
>> intentional?
>
> No, that's fallout from cherry-picking.  I'll re-send.

Actually I mis-read the diff - there is no delta apart from the removal of xvmc.

Ross
Richard Purdie - Oct. 3, 2012, 10:48 a.m.
On Wed, 2012-10-03 at 10:57 +0100, Burton, Ross wrote:
> On 3 October 2012 10:39, Burton, Ross <ross.burton@intel.com> wrote:
> > On 3 October 2012 10:07, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> >> On Mon, 2012-10-01 at 11:18 +0100, Ross Burton wrote:
> >>> xvmc is explicitly disabled, so remove the dependency.
> >>
> >> and also add some new dependencies. I'm left wondering if that was
> >> intentional?
> >
> > No, that's fallout from cherry-picking.  I'll re-send.
> 
> Actually I mis-read the diff - there is no delta apart from the removal of xvmc.

Sorry, yes, I'm misreading it :/

My other question was whether we need any m4 macros from xvmc to
reautoconf it?

Cheers,

Richard
Ross Burton - Oct. 3, 2012, 10:55 a.m.
On 3 October 2012 11:48, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> My other question was whether we need any m4 macros from xvmc to
> reautoconf it?

if test "$XVMC" = yes; then
	PKG_CHECK_MODULES(XVMCLIB,
			  [xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux],
			  [XVMC=yes], [XVMC=no])
fi

Nope, it uses pkgconfig.

Ross

Patch

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
index fe7408b..fe4dfbd 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
@@ -9,9 +9,9 @@  Infrastructure (DRI)."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
+DEPENDS += "virtual/libx11 drm xf86driproto glproto \
 	    virtual/libgl xineramaproto xf86driproto libpciaccess"
 
 
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index ed1f269..83a24ce 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -7,12 +7,12 @@  chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
 the driver supports hardware accelerated 3D via the Direct Rendering \
 Infrastructure (DRI)."
 
-DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
+DEPENDS += "virtual/libx11 drm dri2proto glproto \
 	    virtual/libgl xineramaproto libpciaccess"
 
 SRCREV = "87ea531c5dc5b39809395b277c330854aaaaf019"
 PV = "2.10.0+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static"