--- a/open-src/app/mesa-demos/Makefile Tue Jun 02 20:33:55 2009 -0700
+++ b/open-src/app/mesa-demos/Makefile Wed Jun 03 08:57:18 2009 -0700
@@ -33,7 +33,7 @@
MODULE_NAME=MesaDemos
# Version number (used in path names)
-MODULE_VERSION=7.4.1
+MODULE_VERSION=7.4.2
# Directory created by unpacking source
SOURCE_DIRNAME=Mesa-$(MODULE_VERSION)
--- a/open-src/driver/xf86-video-intel/Makefile Tue Jun 02 20:33:55 2009 -0700
+++ b/open-src/driver/xf86-video-intel/Makefile Wed Jun 03 08:57:18 2009 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.23 09/05/15
+# @(#)Makefile 1.24 09/06/02
#
# Package name used in tarballs
@@ -41,7 +41,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= build-dri.patch libraries.patch \
- 6538497_6554161.patch bugs.patch
+ 6538497_6554161.patch bugs.patch \
+ uxa.patch gem.patch
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/gem.patch Wed Jun 03 08:57:18 2009 -0700
@@ -0,0 +1,11 @@
+--- src/i830_common.h Mon May 4 15:54:00 2009
++++ src/i830_common.h Mon May 4 15:54:16 2009
+@@ -134,6 +134,8 @@
+ int pipeB_w;
+ int pipeB_h;
+
++ int pad1;
++
+ /* Triple buffering */
+ drm_handle_t third_handle;
+ int third_offset;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/uxa.patch Wed Jun 03 08:57:18 2009 -0700
@@ -0,0 +1,78 @@
+--- configure.ac Wed Apr 8 14:05:14 2009
++++ configure.ac Wed Apr 8 14:05:30 2009
+@@ -84,7 +84,7 @@
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+-PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=no], [BUILD_UXA=no])
++PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=yes], [BUILD_UXA=no])
+
+ AC_ARG_WITH(xorg-sdk-dir,
+ AC_HELP_STRING([--with-xorg-sdk-dir=DIR],
+
+--- uxa/uxa-accel.c Mon Apr 13 13:37:17 2009
++++ uxa/uxa-accel.c Mon Apr 13 13:41:50 2009
+@@ -251,6 +251,63 @@
+ return FALSE;
+ }
+
++void
++miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
++ DrawablePtr dst;
++ GCPtr pGC;
++ int depth, w, h, sx, sy, sw, sh, dx, dy;
++ unsigned int format;
++ char *data;
++{
++ PixmapPtr pmap;
++ GCPtr putGC;
++
++ putGC = GetScratchGC(depth, dst->pScreen);
++ if (!putGC)
++ return;
++ pmap = (*dst->pScreen->CreatePixmap)(dst->pScreen, sw, sh, depth, 0);
++ if (!pmap)
++ {
++ FreeScratchGC(putGC);
++ return;
++ }
++ ValidateGC((DrawablePtr)pmap, putGC);
++ (*putGC->ops->PutImage)((DrawablePtr)pmap, putGC, depth, -sx, -sy, w, h, 0,(format == XYPixmap) ? XYPixmap : ZPixmap, data);
++ FreeScratchGC(putGC);
++ if (format == XYBitmap)
++ (void)(*pGC->ops->CopyPlane)((DrawablePtr)pmap, dst, pGC, 0, 0, sw, sh,dx, dy, 1L);
++ else
++ (void)(*pGC->ops->CopyArea)((DrawablePtr)pmap, dst, pGC, 0, 0, sw, sh,dx, dy);
++ (*pmap->drawable.pScreen->DestroyPixmap)(pmap);
++}
++
++void
++fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
++ DrawablePtr dst;
++ GCPtr pGC;
++ int depth, w, h, sx, sy, sw, sh, dx, dy;
++ unsigned int format;
++ char *data;
++{
++ if ((format == ZPixmap) || (depth == 1))
++ {
++ PixmapPtr pPixmap;
++
++ pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth, /*XXX*/depth, PixmapBytePad(w, depth), (pointer)data);
++ if (!pPixmap)
++ return;
++ if (format == XYBitmap)
++ (void)(*pGC->ops->CopyPlane)((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy, 1L);
++ else
++ (void)(*pGC->ops->CopyArea)((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
++ FreeScratchPixmapHeader(pPixmap);
++ }
++ else
++ miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data);
++}
++
++
++
+ /* The actual ShmPutImage isn't wrapped by the damage layer, so we need to
+ * inform any interested parties of the damage incurred to the drawable.
+ *
--- a/open-src/lib/libdrm/Makefile Tue Jun 02 20:33:55 2009 -0700
+++ b/open-src/lib/libdrm/Makefile Wed Jun 03 08:57:18 2009 -0700
@@ -27,14 +27,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.11 09/05/15
+# @(#)Makefile 1.12 09/06/02
#
# Package name used in tarballs
MODULE_NAME=libdrm
# Version number (used in path names)
-MODULE_VERSION=2.4.5
+MODULE_VERSION=2.4.11
# Library name (used for specfiles/mapfiles)
LIBNAME=drm
@@ -47,9 +47,9 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- Makefile.patch,-p1 \
solaris-drm-port.patch \
- 6802045.patch
+ 6802045.patch \
+ gem.patch
# Need to regenerate files after patching Makefile.am in solaris-drm-port.patch
AUTORECONF=yes
--- a/open-src/lib/libdrm/Makefile.patch Tue Jun 02 20:33:55 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-From 1bae8844cafd70f6196116f6e84b0f36c069e976 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Sat, 9 May 2009 17:21:29 -0700
-Subject: [PATCH] Delete extra libdrm_lists.h line after libdrm_la_SOURCES in libdrm/Makefile.am
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- libdrm/Makefile.am | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
-index 4c066e0..458420a 100644
---- a/libdrm/Makefile.am
-+++ b/libdrm/Makefile.am
-@@ -32,7 +32,6 @@ libdrm_la_LIBADD = @CLOCK_LIB@
- AM_CFLAGS = -I$(top_srcdir)/shared-core
- libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
- xf86drmMode.c libdrm_lists.h
-- libdrm_lists.h
-
- libdrmincludedir = ${includedir}
- libdrminclude_HEADERS = xf86drm.h xf86drmMode.h
---
-1.5.6.5
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libdrm/gem.patch Wed Jun 03 08:57:18 2009 -0700
@@ -0,0 +1,11 @@
+--- shared-core/i915_drm.h Mon May 4 15:55:31 2009
++++ shared-core/i915_drm.h Mon May 4 15:55:48 2009
+@@ -132,6 +132,8 @@
+ int pipeB_w;
+ int pipeB_h;
+
++ int pad1;
++
+ /* Triple buffering */
+ drm_handle_t third_handle;
+ int third_offset;
--- a/open-src/lib/libdrm/solaris-drm-port.patch Tue Jun 02 20:33:55 2009 -0700
+++ b/open-src/lib/libdrm/solaris-drm-port.patch Wed Jun 03 08:57:18 2009 -0700
@@ -73,9 +73,8 @@
#ifndef DRM_CAS
#define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */
#endif
-diff -urp -x '*~' -x '*.orig' shared-core/drm.h shared-core/drm.h
---- shared-core/drm.h 2008-12-17 10:28:24.000000000 -0800
-+++ shared-core/drm.h 2009-05-09 17:29:00.817832000 -0700
+--- shared-core/drm.h Fri May 15 16:13:57 2009
++++ shared-core/drm.h Mon Jun 1 12:10:27 2009
@@ -58,6 +58,8 @@
#ifndef _DRM_H_
#define _DRM_H_
@@ -85,20 +84,7 @@
#ifndef __user
#define __user
#endif
-@@ -69,6 +71,12 @@
- # define DEPRECATED __attribute__ ((deprecated))
- #else
- # define DEPRECATED
-+# ifndef __FUNCTION__
-+# define __FUNCTION__ __func__ /* C99 */
-+# endif
-+# ifndef __volatile__
-+# define __volatile__ volatile
-+# endif
- #endif
-
- #if defined(__linux__)
-@@ -89,6 +97,62 @@
+@@ -95,6 +97,62 @@
#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
#endif
@@ -161,7 +147,7 @@
#ifdef __OpenBSD__
#define DRM_MAJOR 81
#endif
-@@ -112,7 +176,7 @@
+@@ -118,7 +176,7 @@
typedef unsigned int drm_handle_t;
#else
#include <sys/types.h>
@@ -170,7 +156,7 @@
#endif
typedef unsigned int drm_context_t; /**< GLXContext handle */
typedef unsigned int drm_drawable_t;
-@@ -169,7 +233,9 @@ struct drm_hw_lock {
+@@ -175,7 +233,9 @@
#ifdef __SIZE_TYPE__
# define DRM_SIZE_T __SIZE_TYPE__
#else
@@ -180,7 +166,7 @@
# define DRM_SIZE_T unsigned long
#endif
-@@ -266,12 +332,13 @@ struct drm_ctx_priv_map {
+@@ -272,12 +332,13 @@
* \sa drmAddMap().
*/
struct drm_map {
@@ -197,7 +183,7 @@
int mtrr; /**< MTRR slot used */
/* Private data */
};
-@@ -378,18 +445,20 @@ enum drm_dma_flags {
+@@ -384,18 +445,20 @@
*
* \sa drmAddBufs().
*/
@@ -225,7 +211,7 @@
unsigned long agp_start; /**<
* Start address of where the AGP buffers are
* in the AGP aperture
-@@ -435,6 +504,7 @@ struct drm_buf_map {
+@@ -441,6 +504,7 @@
void __user *virtual; /**< Mmap'd area in user-virtual */
#endif
struct drm_buf_pub __user *list; /**< Buffer information */
--- a/open-src/lib/mesa/Makefile Tue Jun 02 20:33:55 2009 -0700
+++ b/open-src/lib/mesa/Makefile Wed Jun 03 08:57:18 2009 -0700
@@ -28,14 +28,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.19 09/05/15
+# @(#)Makefile 1.20 09/06/02
#
# Package name used in tarballs
MODULE_NAME=mesa
# Version number (used in path names)
-MODULE_VERSION=7.4.1
+MODULE_VERSION=7.4.2
# Source tarball
SOURCE_TARBALL_NAME=MesaLib-$(MODULE_VERSION).tar.bz2