From 7d5759aa4429c626e66f65e8e0807a999d324e6f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 14 Apr 2009 12:50:03 +0100 Subject: mesa: Upgrade 7.2 -> 7.4 --- meta/packages/mesa/mesa-dri_7.2.bb | 37 ------------------------------------- meta/packages/mesa/mesa-dri_7.4.bb | 37 +++++++++++++++++++++++++++++++++++++ meta/packages/mesa/mesa-xlib_7.2.bb | 20 -------------------- meta/packages/mesa/mesa-xlib_7.4.bb | 20 ++++++++++++++++++++ 4 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 meta/packages/mesa/mesa-dri_7.2.bb create mode 100644 meta/packages/mesa/mesa-dri_7.4.bb delete mode 100644 meta/packages/mesa/mesa-xlib_7.2.bb create mode 100644 meta/packages/mesa/mesa-xlib_7.4.bb (limited to 'meta/packages/mesa') diff --git a/meta/packages/mesa/mesa-dri_7.2.bb b/meta/packages/mesa/mesa-dri_7.2.bb deleted file mode 100644 index 43e4cb552..000000000 --- a/meta/packages/mesa/mesa-dri_7.2.bb +++ /dev/null @@ -1,37 +0,0 @@ -include mesa-common.inc - -PROTO_DEPS = "xf86driproto glproto dri2proto" -LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" - -PR = "r6" - -# most of our targets do not have DRI so will use mesa-xlib -DEFAULT_PREFERENCE = "-1" - -# Netbooks have DRI support so use mesa-dri by default -DEFAULT_PREFERENCE_netbook = "1" - -PACKAGES =+ "${PN}-xprogs" -PACKAGES_DYNAMIC = "mesa-dri-driver-*" - -FILES_${PN}-dbg += "${libdir}/dri/.debug/*" -FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" - -EXTRA_OECONF += "--with-driver=dri" - -do_install_append () { - install -d ${D}/usr/bin - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ -} - -python populate_packages_prepend() { - import os.path - - dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri") - - do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') -} - -COMPATIBLE_HOST = '(i.86.*-linux)' diff --git a/meta/packages/mesa/mesa-dri_7.4.bb b/meta/packages/mesa/mesa-dri_7.4.bb new file mode 100644 index 000000000..43e4cb552 --- /dev/null +++ b/meta/packages/mesa/mesa-dri_7.4.bb @@ -0,0 +1,37 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto dri2proto" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PR = "r6" + +# most of our targets do not have DRI so will use mesa-xlib +DEFAULT_PREFERENCE = "-1" + +# Netbooks have DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_netbook = "1" + +PACKAGES =+ "${PN}-xprogs" +PACKAGES_DYNAMIC = "mesa-dri-driver-*" + +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +EXTRA_OECONF += "--with-driver=dri" + +do_install_append () { + install -d ${D}/usr/bin + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ +} + +python populate_packages_prepend() { + import os.path + + dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri") + + do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') +} + +COMPATIBLE_HOST = '(i.86.*-linux)' diff --git a/meta/packages/mesa/mesa-xlib_7.2.bb b/meta/packages/mesa/mesa-xlib_7.2.bb deleted file mode 100644 index 069446904..000000000 --- a/meta/packages/mesa/mesa-xlib_7.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -include mesa-common.inc - -PROTO_DEPS = "xf86driproto glproto" -LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" - -PE = "1" -PR = "r3" - -EXTRA_OECONF += "--with-driver=xlib" - -PACKAGES =+ "${PN}-xprogs" - -FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" - -do_install_append () { - install -d ${D}/${bindir} - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} -} diff --git a/meta/packages/mesa/mesa-xlib_7.4.bb b/meta/packages/mesa/mesa-xlib_7.4.bb new file mode 100644 index 000000000..069446904 --- /dev/null +++ b/meta/packages/mesa/mesa-xlib_7.4.bb @@ -0,0 +1,20 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto" +LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PE = "1" +PR = "r3" + +EXTRA_OECONF += "--with-driver=xlib" + +PACKAGES =+ "${PN}-xprogs" + +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +do_install_append () { + install -d ${D}/${bindir} + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} +} -- cgit v1.2.3 From 25dc55da0991f0e1ced12f317703ce23e5d04d3b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 14 Apr 2009 12:50:32 +0100 Subject: mesa: Drop stale files --- .../mesa/mesa-7.0.2/fix-host-compile.patch | 30 ---------------------- .../mesa/mesa-7.0.2/mklib-rpath-link.patch | 23 ----------------- 2 files changed, 53 deletions(-) delete mode 100644 meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch delete mode 100644 meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch (limited to 'meta/packages/mesa') diff --git a/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch b/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch deleted file mode 100644 index d24d03d37..000000000 --- a/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- /src/mesa/x86/orig-Makefile 2005-07-01 04:54:38.000000000 +0300 -+++ /src/mesa/x86/Makefile 2007-06-07 21:52:31.000000000 +0300 -@@ -5,6 +5,7 @@ - - - INCLUDE_DIRS = \ -+ -I/usr/include \ - -I$(TOP)/include/GL \ - -I$(TOP)/include \ - -I.. \ -@@ -13,6 +14,10 @@ - -I../glapi \ - -I../tnl - -+OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -+ -+CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \ -+ $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math - - default: gen_matypes matypes.h - -@@ -21,7 +26,7 @@ - - - gen_matypes: gen_matypes.c -- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes -+ $(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes - - # need some special rules here, unfortunately - matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes diff --git a/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch b/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch deleted file mode 100644 index 618f5b57e..000000000 --- a/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /tmp/mklib 2007-12-08 11:03:23.000000000 +0100 -+++ Mesa-7.0.2/bin/mklib 2007-12-08 11:04:02.509863000 +0100 -@@ -106,6 +106,9 @@ - -L*) - DEPS="$DEPS $1" - ;; -+ -Wl*) -+ DEPS="$DEPS $1" -+ ;; - -pthread) - # this is a special case (see bugzilla 10876) - DEPS="$DEPS $1" ---- /tmp/default 2007-12-08 11:04:17.000000000 +0100 -+++ Mesa-7.0.2/configs/default 2007-12-08 11:05:06.279863000 +0100 -@@ -76,7 +76,7 @@ - GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 - - # Program dependencies - specific GL/glut libraries added in Makefiles --APP_LIB_DEPS = -lm -+APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm - - - -- cgit v1.2.3 From dfcd318ea155c47c18c50511cf5763e549422be9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 14 Apr 2009 12:51:01 +0100 Subject: mesa-dri: Use master branch for git version --- meta/packages/mesa/mesa-dri_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/packages/mesa') diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb index e565ac536..2608e226b 100644 --- a/meta/packages/mesa/mesa-dri_git.bb +++ b/meta/packages/mesa/mesa-dri_git.bb @@ -14,7 +14,7 @@ DEFAULT_PREFERENCE = "-1" # Netbooks have DRI support so use mesa-dri by default DEFAULT_PREFERENCE_netbook = "1" -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=intel-2008-q3 " +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=master" S = "${WORKDIR}/git" PACKAGES =+ "${PN}-xprogs" -- cgit v1.2.3