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

Fix libOSMesa* to link against libselinux

Browse Source
This commit is contained in:
Tom Callaway 2007-11-15 20:59:12 +00:00
parent a9b66a20a7
commit a427a13566
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mesa-7.0-selinux-awareness.patch
View File

@ -132,15 +132,36 @@ diff -up Mesa-7.0/configs/linux-dri.jx Mesa-7.0/configs/linux-dri
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -lpthread -ldl \ -lm -lpthread -ldl \
$(LIBDRM_LIB) $(LIBDRM_LIB)
diff -up Mesa-7.1pre/progs/osdemos/Makefile.da Mesa-7.1pre/progs/osdemos/Makefile diff -up Mesa-7.1pre/configs/linux-osmesa16.BAD Mesa-7.1pre/configs/linux-osmesa16
--- Mesa-7.1pre/progs/osdemos/Makefile.da 2007-11-01 15:59:52.000000000 +1000 --- Mesa-7.1pre/configs/linux-osmesa16.BAD 2007-11-15 14:56:18.000000000 -0500
+++ Mesa-7.1pre/progs/osdemos/Makefile 2007-11-01 15:59:57.000000000 +1000 +++ Mesa-7.1pre/configs/linux-osmesa16 2007-11-15 14:56:35.000000000 -0500
@@ -5,7 +5,7 @@ include $(TOP)/configs/current @@ -26,6 +26,6 @@ PROGRAM_DIRS =
INCDIR = $(TOP)/include
-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) # Dependencies
+OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) -l selinux -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
diff -up Mesa-7.1pre/configs/linux-osmesa32.BAD Mesa-7.1pre/configs/linux-osmesa32
--- Mesa-7.1pre/configs/linux-osmesa32.BAD 2007-11-15 14:55:35.000000000 -0500
+++ Mesa-7.1pre/configs/linux-osmesa32 2007-11-15 14:55:44.000000000 -0500
@@ -26,6 +26,6 @@ PROGRAM_DIRS =
OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
# 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
diff -up Mesa-7.1pre/configs/linux-osmesa.BAD Mesa-7.1pre/configs/linux-osmesa
--- Mesa-7.1pre/configs/linux-osmesa.BAD 2007-11-15 15:00:23.000000000 -0500
+++ Mesa-7.1pre/configs/linux-osmesa 2007-11-15 15:00:28.000000000 -0500
@@ -23,6 +23,6 @@ PROGRAM_DIRS = osdemos
# 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

5
mesa.spec
View File

@ -32,7 +32,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 7.1 Version: 7.1
Release: 0.3%{?dist} Release: 0.4%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -404,6 +404,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mesa-demos-data %{_libdir}/mesa-demos-data
%changelog %changelog
* Thu Nov 15 2007 Tom "spot" Callaway <tcallawa@redhat.com> 7.1-0.4
- link libOSMesa* against libselinux
* Mon Nov 12 2007 Adam Jackson <ajax@redhat.com> 7.1-0.3 * Mon Nov 12 2007 Adam Jackson <ajax@redhat.com> 7.1-0.3
- Drop xserver 1.1 source compatibility. - Drop xserver 1.1 source compatibility.