Accepting request 228406 from X11:XOrg
- Clean up specfile - Turn negative arch checks into positive ones for non-default configure settings - libxsmfence is also available on ppc64le - Don't enable gallium-egl on ppc64 for now to work around llvm bug (forwarded request 228347 from Andreas_Schwab) OBS-URL: https://build.opensuse.org/request/show/228406 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=207
This commit is contained in:
commit
30c9bac10e
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 31 09:57:12 UTC 2014 - schwab@suse.de
|
||||||
|
|
||||||
|
- Clean up specfile
|
||||||
|
- Turn negative arch checks into positive ones for non-default configure
|
||||||
|
settings
|
||||||
|
- libxsmfence is also available on ppc64le
|
||||||
|
- Don't enable gallium-egl on ppc64 for now to work around llvm bug
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 13 15:20:17 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
|
Thu Mar 13 15:20:17 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
|
||||||
|
|
||||||
|
75
Mesa.spec
75
Mesa.spec
@ -17,17 +17,37 @@
|
|||||||
|
|
||||||
|
|
||||||
%define glamor 1
|
%define glamor 1
|
||||||
|
# --enable-gallium-egl requires non-empty --with-gallium-drivers (default
|
||||||
|
# is r300,r600,svga,swrast, which also enables VDPAU support for r600)
|
||||||
%ifnarch s390 s390x aarch64 m68k
|
%ifnarch s390 s390x aarch64 m68k
|
||||||
# Requires non-empty --with-gallium-drivers
|
|
||||||
%define egl_gallium 1
|
%define egl_gallium 1
|
||||||
|
%define vdpau_r600 1
|
||||||
%else
|
%else
|
||||||
%define egl_gallium 0
|
%define egl_gallium 0
|
||||||
|
%define vdpau_r600 0
|
||||||
%endif
|
%endif
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
%define llvm_r600 1
|
%define llvm_r600 1
|
||||||
%else
|
%else
|
||||||
%define llvm_r600 0
|
%define llvm_r600 0
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch %ix86 x86_64 %arm ppc64
|
||||||
|
%define xvmc_support 1
|
||||||
|
%else
|
||||||
|
%define xvmc_support 0
|
||||||
|
%endif
|
||||||
|
%ifarch %ix86 x86_64 %arm ppc64 ia64 ppc %sparc hppa
|
||||||
|
%define vdpau_nouveau 1
|
||||||
|
%else
|
||||||
|
%define vdpau_nouveau 0
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# llvm-config on ppc64 is currently broken (bnc#871128)
|
||||||
|
# /usr/lib64/libLLVMSupport.a(Process.cpp.o): In function `llvm::sys::Process::FileDescriptorHasColors(int)':
|
||||||
|
# /home/abuild/rpmbuild/BUILD/llvm/lib/Support/Process.cpp:(.text+0xcd4): undefined reference to `setupterm'
|
||||||
|
%ifarch ppc64
|
||||||
|
%define egl_gallium 0
|
||||||
|
%endif
|
||||||
|
|
||||||
%define _version 10.1.0
|
%define _version 10.1.0
|
||||||
%define _name_archive MesaLib
|
%define _name_archive MesaLib
|
||||||
@ -52,9 +72,7 @@ BuildRequires: pkgconfig
|
|||||||
BuildRequires: python-base
|
BuildRequires: python-base
|
||||||
BuildRequires: xorg-x11-util-devel
|
BuildRequires: xorg-x11-util-devel
|
||||||
BuildRequires: pkgconfig(libdrm) >= 2.4.24
|
BuildRequires: pkgconfig(libdrm) >= 2.4.24
|
||||||
%ifnarch ppc64le
|
|
||||||
BuildRequires: pkgconfig(xshmfence)
|
BuildRequires: pkgconfig(xshmfence)
|
||||||
%endif
|
|
||||||
%ifarch %arm
|
%ifarch %arm
|
||||||
BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.43
|
BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.43
|
||||||
%endif
|
%endif
|
||||||
@ -592,65 +610,54 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
|
|||||||
#sed -i -e '/^Libs.private/d' -e '/^Requires.private/d' %{buildroot}%{_libdir}/pkgconfig/*.pc
|
#sed -i -e '/^Libs.private/d' -e '/^Requires.private/d' %{buildroot}%{_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n Mesa-libEGL1 -p /sbin/ldconfig
|
%post -n Mesa-libEGL1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n Mesa-libEGL1 -p /sbin/ldconfig
|
%postun -n Mesa-libEGL1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n Mesa-libGL1 -p /sbin/ldconfig
|
%post -n Mesa-libGL1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n Mesa-libGL1 -p /sbin/ldconfig
|
%postun -n Mesa-libGL1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n Mesa-libGLESv1_CM1 -p /sbin/ldconfig
|
%post -n Mesa-libGLESv1_CM1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n Mesa-libGLESv1_CM1 -p /sbin/ldconfig
|
%postun -n Mesa-libGLESv1_CM1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n Mesa-libGLESv2-2 -p /sbin/ldconfig
|
%post -n Mesa-libGLESv2-2 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n Mesa-libGLESv2-2 -p /sbin/ldconfig
|
%postun -n Mesa-libGLESv2-2 -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n libOSMesa9 -p /sbin/ldconfig
|
%post -n libOSMesa9 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libOSMesa9 -p /sbin/ldconfig
|
%postun -n libOSMesa9 -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n libgbm1 -p /sbin/ldconfig
|
%post -n libgbm1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libgbm1 -p /sbin/ldconfig
|
%postun -n libgbm1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%ifnarch s390 aarch64 m68k ppc64le
|
%ifarch %ix86 x86_64 %arm ppc64
|
||||||
|
|
||||||
%post -n libxatracker2 -p /sbin/ldconfig
|
%post -n libxatracker2 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libxatracker2 -p /sbin/ldconfig
|
%postun -n libxatracker2 -p /sbin/ldconfig
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %xvmc_support
|
||||||
%post -n libXvMC_nouveau
|
%post -n libXvMC_nouveau
|
||||||
%postun -n libXvMC_nouveau
|
%postun -n libXvMC_nouveau
|
||||||
|
|
||||||
%endif
|
|
||||||
%ifnarch s390 s390x aarch64 m68k
|
|
||||||
|
|
||||||
%post -n libXvMC_r600
|
%post -n libXvMC_r600
|
||||||
|
|
||||||
%postun -n libXvMC_r600
|
%postun -n libXvMC_r600
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %vdpau_r600
|
||||||
%post -n libvdpau_r600
|
%post -n libvdpau_r600
|
||||||
%postun -n libvdpau_r600
|
%postun -n libvdpau_r600
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %llvm_r600
|
%if %llvm_r600
|
||||||
%post -n libvdpau_radeonsi
|
%post -n libvdpau_radeonsi
|
||||||
%postun -n libvdpau_radeonsi
|
%postun -n libvdpau_radeonsi
|
||||||
%endif
|
%endif
|
||||||
%endif
|
|
||||||
|
|
||||||
%post -n Mesa-libglapi0 -p /sbin/ldconfig
|
%post -n Mesa-libglapi0 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n Mesa-libglapi0 -p /sbin/ldconfig
|
%postun -n Mesa-libglapi0 -p /sbin/ldconfig
|
||||||
|
|
||||||
%if 0%{?suse_version} >= 1310
|
%if 0%{?suse_version} >= 1310
|
||||||
%post -n libwayland-egl1 -p /sbin/ldconfig
|
%post -n libwayland-egl1 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libwayland-egl1 -p /sbin/ldconfig
|
%postun -n libwayland-egl1 -p /sbin/ldconfig
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -736,7 +743,6 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%_libdir/libwayland-egl.so
|
%_libdir/libwayland-egl.so
|
||||||
%_libdir/pkgconfig/wayland-egl.pc
|
%_libdir/pkgconfig/wayland-egl.pc
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files -n libgbm1
|
%files -n libgbm1
|
||||||
@ -753,8 +759,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
|
|||||||
%_libdir/libgbm.so
|
%_libdir/libgbm.so
|
||||||
%_libdir/pkgconfig/gbm.pc
|
%_libdir/pkgconfig/gbm.pc
|
||||||
|
|
||||||
%ifnarch s390 ppc aarch64 m68k ppc64le
|
%ifarch %ix86 x86_64 %arm ppc64
|
||||||
|
|
||||||
%files -n libxatracker2
|
%files -n libxatracker2
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%_libdir/libxatracker.so.2*
|
%_libdir/libxatracker.so.2*
|
||||||
@ -764,38 +769,36 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
|
|||||||
%_includedir/xa_*.h
|
%_includedir/xa_*.h
|
||||||
%_libdir/libxatracker.so
|
%_libdir/libxatracker.so
|
||||||
%_libdir/pkgconfig/xatracker.pc
|
%_libdir/pkgconfig/xatracker.pc
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifnarch s390 s390x aarch64 m68k ppc64le
|
%if %xvmc_support
|
||||||
|
|
||||||
%files -n libXvMC_nouveau
|
%files -n libXvMC_nouveau
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%_libdir/libXvMCnouveau.so
|
%_libdir/libXvMCnouveau.so
|
||||||
%_libdir/libXvMCnouveau.so.1
|
%_libdir/libXvMCnouveau.so.1
|
||||||
%_libdir/libXvMCnouveau.so.1.0.0
|
%_libdir/libXvMCnouveau.so.1.0.0
|
||||||
|
|
||||||
%files -n libvdpau_nouveau
|
|
||||||
%defattr(-,root,root)
|
|
||||||
%_libdir/vdpau/libvdpau_nouveau.so
|
|
||||||
%_libdir/vdpau/libvdpau_nouveau.so.1
|
|
||||||
%_libdir/vdpau/libvdpau_nouveau.so.1.0.0
|
|
||||||
|
|
||||||
%endif
|
|
||||||
%ifnarch s390 s390x aarch64 m68k
|
|
||||||
|
|
||||||
%files -n libXvMC_r600
|
%files -n libXvMC_r600
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%_libdir/libXvMCr600.so
|
%_libdir/libXvMCr600.so
|
||||||
%_libdir/libXvMCr600.so.1
|
%_libdir/libXvMCr600.so.1
|
||||||
%_libdir/libXvMCr600.so.1.0.0
|
%_libdir/libXvMCr600.so.1.0.0
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %vdpau_nouveau
|
||||||
|
%files -n libvdpau_nouveau
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%_libdir/vdpau/libvdpau_nouveau.so
|
||||||
|
%_libdir/vdpau/libvdpau_nouveau.so.1
|
||||||
|
%_libdir/vdpau/libvdpau_nouveau.so.1.0.0
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %vdpau_r600
|
||||||
%files -n libvdpau_r600
|
%files -n libvdpau_r600
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%_libdir/vdpau/libvdpau_r600.so
|
%_libdir/vdpau/libvdpau_r600.so
|
||||||
%_libdir/vdpau/libvdpau_r600.so.1
|
%_libdir/vdpau/libvdpau_r600.so.1
|
||||||
%_libdir/vdpau/libvdpau_r600.so.1.0.0
|
%_libdir/vdpau/libvdpau_r600.so.1.0.0
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %llvm_r600
|
%if %llvm_r600
|
||||||
|
Loading…
Reference in New Issue
Block a user