packages: Mesa/Mesa-selinux.patch, Mesa/Mesa.spec - reduced selinux patch t...

[qboosh]

Author: qboosh                       Date: Wed Oct 27 18:08:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reduced selinux patch to only needed part instead of random inserts

---- Files affected:
packages/Mesa:
   Mesa-selinux.patch (1.1 -> 1.2) , Mesa.spec (1.258 -> 1.259) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa-selinux.patch
diff -u packages/Mesa/Mesa-selinux.patch:1.1 packages/Mesa/Mesa-selinux.patch:1.2
--- packages/Mesa/Mesa-selinux.patch:1.1	Mon Aug 30 23:17:52 2010
+++ packages/Mesa/Mesa-selinux.patch	Wed Oct 27 20:08:29 2010
@@ -1,48 +1,13 @@
---- configure.ac.orig	2010-08-30 22:19:47.937720469 +0200
-+++ configure.ac	2010-08-30 22:34:04.557727158 +0200
-@@ -429,6 +429,7 @@
-     SELINUX_LIBS="-lselinux"
-     DEFINES="$DEFINES -DMESA_SELINUX"
- fi
-+    SELINUX_LIBS="-lselinux"
- 
- dnl
- dnl Driver configuration. Options are xlib, dri and osmesa right now.
-@@ -568,11 +569,11 @@
-         PKG_CHECK_MODULES([XLIBGL], [x11 xext])
-         GL_PC_REQ_PRIV="x11 xext"
-         X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"
--        GL_LIB_DEPS="$XLIBGL_LIBS"
-+        GL_LIB_DEPS="$XLIBGL_LIBS $SELINUX_LIBS"
-     else
-         # should check these...
-         X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
--        GL_LIB_DEPS="$X_LIBS -lX11 -lXext"
-+        GL_LIB_DEPS="$X_LIBS -lX11 -lXext $SELINUX_LIBS"
-         GL_PC_LIB_PRIV="$GL_LIB_DEPS"
-         GL_PC_CFLAGS="$X11_INCLUDES"
-     fi
-@@ -610,7 +611,7 @@
-         PKG_CHECK_MODULES([DRIGL], [$dri_modules])
-         GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
-         X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
--        GL_LIB_DEPS="$DRIGL_LIBS"
-+        GL_LIB_DEPS="$DRIGL_LIBS $SELINUX_LIBS"
-     else
-         # should check these...
-         X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
-@@ -623,12 +624,12 @@
-             PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx])
-             GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx"
-             X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS"
--            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS"
-+            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS $SELINUX_LIBS"
-         fi
+--- Mesa-7.9/configure.ac.orig	2010-10-05 03:58:00.000000000 +0200
++++ Mesa-7.9/configure.ac	2010-10-27 08:04:55.739734339 +0200
+@@ -667,8 +667,8 @@
      fi
  
      # need DRM libs, -lpthread, etc.
 -    GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
-+    GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS $SELINUX_LIBS"
-     GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+-    GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
++    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
++    GL_PC_LIB_PRIV="$SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS"
      GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
      GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+     GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.258 packages/Mesa/Mesa.spec:1.259
--- packages/Mesa/Mesa.spec:1.258	Tue Oct 26 20:06:15 2010
+++ packages/Mesa/Mesa.spec	Wed Oct 27 20:08:29 2010
@@ -7,13 +7,13 @@
 # Conditional build:
 %bcond_without	egl	# build egl
 %bcond_without	gallium	# don't build gallium
-%bcond_with	gallium_intel # gallium i915 driver (but doesn't work with AIGLX)
-%bcond_with	gallium_radeon
-%bcond_without	gallium_nouveau
+%bcond_with	gallium_intel	# gallium i915 driver (but doesn't work with AIGLX)
+%bcond_with	gallium_radeon	# gallium radeon driver
+%bcond_without	gallium_nouveau	# gallium nouveau driver
 %bcond_without	motif	# build static libGLw without Motif interface
 %bcond_with	multigl	# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
 %bcond_without	osmesa	# don't build osmesa
-%bcond_with	static
+%bcond_with	static	# static libraries
 #
 # minimal supported xserver version
 %define		xserver_ver	1.5.0
@@ -663,11 +663,10 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 
 %build
-#autoreconf --install
 %{__aclocal}
 %{__autoconf}
 
@@ -1008,6 +1007,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.259  2010/10/27 18:08:29  qboosh
+- reduced selinux patch to only needed part instead of random inserts
+
 Revision 1.258  2010/10/26 18:06:15  qboosh
 - DO track sonames (for libGL* it's part of ABI defined by OpenGL standard)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa-selinux.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.258&r2=1.259&f=u