Index: head/x11/xpra/Makefile =================================================================== --- head/x11/xpra/Makefile (revision 434060) +++ head/x11/xpra/Makefile (revision 434061) @@ -1,142 +1,142 @@ # Created by: Steve Wills # $FreeBSD$ PORTNAME= xpra -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ MAINTAINER= rezny@FreeBSD.org COMMENT= Xpra gives you persistent remote applications for X LICENSE= GPLv2 BUILD_DEPENDS= cython:lang/cython \ ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2 \ ${PYNUMPY} LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4 \ ${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode \ ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify \ ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash \ ${PYTHON_PKGNAMEPREFIX}pillow>1:graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ ssh-askpass:security/openssh-askpass \ ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography \ setxkbmap:x11/setxkbmap \ xauth:x11/xauth \ xkbcomp:x11/xkbcomp \ ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ Xvfb:x11-servers/xorg-vfbserver \ ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2 \ ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext \ ${PYNUMPY} USES= desktop-file-utils fortran gettext-runtime pkgconfig python:2 shared-mime-info tar:xz USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango USE_PYTHON= distutils USE_XORG= x11 xcomposite xdamage xext xfixes xkbfile xrandr xtst PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER} OPTIONS_DEFINE= AVAHI AVCODEC CUPS FFMPEG GSTREAMER HTML5 LIBYUV OPENCL OPENCV SWSCALE VPX WEBCAM WEBP X264 X265 XVID OPTIONS_DEFAULT= AVAHI AVCODEC CUPS FFMPEG GSTREAMER HTML5 LIBYUV SWSCALE VPX X264 OPTIONS_SUB= yes AVCODEC_DESC= Enable avcodec2 (FFmpeg) decoder CUPS_DESC= Enable CUPS for printer forwarding FFMPEG_DESC= Enable FFmpeg encoder GSTREAMER_DESC= Enable GStreamer for sound forwarding HTML5_DESC= Install HTML5 client interface LIBYUV_DESC= Enable libyuv CSC module (CPU, fastest) OPENCL_DESC= Enable OpenCL CSC module (GPU) OPENCV_DESC= Enable OpenCV CSC module (CPU, deprecated) SWSCALE_DESC= Enable swscale (FFmpeg) CSC module (CPU) VPX_DESC= Enable VP8 and VP9 codec (good) WEBCAM_DESC= Enable webcam forwarding (client only) WEBP_DESC= Enable WebP codec (deprecated) X264_DESC= Enable X264 encoder (good) X265_DESC= Enable X265 encoder (slow) XVID_DESC= Enable Xvid encoder (unstable, deprecated) AVAHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi AVAHI_VARS= XPRA_OPTIONS+=mdns AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2 CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups CUPS_VARS= XPRA_OPTIONS+=printing FFMPEG_VARS= XPRA_OPTIONS+=enc_ffmpeg GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 GSTREAMER_USE= GSTREAMER1=flac,lame,mad,ogg,opus,vorbis,wavpack GSTREAMER_VARS= XPRA_OPTIONS+=sound HTML5_VARS= XPRA_OPTIONS+=html5 LIBYUV_LIB_DEPENDS= libyuv.so:graphics/libyuv LIBYUV_VARS= XPRA_OPTIONS+=csc_libyuv OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl OPENCL_VARS= XPRA_OPTIONS+=csc_opencl OPENCV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv2>2:graphics/py-opencv2 OPENCV_VARS= XPRA_OPTIONS+=csc_opencv SWSCALE_LIB_DEPENDS= libswscale.so:multimedia/ffmpeg SWSCALE_VARS= XPRA_OPTIONS+=csc_swscale VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_VARS= XPRA_OPTIONS+=vpx WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv2>2:graphics/py-opencv2 WEBCAM_VARS= XPRA_OPTIONS+=webcam WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_VARS= XPRA_OPTIONS+=webp X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_VARS= XPRA_OPTIONS+=enc_x264 X265_LIB_DEPENDS= libx265.so:multimedia/x265 X265_VARS= XPRA_OPTIONS+=enc_x265 XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_VARS= XPRA_OPTIONS+=enc_xvid PYDISTUTILS_PKGNAME= xpra_all XPRA_OPTIONS_ALL= csc_libyuv csc_opencl csc_opencv csc_swscale XPRA_OPTIONS_ALL+= dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 enc_xvid XPRA_OPTIONS_ALL+= html5 mdns sound printing vpx webcam webp XPRA_OPTIONS_ALL+= ${XPRA_OPTIONS_DISABLED} XPRA_OPTIONS_DISABLED= Xdummy Xdummy_wrapper minify nvenc7 .include .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:MFFMPEG} LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg .endif .include PYDISTUTILS_BUILDARGS+= ${PYDISTUTILS_ARGS} PYDISTUTILS_CONFIGUREARGS+= ${PYDISTUTILS_ARGS} PYDISTUTILS_INSTALLARGS+= ${PYDISTUTILS_ARGS} post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.py ${REINPLACE_CMD} -e 's|%%GCC_RUNTIME%%|${LOCALBASE}/lib/gcc${_GCC_VER}|' \ ${WRKSRC}/scripts/xpra ${WRKSRC}/scripts/xpra_launcher ${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${WRKSRC}/xpra/platform/pycups_printing.py ${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/sbin|' \ ${WRKSRC}/etc/xpra/conf.d/16_printing.conf.in post-install: ${MV} ${STAGEDIR}${ETCDIR}/xorg.conf \ ${STAGEDIR}${ETCDIR}/xorg.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/xpra.conf \ ${STAGEDIR}${ETCDIR}/xpra.conf.sample ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \ -exec ${STRIP_CMD} {} \; .include Index: head/x11/xpra/distinfo =================================================================== --- head/x11/xpra/distinfo (revision 434060) +++ head/x11/xpra/distinfo (revision 434061) @@ -1,3 +1,3 @@ -TIMESTAMP = 1486238713 -SHA256 (xpra-1.0.2.tar.xz) = e32d2550c13d175681643696664790c9c59eda1e0ce1cea779ef7b0785f8bd2c -SIZE (xpra-1.0.2.tar.xz) = 1888452 +TIMESTAMP = 1486998413 +SHA256 (xpra-1.0.3.tar.xz) = f83c5946f67fe26eee8b44fba0fa30bca9fbc7aa58ee66b903b7385c2d332166 +SIZE (xpra-1.0.3.tar.xz) = 1888908 Index: head/x11/xpra/files/patch-xpra_scripts_config.py =================================================================== --- head/x11/xpra/files/patch-xpra_scripts_config.py (revision 434060) +++ head/x11/xpra/files/patch-xpra_scripts_config.py (nonexistent) @@ -1,18 +0,0 @@ -# Chaneset 15036 in xpra -# Timestamp: 02/11/17 05:03:04 -# Author: Antoine Martin -# Message: make sure we call makedirs on the expanded path -# ---- xpra/scripts/config.py.orig 2016-12-30 04:31:45 UTC -+++ xpra/scripts/config.py -@@ -401,8 +401,8 @@ def may_create_user_config(xpra_conf_fil - ad = os.path.expanduser(d) - conf_file = os.path.join(ad, xpra_conf_filename) - try: -- if not os.path.exists(d): -- os.makedirs(d, int('700', 8)) -+ if not os.path.exists(ad): -+ os.makedirs(ad, int('700', 8)) - with open(conf_file, 'wb') as f: - f.write("# xpra user configuration file\n") - f.write("# place your custom settings in this file\n") Property changes on: head/x11/xpra/files/patch-xpra_scripts_config.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/xpra/files/patch-setup.py =================================================================== --- head/x11/xpra/files/patch-setup.py (revision 434060) +++ head/x11/xpra/files/patch-setup.py (revision 434061) @@ -1,77 +1,66 @@ ---- setup.py.orig 2017-02-01 05:52:14 UTC +--- setup.py.orig 2017-02-06 09:47:42 UTC +++ setup.py @@ -218,7 +218,7 @@ else: nvenc7_ENABLED = DEFAULT and pkg_config_ok("--exists", "nvenc7") memoryview_ENABLED = sys.version>='2.7' -csc_opencl_ENABLED = DEFAULT and pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD() +csc_opencl_ENABLED = DEFAULT and pkg_config_ok("--exists", "OpenCL") csc_libyuv_ENABLED = DEFAULT and memoryview_ENABLED and pkg_config_ok("--exists", "libyuv", fallback=WIN32) #Cython / gcc / packaging build options: -@@ -798,8 +798,8 @@ def get_base_conf_dir(install_dir, strip - elif "usr" in dirs: - #ie: ["some", "path", "to", "usr"] -> ["usr"] - #assume "/usr" or "/usr/local" is the build root -- while "usr" in dirs and dirs.index("usr")>0: -- dirs = dirs[dirs.index("usr"):] -+ while "usr" in dirs[1:]: -+ dirs = dirs[dirs[1:].index("usr")+1:] - elif "image" in dirs: - # Gentoo's "${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/image/_python2.7" -> "" - while "image" in dirs: @@ -1839,12 +1839,12 @@ if WIN32: else: #OSX and *nix: scripts += ["scripts/xpra", "scripts/xpra_launcher"] - add_data_files("share/man/man1", ["man/xpra.1", "man/xpra_launcher.1"]) + add_data_files("man/man1", ["man/xpra.1", "man/xpra_launcher.1"]) add_data_files("share/xpra", ["README", "COPYING"]) add_data_files("share/xpra/icons", glob.glob("icons/*")) add_data_files("share/applications", ["xdg/xpra_launcher.desktop", "xdg/xpra.desktop"]) add_data_files("share/mime/packages", ["xdg/application-x-xpraconfig.xml"]) - add_data_files("share/icons", ["xdg/xpra.png"]) + add_data_files("share/pixmaps", ["xdg/xpra.png"]) add_data_files("share/appdata", ["xdg/xpra.appdata.xml"]) #here, we override build and install so we can @@ -1877,7 +1877,7 @@ else: if printing_ENABLED and os.name=="posix": #install "/usr/lib/cups/backend" with 0700 permissions: xpraforwarder_src = os.path.join("cups", "xpraforwarder") - cups_backend_dir = os.path.join(self.install_dir, "lib", "cups", "backend") + cups_backend_dir = os.path.join(self.install_dir, "libexec", "cups", "backend") self.mkpath(cups_backend_dir) xpraforwarder_dst = os.path.join(cups_backend_dir, "xpraforwarder") shutil.copyfile(xpraforwarder_src, xpraforwarder_dst) @@ -1895,7 +1895,8 @@ else: #install xorg.conf, cuda.conf and nvenc.keys: etc_xpra = os.path.join(etc_prefix, "etc", "xpra") self.mkpath(etc_xpra) - for x in ("xorg.conf", "cuda.conf", "nvenc.keys"): + etc_files = ["xorg.conf", "cuda.conf", "nvenc.keys"] if nvenc7_ENABLED else ["xorg.conf"] + for x in etc_files: shutil.copyfile("etc/xpra/%s" % x, os.path.join(etc_xpra, x)) if pam_ENABLED: @@ -1928,7 +1929,7 @@ else: add_packages("xpra.platform.xposix") remove_packages("xpra.platform.win32", "xpra.platform.darwin") #not supported by all distros, but doesn't hurt to install it anyway: - add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"]) + #add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"]) #gentoo does weird things, calls --no-compile with build *and* install #then expects to find the cython modules!? ie: @@ -2353,7 +2354,10 @@ if enc_x265_ENABLED: toggle_packages(enc_xvid_ENABLED, "xpra.codecs.enc_xvid") if enc_xvid_ENABLED: - xvid_pkgconfig = pkgconfig("xvid") + xvid_pkgconfig = pkgconfig(optimize=3) + add_to_keywords(xvid_pkgconfig, 'libraries', "xvidcore") + add_to_keywords(xvid_pkgconfig, 'library_dirs', "%%LOCALBASE%%/lib") + add_to_keywords(xvid_pkgconfig, 'include_dirs', "%%LOCALBASE%%/include") cython_add(Extension("xpra.codecs.enc_xvid.encoder", ["xpra/codecs/enc_xvid/encoder.pyx", buffers_c], **xvid_pkgconfig))