diff options
| -rw-r--r-- | index.html | 4 | ||||
| -rw-r--r-- | src/libtorrent-rasterbar-1-getfileattributesex.patch | 30 | ||||
| -rw-r--r-- | src/libtorrent-rasterbar-2-geoip-win32.patch | 29 | ||||
| -rw-r--r-- | src/libtorrent-rasterbar-3-geoip-include-winsock2-before-windows.patch | 37 | ||||
| -rw-r--r-- | src/libtorrent-rasterbar-4-ed25519-seed-fix-includes.patch | 30 | ||||
| -rw-r--r-- | src/libtorrent-rasterbar.mk | 31 |
6 files changed, 161 insertions, 0 deletions
@@ -1785,6 +1785,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre> <td class="website"><a href="https://www.gnu.org/software/libtool/">GNU Libtool</a></td> </tr> <tr> + <td class="package">libtorrent-rasterbar</td> + <td class="website"><a href="http://www.rasterbar.com/products/libtorrent/">libtorrent-rasterbar</a></td> + </tr> + <tr> <td class="package">libunistring</td> <td class="website"><a href="https://www.gnu.org/software/libunistring/">libunistring</a></td> </tr> diff --git a/src/libtorrent-rasterbar-1-getfileattributesex.patch b/src/libtorrent-rasterbar-1-getfileattributesex.patch new file mode 100644 index 0000000..ec7abc6 --- /dev/null +++ b/src/libtorrent-rasterbar-1-getfileattributesex.patch @@ -0,0 +1,30 @@ +This file is part of MXE. +See index.html for further information. + +From 679ad4e2331484fda9da250cb269779daf703698 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sat, 29 Aug 2015 10:28:59 +0200 +Subject: [PATCH] file.cpp: use defined GetFileAttributesEx + +This macro was defined as GetFileAttributesEx_ but used +as GetFileAttributesEx. Strange. +--- + src/file.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/file.cpp b/src/file.cpp +index a3219b0..0276033 100644 +--- a/src/file.cpp ++++ b/src/file.cpp +@@ -208,7 +208,7 @@ namespace libtorrent + std::string f = convert_to_native(inf); + #endif + WIN32_FILE_ATTRIBUTE_DATA data; +- if (!GetFileAttributesEx(f.c_str(), GetFileExInfoStandard, &data)) ++ if (!GetFileAttributesEx_(f.c_str(), GetFileExInfoStandard, &data)) + { + ec.assign(GetLastError(), get_system_category()); + return; +-- +1.7.10.4 + diff --git a/src/libtorrent-rasterbar-2-geoip-win32.patch b/src/libtorrent-rasterbar-2-geoip-win32.patch new file mode 100644 index 0000000..f37b09a --- /dev/null +++ b/src/libtorrent-rasterbar-2-geoip-win32.patch @@ -0,0 +1,29 @@ +This file is part of MXE. +See index.html for further information. + +From 258068273e70f25b723c4813805e76f92b18264c Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sat, 29 Aug 2015 11:03:49 +0200 +Subject: [PATCH] GeoIP.c: disable POSIX section + +WIN32 is not defined for some reason. +--- + src/GeoIP.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/GeoIP.c b/src/GeoIP.c +index cb4437e..be2c5e4 100644 +--- a/src/GeoIP.c ++++ b/src/GeoIP.c +@@ -22,7 +22,7 @@ + + #include "libtorrent/ConvertUTF.h" + +-#ifndef WIN32 ++#ifndef _WIN32 + #include <netdb.h> + #include <sys/socket.h> + #include <netinet/in.h> /* For ntohl */ +-- +1.7.10.4 + diff --git a/src/libtorrent-rasterbar-3-geoip-include-winsock2-before-windows.patch b/src/libtorrent-rasterbar-3-geoip-include-winsock2-before-windows.patch new file mode 100644 index 0000000..c15fd12 --- /dev/null +++ b/src/libtorrent-rasterbar-3-geoip-include-winsock2-before-windows.patch @@ -0,0 +1,37 @@ +This file is part of MXE. +See index.html for further information. + +From 09eb90c58226b667e5ad327520c7bc3ec18617b8 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sat, 29 Aug 2015 11:15:52 +0200 +Subject: [PATCH] GeoIP.c: include winsock2.h before windows.h + +Fix a warning: + +In file included from GeoIP.c:35:0: +mxe/usr/i686-w64-mingw32.static/include/winsock2.h:15:2: +warning: #warning Please include winsock2.h before windows.h +[-Wcpp] + #warning Please include winsock2.h before windows.h + ^ +--- + src/GeoIP.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/GeoIP.c b/src/GeoIP.c +index be2c5e4..e1250e0 100644 +--- a/src/GeoIP.c ++++ b/src/GeoIP.c +@@ -31,8 +31,8 @@ + #include <sys/mman.h> + + #else +-#include <windows.h> + #include <winsock2.h> ++#include <windows.h> + #define snprintf _snprintf + #endif + #include <errno.h> +-- +1.7.10.4 + diff --git a/src/libtorrent-rasterbar-4-ed25519-seed-fix-includes.patch b/src/libtorrent-rasterbar-4-ed25519-seed-fix-includes.patch new file mode 100644 index 0000000..43d8887 --- /dev/null +++ b/src/libtorrent-rasterbar-4-ed25519-seed-fix-includes.patch @@ -0,0 +1,30 @@ +This file is part of MXE. +See index.html for further information. + +From eddde6d65c1ec97ab473e40ce44cfef2a20e6bd6 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sat, 29 Aug 2015 11:20:16 +0200 +Subject: [PATCH] ed25519/src/seed.cpp: fix includes + +--- + ed25519/src/seed.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ed25519/src/seed.cpp b/ed25519/src/seed.cpp +index 7619c66..d9dd1c1 100644 +--- a/ed25519/src/seed.cpp ++++ b/ed25519/src/seed.cpp +@@ -3,8 +3,8 @@ + #ifndef ED25519_NO_SEED + + #ifdef _WIN32 +-#include <Windows.h> +-#include <Wincrypt.h> ++#include <windows.h> ++#include <wincrypt.h> + #else + #include <stdio.h> + #endif +-- +1.7.10.4 + diff --git a/src/libtorrent-rasterbar.mk b/src/libtorrent-rasterbar.mk new file mode 100644 index 0000000..b3039c6 --- /dev/null +++ b/src/libtorrent-rasterbar.mk @@ -0,0 +1,31 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libtorrent-rasterbar +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.0.6 +$(PKG)_CHECKSUM := 160e7cde6aafdb3dff1abf5ae384676367d04f2b +$(PKG)_SUBDIR := libtorrent-rasterbar-$($(PKG)_VERSION) +$(PKG)_FILE := libtorrent-rasterbar-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(subst .,_,$($(PKG)_VERSION))/libtorrent-rasterbar-$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc boost openssl + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://github.com/arvidn/libtorrent/releases' | \ + $(SED) -n 's,.*libtorrent-rasterbar-\([0-9][^"]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && \ + ./configure \ + $(MXE_CONFIGURE_OPTS) \ + PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ + --with-boost-system=boost_system-mt \ + --disable-debug \ + --enable-tests --enable-examples + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef + +$(PKG)_BUILD_SHARED = |