Add optional ffmpeg, smartcard, and xv support, and a few more debug options. Make build output verbose. Misc cleanup.

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

4 files changed, 51 insertions, 26 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index 2bf7501928d9..5c5002cd81a8 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.12 2011/11/11 01:12:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.13 2011/11/14 03:35:19 floppym Exp $
+
+  14 Nov 2011; Mike Gilbert <floppym@gentoo.org> freerdp-1.0_beta1.ebuild,
+  freerdp-9999.1.ebuild, metadata.xml:
+  Add optional ffmpeg, smartcard, and xv support, and a few more debug options.
+  Make build output verbose. Misc cleanup.
 
 *freerdp-1.0_beta1 (11 Nov 2011)
 
diff --git a/net-misc/freerdp/freerdp-1.0_beta1.ebuild b/net-misc/freerdp/freerdp-1.0_beta1.ebuild
index 1c0925b345c4..deda4169cc7c 100644
--- a/net-misc/freerdp/freerdp-1.0_beta1.ebuild
+++ b/net-misc/freerdp/freerdp-1.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.0_beta1.ebuild,v 1.1 2011/11/11 01:12:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.0_beta1.ebuild,v 1.2 2011/11/14 03:35:19 floppym Exp $
 
 EAPI="4"
 
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${PV/_/-}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+alsa +cups directfb pulseaudio sse2 test +X +xcursor +xext +xinerama +xkbfile"
+IUSE="+alsa +cups directfb ffmpeg pulseaudio smartcard sse2 test +X +xcursor
+	+xext +xinerama +xkbfile +xv"
 
 FREERDP_DEBUG="transport chanman svc dvc kbd nla nego certificate license gdi rfx x11 rail xv"
 IUSE+=" $(printf 'debug-%s ' ${FREERDP_DEBUG})"
@@ -24,12 +25,15 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
 	directfb? ( dev-libs/DirectFB )
+	ffmpeg? ( virtual/ffmpeg )
 	pulseaudio? ( media-sound/pulseaudio )
+	smartcard? ( sys-apps/pcsc-lite )
 	X? (
 		x11-libs/libX11
 		xcursor? ( x11-libs/libXcursor )
 		xext? ( x11-libs/libXext )
 		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
 	)
 	xkbfile? ( x11-libs/libxkbfile )
 "
@@ -48,26 +52,30 @@ src_unpack() {
 	mv FreeRDP-* "${S}" || die
 }
 
+CMAKE_VERBOSE=1
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_MANPAGES=ON
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with cups)
-		$(cmake-utils_use_with directfb)
-		$(cmake-utils_use_with pulseaudio)
+		$(cmake-utils_use_with alsa ALSA)
+		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with directfb DIRECTFB)
+		$(cmake-utils_use_with ffmpeg FFMPEG)
+		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_with test CUNIT)
 		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xcursor)
-		$(cmake-utils_use_with xext)
-		$(cmake-utils_use_with xinerama)
-		$(cmake-utils_use_with xkbfile)
-		$(cmake-utils_use_with sse2 SSE2)
+		$(cmake-utils_use_with xcursor XCURSOR)
+		$(cmake-utils_use_with xext XEXT)
+		$(cmake-utils_use_with xinerama XINERAMA)
+		$(cmake-utils_use_with xkbfile XKBFILE)
+		$(cmake-utils_use_with xv XV)
 	)
 	for i in ${FREERDP_DEBUG}; do
 		mycmakeargs+=(
 			$(cmake-utils_use_with debug-${i} DEBUG_$(LC_ALL=C echo ${i} | tr a-z A-Z))
 		)
 	done
-	einfo "${mycmakeargs[@]}"
 	cmake-utils_src_configure
 }
diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild
index d105f9301ff3..7566ce65db69 100644
--- a/net-misc/freerdp/freerdp-9999.1.ebuild
+++ b/net-misc/freerdp/freerdp-9999.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.3 2011/10/01 16:46:46 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.4 2011/11/14 03:35:19 floppym Exp $
 
 EAPI="4"
 
@@ -15,9 +15,11 @@ EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+alsa +cups directfb pulseaudio sse2 test +X +xcursor +xext +xinerama +xkbfile"
+IUSE="+alsa +cups directfb ffmpeg pulseaudio smartcard sse2 test +X +xcursor
+	+xext +xinerama +xkbfile +xv"
 
-FREERDP_DEBUG="transport chanman svc dvc kbd nla nego certificate license gdi rfx x11 rail xv"
+FREERDP_DEBUG="transport chanman svc dvc kbd nla nego certificate license gdi
+	rfx x11 rail xv scard orders redir"
 IUSE+=" $(printf 'debug-%s ' ${FREERDP_DEBUG})"
 
 RDEPEND="
@@ -26,12 +28,15 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
 	directfb? ( dev-libs/DirectFB )
+	ffmpeg? ( virtual/ffmpeg )
 	pulseaudio? ( media-sound/pulseaudio )
+	smartcard? ( sys-apps/pcsc-lite )
 	X? (
 		x11-libs/libX11
 		xcursor? ( x11-libs/libXcursor )
 		xext? ( x11-libs/libXext )
 		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
 	)
 	xkbfile? ( x11-libs/libxkbfile )
 "
@@ -45,26 +50,30 @@ DOCS=( README )
 # Test suite segfaults
 RESTRICT="test"
 
+CMAKE_VERBOSE=1
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_MANPAGES=ON
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with cups)
-		$(cmake-utils_use_with directfb)
-		$(cmake-utils_use_with pulseaudio)
+		$(cmake-utils_use_with alsa ALSA)
+		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with directfb DIRECTFB)
+		$(cmake-utils_use_with ffmpeg FFMPEG)
+		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_with test CUNIT)
 		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xcursor)
-		$(cmake-utils_use_with xext)
-		$(cmake-utils_use_with xinerama)
-		$(cmake-utils_use_with xkbfile)
-		$(cmake-utils_use_with sse2 SSE2)
+		$(cmake-utils_use_with xcursor XCURSOR)
+		$(cmake-utils_use_with xext XEXT)
+		$(cmake-utils_use_with xinerama XINERAMA)
+		$(cmake-utils_use_with xkbfile XKBFILE)
+		$(cmake-utils_use_with xv XV)
 	)
 	for i in ${FREERDP_DEBUG}; do
 		mycmakeargs+=(
 			$(cmake-utils_use_with debug-${i} DEBUG_$(LC_ALL=C echo ${i} | tr a-z A-Z))
 		)
 	done
-	einfo "${mycmakeargs[@]}"
 	cmake-utils_src_configure
 }
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index c666d3441454..8e399fd0786e 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -31,6 +31,9 @@
 	<flag name="debug-svc">Enable static virtual channel debug messages</flag>
 	<flag name="debug-x11">Enable X11 Client debug messages</flag>
 	<flag name="debug-xv">Enable XVideo debug messages</flag>
+	<flag name="debug-scard">Print smartcard debug messages</flag>
+	<flag name="debug-orders">Print drawing orders debug messages</flag>
+	<flag name="debug-redir">Print redirection debug messages</flag>
 	<flag name="gnutls">Use GnuTLS as crypto backend</flag>
 	<flag name="nss">Use NSS as crypto backend</flag>
 	<flag name="polarssl">Use PolarSSL as crypto backend</flag>