[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: contrib: live555: only patch the config file we will use

[Steve Lhomme (@robUx4)]

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


Commits:
67343ea0 by Steve Lhomme at 2026-09-08T10:38:16+00:00
contrib: live555: only patch the config file we will use

(cherry picked from commit 5956d6c87af1ac94f00b13aac6103536df17de26)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
1b18947c by Steve Lhomme at 2026-09-08T10:38:16+00:00
contrib: live555: use the CXXFLAGS variable when compiling

Regression from ad435562b7250478763377aeca64481d7e0b3b37.

(cherry picked from commit c4ea2e822c9ac4848c4b8fffd3924e47555abf00)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
7d674424 by Steve Lhomme at 2026-09-08T10:38:16+00:00
contrib: live555: pass LIVE_EXTRA_CFLAGS as a (dynamic) variable

So it's not hardcoded in the makefile.

(cherry picked from commit 4c1a8d5bbce2a0ed2dbda3010e37929a0e32191e)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


1 changed file:

- contrib/src/live555/rules.mak


Changes:

=====================================
contrib/src/live555/rules.mak
=====================================
@@ -68,13 +68,15 @@ live555: $(LIVE555_FILE) .sum-live555
 	chmod -R u+w $(UNPACK_DIR)
 	# Remove hardcoded cc, c++, ar variables
 	sed -e 's%C_COMPILER%#C_COMPILER%' -e 's%CPLUSPLUS_COMPILER%#CPLUSPLUS_COMPILER%' -e 's%LIBRARY_LINK%#LIBRARY_LINK%' -i.orig $(UNPACK_DIR)/config.$(LIVE_TARGET)
+	# Use CXXFLAGS when compiling C++ code
+	sed -e 's%CPLUSPLUS_FLAGS =%CPLUSPLUS_FLAGS = $$(CXXFLAGS)%' -i.orig $(UNPACK_DIR)/config.$(LIVE_TARGET)
 	# Remove hardcoded --std=c+20 on un supported compilers
 ifndef HAVE_LIVE555_CPP20_ATOMIC_TEST
 	sed -e 's%-std=c++20% -DNO_STD_LIB=1%' -i.orig $(UNPACK_DIR)/config.$(LIVE_TARGET)
 endif
-	# Add the Extra_CFLAGS to all config files
+	# Add the Extra_CFLAGS to the config files
 	sed -i.orig \
-		-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(LIVE_EXTRA_CFLAGS)%" $(UNPACK_DIR)/config.*
+		-e 's%COMPILE_OPTS =%COMPILE_OPTS = $$(EXTRA_CFLAGS)%' $(UNPACK_DIR)/config.$(LIVE_TARGET)
 	# We want 64bits offsets and PIC on Linux
 	sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig $(UNPACK_DIR)/config.linux
 	# Disable Locale for Solaris
@@ -105,7 +107,7 @@ endif
 	$(MOVE)
 
 LIVE555_ENV := $(HOSTVARS) C_COMPILER=$(CC) CPLUSPLUS_COMPILER=$(CXX) LIBRARY_LINK="$(AR) cr " \
-	PREFIX=$(PREFIX) DESTDIR= LIBDIR=$(PREFIX)/lib
+	PREFIX=$(PREFIX) DESTDIR= LIBDIR=$(PREFIX)/lib EXTRA_CFLAGS="$(LIVE_EXTRA_CFLAGS)"
 
 .live555: BUILD_DIR=$<
 .live555: live555



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/cd49211700bc7ce7e68f546a5db9c8f0d44b167a...7d674424e9f290ba539e0700b3c22b2cb034d51e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/cd49211700bc7ce7e68f546a5db9c8f0d44b167a...7d674424e9f290ba539e0700b3c22b2cb034d51e
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help