rpms/vnc/devel vnc-F9mesa.patch, NONE, 1.1 vnc-gcc43.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 sources, 1.23, 1.24 vnc.spec, 1.181, 1.182
Adam Tkac (atkac)
fedora-extras-commits at redhat.com
Tue Jan 22 17:16:50 UTC 2008
Author: atkac
Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23266
Modified Files:
.cvsignore sources vnc.spec
Added Files:
vnc-F9mesa.patch vnc-gcc43.patch
Log Message:
- start use F8 xserver codebase
- compat patches and gcc 4.3 patches
- use catalogue:/etc/X11/fontpath.d,built-ins as default fontpath
(#390971)
vnc-F9mesa.patch:
--- NEW FILE vnc-F9mesa.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_dispatch.c.rawhidemesa vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_dispatch.c
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_dispatch.c.rawhidemesa 2008-01-09 14:38:43.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_dispatch.c 2008-01-09 14:48:56.000000000 +0100
@@ -5169,31 +5169,6 @@ void __glXDisp_LoadProgramNV(GLbyte * pc
) );
}
-void __glXDisp_ProgramParameter4dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
- if ((unsigned long)(pc) & 7) {
- (void) memmove(pc-4, pc, 40);
- pc -= 4;
- }
-#endif
-
- CALL_ProgramParameter4dvNV( GET_DISPATCH(), (
- *(GLenum *)(pc + 0),
- *(GLuint *)(pc + 4),
- (const GLdouble *)(pc + 8)
- ) );
-}
-
-void __glXDisp_ProgramParameter4fvNV(GLbyte * pc)
-{
- CALL_ProgramParameter4fvNV( GET_DISPATCH(), (
- *(GLenum *)(pc + 0),
- *(GLuint *)(pc + 4),
- (const GLfloat *)(pc + 8)
- ) );
-}
-
void __glXDisp_ProgramParameters4dvNV(GLbyte * pc)
{
const GLuint num = *(GLuint *)(pc + 8);
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_table.c.rawhidemesa vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_table.c
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_table.c.rawhidemesa 2008-01-09 14:47:05.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_table.c 2008-01-09 14:47:24.000000000 +0100
@@ -644,7 +644,7 @@ static const void *Render_function_table
/* [ 301] = 4181 */ {__glXDisp_ExecuteProgramNV, __glXDispSwap_ExecuteProgramNV},
/* [ 302] = 4182 */ {__glXDisp_RequestResidentProgramsNV, __glXDispSwap_RequestResidentProgramsNV},
/* [ 303] = 4183 */ {__glXDisp_LoadProgramNV, __glXDispSwap_LoadProgramNV},
- /* [ 304] = 4184 */ {__glXDisp_ProgramParameter4fvNV, __glXDispSwap_ProgramParameter4fvNV},
+ /* [ 304] = 4184 */ {__glXDisp_ProgramEnvParameter4fvARB, __glXDispSwap_ProgramEnvParameter4fvARB},
/* [ 305] = 4185 */ {__glXDisp_ProgramEnvParameter4dvARB, __glXDispSwap_ProgramEnvParameter4dvARB},
/* [ 306] = 4186 */ {__glXDisp_ProgramParameters4fvNV, __glXDispSwap_ProgramParameters4fvNV},
/* [ 307] = 4187 */ {__glXDisp_ProgramParameters4dvNV, __glXDispSwap_ProgramParameters4dvNV},
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_dispatch_swap.c.rawhidemesa vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_dispatch_swap.c
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_dispatch_swap.c.rawhidemesa 2008-01-09 14:49:12.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/GL/glx/indirect_dispatch_swap.c 2008-01-09 14:49:25.000000000 +0100
@@ -5325,31 +5325,6 @@ void __glXDispSwap_LoadProgramNV(GLbyte
) );
}
-void __glXDispSwap_ProgramParameter4dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
- if ((unsigned long)(pc) & 7) {
- (void) memmove(pc-4, pc, 40);
- pc -= 4;
- }
-#endif
-
- CALL_ProgramParameter4dvNV( GET_DISPATCH(), (
- (GLenum )bswap_ENUM ( pc + 0 ),
- (GLuint )bswap_CARD32 ( pc + 4 ),
- (const GLdouble *)bswap_64_array( (uint64_t *) (pc + 8), 4 )
- ) );
-}
-
-void __glXDispSwap_ProgramParameter4fvNV(GLbyte * pc)
-{
- CALL_ProgramParameter4fvNV( GET_DISPATCH(), (
- (GLenum )bswap_ENUM ( pc + 0 ),
- (GLuint )bswap_CARD32 ( pc + 4 ),
- (const GLfloat *)bswap_32_array( (uint32_t *) (pc + 8), 4 )
- ) );
-}
-
void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc)
{
const GLuint num = (GLuint )bswap_CARD32 ( pc + 8 );
vnc-gcc43.patch:
--- NEW FILE vnc-gcc43.patch ---
diff -up vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.gcc43 vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx
--- vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.gcc43 2008-01-09 14:51:54.000000000 +0100
+++ vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx 2008-01-09 14:51:54.000000000 +0100
@@ -37,6 +37,9 @@
#include <fcntl.h>
#endif
+extern "C" {
+#include <stdlib.h>
+}
#include <network/TcpSocket.h>
#include <rfb/util.h>
#include <rfb/LogWriter.h>
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/render/picturestr.h.gcc43 vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/render/picturestr.h
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/render/picturestr.h.gcc43 2008-01-09 14:57:58.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/render/picturestr.h 2008-01-09 14:58:08.000000000 +0100
@@ -26,6 +26,7 @@
#ifndef _PICTURESTR_H_
#define _PICTURESTR_H_
+#include <X11/X.h>
#include "glyphstr.h"
#include "scrnintstr.h"
#include "resource.h"
diff -up vnc-4_1_2-unixsrc/unix/tx/TXImage.cxx.gcc43 vnc-4_1_2-unixsrc/unix/tx/TXImage.cxx
--- vnc-4_1_2-unixsrc/unix/tx/TXImage.cxx.gcc43 2006-05-15 18:56:20.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/tx/TXImage.cxx 2008-01-09 14:51:54.000000000 +0100
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <strings.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
diff -up vnc-4_1_2-unixsrc/unix/x0vncserver/Image.cxx.gcc43 vnc-4_1_2-unixsrc/unix/x0vncserver/Image.cxx
--- vnc-4_1_2-unixsrc/unix/x0vncserver/Image.cxx.gcc43 2006-05-15 18:56:20.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/x0vncserver/Image.cxx 2008-01-09 14:51:54.000000000 +0100
@@ -21,6 +21,7 @@
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 5 Mar 2007 15:12:02 -0000 1.22
+++ .cvsignore 22 Jan 2008 17:16:12 -0000 1.23
@@ -1,2 +1,3 @@
vnc-4_1_2-unixsrc.tar.gz
vnc-4_1-javasrc.tar.gz
+xserver-1.3.0.0-37.fc8.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 5 Mar 2007 15:12:02 -0000 1.23
+++ sources 22 Jan 2008 17:16:12 -0000 1.24
@@ -1,2 +1,3 @@
cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz
9407ce1f215aefca77bef12670745280 vnc-4_1-javasrc.tar.gz
+db16d9f0e5b19a34ac5e6f353b79ec8d xserver-1.3.0.0-37.fc8.tar.bz2
Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- vnc.spec 23 Oct 2007 17:38:06 -0000 1.181
+++ vnc.spec 22 Jan 2008 17:16:12 -0000 1.182
@@ -4,7 +4,7 @@
Summary: A remote display system
Name: vnc
Version: 4.1.2
-Release: 23%{?dist}
+Release: 24%{?dist}
URL: http://www.realvnc.com
Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
Source1: http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -12,6 +12,10 @@
Source3: vnc-16x16.png
Source4: vnc-24x24.png
Source5: vnc-48x48.png
+
+# XXX Temporary build with F8 xserver due new Input events handling in 1.4.99
+Source6: xserver-1.3.0.0-37.fc8.tar.bz2
+
Patch0: vnc-cookie.patch
Patch1: vnc-gcc4.patch
Patch2: vnc-use-fb.patch
@@ -37,6 +41,8 @@
Patch34: vnc-vsnprintf.patch
Patch36: vnc-24bit.patch
Patch37: vnc-noxorg.patch
+Patch38: vnc-gcc43.patch
+Patch39: vnc-F9mesa.patch
License: GPLv2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -52,7 +58,7 @@
BuildRequires: libXtst-devel, libfontenc-devel, xorg-x11-util-macros
BuildRequires: libXt-devel
BuildRequires: libstdc++-devel, gcc-c++, libselinux-devel
-BuildRequires: xorg-x11-server-source
+#BuildRequires: xorg-x11-server-source
BuildRequires: mesa-libGL-devel >= 6.5.2, mesa-source >= 6.5.2, libdrm-devel
Requires: gtk2 >= 2.6
@@ -87,7 +93,13 @@
%prep
%setup -q -n vnc-%{vnc_version}-unixsrc -a1
-cp -r %{_datadir}/xorg-x11-server-source unix
+
+# XXX - new event handling in 1.4.99 xserver
+#cp -r %{_datadir}/xorg-x11-server-source unix
+pushd unix; mkdir xorg-x11-server-source; cd xorg-x11-server-source
+tar xf %{SOURCE6}
+popd
+
%patch0 -p1 -b .cookie
%patch1 -p1 -b .gcc4
%patch2 -p1 -b .use-fb
@@ -113,6 +125,8 @@
%patch34 -p1 -b .vsnprintf
%patch36 -p1 -b .24bit
%patch37 -p1 -b .nomodule
+%patch38 -p1 -b .gcc43
+%patch39 -p1 -b .F9mesa
cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
unix/xc/programs/Xserver/Xvnc.man \
@@ -126,7 +140,7 @@
%build
cd common
-autoreconf --install --force
+autoreconf -fiv
%configure
make %{?_smp_mflags}
@@ -134,7 +148,7 @@
make JAVAC="gcj -C" JAR=fastjar %{?_smp_mflags}
cd ../../unix
-autoreconf --install --force
+autoreconf -fiv
%configure
make %{?_smp_mflags}
@@ -150,9 +164,9 @@
--disable-composite \
--enable-xtrap \
--enable-xcsecurity \
- --with-default-font-path="unix/:7100,built-ins" \
+ --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
--with-fontdir=%{_datadir}/X11/fonts \
- --with-os-name="Fedora Core 8" \
+ --with-os-name="Fedora 9" \
--with-os-vendor="Red Hat, Inc." \
--with-xkb-output=%{_localstatedir}/lib/xkb \
--with-rgb-path=%{_datadir}/X11/rgb \
@@ -312,6 +326,12 @@
%{_libdir}/librfb.so.*
%changelog
+* Wed Jan 09 2008 Adam Tkac <atkac redhat com> 4.1.2-24
+- start use F8 xserver codebase
+- compat patches and gcc 4.3 patches
+- use catalogue:/etc/X11/fontpath.d,built-ins as default fontpath
+ (#390971)
+
* Tue Oct 23 2007 Adam Tkac <atkac redhat com> 4.1.2-23
- disabled Composite extension (#242280, #339811)
More information about the fedora-extras-commits
mailing list