[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: dvdnav: do not force a packing style

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
6dc4d484 by Steve Lhomme at 2024-11-23T10:15:22+00:00
contrib: dvdnav: do not force a packing style

We should use the same packing as libdvdread. It's done and made public through
a header. But we must also use the compiler the same way. libdvdread doesn't
force -mno-ms-bitfields.

(cherry picked from commit 2f08e3cc36bd79ab593d45e0c2cc8183765e12d2) (rebased)
rebased:
- on 4.0 the autoconf is updated before this line

- - - - -


2 changed files:

- + contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch
- contrib/src/dvdnav/rules.mak


Changes:

=====================================
contrib/src/dvdnav/0001-configure-don-t-use-ms-style-packing.patch
=====================================
@@ -0,0 +1,30 @@
+From ac7973075f808ffbf3bfeb601de940796485d6d1 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
+
+It is not used in libdvdread and we should use the same structure packing as
+libdvdread.
+---
+ configure.ac | 5 -----
+ 1 file changed, 5 deletions(-)
+
+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])
+ 
+-- 
+2.27.0.windows.1
+


=====================================
contrib/src/dvdnav/rules.mak
=====================================
@@ -19,6 +19,7 @@ $(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
 
 dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
 	$(UNPACK)
+	$(APPLY) $(SRC)/dvdnav/0001-configure-don-t-use-ms-style-packing.patch
 	$(call pkg_static,"misc/dvdnav.pc.in")
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6dc4d484c6c4e9b29c94410cc8723fc7fbc5f4dc

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6dc4d484c6c4e9b29c94410cc8723fc7fbc5f4dc
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance