[vlc-commits] Contribs: update libnfs to 1.10.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Feb  2 11:55:59 2016 +0100| [584d1ea9b29d96d79ae6e998679cca148a159c51] | committer: Jean-Baptiste Kempf

Contribs: update libnfs to 1.10.0

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

 contrib/src/nfs/SHA512SUMS         |    2 +-
 contrib/src/nfs/nfs-no-utils.patch |   27 ---------------------------
 contrib/src/nfs/rules.mak          |    3 +--
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/contrib/src/nfs/SHA512SUMS b/contrib/src/nfs/SHA512SUMS
index 30ecaba..f6777dd 100644
--- a/contrib/src/nfs/SHA512SUMS
+++ b/contrib/src/nfs/SHA512SUMS
@@ -1 +1 @@
-2a0e11dde5a2c4d25fcf1040d04ad984fe3b2e2ce5f544d602becb55aebdabbfe29a3b961d3db7d034c918862b540d3a03735bbbad0606ff3a128c50c2dad666  libnfs-1.9.8.tar.gz
+9d1bdd2e193f189841dd915d5a4d0965cfd0c597372fa82b12377c4da1f6b5ec022bd0cddfe46dda1a4ac3de3f31eed73cb7dcf832469a4d292e05401b8fb247  libnfs-1.10.0.tar.gz
diff --git a/contrib/src/nfs/nfs-no-utils.patch b/contrib/src/nfs/nfs-no-utils.patch
deleted file mode 100644
index 470e87a..0000000
--- a/contrib/src/nfs/nfs-no-utils.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru nfs/Makefile.am nfs-fixed/Makefile.am
---- nfs/Makefile.am	2015-08-02 19:18:25.000000000 +0200
-+++ nfs-fixed/Makefile.am	2016-01-14 14:33:06.000000000 +0100
-@@ -1,4 +1,4 @@
--SUBDIRS = doc mount nfs nlm nsm portmap rquota lib include utils . $(MAYBE_EXAMPLES)
-+SUBDIRS = doc mount nfs nlm nsm portmap rquota lib include $(MAYBE_UTILS) . $(MAYBE_EXAMPLES)
- ACLOCAL_AMFLAGS = -I m4
- 
- pkgconfigdir = $(libdir)/pkgconfig
-diff -ru nfs/configure.ac nfs-fixed/configure.ac
---- nfs/configure.ac	2015-08-02 19:18:25.000000000 +0200
-+++ nfs-fixed/configure.ac	2016-01-14 14:43:43.000000000 +0100
-@@ -24,6 +24,14 @@
- # We always want 64 bit file offsets
- CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"
- 
-+#option: utils
-+AC_ARG_ENABLE([utils],
-+              [AC_HELP_STRING([--enable-utils],
-+                              [Build util programs])],
-+	      [MAYBE_UTILS=""],
-+	      [MAYBE_UTILS="utils"])
-+AC_SUBST(MAYBE_UTILS)
-+
- #option: examples
- AC_ARG_ENABLE([examples],
-               [AC_HELP_STRING([--enable-examples],
diff --git a/contrib/src/nfs/rules.mak b/contrib/src/nfs/rules.mak
index ac7f4d5..2c08fcc 100644
--- a/contrib/src/nfs/rules.mak
+++ b/contrib/src/nfs/rules.mak
@@ -1,5 +1,5 @@
 # NFS
-NFS_VERSION := 1.9.8
+NFS_VERSION := 1.10.0
 NFS_URL := https://github.com/sahlberg/libnfs/archive/libnfs-$(NFS_VERSION).tar.gz
 
 ifndef HAVE_WIN32
@@ -17,7 +17,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/nfs-no-utils.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)