mirror of
https://github.com/videolan/vlc.git
synced 2025-01-05 23:38:09 +08:00
Contribs: update libbluray to 0.4.0
This commit is contained in:
parent
0ab58d82d4
commit
abdb22e6b9
@ -1 +1 @@
|
||||
96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02 libbluray-0.3.0.tar.bz2
|
||||
7f9a7c017c400b7d4290635860a8440110a91dcf21966fd0352ecc212b9ff579d6a5c7a8adc729904540120916c249b90f58adee023416c60c210434dff73df5 libbluray-0.4.0.tar.bz2
|
||||
|
@ -1,43 +0,0 @@
|
||||
From 78e2db66ee6b592feaf1d1b4af490f50d164aab7 Mon Sep 17 00:00:00 2001
|
||||
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
|
||||
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ò <flameeyes@flameeyes.eu>
|
||||
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
|
||||
---
|
||||
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
|
||||
|
@ -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}
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user