Browse Source

xorg-x11-drv-nouveau: new upstream release, libdrm: fix %%files

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2894 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 13 years ago
parent
commit
072d523497
2 changed files with 22 additions and 12 deletions
  1. 5 1
      lib/libd/libdrm/libdrm-vl.spec
  2. 17 11
      x/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau-vl.spec

+ 5 - 1
lib/libd/libdrm/libdrm-vl.spec

@@ -4,7 +4,7 @@ Summary: Direct Rendering Manager runtime library
 Summary(ja): Direct Rendering Manager ランタイムライブラリ
 Name: libdrm
 Version: 2.4.24
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -119,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/nouveau
 %{_includedir}/nouveau/nouveau_*.h
 %{_includedir}/nouveau/nv04_*.h
+%{_includedir}/nouveau/nvc0_pushbuf.h
 %dir %{_includedir}/libkms
 %{_includedir}/libkms/libkms.h
 %{_libdir}/libdrm.so
@@ -157,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Mar 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.24-2
+- fix %%files devel (add %%{_includedir}/nouveau/nvc0_pushbuf.h)
+
 * Sun Mar 06 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.24-1
 - new upstream release
 

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

@@ -7,8 +7,8 @@
 # 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 20100218
-%define git_version 2964702
+%define gitdate 20110117
+%define git_version 38e8809
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -18,7 +18,7 @@ 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:   2.%{snapshot}%{?_dist_release}
+Release:   3.%{snapshot}%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,29 +31,28 @@ ExcludeArch: s390 s390x
 
 BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-sdk >= 1.7.0
-BuildRequires: libdrm-devel >= 2.4.18
+BuildRequires: libdrm-devel >= 2.4.24
 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.18
+Requires:  libdrm >= 2.4.24
+Requires:  libudev
 
-Patch0: nouveau-bicubic-2x.patch
-Patch1: nouveau-bgnr.patch
+Patch2: nouveau-nva3-noaccel-info.patch
 
 %description 
 X.Org X11 nouveau video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-
-%patch0 -p1 -b .bicubic
-%patch1 -p1 -b .bgnr
+%patch2 -p1 -b .nva3info
 
 %build
 autoreconf -v --install
-%configure --disable-static --with-kms=yes
+%configure --disable-static
 
 make
 
@@ -73,6 +72,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Sun Mar 28 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.16-3.20110117git38e8809
+- update to new git snapshot
+- drop all patches
+- add Patch2: nouveau-nva3-noaccel-info.patch
+- add BuildRequires: libudev-devel
+- add Requires: libudev
+
 * Sun Mar 28 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.16-2.20100218git2964702
 - rebuild with xserver-1.8rc