vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Mar 26 12:35:46 2020 +0100| [9669cffad6d5f0d4f4337b91d13f8991ab0771aa] | committer: Hugo Beauzée-Luyssen
contrib: Backport a libbluray patch to fix snap build > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=9669cffad6d5f0d4f4337b91d13f8991ab0771aa --- ...ure.ac-Add-lpthread-to-.pc-file-if-needed.patch | 26 ++++++++++++++++++++++ contrib/src/bluray/rules.mak | 1 + 2 files changed, 27 insertions(+) diff --git a/contrib/src/bluray/0001-configure.ac-Add-lpthread-to-.pc-file-if-needed.patch b/contrib/src/bluray/0001-configure.ac-Add-lpthread-to-.pc-file-if-needed.patch new file mode 100644 index 0000000000..bde454e632 --- /dev/null +++ b/contrib/src/bluray/0001-configure.ac-Add-lpthread-to-.pc-file-if-needed.patch @@ -0,0 +1,26 @@ +From 4efd8acf4b0a476eef47f8b99ed8c1b5c6d246a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <[email protected]> +Date: Wed, 25 Mar 2020 15:48:11 +0100 +Subject: [PATCH] configure.ac: Add -lpthread to .pc file if needed + +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 92e2d705..2c8a212b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -146,6 +146,9 @@ AS_IF([test "${SYS}" != "mingw32"], [ + [AC_MSG_ERROR([pthread required])]) + AC_SEARCH_LIBS([pthread_create], [pthread], , + [AC_MSG_ERROR([pthread required])]) ++ PTHREAD_LIBS="$ac_cv_search_pthread_create" ++ AS_IF([test x"$PTHREAD_LIBS" != x"none required"], ++ [EXTRA_LIBS="$EXTRA_LIBS $PTHREAD_LIBS"]) + AC_SEARCH_LIBS([dlopen], [dl]) + DLOPEN_LIBS="$ac_cv_search_dlopen" + AS_CASE([$DLOPEN_LIBS], +-- +2.20.1 + diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index 0d02c05082..1150ea2caa 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -49,6 +49,7 @@ $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2: bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray $(UNPACK) $(APPLY) $(SRC)/bluray/0001-install-bdjo_data-header.patch + $(APPLY) $(SRC)/bluray/0001-configure.ac-Add-lpthread-to-.pc-file-if-needed.patch $(call pkg_static,"src/libbluray.pc.in") $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
