summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-01-01 13:28:47 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-01 22:34:37 +0100
commit6ac6622d5b25e234ea6637c3e640772fc234eab9 (patch)
tree98ab09e4b3aac33386007ab4bbc70ff272e08d22 /meta-oe
parentbe9ca8657b6e1e0edb3153e5fe7f7d29ec7b01dd (diff)
downloadmeta-openembedded-6ac6622d5b25e234ea6637c3e640772fc234eab9.tar.gz
freerdp: Fix branch param and set better PV in recipe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp.inc2
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp_git.bb5
2 files changed, 2 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc
index 65c61c2d4..34dac4b7e 100644
--- a/meta-oe/recipes-support/freerdp/freerdp.inc
+++ b/meta-oe/recipes-support/freerdp/freerdp.inc
@@ -8,8 +8,6 @@ SECTION = "x11/network"
8LICENSE = "Apache-2.0" 8LICENSE = "Apache-2.0"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
10 10
11INC_PR = "r1"
12
13inherit pkgconfig cmake 11inherit pkgconfig cmake
14 12
15EXTRA_OECMAKE += "-DWITH_PULSEAUDIO=ON \ 13EXTRA_OECMAKE += "-DWITH_PULSEAUDIO=ON \
diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_git.bb
index 434e89aa8..0e9bf065c 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_git.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb
@@ -5,13 +5,12 @@ include freerdp.inc
5 5
6inherit gitpkgv 6inherit gitpkgv
7 7
8PV = "gitr${SRCPV}" 8PV = "1.0.2+gitr${SRCPV}"
9PKGV = "${GITPKGVTAG}" 9PKGV = "${GITPKGVTAG}"
10PR = "${INC_PR}.2"
11 10
12EXTRA_OECMAKE += "-DWITH_MANPAGES=OFF" 11EXTRA_OECMAKE += "-DWITH_MANPAGES=OFF"
13 12
14SRCREV = "f311acaffb9190567e2b478a98d7cbfaf2709f6b" 13SRCREV = "f311acaffb9190567e2b478a98d7cbfaf2709f6b"
15SRC_URI = "git://github.com/FreeRDP/FreeRDP.git" 14SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-1.0"
16 15
17S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"