svn commit: r367755 - in head/x11: . nxcomp nxcomp/files
Baptiste Daroussin
bapt at FreeBSD.org
Tue Sep 9 17:50:07 UTC 2014
Author: bapt
Date: Tue Sep 9 17:50:06 2014
New Revision: 367755
URL: http://svnweb.freebsd.org/changeset/ports/367755
QAT: https://qat.redports.org/buildarchive/r367755/
Log:
Add nxcomp
Added:
head/x11/nxcomp/
head/x11/nxcomp/Makefile (contents, props changed)
head/x11/nxcomp/distinfo (contents, props changed)
head/x11/nxcomp/files/
head/x11/nxcomp/files/patch-Types.h (contents, props changed)
head/x11/nxcomp/pkg-descr (contents, props changed)
head/x11/nxcomp/pkg-plist (contents, props changed)
Modified:
head/x11/Makefile
Modified: head/x11/Makefile
==============================================================================
--- head/x11/Makefile Tue Sep 9 17:23:58 2014 (r367754)
+++ head/x11/Makefile Tue Sep 9 17:50:06 2014 (r367755)
@@ -224,6 +224,7 @@
SUBDIR += nvidia-driver-96
SUBDIR += nvidia-settings
SUBDIR += nvidia-xconfig
+ SUBDIR += nxcomp
SUBDIR += ooxcb
SUBDIR += p5-Clipboard
SUBDIR += p5-X11-GUITest
Added: head/x11/nxcomp/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/nxcomp/Makefile Tue Sep 9 17:50:06 2014 (r367755)
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME= nxcomp
+PORTVERSION= 3.5.0.27
+MASTER_SITES= http://code.x2go.org/releases/source/nx-libs/
+CATEGORIES= x11 devel
+DISTNAME= nx-libs-${PORTVERSION}-lite
+
+MAINTAINER= bapt at FreeBSD.org
+COMMENT= NX X11 protocol compression libraries
+
+WRKSRC= ${WRKDIR}/nx-libs-${PORTVERSION}/${PORTNAME}
+
+USE_AUTOTOOLS= autoconf
+USE_XORG= xproto
+GNU_CONFIGURE= yes
+LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
+ libpng15.so:${PORTSDIR}/graphics/png
+
+post-patch:
+ @${REINPLACE_CMD} -e "s,libdir}/nx,libdir},g" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|/usr/NX/bin:/opt/NX/bin:/usr/local/NX|${PREFIX}|" \
+ ${WRKSRC}/Children.cpp
+
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXcomp.so.3.5*
+
+.include <bsd.port.mk>
+
Added: head/x11/nxcomp/distinfo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/nxcomp/distinfo Tue Sep 9 17:50:06 2014 (r367755)
@@ -0,0 +1,2 @@
+SHA256 (nx-libs-3.5.0.27-lite.tar.gz) = efbf6eed02b5eb2892828e2237dff4591442e96d0ac83f3d75c62a15101d6a27
+SIZE (nx-libs-3.5.0.27-lite.tar.gz) = 513262
Added: head/x11/nxcomp/files/patch-Types.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/nxcomp/files/patch-Types.h Tue Sep 9 17:50:06 2014 (r367755)
@@ -0,0 +1,52 @@
+Description: In Types.h, don't use STL internals on libc++.
+Author: Clemens Lang <cal at macports.org>
+Abstract:
+ The nx-libs-lite package does not compile on OS X Mavericks because
+ Apple's clang compilers now default to compiling against the libc++ STL
+ rather than (their outdated copy of) libstdc++.
+ .
+ While the compiler still allows changing that, we should not rely on
+ this being possible forever.
+ .
+ The compiler chokes in Types.h, specifically the clear() methods in
+ subclasses of vectors that use implementation details of the GNU STL.
+ The attached patch fixes these compilation issues by not overriding the
+ clear() method when compiling against libc++, since the libc++ headers
+ seem to do essentially the same as the overriden method.
+--- Types.h 2013-11-05 01:35:22.000000000 +0100
++++ Types.h 2013-11-05 01:37:30.000000000 +0100
+@@ -55,6 +55,9 @@
+ return &*(vector < unsigned char >::begin());
+ }
+
++ // Avoid overriding clear() when using libc++. Fiddling with STL internals
++ // doesn't really seem like a good idea to me anyway.
++ #ifndef _LIBCPP_VECTOR
+ void clear()
+ {
+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+@@ -95,12 +98,16 @@
+
+ #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+ }
++ #endif /* #ifdef _LIBCPP_VECTOR */
+ };
+
+ class T_messages : public vector < Message * >
+ {
+ public:
+
++ // Avoid overriding clear() when using libc++. Fiddling with STL internals
++ // doesn't really seem like a good idea to me anyway.
++ #ifndef _LIBCPP_VECTOR
+ void clear()
+ {
+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+@@ -141,6 +148,7 @@
+
+ #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+ }
++ #endif /* #ifndef _LIBCPP_VECTOR */
+ };
+
+ typedef md5_byte_t * T_checksum;
Added: head/x11/nxcomp/pkg-descr
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/nxcomp/pkg-descr Tue Sep 9 17:50:06 2014 (r367755)
@@ -0,0 +1,4 @@
+nxcomp is a library compressing X commands to be passed over network
+for use with x2go.
+
+WWW: http://wiki.x2go.org/
Added: head/x11/nxcomp/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/nxcomp/pkg-plist Tue Sep 9 17:50:06 2014 (r367755)
@@ -0,0 +1,13 @@
+include/nx/MD5.h
+include/nx/NX.h
+include/nx/NXalert.h
+include/nx/NXmitshm.h
+include/nx/NXpack.h
+include/nx/NXproto.h
+include/nx/NXrender.h
+include/nx/NXvars.h
+lib/libXcomp.a
+lib/libXcomp.so
+lib/libXcomp.so.3
+lib/libXcomp.so.3.5.0
+ at dirrmtry include/nx
More information about the svn-ports-head
mailing list