[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: dvdread: update to 7.0.0
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Nov 3 10:43:12 UTC 2025
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
defa5d39 by Steve Lhomme at 2025-11-03T10:08:56+00:00
contrib: dvdread: update to 7.0.0
Use the tag tarball as it is not published in https://downloads.videolan.org/pub/videolan/libdvdread/
They should be the same (minus date differences) since there's no autotool anymore.
- - - - -
b755ab6b by Steve Lhomme at 2025-11-03T10:08:56+00:00
contrib: dvdcss: update to 1.5.0
Use the tag tarball as it is not published in https://downloads.videolan.org/pub/videolan/libdvdcss/
They should be the same (minus date differences) since there's no autotool anymore.
- - - - -
3d619de3 by Steve Lhomme at 2025-11-03T10:08:56+00:00
contrib: jack: do call update_autoconfig
We are not calling RECONF as claimed in d69a76f3564fe5e96a2f2504ea73b1d6e8eba4fe.
- - - - -
6 changed files:
- contrib/src/dvdcss/SHA512SUMS
- contrib/src/dvdcss/rules.mak
- − contrib/src/dvdread/0001-ifo_types-avoid-forcing-a-higher-length-in-bitfield-.patch
- contrib/src/dvdread/SHA512SUMS
- contrib/src/dvdread/rules.mak
- contrib/src/jack/rules.mak
Changes:
=====================================
contrib/src/dvdcss/SHA512SUMS
=====================================
@@ -1 +1 @@
-0f9c0244feff5ca62459823810a39ede745b63fedb682707fcbaf0dff11fff42998cef31a281bb6380930123d079780d37a79871f6e628cdca9cfa06c64befb6 libdvdcss-1.4.3.tar.bz2
+439fbd9dae60b9a114d3429a19703478c734e8525ac6852da6f05f72d9ca44ca0ac5e874ab6a10017e7f31869fcd29f01d1bc156c4f0331b4e4abd98ec2f95cd libdvdcss-1.5.0.tar.bz2
=====================================
contrib/src/dvdcss/rules.mak
=====================================
@@ -1,6 +1,6 @@
# DVDCSS
DVDCSS_VERSION := 1.5.0
-DVDCSS_URL := $(VIDEOLAN)/libdvdcss/$(DVDCSS_VERSION)/libdvdcss-$(DVDCSS_VERSION).tar.bz2
+DVDCSS_URL := https://code.videolan.org/videolan/libdvdcss/-/archive/$(DVDCSS_VERSION)/libdvdcss-$(DVDCSS_VERSION).tar.bz2
LIBDVDCSS_GITURL:=https://code.videolan.org/videolan/libdvdcss.git
LIBDVDCSS_BRANCH:=master
LIBDVDCSS_GITVERSION:=236350672911500999b1577f98c4740224999777
@@ -9,32 +9,27 @@ ifeq ($(call need_pkg,"libdvdcss"),)
PKGS_FOUND += dvdcss
endif
-$(TARBALLS)/libdvdcss-$(LIBDVDCSS_GITVERSION).tar.xz:
- $(call download_git,$(LIBDVDCSS_GITURL),$(LIBDVDCSS_BRANCH),$(LIBDVDCSS_GITVERSION))
+# $(TARBALLS)/libdvdcss-$(LIBDVDCSS_GITVERSION).tar.xz:
+# $(call download_git,$(LIBDVDCSS_GITURL),$(LIBDVDCSS_BRANCH),$(LIBDVDCSS_GITVERSION))
-.sum-dvdcss: libdvdcss-$(LIBDVDCSS_GITVERSION).tar.xz
- $(call check_githash,$(LIBDVDCSS_GITVERSION))
- touch $@
+# .sum-dvdcss: libdvdcss-$(LIBDVDCSS_GITVERSION).tar.xz
+# $(call check_githash,$(LIBDVDCSS_GITVERSION))
+# touch $@
-# $(TARBALLS)/libdvdcss-$(DVDCSS_VERSION).tar.bz2:
-# $(call download,$(DVDCSS_URL))
+$(TARBALLS)/libdvdcss-$(DVDCSS_VERSION).tar.bz2:
+ $(call download,$(DVDCSS_URL))
-# .sum-dvdcss: libdvdcss-$(DVDCSS_VERSION).tar.bz2
+.sum-dvdcss: libdvdcss-$(DVDCSS_VERSION).tar.bz2
-# dvdcss: libdvdcss-$(DVDCSS_VERSION).tar.bz2 .sum-dvdcss
-dvdcss: libdvdcss-$(LIBDVDCSS_GITVERSION).tar.xz .sum-dvdcss
+dvdcss: libdvdcss-$(DVDCSS_VERSION).tar.bz2 .sum-dvdcss
+# dvdcss: libdvdcss-$(LIBDVDCSS_GITVERSION).tar.xz .sum-dvdcss
$(UNPACK)
- $(call update_autoconfig,.)
$(MOVE)
-DVDCSS_CONF := --disable-doc --disable-maintainer-mode
-
-.dvdcss: dvdcss
+.dvdcss: dvdcss crossfile.meson
$(REQUIRE_GPL)
- $(RECONF)
- $(MAKEBUILDDIR)
- $(MAKECONFIGURE) $(DVDCSS_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ $(MESONCLEAN)
+ $(MESON)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/dvdread/0001-ifo_types-avoid-forcing-a-higher-length-in-bitfield-.patch deleted
=====================================
@@ -1,206 +0,0 @@
-From c5c04a5b323e6390a8de91ca8dfd0e3aeacf1528 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Thu, 18 Aug 2022 14:44:33 +0200
-Subject: [PATCH] ifo_types: avoid forcing a higher length in bitfield
- structures
-
-LLVM ends up using the size of an unsigned int if it's used in the bitfield.
-In other places the bitfields are using unsigned char which always uses the
-proper size in the packed structures.
-
-* multichannel_ext_t would end up having a size of 27 instead of 24
-* cell_playback_t would end up having a size of 26 instead of 24
-* pgci_srp_t would end up having a size of 11 instead of 8
-* playback_type_t would end up having a size of 4 instead of 1
----
- src/dvdread/ifo_types.h | 146 ++++++++++++++++++++--------------------
- 1 file changed, 73 insertions(+), 73 deletions(-)
-
-diff --git a/src/dvdread/ifo_types.h b/src/dvdread/ifo_types.h
-index fca1b8b..9293ce7 100644
---- a/src/dvdread/ifo_types.h
-+++ b/src/dvdread/ifo_types.h
-@@ -132,29 +132,29 @@ typedef struct {
- * MultiChannel Extension
- */
- typedef struct {
-- unsigned int zero1 : 7;
-- unsigned int ach0_gme : 1;
--
-- unsigned int zero2 : 7;
-- unsigned int ach1_gme : 1;
--
-- unsigned int zero3 : 4;
-- unsigned int ach2_gv1e : 1;
-- unsigned int ach2_gv2e : 1;
-- unsigned int ach2_gm1e : 1;
-- unsigned int ach2_gm2e : 1;
--
-- unsigned int zero4 : 4;
-- unsigned int ach3_gv1e : 1;
-- unsigned int ach3_gv2e : 1;
-- unsigned int ach3_gmAe : 1;
-- unsigned int ach3_se2e : 1;
--
-- unsigned int zero5 : 4;
-- unsigned int ach4_gv1e : 1;
-- unsigned int ach4_gv2e : 1;
-- unsigned int ach4_gmBe : 1;
-- unsigned int ach4_seBe : 1;
-+ unsigned char zero1 : 7;
-+ unsigned char ach0_gme : 1;
-+
-+ unsigned char zero2 : 7;
-+ unsigned char ach1_gme : 1;
-+
-+ unsigned char zero3 : 4;
-+ unsigned char ach2_gv1e : 1;
-+ unsigned char ach2_gv2e : 1;
-+ unsigned char ach2_gm1e : 1;
-+ unsigned char ach2_gm2e : 1;
-+
-+ unsigned char zero4 : 4;
-+ unsigned char ach3_gv1e : 1;
-+ unsigned char ach3_gv2e : 1;
-+ unsigned char ach3_gmAe : 1;
-+ unsigned char ach3_se2e : 1;
-+
-+ unsigned char zero5 : 4;
-+ unsigned char ach4_gv1e : 1;
-+ unsigned char ach4_gv2e : 1;
-+ unsigned char ach4_gmBe : 1;
-+ unsigned char ach4_seBe : 1;
- uint8_t zero6[19];
- } ATTRIBUTE_PACKED multichannel_ext_t;
-
-@@ -207,16 +207,16 @@ typedef uint8_t pgc_program_map_t;
- * Cell Playback Information.
- */
- typedef struct {
-- unsigned int block_mode : 2;
-- unsigned int block_type : 2;
-- unsigned int seamless_play : 1;
-- unsigned int interleaved : 1;
-- unsigned int stc_discontinuity: 1;
-- unsigned int seamless_angle : 1;
-- unsigned int zero_1 : 1;
-- unsigned int playback_mode : 1; /**< When set, enter StillMode after each VOBU */
-- unsigned int restricted : 1; /**< ?? drop out of fastforward? */
-- unsigned int cell_type : 5; /** for karaoke, reserved otherwise */
-+ unsigned char block_mode : 2;
-+ unsigned char block_type : 2;
-+ unsigned char seamless_play : 1;
-+ unsigned char interleaved : 1;
-+ unsigned char stc_discontinuity: 1;
-+ unsigned char seamless_angle : 1;
-+ unsigned char zero_1 : 1;
-+ unsigned char playback_mode : 1; /**< When set, enter StillMode after each VOBU */
-+ unsigned char restricted : 1; /**< ?? drop out of fastforward? */
-+ unsigned char cell_type : 5; /** for karaoke, reserved otherwise */
- uint8_t still_time;
- uint8_t cell_cmd_nr;
- dvd_time_t playback_time;
-@@ -247,35 +247,35 @@ typedef struct {
- * User Operations.
- */
- typedef struct {
-- unsigned int zero : 7; /* 25-31 */
-- unsigned int video_pres_mode_change : 1; /* 24 */
--
-- unsigned int karaoke_audio_pres_mode_change : 1; /* 23 */
-- unsigned int angle_change : 1;
-- unsigned int subpic_stream_change : 1;
-- unsigned int audio_stream_change : 1;
-- unsigned int pause_on : 1;
-- unsigned int still_off : 1;
-- unsigned int button_select_or_activate : 1;
-- unsigned int resume : 1; /* 16 */
--
-- unsigned int chapter_menu_call : 1; /* 15 */
-- unsigned int angle_menu_call : 1;
-- unsigned int audio_menu_call : 1;
-- unsigned int subpic_menu_call : 1;
-- unsigned int root_menu_call : 1;
-- unsigned int title_menu_call : 1;
-- unsigned int backward_scan : 1;
-- unsigned int forward_scan : 1; /* 8 */
--
-- unsigned int next_pg_search : 1; /* 7 */
-- unsigned int prev_or_top_pg_search : 1;
-- unsigned int time_or_chapter_search : 1;
-- unsigned int go_up : 1;
-- unsigned int stop : 1;
-- unsigned int title_play : 1;
-- unsigned int chapter_search_or_play : 1;
-- unsigned int title_or_time_play : 1; /* 0 */
-+ unsigned char zero : 7; /* 25-31 */
-+ unsigned char video_pres_mode_change : 1; /* 24 */
-+
-+ unsigned char karaoke_audio_pres_mode_change : 1; /* 23 */
-+ unsigned char angle_change : 1;
-+ unsigned char subpic_stream_change : 1;
-+ unsigned char audio_stream_change : 1;
-+ unsigned char pause_on : 1;
-+ unsigned char still_off : 1;
-+ unsigned char button_select_or_activate : 1;
-+ unsigned char resume : 1; /* 16 */
-+
-+ unsigned char chapter_menu_call : 1; /* 15 */
-+ unsigned char angle_menu_call : 1;
-+ unsigned char audio_menu_call : 1;
-+ unsigned char subpic_menu_call : 1;
-+ unsigned char root_menu_call : 1;
-+ unsigned char title_menu_call : 1;
-+ unsigned char backward_scan : 1;
-+ unsigned char forward_scan : 1; /* 8 */
-+
-+ unsigned char next_pg_search : 1; /* 7 */
-+ unsigned char prev_or_top_pg_search : 1;
-+ unsigned char time_or_chapter_search : 1;
-+ unsigned char go_up : 1;
-+ unsigned char stop : 1;
-+ unsigned char title_play : 1;
-+ unsigned char chapter_search_or_play : 1;
-+ unsigned char title_or_time_play : 1; /* 0 */
- } ATTRIBUTE_PACKED user_ops_t;
-
- /**
-@@ -312,9 +312,9 @@ typedef struct {
- */
- typedef struct {
- uint8_t entry_id;
-- unsigned int block_mode : 2;
-- unsigned int block_type : 2;
-- unsigned int zero_1 : 4;
-+ unsigned char block_mode : 2;
-+ unsigned char block_type : 2;
-+ unsigned char zero_1 : 4;
- uint16_t ptl_id_mask;
- uint32_t pgc_start_byte;
- pgc_t *pgc;
-@@ -440,14 +440,14 @@ typedef struct {
- } ATTRIBUTE_PACKED vmgi_mat_t;
-
- typedef struct {
-- unsigned int zero_1 : 1;
-- unsigned int multi_or_random_pgc_title : 1; /* 0: one sequential pgc title */
-- unsigned int jlc_exists_in_cell_cmd : 1;
-- unsigned int jlc_exists_in_prepost_cmd : 1;
-- unsigned int jlc_exists_in_button_cmd : 1;
-- unsigned int jlc_exists_in_tt_dom : 1;
-- unsigned int chapter_search_or_play : 1; /* UOP 1 */
-- unsigned int title_or_time_play : 1; /* UOP 0 */
-+ unsigned char zero_1 : 1;
-+ unsigned char multi_or_random_pgc_title : 1; /* 0: one sequential pgc title */
-+ unsigned char jlc_exists_in_cell_cmd : 1;
-+ unsigned char jlc_exists_in_prepost_cmd : 1;
-+ unsigned char jlc_exists_in_button_cmd : 1;
-+ unsigned char jlc_exists_in_tt_dom : 1;
-+ unsigned char chapter_search_or_play : 1; /* UOP 1 */
-+ unsigned char title_or_time_play : 1; /* UOP 0 */
- } ATTRIBUTE_PACKED playback_type_t;
-
- /**
---
-2.27.0.windows.1
-
=====================================
contrib/src/dvdread/SHA512SUMS
=====================================
@@ -1 +1 @@
-c98055829ccbbe2bb7b5df48f6e279cf6e91ecab39a35c37081581452f7df7531c1d7b8abd641c55eeee357235b2658b31478dbc307995cffdf8c011bd0dd0bc libdvdread-6.1.3.tar.bz2
+d1420e60b01a408ebd3cc94752929cf962ad1c6dd771317021633a755df7de01fa7597a88dec9946a81488822edd7d856e56bfd36556bf226e750fc20cad34b0 libdvdread-7.0.0.tar.bz2
=====================================
contrib/src/dvdread/rules.mak
=====================================
@@ -1,6 +1,6 @@
# DVDREAD
LIBDVDREAD_VERSION := 7.0.0
-LIBDVDREAD_URL := $(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+LIBDVDREAD_URL := https://code.videolan.org/videolan/libdvdread/-/archive/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
LIBDVDREAD_GITURL:=https://code.videolan.org/videolan/libdvdread.git
LIBDVDREAD_BRANCH:=master
LIBDVDREAD_GITVERSION:=fd8a73304597dc3a4fc187d0dd0cfb50af8f0a2d
@@ -16,35 +16,30 @@ ifeq ($(call need_pkg,"dvdread >= 6.1.0"),)
PKGS_FOUND += dvdread
endif
-$(TARBALLS)/libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz:
- $(call download_git,$(LIBDVDREAD_GITURL),$(LIBDVDREAD_BRANCH),$(LIBDVDREAD_GITVERSION))
+# $(TARBALLS)/libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz:
+# $(call download_git,$(LIBDVDREAD_GITURL),$(LIBDVDREAD_BRANCH),$(LIBDVDREAD_GITVERSION))
-.sum-dvdread: libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz
- $(call check_githash,$(LIBDVDREAD_GITVERSION))
- touch $@
+# .sum-dvdread: libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz
+# $(call check_githash,$(LIBDVDREAD_GITVERSION))
+# touch $@
-# $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
-# $(call download,$(LIBDVDREAD_URL))
+$(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
+ $(call download,$(LIBDVDREAD_URL))
-# .sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+.sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
-# dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
-dvdread: libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz .sum-dvdread
+dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
+# dvdread: libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz .sum-dvdread
$(UNPACK)
- $(call update_autoconfig,.)
- # $(APPLY) $(SRC)/dvdread/0001-ifo_types-avoid-forcing-a-higher-length-in-bitfield-.patch
- $(call pkg_static,"misc/dvdread.pc.in")
$(MOVE)
DEPS_dvdread = dvdcss $(DEPS_dvdcss)
-DVDREAD_CONF := --with-libdvdcss
+DVDREAD_CONF := -Dlibdvdcss=enabled
-.dvdread: dvdread
+.dvdread: dvdread crossfile.meson
$(REQUIRE_GPL)
- $(RECONF)
- $(MAKEBUILDDIR)
- $(MAKECONFIGURE) $(DVDREAD_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ $(MESONCLEAN)
+ $(MESON) $(DVDREAD_CONF)
+ +$(MESONBUILD)
touch $@
=====================================
contrib/src/jack/rules.mak
=====================================
@@ -16,7 +16,7 @@ $(TARBALLS)/jack1-$(JACK_VERSION).tar.gz:
jack: jack1-$(JACK_VERSION).tar.gz .sum-jack
$(UNPACK)
- # $(call update_autoconfig,.)
+ $(call update_autoconfig,.)
ifdef HAVE_MACOSX
$(APPLY) $(SRC)/jack/config-osx.patch
endif
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7a7bf4ea9766e4127908202a3a884c63f6709832...3d619de3543f16d6ba173e6066aa6eaa609fdfba
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7a7bf4ea9766e4127908202a3a884c63f6709832...3d619de3543f16d6ba173e6066aa6eaa609fdfba
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