packages: nx/nx.spec, nx/nx-libpng15.patch (NEW), nx/nx-optflags.patch (NEW...
baggins
baggins at pld-linux.org
Mon Feb 27 22:05:46 CET 2012
Author: baggins Date: Mon Feb 27 21:05:46 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- 3.5.0
- libpng 1.5 fix
- use our optflags everywhere
- use some system libs
---- Files affected:
packages/nx:
nx.spec (1.39 -> 1.40) , nx-libpng15.patch (NONE -> 1.1) (NEW), nx-optflags.patch (NONE -> 1.1) (NEW), nx-syslibs.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/nx/nx.spec
diff -u packages/nx/nx.spec:1.39 packages/nx/nx.spec:1.40
--- packages/nx/nx.spec:1.39 Fri Dec 10 12:41:09 2010
+++ packages/nx/nx.spec Mon Feb 27 22:05:41 2012
@@ -2,38 +2,41 @@
# TODO
# - the x11 libraires packaged to %{_libdir}/NX aren't used, still links (without rpath) to system xorg libs
# so get rid of the copies or make link with them!
-%define agent_minor 11
-%define auth_minor 3
-%define comp_minor 7
+%define agent_minor 7
+%define auth_minor 1
+%define comp_minor 2
%define compext_minor 1
-%define compshad_minor 3
-%define proxy_minor 2
-%define win_minor 7
-%define X11_minor 4
+%define compshad_minor 2
+%define proxy_minor 1
+%define win_minor 2
+%define X11_minor 2
Summary: NoMachine NX is the next-generation X compression scheme
Summary(pl.UTF-8): NoMachine NX to schemat kompresji nowej generacji dla X
Name: nx
-Version: 3.4.0
-Release: 2
+Version: 3.5.0
+Release: 1
License: GPL
Group: Libraries
#SourceDownload: http://www.nomachine.com/sources.php
Source0: http://web04.nomachine.com/download/%{version}/sources/%{name}-X11-%{version}-%{X11_minor}.tar.gz
-# Source0-md5: 38a84d4521a41e5ff988a84181ddcaf5
+# Source0-md5: 12060433a74ac61a1c776d1d6d136117
Source1: http://web04.nomachine.com/download/%{version}/sources/%{name}agent-%{version}-%{agent_minor}.tar.gz
-# Source1-md5: 1ede9d6a7f2782c18d489ac089c5b885
+# Source1-md5: 0a36c7e6a86c6c741179464b8f79c487
Source2: http://web04.nomachine.com/download/%{version}/sources/%{name}auth-%{version}-%{auth_minor}.tar.gz
-# Source2-md5: bfb758edd51271b31aa6b902557fa0cc
+# Source2-md5: cf38ec1e5a5f6453946cd387c14f2684
Source3: http://web04.nomachine.com/download/%{version}/sources/%{name}proxy-%{version}-%{proxy_minor}.tar.gz
-# Source3-md5: 95ce93520d463a3d18cdd5d19c321e85
+# Source3-md5: 488bb4d9b8e9f82dc272b4e6e9c57d30
Source4: http://web04.nomachine.com/download/%{version}/sources/%{name}comp-%{version}-%{comp_minor}.tar.gz
-# Source4-md5: cba926f2b855231a8fc3e0dabff52855
+# Source4-md5: ad8c0f133122c6d07732ca69c8759410
Source5: http://web04.nomachine.com/download/%{version}/sources/%{name}compext-%{version}-%{compext_minor}.tar.gz
-# Source5-md5: 605a8e2a136f89477f0059a0d2af4582
+# Source5-md5: abde2ccc33e31fc695031c2cfb60f3dd
Source6: http://web04.nomachine.com/download/%{version}/sources/%{name}compshad-%{version}-%{compshad_minor}.tar.gz
-# Source6-md5: 15deba68e12e13b524a723b49e7ec813
+# Source6-md5: 90a762dd9eb19c8c97876ad837923857
Source7: http://web04.nomachine.com/download/%{version}/sources/%{name}win-%{version}-%{win_minor}.tar.gz
-# Source7-md5: f45d183360067ede979c18fc964824ab
+# Source7-md5: 84c7f1575d9a1506370125ed050514ab
+Patch0: nx-optflags.patch
+Patch1: nx-syslibs.patch
+Patch2: nx-libpng15.patch
URL: http://www.nomachine.com/
#BuildRequires: Xaw3d-devel
BuildRequires: autoconf
@@ -77,6 +80,9 @@
%prep
%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
%build
export CFLAGS="%{rpmcflags} -fPIC"
@@ -134,6 +140,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2012/02/27 21:05:41 baggins
+- 3.5.0
+- libpng 1.5 fix
+- use our optflags everywhere
+- use some system libs
+
Revision 1.39 2010/12/10 11:41:09 paszczus
- updated win,X11,agent; rel 2
================================================================
Index: packages/nx/nx-libpng15.patch
diff -u /dev/null packages/nx/nx-libpng15.patch:1.1
--- /dev/null Mon Feb 27 22:05:46 2012
+++ packages/nx/nx-libpng15.patch Mon Feb 27 22:05:41 2012
@@ -0,0 +1,30 @@
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200
++++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300
+@@ -414,7 +414,7 @@
+
+ png_read_info(pngPtr, infoPtr);
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
+@@ -565,7 +565,7 @@
+
+ png_read_info( pngPtr, infoPtr ) ;
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
+@@ -709,7 +709,7 @@
+ png_read_info(pngPtr, infoPtr) ;
+
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
================================================================
Index: packages/nx/nx-optflags.patch
diff -u /dev/null packages/nx/nx-optflags.patch:1.1
--- /dev/null Mon Feb 27 22:05:46 2012
+++ packages/nx/nx-optflags.patch Mon Feb 27 22:05:41 2012
@@ -0,0 +1,176 @@
+diff -up nx-3.5.0/nxcomp/configure~ nx-3.5.0/nxcomp/configure
+--- nx-3.5.0/nxcomp/configure~ 2011-06-25 14:44:37.184036869 +0300
++++ nx-3.5.0/nxcomp/configure 2011-06-25 14:46:20.588641288 +0300
+@@ -1269,8 +1269,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+
+ LIBSTATIC=""
+diff -up nx-3.5.0/nxcompext/configure~ nx-3.5.0/nxcompext/configure
+--- nx-3.5.0/nxcompext/configure~ 2011-06-25 14:44:37.016021263 +0300
++++ nx-3.5.0/nxcompext/configure 2011-06-25 14:46:47.551145591 +0300
+@@ -1269,8 +1269,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+
+
+ LIBSTATIC=""
+diff -up nx-3.5.0/nxcompshad/configure~ nx-3.5.0/nxcompshad/configure
+--- nx-3.5.0/nxcompshad/configure~ 2011-06-25 14:44:37.173035846 +0300
++++ nx-3.5.0/nxcompshad/configure 2011-06-25 14:48:14.259199114 +0300
+@@ -1269,8 +1269,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+
+
+ LIBSTATIC=""
+diff -up nx-3.5.0/nxproxy/configure~ nx-3.5.0/nxproxy/configure
+--- nx-3.5.0/nxproxy/configure~ 2005-11-11 18:27:30.000000000 +0200
++++ nx-3.5.0/nxproxy/configure 2011-06-25 14:48:38.700469269 +0300
+@@ -1269,8 +1269,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+
+
+ if test -d "../nx-X11/exports/include" ; then
+diff -up nx-3.5.0/nx-X11/config/cf/host.def~ nx-3.5.0/nx-X11/config/cf/host.def
+--- nx-3.5.0/nx-X11/config/cf/host.def~ 2011-06-29 01:14:46.974506460 +0300
++++ nx-3.5.0/nx-X11/config/cf/host.def 2011-07-01 00:20:11.261694918 +0300
+@@ -497,17 +497,17 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
+ * -m486
+ *
+ #define DefaultGcc2i386Opt -O2 -fno-strength-reduce
+- */
+
+ #if defined (LinuxArchitecture)
+ #define DefaultGcc2i386Opt -g -O3
+ #endif
++ */
+
+ /*
+ * Enable all the optimizations on AMD64.
+- */
+
+ #define DefaultGcc2AMD64Opt -g -O3 GccAliasingArgs
++ */
+
+ /*
+ * This allows the GCC warning flags to be set. The default is shown here.
+diff -up nx-3.5.0/nx-X11/config/cf/linux.cf~ nx-3.5.0/nx-X11/config/cf/linux.cf
+--- nx-3.5.0/nx-X11/config/cf/linux.cf~ 2005-10-21 22:10:27.000000000 +0300
++++ nx-3.5.0/nx-X11/config/cf/linux.cf 2011-06-29 01:09:13.799185571 +0300
+@@ -837,7 +837,7 @@ InstallNamedTargetNoClobber(install,file
+ #ifdef Arm32Architecture
+ # define DefaultCCOptions
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O3
++# define OptimizedCDebugFlags $(RPM_OPT_FLAGS)
+ # endif
+ # define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -845,7 +845,7 @@ InstallNamedTargetNoClobber(install,file
+ #endif /* Arm32Achitecture */
+
+ #ifdef HPArchitecture
+-# define OptimizedCDebugFlags -O2 GccAliasingArgs
++# define OptimizedCDebugFlags $(RPM_OPT_FLAGS) GccAliasingArgs
+ # define LinuxMachineDefines -D__hppa__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+ # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+@@ -909,7 +909,7 @@ InstallNamedTargetNoClobber(install,file
+
+ #ifdef s390Architecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs
++# define OptimizedCDebugFlags $(RPM_OPT_FLAGS) GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__s390__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -918,7 +918,7 @@ InstallNamedTargetNoClobber(install,file
+
+ #ifdef s390xArchitecture
+ /*#define DefaultCCOptions -fsigned-char */
+-#define OptimizedCDebugFlags -O3 -fomit-frame-pointer
++#define OptimizedCDebugFlags $(RPM_OPT_FLAGS)
+ #define LinuxMachineDefines -D__s390x__
+ #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+ #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+@@ -926,7 +926,7 @@ InstallNamedTargetNoClobber(install,file
+
+ #ifdef SparcArchitecture
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 GccAliasingArgs
++# define OptimizedCDebugFlags $(RPM_OPT_FLAGS) GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__sparc__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+@@ -957,7 +957,7 @@ InstallNamedTargetNoClobber(install,file
+ # endif
+ # endif
+ # ifndef OptimizedCDebugFlags
+-# define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs
++# define OptimizedCDebugFlags $(RPM_OPT_FLAGS) SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines -D__sh__
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+diff -up nx-3.5.0/nx-X11/config/cf/xorg.cf~ nx-3.5.0/nx-X11/config/cf/xorg.cf
+--- nx-3.5.0/nx-X11/config/cf/xorg.cf~ 2005-10-03 19:08:44.000000000 +0300
++++ nx-3.5.0/nx-X11/config/cf/xorg.cf 2011-06-29 01:10:00.860608947 +0300
+@@ -1557,37 +1557,37 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane
+
+ #if HasGcc2 && defined(i386Architecture)
+ # ifndef DefaultGcc2i386Opt
+-# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
++# define DefaultGcc2i386Opt $(RPM_OPT_FLAGS) -fno-strength-reduce GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(AMD64Architecture)
+ # ifndef DefaultGcc2AMD64Opt
+-# define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs
++# define DefaultGcc2AMD64Opt $(RPM_OPT_FLAGS) -fno-strength-reduce GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(AlphaArchitecture)
+ # ifndef DefaultGcc2AxpOpt
+-# define DefaultGcc2AxpOpt -O2 GccAliasingArgs
++# define DefaultGcc2AxpOpt $(RPM_OPT_FLAGS) GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(Ppc64Architecture)
+ # ifndef DefaultGcc2Ppc64Opt
+-# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
++# define DefaultGcc2Ppc64Opt $(RPM_OPT_FLAGS) GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(MipsArchitecture)
+ # ifndef DefaultGcc2MipsOpt
+-# define DefaultGcc2MipsOpt -O2 GccAliasingArgs
++# define DefaultGcc2MipsOpt $(RPM_OPT_FLAGS) GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(PpcArchitecture)
+ # ifndef DefaultGcc2PpcOpt
+-# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
++# define DefaultGcc2PpcOpt $(RPM_OPT_FLAGS) GccAliasingArgs
+ # endif
+ #endif
+
================================================================
Index: packages/nx/nx-syslibs.patch
diff -u /dev/null packages/nx/nx-syslibs.patch:1.1
--- /dev/null Mon Feb 27 22:05:46 2012
+++ packages/nx/nx-syslibs.patch Mon Feb 27 22:05:41 2012
@@ -0,0 +1,19 @@
+diff -up nx-3.5.0/nx-X11/config/cf/host.def~ nx-3.5.0/nx-X11/config/cf/host.def
+--- nx-3.5.0/nx-X11/config/cf/host.def~ 2011-05-09 16:20:22.000000000 +0300
++++ nx-3.5.0/nx-X11/config/cf/host.def 2011-06-29 01:13:59.677059431 +0300
+@@ -908,7 +908,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
+ *
+ #define HasFontconfig NO
+ */
+-#define HasFontconfig NO
+
+ /*
+ * To use a Fontconfig library already installed outside the default search
+@@ -924,7 +923,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
+ *
+ #define HasExpat NO
+ */
+-#define HasExpat NO
+
+ /*
+ * To use a Expat library already installed outside the default search
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nx/nx.spec?r1=1.39&r2=1.40&f=u
More information about the pld-cvs-commit
mailing list