From 4d645a057c314c08827c11cf4a05e0532d8a9afee9d6aa6ee681b2e5b648bf20 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 10 Apr 2010 20:45:16 +0000
Subject: [PATCH] - removed legal check since affected source files no longer
 exist - removed obsolete missing_Makefile.diff - specfile cleanup

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=104
---
 Mesa.changes          |  7 +++++
 Mesa.spec             | 14 +++-------
 missing_Makefile.diff | 64 -------------------------------------------
 3 files changed, 11 insertions(+), 74 deletions(-)
 delete mode 100644 missing_Makefile.diff

diff --git a/Mesa.changes b/Mesa.changes
index c710e3f..2dd0ec7 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Apr 10 22:03:00 CEST 2010 - sndirsch@suse.de
+
+- removed legal check since affected source files no longer exist
+- removed obsolete missing_Makefile.diff 
+- specfile cleanup
+
 -------------------------------------------------------------------
 Tue Apr  6 02:09:57 CEST 2010 - sndirsch@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index 9bf4848..1220a7f 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -48,7 +48,6 @@ Patch1:         dri_driver_dir.diff
 # to be upstreamed
 Patch8:         egl-buildfix.diff
 # from Mesa 7.8 branch
-Patch9:         missing_Makefile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -109,9 +108,6 @@ Authors:
 
 %prep
 %setup -n %{name}-%{_version} -b1 -b4 -q
-# make legal department happy (Bug #204110)
-test -f src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
-test -f progs/ggi/asc-view.c && exit 1
 # no need to build (GLUT-)Demos
 rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
 # we use freeglut
@@ -120,7 +116,6 @@ rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
 sed -i 's/REPLACE/%_lib/g' src/glx/Makefile
 sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
 %patch8
-%patch9
 
 %build
 
@@ -146,9 +141,8 @@ autoreconf -fi
            --with-dri-drivers=swrast \
 %endif
            --disable-glut \
-	   CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-make %{?jobs:-j%jobs} -C src/gallium/state_trackers/dri
-gmake %{?jobs:-j%jobs};
+           CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+make %{?jobs:-j%jobs}
 make install DESTDIR=$RPM_BUILD_ROOT
 # build and install Indirect Rendering only libGL
 make realclean
@@ -157,9 +151,9 @@ make realclean
            --disable-glw \
            --disable-glut \
            --disable-gallium \
-	   CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+           CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf
-gmake %{?jobs:-j%jobs};
+make %{?jobs:-j%jobs}
 cp -a %{_lib}/libIndirectGL.so.* %{_lib}/libOSMesa.so* \
   $RPM_BUILD_ROOT/usr/%{_lib}
 for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do
diff --git a/missing_Makefile.diff b/missing_Makefile.diff
deleted file mode 100644
index ecbfccb..0000000
--- a/missing_Makefile.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/gallium/winsys/drm/Makefile.egl	2010/03/18 01:31:42	1.1
-+++ src/gallium/winsys/drm/Makefile.egl	2010/03/17 17:44:19
-@@ -0,0 +1,61 @@
-+# src/gallium/winsys/drm/Makefile.egl
-+
-+# The driver Makefile should define
-+#
-+#   EGL_DRIVER_NAME, the name of the driver
-+#   EGL_DRIVER_SOURCES, the sources of the driver
-+#   EGL_DRIVER_LIBS, extra libraries needed by the driver
-+#   EGL_DRIVER_PIPES, the pipe drivers of the driver
-+#
-+# before including this file.
-+
-+EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o)
-+
-+common_LIBS = -ldrm -lm -ldl
-+
-+x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a
-+x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes
-+
-+kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a
-+kms_LIBS = $(common_LIBS)
-+
-+##### RULES #####
-+
-+.c.o:
-+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-+
-+
-+##### TARGETS #####
-+
-+EGL_DISPLAY_DRIVERS = $(foreach dpy, $(EGL_DISPLAYS), egl_$(dpy)_$(EGL_DRIVER_NAME).so)
-+
-+EGL_DISPLAY_LIBS = $(foreach drv, $(EGL_DISPLAY_DRIVERS), $(TOP)/$(LIB_DIR)/$(drv))
-+
-+default: $(EGL_DISPLAY_LIBS)
-+
-+$(EGL_DISPLAY_LIBS): $(TOP)/$(LIB_DIR)/%.so: %.so
-+	$(INSTALL) $< $(TOP)/$(LIB_DIR)
-+
-+define mklib-egl
-+$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-+	$(MKLIB_OPTIONS) $(EGL_DRIVER_OBJECTS) $($(1)_ST) \
-+	$(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $($(1)_LIBS) $(EGL_DRIVER_LIBS)
-+endef
-+
-+egl_x11_$(EGL_DRIVER_NAME).so: $(EGL_DRIVER_OBJECTS) $(x11_ST) $(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) Makefile
-+	$(call mklib-egl,x11)
-+
-+egl_kms_$(EGL_DRIVER_NAME).so: $(EGL_DRIVER_OBJECTS) $(kms_ST) $(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) Makefile
-+	$(call mklib-egl,kms)
-+
-+clean:
-+	-rm -f $(EGL_DRIVER_OBJECTS)
-+	-rm -f $(EGL_DISPLAY_DRIVERS)
-+
-+install: $(EGL_DISPLAY_LIBS)
-+	$(INSTALL) -d $(DESTDIR)$(EGL_DRIVER_INSTALL_DIR)
-+	for lib in $(EGL_DISPLAY_LIBS); do \
-+		$(MINSTALL) -m 755 "$$lib" $(DESTDIR)$(EGL_DRIVER_INSTALL_DIR); \
-+	done
-+
-+depend: