[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: bluray: update to 1.3.4
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sat Jun 8 14:50:25 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
f44944a5 by Steve Lhomme at 2024-06-08T14:02:52+00:00
contrib: bluray: update to 1.3.4
- - - - -
63ffd9e4 by Steve Lhomme at 2024-06-08T14:02:52+00:00
configure: require libbluray 1.1.0
It's 5 years old and contain patches for https://code.videolan.org/videolan/libbluray/-/issues/1
- - - - -
8abb7cea by Steve Lhomme at 2024-06-08T14:02:52+00:00
access: bluray: remove hack for blacklisting
It was handled in 1.1.0 https://code.videolan.org/videolan/libbluray/-/issues/1
- - - - -
804acaed by Steve Lhomme at 2024-06-08T14:02:52+00:00
contrib: bluray: remove internal header installation
We don't use the hack anymore.
- - - - -
5 changed files:
- configure.ac
- − contrib/src/bluray/0001-install-bdjo_data-header.patch
- contrib/src/bluray/SHA512SUMS
- contrib/src/bluray/rules.mak
- modules/access/bluray.c
Changes:
=====================================
configure.ac
=====================================
@@ -2125,7 +2125,7 @@ PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav >= 6.0.0], [DVD with navigation inp
dnl
dnl Blu-ray Disc Support with libbluray
dnl
-PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.6.2], (libbluray for Blu-ray disc support ) )
+PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 1.1.0], (libbluray for Blu-ray disc support ) )
dnl
dnl OpenCV wrapper and example filters
=====================================
contrib/src/bluray/0001-install-bdjo_data-header.patch deleted
=====================================
@@ -1,37 +0,0 @@
-From 73681388dfd0f839e0b4447b3063842d606691d8 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcvlcdev at 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
-
=====================================
contrib/src/bluray/SHA512SUMS
=====================================
@@ -1 +1 @@
-6f2d3a984809db33a99d2fe3618370a3fda3ef1c417b725d3c2e1f24ff21495f95a6a5f78b30b2b26bab47865f68dd08c08e8a554809d3a5225956da712dc064 libbluray-1.3.2.tar.bz2
+94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1 libbluray-1.3.4.tar.bz2
=====================================
contrib/src/bluray/rules.mak
=====================================
@@ -1,6 +1,6 @@
# LIBBLURAY
-BLURAY_VERSION := 1.3.2
+BLURAY_VERSION := 1.3.4
BLURAY_URL := $(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
ifdef BUILD_DISCS
@@ -48,7 +48,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
$(call pkg_static,"src/libbluray.pc.in")
$(MOVE)
=====================================
modules/access/bluray.c
=====================================
@@ -131,80 +131,6 @@ static const char * bluray_event_debug_strings[] =
# define blurayDebugEvent(e, v)
#endif
-#ifdef BLURAY_HAS_BDJO_DATA_H
-/* System version check menu freeze. See
- * https://code.videolan.org/videolan/libbluray/issues/1
- * To be removed with fix[ed,able] libbluray */
-# include <libbluray/bdjo_data.h>
-# include <strings.h>
-static int BDJO_FileSelect( const char *psz_filename )
-{
- int i_len = strlen( psz_filename );
- if ( i_len <= 5 )
- return 0;
- else
- return ! strcasecmp( &psz_filename[i_len - 5], ".bdjo" );
-}
-
-static bool BDJO_IsBlacklisted(demux_t *p_demux, const char *psz_bd_path)
-{
- const char * rgsz_class_blacklist[] =
- {
- "com.macrovision.bdplus.Handshake",
- };
-
- bool b_ret = false;
- char *psz_bdjo_dir;
- if(-1 == asprintf(&psz_bdjo_dir, "%s/BDMV/BDJO", psz_bd_path))
- return false;
-
- char **ppsz_filenames = NULL;
- int i_files = vlc_scandir(psz_bdjo_dir, &ppsz_filenames, BDJO_FileSelect, NULL);
- if(i_files < 1)
- {
- free(psz_bdjo_dir);
- return false;
- }
-
- for( int i=0; i<i_files && !b_ret; i++ )
- {
- char *psz_bdjo_file;
- if(-1 < asprintf(&psz_bdjo_file, "%s/%s", psz_bdjo_dir, ppsz_filenames[i]))
- {
- struct bdjo_data *bdjo = bd_read_bdjo(psz_bdjo_file);
- if(bdjo)
- {
- size_t k=0;
- for(uint8_t j=0; j<bdjo->app_table.num_app && !b_ret; j++)
- for(; k<ARRAY_SIZE(rgsz_class_blacklist) && !b_ret; k++)
- b_ret = (!strcmp(rgsz_class_blacklist[k],
- bdjo->app_table.app[j].initial_class));
-#ifdef DEBUG_BLURAY
- if(b_ret)
- msg_Warn(p_demux, "Found blacklisted class %s in %s",
- rgsz_class_blacklist[k],
- ppsz_filenames[i]);
-#else
- VLC_UNUSED(p_demux);
-#endif
- bd_free_bdjo(bdjo);
- }
- free(psz_bdjo_file);
- }
- }
-
- free(psz_bdjo_dir);
-
- for( int i=0; i<i_files; i++ )
- free(ppsz_filenames[i]);
- free(ppsz_filenames);
-
- return b_ret;
-}
-#else
-# define BDJO_IsBlacklisted(foo, bar) (0)
-#endif
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
@@ -999,19 +925,6 @@ static int blurayOpen(vlc_object_t *object)
p_sys->b_menu = false;
}
- if(disc_info->bdj_detected &&p_sys->b_menu &&
- BDJO_IsBlacklisted(p_demux, p_sys->psz_bd_path))
- {
- p_sys->b_menu = vlc_dialog_wait_question( p_demux,
- VLC_DIALOG_QUESTION_NORMAL,
- _("Play without Menus"),
- _("Try anyway"),
- NULL,
- _("BDJO Menu check"),
- "%s",
- _("Incompatible Java Menu detected"));
- }
-
/* Get titles and chapters */
blurayInitTitles(p_demux, disc_info->num_hdmv_titles + disc_info->num_bdj_titles + 1/*Top Menu*/ + 1/*First Play*/);
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7c2121922da7d6d112588e43cffd836511a03561...804acaed6762e0213ab263fb6e203a185c7a4cb1
--
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7c2121922da7d6d112588e43cffd836511a03561...804acaed6762e0213ab263fb6e203a185c7a4cb1
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list