From 6f7c23ef0331dfd11f73d83b13bd921907d6fb55 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 15 Dec 2014 09:51:35 +0000 Subject: [PATCH] libtorrent: moved to github Signed-off-by: Felix Fietkau SVN-Revision: 43713 --- libs/libtorrent/Makefile | 71 ------------------- .../patches/100-fix_cross_compile.patch | 41 ----------- .../120-fix-ipv6_socket_datagram.patch | 26 ------- 3 files changed, 138 deletions(-) delete mode 100644 libs/libtorrent/Makefile delete mode 100644 libs/libtorrent/patches/100-fix_cross_compile.patch delete mode 100644 libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile deleted file mode 100644 index ce203ce57..000000000 --- a/libs/libtorrent/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright (C) 2007-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libtorrent -PKG_VERSION:=0.13.3-git -PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/rakshasa/libtorrent.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=680576e23e7d5f642ee51486fdf301ac0195e188 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libtorrent - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Rakshasa's BitTorrent library - URL:=http://libtorrent.rakshasa.no/ - DEPENDS:=+libopenssl +libsigcxx -endef - -define Package/libtorrent/description - LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on - high performance and good code. The library differentiates itself from other - implementations by transfering directly from file pages to the network stack. - On high-bandwidth connections it is able to seed at 3 times the speed of the - official client. -endef - -TARGET_LDFLAGS += $(LIBGCC_S) - -CONFIGURE_ARGS+= \ - --enable-shared \ - --enable-static \ - --enable-aligned \ - --disable-debug \ - --enable-openssl \ - --disable-instrumentation - -define Build/Configure - ( cd $(PKG_BUILD_DIR); ./autogen.sh ); - $(call Build/Configure/Default) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libtorrent/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libtorrent)) diff --git a/libs/libtorrent/patches/100-fix_cross_compile.patch b/libs/libtorrent/patches/100-fix_cross_compile.patch deleted file mode 100644 index 202ee0033..000000000 --- a/libs/libtorrent/patches/100-fix_cross_compile.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO - - AM_INIT_AUTOMAKE - AC_CONFIG_HEADERS(config.h) --AM_PATH_CPPUNIT(1.9.6) - - AC_PROG_CXX - ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses t - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; diff --git a/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch b/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch deleted file mode 100644 index 1a4662703..000000000 --- a/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/net/socket_datagram.cc -+++ b/src/net/socket_datagram.cc -@@ -73,6 +73,23 @@ SocketDatagram::write_datagram(const voi - int r; - - if (sa != NULL) { -+#ifdef RAK_USE_INET6 -+ if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet) { -+ uint32_t addr32[4]; -+ sockaddr_in6 mapped_addr; -+ memset(&mapped_addr, 0, sizeof(mapped_addr)); -+ mapped_addr.sin6_family = AF_INET6; -+ addr32[0] = 0; -+ addr32[1] = 0; -+ addr32[2] = htonl(0xffff); -+ addr32[3] = sa->sa_inet()->address_n(); -+ memcpy(mapped_addr.sin6_addr.s6_addr, addr32, sizeof(uint32_t) * 4); -+ mapped_addr.sin6_port = sa->sa_inet()->port_n(); -+ r = ::sendto(m_fileDesc, buffer, length, 0, (sockaddr*)&mapped_addr, sizeof(mapped_addr)); -+ } else if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet6) { -+ r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet6()->c_sockaddr(), sizeof(rak::socket_address_inet6)); -+ } else -+#endif - r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet()->c_sockaddr(), sizeof(rak::socket_address_inet)); - } else { - r = ::send(m_fileDesc, buffer, length, 0); -- 2.30.2