* [oe-core 01/20] xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 02/20] xserver-xorg: move PE to xserver-xorg-common and bump it Martin Jansa
` (20 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* as discussed here http://lists.linuxtogo.org/pipermail/openembedded-core/2011-October/010899.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-1.11.1.inc | 2 ++
.../xorg-xserver/xserver-xorg-common.inc | 1 -
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
index 690de3f..2c5bb0a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
@@ -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"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 0cc3dc0..a8c7b0a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 02/20] xserver-xorg: move PE to xserver-xorg-common and bump it
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
2011-10-13 11:30 ` [oe-core 01/20] xserver-xorg: drop xorg-minimal-fonts from RDEPENDS Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 03/20] xorg-driver-common: bump PE for upgrade path for meta-oe users Martin Jansa
` (19 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* to provide upgrade path for meta-oe users, where it had PE = 2 already
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 2 ++
.../xorg-xserver/xserver-xorg_1.11.1.bb | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index a8c7b0a..2559397 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -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"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
index 8e97888..0f94fe2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
@@ -1,4 +1,2 @@
require xserver-xorg.inc
require xserver-xorg-${PV}.inc
-
-PE = "1"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 03/20] xorg-driver-common: bump PE for upgrade path for meta-oe users
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
2011-10-13 11:30 ` [oe-core 01/20] xserver-xorg: drop xorg-minimal-fonts from RDEPENDS Martin Jansa
2011-10-13 11:30 ` [oe-core 02/20] xserver-xorg: move PE to xserver-xorg-common and bump it Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 04/20] mesa-dri-glsl-native: fix LICENSE Martin Jansa
` (18 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* 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 <Martin.Jansa@gmail.com>
---
.../xorg-driver/xorg-driver-common.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 097060e..9a474b7 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 04/20] mesa-dri-glsl-native: fix LICENSE
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (2 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 03/20] xorg-driver-common: bump PE for upgrade path for meta-oe users Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 05/20] mesa: move common patches which could be used in both mesa-dri and mesa-xlib from mesa-dri to mesa Martin Jansa
` (17 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../mesa/mesa-dri-glsl-native_7.11.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
index 07247d5..07b0761 100644
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 05/20] mesa: move common patches which could be used in both mesa-dri and mesa-xlib from mesa-dri to mesa
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (3 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 04/20] mesa-dri-glsl-native: fix LICENSE Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 06/20] mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions Martin Jansa
` (16 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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%)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index d8e800e..b3d1c8f 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -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 \
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index ea4acc6..1e0d95e 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -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 \
"
diff --git a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch b/meta/recipes-graphics/mesa/mesa/cross2.patch
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/cross2.patch
rename to meta/recipes-graphics/mesa/mesa/cross2.patch
diff --git a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch b/meta/recipes-graphics/mesa/mesa/crossfix.patch
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
rename to meta/recipes-graphics/mesa/mesa/crossfix.patch
diff --git a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h b/meta/recipes-graphics/mesa/mesa/i586/matypes.h
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
rename to meta/recipes-graphics/mesa/mesa/i586/matypes.h
diff --git a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch b/meta/recipes-graphics/mesa/mesa/uclibc.patch
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
rename to meta/recipes-graphics/mesa/mesa/uclibc.patch
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 06/20] mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (4 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 05/20] mesa: move common patches which could be used in both mesa-dri and mesa-xlib from mesa-dri to mesa Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR Martin Jansa
` (15 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index b3d1c8f..fb9a216 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -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 "
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 6fc8d95..5f15091 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -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"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index 1e0d95e..8b83378 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (5 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 06/20] mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 23:45 ` Khem Raj
2011-10-13 11:30 ` [oe-core 08/20] mesa-common: use glx-use-tls.inc instead of enabling glx-tls every time Martin Jansa
` (14 subsequent siblings)
21 siblings, 1 reply; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index fb9a216..ee359ba 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -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"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 5f15091..5f14346 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -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 \
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index 9e32d0a..c50ba15 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -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"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index 8b83378..1e0d821 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR
2011-10-13 11:30 ` [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR Martin Jansa
@ 2011-10-13 23:45 ` Khem Raj
2011-10-14 6:45 ` Martin Jansa
0 siblings, 1 reply; 40+ messages in thread
From: Khem Raj @ 2011-10-13 23:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Oct 13, 2011 at 4:30 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> 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(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> index fb9a216..ee359ba 100644
> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> @@ -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"
Do u really need PE ?
>
> +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
> S = "${WORKDIR}/Mesa-${PV}"
>
> PROVIDES = "virtual/libgl"
> diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> index 5f15091..5f14346 100644
> --- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> +++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> @@ -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 \
> diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
> index 9e32d0a..c50ba15 100644
> --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
> +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
> @@ -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"
> diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> index 8b83378..1e0d821 100644
> --- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> +++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> @@ -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"
>
> --
> 1.7.7
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR
2011-10-13 23:45 ` Khem Raj
@ 2011-10-14 6:45 ` Martin Jansa
0 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-14 6:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3741 bytes --]
On Thu, Oct 13, 2011 at 04:45:06PM -0700, Khem Raj wrote:
> On Thu, Oct 13, 2011 at 4:30 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > 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(-)
> >
> > diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> > index fb9a216..ee359ba 100644
> > --- a/meta/recipes-graphics/mesa/mesa-common.inc
> > +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> > @@ -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"
>
> 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..)
>
> >
> > +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
> > S = "${WORKDIR}/Mesa-${PV}"
> >
> > PROVIDES = "virtual/libgl"
> > diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> > index 5f15091..5f14346 100644
> > --- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> > +++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
> > @@ -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 \
> > diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
> > index 9e32d0a..c50ba15 100644
> > --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
> > +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
> > @@ -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"
> > diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> > index 8b83378..1e0d821 100644
> > --- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> > +++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
> > @@ -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"
> >
> > --
> > 1.7.7
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread
* [oe-core 08/20] mesa-common: use glx-use-tls.inc instead of enabling glx-tls every time
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (6 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 07/20] mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 09/20] mesa-7.11: move shared DEPENDS, SRC_URI, checksums and do_configure_prepend to shared .inc file Martin Jansa
` (13 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index ee359ba..1596832 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 09/20] mesa-7.11: move shared DEPENDS, SRC_URI, checksums and do_configure_prepend to shared .inc file
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (7 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 08/20] mesa-common: use glx-use-tls.inc instead of enabling glx-tls every time Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 10/20] mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc Martin Jansa
` (12 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc b/meta/recipes-graphics/mesa/mesa-7.11.inc
new file mode 100644
index 0000000..746b764
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-7.11.inc
@@ -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
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 5f14346..90873aa 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -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
-}
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index 1e0d821..44719a0 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -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
-}
-
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 10/20] mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (8 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 09/20] mesa-7.11: move shared DEPENDS, SRC_URI, checksums and do_configure_prepend to shared .inc file Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages Martin Jansa
` (11 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 1596832..89ef0cf 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -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
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 90873aa..8ab1941 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -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"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index c50ba15..10ebd1c 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -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}"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index 44719a0..08277ac 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (9 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 10/20] mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-14 11:12 ` Richard Purdie
2011-10-13 11:30 ` [oe-core 12/20] mesa-xlib: move shared options to .inc Martin Jansa
` (10 subsequent siblings)
21 siblings, 1 reply; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* also install internal GL headers to libgl-dev
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 89ef0cf..62d9b24 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -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
+}
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages
2011-10-13 11:30 ` [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages Martin Jansa
@ 2011-10-14 11:12 ` Richard Purdie
2011-10-14 11:19 ` Martin Jansa
0 siblings, 1 reply; 40+ messages in thread
From: Richard Purdie @ 2011-10-14 11:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> * also install internal GL headers to libgl-dev
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
> 1 files changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> index 89ef0cf..62d9b24 100644
> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> @@ -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
> +}
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
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages
2011-10-14 11:12 ` Richard Purdie
@ 2011-10-14 11:19 ` Martin Jansa
2011-10-14 13:32 ` Koen Kooi
0 siblings, 1 reply; 40+ messages in thread
From: Martin Jansa @ 2011-10-14 11:19 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2425 bytes --]
On Fri, Oct 14, 2011 at 12:12:11PM +0100, Richard Purdie wrote:
> On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> > * also install internal GL headers to libgl-dev
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
> > 1 files changed, 16 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> > index 89ef0cf..62d9b24 100644
> > --- a/meta/recipes-graphics/mesa/mesa-common.inc
> > +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> > @@ -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
> > +}
>
> 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.
> What other issues are people seeing without this piece?
Unless someone else knows about still broken driver :).
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages
2011-10-14 11:19 ` Martin Jansa
@ 2011-10-14 13:32 ` Koen Kooi
2011-10-14 13:58 ` Richard Purdie
0 siblings, 1 reply; 40+ messages in thread
From: Koen Kooi @ 2011-10-14 13:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 14 okt. 2011, om 13:19 heeft Martin Jansa het volgende geschreven:
> On Fri, Oct 14, 2011 at 12:12:11PM +0100, Richard Purdie wrote:
>> On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
>>> * also install internal GL headers to libgl-dev
>>>
>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>> ---
>>> meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
>>> 1 files changed, 16 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
>>> index 89ef0cf..62d9b24 100644
>>> --- a/meta/recipes-graphics/mesa/mesa-common.inc
>>> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
>>> @@ -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
>>> +}
>>
>> 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.
>
>> 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 :(
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages
2011-10-14 13:32 ` Koen Kooi
@ 2011-10-14 13:58 ` Richard Purdie
2011-10-14 14:02 ` Martin Jansa
0 siblings, 1 reply; 40+ messages in thread
From: Richard Purdie @ 2011-10-14 13:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-10-14 at 15:32 +0200, Koen Kooi wrote:
> Op 14 okt. 2011, om 13:19 heeft Martin Jansa het volgende geschreven:
>
> > On Fri, Oct 14, 2011 at 12:12:11PM +0100, Richard Purdie wrote:
> >> On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> >>> * also install internal GL headers to libgl-dev
> >>>
> >>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >>> ---
> >>> meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
> >>> 1 files changed, 16 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> >>> index 89ef0cf..62d9b24 100644
> >>> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> >>> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> >>> @@ -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
> >>> +}
> >>
> >> 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.
> >
> >> 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 :(
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
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages
2011-10-14 13:58 ` Richard Purdie
@ 2011-10-14 14:02 ` Martin Jansa
0 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-14 14:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3818 bytes --]
On Fri, Oct 14, 2011 at 02:58:34PM +0100, Richard Purdie wrote:
> On Fri, 2011-10-14 at 15:32 +0200, Koen Kooi wrote:
> > Op 14 okt. 2011, om 13:19 heeft Martin Jansa het volgende geschreven:
> >
> > > On Fri, Oct 14, 2011 at 12:12:11PM +0100, Richard Purdie wrote:
> > >> On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> > >>> * also install internal GL headers to libgl-dev
> > >>>
> > >>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > >>> ---
> > >>> meta/recipes-graphics/mesa/mesa-common.inc | 18 ++++++++++++++++--
> > >>> 1 files changed, 16 insertions(+), 2 deletions(-)
> > >>>
> > >>> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> > >>> index 89ef0cf..62d9b24 100644
> > >>> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> > >>> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> > >>> @@ -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
> > >>> +}
> > >>
> > >> 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.
> > >
> > >> 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 :(
>
> 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,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread
* [oe-core 12/20] mesa-xlib: move shared options to .inc
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (10 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 13/20] mesa-dri: move shared options to mesa-dri.inc Martin Jansa
` (9 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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
diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
new file mode 100644
index 0000000..b720e14
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
@@ -0,0 +1 @@
+EXTRA_OECONF += " --with-driver=xlib --without-gallium-drivers"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index 08277ac..95ff5e8 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 13/20] mesa-dri: move shared options to mesa-dri.inc
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (11 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 12/20] mesa-xlib: move shared options to .inc Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES Martin Jansa
` (8 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
new file mode 100644
index 0000000..603438e
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -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/*"
+
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 8ab1941..2cb2e05 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -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/*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index 10ebd1c..aaa3073 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -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'
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (12 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 13/20] mesa-dri: move shared options to mesa-dri.inc Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 13:23 ` Richard Purdie
2011-10-13 11:30 ` [oe-core 15/20] mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging each lib in separate package Martin Jansa
` (7 subsequent siblings)
21 siblings, 1 reply; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* not everybody needs i915, i965
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 603438e..be6905c 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -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
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 2cb2e05..11fdc9b 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -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)'
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-13 11:30 ` [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES Martin Jansa
@ 2011-10-13 13:23 ` Richard Purdie
2011-10-13 13:32 ` Martin Jansa
0 siblings, 1 reply; 40+ messages in thread
From: Richard Purdie @ 2011-10-13 13:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> * not everybody needs i915, i965
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> 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(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> index 603438e..be6905c 100644
> --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> @@ -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
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-13 13:23 ` Richard Purdie
@ 2011-10-13 13:32 ` Martin Jansa
2011-10-13 13:56 ` Richard Purdie
0 siblings, 1 reply; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 13:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2024 bytes --]
On Thu, Oct 13, 2011 at 02:23:54PM +0100, Richard Purdie wrote:
> On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> > * not everybody needs i915, i965
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > 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(-)
> >
> > diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> > index 603438e..be6905c 100644
> > --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> > +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> > @@ -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?
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,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-13 13:32 ` Martin Jansa
@ 2011-10-13 13:56 ` Richard Purdie
2011-10-13 14:07 ` Martin Jansa
2011-10-13 14:32 ` Otavio Salvador
0 siblings, 2 replies; 40+ messages in thread
From: Richard Purdie @ 2011-10-13 13:56 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-10-13 at 15:32 +0200, Martin Jansa wrote:
> On Thu, Oct 13, 2011 at 02:23:54PM +0100, Richard Purdie wrote:
> > On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> > > * not everybody needs i915, i965
> > >
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > > 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(-)
> > >
> > > diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> > > index 603438e..be6905c 100644
> > > --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> > > +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> > > @@ -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?
>
> 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?
> 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
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-13 13:56 ` Richard Purdie
@ 2011-10-13 14:07 ` Martin Jansa
2011-10-14 16:04 ` Richard Purdie
2011-10-13 14:32 ` Otavio Salvador
1 sibling, 1 reply; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 14:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3830 bytes --]
On Thu, Oct 13, 2011 at 02:56:24PM +0100, Richard Purdie wrote:
> On Thu, 2011-10-13 at 15:32 +0200, Martin Jansa wrote:
> > On Thu, Oct 13, 2011 at 02:23:54PM +0100, Richard Purdie wrote:
> > > On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> > > > * not everybody needs i915, i965
> > > >
> > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > > ---
> > > > 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(-)
> > > >
> > > > diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> > > > index 603438e..be6905c 100644
> > > > --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> > > > +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> > > > @@ -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?
> >
> > 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?
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,
> > 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
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-13 14:07 ` Martin Jansa
@ 2011-10-14 16:04 ` Richard Purdie
0 siblings, 0 replies; 40+ messages in thread
From: Richard Purdie @ 2011-10-14 16:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-10-13 at 16:07 +0200, Martin Jansa wrote:
> On Thu, Oct 13, 2011 at 02:56:24PM +0100, Richard Purdie wrote:
> > On Thu, 2011-10-13 at 15:32 +0200, Martin Jansa wrote:
> > > On Thu, Oct 13, 2011 at 02:23:54PM +0100, Richard Purdie wrote:
> > > > On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> > > > > * not everybody needs i915, i965
> > > > >
> > > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > > > ---
> > > > > 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(-)
> > > > >
> > > > > diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> > > > > index 603438e..be6905c 100644
> > > > > --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> > > > > +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> > > > > @@ -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?
> > >
> > > 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?
>
> 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
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-13 13:56 ` Richard Purdie
2011-10-13 14:07 ` Martin Jansa
@ 2011-10-13 14:32 ` Otavio Salvador
2011-10-14 11:29 ` Richard Purdie
1 sibling, 1 reply; 40+ messages in thread
From: Otavio Salvador @ 2011-10-13 14:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Oct 13, 2011 at 10:56, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
...
>> 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.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-13 14:32 ` Otavio Salvador
@ 2011-10-14 11:29 ` Richard Purdie
2011-10-14 13:19 ` Otavio Salvador
0 siblings, 1 reply; 40+ messages in thread
From: Richard Purdie @ 2011-10-14 11:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-10-13 at 11:32 -0300, Otavio Salvador wrote:
> On Thu, Oct 13, 2011 at 10:56, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> ...
> >> 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.
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
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-14 11:29 ` Richard Purdie
@ 2011-10-14 13:19 ` Otavio Salvador
2011-10-14 23:46 ` Richard Purdie
0 siblings, 1 reply; 40+ messages in thread
From: Otavio Salvador @ 2011-10-14 13:19 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, Oct 14, 2011 at 08:29, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
...
>> 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.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES
2011-10-14 13:19 ` Otavio Salvador
@ 2011-10-14 23:46 ` Richard Purdie
0 siblings, 0 replies; 40+ messages in thread
From: Richard Purdie @ 2011-10-14 23:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-10-14 at 10:19 -0300, Otavio Salvador wrote:
> On Fri, Oct 14, 2011 at 08:29, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> ...
> >> 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
^ permalink raw reply [flat|nested] 40+ messages in thread
* [oe-core 15/20] mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging each lib in separate package
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (13 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 14/20] mesa-dri: introduce MACHINE_DRI_MODULES Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 16/20] mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody Martin Jansa
` (6 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 11fdc9b..f9c6d89 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -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)'
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index aaa3073..1485213 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -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
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 16/20] mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (14 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 15/20] mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging each lib in separate package Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 17/20] mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add mesa-xlib_git Martin Jansa
` (5 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* and more machines like om-gta02 have own DRI modules too
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index f9c6d89..5d25127 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -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)'
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index 1485213..6a7ab76 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -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'
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 17/20] mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add mesa-xlib_git
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (15 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 16/20] mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 18/20] mesa-git: lower D_P a bit more then all mesa-dri Martin Jansa
` (4 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index 6a7ab76..7ba3117 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -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/
-}
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
new file mode 100644
index 0000000..2f27ef1
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -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/
+}
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_git.bb b/meta/recipes-graphics/mesa/mesa-xlib_git.bb
new file mode 100644
index 0000000..7f827a7
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib_git.bb
@@ -0,0 +1,4 @@
+include mesa-common.inc
+include mesa-git.inc
+include mesa-xlib.inc
+PR = "${INC_PR}.0"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 18/20] mesa-git: lower D_P a bit more then all mesa-dri
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (16 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 17/20] mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add mesa-xlib_git Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 19/20] mesa-git: upgrade from 7.7+git to 7.11+git Martin Jansa
` (3 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* 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 <Martin.Jansa@gmail.com>
---
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(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index 7ba3117..ce1c8c7 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -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"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_git.bb b/meta/recipes-graphics/mesa/mesa-xlib_git.bb
index 7f827a7..97cac51 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_git.bb
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 19/20] mesa-git: upgrade from 7.7+git to 7.11+git
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (17 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 18/20] mesa-git: lower D_P a bit more then all mesa-dri Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:30 ` [oe-core 20/20] mesa-git: fix LIC_FILES_CHKSUM Martin Jansa
` (2 subsequent siblings)
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* 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 <Martin.Jansa@gmail.com>
---
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
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 2f27ef1..c9b17a9 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -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
}
diff --git a/meta/recipes-graphics/mesa/mesa-git/uclibc.patch b/meta/recipes-graphics/mesa/mesa-git/uclibc.patch
new file mode 100644
index 0000000..0b031f9
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-git/uclibc.patch
@@ -0,0 +1,57 @@
+Upstream-Status: Pending
+
+From 904bd5127bd88f45abf4a376676e0a487cfb018a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 13 Oct 2011 12:46:53 +0200
+Subject: [PATCH] configure: add check HAVE_NEWLOCALE to fix build with uclibc
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure.ac | 3 +++
+ src/glsl/strtod.c | 2 +-
+ src/mesa/main/imports.c | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 49e81ad..468cfd7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -507,6 +507,9 @@ AC_SUBST([DLOPEN_LIBS])
+ dnl See if posix_memalign is available
+ AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+
++dnl See if newlocale is available
++AC_CHECK_FUNCS_ONCE(newlocale)
++
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+ [AS_HELP_STRING([--enable-selinux],
+diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
+index ff34591..88aa5ef 100644
+--- a/src/glsl/strtod.c
++++ b/src/glsl/strtod.c
+@@ -44,7 +44,7 @@
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
+ static locale_t loc = NULL;
+ if (!loc) {
+ loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
+index 345a1c5..493e0fb 100644
+--- a/src/mesa/main/imports.c
++++ b/src/mesa/main/imports.c
+@@ -767,7 +767,7 @@ float
+ _mesa_strtof( const char *s, char **end )
+ {
+ #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+- !defined(ANDROID)
++ !defined(ANDROID) && defined (HAVE_NEWLOCALE)
+ static locale_t loc = NULL;
+ if (!loc) {
+ loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+--
+1.7.7
+
diff --git a/meta/recipes-graphics/mesa/mesa/cross2.patch b/meta/recipes-graphics/mesa/mesa/cross2.patch
deleted file mode 100644
index 264c153..0000000
--- a/meta/recipes-graphics/mesa/mesa/cross2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100
-+++ git/configure.ac 2009-09-01 16:38:47.000000000 +0100
-@@ -269,15 +269,6 @@
- GLAPI_ASM_SOURCES=""
- AC_MSG_CHECKING([whether to enable assembly])
- test "x$enable_asm" = xno && AC_MSG_RESULT([no])
--# disable if cross compiling on x86/x86_64 since we must run gen_matypes
--if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
-- case "$host_cpu" in
-- i?86 | x86_64)
-- enable_asm=no
-- AC_MSG_RESULT([no, cross compiling])
-- ;;
-- esac
--fi
- # check for supported arches
- if test "x$enable_asm" = xyes; then
- case "$host_cpu" in
-Index: git/src/mesa/x86/Makefile
-===================================================================
---- git.orig/src/mesa/x86/Makefile 2009-09-01 16:40:02.000000000 +0100
-+++ git/src/mesa/x86/Makefile 2009-09-01 16:40:13.000000000 +0100
-@@ -14,19 +14,6 @@
- -I../tnl
-
-
--default: gen_matypes matypes.h
--
--clean:
-- -rm -f matypes.h gen_matypes
--
--
--gen_matypes: gen_matypes.c
-- $(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes
--
--# need some special rules here, unfortunately
--matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
-- ./gen_matypes > matypes.h
--
- common_x86_asm.o: matypes.h
- 3dnow_normal.o: matypes.h
- 3dnow_xform1.o: matypes.h
diff --git a/meta/recipes-graphics/mesa/mesa/i586/matypes.h b/meta/recipes-graphics/mesa/mesa/i586/matypes.h
deleted file mode 100644
index 98d2188..0000000
--- a/meta/recipes-graphics/mesa/mesa/i586/matypes.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * This file is automatically generated from the Mesa internal type
- * definitions. Do not edit directly.
- */
-
-#ifndef __ASM_TYPES_H__
-#define __ASM_TYPES_H__
-
-
-
-/* =============================================================
- * Offsets for GLcontext
- */
-
-#define CTX_DRIVER_CTX 996
-
-#define CTX_LIGHT_ENABLED 39404
-#define CTX_LIGHT_SHADE_MODEL 39408
-#define CTX_LIGHT_COLOR_MAT_FACE 39412
-#define CTX_LIGHT_COLOR_MAT_MODE 39416
-#define CTX_LIGHT_COLOR_MAT_MASK 39420
-#define CTX_LIGHT_COLOR_MAT_ENABLED 39424
-#define CTX_LIGHT_ENABLED_LIST 39432
-#define CTX_LIGHT_NEED_VERTS 43793
-#define CTX_LIGHT_FLAGS 43796
-#define CTX_LIGHT_BASE_COLOR 43800
-
-
-/* =============================================================
- * Offsets for struct vertex_buffer
- */
-
-#define VB_SIZE 0
-#define VB_COUNT 4
-
-#define VB_ELTS 8
-#define VB_OBJ_PTR 12
-#define VB_EYE_PTR 16
-#define VB_CLIP_PTR 20
-#define VB_PROJ_CLIP_PTR 24
-#define VB_CLIP_OR_MASK 28
-#define VB_CLIP_MASK 32
-#define VB_NORMAL_PTR 36
-#define VB_EDGE_FLAG 44
-#define VB_TEX0_COORD_PTR 48
-#define VB_TEX1_COORD_PTR 52
-#define VB_TEX2_COORD_PTR 56
-#define VB_TEX3_COORD_PTR 60
-#define VB_INDEX_PTR 80
-#define VB_COLOR_PTR 88
-#define VB_SECONDARY_COLOR_PTR 96
-#define VB_FOG_COORD_PTR 104
-#define VB_PRIMITIVE 108
-
-
-/*
- * Flags for struct vertex_buffer
- */
-
-#define VERT_BIT_OBJ 0x1
-#define VERT_BIT_NORM 0x4
-#define VERT_BIT_RGBA 0x8
-#define VERT_BIT_SPEC_RGB 0x10
-#define VERT_BIT_FOG_COORD 0x20
-#define VERT_BIT_TEX0 0x100
-#define VERT_BIT_TEX1 0x200
-#define VERT_BIT_TEX2 0x400
-#define VERT_BIT_TEX3 0x800
-
-
-/* =============================================================
- * Offsets for GLvector4f
- */
-
-#define V4F_DATA 0
-#define V4F_START 4
-#define V4F_COUNT 8
-#define V4F_STRIDE 12
-#define V4F_SIZE 16
-#define V4F_FLAGS 20
-
-/*
- * Flags for GLvector4f
- */
-
-#define VEC_MALLOC 0x10
-#define VEC_NOT_WRITEABLE 0x40
-#define VEC_BAD_STRIDE 0x100
-
-#define VEC_SIZE_1 0x1
-#define VEC_SIZE_2 0x3
-#define VEC_SIZE_3 0x7
-#define VEC_SIZE_4 0xf
-
-
-/* =============================================================
- * Offsets for GLmatrix
- */
-
-#define MATRIX_DATA 0
-#define MATRIX_INV 4
-#define MATRIX_FLAGS 8
-#define MATRIX_TYPE 12
-
-
-/* =============================================================
- * Offsets for struct gl_light
- */
-
-#define LIGHT_NEXT 0
-#define LIGHT_PREV 4
-
-#define LIGHT_AMBIENT 8
-#define LIGHT_DIFFUSE 24
-#define LIGHT_SPECULAR 40
-#define LIGHT_EYE_POSITION 56
-#define LIGHT_SPOT_DIRECTION 72
-#define LIGHT_SPOT_EXPONENT 88
-#define LIGHT_SPOT_CUTOFF 92
-#define LIGHT_COS_CUTOFF 100
-#define LIGHT_CONST_ATTEN 104
-#define LIGHT_LINEAR_ATTEN 108
-#define LIGHT_QUADRATIC_ATTEN 112
-#define LIGHT_ENABLED 116
-
-#define LIGHT_FLAGS 120
-
-#define LIGHT_POSITION 124
-#define LIGHT_VP_INF_NORM 140
-#define LIGHT_H_INF_NORM 152
-#define LIGHT_NORM_DIRECTION 164
-#define LIGHT_VP_INF_SPOT_ATTEN 180
-
-#define LIGHT_SPOT_EXP_TABLE 184
-#define LIGHT_MAT_AMBIENT 4280
-#define LIGHT_MAT_DIFFUSE 4304
-#define LIGHT_MAT_SPECULAR 4328
-
-#define SIZEOF_GL_LIGHT 4360
-
-/*
- * Flags for struct gl_light
- */
-
-#define LIGHT_SPOT 0x1
-#define LIGHT_LOCAL_VIEWER 0x2
-#define LIGHT_POSITIONAL 0x4
-
-#define LIGHT_NEED_VERTICES 0x6
-
-
-/* =============================================================
- * Offsets for struct gl_lightmodel
- */
-
-#define LIGHT_MODEL_AMBIENT 0
-#define LIGHT_MODEL_LOCAL_VIEWER 16
-#define LIGHT_MODEL_TWO_SIDE 17
-#define LIGHT_MODEL_COLOR_CONTROL 20
-
-
-#endif /* __ASM_TYPES_H__ */
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* [oe-core 20/20] mesa-git: fix LIC_FILES_CHKSUM
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (18 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 19/20] mesa-git: upgrade from 7.7+git to 7.11+git Martin Jansa
@ 2011-10-13 11:30 ` Martin Jansa
2011-10-13 11:39 ` [oe-core 00/20] Xorg, mesa changes Koen Kooi
2011-10-14 11:26 ` Richard Purdie
21 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-13 11:30 UTC (permalink / raw)
To: openembedded-core
* 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.
---
> 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 <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-git.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index c9b17a9..594d9b8 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -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"
--
1.7.7
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [oe-core 00/20] Xorg, mesa changes
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (19 preceding siblings ...)
2011-10-13 11:30 ` [oe-core 20/20] mesa-git: fix LIC_FILES_CHKSUM Martin Jansa
@ 2011-10-13 11:39 ` Koen Kooi
2011-10-14 11:26 ` Richard Purdie
21 siblings, 0 replies; 40+ messages in thread
From: Koen Kooi @ 2011-10-13 11:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 13 okt. 2011, om 13:30 heeft Martin Jansa het volgende geschreven:
> 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
These changes all look sane to me, but I must admit I haven't tried a build with them yet.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 00/20] Xorg, mesa changes
2011-10-13 11:30 [oe-core 00/20] Xorg, mesa changes Martin Jansa
` (20 preceding siblings ...)
2011-10-13 11:39 ` [oe-core 00/20] Xorg, mesa changes Koen Kooi
@ 2011-10-14 11:26 ` Richard Purdie
2011-10-14 11:39 ` Martin Jansa
21 siblings, 1 reply; 40+ messages in thread
From: Richard Purdie @ 2011-10-14 11:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> 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
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
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [oe-core 00/20] Xorg, mesa changes
2011-10-14 11:26 ` Richard Purdie
@ 2011-10-14 11:39 ` Martin Jansa
0 siblings, 0 replies; 40+ messages in thread
From: Martin Jansa @ 2011-10-14 11:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3429 bytes --]
On Fri, Oct 14, 2011 at 12:26:30PM +0100, Richard Purdie wrote:
> On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> > 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
>
> 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
> This was *much* easier to review and I'm grateful for that, thanks!
good, you're welcome
> 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
OK
> 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
> 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)
> and then we should have this all resolved :)
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread