[vlc-devel] [PATCH 1/2] contrib: mfx: update hash to integrate the merged patch

[Steve Lhomme]

---
 contrib/src/mfx/mfx-cpp11-fix.patch | 20 --------------------
 contrib/src/mfx/rules.mak           |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 contrib/src/mfx/mfx-cpp11-fix.patch

diff --git a/contrib/src/mfx/mfx-cpp11-fix.patch b/contrib/src/mfx/mfx-cpp11-fix.patch
deleted file mode 100644
index dff75033768c..000000000000
--- a/contrib/src/mfx/mfx-cpp11-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mfx/src/mfx_plugin_hive.cpp.cpp11	2019-03-20 09:52:12.000000000 +0100
-+++ mfx/src/mfx_plugin_hive.cpp	2019-03-21 09:08:20.825840300 +0100
-@@ -169,7 +169,7 @@ MFX::MFXPluginsInHive::MFXPluginsInHive(
- 
-         if (QueryKey(subKey, CodecIDKeyName, descriptionRecord.CodecId))
-         {
--            TRACE_HIVE_INFO(alignStr()" : "MFXFOURCCTYPE()" \n", CodecIDKeyName, MFXU32TOFOURCC(descriptionRecord.CodecId));
-+            TRACE_HIVE_INFO(alignStr()" : " MFXFOURCCTYPE() " \n", CodecIDKeyName, MFXU32TOFOURCC(descriptionRecord.CodecId));
-         }
-         else
-         {
-@@ -180,7 +180,7 @@ MFX::MFXPluginsInHive::MFXPluginsInHive(
-         {
-             continue;
-         }
--        TRACE_HIVE_INFO(alignStr()" : "MFXGUIDTYPE()"\n", GUIDKeyName, MFXGUIDTOHEX(&descriptionRecord.PluginUID));
-+        TRACE_HIVE_INFO(alignStr()" : " MFXGUIDTYPE() "\n", GUIDKeyName, MFXGUIDTOHEX(&descriptionRecord.PluginUID));
- 
-         mfxU32 nSize = sizeof(descriptionRecord.sPath)/sizeof(*descriptionRecord.sPath);
-         if (!subKey.Query(PathKeyName, descriptionRecord.sPath, nSize))
diff --git a/contrib/src/mfx/rules.mak b/contrib/src/mfx/rules.mak
index cb330b55ec3d..1bf9580871be 100644
--- a/contrib/src/mfx/rules.mak
+++ b/contrib/src/mfx/rules.mak
@@ -1,7 +1,7 @@
 # mfx (Media SDK)
 
 mfx_GITURL := https://github.com/lu-zero/mfx_dispatch.git
-MFX_GITHASH := 612558419be4889ac6d059516457e83c163edcd2
+MFX_GITHASH := c51a54c15f51579804030c70592c0a26065f1242
 
 ifeq ($(call need_pkg,"mfx"),)
 PKGS_FOUND += mfx
@@ -29,7 +29,6 @@ $(TARBALLS)/mfx-$(MFX_GITHASH).tar.xz:
 
 mfx: mfx-$(MFX_GITHASH).tar.xz .sum-mfx
 	$(UNPACK)
-	$(APPLY) $(SRC)/mfx/mfx-cpp11-fix.patch
 	cd $(UNPACK_DIR) && autoreconf -ivf
 	$(MOVE)
 
-- 
2.26.2