diff options
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_7.5.bb | 48 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_7.7.bb | 49 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb | 56 |
5 files changed, 4 insertions, 153 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch b/meta/recipes-graphics/mesa/mesa-dri/cross2.patch index d2147910ae..264c153087 100644 --- a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch +++ b/meta/recipes-graphics/mesa/mesa-dri/cross2.patch | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 1 | Index: git/configure.ac | 3 | Index: git/configure.ac |
| 2 | =================================================================== | 4 | =================================================================== |
| 3 | --- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100 | 5 | --- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100 |
diff --git a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch b/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch index 84be428c4f..d300e2f1b3 100644 --- a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch +++ b/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 1 | Index: Mesa-7.5/bin/mklib | 3 | Index: Mesa-7.5/bin/mklib |
| 2 | =================================================================== | 4 | =================================================================== |
| 3 | --- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100 | 5 | --- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100 |
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.5.bb b/meta/recipes-graphics/mesa/mesa-dri_7.5.bb deleted file mode 100644 index b50cee8639..0000000000 --- a/meta/recipes-graphics/mesa/mesa-dri_7.5.bb +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | include mesa-common.inc | ||
| 2 | |||
| 3 | SRC_URI += "file://crossfix.patch;patch=1" | ||
| 4 | # file://mesa-DRI2Swapbuffer.patch;patch=1 | ||
| 5 | |||
| 6 | PROTO_DEPS = "xf86driproto glproto dri2proto" | ||
| 7 | LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" | ||
| 8 | |||
| 9 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" | ||
| 10 | |||
| 11 | PR = "r12" | ||
| 12 | |||
| 13 | # most of our targets do not have DRI so will use mesa-xlib | ||
| 14 | DEFAULT_PREFERENCE = "-1" | ||
| 15 | |||
| 16 | # Atom PCs have DRI support so use mesa-dri by default | ||
| 17 | DEFAULT_PREFERENCE_atom-pc = "1" | ||
| 18 | |||
| 19 | PACKAGES =+ "${PN}-xprogs" | ||
| 20 | PACKAGES_DYNAMIC = "mesa-dri-driver-*" | ||
| 21 | |||
| 22 | FILES_${PN}-dbg += "${libdir}/dri/.debug/*" | ||
| 23 | FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" | ||
| 24 | |||
| 25 | LEAD_SONAME = "libGL.so.1" | ||
| 26 | |||
| 27 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" | ||
| 28 | |||
| 29 | do_install_append () { | ||
| 30 | install -d ${D}/usr/bin | ||
| 31 | install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ | ||
| 32 | } | ||
| 33 | |||
| 34 | python populate_packages_prepend() { | ||
| 35 | import os.path | ||
| 36 | |||
| 37 | dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri") | ||
| 38 | |||
| 39 | do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') | ||
| 40 | } | ||
| 41 | |||
| 42 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' | ||
| 43 | |||
| 44 | |||
| 45 | # | ||
| 46 | # Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl | ||
| 47 | # then run gen_matypes > matypes.h on device | ||
| 48 | # | ||
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.7.bb b/meta/recipes-graphics/mesa/mesa-dri_7.7.bb deleted file mode 100644 index 4cae9c8699..0000000000 --- a/meta/recipes-graphics/mesa/mesa-dri_7.7.bb +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | include mesa-common.inc | ||
| 2 | |||
| 3 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaLib-${PV}.tar.bz2 \ | ||
| 4 | ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaDemos-${PV}.tar.bz2 \ | ||
| 5 | file://crossfix.patch;patch=1" | ||
| 6 | |||
| 7 | PROTO_DEPS = "xf86driproto glproto dri2proto" | ||
| 8 | LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" | ||
| 9 | |||
| 10 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" | ||
| 11 | |||
| 12 | PR = "r12" | ||
| 13 | |||
| 14 | # most of our targets do not have DRI so will use mesa-xlib | ||
| 15 | DEFAULT_PREFERENCE = "-1" | ||
| 16 | |||
| 17 | # Atom PCs have DRI support so use mesa-dri by default | ||
| 18 | DEFAULT_PREFERENCE_atom-pc = "1" | ||
| 19 | |||
| 20 | PACKAGES =+ "${PN}-xprogs" | ||
| 21 | PACKAGES_DYNAMIC = "mesa-dri-driver-*" | ||
| 22 | |||
| 23 | FILES_${PN}-dbg += "${libdir}/dri/.debug/*" | ||
| 24 | FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" | ||
| 25 | |||
| 26 | LEAD_SONAME = "libGL.so.1" | ||
| 27 | |||
| 28 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" | ||
| 29 | |||
| 30 | do_install_append () { | ||
| 31 | install -d ${D}/usr/bin | ||
| 32 | install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ | ||
| 33 | } | ||
| 34 | |||
| 35 | python populate_packages_prepend() { | ||
| 36 | import os.path | ||
| 37 | |||
| 38 | dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri") | ||
| 39 | |||
| 40 | do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') | ||
| 41 | } | ||
| 42 | |||
| 43 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' | ||
| 44 | |||
| 45 | |||
| 46 | # | ||
| 47 | # Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl | ||
| 48 | # then run gen_matypes > matypes.h on device | ||
| 49 | # | ||
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb deleted file mode 100644 index 1b4606d43e..0000000000 --- a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | include mesa-common.inc | ||
| 2 | |||
| 3 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" | ||
| 4 | |||
| 5 | PROTO_DEPS = "xf86driproto glproto dri2proto" | ||
| 6 | LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" | ||
| 7 | |||
| 8 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" | ||
| 9 | |||
| 10 | PR = "r3" | ||
| 11 | |||
| 12 | SRC_URI += "file://crossfix.patch" | ||
| 13 | |||
| 14 | SRC_URI[mesalib.md5sum] = "6be2d343a0089bfd395ce02aaf8adb57" | ||
| 15 | SRC_URI[mesalib.sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d" | ||
| 16 | |||
| 17 | SRC_URI[mesademos.md5sum] = "757d9e2e06f48b1a52848be9b0307ced" | ||
| 18 | SRC_URI[mesademos.sha256sum] = "ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c" | ||
| 19 | |||
| 20 | # most of our targets do not have DRI so will use mesa-xlib | ||
| 21 | DEFAULT_PREFERENCE = "-1" | ||
| 22 | |||
| 23 | LEAD_SONAME = "libGL.so.1" | ||
| 24 | |||
| 25 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" | ||
| 26 | |||
| 27 | # We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" | ||
| 28 | do_configure_prepend() { | ||
| 29 | sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile | ||
| 30 | } | ||
| 31 | |||
| 32 | do_install_append () { | ||
| 33 | install -d ${D}/usr/bin | ||
| 34 | install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ | ||
| 35 | } | ||
| 36 | |||
| 37 | python populate_packages_prepend() { | ||
| 38 | import os.path | ||
| 39 | |||
| 40 | dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri") | ||
| 41 | |||
| 42 | do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') | ||
| 43 | } | ||
| 44 | |||
| 45 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' | ||
| 46 | |||
| 47 | PACKAGES =+ "${PN}-xprogs" | ||
| 48 | PACKAGES_DYNAMIC = "mesa-dri-driver-*" | ||
| 49 | |||
| 50 | FILES_${PN}-dbg += "${libdir}/dri/.debug/*" | ||
| 51 | FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" | ||
| 52 | |||
| 53 | # | ||
| 54 | # Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl | ||
| 55 | # then run gen_matypes > matypes.h on device | ||
| 56 | # | ||
