[vlc-commits] Contribs: update libdsm to 0.3.1
Thomas Guillem
git at videolan.org
Wed Oct 30 15:39:15 CET 2019
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Oct 30 15:38:58 2019 +0100| [3246f49f132ac8812e4bb933d406d6c1ba88a959] | committer: Thomas Guillem
Contribs: update libdsm to 0.3.1
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3246f49f132ac8812e4bb933d406d6c1ba88a959
---
...uild-fix-nl_langinfo-detection-on-Android.patch | 55 ----------
...on-t-use-_pipe-when-building-for-winstore.patch | 37 -------
contrib/src/libdsm/SHA512SUMS | 2 +-
contrib/src/libdsm/fix-pc-generation.patch | 121 ---------------------
contrib/src/libdsm/fix-pipe-compat.patch | 65 -----------
contrib/src/libdsm/rules.mak | 6 +-
6 files changed, 2 insertions(+), 284 deletions(-)
diff --git a/contrib/src/libdsm/0001-build-fix-nl_langinfo-detection-on-Android.patch b/contrib/src/libdsm/0001-build-fix-nl_langinfo-detection-on-Android.patch
deleted file mode 100644
index d022f0d564..0000000000
--- a/contrib/src/libdsm/0001-build-fix-nl_langinfo-detection-on-Android.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 68dc318713f7ca577e9d5bb4088d31851944b0fa Mon Sep 17 00:00:00 2001
-From: Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet at gmail.com>
-Date: Tue, 11 Sep 2018 17:51:04 +0200
-Subject: [PATCH] build: fix nl_langinfo detection on Android
-
-The android NDK 17 provides the header, but not necessarily the
-nl_langinfo function.
-
-Signed-off-by: Thomas Guillem <thomas at gllm.fr>
----
- configure.ac | 4 ++--
- src/smb_utils.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e0e40c9..17757d5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,9 +107,9 @@ AC_CHECK_DECLS([CLOCK_MONOTONIC],,,[
- AC_REPLACE_FUNCS([strlcpy])
- AC_REPLACE_FUNCS([strndup])
- AC_REPLACE_FUNCS([clock_gettime])
--AC_CHECK_FUNCS([pipe _pipe getifaddrs])
-+AC_CHECK_FUNCS([pipe _pipe getifaddrs nl_langinfo])
-
--AC_CHECK_HEADERS([bsd/string.h langinfo.h alloca.h sys/queue.h arpa/inet.h sys/socket.h sys/time.h ifaddrs.h])
-+AC_CHECK_HEADERS([bsd/string.h alloca.h sys/queue.h arpa/inet.h sys/socket.h sys/time.h ifaddrs.h])
-
- ## Configure random device path
- AC_ARG_WITH([urandom],
-diff --git a/src/smb_utils.c b/src/smb_utils.c
-index a64c1db..3e8a420 100644
---- a/src/smb_utils.c
-+++ b/src/smb_utils.c
-@@ -40,7 +40,7 @@
- #include <string.h>
- #include <errno.h>
-
--#if HAVE_LANGINFO_H && !defined( __APPLE__ )
-+#if HAVE_NL_LANGINFO && !defined( __APPLE__ )
- # include <langinfo.h>
- #endif
-
-@@ -51,7 +51,7 @@ static const char *current_encoding()
- {
- #if defined( __APPLE__ )
- return "UTF8";
--#elif !HAVE_LANGINFO_H
-+#elif !HAVE_NL_LANGINFO
- return "UTF-8";
- #else
- static int locale_set = 0;
---
-2.19.1
-
diff --git a/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch b/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
deleted file mode 100644
index 6df9ce8a1b..0000000000
--- a/contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 45e48b777207853d7b125612b40b5d8fde101634 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Mon, 3 Dec 2018 14:13:26 +0100
-Subject: [PATCH] compat: Don't use _pipe when building for winstore
-
----
- compat/compat.h | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/compat/compat.h b/compat/compat.h
-index 4eef355..b7f878c 100644
---- a/compat/compat.h
-+++ b/compat/compat.h
-@@ -66,13 +66,18 @@ char *strndup(const char *str, size_t n);
- #endif
-
- #if !defined(HAVE_PIPE) && defined(HAVE__PIPE)
--#include <fcntl.h>
--#define HAVE_PIPE
-+# ifdef _WIN32
-+# include <winapifamily.h>
-+# endif
-+# if !defined(_WIN32) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-+# include <fcntl.h>
-+# define HAVE_PIPE
- static inline int pipe(int fds[2])
- {
- return _pipe(fds, 32768, O_NOINHERIT | O_BINARY);
- }
- #endif
-+#endif
-
- #ifndef _WIN32
- #define closesocket(fd) close(fd)
---
-2.19.2
-
diff --git a/contrib/src/libdsm/SHA512SUMS b/contrib/src/libdsm/SHA512SUMS
index bb3a29cbb8..aef26d6c1b 100644
--- a/contrib/src/libdsm/SHA512SUMS
+++ b/contrib/src/libdsm/SHA512SUMS
@@ -1 +1 @@
-8a26a4b14ad64b55f830d39641c0879639b2086f9e5cb8d4b6b83314a778844303e4c491aafd98362a9b5ec3eaab9fe7a4cfd5580b055d93553b69b68cdece4a libdsm-0.3.0.tar.gz
+be2ba69879b7e5de55f72c4105c7e734883e66bbb60a8e1ac46acb808468f80de37738cdec2aa35443e89739fd8564784caf67b2adf07606262b1a4cb5c49306 libdsm-0.3.1.tar.gz
diff --git a/contrib/src/libdsm/fix-pc-generation.patch b/contrib/src/libdsm/fix-pc-generation.patch
deleted file mode 100644
index bd4cde71aa..0000000000
--- a/contrib/src/libdsm/fix-pc-generation.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 75a5f417c6dc20bb950d5106ba8ab978fa4c9942 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Tue, 20 Nov 2018 18:09:47 +0100
-Subject: [PATCH] Simplify package version management
-
-This mostly fixes .pc generation from a `make dist` tarball
----
- Makefile.am | 1 -
- configure.ac | 9 +++++----
- libdsm.pc.in | 2 +-
- package_version.sh | 40 ----------------------------------------
- 4 files changed, 6 insertions(+), 46 deletions(-)
- delete mode 100755 package_version.sh
-
-diff --git a/Makefile.am b/Makefile.am
-index 4a78c3c..5c191cf 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,6 @@ DISTCLEANFILES = @DOLT_CLEANFILES@
-
- EXTRA_DIST = \
- abi_version.sh \
-- package_version.sh \
- contrib/spnego/spnego.asn1 \
- contrib/spnego/spnego_asn1.c \
- src/libdsm.sym
-diff --git a/configure.ac b/configure.ac
-index 17757d5..c8a9c5b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,8 +1,12 @@
- AC_PREREQ([2.53])
-
-+m4_define([BDSM_MAJOR], [0])
-+m4_define([BDSM_MINOR], [3])
-+m4_define([BDSM_MICRO], [0])
-+
- AC_COPYRIGHT([Copyright 2014-2018 VideoLabs])
-
--AC_INIT([libdsm], [m4_esyscmd([./package_version.sh])], [], [libdsm], [])
-+AC_INIT([libdsm], [BDSM_MAJOR.BDSM_MINOR.BDSM_MICRO], [], [libdsm], [])
- AC_CONFIG_HEADER(config.h)
- AC_CONFIG_SRCDIR([include/bdsm.h])
- AC_CONFIG_LIBOBJ_DIR([compat])
-@@ -14,14 +18,11 @@ m4_ifdef([AM_SILENT_RULES], [
- AC_CANONICAL_HOST
-
- BDSM_ABI_VERSION=m4_esyscmd([./abi_version.sh])
--BDSM_PACKAGE_VERSION=m4_esyscmd([./package_version.sh])
- BDSM_LIBTOOL_VERSION=m4_esyscmd([./abi_version.sh -libtool])
-
- AC_SUBST(BDSM_ABI_VERSION)
--AC_SUBST(BDSM_PACKAGE_VERSION)
- AC_SUBST(BDSM_LIBTOOL_VERSION)
-
--AC_MSG_NOTICE([dsm package version: $BDSM_PACKAGE_VERSION])
- AC_MSG_NOTICE([dsm ABI version: $BDSM_ABI_VERSION])
-
- AC_PROG_CC_C99
-diff --git a/libdsm.pc.in b/libdsm.pc.in
-index cc9b22a..8626580 100644
---- a/libdsm.pc.in
-+++ b/libdsm.pc.in
-@@ -5,7 +5,7 @@ includedir=${prefix}/include
-
- Name: libdsm
- Description: Minimalist and read-only smb client library
--Version: @BDSM_PACKAGE_VERSION@
-+Version: @PACKAGE_VERSION@
- Cflags: -I${includedir} @PTHREAD_CFLAGS@
- Libs: -L${libdir} -ldsm
- Libs.private: @LIBICONV@ -ltasn1 @PTHREAD_LIBS@ @BDSM_LIB_LOG@ @SOCKET_LIBS@
-diff --git a/package_version.sh b/package_version.sh
-deleted file mode 100755
-index 865a899..0000000
---- a/package_version.sh
-+++ /dev/null
-@@ -1,40 +0,0 @@
--#!/bin/sh
--# Copyright (c) 2013 Luca Barbato
--#
--# Permission is hereby granted, free of charge, to any person obtaining a copy
--# of this software and associated documentation files (the "Software"),
--# to deal in the Software without restriction, including without limitation
--# the rights to use, copy, modify, merge, publish, distribute, sublicense,
--# and/or sell copies of the Software, and to permit persons to whom
--# the Software is furnished to do so, subject to the following conditions:
--#
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--#
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
--# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
--# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
--# IN THE SOFTWARE.
--
--if [ -d .git ]; then
-- # Retrieve the version from the last git tag.
-- VER=`git describe --always | sed -e "s:v::"`
-- if [ x"`git diff-index --name-only HEAD`" != x ]; then
-- # If the sources have been changed locally, add -dirty to the version.
-- VER="${VER}-dirty"
-- fi
--elif [ -f .version ]; then
-- # If git is not available (e.g. when building from source package)
-- # we can extract the package version from .version file.
-- VER=`< .version`
--else
-- # The package version cannot be retrieved.
-- VER="Unknown"
--fi
--
--printf '%s' "$VER"
--
--
---
-2.19.1
-
diff --git a/contrib/src/libdsm/fix-pipe-compat.patch b/contrib/src/libdsm/fix-pipe-compat.patch
deleted file mode 100644
index b966190dc2..0000000000
--- a/contrib/src/libdsm/fix-pipe-compat.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From e9849895aeb378a59e6cc545540c8b8eecba7fba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
-Date: Wed, 21 Nov 2018 13:27:12 +0100
-Subject: [PATCH] compat: Fix pipe compat function
-
-The compatibility function was never built since we were forcing
-HAVE_PIPE in compat.h
----
- Makefile.am | 2 +-
- compat/compat.c | 11 -----------
- compat/compat.h | 6 +++++-
- 3 files changed, 6 insertions(+), 13 deletions(-)
- delete mode 100644 compat/compat.c
-
-diff --git a/Makefile.am b/Makefile.am
-index 5c191cf..6dde7bc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -88,7 +88,7 @@ libdsm_la_SOURCES = \
- src/smb_utils.c
-
- noinst_LTLIBRARIES = libcompat.la
--libcompat_la_SOURCES = compat/compat.c
-+libcompat_la_SOURCES =
- libcompat_la_LIBADD = $(LTLIBOBJS)
-
- pkgconfigdir = $(libdir)/pkgconfig
-diff --git a/compat/compat.c b/compat/compat.c
-deleted file mode 100644
-index c3c6f9e..0000000
---- a/compat/compat.c
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#include "config.h"
--
--#if !defined(HAVE_PIPE) && defined(HAVE__PIPE)
--
--#include <fcntl.h>
--
--int pipe(int fds[2])
--{
-- return _pipe(fds, 32768, O_NOINHERIT | O_BINARY);
--}
--#endif
-diff --git a/compat/compat.h b/compat/compat.h
-index 50b102c..4eef355 100644
---- a/compat/compat.h
-+++ b/compat/compat.h
-@@ -66,8 +66,12 @@ char *strndup(const char *str, size_t n);
- #endif
-
- #if !defined(HAVE_PIPE) && defined(HAVE__PIPE)
-+#include <fcntl.h>
- #define HAVE_PIPE
--int pipe(int fds[2]);
-+static inline int pipe(int fds[2])
-+{
-+ return _pipe(fds, 32768, O_NOINHERIT | O_BINARY);
-+}
- #endif
-
- #ifndef _WIN32
---
-2.19.1
-
diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
index 7fe73b8d60..d2a413874d 100644
--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
@@ -1,7 +1,7 @@
# libdsm
#LIBDSM_GITURL := git://github.com/videolabs/libdsm.git
-LIBDSM_VERSION := 0.3.0
+LIBDSM_VERSION := 0.3.1
LIBDSM_URL := https://github.com/videolabs/libdsm/releases/download/v$(LIBDSM_VERSION)/libdsm-$(LIBDSM_VERSION).tar.gz
ifeq ($(call need_pkg,"libdsm >= 0.2.0"),)
@@ -20,10 +20,6 @@ endif
libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm
$(UNPACK)
- $(APPLY) $(SRC)/libdsm/0001-build-fix-nl_langinfo-detection-on-Android.patch
- $(APPLY) $(SRC)/libdsm/fix-pc-generation.patch
- $(APPLY) $(SRC)/libdsm/fix-pipe-compat.patch
- $(APPLY) $(SRC)/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
$(MOVE)
DEPS_libdsm = libtasn1 iconv
More information about the vlc-commits
mailing list