View | Details | Raw Unified | Return to bug 245517 | Differences between
and this patch

Collapse All | Expand All

(-)net/freerdp/Makefile (-5 / +11 lines)
Lines 2-14 Link Here
2
# $FreeBSD: head/net/freerdp/Makefile 532707 2020-04-23 20:14:49Z jbeich $
2
# $FreeBSD: head/net/freerdp/Makefile 532707 2020-04-23 20:14:49Z jbeich $
3
3
4
PORTNAME=	freerdp
4
PORTNAME=	freerdp
5
DISTVERSION=	2.0.0-rc4
5
DISTVERSION=	2.1.1
6
PORTREVISION=	8
6
PORTREVISION=	0
7
CATEGORIES=	net comms
7
CATEGORIES=	net comms
8
8
9
PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
10
PATCHFILES=	649f49f.patch:-p1 effa8b8.patch:-p1 0c83efa.patch:-p1
11
12
MAINTAINER=	kevans@FreeBSD.org
9
MAINTAINER=	kevans@FreeBSD.org
13
COMMENT=	Free implementation of Remote Desktop Protocol
10
COMMENT=	Free implementation of Remote Desktop Protocol
14
11
Lines 25-30 Link Here
25
22
26
CPE_VENDOR=	freerdp_project
23
CPE_VENDOR=	freerdp_project
27
24
25
PATCHVERSION=	${PORTVERSION}
26
MAJORVERSION=	${PORTVERSION:R:R}
27
28
PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
29
PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
30
28
USE_GITHUB=	yes
31
USE_GITHUB=	yes
29
GH_ACCOUNT=	FreeRDP
32
GH_ACCOUNT=	FreeRDP
30
GH_PROJECT=	${GH_ACCOUNT}
33
GH_PROJECT=	${GH_ACCOUNT}
Lines 157-161 Link Here
157
	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
160
	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
158
		${WRKSRC}/cmake/FindGSM.cmake \
161
		${WRKSRC}/cmake/FindGSM.cmake \
159
		${WRKSRC}/libfreerdp/codec/dsp.c
162
		${WRKSRC}/libfreerdp/codec/dsp.c
163
164
pre-configure:
165
	${CP} ${FILESDIR}/mntent* ${WRKSRC}/rdtk/include
160
166
161
.include <bsd.port.mk>
167
.include <bsd.port.mk>
(-)net/freerdp/distinfo (-9 / +3 lines)
Lines 1-9 Link Here
1
TIMESTAMP = 1546908117
1
TIMESTAMP = 1590430364
2
SHA256 (FreeRDP-FreeRDP-2.0.0-rc4_GH0.tar.gz) = 3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49
2
SHA256 (FreeRDP-FreeRDP-2.1.1_GH0.tar.gz) = ce363a6578530cf508df802bb980a8dd49a874919bfa33b8c61d992ad0882bfb
3
SIZE (FreeRDP-FreeRDP-2.0.0-rc4_GH0.tar.gz) = 6615213
3
SIZE (FreeRDP-FreeRDP-2.1.1_GH0.tar.gz) = 6828178
4
SHA256 (649f49f.patch) = 9f8ef88e12f55fcb02a6a30c7d7fff3ae19894c6d368eebc17e878b81cdaa975
5
SIZE (649f49f.patch) = 777
6
SHA256 (effa8b8.patch) = 2fa4479ff7c0239f279172c08e7b52491d457ab844e6f5a6316c46f0d3afa49c
7
SIZE (effa8b8.patch) = 993
8
SHA256 (0c83efa.patch) = fe9b6cabe7e54f6c02bf64e14eeb07d997511c3481e7e592e6526dbc10d337c3
9
SIZE (0c83efa.patch) = 1144
(-)net/freerdp/files/mntent.h (+64 lines)
Line 0 Link Here
1
/*
2
 *  mntent
3
 *  mntent.h - compatability header for FreeBSD
4
 *
5
 *  Copyright (c) 2001 David Rufino <daverufino@btinternet.com>
6
 *  All rights reserved.
7
 *
8
 * Redistribution and use in source and binary forms, with or without
9
 * modification, are permitted provided that the following conditions
10
 * are met:
11
 * 1. Redistributions of source code must retain the above copyright
12
 *    notice, this list of conditions and the following disclaimer.
13
 * 2. Redistributions in binary form must reproduce the above copyright
14
 *    notice, this list of conditions and the following disclaimer in the
15
 *    documentation and/or other materials provided with the distribution.
16
 *
17
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
18
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
21
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27
 * SUCH DAMAGE.
28
 */
29
30
// $FreeBSD: head/net/freerdp/files/mntent.h 517806 2019-11-17 07:05:23Z yuri $
31
32
#if defined(HAVE_MNTENT_H)
33
#include <mntent.h>
34
#else
35
#ifndef _MNTENT_H
36
#define _MNTENT_H
37
#include <stdio.h>
38
39
#define MOUNTED "dummy"
40
41
#define MNTTYPE_NFS "nfs"
42
43
struct mntent {
44
	char *mnt_fsname;
45
	char *mnt_dir;
46
	char *mnt_type;
47
	char *mnt_opts;
48
	int mnt_freq;
49
	int mnt_passno;
50
};
51
52
#define setmntent(x,y) ((FILE *)0x1)
53
#ifdef __cplusplus
54
extern "C" {
55
#endif
56
struct mntent *getmntent __P ((FILE *fp));
57
char *hasmntopt __P ((const struct mntent *mnt, const char *option));
58
#ifdef __cplusplus
59
}; // extern "C"
60
#endif
61
#define endmntent(x) ((int)1)
62
63
#endif /* _MNTENT_H */
64
#endif /* HAVE_MNTENT_H */
(-)net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h (+15 lines)
Line 0 Link Here
1
--- channels/urbdrc/client/libusb/libusb_udevice.h.orig
2
+++ channels/urbdrc/client/libusb/libusb_udevice.h
3
@@ -75,4 +75,12 @@ IUDEVICE* udev_new_by_addr(URBDRC_PLUGIN* urbdrc, libu
4
                            BYTE dev_number);
5
 const char* usb_interface_class_to_string(uint8_t class);
6
 
7
+#ifndef LIBUSB_CLASS_PHYSICAL
8
+#define LIBUSB_CLASS_PHYSICAL 5
9
+#endif
10
+
11
+#ifndef LIBUSB_CAP_HAS_HOTPLUG
12
+#define LIBUSB_CAP_HAS_HOTPLUG 0x0001
13
+#endif
14
+
15
 #endif /* FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_UDEVICE_H */
(-)net/freerdp/files/patch-client_Wayland_CMakeLists.txt (-1 / +1 lines)
Lines 1-6 Link Here
1
--- client/Wayland/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
1
--- client/Wayland/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
2
+++ client/Wayland/CMakeLists.txt
2
+++ client/Wayland/CMakeLists.txt
3
@@ -39,5 +39,12 @@ target_link_libraries(${MODULE_NAME} ${$
3
@@ -46,5 +46,12 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX
4
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
4
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
5
 
5
 
6
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Wayland")
6
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Wayland")
(-)net/freerdp/files/patch-client_X11_CMakeLists.txt (-1 / +1 lines)
Lines 1-6 Link Here
1
--- client/X11/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
1
--- client/X11/CMakeLists.txt.orig	2017-11-28 14:26:30 UTC
2
+++ client/X11/CMakeLists.txt
2
+++ client/X11/CMakeLists.txt
3
@@ -111,7 +111,11 @@ if(WITH_MANPAGES)
3
@@ -126,7 +126,11 @@ if(WITH_MANPAGES)
4
 		add_custom_target(xfreerdp.manpage ALL
4
 		add_custom_target(xfreerdp.manpage ALL
5
 			DEPENDS xfreerdp.1)
5
 			DEPENDS xfreerdp.1)
6
 
6
 
(-)net/freerdp/pkg-plist (-10 / +9 lines)
Lines 123-129 Link Here
123
include/freerdp2/freerdp/svc.h
123
include/freerdp2/freerdp/svc.h
124
include/freerdp2/freerdp/types.h
124
include/freerdp2/freerdp/types.h
125
include/freerdp2/freerdp/update.h
125
include/freerdp2/freerdp/update.h
126
include/freerdp2/freerdp/utils/msusb.h
127
include/freerdp2/freerdp/utils/passphrase.h
126
include/freerdp2/freerdp/utils/passphrase.h
128
include/freerdp2/freerdp/utils/pcap.h
127
include/freerdp2/freerdp/utils/pcap.h
129
include/freerdp2/freerdp/utils/profiler.h
128
include/freerdp2/freerdp/utils/profiler.h
Lines 203-222 Link Here
203
include/winpr2/winpr/wtsapi.h
202
include/winpr2/winpr/wtsapi.h
204
include/winpr2/winpr/wtypes.h
203
include/winpr2/winpr/wtypes.h
205
lib/libfreerdp-client2.so
204
lib/libfreerdp-client2.so
206
lib/libfreerdp-client2.so.2
205
lib/libfreerdp-client2.so.%%MAJORVERSION%%
207
lib/libfreerdp-client2.so.2.0.0
206
lib/libfreerdp-client2.so.%%PATCHVERSION%%
208
lib/libfreerdp2.so
207
lib/libfreerdp2.so
209
lib/libfreerdp2.so.2
208
lib/libfreerdp2.so.%%MAJORVERSION%%
210
lib/libfreerdp2.so.2.0.0
209
lib/libfreerdp2.so.%%PATCHVERSION%%
211
%%WAYLAND%%lib/libuwac0.so
210
%%WAYLAND%%lib/libuwac0.so
212
%%WAYLAND%%lib/libuwac0.so.0
211
%%WAYLAND%%lib/libuwac0.so.0
213
%%WAYLAND%%lib/libuwac0.so.0.0.1
212
%%WAYLAND%%lib/libuwac0.so.0.1.1
214
lib/libwinpr-tools2.so
213
lib/libwinpr-tools2.so
215
lib/libwinpr-tools2.so.2
214
lib/libwinpr-tools2.so.%%MAJORVERSION%%
216
lib/libwinpr-tools2.so.2.0.0
215
lib/libwinpr-tools2.so.%%PATCHVERSION%%
217
lib/libwinpr2.so
216
lib/libwinpr2.so
218
lib/libwinpr2.so.2
217
lib/libwinpr2.so.%%MAJORVERSION%%
219
lib/libwinpr2.so.2.0.0
218
lib/libwinpr2.so.%%PATCHVERSION%%
220
libdata/pkgconfig/freerdp-client2.pc
219
libdata/pkgconfig/freerdp-client2.pc
221
libdata/pkgconfig/freerdp2.pc
220
libdata/pkgconfig/freerdp2.pc
222
%%WAYLAND%%libdata/pkgconfig/uwac0.pc
221
%%WAYLAND%%libdata/pkgconfig/uwac0.pc

Return to bug 245517