[oe] [meta-oe][PATCH 14/14] libtorrent, rtorrent: Update to 0.13.6+git

[Martin Jansa]

On Mon, Mar 06, 2017 at 11:13:49PM -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  .../{libtorrent_0.13.3.bb => libtorrent_0.13.6.bb}          | 13 ++++++++++---
>  .../rtorrent/{rtorrent_0.9.3.bb => rtorrent_0.9.6.bb}       | 12 +++++++++---
>  2 files changed, 19 insertions(+), 6 deletions(-)
>  rename meta-oe/recipes-connectivity/libtorrent/{libtorrent_0.13.3.bb => libtorrent_0.13.6.bb} (60%)
>  rename meta-oe/recipes-connectivity/rtorrent/{rtorrent_0.9.3.bb => rtorrent_0.9.6.bb} (57%)
> 
> diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
> similarity index 60%
> rename from meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb
> rename to meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
> index 4af3a6a6a..7153cff6c 100644
> --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb
> +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb
> @@ -6,12 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
>  
>  DEPENDS = "libsigc++-2.0 openssl cppunit"
>  
> -SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \
> +SRC_URI = "git://github.com/rakshasa/libtorrent;protocol=git;branch=master \

Drop protocol and branch

>      file://don-t-run-code-while-configuring-package.patch \
>  "
> +SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87"
>  
> -SRC_URI[md5sum] = "e94f6c590bb02aaf4d58618f738a85f2"
> -SRC_URI[sha256sum] = "34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677"
> +PV .= "+git${SRCPV}"

Please rename the recipe and set whole version inside.

> +
> +S = "${WORKDIR}/git"
>  
>  inherit autotools pkgconfig
>  
> +EXTRA_OECONF = "--without-zlib"

For some reason even with this it tries to use zlib:

| ../../../../git/src/torrent/utils/log.cc:51:18: fatal error: zlib.h:
No such file or directory
|  #include <zlib.h>
|                   ^
| compilation terminated.
| Makefile:485: recipe for target 'log.lo' failed

http://errors.yoctoproject.org/Errors/Details/134814/

> +
> +do_configure_prepend() {
> +    (cd ${S}; ./autogen.sh; cd -)
> +}
> diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
> similarity index 57%
> rename from meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb
> rename to meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
> index eb0a39af5..817c24345 100644
> --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb
> +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb
> @@ -5,11 +5,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>  
>  DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses"
>  
> -SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \
> +SRC_URI = "git://github.com/rakshasa/rtorrent;protocol=git;branch=master \
>      file://don-t-run-code-while-configuring-package.patch \
>  "
> +SRCREV = "226e670decf92e7adaa845a6982aca4f164ea740"
>  
> -SRC_URI[md5sum] = "0bf2f262faa8c8c8d3b11ce286ea2bf2"
> -SRC_URI[sha256sum] = "9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310"
> +PV .= "+git${SRCPV}"
> +
> +S = "${WORKDIR}/git"
>  
>  inherit autotools pkgconfig
> +
> +do_configure_prepend() {
> +    (cd ${S}; ./autogen.sh; cd -)
> +}
> -- 
> 2.12.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20170308/2ba27571/attachment-0002.sig>