Browse Source

xorg-x11-drv-openchrome: update to svn trunk

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2053 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 14 years ago
parent
commit
24d93d8aa0
1 changed files with 19 additions and 1 deletions
  1. 19 1
      x/xorg-x11-drv-openchrome/xorg-x11-drv-openchrome-vl.spec

+ 19 - 1
x/xorg-x11-drv-openchrome/xorg-x11-drv-openchrome-vl.spec

@@ -10,7 +10,7 @@ Summary:	Xorg X11 openchrome video driver
 Summary(ja):	Xorg X11 openchrome ビデオドライバ
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.904
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -19,6 +19,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source0:	http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2
 Source1:	openchrome.xinf
 
+# Patches from upstream trunk :
+# svn diff -x -p http://svn.openchrome.org/svn/tags/release_0_2_904 http://svn.openchrome.org/svn/trunk
+Patch0:         openchrome-0.2.904-latest_trunk.patch
+# svn diff -x -p -r853:854 http://svn.openchrome.org/svn/trunk
+patch1:         openchrome-0.2.904-fix_dri_on_64_bits.patch
+
+# Patches from Fedora :
+Patch13:        openchrome-0.2.904-fix_tvout_flickering.patch
+Patch20:        openchrome-0.2.904-I420_Xv_surface_for_CME.patch
+
 ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pkgconfig
@@ -55,6 +65,10 @@ X.Org X11 openchrome video driver XvMC development package.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p0
+%patch1 -p0
+%patch13 -p0
+%patch20 -p1
 
 %build
 %configure --disable-static --enable-dri
@@ -102,6 +116,10 @@ fi
 
 
 %changelog
+* Tue Oct 12 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.2.904-3
+- update to svn trunk (r854)
+- add patch13,20 from fedora
+
 * Sun Mar 28 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.904-2
 - rebuild with xserver-1.8rc