rpms/vnc/devel vnc-xorg.patch,1.4,1.5 vnc.spec,1.202,1.203

Fri Oct 3 12:52:25 UTC 2008

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2230

Modified Files:
	vnc-xorg.patch vnc.spec 
Log Message:
- updated patches due rpm 4.6 (#465099)
- build with -O2


vnc-xorg.patch:

Index: vnc-xorg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc-xorg.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- vnc-xorg.patch	16 Jul 2008 11:40:44 -0000	1.4
+++ vnc-xorg.patch	3 Oct 2008 12:51:54 -0000	1.5
@@ -1,25 +1,29 @@
 diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc	2008-07-16 13:33:14.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac	2008-07-16 13:33:50.000000000 +0200
-@@ -29,7 +29,6 @@ AC_PREREQ(2.57)
- AC_INIT([xorg-server], 1.4.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc	2008-10-03 14:27:43.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac	2008-10-03 14:29:10.000000000 +0200
+@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.5.1, [https://b
+ RELEASE_DATE="23 September 2008"
  AC_CONFIG_SRCDIR([Makefile.am])
  AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 -AM_MAINTAINER_MODE
  
  dnl this gets generated by autoheader, and thus contains all the defines.  we
  dnl don't ever actually use it, internally.
-@@ -1212,6 +1211,9 @@ if test "x$XVFB" = xyes; then
+@@ -1214,6 +1213,13 @@ 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 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
  
-@@ -2176,6 +2178,7 @@ hw/dmx/input/Makefile
+@@ -2178,6 +2184,7 @@ hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
  hw/dmx/Makefile
  hw/vfb/Makefile
@@ -28,8 +32,8 @@
  hw/xgl/egl/Makefile
  hw/xgl/egl/module/Makefile
 diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc	2008-07-16 13:33:14.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am	2008-07-16 13:33:15.000000000 +0200
+--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc	2008-10-03 14:27:44.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am	2008-10-03 14:27:47.000000000 +0200
 @@ -43,7 +43,8 @@ SUBDIRS =			\
  	$(DMX_SUBDIRS)		\
  	$(KDRIVE_SUBDIRS)	\
@@ -41,8 +45,8 @@
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
  
 diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc	2008-07-16 13:33:14.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c	2008-07-16 13:33:15.000000000 +0200
+--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc	2008-10-03 14:27:44.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c	2008-10-03 14:27:47.000000000 +0200
 @@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS
  #ifdef MITMISC
  extern void MITMiscExtensionInit(INITARGS);


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- vnc.spec	28 Jul 2008 14:19:38 -0000	1.202
+++ vnc.spec	3 Oct 2008 12:51:55 -0000	1.203
@@ -3,7 +3,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   34.2%{?dist}
+Release:   35%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   Makefile.am
@@ -144,7 +144,7 @@
 %patch54 -p1 -b .rh212985
 
 %build
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0"
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 export CXXFLAGS="$CFLAGS"
 
 pushd common
@@ -169,7 +169,7 @@
         --disable-xprint \
         --disable-static \
         --disable-composite \
-	--enable-xtrap \
+	--disable-xtrap \
 	--enable-xcsecurity \
 	--with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \
@@ -179,10 +179,11 @@
         --with-rgb-path=%{_datadir}/X11/rgb \
 	--enable-install-libxf86config \
 	--disable-xevie \
-	--disable-dri \
+	--disable-dri2 \
         --enable-glx \
 	--disable-config-dbus \
-	--disable-config-hal
+	--disable-config-hal \
+	--with-dri-driver-path=%{_libdir}/dri
 
 make %{?_smp_mflags}
 popd
@@ -331,6 +332,10 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Fri Oct 03 2008 Adam Tkac <atkac redhat com> 4.1.2-35
+- updated patches due rpm 4.6 (#465099)
+- build with -O2
+
 * Mon Jul 28 2008 Adam Tkac <atkac redhat com> 4.1.2-34.2
 - removed initscript %%config attribute
 


