diff options
| author | Tom Callaway <spot@fedoraproject.org> | 2007-11-15 20:59:12 +0000 |
|---|---|---|
| committer | Tom Callaway <spot@fedoraproject.org> | 2007-11-15 20:59:12 +0000 |
| commit | a427a1356644fdc0944264a8e3acaab9c6b6935d (patch) | |
| tree | 3fbd0e6f0461fb5fd677d54d9c776ebf41dc244d | |
| parent | a9b66a20a73d7f2027a054393e714826ea853473 (diff) | |
| download | mesa-a427a1356644fdc0944264a8e3acaab9c6b6935d.tar.gz mesa-a427a1356644fdc0944264a8e3acaab9c6b6935d.tar.xz mesa-a427a1356644fdc0944264a8e3acaab9c6b6935d.zip | |
Fix libOSMesa* to link against libselinuxmesa-7_1-0_4_fc9
| -rw-r--r-- | mesa-7.0-selinux-awareness.patch | 45 | ||||
| -rw-r--r-- | mesa.spec | 5 |
2 files changed, 37 insertions, 13 deletions
diff --git a/mesa-7.0-selinux-awareness.patch b/mesa-7.0-selinux-awareness.patch index ab3e18e..59f154a 100644 --- a/mesa-7.0-selinux-awareness.patch +++ b/mesa-7.0-selinux-awareness.patch @@ -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 \ -lm -lpthread -ldl \ $(LIBDRM_LIB) -diff -up Mesa-7.1pre/progs/osdemos/Makefile.da Mesa-7.1pre/progs/osdemos/Makefile ---- Mesa-7.1pre/progs/osdemos/Makefile.da 2007-11-01 15:59:52.000000000 +1000 -+++ Mesa-7.1pre/progs/osdemos/Makefile 2007-11-01 15:59:57.000000000 +1000 -@@ -5,7 +5,7 @@ include $(TOP)/configs/current - - INCDIR = $(TOP)/include - --OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) -+OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) -l selinux - - OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) - +diff -up Mesa-7.1pre/configs/linux-osmesa16.BAD Mesa-7.1pre/configs/linux-osmesa16 +--- Mesa-7.1pre/configs/linux-osmesa16.BAD 2007-11-15 14:56:18.000000000 -0500 ++++ Mesa-7.1pre/configs/linux-osmesa16 2007-11-15 14:56:35.000000000 -0500 +@@ -26,6 +26,6 @@ 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 +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 = + + + # 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 @@ -32,7 +32,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.1 -Release: 0.3%{?dist} +Release: 0.4%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -404,6 +404,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/mesa-demos-data %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 - Drop xserver 1.1 source compatibility. |