Accepting request 105524 from X11:XOrg

- Update dependencies according to configure.ac,
  use pkgconfig symbols
- Parallel build with %_smp_mflags
- Remove redundant tags/sections

- fixed buildreqs due to splitted xorg-x11-libs

OBS-URL: https://build.opensuse.org/request/show/105524
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=139
This commit is contained in:
Stephan Kulow 2012-02-17 11:06:00 +00:00 committed by Git OBS Bridge
commit ec78c9d44e
2 changed files with 41 additions and 13 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sun Feb 12 19:24:03 UTC 2012 - jengelh@medozas.de
- Update dependencies according to configure.ac,
use pkgconfig symbols
- Parallel build with %_smp_mflags
- Remove redundant tags/sections
-------------------------------------------------------------------
Thu Feb 9 20:01:37 UTC 2012 - sndirsch@suse.com
- fixed buildreqs due to splitted xorg-x11-libs
-------------------------------------------------------------------
Thu Dec 1 11:15:48 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package Mesa
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -13,6 +13,9 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#
%define _version 7.11.1
@ -20,25 +23,38 @@ Version: 7.11.1
Release: 0
Name: Mesa
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: libdrm-devel
BuildRequires: libexpat-devel
BuildRequires: libtalloc-devel
BuildRequires: libudev-devel
BuildRequires: libtool
BuildRequires: libxml2-python
BuildRequires: pkgconfig
BuildRequires: python-base
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-util-devel
BuildRequires: pkgconfig(dri2proto) >= 2.1
BuildRequires: pkgconfig(glproto) >= 1.4.11
BuildRequires: pkgconfig(libdrm) >= 2.4.24
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.24
BuildRequires: pkgconfig(libdrm_nouveau) >= 0.6
BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.24
BuildRequires: pkgconfig(libudev) > 150
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xcb-dri2)
BuildRequires: pkgconfig(xcb-glx)
BuildRequires: pkgconfig(xdamage)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xxf86vm)
%ifarch %ix86 x86_64
BuildRequires: llvm-devel
%endif
Url: http://www.mesa3d.org
License: MIT
Group: System/Libraries
Provides: xorg-x11-Mesa = %{version} intel-i810-Mesa = %{version} Mesa7 = %{version}
Obsoletes: xorg-x11-Mesa < %{version} intel-i810-Mesa < %{version} Mesa7 < %{version}
Obsoletes: Mesa-nouveau3d
@ -49,6 +65,8 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version}
%endif
#
Summary: System for rendering interactive 3-D graphics
License: MIT
Group: System/Libraries
Source: MesaLib-%{_version}.tar.bz2
Source2: baselibs.conf
Source3: README.updates
@ -84,7 +102,7 @@ Authors:
Brian Paul
%package devel
Requires: Mesa = %version xorg-x11-devel libdrm-devel libudev-devel
Requires: Mesa = %version libdrm-devel libudev-devel
Summary: Libraries, includes and more to develop Mesa applications
Group: Development/Libraries/X11
# bug437293
@ -167,7 +185,7 @@ autoreconf -fi
%endif
--disable-glut \
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
make %{?jobs:-j%jobs}
make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT
# build and install Indirect Rendering only libGL
make realclean
@ -178,13 +196,13 @@ make realclean
--with-gallium-drivers="" \
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf
make %{?jobs:-j%jobs}
make %{?_smp_mflags}
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
pushd $dir
xmkmf -a
make %{?jobs:-j%jobs};
make %{?_smp_mflags}
make install.man DESTDIR=$RPM_BUILD_ROOT MANPATH=%{_mandir} LIBMANSUFFIX=3gl
popd
done
@ -197,9 +215,6 @@ mkdir -p $RPM_BUILD_ROOT/etc
install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%fdupes -s $RPM_BUILD_ROOT/%_mandir
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig