rpms/alsa-utils/F-12 .cvsignore, 1.29, 1.30 alsa-utils.spec, 1.88, 1.89 sources, 1.34, 1.35 alsactl-init-fix-headphone2.patch, 1.1, NONE
by perex
Author: perex
Update of /cvs/pkgs/rpms/alsa-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6724
Modified Files:
.cvsignore alsa-utils.spec sources
Removed Files:
alsactl-init-fix-headphone2.patch
Log Message:
updated to 1.0.22
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore 3 Sep 2009 10:57:30 -0000 1.29
+++ .cvsignore 1 Jan 2010 15:46:24 -0000 1.30
@@ -22,3 +22,4 @@ alsa-utils-1.0.18.tar.bz2
alsa-utils-1.0.19.tar.bz2
alsa-utils-1.0.20.tar.bz2
alsa-utils-1.0.21.tar.bz2
+alsa-utils-1.0.22.tar.bz2
Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-12/alsa-utils.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- alsa-utils.spec 3 Sep 2009 11:00:49 -0000 1.88
+++ alsa-utils.spec 1 Jan 2010 15:46:24 -0000 1.89
@@ -3,8 +3,8 @@
Summary: Advanced Linux Sound Architecture (ALSA) utilities
Name: alsa-utils
-Version: 1.0.21
-Release: 2%{?prever_dot}%{?dist}
+Version: 1.0.22
+Release: 1%{?prever_dot}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.alsa-project.org/
@@ -13,7 +13,6 @@ Source4: alsaunmute
Source6: alsa-info.sh
Source10: alsa.rules
Source11: alsactl.conf
-Patch1: alsactl-init-fix-headphone2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= %{version}
BuildRequires: ncurses-devel
@@ -27,7 +26,6 @@ Architecture (ALSA).
%prep
%setup -q -n %{name}-%{version}%{?prever}
-%patch1 -p1 -b .headphone
%build
%configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin --disable-alsaconf
@@ -94,6 +92,9 @@ if [ -s /etc/alsa/asound.state -a ! -s /
fi
%changelog
+* Fri Jan 1 2010 Jaroslav Kysela <jkysela(a)redhat.com> 1.0.22-1
+- updated to 1.0.22 final
+
* Thu Sep 3 2009 Jaroslav Kysela <jkysela(a)redhat.com> 1.0.21-2
- added missing patch file
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources 3 Sep 2009 10:57:30 -0000 1.34
+++ sources 1 Jan 2010 15:46:24 -0000 1.35
@@ -1 +1 @@
-3672287c2608040d111ce45495ba7602 alsa-utils-1.0.21.tar.bz2
+f7180316188552ee1e6759a03f1fe98d alsa-utils-1.0.22.tar.bz2
--- alsactl-init-fix-headphone2.patch DELETED ---
12Â years, 4Â months
rpms/gdb/F-12 gdb-rhel5-compat.patch,1.1,1.2 gdb.spec,1.408,1.409
by Jan Kratochvil
Author: jkratoch
Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1848
Modified Files:
gdb-rhel5-compat.patch gdb.spec
Log Message:
* Fri Jan 1 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0-16.fc12
- More RHEL-5 compatibility updates.
- Disable the build-id support by default.
- Bundle back gdbserver to the base gdb package.
- Remove bundled pstack.
- Drop the BuildRequires of rpm-devel.
gdb-rhel5-compat.patch:
./gdb/corelow.c | 2 +-
./gdb/symfile.c | 2 +-
gdb/linux-nat.c | 18 ++++++++++++++++--
symfile.c | 2 ++
4 files changed, 20 insertions(+), 4 deletions(-)
Index: gdb-rhel5-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-rhel5-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-rhel5-compat.patch 21 Dec 2009 11:26:48 -0000 1.1
+++ gdb-rhel5-compat.patch 1 Jan 2010 15:15:34 -0000 1.2
@@ -14,6 +14,28 @@ gdb/linux-nat.c:
xfree (build_id_name);
}
else if (build_id_name != NULL)
+--- ./gdb/corelow.c 2010-01-01 16:04:34.000000000 +0100
++++ ./gdb/corelow.c 2010-01-01 16:06:26.000000000 +0100
+@@ -277,7 +277,7 @@ add_to_thread_list (bfd *abfd, asection
+ inferior_ptid = ptid; /* Yes, make it current */
+ }
+
+-static int build_id_core_loads = 1;
++static int build_id_core_loads = 0;
+
+ static void
+ build_id_locate_exec (int from_tty)
+--- ./gdb/symfile.c 2010-01-01 16:04:35.000000000 +0100
++++ ./gdb/symfile.c 2010-01-01 16:06:12.000000000 +0100
+@@ -1249,7 +1249,7 @@ symbol_file_clear (int from_tty)
+ #define BUILD_ID_VERBOSE_NONE 0
+ #define BUILD_ID_VERBOSE_FILENAMES 1
+ #define BUILD_ID_VERBOSE_BINARY_PARSE 2
+-static int build_id_verbose = BUILD_ID_VERBOSE_FILENAMES;
++static int build_id_verbose = BUILD_ID_VERBOSE_NONE;
+ static void
+ show_build_id_verbose (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
--- gdb-7.0-orig/gdb/linux-nat.c 2009-12-19 20:53:46.000000000 +0100
+++ gdb-7.0/gdb/linux-nat.c 2009-12-19 20:55:02.000000000 +0100
@@ -1604,8 +1604,22 @@ GPT: lwp %s had signal %s, but it is in
Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- gdb.spec 1 Jan 2010 11:06:50 -0000 1.408
+++ gdb.spec 1 Jan 2010 15:15:34 -0000 1.409
@@ -36,7 +36,7 @@ Version: 7.0
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 15%{?_with_upstream:.upstream}%{dist}
+Release: 16%{?_with_upstream:.upstream}%{dist}
License: GPLv3+
Group: Development/Debuggers
@@ -61,11 +61,13 @@ URL: http://gnu.org/software/gdb/
Obsoletes: gdb64 < 5.3.91
%endif
+%if 0%{!?el5:1}
%if 0%{!?_with_upstream:1}
# The last Rawhide release was (no dist tag) pstack-1.2-7.2.2
Obsoletes: pstack < 1.2-7.2.2.1
Provides: pstack = 1.2-7.2.2.1
%endif # 0%{!?_with_upstream:1}
+%endif # 0%{!?el5:1}
# GDB patches have the format `gdb-<version>-bz<red-hat-bz-#>-<desc>.patch'.
# They should be created using patch level 1: diff -up ./gdb (or gdb-6.3/gdb).
@@ -429,9 +431,11 @@ Patch398: gdb-testsuite-unknown-output.p
BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
Requires: readline
BuildRequires: readline-devel
+%if 0%{!?el5:1}
# dlopen() no longer makes rpm-libs a mandatory dependency.
#Requires: rpm-libs
BuildRequires: rpm-devel
+%endif # 0%{!?el5:1}
Requires: zlib
BuildRequires: zlib-devel
%if 0%{!?_without_python:1}
@@ -514,6 +518,7 @@ GDB, the GNU debugger, allows you to deb
Java, and other languages, by executing them in a controlled fashion
and printing their data.
+%if 0%{!?el5:1}
%package gdbserver
Summary: A standalone server for GDB (the GNU source-level debugger)
Group: Development/Debuggers
@@ -524,6 +529,7 @@ Java, and other languages, by executing
and printing their data.
This package provides a program that allows you to run GDB on a different machine than the one which is running the program being debugged.
+%endif # 0%{!?el5:1}
%prep
@@ -920,8 +926,10 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# pstack obsoletion
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/gstack.1
+%if 0%{!?el5:1}
ln -s gstack.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/pstack.1.gz
ln -s gstack $RPM_BUILD_ROOT%{_bindir}/pstack
+%endif # 0%{!?el5:1}
%endif # 0%{!?_with_upstream:1}
%clean
@@ -963,9 +971,11 @@ fi
%{_mandir}/*/gdbtui.1*
%if 0%{!?_with_upstream:1}
%{_bindir}/gstack
-%{_bindir}/pstack
%{_mandir}/*/gstack.1*
+%if 0%{!?el5:1}
+%{_bindir}/pstack
%{_mandir}/*/pstack.1*
+%endif # 0%{!?el5:1}
%endif # 0%{!?_with_upstream:1}
%{_datadir}/gdb
%{_infodir}/annotate.info*
@@ -976,12 +986,21 @@ fi
# don't include the files in include, they are part of binutils
%ifnarch sparcv9
+%if 0%{!?el5:1}
%files gdbserver
+%endif
%{_bindir}/gdbserver
%{_mandir}/*/gdbserver.1*
%endif
%changelog
+* Fri Jan 1 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0-16.fc12
+- More RHEL-5 compatibility updates.
+ - Disable the build-id support by default.
+ - Bundle back gdbserver to the base gdb package.
+ - Remove bundled pstack.
+ - Drop the BuildRequires of rpm-devel.
+
* Fri Jan 1 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0-15.fc12
- Fix error on a sw watchpoint active at function epilogue (hit on s390x).
- testsuite: Fix false MI "unknown output after running" regression.
12Â years, 4Â months
rpms/xorg-x11-drv-radeonhd/F-11 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.65, 1.66
by Hans Ulrich Niedermann
Author: ndim
Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv540
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(a)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(a)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/F-11/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore 4 Dec 2009 00:43:52 -0000 1.51
+++ .cvsignore 1 Jan 2010 15:07:43 -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/F-11/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources 4 Dec 2009 00:43:52 -0000 1.52
+++ sources 1 Jan 2010 15:07:43 -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/F-11/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:43:52 -0000 1.1
+++ xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch 1 Jan 2010 15:07:43 -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(a)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(a)exsuse.de>
* Copyright 2007-2009 Matthias Hopf <mhopf(a)novell.com>
* Copyright 2007-2009 Egbert Eich <eich(a)novell.com>
+ * Copyright 2009 Dave Airlie <airlied(a)redhat.com>
++ * Copyright 2009 Hans Ulrich Niedermann <hun(a)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/F-11/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:43:52 -0000 1.52
+++ xorg-x11-drv-radeonhd-README.fedora 1 Jan 2010 15:07:43 -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/F-11/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:07:43 -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/F-11/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xorg-x11-drv-radeonhd.spec 4 Dec 2009 00:43:52 -0000 1.65
+++ xorg-x11-drv-radeonhd.spec 1 Jan 2010 15:07:43 -0000 1.66
@@ -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(a)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(a)n-dimensional.de> - 1.3.0-4.2.20091204git
- Abort driver startup if kernel modesetting (KMS) is enabled
- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
12Â years, 4Â months
rpms/xtide/devel .cvsignore, 1.31, 1.32 sources, 1.31, 1.32 xtide.spec, 1.47, 1.48
by Mamoru TASAKA
Author: mtasaka
Update of /cvs/extras/rpms/xtide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32764
Modified Files:
.cvsignore sources xtide.spec
Log Message:
* Sat Jan 2 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.11-0.2.dev20091227
- Update to 2.11 dev20091227
- Update to dwf data 20091227
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore 1 Jan 2010 14:58:53 -0000 1.31
+++ .cvsignore 1 Jan 2010 15:07:03 -0000 1.32
@@ -1,2 +1,2 @@
-harmonics-dwf-20081228-free.tar.bz2
+harmonics-dwf-20091227-free.tar.bz2
xtide-2.11-dev-20091227.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources 1 Jan 2010 14:58:53 -0000 1.31
+++ sources 1 Jan 2010 15:07:03 -0000 1.32
@@ -1,2 +1,2 @@
-2e1ee564394a7b6f034f7f9be1ce5394 harmonics-dwf-20081228-free.tar.bz2
+1dad5ae62f85b33b7ca249a08473ca79 harmonics-dwf-20091227-free.tar.bz2
39cd9d6881a34feef4968889924a0cd8 xtide-2.11-dev-20091227.tar.bz2
Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- xtide.spec 1 Jan 2010 14:58:53 -0000 1.47
+++ xtide.spec 1 Jan 2010 15:07:03 -0000 1.48
@@ -1,6 +1,6 @@
%define mainver 2.11
%define betatag dev-20091227
-%define dwfdate 20081228
+%define dwfdate 20091227
%define fedorarel 2
@@ -277,8 +277,9 @@ exit 0
%{_datadir}/man/man8/xttpd.8*
%changelog
-* Fri Jan 1 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.11-0.2.dev20091227
+* Sat Jan 2 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.11-0.2.dev20091227
- Update to 2.11 dev20091227
+- Update to dwf data 20091227
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.11-0.1.dev20090913
- Update to 2.11 development branch
12Â years, 4Â months
rpms/xorg-x11-drv-radeonhd/F-12 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
by 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-serv32475
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(a)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(a)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/F-12/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore 4 Dec 2009 00:43:52 -0000 1.51
+++ .cvsignore 1 Jan 2010 15:06:24 -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/F-12/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources 4 Dec 2009 00:43:52 -0000 1.52
+++ sources 1 Jan 2010 15:06:24 -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/F-12/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:43:52 -0000 1.1
+++ xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch 1 Jan 2010 15:06:24 -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(a)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(a)exsuse.de>
* Copyright 2007-2009 Matthias Hopf <mhopf(a)novell.com>
* Copyright 2007-2009 Egbert Eich <eich(a)novell.com>
+ * Copyright 2009 Dave Airlie <airlied(a)redhat.com>
++ * Copyright 2009 Hans Ulrich Niedermann <hun(a)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/F-12/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:43:52 -0000 1.52
+++ xorg-x11-drv-radeonhd-README.fedora 1 Jan 2010 15:06:25 -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/F-12/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:06:25 -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/F-12/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:43:52 -0000 1.68
+++ xorg-x11-drv-radeonhd.spec 1 Jan 2010 15:06:25 -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(a)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(a)n-dimensional.de> - 1.3.0-4.2.20091204git
- Abort driver startup if kernel modesetting (KMS) is enabled
- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
12Â years, 4Â months
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
by 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(a)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(a)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(a)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(a)exsuse.de>
* Copyright 2007-2009 Matthias Hopf <mhopf(a)novell.com>
* Copyright 2007-2009 Egbert Eich <eich(a)novell.com>
+ * Copyright 2009 Dave Airlie <airlied(a)redhat.com>
++ * Copyright 2009 Hans Ulrich Niedermann <hun(a)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(a)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(a)n-dimensional.de> - 1.3.0-4.2.20091204git
- Abort driver startup if kernel modesetting (KMS) is enabled
- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
12Â years, 4Â months
rpms/xtide/devel .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 xtide.spec, 1.46, 1.47
by Mamoru TASAKA
Author: mtasaka
Update of /cvs/extras/rpms/xtide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30971
Modified Files:
.cvsignore sources xtide.spec
Log Message:
* Fri Jan 1 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.11-0.2.dev20091227
- Update to 2.11 dev20091227
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore 14 Sep 2009 09:01:28 -0000 1.30
+++ .cvsignore 1 Jan 2010 14:58:53 -0000 1.31
@@ -1,2 +1,2 @@
harmonics-dwf-20081228-free.tar.bz2
-xtide-2.11-dev-20090913.tar.bz2
+xtide-2.11-dev-20091227.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources 14 Sep 2009 09:01:28 -0000 1.30
+++ sources 1 Jan 2010 14:58:53 -0000 1.31
@@ -1,2 +1,2 @@
2e1ee564394a7b6f034f7f9be1ce5394 harmonics-dwf-20081228-free.tar.bz2
-718f6fcc35b81b3638c66b088989a7f9 xtide-2.11-dev-20090913.tar.bz2
+39cd9d6881a34feef4968889924a0cd8 xtide-2.11-dev-20091227.tar.bz2
Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- xtide.spec 14 Sep 2009 08:56:47 -0000 1.46
+++ xtide.spec 1 Jan 2010 14:58:53 -0000 1.47
@@ -1,9 +1,9 @@
%define mainver 2.11
-%define betatag dev-20090913
+%define betatag dev-20091227
%define dwfdate 20081228
-%define fedorarel 1
+%define fedorarel 2
%define rel %{?betatag:0.}%{fedorarel}%{?betatag:.%(echo %betatag | sed -e 's|-||g')}
@@ -277,6 +277,9 @@ exit 0
%{_datadir}/man/man8/xttpd.8*
%changelog
+* Fri Jan 1 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.11-0.2.dev20091227
+- Update to 2.11 dev20091227
+
* Mon Sep 14 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.11-0.1.dev20090913
- Update to 2.11 development branch
12Â years, 4Â months