From abdb22e6b9f8f5815f9bccff6b6f1da7e7fca4a3 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 20 Sep 2013 18:33:53 +0200 Subject: [PATCH] Contribs: update libbluray to 0.4.0 --- contrib/src/bluray/SHA512SUMS | 2 +- contrib/src/bluray/libbluray-win32.patch | 43 -------------------------------- contrib/src/bluray/pkg-static.patch | 9 ------- contrib/src/bluray/rules.mak | 4 +-- 4 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 contrib/src/bluray/libbluray-win32.patch delete mode 100644 contrib/src/bluray/pkg-static.patch diff --git a/contrib/src/bluray/SHA512SUMS b/contrib/src/bluray/SHA512SUMS index 2dc60de539..26e98ef5a9 100644 --- a/contrib/src/bluray/SHA512SUMS +++ b/contrib/src/bluray/SHA512SUMS @@ -1 +1 @@ -96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02 libbluray-0.3.0.tar.bz2 +7f9a7c017c400b7d4290635860a8440110a91dcf21966fd0352ecc212b9ff579d6a5c7a8adc729904540120916c249b90f58adee023416c60c210434dff73df5 libbluray-0.4.0.tar.bz2 diff --git a/contrib/src/bluray/libbluray-win32.patch b/contrib/src/bluray/libbluray-win32.patch deleted file mode 100644 index 5bbd88051f..0000000000 --- a/contrib/src/bluray/libbluray-win32.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 78e2db66ee6b592feaf1d1b4af490f50d164aab7 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= -Date: Wed, 8 May 2013 09:40:37 -0700 -Subject: [PATCH] build: make sure to add -ldl to Libs.private if needed. -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Diego Elio Pettenò -Signed-off-by: Jean-Baptiste Kempf ---- - configure.ac | 4 ++++ - src/libbluray.pc.in | 1 + - 2 files changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 61ff283..c6439bd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -126,6 +126,10 @@ AS_IF([test "${SYS}" != "mingw32"], [ - AC_SEARCH_LIBS([pthread_create], [pthread], , - [AC_MSG_ERROR([pthread required])]) - AC_SEARCH_LIBS([dlopen], [dl]) -+ DLOPEN_LIBS="$ac_cv_search_dlopen" -+ AS_CASE([$DLOPEN_LIBS], -+ [no|none\ required], [DLOPEN_LIBS=""]) -+ AC_SUBST([DLOPEN_LIBS]) - ]) - - dnl libxml2 for metadata parser -diff --git a/src/libbluray.pc.in b/src/libbluray.pc.in -index 4e3fe15..ce256e2 100644 ---- a/src/libbluray.pc.in -+++ b/src/libbluray.pc.in -@@ -7,4 +7,5 @@ Name: libbluray - Description: library supporting Blu-ray playback - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lbluray -+Libs.private: @DLOPEN_LIBS@ - Cflags: -I${includedir} --- -1.7.10.4 - diff --git a/contrib/src/bluray/pkg-static.patch b/contrib/src/bluray/pkg-static.patch deleted file mode 100644 index c95cf14a81..0000000000 --- a/contrib/src/bluray/pkg-static.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- libbluray-0.3.0/src/libbluray.pc.in.orig 2013-05-26 12:05:07.233864756 +0200 -+++ libbluray-0.3.0/src/libbluray.pc.in 2013-05-26 12:07:43.552878009 +0200 -@@ -7,5 +7,5 @@ - Description: library supporting Blu-ray playback - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lbluray --Libs.private: @DLOPEN_LIBS@ -+Libs.private: @DLOPEN_LIBS@ @LIBXML2_LIBS@ - Cflags: -I${includedir} diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index 645745b610..d5bd7b8d89 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -9,7 +9,7 @@ endif DEPS_bluray = libxml2 $(DEPS_libxml2) -BLURAY_VERSION := 0.3.0 +BLURAY_VERSION := 0.4.0 BLURAY_URL := http://ftp.videolan.org/pub/videolan/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2 $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2: @@ -19,8 +19,6 @@ $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2: bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray $(UNPACK) - $(APPLY) $(SRC)/bluray/libbluray-win32.patch - $(APPLY) $(SRC)/bluray/pkg-static.patch $(MOVE) .bluray: bluray -- 2.11.4.GIT