mesa: switch to SRCPV with PE bump

11 files changed, 5 insertions, 8 deletions

diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc
index 8fc2044bef..a88a07f019 100644
--- 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 aaccf54d0b..3884112390 100644
--- 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 4665363d40..da402c3881 100644
--- 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 583584be19..a78c03f586 100644
--- 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 a1a4d08a51..33f4069bc5 100644
--- 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 217541f814..fe8bcd5966 100644
--- 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 9fedd8bd86..dfc0d7ce80 100644
--- 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 f24087dba2..68e7218ea7 100644
--- 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 25934ece46..e81c5857bf 100644
--- 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 d620f85787..73f96f72e7 100644
--- 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 0e9f99684f..7eb52b2579 100644
--- 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"