rpms/nx/devel NX-noansi.diff, NONE, 1.1 NX.diff, NONE, 1.1 nx.spec, NONE, 1.1 nxagent, NONE, 1.1 p_XFree86-4.3-ppc64.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Richard A. Stout (zipsonic)
fedora-extras-commits at redhat.com
Wed May 11 21:59:53 UTC 2005
Author: zipsonic
Update of /cvs/extras/rpms/nx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3160/devel
Modified Files:
.cvsignore sources
Added Files:
NX-noansi.diff NX.diff nx.spec nxagent
p_XFree86-4.3-ppc64.diff
Log Message:
auto-import nx-1.4.0-5 on branch devel from nx-1.4.0-5.src.rpm
NX-noansi.diff:
--- NEW FILE NX-noansi.diff ---
--- lib/Xxf86dga/Imakefile.noansi 2004-04-19 15:55:51.000000000 +0000
+++ lib/Xxf86dga/Imakefile 2004-04-19 20:10:55.000000000 +0000
@@ -36,6 +36,11 @@
#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
+#if defined(ia64Architecture)
+#undef DefaultCCOptions
+#define DefaultCCOptions GccWarningOptions
+#endif
+
#include <Library.tmpl>
MANDIR = $(LIBMANDIR)
--- lib/Xaw6/Imakefile.orig 2004-04-19 20:34:53.000000000 +0000
+++ lib/Xaw6/Imakefile 2004-04-19 20:35:05.000000000 +0000
@@ -115,6 +115,11 @@
INCLUDES = -I$(AWIDGETSRC)
+#if defined(ia64Architecture)
+#undef DefaultCCOptions
+#define DefaultCCOptions GccWarningOptions
+#endif
+
#include <Library.tmpl>
#if DoSharedLib && SharedDataSeparation
--- lib/Xaw/Imakefile.orig 2004-04-19 20:38:05.000000000 +0000
+++ lib/Xaw/Imakefile 2004-04-19 20:38:30.000000000 +0000
@@ -194,6 +194,11 @@
XawI18n.o \
XawInit.o
+#if defined(ia64Architecture)
+#undef DefaultCCOptions
+#define DefaultCCOptions GccWarningOptions
+#endif
+
#include <Library.tmpl>
#if DoSharedLib && SharedDataSeparation
--- programs/xedit/lisp/Imakefile.orig 2004-04-19 21:52:42.000000000 +0000
+++ programs/xedit/lisp/Imakefile 2004-04-19 21:53:11.000000000 +0000
@@ -98,6 +98,11 @@
write.o \
xedit.o
+#if defined(ia64Architecture)
+#undef DefaultCCOptions
+#define DefaultCCOptions GccWarningOptions
+#endif
+
#include <Library.tmpl>
AllTarget(ProgramTargetName($(SAMP)))
--- programs/Xserver/hw/xfree86/fbdevhw/Imakefile.orig 2004-04-20 02:04:59.000000000 +0000
+++ programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2004-04-20 02:06:13.000000000 +0000
@@ -1,6 +1,10 @@
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/Imakefile,v 1.11tsi Exp $
#define IHaveModules
+#if defined(ia64Architecture)
+#undef DefaultCCOptions
+#define DefaultCCOptions GccWarningOptions
+#endif
#include <Server.tmpl>
#if defined(LinuxArchitecture) && LinuxFBDevSupport
NX.diff:
--- NEW FILE NX.diff ---
--- nxcomp/configure.in.old 2004-05-17 13:33:16.748612843 +0000
+++ nxcomp/configure.in 2004-05-17 13:37:12.710956205 +0000
@@ -5,10 +5,8 @@
AC_INIT(NX.h)
AC_PREREQ(2.13)
-dnl Reset default compilation flags.
-
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CFLAGS="-O2 -fPIC"
+CXXFLAGS="-O2 -fPIC"
dnl Reset default linking directives.
--- nxcompext/configure.in.old 2004-05-17 14:24:52.506541849 +0000
+++ nxcompext/configure.in 2004-05-17 14:25:03.294318138 +0000
@@ -5,8 +5,8 @@
AC_PREREQ(2.13)
dnl Reset default compilation flags.
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="-O2 -fPIC"
+CPPFLAGS="-O2 -fPIC"
dnl Check for programs.
AC_PROG_CXX
--- nx-X11/lib/X11/XlcDL.c.old 2004-05-17 15:01:39.385673123 +0000
+++ nx-X11/lib/X11/XlcDL.c 2004-05-17 15:02:15.963136940 +0000
@@ -58,10 +58,8 @@
#ifdef _LP64
# if defined(__sparcv9)
# define _MACH64_NAME "sparcv9"
-# elif defined(__ia64__)
-# undef MACH64_NAME
# else
-# error "Unknown architecture"
+# undef MACH64_NAME
# endif /* defined(__sparcv9) */
# ifdef _MACH64_NAME
# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
--- nx-X11/lib/xtrans/Xtranssock.c.old 2004-05-17 19:35:29.031496228 +0000
+++ nx-X11/lib/xtrans/Xtranssock.c 2004-05-17 19:41:28.438822523 +0000
@@ -2118,7 +2118,7 @@
* platforms as well.
*/
- #ifndef __sun
+ #if !defined(__sun) && !defined(__ia64__)
sa.sa_restorer = NULL;
--- nxviewer/nxviewer/Imakefile.old 2004-05-31 15:33:45.000000000 +0000
+++ nxviewer/nxviewer/Imakefile 2004-05-31 15:35:06.000000000 +0000
@@ -44,6 +44,8 @@
USRLIBDIR = ../../nx-X11/exports/lib
+XPLIB =
+
#ifdef SunArchitecture
USRLIBDIR = /usr/NX/lib
SUN_LIB = -lX11 -lXext -L/usr/openwin/lib
--- nx-X11/programs/Imakefile.old 2004-09-11 03:30:15.738465241 +0200
+++ nx-X11/programs/Imakefile 2004-09-11 03:30:39.661194763 +0200
@@ -125,7 +125,7 @@
#if defined(NXEmbeddedXServer)
SUBDIRS = $(XSSRCDIR)
#else
-SUBDIRS = $(XSSRCDIR) nxauth
+SUBDIRS = $(XSSRCDIR)
#endif
#else
SUBDIRS = \
--- NEW FILE nx.spec ---
Name: nx
Version: 1.4.0
Release: 5
Summary: Proxy system for X11
Group: Applications/Internet
License: GPL, MIT/X11 for X11 bits
URL: http://www.nomachine.com
Source0: nxproxy-%{version}-2.tar.gz
Source1: nxcomp-%{version}-31.tar.gz
Source2: nxcompext-%{version}-3.tar.gz
Source3: nx-X11-%{version}-10.tar.gz
Source4: nxagent-%{version}-65.tar.gz
Source5: nxviewer-%{version}-4.tar.gz
Source6: nxdesktop-%{version}-61.tar.gz
Source7: nxscripts-%{version}-3.tar.gz
Source8: nxagent
Source9: docs.tar.bz2
Patch0: NX.diff
Patch1: NX-noansi.diff
Patch2: p_XFree86-4.3-ppc64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel audiofile-devel openssl-devel libjpeg-devel libpng-devel XFree86-devel
Requires: xorg-x11 xorg-x11-tools
%description
NX provides a proxy system for the X Window System.
%prep
%setup -q -T -c %{name}-%{version} -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7
%patch0 -p0
pushd nx-X11
%patch1 -p0
%patch2 -p1
popd
ln -s rdesktop.1 nxdesktop/doc/nxdesktop.1
cat >> nx-X11/config/cf/host.def << EOF
#ifdef i386Architecture
#undef DefaultGcc2i386Opt
#define DefaultGcc2i386Opt $RPM_OPT_FLAGS -fno-strict-aliasing
#endif
#ifdef MipsArchitecture
#undef DefaultGcc2MipsOpt
#define DefaultGcc2MipsOpt $RPM_OPT_FLAGS -fno-strict-aliasing
#endif
#ifdef s390xArchitecture
#undef OptimizedCDebugFlags
#define OptimizedCDebugFlags $RPM_OPT_FLAGS -fno-strict-aliasing
#endif
EOF
%build
%ifarch x86_64
export CFLAGS="%{optflags} -fPIC"
export CXXFLAGS="%{optflags} -fPIC"
%else
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
%endif
perl -pi -e"s|CXXFLAGS=.-O.*|CXXFLAGS=$CXXFLAGS|" */configure
# build Compression Library and Proxy
for i in nxcomp nxproxy; do
pushd $i; ./configure; make; popd
done
# build X11 Support Libraries and Agents
pushd nx-X11
make World
popd
# build Extended Compression Library
pushd nxcompext
./configure; make
popd
# build RFB Agent
pushd nxviewer
xmkmf -a
cp -a /usr/X11R6/%{_lib}/libXp.so* ../nx-X11/exports/lib/
make 2> /dev/null
popd
# build RDP Agent
%ifnarch ppc ppc64 s390 s390x
pushd nxdesktop
./configure --prefix=%{_prefix} --sharedir=%{_datadir}/NX
make
popd
%endif
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/NX/lib
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
# install X11 Support Libraries and Agents
cp -a nx-X11/lib/X11/libX11.so.* \
nx-X11/lib/Xext/libXext.so.* \
nx-X11/lib/Xrender/libXrender.so.* \
$RPM_BUILD_ROOT/%{_libdir}/NX/lib
install -m 755 nx-X11/programs/Xserver/nxagent \
$RPM_BUILD_ROOT/%{_libdir}/NX
install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/%{_bindir}
# install Compression Libraries and Proxy
cp -a nxcomp/libXcomp.so.* $RPM_BUILD_ROOT/%{_libdir}/NX/lib
cp -a nxcompext/libXcompext.so.* $RPM_BUILD_ROOT/%{_libdir}/NX/lib
install -m 755 nxproxy/nxproxy $RPM_BUILD_ROOT/%{_libdir}/NX
ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxproxy
# install RFB Agent
pushd nxviewer
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/usr/X11R6/bin/nxviewer $RPM_BUILD_ROOT/%{_libdir}/NX
ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxviewer
chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nxviewer
mv $RPM_BUILD_ROOT/usr/X11R6/bin/nxpasswd $RPM_BUILD_ROOT/%{_bindir}
popd
# install RDP Agent
%ifnarch ppc ppc64 s390 s390x
pushd nxdesktop
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_bindir}/nxdesktop $RPM_BUILD_ROOT/%{_libdir}/NX
ln -snf nxagent $RPM_BUILD_ROOT/%{_bindir}/nxdesktop
chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nxdesktop
mv $RPM_BUILD_ROOT/usr/man/man1/nxdesktop.1 \
$RPM_BUILD_ROOT/%{_mandir}/man1/nxdesktop.1
rm -rf $RPM_BUILD_ROOT/usr/man
popd
%endif
# install scripts
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
cp -r nxscripts $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
# documentation and license
tar xjf %{SOURCE9} -C $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
install -m 644 nxcomp/LICENSE $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX
for i in nxcomp nxdesktop; do
mkdir $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/$i
done
install -m 644 nxcomp/README $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/nxcomp
install -m 644 nxdesktop/README $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/nxdesktop
rm -rf nxdesktop/doc/CVS
cp -r nxdesktop/doc $RPM_BUILD_ROOT/%{_datadir}/doc/packages/NX/nxdesktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/packages/NX
%{_bindir}/*
%dir %{_libdir}/NX
%dir %{_libdir}/NX/lib
%{_libdir}/NX/*
%ifnarch ppc ppc64 s390 s390x
%dir %{_datadir}/NX
%{_mandir}/man1/nxdesktop.1.gz
%{_datadir}/NX/keymaps-windows/
%endif
%changelog
* Mon Apr 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.0-5
- spec cleanups
- reworked Patch1 to make it apply without arch conditional
* Mon Feb 14 2005 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-4
- updated nx-X11, nxproxy, nxcomp, nxagent and nxdesktop
- released to address X11 security concerns.
* Tue Nov 09 2004 Rick Stout <zipsonci[AT]gmail.com> - 1.4.0-3
- updated to 1.4.0 final
* Mon Oct 11 2004 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-2
- Changed naming structure to be more friendly (lowercase)
* Fri Oct 07 2004 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-1
- Updated package dependencies
* Wed Sep 29 2004 Rick Stout <zipsonic[AT]gmail.com> - 1.4.0-0
- Initial Fedora RPM release.
- Updated SuSE package to work with Fedora
--- NEW FILE nxagent ---
#!/bin/sh
NXCOMMAND=$(basename $0)
export LD_LIBRARY_PATH=/usr/lib/NX/lib:$LD_LIBRARY_PATH
exec /usr/lib/NX/$NXCOMMAND ${1+"$@"}
p_XFree86-4.3-ppc64.diff:
--- NEW FILE p_XFree86-4.3-ppc64.diff ---
--- xc/config/cf/Imake.cf.ppc64 2002-10-30 10:24:49.000000000 +0100
+++ xc/config/cf/Imake.cf 2002-11-28 16:59:53.000000000 +0100
@@ -743,6 +743,13 @@
# define Mc68020Architecture
# undef mc68000
# endif /* mc68000 */
+# ifdef __powerpc64__
+# ifndef Ppc64Architecture
+# define Ppc64Architecture
+# endif
+# undef __powerpc64__
+# undef __powerpc__
+# endif
# ifdef powerpc
# define PpcArchitecture
# undef powerpc
--- xc/config/cf/linux.cf.ppc64 2002-11-26 11:22:00.000000000 +0100
+++ xc/config/cf/linux.cf 2002-11-28 16:59:53.000000000 +0100
@@ -288,6 +288,8 @@
# elif defined(HPArchitecture)
# define BuildXF86DRI NO
# elif defined(i386Architecture)
+# elif defined(Ppc64Architecture)
+# define BuildXF86DRI NO
# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
# define BuildXF86DRI YES
# else
@@ -512,7 +514,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
-# if defined (x86_64Architecture) || defined (s390xArchitecture)
+# if defined (x86_64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
# define HaveLib64 YES
# else
# define HaveLib64 NO
@@ -802,6 +804,16 @@
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif
+#ifdef Ppc64Architecture
+# define DefaultCCOptions -fsigned-char -mminimal-toc
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags DefaultGcc2Ppc64Opt
+# endif
+# define LinuxMachineDefines -D__powerpc64__
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#endif /* Ppc64Architecture */
+
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
--- xc/config/cf/xfree86.cf.ppc64 2002-11-28 13:25:27.000000000 +0100
+++ xc/config/cf/xfree86.cf 2002-11-28 16:59:53.000000000 +0100
@@ -1050,6 +1050,99 @@
# endif
#endif
+/*
+ * For PowerPC 64bit systems
+ * only libraries are strictly needed
+ */
+#if defined(Ppc64Architecture)
+# ifndef XF86Server
+# define XF86Server YES
+# endif
+/* Amiga framebuffer module */
+# ifndef XF86AFB
+# define XF86AFB NO
+# endif
+/* 1bpp module */
+# ifndef XF1Bpp
+# define XF1Bpp NO
+# endif
+/* 4bpp module */
+# ifndef XF4Bpp
+# define XF4Bpp NO
+# endif
+/* 8/32bpp overlay module */
+# ifndef XF8_32Bpp
+# define XF8_32Bpp YES
+# endif
+/* 8/16bpp dual fb module */
+# ifndef XF8_16Bpp
+# define XF8_16Bpp YES
+# endif
+/* 24/32bpp conversion module */
+# ifndef XF24_32Bpp
+# define XF24_32Bpp YES
+# endif
+/* shadow fb module */
+# ifndef XFShadowFB
+# define XFShadowFB YES
+# endif
+/* vgahw module */
+# ifndef XF86VgaHw
+# define XF86VgaHw NO
+# endif
+/* fbdevhw module */
+# ifndef XF86FBDevHw
+# define XF86FBDevHw YES
+# endif
+/* XAA module */
+# ifndef XF86XAA
+# define XF86XAA YES
+# endif
+/* ramdac module */
+# ifndef XF86Ramdac
+# define XF86Ramdac YES
+# endif
+/* I2C module */
+# ifndef XF86I2C
+# define XF86I2C YES
+# endif
+/* DDC module */
+# ifndef XF86DDC
+# define XF86DDC YES
+# endif
+/* RAC (Resource Access Control) module */
+# ifndef XF86RAC
+# define XF86RAC YES
+# endif
+
+/* int10 module */
+# ifndef XF86Int10
+# define XF86Int10 YES
+# endif
+
+# ifndef DevelDrivers
+# if XFree86Devel
+# define DevelDrivers
+# else
+# define DevelDrivers /* */
+# endif
+# endif
+
+/* Pure PCI drivers should go first */
+# ifndef XF86CardDrivers
+# define XF86CardDrivers ati mga \
+ DevelDrivers \
+ XF86OSCardDrivers XF86ExtraCardDrivers
+# endif
+# if HasGlide3
+# define TdfxDriDriver
+# else
+# define TdfxDriDriver /**/
+# endif
+# ifndef DriDrivers
+# define DriDrivers gamma r128
+# endif
+#endif
/*
* For Mips/Arc platforms, the default is to build all modules which
@@ -1910,6 +2003,12 @@
# endif
#endif
+#if HasGcc2 && defined(Ppc64Architecture)
+# ifndef DefaultGcc2Ppc64Opt
+# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
+# endif
+#endif
+
#if HasGcc2 && defined(PpcArchitecture)
# ifndef DefaultGcc2PpcOpt
# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
--- xc/config/imake/imakemdep.h.ppc64 2002-11-26 11:22:24.000000000 +0100
+++ xc/config/imake/imakemdep.h 2002-11-28 16:59:53.000000000 +0100
@@ -612,6 +612,9 @@
# ifdef ppc
"-Dppc",
# endif
+# ifdef ppc64
+ "-Dppc64",
+# endif
# if defined(m68k) || defined(M68k) || defined(m68040)
"-Dm68k",
"-DM68k",
@@ -671,6 +674,10 @@
"-DSVR4",
# endif
# ifdef __powerpc__
+# ifdef __powerpc64__
+ "-D__powerpc64__",
+# endif
+# else
"-D__powerpc__",
# endif
# ifdef PowerMAX_OS
@@ -705,6 +712,9 @@
# ifdef __ppc__
"-D__ppc__",
# endif
+# ifdef __ppc64__
+ "-D__ppc64__",
+# endif
# ifdef __i386__
"-D__i386__",
# endif
@@ -1228,6 +1238,10 @@
{"__QNXNTO__", "1"},
#endif
# ifdef __powerpc__
+# ifdef __powerpc64__
+ {"__powerpc64__", "1"},
+# endif
+# else
{"__powerpc__", "1"},
# endif
# ifdef PowerMAX_OS
@@ -1302,6 +1316,9 @@
#if defined(__ppc__)
{"__ppc__", "1"},
#endif
+#if defined(__ppc64__)
+ {"__ppc64__", "1"},
+#endif
#if defined(__BIG_ENDIAN__)
{"__BIG_ENDIAN__", "1"},
#endif
--- xc/include/Xmd.h.ppc64 2002-05-31 20:45:39.000000000 +0200
+++ xc/include/Xmd.h 2002-11-28 16:59:53.000000000 +0100
@@ -63,7 +63,8 @@
defined(__sparc64__) || \
defined(__s390x__) || \
(defined(__hppa__) && defined(__LP64__)) || \
- defined(__x86_64__) || defined(x86_64)
+ defined(__x86_64__) || defined(x86_64) || \
+ defined(__powerpc64__) || defined(powerpc64)
#define LONG64 /* 32/64-bit architecture */
#endif
#ifdef __sgi
--- xc/lib/Xt/Xtos.h.ppc64 2002-04-04 16:05:35.000000000 +0200
+++ xc/lib/Xt/Xtos.h 2002-11-28 16:59:53.000000000 +0100
@@ -66,7 +66,8 @@
defined(__sparc64__) || \
defined(__s390x__) || \
(defined(__hppa__) && defined(__LP64__)) || \
- defined(__x86_64__) || defined(x86_64)
+ defined(__x86_64__) || defined(x86_64) || \
+ defined(__powerpc64__) || defined(powerpc64)
#define LONG64
#endif
--- xc/programs/Xserver/fb/fb.h.ppc64 2002-04-04 16:05:37.000000000 +0200
+++ xc/programs/Xserver/fb/fb.h 2002-11-28 16:59:53.000000000 +0100
@@ -105,7 +105,8 @@
defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \
defined(__s390x__) || \
- defined(x86_64) || defined (__x86_64__)
+ defined(x86_64) || defined (__x86_64__) || \
+ defined(powerpc64) || defined (__powerpc64__)
typedef unsigned long FbBits;
# else
typedef unsigned long long FbBits;
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile.ppc64 2002-10-30 10:37:54.000000000 +0100
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile 2002-11-28 16:59:53.000000000 +0100
@@ -34,6 +34,7 @@
#elif defined(LinuxArchitecture) && \
(defined(PpcArchitecture) || \
+ defined(Ppc64Architecture) || \
defined(MipsArchitecture) || \
defined(ia64Architecture) || \
defined(Mc68020Architecture) || \
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h.ppc64 2002-11-26 11:23:49.000000000 +0100
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2002-11-28 17:16:47.000000000 +0100
@@ -252,7 +252,7 @@
# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
# define INCLUDE_XF86_MAP_PCI_MEM
--- xc/programs/Xserver/os/xalloc.c.ppc64 2002-04-04 16:05:57.000000000 +0200
+++ xc/programs/Xserver/os/xalloc.c 2002-11-28 16:59:53.000000000 +0100
@@ -183,6 +183,7 @@
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
+ defined(__powerpc64__) || \
defined(__x86_64__) || defined(x86_64)
#define MAGIC 0x1404196414071968
#define MAGIC_FREE 0x1506196615061966
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 11 May 2005 21:47:07 -0000 1.1
+++ .cvsignore 11 May 2005 21:59:51 -0000 1.2
@@ -0,0 +1,9 @@
+docs.tar.bz2
+nx-X11-1.4.0-10.tar.gz
+nxagent-1.4.0-65.tar.gz
+nxcomp-1.4.0-31.tar.gz
+nxcompext-1.4.0-3.tar.gz
+nxdesktop-1.4.0-61.tar.gz
+nxproxy-1.4.0-2.tar.gz
+nxscripts-1.4.0-3.tar.gz
+nxviewer-1.4.0-4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 11 May 2005 21:47:07 -0000 1.1
+++ sources 11 May 2005 21:59:51 -0000 1.2
@@ -0,0 +1,9 @@
+0511072ee377316879bb91a75153ed47 docs.tar.bz2
+a8c6ab48021c91e55b902cd25097f33d nx-X11-1.4.0-10.tar.gz
+e39f2a3384edc9e33d8b68405fb91228 nxagent-1.4.0-65.tar.gz
+c2eb354e141e9f0e81f4cd1673b2a3ae nxcomp-1.4.0-31.tar.gz
+ab12f1f32329f5da0f53dd0969fe897e nxcompext-1.4.0-3.tar.gz
+9399fa94c59fbde2a158618e507635d7 nxdesktop-1.4.0-61.tar.gz
+15d89810730c7ed0e669b5525e5f3620 nxproxy-1.4.0-2.tar.gz
+eaf568181a6f6c84ab673ce8a98c69f0 nxscripts-1.4.0-3.tar.gz
+629f90c1f8ef50517e8b1de2c30adcb4 nxviewer-1.4.0-4.tar.gz
More information about the fedora-extras-commits
mailing list