[meta-oe][PATCH v1] freerdp: update to 2011-05-16 snapshot

[meta-oe][PATCH v1] freerdp: update to 2011-05-16 snapshot

[Otavio Salvador]

This version includes major improvements since last version
packages. It also had the plugins packages redone so they can be
choosen depending on the environment needs.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-support/freerdp/freerdp.inc    |   40 +++++++++++++++++++----
 meta-oe/recipes-support/freerdp/freerdp_git.bb |    4 +-
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc
index f8402c7..71dab97 100644
--- a/meta-oe/recipes-support/freerdp/freerdp.inc
+++ b/meta-oe/recipes-support/freerdp/freerdp.inc
@@ -3,22 +3,48 @@
 
 DESCRIPTION = "FreeRDP RDP client"
 HOMEPAGE = "http://freerdp.sourceforge.net"
-DEPENDS = "virtual/libx11 openssl libxcursor cups alsa-lib"
+DEPENDS = "virtual/libx11 openssl libxcursor libxv cups alsa-lib pulseaudio pcsc-lite"
 SECTION = "x11/network"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 inherit pkgconfig autotools
 
-do_configure_prepend() {
-	# workaround gcc linking bug
-	find ${S} -name 'Makefile.am' | xargs -n 1 sed 's,-pthread,-lpthread -D_REENTRANT,g' -i
-}
+EXTRA_OECONF += "--with-smartcard --with-xvideo"
 
 do_install_append() {
 	rm ${D}${libdir}/freerdp/*.a ${D}${libdir}/freerdp/*.la
 }
 
-RDEPENDS_${PN} += "xprop"
+PACKAGES =+ "libfreerdp"
+
+LEAD_SONAME = "libfreerdp.so"
+FILES_libfreerdp = "${libdir}/lib*${SOLIBS}"
+
+PACKAGES_DYNAMIC = "libfreerdp-plugin-*"
+
+python populate_packages_prepend () {
+        freerdp_root = bb.data.expand('${libdir}/freerdp', d)
+
+        do_split_packages(d, freerdp_root, '^(audin_.*)\.so$',
+                output_pattern='libfreerdp-plugin-%s',
+                description='FreeRDP plugin %s',
+                prepend=True, extra_depends='libfreerdp-plugin-audin')
+
+        do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$',
+                output_pattern='libfreerdp-plugin-%s',
+                description='FreeRDP plugin %s',
+                prepend=True, extra_depends='libfreerdp-plugin-rdpsnd')
+
+        do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$',
+                output_pattern='libfreerdp-plugin-%s',
+                description='FreeRDP plugin %s',
+                prepend=True, extra_depends='libfreerdp-plugin-tsmf')
+
+        do_split_packages(d, freerdp_root, '^([^-]*)\.so$',
+                output_pattern='libfreerdp-plugin-%s',
+                description='FreeRDP plugin %s',
+                prepend=True, extra_depends='')
+}
diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_git.bb
index fa4ba9a..e135902 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_git.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb
@@ -7,9 +7,9 @@ inherit gitpkgv
 
 PV = "gitr${SRCPV}"
 PKGV = "${GITPKGVTAG}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-SRCREV = "7bbde4fb3bc3a781364d0a626c49bc165cc507fd"
+SRCREV = "f5aef3be8fac9a02b0c7bbb5424831a7b285e7bb"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;protocol=git"
 
 S = "${WORKDIR}/git"
-- 
1.7.2.5

Re: [meta-oe][PATCH v1] freerdp: update to 2011-05-16 snapshot

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 16-05-11 22:43, Otavio Salvador wrote:
> This version includes major improvements since last version
> packages. It also had the plugins packages redone so they can be
> choosen depending on the environment needs.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

This one doesn't have the colourbug you mentioned earlier? And it
doesn't need xprop anymore, right?


> ---
>  meta-oe/recipes-support/freerdp/freerdp.inc    |   40 +++++++++++++++++++----
>  meta-oe/recipes-support/freerdp/freerdp_git.bb |    4 +-
>  2 files changed, 35 insertions(+), 9 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc
> index f8402c7..71dab97 100644
> --- a/meta-oe/recipes-support/freerdp/freerdp.inc
> +++ b/meta-oe/recipes-support/freerdp/freerdp.inc
> @@ -3,22 +3,48 @@
>  
>  DESCRIPTION = "FreeRDP RDP client"
>  HOMEPAGE = "http://freerdp.sourceforge.net"
> -DEPENDS = "virtual/libx11 openssl libxcursor cups alsa-lib"
> +DEPENDS = "virtual/libx11 openssl libxcursor libxv cups alsa-lib pulseaudio pcsc-lite"
>  SECTION = "x11/network"
>  LICENSE = "Apache-2.0"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
>  
> -INC_PR = "r0"
> +INC_PR = "r1"
>  
>  inherit pkgconfig autotools
>  
> -do_configure_prepend() {
> -	# workaround gcc linking bug
> -	find ${S} -name 'Makefile.am' | xargs -n 1 sed 's,-pthread,-lpthread -D_REENTRANT,g' -i
> -}
> +EXTRA_OECONF += "--with-smartcard --with-xvideo"
>  
>  do_install_append() {
>  	rm ${D}${libdir}/freerdp/*.a ${D}${libdir}/freerdp/*.la
>  }
>  
> -RDEPENDS_${PN} += "xprop"
> +PACKAGES =+ "libfreerdp"
> +
> +LEAD_SONAME = "libfreerdp.so"
> +FILES_libfreerdp = "${libdir}/lib*${SOLIBS}"
> +
> +PACKAGES_DYNAMIC = "libfreerdp-plugin-*"
> +
> +python populate_packages_prepend () {
> +        freerdp_root = bb.data.expand('${libdir}/freerdp', d)
> +
> +        do_split_packages(d, freerdp_root, '^(audin_.*)\.so$',
> +                output_pattern='libfreerdp-plugin-%s',
> +                description='FreeRDP plugin %s',
> +                prepend=True, extra_depends='libfreerdp-plugin-audin')
> +
> +        do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$',
> +                output_pattern='libfreerdp-plugin-%s',
> +                description='FreeRDP plugin %s',
> +                prepend=True, extra_depends='libfreerdp-plugin-rdpsnd')
> +
> +        do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$',
> +                output_pattern='libfreerdp-plugin-%s',
> +                description='FreeRDP plugin %s',
> +                prepend=True, extra_depends='libfreerdp-plugin-tsmf')
> +
> +        do_split_packages(d, freerdp_root, '^([^-]*)\.so$',
> +                output_pattern='libfreerdp-plugin-%s',
> +                description='FreeRDP plugin %s',
> +                prepend=True, extra_depends='')
> +}
> diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_git.bb
> index fa4ba9a..e135902 100644
> --- a/meta-oe/recipes-support/freerdp/freerdp_git.bb
> +++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb
> @@ -7,9 +7,9 @@ inherit gitpkgv
>  
>  PV = "gitr${SRCPV}"
>  PKGV = "${GITPKGVTAG}"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>  
> -SRCREV = "7bbde4fb3bc3a781364d0a626c49bc165cc507fd"
> +SRCREV = "f5aef3be8fac9a02b0c7bbb5424831a7b285e7bb"
>  SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;protocol=git"
>  
>  S = "${WORKDIR}/git"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN0hhUMkyGM64RGpERAldWAJ4klXnI/UCCepTMCPEGHuUiRu/4QgCgsg4q
Im7pc9nkpsoXCtHT3lzsIRs=
=GtPm
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH v1] freerdp: update to 2011-05-16 snapshot

[Otavio Salvador]

On Tue, May 17, 2011 at 03:40, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 16-05-11 22:43, Otavio Salvador wrote:
>> This version includes major improvements since last version
>> packages. It also had the plugins packages redone so they can be
>> choosen depending on the environment needs.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> This one doesn't have the colourbug you mentioned earlier? And it
> doesn't need xprop anymore, right?

Correct. Please merge it.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-oe][PATCH v1] freerdp: update to 2011-05-16 snapshot

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 17-05-11 14:10, Otavio Salvador wrote:
> On Tue, May 17, 2011 at 03:40, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 16-05-11 22:43, Otavio Salvador wrote:
>>> This version includes major improvements since last version
>>> packages. It also had the plugins packages redone so they can be
>>> choosen depending on the environment needs.
>>>
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>
>> This one doesn't have the colourbug you mentioned earlier? And it
>> doesn't need xprop anymore, right?
> 
> Correct. Please merge it.

Done

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN0mlBMkyGM64RGpERAjFwAKC9QgViZg/TWpLoll/t9Kpxw9D7EACeJUrd
qVLSCtBxJYV5i65RZ+uuigo=
=KFYS
-----END PGP SIGNATURE-----