net-misc/nx-X11: Initial checkin
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2265 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
parent
a2ebe5e909
commit
fcd952a7e8
12
net-misc/nx-X11/ChangeLog
Normal file
12
net-misc/nx-X11/ChangeLog
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# ChangeLog for net-misc/nx-X11
|
||||||
|
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
|
||||||
|
# $Header: $
|
||||||
|
|
||||||
|
14 Jun 2010; Mario Fetka <mario.fetka@gmail.com> +nx-X11-3.4.0_p3.ebuild,
|
||||||
|
+files/02_dont_build_nxcompshad.dpatch,
|
||||||
|
+files/nx-X11-3.4.0-Imake-fix-1.patch,
|
||||||
|
+files/01_build_nx-X11_without_nxcomp.dpatch,
|
||||||
|
+files/85_nx-X11_debian-ld.dpatch, +files/nx-x11-1.5.0-tmp-exec.patch,
|
||||||
|
+files/95_fix_Imakefile.dpatch, +metadata.xml:
|
||||||
|
Initial checkin
|
||||||
|
|
12
net-misc/nx-X11/Manifest
Normal file
12
net-misc/nx-X11/Manifest
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
AUX 01_build_nx-X11_without_nxcomp.dpatch 1315 RMD160 daa0ab00f804ba17684f0a710bd191de40548f30 SHA1 630a5f17d102ac8a0ef2d58fa3b60a7710cae6e9 SHA256 3d0668adb9bc5c9357decad0b903ab55e0303cbd3036ea5037d743b88c97e0b9
|
||||||
|
AUX 02_dont_build_nxcompshad.dpatch 1089 RMD160 6e420f3f84d379571498d523cfbc9ae79870af8c SHA1 24795cebcb410b5ede00d5181d1a6849215f32e5 SHA256 6f10a43addc058732a1910c6b161e808a25a6883d357cec5de58bd34237d3e27
|
||||||
|
AUX 85_nx-X11_debian-ld.dpatch 6101 RMD160 8fc71becadd6dbd963b31102c709f3af6ee89e9a SHA1 c7550d08d5a560a181564c94c35654cba684c25f SHA256 00820cb9deec7d0a90aeea3cb3ca0fc807eb9a6617465dc2c63cec4f9d0a16ee
|
||||||
|
AUX 95_fix_Imakefile.dpatch 1844 RMD160 50e692ad2f12a1551c1e4619bb7d32a3653f68c9 SHA1 777a8a3fb535d9ab30d0b6ac7beadc4a8b9095d7 SHA256 bd2f28fdf0026fc02aca04403592b48b18b73acd7b40374af057c03600fb5022
|
||||||
|
AUX nx-X11-3.4.0-Imake-fix-1.patch 1313 RMD160 a2b1a6981ab4a6deb7097ac3812c908060a97640 SHA1 73f33188591e4d159ad6aa6714a3581d9bc6c105 SHA256 91a3e675e200e1e2245e8ad4636e089dacc1302c7e309d929dc5021db160a48f
|
||||||
|
AUX nx-x11-1.5.0-tmp-exec.patch 349 RMD160 083862e5563962764e9d78f50a37576bac9913cc SHA1 97402172c1039e4f86b977f27a4571a8a77d1c6b SHA256 bbaeeb4e04c04da96f37dfb7ab5e494094d61a390ef2ae24813a5f49b3c44971
|
||||||
|
DIST nx-X11-3.4.0-3.tar.gz 20245244 RMD160 98f0a39ce7dd0ba2ddfe6f1e7db0c8a2384b78e4 SHA1 74dbc9cfea6d93361e362298421cdac82f5d910d SHA256 7819ffb49859277ae5003574b683410c6ff03e80dfb523da7c32dbf70774a903
|
||||||
|
DIST nxagent-3.4.0-8.tar.gz 1563583 RMD160 3277111c9b3529d53921e50c916e096d6c861131 SHA1 c8f3f191fe67ca2678925d73f45a0204dcaeb9f9 SHA256 e6bb0b66a5f858e6383961b300ee39c748bdb05a9876dec3491cfc2374b0c973
|
||||||
|
DIST nxauth-3.4.0-3.tar.gz 30637 RMD160 4c88ada185ea8d326a00e67d6c5d6993afbb6274 SHA1 da99b2c85ed81c1ddc5dca7b2105d435d6897e6b SHA256 6ac8238852b1b3754ed1ed917ede5cd7473c482c0d847f2fb2c8c9a1334e3516
|
||||||
|
EBUILD nx-X11-3.4.0_p3.ebuild 2470 RMD160 b2a94bfd3e97828c69a375c519de39b4952ddb1a SHA1 44db6053ec6f40422effe2fed65cdf84b86082dd SHA256 5ee91b7cee2d9502357c17d4cc7b662839e778c8e131d6ea6f789f8bac5f6f7f
|
||||||
|
MISC ChangeLog 464 RMD160 46aa36f816ad423bbc228e861299b1e622ebfbb1 SHA1 70d8400f0114b4c1f9d83cef385892498271f1e0 SHA256 8d787822b781741476012af81fc7ce83affb9c5442098b60c8608928b5ef92dd
|
||||||
|
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
|
54
net-misc/nx-X11/files/01_build_nx-X11_without_nxcomp.dpatch
Normal file
54
net-misc/nx-X11/files/01_build_nx-X11_without_nxcomp.dpatch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||||
|
## 01_build_nx-X11_without_nxcomp.dpatch by <marceloshima@gmail.com>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: Correct build without nxcomp and nxcompext
|
||||||
|
|
||||||
|
@DPATCH@
|
||||||
|
Index: nx-x11-ubuntu/lib/X11/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/lib/X11/Imakefile 2010-03-18 17:43:37.333686996 -0300
|
||||||
|
+++ nx-x11-ubuntu/lib/X11/Imakefile 2010-03-18 17:52:15.493687076 -0300
|
||||||
|
@@ -1150,30 +1150,30 @@
|
||||||
|
#if NXLibraries
|
||||||
|
|
||||||
|
$(NX_XCOMPCONFIGTARGET):
|
||||||
|
- cd ../../../nxcomp && \
|
||||||
|
- ./configure
|
||||||
|
+# cd ../../../nxcomp && \
|
||||||
|
+# ./configure
|
||||||
|
|
||||||
|
$(NX_XCOMPEXTCONFIGTARGET):
|
||||||
|
- cd ../../../nxcompext && \
|
||||||
|
- ./configure
|
||||||
|
+# cd ../../../nxcompext && \
|
||||||
|
+# ./configure
|
||||||
|
|
||||||
|
#ifdef SunArchitecture
|
||||||
|
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
|
||||||
|
- cd $(NX_XCOMPLIBDIR) && \
|
||||||
|
- gmake
|
||||||
|
+# cd $(NX_XCOMPLIBDIR) && \
|
||||||
|
+# gmake
|
||||||
|
|
||||||
|
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
|
||||||
|
- cd ../../../nxcompext && \
|
||||||
|
- gmake
|
||||||
|
+# cd ../../../nxcompext && \
|
||||||
|
+# gmake
|
||||||
|
|
||||||
|
#else
|
||||||
|
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
|
||||||
|
- cd $(NX_XCOMPLIBDIR) && \
|
||||||
|
- make
|
||||||
|
+# cd $(NX_XCOMPLIBDIR) && \
|
||||||
|
+# make
|
||||||
|
|
||||||
|
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
|
||||||
|
- cd ../../../nxcompext && \
|
||||||
|
- make
|
||||||
|
+# cd ../../../nxcompext && \
|
||||||
|
+# make
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
35
net-misc/nx-X11/files/02_dont_build_nxcompshad.dpatch
Normal file
35
net-misc/nx-X11/files/02_dont_build_nxcompshad.dpatch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||||
|
## 02_dont_build_nxcompshad.dpatch by <marceloshima@gmail.com>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: Correct build without nxcompext
|
||||||
|
|
||||||
|
@DPATCH@
|
||||||
|
Index: nx-x11-ubuntu/programs/Xserver/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/programs/Xserver/Imakefile 2010-03-18 17:43:37.233685038 -0300
|
||||||
|
+++ nx-x11-ubuntu/programs/Xserver/Imakefile 2010-03-18 17:52:15.423684745 -0300
|
||||||
|
@@ -1037,17 +1037,17 @@
|
||||||
|
NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
|
||||||
|
|
||||||
|
$(NX_XSHADOWCONFIGTARGET):
|
||||||
|
- cd $(NX_XSHADOWLIBDIR) && \
|
||||||
|
- ./configure
|
||||||
|
+# cd $(NX_XSHADOWLIBDIR) && \
|
||||||
|
+# ./configure
|
||||||
|
|
||||||
|
#ifdef SunArchitecture
|
||||||
|
$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
|
||||||
|
- cd $(NX_XSHADOWLIBDIR) && \
|
||||||
|
- gmake
|
||||||
|
+# cd $(NX_XSHADOWLIBDIR) && \
|
||||||
|
+# gmake
|
||||||
|
#else
|
||||||
|
$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
|
||||||
|
- cd $(NX_XSHADOWLIBDIR) && \
|
||||||
|
- make
|
||||||
|
+# cd $(NX_XSHADOWLIBDIR) && \
|
||||||
|
+# make
|
||||||
|
#endif
|
||||||
|
|
||||||
|
ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
|
144
net-misc/nx-X11/files/85_nx-X11_debian-ld.dpatch
Normal file
144
net-misc/nx-X11/files/85_nx-X11_debian-ld.dpatch
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||||
|
## 85_nx-X11_debian-ld.dpatch by <marceloshima@gmail.com>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: Change the library filename to not conflict with Xorg ones.
|
||||||
|
|
||||||
|
@DPATCH@
|
||||||
|
Index: nx-x11-ubuntu/config/cf/X11.tmpl
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/config/cf/X11.tmpl 2010-03-18 17:43:37.113684797 -0300
|
||||||
|
+++ nx-x11-ubuntu/config/cf/X11.tmpl 2010-03-18 17:46:07.532435434 -0300
|
||||||
|
@@ -2665,9 +2665,9 @@
|
||||||
|
#ifndef SharedXrenderRev
|
||||||
|
#define SharedXrenderRev 1.2.2
|
||||||
|
#endif
|
||||||
|
-SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
|
||||||
|
+SharedLibReferences(XRENDER,Xrender-nx,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
|
||||||
|
#else
|
||||||
|
-ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
|
||||||
|
+ProjectUnsharedLibReferences(XRENDER,Xrender-nx,$(XRENDERLIBSRC),XBuildLibDir)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
XRANDRLIBSRC = $(LIBSRC)/Xrandr
|
||||||
|
Index: nx-x11-ubuntu/lib/X11/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/lib/X11/Imakefile 2010-03-18 17:46:05.702437552 -0300
|
||||||
|
+++ nx-x11-ubuntu/lib/X11/Imakefile 2010-03-18 17:46:07.532435434 -0300
|
||||||
|
@@ -83,7 +83,7 @@
|
||||||
|
#define DoExtraLib SharedLibX11
|
||||||
|
#define DoDebugLib DebugLibX11
|
||||||
|
#define DoProfileLib ProfileLibX11
|
||||||
|
-#define LibName X11
|
||||||
|
+#define LibName X11-nx
|
||||||
|
#define SoRev SOXLIBREV
|
||||||
|
#define HugeLibrary YES
|
||||||
|
#define IncSubdir X11
|
||||||
|
Index: nx-x11-ubuntu/lib/Xext/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/lib/Xext/Imakefile 2010-03-18 17:43:37.033687480 -0300
|
||||||
|
+++ nx-x11-ubuntu/lib/Xext/Imakefile 2010-03-18 17:46:07.532435434 -0300
|
||||||
|
@@ -10,14 +10,15 @@
|
||||||
|
#define DoExtraLib SharedLibXext
|
||||||
|
#define DoDebugLib DebugLibXext
|
||||||
|
#define DoProfileLib ProfileLibXext
|
||||||
|
-#define LibName Xext
|
||||||
|
+#define LibName Xext-nx
|
||||||
|
#define SoRev SOXEXTREV
|
||||||
|
#define LibHeaders NO
|
||||||
|
|
||||||
|
#include <Threads.tmpl>
|
||||||
|
|
||||||
|
#ifdef SharedXextReqs
|
||||||
|
-REQUIREDLIBS = SharedXextReqs
|
||||||
|
+/* REQUIREDLIBS = SharedXextReqs $(NX_REQUIREDLIBS) */
|
||||||
|
+REQUIREDLIBS = -L../../exports/lib/ -lX11-nx $(NX_REQUIREDLIBS)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if HasShm
|
||||||
|
Index: nx-x11-ubuntu/lib/Xft/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/lib/Xft/Imakefile 2010-03-18 17:43:37.053695190 -0300
|
||||||
|
+++ nx-x11-ubuntu/lib/Xft/Imakefile 2010-03-18 17:46:07.532435434 -0300
|
||||||
|
@@ -94,8 +94,7 @@
|
||||||
|
FONTCONFIG_CFLAGS="$(FONTCONFIG_CFLAGS)" \
|
||||||
|
FONTCONFIG_LIBS="$(FONTCONFIG_LIBS)"
|
||||||
|
|
||||||
|
-REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2LIB)
|
||||||
|
-
|
||||||
|
+REQUIREDLIBS=$(LDPRELIBS) -L../../exports/lib/ -lXrender-nx -lX11-nx $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2LIB)
|
||||||
|
HEADERS = Xft.h XftCompat.h
|
||||||
|
|
||||||
|
SRCS = xftcolor.c xftdbg.c xftdpy.c \
|
||||||
|
Index: nx-x11-ubuntu/lib/Xft1/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/lib/Xft1/Imakefile 2010-03-18 17:43:37.073687814 -0300
|
||||||
|
+++ nx-x11-ubuntu/lib/Xft1/Imakefile 2010-03-18 17:46:07.532435434 -0300
|
||||||
|
@@ -92,7 +92,7 @@
|
||||||
|
FREETYPE2REQLIB = $(FREETYPE2LIB)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB)
|
||||||
|
+REQUIREDLIBS=$(LDPRELIBS) -L../../exports/lib/ -lXrender-nx -lX11-nx $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB)
|
||||||
|
|
||||||
|
#if UseFreetype2
|
||||||
|
FT_OLD = xftcache.c
|
||||||
|
Index: nx-x11-ubuntu/lib/Xrender/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/lib/Xrender/Imakefile 2010-03-18 17:43:37.093686165 -0300
|
||||||
|
+++ nx-x11-ubuntu/lib/Xrender/Imakefile 2010-03-18 17:46:07.532435434 -0300
|
||||||
|
@@ -74,7 +74,7 @@
|
||||||
|
#define DoSharedLib SharedLibXrender
|
||||||
|
#define DoDebugLib DebugLibXrender
|
||||||
|
#define DoProfileLib ProfileLibXrender
|
||||||
|
-#define LibName Xrender
|
||||||
|
+#define LibName Xrender-nx
|
||||||
|
#define SoRev SOXRENDERREV
|
||||||
|
|
||||||
|
#ifdef XBuildIncDir
|
||||||
|
@@ -89,7 +89,8 @@
|
||||||
|
#include <Threads.tmpl>
|
||||||
|
|
||||||
|
#ifdef SharedXrenderReqs
|
||||||
|
-REQUIREDLIBS = SharedXrenderReqs
|
||||||
|
+/* REQUIREDLIBS = SharedXrenderReqs */
|
||||||
|
+REQUIREDLIBS = $(LDPRELIB) -L../../exports/lib/ -lXext-nx -lX11-nx
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if Malloc0ReturnsNull
|
||||||
|
Index: nx-x11-ubuntu/programs/Xserver/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/programs/Xserver/Imakefile 2010-03-18 17:46:06.573684670 -0300
|
||||||
|
+++ nx-x11-ubuntu/programs/Xserver/Imakefile 2010-03-18 17:46:07.542462477 -0300
|
||||||
|
@@ -997,7 +997,7 @@
|
||||||
|
XPMLIB = -lXpm
|
||||||
|
NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
|
||||||
|
NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI)
|
||||||
|
-NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB)
|
||||||
|
+NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) -lX11-nx -lXext-nx -lXrender-nx $(SYSLIBS) $(XPMLIB)
|
||||||
|
#if HasParallelMake
|
||||||
|
MakeMutex($(NXAGENTDIRS) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS))
|
||||||
|
#endif
|
||||||
|
@@ -1016,11 +1016,11 @@
|
||||||
|
-L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite
|
||||||
|
#elif defined(cygwinArchitecture)
|
||||||
|
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
|
||||||
|
- -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \
|
||||||
|
+ -lXcomp -lXcompext -lX11-nx -lXext-nx -lXrender-nx -lXcomposite -lXfixes \
|
||||||
|
-L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst
|
||||||
|
#else
|
||||||
|
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
|
||||||
|
- -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \
|
||||||
|
+ -lXcomp -lXcompext -lXcompshad -lX11-nx -lXext-nx -lXrender-nx -lXfixes \
|
||||||
|
-L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -1073,7 +1073,7 @@
|
||||||
|
else exit 0; fi
|
||||||
|
$(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \
|
||||||
|
$(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \
|
||||||
|
- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS)
|
||||||
|
+ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lX11-nx -lXext-nx $(EXTRA_LOAD_FLAGS)
|
||||||
|
#endif /* NXAgentServer */
|
||||||
|
|
||||||
|
#if defined(XnonServer) && XnonServer
|
38
net-misc/nx-X11/files/95_fix_Imakefile.dpatch
Normal file
38
net-misc/nx-X11/files/95_fix_Imakefile.dpatch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||||
|
## 95_fix_Imakefile.dpatch by <marceloshima@gmail.com>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: No description.
|
||||||
|
|
||||||
|
@DPATCH@
|
||||||
|
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Imakefile
|
||||||
|
===================================================================
|
||||||
|
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Imakefile 2010-03-18 17:43:36.743684770 -0300
|
||||||
|
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Imakefile 2010-03-18 17:46:10.473686346 -0300
|
||||||
|
@@ -137,7 +137,7 @@
|
||||||
|
NXFONTINCLUDES = -I../../../../lib/font/include
|
||||||
|
LIBXRANDRINCLUDES= -I../../../../lib/Xrandr
|
||||||
|
|
||||||
|
-INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \
|
||||||
|
+INCLUDES = -I. -I/usr/include -I/usr/include/nx \
|
||||||
|
-I../../../../extras/Mesa/include \
|
||||||
|
-I$(XBUILDINCDIR) -I$(FONTINCSRC) \
|
||||||
|
-I../../mi -I../../include -I../../os \
|
||||||
|
@@ -146,7 +146,7 @@
|
||||||
|
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
|
||||||
|
$(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES)
|
||||||
|
#ifdef SunArchitecture
|
||||||
|
-INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \
|
||||||
|
+INCLUDES = -I. -I/usr/include -I/usr/include/nx \
|
||||||
|
-I../../../../extras/Mesa/include \
|
||||||
|
-I$(XBUILDINCDIR) -I$(FONTINCSRC) \
|
||||||
|
-I/usr/sfw/include \
|
||||||
|
@@ -161,7 +161,7 @@
|
||||||
|
-I../../mi -I../../include -I../../os \
|
||||||
|
-I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \
|
||||||
|
-I../../miext/damage -I../../miext/cw \
|
||||||
|
- -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \
|
||||||
|
+ -I/usr/include -I/usr/include/nx \
|
||||||
|
-I../../../../extras/Mesa/include \
|
||||||
|
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
|
||||||
|
$(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES)
|
34
net-misc/nx-X11/files/nx-X11-3.4.0-Imake-fix-1.patch
Normal file
34
net-misc/nx-X11/files/nx-X11-3.4.0-Imake-fix-1.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
||||||
|
Date: 2010-06-14
|
||||||
|
Initial Package Version: 3.4.0
|
||||||
|
Origin: me
|
||||||
|
Upstream Status: unknown
|
||||||
|
Description: fix location of header files
|
||||||
|
|
||||||
|
diff -Naur nx-X11.orig/lib/X11/Imakefile nx-X11/lib/X11/Imakefile
|
||||||
|
--- nx-X11.orig/lib/X11/Imakefile 2010-06-14 21:00:25.766704602 +0000
|
||||||
|
+++ nx-X11/lib/X11/Imakefile 2010-06-14 21:00:57.692957389 +0000
|
||||||
|
@@ -37,9 +37,9 @@
|
||||||
|
#if NXLibraries
|
||||||
|
|
||||||
|
#ifdef SunArchitecture
|
||||||
|
-NX_INCLUDES = -I../../../nxcomp -I/usr/sfw/include
|
||||||
|
+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/sfw/include
|
||||||
|
#else
|
||||||
|
-NX_INCLUDES = -I../../../nxcomp
|
||||||
|
+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
NX_DEFINES = -DNX_TRANS_SOCKET \
|
||||||
|
diff -Naur nx-X11.orig/programs/Xserver/os/Imakefile nx-X11/programs/Xserver/os/Imakefile
|
||||||
|
--- nx-X11.orig/programs/Xserver/os/Imakefile 2010-06-14 21:00:26.230954814 +0000
|
||||||
|
+++ nx-X11/programs/Xserver/os/Imakefile 2010-06-14 21:01:37.215706106 +0000
|
||||||
|
@@ -30,7 +30,7 @@
|
||||||
|
|
||||||
|
#if NXLibraries
|
||||||
|
|
||||||
|
-NX_INCLUDES = -I../../../../nxcomp
|
||||||
|
+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1
|
||||||
|
|
||||||
|
NX_DEFINES = -DNX_TRANS_SOCKET \
|
||||||
|
-DNX_TRANS_AUTH \
|
11
net-misc/nx-X11/files/nx-x11-1.5.0-tmp-exec.patch
Normal file
11
net-misc/nx-X11/files/nx-x11-1.5.0-tmp-exec.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- nx-X11/config/imake/imake.c.orig 2006-11-05 00:10:49.000000000 +0000
|
||||||
|
+++ nx-X11/config/imake/imake.c 2006-11-05 00:11:49.000000000 +0000
|
||||||
|
@@ -974,7 +974,7 @@
|
||||||
|
static void
|
||||||
|
get_libc_version(FILE *inFile)
|
||||||
|
{
|
||||||
|
- char aout[] = "/tmp/imakeXXXXXX";
|
||||||
|
+ char aout[] = "./imakeXXXXXX";
|
||||||
|
FILE *fp;
|
||||||
|
const char *format = "%s -o %s -x c -";
|
||||||
|
char *cc;
|
34
net-misc/nx-X11/metadata.xml
Normal file
34
net-misc/nx-X11/metadata.xml
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<!--
|
||||||
|
$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
|
||||||
|
|
||||||
|
This is the example metadata file.
|
||||||
|
The root element of this file is <pkgmetadata>. Within this element a
|
||||||
|
number of subelements are allowed: herd, maintainer, and
|
||||||
|
longdescription. herd is a required subelement.
|
||||||
|
|
||||||
|
For a full description look at:
|
||||||
|
http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
|
||||||
|
|
||||||
|
|
||||||
|
Before committing, please remove the comments from this file. They are
|
||||||
|
not relevant for general metadata.xml files.
|
||||||
|
-->
|
||||||
|
<pkgmetadata>
|
||||||
|
<herd>no-herd</herd>
|
||||||
|
<maintainer>
|
||||||
|
<email>@gentoo.org</email>
|
||||||
|
<!-- <description>Description of the maintainership</description> -->
|
||||||
|
</maintainer>
|
||||||
|
<!-- <longdescription>Long description of the package</longdescription> -->
|
||||||
|
<!--
|
||||||
|
<use>
|
||||||
|
<flag name='flag'>Description of how USE='flag' affects this package</flag>
|
||||||
|
<flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
|
||||||
|
package</flag>
|
||||||
|
<flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
|
||||||
|
Requires an installed dictionary from <cat>app-dicts</cat></flag>
|
||||||
|
</use>
|
||||||
|
-->
|
||||||
|
</pkgmetadata>
|
86
net-misc/nx-X11/nx-X11-3.4.0_p3.ebuild
Normal file
86
net-misc/nx-X11/nx-X11-3.4.0_p3.ebuild
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
# Copyright 1999-2010 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.4.0-r1.ebuild,v 1.1 2010/02/09 23:25:04 voyageur Exp $
|
||||||
|
|
||||||
|
EAPI=2
|
||||||
|
|
||||||
|
MY_PVV=${PV/_p/-}
|
||||||
|
MY_PV=${PV/_p*/}
|
||||||
|
|
||||||
|
inherit autotools eutils multilib
|
||||||
|
|
||||||
|
DESCRIPTION="NX compression technology core libraries"
|
||||||
|
HOMEPAGE="http://www.nomachine.com/developers.php"
|
||||||
|
|
||||||
|
URI_BASE="http://web04.nomachine.com/download/${MY_PV}/sources"
|
||||||
|
SRC_NX_X11="nx-X11-${MY_PVV}.tar.gz"
|
||||||
|
SRC_NXAGENT="nxagent-${MY_PV}-8.tar.gz"
|
||||||
|
SRC_NXAUTH="nxauth-${MY_PVV}.tar.gz"
|
||||||
|
|
||||||
|
SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXAUTH"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="media-libs/freetype
|
||||||
|
x11-libs/libXcomposite
|
||||||
|
x11-libs/libXfixes
|
||||||
|
x11-libs/libXpm
|
||||||
|
>=media-libs/jpeg-6b-r4
|
||||||
|
>=media-libs/libpng-1.2.8
|
||||||
|
>=sys-libs/zlib-1.2.3
|
||||||
|
>=net-misc/nxcomp-${MY_PV}
|
||||||
|
>=net-misc/nxcompext-${MY_PV}
|
||||||
|
>=net-misc/nxcompshad-${MY_PV}"
|
||||||
|
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
x11-misc/gccmakedep
|
||||||
|
x11-misc/imake
|
||||||
|
x11-proto/inputproto"
|
||||||
|
|
||||||
|
S=${WORKDIR}/${PN}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# Fix sandbox violation
|
||||||
|
epatch "${FILESDIR}"/nx-x11-1.5.0-tmp-exec.patch
|
||||||
|
# -fPIC
|
||||||
|
epatch "${FILESDIR}"/01_build_nx-X11_without_nxcomp.dpatch
|
||||||
|
# Respect CFLAGS/CXXFLAGS
|
||||||
|
epatch "${FILESDIR}"/02_dont_build_nxcompshad.dpatch
|
||||||
|
# Respect CFLAGS/CXXFLAGS
|
||||||
|
epatch "${FILESDIR}"/85_nx-X11_debian-ld.dpatch
|
||||||
|
# Respect CFLAGS/CXXFLAGS
|
||||||
|
epatch "${FILESDIR}"/95_fix_Imakefile.dpatch
|
||||||
|
# Respect CFLAGS/CXXFLAGS
|
||||||
|
epatch "${FILESDIR}"/nx-X11-3.4.0-Imake-fix-1.patch
|
||||||
|
|
||||||
|
# From xorg-x11-6.9.0-r3.ebuild
|
||||||
|
cd "${S}"
|
||||||
|
[ -e programs/Xserver/hw/nxagent ] || cp -r nxagent/programs/Xserver/hw/nxagent programs/Xserver/hw/
|
||||||
|
HOSTCONF="config/cf/host.def"
|
||||||
|
echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
|
||||||
|
echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
|
||||||
|
echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
# Again, from xorg-x11-6.9.0-r3.ebuild
|
||||||
|
unset MAKE_OPTS
|
||||||
|
FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "nx-X11 emake failed"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dobin "${S}"/programs/Xserver/nxagent
|
||||||
|
dobin "${S}"/programs/nxauth/nxauth
|
||||||
|
|
||||||
|
dolib.so "${S}"/lib/X11/libX11-nx.so*
|
||||||
|
dolib.so "${S}"/lib/Xext/libXext-nx.so*
|
||||||
|
dolib.so "${S}"/lib/Xrender/libXrender-nx.so*
|
||||||
|
|
||||||
|
insinto /usr/include/nx
|
||||||
|
doins "${S}"/programs/Xserver/hw/nxagent/*.h
|
||||||
|
doins "${S}"/programs/Xserver/include/dix.h
|
||||||
|
doins -r "${S}"/exports/include/*
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user