rpms/vnc/devel vnc-includes.patch, NONE, 1.1 Makefile.am, 1.2, 1.3 vnc-xorg.patch, 1.2, 1.3 vnc.spec, 1.189, 1.190

Adam Tkac (atkac) fedora-extras-commits at redhat.com
Wed Apr 9 09:57:10 UTC 2008 

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9755

Modified Files:
	Makefile.am vnc-xorg.patch vnc.spec 
Added Files:
	vnc-includes.patch 
Log Message:
- rebuild with -O2
- fixed some #includes in xvnc.cc


vnc-includes.patch:

--- NEW FILE vnc-includes.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc.includes vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc.includes	2008-04-04 13:54:24.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc	2008-04-04 13:54:49.000000000 +0200
@@ -22,8 +22,8 @@
 extern "C" {
 #define class c_class
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.includes vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.includes	2008-04-04 13:55:07.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc	2008-04-04 13:55:29.000000000 +0200
@@ -50,9 +50,9 @@ extern char *display;
 #include "resource.h"
 #include "cursorstr.h"
 #include "windowstr.h"
-#include "mi/mi.h"
+#include "mi.h"
 #define XK_CYRILLIC
-#include "keysym.h"
+#include <X11/keysym.h>
 #undef public
 #undef class
 }
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc.includes vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc.includes	2008-04-04 13:57:34.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc	2008-04-04 13:57:44.000000000 +0200
@@ -68,7 +68,7 @@ extern "C" {
 #include <X11/XWDFile.h>
 #include "dix.h"
 #include "inputstr.h"
-#include "keysym.h"
+#include <X11/keysym.h>
   extern int defaultColorVisualClass;
 #undef new
 #undef class


Index: Makefile.am
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	11 Mar 2008 13:25:25 -0000	1.2
+++ Makefile.am	9 Apr 2008 09:56:29 -0000	1.3
@@ -1,4 +1,3 @@
-# Define includes and libraries
 LIB_DIR=$(top_srcdir)/../../common
 BIN_DIR=$(top_srcdir)/..
 
@@ -6,71 +5,47 @@
 
 noinst_LTLIBRARIES = libvnccommon.la
 
-libvnccommon_la_SOURCES = \
-	vncExtInit.cc vncHooks.cc XserverDesktop.cc
+libvnccommon_la_SOURCES = vncExtInit.cc vncHooks.cc XserverDesktop.cc
 
-libvnccommon_la_CPPFLAGS = \
-	-DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
-	-I/usr/include/X11 -Iinclude -I$(top_srcdir) \
-	-I$(LIB_DIR) -I$(BIN_DIR)/vncconfig \
-	-DGC_HAS_COMPOSITE_CLIP
+libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
+	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
+	-I$(BIN_DIR)/vncconfig -DGC_HAS_COMPOSITE_CLIP $(XVNC_CPPFLAGS) \
+	-I$(includedir)/pixman-1
 
 bin_PROGRAMS = Xvnc
 
-Xvnc_SOURCES = \
-	xvnc.cc $(top_srcdir)/Xext/dpmsstubs.c $(top_srcdir)/Xi/stubs.c \
-	$(top_srcdir)/mi/miinitext.c $(top_srcdir)/fb/fbcmap_mi.c
-
-nodist_Xvnc_SOURCES = \
-	fbrop.h fb.h pixman.h
-
-Xvnc_CPPFLAGS = \
-	-DHAVE_DIX_CONFIG_H -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS -DXFree86Server \
-	-DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
-	-I$(LIB_DIR) \
-	-I$(top_srcdir)/include -I/usr/include/X11 -I$(top_srcdir)/mi \
-	-I$(top_srcdir)/render -I$(top_srcdir)/Xext
-
-Xvnc_LDADD = \
-	$(top_srcdir)/Xext/libXext.la $(top_srcdir)/dix/libdix.la \
-	$(top_srcdir)/config/libconfig.a $(top_srcdir)/Xi/libXi.la \
-	$(top_srcdir)/xkb/libxkb.la $(top_srcdir)/xkb/libxkbstubs.la \
-	$(top_srcdir)/record/librecord.la $(top_srcdir)/GL/glx/libglx.la \
-	$(top_srcdir)/GL/mesa/libGLcore.la $(top_srcdir)/dbe/libdbe.la \
-	$(top_srcdir)/damageext/libdamageext.la $(top_srcdir)/fb/libfb.la \
-	$(top_srcdir)/miext/damage/libdamage.la $(top_srcdir)/mi/libmi.la \
-	$(top_srcdir)/xfixes/libxfixes.la $(top_srcdir)/XTrap/libxtrap.la \
-	$(top_srcdir)/randr/librandr.la $(top_srcdir)/render/librender.la \
-	$(top_srcdir)/os/libos.la libvnccommon.la $(RFB_LIBS) \
-	-lXfont -lX11 -lpixman-1 -lcrypto -lselinux
+Xvnc_SOURCES = xvnc.cc $(top_srcdir)/Xext/dpmsstubs.c \
+	$(top_srcdir)/Xi/stubs.c $(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/fb/fbcmap_mi.c
+
+nodist_Xvnc_SOURCES = fbrop.h fb.h pixman.h
+
+Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
+	-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
+	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
+	-I$(top_srcdir)/include -I$(includedir)/pixman-1
+
+Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(RFB_LIBS) \
+	$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11
 
 libvnc_la_LTLIBRARIES = libvnc.la
 libvnc_ladir = $(moduledir)/extensions
 
-libvnc_la_SOURCES = \
-	xf86vncModule.cc
-
-libvnc_la_CPPFLAGS = \
-		-I$(LIB_DIR) \
-		-I$(top_srcdir)/hw/xfree86/common \
-		-I$(top_srcdir)/hw/xfree86/os-support \
-		-I$(top_srcdir)/hw/xfree86/os-support/bus \
-		-DXFree86Module -DXFree86LOADER -DIN_MODULE
+libvnc_la_SOURCES = xf86vncModule.cc
 
-libvnc_la_CXXFLAGS = \
-	$(COMPILER_FLAGS)
+libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) \
+	-I$(top_srcdir)/hw/xfree86/common \
+	-I$(top_srcdir)/hw/xfree86/os-support \
+	-I$(top_srcdir)/hw/xfree86/os-support/bus \
+	-DXFree86Module -DXFree86LOADER -DIN_MODULE \
+	-I$(includedir)/pixman-1
 
-libvnc_la_LDFLAGS = \
-	-module -avoid-version
+libvnc_la_LDFLAGS = -module -avoid-version
 
-libvnc_la_LIBADD = \
-	libvnccommon.la $(RFB_LIBS)
+libvnc_la_LIBADD = libvnccommon.la $(RFB_LIBS)
 
 # C++ hacks
-BUILT_SOURCES = \
-	$(nodist_Xvnc_SOURCES)
+BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
 
 fb.h: $(top_srcdir)/fb/fb.h
 	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h

vnc-xorg.patch:

Index: vnc-xorg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc-xorg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vnc-xorg.patch	13 Mar 2008 15:23:57 -0000	1.2
+++ vnc-xorg.patch	9 Apr 2008 09:56:29 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up xorg-x11-server-source/mi/miinitext.c.orig xorg/mi/miinitext.c
---- xorg-x11-server-source/mi/miinitext.c.orig	2008-01-28 10:18:46.000000000 +0100
-+++ xorg-x11-server-source/mi/miinitext.c	2008-01-28 10:18:58.000000000 +0100
+diff -up mi/miinitext.c.orig xorg/mi/miinitext.c
+--- mi/miinitext.c.orig	2008-01-28 10:18:46.000000000 +0100
++++ mi/miinitext.c	2008-01-28 10:18:58.000000000 +0100
 @@ -289,6 +289,7 @@ extern void BigReqExtensionInit(INITARGS
  #ifdef MITMISC
  extern void MITMiscExtensionInit(INITARGS);
@@ -17,9 +17,9 @@
  #ifdef XIDLE
      if (!noXIdleExtension) XIdleExtensionInit();
  #endif
-diff -up xorg-x11-server-source/hw/Makefile.am.orig xorg/hw/Makefile.am
---- xorg-x11-server-source/hw/Makefile.am.orig	2008-01-28 10:18:46.000000000 +0100
-+++ xorg-x11-server-source/hw/Makefile.am	2008-01-28 10:18:58.000000000 +0100
+diff -up hw/Makefile.am.orig xorg/hw/Makefile.am
+--- hw/Makefile.am.orig	2008-01-28 10:18:46.000000000 +0100
++++ hw/Makefile.am	2008-01-28 10:18:58.000000000 +0100
 @@ -43,7 +43,8 @@ SUBDIRS =			\
  	$(DMX_SUBDIRS)		\
  	$(KDRIVE_SUBDIRS)	\
@@ -30,9 +30,9 @@
  
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
  
-diff -up xorg-x11-server-source/configure.ac.orig xorg/configure.ac
---- xorg-x11-server-source/configure.ac.orig	2008-01-28 10:18:45.000000000 +0100
-+++ xorg-x11-server-source/configure.ac	2008-01-28 10:18:58.000000000 +0100
+diff -up configure.ac.orig xserver/configure.ac
+--- configure.ac.orig	2008-03-25 14:32:36.000000000 +0100
++++ configure.ac	2008-03-26 20:14:16.000000000 +0100
 @@ -29,7 +29,6 @@ AC_PREREQ(2.57)
  AC_INIT([xorg-server], 1.4.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
  AC_CONFIG_SRCDIR([Makefile.am])
@@ -41,7 +41,17 @@
  
  dnl this gets generated by autoheader, and thus contains all the defines.  we
  dnl don't ever actually use it, internally.
-@@ -2173,6 +2172,7 @@ hw/dmx/input/Makefile
+@@ -1206,6 +1205,9 @@ if test "x$XVFB" = xyes; then
+ 	AC_SUBST([XVFB_SYS_LIBS])
+ fi
+ 
++dnl Xvnc DDX
++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"])
+ 
+ dnl Xnest DDX
+ 
+@@ -2186,6 +2188,7 @@ hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
  hw/dmx/Makefile
  hw/vfb/Makefile


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- vnc.spec	19 Mar 2008 11:47:44 -0000	1.189
+++ vnc.spec	9 Apr 2008 09:56:29 -0000	1.190
@@ -3,7 +3,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   28%{?dist}
+Release:   29%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   Makefile.am
@@ -46,6 +46,7 @@
 Patch49:   vnc-clipboard.patch
 Patch50:   vnc-scrollbars.patch
 Patch51:   vnc-bounds.patch
+Patch52:   vnc-includes.patch
 License:   GPLv2
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -107,7 +108,7 @@
 %patch9 -p1 -b .vncpasswd
 %patch11 -p1 -b .modular-xorg
 pushd unix/xorg-x11-server-source
-%patch40 -p1 -b .vnc
+%patch40 -p0 -b .vnc
 popd
 %patch12 -p1 -b .nohttpd
 %patch15 -p1 -b .viewer-reparent
@@ -142,9 +143,10 @@
 %patch49 -p1 -b .clipboard
 %patch50 -p1 -b .scrollbars
 %patch51 -p1 -b .bounds
+%patch52 -p1 -b .includes
 
 %build
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0"
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 export CXXFLAGS="$CFLAGS"
 
 pushd common
@@ -332,6 +334,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Wed Apr 09 2008 Adam Tkac <atkac redhat com> 4.1.2-29
+- rebuild with -O2
+
 * Wed Mar 19 2008 Adam Tkac <atkac redhat com> 4.1.2-28
 - validate framebuffer bounds before GetImage call (#430468, improved fix)

More information about the fedora-extras-commits mailing list