From 23400e939e08d3b88a871f9c981b6bdd08483499 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 7 Oct 2015 00:27:05 +0200 Subject: Revert "freerdp: move to nonworking" * use PNBLACKLIST instead This reverts commit 353b2ceff20c8fcf4d58e048cab8b88f1fdccf9e. Signed-off-by: Martin Jansa --- meta-oe/recipes-support/freerdp/freerdp.inc | 51 ++++++++++++++++++++++ meta-oe/recipes-support/freerdp/freerdp_git.bb | 21 +++++++++ .../recipes-support/nonworking/freerdp/freerdp.inc | 51 ---------------------- .../nonworking/freerdp/freerdp_git.bb | 16 ------- 4 files changed, 72 insertions(+), 67 deletions(-) create mode 100644 meta-oe/recipes-support/freerdp/freerdp.inc create mode 100644 meta-oe/recipes-support/freerdp/freerdp_git.bb delete mode 100644 meta-oe/recipes-support/nonworking/freerdp/freerdp.inc delete mode 100644 meta-oe/recipes-support/nonworking/freerdp/freerdp_git.bb (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc new file mode 100644 index 0000000000..34dac4b7e7 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp.inc @@ -0,0 +1,51 @@ +# Copyright (C) 2010-2012 O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license + +DESCRIPTION = "FreeRDP RDP client" +HOMEPAGE = "http://www.freerdp.com" +DEPENDS = "virtual/libx11 openssl libxcursor libxv cups alsa-lib pulseaudio pcsc-lite libxkbfile libxinerama" +SECTION = "x11/network" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pkgconfig cmake + +EXTRA_OECMAKE += "-DWITH_PULSEAUDIO=ON \ + -DWITH_PCSC=ON \ + -DWITH_CUPS=ON \ + -DWITH_FFMPEG=OFF \ + -DWITH_CUNIT=OFF \ + -DWITH_X11=ON \ + -DWITH_XKBFILE=ON \ + -DWITH_XINERAMA=ON" + +PACKAGES =+ "libfreerdp" + +LEAD_SONAME = "libfreerdp.so" +FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" + +PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" + +python populate_packages_prepend () { + freerdp_root = d.expand('${libdir}/freerdp') + + 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 new file mode 100644 index 0000000000..fd7f74c86f --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb @@ -0,0 +1,21 @@ +# Copyright (C) 2010-2012, O.S. Systems Software Ltda. +# Released under the MIT license + +include freerdp.inc + +inherit gitpkgv + +PV = "1.0.2+gitr${SRCPV}" +PKGV = "${GITPKGVTAG}" + +EXTRA_OECMAKE += "-DWITH_MANPAGES=OFF" + +SRCREV = "f311acaffb9190567e2b478a98d7cbfaf2709f6b" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-1.0" + +S = "${WORKDIR}/git" + +PNBLACKLIST[freerdp] ?= "Installs into double prefix, causing all files installed in /usr/usr and empty packages" +# freerdp-1.0.2+gitrAUTOINC+f311acaffb: freerdp: Files/directories were installed but not shipped +# /usr/usr +# .... diff --git a/meta-oe/recipes-support/nonworking/freerdp/freerdp.inc b/meta-oe/recipes-support/nonworking/freerdp/freerdp.inc deleted file mode 100644 index 34dac4b7e7..0000000000 --- a/meta-oe/recipes-support/nonworking/freerdp/freerdp.inc +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright (C) 2010-2012 O.S. Systems Software Ltda. All Rights Reserved -# Released under the MIT license - -DESCRIPTION = "FreeRDP RDP client" -HOMEPAGE = "http://www.freerdp.com" -DEPENDS = "virtual/libx11 openssl libxcursor libxv cups alsa-lib pulseaudio pcsc-lite libxkbfile libxinerama" -SECTION = "x11/network" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit pkgconfig cmake - -EXTRA_OECMAKE += "-DWITH_PULSEAUDIO=ON \ - -DWITH_PCSC=ON \ - -DWITH_CUPS=ON \ - -DWITH_FFMPEG=OFF \ - -DWITH_CUNIT=OFF \ - -DWITH_X11=ON \ - -DWITH_XKBFILE=ON \ - -DWITH_XINERAMA=ON" - -PACKAGES =+ "libfreerdp" - -LEAD_SONAME = "libfreerdp.so" -FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" - -PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" - -python populate_packages_prepend () { - freerdp_root = d.expand('${libdir}/freerdp') - - 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/nonworking/freerdp/freerdp_git.bb b/meta-oe/recipes-support/nonworking/freerdp/freerdp_git.bb deleted file mode 100644 index 0e9bf065c6..0000000000 --- a/meta-oe/recipes-support/nonworking/freerdp/freerdp_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2010-2012, O.S. Systems Software Ltda. -# Released under the MIT license - -include freerdp.inc - -inherit gitpkgv - -PV = "1.0.2+gitr${SRCPV}" -PKGV = "${GITPKGVTAG}" - -EXTRA_OECMAKE += "-DWITH_MANPAGES=OFF" - -SRCREV = "f311acaffb9190567e2b478a98d7cbfaf2709f6b" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-1.0" - -S = "${WORKDIR}/git" -- cgit 1.2.3-korg