Skip to contentSkip to conversation

Misc Fixes for meta-intel 1.3 release

PATCH In review [email protected] 3 participants 9 messages Nov 1, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

v2 cover Misc Fixes for meta-intel 1.3 release

From: Nitin A Kamble <[email protected]>

This v2 pull request is with newer version of libva-intel-driver. These commits tested on All the BSPs I am maintaining with expected results.

Thanks,
Nitin

The following changes since commit 43b2e9c34363ade4241a60f699b47179929c6fb6:

n450: Add WEBTITLE and boilerplate README (2012-10-31 08:40:15 -0700)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/misc
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc

Nitin A Kamble (3):
libva: update to the latest version
libva-intel-driver: update to the latest version mesa-dri.bbappend: avoid conflict with emgd-driver-bin

Ross Burton (1):
libva: remove redundant libva 1.0.12

 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   27 +++++++++++++++++---
 .../libva/libva-intel-driver.inc                   |    2 +-
 .../libva/libva-intel-driver_1.0.15.bb             |    8 ------
 .../libva/libva-intel-driver_1.0.18.bb             |    8 ++++++
 common/recipes-multimedia/libva/libva_1.0.12.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.15.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.16.bb    |    8 ++++++
 7 files changed, 40 insertions(+), 29 deletions(-)
 delete mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.18.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.12.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva_1.0.16.bb
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH v2 1/4 libva: update to the latest version

From: Nitin A Kamble <[email protected]>

This bug https://bugzilla.yoctoproject.org/show_bug.cgi?id=3348 is triggering this change. The old versions of libva components are affecting video playback on few BSPs like sugarbay & chiefriver.

Also, use the release tarball instead of a tag snapshot.

Signed-off-by Ross Burton <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
---
 common/recipes-multimedia/libva/libva_1.0.15.bb |    8 --------
 common/recipes-multimedia/libva/libva_1.0.16.bb |    8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva_1.0.16.bb
common/recipes-multimedia/libva/libva_1.0.15.bb deleted +0 -8
deleted file mode 100644
index e60a4b6..0000000
@@ -1,8 +0,0 @@
-require libva.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "ad8a94ba87ff0563a533c3c142816794"
-SRC_URI[sha256sum] = "7cc24ae9c947aa13904255244810d3637b03d41e2b6f4b643db3b97412cacd37"
common/recipes-multimedia/libva/libva_1.0.16.bb new file +8 -0
new file mode 100644
index 0000000..7374c70
@@ -0,0 +1,8 @@
+require libva.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva/libva-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "99343b27cf24e99abc0c5db2d09e30c8"
+SRC_URI[sha256sum] = "03e46f8f48f252e6b6112c495745100bc217ddded801fdb393384aab1fafeaa2"
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH v2 2/4 libva-intel-driver: update to the latest version

From: Nitin A Kamble <[email protected]>

The older version of libva-intel-driver recipe with newer gst-vaapi recipe was causing video playback failure.

As per the discussion on the bug here:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=3348

The maintainer of the upstream project is recommending to update the recipe to the latest version to fix the video playback issue.

Also, use the release tarball instead of a tag snapshot.

Signed-off-by Nitin A Kamble <[email protected]>
Signed-off-by Ross Burton <[email protected]>
---
 .../libva/libva-intel-driver.inc                   |    2 +-
 .../libva/libva-intel-driver_1.0.15.bb             |    8 --------
 .../libva/libva-intel-driver_1.0.18.bb             |    8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.18.bb
common/recipes-multimedia/libva/libva-intel-driver.inc +1 -1
index f0c6b9a..fa7be4c 100644
@@ -15,7 +15,7 @@ INC_PR = "r0"
 
 DEPENDS = "libva"
 
-S = "${WORKDIR}/intel-driver-${PV}"
+S = "${WORKDIR}/${PN}-${PV}"
 
 inherit autotools pkgconfig
common/recipes-multimedia/libva/libva-intel-driver_1.0.15.bb deleted +0 -8
deleted file mode 100644
index 6fdd6a9..0000000
@@ -1,8 +0,0 @@
-require libva-intel-driver.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "9dbd642f18993335146480a3a2987874"
-SRC_URI[sha256sum] = "52f16f78129af00ec40afc6a1b8fb07c7b6c6c0da7f43a54e19afd2a41791098"
common/recipes-multimedia/libva/libva-intel-driver_1.0.18.bb new file +8 -0
new file mode 100644
index 0000000..fcd3b6f
@@ -0,0 +1,8 @@
+require libva-intel-driver.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "13907085223d88d956cdfc282962b7a7"
+SRC_URI[sha256sum] = "789fa2d6e22b9028ce12a89981eb33e57b04301431415149acfb61a49d3a63ee"
Signature · 1 line
1.7.3.4
author
#3 lore raw

PATCH v2 3/4 libva: remove redundant libva 1.0.12

In reply to [email protected]

From: Ross Burton <[email protected]>

No BSP from meta-intel repo is requiring this version of libva now.

Signed-off-by Ross Burton <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
---
 common/recipes-multimedia/libva/libva_1.0.12.bb |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.12.bb
common/recipes-multimedia/libva/libva_1.0.12.bb deleted +0 -8
deleted file mode 100644
index 490e60f..0000000
@@ -1,8 +0,0 @@
-require libva.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "http://cgit.freedesktop.org/libva/snapshot/libva-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "84408a0746a63b8cf308dc7b9f2451cf"
-SRC_URI[sha256sum] = "e80aae68fc78d237d046be6525d333f072fd57fe4f4d8f981e869703ebfee8f5"
Signature · 1 line
1.7.3.4
author
#4 lore raw

PATCH v2 4/4 mesa-dri.bbappend: avoid conflict with emgd-driver-bin

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

Extend the mesa-dri recipe from oecore to avoid conflict with files generated by emgd-driver-bin recipe.

This extention is needed only when emgd-driver-bin recipe is included in the target image, so the code is conditional to run only on the machine with emgd graphics driver.

The emgd binary driver also provides egl, gles1, gles2 library & headers. To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image is bundling the emgd driver.

This commits avoids these build warning

WARNING: The recipe is trying to install files into a shared area when those files already exist. Those files are:
/srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/KHR/khrplatform.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglplatform.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/eglext.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/EGL/egl.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glplatform.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/gl.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES/glext.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2ext.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2.h /srv/home/nitin/build-test-bsps/build-crownbay/tmp/sysroots/crownbay/usr/include/GLES2/gl2platform.h

And revert the replacement change commited earlier to avoid these warnings.
Revert "mesa-dri.bbappend: avoid buildtime warnings"
This reverts commit 2408d28972db8e56f37ec52208adc65734c61dea.

This fixes the bug:
[YOCTO #3295]

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   27 +++++++++++++++++---
 1 files changed, 23 insertions(+), 4 deletions(-)
common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend +23 -4
index 90e4394..6bfa968 100644
@@ -1,5 +1,24 @@
-# Temporary avoid warnings of duplicate files providers until
-# mesa-dri & emgd-driver-bin recipes are fixed
-SSTATE_DUPWHITELIST += "${STAGING_INCDIR}/KHR ${STAGING_INCDIR}/EGL \
-                        ${STAGING_INCDIR}/GLES ${STAGING_INCDIR}/GLES2"
 
+# The emgd binary driver also provides egl, gles1, gles2 library & headers.
+# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image
+# is bundling the emgd driver.
+
+python __anonymous () {
+    import re
+    xserver = d.getVar('XSERVER', True)
+    if 'emgd-driver-bin' in xserver.split(' '):
+        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
+	take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
+	put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
+        pattern = re.compile("--with-egl-platforms")
+        new_extra_oeconf = [ ]
+	for i in extra_oeconf:
+            if ( i not in take_out ) and ( not pattern.match(i)):
+                new_extra_oeconf.append(i)
+        for i in put_in:
+            new_extra_oeconf.append(i)
+
+        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
+        depends = d.getVar('DEPENDS', True)
+        d.setVar('DEPENDS', depends + " emgd-driver-bin")
+}
Signature · 1 line
1.7.3.4
#5 lore raw
In reply to [email protected]
Quoted 5 lines · On 10/31/2012 10:14 PM, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

This v2 pull request is with newer version of libva-intel-driver. These commits tested on All the BSPs I am maintaining with expected results.

Nitin, do these patches fix any specific bug? Such as 3348? You mention a couple, but not clearly that these patches fix them. If so, please include:

Fixes [YOCTO #XXXX]

in the commit log for the associated patch(es).

Otherwise this looks to be what we have discussed.

Thanks,

Darren

Quoted 33 lines

Thanks,
Nitin

The following changes since commit 43b2e9c34363ade4241a60f699b47179929c6fb6:

n450: Add WEBTITLE and boilerplate README (2012-10-31 08:40:15 -0700)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/misc
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc

Nitin A Kamble (3):
libva: update to the latest version
libva-intel-driver: update to the latest version mesa-dri.bbappend: avoid conflict with emgd-driver-bin

Ross Burton (1):
libva: remove redundant libva 1.0.12

 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   27 +++++++++++++++++---
 .../libva/libva-intel-driver.inc                   |    2 +-
 .../libva/libva-intel-driver_1.0.15.bb             |    8 ------
 .../libva/libva-intel-driver_1.0.18.bb             |    8 ++++++
 common/recipes-multimedia/libva/libva_1.0.12.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.15.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.16.bb    |    8 ++++++
 7 files changed, 40 insertions(+), 29 deletions(-)
 delete mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.18.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.12.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva_1.0.16.bb
Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#6 lore raw
Quoted 7 lines · Darren Hart
Quoted 5 lines · On 10/31/2012 10:14 PM, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

This v2 pull request is with newer version of libva-intel-driver. These commits tested on All the BSPs I am maintaining with expected results.

Quoted 8 lines

Nitin, do these patches fix any specific bug? Such as 3348? You mention a couple, but not clearly that these patches fix them. If so, please include:

Fixes [YOCTO #XXXX]

in the commit log for the associated patch(es).

To save time, I'll go ahead and add that to those 2 patches when I pull it in...

Tom

Quoted 40 lines

Otherwise this looks to be what we have discussed.

Thanks,

Darren

Quoted 33 lines

Thanks,
Nitin

The following changes since commit 43b2e9c34363ade4241a60f699b47179929c6fb6:

n450: Add WEBTITLE and boilerplate README (2012-10-31 08:40:15 -0700)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/misc
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc

Nitin A Kamble (3):
libva: update to the latest version
libva-intel-driver: update to the latest version mesa-dri.bbappend: avoid conflict with emgd-driver-bin

Ross Burton (1):
libva: remove redundant libva 1.0.12

 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   27 +++++++++++++++++---
 .../libva/libva-intel-driver.inc                   |    2 +-
 .../libva/libva-intel-driver_1.0.15.bb             |    8 ------
 .../libva/libva-intel-driver_1.0.18.bb             |    8 ++++++
 common/recipes-multimedia/libva/libva_1.0.12.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.15.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.16.bb    |    8 ++++++
 7 files changed, 40 insertions(+), 29 deletions(-)
 delete mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.18.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.12.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva_1.0.16.bb
author
#7 lore raw
Quoted 23 lines

-----Original Message-----
From: Zanussi, Tom
Sent: Thursday, November 01, 2012 6:33 AM
To: Hart, Darren
Cc: Kamble, Nitin A; [email protected]; Burton, Ross
Subject: Re: [Patch v2 0/4] Misc Fixes for meta-intel 1.3 release

Quoted 5 lines · Darren Hart
Quoted 4 lines · On 10/31/2012 10:14 PM, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

This v2 pull request is with newer version of libva-intel-driver. These commits tested on All the BSPs I am maintaining with expected

results.

Quoted 7 lines
Quoted 1 line

Nitin, do these patches fix any specific bug? Such as 3348? You mention a couple, but not clearly that these patches fix them. If so, please
include:

Quoted 6 lines
Quoted 4 lines

Fixes [YOCTO #XXXX]

in the commit log for the associated patch(es).

To save time, I'll go ahead and add that to those 2 patches when I pull it in...

Thanks Tom,
Nitin

Quoted 50 lines

Tom

Quoted 10 lines

Otherwise this looks to be what we have discussed.

Thanks,

Darren

Quoted 4 lines

Thanks,
Nitin

The following changes since commit

43b2e9c34363ade4241a60f699b47179929c6fb6:

Quoted 15 lines
Quoted 15 lines

n450: Add WEBTITLE and boilerplate README (2012-10-31 08:40:15
-0700)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/misc

http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin
/misc

Nitin A Kamble (3):
libva: update to the latest version
libva-intel-driver: update to the latest version mesa-dri.bbappend: avoid conflict with emgd-driver-bin

Quoted 4 lines
Quoted 4 lines

Ross Burton (1):
libva: remove redundant libva 1.0.12

 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   27

+++++++++++++++++---

Quoted 15 lines
Quoted 14 lines
 .../libva/libva-intel-driver.inc                   |    2 +-
 .../libva/libva-intel-driver_1.0.15.bb             |    8 ------
 .../libva/libva-intel-driver_1.0.18.bb             |    8 ++++++
 common/recipes-multimedia/libva/libva_1.0.12.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.15.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.16.bb    |    8 ++++++
 7 files changed, 40 insertions(+), 29 deletions(-)  delete mode
100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.15.bb
 create mode 100644
common/recipes-multimedia/libva/libva-intel-driver_1.0.18.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.12.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva_1.0.16.bb
#8 lore raw
In reply to [email protected]
Quoted 5 lines · On Wed, 2012-10-31 at 22:14 -0700, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

This v2 pull request is with newer version of libva-intel-driver. These commits tested on All the BSPs I am maintaining with expected results.

OK, I've confirmed video works on crownbay and have two independent confirmations that cedartrail works fine too.

All pulled into meta-intel/master.

Thanks,

Tom

Quoted 33 lines

Thanks,
Nitin

The following changes since commit 43b2e9c34363ade4241a60f699b47179929c6fb6:

n450: Add WEBTITLE and boilerplate README (2012-10-31 08:40:15 -0700)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/misc
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc

Nitin A Kamble (3):
libva: update to the latest version
libva-intel-driver: update to the latest version mesa-dri.bbappend: avoid conflict with emgd-driver-bin

Ross Burton (1):
libva: remove redundant libva 1.0.12

 .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |   27 +++++++++++++++++---
 .../libva/libva-intel-driver.inc                   |    2 +-
 .../libva/libva-intel-driver_1.0.15.bb             |    8 ------
 .../libva/libva-intel-driver_1.0.18.bb             |    8 ++++++
 common/recipes-multimedia/libva/libva_1.0.12.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.15.bb    |    8 ------
 common/recipes-multimedia/libva/libva_1.0.16.bb    |    8 ++++++
 7 files changed, 40 insertions(+), 29 deletions(-)
 delete mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva-intel-driver_1.0.18.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.12.bb
 delete mode 100644 common/recipes-multimedia/libva/libva_1.0.15.bb
 create mode 100644 common/recipes-multimedia/libva/libva_1.0.16.bb