From 87d81ee78d347404e53ee67e6d067ce2f477985d Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <[email protected]>
Date: Tue, 5 Jan 2021 10:51:01 +0530
Subject: [PATCH 3/5] crt: Move mfcore export library to lib-common.

Comment out DLL initialization symbols.

Signed-off-by: Biswapriyo Nath <[email protected]>
---
 .../{libarm32 => lib-common}/mfcore.def       | 11 ++++
 mingw-w64-crt/lib32/Makefile.am               |  1 +
 mingw-w64-crt/lib32/mfcore.def                | 60 +++++++++++++++++++
 mingw-w64-crt/lib64/Makefile.am               |  1 +
 mingw-w64-crt/libarm32/Makefile.am            |  2 +-
 mingw-w64-crt/libarm64/Makefile.am            |  1 +
 6 files changed, 75 insertions(+), 1 deletion(-)
 rename mingw-w64-crt/{libarm32 => lib-common}/mfcore.def (78%)
 create mode 100644 mingw-w64-crt/lib32/mfcore.def

diff --git a/mingw-w64-crt/libarm32/mfcore.def 
b/mingw-w64-crt/lib-common/mfcore.def
similarity index 78%
rename from mingw-w64-crt/libarm32/mfcore.def
rename to mingw-w64-crt/lib-common/mfcore.def
index 7fdc76f..75984fc 100644
--- a/mingw-w64-crt/libarm32/mfcore.def
+++ b/mingw-w64-crt/lib-common/mfcore.def
@@ -9,14 +9,24 @@ AppendPropVariant
 ConvertPropVariant
 CopyPropertyStore
 CreateNamedPropertyStore
+; DllCanUnloadNow
+; DllGetActivationFactory
+; DllGetClassObject
+; DllRegisterServer
+; DllUnregisterServer
 ExtractPropVariant
 MFCopyMFMetadata
+MFCopyPropertyStore
+MFCopyStreamMetadata
 MFCreateAggregateSource
 MFCreateAppSourceProxy
 MFCreateAudioRenderer
 MFCreateAudioRendererActivate
 MFCreateDeviceSource
 MFCreateDeviceSourceActivate
+MFCreateEncryptedMediaExtensionsStoreActivate
+MFCreateExtendedCameraIntrinsicModel
+MFCreateExtendedCameraIntrinsics
 MFCreateFileSchemePlugin
 MFCreateMFMetadataOnPropertyStore
 MFCreateMediaProcessor
@@ -25,6 +35,7 @@ MFCreatePMPHost
 MFCreatePMPMediaSession
 MFCreatePMPServer
 MFCreatePresentationClock
+MFCreatePresentationClockAsyncTimeSource
 MFCreateSampleCopierMFT
 MFCreateSampleGrabberSinkActivate
 MFCreateSequencerSegmentOffset
diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
index 33f775a..e2cb6fe 100644
--- a/mingw-w64-crt/lib32/Makefile.am
+++ b/mingw-w64-crt/lib32/Makefile.am
@@ -167,6 +167,7 @@ lib32_DATA += %reldir%/liblz32.a
 lib32_DATA += %reldir%/libmapi32.a
 lib32_DATA += %reldir%/libmcd.a
 lib32_DATA += %reldir%/libmf.a
+lib32_DATA += %reldir%/libmfcore.a
 lib32_DATA += %reldir%/libmfcuia32.a
 lib32_DATA += %reldir%/libmfplat.a
 lib32_DATA += %reldir%/libmfreadwrite.a
diff --git a/mingw-w64-crt/lib32/mfcore.def b/mingw-w64-crt/lib32/mfcore.def
new file mode 100644
index 0000000..b363c05
--- /dev/null
+++ b/mingw-w64-crt/lib32/mfcore.def
@@ -0,0 +1,60 @@
+;
+; Definition file of MFCORE.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "MFCORE.dll"
+EXPORTS
+AppendPropVariant@8
+ConvertPropVariant@8
+CopyPropertyStore@12
+CreateNamedPropertyStore@4
+; DllCanUnloadNow@0
+; DllGetActivationFactory@8
+; DllGetClassObject@12
+; DllRegisterServer@0
+; DllUnregisterServer@0
+ExtractPropVariant@12
+MFCopyMFMetadata@16
+MFCopyPropertyStore@8
+MFCopyStreamMetadata@12
+MFCreateAggregateSource@8
+MFCreateAppSourceProxy@12
+MFCreateAudioRenderer@8
+MFCreateAudioRendererActivate@4
+MFCreateDeviceSource@8
+MFCreateDeviceSourceActivate@8
+MFCreateEncryptedMediaExtensionsStoreActivate@16
+MFCreateExtendedCameraIntrinsicModel@8
+MFCreateExtendedCameraIntrinsics@4
+MFCreateFileSchemePlugin@8
+MFCreateMFMetadataOnPropertyStore@8
+MFCreateMediaProcessor@4
+MFCreateMediaSession@8
+MFCreatePMPHost@12
+MFCreatePMPMediaSession@16
+MFCreatePMPServer@8
+MFCreatePresentationClock@4
+MFCreatePresentationClockAsyncTimeSource@4
+MFCreateSampleCopierMFT@4
+MFCreateSampleGrabberSinkActivate@12
+MFCreateSequencerSegmentOffset@16
+MFCreateSequencerSource@8
+MFCreateSequencerSourceRemoteStream@12
+MFCreateSimpleTypeHandler@4
+MFCreateSoundEventSchemePlugin@8
+MFCreateStandardQualityManager@4
+MFCreateTopoLoader@4
+MFCreateTopology@4
+MFCreateTopologyNode@8
+MFCreateTransformWrapper@12
+MFCreateWMAEncoderActivate@12
+MFCreateWMVEncoderActivate@12
+MFEnumDeviceSources@12
+MFGetMultipleServiceProviders@16
+MFGetService@16
+MFGetTopoNodeCurrentType@16
+MFReadSequencerSegmentOffset@12
+MFRequireProtectedEnvironment@4
+MFShutdownObject@4
+MergePropertyStore@12
diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am
index 6f75d21..b18174a 100644
--- a/mingw-w64-crt/lib64/Makefile.am
+++ b/mingw-w64-crt/lib64/Makefile.am
@@ -695,6 +695,7 @@ lib64_DATA += %reldir%/libevr.a
 lib64_DATA += %reldir%/libiscsidsc.a
 lib64_DATA += %reldir%/libktmw32.a
 lib64_DATA += %reldir%/libmf.a
+lib64_DATA += %reldir%/libmfcore.a
 lib64_DATA += %reldir%/libmfplat.a
 lib64_DATA += %reldir%/libmsdrm.a
 lib64_DATA += %reldir%/libncrypt.a
diff --git a/mingw-w64-crt/libarm32/Makefile.am 
b/mingw-w64-crt/libarm32/Makefile.am
index aaec07e..1375f0d 100644
--- a/mingw-w64-crt/libarm32/Makefile.am
+++ b/mingw-w64-crt/libarm32/Makefile.am
@@ -372,8 +372,8 @@ libarm32_DATA += %reldir%/libmdmregistration.a
 libarm32_DATA += %reldir%/libmf3216.a
 libarm32_DATA += %reldir%/libmfasfsrcsnk.a
 libarm32_DATA += %reldir%/libmfcaptureengine.a
-libarm32_DATA += %reldir%/libmfcore.a
 libarm32_DATA += %reldir%/libmf.a
+libarm32_DATA += %reldir%/libmfcore.a
 libarm32_DATA += %reldir%/libmfnetcore.a
 libarm32_DATA += %reldir%/libmfnetsrc.a
 libarm32_DATA += %reldir%/libmfplat.a
diff --git a/mingw-w64-crt/libarm64/Makefile.am 
b/mingw-w64-crt/libarm64/Makefile.am
index ebf0de2..a05b63f 100644
--- a/mingw-w64-crt/libarm64/Makefile.am
+++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -149,6 +149,7 @@ libarm64_DATA += %reldir%/libmciwave.a
 libarm64_DATA += %reldir%/libmdminst.a
 libarm64_DATA += %reldir%/libmf3216.a
 libarm64_DATA += %reldir%/libmf.a
+libarm64_DATA += %reldir%/libmfcore.a
 libarm64_DATA += %reldir%/libmfplat.a
 libarm64_DATA += %reldir%/libmfreadwrite.a
 libarm64_DATA += %reldir%/libmgmtapi.a
-- 
2.29.2

_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to