vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Oct 24 20:19:49 2020 +0200| [2f5dcf95d86e236239eb6d34f69ed8110a55bdec] | committer: Jean-Baptiste Kempf
Contribs: update libbluray to 1.2.1 Fixes for a large number of discs, notably UHD. (cherry picked from commit 345b87fc4024b2aebec7d5d46e4369123ee4585e) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2f5dcf95d86e236239eb6d34f69ed8110a55bdec --- ...ure.ac-Add-lpthread-to-.pc-file-if-needed.patch | 26 ---------------------- contrib/src/bluray/SHA512SUMS | 2 +- contrib/src/bluray/rules.mak | 5 ++--- 3 files changed, 3 insertions(+), 30 deletions(-) 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 deleted file mode 100644 index bde454e632..0000000000 --- a/contrib/src/bluray/0001-configure.ac-Add-lpthread-to-.pc-file-if-needed.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/SHA512SUMS b/contrib/src/bluray/SHA512SUMS index efcf31cf85..11b1d43f87 100644 --- a/contrib/src/bluray/SHA512SUMS +++ b/contrib/src/bluray/SHA512SUMS @@ -1 +1 @@ -d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324 libbluray-1.2.0.tar.bz2 +e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4 libbluray-1.2.1.tar.bz2 diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index c37ee53320..b8c4aa0a76 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -1,12 +1,12 @@ # LIBBLURAY -BLURAY_VERSION := 1.2.0 +BLURAY_VERSION := 1.2.1 BLURAY_URL := $(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2 ifdef BUILD_DISCS PKGS += bluray endif -ifeq ($(call need_pkg,"libbluray >= 0.7.0"),) +ifeq ($(call need_pkg,"libbluray >= 1.0.0"),) PKGS_FOUND += bluray endif @@ -57,7 +57,6 @@ $(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
