mirror of https://git.wownero.com/dsc/mxe.git
libtorrent-rasterbar: update 1.0.7 --> 1.1.0
failing on x86_64-w64-mingw32.static
This commit is contained in:
Tony Theodore
parent
9817717103
commit
b247344bdc
|
|
@ -1,30 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -3,11 +3,13 @@
|
|||
|
||||
PKG := libtorrent-rasterbar
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.0.7
|
||||
$(PKG)_CHECKSUM := 3e16e024b175fefada17471c659fdbcfab235f9619d4f0913faa13cb02ca8d83
|
||||
$(PKG)_VERSION := 1.1.0
|
||||
$(PKG)_CHECKSUM := 2713df7da4aec5263ac11b6626ea966f368a5a8081103fd8f2f2ed97b5cd731d
|
||||
$(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
|
||||
# this will likely revert to standard naming in future releases
|
||||
$(PKG)_URL := https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1/libtorrent-rasterbar-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_DEPS := gcc boost openssl
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
|
|
@ -17,14 +19,14 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && \
|
||||
./configure \
|
||||
cd '$(1)' && ./configure \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
|
||||
--with-boost-system=boost_system-mt \
|
||||
--with-boost='$(PREFIX)/$(TARGET)' \
|
||||
--disable-debug \
|
||||
--disable-tests \
|
||||
--disable-examples
|
||||
--disable-examples \
|
||||
CXXFLAGS='-D_WIN32_WINNT=0x0501'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)'
|
||||
$(MAKE) -C '$(1)' -j 1 install
|
||||
endef
|
||||
|
|
|
|||
Loading…
Reference in New Issue