Author: arekm Date: Wed Dec 3 10:03:31 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- builds (without dri2 and without dmx)
---- Files affected:
SPECS:
xorg-xserver-server.spec (1.159 -> 1.160)
---- Diffs:
================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.159
SPECS/xorg-xserver-server.spec:1.160
--- SPECS/xorg-xserver-server.spec:1.159 Wed Dec 3 09:45:19 2008
+++ SPECS/xorg-xserver-server.spec Wed Dec 3 11:03:26 2008
@@ -4,6 +4,7 @@
%bcond_with multigl # package libglx.so in a way allowing concurrent
install with nvidia/fglrx drivers
%bcond_without dri2 # DRI2 support
%bcond_without hal # HAL support
+%bcond_without dmx # DMX support
%bcond_with record # RECORD extension
#
# ABI versions, see hw/xfree86/common/xf86Module.h
@@ -26,6 +27,8 @@
Patch0: %{name}-xwrapper.patch
Patch1: %{name}-pic-libxf86config.patch
Patch2: %{name}-fb-size.patch
+Patch3: %{name}-Xi.patch
+Patch4: %{name}-glxproxy.patch
URL: http://xorg.freedesktop.org/
BuildRequires: Mesa-libGL-devel >= 7.2
# for glx headers
@@ -51,7 +54,7 @@
BuildRequires: xorg-lib-libXdmcp-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXfont-devel
-BuildRequires: xorg-lib-libXi-devel >= 1.2.90
+BuildRequires: xorg-lib-libXi-devel >= 1.2
BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-lib-libXpm-devel
BuildRequires: xorg-lib-libXrender-devel
@@ -61,7 +64,7 @@
BuildRequires: xorg-lib-libXxf86dga-devel
BuildRequires: xorg-lib-libXxf86misc-devel
BuildRequires: xorg-lib-libXxf86vm-devel
-BuildRequires: xorg-lib-libdmx-devel
+%{?with_dmx:BuildRequires: xorg-lib-libdmx-devel}
BuildRequires: xorg-lib-libfontenc-devel
BuildRequires: xorg-lib-libpciaccess-devel
BuildRequires: xorg-lib-libxkbfile-devel
@@ -70,7 +73,7 @@
BuildRequires: xorg-proto-bigreqsproto-devel
BuildRequires: xorg-proto-compositeproto-devel >= 0.4
BuildRequires: xorg-proto-damageproto-devel >= 1.1
-BuildRequires: xorg-proto-dmxproto-devel
+%{?with_dmx:BuildRequires: xorg-proto-dmxproto-devel}
%{?with_dri2:BuildRequires: xorg-proto-dri2proto-devel >= 1.99.3}
BuildRequires: xorg-proto-evieext-devel
BuildRequires: xorg-proto-fixesproto-devel >= 4.0
@@ -272,6 +275,8 @@
%patch0 -p0
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# xserver uses pixman-1 API/ABI so put that explictly here
sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h
./render/picture.h
@@ -318,7 +323,7 @@
--enable-aiglx \
--enable-builddocs \
--enable-dga \
- --enable-dmx \
+ %{?with_dmx:--enable-dmx} \
--enable-glx-tls \
--enable-install-libxf86config \
%{?with_record:--enable-record} \
@@ -378,11 +383,6 @@
%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/cvt
%attr(755,root,root) %{_bindir}/gtf
-%attr(755,root,root) %{_bindir}/in[bwl]
-%attr(755,root,root) %{_bindir}/ioport
-%attr(755,root,root) %{_bindir}/out[bwl]
-%attr(755,root,root) %{_bindir}/xorgconfig
-%{_libdir}/X11/Cards
%{_libdir}/X11/Options
%dir %{_libdir}/xorg
%{_libdir}/xorg/protocol.txt
@@ -395,8 +395,6 @@
%{?with_dri2:%attr(755,root,root)
%{_libdir}/xorg/modules/extensions/libdri2.so}
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
%{?with_record:%attr(755,root,root)
%{_libdir}/xorg/modules/extensions/librecord.so}
-%dir %{_libdir}/xorg/modules/fonts
-%attr(755,root,root) %{_libdir}/xorg/modules/fonts/lib*.so
%dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/xorg/modules/linux
%attr(755,root,root) %{_libdir}/xorg/modules/linux/libfbdevhw.so
@@ -412,11 +410,11 @@
%{_mandir}/man1/Xserver.1x*
%{_mandir}/man1/cvt.1*
%{_mandir}/man1/gtf.1x*
-%{_mandir}/man1/xorgconfig.1*
%{_mandir}/man4/exa.4*
%{_mandir}/man4/fbdevhw.4*
%{_mandir}/man5/xorg.conf.5x*
+%if %{with dmx}
%files -n xorg-xserver-Xdmx
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/Xdmx
@@ -435,6 +433,7 @@
%{_mandir}/man1/dmxtodmx.1x*
%{_mandir}/man1/vdltodmx.1x*
%{_mandir}/man1/xdmxconfig.1x*
+%endif
%files -n xorg-xserver-Xnest
%defattr(644,root,root,755)
@@ -468,6 +467,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.160 2008/12/03 10:03:26 arekm
+- builds (without dri2 and without dmx)
+
Revision 1.159 2008/12/03 08:45:19 arekm
- 1.5.99.2; dri2 needs unreleasted mesa, xserver itself needs unreleased libXi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.159&r2=1.160&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
