Xorg, mesa changes

PATCH In review Martin Jansa 5 participants 40 messages Oct 13, 2011 – Oct 14, 2011

lore

Share & tools

lore

Martin Jansa

author

2011-10-13 11:36 UTC #0 lore raw

cover Xorg, mesa changes

Mostly cleanup in mesa directory.

Most controversial is
mesa-dri: introduce MACHINE_DRI_MODULES
but maybe we can use it as distro variable and keep it with default arch. But then we cannot just add ie glamo dri module from meta-openmoko like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.

The following changes since commit 5ad1ca59dea6d5045f252ed7b786ad193faced64:

xf86-video-intel: Update 2.15.0 -> 2.16.0 (2011-10-12 22:59:14 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11-v4
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v4

Martin Jansa (20):
xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
xserver-xorg: move PE to xserver-xorg-common and bump it
xorg-driver-common: bump PE for upgrade path for meta-oe users
mesa-dri-glsl-native: fix LICENSE
mesa: move common patches which could be used in both mesa-dri and
mesa-xlib from mesa-dri to mesa
mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions
mesa-common: MesaDemos is now separate recipes, bump PE, introduce
INC_PR
mesa-common: use glx-use-tls.inc instead of enabling glx-tls every
time
mesa-7.11: move shared DEPENDS, SRC_URI, checksums and
do_configure_prepend to shared .inc file
mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
mesa: package gl/egl/osmesa to separate packages
mesa-xlib: move shared options to .inc
mesa-dri: move shared options to mesa-dri.inc
mesa-dri: introduce MACHINE_DRI_MODULES
mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging
each lib in separate package
mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody
mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add
mesa-xlib_git
mesa-git: lower D_P a bit more then all mesa-dri
mesa-git: upgrade from 7.7+git to 7.11+git
mesa-git: fix LIC_FILES_CHKSUM

 meta/recipes-graphics/mesa/mesa-7.11.inc           |   14 ++
 meta/recipes-graphics/mesa/mesa-common.inc         |   36 ++++-
 .../mesa/mesa-dri-glsl-native_7.11.bb              |    2 +-
 meta/recipes-graphics/mesa/mesa-dri.inc            |   24 +++
 meta/recipes-graphics/mesa/mesa-dri/cross2.patch   |   46 ------
 meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h |  162 --------------------
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb        |   50 +------
 meta/recipes-graphics/mesa/mesa-dri_git.bb         |   59 +-------
 meta/recipes-graphics/mesa/mesa-git.inc            |   20 +++
 meta/recipes-graphics/mesa/mesa-git/uclibc.patch   |   57 +++++++
 meta/recipes-graphics/mesa/mesa-xlib.inc           |    1 +
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb       |   31 +----
 meta/recipes-graphics/mesa/mesa-xlib_git.bb        |    8 +
 .../mesa/{mesa-dri => mesa}/crossfix.patch         |    0
 .../mesa/{mesa-dri => mesa}/uclibc.patch           |    0
 .../xorg-driver/xorg-driver-common.inc             |    2 +-
 .../xorg-xserver/xserver-xorg-1.11.1.inc           |    2 +
 .../xorg-xserver/xserver-xorg-common.inc           |    3 +-
 .../xorg-xserver/xserver-xorg_1.11.1.bb            |    2 -
 19 files changed, 172 insertions(+), 347 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri.inc
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/cross2.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
 create mode 100644 meta/recipes-graphics/mesa/mesa-git.inc
 create mode 100644 meta/recipes-graphics/mesa/mesa-git/uclibc.patch
 create mode 100644 meta/recipes-graphics/mesa/mesa-xlib.inc
 create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_git.bb
 rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/crossfix.patch (100%)
 rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/uclibc.patch (100%)

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:36 UTC #1 lore raw

PATCH 1/20 xserver-xorg: drop xorg-minimal-fonts from RDEPENDS

* as discussed here http://lists.linuxtogo.org/pipermail/openembedded-core/2011-October/010899.html

Signed-off-by Martin Jansa <[email protected]>

---
 .../xorg-xserver/xserver-xorg-1.11.1.inc           |    2 ++
 .../xorg-xserver/xserver-xorg-common.inc           |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc +2 -0

index 690de3f..2c5bb0a 100644
@@ -3,5 +3,7 @@ SRC_URI += "file://crosscompile.patch"
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch"
 
+PR = "r1"
+
 SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d"
 SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6"

meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +0 -1

index 0cc3dc0..a8c7b0a 100644
@@ -60,7 +60,6 @@ PACKAGES =+ "${PN}-security-policy \
              ${PN}-module-libxf1bpp \
              ${PN}-module-libxf4bpp"
 
-RDEPENDS_${PN} += "xorg-minimal-fonts"
 RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
 RDEPENDS_${PN}-xvfb += "xkeyboard-config"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:36 UTC #2 lore raw

PATCH 2/20 xserver-xorg: move PE to xserver-xorg-common and bump it

* to provide upgrade path for meta-oe users, where it had PE = 2 already

Signed-off-by Martin Jansa <[email protected]>

---
 .../xorg-xserver/xserver-xorg-common.inc           |    2 ++
 .../xorg-xserver/xserver-xorg_1.11.1.bb            |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +2 -0

index a8c7b0a..2559397 100644
@@ -12,6 +12,8 @@ PROVIDES = "virtual/xserver-xf86"
 # Other packages tend to just care that there is *an* X server:
 PROVIDES += "virtual/xserver"
 
+PE = "2"
+
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 SRC_URI += "file://macro_tweak.patch"

meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +0 -2

index 8e97888..0f94fe2 100644
@@ -1,4 +1,2 @@
 require xserver-xorg.inc
 require xserver-xorg-${PV}.inc
-
-PE = "1"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:36 UTC #3 lore raw

PATCH 3/20 xorg-driver-common: bump PE for upgrade path for meta-oe users

In reply to Martin Jansa

* mostly because of xf86-video-omapfb
Not downgrading package xf86-video-omapfb on root from 1:0.1.1+r16+gitr28c006c94e57ea71df11ec4fff79d7ffcfc4860f-r16 to 1:0.1.1+gitr1+28c006c94e57ea71df11ec4fff79d7ffcfc4860f-r17.5.

Signed-off-by Martin Jansa <[email protected]>

---
 .../xorg-driver/xorg-driver-common.inc             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +1 -1

index 097060e..9a474b7 100644
@@ -4,7 +4,7 @@ BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11/drivers"
 LICENSE = "MIT-X"
 
-PE = "1"
+PE = "2"
 INC_PR = "r17"
 
 DEPENDS = "virtual/xserver xproto randrproto util-macros"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:36 UTC #4 lore raw

PATCH 4/20 mesa-dri-glsl-native: fix LICENSE

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../mesa/mesa-dri-glsl-native_7.11.bb              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb +1 -1

index 07247d5..07b0761 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "gl shader language specific build from mesa-dri"
 HOMEPAGE = "http://mesa3d.org"
 BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11"
-LICENSE = "GPLv3"
+LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
 
 DEPENDS = "makedepend-native"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:37 UTC #5 lore raw

PATCH 5/20 mesa: move common patches which could be used in both mesa-dri and mesa-xlib from mesa-dri to mesa

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-common.inc         |    3 +++
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb       |    2 --
 .../mesa/{mesa-dri => mesa}/cross2.patch           |    0
 .../mesa/{mesa-dri => mesa}/crossfix.patch         |    0
 .../mesa/{mesa-dri => mesa}/i586/matypes.h         |    0
 .../mesa/{mesa-dri => mesa}/uclibc.patch           |    0
 6 files changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/cross2.patch (100%)
 rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/crossfix.patch (100%)
 rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/i586/matypes.h (100%)
 rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/uclibc.patch (100%)

meta/recipes-graphics/mesa/mesa-common.inc +3 -0

index d8e800e..b3d1c8f 100644
@@ -18,6 +18,9 @@ S = "${WORKDIR}/Mesa-${PV}"
 
 PROVIDES = "virtual/libgl"
 
+# for mesa-dri and mesa-xlib
+FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
+
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-glu \

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +0 -2

index ea4acc6..1e0d95e 100644
@@ -1,7 +1,5 @@
 include mesa-common.inc
 
-FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
-
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://uclibc.patch \
            "

meta/recipes-graphics/mesa/mesa/cross2.patch renamed from meta/recipes-graphics/mesa/mesa-dri/cross2.patch +0 -0

similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/cross2.patch
rename to meta/recipes-graphics/mesa/mesa/cross2.patch

meta/recipes-graphics/mesa/mesa/crossfix.patch renamed from meta/recipes-graphics/mesa/mesa-dri/crossfix.patch +0 -0

similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
rename to meta/recipes-graphics/mesa/mesa/crossfix.patch

meta/recipes-graphics/mesa/mesa/i586/matypes.h renamed from meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h +0 -0

similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
rename to meta/recipes-graphics/mesa/mesa/i586/matypes.h

meta/recipes-graphics/mesa/mesa/uclibc.patch renamed from meta/recipes-graphics/mesa/mesa-dri/uclibc.patch +0 -0

similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
rename to meta/recipes-graphics/mesa/mesa/uclibc.patch

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:37 UTC #6 lore raw

PATCH 6/20 mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-common.inc   |    1 +
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb  |    2 --
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |    2 --
 3 files changed, 1 insertions(+), 4 deletions(-)

meta/recipes-graphics/mesa/mesa-common.inc +1 -0

index b3d1c8f..fb9a216 100644
@@ -10,6 +10,7 @@ HOMEPAGE = "http://mesa3d.org"
 BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11"
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
            ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos "

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +0 -2

index 6fc8d95..5f15091 100644
@@ -1,7 +1,5 @@
 include mesa-common.inc
 
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-
 PROTO_DEPS = "xf86driproto glproto dri2proto"
 LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \
             libxml2-native"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +0 -2

index 1e0d95e..8b83378 100644
@@ -7,8 +7,6 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
 SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
 
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-
 PROTO_DEPS = "xf86driproto glproto"
 LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:37 UTC #7 lore raw

PATCH 7/20 mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-common.inc   |    5 +++--
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb  |    2 +-
 meta/recipes-graphics/mesa/mesa-dri_git.bb   |    2 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |    3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

meta/recipes-graphics/mesa/mesa-common.inc +3 -2

index fb9a216..ee359ba 100644
@@ -12,9 +12,10 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
-           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos "
+INC_PR = "r12"
+PE = "2"
 
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
 S = "${WORKDIR}/Mesa-${PV}"
 
 PROVIDES = "virtual/libgl"

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +1 -1

index 5f15091..5f14346 100644
@@ -7,7 +7,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native python-native"
 DEPENDS += "mesa-dri-glsl-native"
 
-PR = "r5"
+PR = "${INC_PR}.0"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://crossfix.patch \

meta/recipes-graphics/mesa/mesa-dri_git.bb +1 -1

index 9e32d0a..c50ba15 100644
@@ -13,7 +13,7 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
 PV = "7.7+git${SRCPV}"
-PR = "r2"
+PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +1 -2

index 8b83378..1e0d821 100644
@@ -12,8 +12,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
 
-PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"

Signature · 1 line

1.7.7

Khem Raj

2011-10-13 23:51 UTC #8 lore raw

Re: [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR

Quoted 16 lines · Martin Jansa

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-common.inc   |    5 +++--
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb  |    2 +-
 meta/recipes-graphics/mesa/mesa-dri_git.bb   |    2 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |    3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)
meta/recipes-graphics/mesa/mesa-common.inc +0 -0
index fb9a216..ee359ba 100644
@@ -12,9 +12,10 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"

meta/recipes-graphics/mesa/mesa-common.inc SECTION = "x11" · line 16

Quoted 4 lines

meta/recipes-graphics/mesa/mesa-common.inc +2 -2

-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
-           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos "
+INC_PR = "r12"
+PE = "2"

Do u really need PE ?

Quoted 54 lines

+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" S = "${WORKDIR}/Mesa-${PV}"
PROVIDES = "virtual/libgl"
meta/recipes-graphics/mesa/mesa-dri_7.11.bb +0 -0
index 5f15091..5f14346 100644
@@ -7,7 +7,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native" DEPENDS += "mesa-dri-glsl-native"
meta/recipes-graphics/mesa/mesa-dri_7.11.bb +1 -1
-PR = "r5"
+PR = "${INC_PR}.0"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://crossfix.patch \
meta/recipes-graphics/mesa/mesa-dri_git.bb +0 -0
index 9e32d0a..c50ba15 100644
@@ -13,7 +13,7 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" PV = "7.7+git${SRCPV}"
meta/recipes-graphics/mesa/mesa-dri_git.bb +1 -1
-PR = "r2"
+PR = "${INC_PR}.0"
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +0 -0
index 8b83378..1e0d821 100644
@@ -12,8 +12,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
 
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native"
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +1 -2
-PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"
--
1.7.7
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Martin Jansa

author

2011-10-14 06:53 UTC #9 lore raw

Re: [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR

Quoted 17 lines · Khem Raj

Quoted 16 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-common.inc   |    5 +++--
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb  |    2 +-
 meta/recipes-graphics/mesa/mesa-dri_git.bb   |    2 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |    3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)
meta/recipes-graphics/mesa/mesa-common.inc +0 -0
index fb9a216..ee359ba 100644
@@ -12,9 +12,10 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"

Quoted 6 lines

meta/recipes-graphics/mesa/mesa-common.inc SECTION = "x11" · line 16
Quoted 4 lines
meta/recipes-graphics/mesa/mesa-common.inc +2 -2
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
-           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos "
+INC_PR = "r12"
+PE = "2"
Do u really need PE ?

Yes because I wanted upgrade path for meta-oe users.. (same with PE bumping patches for xserver-xorg and xorg-drivers..)

Quoted 60 lines

Quoted 46 lines
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" S = "${WORKDIR}/Mesa-${PV}"
PROVIDES = "virtual/libgl"
meta/recipes-graphics/mesa/mesa-dri_7.11.bb +0 -0
index 5f15091..5f14346 100644
@@ -7,7 +7,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native" DEPENDS += "mesa-dri-glsl-native"
meta/recipes-graphics/mesa/mesa-dri_7.11.bb +1 -1
-PR = "r5"
+PR = "${INC_PR}.0"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://crossfix.patch \
meta/recipes-graphics/mesa/mesa-dri_git.bb +0 -0
index 9e32d0a..c50ba15 100644
@@ -13,7 +13,7 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" PV = "7.7+git${SRCPV}"
meta/recipes-graphics/mesa/mesa-dri_git.bb +1 -1
-PR = "r2"
+PR = "${INC_PR}.0"
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +0 -0
index 8b83378..1e0d821 100644
@@ -12,8 +12,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
 
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native"
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +1 -2
-PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"
Quoted 9 lines
--
1.7.7
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2011-10-13 11:37 UTC #10 lore raw

PATCH 8/20 mesa-common: use glx-use-tls.inc instead of enabling glx-tls every time

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-common.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

meta/recipes-graphics/mesa/mesa-common.inc +3 -1

index ee359ba..1596832 100644
@@ -28,7 +28,9 @@ inherit autotools pkgconfig
 EXTRA_OECONF = "--enable-glu \
                 --disable-glw \
                 --disable-glut \
-                --enable-glx-tls"
+               "
+
+require glx-use-tls.inc
 
 # Multiple virtual/gl providers being built breaks staging
 EXCLUDE_FROM_WORLD = "1"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:37 UTC #11 lore raw

PATCH 9/20 mesa-7.11: move shared DEPENDS, SRC_URI, checksums and do_configure_prepend to shared .inc file

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-7.11.inc     |   14 ++++++++++++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb  |   17 +----------------
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |   16 +---------------
 3 files changed, 16 insertions(+), 31 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc

meta/recipes-graphics/mesa/mesa-7.11.inc new file +14 -0

new file mode 100644
index 0000000..746b764
@@ -0,0 +1,14 @@
+DEPENDS += "mesa-dri-glsl-native"
+
+SRC_URI += "file://uclibc.patch \
+            file://crossfix.patch \
+           "
+SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
+SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
+
+do_configure_prepend() {
+  #check for python not python2, because python-native does not stage python2 binary/link
+  sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
+  # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
+  sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
+}

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +1 ~~-16~~

index 5f14346..90873aa 100644
@@ -1,22 +1,14 @@
 include mesa-common.inc
+include mesa-${PV}.inc
 
 PROTO_DEPS = "xf86driproto glproto dri2proto"
 LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \
             libxml2-native"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native python-native"
-DEPENDS += "mesa-dri-glsl-native"
 
 PR = "${INC_PR}.0"
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           file://crossfix.patch \
-           file://uclibc.patch \
-          "
-
-SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
-SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
-
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"

@@ -37,10 +29,3 @@ COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-
-do_configure_prepend() {
-	#check for python not python2, because python-native does not stage python2 binary/link
-	sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
-	# We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
-	sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
-}

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +1 ~~-15~~

index 1e0d821..44719a0 100644
@@ -1,11 +1,5 @@
 include mesa-common.inc
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           file://uclibc.patch \
-           "
-
-SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
-SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
+include mesa-${PV}.inc
 
 PROTO_DEPS = "xf86driproto glproto"
 LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"

@@ -15,11 +9,3 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
 PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"
-
-do_configure_prepend() {
-	#check for python not python2, because python-native does not stage python2 binary/link
-	sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
-	# We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
-	sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
-}
-

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:37 UTC #12 lore raw

PATCH 10/20 mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-common.inc   |    5 +++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb  |    7 ++-----
 meta/recipes-graphics/mesa/mesa-dri_git.bb   |    6 ++----
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |    5 -----
 4 files changed, 9 insertions(+), 14 deletions(-)

meta/recipes-graphics/mesa/mesa-common.inc +5 -0

index 1596832..89ef0cf 100644
@@ -18,6 +18,11 @@ PE = "2"
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
 S = "${WORKDIR}/Mesa-${PV}"
 
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
+
+DEPENDS = "makedepend-native python-native ${PROTO_DEPS} ${LIB_DEPS}"
+
 PROVIDES = "virtual/libgl"
 
 # for mesa-dri and mesa-xlib

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +2 -5

index 90873aa..8ab1941 100644
@@ -1,11 +1,8 @@
 include mesa-common.inc
 include mesa-${PV}.inc
 
-PROTO_DEPS = "xf86driproto glproto dri2proto"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \
-            libxml2-native"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native python-native"
+PROTO_DEPS += "dri2proto"
+LIB_DEPS += "libdrm expat"
 
 PR = "${INC_PR}.0"

meta/recipes-graphics/mesa/mesa-dri_git.bb +2 -4

index c50ba15..10ebd1c 100644
@@ -6,10 +6,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
 #           file://mesa-DRI2Swapbuffer.patch "
 S = "${WORKDIR}/git"
 
-PROTO_DEPS = "xf86driproto glproto dri2proto"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+PROTO_DEPS += "dri2proto"
+LIB_DEPS += "libdrm expat"
 
 SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
 PV = "7.7+git${SRCPV}"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +0 -5

index 44719a0..08277ac 100644
@@ -1,11 +1,6 @@
 include mesa-common.inc
 include mesa-${PV}.inc
 
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
-
 PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:37 UTC #13 lore raw

PATCH 11/20 mesa: package gl/egl/osmesa to separate packages

In reply to Martin Jansa

* also install internal GL headers to libgl-dev

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-common.inc |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

meta/recipes-graphics/mesa/mesa-common.inc +16 -2

index 89ef0cf..62d9b24 100644
@@ -40,7 +40,21 @@ require glx-use-tls.inc
 # Multiple virtual/gl providers being built breaks staging
 EXCLUDE_FROM_WORLD = "1"
 
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
 FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
 FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}

Signature · 1 line

1.7.7

Richard Purdie

2011-10-14 11:18 UTC #14 lore raw

Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages

Quoted 25 lines · Martin Jansa

* also install internal GL headers to libgl-dev

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-common.inc |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

meta/recipes-graphics/mesa/mesa-common.inc +7 -2

index 89ef0cf..62d9b24 100644
@@ -40,7 +40,21 @@ require glx-use-tls.inc
 # Multiple virtual/gl providers being built breaks staging
 EXCLUDE_FROM_WORLD = "1"
 
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
 FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"

meta/recipes-graphics/mesa/mesa-common.inc require glx-use-tls.inc · line 60

Quoted 10 lines

meta/recipes-graphics/mesa/mesa-common.inc +9 -0

 FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}

This last do_install_append is wrong. Things should only be using installed header files, not internal uninstalled ones. If the need anything else there is a bug. I know the intel video driver had issues in this area but those were fixed in the driver.

What other issues are people seeing without this piece?

Cheers,

Richard

Martin Jansa

author

2011-10-14 11:25 UTC #15 lore raw

Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages

Quoted 33 lines · Richard Purdie

Quoted 32 lines · Martin Jansa

* also install internal GL headers to libgl-dev

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-common.inc |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

meta/recipes-graphics/mesa/mesa-common.inc +13 -2

index 89ef0cf..62d9b24 100644
@@ -40,7 +40,21 @@ require glx-use-tls.inc
 # Multiple virtual/gl providers being built breaks staging
 EXCLUDE_FROM_WORLD = "1"
 
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
 FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
 FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {

Quoted 8 lines

meta/recipes-graphics/mesa/mesa-common.inc require glx-use-tls.inc · line 60
Quoted 3 lines
meta/recipes-graphics/mesa/mesa-common.inc +3 -0
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
This last do_install_append is wrong. Things should only be using installed header files, not internal uninstalled ones. If the need anything else there is a bug. I know the intel video driver had issues in this area but those were fixed in the driver.

checking from where we got this in meta-oe I've found really old commit
http://git.openembedded.org/openembedded/commit/packages/mesa/mesa-common.inc?id=523eeb1062797a8562446fbefe9413a59540816b
so you're right, I'll try to rebuild without this and drop this part from patchset.

Quoted 1 line

What other issues are people seeing without this piece?

Unless someone else knows about still broken driver :).

Regards,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Koen Kooi

2011-10-14 13:38 UTC #16 lore raw

Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages

Op 14 okt. 2011, om 13:19 heeft Martin Jansa het volgende geschreven:

Quoted 43 lines · Richard Purdie

Quoted 33 lines · Martin Jansa
Quoted 32 lines
* also install internal GL headers to libgl-dev
Signed-off-by Martin Jansa <[email protected]>
---
meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa-common.inc +0 -0
index 89ef0cf..62d9b24 100644
@@ -40,7 +40,21 @@ require glx-use-tls.inc
 # Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
meta/recipes-graphics/mesa/mesa-common.inc +3 -2
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
meta/recipes-graphics/mesa/mesa-common.inc +4 -0
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
meta/recipes-graphics/mesa/mesa-common.inc +6 -0
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
Quoted 8 lines
meta/recipes-graphics/mesa/mesa-common.inc require glx-use-tls.inc · line 60
Quoted 3 lines
meta/recipes-graphics/mesa/mesa-common.inc +3 -0
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
This last do_install_append is wrong. Things should only be using installed header files, not internal uninstalled ones. If the need anything else there is a bug. I know the intel video driver had issues in this area but those were fixed in the driver.

Quoted 8 lines

checking from where we got this in meta-oe I've found really old commit
http://git.openembedded.org/openembedded/commit/packages/mesa/mesa-common.inc?id=523eeb1062797a8562446fbefe9413a59540816b
so you're right, I'll try to rebuild without this and drop this part from patchset.
Quoted 1 line
What other issues are people seeing without this piece?
Unless someone else knows about still broken driver :).

| glxdriswrast.c:39:39: fatal error: GL/internal/dri_interface.h: No such file or directory
| compilation terminated.
| glxdricommon.c:36:39: fatal error: GL/internal/dri_interface.h: No such file or directory
| compilation terminated.
| make[1]: *** [glxdricommon.lo] Error 1
| make[1]: *** Waiting for unfinished jobs....
| make[1]: *** [glxdriswrast.lo] Error 1
| make[1]: Leaving directory `/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/xserver-xorg-2_1.11.1-r1/xorg-server-1.11.1/glx'

Xorg requires 'mesa-dri', which doesn't build anymore due to the COMPATIBLE_HOST :(

Richard Purdie

2011-10-14 14:04 UTC #17 lore raw

Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages

Quoted 64 lines · Koen Kooi

Op 14 okt. 2011, om 13:19 heeft Martin Jansa het volgende geschreven:
Quoted 43 lines · Richard Purdie
Quoted 33 lines · Martin Jansa
Quoted 32 lines
* also install internal GL headers to libgl-dev
Signed-off-by Martin Jansa <[email protected]>
---
meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa-common.inc +0 -0
index 89ef0cf..62d9b24 100644
@@ -40,7 +40,21 @@ require glx-use-tls.inc
 # Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
meta/recipes-graphics/mesa/mesa-common.inc +3 -2
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
meta/recipes-graphics/mesa/mesa-common.inc +4 -0
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
meta/recipes-graphics/mesa/mesa-common.inc +6 -0
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
Quoted 8 lines
meta/recipes-graphics/mesa/mesa-common.inc require glx-use-tls.inc · line 60
Quoted 3 lines
meta/recipes-graphics/mesa/mesa-common.inc +3 -0
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
This last do_install_append is wrong. Things should only be using installed header files, not internal uninstalled ones. If the need anything else there is a bug. I know the intel video driver had issues in this area but those were fixed in the driver.
Quoted 8 lines
checking from where we got this in meta-oe I've found really old commit
http://git.openembedded.org/openembedded/commit/packages/mesa/mesa-common.inc?id=523eeb1062797a8562446fbefe9413a59540816b
so you're right, I'll try to rebuild without this and drop this part from patchset.
Quoted 1 line
What other issues are people seeing without this piece?
Unless someone else knows about still broken driver :).
| glxdriswrast.c:39:39: fatal error: GL/internal/dri_interface.h: No such file or directory
| compilation terminated.
| glxdricommon.c:36:39: fatal error: GL/internal/dri_interface.h: No such file or directory
| compilation terminated.
| make[1]: *** [glxdricommon.lo] Error 1
| make[1]: *** Waiting for unfinished jobs....
| make[1]: *** [glxdriswrast.lo] Error 1
| make[1]: Leaving directory `/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/xserver-xorg-2_1.11.1-r1/xorg-server-1.11.1/glx'

Quoted 1 line

Xorg requires 'mesa-dri', which doesn't build anymore due to the COMPATIBLE_HOST :(

This means the swrast dri backend should be installing that file...

Hmm, so does the xserver now require the dri backend and the xlib one is now defunct?

Cheers,

Richard

Martin Jansa

author

2011-10-14 14:08 UTC #18 lore raw

Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages

Quoted 65 lines · Richard Purdie

Quoted 64 lines · Koen Kooi
Op 14 okt. 2011, om 13:19 heeft Martin Jansa het volgende geschreven:
Quoted 43 lines · Richard Purdie
Quoted 33 lines · Martin Jansa
Quoted 32 lines
* also install internal GL headers to libgl-dev
Signed-off-by Martin Jansa <[email protected]>
---
meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa-common.inc +0 -0
index 89ef0cf..62d9b24 100644
@@ -40,7 +40,21 @@ require glx-use-tls.inc
 # Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
meta/recipes-graphics/mesa/mesa-common.inc +3 -2
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
meta/recipes-graphics/mesa/mesa-common.inc +4 -0
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
meta/recipes-graphics/mesa/mesa-common.inc +6 -0
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
Quoted 8 lines
meta/recipes-graphics/mesa/mesa-common.inc require glx-use-tls.inc · line 60
Quoted 3 lines
meta/recipes-graphics/mesa/mesa-common.inc +3 -0
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
This last do_install_append is wrong. Things should only be using installed header files, not internal uninstalled ones. If the need anything else there is a bug. I know the intel video driver had issues in this area but those were fixed in the driver.
Quoted 8 lines
checking from where we got this in meta-oe I've found really old commit
http://git.openembedded.org/openembedded/commit/packages/mesa/mesa-common.inc?id=523eeb1062797a8562446fbefe9413a59540816b
so you're right, I'll try to rebuild without this and drop this part from patchset.
Quoted 1 line
What other issues are people seeing without this piece?
Unless someone else knows about still broken driver :).
| glxdriswrast.c:39:39: fatal error: GL/internal/dri_interface.h: No such file or directory
| compilation terminated.
| glxdricommon.c:36:39: fatal error: GL/internal/dri_interface.h: No such file or directory
| compilation terminated.
| make[1]: *** [glxdricommon.lo] Error 1
| make[1]: *** Waiting for unfinished jobs....
| make[1]: *** [glxdriswrast.lo] Error 1
| make[1]: Leaving directory `/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/xserver-xorg-2_1.11.1-r1/xorg-server-1.11.1/glx'

Quoted 6 lines

Quoted 1 line
Xorg requires 'mesa-dri', which doesn't build anymore due to the COMPATIBLE_HOST :(
This means the swrast dri backend should be installing that file...
Hmm, so does the xserver now require the dri backend and the xlib one is now defunct?

I'm using mesa-xlib with xserver-xorg-lite and mesa-dri with xserver-xorg, but in both cases with this do_install_append..

Regards,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2011-10-13 11:37 UTC #19 lore raw

PATCH 12/20 mesa-xlib: move shared options to .inc

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-xlib.inc     |    1 +
 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-xlib.inc

meta/recipes-graphics/mesa/mesa-xlib.inc new file +1 -0

new file mode 100644
index 0000000..b720e14
@@ -0,0 +1 @@
+EXTRA_OECONF += " --with-driver=xlib --without-gallium-drivers"

meta/recipes-graphics/mesa/mesa-xlib_7.11.bb +1 -2

index 08277ac..95ff5e8 100644
@@ -1,6 +1,5 @@
 include mesa-common.inc
 include mesa-${PV}.inc
-
+include mesa-xlib.inc
 PR = "${INC_PR}.0"
 
-EXTRA_OECONF += "--with-driver=xlib --without-gallium-drivers"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:38 UTC #20 lore raw

PATCH 13/20 mesa-dri: move shared options to mesa-dri.inc

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-dri.inc     |   20 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |   22 ++--------------------
 meta/recipes-graphics/mesa/mesa-dri_git.bb  |   19 +------------------
 3 files changed, 23 insertions(+), 38 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri.inc

meta/recipes-graphics/mesa/mesa-dri.inc new file +20 -0

new file mode 100644
index 0000000..603438e
@@ -0,0 +1,20 @@
+PROTO_DEPS += "dri2proto"
+LIB_DEPS += "libdrm expat"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
+
+python populate_packages_prepend() {
+	import os.path
+
+	dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+
+	do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +2 ~~-20~~

index 8ab1941..2cb2e05 100644
@@ -1,28 +1,10 @@
 include mesa-common.inc
 include mesa-${PV}.inc
-
-PROTO_DEPS += "dri2proto"
-LIB_DEPS += "libdrm expat"
-
+include mesa-dri.inc
 PR = "${INC_PR}.0"
 
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
 LEAD_SONAME = "libGL.so.1"
 
-EXTRA_OECONF += "--with-driver=dri --disable-egl -with-dri-drivers=swrast,i915,i965 --without-gallium-drivers"
-
-python populate_packages_prepend() {
-	import os.path
-
-	dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
-
-	do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
+EXTRA_OECONF += "--with-dri-drivers=swrast,i915,i965"
 
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"

meta/recipes-graphics/mesa/mesa-dri_git.bb +1 ~~-18~~

index 10ebd1c..aaa3073 100644
@@ -1,4 +1,5 @@
 include mesa-common.inc
+include mesa-dri.inc
 
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
            file://cross2.patch \

@@ -6,26 +7,16 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
 #           file://mesa-DRI2Swapbuffer.patch "
 S = "${WORKDIR}/git"
 
-PROTO_DEPS += "dri2proto"
-LIB_DEPS += "libdrm expat"
-
 SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
 PV = "7.7+git${SRCPV}"
 PR = "${INC_PR}.0"
 
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
 PACKAGES =+ "${PN}-xprogs"
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
 LEAD_SONAME = "libGL.so.1"
 
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
-
 do_configure_prepend () {
     cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86
     touch ${S}/src/mesa/x86/matypes.h

@@ -44,12 +35,4 @@ do_install_append () {
     install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
 }
 
-python populate_packages_prepend() {
-	import os.path
-
-	dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
-
-	do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
-
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:38 UTC #21 lore raw

PATCH 14/20 mesa-dri: introduce MACHINE_DRI_MODULES

In reply to Martin Jansa

* not everybody needs i915, i965

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-dri.inc     |    4 ++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

meta/recipes-graphics/mesa/mesa-dri.inc +4 -0

index 603438e..be6905c 100644
@@ -6,6 +6,10 @@ DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
 
+MACHINE_DRI_MODULES ?= ""
+PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
+EXTRA_OECONF += "--with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+
 python populate_packages_prepend() {
 	import os.path

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +0 -2

index 2cb2e05..11fdc9b 100644
@@ -5,6 +5,4 @@ PR = "${INC_PR}.0"
 
 LEAD_SONAME = "libGL.so.1"
 
-EXTRA_OECONF += "--with-dri-drivers=swrast,i915,i965"
-
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'

Signature · 1 line

1.7.7

Richard Purdie

2011-10-13 13:29 UTC #22 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 13 lines · Martin Jansa

* not everybody needs i915, i965
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-dri.inc     |    4 ++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa-dri.inc +0 -0
index 603438e..be6905c 100644

meta/recipes-graphics/mesa/mesa-dri.inc DEFAULT_PREFERENCE = "-1" · line 14

Quoted 9 lines

meta/recipes-graphics/mesa/mesa-dri.inc +4 -0

@@ -6,6 +6,10 @@ DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
 
+MACHINE_DRI_MODULES ?= ""
+PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
+EXTRA_OECONF += "--with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+
 python populate_packages_prepend() {
 	import os.path

Whilst I understand the problem, I don't like this solution. Particularly, it means that the meas-dri package needs to be marked as machine specific which I don't like the idea of at all.

How about we do this on a per architecture basis?

Cheers,

Richard

Martin Jansa

author

2011-10-13 13:38 UTC #23 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 28 lines · Richard Purdie

Quoted 13 lines · Martin Jansa
* not everybody needs i915, i965
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-dri.inc     |    4 ++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa-dri.inc +0 -0
index 603438e..be6905c 100644
meta/recipes-graphics/mesa/mesa-dri.inc DEFAULT_PREFERENCE = "-1" · line 14
Quoted 9 lines
meta/recipes-graphics/mesa/mesa-dri.inc +4 -0
@@ -6,6 +6,10 @@ DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
 
+MACHINE_DRI_MODULES ?= ""
+PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
+EXTRA_OECONF += "--with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+
 python populate_packages_prepend() {
 	import os.path
Whilst I understand the problem, I don't like this solution. Particularly, it means that the meas-dri package needs to be marked as machine specific which I don't like the idea of at all.

Quoted 1 line

How about we do this on a per architecture basis?

taken from cover-letter:
but maybe we can use it as distro variable and keep it with default arch. But then we cannot just add ie glamo dri module from meta-openmoko like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.

per architecture has same problem as distro basis

btw: in old recipes there was --with-dri-drivers with only one -, so maybe it wasn't actually working even for i915, i965 before or configure has benevolent syntax

Regards,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Richard Purdie

2011-10-13 14:02 UTC #24 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 29 lines · Martin Jansa

Quoted 28 lines · Richard Purdie
Quoted 13 lines · Martin Jansa
* not everybody needs i915, i965
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-dri.inc     |    4 ++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa-dri.inc +0 -0
index 603438e..be6905c 100644
meta/recipes-graphics/mesa/mesa-dri.inc DEFAULT_PREFERENCE = "-1" · line 14
Quoted 9 lines
meta/recipes-graphics/mesa/mesa-dri.inc +4 -0
@@ -6,6 +6,10 @@ DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
 
+MACHINE_DRI_MODULES ?= ""
+PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
+EXTRA_OECONF += "--with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+
 python populate_packages_prepend() {
 	import os.path
Whilst I understand the problem, I don't like this solution. Particularly, it means that the meas-dri package needs to be marked as machine specific which I don't like the idea of at all.

Quoted 7 lines

Quoted 1 line
How about we do this on a per architecture basis?
taken from cover-letter:
but maybe we can use it as distro variable and keep it with default arch. But then we cannot just add ie glamo dri module from meta-openmoko like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.

Whilst I hadn't seen the patch I was guessing you were doing something like this. Will the glamo module build on all arm platforms or just gta02 specifically?

Quoted 4 lines

per architecture has same problem as distro basis
btw: in old recipes there was --with-dri-drivers with only one -, so maybe it wasn't actually working even for i915, i965 before or configure has benevolent syntax

It defaults to enable all modules. We don't have libdrm-nouveau (or llvm) so we had to change the config options to explicitly enable the pieces I know are cared about on x86 in the latest version. This is why the COMPATIBLE_HOST is there too since that recipe was always meaning to compile these modules.

FWIW, if a patch needs some change in behaviour such as the introduction of a variable like MACHINE_DRI_MODULES, we need to spell this out very clearly. I know its better in this series but that was a major problem in the last version. I'm spelling this out for anyone else on the mailing list to take note of!

Cheers,

Richard

Martin Jansa

author

2011-10-13 14:13 UTC #25 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 38 lines · Richard Purdie

Quoted 29 lines · Martin Jansa
Quoted 28 lines · Richard Purdie
Quoted 13 lines · Martin Jansa
* not everybody needs i915, i965
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-dri.inc     |    4 ++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa-dri.inc +0 -0
index 603438e..be6905c 100644
meta/recipes-graphics/mesa/mesa-dri.inc DEFAULT_PREFERENCE = "-1" · line 14
Quoted 9 lines
meta/recipes-graphics/mesa/mesa-dri.inc +4 -0
@@ -6,6 +6,10 @@ DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
 
+MACHINE_DRI_MODULES ?= ""
+PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
+EXTRA_OECONF += "--with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+
 python populate_packages_prepend() {
 	import os.path
Whilst I understand the problem, I don't like this solution. Particularly, it means that the meas-dri package needs to be marked as machine specific which I don't like the idea of at all.
Quoted 7 lines
Quoted 1 line
How about we do this on a per architecture basis?
taken from cover-letter:
but maybe we can use it as distro variable and keep it with default arch. But then we cannot just add ie glamo dri module from meta-openmoko like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.

Quoted 3 lines

Whilst I hadn't seen the patch I was guessing you were doing something like this. Will the glamo module build on all arm platforms or just gta02 specifically?

It should build on all arm platforms, but depends on another patch to libdrm
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=0a846fa3dec896751b44811cd909013874920aae
which should also build on all arm platforms.

I was using both patches for all machines (distr==SHR basis) in OE-classic, but with BSP layers I found it nice to keep them only in respective layer and now I would need to move them to upper layer again..

Regards,

Quoted 27 lines

Quoted 4 lines
per architecture has same problem as distro basis
btw: in old recipes there was --with-dri-drivers with only one -, so maybe it wasn't actually working even for i915, i965 before or configure has benevolent syntax
It defaults to enable all modules. We don't have libdrm-nouveau (or llvm) so we had to change the config options to explicitly enable the pieces I know are cared about on x86 in the latest version. This is why the COMPATIBLE_HOST is there too since that recipe was always meaning to compile these modules.
FWIW, if a patch needs some change in behaviour such as the introduction of a variable like MACHINE_DRI_MODULES, we need to spell this out very clearly. I know its better in this series but that was a major problem in the last version. I'm spelling this out for anyone else on the mailing list to take note of!
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Richard Purdie

2011-10-14 16:10 UTC #26 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 43 lines · Martin Jansa

Quoted 38 lines · Richard Purdie
Quoted 29 lines · Martin Jansa
Quoted 28 lines · Richard Purdie
Quoted 13 lines · Martin Jansa
* not everybody needs i915, i965
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-dri.inc     |    4 ++++
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa-dri.inc +0 -0
index 603438e..be6905c 100644
meta/recipes-graphics/mesa/mesa-dri.inc DEFAULT_PREFERENCE = "-1" · line 14
Quoted 9 lines
meta/recipes-graphics/mesa/mesa-dri.inc +4 -0
@@ -6,6 +6,10 @@ DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
 
+MACHINE_DRI_MODULES ?= ""
+PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
+EXTRA_OECONF += "--with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+
 python populate_packages_prepend() {
 	import os.path
Whilst I understand the problem, I don't like this solution. Particularly, it means that the meas-dri package needs to be marked as machine specific which I don't like the idea of at all.
Quoted 7 lines
Quoted 1 line
How about we do this on a per architecture basis?
taken from cover-letter:
but maybe we can use it as distro variable and keep it with default arch. But then we cannot just add ie glamo dri module from meta-openmoko like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.
Quoted 3 lines
Whilst I hadn't seen the patch I was guessing you were doing something like this. Will the glamo module build on all arm platforms or just gta02 specifically?

Quoted 8 lines

It should build on all arm platforms, but depends on another patch to libdrm
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=0a846fa3dec896751b44811cd909013874920aae
which should also build on all arm platforms.
I was using both patches for all machines (distr==SHR basis) in OE-classic, but with BSP layers I found it nice to keep them only in respective layer and now I would need to move them to upper layer again..

Not necessarily, you can keep them in the layer but apply the patch globally. This means you do need to build shr with all layers enabled but that shouldn't be too much of an issue?

Cheers,

Richard

Otavio Salvador

2011-10-13 14:37 UTC #27 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

In reply to Richard Purdie

On Thu, Oct 13, 2011 at 10:56, Richard Purdie
<[email protected]> wrote:
...

Quoted 8 lines

Quoted 2 lines
btw: in old recipes there was --with-dri-drivers with only one -, so maybe it wasn't actually working even for i915, i965 before or configure has benevolent syntax
It defaults to enable all modules. We don't have libdrm-nouveau (or llvm) so we had to change the config options to explicitly enable the pieces I know are cared about on x86 in the latest version. This is why the COMPATIBLE_HOST is there too since that recipe was always meaning to compile these modules.

...

At least here it hadn't built i915 or i965 drivers.

Signature · 3 lines

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Richard Purdie

2011-10-14 11:35 UTC #28 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 6 lines · Otavio Salvador

On Thu, Oct 13, 2011 at 10:56, Richard Purdie
<[email protected]> wrote:
...
Quoted 3 lines
Quoted 2 lines
btw: in old recipes there was --with-dri-drivers with only one -, so maybe it wasn't actually working even for i915, i965 before or configure has benevolent syntax

Quoted 8 lines

Quoted 5 lines
It defaults to enable all modules. We don't have libdrm-nouveau (or llvm) so we had to change the config options to explicitly enable the pieces I know are cared about on x86 in the latest version. This is why the COMPATIBLE_HOST is there too since that recipe was always meaning to compile these modules.
...
At least here it hadn't built i915 or i965 drivers.

I think there is a slight change in behaviour as the architectures it would have built certain modules on used to get applied, now it doesn't as we're passing a fixed list. We need to fix this but it shouldn't be hard.

Cheers,

Richard

Otavio Salvador

2011-10-14 13:25 UTC #29 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

On Fri, Oct 14, 2011 at 08:29, Richard Purdie
<[email protected]> wrote:
...

Quoted 6 lines

Quoted 1 line
At least here it hadn't built i915 or i965 drivers.
I think there is a slight change in behaviour as the architectures it would have built certain modules on used to get applied, now it doesn't as we're passing a fixed list. We need to fix this but it shouldn't be hard.

I am sorry but I didn't get what you meant.

Signature · 3 lines

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Richard Purdie

2011-10-14 23:52 UTC #30 lore raw

Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 11 lines · Otavio Salvador

On Fri, Oct 14, 2011 at 08:29, Richard Purdie
<[email protected]> wrote:
...
Quoted 6 lines
Quoted 1 line
At least here it hadn't built i915 or i965 drivers.
I think there is a slight change in behaviour as the architectures it would have built certain modules on used to get applied, now it doesn't as we're passing a fixed list. We need to fix this but it shouldn't be hard.
I am sorry but I didn't get what you meant.

The old recipe just said "enable dri" and left it to the makefile to decide what to build which it did based upon the target architecture.

I then changed the recipe to say i915 and i965 since the recipe was marked x86 only. Now I've merged changes to default to swrast apart from x86 (23 and 64 bit) where the intel modules are enabled. As and when any other dependencies are fixed and people need other modules we'll enable those on a per arch basis too.

This should hopefully resolve most of the issues people were seeing.

Cheers,

Richard

Martin Jansa

author

2011-10-13 11:38 UTC #31 lore raw

PATCH 15/20 mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging each lib in separate package

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |    2 --
 meta/recipes-graphics/mesa/mesa-dri_git.bb  |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +0 -2

index 11fdc9b..f9c6d89 100644
@@ -3,6 +3,4 @@ include mesa-${PV}.inc
 include mesa-dri.inc
 PR = "${INC_PR}.0"
 
-LEAD_SONAME = "libGL.so.1"
-
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'

meta/recipes-graphics/mesa/mesa-dri_git.bb +0 -2

index aaa3073..1485213 100644
@@ -15,8 +15,6 @@ PACKAGES =+ "${PN}-xprogs"
 
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
-LEAD_SONAME = "libGL.so.1"
-
 do_configure_prepend () {
     cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86
     touch ${S}/src/mesa/x86/matypes.h

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:38 UTC #32 lore raw

PATCH 16/20 mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody

In reply to Martin Jansa

* and more machines like om-gta02 have own DRI modules too

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-dri_7.11.bb |    2 --
 meta/recipes-graphics/mesa/mesa-dri_git.bb  |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

meta/recipes-graphics/mesa/mesa-dri_7.11.bb +0 -2

index f9c6d89..5d25127 100644
@@ -2,5 +2,3 @@ include mesa-common.inc
 include mesa-${PV}.inc
 include mesa-dri.inc
 PR = "${INC_PR}.0"
-
-COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'

meta/recipes-graphics/mesa/mesa-dri_git.bb +0 -2

index 1485213..6a7ab76 100644
@@ -32,5 +32,3 @@ do_install_append () {
     install -d ${D}/usr/bin
     install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
 }
-
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:38 UTC #33 lore raw

PATCH 17/20 mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add mesa-xlib_git

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-dri_git.bb  |   32 +--------------------------
 meta/recipes-graphics/mesa/mesa-git.inc     |   30 +++++++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa-xlib_git.bb |    4 +++
 3 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-git.inc
 create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_git.bb

meta/recipes-graphics/mesa/mesa-dri_git.bb +1 ~~-31~~

index 6a7ab76..7ba3117 100644
@@ -1,34 +1,4 @@
 include mesa-common.inc
+include mesa-git.inc
 include mesa-dri.inc
-
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
-           file://cross2.patch \
-           file://matypes.h"
-#           file://mesa-DRI2Swapbuffer.patch "
-S = "${WORKDIR}/git"
-
-SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
-PV = "7.7+git${SRCPV}"
 PR = "${INC_PR}.0"
-
-PACKAGES =+ "${PN}-xprogs"
-
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
-
-do_configure_prepend () {
-    cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86
-    touch ${S}/src/mesa/x86/matypes.h
-}
-
-do_compile () {
-	oe_runmake clean
-	oe_runmake -C src/glsl CC='${BUILD_CC}' CFLAGS=""
-	mv ${S}/src/glsl/apps/compile ${S}/host_compile
-	oe_runmake clean
-	oe_runmake GLSL_CL="${S}/host_compile"
-}
-
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}

meta/recipes-graphics/mesa/mesa-git.inc new file +30 -0

new file mode 100644
index 0000000..2f27ef1
@@ -0,0 +1,30 @@
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
+           file://cross2.patch \
+           file://matypes.h"
+#           file://mesa-DRI2Swapbuffer.patch "
+S = "${WORKDIR}/git"
+
+SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
+PV = "7.7+git${SRCPV}"
+
+PACKAGES =+ "${PN}-xprogs"
+
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+do_configure_prepend () {
+    cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86
+    touch ${S}/src/mesa/x86/matypes.h
+}
+
+do_compile () {
+	oe_runmake clean
+	oe_runmake -C src/glsl CC='${BUILD_CC}' CFLAGS=""
+	mv ${S}/src/glsl/apps/compile ${S}/host_compile
+	oe_runmake clean
+	oe_runmake GLSL_CL="${S}/host_compile"
+}
+
+do_install_append () {
+    install -d ${D}/usr/bin
+    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
+}

meta/recipes-graphics/mesa/mesa-xlib_git.bb new file +4 -0

new file mode 100644
index 0000000..7f827a7
@@ -0,0 +1,4 @@
+include mesa-common.inc
+include mesa-git.inc
+include mesa-xlib.inc
+PR = "${INC_PR}.0"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:38 UTC #34 lore raw

PATCH 18/20 mesa-git: lower D_P a bit more then all mesa-dri

In reply to Martin Jansa

* it needs to be done in .bb because mesa-dri.inc is included after mesa-git.inc
* lower it for mesa-xlib to same value

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-dri_git.bb  |    4 ++++
 meta/recipes-graphics/mesa/mesa-xlib_git.bb |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

meta/recipes-graphics/mesa/mesa-dri_git.bb +4 -0

index 7ba3117..ce1c8c7 100644
@@ -1,4 +1,8 @@
 include mesa-common.inc
 include mesa-git.inc
 include mesa-dri.inc
+
+# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
+DEFAULT_PREFERENCE = "-2"
+
 PR = "${INC_PR}.0"

meta/recipes-graphics/mesa/mesa-xlib_git.bb +4 -0

index 7f827a7..97cac51 100644
@@ -1,4 +1,8 @@
 include mesa-common.inc
 include mesa-git.inc
 include mesa-xlib.inc
+
+# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
+DEFAULT_PREFERENCE = "-2"
+
 PR = "${INC_PR}.0"

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:38 UTC #35 lore raw

PATCH 19/20 mesa-git: upgrade from 7.7+git to 7.11+git

In reply to Martin Jansa

* progs package is also gone like in 7.11 (moved to separate recipe)
* uclibc.patch was updated a bit to apply again

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-git.inc          |   39 ++----
 meta/recipes-graphics/mesa/mesa-git/uclibc.patch |   57 ++++++++
 meta/recipes-graphics/mesa/mesa/cross2.patch     |   46 ------
 meta/recipes-graphics/mesa/mesa/i586/matypes.h   |  162 ----------------------
 4 files changed, 71 insertions(+), 233 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-git/uclibc.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/cross2.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/i586/matypes.h

meta/recipes-graphics/mesa/mesa-git.inc +14 ~~-25~~

index 2f27ef1..c9b17a9 100644
@@ -1,30 +1,19 @@
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
-           file://cross2.patch \
-           file://matypes.h"
-#           file://mesa-DRI2Swapbuffer.patch "
-S = "${WORKDIR}/git"
-
-SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
-PV = "7.7+git${SRCPV}"
-
-PACKAGES =+ "${PN}-xprogs"
+DEPENDS += "mesa-dri-glsl-native"
 
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+SRCREV = "983fa4ad523535debf2e94cf6ac1fd4c5630c0d2"
+PV = "7.11+gitr${SRCPV}"
 
-do_configure_prepend () {
-    cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86
-    touch ${S}/src/mesa/x86/matypes.h
-}
+FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
 
-do_compile () {
-	oe_runmake clean
-	oe_runmake -C src/glsl CC='${BUILD_CC}' CFLAGS=""
-	mv ${S}/src/glsl/apps/compile ${S}/host_compile
-	oe_runmake clean
-	oe_runmake GLSL_CL="${S}/host_compile"
-}
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
+SRC_URI += "file://uclibc.patch \
+            file://crossfix.patch \
+           "
+S = "${WORKDIR}/git"
 
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
+do_configure_prepend() {
+  #check for python not python2, because python-native does not stage python2 binary/link
+  sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
+  # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
+  sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
 }

meta/recipes-graphics/mesa/mesa-git/uclibc.patch new file +57 -0

57 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa/cross2.patch deleted +0 ~~-46~~

46 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa/i586/matypes.h deleted +0 ~~-162~~

162 lines not on this page · raw message

Signature · 1 line

1.7.7

Martin Jansa

author

2011-10-13 11:39 UTC #36 lore raw

PATCH 20/20 mesa-git: fix LIC_FILES_CHKSUM

In reply to Martin Jansa

* only wording was changed a bit and GLUT is not named explicitly

  $ diff docs/license.html 7.11/Mesa-7.11/docs/license.html
  41,44c41,44
  < and licenses apply to different components.  For example, some demo programs
  < are copyrighted by SGI, some of the Mesa device drivers are copyrighted by
  < their authors.  See below for a list of Mesa's main components and the license
  < for each.
  ---

Quoted 4 lines

and licenses apply to different components. For example, GLUT is copyrighted by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa device drivers are copyrighted by their authors. See below for a list of Mesa's main components and the license for each.

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/mesa/mesa-git.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

meta/recipes-graphics/mesa/mesa-git.inc +1 -0

index c9b17a9..594d9b8 100644
@@ -3,6 +3,7 @@ DEPENDS += "mesa-dri-glsl-native"
 SRCREV = "983fa4ad523535debf2e94cf6ac1fd4c5630c0d2"
 PV = "7.11+gitr${SRCPV}"
 
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
 FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
 
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"

Signature · 1 line

1.7.7

Koen Kooi

2011-10-13 11:45 UTC #37 lore raw

In reply to Martin Jansa

Op 13 okt. 2011, om 13:30 heeft Martin Jansa het volgende geschreven:

Quoted 36 lines

Mostly cleanup in mesa directory.
Most controversial is
mesa-dri: introduce MACHINE_DRI_MODULES
but maybe we can use it as distro variable and keep it with default arch. But then we cannot just add ie glamo dri module from meta-openmoko like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.
The following changes since commit 5ad1ca59dea6d5045f252ed7b786ad193faced64:
xf86-video-intel: Update 2.15.0 -> 2.16.0 (2011-10-12 22:59:14 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11-v4
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v4
Martin Jansa (20):
xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
xserver-xorg: move PE to xserver-xorg-common and bump it
xorg-driver-common: bump PE for upgrade path for meta-oe users
mesa-dri-glsl-native: fix LICENSE
mesa: move common patches which could be used in both mesa-dri and
mesa-xlib from mesa-dri to mesa
mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions
mesa-common: MesaDemos is now separate recipes, bump PE, introduce
INC_PR
mesa-common: use glx-use-tls.inc instead of enabling glx-tls every
time
mesa-7.11: move shared DEPENDS, SRC_URI, checksums and
do_configure_prepend to shared .inc file
mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
mesa: package gl/egl/osmesa to separate packages
mesa-xlib: move shared options to .inc
mesa-dri: move shared options to mesa-dri.inc
mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 8 lines

mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging
each lib in separate package
mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody
mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add
mesa-xlib_git
mesa-git: lower D_P a bit more then all mesa-dri
mesa-git: upgrade from 7.7+git to 7.11+git
mesa-git: fix LIC_FILES_CHKSUM

These changes all look sane to me, but I must admit I haven't tried a build with them yet.

Richard Purdie

2011-10-14 11:32 UTC #38 lore raw

In reply to Martin Jansa

Quoted 36 lines · Martin Jansa

Mostly cleanup in mesa directory.
Most controversial is
mesa-dri: introduce MACHINE_DRI_MODULES
but maybe we can use it as distro variable and keep it with default arch. But then we cannot just add ie glamo dri module from meta-openmoko like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.
The following changes since commit 5ad1ca59dea6d5045f252ed7b786ad193faced64:
xf86-video-intel: Update 2.15.0 -> 2.16.0 (2011-10-12 22:59:14 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11-v4
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v4
Martin Jansa (20):
xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
xserver-xorg: move PE to xserver-xorg-common and bump it
xorg-driver-common: bump PE for upgrade path for meta-oe users
mesa-dri-glsl-native: fix LICENSE
mesa: move common patches which could be used in both mesa-dri and
mesa-xlib from mesa-dri to mesa
mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions
mesa-common: MesaDemos is now separate recipes, bump PE, introduce
INC_PR
mesa-common: use glx-use-tls.inc instead of enabling glx-tls every
time
mesa-7.11: move shared DEPENDS, SRC_URI, checksums and
do_configure_prepend to shared .inc file
mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
mesa: package gl/egl/osmesa to separate packages
mesa-xlib: move shared options to .inc
mesa-dri: move shared options to mesa-dri.inc
mesa-dri: introduce MACHINE_DRI_MODULES

Quoted 8 lines

mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging
each lib in separate package
mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody
mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add
mesa-xlib_git
mesa-git: lower D_P a bit more then all mesa-dri
mesa-git: upgrade from 7.7+git to 7.11+git
mesa-git: fix LIC_FILES_CHKSUM

I merged most of this. The pieces I didn't take:

* MACHINE_DRI_MODULES piece
* Drop COMPATIBLE_HOST (due to above)
* glx-tls piece
* FILES changes (due to do_install_append)

This was *much* easier to review and I'm grateful for that, thanks!

I think the actions are now:

a) Resolve the MACHINE_DRI_MODULES discussion. Short term we can make the i915/965 pieces ia32 only and then remove the COMPATIBLE_MACHINES
b) Drop the glx/tls piece
c) Drop the do_install_append

and then we should have this all resolved :)

Cheers,

Richard

Martin Jansa

author

2011-10-14 11:45 UTC #39 lore raw

Quoted 46 lines · Richard Purdie

Quoted 36 lines · Martin Jansa
Mostly cleanup in mesa directory.
Most controversial is
mesa-dri: introduce MACHINE_DRI_MODULES
but maybe we can use it as distro variable and keep it with default arch. But then we cannot just add ie glamo dri module from meta-openmoko like this:
http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.
The following changes since commit 5ad1ca59dea6d5045f252ed7b786ad193faced64:
xf86-video-intel: Update 2.15.0 -> 2.16.0 (2011-10-12 22:59:14 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11-v4
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v4
Martin Jansa (20):
xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
xserver-xorg: move PE to xserver-xorg-common and bump it
xorg-driver-common: bump PE for upgrade path for meta-oe users
mesa-dri-glsl-native: fix LICENSE
mesa: move common patches which could be used in both mesa-dri and
mesa-xlib from mesa-dri to mesa
mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions
mesa-common: MesaDemos is now separate recipes, bump PE, introduce
INC_PR
mesa-common: use glx-use-tls.inc instead of enabling glx-tls every
time
mesa-7.11: move shared DEPENDS, SRC_URI, checksums and
do_configure_prepend to shared .inc file
mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
mesa: package gl/egl/osmesa to separate packages
mesa-xlib: move shared options to .inc
mesa-dri: move shared options to mesa-dri.inc
mesa-dri: introduce MACHINE_DRI_MODULES
Quoted 8 lines
mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging
each lib in separate package
mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody
mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add
mesa-xlib_git
mesa-git: lower D_P a bit more then all mesa-dri
mesa-git: upgrade from 7.7+git to 7.11+git
mesa-git: fix LIC_FILES_CHKSUM

Quoted 6 lines

I merged most of this. The pieces I didn't take:
* MACHINE_DRI_MODULES piece
* Drop COMPATIBLE_HOST (due to above)
* glx-tls piece
* FILES changes (due to do_install_append)

I've just pushed rebased jansa/x11-v4 with this last 4 patches

Quoted 1 line

This was *much* easier to review and I'm grateful for that, thanks!

good, you're welcome

Quoted 4 lines

I think the actions are now:
a) Resolve the MACHINE_DRI_MODULES discussion. Short term we can make the i915/965 pieces ia32 only and then remove the COMPATIBLE_MACHINES

Quoted 1 line

b) Drop the glx/tls piece

I'll send patch dropping also the file and from xserver-xorg after mesa is dropped in meta-oe so we don't introduce parsing issues

Quoted 1 line

c) Drop the do_install_append

resolved in 1/4 which is
mesa: package gl/egl/osmesa to separate packages
without do_install_append (that is moved to 3/4)

Quoted 1 line

and then we should have this all resolved :)

Regards,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]