packages: Mesa/Mesa.spec, Mesa/Mesa-link.patch (NEW)=?UTF-8?Q?=20?=- added link patch to ...
qboosh
qboosh at pld-linux.org
Sun Mar 11 13:15:19 CET 2012
Author: qboosh Date: Sun Mar 11 12:15:19 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- added link patch to fix vdpau-nouveau, xvmc-* and xatracker linking instead of disabling checks
- added xa bcond to allow build libxatracker (Gallium/XA API state tracker)
---- Files affected:
packages/Mesa:
Mesa.spec (1.310 -> 1.311) , Mesa-link.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.310 packages/Mesa/Mesa.spec:1.311
--- packages/Mesa/Mesa.spec:1.310 Sun Mar 11 11:29:02 2012
+++ packages/Mesa/Mesa.spec Sun Mar 11 13:15:13 2012
@@ -12,7 +12,8 @@
%bcond_with gallium_intel # gallium i915 driver (but doesn't work with AIGLX)
%bcond_without gallium_nouveau # gallium nouveau driver
%bcond_without osmesa # OSMesa libraries
-%bcond_without gbm # with Graphics Buffer Manager
+%bcond_without gbm # Graphics Buffer Manager
+%bcond_with xa # XA state tracker (for future vmwgfx xorg driver)
%bcond_with static_libs # static libraries
#
# minimal supported xserver version
@@ -36,6 +37,7 @@
Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
# Source0-md5: 24eeebf66971809d8f40775a379b36c9
Patch0: %{name}-realclean.patch
+Patch1: %{name}-link.patch
URL: http://www.mesa3d.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -58,6 +60,7 @@
BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libXdamage-devel
BuildRequires: xorg-lib-libXext-devel >= 1.0.5
+BuildRequires: xorg-lib-libXfixes-devel
BuildRequires: xorg-lib-libXt-devel
BuildRequires: xorg-lib-libXvMC-devel >= 1.0.6
BuildRequires: xorg-lib-libXxf86vm-devel
@@ -78,6 +81,7 @@
%if %{without gallium}
%undefine with_gallium_intel
%undefine with_gallium_nouveau
+%undefine with_xa
%endif
%if %{without egl}
@@ -85,7 +89,7 @@
%endif
# _glapi_tls_Dispatch is defined in libglapi, but it's some kind of symbol ldd -r doesn't notice(?)
-%define skip_post_check_so libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libXvMCnouveau.so.1.* libXvMCr300.so.1.* libXvMCr600.so.1.* libXvMCsoftpipe.so.1.* libvdpau_nouveau.so.1.*
+%define skip_post_check_so libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.*
# llvm build broken
%define filterout_ld -Wl,--as-needed
@@ -499,6 +503,7 @@
License: MIT
Group: Libraries
Requires: libdrm >= %{libdrm_ver}
+Requires: xorg-lib-libXvMC >= 1.0.6
Conflicts: Mesa-libXvMC
%description libXvMC-nouveau
@@ -513,6 +518,7 @@
License: MIT
Group: Libraries
Requires: libdrm >= %{libdrm_ver}
+Requires: xorg-lib-libXvMC >= 1.0.6
Conflicts: Mesa-libXvMC
%description libXvMC-r300
@@ -529,6 +535,7 @@
License: MIT
Group: Libraries
Requires: libdrm >= %{libdrm_ver}
+Requires: xorg-lib-libXvMC >= 1.0.6
Conflicts: Mesa-libXvMC
%description libXvMC-r600
@@ -545,6 +552,7 @@
License: MIT
Group: Libraries
Requires: libdrm >= %{libdrm_ver}
+Requires: xorg-lib-libXvMC >= 1.0.6
Conflicts: Mesa-libXvMC
%description libXvMC-softpipe
@@ -553,6 +561,32 @@
%description libXvMC-softpipe -l pl.UTF-8
Implementacja Mesa softpipe API XvMC.
+%package libxatracker
+Summary: Xorg Gallium3D accelleration library
+Summary(pl.UTF-8): Biblioteka akceleracji Gallium3D dla Xorg
+Group: X11/Libraries
+#Requires:
+
+%description libxatracker
+Xorg Gallium3D accelleration library (used by new vmwgfx driver).
+
+%description libxatracker -l pl.UTF-8
+Biblioteka akceleracji Gallium3D dla Xorg (używana przez nowy
+sterownik vmwgfx).
+
+%package libxatracker-devel
+Summary: Header files for Xorg Gallium3D accelleration library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki akceleracji Gallium3D dla Xorg
+Group: X11/Development/Libraries
+Requires: %{name}-libxatracker = %{version}-%{release}
+#Requires:
+
+%description libxatracker-devel
+Header files for Xorg Gallium3D accelleration library.
+
+%description libxatracker-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki akceleracji Gallium3D dla Xorg.
+
%package dri-driver-ati-radeon-R100
Summary: X.org DRI driver for ATI R100 card family
Summary(pl.UTF-8): Sterownik X.org DRI dla rodziny kart ATI R100
@@ -768,6 +802,7 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
%build
%{__aclocal}
@@ -836,6 +871,7 @@
%{__enable gbm gallium-gbm} \
--enable-openvg \
--enable-vdpau \
+ %{?with_xa:--enable-xa} \
--enable-xvmc \
--with-gallium-drivers=${gallium_drivers} \
%else
@@ -897,6 +933,9 @@
%post libXvMC-softpipe -p /sbin/ldconfig
%postun libXvMC-softpipe -p /sbin/ldconfig
+%post libxatracker -p /sbin/ldconfig
+%postun libxatracker -p /sbin/ldconfig
+
%if %{with egl}
%files libEGL
%defattr(644,root,root,755)
@@ -1088,6 +1127,21 @@
%attr(755,root,root) %ghost %{_libdir}/libXvMCsoftpipe.so.1
%endif
+%if %{with xa}
+%files libxatracker
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libxatracker.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxatracker.so.1
+
+%files libxatracker-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libxatracker.so
+%{_includedir}/xa_composite.h
+%{_includedir}/xa_context.h
+%{_includedir}/xa_tracker.h
+%{_pkgconfigdir}/xatracker.pc
+%endif
+
%files dri-driver-ati-radeon-R100
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/radeon_dri.so
@@ -1165,6 +1219,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.311 2012/03/11 12:15:13 qboosh
+- added link patch to fix vdpau-nouveau, xvmc-* and xatracker linking instead of disabling checks
+- added xa bcond to allow build libxatracker (Gallium/XA API state tracker)
+
Revision 1.310 2012/03/11 10:29:02 qboosh
- check-files cleanup
- fixed build without gallium_nouveau
================================================================
Index: packages/Mesa/Mesa-link.patch
diff -u /dev/null packages/Mesa/Mesa-link.patch:1.1
--- /dev/null Sun Mar 11 13:15:19 2012
+++ packages/Mesa/Mesa-link.patch Sun Mar 11 13:15:13 2012
@@ -0,0 +1,76 @@
+--- Mesa-8.0.1/src/gallium/targets/vdpau-nouveau/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
++++ Mesa-8.0.1/src/gallium/targets/vdpau-nouveau/Makefile 2012-03-11 12:26:44.906377873 +0100
+@@ -19,7 +19,7 @@
+ $(COMMON_GALLIUM_SOURCES) \
+ $(DRIVER_SOURCES)
+
+-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
++DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes
+
+ LINK_WITH_CXX=1
+
+--- Mesa-8.0.1/src/gallium/targets/xvmc-nouveau/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
++++ Mesa-8.0.1/src/gallium/targets/xvmc-nouveau/Makefile 2012-03-11 12:34:15.799733412 +0100
+@@ -19,7 +19,7 @@
+ $(COMMON_GALLIUM_SOURCES) \
+ $(DRIVER_SOURCES)
+
+-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
++DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes -lXvMC
+
+ LINK_WITH_CXX=1
+
+--- Mesa-8.0.1/src/gallium/targets/xvmc-r300/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
++++ Mesa-8.0.1/src/gallium/targets/xvmc-r300/Makefile 2012-03-11 12:34:46.519728247 +0100
+@@ -15,7 +15,7 @@
+ $(COMMON_GALLIUM_SOURCES) \
+ $(DRIVER_SOURCES)
+
+-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes
++DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC
+
+ include ../Makefile.xvmc
+
+--- Mesa-8.0.1/src/gallium/targets/xvmc-r600/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
++++ Mesa-8.0.1/src/gallium/targets/xvmc-r600/Makefile 2012-03-11 12:35:23.323061190 +0100
+@@ -15,7 +15,7 @@
+ $(COMMON_GALLIUM_SOURCES) \
+ $(DRIVER_SOURCES)
+
+-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes
++DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC
+
+ include ../Makefile.xvmc
+
+--- Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
++++ Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile 2012-03-11 12:35:53.273062913 +0100
+@@ -14,7 +14,7 @@
+ C_SOURCES = \
+ $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+
+-DRIVER_LIBS =
++DRIVER_LIBS = -lXvMC -lXext
+
+ include ../Makefile.xvmc
+
+--- Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
++++ Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile 2012-03-11 12:43:05.479747729 +0100
+@@ -30,6 +30,9 @@
+ SOURCES = vmw_target.c
+ OBJECTS = $(SOURCES:.c=.o)
+
++XA_LIBS = $(shell $(PKG_CONFIG) libdrm --libs)
++XA_PC_REQ_PRIV = libdrm
++
+ ifeq ($(MESA_LLVM),1)
+ LDFLAGS += $(LLVM_LDFLAGS)
+ GALLIUM_AUXILIARIES += $(LLVM_LIBS)
+@@ -64,7 +67,7 @@
+ $(MKLIB_OPTIONS) \
+ -exports xa_symbols \
+ -install $(TOP)/$(LIB_DIR)/gallium \
+- $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES)
++ $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES) $(XA_LIBS)
+
+ # xa pkgconfig file
+ pcedit = sed \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.310&r2=1.311&f=u
More information about the pld-cvs-commit
mailing list