Browse Source

xorg-x11-drv-nouveau: update to 1.0.4, build with libdrm-2.4.40

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7128 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
fd4041004e
1 changed files with 11 additions and 23 deletions
  1. 11 23
      x/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau-vl.spec

+ 11 - 23
x/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau-vl.spec

@@ -1,54 +1,39 @@
 %define tarball xf86-video-nouveau
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/drivers
-%define nouveau_version 0.0.16
-
-# Tarfile created using git
-# git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
-# git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
-
-%define gitdate 20110117
-%define git_version 38e8809
-
-%define snapshot %{gitdate}git%{git_version}
-
-%define tarfile %{tarball}-%{nouveau_version}-%{snapshot}.tar.bz2
 
 Summary:   Xorg X11 nouveau video driver for NVIDIA graphics chipsets
 Summary(ja): Xorg X11 nouveau ビデオドライバ - NVIDIA グラフィックスチップセット用
 Name:      xorg-x11-drv-nouveau
-Version:   %{nouveau_version}
-Release:   5.%{snapshot}%{?_dist_release}
+Version:   1.0.4
+Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 # Fedora specific snapshot no upstream release
-Source0:   %{tarfile}
+Source0:   xf86-video-nouveau-%{version}.tar.bz2
 
 ExcludeArch: s390 s390x
 
 BuildRequires: libtool automake autoconf
-BuildRequires: xorg-x11-server-sdk >= 1.7.0
-BuildRequires: libdrm-devel >= 2.4.24
+BuildRequires: xorg-x11-server-sdk >= 1.8.0
+BuildRequires: libdrm-devel >= 2.4.40
 BuildRequires: mesa-libGL-devel
 BuildRequires: libudev-devel
 BuildRequires: kernel-headers >= 2.6.32
 
 Requires:  hwdata
-Requires:  xorg-x11-server-Xorg > 1.7.0
-Requires:  libdrm >= 2.4.24
+Requires:  xorg-x11-server-Xorg > 1.8.0
+Requires:  libdrm >= 2.4.40
 Requires:  libudev
 
-Patch2: nouveau-nva3-noaccel-info.patch
-
 %description 
 X.Org X11 nouveau video driver.
 
 %prep
-%setup -q -n %{tarball}-%{version}
-%patch2 -p1 -b .nva3info
+%setup -q -n xf86-video-nouveau-%{version}
 
 %build
 autoreconf -v --install
@@ -72,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Sun Nov 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.4-1
+- update to 1.0.4, build with libdrm-2.4.40
+
 * Sun Mar 25 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.16-5.20110117git38e8809
 - rebuild with xserver-1.12.0