[xorg-x11-drv-openchrome] temporary git snapshot, to fix deps after X server rebuild
Dave Airlie
airlied at fedoraproject.org
Fri Jul 20 04:19:57 UTC 2012
commit a2d6f50f2e33478fa6e2a593774c35e6ce06fb84
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Jul 20 00:25:10 2012 -0400
temporary git snapshot, to fix deps after X server rebuild
.gitignore | 1 +
make-git-snapshot.sh | 22 ++++++++++++++++++++++
sources | 2 +-
xorg-x11-drv-openchrome.spec | 25 ++++++++++++++-----------
4 files changed, 38 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b274aa..f11881e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
xf86-video-openchrome-0.2.904.tar.bz2
/xf86-video-openchrome-0.2.905.tar.bz2
/xf86-video-openchrome-0.2.906.tar.bz2
+/xf86-video-openchrome-20120718.tar.bz2
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..3d9aef1
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch. Defaults to HEAD.
+# Point env var REF to a local mesa repo to reduce clone time.
+
+DIRNAME=xf86-video-openchrome-$( date +%Y%m%d )
+
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
+rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+ git://git.freedesktop.org/git/openchrome/xf86-video-openchrome $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+ | bzip2 > $DIRNAME.tar.bz2
+
+# rm -rf $DIRNAME
diff --git a/sources b/sources
index 0efe2db..a769461 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-244507baf1900f1e923604c4a0f05925 xf86-video-openchrome-0.2.906.tar.bz2
+c1baec0e45e57feb4b249616a7421c40 xf86-video-openchrome-20120718.tar.bz2
diff --git a/xorg-x11-drv-openchrome.spec b/xorg-x11-drv-openchrome.spec
index 9678686..78a947d 100644
--- a/xorg-x11-drv-openchrome.spec
+++ b/xorg-x11-drv-openchrome.spec
@@ -1,8 +1,12 @@
%define tarball xf86-video-openchrome
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
+%define gitdate 20120718
+%define gitversion 6a69631a6
-%define cvsdate xxxxxxx
+%if 0%{?gitdate}
+%define gver .%{gitdate}git%{gitversion}
+%endif
%define with_xvmc 1
%define with_debug 0
@@ -10,12 +14,13 @@
Summary: Xorg X11 openchrome video driver
Name: xorg-x11-drv-openchrome
Version: 0.2.906
-Release: 1%{?dist}
+Release: 2%{?gver}%{?dist}
URL: http://www.openchrome.org
License: MIT
Group: User Interface/X Hardware Support
-Source0: http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2
+#Source0: http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2
+Source0: %{tarball}-%{gitdate}.tar.bz2
# Patches from upstream trunk :
# svn diff -x -p http://svn.openchrome.org/svn/tags/release_0_2_904 http://svn.openchrome.org/svn/trunk
@@ -31,6 +36,7 @@ Patch13: openchrome-0.2.904-fix_tvout_flickering.patch
ExclusiveArch: %{ix86} x86_64
+BuildRequires: autoconf automake libtool
BuildRequires: xorg-x11-server-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
@@ -64,16 +70,10 @@ X.Org X11 openchrome video driver XvMC development package.
%prep
-%setup -q -n %{tarball}-%{version}
-#%patch0 -p0
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-
-#%patch13 -p0
-
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
%build
+%{?gitdate:autoreconf -v --install}
%configure --disable-static --enable-dri \
%if %{with_debug}
--enable-debug --enable-xv-debug
@@ -125,6 +125,9 @@ fi
%changelog
+* Fri Jul 20 2012 Dave Airlie <airlied at redhat.com> 0.2.906-2
+- temporary git snapshot, to fix deps after X server rebuild
+
* Wed May 15 2012 Xavier Bachelot <xavier at bachelot.org> - 0.2.906-1
- Update to 0.2.906.
More information about the scm-commits
mailing list