Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits: 42557442 by Steve Lhomme at 2026-06-03T10:29:41+02:00 contrib: x264: remove unused patch Missing from d7bd60200ee54494ca092a1d7345dcbc41a86507. - - - - - 2c50d1ce by Steve Lhomme at 2026-06-03T10:29:41+02:00 contrib: x264: do not pass autotools flags x264 is not using autotools. Only a handful of options are supported. We do the same for ffmpeg and postproc. - - - - - b6145973 by Steve Lhomme at 2026-06-03T10:29:41+02:00 contrib: x264: show the failing configure on error The tests are not printed in the command line, unlike autotools. - - - - - 2 changed files: - − contrib/src/x264/0001-configure-set-_FILE_OFFSET_BITS-to-detect-fseeko.patch - contrib/src/x264/rules.mak Changes: ===================================== contrib/src/x264/0001-configure-set-_FILE_OFFSET_BITS-to-detect-fseeko.patch deleted ===================================== @@ -1,26 +0,0 @@ -From dc69fefa49726021d75e6a764357779a4b4d0800 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <[email protected]> -Date: Mon, 22 Apr 2024 14:03:02 +0200 -Subject: [PATCH] configure: set _FILE_OFFSET_BITS to detect fseeko - -On Android fseeko is not detected properly if if _FILE_OFFSET_BITS is not set. ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index c1fb599f..60ad229b 100755 ---- a/configure -+++ b/configure -@@ -1369,7 +1369,7 @@ if [ $SYS = WINDOWS -a $ARCH = X86 -a $compiler = GNU ] ; then - cc_check '' -fno-zero-initialized-in-bss && CFLAGS="$CFLAGS -fno-zero-initialized-in-bss" - fi - --if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then -+if cc_check "stdio.h" "#define _FILE_OFFSET_BITS 64" "fseeko(stdin,0,0);" ; then - define fseek fseeko - define ftell ftello - elif cc_check "stdio.h" "" "fseeko64(stdin,0,0);" ; then --- -2.37.3.windows.1 - ===================================== contrib/src/x264/rules.mak ===================================== @@ -22,7 +22,7 @@ endif PKGS_ALL += x26410b -X264CONF = \ +X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" --enable-static \ --disable-avs \ --disable-lavf \ --disable-cli \ @@ -77,7 +77,7 @@ x264 x26410b: %: x264-$(X264_VERSION).tar.xz .sum-% .x264: x264 $(REQUIRE_GPL) $(MAKEBUILDDIR) - $(MAKECONFIGURE) $(X264CONF) + cd $(BUILD_DIR) && $(HOSTVARS) $(BUILD_SRC)/configure $(X264CONF) || cat config.log # make dummy dependency file touch $(BUILD_DIR)/.depend +$(MAKEBUILD) View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/73605f797ead8978b1e4447791dfe62feb146331...b6145973e2256338715f08d62c05e26b51faee82 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/73605f797ead8978b1e4447791dfe62feb146331...b6145973e2256338715f08d62c05e26b51faee82 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
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
