aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/mesa
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2009-11-16 00:13:38 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2009-11-16 00:13:38 +0100
commit524ac4238c19a5b4219899474c69850b3915c539 (patch)
treed9960128149f5d7c90d6cffb8ccd4e9fea9af127 /recipes/mesa
parent5df7ab9773f6d152236e1aa10060f81fff923a46 (diff)
parentfcc6c8c263035498f0f45ed884793b953acb5882 (diff)
downloadopenembedded-524ac4238c19a5b4219899474c69850b3915c539.tar.gz
Merge remote branch 'origin/martin_jansa/srcpv' into shr/merge
Conflicts: recipes/mesa/mesa-dri_git.bb
Diffstat (limited to 'recipes/mesa')
-rw-r--r--recipes/mesa/mesa-common-old.inc1
-rw-r--r--recipes/mesa/mesa-common.inc1
-rw-r--r--recipes/mesa/mesa_6.0.1.bb1
-rw-r--r--recipes/mesa/mesa_6.4.1+cvs20060101.bb1
4 files changed, 4 insertions, 0 deletions
diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc
index 18e9b4ebed..402a82a6b3 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 ccfe504d54..fc530a2569 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 \
${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
diff --git a/recipes/mesa/mesa_6.0.1.bb b/recipes/mesa/mesa_6.0.1.bb
index d8c857fef7..dd4e07e80f 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"