svn commit: r428332 - in head/net/freerdp1: . files

Ben Woods woodsb02 at FreeBSD.org
Sun Dec 11 06:11:09 UTC 2016 

Author: woodsb02
Date: Sun Dec 11 06:11:06 2016
New Revision: 428332
URL: https://svnweb.freebsd.org/changeset/ports/428332

Log:
  net/freerdp1: Implement port improvements made to net/freerdp in r428330
  
  - Remove DIRECTFB option, as it no longer compiles, and gets little
    upstream maintenance
  - Use NEON on aarch64, and optionally on armv6
  - Mark as broken on armv6 on FreeBSD 11.0-RELEASE and early versions
    of 12.0-CURRENT
  - Re-generate patches (pet portlint)
  
  PR:		212004
  PR:		213637
  Submitted by:	Kyle Evans (maintainer)
  Reviewed by:	Mikael Urankar <mikael.urankar at gmail.com>
  Reviewed by:	koobs
  Reviewed by:	jbeich
  Approved by:	adamw (mentor, implicit)

Added:
  head/net/freerdp1/files/patch-CMakeLists.txt
     - copied unchanged from r428331, head/net/freerdp1/files/patch-z001-CMakeLists.txt
  head/net/freerdp1/files/patch-cmake_FindGStreamer__1__0.cmake
     - copied, changed from r428331, head/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake
  head/net/freerdp1/files/patch-cmake_FindOpenSSL.cmake
     - copied, changed from r428331, head/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake
  head/net/freerdp1/files/patch-libfreerdp_locale_timezone.c
     - copied, changed from r428331, head/net/freerdp1/files/patch-libfreerdp-locale-timezone.c
Deleted:
  head/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake
  head/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake
  head/net/freerdp1/files/patch-libfreerdp-locale-timezone.c
  head/net/freerdp1/files/patch-z001-CMakeLists.txt
Modified:
  head/net/freerdp1/Makefile
  head/net/freerdp1/distinfo
  head/net/freerdp1/files/patch-ffmpeg29
  head/net/freerdp1/files/patch-git_1b663cef
  head/net/freerdp1/files/patch-git_434436b7
  head/net/freerdp1/files/patch-winpr.pc.in
  head/net/freerdp1/pkg-plist

Modified: head/net/freerdp1/Makefile
==============================================================================
--- head/net/freerdp1/Makefile	Sun Dec 11 04:46:37 2016	(r428331)
+++ head/net/freerdp1/Makefile	Sun Dec 11 06:11:06 2016	(r428332)
@@ -3,6 +3,7 @@
 
 PORTNAME=	freerdp
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	net comms ipv6
 PKGNAMESUFFIX=	1
 
@@ -12,61 +13,68 @@ COMMENT=	Free implementation of Remote D
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_LDCONFIG=	yes
-USES=		alias cmake:outsource cpe execinfo pathfix pkgconfig compiler:c++11-lib ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	${GH_ACCOUNT}
 GH_TAGNAME=	f5ff6e1
 
+USES=		alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl
+USE_LDCONFIG=	yes
 CPE_VENDOR=	freerdp_project
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include
+CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
 
-OPTIONS_DEFINE=		ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11
+CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
+CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
+
+OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11
 OPTIONS_DEFAULT=	CUPS GSTREAMER X11
 OPTIONS_SUB=		yes
 
+OPTIONS_DEFINE_armv6=	NEON
+OPTIONS_EXCLUDE_armv6=	SSE
+
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_CMAKE_ON=		-DWITH_ALSA=ON
-ALSA_CMAKE_OFF=		-DWITH_ALSA=OFF
+ALSA_CMAKE_BOOL=	WITH_ALSA
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
-CUPS_CMAKE_ON=		-DWITH_CUPS=ON
-CUPS_CMAKE_OFF=		-DWITH_CUPS=OFF
-
-# outdated and unmaintained upstream
-DIRECTFB_DESC=		Build FreeRDP DirectFB client (outdated)
-DIRECTFB_LIB_DEPENDS=	libdirectfb.so:devel/directfb
-DIRECTFB_CMAKE_ON=	-DWITH_DIRECTFB=ON
-DIRECTFB_CMAKE_OFF=	-DWITH_DIRECTFB=OFF
-# currently DirectFB option fails with clang
-DIRECTFB_USE=		gcc=yes
+CUPS_CMAKE_BOOL=	WITH_CUPS
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
-FFMPEG_CMAKE_ON=	-DWITH_FFMPEG=ON
-FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG=OFF
+FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 
-GSTREAMER_CMAKE_ON=	-DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF
-GSTREAMER_CMAKE_OFF=	-DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF
-GSTREAMER_USE=		gstreamer1=yes xorg=x11,xextproto,xext,xrandr
+GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0
+GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr
+GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
+
+NEON_DESC=		Enable	Media Processing Engine instructions
+NEON_CMAKE_BOOL=	WITH_NEON
+.if ! ${CFLAGS:M-march*}
+NEON_CFLAGS=		-march=armv7-a
+.endif
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_CMAKE_ON=	-DWITH_PULSE=ON
-PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE=OFF
+PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
-SSE_CMAKE_ON=		-DWITH_SSE2=ON
-SSE_CMAKE_OFF=		-DWITH_SSE2=OFF
+SSE_CMAKE_BOOL=		WITH_SSE2
 
 X11_DESC=		Build FreeRDP X11 client
 X11_BUILD_DEPENDS=	xmlto:textproc/xmlto
-X11_CMAKE_ON=		-DWITH_X11=ON
-X11_CMAKE_OFF=		-DWITH_X11=OFF -DWITH_XKBFILE=OFF
+X11_CMAKE_BOOL=		WITH_X11
+X11_CMAKE_OFF=		-DWITH_XKBFILE=OFF
 X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xrandr,xi,xfixes,xrender
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == "FreeBSD" && ${ARCH} == "armv6"
+.if ${OSVERSION} < 1100500 || \
+	(${OSVERSION} >= 1100500 && ${OSVERSION} < 1100504) || \
+	(${OSVERSION} >= 1200000 && ${OSVERSION} < 1200008)
+BROKEN=	Fails to build on ARMv6 (libm bug). See: r305380 (HEAD), r305971 (stable/11) [\#199422, \#211965] \
+	Please update to a later (fixed) version.
+.endif
+.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name 'CMakeLists.txt' | ${XARGS} \
@@ -83,6 +91,8 @@ post-patch:
 				-e 's|^([[:blank:]]*)target_link_libraries\((.+) winpr\)([[:blank:]]*)$$|\1target_link_libraries(\2 winpr1)\3|' \
 				-e 's|^([[:blank:]]*)set\((.+) freerdp (.+) winpr\)([[:blank:]]*)$$|\1set(\2 freerdp1 \3 winpr1)\4|' \
 				-e 's|^([[:blank:]]*)set\((.+) winpr\)([[:blank:]]*)$$|\1set(\2 winpr1)\3|'
+	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
+		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
 		${WRKSRC}/client/X11/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
@@ -93,4 +103,4 @@ post-patch:
 		${WRKSRC}/winpr/CMakeLists.txt \
 		${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/net/freerdp1/distinfo
==============================================================================
--- head/net/freerdp1/distinfo	Sun Dec 11 04:46:37 2016	(r428331)
+++ head/net/freerdp1/distinfo	Sun Dec 11 06:11:06 2016	(r428332)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470755086
+TIMESTAMP = 1481433621
 SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32
 SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856

Copied: head/net/freerdp1/files/patch-CMakeLists.txt (from r428331, head/net/freerdp1/files/patch-z001-CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/freerdp1/files/patch-CMakeLists.txt	Sun Dec 11 06:11:06 2016	(r428332, copy of r428331, head/net/freerdp1/files/patch-z001-CMakeLists.txt)
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.intermediate	2015-06-06 13:17:20 UTC
++++ CMakeLists.txt
+@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+ 		set(FREEBSD TRUE)
+ 	endif()
+ endif()
++if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
++	set(BSD TRUE)
++	set(FREEBSD TRUE)
++endif()
+ 
+ # Android
+ if(ANDROID)

Copied and modified: head/net/freerdp1/files/patch-cmake_FindGStreamer__1__0.cmake (from r428331, head/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake)
==============================================================================
--- head/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake	Sun Dec 11 04:46:37 2016	(r428331, copy source)
+++ head/net/freerdp1/files/patch-cmake_FindGStreamer__1__0.cmake	Sun Dec 11 06:11:06 2016	(r428332)
@@ -2,9 +2,9 @@ Don't use custom code to find the includ
 Since 1.6.0 there are multiple include paths. So use pkg-config to find
 which. IMO the rest of this file should use pkg-config....
 
---- cmake/FindGStreamer_1_0.cmake.orig	2015-06-26 15:30:00.000000000 +0200
-+++ cmake/FindGStreamer_1_0.cmake	2015-09-27 10:43:55.754514000 +0200
-@@ -78,7 +78,8 @@
+--- cmake/FindGStreamer_1_0.cmake.orig	2014-09-11 22:46:32 UTC
++++ cmake/FindGStreamer_1_0.cmake
+@@ -78,7 +78,8 @@ endmacro()
  # 1.1. Find headers and libraries
  set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
  find_package(Glib REQUIRED)

Copied and modified: head/net/freerdp1/files/patch-cmake_FindOpenSSL.cmake (from r428331, head/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake)
==============================================================================
--- head/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake	Sun Dec 11 04:46:37 2016	(r428331, copy source)
+++ head/net/freerdp1/files/patch-cmake_FindOpenSSL.cmake	Sun Dec 11 06:11:06 2016	(r428332)
@@ -1,6 +1,6 @@
---- cmake/FindOpenSSL.cmake.orig	2013-07-10 04:00:21.000000000 -0400
-+++ cmake/FindOpenSSL.cmake	2015-03-25 19:26:35.154024000 -0400
-@@ -270,7 +270,7 @@
+--- cmake/FindOpenSSL.cmake.orig	2014-09-11 22:46:32 UTC
++++ cmake/FindOpenSSL.cmake
+@@ -266,7 +266,7 @@ if (OPENSSL_INCLUDE_DIR)
      set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
    elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
      file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str

Modified: head/net/freerdp1/files/patch-ffmpeg29
==============================================================================
--- head/net/freerdp1/files/patch-ffmpeg29	Sun Dec 11 04:46:37 2016	(r428331)
+++ head/net/freerdp1/files/patch-ffmpeg29	Sun Dec 11 06:11:06 2016	(r428332)
@@ -2,9 +2,9 @@ Description: Replace deprecated FFmpeg A
 Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
 Last-Update: <2015-11-02>
 
---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2016-06-11 21:12:27.134896000 +0200
-+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2016-06-11 21:14:05.282247000 +0200
-@@ -103,7 +103,7 @@
+--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2014-09-11 22:46:32 UTC
++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -103,7 +103,7 @@ static BOOL tsmf_ffmpeg_init_video_strea
  	mdecoder->codec_context->bit_rate = media_type->BitRate;
  	mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;
  	mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
@@ -13,7 +13,7 @@ Last-Update: <2015-11-02>
  	return TRUE;
  }
  
-@@ -322,14 +322,14 @@
+@@ -322,14 +322,14 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
  									 mdecoder->codec_context->width, mdecoder->codec_context->height);
  			mdecoder->decoded_data = malloc(mdecoder->decoded_size);
  			ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
@@ -30,7 +30,7 @@ Last-Update: <2015-11-02>
  		}
  	return ret;
  }
-@@ -385,7 +385,7 @@
+@@ -385,7 +385,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
  									(int16_t *) dst, &frame_size, src, src_size);
  #else
  		{
@@ -39,7 +39,7 @@ Last-Update: <2015-11-02>
  			int got_frame = 0;
  			AVPacket pkt;
  			av_init_packet(&pkt);
-@@ -398,7 +398,7 @@
+@@ -398,7 +398,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
  														decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1);
  				memcpy(dst, decoded_frame->data[0], frame_size);
  			}
@@ -48,7 +48,7 @@ Last-Update: <2015-11-02>
  		}
  #endif
  		if(len <= 0 || frame_size <= 0)
-@@ -464,7 +464,7 @@
+@@ -464,7 +464,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo
  	TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder;
  	switch(mdecoder->codec_context->pix_fmt)
  	{
@@ -57,7 +57,7 @@ Last-Update: <2015-11-02>
  			return RDP_PIXFMT_I420;
  		default:
  			CLOG_ERR("unsupported pixel format %u",
-@@ -492,7 +492,7 @@
+@@ -492,7 +492,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
  {
  	TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder;
  	if(mdecoder->frame)
@@ -66,7 +66,7 @@ Last-Update: <2015-11-02>
  	if(mdecoder->decoded_data)
  		free(mdecoder->decoded_data);
  	if(mdecoder->codec_context)
-@@ -501,7 +501,7 @@
+@@ -501,7 +501,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
  			avcodec_close(mdecoder->codec_context);
  		if(mdecoder->codec_context->extradata)
  			free(mdecoder->codec_context->extradata);

Modified: head/net/freerdp1/files/patch-git_1b663cef
==============================================================================
--- head/net/freerdp1/files/patch-git_1b663cef	Sun Dec 11 04:46:37 2016	(r428331)
+++ head/net/freerdp1/files/patch-git_1b663cef	Sun Dec 11 06:11:06 2016	(r428332)
@@ -12,7 +12,7 @@ Subject: [PATCH] build: cmake 3.1 compat
 	work with all cmake versions.
 
 Tested with 3.1.0-rc3
---- channels/CMakeLists.txt
+--- channels/CMakeLists.txt.orig	2014-09-11 22:46:32 UTC
 +++ channels/CMakeLists.txt
 @@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake")
  file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
@@ -25,7 +25,7 @@ Tested with 3.1.0-rc3
  		set(CHANNEL_OPTION)
  		include(${FILEPATH})
  		if(${CHANNEL_OPTION})
---- channels/client/CMakeLists.txt
+--- channels/client/CMakeLists.txt.orig	2014-09-11 22:46:32 UTC
 +++ channels/client/CMakeLists.txt
 @@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
  	${CMAKE_CURRENT_SOURCE_DIR}/addin.c
@@ -37,7 +37,7 @@ Tested with 3.1.0-rc3
  
  foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
  	foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
---- third-party/CMakeLists.txt
+--- third-party/CMakeLists.txt.orig	2014-09-11 22:46:32 UTC
 +++ third-party/CMakeLists.txt
 @@ -22,11 +22,11 @@
  file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")

Modified: head/net/freerdp1/files/patch-git_434436b7
==============================================================================
--- head/net/freerdp1/files/patch-git_434436b7	Sun Dec 11 04:46:37 2016	(r428331)
+++ head/net/freerdp1/files/patch-git_434436b7	Sun Dec 11 06:11:06 2016	(r428332)
@@ -10,11 +10,9 @@ Subject: [PATCH] * BSD/FreeBSD build fix
  winpr/libwinpr/utils/CMakeLists.txt |  4 ++++
  4 files changed, 20 insertions(+), 1 deletion(-)
 
-diff CMakeLists.txt CMakeLists.txt
-index 0a9144a..386ae67 100644
---- CMakeLists.txt
+--- CMakeLists.txt.orig	2016-12-11 05:41:21 UTC
 +++ CMakeLists.txt
-@@ -358,6 +358,14 @@ if(APPLE)
+@@ -319,6 +319,14 @@ if(APPLE)
  	endif()
  endif(APPLE)
  
@@ -29,7 +27,7 @@ index 0a9144a..386ae67 100644
  # Android
  if(ANDROID)
    set(WITH_LIBRARY_VERSIONING "OFF")
-@@ -618,6 +626,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions")
+@@ -558,6 +566,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INST
  include_directories(${CMAKE_CURRENT_BINARY_DIR})
  include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -42,9 +40,7 @@ index 0a9144a..386ae67 100644
  
  # Configure files
  add_definitions("-DHAVE_CONFIG_H")
-diff winpr/libwinpr/sysinfo/sysinfo.c winpr/libwinpr/sysinfo/sysinfo.c
-index 1529d54..457ab9d 100644
---- winpr/libwinpr/sysinfo/sysinfo.c
+--- winpr/libwinpr/sysinfo/sysinfo.c.orig	2014-09-11 22:46:32 UTC
 +++ winpr/libwinpr/sysinfo/sysinfo.c
 @@ -54,6 +54,7 @@
  #ifndef _WIN32
@@ -54,11 +50,9 @@ index 1529d54..457ab9d 100644
  
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-diff winpr/libwinpr/utils/CMakeLists.txt winpr/libwinpr/utils/CMakeLists.txt
-index e524bf9..501f605 100644
---- winpr/libwinpr/utils/CMakeLists.txt
+--- winpr/libwinpr/utils/CMakeLists.txt.orig	2014-09-11 22:46:32 UTC
 +++ winpr/libwinpr/utils/CMakeLists.txt
-@@ -113,6 +113,10 @@ if(UNIX)
+@@ -105,6 +105,10 @@ if(UNIX)
  	winpr_library_add(m)
  endif()
  
@@ -69,6 +63,3 @@ index e524bf9..501f605 100644
  if(BUILD_TESTING)
  	add_subdirectory(test)
  endif()
--- 
-2.4.1
-

Copied and modified: head/net/freerdp1/files/patch-libfreerdp_locale_timezone.c (from r428331, head/net/freerdp1/files/patch-libfreerdp-locale-timezone.c)
==============================================================================
--- head/net/freerdp1/files/patch-libfreerdp-locale-timezone.c	Sun Dec 11 04:46:37 2016	(r428331, copy source)
+++ head/net/freerdp1/files/patch-libfreerdp_locale_timezone.c	Sun Dec 11 06:11:06 2016	(r428332)
@@ -3,15 +3,9 @@ From: ivan-83 <rozhuk.im at gmail.com>
 Date: Tue, 10 Mar 2015 04:40:47 +0300
 Subject: [PATCH] * FreeBSD timezone detection patch
 
----
- libfreerdp/locale/timezone.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff libfreerdp/locale/timezone.c libfreerdp/locale/timezone.c
-index 92b74e8..0375f9c 100644
---- libfreerdp/locale/timezone.c
+--- libfreerdp/locale/timezone.c.orig	2014-09-11 22:46:32 UTC
 +++ libfreerdp/locale/timezone.c
-@@ -1521,8 +1523,11 @@ char* freerdp_get_unix_timezone_identifier()
+@@ -1507,8 +1507,11 @@ char* freerdp_get_unix_timezone_identifi
  		return tzid;
  	}
  
@@ -24,7 +18,7 @@ index 92b74e8..0375f9c 100644
  	if (fp != NULL)
  	{
  		fseek(fp, 0, SEEK_END);
-@@ -1678,8 +1683,10 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone)
+@@ -1664,8 +1667,10 @@ void freerdp_time_zone_detect(TIME_ZONE_
  
  #ifdef HAVE_TM_GMTOFF
  	#if defined(__FreeBSD__)
@@ -37,6 +31,3 @@ index 92b74e8..0375f9c 100644
  	#else
  		clientTimeZone->bias = timezone / 60;
  	#endif
--- 
-2.4.1
-

Modified: head/net/freerdp1/files/patch-winpr.pc.in
==============================================================================
--- head/net/freerdp1/files/patch-winpr.pc.in	Sun Dec 11 04:46:37 2016	(r428331)
+++ head/net/freerdp1/files/patch-winpr.pc.in	Sun Dec 11 06:11:06 2016	(r428332)
@@ -1,8 +1,7 @@
 Index: winpr.pc.in
-diff -u winpr.pc.in.orig winpr.pc.in
---- winpr.pc.in.orig	2014-09-12 07:46:32.000000000 +0900
-+++ winpr.pc.in	2015-05-26 02:05:59.353925013 +0900
-@@ -9,7 +9,6 @@
+--- winpr.pc.in.orig	2014-09-11 22:46:32 UTC
++++ winpr.pc.in
+@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Run
  URL: http://www.freerdp.com/
  Version: @WINPR_VERSION_FULL@
  Requires: 

Modified: head/net/freerdp1/pkg-plist
==============================================================================
--- head/net/freerdp1/pkg-plist	Sun Dec 11 04:46:37 2016	(r428331)
+++ head/net/freerdp1/pkg-plist	Sun Dec 11 06:11:06 2016	(r428332)
@@ -1,4 +1,3 @@
-%%DIRECTFB%%bin/dfreerdp1
 %%X11%%bin/xfreerdp1
 include/freerdp/addin.h
 include/freerdp/altsec.h
@@ -222,15 +221,15 @@ lib/freerdp/smartcard-client.a
 %%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a
 %%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a
 lib/freerdp/tsmf-client.a
-lib/libfreerdp1.so          
-lib/libfreerdp1.so.1.2      
-lib/libfreerdp1.so.1.2.0    
+lib/libfreerdp1.so
+lib/libfreerdp1.so.1.2
+lib/libfreerdp1.so.1.2.0
 lib/libfreerdp1-client.so
 lib/libfreerdp1-client.so.1.2
 lib/libfreerdp1-client.so.1.2.0
-lib/libwinpr1.so          
-lib/libwinpr1.so.1.1      
-lib/libwinpr1.so.1.1.0    
+lib/libwinpr1.so
+lib/libwinpr1.so.1.1
+lib/libwinpr1.so.1.1.0
 lib/libwinpr-makecert-tool.a
 %%X11%%lib/libxfreerdp1-client.so
 %%X11%%lib/libxfreerdp1-client.so.1.2

More information about the svn-ports-head mailing list