haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libtorrent_rasterbar: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2017-09-08 09:06:32 +03:00
parent 87ebbfaaae
commit a8f12cc2bb
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.9.recipe → net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.4.recipe
View File

@@ -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="

46
net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.0.9.patchset → net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.4.patchset
View File

@@ -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 <diver@gelios.net>
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 <StorageDefs.h> // 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 <winsock2.h>
#endif
@@ -43,7 +43,7 @@ index 70a2b85..9bc9ee3 100644
#include <memory> // for auto_ptr required by asio
#include <boost/asio/detail/thread.hpp>
@@ -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 <unistd.h> // _SC_PAGESIZE
#endif
@@ -65,22 +65,22 @@ index 310cf0b..4cb2aa8 100644
#include <stdlib.h> // _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 <ifaddrs.h>
#endif
+#if defined __HAIKU__
+#include <sys/sockio.h>
+#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 <sys/time.h> // for gettimeofday()
#include <boost/cstdint.hpp>
@@ -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