[vlc-commits] Contribs: update libnfs to 1.11.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Apr  9 19:20:40 2017 +0200| [a4733528d034a13a234c960e29e38d52d5ffa97c] | committer: Jean-Baptiste Kempf

Contribs: update libnfs to 1.11.0

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a4733528d034a13a234c960e29e38d52d5ffa97c
---

 contrib/src/nfs/Android-statvfs.patch | 66 -----------------------------------
 contrib/src/nfs/SHA512SUMS            |  2 +-
 contrib/src/nfs/rules.mak             |  3 +-
 3 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/contrib/src/nfs/Android-statvfs.patch b/contrib/src/nfs/Android-statvfs.patch
deleted file mode 100644
index 42b87ac8ea..0000000000
--- a/contrib/src/nfs/Android-statvfs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 41c41aec0bfd2288afde4068e433e58513268668 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Fri, 11 Mar 2016 00:09:16 +0100
-Subject: [PATCH] Android: only redefine statvfs if it is not already defined
-
-It is defined with recent platforms version 21 and more recent
----
- lib/libnfs-sync.c | 8 ++++----
- lib/libnfs.c      | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
-index 664ccfc..69caee3 100644
---- a/lib/libnfs-sync.c
-+++ b/lib/libnfs-sync.c
-@@ -37,10 +37,6 @@
- #include <net/if.h>
- #endif
- 
--#ifdef __ANDROID__
--#define statvfs statfs
--#endif
--
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -49,6 +45,10 @@
- #include <sys/statvfs.h>
- #endif
- 
-+#if defined(__ANDROID__) && !defined(HAVE_SYS_STATVFS_H)
-+#define statvfs statfs
-+#endif
-+
- #ifdef HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
-diff --git a/lib/libnfs.c b/lib/libnfs.c
-index 1f16e5f..36c1430 100644
---- a/lib/libnfs.c
-+++ b/lib/libnfs.c
-@@ -33,10 +33,6 @@
- #include <utime.h>
- #endif
- 
--#ifdef __ANDROID__
--#define statvfs statfs
--#endif
--
- #define _GNU_SOURCE
- 
- #ifdef HAVE_UNISTD_H
-@@ -51,6 +47,10 @@
- #include <sys/statvfs.h>
- #endif
- 
-+#if defined(__ANDROID__) && !defined(HAVE_SYS_STATVFS_H)
-+#define statvfs statfs
-+#endif
-+
- #ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
--- 
-2.7.0
-
diff --git a/contrib/src/nfs/SHA512SUMS b/contrib/src/nfs/SHA512SUMS
index f6777dd4ea..f17f6dbb1c 100644
--- a/contrib/src/nfs/SHA512SUMS
+++ b/contrib/src/nfs/SHA512SUMS
@@ -1 +1 @@
-9d1bdd2e193f189841dd915d5a4d0965cfd0c597372fa82b12377c4da1f6b5ec022bd0cddfe46dda1a4ac3de3f31eed73cb7dcf832469a4d292e05401b8fb247  libnfs-1.10.0.tar.gz
+e1ef6e341fd56955c3adedf6ba90841a57be9c6a962d61ff18425593bfc2787c34c776fdc8ec711f8bb2da1ec08271fc8778a0499aef01c3a7694c384a4c037b  libnfs-1.11.0.tar.gz
diff --git a/contrib/src/nfs/rules.mak b/contrib/src/nfs/rules.mak
index 013a4a0b15..4e91925ca4 100644
--- a/contrib/src/nfs/rules.mak
+++ b/contrib/src/nfs/rules.mak
@@ -1,5 +1,5 @@
 # NFS
-NFS_VERSION := 1.10.0
+NFS_VERSION := 1.11.0
 NFS_URL := https://github.com/sahlberg/libnfs/archive/libnfs-$(NFS_VERSION).tar.gz
 
 PKGS += nfs
@@ -15,7 +15,6 @@ $(TARBALLS)/libnfs-$(NFS_VERSION).tar.gz:
 nfs: libnfs-$(NFS_VERSION).tar.gz .sum-nfs
 	$(UNPACK)
 	mv libnfs-libnfs-$(NFS_VERSION) libnfs-$(NFS_VERSION)
-	$(APPLY) $(SRC)/nfs/Android-statvfs.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)