Mercurial Mercurial > upstream > oracle > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7089465 x11/server/xorg/driver/xorg-efb is misnamed
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 13 Sep 2011 05:57:35 -0700
changeset 1211 86b2739efd51
parent 1210 822812173154
child 1212 2a1c6a027d7a
7089465 x11/server/xorg/driver/xorg-efb is misnamed
open-src/driver/efb/Makefile file | annotate | diff | comparison | revisions
pkg/legacy/x11-server-xorg-driver-xorg-efb.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xorg-driver-xorg-efb.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xorg-driver-xorg-video-efb.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xorg-driver-xorg-video.p5m file | annotate | diff | comparison | revisions 
--- a/open-src/driver/efb/Makefile	Mon Sep 12 11:31:57 2011 -0700
+++ b/open-src/driver/efb/Makefile	Tue Sep 13 05:57:35 2011 -0700
@@ -45,7 +45,7 @@
 AUTORECONF=yes
 
 # pkg(5) name we deliver the files in (override default)
-MODULE_PKGTAIL=xorg-efb
+MODULE_PKGTAIL=xorg-video-efb
 MODULE_PKGTAIL_SET=yes
 
 # Man pages to apply Sun footer to & attributes to list
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/legacy/x11-server-xorg-driver-xorg-efb.p5m	Tue Sep 13 05:57:35 2011 -0700
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 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/[email protected],5.11-0.175.0.0.0.0.1210
+set name=pkg.renamed value=true
+set name=variant.arch value=sparc
+depend type=require \
+    fmri=pkg:/x11/server/xorg/driver/[email protected],5.11-0.175.0.0.0.0.1210
--- a/pkg/manifests/x11-server-xorg-driver-xorg-efb.p5m	Mon Sep 12 11:31:57 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 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-efb@$(OSPKGVERS)
-set name=pkg.summary \
-    value="efb - Sun XVR-300, XVR-100, XVR-50 video driver for the Xorg X server"
-set name=pkg.description \
-    value="Xorg video driver for Sun XVR-300, XVR-100, XVR-50 Graphics"
-set name=variant.arch value=sparc
-file path=usr/lib/xorg/modules/drivers/efb_drv.so
-legacy pkg=SUNWefbw arch=sparc category=application,graphics \
-    desc="Sun XVR-300, XVR-100, XVR-50 Graphics Window System" \
-    name="Sun XVR-300, XVR-100, XVR-50 Graphics Window System" \
-    version=11.0.0,REV=2011.03.15
-
-# Requires kernel driver for efb
-depend type=require fmri=pkg:/driver/graphics/efb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-efb.p5m	Tue Sep 13 05:57:35 2011 -0700
@@ -0,0 +1,36 @@
+#
+# Copyright (c) 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-efb@$(OSPKGVERS)
+set name=pkg.summary \
+    value="efb - Sun XVR-300, XVR-100, XVR-50 video driver for the Xorg X server"
+set name=pkg.description \
+    value="Xorg video driver for Sun XVR-300, XVR-100, XVR-50 Graphics"
+set name=variant.arch value=sparc
+file path=usr/lib/xorg/modules/drivers/efb_drv.so
+legacy pkg=SUNWefbw arch=sparc category=application,graphics \
+    desc="Sun XVR-300, XVR-100, XVR-50 Graphics Window System" \
+    name="Sun XVR-300, XVR-100, XVR-50 Graphics Window System" \
+    version=11.0.0,REV=2011.03.15
+
+# Requires kernel driver for efb
+depend type=require fmri=pkg:/driver/graphics/efb
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video.p5m	Mon Sep 12 11:31:57 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video.p5m	Tue Sep 13 05:57:35 2011 -0700
@@ -33,9 +33,6 @@
 # Nvidia driver (from outside the X gate)
 $(i386_ONLY)depend type=group fmri=pkg:/driver/graphics/nvidia
 
-# driver/efb
-$(sparc_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-efb
-
 # driver/xf86-video-ast
 depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-ast
 
@@ -45,6 +42,9 @@
 # driver/xf86-video-cirrus
 $(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-cirrus
 
+# driver/efb
+$(sparc_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-efb
+
 # driver/xf86-video-intel
 $(i386_ONLY)depend type=group fmri=pkg:/x11/server/xorg/driver/xorg-video-intel
upstream/oracle/xnv