rpms/xorg-x11-drv-radeonhd/devel xorg-x11-drv-radeonhd-git_version.h, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xorg-x11-drv-radeonhd-README.fedora, 1.6, 1.7 xorg-x11-drv-radeonhd-snapshot.sh, 1.5, 1.6 xorg-x11-drv-radeonhd.spec, 1.10, 1.11 xorg-x11-drv-radeonhd-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch, 1.2, NONE
Hans Ulrich Niedermann (ndim)
fedora-extras-commits at redhat.com
Mon Nov 5 16:47:39 UTC 2007
Author: ndim
Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30230
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-git_version.h
Removed Files:
xorg-x11-drv-radeonhd-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch
Log Message:
* Mon Nov 05 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.15.20071105git
- New snapshot (upstream commit e9c24f662860229440dc61ecbae22e7d7c74d442):
- Improve online help in rhd_conntest.
- Use correct variable for DDC speed setting on R6xx, fix some warnings.
- Add git version to program output (we emulate that).
- Ship rhd_conntest source, and build it (we also install it).
--- NEW FILE xorg-x11-drv-radeonhd-git_version.h ---
/*
* Basic versioning gathered from the git repository.
* Automatically generated by ../../../xf86-video-radeonhd.src/git_version.sh.
*/
#ifndef GIT_VERSION_H
#define GIT_VERSION_H 1
/* This is a git repository */
#define GIT_USED 1
/* Git SHA ID of last commit */
#define GIT_SHAID "e9c24f66.."
/* Branch this tree is on */
#define GIT_BRANCH "fedora/snapshot"
/* SHA-ID uniquely defines the state of this code */
#undef GIT_UNCOMMITTED
/* Define GIT_MESSAGE such that
* printf("%s: built from %s", argv[0], GIT_MESSAGE);
* forms a proper sentence.
*/
#ifdef GIT_USED
# ifdef GIT_UNCOMMITTED
# define GIT_WITH_WITHOUT_UNCOMMITTED " + changes"
# else
# define GIT_WITH_WITHOUT_UNCOMMITTED ""
# endif /* GIT_UNCOMMITTED */
# define GIT_MESSAGE \
"git branch " GIT_BRANCH ", " \
"commit " GIT_SHAID GIT_WITH_WITHOUT_UNCOMMITTED
#else
# define GIT_MESSAGE "non-git sources"
#endif /* GIT_USED */
#endif /* GIT_VERSION_H */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 1 Nov 2007 14:29:07 -0000 1.9
+++ .cvsignore 5 Nov 2007 16:47:03 -0000 1.10
@@ -1 +1 @@
-xf86-video-radeonhd-0.0.2-20071031git.tar.bz2
+xf86-video-radeonhd-0.0.2-20071105git.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 1 Nov 2007 14:29:07 -0000 1.9
+++ sources 5 Nov 2007 16:47:03 -0000 1.10
@@ -1 +1 @@
-d250daad8faac1e5042c5f13a6323a4c xf86-video-radeonhd-0.0.2-20071031git.tar.bz2
+d323fc15b8e54d33d50edb8d35ee1003 xf86-video-radeonhd-0.0.2-20071105git.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-radeonhd-README.fedora 1 Nov 2007 14:29:07 -0000 1.6
+++ xorg-x11-drv-radeonhd-README.fedora 5 Nov 2007 16:47:03 -0000 1.7
@@ -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: ad599c4436c64b11d18c89da6a684f5241979a96
+Latest upstream commit: e9c24f662860229440dc61ecbae22e7d7c74d442
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-radeonhd-snapshot.sh 1 Nov 2007 14:29:07 -0000 1.5
+++ xorg-x11-drv-radeonhd-snapshot.sh 5 Nov 2007 16:47:03 -0000 1.6
@@ -28,7 +28,7 @@
specfile="${name}.spec"
date="${date-$(date +%Y%m%d)}"
-branch="tmp-snapshot"
+branch="fedora/snapshot"
# Check files and directories before starting to do anything
if [ -d "${builddir}" ]; then
@@ -85,7 +85,7 @@
echo "Skipping pull from upstream as requested"
else
# update from repo, keeping local changes separate
- ( cd "${srcdir}" && git fetch && git rebase origin )
+ ( cd "${srcdir}" && git fetch && git rebase origin ) || exit $?
fi
( cd "${srcdir}" && (git branch -D "${branch}" ||:))
else
@@ -103,8 +103,7 @@
# 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
+for patch in
do
if [ -s "$patch" ]; then
(cd "$srcdir" && git-am -3) < "$patch"
@@ -118,10 +117,16 @@
fi
done
-# Build dist tarball and move it to CWD
+# Generate and configure build system
autoreconf -vis "${srcdir}"
mkdir "${builddir}"
( cd "${builddir}" && ../${srcdir}/configure )
+
+# Build git_version.h for shipping
+make -C "${builddir}/utils/conntest"
+cp "${builddir}/utils/conntest/git_version.h" "${name}-git_version.h"
+
+# Build dist tarball and move it to CWD
version=`sed -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"`
tarname="${tarbase}-${version}-${date}git"
if "$opt_no_checks"; then
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-radeonhd.spec 1 Nov 2007 14:29:07 -0000 1.10
+++ xorg-x11-drv-radeonhd.spec 5 Nov 2007 16:47:03 -0000 1.11
@@ -20,8 +20,8 @@
%endif
%if 0%{snapshot}
-%define date 20071031
-%define git_commit ad599c4436c64b11d18c89da6a684f5241979a96
+%define date 20071105
+%define git_commit e9c24f662860229440dc61ecbae22e7d7c74d442
%define alphatag .%{date}git
%define tarball %{tarname}-%{version}-%{date}git
%else
@@ -31,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.14%{?alphatag}%{?dist}
+Release: 0.15%{?alphatag}%{?dist}
License: MIT
Group: User Interface/X Hardware Support
@@ -53,13 +53,11 @@
Source1: xorg-x11-drv-radeonhd-snapshot.sh
Source2: xorg-x11-drv-radeonhd-README.fedora
+Source3: xorg-x11-drv-radeonhd-git_version.h
# 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
-
ExcludeArch: s390 s390x
%if 0%{snapshot}
@@ -83,12 +81,15 @@
%prep
%setup -q -n %{tarball}
-%patch13 -p1 -b .sys-io
%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
+# Use git version information from snapshot
+echo -e "#!/bin/sh\nexit 0" > git_version.sh
+sed -e 's/^# define GIT_WITH_WITHOUT_UNCOMMITTED " +.*/# define GIT_WITH_WITHOUT_UNCOMMITTED " + fedora"/' \
+ < %{SOURCE3} > src/git_version.h
+cp src/git_version.h utils/conntest/git_version.h
%endif
%{__make} %{?_smp_mflags}
%{__cp} %{SOURCE2} README.fedora
@@ -103,6 +104,8 @@
%{__rm} -rf "%{buildroot}"
%{__make} install DESTDIR="%{buildroot}"
%{__rm} -f "%{buildroot}%{driverdir}/radeonhd_drv.la"
+%{__install} -m 0755 -d "%{buildroot}/%{_bindir}"
+%{__install} -m 0755 utils/conntest/rhd_conntest "%{buildroot}/%{_bindir}/rhd_conntest"
%if 0%{generate_xinf}
%{__install} -m 0755 -d "%{buildroot}%{_datadir}/hwdata/videoaliases"
%{__install} -m 0644 radeonhd.xinf "%{buildroot}%{_datadir}/hwdata/videoaliases"
@@ -129,6 +132,13 @@
%endif
%changelog
+* Mon Nov 05 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.15.20071105git
+- New snapshot (upstream commit e9c24f662860229440dc61ecbae22e7d7c74d442):
+ - Improve online help in rhd_conntest.
+ - Use correct variable for DDC speed setting on R6xx, fix some warnings.
+ - Add git version to program output (we emulate that).
+ - Ship rhd_conntest source, and build it (we also install it).
+
* 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.
--- xorg-x11-drv-radeonhd-Add-Makefile.am-for-rhd_conntest-and-build-and-inst.patch DELETED ---
More information about the fedora-extras-commits
mailing list