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

libtorrent-rasterbar: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-02-26 23:21:33 +10:00
parent 0d821860ea
commit 5fe6c387cc
3 changed files with 43 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.6.recipe → net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.12.recipe
View File

@@ -11,7 +11,7 @@ The main goals of libtorrent are:
* to be memory efficient
* to be very easy to use"
HOMEPAGE="https://www.libtorrent.org/"
COPYRIGHT="2003-2017 Arvid Norberg
COPYRIGHT="2003-2018 Arvid Norberg
Andrei Kurushin
Steven Siloti
Thomas Fischer
@@ -28,9 +28,9 @@ COPYRIGHT="2003-2017 Arvid Norberg
Peter Koeleman
Reimond Retz"
LICENSE="BSD (2-clause)"
REVISION="2"
SOURCE_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${portVersion//./_}/libtorrent-rasterbar-$portVersion.tar.gz"
CHECKSUM_SHA256="b7c74d004bd121bd6e9f8975ee1fec3c95c74044c6a6250f6b07f259f55121ef"
REVISION="1"
SOURCE_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${portVersion//./_}/libtorrent-rasterbar-$portVersion.tar.gz"
CHECKSUM_SHA256="a5937134edf3ca8c109403a47f5a5fc93f7b8dca4e97f1a629a8c84288bee7a7"
SOURCE_DIR="libtorrent-rasterbar-$portVersion"
PATCHES="libtorrent_rasterbar-$portVersion.patchset"
@@ -64,9 +64,9 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_chrono$secondaryArchSuffix >= 1.63.0
devel:libboost_random$secondaryArchSuffix >= 1.63.0
devel:libboost_system$secondaryArchSuffix >= 1.63.0
devel:libboost_chrono$secondaryArchSuffix >= 1.65.0
devel:libboost_random$secondaryArchSuffix >= 1.65.0
devel:libboost_system$secondaryArchSuffix >= 1.65.0
devel:libiconv$secondaryArchSuffix
devel:libssl$secondaryArchSuffix >= 1.0.0
"
@@ -83,7 +83,6 @@ defineDebugInfoPackage libtorrent_rasterbar$secondaryArchSuffix \
BUILD()
{
export CXXFLAGS="$CXXFLAGS -std=c++11 -DBOOST_NO_CXX11_CONSTEXPR"
runConfigure ./configure \
--disable-static \
--with-libiconv \

36
net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.12.patchset Normal file
View File

@@ -0,0 +1,36 @@
From 5c96f785a2b2ebc095e665da736bb532e40b1007 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 26 Feb 2019 23:09:10 +1000
Subject: Fixes for Haiku
diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index 0fe4dce..744e297 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -322,6 +322,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define TORRENT_USE_BEOS_ATOMIC 1
#ifndef TORRENT_USE_ICONV
#define TORRENT_USE_ICONV 0
+#define TORRENT_USE_IFCONF 1
#endif
// ==== GNU/Hurd ===
diff --git a/src/enum_net.cpp b/src/enum_net.cpp
index 94d9f7f..e9aee31 100644
--- a/src/enum_net.cpp
+++ b/src/enum_net.cpp
@@ -93,6 +93,10 @@ POSSIBILITY OF SUCH DAMAGE.
#include <sys/types.h>
#endif
+#if defined __HAIKU__
+#include <sys/sockio.h>
+#endif
+
#if TORRENT_USE_IFADDRS
#include <ifaddrs.h>
#endif
--
2.19.1

117
net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.6.patchset
View File

@@ -1,117 +0,0 @@
From 9a660582bd0a019c087d2e10460e734030741869 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 8 Sep 2017 09:25:29 +0300
Subject: Replace BeOS support code with Haiku
diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index cc9f09f..426ca4d 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -314,14 +314,15 @@ POSSIBILITY OF SUCH DAMAGE.
#define TORRENT_HAVE_MMAP 1
#define TORRENT_USE_SOLARIS_ATOMIC 1
-// ==== BEOS ===
-#elif defined __BEOS__ || defined __HAIKU__
-#define TORRENT_BEOS
-#include <storage/StorageDefs.h> // B_PATH_NAME_LENGTH
+// ==== Haiku ===
+#elif defined __HAIKU__
+#define TORRENT_HAIKU
+#include <StorageDefs.h> // B_PATH_NAME_LENGTH
#define TORRENT_HAS_FALLOCATE 0
#define TORRENT_USE_BEOS_ATOMIC 1
#ifndef TORRENT_USE_ICONV
#define TORRENT_USE_ICONV 0
+#define TORRENT_USE_IFCONF 1
#endif
// ==== GNU/Hurd ===
diff --git a/include/libtorrent/thread.hpp b/include/libtorrent/thread.hpp
index 4ef92bb..70d629e 100644
--- a/include/libtorrent/thread.hpp
+++ b/include/libtorrent/thread.hpp
@@ -44,10 +44,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include <winsock2.h>
#endif
-#if defined TORRENT_BEOS
-#include <kernel/OS.h>
-#endif
-
#include <memory> // for auto_ptr required by asio
#include <boost/asio/detail/thread.hpp>
@@ -81,7 +77,6 @@ namespace libtorrent
HANDLE m_sem;
mutex m_mutex;
int m_num_waiters;
-#elif defined TORRENT_BEOS
sem_id m_sem;
mutex m_mutex;
int m_num_waiters;
diff --git a/src/allocator.cpp b/src/allocator.cpp
index a21ac74..6e55176 100644
--- a/src/allocator.cpp
+++ b/src/allocator.cpp
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <unistd.h> // _SC_PAGESIZE
#endif
-#if TORRENT_USE_MEMALIGN || TORRENT_USE_POSIX_MEMALIGN || defined TORRENT_WINDOWS
+#if TORRENT_USE_MEMALIGN || TORRENT_USE_POSIX_MEMALIGN || defined TORRENT_WINDOWS || defined TORRENT_HAIKU
#include <malloc.h> // memalign and _aligned_malloc
#include <stdlib.h> // _aligned_malloc on mingw
#endif
diff --git a/src/enum_net.cpp b/src/enum_net.cpp
index f38fb11..9c15de3 100644
--- a/src/enum_net.cpp
+++ b/src/enum_net.cpp
@@ -88,6 +88,10 @@ POSSIBILITY OF SUCH DAMAGE.
#include <ifaddrs.h>
#endif
+#if defined __HAIKU__
+#include <sys/sockio.h>
+#endif
+
#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 eec8c10..8042f03 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -33,10 +33,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/thread.hpp"
#include "libtorrent/assert.hpp"
-#ifdef TORRENT_BEOS
-#include <kernel/OS.h>
-#endif
-
#ifdef BOOST_HAS_PTHREADS
#include <sys/time.h> // for gettimeofday()
#include <boost/cstdint.hpp>
@@ -51,8 +47,6 @@ namespace libtorrent
{
#if defined TORRENT_WINDOWS || defined TORRENT_CYGWIN
Sleep(milliseconds);
-#elif defined TORRENT_BEOS
- snooze_until(system_time() + boost::int64_t(milliseconds) * 1000, B_SYSTEM_TIMEBASE);
#else
usleep(milliseconds * 1000);
#endif
@@ -146,7 +140,7 @@ namespace libtorrent
{
ReleaseSemaphore(m_sem, (std::min)(m_num_waiters, 1), 0);
}
-#elif defined TORRENT_BEOS
+#elif defined TORRENT_HAIKU
condition_variable::condition_variable()
: m_num_waiters(0)
{
--
2.14.2