mesa: switch to SRCPV with PE bump

diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc
index 8fc2044bef2cd26a7074947664900368a8ec6b43..a88a07f01998ca96521d95d2e05146eb053a2f68 100644 (file)
--- a/recipes/mesa/mesa-common-old.inc
+++ b/recipes/mesa/mesa-common-old.inc
@@ -1,4 +1,5 @@
 SECTION = "x11"
+PE = "2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
        file://mklib-rpath-link.patch;patch=1"

diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc
index aaccf54d0b906633f82cca301ea5c91b636f4dc6..388411239061a4a2c585f293330dd355a28c70eb 100644 (file)
--- a/recipes/mesa/mesa-common.inc
+++ b/recipes/mesa/mesa-common.inc
@@ -5,6 +5,7 @@ HOMEPAGE = "http://mesa3d.org"
 LICENSE = "MIT"
 
 INC_PR = "r7"
+PE = "2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2;name=archive \
            ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2;name=demos "

diff --git a/recipes/mesa/mesa-dri_7.2.bb b/recipes/mesa/mesa-dri_7.2.bb
index 4665363d4091a5fe6ea67811bdf873f35159a269..da402c38813a09aa110219c4eb4c8a06d730d11c 100644 (file)
--- a/recipes/mesa/mesa-dri_7.2.bb
+++ b/recipes/mesa/mesa-dri_7.2.bb
@@ -5,7 +5,6 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PE = "1"
 PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib

diff --git a/recipes/mesa/mesa-dri_7.4.bb b/recipes/mesa/mesa-dri_7.4.bb
index 583584be1943b86c1aad32a4871becf9be370999..a78c03f586f6b30ebdd9a8094399e91bc4b2b6b2 100644 (file)
--- a/recipes/mesa/mesa-dri_7.4.bb
+++ b/recipes/mesa/mesa-dri_7.4.bb
@@ -5,7 +5,6 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PE = "1"
 PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib

diff --git a/recipes/mesa/mesa-dri_7.6.bb b/recipes/mesa/mesa-dri_7.6.bb
index a1a4d08a51c1f08db889e3ceeb69ef58481fb4b5..33f4069bc56cfdfcad61272a742295ad3c9a00d9 100644 (file)
--- a/recipes/mesa/mesa-dri_7.6.bb
+++ b/recipes/mesa/mesa-dri_7.6.bb
@@ -8,7 +8,6 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
            ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
           "
-PE = "1"
 PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib

diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index 217541f814a059d3b2c9f455add7b3aa063a0195..fe8bcd59668beadf7d75ea92c278a03977eed6d0 100644 (file)
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -7,8 +7,7 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native mesa-dri-glsl-native"
 
 PV = "7.7.999"
 PR = "${INC_PR}.0"
-PR_append = "+gitr${SRCREV}"
-PE = "1"
+PR_append = "+gitr${SRCPV}"
 
 DEFAULT_PREFERENCE = "-2"
 DEFAULT_PREFERENCE_shr = "2"

diff --git a/recipes/mesa/mesa-xlib_7.2.bb b/recipes/mesa/mesa-xlib_7.2.bb
index 9fedd8bd866e742607ccdcc8aa7c6fb2b77af77d..dfc0d7ce80615e8e64a219b48b2f2ae44c10b048 100644 (file)
--- a/recipes/mesa/mesa-xlib_7.2.bb
+++ b/recipes/mesa/mesa-xlib_7.2.bb
@@ -5,7 +5,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PE = "1"
 PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--with-driver=xlib"

diff --git a/recipes/mesa/mesa-xlib_7.4.bb b/recipes/mesa/mesa-xlib_7.4.bb
index f24087dba26965291ed9fc01e31bc982a5e2bf3a..68e7218ea79b669e5723a4523365ae291aba83d0 100644 (file)
--- a/recipes/mesa/mesa-xlib_7.4.bb
+++ b/recipes/mesa/mesa-xlib_7.4.bb
@@ -5,7 +5,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PE = "1"
 PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--with-driver=xlib"

diff --git a/recipes/mesa/mesa-xlib_7.6.bb b/recipes/mesa/mesa-xlib_7.6.bb
index 25934ece46305e05d82c39094084edb4c56286fa..e81c5857bf04cbc9a02a369b631764d4914b7137 100644 (file)
--- a/recipes/mesa/mesa-xlib_7.6.bb
+++ b/recipes/mesa/mesa-xlib_7.6.bb
@@ -9,7 +9,6 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=a
            ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
           "
 
-PE = "1"
 PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--disable-gallium --with-driver=xlib"

diff --git a/recipes/mesa/mesa_6.0.1.bb b/recipes/mesa/mesa_6.0.1.bb
index d620f85787507bd3bfb5c618df6c1e59aaed06f2..73f96f72e707ebf2c891a980953cc31de42f8725 100644 (file)
--- a/recipes/mesa/mesa_6.0.1.bb
+++ b/recipes/mesa/mesa_6.0.1.bb
@@ -3,6 +3,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
        file://Make-config.patch;patch=1 \
        file://mklib.patch;patch=1"
 S = "${WORKDIR}/Mesa-${PV}"
+PE = "2"
 LICENSE = "LGPL"
 # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
 CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"

diff --git a/recipes/mesa/mesa_6.4.1+cvs20060101.bb b/recipes/mesa/mesa_6.4.1+cvs20060101.bb
index 0e9f99684fa95322c8455b4363ae327cd3e44f24..7eb52b2579bd16b31eaf3979522a37b14805c191 100644 (file)
--- a/recipes/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/recipes/mesa/mesa_6.4.1+cvs20060101.bb
@@ -2,6 +2,7 @@ SECTION = "unknown"
 
 SRCDATE = "20060101"
 PV = "6.4.1+cvs${SRCDATE}"
+PE = "2"
 
 SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \
        file://mklib-rpath-link.patch;patch=1"