From 6e48b091dce6ad2253a03b96b9445913b7ce749d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 28 Oct 2010 06:36:12 -0400 Subject: [PATCH] drop demos subpackage --- mesa-demos-fix-add-needed.patch | 36 ------------- mesa.spec | 91 +++------------------------------ sources | 2 - 3 files changed, 7 insertions(+), 122 deletions(-) delete mode 100644 mesa-demos-fix-add-needed.patch diff --git a/mesa-demos-fix-add-needed.patch b/mesa-demos-fix-add-needed.patch deleted file mode 100644 index 5ea3908..0000000 --- a/mesa-demos-fix-add-needed.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up mesa-demos-20100529/src/tests/Makefile.am.orig mesa-demos-20100529/src/tests/Makefile.am ---- mesa-demos-20100529/src/tests/Makefile.am.orig 2010-05-30 09:11:04.000000000 +1000 -+++ mesa-demos-20100529/src/tests/Makefile.am 2010-05-30 11:19:49.000000000 +1000 -@@ -169,13 +169,17 @@ endif - - afsmultiarb_LDADD = ../util/libutil.la - arraytexture_LDADD = ../util/libutil.la -+auxbuffer_LDADD = -lX11 - bug_3195_LDADD = ../util/libutil.la - bumpmap_LDADD = ../util/libutil.la - floattex_LDADD = ../util/libutil.la - fillrate_LDADD = ../util/libutil.la - invert_LDADD = ../util/libutil.la -+jkrahntest_LDADD = -lX11 - mipmap_limits_LDADD = ../util/libutil.la - mipmap_view_LDADD = ../util/libutil.la -+sharedtex_LDADD = -lX11 -+texobjshare_LDADD = -lX11 - texrect_LDADD = ../util/libutil.la - - EXTRA_DIST = \ -diff -up mesa-demos-20100529/src/xdemos/Makefile.am.orig mesa-demos-20100529/src/xdemos/Makefile.am ---- mesa-demos-20100529/src/xdemos/Makefile.am.orig 2010-05-30 14:41:55.000000000 +1000 -+++ mesa-demos-20100529/src/xdemos/Makefile.am 2010-05-30 14:43:43.000000000 +1000 -@@ -77,9 +77,11 @@ xrotfontdemo_SOURCES = \ - xuserotfont.c \ - xuserotfont.h - -+glthreads_LDADD = -lpthread - glxgears_fbconfig_LDADD = libpbutil.la - pbdemo_LDADD = libpbutil.la - pbinfo_LDADD = libpbutil.la -+sharedtex_mt_LDADD = -lpthread - - EXTRA_DIST = \ - yuvrect_client.c \ diff --git a/mesa.spec b/mesa.spec index 59f04d1..cf6feb8 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,6 +1,3 @@ - -# When bootstrapping an arch, omit the -demos subpackage. - # S390 doesn't have video cards, but we need swrast for xserver's GLX %ifarch s390 s390x %define with_hardware 0 @@ -12,39 +9,26 @@ %define _default_patch_fuzz 2 %define manpages gl-manpages-1.0.1 -%define xdriinfo xdriinfo-1.0.3 %define gitdate 20101020 -%define demosgitdate 20100529 #% define snapshot -%global demopkg %{name}-demos-%{demosgitdate} -%define demodir %{_libdir}/mesa - Summary: Mesa graphics libraries Name: mesa Version: 7.10 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2 #Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2 -#Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}%{?snapshot}.tar.bz2 Source0: %{name}-%{gitdate}.tar.bz2 -Source1: %{name}-demos-%{demosgitdate}.tar.bz2 -#Source1: http://downloads.sf.net/mesa3d/MesaDemos-%{version}.tar.bz2 Source2: %{manpages}.tar.bz2 Source3: make-git-snapshot.sh -Source4: make-demo-snapshot.sh - -Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2 Patch2: mesa-7.1-nukeglthread-debug.patch Patch3: mesa-no-mach64.patch Patch4: nouveau-legacy-enable.patch -Patch5: mesa-demos-fix-add-needed.patch #Patch7: mesa-7.1-link-shared.patch @@ -62,12 +46,10 @@ BuildRequires: xorg-x11-proto-devel >= 7.4-35 BuildRequires: makedepend BuildRequires: libselinux-devel BuildRequires: libXext-devel -BuildRequires: freeglut-devel BuildRequires: libXfixes-devel BuildRequires: libXdamage-devel BuildRequires: libXi-devel BuildRequires: libXmu-devel -BuildRequires: glew-devel BuildRequires: elfutils BuildRequires: python BuildRequires: llvm-devel @@ -164,22 +146,6 @@ Requires: mesa-libOSMesa = %{version}-%{release} Mesa offscreen rendering development package -%package -n glx-utils -Summary: GLX utilities -Group: Development/Libraries - -%description -n glx-utils -The glx-utils package provides the glxinfo and glxgears utilities. - - -%package demos -Summary: Mesa demos -Group: Development/Libraries -Requires: glew - -%description demos -This package provides some demo applications for testing Mesa. - %package -n xorg-x11-drv-vmwgfx Summary: VMware GFX DDX driver Group: User Interface/X Hardware Support @@ -188,23 +154,14 @@ Group: User Interface/X Hardware Support 2D driver for VMware SVGA vGPU %prep -#setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -b5 -%setup -q -n mesa-%{gitdate} -b1 -b2 -b5 +#setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 +%setup -q -n mesa-%{gitdate} -b2 %patch2 -p1 -b .intel-glthread %patch3 -p1 -b .no-mach64 %patch4 -p1 -b .nouveau #%patch7 -p1 -b .dricore %patch30 -p1 -b .vblank-warning -# Hack the demos to use installed data files -cd ../%{demopkg} -%patch5 -p1 -b .add -sed -i 's,../images,%{_libdir}/mesa,' src/demos/*.c -sed -i 's,geartrain.dat,%{_libdir}/mesa/&,' src/demos/geartrain.c -sed -i 's,isosurf.dat,%{_libdir}/mesa/&,' src/demos/isosurf.c -sed -i 's,terrain.dat,%{_libdir}/mesa/&,' src/demos/terrain.c -cd - - %build autoreconf --install @@ -253,17 +210,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os" make %{?_smp_mflags} -pushd ../%{demopkg} -autoreconf -v --install -%configure --bindir=%{demodir} -make %{?_smp_mflags} -popd - -pushd ../%{xdriinfo} -%configure -make %{?_smp_mflags} -popd - pushd ../%{manpages} autoreconf -v --install %configure @@ -295,25 +241,9 @@ pushd $RPM_BUILD_ROOT%{_libdir} rm -f xorg/modules/drivers/modesetting_drv.so popd -pushd ../%{demopkg} -# XXX demos, since they don't install automatically. should fix that. -install -d $RPM_BUILD_ROOT%{_bindir} -install -m 0755 src/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir} -install -m 0755 src/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir} -install -d $RPM_BUILD_ROOT%{demodir} -find src/demos/ -type f -perm /0111 | - xargs install -m 0755 -t $RPM_BUILD_ROOT/%{demodir} -install -m 0644 src/images/*.rgb $RPM_BUILD_ROOT/%{demodir} -install -m 0644 src/demos/*.dat $RPM_BUILD_ROOT/%{demodir} -popd - # and osmesa mv osmesa*/libOS* $RPM_BUILD_ROOT%{_libdir} -pushd ../%{xdriinfo} -make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT -popd - # man pages pushd ../%{manpages} make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT @@ -403,18 +333,11 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/GL/osmesa.h %{_libdir}/libOSMesa.so -%files -n glx-utils -%defattr(-,root,root,-) -%{_bindir}/glxgears -%{_bindir}/glxinfo -%{_bindir}/xdriinfo -%{_datadir}/man/man1/xdriinfo.1* - -%files demos -%defattr(-,root,root,-) -%{demodir} - %changelog +* Thu Oct 28 2010 Adam Jackson 7.10-0.3 +- Drop demos and glx-utils subpackages, they have their own source package + now. (#605719) + * Wed Oct 20 2010 Adam Jackson 7.10-0.2 - git snapshot, fixes osmesa linking issues diff --git a/sources b/sources index ff0efd2..f28ff1a 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -cb304d1ce562ac48b68eedeba38c662f xdriinfo-1.0.3.tar.bz2 -b4d32564ccc411bbfcfe657f42d3632d mesa-demos-20100529.tar.bz2 50cfa6784e41c60ae8f94978fc623b01 mesa-20101020.tar.bz2