cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major update to freerdp-1.2.0beta1.

Browse Source 
Needed for an upcoming x11/gnome/vinagre update.

ok sthen@
This commit is contained in:
ajacoutot 2015-11-07 05:55:08 +00:00
parent 5722e8cb06
commit 073ce08c03
20 changed files with 376 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
x11/freerdp/Makefile
View File

@ -1,51 +1,53 @@
# $OpenBSD: Makefile,v 1.19 2015/02/08 04:55:00 jsing Exp $
# $OpenBSD: Makefile,v 1.20 2015/11/07 05:55:08 ajacoutot Exp $
SHARED_ONLY = Yes
V = 1.0.2
COMMENT = open source client for Windows Terminal Server
DISTNAME = freerdp-$V
REVISION = 3
DISTFILES = ${DISTNAME}{$V}.tar.gz
WRKDIST = ${WRKDIR}/FreeRDP-$V
DISTNAME = freerdp-1.2.0beta1
CATEGORIES = x11 net
SHARED_LIBS += freerdp-cache 0.0 # 1.0
SHARED_LIBS += freerdp-channels 0.0 # 1.0
SHARED_LIBS += freerdp-codec 0.0 # 1.0
SHARED_LIBS += freerdp-core 0.0 # 1.0
SHARED_LIBS += freerdp-gdi 0.0 # 1.0
SHARED_LIBS += freerdp-kbd 0.0 # 1.0
SHARED_LIBS += freerdp-rail 0.0 # 1.0
SHARED_LIBS += freerdp-utils 0.0 # 1.0
GH_ACCOUNT = FreeRDP
GH_PROJECT = FreeRDP
GH_COMMIT = f5ff6e1bd819a347aa532c1ef1a9cf0c67387507
SHARED_LIBS += freerdp-client 0.0 # 1.2
SHARED_LIBS += freerdp 0.0 # 1.2
SHARED_LIBS += winpr 0.0 # 1.1
SHARED_LIBS += xfreerdp-client 0.0 # 1.2
HOMEPAGE = http://www.freerdp.com/
MAINTAINER = Michael Erdely <merdely@openbsd.org>
# Apache 2.0
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += X11 Xcursor Xext Xinerama Xv avcodec avutil c crypto cups pcsclite
WANTLIB += pthread ssl xkbfile z
MASTER_SITES = https://github.com/FreeRDP/FreeRDP/archive/ \
http://spacehopper.org/mirrors/
WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv c crypto
WANTLIB += execinfo m pthread ssl xkbfile z
MODULES = devel/cmake
BUILD_DEPENDS = textproc/docbook \
CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
BUILD_DEPENDS = graphics/ffmpeg \
print/cups,-libs \
security/pcsc-lite \
textproc/xmlto
LIB_DEPENDS = graphics/ffmpeg \
print/cups,-libs \
security/pcsc-lite
LIB_DEPENDS = devel/libexecinfo
CONFIGURE_ARGS += -DWITH_ALSA=Off \
-DWITH_PCSC=On
CONFIGURE_ARGS += -DWITH_ALSA=OFF \
-DWITH_CUPS=ON \
-DWITH_DIRECTFB=OFF \
-DWITH_GSTREAMER_0_10=OFF \
-DWITH_GSTREAMER_1_0=OFF \
-DWITH_OPENSLES=OFF \
-DWITH_PCSC=ON \
-DWITH_PULSE=OFF \
-DWITH_WAYLAND=OFF \
-DWITH_SSE2=OFF
post-patch:
perl -pi -e 's,/usr/local,${LOCALBASE},g; s,/usr/X11R6,${X11BASE},g;' \
${WRKSRC}/CMakeLists.txt
NO_TEST = Yes
pre-configure:
sed -i "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/CMakeLists.txt
.include <bsd.port.mk>

4
x11/freerdp/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (freerdp-1.0.2.tar.gz) = wPE333q2+3bX59MWrk4MpsrzVuW8C12tvfrepduZLfE=
SIZE (freerdp-1.0.2.tar.gz) = 3506618
SHA256 (freerdp-1.2.0beta1.tar.gz) = /LC7jfaSVy4Bmye9sljZvhOW/pOAerJ3Ld4vC7JqxVY=
SIZE (freerdp-1.2.0beta1.tar.gz) = 6036392

62
x11/freerdp/patches/patch-CMakeLists_txt
View File

@ -1,22 +1,54 @@
$OpenBSD: patch-CMakeLists_txt,v 1.4 2014/07/10 13:20:46 giovanni Exp $
--- CMakeLists.txt.orig Wed Jan 2 22:46:59 2013
+++ CMakeLists.txt Thu Jul 10 11:32:46 2014
@@ -68,7 +68,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
endif()
$OpenBSD: patch-CMakeLists_txt,v 1.5 2015/11/07 05:55:08 ajacoutot Exp $
--- CMakeLists.txt.orig Fri Sep 12 00:46:32 2014
+++ CMakeLists.txt Fri Nov 6 19:29:28 2015
@@ -170,20 +170,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- CHECK_C_COMPILER_FLAG (-Wno-builtin-macro-redefined Wno-builtin-macro-redefined)
- if(Wno-builtin-macro-redefined)
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-builtin-macro-redefined")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D__FILE__='\"$(subst ${CMAKE_BINARY_DIR}/,,$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<)))\"'")
- endif()
-
- CHECK_CXX_COMPILER_FLAG (-Wno-builtin-macro-redefined Wno-builtin-macro-redefinedCXX)
- if(Wno-builtin-macro-redefinedCXX)
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-builtin-macro-redefined")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D__FILE__='\"$(subst ${CMAKE_BINARY_DIR}/,,$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<)))\"'")
- endif()
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
@@ -315,6 +304,14 @@ if(APPLE)
endif()
if(WITH_SSE2_TARGET)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
@@ -134,6 +133,10 @@ set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMA
# Include directories
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/include)
endif(APPLE)
+# BSD
+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+ set(BSD TRUE)
+ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+ set(OPENBSD TRUE)
+ endif()
+endif()
+
+# Done after dirs in freerdp tree to avoid failure when freerdp is installed
+include_directories(/usr/local/include)
+link_directories(/usr/local/lib)
# Android
if(ANDROID)
set(WITH_LIBRARY_VERSIONING "OFF")
@@ -554,6 +551,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDI
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+if(BSD)
+ if(IS_DIRECTORY /usr/local/include)
+ include_directories(/usr/local/include)
+ link_directories(/usr/local/lib)
+ endif()
+endif()
# Configure files
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
add_definitions("-DHAVE_CONFIG_H")

13
x11/freerdp/patches/patch-channels_client_CMakeLists_txt Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-channels_client_CMakeLists_txt,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- channels/client/CMakeLists.txt.orig Thu Oct 29 07:42:20 2015
+++ channels/client/CMakeLists.txt Thu Oct 29 07:42:34 2015
@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/addin.c
${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
+if(CHANNEL_STATIC_CLIENT_ENTRIES)
list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
+endif()
foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})

123
x11/freerdp/patches/patch-channels_drdynvc_tsmf_ffmpeg_tsmf_ffmpeg_c
View File

@ -1,123 +0,0 @@
$OpenBSD: patch-channels_drdynvc_tsmf_ffmpeg_tsmf_ffmpeg_c,v 1.1 2014/04/23 22:10:50 brad Exp $
Deal with newer FFmpeg API.
--- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c.orig Tue Apr 22 21:21:53 2014
+++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c Tue Apr 22 21:47:15 2014
@@ -34,12 +34,22 @@
#define AVMEDIA_TYPE_AUDIO 1
#endif
+#if LIBAVCODEC_VERSION_MAJOR < 54
+#define MAX_AUDIO_FRAME_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
+#else
+#define MAX_AUDIO_FRAME_SIZE 192000
+#endif
+
typedef struct _TSMFFFmpegDecoder
{
ITSMFDecoder iface;
int media_type;
+#if LIBAVCODEC_VERSION_MAJOR < 55
enum CodecID codec_id;
+#else
+ enum AVCodecID codec_id;
+#endif
AVCodecContext* codec_context;
AVCodec* codec;
AVFrame* frame;
@@ -54,7 +64,7 @@ static boolean tsmf_ffmpeg_init_context(ITSMFDecoder*
{
TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- mdecoder->codec_context = avcodec_alloc_context();
+ mdecoder->codec_context = avcodec_alloc_context3(NULL);
if (!mdecoder->codec_context)
{
DEBUG_WARN("avcodec_alloc_context failed.");
@@ -88,6 +98,7 @@ static boolean tsmf_ffmpeg_init_audio_stream(ITSMFDeco
mdecoder->codec_context->channels = media_type->Channels;
mdecoder->codec_context->block_align = media_type->BlockAlign;
+#if LIBAVCODEC_VERSION_MAJOR < 55
#ifdef AV_CPU_FLAG_SSE2
mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
#else
@@ -97,6 +108,13 @@ static boolean tsmf_ffmpeg_init_audio_stream(ITSMFDeco
mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
#endif
#endif
+#else /* LIBAVCODEC_VERSION_MAJOR < 55 */
+#ifdef AV_CPU_FLAG_SSE2
+ av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2);
+#else
+ av_set_cpu_flags_mask(FF_MM_SSE2 | FF_MM_MMX2);
+#endif
+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
return true;
}
@@ -174,9 +192,9 @@ static boolean tsmf_ffmpeg_prepare(ITSMFDecoder* decod
{
TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
- if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0)
+ if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0)
{
- DEBUG_WARN("avcodec_open failed.");
+ DEBUG_WARN("avcodec_open2 failed.");
return false;
}
@@ -337,7 +355,7 @@ static boolean tsmf_ffmpeg_decode_audio(ITSMFDecoder*
#endif
if (mdecoder->decoded_size_max == 0)
- mdecoder->decoded_size_max = AVCODEC_MAX_AUDIO_FRAME_SIZE + 16;
+ mdecoder->decoded_size_max = MAX_AUDIO_FRAME_SIZE + 16;
mdecoder->decoded_data = xzalloc(mdecoder->decoded_size_max);
/* align the memory for SSE2 needs */
dst = (uint8*) (((uintptr_t)mdecoder->decoded_data + 15) & ~ 0x0F);
@@ -348,7 +366,7 @@ static boolean tsmf_ffmpeg_decode_audio(ITSMFDecoder*
while (src_size > 0)
{
/* Ensure enough space for decoding */
- if (mdecoder->decoded_size_max - mdecoder->decoded_size < AVCODEC_MAX_AUDIO_FRAME_SIZE)
+ if (mdecoder->decoded_size_max - mdecoder->decoded_size < MAX_AUDIO_FRAME_SIZE)
{
mdecoder->decoded_size_max = mdecoder->decoded_size_max * 2 + 16;
mdecoder->decoded_data = xrealloc(mdecoder->decoded_data, mdecoder->decoded_size_max);
@@ -368,12 +386,22 @@ static boolean tsmf_ffmpeg_decode_audio(ITSMFDecoder*
src, src_size);
#else
{
+ AVFrame* decoded_frame = avcodec_alloc_frame();
+ int got_frame = 0;
AVPacket pkt;
av_init_packet(&pkt);
pkt.data = (uint8*) src;
pkt.size = src_size;
- len = avcodec_decode_audio3(mdecoder->codec_context,
- (int16_t*) dst, &frame_size, &pkt);
+ len = avcodec_decode_audio4(mdecoder->codec_context, decoded_frame, &got_frame, &pkt);
+
+ if (len >= 0 && got_frame)
+ {
+ frame_size = av_samples_get_buffer_size(NULL, mdecoder->codec_context->channels,
+ decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1);
+ memcpy(dst, decoded_frame->data[0], frame_size);
+ }
+
+ av_free(decoded_frame);
}
#endif
if (len <= 0 || frame_size <= 0)
@@ -499,7 +527,6 @@ TSMFDecoderEntry(void)
if (!initialized)
{
- avcodec_init();
avcodec_register_all();
initialized = true;
}

14
x11/freerdp/patches/patch-channels_rdpdr_printer_printer_cups_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-channels_rdpdr_printer_printer_cups_c,v 1.1 2014/07/10 13:25:46 giovanni Exp $
--- channels/rdpdr/printer/printer_cups.c.orig Thu Jul 10 11:21:38 2014
+++ channels/rdpdr/printer/printer_cups.c Thu Jul 10 11:21:14 2014
@@ -125,9 +125,8 @@ static void printer_cups_close_printjob(rdpPrintJob* p
#endif
- xfree(cups_printjob);
-
((rdpCupsPrinter*)printjob->printer)->printjob = NULL;
+ xfree(cups_printjob);
}
static rdpPrintJob* printer_cups_create_printjob(rdpPrinter* printer, uint32 id)

14
x11/freerdp/patches/patch-client_X11_CMakeLists_txt
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-client_X11_CMakeLists_txt,v 1.1 2012/02/24 09:41:43 sthen Exp $
--- client/X11/CMakeLists.txt.orig Mon Feb 6 19:35:57 2012
+++ client/X11/CMakeLists.txt Mon Feb 6 19:36:14 2012
@@ -51,7 +51,7 @@ if(WITH_MANPAGES)
$OpenBSD: patch-client_X11_CMakeLists_txt,v 1.2 2015/11/07 05:55:08 ajacoutot Exp $
--- client/X11/CMakeLists.txt.orig Thu Oct 29 07:05:08 2015
+++ client/X11/CMakeLists.txt Thu Oct 29 07:05:18 2015
@@ -108,7 +108,7 @@ if(WITH_MANPAGES)
add_custom_target(xfreerdp.manpage ALL
DEPENDS xfreerdp.1)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION share/man/man1)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION man/man1)
else(XMLTO_FOUND)
message(WARNING "WITH_MANPAGES was set, but xmlto was not found. man-pages will not be installed")
endif(XMLTO_FOUND)
else()
message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed")
endif()

21
x11/freerdp/patches/patch-libfreerdp-core_ntlmssp_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-libfreerdp-core_ntlmssp_c,v 1.1 2014/04/14 17:10:56 naddy Exp $
--- libfreerdp-core/ntlmssp.c.orig Wed Jan 2 22:46:59 2013
+++ libfreerdp-core/ntlmssp.c Mon Apr 14 18:48:37 2014
@@ -456,7 +456,7 @@ void ntlmssp_compute_lm_hash(char* password, char* has
char text[14];
char des_key1[8];
char des_key2[8];
- des_key_schedule ks;
+ DES_key_schedule ks;
/* LM("password") = E52CAC67419A9A224A3B108F3FA6CB6D */
@@ -530,7 +530,7 @@ void ntlmssp_compute_lm_response(char* password, char*
char des_key1[8];
char des_key2[8];
char des_key3[8];
- des_key_schedule ks;
+ DES_key_schedule ks;
/* A LM hash is 16-bytes long, but the LM response uses a LM hash null-padded to 21 bytes */
memset(hash, '\0', 21);

17
x11/freerdp/patches/patch-libfreerdp-core_tls_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-libfreerdp-core_tls_c,v 1.1 2015/02/08 04:55:00 jsing Exp $
--- libfreerdp-core/tls.c.orig Sun Feb 8 04:08:05 2015
+++ libfreerdp-core/tls.c Sun Feb 8 04:12:11 2015
@@ -44,6 +44,13 @@ boolean tls_connect(rdpTls* tls)
*/
SSL_CTX_set_options(tls->ctx, SSL_OP_ALL);
+ /*
+ * Disable the SSL 3.0/TLS 1.0 CBC vulnerability workaround since this
+ * breaks NLA - the remote host will return a TLS alert 50, terminating
+ * the session.
+ */
+ SSL_CTX_set_options(tls->ctx, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS);
+
tls->ssl = SSL_new(tls->ctx);
if (tls->ssl == NULL)

11
x11/freerdp/patches/patch-server_X11_xfreerdp_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-server_X11_xfreerdp_c,v 1.1 2012/02/24 09:41:43 sthen Exp $
--- server/X11/xfreerdp.c.orig Mon Feb 6 19:18:56 2012
+++ server/X11/xfreerdp.c Mon Feb 6 19:19:23 2012
@@ -18,6 +18,7 @@
*/
#include <errno.h>
+#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

15
x11/freerdp/patches/patch-winpr_include_winpr_crt_h Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-winpr_include_winpr_crt_h,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
__builtin_bswap32
--- winpr/include/winpr/crt.h.orig Fri Nov 6 19:36:54 2015
+++ winpr/include/winpr/crt.h Fri Nov 6 19:37:12 2015
@@ -56,7 +56,7 @@ static INLINE UINT64 _rotr64(UINT64 value, int shift)
}
#endif
-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
#define _byteswap_ushort(_val) __builtin_bswap16(_val)
#define _byteswap_ulong(_val) __builtin_bswap32(_val)

12
x11/freerdp/patches/patch-winpr_libwinpr_synch_CMakeLists_txt Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-winpr_libwinpr_synch_CMakeLists_txt,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr/libwinpr/synch/CMakeLists.txt.orig Thu Oct 29 08:00:39 2015
+++ winpr/libwinpr/synch/CMakeLists.txt Thu Oct 29 08:00:54 2015
@@ -30,7 +30,7 @@ winpr_module_add(
timer.c
wait.c)
-if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID))
+if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID) AND (NOT OPENBSD))
winpr_library_add(rt)
endif()

12
x11/freerdp/patches/patch-winpr_libwinpr_synch_wait_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-winpr_libwinpr_synch_wait_c,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr/libwinpr/synch/wait.c.orig Fri Sep 12 00:46:32 2014
+++ winpr/libwinpr/synch/wait.c Fri Nov 6 19:23:22 2015
@@ -134,7 +134,7 @@ static int pthread_timedjoin_np(pthread_t td, void** r
return ETIMEDOUT;
}
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
/*the only way to get it work is to remove the static*/
int pthread_mutex_timedlock(pthread_mutex_t* mutex, const struct timespec* timeout)
#else

12
x11/freerdp/patches/patch-winpr_libwinpr_sysinfo_CMakeLists_txt Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-winpr_libwinpr_sysinfo_CMakeLists_txt,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr/libwinpr/sysinfo/CMakeLists.txt.orig Thu Oct 29 08:01:02 2015
+++ winpr/libwinpr/sysinfo/CMakeLists.txt Thu Oct 29 08:01:12 2015
@@ -17,7 +17,7 @@
winpr_module_add(sysinfo.c)
-if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID))
+if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID) AND NOT(OPENBSD))
winpr_library_add(rt)
endif()

12
x11/freerdp/patches/patch-winpr_libwinpr_sysinfo_sysinfo_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-winpr_libwinpr_sysinfo_sysinfo_c,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr/libwinpr/sysinfo/sysinfo.c.orig Wed Nov 12 18:56:03 2014
+++ winpr/libwinpr/sysinfo/sysinfo.c Thu Oct 29 09:34:59 2015
@@ -105,7 +105,7 @@ static DWORD GetNumberOfProcessors()
int mib[4];
size_t length = sizeof(numCPUs);
mib[0] = CTL_HW;
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
mib[1] = HW_NCPU;
#else
mib[1] = HW_AVAILCPU;

14
x11/freerdp/patches/patch-winpr_libwinpr_utils_CMakeLists_txt Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-winpr_libwinpr_utils_CMakeLists_txt,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr/libwinpr/utils/CMakeLists.txt.orig Fri Sep 12 00:46:32 2014
+++ winpr/libwinpr/utils/CMakeLists.txt Fri Nov 6 19:23:22 2015
@@ -105,6 +105,10 @@ if(UNIX)
winpr_library_add(m)
endif()
+if(BSD)
+ winpr_library_add(execinfo)
+endif()
+
if(BUILD_TESTING)
add_subdirectory(test)
endif()

12
x11/freerdp/patches/patch-winpr_libwinpr_utils_trio_triodef_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-winpr_libwinpr_utils_trio_triodef_h,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr/libwinpr/utils/trio/triodef.h.orig Thu Oct 29 07:05:37 2015
+++ winpr/libwinpr/utils/trio/triodef.h Thu Oct 29 07:05:59 2015
@@ -88,7 +88,7 @@
# endif
#endif
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__)
# define TRIO_PLATFORM_UNIX
#endif

15
x11/freerdp/patches/patch-winpr_libwinpr_winsock_winsock_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-winpr_libwinpr_winsock_winsock_c,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr/libwinpr/winsock/winsock.c.orig Thu Oct 29 07:45:37 2015
+++ winpr/libwinpr/winsock/winsock.c Thu Oct 29 07:52:35 2015
@@ -435,9 +435,11 @@ int WSAGetLastError(void)
break;
#endif
+#ifdef EPROTO
case EPROTO:
iError = WSAECONNRESET;
break;
+#endif
}
/**

10
x11/freerdp/patches/patch-winpr_pc_in Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-winpr_pc_in,v 1.1 2015/11/07 05:55:08 ajacoutot Exp $
--- winpr.pc.in.orig Fri Sep 12 00:46:32 2014
+++ winpr.pc.in Thu Oct 29 07:55:29 2015
@@ -11,5 +11,5 @@ Version: @WINPR_VERSION_FULL@
Requires:
Requires.private: zlib libssl
Libs: -L${libdir} ${libs}
-Libs.private: -ldl -lrt -lm -lpthread
+Libs.private: -lm -lpthread
Cflags: -I${includedir}

237
x11/freerdp/pkg/PLIST
View File

@ -1,27 +1,81 @@
@comment $OpenBSD: PLIST,v 1.5 2013/11/04 14:42:36 merdely Exp $
@comment $OpenBSD: PLIST,v 1.6 2015/11/07 05:55:08 ajacoutot Exp $
@pkgpath x11/freerdp,no_cups
@bin bin/xfreerdp
include/freerdp/
include/freerdp/addin.h
include/freerdp/altsec.h
include/freerdp/api.h
include/freerdp/assistance.h
include/freerdp/cache/
include/freerdp/cache/bitmap.h
include/freerdp/cache/brush.h
include/freerdp/cache/cache.h
include/freerdp/cache/glyph.h
include/freerdp/cache/nine_grid.h
include/freerdp/cache/offscreen.h
include/freerdp/cache/palette.h
include/freerdp/cache/pointer.h
include/freerdp/channels/
include/freerdp/channels/audin.h
include/freerdp/channels/channels.h
include/freerdp/channels/cliprdr.h
include/freerdp/channels/encomsp.h
include/freerdp/channels/log.h
include/freerdp/channels/rail.h
include/freerdp/channels/rdpdr.h
include/freerdp/channels/rdpgfx.h
include/freerdp/channels/rdpsnd.h
include/freerdp/channels/remdesk.h
include/freerdp/channels/tsmf.h
include/freerdp/channels/wtsvc.h
include/freerdp/client/
include/freerdp/client.h
include/freerdp/client/audin.h
include/freerdp/client/channels.h
include/freerdp/client/cliprdr.h
include/freerdp/client/cmdline.h
include/freerdp/client/disp.h
include/freerdp/client/drdynvc.h
include/freerdp/client/encomsp.h
include/freerdp/client/file.h
include/freerdp/client/rail.h
include/freerdp/client/rdpei.h
include/freerdp/client/rdpgfx.h
include/freerdp/client/rdpsnd.h
include/freerdp/client/remdesk.h
include/freerdp/client/tsmf.h
include/freerdp/codec/
include/freerdp/codec/audio.h
include/freerdp/codec/bitmap.h
include/freerdp/codec/bulk.h
include/freerdp/codec/clear.h
include/freerdp/codec/color.h
include/freerdp/codec/dsp.h
include/freerdp/codec/h264.h
include/freerdp/codec/interleaved.h
include/freerdp/codec/jpeg.h
include/freerdp/codec/mppc.h
include/freerdp/codec/ncrush.h
include/freerdp/codec/nsc.h
include/freerdp/codec/planar.h
include/freerdp/codec/progressive.h
include/freerdp/codec/region.h
include/freerdp/codec/rfx.h
include/freerdp/codec/xcrush.h
include/freerdp/codec/zgfx.h
include/freerdp/codecs.h
include/freerdp/constants.h
include/freerdp/crypto/
include/freerdp/crypto/ber.h
include/freerdp/crypto/certificate.h
include/freerdp/crypto/crypto.h
include/freerdp/crypto/der.h
include/freerdp/crypto/er.h
include/freerdp/crypto/per.h
include/freerdp/crypto/tls.h
include/freerdp/dvc.h
include/freerdp/error.h
include/freerdp/event.h
include/freerdp/extension.h
include/freerdp/freerdp.h
include/freerdp/gdi/
@ -41,106 +95,137 @@ include/freerdp/gdi/region.h
include/freerdp/gdi/shape.h
include/freerdp/graphics.h
include/freerdp/input.h
include/freerdp/kbd/
include/freerdp/kbd/kbd.h
include/freerdp/kbd/layouts.h
include/freerdp/kbd/locales.h
include/freerdp/kbd/vkcodes.h
include/freerdp/listener.h
include/freerdp/locale/
include/freerdp/locale/keyboard.h
include/freerdp/locale/locale.h
include/freerdp/locale/timezone.h
include/freerdp/log.h
include/freerdp/message.h
include/freerdp/metrics.h
include/freerdp/peer.h
include/freerdp/plugins/
include/freerdp/plugins/cliprdr.h
include/freerdp/plugins/tsmf.h
include/freerdp/pointer.h
include/freerdp/primary.h
include/freerdp/primitives.h
include/freerdp/rail/
include/freerdp/rail.h
include/freerdp/rail/icon.h
include/freerdp/rail/rail.h
include/freerdp/rail/window.h
include/freerdp/rail/window_list.h
include/freerdp/scancode.h
include/freerdp/secondary.h
include/freerdp/server/
include/freerdp/server/audin.h
include/freerdp/server/channels.h
include/freerdp/server/cliprdr.h
include/freerdp/server/drdynvc.h
include/freerdp/server/echo.h
include/freerdp/server/encomsp.h
include/freerdp/server/rdpdr.h
include/freerdp/server/rdpsnd.h
include/freerdp/server/remdesk.h
include/freerdp/server/shadow.h
include/freerdp/settings.h
include/freerdp/svc.h
include/freerdp/types.h
include/freerdp/update.h
include/freerdp/utils/
include/freerdp/utils/args.h
include/freerdp/utils/bitmap.h
include/freerdp/utils/blob.h
include/freerdp/utils/debug.h
include/freerdp/utils/dsp.h
include/freerdp/utils/event.h
include/freerdp/utils/file.h
include/freerdp/utils/hexdump.h
include/freerdp/utils/list.h
include/freerdp/utils/load_plugin.h
include/freerdp/utils/memory.h
include/freerdp/utils/mutex.h
include/freerdp/utils/msusb.h
include/freerdp/utils/passphrase.h
include/freerdp/utils/pcap.h
include/freerdp/utils/print.h
include/freerdp/utils/profiler.h
include/freerdp/utils/rail.h
include/freerdp/utils/rect.h
include/freerdp/utils/registry.h
include/freerdp/utils/semaphore.h
include/freerdp/utils/ringbuffer.h
include/freerdp/utils/signal.h
include/freerdp/utils/sleep.h
include/freerdp/utils/stopwatch.h
include/freerdp/utils/stream.h
include/freerdp/utils/string.h
include/freerdp/utils/svc_plugin.h
include/freerdp/utils/thread.h
include/freerdp/utils/unicode.h
include/freerdp/utils/wait_obj.h
include/freerdp/utils/tcp.h
include/freerdp/utils/time.h
include/freerdp/utils/uds.h
include/freerdp/version.h
include/freerdp/window.h
lib/freerdp/
lib/freerdp/audin.so
lib/freerdp/cliprdr.so
lib/freerdp/disk.so
lib/freerdp/drdynvc.so
lib/freerdp/parallel.so
lib/freerdp/printer.so
lib/freerdp/rail.so
lib/freerdp/rdpdbg.so
lib/freerdp/rdpdr.so
lib/freerdp/rdpsnd.so
lib/freerdp/scard.so
lib/freerdp/serial.so
lib/freerdp/tsmf.so
lib/freerdp/tsmf_ffmpeg.so
@lib lib/libfreerdp-cache.so.${LIBfreerdp-cache_VERSION}
@lib lib/libfreerdp-channels.so.${LIBfreerdp-channels_VERSION}
@lib lib/libfreerdp-codec.so.${LIBfreerdp-codec_VERSION}
@lib lib/libfreerdp-core.so.${LIBfreerdp-core_VERSION}
@lib lib/libfreerdp-gdi.so.${LIBfreerdp-gdi_VERSION}
@lib lib/libfreerdp-kbd.so.${LIBfreerdp-kbd_VERSION}
@lib lib/libfreerdp-rail.so.${LIBfreerdp-rail_VERSION}
@lib lib/libfreerdp-utils.so.${LIBfreerdp-utils_VERSION}
include/winpr/
include/winpr/asn1.h
include/winpr/bcrypt.h
include/winpr/bitstream.h
include/winpr/cmdline.h
include/winpr/collections.h
include/winpr/comm.h
include/winpr/credentials.h
include/winpr/credui.h
include/winpr/crt.h
include/winpr/crypto.h
include/winpr/debug.h
include/winpr/dsparse.h
include/winpr/endian.h
include/winpr/environment.h
include/winpr/error.h
include/winpr/file.h
include/winpr/handle.h
include/winpr/heap.h
include/winpr/image.h
include/winpr/ini.h
include/winpr/input.h
include/winpr/interlocked.h
include/winpr/io.h
include/winpr/library.h
include/winpr/locale.h
include/winpr/memory.h
include/winpr/midl.h
include/winpr/ndr.h
include/winpr/nt.h
include/winpr/ntlm.h
include/winpr/path.h
include/winpr/pipe.h
include/winpr/platform.h
include/winpr/pool.h
include/winpr/print.h
include/winpr/registry.h
include/winpr/rpc.h
include/winpr/sam.h
include/winpr/schannel.h
include/winpr/security.h
include/winpr/smartcard.h
include/winpr/spec.h
include/winpr/ssl.h
include/winpr/sspi.h
include/winpr/sspicli.h
include/winpr/stream.h
include/winpr/string.h
include/winpr/synch.h
include/winpr/sysinfo.h
include/winpr/tchar.h
include/winpr/thread.h
include/winpr/timezone.h
include/winpr/tools/
include/winpr/tools/makecert.h
include/winpr/windows.h
include/winpr/winhttp.h
include/winpr/winpr.h
include/winpr/winsock.h
include/winpr/wlog.h
include/winpr/wnd.h
include/winpr/wtsapi.h
include/winpr/wtypes.h
lib/cmake/
lib/cmake/FreeRDP/
lib/cmake/FreeRDP/FreeRDPConfig.cmake
lib/cmake/FreeRDP/FreeRDPConfigVersion.cmake
lib/cmake/FreeRDP/FreeRDPTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/FreeRDP/FreeRDPTargets.cmake
lib/cmake/WinPR/
lib/cmake/WinPR/WinPRConfig.cmake
lib/cmake/WinPR/WinPRConfigVersion.cmake
lib/cmake/WinPR/WinPRTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/WinPR/WinPRTargets.cmake
@lib lib/libfreerdp-client.so.${LIBfreerdp-client_VERSION}
@lib lib/libfreerdp.so.${LIBfreerdp_VERSION}
lib/libwinpr-makecert-tool.a
@lib lib/libwinpr.so.${LIBwinpr_VERSION}
@lib lib/libxfreerdp-client.so.${LIBxfreerdp-client_VERSION}
lib/pkgconfig/freerdp.pc
lib/pkgconfig/winpr.pc
@man man/man1/xfreerdp.1
share/freerdp/
share/freerdp/keymaps/
share/freerdp/keymaps/aliases
share/freerdp/keymaps/amiga
share/freerdp/keymaps/ataritt
share/freerdp/keymaps/digital_vndr/
share/freerdp/keymaps/digital_vndr/lk
share/freerdp/keymaps/digital_vndr/pc
share/freerdp/keymaps/empty
share/freerdp/keymaps/evdev
share/freerdp/keymaps/fujitsu
share/freerdp/keymaps/hp
share/freerdp/keymaps/ibm
share/freerdp/keymaps/macintosh
share/freerdp/keymaps/macosx
share/freerdp/keymaps/sgi_vndr/
share/freerdp/keymaps/sgi_vndr/indigo
share/freerdp/keymaps/sgi_vndr/indy
share/freerdp/keymaps/sgi_vndr/iris
share/freerdp/keymaps/sony
share/freerdp/keymaps/sun
share/freerdp/keymaps/xfree86
share/freerdp/keymaps/xfree98
share/freerdp/keymaps/xkb.pl