[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: dvdnav: update to 7.0.0
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sat Dec 13 03:15:09 UTC 2025
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
d5cfd704 by Steve Lhomme at 2025-12-13T02:30:22+00:00
contrib: dvdnav: update to 7.0.0
We still need to remove -mno-ms-bitfields for the build to work properly with llvm-mingw.
- - - - -
300ead2c by Steve Lhomme at 2025-12-13T02:30:22+00:00
contrib: dvdread: update to 7.0.1
And use the official tarball package.
- - - - -
9 changed files:
- − contrib/src/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch
- contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch
- − contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch
- − contrib/src/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch
- − contrib/src/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch
- contrib/src/dvdnav/SHA512SUMS
- contrib/src/dvdnav/rules.mak
- contrib/src/dvdread/SHA512SUMS
- contrib/src/dvdread/rules.mak
Changes:
=====================================
contrib/src/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch deleted
=====================================
@@ -1,29 +0,0 @@
-From e10f8570219748f67c7809cbdb57e8b790415083 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Thu, 22 May 2025 13:57:31 +0200
-Subject: [PATCH 1/2] Check the the title parts read are available
-
-The nr_of_ptts of the VTS and VMGI may differ.
-We can't read past the number count of items in title[].
----
- src/searching.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/searching.c b/src/searching.c
-index 7c8e6e6..ba27306 100644
---- a/src/searching.c
-+++ b/src/searching.c
-@@ -668,6 +668,10 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t
- if(ptitle->vts_ttn == 0)
- goto fail;
- ptt = ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].ptt;
-+ if (parts > ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].nr_of_ptts) {
-+ printerr("Too many parts, using the ones available.");
-+ parts = ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].nr_of_ptts;
-+ }
-
- tmp = calloc(1, sizeof(uint64_t)*parts);
- if(!tmp)
---
-2.45.1.windows.1
-
=====================================
contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch
=====================================
@@ -1,4 +1,4 @@
-From ac7973075f808ffbf3bfeb601de940796485d6d1 Mon Sep 17 00:00:00 2001
+From 3a35f7e480addf58ca6ac479ee602baec97a21e6 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4 at ycbcr.xyz>
Date: Thu, 18 Aug 2022 11:14:57 +0200
Subject: [PATCH] configure: don't use ms style packing
@@ -6,25 +6,21 @@ Subject: [PATCH] configure: don't use ms style packing
It is not used in libdvdread and we should use the same structure packing as
libdvdread.
---
- configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index 595378b..eb4cfa5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -99,11 +99,6 @@ AC_SUBST(THREAD_CFLAGS)
-
- PKG_CHECK_MODULES([DVDREAD], [dvdread >= ${DVDREAD_MIN_VERSION}])
-
--dnl ---------------------------------------------
--dnl Check for bitfield compiler flag
--dnl ---------------------------------------------
--CC_CHECK_CFLAG_APPEND([-mno-ms-bitfields])
--
- dnl check for -Wall -Wextra support
- CC_CHECK_CFLAG_APPEND([-Wall -Wsign-compare -Wextra])
-
+diff --git a/meson.build b/meson.build
+index ca2f9de..9ed45bc 100644
+--- a/meson.build
++++ b/meson.build
+@@ -96,7 +96,6 @@ endif
+ # it is not an error and silently tolerated
+ if cc.get_argument_syntax() != 'msvc'
+ optional_arguments += [
+- '-mno-ms-bitfields',
+ '-Wsign-compare',
+ ]
+ endif
--
-2.27.0.windows.1
+2.52.0.windows.1
=====================================
contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch deleted
=====================================
@@ -1,30 +0,0 @@
-From ff8676289c227d03293f63152d327b2a16775eea Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 24 Jan 2025 13:34:52 +0100
-Subject: [PATCH 1/2] play: avoid assert and exit and bogus PG link
-
-Just return LinkNoLink.
----
- src/vm/play.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/vm/play.c b/src/vm/play.c
-index 8830883..e5d0e72 100644
---- a/src/vm/play.c
-+++ b/src/vm/play.c
-@@ -177,7 +177,11 @@ link_t play_PG(vm_t *vm) {
- Log3(vm, "play_PG: (vm->state).pgN (%i) > pgc->nr_of_programs (%i)",
- (vm->state).pgN, (vm->state).pgc->nr_of_programs );
- #endif
-- assert((vm->state).pgN == (vm->state).pgc->nr_of_programs + 1);
-+ if((vm->state).pgN > (vm->state).pgc->nr_of_programs + 1) {
-+ /* bogus link, ignore it */
-+ link_t link_values = { LinkNoLink, 0, 0, 0 };
-+ return link_values;
-+ }
- return play_PGC_post(vm);
- }
-
---
-2.45.0.windows.1
-
=====================================
contrib/src/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch deleted
=====================================
@@ -1,27 +0,0 @@
-From 48ba3c481225dbe3b3a03ed621bed8df25bed941 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Thu, 22 May 2025 14:09:53 +0200
-Subject: [PATCH 2/2] Fix access to title not found in array
-
----
- src/searching.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/searching.c b/src/searching.c
-index ba27306..968deef 100644
---- a/src/searching.c
-+++ b/src/searching.c
-@@ -667,6 +667,10 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t
- parts = ptitle->nr_of_ptts;
- if(ptitle->vts_ttn == 0)
- goto fail;
-+ if (ptitle->vts_ttn > ifo->vts_ptt_srpt->nr_of_srpts) {
-+ printerr("Requested title not found.");
-+ goto fail;
-+ }
- ptt = ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].ptt;
- if (parts >= ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].nr_of_ptts) {
- printerr("Too many parts, using the ones available.");
---
-2.45.1.windows.1
-
=====================================
contrib/src/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch deleted
=====================================
@@ -1,30 +0,0 @@
-From 43d76f9a0136fb244662e59876d87c7256df27c4 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 24 Jan 2025 13:39:11 +0100
-Subject: [PATCH 2/2] play: avoid assert and exit and bogus Cell link
-
-Just return LinkNoLink.
----
- src/vm/play.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/vm/play.c b/src/vm/play.c
-index e5d0e72..a9d99fa 100644
---- a/src/vm/play.c
-+++ b/src/vm/play.c
-@@ -203,7 +203,11 @@ link_t play_Cell(vm_t *vm) {
- Log3(vm, "(vm->state).cellN (%i) > pgc->nr_of_cells (%i)",
- (vm->state).cellN, (vm->state).pgc->nr_of_cells );
- #endif
-- assert((vm->state).cellN == (vm->state).pgc->nr_of_cells + 1);
-+ if((vm->state).cellN > (vm->state).pgc->nr_of_cells + 1) {
-+ /* bogus link, ignore it */
-+ link_t link_values = { LinkNoLink, 0, 0, 0 };
-+ return link_values;
-+ }
- return play_PGC_post(vm);
- }
-
---
-2.45.0.windows.1
-
=====================================
contrib/src/dvdnav/SHA512SUMS
=====================================
@@ -1 +1 @@
-889bc987113189bfdfc1ebf603b256e5b228be37196455dcfdc7f66debe18e7298b82b807e86ff18a8925e491395ed4007c87cf18ba1ff1ccc213d86f5342a10 libdvdnav-6.1.1.tar.bz2
+4df6336050f3b79ca2edafac28dd0383b950272ba6d8ebe6e43a85eddc737ce740d72a3fc1fa03c26fc5f285125e3672a022555a5399259386b2036c467a47f3 libdvdnav-7.0.0.tar.xz
=====================================
contrib/src/dvdnav/rules.mak
=====================================
@@ -1,7 +1,7 @@
# DVDNAV
-LIBDVDNAV_VERSION := 6.1.1
-LIBDVDNAV_URL := $(VIDEOLAN)/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
+LIBDVDNAV_VERSION := 7.0.0
+LIBDVDNAV_URL := $(VIDEOLAN)/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.xz
ifdef BUILD_DISCS
ifdef GPL
@@ -14,30 +14,21 @@ ifeq ($(call need_pkg,"dvdnav >= 5.0.3"),)
PKGS_FOUND += dvdnav
endif
-$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.xz:
$(call download,$(LIBDVDNAV_URL))
-.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
+.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz
-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
+dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav
$(UNPACK)
$(APPLY) $(SRC)/dvdnav/0001-configure-don-t-use-ms-style-packing.patch
- # turn asserts/exit into silent discard
- $(APPLY) $(SRC)/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch
- $(APPLY) $(SRC)/dvdnav/0002-play-avoid-assert-and-exit-and-bogus-Cell-link.patch
- # fix some bogus accesses
- $(APPLY) $(SRC)/dvdnav/0001-Check-the-the-title-parts-read-are-available.patch
- $(APPLY) $(SRC)/dvdnav/0002-Fix-access-to-title-not-found-in-array.patch
- $(call pkg_static,"misc/dvdnav.pc.in")
$(MOVE)
DEPS_dvdnav = dvdread $(DEPS_dvdread)
-.dvdnav: dvdnav
+.dvdnav: dvdnav crossfile.meson
$(REQUIRE_GPL)
- $(RECONF)
- $(MAKEBUILDDIR)
- $(MAKECONFIGURE)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ $(MESONCLEAN)
+ $(MESON)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/dvdread/SHA512SUMS
=====================================
@@ -1 +1 @@
-d1420e60b01a408ebd3cc94752929cf962ad1c6dd771317021633a755df7de01fa7597a88dec9946a81488822edd7d856e56bfd36556bf226e750fc20cad34b0 libdvdread-7.0.0.tar.bz2
+03e7376327ba211fcc51ee4e4705b1cc7649c613a96e186eb62821b57a11a519c46720e33cf3351cd95fa02db200e40d3b1b9f7e4fe5a3003853fc40c5f511f0 libdvdread-7.0.1.tar.xz
=====================================
contrib/src/dvdread/rules.mak
=====================================
@@ -1,6 +1,6 @@
# DVDREAD
-LIBDVDREAD_VERSION := 7.0.0
-LIBDVDREAD_URL := https://code.videolan.org/videolan/libdvdread/-/archive/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+LIBDVDREAD_VERSION := 7.0.1
+LIBDVDREAD_URL := $(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.xz
LIBDVDREAD_GITURL:=https://code.videolan.org/videolan/libdvdread.git
LIBDVDREAD_BRANCH:=master
LIBDVDREAD_GITVERSION:=fd8a73304597dc3a4fc187d0dd0cfb50af8f0a2d
@@ -23,12 +23,12 @@ endif
# $(call check_githash,$(LIBDVDREAD_GITVERSION))
# touch $@
-$(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
+$(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.xz:
$(call download,$(LIBDVDREAD_URL))
-.sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+.sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.xz
-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
+dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.xz .sum-dvdread
# dvdread: libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz .sum-dvdread
$(UNPACK)
$(MOVE)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5512290f5e7848700a97e18233ffe5ab0ff5aacf...300ead2cb7035678ac23a6d63b415ce4877707f3
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5512290f5e7848700a97e18233ffe5ab0ff5aacf...300ead2cb7035678ac23a6d63b415ce4877707f3
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