|
|
@@ -12,17 +12,18 @@
|
|
|
Summary: Mesa graphics libraries
|
|
|
Summary(ja): Mesa グラフィックスライブラリ
|
|
|
Name: mesa
|
|
|
-Version: 7.8.1
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 7.8.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: MIT
|
|
|
Group: System Environment/Libraries
|
|
|
URL: http://www.mesa3d.org
|
|
|
|
|
|
-Source0: ftp://ftp.freedesktop.org/pub/mesa/7.8/MesaLib-%{version}.tar.bz2
|
|
|
-Source1: ftp://ftp.freedesktop.org/pub/mesa/7.8/MesaDemos-%{version}.tar.bz2
|
|
|
+Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaLib-%{version}.tar.bz2
|
|
|
+Source1: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaDemos-%{version}.tar.bz2
|
|
|
#Source0: %{name}-%{gitdate}.tar.bz2
|
|
|
Source2: %{manpages}.tar.bz2
|
|
|
Source3: make-git-snapshot.sh
|
|
|
+Source10: nouveau_class.h
|
|
|
|
|
|
Patch1: mesa-7.4.4-osmesa-version.patch
|
|
|
Patch3: mesa-7.8-no-mach64.patch
|
|
|
@@ -32,6 +33,9 @@ Patch4: mesa-7.8-nouveau-legacy-enable.patch
|
|
|
|
|
|
Patch30: mesa-7.6-hush-vblank-warning.patch
|
|
|
|
|
|
+Patch40: mesa-7.8.2-nouveau-build-fix.patch
|
|
|
+Patch41: mesa-7.8.2-gallium-build-fix.patch
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
BuildRequires: pkgconfig
|
|
|
%if %{with_dri}
|
|
|
@@ -40,6 +44,8 @@ BuildRequires: libdrm-devel >= 2.4.9
|
|
|
BuildRequires: libXxf86vm-devel
|
|
|
BuildRequires: expat-devel >= 2.0
|
|
|
BuildRequires: xorg-x11-proto-devel >= 7.4
|
|
|
+BuildRequires: xorg-x11-server-sdk
|
|
|
+BuildRequires: kernel-headers
|
|
|
BuildRequires: makedepend
|
|
|
BuildRequires: libXext-devel
|
|
|
BuildRequires: freeglut-devel
|
|
|
@@ -255,6 +261,11 @@ Mesa offscreen rendering development package
|
|
|
#%patch7 -p1 -b .dricore
|
|
|
%patch30 -p1 -b .vblank-warning
|
|
|
|
|
|
+cp %{SOURCE10} src/mesa/drivers/dri/nouveau
|
|
|
+cp %{SOURCE10} src/gallium/drivers/nouveau
|
|
|
+%patch40 -p1 -b .build-fix
|
|
|
+%patch41 -p1 -b .build-fix
|
|
|
+
|
|
|
# Hack the demos to use installed data files
|
|
|
sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
|
|
|
sed -i 's,geartrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/geartrain.c
|
|
|
@@ -317,7 +328,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
|
|
|
--with-dri-driverdir=%{_libdir}/dri \
|
|
|
--with-state-trackers=dri,xorg,glx \
|
|
|
--enable-gallium-svga \
|
|
|
- --enable-gallium-nouveau
|
|
|
+ --enable-gallium-nouveau \
|
|
|
+ --enable-gallium-radeon
|
|
|
|
|
|
make #{?_smp_mflags}
|
|
|
|
|
|
@@ -573,6 +585,12 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Sep 22 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 7.8.2-1
|
|
|
+- update to 7.8.2
|
|
|
+- add Patch40,41 to fix build failure
|
|
|
+- add Source10 to build with libdrm-2.4.21
|
|
|
+- add BR: kernel-headers, xorg-x11-server-sdk
|
|
|
+
|
|
|
* Thu Apr 8 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 7.8.1-2
|
|
|
- rebuilt with gcc-4.4.3-5 on ppc
|
|
|
- temporarily don't use "-Os" on ppc (a toolchain bug?)
|
daisuke