Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
Fix libminiupnpc version detection
|
||||
|
||||
Problem is known upstream: https://trac.transmissionbt.com/ticket/6140
|
||||
|
||||
For buildroot we know the libminiupnpc version so we hard-code 2.0.
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac
|
||||
--- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100
|
||||
+++ transmission-2.92/configure.ac 2016-07-02 21:48:13.452385686 +0200
|
||||
@@ -386,18 +386,7 @@
|
||||
dnl MINIUPNPC_API_VERSION and we won't have to figure
|
||||
dnl it out on our own
|
||||
if test "x$upnp_version" = "xunknown" ; then
|
||||
- AC_RUN_IFELSE(
|
||||
- [AC_LANG_PROGRAM(
|
||||
- [#include <stdlib.h>
|
||||
- #include <miniupnpc/miniupnpc.h>],
|
||||
- [#ifdef MINIUPNPC_API_VERSION
|
||||
- return EXIT_SUCCESS;
|
||||
- #else
|
||||
- return EXIT_FAILURE;
|
||||
- #endif]
|
||||
- )],
|
||||
- [upnp_version=">= 1.7"]
|
||||
- )
|
||||
+ upnp_version="2.0"
|
||||
fi
|
||||
|
||||
dnl Or maybe it's miniupnp 1.6
|
||||
@@ -0,0 +1,46 @@
|
||||
Fix compilation when using system libminiupnpc with libutp disabled
|
||||
|
||||
If transmission uses its own copy of libminiupnpc in third-party/ then
|
||||
the configure script adds that path to CFLAGS:
|
||||
https://trac.transmissionbt.com/browser/trunk/configure.ac#L455
|
||||
|
||||
This path is also added if transmission uses its own copy of libutp:
|
||||
https://trac.transmissionbt.com/browser/trunk/configure.ac#L349
|
||||
|
||||
But if a system-provided libminiupnpc is used and utp-support is
|
||||
disabled using --disable-utp the result is a build error, detected by
|
||||
buildroot autobuilders:
|
||||
http://autobuild.buildroot.net/results/b79/b79e51140cb0320554a58ce59dcb33f53cd9211a/build-end.log
|
||||
|
||||
net.c:40:24: fatal error: libutp/utp.h: No such file or directory
|
||||
|
||||
Patch proposed by Yann E. MORIN:
|
||||
http://lists.busybox.net/pipermail/buildroot/2016-July/167896.html
|
||||
|
||||
Patch sent upstream: https://trac.transmissionbt.com/ticket/6163
|
||||
|
||||
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
|
||||
|
||||
diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac
|
||||
--- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100
|
||||
+++ transmission-2.92/configure.ac 2016-07-31 12:13:40.921660078 +0200
|
||||
@@ -358,6 +358,10 @@
|
||||
else
|
||||
AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found")
|
||||
fi
|
||||
+else
|
||||
+ # For the system libminiupnpc with UTC disabled,
|
||||
+ # point to our bundled UTP headers
|
||||
+ LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
|
||||
fi
|
||||
AC_SUBST(LIBUTP_CFLAGS)
|
||||
AC_SUBST(LIBUTP_LIBS)
|
||||
@@ -457,7 +461,7 @@
|
||||
LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a"
|
||||
else
|
||||
AC_DEFINE([SYSTEM_MINIUPNP])
|
||||
- LIBUPNP_CFLAGS=""
|
||||
+ LIBUPNP_CFLAGS="${LIBUTP_CFLAGS}"
|
||||
LIBUPNP_LIBS="-lminiupnpc"
|
||||
LIBUPNP_LIBS_QT="-lminiupnpc"
|
||||
fi
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb transmission-2.84.tar.xz
|
||||
sha256 3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f transmission-2.92.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TRANSMISSION_VERSION = 2.84
|
||||
TRANSMISSION_VERSION = 2.92
|
||||
TRANSMISSION_SITE = http://download.transmissionbt.com/files
|
||||
TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz
|
||||
TRANSMISSION_DEPENDENCIES = \
|
||||
@@ -21,6 +21,17 @@ TRANSMISSION_CONF_OPTS = \
|
||||
TRANSMISSION_LICENSE = GPLv2 or GPLv3 with OpenSSL exception
|
||||
TRANSMISSION_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y)
|
||||
TRANSMISSION_DEPENDENCIES += libminiupnpc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNATPMP),y)
|
||||
TRANSMISSION_DEPENDENCIES += libnatpmp
|
||||
TRANSMISSION_CONF_OPTS += --enable-external-natpmp
|
||||
else
|
||||
TRANSMISSION_CONF_OPTS += --disable-external-natpmp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TRANSMISSION_UTP),y)
|
||||
TRANSMISSION_CONF_OPTS += --enable-utp
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user