From 9889c6e3bc39f91eb426ce49e317f635eedf4ce1 Mon Sep 17 00:00:00 2001 From: evpobr Date: Tue, 10 Nov 2020 03:37:28 +0500 Subject: [mpg123] Upgrade to 1.26.3 (#14444) * Update to the newest version * Convert `CONTROL` to `vcpkg.json` * Use `vcpkg_install_msbuild()` instead of deprecated `vcpkg_build_msbuild()` --- ports/mpg123/0001-fix-crt-linking.patch | 88 -- ports/mpg123/0001-fix-x86-build.patch | 37 + ports/mpg123/0002-fix-x86-build.patch | 37 - ports/mpg123/0003-add-arm-configs.patch | 1149 -------------------------- ports/mpg123/0004-add-arm64-uwp-config.patch | 181 ---- ports/mpg123/CONTROL | 6 - ports/mpg123/portfile.cmake | 75 +- ports/mpg123/vcpkg.json | 9 + 8 files changed, 58 insertions(+), 1524 deletions(-) delete mode 100644 ports/mpg123/0001-fix-crt-linking.patch create mode 100644 ports/mpg123/0001-fix-x86-build.patch delete mode 100644 ports/mpg123/0002-fix-x86-build.patch delete mode 100644 ports/mpg123/0003-add-arm-configs.patch delete mode 100644 ports/mpg123/0004-add-arm64-uwp-config.patch delete mode 100644 ports/mpg123/CONTROL create mode 100644 ports/mpg123/vcpkg.json diff --git a/ports/mpg123/0001-fix-crt-linking.patch b/ports/mpg123/0001-fix-crt-linking.patch deleted file mode 100644 index c0a74c366..000000000 --- a/ports/mpg123/0001-fix-crt-linking.patch +++ /dev/null @@ -1,88 +0,0 @@ -From fcf5f82c9abeb6068be26dc43f613a253cac3436 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Mon, 13 Mar 2017 02:59:35 +0300 -Subject: [PATCH] ports/msvc/libmpg123: fix static library linking - ---- - ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -index 0a69525..ecf3a66 100644 ---- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -+++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -@@ -265,7 +265,7 @@ - - - EnableFastChecks -- MultiThreadedDebugDLL -+ MultiThreadedDebug - false - Level3 - ProgramDatabase -@@ -285,7 +285,7 @@ - - - EnableFastChecks -- MultiThreadedDebugDLL -+ MultiThreadedDebug - false - Level3 - ProgramDatabase -@@ -312,7 +312,7 @@ - WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;%(PreprocessorDefinitions) - - -- MultiThreadedDLL -+ MultiThreaded - false - false - Level3 -@@ -336,7 +336,7 @@ - WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;%(PreprocessorDefinitions) - - -- MultiThreadedDLL -+ MultiThreaded - false - false - Level3 -@@ -474,7 +474,7 @@ - - - EnableFastChecks -- MultiThreadedDebugDLL -+ MultiThreadedDebug - false - Level3 - ProgramDatabase -@@ -562,7 +562,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - - - EnableFastChecks -- MultiThreadedDebugDLL -+ MultiThreadedDebug - false - Level3 - ProgramDatabase -@@ -623,7 +623,7 @@ yasm -a x86 -m amd64 -f win64 -p gas -r raw -g null -o "$(IntDir)synth_stereo_x8 - WIN32;_CRT_SECURE_NO_WARNINGS;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;%(PreprocessorDefinitions) - - -- MultiThreadedDLL -+ MultiThreaded - false - false - Level3 -@@ -716,7 +716,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - WIN32;_CRT_SECURE_NO_WARNINGS;OPT_MULTI;OPT_GENERIC;OPT_X86_64;%(PreprocessorDefinitions) - - -- MultiThreadedDLL -+ MultiThreaded - false - false - Level3 --- -2.11.0.windows.1 - diff --git a/ports/mpg123/0001-fix-x86-build.patch b/ports/mpg123/0001-fix-x86-build.patch new file mode 100644 index 000000000..9c098c679 --- /dev/null +++ b/ports/mpg123/0001-fix-x86-build.patch @@ -0,0 +1,37 @@ +diff --git a/src/libmpg123/mangle.h b/src/libmpg123/mangle.h +index e37386a..b474e7f 100644 +--- a/src/libmpg123/mangle.h ++++ b/src/libmpg123/mangle.h +@@ -85,6 +85,10 @@ + #define ASM_VALUE(a) MANGLE_MACROCAT($,a) + #endif + ++#if defined(_WIN32) && !defined(_WIN64) ++#define OPT_X86 ++#endif ++ + /* Enable position-independent code for certain platforms. */ + + #if defined(OPT_X86) +@@ -130,7 +134,7 @@ Lpic_base: \ + /* Dummies for everyone else. */ + #define LOCAL_VAR(a) a + #define GLOBAL_VAR ASM_NAME +-#define GLOBAL_VAR_PTR(a) .err Cannot use indirect addressing in non-PIC object. ++#define GLOBAL_VAR_PTR(a) // #error Cannot use indirect addressing in non-PIC object. + #define FUNC ASM_NAME + #define EXTERNAL_FUNC ASM_NAME + #define GET_GOT +diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj +index f2bc362..07e81cd 100644 +--- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj ++++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj +@@ -1194,7 +1194,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ + + + +- Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) ++ Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) + $(IntDir);%(AdditionalLibraryDirectories) + true + diff --git a/ports/mpg123/0002-fix-x86-build.patch b/ports/mpg123/0002-fix-x86-build.patch deleted file mode 100644 index 2d0b10b81..000000000 --- a/ports/mpg123/0002-fix-x86-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/libmpg123/mangle.h b/src/libmpg123/mangle.h -index 6012ccc..bf37cd7 100644 ---- a/src/libmpg123/mangle.h -+++ b/src/libmpg123/mangle.h -@@ -85,6 +85,10 @@ - #define ASM_VALUE(a) MANGLE_MACROCAT($,a) - #endif - -+#if defined(_WIN32) && !defined(_WIN64) -+#define OPT_X86 -+#endif -+ - /* Enable position-independent code for certain platforms. */ - - #if defined(OPT_X86) -@@ -130,7 +134,7 @@ Lpic_base: \ - /* Dummies for everyone else. */ - #define LOCAL_VAR(a) a - #define GLOBAL_VAR ASM_NAME --#define GLOBAL_VAR_PTR(a) #error Cannot use indirect addressing in non-PIC object. -+#define GLOBAL_VAR_PTR(a) // #error Cannot use indirect addressing in non-PIC object. - #define FUNC ASM_NAME - #define EXTERNAL_FUNC ASM_NAME - #define GET_GOT -diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -index 1edf77d..f78999b 100644 ---- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -+++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -@@ -700,7 +700,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - - - -- Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) -+ Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) - $(IntDir);%(AdditionalLibraryDirectories) - true - diff --git a/ports/mpg123/0003-add-arm-configs.patch b/ports/mpg123/0003-add-arm-configs.patch deleted file mode 100644 index d343c760c..000000000 --- a/ports/mpg123/0003-add-arm-configs.patch +++ /dev/null @@ -1,1149 +0,0 @@ -diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -index 5849861..4c4e51e 100644 ---- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -+++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -@@ -1,6 +1,14 @@ -  - - -+ -+ Debug_Generic_Dll -+ ARM -+ -+ -+ Debug_Generic_Dll -+ ARM64 -+ - - Debug_Generic_Dll - Win32 -@@ -9,6 +17,14 @@ - Debug_Generic_Dll - x64 - -+ -+ Debug_Generic -+ ARM -+ -+ -+ Debug_Generic -+ ARM64 -+ - - Debug_Generic - Win32 -@@ -17,6 +33,14 @@ - Debug_Generic - x64 - -+ -+ Debug_x86_Dll -+ ARM -+ -+ -+ Debug_x86_Dll -+ ARM64 -+ - - Debug_x86_Dll - Win32 -@@ -25,6 +49,14 @@ - Debug_x86_Dll - x64 - -+ -+ Debug_x86 -+ ARM -+ -+ -+ Debug_x86 -+ ARM64 -+ - - Debug_x86 - Win32 -@@ -33,6 +65,14 @@ - Debug_x86 - x64 - -+ -+ Release_Generic_Dll -+ ARM -+ -+ -+ Release_Generic_Dll -+ ARM64 -+ - - Release_Generic_Dll - Win32 -@@ -41,6 +81,14 @@ - Release_Generic_Dll - x64 - -+ -+ Release_Generic -+ ARM -+ -+ -+ Release_Generic -+ ARM64 -+ - - Release_Generic - Win32 -@@ -49,6 +97,14 @@ - Release_Generic - x64 - -+ -+ Release_x86_Dll -+ ARM -+ -+ -+ Release_x86_Dll -+ ARM64 -+ - - Release_x86_Dll - Win32 -@@ -57,6 +113,14 @@ - Release_x86_Dll - x64 - -+ -+ Release_x86 -+ ARM -+ -+ -+ Release_x86 -+ ARM64 -+ - - Release_x86 - Win32 -@@ -78,164 +142,311 @@ - true - v140 - -+ -+ DynamicLibrary -+ Unicode -+ true -+ v140 -+ - - DynamicLibrary - Unicode - true - v140 - -+ -+ DynamicLibrary -+ Unicode -+ true -+ v140 -+ - - DynamicLibrary - Unicode - v140 - -+ -+ DynamicLibrary -+ Unicode -+ v140 -+ - - DynamicLibrary - Unicode - v140 - -+ -+ DynamicLibrary -+ Unicode -+ v140 -+ - - StaticLibrary - Unicode - true - v140 - -+ -+ StaticLibrary -+ Unicode -+ true -+ v140 -+ - - StaticLibrary - Unicode - true - v140 - -+ -+ StaticLibrary -+ Unicode -+ true -+ v140 -+ - - StaticLibrary - Unicode - v140 - -+ -+ StaticLibrary -+ Unicode -+ v140 -+ - - StaticLibrary - Unicode - v140 - -+ -+ StaticLibrary -+ Unicode -+ v140 -+ - - DynamicLibrary - Unicode - true - v140 - -+ -+ DynamicLibrary -+ Unicode -+ true -+ v140 -+ - - DynamicLibrary - Unicode - true - v140 - -+ -+ DynamicLibrary -+ Unicode -+ true -+ v140 -+ - - DynamicLibrary - Unicode - v140 - -+ -+ DynamicLibrary -+ Unicode -+ v140 -+ - - DynamicLibrary - Unicode - v140 - -+ -+ DynamicLibrary -+ Unicode -+ v140 -+ - - StaticLibrary - Unicode - true - v140 - -+ -+ StaticLibrary -+ Unicode -+ true -+ v140 -+ - - StaticLibrary - Unicode - true - v140 - -+ -+ StaticLibrary -+ Unicode -+ true -+ v140 -+ - - StaticLibrary - Unicode - v140 - -+ -+ StaticLibrary -+ Unicode -+ v140 -+ - - StaticLibrary - Unicode - v140 - -+ -+ StaticLibrary -+ Unicode -+ v140 -+ - - - - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - -+ -+ -+ - - - <_ProjectFileVersion>10.0.21006.1 - $(SolutionDir)$(Platform)\Debug\ - $(Platform)\$(Configuration)\ -+ $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Release\ - $(Platform)\$(Configuration)\ -+ $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Debug\ - $(Platform)\$(Configuration)\ -+ $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Release\ - $(Platform)\$(Configuration)\ -+ $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Debug\ - $(Platform)\$(Configuration)\ -+ $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Release\ - $(Platform)\$(Configuration)\ -+ $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Debug\ - $(Platform)\$(Configuration)\ -+ $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Release\ - $(Platform)\$(Configuration)\ -+ $(Platform)\$(Configuration)\ - false -+ false - false -+ false - - - $(SolutionDir)$(Platform)\Release\ - -+ - - $(SolutionDir)$(Platform)\Release\ - -@@ -257,6 +468,30 @@ - - $(SolutionDir)$(Platform)\Debug\ - -+ -+ $(SolutionDir)$(Platform)\Release\ -+ -+ -+ $(SolutionDir)$(Platform)\Release\ -+ -+ -+ $(SolutionDir)$(Platform)\Debug\ -+ -+ -+ $(SolutionDir)$(Platform)\Debug\ -+ -+ -+ $(SolutionDir)$(Platform)\Debug\ -+ -+ -+ $(SolutionDir)$(Platform)\Debug\ -+ -+ -+ $(SolutionDir)$(Platform)\Release\ -+ -+ -+ $(SolutionDir)$(Platform)\Release\ -+ - - - Disabled -@@ -277,6 +512,26 @@ - Shlwapi.lib - - -+ -+ -+ Disabled -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;_DEBUG;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebug -+ false -+ Level3 -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ Shlwapi.lib -+ -+ - - - Disabled -@@ -301,6 +556,30 @@ - Shlwapi.lib;%(AdditionalDependencies) - - -+ -+ -+ Disabled -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;_DEBUG;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebug -+ false -+ Level3 -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;%(AdditionalDependencies) -+ -+ - - - MaxSpeed -@@ -325,6 +604,30 @@ - Shlwapi.lib - - -+ -+ -+ MaxSpeed -+ AnySuitable -+ true -+ Speed -+ true -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;%(PreprocessorDefinitions) -+ -+ -+ MultiThreaded -+ false -+ false -+ Level3 -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ Shlwapi.lib -+ -+ - - - MaxSpeed -@@ -353,6 +656,34 @@ - Shlwapi.lib;%(AdditionalDependencies) - - -+ -+ -+ MaxSpeed -+ AnySuitable -+ true -+ Speed -+ true -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;%(PreprocessorDefinitions) -+ -+ -+ MultiThreaded -+ false -+ false -+ Level3 -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;%(AdditionalDependencies) -+ -+ - - - Disabled -@@ -378,6 +709,32 @@ - Shlwapi.lib;%(AdditionalDependencies) - - -+ -+ -+ Disabled -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;_DEBUG;BUILD_MPG123_DLL;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ false -+ Level3 -+ false -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ DebugFastLink -+ true -+ -+ -+ true -+ false -+ Shlwapi.lib;%(AdditionalDependencies) -+ -+ - - - Disabled -@@ -403,12 +760,98 @@ - true - Shlwapi.lib;%(AdditionalDependencies) - -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ Disabled -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;_DEBUG;BUILD_MPG123_DLL;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ false -+ Level3 -+ false -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ $(IntDir);%(AdditionalLibraryDirectories) -+ DebugFastLink -+ true -+ -+ -+ true -+ false -+ Shlwapi.lib;%(AdditionalDependencies) -+ -+ -+ -+ -+ -+ -+ -+ -+ MaxSpeed -+ AnySuitable -+ true -+ Speed -+ true -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;BUILD_MPG123_DLL;%(PreprocessorDefinitions) -+ -+ -+ MultiThreadedDLL -+ false -+ false -+ Level3 -+ false -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ 0x63000000 -+ false -+ true -+ Shlwapi.lib;%(AdditionalDependencies) -+ -+ -+ -+ -+ MaxSpeed -+ AnySuitable -+ true -+ Speed -+ true -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;BUILD_MPG123_DLL;%(PreprocessorDefinitions) -+ -+ -+ MultiThreadedDLL -+ false -+ false -+ Level3 -+ false -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ true -+ false -+ Shlwapi.lib;%(AdditionalDependencies) -+ - -- -+ - - MaxSpeed - AnySuitable -@@ -434,8 +877,12 @@ - true - Shlwapi.lib;%(AdditionalDependencies) - -+ -+ -+ -+ - -- -+ - - MaxSpeed - AnySuitable -@@ -456,9 +903,10 @@ - 4996;%(DisableSpecificWarnings) - - -- 0x63000000 -- false -- true -+ -+ -+ true -+ false - Shlwapi.lib;%(AdditionalDependencies) - - -@@ -554,6 +1002,30 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - $(IntDir);%(AdditionalLibraryDirectories) - - -+ -+ -+ Disabled -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebug -+ false -+ Level3 -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) -+ $(IntDir);%(AdditionalLibraryDirectories) -+ -+ - - - Disabled -@@ -612,6 +1084,30 @@ yasm -a x86 -m amd64 -f win64 -p gas -r raw -g null -o "$(IntDir)synth_stereo_x8 - $(IntDir);%(AdditionalLibraryDirectories) - - -+ -+ -+ Disabled -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;OPT_MULTI;OPT_GENERIC;OPT_X86_64;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebug -+ false -+ Level3 -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;getcpuflags_x86_64.o;dct36_x86_64.o;synth_x86_64_float.o;synth_x86_64_s32.o;synth_stereo_x86_64_float.o;synth_stereo_x86_64_s32.o;synth_x86_64.o;dct64_x86_64.o;dct64_x86_64_float.o;synth_stereo_x86_64.o;synth_x86_64_accurate.o;synth_stereo_x86_64_accurate.o;%(AdditionalDependencies) -+ $(IntDir);%(AdditionalLibraryDirectories) -+ -+ - - - MaxSpeed -@@ -705,6 +1201,35 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - true - - -+ -+ -+ MaxSpeed -+ AnySuitable -+ true -+ Speed -+ true -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;%(PreprocessorDefinitions) -+ -+ -+ MultiThreaded -+ false -+ false -+ Level3 -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) -+ $(IntDir);%(AdditionalLibraryDirectories) -+ true -+ -+ - - - MaxSpeed -@@ -768,6 +1293,35 @@ yasm -a x86 -m amd64 -f win64 -p gas -r raw -g null -o "$(IntDir)synth_stereo_x8 - true - - -+ -+ -+ MaxSpeed -+ AnySuitable -+ true -+ Speed -+ true -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;OPT_MULTI;OPT_GENERIC;OPT_X86_64;%(PreprocessorDefinitions) -+ -+ -+ MultiThreaded -+ false -+ false -+ Level3 -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;getcpuflags_x86_64.o;dct36_x86_64.o;synth_x86_64_float.o;synth_x86_64_s32.o;synth_stereo_x86_64_float.o;synth_stereo_x86_64_s32.o;synth_x86_64.o;dct64_x86_64.o;dct64_x86_64_float.o;synth_stereo_x86_64.o;synth_x86_64_accurate.o;synth_stereo_x86_64_accurate.o;%(AdditionalDependencies) -+ $(IntDir);%(AdditionalLibraryDirectories) -+ true -+ -+ - - - Disabled -@@ -862,6 +1416,36 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - false - - -+ -+ -+ Disabled -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ false -+ Level3 -+ false -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) -+ $(IntDir);%(AdditionalLibraryDirectories) -+ DebugFastLink -+ true -+ 0x63000000 -+ true -+ false -+ -+ - - - Disabled -@@ -926,6 +1510,36 @@ yasm -a x86 -m amd64 -f win64 -p gas -r raw -g null -o "$(IntDir)synth_stereo_x8 - false - - -+ -+ -+ Disabled -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;OPT_X86_64;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ false -+ Level3 -+ false -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;getcpuflags_x86_64.o;dct36_x86_64.o;synth_x86_64_float.o;synth_x86_64_s32.o;synth_stereo_x86_64_float.o;synth_stereo_x86_64_s32.o;synth_x86_64.o;dct64_x86_64.o;dct64_x86_64_float.o;synth_stereo_x86_64.o;synth_x86_64_accurate.o;synth_stereo_x86_64_accurate.o;%(AdditionalDependencies) -+ $(IntDir);%(AdditionalLibraryDirectories) -+ DebugFastLink -+ true -+ 0x63000000 -+ true -+ false -+ -+ - - - -@@ -1030,6 +1644,46 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - - - -+ -+ -+ -+ -+ -+ -+ MaxSpeed -+ AnySuitable -+ true -+ Speed -+ true -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;%(PreprocessorDefinitions) -+ -+ -+ MultiThreadedDLL -+ false -+ false -+ Level3 -+ false -+ ProgramDatabase -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) -+ $(IntDir);%(AdditionalLibraryDirectories) -+ 0x63000000 -+ false -+ true -+ -+ -+ -+ -+ -+ - - - -@@ -1102,37 +1756,99 @@ yasm -a x86 -m amd64 -f win64 -p gas -r raw -g null -o "$(IntDir)synth_stereo_x8 - - - -+ -+ -+ -+ -+ -+ -+ MaxSpeed -+ AnySuitable -+ true -+ Speed -+ true -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;OPT_X86_64;%(PreprocessorDefinitions) -+ -+ -+ MultiThreadedDLL -+ false -+ false -+ Level3 -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ -+ -+ -+ -+ Shlwapi.lib;getcpuflags_x86_64.o;dct36_x86_64.o;synth_x86_64_float.o;synth_x86_64_s32.o;synth_stereo_x86_64_float.o;synth_stereo_x86_64_s32.o;synth_x86_64.o;dct64_x86_64.o;dct64_x86_64_float.o;synth_stereo_x86_64.o;synth_x86_64_accurate.o;synth_stereo_x86_64_accurate.o;%(AdditionalDependencies) -+ $(IntDir);%(AdditionalLibraryDirectories) -+ 0x63000000 -+ false -+ true -+ -+ -+ -+ -+ -+ - - - - - - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - - - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - - - -@@ -1156,21 +1872,37 @@ yasm -a x86 -m amd64 -f win64 -p gas -r raw -g null -o "$(IntDir)synth_stereo_x8 - - - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - true -+ true - - - diff --git a/ports/mpg123/0004-add-arm64-uwp-config.patch b/ports/mpg123/0004-add-arm64-uwp-config.patch deleted file mode 100644 index be18b6a82..000000000 --- a/ports/mpg123/0004-add-arm64-uwp-config.patch +++ /dev/null @@ -1,181 +0,0 @@ -diff --git a/ports/MSVC++/2015/uwp/libmpg123.sln b/ports/MSVC++/2015/uwp/libmpg123.sln -index 6e4eaee..ecedd3d 100644 ---- a/ports/MSVC++/2015/uwp/libmpg123.sln -+++ b/ports/MSVC++/2015/uwp/libmpg123.sln -@@ -8,21 +8,27 @@ EndProject - Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM -+ Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM -+ Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Debug|ARM.ActiveCfg = Debug|ARM - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Debug|ARM.Build.0 = Debug|ARM -+ {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Debug|ARM64.ActiveCfg = Debug|ARM64 -+ {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Debug|ARM64.Build.0 = Debug|ARM64 - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Debug|x64.ActiveCfg = Debug|x64 - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Debug|x64.Build.0 = Debug|x64 - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Debug|x86.ActiveCfg = Debug|Win32 - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Debug|x86.Build.0 = Debug|Win32 - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Release|ARM.ActiveCfg = Release|ARM - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Release|ARM.Build.0 = Release|ARM -+ {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Release|ARM64.ActiveCfg = Release|ARM64 -+ {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Release|ARM64.Build.0 = Release|ARM64 - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Release|x64.ActiveCfg = Release|x64 - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Release|x64.Build.0 = Release|x64 - {2411FC2F-79ED-4787-A143-DE3644B0FBF5}.Release|x86.ActiveCfg = Release|Win32 -diff --git a/ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj -index 0e54f92..91f40db 100644 ---- a/ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj -+++ b/ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj -@@ -5,6 +5,10 @@ - Debug - ARM - -+ -+ Debug -+ ARM64 -+ - - Debug - Win32 -@@ -17,6 +21,10 @@ - Release - ARM - -+ -+ Release -+ ARM64 -+ - - Release - Win32 -@@ -76,6 +84,8 @@ - true - true - true -+ true -+ true - - - -@@ -105,6 +115,8 @@ - true - true - true -+ true -+ true - - - -@@ -206,6 +218,11 @@ - true - v140 - -+ -+ DynamicLibrary -+ true -+ v140 -+ - - DynamicLibrary - true -@@ -221,6 +238,11 @@ - false - v140 - -+ -+ DynamicLibrary -+ false -+ v140 -+ - - DynamicLibrary - false -@@ -240,9 +262,15 @@ - - - -+ -+ -+ - - - -+ -+ -+ - - - -@@ -273,6 +301,15 @@ - false - false - -+ -+ false -+ false -+ -+ -+ false -+ false -+ false -+ - - false - false -@@ -497,6 +534,48 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - - - -+ -+ -+ NotUsing -+ false -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;%(PreprocessorDefinitions) -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ -+ -+ Console -+ false -+ false -+ $(OutDir) -+ Default -+ -+ -+ -+ -+ -+ -+ -+ -+ NotUsing -+ false -+ $(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\..\src;$(ProjectDir)..\..\..\..\..\src\libmpg123;$(ProjectDir)..\..\..\..\..\src\compat;%(AdditionalIncludeDirectories) -+ WIN32;_CRT_SECURE_NO_WARNINGS;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;%(PreprocessorDefinitions) -+ CompileAsC -+ 4996;%(DisableSpecificWarnings) -+ MultiThreadedDLL -+ -+ -+ Console -+ false -+ false -+ $(OutDir) -+ -+ -+ -+ -+ -+ - - - NotUsing diff --git a/ports/mpg123/CONTROL b/ports/mpg123/CONTROL deleted file mode 100644 index be249c232..000000000 --- a/ports/mpg123/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: mpg123 -Version: 1.25.8 -Port-Version: 14 -Homepage: https://sourceforge.net/projects/mpg123/ -Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3). -Build-Depends: yasm-tool-helper diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 2a852b132..b96d2fade 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,5 +1,5 @@ -set(MPG123_VERSION 1.25.8) -set(MPG123_HASH f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203) +set(MPG123_VERSION 1.26.3) +set(MPG123_HASH 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d) #architecture detection if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") @@ -30,40 +30,20 @@ vcpkg_from_sourceforge( FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" SHA512 ${MPG123_HASH} PATCHES - 0001-fix-crt-linking.patch - 0002-fix-x86-build.patch - 0003-add-arm-configs.patch - 0004-add-arm64-uwp-config.patch + 0001-fix-x86-build.patch ) - include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) yasm_tool_helper(APPEND_TO_PATH) if(VCPKG_TARGET_IS_UWP) - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj OPTIONS /p:UseEnv=True - ) - - message(STATUS "Installing") - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/uwp/libmpg123/${MPG123_ARCH}/Debug/libmpg123/libmpg123.dll - ${SOURCE_PATH}/ports/MSVC++/2015/uwp/libmpg123/${MPG123_ARCH}/Debug/libmpg123/libmpg123.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/uwp/libmpg123/${MPG123_ARCH}/Debug/libmpg123/libmpg123.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/uwp/libmpg123/${MPG123_ARCH}/Release/libmpg123/libmpg123.dll - ${SOURCE_PATH}/ports/MSVC++/2015/uwp/libmpg123/${MPG123_ARCH}/Release/libmpg123/libmpg123.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/uwp/libmpg123/${MPG123_ARCH}/Release/libmpg123/libmpg123.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + PLATFORM ${MPG123_ARCH} + RELEASE_CONFIGURATION Release_uwp + DEBUG_CONFIGURATION Debug_uwp ) file(INSTALL ${SOURCE_PATH}/ports/MSVC++/mpg123.h @@ -72,44 +52,13 @@ if(VCPKG_TARGET_IS_UWP) DESTINATION ${CURRENT_PACKAGES_DIR}/include ) elseif(VCPKG_TARGET_IS_WINDOWS) - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj OPTIONS /p:UseEnv=True RELEASE_CONFIGURATION Release${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} DEBUG_CONFIGURATION Debug${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} ) - - message(STATUS "Installing") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.dll - ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.dll - ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) - else() - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug_x86/libmpg123.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release_x86/libmpg123.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) - endif() - - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Debug/libmpg123.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/${MPG123_ARCH}/Release/libmpg123.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) file(INSTALL ${SOURCE_PATH}/ports/MSVC++/mpg123.h ${SOURCE_PATH}/src/libmpg123/fmt123.h diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json new file mode 100644 index 000000000..080bc57d0 --- /dev/null +++ b/ports/mpg123/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "mpg123", + "version-string": "1.26.3", + "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", + "homepage": "https://sourceforge.net/projects/mpg123/", + "dependencies": [ + "yasm-tool-helper" + ] +} -- cgit v1.2.3