Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 585576 | Differences between
and this patch

Collapse All | Expand All

(-)a/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild (-3 / +2 lines)
Lines 22-28 HOMEPAGE="http://www.freerdp.com/" Link Here
22
22
23
LICENSE="Apache-2.0"
23
LICENSE="Apache-2.0"
24
SLOT="0/1.2"
24
SLOT="0/1.2"
25
IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
25
IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl
26
	neon pulseaudio server smartcard systemd test usb wayland X xinerama xv elibc_musl"
26
27
27
RDEPEND="
28
RDEPEND="
28
	elibc_musl? ( dev-libs/libbsd )
29
	elibc_musl? ( dev-libs/libbsd )
29
- 
30
--
31
.../freerdp/files/1.2.1_pre20160610-musl.patch     |  11 --
30
.../freerdp/files/1.2.1_pre20160610-musl.patch     |  11 --
32
.../freerdp/files/2.0.0_pre20160610-musl.patch     |  11 ++
31
.../freerdp/files/2.0.0_pre20160610-musl.patch     |  11 ++
33
net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild  | 115 ---------------------
32
net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild  | 115 ---------------------
34
net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild  | 115 +++++++++++++++++++++
33
net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild  | 115 +++++++++++++++++++++
35
5 files changed, 130 insertions(+), 129 deletions(-)
34
5 files changed, 130 insertions(+), 129 deletions(-)
36
delete mode 100644 net-misc/freerdp/files/1.2.1_pre20160610-musl.patch
35
delete mode 100644 net-misc/freerdp/files/1.2.1_pre20160610-musl.patch
37
create mode 100644 net-misc/freerdp/files/2.0.0_pre20160610-musl.patch
36
create mode 100644 net-misc/freerdp/files/2.0.0_pre20160610-musl.patch
38
delete mode 100644 net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild
37
delete mode 100644 net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild
39
create mode 100644 net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild
38
create mode 100644 net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild
(-)a/net-misc/freerdp/files/1.2.1_pre20160610-musl.patch (-11 lines)
Lines 1-11 Link Here
1
--- a/winpr/libwinpr/comm/comm_serial_sys.c
2
+++ b/winpr/libwinpr/comm/comm_serial_sys.c
3
@@ -42,6 +42,9 @@
4
 #define TTY_THRESHOLD_UNTHROTTLE 	128
5
 #define N_TTY_BUF_SIZE			4096
6
 
7
+#ifndef CMSPAR
8
+#define CMSPAR   010000000000
9
+#endif
10
 
11
 #define _BAUD_TABLE_END	0010020	/* __MAX_BAUD + 1 */
(-)a/net-misc/freerdp/files/2.0.0_pre20160610-musl.patch (+11 lines)
Line 0 Link Here
1
--- a/winpr/libwinpr/comm/comm_serial_sys.c
2
+++ b/winpr/libwinpr/comm/comm_serial_sys.c
3
@@ -42,6 +42,9 @@
4
 #define TTY_THRESHOLD_UNTHROTTLE 	128
5
 #define N_TTY_BUF_SIZE			4096
6
 
7
+#ifndef CMSPAR
8
+#define CMSPAR   010000000000
9
+#endif
10
 
11
 #define _BAUD_TABLE_END	0010020	/* __MAX_BAUD + 1 */
(-)a/net-misc/freerdp/freerdp-1.2.1_pre20160610.ebuild (-115 lines)
Lines 1-115 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
7
inherit cmake-utils vcs-snapshot
8
9
if [[ ${PV} != 9999* ]]; then
10
	COMMIT="f818bab4b6a372117273c2fc06d561552d71874d"
11
	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
12
	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
13
else
14
	inherit git-r3
15
	SRC_URI=""
16
	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
17
		https://github.com/FreeRDP/FreeRDP.git"
18
fi
19
20
DESCRIPTION="Free implementation of the Remote Desktop Protocol"
21
HOMEPAGE="http://www.freerdp.com/"
22
23
LICENSE="Apache-2.0"
24
SLOT="0/1.2"
25
IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl
26
	neon pulseaudio server smartcard systemd test usb wayland X xinerama xv elibc_musl"
27
28
RDEPEND="
29
	elibc_musl? ( dev-libs/libbsd )
30
	!libressl? ( dev-libs/openssl:0 )
31
	libressl? ( dev-libs/libressl )
32
	sys-libs/zlib:0
33
	alsa? ( media-libs/alsa-lib )
34
	cups? ( net-print/cups )
35
	client? (
36
		usb? (
37
			virtual/libudev:0=
38
			sys-apps/util-linux:0=
39
			dev-libs/dbus-glib:0=
40
			virtual/libusb:1=
41
		)
42
		X? (
43
			x11-libs/libXcursor
44
			x11-libs/libXext
45
			x11-libs/libXi
46
			x11-libs/libXrender
47
			xinerama? ( x11-libs/libXinerama )
48
			xv? ( x11-libs/libXv )
49
		)
50
	)
51
	ffmpeg? ( virtual/ffmpeg )
52
	gstreamer? (
53
		media-libs/gstreamer:1.0
54
		media-libs/gst-plugins-base:1.0
55
		x11-libs/libXrandr
56
	)
57
	jpeg? ( virtual/jpeg:0 )
58
	pulseaudio? ( media-sound/pulseaudio )
59
	server? (
60
		X? (
61
			x11-libs/libXcursor
62
			x11-libs/libXdamage
63
			x11-libs/libXext
64
			x11-libs/libXfixes
65
			xinerama? ( x11-libs/libXinerama )
66
		)
67
	)
68
	smartcard? ( sys-apps/pcsc-lite )
69
	systemd? ( sys-apps/systemd:0= )
70
	wayland? ( dev-libs/wayland )
71
	X? (
72
		x11-libs/libX11
73
		x11-libs/libxkbfile
74
	)
75
"
76
DEPEND="${RDEPEND}
77
	virtual/pkgconfig
78
	client? ( X? ( doc? (
79
		app-text/docbook-xml-dtd:4.1.2
80
		app-text/xmlto
81
	) ) )
82
"
83
84
DOCS=( README )
85
86
if use elibc_musl; then
87
	CFLAGS="${CFLAGS} -idirafter /usr/include/bsd"
88
	PATCHES=( "${FILESDIR}/1.2.1_pre20160610-musl.patch" )
89
fi
90
91
src_configure() {
92
	local mycmakeargs=(
93
		$(cmake-utils_use_with alsa ALSA)
94
		$(cmake-utils_use_with client CLIENT)
95
		$(cmake-utils_use_with cups CUPS)
96
		$(cmake-utils_use_with debug DEBUG_ALL)
97
		$(cmake-utils_use_with doc MANPAGES)
98
		$(cmake-utils_use_with ffmpeg FFMPEG)
99
		$(cmake-utils_use_with gstreamer GSTREAMER_1_0)
100
		$(cmake-utils_use_with jpeg JPEG)
101
		$(cmake-utils_use_with neon NEON)
102
		$(cmake-utils_use_with pulseaudio PULSE)
103
		$(cmake-utils_use_with server SERVER)
104
		$(cmake-utils_use_with smartcard PCSC)
105
		$(cmake-utils_use_with systemd LIBSYSTEMD)
106
		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
107
		$(cmake-utils_use usb CHANNEL_URBDRC)
108
		$(cmake-utils_use_with X X11)
109
		$(cmake-utils_use_with xinerama XINERAMA)
110
		$(cmake-utils_use_with xv XV)
111
		$(cmake-utils_use_build test TESTING)
112
		$(cmake-utils_use_with wayland WAYLAND)
113
	)
114
	cmake-utils_src_configure
115
}
(-)a/net-misc/freerdp/freerdp-2.0.0_pre20160610.ebuild (-1 / +115 lines)
Line 0 Link Here
0
- 
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
7
inherit cmake-utils vcs-snapshot
8
9
if [[ ${PV} != 9999* ]]; then
10
	COMMIT="f818bab4b6a372117273c2fc06d561552d71874d"
11
	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
12
	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
13
else
14
	inherit git-r3
15
	SRC_URI=""
16
	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
17
		https://github.com/FreeRDP/FreeRDP.git"
18
fi
19
20
DESCRIPTION="Free implementation of the Remote Desktop Protocol"
21
HOMEPAGE="http://www.freerdp.com/"
22
23
LICENSE="Apache-2.0"
24
SLOT="0/2"
25
IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl
26
	neon pulseaudio server smartcard systemd test usb wayland X xinerama xv elibc_musl"
27
28
RDEPEND="
29
	elibc_musl? ( dev-libs/libbsd )
30
	!libressl? ( dev-libs/openssl:0 )
31
	libressl? ( dev-libs/libressl )
32
	sys-libs/zlib:0
33
	alsa? ( media-libs/alsa-lib )
34
	cups? ( net-print/cups )
35
	client? (
36
		usb? (
37
			virtual/libudev:0=
38
			sys-apps/util-linux:0=
39
			dev-libs/dbus-glib:0=
40
			virtual/libusb:1=
41
		)
42
		X? (
43
			x11-libs/libXcursor
44
			x11-libs/libXext
45
			x11-libs/libXi
46
			x11-libs/libXrender
47
			xinerama? ( x11-libs/libXinerama )
48
			xv? ( x11-libs/libXv )
49
		)
50
	)
51
	ffmpeg? ( virtual/ffmpeg )
52
	gstreamer? (
53
		media-libs/gstreamer:1.0
54
		media-libs/gst-plugins-base:1.0
55
		x11-libs/libXrandr
56
	)
57
	jpeg? ( virtual/jpeg:0 )
58
	pulseaudio? ( media-sound/pulseaudio )
59
	server? (
60
		X? (
61
			x11-libs/libXcursor
62
			x11-libs/libXdamage
63
			x11-libs/libXext
64
			x11-libs/libXfixes
65
			xinerama? ( x11-libs/libXinerama )
66
		)
67
	)
68
	smartcard? ( sys-apps/pcsc-lite )
69
	systemd? ( sys-apps/systemd:0= )
70
	wayland? ( dev-libs/wayland )
71
	X? (
72
		x11-libs/libX11
73
		x11-libs/libxkbfile
74
	)
75
"
76
DEPEND="${RDEPEND}
77
	virtual/pkgconfig
78
	client? ( X? ( doc? (
79
		app-text/docbook-xml-dtd:4.1.2
80
		app-text/xmlto
81
	) ) )
82
"
83
84
DOCS=( README )
85
86
if use elibc_musl; then
87
	CFLAGS="${CFLAGS} -idirafter /usr/include/bsd"
88
	PATCHES=( "${FILESDIR}/2.0.0_pre20160610-musl.patch" )
89
fi
90
91
src_configure() {
92
	local mycmakeargs=(
93
		$(cmake-utils_use_with alsa ALSA)
94
		$(cmake-utils_use_with client CLIENT)
95
		$(cmake-utils_use_with cups CUPS)
96
		$(cmake-utils_use_with debug DEBUG_ALL)
97
		$(cmake-utils_use_with doc MANPAGES)
98
		$(cmake-utils_use_with ffmpeg FFMPEG)
99
		$(cmake-utils_use_with gstreamer GSTREAMER_1_0)
100
		$(cmake-utils_use_with jpeg JPEG)
101
		$(cmake-utils_use_with neon NEON)
102
		$(cmake-utils_use_with pulseaudio PULSE)
103
		$(cmake-utils_use_with server SERVER)
104
		$(cmake-utils_use_with smartcard PCSC)
105
		$(cmake-utils_use_with systemd LIBSYSTEMD)
106
		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
107
		$(cmake-utils_use usb CHANNEL_URBDRC)
108
		$(cmake-utils_use_with X X11)
109
		$(cmake-utils_use_with xinerama XINERAMA)
110
		$(cmake-utils_use_with xv XV)
111
		$(cmake-utils_use_build test TESTING)
112
		$(cmake-utils_use_with wayland WAYLAND)
113
	)
114
	cmake-utils_src_configure
115
}

Return to bug 585576