[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: x264: skip dependecy file generation

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f7634226 by Steve Lhomme at 2023-09-25T01:48:06+00:00
contrib: x264: skip dependecy file generation

It doesn't support --disable-dependency-tracking.

- - - - -
11756131 by Steve Lhomme at 2023-09-25T01:48:06+00:00
contrib: x264: fix build when x264 is in the include path

- - - - -


2 changed files:

- + contrib/src/x264/0001-osdep-use-direct-path-to-internal-x264.h.patch
- contrib/src/x264/rules.mak


Changes:

=====================================
contrib/src/x264/0001-osdep-use-direct-path-to-internal-x264.h.patch
=====================================
@@ -0,0 +1,26 @@
+From 2597083bc24f3d3172ecc4fc336face1fcc0c4e2 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Thu, 21 Sep 2023 11:44:40 +0200
+Subject: [PATCH] osdep: use direct path to internal x264.h
+
+This fixes issues when a previous x264.h is found in the include path.
+---
+ common/osdep.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/osdep.h b/common/osdep.h
+index dfa4aaec..f3cd5822 100644
+--- a/common/osdep.h
++++ b/common/osdep.h
+@@ -49,7 +49,7 @@
+ #include <io.h>
+ #endif
+ 
+-#include "x264.h"
++#include "../x264.h"
+ 
+ #if !HAVE_LOG2F
+ #define log2f(x) (logf(x)/0.693147180559945f)
+-- 
+2.38.1.windows.1
+


=====================================
contrib/src/x264/rules.mak
=====================================
@@ -56,12 +56,15 @@ x264 x26410b: %: x264-$(X264_VERSION).tar.xz .sum-%
 	$(UNPACK)
 	$(UPDATE_AUTOCONFIG)
 	$(APPLY) $(SRC)/x264/x264-winstore.patch
+	$(APPLY) $(SRC)/x264/0001-osdep-use-direct-path-to-internal-x264.h.patch
 	$(MOVE)
 
 .x264: x264
 	$(REQUIRE_GPL)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(X264CONF)
+	# make dummy dependency file
+	touch $(BUILD_DIR)/.depend
 	+$(MAKEBUILD)
 	+$(MAKEBUILD) install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5a75966b395d13cab0fa082e50e34b36a554840a...117561315447fa25425bc09f9168e9692cb9a561

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5a75966b395d13cab0fa082e50e34b36a554840a...117561315447fa25425bc09f9168e9692cb9a561
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance