rpms/xorg-x11-drv-radeonhd/devel xorg-x11-drv-radeonhd-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch, NONE, 1.1 xorg-x11-drv-radeonhd-Add-a-simple-radeonhd-4-man-page.patch, NONE, 1.1 xorg-x11-drv-radeonhd-Multiple-updates-to-man-page.patch, NONE, 1.1 xorg-x11-drv-radeonhd-README.fedora, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-drv-radeonhd-snapshot.sh, 1.2, 1.3 xorg-x11-drv-radeonhd.spec, 1.2, 1.3
Hans Ulrich Niedermann (ndim)
fedora-extras-commits at redhat.com
Sun Oct 21 02:20:01 UTC 2007
Author: ndim
Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9208
Modified Files:
.cvsignore sources xorg-x11-drv-radeonhd-snapshot.sh
xorg-x11-drv-radeonhd.spec
Added Files:
xorg-x11-drv-radeonhd-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch
xorg-x11-drv-radeonhd-Add-a-simple-radeonhd-4-man-page.patch
xorg-x11-drv-radeonhd-Multiple-updates-to-man-page.patch
xorg-x11-drv-radeonhd-README.fedora
Log Message:
* Wed Oct 20 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.8.20071020git
- New snapshot (upstream commit 3579bdddd95dc6f129e57bcf05cbd8b9b375940f).
- Cleaned up snapshot script.
- Package rhd_conntest utility when building snapshot package.
- Add simple man page.
- Add README.fedora file.
xorg-x11-drv-radeonhd-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch:
--- NEW FILE xorg-x11-drv-radeonhd-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch ---
>From 537a378e61e739641164102ea268847545da1b2e Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Sat, 20 Oct 2007 18:13:14 +0200
Subject: [PATCH] Add Makefile.am for rhd_conntest, and build and install it
---
Makefile.am | 2 +-
configure.ac | 1 +
utils/conntest/.gitignore | 2 +-
utils/conntest/Makefile | 9 ---------
utils/conntest/Makefile.am | 5 +++++
5 files changed, 8 insertions(+), 11 deletions(-)
delete mode 100644 utils/conntest/Makefile
create mode 100644 utils/conntest/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f83dcbb..5a291fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src
\ No newline at end of file
+SUBDIRS = src utils/conntest
diff --git a/configure.ac b/configure.ac
index cceaccc..8140643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,4 +139,5 @@ XORG_RELEASE_VERSION
AC_OUTPUT([
Makefile
src/Makefile
+ utils/conntest/Makefile
])
diff --git a/utils/conntest/.gitignore b/utils/conntest/.gitignore
index 56196ff..4bd650f 100644
--- a/utils/conntest/.gitignore
+++ b/utils/conntest/.gitignore
@@ -1,2 +1,2 @@
-!Makefile
+.deps
rhd_conntest
diff --git a/utils/conntest/Makefile b/utils/conntest/Makefile
deleted file mode 100644
index 414cfe6..0000000
--- a/utils/conntest/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-rhd_conntest: rhd_conntest.c
- gcc -Wall -o rhd_conntest rhd_conntest.c -lpci -lz -I../../src/AtomBios/includes
-
-all: rhd_conntest
-
-clean:
- rm -f rhd_conntest
- rm -f *.o
- rm -f *~
diff --git a/utils/conntest/Makefile.am b/utils/conntest/Makefile.am
new file mode 100644
index 0000000..fa170f7
--- /dev/null
+++ b/utils/conntest/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = README
+AM_CPPFLAGS = -I$(top_srcdir)/src/AtomBios/includes
+bin_PROGRAMS = rhd_conntest
+rhd_conntest_SOURCES = rhd_conntest.c
+rhd_conntest_LDADD = -lpci -lz
--
1.5.3.4
xorg-x11-drv-radeonhd-Add-a-simple-radeonhd-4-man-page.patch:
--- NEW FILE xorg-x11-drv-radeonhd-Add-a-simple-radeonhd-4-man-page.patch ---
>From 20cfaefa8b379025499df454cba7e97b1f2d61c8 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Sat, 20 Oct 2007 20:22:50 +0200
Subject: [PATCH] Add a simple radeonhd(4) man page
---
Makefile.am | 2 +-
configure.ac | 3 +-
man/.gitignore | 1 +
man/Makefile.am | 59 ++++++++++++++++++++++
man/radeonhd.man | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 206 insertions(+), 2 deletions(-)
create mode 100644 man/.gitignore
create mode 100644 man/Makefile.am
create mode 100644 man/radeonhd.man
diff --git a/Makefile.am b/Makefile.am
index 5a291fe..124025e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src utils/conntest
+SUBDIRS = man src utils/conntest
diff --git a/configure.ac b/configure.ac
index 8140643..e24d0f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,11 +133,12 @@ AC_SUBST([moduledir])
DRIVER_NAME=radeonhd
AC_SUBST([DRIVER_NAME])
-# XORG_MANPAGE_SECTIONS
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
Makefile
+ man/Makefile
src/Makefile
utils/conntest/Makefile
])
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..181f314
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1 @@
+*.[0-9]
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..bf7ec17
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,59 @@
+# $Id$
+#
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+#
+# 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 OPEN GROUP 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.
+#
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
+#
+
+drivermandir = $(DRIVER_MAN_DIR)
+
+driverman_PRE = @DRIVER_NAME at .man
+
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
+
+EXTRA_DIST = @DRIVER_NAME at .man
+
+CLEANFILES = $(driverman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
diff --git a/man/radeonhd.man b/man/radeonhd.man
new file mode 100644
index 0000000..ada38d3
--- /dev/null
+++ b/man/radeonhd.man
@@ -0,0 +1,143 @@
+.\" radeonhd.man based on formatting used in the xf86-video-{ati,nv} radeon.man, nv.man
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.\"
+.\"
+.TH RADEONHD __drivermansuffix__ __vendorversion__
+.\"
+.\"
+.SH NAME
+radeonhd \- AMD GPG (ATI) R5xx/R6xx video driver
+.\"
+.\"
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI " Identifier \*q" devname \*q
+.B " Driver \*qradeonhd\*q"
+\ \ ...
+.B EndSection
+.fi
+.\"
+.\"
+.SH DESCRIPTION
+.B radeonhd
+is an __xservername__ driver for AMD GPG (ATI) R5xx/R6xx based video cards.
+
+.B "RADEONHD is still very much a work in progress."
+
+At the time of this writing,
+.B radeonhd
+has
+.B NO
+support for 2D acceleration, Xvideo, 3D acceleration, and many other nice
+features.
+.SH SUPPORTED HARDWARE
+The
+.B radeonhd
+driver supports video cards based on the following ATI chips:
+.\" The following list was generated from "X -logverbose 7" by the following command:
+.\" sed -n '/^\t[RM][A-Z0-9]\+ * : /{ s/\.$//; s/^\t\([A-Z0-9]\+\) \+: \(.*\)/.TP 12\n.B \1\n\2/; p};' /var/log/Xorg.0.log
+.\" The list replicates the output of RHDIdentify() in src/rhd_id.c.
+.TP 12
+.B RV505
+Radeon X1550, X1550 64bit
+.TP 12
+.B RV515
+Radeon X1300, X1550, X1600; FireGL V3300, V3350
+.TP 12
+.B RV516
+Radeon X1300, X1550, X1550 64-bit, X1600; FireMV 2250
+.TP 12
+.B R520
+Radeon X1800; FireGL V5300, V7200, V7300, V7350
+.TP 12
+.B RV530
+Radeon X1300 XT, X1600, X1600 Pro, X1650; FireGL V3400, V5200
+.TP 12
+.B RV535
+Radeon X1300, X1650
+.TP 12
+.B RV550
+Radeon X2300 HD
+.TP 12
+.B RV560
+Radeon X1650
+.TP 12
+.B RV570
+Radeon X1950, X1950 GT; FireGL V7400
+.TP 12
+.B R580
+Radeon X1900, X1950; AMD Stream Processor
+.TP 12
+.B R600
+Radeon HD 2900 GT/Pro/XT; FireGL V7600/V8600/V8650
+.TP 12
+.B RV610
+Radeon HD 2350, HD 2400 Pro/XT, HD 2400 Pro AGP; FireGL V4000
+.TP 12
+.B RV630
+Radeon HD 2600 Pro/XT, HD 2600 Pro/XT AGP; Gemini RV630; FireGL V3600/V5600
+.TP 12
+.B M52
+Mobility Radeon X1300
+.TP 12
+.B M54
+Mobility Radeon X1400; M54-GL
+.TP 12
+.B M56
+Mobility Radeon X1600; Mobility FireGL V5200
+.TP 12
+.B M58
+Mobility Radeon X1800, X1800 XT; Mobility FireGL V7100, V7200
+.TP 12
+.B M62
+Mobility Radeon X1350
+.TP 12
+.B M64
+Mobility Radeon X1450, X2300
+.TP 12
+.B M66
+Mobility Radeon X1700, X1700 XT; FireGL V5250
+.TP 12
+.B M68
+Mobility Radeon X1900
+.TP 12
+.B M71
+Mobility Radeon HD 2300
+.TP 12
+.B M72
+Mobility Radeon HD 2400; Radeon E2400
+.TP 12
+.B M74
+Mobility Radeon HD 2400 XT
+.TP 12
+.B M76
+Mobility Radeon HD 2600; (Gemini ATI) Mobility Radeon HD 2600 XT
+.TP 12
+.B RS690
+Radeon X1200
+.TP 12
+.B RS740
+RS740, RS740M
+.\"
+.\"
+.SH CONFIGURATION DETAILS
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+details. This section only covers configuration details specific to this
+driver.
+.PP
+See the source code (
+.I src/rhd_driver.c
+) for now. Sorry.
+.\"
+.\"
+.SH SEE ALSO
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+.\"
+.\"
+.SH AUTHORS
+.nf
+Hans Ulrich Niedermann \fIhun at n-dimensional.de\fP
+.fi
+.\" vim: syntax=nroff
--
1.5.3.4
xorg-x11-drv-radeonhd-Multiple-updates-to-man-page.patch:
--- NEW FILE xorg-x11-drv-radeonhd-Multiple-updates-to-man-page.patch ---
>From ee9f639b262bad1bb0552d93f2c721326b324e3a Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Sat, 20 Oct 2007 20:43:17 +0200
Subject: [PATCH] Multiple updates to man page
---
man/radeonhd.man | 88 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/man/radeonhd.man b/man/radeonhd.man
index ada38d3..528d65d 100644
--- a/man/radeonhd.man
+++ b/man/radeonhd.man
@@ -37,103 +37,129 @@ The
.B radeonhd
driver supports video cards based on the following ATI chips:
.\" The following list was generated from "X -logverbose 7" by the following command:
-.\" sed -n '/^\t[RM][A-Z0-9]\+ * : /{ s/\.$//; s/^\t\([A-Z0-9]\+\) \+: \(.*\)/.TP 12\n.B \1\n\2/; p};' /var/log/Xorg.0.log
+.\" sed -n '/^\t[RM][A-Z0-9]\+ * : /{ s/\.$//; s/^\t\([A-Z0-9]\+\) \+: \(.*\)/.TP 8\n.B \1\n\2/; p};' /var/log/Xorg.0.log
.\" The list replicates the output of RHDIdentify() in src/rhd_id.c.
-.TP 12
+.TP 8
.B RV505
Radeon X1550, X1550 64bit
-.TP 12
+.TP 8
.B RV515
Radeon X1300, X1550, X1600; FireGL V3300, V3350
-.TP 12
+.TP 8
.B RV516
Radeon X1300, X1550, X1550 64-bit, X1600; FireMV 2250
-.TP 12
+.TP 8
.B R520
Radeon X1800; FireGL V5300, V7200, V7300, V7350
-.TP 12
+.TP 8
.B RV530
Radeon X1300 XT, X1600, X1600 Pro, X1650; FireGL V3400, V5200
-.TP 12
+.TP 8
.B RV535
Radeon X1300, X1650
-.TP 12
+.TP 8
.B RV550
Radeon X2300 HD
-.TP 12
+.TP 8
.B RV560
Radeon X1650
-.TP 12
+.TP 8
.B RV570
Radeon X1950, X1950 GT; FireGL V7400
-.TP 12
+.TP 8
.B R580
Radeon X1900, X1950; AMD Stream Processor
-.TP 12
+.TP 8
.B R600
Radeon HD 2900 GT/Pro/XT; FireGL V7600/V8600/V8650
-.TP 12
+.TP 8
.B RV610
Radeon HD 2350, HD 2400 Pro/XT, HD 2400 Pro AGP; FireGL V4000
-.TP 12
+.TP 8
.B RV630
Radeon HD 2600 Pro/XT, HD 2600 Pro/XT AGP; Gemini RV630; FireGL V3600/V5600
-.TP 12
+.TP 8
.B M52
Mobility Radeon X1300
-.TP 12
+.TP 8
.B M54
Mobility Radeon X1400; M54-GL
-.TP 12
+.TP 8
.B M56
Mobility Radeon X1600; Mobility FireGL V5200
-.TP 12
+.TP 8
.B M58
Mobility Radeon X1800, X1800 XT; Mobility FireGL V7100, V7200
-.TP 12
+.TP 8
.B M62
Mobility Radeon X1350
-.TP 12
+.TP 8
.B M64
Mobility Radeon X1450, X2300
-.TP 12
+.TP 8
.B M66
Mobility Radeon X1700, X1700 XT; FireGL V5250
-.TP 12
+.TP 8
.B M68
Mobility Radeon X1900
-.TP 12
+.TP 8
.B M71
Mobility Radeon HD 2300
-.TP 12
+.TP 8
.B M72
Mobility Radeon HD 2400; Radeon E2400
-.TP 12
+.TP 8
.B M74
Mobility Radeon HD 2400 XT
-.TP 12
+.TP 8
.B M76
Mobility Radeon HD 2600; (Gemini ATI) Mobility Radeon HD 2600 XT
-.TP 12
+.TP 8
.B RS690
Radeon X1200
-.TP 12
+.TP 8
.B RS740
RS740, RS740M
.\"
.\"
.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
-details. This section only covers configuration details specific to this
-driver.
+Please refer to __xconfigfile__(__filemansuffix__) for general
+configuration details. This section only covers configuration details
+specific to this driver.
.PP
See the source code (
.I src/rhd_driver.c
) for now. Sorry.
.\"
.\"
+.SH KNOWN BUGS
+As the
+.B radeonhd
+driver is still in the early stages of development. Therefore, many
+non-obvious things do not work yet.
+.SS No valid modeline found
+If the
+.I "Section \*qscreen\*q"
+in your __xconfigfile__ contains a
+.I "Monitor \*qfoobar\*q"
+line,
+.B radeonhd
+often does not find a valid modeline for the attached display and
+aborts.
+.\"
+.\"
.SH SEE ALSO
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+.IP " 1." 4
+The radeonhd mailing list
+.RS 4
+\%http://lists.opensuse.org/radeonhd/
+.RE
+.IP " 2." 4
+Overview about radeonhd development code
+.RS 4
+\%http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-radeonhd
+.RE
.\"
.\"
.SH AUTHORS
--
1.5.3.4
--- NEW FILE xorg-x11-drv-radeonhd-README.fedora ---
==========================================================-*- text -*-==
xorg-x11-drv-radeonhd - xf86-video-radeonhd for Fedora
========================================================================
0. DEVELOPMENT SNAPSHOT
=======================
The xorg-x11-drv-radeon package consists of a development snapshot of
the xf86-video-radeonhd driver. As a development snapshot, do not rely
on it to do anything particular for you.
Latest upstream commit: 3579bdddd95dc6f129e57bcf05cbd8b9b375940f
Contents
========
1. What Is RADEONHD?
2. Supported Hardware
3. Features
4. Known Issues
5. Resources
6. rhd_conntest
1. What Is RADEONHD?
====================
Radeonhd is the long-awaited open source Xorg driver for newer
graphics cards using a r5xx/r6xx series GPU made by AMD GPG
(a.k.a. ATI), written with docs supplied by AMD.
2. Supported Hardware
=====================
As of 2007-10-18 (commit 3579bdddd95dc6f129e57bcf05cbd8b9b375940f), the
radeonhd driver reports the following devices as supported in one way
or the other, i.e. something between 0.01% and 80%:
RADEONHD: X driver for the following AMD GPG (ATI) graphics devices:
RV505 : Radeon X1550, X1550 64bit.
RV515 : Radeon X1300, X1550, X1600; FireGL V3300, V3350.
RV516 : Radeon X1300, X1550, X1550 64-bit, X1600; FireMV 2250.
R520 : Radeon X1800; FireGL V5300, V7200, V7300, V7350.
RV530 : Radeon X1300 XT, X1600, X1600 Pro, X1650; FireGL V3400, V5200.
RV535 : Radeon X1300, X1650.
RV550 : Radeon X2300 HD.
RV560 : Radeon X1650.
RV570 : Radeon X1950, X1950 GT; FireGL V7400.
R580 : Radeon X1900, X1950; AMD Stream Processor.
R600 : Radeon HD 2900 GT/Pro/XT; FireGL V7600/V8600/V8650.
RV610 : Radeon HD 2350, HD 2400 Pro/XT, HD 2400 Pro AGP; FireGL V4000.
RV630 : Radeon HD 2600 Pro/XT, HD 2600 Pro/XT AGP; Gemini RV630; FireGL V3600/V5600.
M52 : Mobility Radeon X1300.
M54 : Mobility Radeon X1400; M54-GL.
M56 : Mobility Radeon X1600; Mobility FireGL V5200.
M58 : Mobility Radeon X1800, X1800 XT; Mobility FireGL V7100, V7200.
M62 : Mobility Radeon X1350.
M64 : Mobility Radeon X1450, X2300.
M66 : Mobility Radeon X1700, X1700 XT; FireGL V5250.
M68 : Mobility Radeon X1900.
M71 : Mobility Radeon HD 2300.
M72 : Mobility Radeon HD 2400; Radeon E2400.
M74 : Mobility Radeon HD 2400 XT.
M76 : Mobility Radeon HD 2600; (Gemini ATI) Mobility Radeon HD 2600 XT.
RS690 : Radeon X1200.
RS740 : RS740, RS740M
3. Features
===========
* Non-accelerated 2D graphics.
4. Known Issues
===============
* XVideo: Not supported.
Possibly relatively soon for YUV and scaling limited to x1 and x2.
* 3D acceleration: Not supported.
* ThinkPad backlight brightness control: Not yet, ETA 2007-11.
* Try commenting out the 'Monitor "foobar"' line in the xorg.conf
Section "Screen" if Xorg.0.log suggests radeonhd cannot find a
suitable modeline.
* Finding the correct modeline for the proper resolution of a monitor
may fail.
* Switching from X11 to the VGA text console sometimes leaves the
display in a non-working state. Switching back to X11, and then
back to VGA text seems to toggle that.
5. Resources
============
* Overview about development code:
http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-radeonhd
* Git clone URL:
http://anongit.freedesktop.org/git/xorg/driver/xf86-video-radeonhd/
* Mailing list: http://lists.opensuse.org/radeonhd/
6. rhd_conntest
===============
rhd_conntest is a test utility used to test the connectors on the
graphics card.
Before sending reports to upstream, however, please make sure that
* the report has not been integrated into upstream yet.
* your radeonhd snapshot is not older than one or two weeks max.
For usage information, please consult README.rhd_conntest.
========================================================================
xorg-x11-drv-radeonhd - xf86-video-radeonhd for Fedora
========================================================================
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Oct 2007 19:30:03 -0000 1.3
+++ .cvsignore 21 Oct 2007 02:19:29 -0000 1.4
@@ -1 +1 @@
-xf86-video-radeonhd-0.0.2-20071017git.tar.bz2
+xf86-video-radeonhd-0.0.2-20071020git.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Oct 2007 19:30:03 -0000 1.3
+++ sources 21 Oct 2007 02:19:29 -0000 1.4
@@ -1 +1 @@
-0ec4cca976c5cdd47055db93f1ad5cec xf86-video-radeonhd-0.0.2-20071017git.tar.bz2
+fce73599b7664462c76af83a5b672a08 xf86-video-radeonhd-0.0.2-20071020git.tar.bz2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-radeonhd-snapshot.sh 17 Oct 2007 19:30:03 -0000 1.2
+++ xorg-x11-drv-radeonhd-snapshot.sh 21 Oct 2007 02:19:29 -0000 1.3
@@ -1,16 +1,26 @@
#!/bin/sh
-# Generate snapshot tarball of xf86-video-radeonhd.
-#
-# Syntax:
-# sh xorg-x11-drv-radeonhd-snapshot.sh
-# Generate a snapshot tarball, and a few patches
-#
-# sh xorg-x11-drv-radeonhd-snapshot.sh --update-spec
-# Generate a snapshot tarball, a few patches, and update the spec
-# file with the correct %date timestamp.
-#
-# (requires git, automake, autoconf, libtool to be installed)
+help="$(cat<<EOF
+Generate snapshot tarball from git repository.
+Syntax:
+ sh $0 [<options>]
+ Generate a snapshot tarball
+
+Options:
+ --update-config
+ Update spec file, README.foo, etc. with the correct timestamps,
+ commit ids, etc.
+ --skip-pull
+ Do not fetch updates from upstream repository.
+ --no-checks
+ Disable check runs.
+
+Requires:
+ git, automake, autoconf, libtool
+EOF
+)"
+
+# Local settings
name="xorg-x11-drv-radeonhd"
tarbase="xf86-video-radeonhd"
builddir="${tarbase}.build"
@@ -18,48 +28,94 @@
specfile="${name}.spec"
date="${date-$(date +%Y%m%d)}"
+branch="tmp-snapshot"
+
+# Check files and directories before starting to do anything
if [ -d "${builddir}" ]; then
echo "Remove the \"${builddir}\" directory first !"
exit 1
fi
+# Parse command line options
+opt_update_config="false"
+opt_skip_pull="false"
+opt_no_checks="false"
+for opt
+do
+ case "$opt" in
+ --skip-pull) opt_skip_pull=":" ;;
+ --update-config) opt_update_config=":" ;;
+ --no-checks) opt_no_checks=":" ;;
+ -h|--help)
+ echo "$help"
+ exit 0
+ ;;
+ *)
+ echo "FATAL: Unhandled command line option: $opt"
+ exit 13
+ ;;
+ esac
+done
+
+
+# Syntax: sed_update_cond <FILENAME> [<sed-options>]
+sed_update_cond() {
+ old="$1"
+ new="$1.new"
+ shift
+ if sed "$@" < "${old}" > "${new}"; then
+ if cmp "${new}" "${old}"; then :
+ else
+ mv -f "${new}" "${old}"
+ return
+ fi
+ fi
+ rm -f "${new}"
+}
+
+
+# Prepare for action
unset CDPATH
set -ex
# Update/check out source
if [ -s "${srcdir}/.git/refs/heads/master" ]; then
- # update from repo, keeping local changes separate
- ( cd "${srcdir}" && git checkout master && git fetch && git rebase origin )
+ ( cd "${srcdir}" && git reset --hard HEAD && git checkout master )
+ if "$opt_skip_pull"; then
+ echo "Skipping pull from upstream as requested"
+ else
+ # update from repo, keeping local changes separate
+ ( cd "${srcdir}" && git fetch && git rebase origin )
+ fi
+ ( cd "${srcdir}" && (git branch -D "${branch}" ||:))
else
# first checkout
git clone "git://anongit.freedesktop.org/git/xorg/driver/${tarbase}" "${srcdir}"
fi
+( cd "${srcdir}" && git checkout -b "${branch}" )
# Determine latest upstream commit:
-upstream_commit="$(cd xf86-video-radeonhd.src && git log | head -n1 | cut -d' ' -f2)"
+upstream_commit="$(cd "${srcdir}" && git log | head -n1 | cut -d' ' -f2)"
-# This commit break the brightness settings
-#( cd "${srcdir}" && git diff 1103f74dc04e80f47a84367771e6b981d6a902ac 1103f74dc04e80f47a84367771e6b981d6a902ac^ ) \
-# > "${name}-fix-thinkpad-backlight-keys.patch"
-
-# If possible, create a few patches from our local development branch
-# which are pending for inclusion in upstream.
-pending="${HOME}/src/xorg/xf86-video-radeonhd"
-if test -d "${pending}/.git/refs/heads/master"; then
- for commit in ;
- do
- opatch=`cd "${pending}" && git format-patch "${commit}^..${commit}"`
- npatch=`echo "${opatch}" | sed "s/^0001-/${name}-/g"`
- if test -s "${npatch}" && cmp "${pending}/${opatch}" "$npatch"; then
- echo "### Patch ${npatch} already exists, not modified."
- else
- mv -f "${pending}/${opatch}" "${npatch}"
+# Fix and/or clean up upstream's git repo before creating a dist tarball:
+# * upstream tends to forget to make sure the dist tarball builds
+# * we avoid ugly simultanous spec patches to Makefile.{am,in}
+for patch in \
+ ${name}-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch \
+ ${name}-Add-a-simple-radeonhd-4-man-page.patch \
+ ${name}-Multiple-updates-to-man-page.patch
+do
+ if [ -s "$patch" ]; then
+ (cd "$srcdir" && git-am -3) < "$patch"
+ if test -s "${srcdir}/.dotest/patch"; then
+ echo "Fatal: Could not cleanly apply patch \"$patch\"."
+ exit 11
fi
- done
-fi
-
-# Upstream's git repo tends to forget to make sure the dist tarball is OK.
-# We need to fix that here before we can create a dist tarball.
+ else
+ echo "Fatal: Patch file \"$patch\" not found."
+ exit 13
+ fi
+done
# Build dist tarball and move it to CWD
autoreconf -vis "${srcdir}"
@@ -67,23 +123,26 @@
( cd "${builddir}" && ../${srcdir}/configure )
version=`sed -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"`
tarname="${tarbase}-${version}-${date}git"
-make -C "${builddir}" distcheck distdir="${tarname}"
+if "$opt_no_checks"; then
+ disttarget="dist"
+else
+ disttarget="distcheck"
+fi
+make -C "${builddir}" "${disttarget}" distdir="${tarname}"
mv -f "${builddir}/${tarname}.tar.bz2" "${tarname}.tar.bz2"
# Update spec file with the proper timestamp
-if [ "x$1" = "x--update-spec" ]; then
- sed -e "s/^%define date .*/%define date ${date}/" \
- -e "s/^Version:.*/Version: ${version}/" \
- "$specfile" > "$specfile.new"
- if cmp "${specfile}.new" "${specfile}"; then
- rm -f "${specfile},new"
- else
- mv -f "${specfile}.new" "${specfile}"
- fi
+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/^Version:.*/Version: ${version}/"
+
+ sed_update_cond "${name}-README.fedora" \
+ -e "s/^\(Latest upstream commit:\).*/\\1 ${upstream_commit}/"
fi
-# Clean up after us
-(cd "${srcdir}" && git reset --hard origin)
+# Clean up after us (keeping the patched git branch)
rm -rf "${builddir}"
echo "Latest upstream commit: ${upstream_commit}"
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-radeonhd.spec 17 Oct 2007 19:30:03 -0000 1.2
+++ xorg-x11-drv-radeonhd.spec 21 Oct 2007 02:19:29 -0000 1.3
@@ -5,13 +5,14 @@
# Git snapshots are treated slightly different from released source tarballs:
# * Release: tag is augmented with timestamp
# * Description contains a few things about the snapshot
-# * Source: snapshots are local files with timestamps, release
-# come from ftp.x.org and have no timestamps
+# * Source: snapshots are local files with timestamps, released source
+# tarballs come from ftp.x.org and have no timestamps
# * ...
%define snapshot 1
%if 0%{snapshot}
-%define date 20071017
+%define date 20071020
+%define git_commit
%define alphatag .%{date}git
%define tarball %{tarname}-%{version}-%{date}git
%else
@@ -21,7 +22,7 @@
Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
Name: xorg-x11-drv-radeonhd
Version: 0.0.2
-Release: 0.7%{?alphatag}%{?dist}
+Release: 0.8%{?alphatag}%{?dist}
License: MIT
Group: User Interface/X Hardware Support
@@ -33,7 +34,7 @@
# (cf. http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-radeonhd)
# Use the following commands to generate the tarball:
# sh xorg-x11-drv-radeonhd-snapshot.sh
-# sh xorg-x11-drv-radeonhd-snapshot.sh --update-spec
+# 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.bz2
@@ -42,13 +43,20 @@
%endif
Source1: xorg-x11-drv-radeonhd-snapshot.sh
+Source2: xorg-x11-drv-radeonhd-README.fedora
-# This patch is also generated by xorg-x11-drv-radeonhd-snapshot.sh
-# cf. http://lists.opensuse.org/radeonhd/2007-10/msg00247.html
-# Patch0: xorg-x11-drv-radeonhd-fix-thinkpad-backlight-keys.patch
+# Needs to be applied while creating dist tarball, but still be in SRPM.
+Source10: %{name}-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch
+Source11: %{name}-Add-a-simple-radeonhd-4-man-page.patch
+Source12: %{name}-Multiple-updates-to-man-page.patch
ExcludeArch: s390 s390x
+%if 0%{snapshot}
+# Required for building rhd_conntest
+BuildRequires: pciutils-devel
+BuildRequires: zlib-devel
+%endif
BuildRequires: xorg-x11-server-sdk >= 1.3
Requires: xorg-x11-server-Xorg >= 1.3
@@ -63,11 +71,17 @@
%prep
%setup -q -n %{tarball}
-#%patch0 -p1 -b .fix-thinkpad-backlight-keys
%build
%{configure} --with-xorg-module-dir=%{moduledir} --disable-static
+%if 0%{snapshot}
+sed -i 's/^#define GIT_COMMIT NULL$/#define GIT_COMMIT "%{git_commit} (+fedora)"/' config.h
+%endif
%{__make} %{?_smp_mflags}
+%{__cp} %{SOURCE2} README.fedora
+%if 0%{snapshot}
+%{__cp} utils/conntest/README README.rhd_conntest
+%endif
%install
%{__rm} -rf "%{buildroot}"
@@ -83,9 +97,22 @@
%files
%defattr(-,root,root,-)
%doc README COPYING
+%doc README.fedora
+%if 0%{snapshot}
+%doc README.rhd_conntest
+%{_bindir}/rhd_conntest
+%endif
%{driverdir}/radeonhd_drv.so
+%{_mandir}/man4/radeonhd.4.gz
%changelog
+* Wed Oct 20 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.8.20071020git
+- New snapshot (upstream commit 3579bdddd95dc6f129e57bcf05cbd8b9b375940f).
+- Cleaned up snapshot script.
+- Package rhd_conntest utility when building snapshot package.
+- Add simple man page.
+- Add README.fedora file.
+
* Wed Oct 17 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.7.20071017git
- New snapshot (upstream commit d03841b4950b3b827b3c42507e01767d0569391f).
- Use upstream's version 0.0.2.
More information about the fedora-extras-commits
mailing list