diff --git a/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.9.recipe b/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.4.recipe similarity index 92% rename from net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.9.recipe rename to net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.4.recipe index 70bded12d..ebc576188 100644 --- a/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.9.recipe +++ b/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.4.recipe @@ -11,11 +11,11 @@ The main goals of libtorrent are: * to be memory efficient * to be very easy to use" HOMEPAGE="http://www.libtorrent.org/" -COPYRIGHT="2003-2016 Arvid Norberg" +COPYRIGHT="2003-2017 Arvid Norberg" LICENSE="BSD (2-clause)" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${portVersion//./_}/libtorrent-rasterbar-$portVersion.tar.gz" -CHECKSUM_SHA256="11a93125ed49f796fca83da925ab7dc29e91d88b915f078caaddaaf559d63db6" +CHECKSUM_SHA256="ccf42367803a6df7edcf4756d1f7d0a9ce6158ec33b851b3b58fd470ac4eeba6" SOURCE_DIR="libtorrent-rasterbar-$portVersion" PATCHES="libtorrent_rasterbar-$portVersion.patchset" @@ -47,7 +47,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libboost_system$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 1.0.0 devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.0.9.patchset b/net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.4.patchset similarity index 71% rename from net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.0.9.patchset rename to net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.4.patchset index 1790b90e5..60b61352f 100644 --- a/net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.0.9.patchset +++ b/net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.4.patchset @@ -1,16 +1,16 @@ -From 7258de8d1f9af649bc829b447c93e0f835602d0b Mon Sep 17 00:00:00 2001 +From 0f1c700d99a3faf97f7f7f4e6f2b1b9670ab774c Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Tue, 9 Jun 2015 08:26:30 +0300 +Date: Fri, 8 Sep 2017 08:09:28 +0300 Subject: Replace BeOS support code with Haiku diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp -index 1f17426..c8f36f3 100644 +index be22e9c..b3293dc 100644 --- a/include/libtorrent/config.hpp +++ b/include/libtorrent/config.hpp -@@ -250,14 +250,15 @@ POSSIBILITY OF SUCH DAMAGE. - #define TORRENT_USE_IFCONF 1 - #define TORRENT_HAS_SALEN 0 +@@ -321,14 +321,15 @@ POSSIBILITY OF SUCH DAMAGE. + #define TORRENT_HAVE_MMAP 1 + #define TORRENT_USE_SOLARIS_ATOMIC 1 -// ==== BEOS === -#elif defined __BEOS__ || defined __HAIKU__ @@ -21,7 +21,7 @@ index 1f17426..c8f36f3 100644 +#define TORRENT_HAIKU +#include // B_PATH_NAME_LENGTH #define TORRENT_HAS_FALLOCATE 0 - #define TORRENT_USE_MLOCK 0 + #define TORRENT_USE_BEOS_ATOMIC 1 #ifndef TORRENT_USE_ICONV #define TORRENT_USE_ICONV 0 +#define TORRENT_USE_IFCONF 1 @@ -29,10 +29,10 @@ index 1f17426..c8f36f3 100644 // ==== GNU/Hurd === diff --git a/include/libtorrent/thread.hpp b/include/libtorrent/thread.hpp -index 70a2b85..9bc9ee3 100644 +index 4ef92bb..70d629e 100644 --- a/include/libtorrent/thread.hpp +++ b/include/libtorrent/thread.hpp -@@ -41,10 +41,6 @@ POSSIBILITY OF SUCH DAMAGE. +@@ -44,10 +44,6 @@ POSSIBILITY OF SUCH DAMAGE. #include #endif @@ -43,7 +43,7 @@ index 70a2b85..9bc9ee3 100644 #include // for auto_ptr required by asio #include -@@ -75,7 +71,6 @@ namespace libtorrent +@@ -81,7 +77,6 @@ namespace libtorrent HANDLE m_sem; mutex m_mutex; int m_num_waiters; @@ -52,10 +52,10 @@ index 70a2b85..9bc9ee3 100644 mutex m_mutex; int m_num_waiters; diff --git a/src/allocator.cpp b/src/allocator.cpp -index 310cf0b..4cb2aa8 100644 +index a21ac74..6e55176 100644 --- a/src/allocator.cpp +++ b/src/allocator.cpp -@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. +@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE. #include // _SC_PAGESIZE #endif @@ -65,22 +65,22 @@ index 310cf0b..4cb2aa8 100644 #include // _aligned_malloc on mingw #endif diff --git a/src/enum_net.cpp b/src/enum_net.cpp -index 0994a63..a66d20b 100644 +index f38fb11..9c15de3 100644 --- a/src/enum_net.cpp +++ b/src/enum_net.cpp -@@ -92,6 +92,10 @@ POSSIBILITY OF SUCH DAMAGE. - #define IF_NAMESIZE IFNAMSIZ +@@ -88,6 +88,10 @@ POSSIBILITY OF SUCH DAMAGE. + #include #endif +#if defined __HAIKU__ +#include +#endif + - namespace libtorrent { namespace - { - + #if TORRENT_USE_IFADDRS || TORRENT_USE_IFCONF || TORRENT_USE_NETLINK || TORRENT_USE_SYSCTL + // capture this here where warnings are disabled (the macro generates warnings) + const unsigned long siocgifmtu = SIOCGIFMTU; diff --git a/src/thread.cpp b/src/thread.cpp -index c22aeb0..2490d20 100644 +index eec8c10..8042f03 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -33,10 +33,6 @@ POSSIBILITY OF SUCH DAMAGE. @@ -94,7 +94,7 @@ index c22aeb0..2490d20 100644 #ifdef BOOST_HAS_PTHREADS #include // for gettimeofday() #include -@@ -48,8 +44,6 @@ namespace libtorrent +@@ -51,8 +47,6 @@ namespace libtorrent { #if defined TORRENT_WINDOWS || defined TORRENT_CYGWIN Sleep(milliseconds); @@ -103,9 +103,9 @@ index c22aeb0..2490d20 100644 #else usleep(milliseconds * 1000); #endif -@@ -129,7 +123,7 @@ namespace libtorrent +@@ -146,7 +140,7 @@ namespace libtorrent { - ReleaseSemaphore(m_sem, m_num_waiters, 0); + ReleaseSemaphore(m_sem, (std::min)(m_num_waiters, 1), 0); } -#elif defined TORRENT_BEOS +#elif defined TORRENT_HAIKU @@ -113,5 +113,5 @@ index c22aeb0..2490d20 100644 : m_num_waiters(0) { -- -2.2.2 +2.13.1