--- a/open-src/app/mesa-demos/Makefile Fri Mar 23 15:47:54 2012 -0700
+++ b/open-src/app/mesa-demos/Makefile Mon Mar 26 11:24:02 2012 -0700
@@ -65,6 +65,8 @@
# What to build
BUILD_TARGETS= $(GLXGEARS_BIN) $(GLXINFO_BIN) $(MODTYPE_ADD_BUILD_TARGETS)
BUILD_TARGETS_SET=yes
+BUILD_TYPES_SET=yes
+BUILD_TYPES=32 64
# What to install
INSTALL_TARGETS= install_demos install_man
@@ -106,7 +108,7 @@
install_demos: $(INSTALL_DEPS)
mkdir -p $(DESTDIR)$(MODULE_PREFIX)/bin
- cp -pf $(GLXGEARS_BIN) $(GLXINFO_BIN) $(DESTDIR)$(MODULE_PREFIX)/bin
+ cp -pf $(GLXGEARS_BIN) $(GLXINFO_BIN) $(DESTDIR)$(MODULE_PREFIX)/bin$(ARCHLIBSUBDIR)
install_man:
mkdir -p $(DESTDIR)$(MODULE_PREFIX)/share/man/man1
--- a/open-src/lib/mesa/Makefile Fri Mar 23 15:47:54 2012 -0700
+++ b/open-src/lib/mesa/Makefile Mon Mar 26 11:24:02 2012 -0700
@@ -79,7 +79,7 @@
# Command line options to GNU autoconf configure script
MODULE_CONFIG_OPTS = --with-driver=dri --disable-egl --disable-gallium \
- --with-dri-driverdir='$(X11_SERVERMODS_DIR)/dri' \
+ --with-dri-driverdir='$(X11_SERVERMODS_DIR)/dri$(ARCHLIBSUBDIR)' \
--with-dri-drivers='$(DRI_DRIVER_LIST)'
# Build mesa with this define (CR 7032292)
--- a/open-src/xserver/Makefile.inc Fri Mar 23 15:47:54 2012 -0700
+++ b/open-src/xserver/Makefile.inc Mon Mar 26 11:24:02 2012 -0700
@@ -42,7 +42,7 @@
XORG_SOURCE_PATCHES:sh=sed '/^\#/ d' ../xorg/patch-list
SERVER_MODULES_DIR='$(X11_SERVERMODS_DIR)'
-DRI_MODULES_DIR='$(X11_SERVERMODS_DIR)/dri'
+DRI_MODULES_DIR='$(X11_SERVERMODS_DIR)/dri$(ARCHLIBSUBDIR)'
# Changes to apply to man pages
MODTYPE_SUNTOUCH_MAN_FLAGS = -p $(MODULE_PREFIX)/bin/
--- a/pkg/manifests/x11-demo-mesa-demos.p5m Fri Mar 23 15:47:54 2012 -0700
+++ b/pkg/manifests/x11-demo-mesa-demos.p5m Mon Mar 26 11:24:02 2012 -0700
@@ -24,6 +24,8 @@
set name=pkg.description \
value="glxinfo lists information about the GLX extension, OpenGL capable visuals, and the OpenGL renderer on an X server. glxgears is a GLX demo that draws three rotating gears, and prints out framerate information."
link path=usr/X11/bin/glxinfo target=../../bin/glxinfo
+file path=usr/bin/$(ARCH64)/glxgears
+file path=usr/bin/$(ARCH64)/glxinfo
file path=usr/bin/glxgears
file path=usr/bin/glxinfo
file path=usr/share/man/man1/glxgears.1
--- a/pkg/manifests/x11-library-mesa.p5m Fri Mar 23 15:47:54 2012 -0700
+++ b/pkg/manifests/x11-library-mesa.p5m Mon Mar 26 11:24:02 2012 -0700
@@ -111,6 +111,7 @@
file path=usr/lib/pkgconfig/gl.pc
file path=usr/lib/pkgconfig/glu.pc
file path=usr/lib/pkgconfig/glw.pc
+file path=usr/lib/xorg/modules/dri/$(ARCH64)/swrast_dri.so
file path=usr/lib/xorg/modules/dri/swrast_dri.so
legacy pkg=SUNWxorg-mesa \
desc="Server modules and client libraries for X Window System GLX extension based on Mesa open source project" \
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-ati.p5m Fri Mar 23 15:47:54 2012 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-ati.p5m Mon Mar 26 11:24:02 2012 -0700
@@ -26,6 +26,9 @@
set name=pkg.description \
value="Xorg video driver for ATI Radeon and Radeon HD graphics devices from AMD"
set name=variant.arch value=i386
+file path=usr/lib/xorg/modules/dri/$(ARCH64)/r200_dri.so
+file path=usr/lib/xorg/modules/dri/$(ARCH64)/r300_dri.so
+file path=usr/lib/xorg/modules/dri/$(ARCH64)/radeon_dri.so
file path=usr/lib/xorg/modules/dri/r200_dri.so
file path=usr/lib/xorg/modules/dri/r300_dri.so
file path=usr/lib/xorg/modules/dri/radeon_dri.so
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-intel.p5m Fri Mar 23 15:47:54 2012 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-intel.p5m Mon Mar 26 11:24:02 2012 -0700
@@ -34,6 +34,8 @@
file path=usr/lib/libI810XvMC.so.1
link path=usr/lib/libIntelXvMC.so target=libIntelXvMC.so.1
file path=usr/lib/libIntelXvMC.so.1
+file path=usr/lib/xorg/modules/dri/$(ARCH64)/i915_dri.so
+file path=usr/lib/xorg/modules/dri/$(ARCH64)/i965_dri.so
file path=usr/lib/xorg/modules/dri/i915_dri.so
file path=usr/lib/xorg/modules/dri/i965_dri.so
file path=usr/lib/xorg/modules/drivers/intel_drv.so