--- a/exception_lists/packaging Wed Jun 26 11:03:12 2013 -0700
+++ b/exception_lists/packaging Mon Jul 01 14:44:47 2013 -0700
@@ -94,3 +94,6 @@
usr/lib/xorg/libdrm_radeon.so.1 sparc
usr/lib/xorg/sparcv9/libdrm_radeon.so sparc
usr/lib/xorg/sparcv9/libdrm_radeon.so.1 sparc
+
+# Deliver it once the driver provides the correct plumbing for use on solaris
+usr/bin/intel_gpu_abrt i386
--- a/open-src/app/Makefile Wed Jun 26 11:03:12 2013 -0700
+++ b/open-src/app/Makefile Mon Jul 01 14:44:47 2013 -0700
@@ -1,6 +1,6 @@
# Makefile for X Consolidation Open Source Application modules
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -126,7 +126,8 @@
OS_SUBDIRS_sparc = $(OS_SUBDIRS_common) \
gfx-utils
-OS_SUBDIRS_i386 = $(OS_SUBDIRS_common)
+OS_SUBDIRS_i386 = $(OS_SUBDIRS_common) \
+ intel-gpu-tools
OBSOLETE_SUBDIRS = \
rstart \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/intel-gpu-tools/COPYING Mon Jul 01 14:44:47 2013 -0700
@@ -0,0 +1,122 @@
+/*
+ * Copyright \251 2006 Intel Corporation
+ * Copyright \302\251 2006,2009 Intel Corporation
+ * Copyright © 2007 Intel Corporation
+ * Copyright © 2008 Intel Corporation
+ * Copyright \302\251 2007,2009 Intel Corporation
+ * Copyright © 2009 Intel Corporation
+ * Copyright \302\251 2010 Intel Corporation
+ * Copyright © 2011 Intel Corporation
+ * Copyright \302\251 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ * Zhenyu Wang <[email protected]>
+ * Wu Fengguang <[email protected]>
+ * Eric Anholt <[email protected]>
+ * Carl Worth <[email protected]>
+ * Ben Widawsky <[email protected]>
+ * Eugeni Dodonov <[email protected]>
+ * Ben Gamari <[email protected]>
+ * Daniel Vetter <[email protected]>
+ * Chris Wilson <[email protected]>
+ * Zhenyu Wang <[email protected]>
+ * Paulo Zanoni <[email protected]>
+ * Vijay Purushothaman <[email protected]>
+ *
+ */
+
+/*
+ * Copyright \302\251 2010 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors:
+ * Adam Jackson <[email protected]>
+ */
+
+/*
+ * Copyright 2010 Intel Corporation
+ * Jesse Barnes <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/*
+ * Copyright \302\251 2011 Daniel Vetter
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Daniel Vetter <[email protected]>
+ *
+ * Partially based upon gem_tiled_fence_blits.c
+ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/intel-gpu-tools/Makefile Mon Jul 01 14:44:47 2013 -0700
@@ -0,0 +1,69 @@
+###############################################################################
+#
+# intel-gpu-tools - Intel graphics driver debug tools
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+# Package name used in tarballs
+MODULE_NAME=intel-gpu-tools
+
+# Package metadata
+MODULE_DESC = Intel graphics driver debug tools
+
+# Dates to show in Oracle copyright notice in pkg license file
+# Earliest & latest of the copyrights in the Oracle files in this pkg
+ORACLE_COPYRIGHT_YEARS = 2013
+ORACLE_TPNO = 13224
+
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/diagnostic/$(MODULE_NAME)
+MODULE_PKGNAME_SET=yes
+
+# Version number (used in path names)
+MODULE_VERSION=1.3
+
+# Checksums for upstream tarball
+TARBALL_MD5 = 67facd6241e26e2c68614728e3a932e9
+TARBALL_SHA1 = 35e4907c4dbc48ad37921e44d73f0fe15a989aa2
+TARBALL_SHA256= 51d22fdb3d415a1b3b7d0a172c1bb24dec6f16116e80a9ce49873f44527f20a0
+
+# Command line options to GNU autoconf configure script
+MODULE_CONFIG_OPTS = --disable-nouveau
+
+MODULE_COMPILER=gcc
+MODULE_COMPILER_SET=yes
+
+# Override default config environment - if PYTHON is set to a specific version
+# then configure will complain it's version is not >= 3, but if it's unset it's
+# fine with not finding a python version >= 3.
+MODULE_CONFIG_ENV = PYTHON=""
+
+# ARC cases that covered this module
+# PSARC/2013/087
+MODULE_ARC_CASES = PSARC/2013/087
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=man/*.man
+MODULE_STABILITY=Volatile
+
+include ../Makefile.inc
--- a/pkg/manifests/developer-opensolaris-X.p5m Wed Jun 26 11:03:12 2013 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m Mon Jul 01 14:44:47 2013 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -135,6 +135,10 @@
depend type=require fmri=pkg:/library/c++/stdcxx \
org.opensolaris.pkgdepend.resolve=true
+# intel-gpu-tools links against libcairo
+depend type=require fmri=pkg:/library/desktop/cairo \
+ org.opensolaris.pkgdepend.resolve=true
+
# lib/fontconfig links with libexpat
depend type=require fmri=pkg:/library/expat \
org.opensolaris.pkgdepend.resolve=true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-diagnostic-intel-gpu-tools.p5m Mon Jul 01 14:44:47 2013 -0700
@@ -0,0 +1,70 @@
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+set name=pkg.fmri \
+ value=pkg:/x11/diagnostic/intel-gpu-tools@__version:intel-gpu-tools__
+set name=pkg.summary value="Intel graphics driver debug tools"
+set name=pkg.description \
+ value="A collection of tools for development, testing, and debugging of the i915 DRM driver for Intel integrated graphics chipsets."
+set name=variant.arch value=i386
+file path=usr/bin/intel_audio_dump
+file path=usr/bin/intel_backlight
+file path=usr/bin/intel_bios_dumper
+file path=usr/bin/intel_bios_reader
+file path=usr/bin/intel_disable_clock_gating
+file path=usr/bin/intel_dpio_read
+file path=usr/bin/intel_dpio_write
+file path=usr/bin/intel_error_decode
+file path=usr/bin/intel_forcewaked
+file path=usr/bin/intel_gpu_time
+file path=usr/bin/intel_gpu_top
+file path=usr/bin/intel_gtt
+file path=usr/bin/intel_l3_parity
+file path=usr/bin/intel_reg_checker
+file path=usr/bin/intel_reg_dumper
+file path=usr/bin/intel_reg_read
+file path=usr/bin/intel_reg_snapshot
+file path=usr/bin/intel_reg_write
+file path=usr/bin/intel_sprite_on
+file path=usr/bin/intel_stepping
+file path=usr/bin/intel_upload_blit_large
+file path=usr/bin/intel_upload_blit_large_gtt
+file path=usr/bin/intel_upload_blit_large_map
+file path=usr/bin/intel_upload_blit_small
+file path=usr/share/man/man1/intel_audio_dump.1
+file path=usr/share/man/man1/intel_bios_dumper.1
+file path=usr/share/man/man1/intel_bios_reader.1
+file path=usr/share/man/man1/intel_error_decode.1
+file path=usr/share/man/man1/intel_gpu_top.1
+file path=usr/share/man/man1/intel_gtt.1
+file path=usr/share/man/man1/intel_infoframes.1
+file path=usr/share/man/man1/intel_lid.1
+file path=usr/share/man/man1/intel_panel_fitter.1
+file path=usr/share/man/man1/intel_reg_dumper.1
+file path=usr/share/man/man1/intel_reg_read.1
+file path=usr/share/man/man1/intel_reg_write.1
+file path=usr/share/man/man1/intel_stepping.1
+file path=usr/share/man/man1/intel_upload_blit_large.1
+file path=usr/share/man/man1/intel_upload_blit_large_gtt.1
+file path=usr/share/man/man1/intel_upload_blit_large_map.1
+file path=usr/share/man/man1/intel_upload_blit_small.1
+# Tools require Intel DRM kernel module
+depend type=require fmri=pkg:/driver/graphics/drm