svn commit: r401959 - in branches/2015Q4/x11/xpra: . files
Jung-uk Kim
jkim at FreeBSD.org
Thu Nov 19 20:01:39 UTC 2015
Author: jkim
Date: Thu Nov 19 20:01:37 2015
New Revision: 401959
URL: https://svnweb.freebsd.org/changeset/ports/401959
Log:
MFH: r399796, r401788
Update to 0.15.8.
Approved by: ports-secteam (feld)
Added:
branches/2015Q4/x11/xpra/pkg-message
- copied unchanged from r399796, head/x11/xpra/pkg-message
Modified:
branches/2015Q4/x11/xpra/Makefile
branches/2015Q4/x11/xpra/distinfo
branches/2015Q4/x11/xpra/files/patch-setup.py
branches/2015Q4/x11/xpra/pkg-plist
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/x11/xpra/Makefile
==============================================================================
--- branches/2015Q4/x11/xpra/Makefile Thu Nov 19 18:36:58 2015 (r401958)
+++ branches/2015Q4/x11/xpra/Makefile Thu Nov 19 20:01:37 2015 (r401959)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xpra
-PORTVERSION= 0.15.6
+PORTVERSION= 0.15.8
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/
@@ -14,7 +14,6 @@ LICENSE= GPLv2
BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython \
${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
RUN_DEPENDS= py${PYTHON_SUFFIX}-lz4>=0.7.0_1:${PORTSDIR}/archivers/py-lz4 \
- pulseaudio:${PORTSDIR}/audio/pulseaudio \
${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \
${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
@@ -31,27 +30,74 @@ RUN_DEPENDS= py${PYTHON_SUFFIX}-lz4>=0.7
Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
-LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp \
- libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
- libvpx.so:${PORTSDIR}/multimedia/libvpx \
- libx264.so:${PORTSDIR}/multimedia/libx264 \
- libx265.so:${PORTSDIR}/multimedia/x265
-USES= pkgconfig python tar:xz
+USES= desktop-file-utils pkgconfig python shared-mime-info tar:xz
USE_PYTHON= distutils
USE_XORG= x11 xcomposite xdamage xfixes xkbfile xrandr xtst
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}
+OPTIONS_DEFINE= AVCODEC OPENCL SWSCALE VPX WEBP X264 X265
+OPTIONS_DEFAULT= AVCODEC SWSCALE VPX WEBP X264 X265
+OPTIONS_SUB= yes
+
+AVCODEC_DESC= Enable avcodec2 decoder
+OPENCL_DESC= Enable OpenCL CSC module
+SWSCALE_DESC= Enable swscale CSC module
+VPX_DESC= Enable VP8 and VP9 encoder
+WEBP_DESC= Enable WebP encoder
+X264_DESC= Enable X264 encoder
+X265_DESC= Enable X265 encoder
+
+AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2
+OPENCL_LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd
+OPENCL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyopencl/__init__.py:${PORTSDIR}/devel/py-pyopencl
+OPENCL_VARS= XPRA_OPTIONS+=csc_opencl
+SWSCALE_VARS= XPRA_OPTIONS+=csc_swscale
+VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_VARS= XPRA_OPTIONS+=vpx
+WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_VARS= XPRA_OPTIONS+=webp
+X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264
+X264_VARS= XPRA_OPTIONS+=enc_x264
+X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265
+X265_VARS= XPRA_OPTIONS+=enc_x265
+
PYDISTUTILS_PKGNAME= xpra_all
+XPRA_OPTIONS_ALL= csc_opencl csc_swscale dec_avcodec2
+XPRA_OPTIONS_ALL+= enc_x264 enc_x265 vpx webp
+XPRA_OPTIONS_ALL+= ${XPRA_OPTIONS_DISABLED}
+XPRA_OPTIONS_DISABLED= Xdummy Xdummy_wrapper
+XPRA_OPTIONS_DISABLED+= nvenc3 nvenc4 nvenc5
+
+.include <bsd.port.options.mk>
+
+.for opt in ${XPRA_OPTIONS_ALL}
+.if empty(XPRA_OPTIONS:M${opt})
+PYDISTUTILS_ARGS+= --without-${opt}
+.else
+PYDISTUTILS_ARGS+= --with-${opt}
+.endif
+.endfor
+
+.if ${PORT_OPTIONS:MAVCODEC} || ${PORT_OPTIONS:MSWSCALE}
+LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+.endif
+
+.include <bsd.port.pre.mk>
+
+PYDISTUTILS_BUILDARGS+= ${PYDISTUTILS_ARGS}
+PYDISTUTILS_CONFIGUREARGS+= ${PYDISTUTILS_ARGS}
+PYDISTUTILS_INSTALLARGS+= ${PYDISTUTILS_ARGS}
post-patch:
${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \
${WRKSRC}/xpra/platform/pycups_printing.py
post-install:
- ${INSTALL_DATA} ${WRKSRC}/etc/xpra/xorg.conf \
- ${STAGEDIR}${ETCDIR}/xorg.conf.sample
+ ${RM} ${STAGEDIR}${ETCDIR}/xpra.conf
${INSTALL_DATA} ${WRKSRC}/build/etc/xpra/xpra.conf \
${STAGEDIR}${ETCDIR}/xpra.conf.sample
+ ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \
+ -exec ${STRIP_CMD} {} \;
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: branches/2015Q4/x11/xpra/distinfo
==============================================================================
--- branches/2015Q4/x11/xpra/distinfo Thu Nov 19 18:36:58 2015 (r401958)
+++ branches/2015Q4/x11/xpra/distinfo Thu Nov 19 20:01:37 2015 (r401959)
@@ -1,2 +1,2 @@
-SHA256 (xpra-0.15.6.tar.xz) = cebd8d22d4173610258c835f175ad3781cf49bf91b3d6d3c36c35a825228fa32
-SIZE (xpra-0.15.6.tar.xz) = 1196700
+SHA256 (xpra-0.15.8.tar.xz) = e6ca124c89cfa81c8ee69dd2d746cdb0b4d896af6b369e60abc50d2fd2d2a0d2
+SIZE (xpra-0.15.8.tar.xz) = 1198496
Modified: branches/2015Q4/x11/xpra/files/patch-setup.py
==============================================================================
--- branches/2015Q4/x11/xpra/files/patch-setup.py Thu Nov 19 18:36:58 2015 (r401958)
+++ branches/2015Q4/x11/xpra/files/patch-setup.py Thu Nov 19 20:01:37 2015 (r401959)
@@ -1,6 +1,15 @@
---- setup.py.orig 2015-06-12 20:31:00 UTC
+--- setup.py.orig 2015-09-10 14:42:44 UTC
+++ setup.py
-@@ -1552,12 +1552,12 @@ if WIN32:
+@@ -147,7 +147,7 @@ nvenc4_ENABLED = pkg_config_ok(
+ nvenc5_ENABLED = pkg_config_ok("--exists", "nvenc5")
+ #elif os.path.exists("C:\\nvenc_3.0_windows_sdk")
+ #...
+-csc_opencl_ENABLED = pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD()
++csc_opencl_ENABLED = pkg_config_ok("--exists", "OpenCL")
+ memoryview_ENABLED = PYTHON3
+
+ warn_ENABLED = True
+@@ -1560,12 +1560,12 @@ if WIN32:
else:
#OSX and *nix:
scripts += ["scripts/xpra", "scripts/xpra_launcher"]
@@ -15,7 +24,7 @@
add_data_files("share/appdata", ["xdg/xpra.appdata.xml"])
html5_dir = "share/xpra/www"
-@@ -1680,7 +1680,7 @@ if html5_ENABLED:
+@@ -1688,7 +1688,7 @@ if html5_ENABLED:
if printing_ENABLED and os.name=="posix":
#"/usr/lib/cups/backend":
Copied: branches/2015Q4/x11/xpra/pkg-message (from r399796, head/x11/xpra/pkg-message)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/x11/xpra/pkg-message Thu Nov 19 20:01:37 2015 (r401959, copy of r399796, head/x11/xpra/pkg-message)
@@ -0,0 +1,14 @@
+==============================================================================
+x11/xpra install note:
+
+Requirements for sound forwarding:
+* a client with sound output of any kind (even virtual)
+* a server with pulseaudio installed (for going beyond the simple test step)
+* users must be "pulseaudio-enabled" - whatever that means in terms of
+ permissions and user setup (policy, user group, etc)
+
+The runtime dependency on pulseaudio has been dropped from this port since it
+is strictly optional at runtime. If you want to forward sound from the server,
+then pulseaudio must be installed and configured for use. Pulseaudio is
+supported for client side but not required for any feature to function.
+==============================================================================
Modified: branches/2015Q4/x11/xpra/pkg-plist
==============================================================================
--- branches/2015Q4/x11/xpra/pkg-plist Thu Nov 19 18:36:58 2015 (r401958)
+++ branches/2015Q4/x11/xpra/pkg-plist Thu Nov 19 20:01:37 2015 (r401959)
@@ -1,7 +1,7 @@
bin/xpra
bin/xpra_Xdummy
bin/xpra_launcher
- at sample %%ETCDIR%%/xorg.conf.sample
+%%ETCDIR%%/xorg.conf
@sample %%ETCDIR%%/xpra.conf.sample
%%PYTHON_SITELIBDIR%%/xpra/__init__.py
%%PYTHON_SITELIBDIR%%/xpra/__init__.pyc
@@ -188,28 +188,37 @@ bin/xpra_launcher
%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.pyc
%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.pyo
%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/colorspace_converter.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/colorspace_converter.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/decoder.so
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.py
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.pyc
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.pyo
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.py
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.pyc
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.pyo
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.py
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.pyc
+%%OPENCL%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.pyo
+%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.py
+%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyc
+%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyo
+%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/colorspace_converter.so
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.py
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyc
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyo
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/decoder.so
%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.py
%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.pyc
%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.pyo
%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/encoder.py
%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/encoder.pyc
%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/encoder.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/encoder.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder.so
+%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.py
+%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyc
+%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyo
+%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/encoder.so
+%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.py
+%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyc
+%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyo
+%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder.so
%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py
%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyc
%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyo
@@ -222,16 +231,16 @@ bin/xpra_launcher
%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py
%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyc
%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/decode.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/encode.so
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyc
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyo
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder.so
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder.so
+%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.py
+%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyc
+%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyo
+%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/decode.so
+%%WEBP%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/encode.so
%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.py
%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyc
%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyo
More information about the svn-ports-all
mailing list