Merge branch 'f16' into f15
Conflicts: .gitignore mesa.spec sources
This commit is contained in:
Adam Jackson
commit
d015e9c7cc
|
|
@ -22,6 +22,7 @@ mesa-20100720.tar.bz2
|
|||
/mesa-20110330.tar.xz
|
||||
/mesa-20110401.tar.xz
|
||||
/mesa-20110412.tar.xz
|
||||
<<<<<<< HEAD
|
||||
/mesa-20110506.tar.xz
|
||||
/mesa-20110509.tar.xz
|
||||
/mesa-20110525.tar.xz
|
||||
|
|
@ -30,3 +31,8 @@ mesa-20100720.tar.bz2
|
|||
/mesa-20110709.tar.xz
|
||||
/mesa-20110729.tar.xz
|
||||
/mesa-20110730.tar.xz
|
||||
=======
|
||||
/mesa-20110620.tar.xz
|
||||
/mesa-20110730.tar.xz
|
||||
/MesaLib-7.11.tar.bz2
|
||||
>>>>>>> f16
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
# Mom, Dad, if you're reading this, I'm very sorry.
|
||||
|
||||
include configs/linux-llvm.llvmcore
|
||||
|
||||
llvmcore:
|
||||
g++ -fPIC -shared -o libllvmcore-$(shell llvm-config --version).so -Wl,--whole-archive $(shell llvm-config --ldflags) $(LLVM_LIBS) -Wl,--no-whole-archive
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Usage: ./make-git-snapshot.sh [COMMIT]
|
||||
#
|
||||
# to make a snapshot of the given tag/branch. Defaults to HEAD.
|
||||
# Point env var REF to a local mesa repo to reduce clone time.
|
||||
|
||||
DIRNAME=mesa-demos-$( date +%Y%m%d )
|
||||
|
||||
echo REF ${REF:+--reference $REF}
|
||||
echo DIRNAME $DIRNAME
|
||||
echo HEAD ${1:-HEAD}
|
||||
|
||||
rm -rf $DIRNAME
|
||||
|
||||
git clone ${REF:+--reference $REF} \
|
||||
git://git.freedesktop.org/git/mesa/demos $DIRNAME
|
||||
|
||||
GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
|
||||
| bzip2 > $DIRNAME.tar.bz2
|
||||
|
||||
# rm -rf $DIRNAME
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
|
||||
--- mesa-20091221/src/mesa/drivers/dri/Makefile.da 2009-12-21 08:09:11.000000000 +1000
|
||||
+++ mesa-20091221/src/mesa/drivers/dri/Makefile 2009-12-21 08:43:03.000000000 +1000
|
||||
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
|
||||
|
||||
|
||||
|
||||
-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
|
||||
+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
|
||||
|
||||
|
||||
$(TOP)/$(LIB_DIR):
|
||||
-mkdir $(TOP)/$(LIB_DIR)
|
||||
|
||||
+libdricore.so:
|
||||
+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
|
||||
+
|
||||
+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
|
||||
+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
|
||||
|
||||
subdirs:
|
||||
@for dir in $(DRI_DIRS) ; do \
|
||||
@@ -32,12 +37,14 @@ dri.pc: dri.pc.in
|
||||
$(pcedit) $< > $@
|
||||
|
||||
|
||||
-install: dri.pc
|
||||
+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
|
||||
@for dir in $(DRI_DIRS) ; do \
|
||||
if [ -d $$dir ] ; then \
|
||||
(cd $$dir && $(MAKE) install) || exit 1 ; \
|
||||
fi \
|
||||
done
|
||||
+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
|
||||
+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
|
||||
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
|
||||
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
|
||||
$(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
|
||||
@@ -51,5 +58,6 @@ clean:
|
||||
(cd $$dir && $(MAKE) clean) ; \
|
||||
fi \
|
||||
done
|
||||
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
|
||||
-rm -f common/*.o
|
||||
-rm -f *.pc
|
||||
diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
|
||||
--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da 2009-12-21 08:09:11.000000000 +1000
|
||||
+++ mesa-20091221/src/mesa/drivers/dri/Makefile.template 2009-12-21 08:43:40.000000000 +1000
|
||||
@@ -1,6 +1,6 @@
|
||||
# -*-makefile-*-
|
||||
|
||||
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
|
||||
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
|
||||
|
||||
COMMON_GALLIUM_SOURCES = \
|
||||
../common/utils.c \
|
||||
@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
|
||||
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
|
||||
$(TOP)/src/mesa/drivers/dri/Makefile.template
|
||||
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
|
||||
- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
|
||||
+ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
|
||||
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
|
||||
$(DRI_LIB_DEPS)
|
||||
|
||||
|
||||
diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
|
||||
--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da 2009-12-21 08:09:11.000000000 +1000
|
||||
+++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S 2009-12-21 08:43:03.000000000 +1000
|
||||
@@ -77,7 +77,6 @@
|
||||
*/
|
||||
|
||||
.globl _generic_read_RGBA_span_BGRA8888_REV_MMX
|
||||
-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
|
||||
.type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
|
||||
_generic_read_RGBA_span_BGRA8888_REV_MMX:
|
||||
pushl %ebx
|
||||
@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
|
||||
*/
|
||||
|
||||
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE
|
||||
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
|
||||
.type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
|
||||
_generic_read_RGBA_span_BGRA8888_REV_SSE:
|
||||
pushl %esi
|
||||
@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
|
||||
|
||||
.text
|
||||
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
|
||||
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
|
||||
.type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
|
||||
_generic_read_RGBA_span_BGRA8888_REV_SSE2:
|
||||
pushl %esi
|
||||
@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
|
||||
|
||||
.text
|
||||
.globl _generic_read_RGBA_span_RGB565_MMX
|
||||
- .hidden _generic_read_RGBA_span_RGB565_MMX
|
||||
.type _generic_read_RGBA_span_RGB565_MMX, @function
|
||||
|
||||
_generic_read_RGBA_span_RGB565_MMX:
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx Mesa-7.1/src/mesa/drivers/osmesa/Makefile
|
||||
--- Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx 2008-08-28 14:05:47.000000000 -0400
|
||||
+++ Mesa-7.1/src/mesa/drivers/osmesa/Makefile 2008-08-28 14:07:13.000000000 -0400
|
||||
@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
|
||||
|
||||
$(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
|
||||
$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
|
||||
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
|
||||
+ -major 6 -minor 5 -patch 3 \
|
||||
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
|
||||
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
|
||||
$(OSMESA_LIB_DEPS) $(OBJECTS)
|
||||
|
|
@ -1,51 +1,12 @@
|
|||
diff --git a/configs/autoconf.in b/configs/autoconf.in
|
||||
index 4e931a3..fec8e42 100644
|
||||
--- a/configs/autoconf.in
|
||||
+++ b/configs/autoconf.in
|
||||
@@ -31,8 +31,8 @@ INTEL_CFLAGS = @INTEL_CFLAGS@
|
||||
X11_LIBS = @X11_LIBS@
|
||||
X11_CFLAGS = @X11_CFLAGS@
|
||||
LLVM_CFLAGS = @LLVM_CFLAGS@
|
||||
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
|
||||
-LLVM_LIBS = @LLVM_LIBS@
|
||||
+LLVM_LDFLAGS = -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lllvmcore-$(shell llvm-config --version)
|
||||
+LLVM_LIBS = -lllvmcore-$(shell llvm-config --version)
|
||||
GLW_CFLAGS = @GLW_CFLAGS@
|
||||
GLUT_CFLAGS = @GLUT_CFLAGS@
|
||||
GLX_TLS = @GLX_TLS@
|
||||
diff --git a/configs/linux-llvm b/configs/linux-llvm
|
||||
index 359bee2..0de094d 100644
|
||||
--- a/configs/linux-llvm
|
||||
+++ b/configs/linux-llvm
|
||||
@@ -32,8 +32,8 @@ endif
|
||||
ifeq ($(MESA_LLVM),1)
|
||||
LLVM_CFLAGS=`llvm-config --cppflags`
|
||||
LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
|
||||
- LLVM_LDFLAGS = $(shell llvm-config --ldflags)
|
||||
- LLVM_LIBS = $(shell llvm-config --libs)
|
||||
+ LLVM_LDFLAGS = -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lllvmcore-$(shell llvm-config --version)
|
||||
+ LLVM_LIBS = -lllvmcore-$(shell llvm-config --version)
|
||||
MKLIB_OPTIONS=-cplusplus
|
||||
else
|
||||
LLVM_CFLAGS=
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b510151..e872f2e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1404,8 +1404,6 @@ if test "x$enable_gallium" = xyes; then
|
||||
fi
|
||||
|
||||
AC_SUBST([LLVM_CFLAGS])
|
||||
-AC_SUBST([LLVM_LIBS])
|
||||
-AC_SUBST([LLVM_LDFLAGS])
|
||||
AC_SUBST([LLVM_VERSION])
|
||||
|
||||
dnl
|
||||
@@ -1649,7 +1647,6 @@ if test "x$enable_gallium_llvm" = xyes; then
|
||||
diff -up mesa-20110412/configure.ac.jx mesa-20110412/configure.ac
|
||||
--- mesa-20110412/configure.ac.jx 2011-05-09 15:04:19.000000000 -0400
|
||||
+++ mesa-20110412/configure.ac 2011-05-09 15:05:11.000000000 -0400
|
||||
@@ -1679,7 +1679,7 @@ if test "x$enable_gallium_llvm" = xyes;
|
||||
if test "x$LLVM_CONFIG" != xno; then
|
||||
LLVM_VERSION=`$LLVM_CONFIG --version`
|
||||
LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
|
||||
- LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
|
||||
+ LLVM_LIBS="-lLLVM-`llvm-config --version` -lstdc++"
|
||||
|
||||
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
|
||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff -up Mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c.jx Mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c
|
||||
--- Mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c.jx 2009-01-21 10:55:47.000000000 -0500
|
||||
+++ Mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c 2009-02-09 17:55:02.000000000 -0500
|
||||
@@ -138,10 +138,10 @@ GLboolean brwCreateContext( const __GLco
|
||||
/* Advertise the full hardware capabilities. The new memory
|
||||
* manager should cope much better with overload situations:
|
||||
*/
|
||||
- ctx->Const.MaxTextureLevels = 12;
|
||||
+ ctx->Const.MaxTextureLevels = 13;
|
||||
ctx->Const.Max3DTextureLevels = 9;
|
||||
ctx->Const.MaxCubeTextureLevels = 12;
|
||||
- ctx->Const.MaxTextureRectSize = (1<<11);
|
||||
+ ctx->Const.MaxTextureRectSize = (1<<12);
|
||||
|
||||
/* if conformance mode is set, swrast can handle any size AA point */
|
||||
ctx->Const.MaxPointSizeAA = 255.0;
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,85 +0,0 @@
|
|||
commit a3c3c1f1437de0186d70de9017a6a8e404ecf482
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Tue Apr 14 17:56:29 2009 -0400
|
||||
|
||||
glx: Make glXGetScreenDriver() work for DRI2
|
||||
|
||||
diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
|
||||
index 3089aa1..87d62ad 100644
|
||||
--- a/src/glx/x11/dri_glx.c
|
||||
+++ b/src/glx/x11/dri_glx.c
|
||||
@@ -40,6 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
#include "glxclient.h"
|
||||
#include "glcontextmodes.h"
|
||||
#include "xf86dri.h"
|
||||
+#include "dri2.h"
|
||||
#include "sarea.h"
|
||||
#include <dlfcn.h>
|
||||
#include <sys/types.h>
|
||||
@@ -75,32 +76,45 @@ struct __GLXDRIcontextPrivateRec {
|
||||
*/
|
||||
static Bool driGetDriverName(Display *dpy, int scrNum, char **driverName)
|
||||
{
|
||||
- int directCapable;
|
||||
- Bool b;
|
||||
- int driverMajor, driverMinor, driverPatch;
|
||||
+ int directCapable;
|
||||
+ Bool b;
|
||||
+ int event, error;
|
||||
+ int driverMajor, driverMinor, driverPatch;
|
||||
|
||||
- *driverName = NULL;
|
||||
+ *driverName = NULL;
|
||||
|
||||
- if (!XF86DRIQueryDirectRenderingCapable(dpy, scrNum, &directCapable)) {
|
||||
- ErrorMessageF("XF86DRIQueryDirectRenderingCapable failed\n");
|
||||
- return False;
|
||||
- }
|
||||
- if (!directCapable) {
|
||||
- ErrorMessageF("XF86DRIQueryDirectRenderingCapable returned false\n");
|
||||
- return False;
|
||||
- }
|
||||
+ if (XF86DRIQueryExtension(dpy, &event, &error)) { /* DRI1 */
|
||||
+ if (!XF86DRIQueryDirectRenderingCapable(dpy, scrNum, &directCapable)) {
|
||||
+ ErrorMessageF("XF86DRIQueryDirectRenderingCapable failed\n");
|
||||
+ return False;
|
||||
+ }
|
||||
+ if (!directCapable) {
|
||||
+ ErrorMessageF("XF86DRIQueryDirectRenderingCapable returned false\n");
|
||||
+ return False;
|
||||
+ }
|
||||
|
||||
- b = XF86DRIGetClientDriverName(dpy, scrNum, &driverMajor, &driverMinor,
|
||||
- &driverPatch, driverName);
|
||||
- if (!b) {
|
||||
- ErrorMessageF("Cannot determine driver name for screen %d\n", scrNum);
|
||||
- return False;
|
||||
- }
|
||||
+ b = XF86DRIGetClientDriverName(dpy, scrNum, &driverMajor, &driverMinor,
|
||||
+ &driverPatch, driverName);
|
||||
+ if (!b) {
|
||||
+ ErrorMessageF("Cannot determine driver name for screen %d\n", scrNum);
|
||||
+ return False;
|
||||
+ }
|
||||
+
|
||||
+ InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n",
|
||||
+ driverMajor, driverMinor, driverPatch, *driverName, scrNum);
|
||||
+
|
||||
+ return True;
|
||||
+ } else if (DRI2QueryExtension(dpy, &event, &error)) { /* DRI2 */
|
||||
+ char *dev;
|
||||
+ Bool ret = DRI2Connect(dpy, RootWindow(dpy, scrNum), driverName, &dev);
|
||||
|
||||
- InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n",
|
||||
- driverMajor, driverMinor, driverPatch, *driverName, scrNum);
|
||||
+ if (ret)
|
||||
+ Xfree(dev);
|
||||
+
|
||||
+ return ret;
|
||||
+ }
|
||||
|
||||
- return True;
|
||||
+ return False;
|
||||
}
|
||||
|
||||
/*
|
||||
113
mesa.spec
113
mesa.spec
|
|
@ -4,32 +4,39 @@
|
|||
%define dri_drivers --with-dri-drivers=swrast
|
||||
%else
|
||||
%define with_hardware 1
|
||||
%define base_drivers mga,nouveau,r128,radeon,r200,savage,tdfx
|
||||
%ifarch %{ix86}
|
||||
%define ix86_drivers ,i810,i915,i965,sis,unichrome
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
%define amd64_drivers ,i915,i965,unichrome
|
||||
%endif
|
||||
%ifarch ia64
|
||||
%define ia64_drivers ,i915
|
||||
%endif
|
||||
%define dri_drivers --with-dri-drivers=%{base_drivers}%{?ix86_drivers}%{?amd64_drivers}%{?ia64_drivers}
|
||||
%endif
|
||||
|
||||
# broken atm, sorry. fix before any f15 merge.
|
||||
%define with_llvmcore 1
|
||||
|
||||
%define _default_patch_fuzz 2
|
||||
|
||||
%define manpages gl-manpages-1.0.1
|
||||
%define gitdate 20110730
|
||||
#define gitdate 20110730
|
||||
#% define snapshot
|
||||
|
||||
Summary: Mesa graphics libraries
|
||||
Name: mesa
|
||||
Version: 7.11
|
||||
Release: 0.18.%{gitdate}.0%{?dist}
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.mesa3d.org
|
||||
|
||||
#Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
|
||||
#Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
|
||||
#Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
|
||||
Source0: %{name}-%{gitdate}.tar.xz
|
||||
Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
|
||||
#Source0: %{name}-%{gitdate}.tar.xz
|
||||
Source2: %{manpages}.tar.bz2
|
||||
Source3: make-git-snapshot.sh
|
||||
Source4: llvmcore.mk
|
||||
|
||||
Patch2: mesa-7.1-nukeglthread-debug.patch
|
||||
Patch3: mesa-no-mach64.patch
|
||||
|
|
@ -74,7 +81,7 @@ Group: System Environment/Libraries
|
|||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
Provides: libGL
|
||||
Requires: libdrm >= 2.4.23-1
|
||||
Requires: libdrm%{?isa} >= 2.4.23-1
|
||||
%if %{with_hardware}
|
||||
Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
|
||||
%endif
|
||||
|
|
@ -88,7 +95,7 @@ Group: System Environment/Libraries
|
|||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
|
||||
Requires: libdrm >= 2.4.23-1
|
||||
Requires: libdrm%{?isa} >= 2.4.23-1
|
||||
|
||||
%description libEGL
|
||||
Mesa libEGL runtime libraries
|
||||
|
|
@ -99,7 +106,7 @@ Group: System Environment/Libraries
|
|||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
|
||||
Requires: libdrm >= 2.4.23-1
|
||||
Requires: libdrm%{?isa} >= 2.4.23-1
|
||||
|
||||
%description libGLES
|
||||
Mesa GLES runtime libraries
|
||||
|
|
@ -110,22 +117,12 @@ Group: User Interface/X Hardware Support
|
|||
%description dri-filesystem
|
||||
Mesa DRI driver filesystem
|
||||
|
||||
%if %{with_llvmcore}
|
||||
%package dri-llvmcore
|
||||
Summary: Mesa common LLVM support
|
||||
Group: User Interface/X Hardware Support
|
||||
Requires: mesa-dri-filesystem%{?_isa}
|
||||
%description dri-llvmcore
|
||||
Common DSO for LLVM support for gallium-based DRI drivers. This package
|
||||
exists solely as a disk space hack for Mesa. Do not link against this
|
||||
library if you are not Mesa. You have been warned.
|
||||
%endif
|
||||
|
||||
%package dri-drivers
|
||||
Summary: Mesa-based DRI drivers
|
||||
Group: User Interface/X Hardware Support
|
||||
Requires: mesa-dri-filesystem%{?_isa}
|
||||
Obsoletes: mesa-dri-drivers-experimental < 0:7.10-0.24
|
||||
Obsoletes: mesa-dri-llvmcore <= 7.11-0.8
|
||||
%description dri-drivers
|
||||
Mesa-based DRI drivers.
|
||||
|
||||
|
|
@ -203,28 +200,17 @@ Requires: mesa-libOSMesa = %{version}-%{release}
|
|||
Mesa offscreen rendering development package
|
||||
|
||||
|
||||
%package -n xorg-x11-drv-vmwgfx
|
||||
Summary: VMware GFX DDX driver
|
||||
Group: User Interface/X Hardware Support
|
||||
Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires videodrv)
|
||||
|
||||
%description -n xorg-x11-drv-vmwgfx
|
||||
2D driver for VMware SVGA vGPU
|
||||
|
||||
%prep
|
||||
#setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
|
||||
%setup -q -n mesa-%{gitdate} -b2
|
||||
%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
|
||||
#setup -q -n mesa-%{gitdate} -b2
|
||||
%patch2 -p1 -b .intel-glthread
|
||||
%patch3 -p1 -b .no-mach64
|
||||
%patch4 -p1 -b .classic
|
||||
#patch7 -p1 -b .dricore
|
||||
%patch8 -p1 -b .llvmcore
|
||||
%patch30 -p1 -b .vblank-warning
|
||||
#patch31 -p1 -b .swrastg
|
||||
|
||||
%if %{with_llvmcore}
|
||||
%patch8 -p1 -b .llvmcore
|
||||
%endif
|
||||
|
||||
%build
|
||||
|
||||
autoreconf --install
|
||||
|
|
@ -237,39 +223,21 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
|
|||
%else
|
||||
%define common_flags --enable-selinux --enable-pic
|
||||
%endif
|
||||
%define osmesa_flags --with-driver=osmesa %{common_flags} --disable-gallium --with-dri-drivers="" --disable-glu --disable-egl --with-gallium-drivers=""
|
||||
|
||||
# first, build osmesa.
|
||||
|
||||
%configure %{osmesa_flags} --with-osmesa-bits=8
|
||||
make %{_smp_mflags}
|
||||
mv %{_lib} osmesa8
|
||||
make clean
|
||||
|
||||
# just to be sure...
|
||||
[ `find . -name \*.o | wc -l` -eq 0 ] || exit 1
|
||||
|
||||
# build llvmcore
|
||||
%if %{with_llvmcore}
|
||||
TOP=`pwd` make -f %{SOURCE4} llvmcore
|
||||
mkdir -p %{_lib}
|
||||
mv libllvmcore*.so %{_lib}
|
||||
%endif
|
||||
|
||||
# now build the rest of mesa
|
||||
%configure %{common_flags} \
|
||||
--disable-glw \
|
||||
--disable-glut \
|
||||
--disable-gl-osmesa \
|
||||
--enable-gl-osmesa \
|
||||
--with-driver=dri \
|
||||
--with-osmesa-bits=8 \
|
||||
--with-dri-driverdir=%{_libdir}/dri \
|
||||
--enable-egl \
|
||||
--enable-gles1 \
|
||||
--enable-gles2 \
|
||||
--disable-gallium-egl \
|
||||
%if %{with_hardware}
|
||||
--enable-gallium-llvm \
|
||||
--with-gallium-drivers=r300,r600,nouveau,swrast \
|
||||
--enable-gallium-llvm \
|
||||
%else
|
||||
--disable-gallium-llvm \
|
||||
--with-gallium-drivers=swrast \
|
||||
|
|
@ -292,9 +260,6 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
|
|||
|
||||
# just the DRI drivers that are sane
|
||||
install -d $RPM_BUILD_ROOT%{_libdir}/dri
|
||||
%if %{with_llvmcore}
|
||||
install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libllvmcore-2*.so >& /dev/null
|
||||
%endif
|
||||
# use gallium driver iff built
|
||||
[ -f %{_lib}/gallium/r300_dri.so ] && cp %{_lib}/gallium/r300_dri.so %{_lib}/r300_dri.so
|
||||
[ -f %{_lib}/gallium/r600_dri.so ] && cp %{_lib}/gallium/r600_dri.so %{_lib}/r600_dri.so
|
||||
|
|
@ -314,9 +279,6 @@ pushd $RPM_BUILD_ROOT%{_libdir}
|
|||
rm -f xorg/modules/drivers/modesetting_drv.so
|
||||
popd
|
||||
|
||||
# and osmesa
|
||||
mv osmesa*/libOS* $RPM_BUILD_ROOT%{_libdir}
|
||||
|
||||
# man pages
|
||||
pushd ../%{manpages}
|
||||
make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
|
@ -372,12 +334,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc docs/COPYING
|
||||
%dir %{_libdir}/dri
|
||||
|
||||
%if %{with_llvmcore}
|
||||
%files dri-llvmcore
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/dri/libllvmcore-2.*.so
|
||||
%endif
|
||||
|
||||
%files dri-drivers
|
||||
%defattr(-,root,root,-)
|
||||
%if %{with_hardware}
|
||||
|
|
@ -401,18 +357,17 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%defattr(-,root,root,-)
|
||||
%doc docs/COPYING
|
||||
%if %{with_hardware}
|
||||
%ifarch %{ix86} x86_64
|
||||
%{_libdir}/dri/unichrome_dri.so
|
||||
%ifarch %{ix86}
|
||||
%{_libdir}/dri/i810_dri.so
|
||||
%{_libdir}/dri/sis_dri.so
|
||||
%endif
|
||||
%endif
|
||||
%{_libdir}/dri/r128_dri.so
|
||||
%ifnarch %{sparc}
|
||||
# we no much hardware....
|
||||
%{_libdir}/dri/mga_dri.so
|
||||
%{_libdir}/dri/savage_dri.so
|
||||
%{_libdir}/dri/tdfx_dri.so
|
||||
%{_libdir}/dri/unichrome_dri.so
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files libGL-devel
|
||||
|
|
@ -433,19 +388,23 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
%files libEGL-devel
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_includedir}/EGL
|
||||
%{_includedir}/EGL/eglext.h
|
||||
%{_includedir}/EGL/egl.h
|
||||
%{_includedir}/EGL/eglplatform.h
|
||||
%dir %{_includedir}/KHR
|
||||
%{_includedir}/KHR/khrplatform.h
|
||||
%{_libdir}/pkgconfig/egl.pc
|
||||
%{_libdir}/libEGL.so
|
||||
|
||||
%files libGLES-devel
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_includedir}/GLES
|
||||
%{_includedir}/GLES/egl.h
|
||||
%{_includedir}/GLES/gl.h
|
||||
%{_includedir}/GLES/glext.h
|
||||
%{_includedir}/GLES/glplatform.h
|
||||
%dir %{_includedir}/GLES2
|
||||
%{_includedir}/GLES2/gl2platform.h
|
||||
%{_includedir}/GLES2/gl2.h
|
||||
%{_includedir}/GLES2/gl2ext.h
|
||||
|
|
@ -475,10 +434,18 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
%files libOSMesa-devel
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_includedir}/GL
|
||||
%{_includedir}/GL/osmesa.h
|
||||
%{_libdir}/libOSMesa.so
|
||||
%{_libdir}/pkgconfig/osmesa.pc
|
||||
|
||||
%changelog
|
||||
* Tue Aug 02 2011 Adam Jackson <ajax@redhat.com> 7.11-1
|
||||
- Mesa 7.11
|
||||
- Redo the driver arch exclusion, yet again. Dear secondary arches: unless
|
||||
it's an on-motherboard driver like i915, all PCI drivers are to be built
|
||||
for all PCI arches.
|
||||
|
||||
* Sat Jul 30 2011 Dave Airlie <airlied@redhat.com> 7.11-0.18.20110730.0
|
||||
- latest 7.11-rc4
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue