mirror of
https://src.fedoraproject.org/rpms/mesa.git
synced 2024-12-01 04:02:55 +00:00
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
This commit is contained in:
Adam Jackson
parent
6ab512ee3a
commit
8ffdfa9a31
2 changed files with 86 additions and 68 deletions
|
|
@ -1,5 +1,40 @@
|
||||||
--- ./configs/default.build-config 2006-09-11 17:35:46.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-osmesa32.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||||
+++ ./configs/default 2006-09-19 15:52:09.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-osmesa32 2006-09-22 18:20:05.000000000 -0400
|
||||||
|
@@ -17,12 +17,12 @@
|
||||||
|
|
||||||
|
|
||||||
|
# Directories
|
||||||
|
-SRC_DIRS = mesa glu
|
||||||
|
+SRC_DIRS = mesa
|
||||||
|
DRIVER_DIRS = osmesa
|
||||||
|
PROGRAM_DIRS =
|
||||||
|
|
||||||
|
|
||||||
|
# Dependencies
|
||||||
|
-OSMESA_LIB_DEPS = -lm -lpthread
|
||||||
|
+OSMESA_LIB_DEPS = -lm -lpthread -lselinux
|
||||||
|
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
|
||||||
|
APP_LIB_DEPS = -lOSMesa32
|
||||||
|
--- Mesa-6.5.1/configs/linux-osmesa.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||||
|
+++ Mesa-6.5.1/configs/linux-osmesa 2006-09-22 18:19:52.000000000 -0400
|
||||||
|
@@ -14,12 +14,12 @@
|
||||||
|
|
||||||
|
|
||||||
|
# Directories
|
||||||
|
-SRC_DIRS = mesa glu
|
||||||
|
+SRC_DIRS = mesa
|
||||||
|
DRIVER_DIRS = osmesa
|
||||||
|
-PROGRAM_DIRS = osdemos
|
||||||
|
+PROGRAM_DIRS =
|
||||||
|
|
||||||
|
|
||||||
|
# Dependencies
|
||||||
|
-OSMESA_LIB_DEPS = -lm -lpthread
|
||||||
|
+OSMESA_LIB_DEPS = -lm -lpthread -lselinux
|
||||||
|
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
|
||||||
|
APP_LIB_DEPS = -lOSMesa -lGLU
|
||||||
|
--- Mesa-6.5.1/configs/default.build-config 2006-09-11 17:35:46.000000000 -0400
|
||||||
|
+++ Mesa-6.5.1/configs/default 2006-09-22 18:11:30.000000000 -0400
|
||||||
@@ -59,8 +59,8 @@
|
@@ -59,8 +59,8 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -28,8 +63,19 @@
|
||||||
|
|
||||||
# Where libGL will look for DRI hardware drivers
|
# Where libGL will look for DRI hardware drivers
|
||||||
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
|
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
|
||||||
--- ./configs/linux-dri.build-config 2006-08-17 10:09:02.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-dri-x86.build-config 2005-09-12 11:03:11.000000000 -0400
|
||||||
+++ ./configs/linux-dri 2006-09-19 17:49:35.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-dri-x86 2006-09-22 18:11:30.000000000 -0400
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
CONFIG_NAME = linux-dri-x86
|
||||||
|
|
||||||
|
# Unnecessary on x86, generally.
|
||||||
|
-PIC_FLAGS =
|
||||||
|
+# PIC_FLAGS =
|
||||||
|
|
||||||
|
# Add -m32 to CFLAGS:
|
||||||
|
ARCH_FLAGS = -m32
|
||||||
|
--- Mesa-6.5.1/configs/linux-dri.build-config 2006-08-17 10:09:02.000000000 -0400
|
||||||
|
+++ Mesa-6.5.1/configs/linux-dri 2006-09-22 18:11:30.000000000 -0400
|
||||||
@@ -12,8 +12,9 @@
|
@@ -12,8 +12,9 @@
|
||||||
#MKDEP = /usr/X11R6/bin/makedepend
|
#MKDEP = /usr/X11R6/bin/makedepend
|
||||||
#MKDEP = gcc -M
|
#MKDEP = gcc -M
|
||||||
|
|
@ -78,8 +124,19 @@
|
||||||
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
|
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
|
||||||
- savage sis tdfx trident unichrome ffb
|
- savage sis tdfx trident unichrome ffb
|
||||||
+ savage tdfx trident unichrome ffb # sis
|
+ savage tdfx trident unichrome ffb # sis
|
||||||
--- ./configs/linux.build-config 2006-08-24 19:37:59.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-indirect.build-config 2006-08-17 10:09:02.000000000 -0400
|
||||||
+++ ./configs/linux 2006-09-19 15:52:09.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-indirect 2006-09-22 18:11:30.000000000 -0400
|
||||||
|
@@ -43,7 +43,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
# Directories
|
||||||
|
-SRC_DIRS = glx/x11 glu glut/glx glw
|
||||||
|
+SRC_DIRS = glx/x11 glu glut/glx
|
||||||
|
DRIVER_DIRS =
|
||||||
|
PROGRAM_DIRS =
|
||||||
|
WINDOW_SYSTEM=dri
|
||||||
|
--- Mesa-6.5.1/configs/linux.build-config 2006-08-24 19:37:59.000000000 -0400
|
||||||
|
+++ Mesa-6.5.1/configs/linux 2006-09-22 18:11:30.000000000 -0400
|
||||||
@@ -8,7 +8,9 @@
|
@@ -8,7 +8,9 @@
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CXX = g++
|
CXX = g++
|
||||||
|
|
@ -91,30 +148,8 @@
|
||||||
PIC_FLAGS = -fPIC
|
PIC_FLAGS = -fPIC
|
||||||
|
|
||||||
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
|
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
|
||||||
--- ./configs/linux-osmesa32.build-config 2006-07-12 22:43:20.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-dri-ppc.build-config 2005-08-19 18:03:05.000000000 -0400
|
||||||
+++ ./configs/linux-osmesa32 2006-09-19 16:00:03.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-dri-ppc 2006-09-22 18:11:30.000000000 -0400
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
# Directories
|
|
||||||
-SRC_DIRS = mesa glu
|
|
||||||
+SRC_DIRS = mesa
|
|
||||||
DRIVER_DIRS = osmesa
|
|
||||||
PROGRAM_DIRS =
|
|
||||||
|
|
||||||
--- ./configs/linux-osmesa16.build-config 2006-07-12 22:43:20.000000000 -0400
|
|
||||||
+++ ./configs/linux-osmesa16 2006-09-19 15:57:29.000000000 -0400
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
# Directories
|
|
||||||
-SRC_DIRS = mesa glu
|
|
||||||
+SRC_DIRS = mesa
|
|
||||||
DRIVER_DIRS = osmesa
|
|
||||||
PROGRAM_DIRS =
|
|
||||||
|
|
||||||
--- ./configs/linux-dri-ppc.build-config 2005-08-19 18:03:05.000000000 -0400
|
|
||||||
+++ ./configs/linux-dri-ppc 2006-09-19 15:52:09.000000000 -0400
|
|
||||||
@@ -5,7 +5,7 @@
|
@@ -5,7 +5,7 @@
|
||||||
|
|
||||||
CONFIG_NAME = linux-dri-ppc
|
CONFIG_NAME = linux-dri-ppc
|
||||||
|
|
@ -124,19 +159,25 @@
|
||||||
PIC_FLAGS = -fPIC
|
PIC_FLAGS = -fPIC
|
||||||
|
|
||||||
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
|
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
|
||||||
--- ./configs/linux-dri-x86.build-config 2005-09-12 11:03:11.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-osmesa16.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||||
+++ ./configs/linux-dri-x86 2006-09-19 15:52:09.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-osmesa16 2006-09-22 18:20:05.000000000 -0400
|
||||||
@@ -6,7 +6,7 @@
|
@@ -17,12 +17,12 @@
|
||||||
CONFIG_NAME = linux-dri-x86
|
|
||||||
|
|
||||||
# Unnecessary on x86, generally.
|
|
||||||
-PIC_FLAGS =
|
|
||||||
+# PIC_FLAGS =
|
|
||||||
|
|
||||||
# Add -m32 to CFLAGS:
|
# Directories
|
||||||
ARCH_FLAGS = -m32
|
-SRC_DIRS = mesa glu
|
||||||
--- ./configs/linux-dri-x86-64.build-config 2006-07-12 22:43:20.000000000 -0400
|
+SRC_DIRS = mesa
|
||||||
+++ ./configs/linux-dri-x86-64 2006-09-19 15:52:09.000000000 -0400
|
DRIVER_DIRS = osmesa
|
||||||
|
PROGRAM_DIRS =
|
||||||
|
|
||||||
|
|
||||||
|
# Dependencies
|
||||||
|
-OSMESA_LIB_DEPS = -lm -lpthread
|
||||||
|
+OSMESA_LIB_DEPS = -lm -lpthread -lselinux
|
||||||
|
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
|
||||||
|
APP_LIB_DEPS = -lOSMesa16
|
||||||
|
--- Mesa-6.5.1/configs/linux-dri-x86-64.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||||
|
+++ Mesa-6.5.1/configs/linux-dri-x86-64 2006-09-22 18:11:30.000000000 -0400
|
||||||
@@ -20,5 +20,5 @@
|
@@ -20,5 +20,5 @@
|
||||||
# the new interface. i810 are missing because there is no x86-64
|
# the new interface. i810 are missing because there is no x86-64
|
||||||
# system where they could *ever* be used.
|
# system where they could *ever* be used.
|
||||||
|
|
@ -144,28 +185,3 @@
|
||||||
-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
||||||
+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
||||||
|
|
||||||
--- ./configs/linux-osmesa.build-config 2006-07-12 22:43:20.000000000 -0400
|
|
||||||
+++ ./configs/linux-osmesa 2006-09-19 15:54:52.000000000 -0400
|
|
||||||
@@ -14,9 +14,9 @@
|
|
||||||
|
|
||||||
|
|
||||||
# Directories
|
|
||||||
-SRC_DIRS = mesa glu
|
|
||||||
+SRC_DIRS = mesa
|
|
||||||
DRIVER_DIRS = osmesa
|
|
||||||
-PROGRAM_DIRS = osdemos
|
|
||||||
+PROGRAM_DIRS =
|
|
||||||
|
|
||||||
|
|
||||||
# Dependencies
|
|
||||||
--- ./configs/linux-indirect.~1.6.~ 2006-08-17 10:09:02.000000000 -0400
|
|
||||||
+++ ./configs/linux-indirect 2006-09-19 18:49:30.000000000 -0400
|
|
||||||
@@ -43,7 +43,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
# Directories
|
|
||||||
-SRC_DIRS = glx/x11 glu glut/glx glw
|
|
||||||
+SRC_DIRS = glx/x11 glu glut/glx
|
|
||||||
DRIVER_DIRS =
|
|
||||||
PROGRAM_DIRS =
|
|
||||||
WINDOW_SYSTEM=dri
|
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
Summary: Mesa graphics libraries
|
Summary: Mesa graphics libraries
|
||||||
Name: mesa
|
Name: mesa
|
||||||
Version: 6.5.1
|
Version: 6.5.1
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: MIT/X11
|
License: MIT/X11
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.mesa3d.org
|
URL: http://www.mesa3d.org
|
||||||
|
|
@ -238,7 +238,6 @@ install -m 755 %{SOURCE12} ./
|
||||||
|
|
||||||
%patch0 -p1 -b .build-config
|
%patch0 -p1 -b .build-config
|
||||||
%patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
|
%patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
|
||||||
|
|
||||||
%patch18 -p1 -b .selinux-awareness
|
%patch18 -p1 -b .selinux-awareness
|
||||||
|
|
||||||
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
|
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
|
||||||
|
|
@ -387,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
%{_bindir}/glxinfo
|
%{_bindir}/glxinfo
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 25 2006 Adam Jackson <ajackson@redhat.com> - 6.5.1-4.fc6
|
||||||
|
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
|
||||||
|
|
||||||
* Wed Sep 20 2006 Kristian Høgsberg <krh@redhat.com> - 6.5.1-3.fc6
|
* Wed Sep 20 2006 Kristian Høgsberg <krh@redhat.com> - 6.5.1-3.fc6
|
||||||
- Bump xorg-x11-proto-devel BuildRequires to 7.1-8 so we pick up the
|
- Bump xorg-x11-proto-devel BuildRequires to 7.1-8 so we pick up the
|
||||||
latest GLX_EXT_texture_from_pixmap opcodes.
|
latest GLX_EXT_texture_from_pixmap opcodes.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue