Skip to contentSkip to conversation

xserver-xorg 1.6.1: fix dolt script to handle ${host_alias}

PATCH In review Michael Smith 2 participants 8 messages Jul 14, 2009 – Aug 24, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 xserver-xorg 1.6.1: fix dolt script to handle ${host_alias}

---

This is a resend from yesterday (just because without it, one of the following patches won't apply cleanly due to PR change).

 .../xserver-xorg-1.6.1/dolt-host-alias.patch       |   28 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg_1.6.1.bb         |    7 +++-
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 recipes/xorg-xserver/xserver-xorg-1.6.1/dolt-host-alias.patch
recipes/xorg-xserver/xserver-xorg-1.6.1/dolt-host-alias.patch new file +28 -0
new file mode 100644
index 0000000..ca2ca07
@@ -0,0 +1,28 @@
+upstream: http://lists.freedesktop.org/archives/xorg/2009-May/045835.html
+
+From: Mario Domenech Goulart <mario at ossystems.com.br>
+
+Generates the libtool file prefixed by ${host_alias} when it is set.
+This is required in cross compiling environments (such as OpenEmbedded).
+
+--- xorg-server-1.6.1/acinclude.m4.orig	2009-04-14 13:14:56.000000000 -0400
++++ xorg-server-1.6.1/acinclude.m4	2009-07-12 17:25:23.000000000 -0400
+@@ -163,10 +163,16 @@
+ if $modeok && $tagok ; then
+     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+-    exec ${top_builddir_slash}libtool "$[]@"
+-fi
+ __DOLTLIBTOOL__EOF__
+ 
++maybe_hyphen=
++if ! test x$host_alias = x; then
++    maybe_hyphen="-"
++fi
++
++echo '    exec ${top_builddir_slash}'${host_alias}${maybe_hyphen}'libtool "$[]@"' >>doltlibtool
++echo 'fi' >>doltlibtool
++
+ dnl Done writing out doltlibtool; substitute it for libtool.
+     chmod +x doltlibtool
+     LIBTOOL='$(top_builddir)/doltlibtool'
recipes/xorg-xserver/xserver-xorg_1.6.1.bb +5 -2
index a177b19..f2902cf 100644
@@ -4,9 +4,12 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
 RDEPENDS += "hal"
 PE = "2"
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://sysroot_fix.patch;patch=1"
+SRC_URI += " \
+	file://sysroot_fix.patch;patch=1 \
+	file://dolt-host-alias.patch;patch=1 \
+"
 
 MESA_VER = "7.2"
 
Signature · 1 line
1.6.3
#1 lore raw

PATCH 2/4 mesa-dri: set PACKAGE_ARCH to ${MACHINE}

${MACHINE_DRI_MODULES} is passed to configure, so the package output depends on MACHINE. As foretold by commit f06119fc :)

Also switch to INC_PR and fix built of mesa-xprogs when prefix != /usr.

---
 recipes/mesa/mesa-common.inc |   10 +++++++++-
 recipes/mesa/mesa-dri_7.2.bb |    7 +------
 recipes/mesa/mesa-dri_7.4.bb |    7 +------
 recipes/mesa/mesa-dri_git.bb |    3 +--
 4 files changed, 12 insertions(+), 15 deletions(-)
recipes/mesa/mesa-common.inc +9 -1
index 9cd10eb..4f18c2f 100644
@@ -4,6 +4,8 @@ DESCRIPTION = "An open source implementation of the OpenGL spec"
 HOMEPAGE = "http://mesa3d.org"
 LICENSE = "MIT"
 
+INC_PR = "r7"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
            ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
 S = "${WORKDIR}/Mesa-${PV}"
@@ -20,6 +22,9 @@ EXTRA_OECONF = "--enable-glu \
 require mesa-tls.inc
 EXTRA_OECONF += "${@get_tls_setting(bb, d)} "
 
+# Package contents vary according to ${MACHINE_DRI_MODULES}.
+PACKAGE_ARCH = "${MACHINE}"
+
 PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
 FILES_libgl = "${libdir}/libGL.so.*"
 FILES_libglu = "${libdir}/libGLU.so.*"
@@ -36,4 +41,7 @@ do_stage() {
 		cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/
 }
 
-
+do_install_append () {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
+}
recipes/mesa/mesa-dri_7.2.bb +1 -6
index 296a254..9356843 100644
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
@@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}
recipes/mesa/mesa-dri_7.4.bb +1 -6
index 296a254..9356843 100644
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
@@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}
recipes/mesa/mesa-dri_git.bb +1 -2
index bca681c..4ca1b73 100644
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PV = "7.2+gitr${SRCREV}"
-PR = "r1"
+PR = "${INC_PR}.0"
 PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
@@ -18,4 +18,3 @@ FILES_${PN} += "${libdir}/dri/*.so"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
Signature · 1 line
1.6.3
#2 lore raw

PATCH 3/4 mesa-dri: move tls configure logic to a class

Will allow reuse by xorg-xserver.

---
 .../mesa-tls.inc => classes/glx-use-tls.bbclass    |    3 ++-
 recipes/mesa/mesa-common.inc                       |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename recipes/mesa/mesa-tls.inc => classes/glx-use-tls.bbclass (81%)
classes/glx-use-tls.bbclass renamed from recipes/mesa/mesa-tls.inc +2 -1
similarity index 81%
rename from recipes/mesa/mesa-tls.inc
rename to classes/glx-use-tls.bbclass
index 1472aa7..7530872 100644
@@ -1,6 +1,7 @@
-
 def get_tls_setting(bb, d):
     # until we have no prober TLS support in uclibc disable it
     if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
         return ""
     return "--enable-glx-tls"
+
+EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
recipes/mesa/mesa-common.inc +1 -2
index 4f18c2f..d7bfc14 100644
@@ -19,8 +19,7 @@ EXTRA_OECONF = "--enable-glu \
                 --disable-glut \
 	       "
 
-require mesa-tls.inc
-EXTRA_OECONF += "${@get_tls_setting(bb, d)} "
+inherit glx-use-tls
 
 # Package contents vary according to ${MACHINE_DRI_MODULES}.
 PACKAGE_ARCH = "${MACHINE}"
Signature · 1 line
1.6.3
#3 lore raw

PATCH 4/4 xorg-xserver-common: pass --enable-glx-tls

Uses the same inherit as mesa-dri, so they both get the same answer.

Also switch to INC_PR.

---
 recipes/xorg-xserver/xorg-xserver-common.inc |    4 +++-
 recipes/xorg-xserver/xserver-xorg_1.2.0.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.4.2.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.4.bb     |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.5.1.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.5.3.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.6.1.bb   |    2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)
recipes/xorg-xserver/xorg-xserver-common.inc +3 -1
index ec56515..cfd350e 100644
@@ -2,6 +2,8 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
 
+INC_PR = "r12"
+
 PROVIDES = "virtual/xserver"
 
 DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ 
@@ -21,7 +23,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig glx-use-tls
 
 EXTRA_OECONF += " --enable-xcalibrate \
                   --enable-kdrive \
recipes/xorg-xserver/xserver-xorg_1.2.0.bb +1 -1
index 61f73b3..50d182c 100644
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r4"
+PR = "${INC_PR}.0"
 
 export LDFLAGS += " -ldl "
 
recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb +1 -1
index 9d6dca4..1efea75 100644
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r8"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"
recipes/xorg-xserver/xserver-xorg_1.4.2.bb +1 -1
index 2c4f3d8..13cceb9 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r11"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
recipes/xorg-xserver/xserver-xorg_1.4.bb +1 -1
index cb9ddcd..edd1ac0 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r9"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
recipes/xorg-xserver/xserver-xorg_1.5.1.bb +1 -1
index d4b8caf..4c2efd5 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r3"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"
recipes/xorg-xserver/xserver-xorg_1.5.3.bb +1 -1
index 74ea3c4..3969724 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "2"
-PR = "r5"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1 \
recipes/xorg-xserver/xserver-xorg_1.6.1.bb +1 -1
index f2902cf..0c5a304 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
 RDEPENDS += "hal"
 PE = "2"
-PR = "r2"
+PR = "${INC_PR}.0"
 
 SRC_URI += " \
 	file://sysroot_fix.patch;patch=1 \
Signature · 1 line
1.6.3
#4 lore raw

Re: [PATCH 4/4] xorg-xserver-common: pass --enable-glx-tls

... and this one?

Thanks,
Mike

Quoted 132 lines · Michael Smith

Uses the same inherit as mesa-dri, so they both get the same answer.

Also switch to INC_PR.

---
 recipes/xorg-xserver/xorg-xserver-common.inc |    4 +++-
 recipes/xorg-xserver/xserver-xorg_1.2.0.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.4.2.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.4.bb     |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.5.1.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.5.3.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.6.1.bb   |    2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)
recipes/xorg-xserver/xorg-xserver-common.inc +3 -1
index ec56515..cfd350e 100644
@@ -2,6 +2,8 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
 
+INC_PR = "r12"
+
 PROVIDES = "virtual/xserver"
 
 DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ 
@@ -21,7 +23,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig glx-use-tls
 
 EXTRA_OECONF += " --enable-xcalibrate \
                   --enable-kdrive \
recipes/xorg-xserver/xserver-xorg_1.2.0.bb +1 -1
index 61f73b3..50d182c 100644
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r4"
+PR = "${INC_PR}.0"
 
 export LDFLAGS += " -ldl "
 
recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb +1 -1
index 9d6dca4..1efea75 100644
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r8"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"
recipes/xorg-xserver/xserver-xorg_1.4.2.bb +1 -1
index 2c4f3d8..13cceb9 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r11"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
recipes/xorg-xserver/xserver-xorg_1.4.bb +1 -1
index cb9ddcd..edd1ac0 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r9"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
recipes/xorg-xserver/xserver-xorg_1.5.1.bb +1 -1
index d4b8caf..4c2efd5 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r3"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"
recipes/xorg-xserver/xserver-xorg_1.5.3.bb +1 -1
index 74ea3c4..3969724 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "2"
-PR = "r5"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1 \
recipes/xorg-xserver/xserver-xorg_1.6.1.bb +1 -1
index f2902cf..0c5a304 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
 RDEPENDS += "hal"
 PE = "2"
-PR = "r2"
+PR = "${INC_PR}.0"
 
 SRC_URI += " \
 	file://sysroot_fix.patch;patch=1 \
Signature · 1 line
1.6.3
#5 lore raw

Re: [PATCH 4/4] xorg-xserver-common: pass --enable-glx-tls

+1 from me.

Quoted 146 lines · Michael Smith

... and this one?

Thanks,
Mike

Quoted 127 lines · Michael Smith

Uses the same inherit as mesa-dri, so they both get the same answer.

Also switch to INC_PR.

---
 recipes/xorg-xserver/xorg-xserver-common.inc |    4 +++- recipes/xorg-xserver/xserver-xorg_1.2.0.bb   |    2 +- recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb |    2 +- recipes/xorg-xserver/xserver-xorg_1.4.2.bb   |    2 +- recipes/xorg-xserver/xserver-xorg_1.4.bb     |    2 +-

 recipes/xorg-xserver/xserver-xorg_1.5.1.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.5.3.bb   |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.6.1.bb   |    2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)
recipes/xorg-xserver/xorg-xserver-common.inc +0 -0
index ec56515..cfd350e 100644
@@ -2,6 +2,8 @@ HOMEPAGE = "http://www.x.org"

 SECTION = "x11/base"
 LICENSE = "MIT-X"

recipes/xorg-xserver/xorg-xserver-common.inc +2 -0
+INC_PR = "r12"
+

 PROVIDES = "virtual/xserver"

 DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \

recipes/xorg-xserver/xorg-xserver-common.inc +0 -0
@@ -21,7 +23,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 

 S = "${WORKDIR}/${XORG_PN}-${PV}"

recipes/xorg-xserver/xorg-xserver-common.inc +1 -1
-inherit autotools pkgconfig
+inherit autotools pkgconfig glx-use-tls

 EXTRA_OECONF += " --enable-xcalibrate \
                   --enable-kdrive \

recipes/xorg-xserver/xserver-xorg_1.2.0.bb +0 -0
index 61f73b3..50d182c 100644
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 

 require xorg-xserver-common.inc
 PE = "1"

recipes/xorg-xserver/xserver-xorg_1.2.0.bb +1 -1
-PR = "r4"
+PR = "${INC_PR}.0"

 export LDFLAGS += " -ldl "

recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb +0 -0
index 9d6dca4..1efea75 100644
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 

 require xorg-xserver-common.inc
 PE = "1"

recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb +1 -1
-PR = "r8"
+PR = "${INC_PR}.0"

 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"

recipes/xorg-xserver/xserver-xorg_1.4.2.bb +0 -0
index 2c4f3d8..13cceb9 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"

 DEPENDS += "pixman"
 RDEPENDS += "hal"
 PE = "1"

recipes/xorg-xserver/xserver-xorg_1.4.2.bb +1 -1
-PR = "r11"
+PR = "${INC_PR}.0"

 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \

recipes/xorg-xserver/xserver-xorg_1.4.bb +0 -0
index cb9ddcd..edd1ac0 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"

 DEPENDS += "pixman"
 RDEPENDS += "hal"
 PE = "1"

recipes/xorg-xserver/xserver-xorg_1.4.bb +1 -1
-PR = "r9"
+PR = "${INC_PR}.0"

 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \

recipes/xorg-xserver/xserver-xorg_1.5.1.bb +0 -0
index d4b8caf..4c2efd5 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"

 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "1"

recipes/xorg-xserver/xserver-xorg_1.5.1.bb +1 -1
-PR = "r3"
+PR = "${INC_PR}.0"

 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"

recipes/xorg-xserver/xserver-xorg_1.5.3.bb +0 -0
index 74ea3c4..3969724 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"

 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "2"

recipes/xorg-xserver/xserver-xorg_1.5.3.bb +1 -1
-PR = "r5"
+PR = "${INC_PR}.0"

 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1 \

recipes/xorg-xserver/xserver-xorg_1.6.1.bb +0 -0
index f2902cf..0c5a304 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"

 DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama" RDEPENDS += "hal"
 PE = "2"

recipes/xorg-xserver/xserver-xorg_1.6.1.bb +1 -1
-PR = "r2"
+PR = "${INC_PR}.0"
Quoted 5 lines

 SRC_URI += " \
      file://sysroot_fix.patch;patch=1 \
--
1.6.3

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 3 lines
Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br
#6 lore raw

Re: [PATCH 3/4] mesa-dri: move tls configure logic to a class

In reply to Michael Smith

... OK to commit?

Quoted 42 lines · Michael Smith

Will allow reuse by xorg-xserver.

---
 .../mesa-tls.inc => classes/glx-use-tls.bbclass    |    3 ++-
 recipes/mesa/mesa-common.inc                       |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename recipes/mesa/mesa-tls.inc => classes/glx-use-tls.bbclass (81%)
classes/glx-use-tls.bbclass renamed from recipes/mesa/mesa-tls.inc +2 -1
similarity index 81%
rename from recipes/mesa/mesa-tls.inc
rename to classes/glx-use-tls.bbclass
index 1472aa7..7530872 100644
@@ -1,6 +1,7 @@
-
 def get_tls_setting(bb, d):
     # until we have no prober TLS support in uclibc disable it
     if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
         return ""
     return "--enable-glx-tls"
+
+EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
recipes/mesa/mesa-common.inc +1 -2
index 4f18c2f..d7bfc14 100644
@@ -19,8 +19,7 @@ EXTRA_OECONF = "--enable-glu \
                 --disable-glut \
 	       "
 
-require mesa-tls.inc
-EXTRA_OECONF += "${@get_tls_setting(bb, d)} "
+inherit glx-use-tls
 
 # Package contents vary according to ${MACHINE_DRI_MODULES}.
 PACKAGE_ARCH = "${MACHINE}"
Signature · 1 line
1.6.3
#7 lore raw

Re: [PATCH 2/4] mesa-dri: set PACKAGE_ARCH to ${MACHINE}

In reply to Michael Smith

OK to commit?

Quoted 110 lines · Michael Smith

${MACHINE_DRI_MODULES} is passed to configure, so the package output depends on MACHINE. As foretold by commit f06119fc :)

Also switch to INC_PR and fix built of mesa-xprogs when prefix != /usr.

---
 recipes/mesa/mesa-common.inc |   10 +++++++++-
 recipes/mesa/mesa-dri_7.2.bb |    7 +------
 recipes/mesa/mesa-dri_7.4.bb |    7 +------
 recipes/mesa/mesa-dri_git.bb |    3 +--
 4 files changed, 12 insertions(+), 15 deletions(-)
recipes/mesa/mesa-common.inc +9 -1
index 9cd10eb..4f18c2f 100644
@@ -4,6 +4,8 @@ DESCRIPTION = "An open source implementation of the OpenGL spec"
 HOMEPAGE = "http://mesa3d.org"
 LICENSE = "MIT"
 
+INC_PR = "r7"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
            ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
 S = "${WORKDIR}/Mesa-${PV}"
@@ -20,6 +22,9 @@ EXTRA_OECONF = "--enable-glu \
 require mesa-tls.inc
 EXTRA_OECONF += "${@get_tls_setting(bb, d)} "
 
+# Package contents vary according to ${MACHINE_DRI_MODULES}.
+PACKAGE_ARCH = "${MACHINE}"
+
 PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
 FILES_libgl = "${libdir}/libGL.so.*"
 FILES_libglu = "${libdir}/libGLU.so.*"
@@ -36,4 +41,7 @@ do_stage() {
 		cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/
 }
 
-
+do_install_append () {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
+}
recipes/mesa/mesa-dri_7.2.bb +1 -6
index 296a254..9356843 100644
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
@@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}
recipes/mesa/mesa-dri_7.4.bb +1 -6
index 296a254..9356843 100644
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
@@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}
recipes/mesa/mesa-dri_git.bb +1 -2
index bca681c..4ca1b73 100644
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PV = "7.2+gitr${SRCREV}"
-PR = "r1"
+PR = "${INC_PR}.0"
 PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
@@ -18,4 +18,3 @@ FILES_${PN} += "${libdir}/dri/*.so"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
Signature · 1 line
1.6.3