16980239 Xorg drivers "nv" and "trident" should be removed from Solaris
PSARC 2013/205 Removal of Xorg drivers "nv" and "trident"
--- a/open-src/common/Makefile.init Wed Aug 07 10:50:38 2013 -0700
+++ b/open-src/common/Makefile.init Wed Aug 21 12:47:48 2013 -0700
@@ -306,6 +306,9 @@
PKGCONFIG_DIR_64=$(PKGCONFIG_DIR_prefix)/$(SUBDIR64)$(PKGCONFIG_DIR_suffix)
PKGCONFIG_DIR_SHARE=/usr/share$(PKGCONFIG_DIR_suffix)
+# System-wide directory for packaged release notes
+RELNOTES_DIR=/usr/share/doc/release-notes
+
# Directory used for installing tools used during build but not
# delivered in packages
TOOLS_DIR=$(PROTOTOP)/tools_$(MACH)
--- a/open-src/driver/Makefile Wed Aug 07 10:50:38 2013 -0700
+++ b/open-src/driver/Makefile Wed Aug 21 12:47:48 2013 -0700
@@ -1,6 +1,6 @@
# Makefile for X Consolidation Open Source Xorg driver modules
#
-# Copyright (c) 2006, 2012, 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"),
@@ -44,10 +44,8 @@
xf86-video-cirrus \
xf86-video-intel \
xf86-video-mach64 \
- xf86-video-nv \
xf86-video-openchrome \
xf86-video-r128 \
- xf86-video-trident \
xf86-video-vesa \
xf86-video-vmware
@@ -80,6 +78,7 @@
xf86-video-i810 \
xf86-video-neomagic \
xf86-video-nsc \
+ xf86-video-nv \
xf86-video-radeonhd \
xf86-video-rendition \
xf86-video-s3 \
@@ -89,6 +88,7 @@
xf86-video-sis \
xf86-video-tdfx \
xf86-video-tga \
+ xf86-video-trident \
xf86-video-tseng \
xf86-video-vga \
xf86-video-via \
--- a/open-src/driver/xf86-video-nv/Makefile Wed Aug 07 10:50:38 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-###############################################################################
-#
-# xf86-video-nv Makefile
-#
-# 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"),
-# 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=xf86-video-nv
-
-# Version number (used in path names)
-MODULE_VERSION=2.1.20
-
-# Checksums for upstream tarball
-TARBALL_MD5 = e263dd0cd149b5224e92baa5a227bb00
-TARBALL_SHA1 = 42b129be471d16444c5a7b443491e8d9e3e5df1a
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = bstore.patch
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-MODULE_STABILITY=Volatile
-
-# Regenerate configure after patching configure.ac
-AUTORECONF=yes
-
-# Libraries/modules to link with
-MODULE_LD_OPTIONS= \
- -L$(PROTODIR)$(X11_SERVERMODS_DIR) \
- -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -R$(X11_SERVERMODS_DIR) \
- -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lexa -lfb -lint10 -lshadowfb -lXfont -lvbe -lvgahw -lfbdevhw \
- -L$(PROTODIR)/usr/lib -lpciaccess -lpixman-1 -lm
-
-include ../Makefile.inc
-
--- a/open-src/driver/xf86-video-nv/bstore.patch Wed Aug 07 10:50:38 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
---- src/riva_include.h Mon Feb 25 12:17:24 2013
-+++ src/riva_include.h Mon Feb 25 12:17:54 2013
-@@ -22,9 +22,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- #include "micmap.h"
-
- #include "xf86DDC.h"
---- src/nv_include.h Mon Feb 25 12:17:27 2013
-+++ src/nv_include.h Mon Feb 25 12:18:34 2013
-@@ -24,9 +24,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- #include "micmap.h"
-
- #include "xf86DDC.h"
---- src/g80_driver.c Mon Feb 25 12:17:20 2013
-+++ src/g80_driver.c Mon Feb 25 12:17:33 2013
-@@ -34,7 +34,6 @@
- #include <xf86Resources.h>
- #endif
- #include <mipointer.h>
--#include <mibstore.h>
- #include <micmap.h>
- #include <xf86cmap.h>
- #include <fb.h>
---- src/nv_driver.c Mon Feb 25 12:20:33 2013
-+++ src/nv_driver.c Mon Feb 25 12:20:39 2013
-@@ -2550,7 +2550,6 @@
- if (!pNv->NoAccel)
- NVAccelInit(pScreen);
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
---- src/riva_driver.c Mon Feb 25 12:21:18 2013
-+++ src/riva_driver.c Mon Feb 25 12:21:24 2013
-@@ -1168,7 +1168,6 @@
- if (!pRiva->NoAccel)
- RivaAccelInit(pScreen);
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
---- src/g80_driver.c Mon Feb 25 12:20:40 2013
-+++ src/g80_driver.c Mon Feb 25 12:22:18 2013
-@@ -832,7 +832,6 @@
- }
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
--- a/open-src/driver/xf86-video-trident/16067432.patch Wed Aug 07 10:50:38 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
---- src/trident_dga.c.orig 2012-12-04 03:30:11.000000000 +0100
-+++ src/trident_dga.c 2012-12-04 03:32:48.000000000 +0100
-@@ -37,10 +37,10 @@
- static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
- int *, int *, int *);
- static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
--static void TRIDENT_Sync(ScrnInfoPtr);
- static int TRIDENT_GetViewport(ScrnInfoPtr);
- static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
- #ifdef HAVE_XAA_H
-+static void TRIDENT_Sync(ScrnInfoPtr);
- static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
- static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
- #if 0
-@@ -56,8 +56,8 @@
- TRIDENT_SetMode,
- TRIDENT_SetViewport,
- TRIDENT_GetViewport,
-- TRIDENT_Sync,
- #ifdef HAVE_XAA_H
-+ TRIDENT_Sync,
- TRIDENT_FillRect,
- TRIDENT_BlitRect,
- #if 0
-@@ -66,7 +66,7 @@
- NULL
- #endif
- #else
-- NULL, NULL, NULL
-+ NULL, NULL, NULL, NULL
- #endif
- };
--- a/open-src/driver/xf86-video-trident/6452329.patch Wed Aug 07 10:50:38 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff --git a/src/trident_driver.c b/src/trident_driver.c
-index 4cf7e24..0d829bb 100644
---- a/src/trident_driver.c
-+++ b/src/trident_driver.c
-@@ -214,7 +214,6 @@ static PciChipsets TRIDENTPciChipsets[] = {
- { CYBER9385, PCI_CHIP_9660, RES_SHARED_VGA },
- { IMAGE975, PCI_CHIP_9750, RES_SHARED_VGA },
- { IMAGE985, PCI_CHIP_9850, RES_SHARED_VGA },
-- { BLADE3D, PCI_CHIP_9880, RES_SHARED_VGA },
- { CYBERBLADEI7, PCI_CHIP_8400, RES_SHARED_VGA },
- { CYBERBLADEI7D, PCI_CHIP_8420, RES_SHARED_VGA },
- { CYBERBLADEI1, PCI_CHIP_8500, RES_SHARED_VGA },
--- a/open-src/driver/xf86-video-trident/Makefile Wed Aug 07 10:50:38 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-###############################################################################
-#
-# xf86-video-trident 1.x Makefile
-#
-# 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"),
-# 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=xf86-video-trident
-
-# Version number (used in path names)
-MODULE_VERSION=1.3.6
-
-# Checksums for upstream tarball
-TARBALL_MD5 = 86fed7e2b2876cb349f958cdd8319118
-TARBALL_SHA1 = 9af5d275e6f4247cde19765178c3a797b4a7351d
-TARBALL_SHA256= 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6452329.patch,-p1 \
- 16067432.patch \
- bstore.patch
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-MODULE_STABILITY=Volatile
-
-# Temporarily revert to gcc until the complier problem is fixed
-MODULE_COMPILER=gcc
-MODULE_COMPILER_SET=yes
-
-# Libraries/modules to link with
-MODULE_LD_OPTIONS= \
- -L$(PROTODIR)$(X11_SERVERMODS_DIR) \
- -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -R$(X11_SERVERMODS_DIR) \
- -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lexa -lfb -lint10 -lpciaccess -lpixman-1 -lshadow -lvbe -lvgahw \
- -lexa -lm
-
-include ../Makefile.inc
-
--- a/open-src/driver/xf86-video-trident/bstore.patch Wed Aug 07 10:50:38 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- src/trident_driver.c Thu Apr 4 08:08:48 2013
-+++ src/trident_driver.c Thu Apr 4 08:09:07 2013
-@@ -56,7 +56,6 @@
-
- #include "mipointer.h"
-
--#include "mibstore.h"
- #include "shadow.h"
- #include "trident.h"
- #include "trident_regs.h"
-@@ -3036,7 +3035,6 @@
- TridentAccelInit(pScreen);
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
-
- /* Initialise cursor functions */
--- a/open-src/xserver/xorg/Makefile Wed Aug 07 10:50:38 2013 -0700
+++ b/open-src/xserver/xorg/Makefile Wed Aug 21 12:47:48 2013 -0700
@@ -379,5 +379,10 @@
## Dtrace docs rules
$(DTRACE_DOC_DIR)/Xserver-DTrace.xml: $(AUTOCONF_TARGET)
-install_docs: $(DTRACE_DOCS) $(PROTODIR)$(MODULE_DOC_DIR)
+$(PROTODIR)$(RELNOTES_DIR):
+ mkdir -p $@
+
+install_docs: $(DTRACE_DOCS) $(PROTODIR)$(MODULE_DOC_DIR) $(PROTODIR)$(RELNOTES_DIR)
$(INSTALL_SCRIPT) -c -m 0444 $(DTRACE_DOCS) $(PROTODIR)$(MODULE_DOC_DIR)
+ $(INSTALL_SCRIPT) -c -m 0444 release-notes/*.txt \
+ $(PROTODIR)$(RELNOTES_DIR)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/release-notes/x11:server:xorg:driver:xorg-video-nv-1.txt Wed Aug 21 12:47:48 2013 -0700
@@ -0,0 +1,3 @@
+The nv open source driver for Xorg for Nvidia graphics is no longer provided.
+If you have an xorg.conf file which specifies this device driver, you will
+need to change it to use the "nvidia" or "vesa" drivers instead.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/release-notes/x11:server:xorg:driver:xorg-video-trident-1.txt Wed Aug 21 12:47:48 2013 -0700
@@ -0,0 +1,4 @@
+The trident driver for Xorg for Trident graphics is no longer provided.
+
+If you have an xorg.conf file which specifies this device driver, you will
+need to change it to use the "vesa" driver instead.
--- a/pkg/exceptions-validate_pkg.p5m Wed Aug 07 10:50:38 2013 -0700
+++ b/pkg/exceptions-validate_pkg.p5m Wed Aug 21 12:47:48 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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"),
@@ -81,6 +81,7 @@
dir path=usr/share/doc/X11/Xserver
dir path=usr/share/doc/X11/graphics
dir path=usr/share/doc/X11/xext
+dir path=usr/share/doc/release-notes
dir path=usr/share/locale
dir path=usr/share/locale/C
dir path=usr/share/locale/C/LC_MESSAGES
--- a/pkg/legacy/x11-server-xorg-driver-xorg-misc.p5m Wed Aug 07 10:50:38 2013 -0700
+++ b/pkg/legacy/x11-server-xorg-driver-xorg-misc.p5m Wed Aug 21 12:47:48 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2011, 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"),
@@ -20,35 +20,8 @@
# 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/server/xorg/driver/[email protected],5.11-0.167
+set name=pkg.fmri \
+ value=pkg:/x11/server/xorg/driver/[email protected],5.11-0.175.2.0.0.22.0
set name=pkg.renamed value=true
-
-# Depends on packages for video drivers split out of this package in snv_144
-# and remaining after the removal of the EOF drivers in 153 & 162.
-
-depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
-$(i386_ONLY)depend type=require \
- fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.152
depend type=require \
fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.167
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/legacy/x11-server-xorg-driver-xorg-video-nv.p5m Wed Aug 21 12:47:48 2013 -0700
@@ -0,0 +1,25 @@
+# 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"),
+# 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/server/xorg/driver/[email protected],5.11-0.175.2.0.0.22.0
+set name=pkg.obsolete value=true
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/legacy/x11-server-xorg-driver-xorg-video-trident.p5m Wed Aug 21 12:47:48 2013 -0700
@@ -0,0 +1,24 @@
+# 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"),
+# 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/server/xorg/driver/[email protected],5.11-0.175.2.0.0.22.0
+set name=pkg.obsolete value=true
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-nv.p5m Wed Aug 07 10:50:38 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# Copyright (c) 2010, 2011, 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/server/xorg/driver/xorg-video-nv@__version:xf86-video-nv__
-set name=pkg.summary \
- value="xf86-video-nv - NVIDIA video driver for the Xorg X server"
-set name=pkg.description \
- value="Unaccelerated Xorg driver for NVIDIA video cards"
-set name=variant.arch value=i386
-file path=usr/lib/xorg/modules/drivers/nv_drv.so
-file path=usr/share/man/man7/nv.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-trident.p5m Wed Aug 07 10:50:38 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# Copyright (c) 2010, 2011, 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/server/xorg/driver/xorg-video-trident@__version:xf86-video-trident__
-set name=pkg.summary \
- value="xf86-video-trident - Trident video driver for the Xorg X server"
-set name=pkg.description value="Xorg driver for Trident video cards"
-set name=variant.arch value=i386
-file path=usr/lib/xorg/modules/drivers/trident_drv.so
-file path=usr/share/man/man7/trident.7
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video.p5m Wed Aug 07 10:50:38 2013 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video.p5m Wed Aug 21 12:47:48 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"),
@@ -54,9 +54,6 @@
# driver/xf86-video-mga
depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-mga
-# driver/xf86-video-nv
-$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-nv
-
# driver/xf86-video-openchrome
$(i386_ONLY)depend type=group \
fmri=pkg:/x11/server/xorg/driver/xorg-video-openchrome
@@ -64,10 +61,6 @@
# driver/xf86-video-r128
$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-r128
-# driver/xf86-video-trident
-$(i386_ONLY)depend type=group \
- fmri=pkg:/x11/server/xorg/driver/xorg-video-trident
-
# driver/xf86-video-vesa
$(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-vesa
--- a/pkg/manifests/x11-server-xorg.p5m Wed Aug 07 10:50:38 2013 -0700
+++ b/pkg/manifests/x11-server-xorg.p5m Wed Aug 21 12:47:48 2013 -0700
@@ -239,6 +239,12 @@
file path=usr/lib/xorg/modules/multimedia/uda1380_drv.so
dir path=usr/share/X11/xorg.conf.d
file path=usr/share/aclocal/xorg-server.m4
+file \
+ path=usr/share/doc/release-notes/x11:server:xorg:driver:xorg-video-nv-1.txt \
+ release-note=pkg:/x11/server/xorg/driver/[email protected],5.11-0.175.2.0.0.22.0
+file \
+ path=usr/share/doc/release-notes/x11:server:xorg:driver:xorg-video-trident-1.txt \
+ release-note=pkg:/x11/server/xorg/driver/[email protected],5.11-0.175.2.0.0.22.0
file path=usr/share/man/man1/Xorg.1
file path=usr/share/man/man1/cvt.1
file path=usr/share/man/man1/gtf.1