meta-intel: libva fixes

PATCH In review [email protected] 2 participants 5 messages Dec 22, 2011

lore

Share & tools

lore

[email protected]

author

2011-12-22 03:51 UTC #0 lore raw

cover meta-intel: libva fixes

From: Tom Zanussi <[email protected]>

This patchset fixes some problems that that started showing up with some higher BBTHREADS values and ipk packaging.

I've done successful ipk and rpm builds with 16 threads and don't seen the problem any longer.

Thanks to Jeffrey Moore and Darren Hart for testing fixes and helping to narrow down the triggering conditions.

The following changes since commit b6d5d9a3b06caf578103a04dc5fcf5e476343205:
Darren Hart (1):
fri2: Update SRCREV to include efi patches and meta-data

are available in the git repository at:

git://git.yoctoproject.org/meta-intel.git tzanussi/libva-glx-rootfs-fix-4
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/libva-glx-rootfs-fix-4

Tom Zanussi (2):
meta-intel: add PROVIDES for extra packages provided by libva
meta-intel: change EMGD xserver libva dependency to libva-x11

 common/recipes-multimedia/libva/libva.inc |   42 +++++++++++++++++++++-------
 conf/machine/include/ia32-base.inc        |    2 +-
 2 files changed, 32 insertions(+), 12 deletions(-)

[email protected]

author

2011-12-22 03:51 UTC #1 lore raw

PATCH 1/2 meta-intel: add PROVIDES for extra packages provided by libva

From: Tom Zanussi <[email protected]>

libva provides some extra packages such as libva-glx. Add PROVIDES for them so the rest of the build system knows about it.

We also need to add the dependency relationships between libva, libva-x11, and libva-glx.

Also remove the bogus RDEPENDS on the display components.

Also libva-glx depends on mesa-dri - if it's not there, libva-glx won't be built.

Also, add missing -dev and -dbg packaging.

Signed-off-by Tom Zanussi <[email protected]>

---
 common/recipes-multimedia/libva/libva.inc |   42 +++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 11 deletions(-)

common/recipes-multimedia/libva/libva.inc +31 ~~-11~~

index 93b3cae..d897f36 100644
@@ -17,25 +17,45 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
-DEPENDS = "libxext libxfixes libdrm"
+DEPENDS = "libxext libxfixes libdrm mesa-dri"
 
 inherit autotools pkgconfig
 
 PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
+PROVIDES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
 PACKAGES =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
+PACKAGES =+ "${PN}-x11-dbg ${PN}-tpi-dbg ${PN}-glx-dbg ${PN}-egl-dbg"
+RPROVIDES_${PN}-dev =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
 
-RDEPENDS_${PN} =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
+RDEPENDS_${PN}-tpi =+ "${PN}"
+RDEPENDS_${PN}-x11 =+ "${PN}"
+RDEPENDS_${PN}-glx =+ "${PN}-x11"
+RDEPENDS_${PN}-egl =+ "${PN}-x11"
 
 FILES_${PN}-dbg += "${libdir}/dri/.debug"
 FILES_${PN} += "${libdir}/dri"
 
-FILES_${PN}-x11-dev =+ "${libdir}/libva-x11.so"
-FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi.so"
-FILES_${PN}-glx-dev =+ "${libdir}/libva-glx.so"
-FILES_${PN}-egl-dev =+ "${libdir}/libva-egl.so"
-FILES_${PN}-x11 =+ "${libdir}/libva-x11.*"
-FILES_${PN}-tpi =+ "${libdir}/libva-tpi.*"
-FILES_${PN}-glx =+ "${libdir}/libva-glx.*"
-FILES_${PN}-egl =+ "${libdir}/libva-egl.*"
+FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}"
+FILES_${PN}-tpi =+ "${libdir}/libva-tpi*${SOLIBS}"
+FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}"
+FILES_${PN}-egl =+ "${libdir}/libva-egl*${SOLIBS}"
+
+FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*${SOLIBSDEV}"
+FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*${SOLIBSDEV}"
+FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*${SOLIBSDEV}"
+FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*${SOLIBSDEV}"
+FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*.la"
+FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*.la"
+FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*.la"
+FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*.la"
+FILES_${PN}-x11-dev =+ "${libdir}/pkgconfig/libva-x11*.pc"
+FILES_${PN}-tpi-dev =+ "${libdir}/pkgconfig/libva-tpi*.pc"
+FILES_${PN}-glx-dev =+ "${libdir}/pkgconfig/libva-glx*.pc"
+FILES_${PN}-egl-dev =+ "${libdir}/pkgconfig/libva-egl*.pc"
+
+FILES_${PN}-x11-dbg =+ "${libdir}/.debug/libva-x11.*"
+FILES_${PN}-tpi-dbg =+ "${libdir}/.debug/libva-tpi.*"
+FILES_${PN}-glx-dbg =+ "${libdir}/.debug/libva-glx.*"
+FILES_${PN}-egl-dbg =+ "${libdir}/.debug/libva-egl.*"

Signature · 1 line

1.7.0.4

[email protected]

author

2011-12-22 03:51 UTC #2 lore raw

PATCH 2/2 meta-intel: change EMGD xserver libva dependency to libva-x11

From: Tom Zanussi <[email protected]>

XSERVER_IA32_EMGD should depend on libva-x11, which in turn depends on libva, instead of just libva.

Signed-off-by Tom Zanussi <[email protected]>

---
 conf/machine/include/ia32-base.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

conf/machine/include/ia32-base.inc +1 -1

index 6522c9c..84693e2 100644
@@ -54,7 +54,7 @@ XSERVER_IA32_I915 = "xf86-video-intel \
            "
 
 XSERVER_IA32_EMGD = "emgd-driver-bin \
-           libva \
+           libva-x11 \
            "
 
 XSERVER_IA32_VESA = "xf86-video-vesa"

Signature · 1 line

1.7.0.4

Darren Hart

Acked-by on v1 1/2

2011-12-22 05:45 UTC #4 lore raw

Re: [PATCH 1/2] meta-intel: add PROVIDES for extra packages provided by libva

In reply to [email protected]

Quoted 8 lines · On 12/21/2011 07:48 PM, [email protected] wrote:

From: Tom Zanussi <[email protected]>
libva provides some extra packages such as libva-glx. Add PROVIDES for them so the rest of the build system knows about it.
We also need to add the dependency relationships between libva, libva-x11, and libva-glx.

Quoted 8 lines

Also remove the bogus RDEPENDS on the display components.
Also libva-glx depends on mesa-dri - if it's not there, libva-glx won't be built.
Also, add missing -dev and -dbg packaging.
Signed-off-by Tom Zanussi <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 65 lines

---
 common/recipes-multimedia/libva/libva.inc |   42 +++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 11 deletions(-)

common/recipes-multimedia/libva/libva.inc +31 ~~-11~~

index 93b3cae..d897f36 100644
@@ -17,25 +17,45 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
-DEPENDS = "libxext libxfixes libdrm"
+DEPENDS = "libxext libxfixes libdrm mesa-dri"
 
 inherit autotools pkgconfig
 
 PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
+PROVIDES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
 PACKAGES =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
+PACKAGES =+ "${PN}-x11-dbg ${PN}-tpi-dbg ${PN}-glx-dbg ${PN}-egl-dbg"
+RPROVIDES_${PN}-dev =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
 
-RDEPENDS_${PN} =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
+RDEPENDS_${PN}-tpi =+ "${PN}"
+RDEPENDS_${PN}-x11 =+ "${PN}"
+RDEPENDS_${PN}-glx =+ "${PN}-x11"
+RDEPENDS_${PN}-egl =+ "${PN}-x11"
 
 FILES_${PN}-dbg += "${libdir}/dri/.debug"
 FILES_${PN} += "${libdir}/dri"
 
-FILES_${PN}-x11-dev =+ "${libdir}/libva-x11.so"
-FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi.so"
-FILES_${PN}-glx-dev =+ "${libdir}/libva-glx.so"
-FILES_${PN}-egl-dev =+ "${libdir}/libva-egl.so"
-FILES_${PN}-x11 =+ "${libdir}/libva-x11.*"
-FILES_${PN}-tpi =+ "${libdir}/libva-tpi.*"
-FILES_${PN}-glx =+ "${libdir}/libva-glx.*"
-FILES_${PN}-egl =+ "${libdir}/libva-egl.*"
+FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}"
+FILES_${PN}-tpi =+ "${libdir}/libva-tpi*${SOLIBS}"
+FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}"
+FILES_${PN}-egl =+ "${libdir}/libva-egl*${SOLIBS}"
+
+FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*${SOLIBSDEV}"
+FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*${SOLIBSDEV}"
+FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*${SOLIBSDEV}"
+FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*${SOLIBSDEV}"
+FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*.la"
+FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*.la"
+FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*.la"
+FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*.la"
+FILES_${PN}-x11-dev =+ "${libdir}/pkgconfig/libva-x11*.pc"
+FILES_${PN}-tpi-dev =+ "${libdir}/pkgconfig/libva-tpi*.pc"
+FILES_${PN}-glx-dev =+ "${libdir}/pkgconfig/libva-glx*.pc"
+FILES_${PN}-egl-dev =+ "${libdir}/pkgconfig/libva-egl*.pc"
+
+FILES_${PN}-x11-dbg =+ "${libdir}/.debug/libva-x11.*"
+FILES_${PN}-tpi-dbg =+ "${libdir}/.debug/libva-tpi.*"
+FILES_${PN}-glx-dbg =+ "${libdir}/.debug/libva-glx.*"
+FILES_${PN}-egl-dbg =+ "${libdir}/.debug/libva-egl.*"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Darren Hart

Acked-by on v1 2/2

2011-12-22 05:45 UTC #3 lore raw

Re: [PATCH 2/2] meta-intel: change EMGD xserver libva dependency to libva-x11

In reply to [email protected]

Quoted 6 lines · On 12/21/2011 07:48 PM, [email protected] wrote:

From: Tom Zanussi <[email protected]>
XSERVER_IA32_EMGD should depend on libva-x11, which in turn depends on libva, instead of just libva.
Signed-off-by Tom Zanussi <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 17 lines

---
 conf/machine/include/ia32-base.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

conf/machine/include/ia32-base.inc +1 -1

index 6522c9c..84693e2 100644
@@ -54,7 +54,7 @@ XSERVER_IA32_I915 = "xf86-video-intel \
            "
 
 XSERVER_IA32_EMGD = "emgd-driver-bin \
-           libva \
+           libva-x11 \
            "
 
 XSERVER_IA32_VESA = "xf86-video-vesa"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel