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

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

5 files changed, 58 insertions, 33 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/Manifest b/net-misc/freerdp/Manifest
index ccef7fa04cf7..7b10a62b9b7a 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 DIST FreeRDP-1.0-beta1.tar.gz 3459584 RMD160 ed7ffb7714a68ba166641d2150b114418744a465 SHA1 4a11eae37b29930cb6c8de04298800a67b3f9431 SHA256 7068abc28981607174b4cb734aaa40c3956a864013156a5f50170cb33aecdc54
 DIST freerdp-0.8.2.tar.gz 936410 RMD160 273e03d598e19900508ff23fde365f7140781917 SHA1 32ea0876357c9906784bd6d8ce6d0a8e7c10ebc4 SHA256 389a707b491bd1905c8395ede3df61ac73a55d866f8a56354c6442c23c8730e1
 EBUILD freerdp-0.8.2.ebuild 2516 RMD160 6a3a2ae32d33f5474064ec13add6174e1018f313 SHA1 f03fd68035c5a92028ebfc801139f26f88007684 SHA256 85c7a7907722ec58ae2ebea498b793a3bac824cff74bda9fd7da9916960ccd19
-EBUILD freerdp-1.0_beta1.ebuild 1874 RMD160 e04460b80c1ad669e1b388235829056d4d25971d SHA1 65445419e89f2f2fc3142a75569186c0423fe789 SHA256 7a904c38c5cf6be3b3a1c073b9a710ddc8f147ef75766725163bbb358c7a8aa6
-EBUILD freerdp-9999.1.ebuild 1827 RMD160 c7917a22e7fa23320297d5d73a02aa4757cf5e74 SHA1 fa77f1cbbef3029fa69069a06993c35f8012532d SHA256 5efb6280458c9074e38f3efd6f41ee5e5a14a0e3771c3140d07fbf9eee202cac
+EBUILD freerdp-1.0_beta1.ebuild 2147 RMD160 4cb0904a74e60cf33babc6675dd329f5c8652677 SHA1 74e48c92f060dc13f9c16b5ce3ef16bd00aee1ef SHA256 e95adeb8c063bbe76de89b1aa5a03a2ce57a44187fb39ba77020499c28cfa28e
+EBUILD freerdp-9999.1.ebuild 2124 RMD160 c9c29f033ad007771914680f924d649f0315b454 SHA1 f44963a1580dbb8befebe575604ae570118f2eab SHA256 d08ed3d19d5111ccd780cc667a0d4181eb37dd6fd2d01f3e0e750734e35bdb03
 EBUILD freerdp-9999.ebuild 2170 RMD160 32e259681d921fb55b1a1b346e9a4f59e8d9d993 SHA1 e8071faa181821459b183856c097a3bd81e4dd9e SHA256 5ae873b00c69b11238a3e3232ec1850f2da842bac14f234667bd9bbf890d347b
-MISC ChangeLog 1858 RMD160 0a64972fa4324929c70545865979d1c0f1161d3b SHA1 cf9eff5d860685b4d4198f4f068e4e3c4dc83243 SHA256 ad28f8890e95e2aab3994ca90a60812a889259c3932885f1a28f54a19f866c5b
-MISC metadata.xml 2264 RMD160 17960f6d5cfdfab3049f641d3ddd6c9ad85a9585 SHA1 753c1baa3a591780edd63f9ce80a0fc782573f93 SHA256 4c8236628c0cbf6541eddc4089e5ca3dc46ba28ca129d3c34ff9b1734721cadf
+MISC ChangeLog 2096 RMD160 dc9692a5a127158ec4a4f31f4c66cb5f70846c14 SHA1 558cd3d8c13552444bb0e731542692d080f633b9 SHA256 b12b53d14409ce000f65248c2774b0b3f14104208f055cec0601cf6622fa161c
+MISC metadata.xml 2464 RMD160 7ba768d4eb49ee321e627e0f16e5e210007bb5a1 SHA1 84d0c8b876882d83b0e7bae4175f8e65aeccdbb9 SHA256 b390bcdb32848425f020c2a3d6c3af4b39cee8a3eef8fbfe7d1aac4c75564d80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk68dnEACgkQC77qH+pIQ6TNggD/UjSzA0ObczlF4RMD0/OPN3BQ
-g3ZmMlfIAV65A/nO/ZUBAJM4f1g42KHvqBdb1U2qaz9JX4aRi2Pp7CO0mEMDIrgd
-=nhww
+iF4EAREIAAYFAk7AjIEACgkQC77qH+pIQ6TUygD/QV4jC9QnXZPW/nbq7kxN0sIh
+hESSLBgBeVqA6xd2lkEBAJWpq51VwOjNzVtz2vEjodHZDmi9LmCUY5xFxVlPkIOu
+=sV4C
 -----END PGP SIGNATURE-----
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>