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

Collapse All | Expand All

(-)Makefile (-16 / +26 lines)
Lines 21-26 Link Here
21
21
22
CPE_VENDOR=	freerdp_project
22
CPE_VENDOR=	freerdp_project
23
23
24
CMAKE_ARGS+=	-DWITH_GSTREAMER_0_10=OFF -DARM_FP_ABI=hard
24
LDFLAGS+=	-L${LOCALBASE}/lib
25
LDFLAGS+=	-L${LOCALBASE}/lib
25
CFLAGS+=	-I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include
26
CFLAGS+=	-I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include
26
27
Lines 28-74 Link Here
28
OPTIONS_DEFAULT=	CUPS GSTREAMER X11
29
OPTIONS_DEFAULT=	CUPS GSTREAMER X11
29
OPTIONS_SUB=		yes
30
OPTIONS_SUB=		yes
30
31
32
OPTIONS_DEFINE_armv6=	NEON
33
OPTIONS_DEFINE_aarch64=	NEON
34
31
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
35
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
32
ALSA_CMAKE_ON=		-DWITH_ALSA=ON
36
ALSA_CMAKE_BOOL=	WITH_ALSA
33
ALSA_CMAKE_OFF=		-DWITH_ALSA=OFF
34
37
35
CUPS_LIB_DEPENDS=	libcups.so:print/cups
38
CUPS_LIB_DEPENDS=	libcups.so:print/cups
36
CUPS_CMAKE_ON=		-DWITH_CUPS=ON
39
CUPS_CMAKE_BOOL=	WITH_CUPS
37
CUPS_CMAKE_OFF=		-DWITH_CUPS=OFF
38
40
39
# outdated and unmaintained upstream
41
# outdated and unmaintained upstream
40
DIRECTFB_DESC=		Build FreeRDP DirectFB client (outdated)
42
DIRECTFB_DESC=		Build FreeRDP DirectFB client (outdated)
41
DIRECTFB_LIB_DEPENDS=	libdirectfb.so:devel/directfb
43
DIRECTFB_LIB_DEPENDS=	libdirectfb.so:devel/directfb
42
DIRECTFB_CMAKE_ON=	-DWITH_DIRECTFB=ON
44
DIRECTFB_CMAKE_BOOL=	WITH_DIRECTFB
43
DIRECTFB_CMAKE_OFF=	-DWITH_DIRECTFB=OFF
44
# currently DirectFB option fails with clang
45
# currently DirectFB option fails with clang
45
DIRECTFB_USE=		gcc=yes
46
DIRECTFB_USE=		gcc=yes
46
47
47
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
48
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
48
			libavutil.so:multimedia/ffmpeg
49
			libavutil.so:multimedia/ffmpeg
49
FFMPEG_CMAKE_ON=	-DWITH_FFMPEG=ON
50
FFMPEG_BOOL=		WITH_FFMPEG
50
FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG=OFF
51
51
52
GSTREAMER_CMAKE_ON=	-DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF
52
GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0
53
GSTREAMER_CMAKE_OFF=	-DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF
54
GSTREAMER_USE=		gstreamer1=yes xorg=x11,xextproto,xext,xrandr
53
GSTREAMER_USE=		gstreamer1=yes xorg=x11,xextproto,xext,xrandr
55
54
55
NEON_DESC=		Enable Media Processing Engine instructions
56
NEON_CMAKE_BOOL=	WITH_NEON
57
NEON_CFLAGS=		-march=armv7-a
58
56
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
59
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
57
PULSEAUDIO_CMAKE_ON=	-DWITH_PULSE=ON
60
PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
58
PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE=OFF
59
61
60
SSE_CMAKE_ON=		-DWITH_SSE2=ON
62
SSE_CMAKE_BOOL=		WITH_SSE2
61
SSE_CMAKE_OFF=		-DWITH_SSE2=OFF
62
63
63
X11_DESC=		Build FreeRDP X11 client
64
X11_DESC=		Build FreeRDP X11 client
64
X11_BUILD_DEPENDS=	xmlto:textproc/xmlto
65
X11_BUILD_DEPENDS=	xmlto:textproc/xmlto
65
X11_CMAKE_ON=		-DWITH_X11=ON
66
X11_CMAKE_BOOL=		WITH_X11
66
X11_CMAKE_OFF=		-DWITH_X11=OFF -DWITH_XKBFILE=OFF
67
X11_CMAKE_OFF=		-DWITH_XKBFILE=OFF
67
X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext \
68
X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext \
68
			xcursor,xrandr,xi,xfixes,xrender
69
			xcursor,xrandr,xi,xfixes,xrender
69
70
70
.include <bsd.port.options.mk>
71
.include <bsd.port.options.mk>
71
72
73
.if ${OPSYS} == "FreeBSD" && ${ARCH} == "armv6"
74
.if ${OSVERSION} < 1100500 || \
75
	(${OSVERSION} >= 1100500 && ${OSVERSION} < 1100504) || \
76
	(${OSVERSION} >= 1200000 && ${OSVERSION} < 1200008)
77
BROKEN=	Fails to build on ARMv6 (libm bug). See: r305380 (HEAD), r305971 (stable/11) [\#199422, \#211965] \
78
	Please update to a later (fixed) version.
79
.endif
80
.endif
81
72
post-extract:
82
post-extract:
73
	${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \
83
	${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \
74
		-e '/CMAKE_INSTALL_RPATH /d' \
84
		-e '/CMAKE_INSTALL_RPATH /d' \
(-)pkg-plist (-6 / +6 lines)
Lines 230-244 Link Here
230
%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a
230
%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a
231
%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a
231
%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a
232
lib/freerdp/tsmf-client.a
232
lib/freerdp/tsmf-client.a
233
lib/libfreerdp.so          
233
lib/libfreerdp.so
234
lib/libfreerdp.so.1.2      
234
lib/libfreerdp.so.1.2
235
lib/libfreerdp.so.1.2.0    
235
lib/libfreerdp.so.1.2.0
236
lib/libfreerdp-client.so
236
lib/libfreerdp-client.so
237
lib/libfreerdp-client.so.1.2
237
lib/libfreerdp-client.so.1.2
238
lib/libfreerdp-client.so.1.2.0
238
lib/libfreerdp-client.so.1.2.0
239
lib/libwinpr.so          
239
lib/libwinpr.so
240
lib/libwinpr.so.1.1      
240
lib/libwinpr.so.1.1
241
lib/libwinpr.so.1.1.0    
241
lib/libwinpr.so.1.1.0
242
lib/libwinpr-makecert-tool.a
242
lib/libwinpr-makecert-tool.a
243
%%X11%%lib/libxfreerdp-client.so
243
%%X11%%lib/libxfreerdp-client.so
244
%%X11%%lib/libxfreerdp-client.so.1.2
244
%%X11%%lib/libxfreerdp-client.so.1.2

Return to bug 213637