- 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
This commit is contained in:
Git OBS Bridge
parent
2adfbaf50a
commit
4d645a057c
@ -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
|
Tue Apr 6 02:09:57 CEST 2010 - sndirsch@suse.de
|
||||||
|
|
||||||
|
|||||||
14
Mesa.spec
14
Mesa.spec
@ -48,7 +48,6 @@ Patch1: dri_driver_dir.diff
|
|||||||
# to be upstreamed
|
# to be upstreamed
|
||||||
Patch8: egl-buildfix.diff
|
Patch8: egl-buildfix.diff
|
||||||
# from Mesa 7.8 branch
|
# from Mesa 7.8 branch
|
||||||
Patch9: missing_Makefile.diff
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -109,9 +108,6 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n %{name}-%{_version} -b1 -b4 -q
|
%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
|
# no need to build (GLUT-)Demos
|
||||||
rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
|
rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
|
||||||
# we use freeglut
|
# 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/glx/Makefile
|
||||||
sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
|
sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
|
||||||
%patch8
|
%patch8
|
||||||
%patch9
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -146,9 +141,8 @@ autoreconf -fi
|
|||||||
--with-dri-drivers=swrast \
|
--with-dri-drivers=swrast \
|
||||||
%endif
|
%endif
|
||||||
--disable-glut \
|
--disable-glut \
|
||||||
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
|
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
|
||||||
make %{?jobs:-j%jobs} -C src/gallium/state_trackers/dri
|
make %{?jobs:-j%jobs}
|
||||||
gmake %{?jobs:-j%jobs};
|
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
# build and install Indirect Rendering only libGL
|
# build and install Indirect Rendering only libGL
|
||||||
make realclean
|
make realclean
|
||||||
@ -157,9 +151,9 @@ make realclean
|
|||||||
--disable-glw \
|
--disable-glw \
|
||||||
--disable-glut \
|
--disable-glut \
|
||||||
--disable-gallium \
|
--disable-gallium \
|
||||||
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
|
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
|
||||||
sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf
|
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* \
|
cp -a %{_lib}/libIndirectGL.so.* %{_lib}/libOSMesa.so* \
|
||||||
$RPM_BUILD_ROOT/usr/%{_lib}
|
$RPM_BUILD_ROOT/usr/%{_lib}
|
||||||
for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do
|
for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do
|
||||||
|
|||||||
@ -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:
|
|
||||||
Loading…
Reference in New Issue
Block a user