pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 135763 from X11:XOrg

Browse Source 
- removed any .la file
- moved libglapi.so from Mesa-devel to Mesa-libglapi-devel package;
  Mesa-devel requires Mesa-libglapi-devel package anyway

- fixed libOSMesa packaging (only a dangling symlink has been
  packaged) 

- fix baselibs.conf after package split

- instead of using "make install" for installing libIndirectGL/
  libOSMesa, do install these libs manually, so we no longer end
  up with linking *everything* against libIndirectGL (instead of
  having it correctly linked against GL!)

OBS-URL: https://build.opensuse.org/request/show/135763
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=157
This commit is contained in:
Stephan Kulow 2012-09-25 12:04:32 +00:00 committed by Git OBS Bridge
commit 3edcfd90c0
5 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Mesa.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Mon Sep 24 17:04:35 UTC 2012 - sndirsch@suse.com
- removed any .la file
- moved libglapi.so from Mesa-devel to Mesa-libglapi-devel package;
Mesa-devel requires Mesa-libglapi-devel package anyway
-------------------------------------------------------------------
Fri Sep 21 08:28:28 UTC 2012 - sndirsch@suse.com
- fixed libOSMesa packaging (only a dangling symlink has been
packaged)
-------------------------------------------------------------------
Fri Sep 21 07:08:05 UTC 2012 - coolo@suse.com
- fix baselibs.conf after package split
-------------------------------------------------------------------
Thu Sep 20 13:05:15 UTC 2012 - sndirsch@suse.com
- instead of using "make install" for installing libIndirectGL/
libOSMesa, do install these libs manually, so we no longer end
up with linking *everything* against libIndirectGL (instead of
having it correctly linked against GL!)
-------------------------------------------------------------------
Fri Aug 24 22:22:28 UTC 2012 - tobias.johannes.klausmann@mni.thm.de

29
Mesa.spec
View File

@ -17,11 +17,11 @@
%define glamor 1
%define _version 8.98.1
%define _version 8.98.5
%define _name_archive mesa
Name: Mesa
Version: 8.98.1
Version: 8.98.5
Release: 0
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@ -489,6 +489,7 @@ export TALLOC_LIBS=-ltalloc
export TALLOC_CFLAGS="-I/usr/include"
autoreconf -fi
### --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga \
### --with-gallium-drivers=r300,r600,nouveau,swrast,svga \
%configure --enable-gles1 \
--enable-gles2 \
--enable-dri \
@ -519,6 +520,7 @@ autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
# build and install Indirect Rendering only libGL
make clean-local
%configure --enable-xlib-glx \
@ -531,7 +533,12 @@ make clean-local
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT
cp -a \
src/mesa/drivers/x11/.libs/libIndirectGL.so* \
src/mesa/drivers/osmesa/.libs/libOSMesa.so* \
$RPM_BUILD_ROOT/usr/%{_lib}
install -m 644 src/mesa/drivers/osmesa/osmesa.pc \
$RPM_BUILD_ROOT/usr/%{_lib}/pkgconfig
#for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do
for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
@ -634,7 +641,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%_includedir/KHR
%_libdir/libEGL.so
%_libdir/pkgconfig/egl.pc
%_libdir/libEGL.la
%files -n Mesa-libGL1
%defattr(-,root,root)
@ -644,9 +650,9 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%defattr(-,root,root)
%dir %_includedir/GL
%_includedir/GL/*.h
%exclude %_includedir/GL/osmesa.h
%_libdir/libGL.so
%_libdir/pkgconfig/gl.pc
%_libdir/libGL.la
%_mandir/man3/gl[A-Z]*
%files -n Mesa-libGLESv1_CM1
@ -657,7 +663,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%defattr(-,root,root)
%_includedir/GLES
%_libdir/libGLESv1_CM.so
%_libdir/libGLESv1_CM.la
%_libdir/pkgconfig/glesv1_cm.pc
%files -n Mesa-libGLESv2-2
@ -668,7 +673,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%defattr(-,root,root)
%_includedir/GLES2
%_libdir/libGLESv2.so
%_libdir/libGLESv2.la
%_libdir/pkgconfig/glesv2.pc
%files -n Mesa-libIndirectGL1
@ -678,16 +682,16 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%files -n Mesa-libIndirectGL-devel
%defattr(-,root,root)
%_libdir/libIndirectGL.so
%_libdir/libIndirectGL.la
%files -n libOSMesa9
%defattr(-,root,root)
%_libdir/libOSMesa.so.*
%_libdir/libOSMesa.so.8.0.0
%_libdir/libOSMesa.so.8
%files -n libOSMesa-devel
%defattr(-,root,root)
%_includedir/GL/osmesa.h
%_libdir/libOSMesa.so
%_libdir/libOSMesa.la
%_libdir/pkgconfig/osmesa.pc
%files -n libgbm1
@ -698,7 +702,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%defattr(-,root,root)
%_includedir/gbm.h
%_libdir/libgbm.so
%_libdir/libgbm.la
%_libdir/pkgconfig/gbm.pc
%ifnarch s390 s390x %arm ppc ppc64
@ -774,15 +777,13 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%files -n Mesa-libglapi-devel
%defattr(-,root,root)
%_libdir/libglapi.la
%_libdir/libglapi.so
%files devel
%defattr(-,root,root)
%doc docs/*.html docs/*.spec
%_includedir/GL/internal
%_libdir/libglapi.so
%_libdir/libdricore9*.so
%_libdir/libdricore9*.la
%_libdir/pkgconfig/dri.pc
%changelog

7
baselibs.conf
View File

@ -8,7 +8,6 @@ Mesa-devel
requires "Mesa-libGL-devel-<targettype> = <version>"
requires "Mesa-libGLESv1_CM-devel-<targettype> = <version>"
requires "Mesa-libGLESv2-devel-<targettype> = <version>"
requires "Mesa-libGLU-devel-<targettype> = <version>"
requires "Mesa-libIndirectGL1-<targettype> = <version>"
requires "Mesa-libIndirectGL-devel-<targettype> = <version>"
requires "libOSMesa9-<targettype> = <version>"
@ -34,12 +33,8 @@ Mesa-libGLESv2-2
Mesa-libGLESv2-devel
requires -Mesa-libGLESv2-<targettype>
requires "Mesa-libGLESv2-2-<targettype> = <version>"
Mesa-libGLU1
Mesa-libGLU-devel
requires -Mesa-libGLU-<targettype>
requires "Mesa-libGLU1-<targettype> = <version>"
Mesa-libIndirectGL1
Mesa-libIndirectGL1-devel
Mesa-libIndirectGL-devel
requires -Mesa-libIndirectGL-<targettype>
requires "Mesa-libIndirectGL1-<targettype> = <version>"
libOSMesa9

3
mesa-8.98.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28139a4fc2f67decca5f88254e0e12b82b325221ca4c6462af1b0c48d065c9d0
size 5692613

3
mesa-8.98.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e4d51a3b56c67ff794ca840a5ff611a72fc4abc56a70974302a36a6a098829a
size 5693920