vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Mon Nov 19 15:30:45 2018 +0100| [20b3c287d9d32257ad4b3541dfa8ca1d2719d97d] | committer: Jean-Baptiste Kempf
contrib: bluray: expose bdjo_data struct (cherry picked from commit 4313ea04aa329b585b8a67b017a63ccdfd2cd9fb) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=20b3c287d9d32257ad4b3541dfa8ca1d2719d97d --- .../src/bluray/0001-install-bdjo_data-header.patch | 37 ++++++++++++++++++++++ contrib/src/bluray/rules.mak | 1 + 2 files changed, 38 insertions(+) diff --git a/contrib/src/bluray/0001-install-bdjo_data-header.patch b/contrib/src/bluray/0001-install-bdjo_data-header.patch new file mode 100644 index 0000000000..e773963fe5 --- /dev/null +++ b/contrib/src/bluray/0001-install-bdjo_data-header.patch @@ -0,0 +1,37 @@ +From 73681388dfd0f839e0b4447b3063842d606691d8 Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie <fcvlc...@free.fr> +Date: Mon, 19 Nov 2018 15:27:23 +0100 +Subject: [PATCH] install bdjo_data header + +--- + Makefile.am | 1 + + src/libbluray/bluray.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 94add5b..f9a76a0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -218,6 +218,7 @@ pkginclude_HEADERS = \ + src/libbluray/bluray-version.h \ + src/libbluray/keys.h \ + src/libbluray/player_settings.h \ ++ src/libbluray/bdj/bdjo_data.h \ + src/libbluray/bdnav/clpi_data.h \ + src/libbluray/bdnav/meta_data.h \ + src/libbluray/decoders/overlay.h \ +diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h +index 8eb8100..86be9e6 100644 +--- a/src/libbluray/bluray.h ++++ b/src/libbluray/bluray.h +@@ -1073,6 +1073,7 @@ void bd_free_mobj(struct mobj_objects *); + struct bdjo_data; + struct bdjo_data *bd_read_bdjo(const char *bdjo_file); + void bd_free_bdjo(struct bdjo_data *); ++#define BLURAY_HAS_BDJO_DATA_H + + /* BD-J testing */ + +-- +2.17.2 + diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index d147afb153..67937b2038 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -50,6 +50,7 @@ bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray $(UNPACK) $(APPLY) $(SRC)/bluray/0001-Implement-dl_get_path-for-darwin-macOS.patch $(APPLY) $(SRC)/bluray/0001-keep-on-with-menuless-user-selected-streams-between-.patch + $(APPLY) $(SRC)/bluray/0001-install-bdjo_data-header.patch $(call pkg_static,"src/libbluray.pc.in") $(MOVE) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
