rpms/xorg-x11-drv-radeonhd/F-12 xorg-x11-drv-radeonhd-Add-instructions-for-disabling-KMS.patch, NONE, 1.1 .cvsignore, 1.52, 1.53 sources, 1.53, 1.54 xorg-x11-drv-radeonhd-README.fedora, 1.53, 1.54 xorg-x11-drv-radeonhd-snapshot.sh, 1.16, 1.17 xorg-x11-drv-radeonhd.spec, 1.69, 1.70 xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch, 1.2, NONE

[Hans Ulrich Niedermann]

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5161

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec 
Added Files:
	xorg-x11-drv-radeonhd-Add-instructions-for-disabling-KMS.patch 
Removed Files:
	xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch 
Log Message:
* Wed Feb 10 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-5.4.20100210git
- More consistent usage of name macro in spec file
- Replace %define by %global
- Replace fedora specific KMS check with the upstreamed KMS check
- New snapshot (upstream commit 17bbb4d5c618eff1fde879c6170a45dbd4598329):
  - 17bbb4d5: ATOM: Upstream parser updates
  - 4c28d82e: Add debugging to RHDCloseScreen.
  - 5b994e0d: Fix wrong mask value for fractional pll divider.
  - c8fb3cdb: Probe: Move KMS test to rhd_dri.c.
  - 0b91ec06: Configure: Only compile the KMS check code if xf86drmMode.h is actually present.
  - 56fa25f4: Probe: Only allow this driver when KMS is not present.
  - 83e0afd3: Update Sun license notices to current X.Org standard form
  - 62b013f6: updated ObjectID.h


xorg-x11-drv-radeonhd-Add-instructions-for-disabling-KMS.patch:
 rhd_driver.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-drv-radeonhd-Add-instructions-for-disabling-KMS.patch ---
>From 8f1336e9b910e261aa3079990c8474b8451fcaad Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Wed, 10 Feb 2010 16:41:22 +0100
Subject: [PATCH] Add instructions for disabling KMS

Augment the message logged in Xorg.N.log with KMS disabling
instructions.
---
 src/rhd_driver.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/rhd_driver.c b/src/rhd_driver.c
index 170120a..d3ae2f8 100644
--- a/src/rhd_driver.c
+++ b/src/rhd_driver.c
@@ -420,7 +420,10 @@ RHDPciProbe(DriverPtr drv, int entityNum,
 	    if (kms) {
 		xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 0,
 		    "FATAL: RadeonHD presently does not work with kernel modesetting (KMS).\n"
-		    "Please disable KMS in your kernel.\n");
+		    "Please disable KMS in your kernel.\n"
+		    "\tAppend \"nomodeset\" or \"radeon.modeset=0\" (depending\n"
+		    "\ton your kernel version, or just add both to be sure) to\n"
+		    "\tyour kernel command line in /boot/grub/grub.conf.\n");
 		return FALSE;
 	    } else {
 		xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 0,
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	1 Jan 2010 15:06:24 -0000	1.52
+++ .cvsignore	10 Feb 2010 16:30:02 -0000	1.53
@@ -1 +1 @@
-xf86-video-radeonhd-1.3.0-20100101git.tar.xz
+xf86-video-radeonhd-1.3.0-20100210git.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	1 Jan 2010 15:06:24 -0000	1.53
+++ sources	10 Feb 2010 16:30:02 -0000	1.54
@@ -1 +1 @@
-9f53f14b8a62ca9f0705ed2619c24bfa  xf86-video-radeonhd-1.3.0-20100101git.tar.xz
+27f796b49a84357bf686ddebab733abc  xf86-video-radeonhd-1.3.0-20100210git.tar.xz


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xorg-x11-drv-radeonhd-README.fedora	1 Jan 2010 15:06:25 -0000	1.53
+++ xorg-x11-drv-radeonhd-README.fedora	10 Feb 2010 16:30:03 -0000	1.54
@@ -11,7 +11,7 @@ quickly (and releases happen too infrequ
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: cc1bb50bb44354be7793e4fc45c625746571ec96
+Latest upstream commit: 17bbb4d5c618eff1fde879c6170a45dbd4598329
 
 
 Contents


Index: xorg-x11-drv-radeonhd-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/xorg-x11-drv-radeonhd-snapshot.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xorg-x11-drv-radeonhd-snapshot.sh	1 Jan 2010 15:06:25 -0000	1.16
+++ xorg-x11-drv-radeonhd-snapshot.sh	10 Feb 2010 16:30:03 -0000	1.17
@@ -195,11 +195,11 @@ make -C "${builddir}" "${disttarget}" di
 bzip2 -c -d "${builddir}/${tarname}.tar.bz2" | xz -c > "${tarname}.tar.xz"
 
 # Update spec file with the proper timestamp
-old_git_commit=`$SED -n 's/^%define git_commit \(.*\)/\1/p' < "$specfile"`
+old_git_commit=`$SED -n 's/^%global git_commit \(.*\)/\1/p' < "$specfile"`
 if "$opt_update_config"; then
     sed_update_cond "$specfile" \
-	-e "s/^%define git_commit .*/%define git_commit ${upstream_commit}/" \
-	-e "s/^%define date .*/%define date ${date}/" \
+	-e "s/^%global git_commit .*/%global git_commit ${upstream_commit}/" \
+	-e "s/^%global date .*/%global date ${date}/" \
         -e "s/^Version:.*/Version:       ${version}/"
 
     sed_update_cond "${name}-README.fedora" \


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- xorg-x11-drv-radeonhd.spec	1 Jan 2010 15:06:25 -0000	1.69
+++ xorg-x11-drv-radeonhd.spec	10 Feb 2010 16:30:03 -0000	1.70
@@ -1,6 +1,6 @@
-%define tarname   xf86-video-radeonhd
-%define moduledir %(pkg-config xorg-server --variable=moduledir)
-%define driverdir %{moduledir}/drivers
+%global tarname   xf86-video-radeonhd
+%global moduledir %(pkg-config xorg-server --variable=moduledir)
+%global driverdir %{moduledir}/drivers
 
 # Git snapshots are treated slightly different from released source tarballs:
 #  * Release: tag is augmented with timestamp
@@ -8,32 +8,32 @@
 #  * Source: snapshots are local files with timestamps, released source
 #    tarballs come from ftp.x.org and have no timestamps
 #  * ...
-#define snapshot 0
-%define snapshot 1
+#global snapshot 0
+%global snapshot 1
 
 # If generating snapshot, we can add a utility which generates an xinf file.
 # This might become interesting at some time in the future, when we are
 # confident that we want radeonhd to handle those cards.
-%define generate_xinf 0
+%global generate_xinf 0
 %if %{snapshot}
-#define generate_xinf 1
+#global generate_xinf 1
 %endif
 
 %if %{snapshot}
-%define date 20100101
-%define git_commit cc1bb50bb44354be7793e4fc45c625746571ec96
-%define alphatag .%{date}git
-%define tarball %{tarname}-%{version}-%{date}git
-%define ship_utils 1
+%global date 20100210
+%global git_commit 17bbb4d5c618eff1fde879c6170a45dbd4598329
+%global alphatag .%{date}git
+%global tarball %{tarname}-%{version}-%{date}git
+%global ship_utils 1
 %else
-%define tarball %{tarname}-%{version}
-%define ship_utils 1
+%global tarball %{tarname}-%{version}
+%global ship_utils 1
 %endif
 
 Summary:       Xorg X11 radeonhd driver for AMD GPG r[5-8]xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.3.0
-Release:       4.3%{?alphatag}%{?dist}
+Release:       5.4%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -53,8 +53,8 @@ Source0:       %{tarball}.tar.xz
 Source0:       ftp://ftp.x.org/pub/individual/driver/%{tarball}.tar.bz2
 %endif
 
-Source1:       xorg-x11-drv-radeonhd-snapshot.sh
-Source2:       xorg-x11-drv-radeonhd-README.fedora
+Source1:       %{name}-snapshot.sh
+Source2:       %{name}-README.fedora
 
 # Needs to be applied while creating dist tarball, but still be in SRPM.
 Source11:      %{name}-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch
@@ -62,13 +62,13 @@ Source11:      %{name}-Generate-xinf-fil
 # Patches 100-199: Fedora adaptations
 
 # Upstream does not install rhd_conntest, but we do. Adapt docs accordingly.
-Patch100:      xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch
+Patch100:      %{name}-Fix-location-of-rhd_conntest-in-msgs.patch
 
-# Abort driver init and Xorg startup when KMS is enabled
-Patch110:      xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch
+# Add (Fedora specific) instructions to KMS error message
+Patch111:      %{name}-Add-instructions-for-disabling-KMS.patch
 
 # Unify xf86DrvMsg calls
-Patch120:      xorg-x11-drv-radeonhd-Unify-xf86DrvMsg-calls.patch
+Patch120:      %{name}-Unify-xf86DrvMsg-calls.patch
 
 # 200-299: Misc patches
 
@@ -126,9 +126,10 @@ Built from git commit: %{git_commit}
 %setup -q -n %{tarball}
 %if %{snapshot}
 %patch100 -p1 -b .conntest-docrefs
-%patch110 -p1 -b .kms-check
 %endif
 
+%patch111 -p1 -b .kms-error-message
+
 # Print all output all the time as Fedora gdm does not allow -logverbose :-/
 %patch120 -p1 -b .xf86drvmsg
 # Change all xf86DrvMsg() calls to xf86DrvMsgVerb() calls
@@ -194,6 +195,23 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 
 
 %changelog
+* Wed Feb 10 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-5.4.20100210git
+- More consistent usage of name macro in spec file
+- Replace %%define by %%global
+- Replace fedora specific KMS check with the upstreamed KMS check
+- New snapshot (upstream commit 17bbb4d5c618eff1fde879c6170a45dbd4598329):
+  - 17bbb4d5: ATOM: Upstream parser updates
+  - 4c28d82e: Add debugging to RHDCloseScreen.
+  - 5b994e0d: Fix wrong mask value for fractional pll divider.
+  - c8fb3cdb: Probe: Move KMS test to rhd_dri.c.
+  - 0b91ec06: Configure: Only compile the KMS check code if xf86drmMode.h is actually present.
+  - 56fa25f4: Probe: Only allow this driver when KMS is not present.
+  - 83e0afd3: Update Sun license notices to current X.Org standard form
+  - 62b013f6: updated ObjectID.h
+
+* Thu Jan 21 2010 Peter Hutterer <peter.hutterer at redhat.com> - 1.3.0-5.3.20100101git
+- Rebuild for server 1.8
+
 * Fri Jan 01 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-4.3.20100101git
 - Log all debug output all the time (gdm "no Xorg params" workaround)
 - Use xz compression for snapshot tarballs


--- xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch DELETED ---