Author: glen Date: Tue Jan 8 08:53:15 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- BR pixman-devel (from xorg-server spec)
---- Files affected:
SPECS:
vnc.spec (1.79 -> 1.80)
---- Diffs:
================================================================
Index: SPECS/vnc.spec
diff -u SPECS/vnc.spec:1.79 SPECS/vnc.spec:1.80
--- SPECS/vnc.spec:1.79 Tue Jan 8 02:33:00 2008
+++ SPECS/vnc.spec Tue Jan 8 09:53:09 2008
@@ -72,6 +72,7 @@
BuildRequires: jar
BuildRequires: libstdc++-devel
BuildRequires: libtool
+BuildRequires: pixman-devel >= 0.9.5
BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
@@ -235,6 +236,9 @@
%patch101 -p0
%ifarch %{x8664} i486
%patch102 -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
%endif
cd ../..
@@ -273,6 +277,8 @@
unix/xorg-server-*/{cfb/cfb.h,fb/fb.h,fb/fbrop.h} \
unix/xorg-server-*/hw/vnc/
+# symbol clash with vnc code
+# TODO pixman headers have same problem...
sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
unix/xorg-server-*/hw/vnc/{cfb,fb,fbrop}.h
@@ -405,6 +411,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.80 2008-01-08 08:53:09 glen
+- BR pixman-devel (from xorg-server spec)
+
Revision 1.79 2008-01-08 01:33:00 glen
- -drop-GLinterface.patch, -mesa.patch outdated (assume)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vnc.spec?r1=1.79&r2=1.80&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
