From 4b895054b88af9f9d09160f14b0fb43f25633415 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 1 Jan 2014 13:28:47 +0100 Subject: [PATCH] freerdp: Fix branch param and set better PV in recipe (From meta-openembedded rev: 6ac6622d5b25e234ea6637c3e640772fc234eab9) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-openembedded/meta-oe/recipes-support/freerdp/freerdp.inc | 2 -- meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp.inc index 65c61c2..34dac4b 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp.inc +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp.inc @@ -8,8 +8,6 @@ SECTION = "x11/network" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -INC_PR = "r1" - inherit pkgconfig cmake EXTRA_OECMAKE += "-DWITH_PULSEAUDIO=ON \ diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb index 434e89a..0e9bf06 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb @@ -5,13 +5,12 @@ include freerdp.inc inherit gitpkgv -PV = "gitr${SRCPV}" +PV = "1.0.2+gitr${SRCPV}" PKGV = "${GITPKGVTAG}" -PR = "${INC_PR}.2" EXTRA_OECMAKE += "-DWITH_MANPAGES=OFF" SRCREV = "f311acaffb9190567e2b478a98d7cbfaf2709f6b" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-1.0" S = "${WORKDIR}/git" -- 2.7.4