From bb2a4a58b422318e418d04df99c7a7ea7328de7c11eeb5d4d6814419c81349df Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 9 Feb 2012 20:16:37 +0000 Subject: [PATCH 1/3] - fixed buildreqs due to splitted xorg-x11-libs OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=187 --- Mesa.changes | 5 +++++ Mesa.spec | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 6c66fcd..64aa865 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/Mesa.spec b/Mesa.spec index 8b3bdac..fc2dffb 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -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 @@ -31,8 +34,10 @@ BuildRequires: libtalloc-devel BuildRequires: libudev-devel BuildRequires: libxml2-python BuildRequires: pkgconfig +BuildRequires: pkgconfig(xdamage) +BuildRequires: pkgconfig(xext) BuildRequires: python-base -BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-util-devel %ifarch %ix86 x86_64 BuildRequires: llvm-devel %endif @@ -84,7 +89,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 From ae5c8dcaaf867d7cb2604d6cf39cdd46ede5fbdff2306cb6ba536cbdb1f80168 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 13 Feb 2012 10:05:48 +0000 Subject: [PATCH 2/3] Accepting request 104198 from home:jengelh:branches:X11:XOrg Dependencies update OBS-URL: https://build.opensuse.org/request/show/104198 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=188 --- Mesa.changes | 8 ++++++++ Mesa.spec | 35 ++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 64aa865..cca9f83 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/Mesa.spec b/Mesa.spec index fc2dffb..e98d53e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # %define _version 7.11.1 @@ -23,27 +22,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: pkgconfig(xdamage) -BuildRequires: pkgconfig(xext) BuildRequires: python-base 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 @@ -54,6 +64,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 @@ -172,7 +184,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 @@ -183,13 +195,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 @@ -202,9 +214,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 From a6a2541c1c8045216ddf4452e69e0fb49784ce98f997c25988a7feebdbddafa5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 16 Feb 2012 15:19:01 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=189 --- Mesa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/Mesa.spec b/Mesa.spec index e98d53e..4f1ec20 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # %define _version 7.11.1