summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-03-19 18:23:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 17:07:16 +0000
commite66deb015674f2a95845b6f6722c460dc3ce0a1a (patch)
tree16a3ea83eb060f41bdf3717e303ca3f8138d392c /meta/recipes-graphics
parentc2f60b6ee7cb70dea2f229de69cce2773de3e59d (diff)
downloadpoky-e66deb015674f2a95845b6f6722c460dc3ce0a1a.tar.gz
mesa: rename mesa-dri recipe to just mesa
Rename mesa-dri recipes to just mesa. Also, replace all references to mesa-dri in all recipes/configs. The reason for this renaming (quote from bugzilla): "mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore. mesa-dri should be renamed to mesa." [YOCTO #3385] (From OE-Core rev: c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/libglu_9.0.0.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc5
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb8
-rw-r--r--meta/recipes-graphics/mesa/mesa-git.inc1
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc (renamed from meta/recipes-graphics/mesa/mesa-dri.inc)11
-rw-r--r--meta/recipes-graphics/mesa/mesa_9.0.2.bb (renamed from meta/recipes-graphics/mesa/mesa-dri_9.0.2.bb)2
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb7
-rw-r--r--meta/recipes-graphics/wayland/weston_1.0.3.bb6
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc2
9 files changed, 22 insertions, 22 deletions
diff --git a/meta/recipes-graphics/mesa/libglu_9.0.0.bb b/meta/recipes-graphics/mesa/libglu_9.0.0.bb
index 79807491bd..06d30f9bfa 100644
--- a/meta/recipes-graphics/mesa/libglu_9.0.0.bb
+++ b/meta/recipes-graphics/mesa/libglu_9.0.0.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \ 8LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \
9 file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9" 9 file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9"
10 10
11# Epoch as this used to be part of mesa-dri 11# Epoch as this used to be part of mesa
12PE = "2" 12PE = "2"
13PR = "0" 13PR = "0"
14 14
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index aa26aee7db..c37ad69075 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -18,9 +18,6 @@ DEPENDS = "expat makedepend-native flex-native bison-native"
18 18
19PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" 19PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
20 20
21# for mesa-dri
22FILESEXTRAPATHS_prepend := "${THISDIR}/mesa:"
23
24inherit autotools pkgconfig pythonnative 21inherit autotools pkgconfig pythonnative
25 22
26EXTRA_OECONF = "--disable-glu \ 23EXTRA_OECONF = "--disable-glu \
@@ -41,7 +38,7 @@ PACKAGECONFIG[wayland] = ",,wayland"
41# Multiple virtual/gl providers being built breaks staging 38# Multiple virtual/gl providers being built breaks staging
42EXCLUDE_FROM_WORLD = "1" 39EXCLUDE_FROM_WORLD = "1"
43 40
44# Remove the mesa-dri dependency on mesa-dri-dev, as mesa-dri is empty 41# Remove the mesa dependency on mesa-dev, as mesa is empty
45RDEPENDS_${PN}-dev = "" 42RDEPENDS_${PN}-dev = ""
46 43
47PACKAGES =+ "libegl-mesa libegl-mesa-dev \ 44PACKAGES =+ "libegl-mesa libegl-mesa-dev \
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
deleted file mode 100644
index 69a433e7c3..0000000000
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require mesa-common.inc
2require mesa-git.inc
3require mesa-dri.inc
4
5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
6DEFAULT_PREFERENCE = "-2"
7
8PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 25093af3fe..ee9a552757 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -3,7 +3,6 @@ SRCREV = "1665af3066f3d58c42e9d5b13098f13615a7672c"
3PV = "9.1~git${SRCPV}" 3PV = "9.1~git${SRCPV}"
4 4
5LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d" 5LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
6FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
7 6
8SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ 7SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
9 file://0002-cross-compile.patch \ 8 file://0002-cross-compile.patch \
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa.inc
index e43150b326..a692bb7a04 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -18,11 +18,16 @@ PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disa
18 18
19python populate_packages_prepend() { 19python populate_packages_prepend() {
20 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") 20 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
21 21
22 do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') 22 pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
23 pkgs += do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-driver-%s', 'Mesa %s DRI driver', extra_depends='')
24 for pkg in pkgs:
25 d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
26 d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
27 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-"))
23} 28}
24 29
25PACKAGES_DYNAMIC += "^mesa-dri-driver-.*" 30PACKAGES_DYNAMIC += "^mesa-driver-.*"
26 31
27FILES_${PN}-dbg += "${libdir}/dri/.debug/*" 32FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
28 33
diff --git a/meta/recipes-graphics/mesa/mesa-dri_9.0.2.bb b/meta/recipes-graphics/mesa/mesa_9.0.2.bb
index 26b56e426c..1a1bf24e10 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_9.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.0.2.bb
@@ -1,4 +1,4 @@
1require mesa-common.inc 1require mesa-common.inc
2require mesa-${PV}.inc 2require mesa-${PV}.inc
3require mesa-dri.inc 3require mesa.inc
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
new file mode 100644
index 0000000000..6a4bc3803e
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -0,0 +1,7 @@
1require mesa-common.inc
2require mesa-git.inc
3require mesa.inc
4
5DEFAULT_PREFERENCE = "-1"
6
7PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/wayland/weston_1.0.3.bb b/meta/recipes-graphics/wayland/weston_1.0.3.bb
index afe8235e10..f769312f32 100644
--- a/meta/recipes-graphics/wayland/weston_1.0.3.bb
+++ b/meta/recipes-graphics/wayland/weston_1.0.3.bb
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "3136a7d2f654ea3e946d4217f7e25321248ad2921f1f4e2504dda58968
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" 16DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg"
17DEPENDS += "wayland mesa-dri virtual/egl" 17DEPENDS += "wayland mesa virtual/egl"
18 18
19EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" 19EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install"
20EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland" 20EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland"
@@ -25,9 +25,9 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland',
25 ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \ 25 ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \
26 " 26 "
27# Weston on KMS 27# Weston on KMS
28PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa-dri libpam" 28PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa libpam"
29# Weston on Wayland (nested Weston) 29# Weston on Wayland (nested Weston)
30PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa-dri" 30PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
31# Weston on X11 31# Weston on X11
32PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" 32PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
33 33
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 5d5443c7db..795410bbe7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -126,7 +126,7 @@ PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '',
126PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 126PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
127PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ 127PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
128 --disable-dri --disable-dri2 --disable-glx,\ 128 --disable-dri --disable-dri2 --disable-glx,\
129 xf86driproto dri2proto mesa-dri" 129 xf86driproto dri2proto mesa"
130 130
131do_install_append () { 131do_install_append () {
132 # Its assumed base-files creates this for us 132 # Its assumed base-files creates this for us