rpms/mesa
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'f19' into f20

Browse Source 
Conflicts:
	mesa.spec
This commit is contained in:
Dave Airlie 2013-09-02 16:36:32 +10:00
commit 1bef4ecf95
4 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -54,3 +54,4 @@ mesa-20100720.tar.bz2
/mesa-20130528.tar.xz /mesa-20130528.tar.xz
/mesa-20130610.tar.xz /mesa-20130610.tar.xz
/mesa-20130723.tar.xz /mesa-20130723.tar.xz
/mesa-20130902.tar.xz

29
mesa-9.2-no-gallium-osmesa.patch
View File

@ -1,29 +0,0 @@
diff -up mesa-20130514/configure.ac.jx mesa-20130514/configure.ac
--- mesa-20130514/configure.ac.jx 2013-05-17 13:51:14.000000000 -0400
+++ mesa-20130514/configure.ac 2013-05-17 13:53:02.288582625 -0400
@@ -763,11 +763,6 @@ if test "x$enable_dri" = xyes; then
GALLIUM_STATE_TRACKERS_DIRS="dri $GALLIUM_STATE_TRACKERS_DIRS"
fi
-if test "x$enable_osmesa" = xyes; then
- GALLIUM_STATE_TRACKERS_DIRS="osmesa $GALLIUM_STATE_TRACKERS_DIRS"
- GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS osmesa"
-fi
-
AC_SUBST([MESA_LLVM])
# Check for libdrm
diff -up mesa-20130514/src/gallium/targets/Makefile.am.jx mesa-20130514/src/gallium/targets/Makefile.am
--- mesa-20130514/src/gallium/targets/Makefile.am.jx 2013-05-17 13:51:14.000000000 -0400
+++ mesa-20130514/src/gallium/targets/Makefile.am 2013-05-17 14:30:33.091558931 -0400
@@ -26,10 +26,6 @@ if HAVE_X11_DRIVER
SUBDIRS += libgl-xlib
endif
-if HAVE_OSMESA
-SUBDIRS += osmesa
-endif
-
if HAVE_GALLIUM_GBM
SUBDIRS += gbm
endif

9
mesa.spec
View File

@ -48,13 +48,13 @@
%define _default_patch_fuzz 2 %define _default_patch_fuzz 2
%define gitdate 20130723 %define gitdate 20130902
#% define snapshot #% define snapshot
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 9.2 Version: 9.2
Release: 0.15.%{gitdate}%{?dist} Release: 1.%{gitdate}%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -75,7 +75,6 @@ Patch9: mesa-8.0-llvmpipe-shmget.patch
Patch12: mesa-8.0.1-fix-16bpp.patch Patch12: mesa-8.0.1-fix-16bpp.patch
Patch15: mesa-9.2-hardware-float.patch Patch15: mesa-9.2-hardware-float.patch
Patch16: mesa-9.2-no-useless-vdpau.patch Patch16: mesa-9.2-no-useless-vdpau.patch
Patch19: mesa-9.2-no-gallium-osmesa.patch
Patch20: mesa-9.2-evergreen-big-endian.patch Patch20: mesa-9.2-evergreen-big-endian.patch
BuildRequires: pkgconfig autoconf automake libtool BuildRequires: pkgconfig autoconf automake libtool
@ -301,7 +300,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
%patch15 -p1 -b .hwfloat %patch15 -p1 -b .hwfloat
%patch16 -p1 -b .vdpau %patch16 -p1 -b .vdpau
%patch19 -p1 -b .osmesa
%patch20 -p1 -b .egbe %patch20 -p1 -b .egbe
%if 0%{with_private_llvm} %if 0%{with_private_llvm}
@ -602,6 +600,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Mon Sep 02 2013 Dave Airlie <airlied@redhat.com> 9.2-1.20130902
- 9.2 upstream release + fixes from git branch
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.2-0.15.20130723 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.2-0.15.20130723
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
322d77c41931530f5be496f7b543ac1e mesa-20130723.tar.xz a87aedfb1bbd4522b576e99906131008 mesa-20130902.tar.xz