- build fixed (glxinfo vs -lGLU).

[packages/Mesa.git] / Mesa.spec

diff --git a/Mesa.spec b/Mesa.spec
index 3f90a277f6c2d61162da1143654d1fa82796afde..aa7dc15b01faf0025028bd48bd2b0f2206b0cf48 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,6 +1,6 @@
 #
 # TODO:
-# - separate libGL/libGLU/libGLw,progs?
+# - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
 #
 # Conditional build:
 %bcond_with    glide   # with GLIDE (broken now)
@@ -9,14 +9,15 @@
 Summary:       Free OpenGL implementation
 Summary(pl):   Wolnodostêpna implementacja standardu OpenGL
 Name:          Mesa
-Version:       6.4
-Release:       1.1
+Version:       6.4.1
+Release:       2.0
 License:       MIT (core), SGI (GLU,libGLw) and others - see COPYRIGHT file
 Group:         X11/Libraries
 Source0:       http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
-# Source0-md5: 85a84e47a3f718f752f306b9e0954ef6
+# Source0-md5: ea148c828ec6f645526451db1b8556f1
 Source1:       http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5: 1a8c4d4fc699233f5fdb902b8753099e
+# Source1-md5: 99df1fdcb98d391666b476ca6f1dda8a
+Patch0:                %{name}-modules_dir.patch
 URL:           http://www.mesa3d.org/
 %{?with_glide:BuildRequires:   Glide3-DRI-devel}
 BuildRequires: expat-devel
@@ -25,6 +26,7 @@ BuildRequires:        libstdc++-devel
 BuildRequires: libtool >= 2:1.4d
 %{?with_motif:BuildRequires:   motif-devel}
 BuildRequires: sed >= 4.0
+BuildRequires: xorg-lib-libXt-devel
 BuildRequires: xorg-lib-libXxf86vm-devel
 BuildRequires: xorg-proto-glproto-devel
 BuildRequires: xorg-util-makedepend
@@ -60,6 +62,7 @@ Group:                X11/Libraries
 Provides:      OpenGL = 1.5
 # reports version 1.3, but supports glXGetProcAddress() from 1.4
 Provides:      OpenGL-GLX = 1.4
+Obsoletes:     Mesa
 Obsoletes:     XFree86-OpenGL-libGL
 
 %description libGL
@@ -252,6 +255,7 @@ Sterowniki DRI dla X.org.
 
 %prep
 %setup -q -n Mesa-%{version} -b 1
+%patch0 -p1
 
 # fix demos
 find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
@@ -271,7 +275,7 @@ targ=""
 %{__make} linux${targ}-static \
        CC="%{__cc}" \
        CXX="%{__cxx}" \
-       OPT_FLAGS="%{rpmcflags}" \
+       OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
        XLIB_DIR=%{_libdir} \
        GLW_SOURCES="GLwDrawA.c%{?with_motif: GLwMDrawA.c}" \
        SRC_DIRS="mesa glu glw" \
@@ -283,21 +287,10 @@ mv -f lib lib-static
        CC="%{__cc}" \
        CXX="%{__cxx}" \
        MKDEP=makedepend \
-       OPT_FLAGS="%{rpmcflags}" \
+       OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
        XLIB_DIR=%{_libdir} \
        SRC_DIRS="glx/x11 mesa glu glw" \
        PROGRAM_DIRS=
-mv -f lib lib-dri
-%{__make} clean \
-       MKDEP=makedepend
-
-%{__make} linux${targ} \
-       CC="%{__cc}" \
-       CXX="%{__cxx}" \
-       OPT_FLAGS="%{rpmcflags}" \
-       XLIB_DIR=%{_libdir} \
-       SRC_DIRS="mesa" \
-       PROGRAM_DIRS=
 
 %{__make} -C progs/xdemos \
        CC="%{__cc}" \
@@ -313,7 +306,19 @@ mv -f lib lib-dri
        OPT_FLAGS="%{rpmcflags}" \
        XLIB_DIR=%{_libdir} \
        PROGS="glxinfo" \
-       APP_LIB_DEPS="-L\$(LIB_DIR) -lGLU -lGL"
+       APP_LIB_DEPS="-L\$(LIB_DIR) -lGL -L../../lib-dri -lGLU"
+
+mv -f lib lib-dri
+%{__make} clean \
+       MKDEP=makedepend
+
+%{__make} linux${targ} \
+       CC="%{__cc}" \
+       CXX="%{__cxx}" \
+       OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
+       XLIB_DIR=%{_libdir} \
+       SRC_DIRS="mesa" \
+       PROGRAM_DIRS=
 
 %install
 rm -rf $RPM_BUILD_ROOT