rpms/xorg-x11-drv-radeonhd/devel xorg-x11-drv-radeonhd-Unify-xf86DrvMsg-calls.patch, NONE, 1.1 .cvsignore, 1.51, 1.52 sources, 1.52, 1.53 xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch, 1.1, 1.2 xorg-x11-drv-radeonhd-README.fedora, 1.52, 1.53 xorg-x11-drv-radeonhd-snapshot.sh, 1.15, 1.16 xorg-x11-drv-radeonhd.spec, 1.68, 1.69

[Hans Ulrich Niedermann]

Author: ndim

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

Modified Files:
	.cvsignore sources 
	xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch 
	xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec 
Added Files:
	xorg-x11-drv-radeonhd-Unify-xf86DrvMsg-calls.patch 
Log Message:
* 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
- New snapshot (upstream commit cc1bb50bb44354be7793e4fc45c625746571ec96):
  - cc1bb50b: Fix incorrect LIST_END macro.
  - b62d13fc: Bugfixing and a bit cleanup
  - ace8f44f: HDMI audio support for RV710 and RV730.
  - ffc141e2: ATOM: add newer power table defs
  - edeb1e7a: Fix build for w/o USE_DRI.


xorg-x11-drv-radeonhd-Unify-xf86DrvMsg-calls.patch:
 rhd_atombios.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE xorg-x11-drv-radeonhd-Unify-xf86DrvMsg-calls.patch ---
>From c1e3626319ee6fb068d29011ac7f5278934b0d0e Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Fri, 1 Jan 2010 05:02:43 +0100
Subject: [PATCH 1/3] Unify xf86DrvMsg calls

This makes it possible to use a simple sed expression to replace
all xf86DrvMsg() calls by xf86DrvMsgVerb() calls.
---
 src/rhd_atombios.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rhd_atombios.c b/src/rhd_atombios.c
index 02070dd..3f7ce54 100644
--- a/src/rhd_atombios.c
+++ b/src/rhd_atombios.c
@@ -5884,8 +5884,8 @@ CailReadPCIConfigData(VOID*CAIL, VOID* ret, UINT32 idx,UINT16 size)
 	    *(CARD32*)ret = pciReadLong(tag,idx << 2);
 	    break;
 	default:
-	xf86DrvMsg(((atomBiosHandlePtr)CAIL)->scrnIndex,
-		   X_ERROR,"%s: Unsupported size: %i\n",
+	xf86DrvMsg(((atomBiosHandlePtr)CAIL)->scrnIndex,X_ERROR,
+		   "%s: Unsupported size: %i\n",
 		   __func__,(int)size);
 	return;
 	    break;
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	4 Dec 2009 00:33:00 -0000	1.51
+++ .cvsignore	1 Jan 2010 15:05:59 -0000	1.52
@@ -1 +1 @@
-xf86-video-radeonhd-1.3.0-20091204git.tar.lzma
+xf86-video-radeonhd-1.3.0-20100101git.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	4 Dec 2009 00:33:00 -0000	1.52
+++ sources	1 Jan 2010 15:05:59 -0000	1.53
@@ -1 +1 @@
-1bab87280d94db5197c3b700b05024a3  xf86-video-radeonhd-1.3.0-20091204git.tar.lzma
+9f53f14b8a62ca9f0705ed2619c24bfa  xf86-video-radeonhd-1.3.0-20100101git.tar.xz

xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch:
 rhd_driver.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

Index: xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch	4 Dec 2009 00:33:00 -0000	1.1
+++ xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch	1 Jan 2010 15:05:59 -0000	1.2
@@ -1,6 +1,6 @@
-From e6e4a2ff28a841f788d4ff28d3fb175c9ae69a63 Mon Sep 17 00:00:00 2001
+From ff079f55c51b6e270dbeccebc9a124591eb910fe Mon Sep 17 00:00:00 2001
 From: Hans Ulrich Niedermann <hun at n-dimensional.de>
-Date: Fri, 4 Dec 2009 01:26:25 +0100
+Date: Fri, 4 Dec 2009 01:58:03 +0100
 Subject: [PATCH] Fail PciProbe if KMS is enabled
 
 This copies the radeon_kernel_mode_enabled() function from radeon's
@@ -13,22 +13,23 @@ PciProbe and do not touch the GPU in any
 Then at least the KMS console continues working, and there is an
 error message for the user to read.
 ---
- src/rhd_driver.c |   42 ++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 42 insertions(+), 0 deletions(-)
+ src/rhd_driver.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 43 insertions(+), 0 deletions(-)
 
 diff --git a/src/rhd_driver.c b/src/rhd_driver.c
-index 2d7f803..058a308 100644
+index 2d7f803..163435d 100644
 --- a/src/rhd_driver.c
 +++ b/src/rhd_driver.c
-@@ -2,6 +2,7 @@
+@@ -2,6 +2,8 @@
   * Copyright 2007-2009  Luc Verhaegen <libv at exsuse.de>
   * Copyright 2007-2009  Matthias Hopf <mhopf at novell.com>
   * Copyright 2007-2009  Egbert Eich   <eich at novell.com>
 + * Copyright      2009  Dave Airlie   <airlied at redhat.com>
++ * Copyright      2009  Hans Ulrich Niedermann <hun at n-dimensional.de>
   * Copyright 2007-2009  Advanced Micro Devices, Inc.
   *
   * Permission is hereby granted, free of charge, to any person obtaining a
-@@ -88,6 +89,7 @@
+@@ -88,6 +90,7 @@
  #define _XF86DRI_SERVER_
  #include "dri.h"
  #include "GL/glxint.h"
@@ -36,7 +37,7 @@ index 2d7f803..058a308 100644
  #endif
  
  #if HAVE_XF86_ANSIC_H
-@@ -398,6 +400,34 @@ RHDAvailableOptions(int chipid, int busid)
+@@ -398,6 +401,34 @@ RHDAvailableOptions(int chipid, int busid)
   *
   */
  #ifdef XSERVER_LIBPCIACCESS
@@ -71,7 +72,7 @@ index 2d7f803..058a308 100644
  static Bool
  RHDPciProbe(DriverPtr drv, int entityNum,
  	    struct pci_device *dev, intptr_t matchData)
-@@ -409,6 +439,18 @@ RHDPciProbe(DriverPtr drv, int entityNum,
+@@ -409,6 +440,18 @@ RHDPciProbe(DriverPtr drv, int entityNum,
  				RES_SHARED_VGA, NULL, NULL, NULL, NULL);
      if (pScrn != NULL) {
  


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- xorg-x11-drv-radeonhd-README.fedora	4 Dec 2009 00:33:01 -0000	1.52
+++ xorg-x11-drv-radeonhd-README.fedora	1 Jan 2010 15:05:59 -0000	1.53
@@ -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: 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8
+Latest upstream commit: cc1bb50bb44354be7793e4fc45c625746571ec96
 
 
 Contents


Index: xorg-x11-drv-radeonhd-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-snapshot.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xorg-x11-drv-radeonhd-snapshot.sh	6 Mar 2009 12:12:02 -0000	1.15
+++ xorg-x11-drv-radeonhd-snapshot.sh	1 Jan 2010 15:05:59 -0000	1.16
@@ -192,7 +192,7 @@ else
     disttarget="distcheck"
 fi
 make -C "${builddir}" "${disttarget}" distdir="${tarname}"
-bzip2 -c -d "${builddir}/${tarname}.tar.bz2" | lzma -c > "${tarname}.tar.lzma"
+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"`
@@ -213,5 +213,5 @@ rm -rf "${builddir}"
 
 echo "Old upstream commit in spec: ${old_git_commit}"
 echo "Latest upstream commit:      ${upstream_commit}"
-echo "$ make new-sources FILES=\"${tarname}.tar.lzma\""
+echo "$ make new-sources FILES=\"${tarname}.tar.xz\""
 


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- xorg-x11-drv-radeonhd.spec	4 Dec 2009 00:33:01 -0000	1.68
+++ xorg-x11-drv-radeonhd.spec	1 Jan 2010 15:05:59 -0000	1.69
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20091204
-%define git_commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8
+%define date 20100101
+%define git_commit cc1bb50bb44354be7793e4fc45c625746571ec96
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r[5-8]xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.3.0
-Release:       4.2%{?alphatag}%{?dist}
+Release:       4.3%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -48,7 +48,7 @@ BuildRoot:     %(mktemp -ud %{_tmppath}/
 #  sh xorg-x11-drv-radeonhd-snapshot.sh --update-config
 # The latter updates this spec file with the appropriate definition of %date.
 # This requires git, automake, autoconf, libtool to be installed.
-Source0:       %{tarball}.tar.lzma
+Source0:       %{tarball}.tar.xz
 %else
 Source0:       ftp://ftp.x.org/pub/individual/driver/%{tarball}.tar.bz2
 %endif
@@ -67,6 +67,9 @@ Patch100:      xorg-x11-drv-radeonhd-Fix
 # Abort driver init and Xorg startup when KMS is enabled
 Patch110:      xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch
 
+# Unify xf86DrvMsg calls
+Patch120:      xorg-x11-drv-radeonhd-Unify-xf86DrvMsg-calls.patch
+
 # 200-299: Misc patches
 
 ExcludeArch:   s390 s390x
@@ -118,14 +121,26 @@ radeonhd mailing list: http://lists.open
 Built from git commit: %{git_commit}
 %endif
 
+
 %prep
 %setup -q -n %{tarball}
 %if %{snapshot}
 %patch100 -p1 -b .conntest-docrefs
 %patch110 -p1 -b .kms-check
 %endif
+
+# Print all output all the time as Fedora gdm does not allow -logverbose :-/
+%patch120 -p1 -b .xf86drvmsg
+# Change all xf86DrvMsg() calls to xf86DrvMsgVerb() calls
+find . -type f -name '*.c' -exec sed -i 's/xf86DrvMsg *(\([^,]*\),\([^,]*\),/xf86DrvMsgVerb(\1,\2, 0,/' {} \;
+# Change all xf86Msg() calls to xf86MsgVerb() calls
+find . -type f -name '*.c' -exec sed -i 's/xf86Msg *(\([^,]*\),/xf86MsgVerb(\1, 0,/' {} \;
+# Verify that we have changed all calls to xf86Msg() and xf86DrvMsg()
+find . -type f -name '*.c' \( -exec grep -H 'xf86Msg[^V]' {} \; -or -exec grep -H 'xf86DrvMsg[^V]' {} \; \) -print
+
 sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c
 
+
 %build
 %{configure} --with-xorg-module-dir=%{moduledir} --disable-static --disable-shave
 %{__make} %{?_smp_mflags}
@@ -137,6 +152,7 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 ./src/print-xinf-data > radeonhd.xinf
 %endif
 
+
 %install
 %{__rm} -rf "%{buildroot}"
 %{__make} install DESTDIR="%{buildroot}"
@@ -151,12 +167,15 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %{__install} -p -m 0644 radeonhd.xinf "%{buildroot}%{_datadir}/hwdata/videoaliases"
 %endif
 
+
 %check
 %{__make} check || %{__make} check VERBOSE=yes
 
+
 %clean
 %{__rm} -rf "%{buildroot}"
 
+
 %files
 %defattr(-,root,root,-)
 %doc README COPYING
@@ -173,7 +192,18 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %{_datadir}/hwdata/videoaliases/radeonhd.xinf
 %endif
 
+
 %changelog
+* 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
+- New snapshot (upstream commit cc1bb50bb44354be7793e4fc45c625746571ec96):
+  - cc1bb50b: Fix incorrect LIST_END macro.
+  - b62d13fc: Bugfixing and a bit cleanup
+  - ace8f44f: HDMI audio support for RV710 and RV730.
+  - ffc141e2: ATOM: add newer power table defs
+  - edeb1e7a: Fix build for w/o USE_DRI.
+
 * Fri Dec 04 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-4.2.20091204git
 - Abort driver startup if kernel modesetting (KMS) is enabled
 - New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):