From: hschang <chang@dev3>
Date: Thu, 3 Jul 2014 02:35:44 +0000 (+0900)
Subject: Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=c363a61977d38b355867dbb58ff9c6c9710d53b5;hp=-c

Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
---

c363a61977d38b355867dbb58ff9c6c9710d53b5
diff --combined meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
index 98c1240,08ad116..393b936
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
@@@ -5,15 -5,16 +5,16 @@@ LIC_FILES_CHKSUM = "file://COPYING;md5=
  
  inherit gitpkgv
  
- PR = "r8"
+ PR = "r9"
  
  PV = "0.1+git${SRCPV}"
  PKGV = "0.1+git${GITPKGV}"
  SRCREV_pn-${PN} ?= "${AUTOREV}"
  
+ DEPENDS += "boost"
  SRC_URI = "git://code.vuplus.com/git/filestreamproxy.git;protocol=git;branch=transtreamproxy"
  
 -inherit autotools
 +inherit autotools-brokensep
  
  S = "${WORKDIR}/git"