rpms/xorg-x11-drv-radeonhd/devel xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-radeonhd-README.fedora, 1.5, 1.6 xorg-x11-drv-radeonhd-snapshot.sh, 1.4, 1.5 xorg-x11-drv-radeonhd.spec, 1.9, 1.10
Hans Ulrich Niedermann (ndim)
fedora-extras-commits at redhat.com
Thu Nov 1 14:29:40 UTC 2007
Author: ndim
Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837
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-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch
Log Message:
* Tue Oct 31 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.14.20071031git
- New snapshot (upstream commit ad599c4436c64b11d18c89da6a684f5241979a96):
- Fix 1650Pro PLL gain control.
- Improve connector handling.
- Stow away radeonhd.xinf generator for possible later use.
xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch:
--- NEW FILE xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch ---
>From 8c607f400d104092092141b608997818ff02a118 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Tue, 30 Oct 2007 23:34:41 +0100
Subject: [PATCH] Generate xinf file for hwdata from rhd_id.c
X-See-URL: http://radeonhd.lauft.net/patches/
Takes all chipset and card data from rhd_id.c and prints them all
as an xinf file suitable for installation in
/usr/share/hwdata/videoaliases/
CAUTION: GENERATED FILE UNTESTED!
Adding to rhd_id.c is not pretty, but works, and uncovers
more compile errors than separate compilation does.
---
configure.ac | 1 +
src/Makefile.am | 7 ++++++
src/rhd_id.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9c41885..991a558 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ AM_MAINTAINER_MODE
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+AM_PROG_CC_C_O
AH_TOP([#ifndef _CONFIG_H])
diff --git a/src/Makefile.am b/src/Makefile.am
index 8746daf..9598455 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,3 +88,9 @@ libatom_la_SOURCES = \
radeonhd_drv_la_LIBADD = libatom.la
endif
+
+noinst_PROGRAMS = print-xinf-data
+
+print_xinf_data_SOURCES = rhd_id.c
+print_xinf_data_CPPFLAGS = $(AM_CPPFLAGS) -DPRINT_XINF_DATA
+print_xinf_data_CFLAGS = $(AM_CFLAGS) @PEDANTIC_CFLAGS@
diff --git a/src/rhd_id.c b/src/rhd_id.c
index bc78a63..9781569 100644
--- a/src/rhd_id.c
+++ b/src/rhd_id.c
@@ -635,3 +635,67 @@ RHDCardIdentify(ScrnInfoPtr pScrn)
#endif
return NULL;
}
+
+
+#ifdef PRINT_XINF_DATA
+
+/* Make linking possible, we're not calling those anyway */
+void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
+{ /* noop */ }
+void xf86Msg(MessageType type, const char *format, ...)
+{ /* noop */ }
+
+const char *const find_chipset(const int id)
+{
+ unsigned int j;
+ for (j=0; RHDChipsets[j].token >= 0; j++) {
+ if (id == RHDChipsets[j].token) {
+ return RHDChipsets[j].name;
+ }
+ }
+ return NULL;
+}
+
+#ifdef XSERVER_LIBPCIACCESS
+#error No print-xinf-data code #ifdef XSERVER_LIBPCIACCESS!
+#else /* !XSERVER_LIBPCIACCESS */
+
+int main(int argc, char *argv[])
+{
+ const unsigned int VENDOR_ATI = 0x1002;
+ printf("# %s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+#ifdef GIT_MESSAGE
+ printf("# built from %s\n", GIT_MESSAGE);
+#endif
+ printf("# Autogenerated device list from src/rhd_id.c\n");
+ printf("\n"
+ "# CAUTION: FILE GENERATED BLINDLY, NEEDS TESTING!!!\n");
+
+ printf("\n# RHDPCIchipsets[] dump\n");
+ if (1) {
+ unsigned int i;
+ for (i=0; ((RHDPCIchipsets[i].numChipset != -1) &&
+ (RHDPCIchipsets[i].PCIid != -1) &&
+ (RHDPCIchipsets[i].resList != RES_UNDEFINED)); i++) {
+ const char *const chipset_name = find_chipset(RHDPCIchipsets[i].numChipset);
+ printf("alias pcivideo:v%08Xd%08Xsv*sd*bc*sc*i* radeonhd # %s\n",
+ VENDOR_ATI, RHDPCIchipsets[i].PCIid,
+ (chipset_name)?(chipset_name):("chipset not in RHDChipsets"));
+ }
+ }
+
+ printf("\n# rhdCards[] dump (this might be included in the chipset list?))\n");
+ if (1) {
+ unsigned int i;
+ for (i=0; rhdCards[i].device != 0; i++) {
+ printf("alias pcivideo:v%08Xd%08Xsv%08Xsd%08Xbc*sc*i* radeonhd # %s\n",
+ VENDOR_ATI, rhdCards[i].device,
+ rhdCards[i].card_vendor, rhdCards[i].card_device,
+ rhdCards[i].name);
+ }
+ }
+ return 0;
+}
+
+#endif /* XSERVER_LIBPCIACCESS */
+#endif /* PRINT_XINF_DATA */
--
1.5.3.4
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 30 Oct 2007 18:29:54 -0000 1.8
+++ .cvsignore 1 Nov 2007 14:29:07 -0000 1.9
@@ -1 +1 @@
-xf86-video-radeonhd-0.0.2-20071030git.tar.bz2
+xf86-video-radeonhd-0.0.2-20071031git.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 30 Oct 2007 18:29:54 -0000 1.8
+++ sources 1 Nov 2007 14:29:07 -0000 1.9
@@ -1 +1 @@
-3a9b4566da2dac7aadf0d8ae6d5988b4 xf86-video-radeonhd-0.0.2-20071030git.tar.bz2
+d250daad8faac1e5042c5f13a6323a4c xf86-video-radeonhd-0.0.2-20071031git.tar.bz2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-radeonhd-README.fedora 30 Oct 2007 18:29:54 -0000 1.5
+++ xorg-x11-drv-radeonhd-README.fedora 1 Nov 2007 14:29:07 -0000 1.6
@@ -10,7 +10,7 @@
the xf86-video-radeonhd driver. As a development snapshot, do not rely
on it to do anything particular for you.
-Latest upstream commit: f3a2530cea981c6b4c88ec85093032ea152ed47f
+Latest upstream commit: ad599c4436c64b11d18c89da6a684f5241979a96
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-radeonhd-snapshot.sh 25 Oct 2007 14:13:05 -0000 1.4
+++ xorg-x11-drv-radeonhd-snapshot.sh 1 Nov 2007 14:29:07 -0000 1.5
@@ -97,6 +97,9 @@
# Determine latest upstream commit:
upstream_commit="$(cd "${srcdir}" && git log | head -n1 | cut -d' ' -f2)"
+# This patch is waiting for the time when we actually need a radeonhd.xinf file.
+# ${name}-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch
+
# 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}
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-radeonhd.spec 30 Oct 2007 19:03:58 -0000 1.9
+++ xorg-x11-drv-radeonhd.spec 1 Nov 2007 14:29:07 -0000 1.10
@@ -8,11 +8,20 @@
# * 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
+# 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.
%if 0%{snapshot}
-%define date 20071030
-%define git_commit f3a2530cea981c6b4c88ec85093032ea152ed47f
+# %define generate_xinf 1
+%define generate_xinf 0
+%endif
+
+%if 0%{snapshot}
+%define date 20071031
+%define git_commit ad599c4436c64b11d18c89da6a684f5241979a96
%define alphatag .%{date}git
%define tarball %{tarname}-%{version}-%{date}git
%else
@@ -22,7 +31,7 @@
Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
Name: xorg-x11-drv-radeonhd
Version: 0.0.2
-Release: 0.13%{?alphatag}%{?dist}
+Release: 0.14%{?alphatag}%{?dist}
License: MIT
Group: User Interface/X Hardware Support
@@ -47,6 +56,7 @@
# 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}-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch
Patch13: xorg-x11-drv-radeonhd-Do-not-include-sys-io.h-in-rhd_conntest.c.patch
@@ -85,11 +95,18 @@
%if 0%{snapshot}
%{__cp} utils/conntest/README README.rhd_conntest
%endif
+%if 0%{generate_xinf}
+./src/print-xinf-data > radeonhd.xinf
+%endif
%install
%{__rm} -rf "%{buildroot}"
%{__make} install DESTDIR="%{buildroot}"
%{__rm} -f "%{buildroot}%{driverdir}/radeonhd_drv.la"
+%if 0%{generate_xinf}
+%{__install} -m 0755 -d "%{buildroot}%{_datadir}/hwdata/videoaliases"
+%{__install} -m 0644 radeonhd.xinf "%{buildroot}%{_datadir}/hwdata/videoaliases"
+%endif
%check
%{__make} check || %{__make} check VERBOSE=yes
@@ -107,8 +124,17 @@
%endif
%{driverdir}/radeonhd_drv.so
%{_mandir}/man4/radeonhd.4.gz
+%if 0%{generate_xinf}
+%{_datadir}/hwdata/videoaliases/radeonhd.xinf
+%endif
%changelog
+* Tue Oct 31 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.14.20071031git
+- New snapshot (upstream commit ad599c4436c64b11d18c89da6a684f5241979a96):
+ - Fix 1650Pro PLL gain control.
+ - Improve connector handling.
+- Stow away radeonhd.xinf generator for possible later use.
+
* Tue Oct 30 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.13.20071030git
- Do not #include <sys/io.h> in rhd_conntest.c (fix PPC build).
More information about the fedora-extras-commits
mailing list