diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 4af03f85e8..89cbf32982 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libwebp", "version": "1.6.0", - "port-version": 2, + "port-version": 3, "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "license": "BSD-3-Clause", @@ -208,7 +208,7 @@ "vwebp" ] }, - "sdl1" + "sdl2" ] } } diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 3d6cda48f5..f378904c15 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( fix-min-max-macro.patch fix-error-c3861.patch android.diff + sdl2-plugin.patch ) file(REMOVE @@ -67,8 +68,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS nvtt CMAKE_REQUIRE_FIND_PACKAGE_NVTT openexr BUILD_OSG_PLUGIN_EXR openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR - sdl1 BUILD_OSG_PLUGIN_SDL - sdl1 VCPKG_LOCK_FIND_PACKAGE_SDL + sdl BUILD_OSG_PLUGIN_SDL + sdl VCPKG_LOCK_FIND_PACKAGE_SDL2 ) # The package osg can be configured to use different OpenGL profiles via a custom triplet file: @@ -123,6 +124,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=ON + -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON ${OPTIONS} OPTIONS_DEBUG -DBUILD_OSG_APPLICATIONS=OFF diff --git a/ports/osg/sdl2-plugin.patch b/ports/osg/sdl2-plugin.patch new file mode 100644 index 0000000000..83a9580136 --- /dev/null +++ b/ports/osg/sdl2-plugin.patch @@ -0,0 +1,28 @@ +diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt +index 812550412..cc4db9ee4 100644 +--- a/src/osgPlugins/CMakeLists.txt ++++ b/src/osgPlugins/CMakeLists.txt +@@ -299,9 +299,9 @@ ENDIF() + # + # Device integration plugins + # +-IF (SDL_FOUND) ++IF (SDL2_FOUND) + ADD_PLUGIN_DIRECTORY(sdl) +-ENDIF(SDL_FOUND) ++ENDIF(SDL2_FOUND) + + IF(ASIO_FOUND) + ADD_PLUGIN_DIRECTORY(RestHttpDevice) +diff --git a/src/osgPlugins/sdl/CMakeLists.txt b/src/osgPlugins/sdl/CMakeLists.txt +index ff1502e36..fcb584e6b 100644 +--- a/src/osgPlugins/sdl/CMakeLists.txt ++++ b/src/osgPlugins/sdl/CMakeLists.txt +@@ -1,5 +1,5 @@ +-SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ) +-INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ) ++SET(TARGET_EXTERNAL_LIBRARIES ${SDL2_LIBRARY} ) ++INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR} ) + + SET(TARGET_SRC + JoystickDevice.cpp diff --git a/ports/osg/usage b/ports/osg/usage index 7b7388febe..8eae996bc9 100644 --- a/ports/osg/usage +++ b/ports/osg/usage @@ -1,5 +1,5 @@ -The package osg can be configured to use different OpenGL profiles via a custom triplet file. -Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3 and GLES2+GLES3. -The default value is GL2. If you want use other profiles, please add the following -code to a custom triplet file. -set(osg_OPENGL_PROFILE GL3) +The package osg can be configured to use different OpenGL profiles via a custom triplet file. +Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3 and GLES2+GLES3. +The default value is GL2. If you want use other profiles, please add the following +code to a custom triplet file. +set(osg_OPENGL_PROFILE GL3) diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index a71d95a666..ca9cdd354f 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 27, + "port-version": 28, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, @@ -145,10 +145,10 @@ } ] }, - "sdl1": { - "description": "Build SDL 1 plugin, and enable SDL 1 app features", + "sdl": { + "description": "Build SDL plugin, and enable SDL app features", "dependencies": [ - "sdl1" + "sdl2" ] }, "tools": { diff --git a/ports/sdl1-mixer/SDL_mixer.vcxproj.in b/ports/sdl1-mixer/SDL_mixer.vcxproj.in deleted file mode 100644 index 1ea5182d74..0000000000 --- a/ports/sdl1-mixer/SDL_mixer.vcxproj.in +++ /dev/null @@ -1,302 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33} - SDL_mixer - - - - @LIB_TYPE@ - v141 - false - - - @LIB_TYPE@ - v141 - false - - - @LIB_TYPE@ - v141 - false - - - @LIB_TYPE@ - v141 - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.28307.799 - - - .\Debug\ - .\Debug\ - true - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - .\Release\ - .\Release\ - false - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/SDL_mixer.tlb - - - - /D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions) - Disabled - ..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) - true - @CRT_TYPE_DBG@ - .\Debug/SDL_mixer.pch - Level3 - true - OldStyle - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;SDL.lib;%(AdditionalDependencies) - true - .\Debug/SDL_mixer.pdb - Windows - MachineX86 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Debug/SDL_mixer.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/SDL_mixer.tlb - - - - /D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions) - Disabled - ..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) - true - @CRT_TYPE_DBG@ - .\Debug/SDL_mixer.pch - Level3 - true - OldStyle - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;SDL.lib;%(AdditionalDependencies) - true - .\Debug/SDL_mixer.pdb - Windows - MachineX64 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Debug/SDL_mixer.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/SDL_mixer.tlb - - - - /D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline - ..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/SDL_mixer.pch - Level3 - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;SDL.lib;%(AdditionalDependencies) - .\Release/SDL_mixer.pdb - Windows - MachineX86 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Release/SDL_mixer.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/SDL_mixer.tlb - - - - /D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline - ..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/SDL_mixer.pch - Level3 - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;SDL.lib;%(AdditionalDependencies) - .\Release/SDL_mixer.pdb - Windows - MachineX64 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Release/SDL_mixer.bsc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ebda67ca-4a23-4f22-bfbc-b8dbe0580d4f} - false - - - {b162b6f1-e876-4d5f-a1f6-e3a6dc2f4a2c} - false - - - - - - \ No newline at end of file diff --git a/ports/sdl1-mixer/SDL_mixer_2017.sln.in b/ports/sdl1-mixer/SDL_mixer_2017.sln.in deleted file mode 100644 index 1437f38588..0000000000 --- a/ports/sdl1-mixer/SDL_mixer_2017.sln.in +++ /dev/null @@ -1,70 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1321 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_mixer", "SDL_mixer.vcxproj", "{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "native_midi\native_midi.vcxproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playmus", "playmus\playmus.vcxproj", "{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playwave", "playwave\playwave.vcxproj", "{AC86CEAA-9908-476F-B15F-C7193CEF81BD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "timidity\timidity.vcxproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.ActiveCfg = Debug|Win32 - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.Build.0 = Debug|Win32 - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.ActiveCfg = Debug|x64 - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.Build.0 = Debug|x64 - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.ActiveCfg = Release|Win32 - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.Build.0 = Release|Win32 - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.ActiveCfg = Release|x64 - {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.Build.0 = Release|x64 - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.ActiveCfg = Debug|Win32 - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.Build.0 = Debug|Win32 - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.ActiveCfg = Debug|x64 - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.Build.0 = Debug|x64 - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.ActiveCfg = Release|Win32 - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.Build.0 = Release|Win32 - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.ActiveCfg = Release|x64 - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.Build.0 = Release|x64 - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.ActiveCfg = Debug|Win32 - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.Build.0 = Debug|Win32 - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.ActiveCfg = Debug|x64 - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.Build.0 = Debug|x64 - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.ActiveCfg = Release|Win32 - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.Build.0 = Release|Win32 - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.ActiveCfg = Release|x64 - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.Build.0 = Release|x64 - {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.Build.0 = Debug|Win32 - {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.ActiveCfg = Debug|x64 - {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.Build.0 = Debug|x64 - {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.ActiveCfg = Release|Win32 - {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.Build.0 = Release|Win32 - {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.ActiveCfg = Release|x64 - {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.Build.0 = Release|x64 - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.ActiveCfg = Debug|Win32 - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.Build.0 = Debug|Win32 - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.ActiveCfg = Debug|x64 - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.Build.0 = Debug|x64 - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.ActiveCfg = Release|Win32 - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.Build.0 = Release|Win32 - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.ActiveCfg = Release|x64 - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F6077CF7-C552-4A55-AB30-0E159B015586} - EndGlobalSection -EndGlobal diff --git a/ports/sdl1-mixer/mpg123_ssize_t.patch b/ports/sdl1-mixer/mpg123_ssize_t.patch deleted file mode 100644 index 8cead24876..0000000000 --- a/ports/sdl1-mixer/mpg123_ssize_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/dynamic_mp3.c b/dynamic_mp3.c -index 7c3209f0..ba80ee7a 100644 ---- a/dynamic_mp3.c -+++ b/dynamic_mp3.c -@@ -63,7 +63,7 @@ int Mix_InitMP3(void) - #else - FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) - #endif -- FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) -+ FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, mpg123_ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) - FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence )) - FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh)) - if (mpg123.mpg123_init() != MPG123_OK) { -diff --git a/dynamic_mp3.h b/dynamic_mp3.h -index 2e4c48af..ad63bf76 100644 ---- a/dynamic_mp3.h -+++ b/dynamic_mp3.h -@@ -43,7 +43,7 @@ typedef struct { - #else - int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); - #endif -- int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); -+ int (*mpg123_replace_reader_handle)( mpg123_handle *mh, mpg123_ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); - off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence ); - const char* (*mpg123_strerror)(mpg123_handle *mh); - } mpg123_loader; -diff --git a/music_mpg.c b/music_mpg.c -index 531615a2..7d92c28b 100644 ---- a/music_mpg.c -+++ b/music_mpg.c -@@ -67,8 +67,8 @@ mpg_err(mpg123_handle* mpg, int code) - - /* we're gonna override mpg123's I/O with these wrappers for RWops */ - static --ssize_t rwops_read(void* p, void* dst, size_t n) { -- return (ssize_t)MP3_RWread((struct mp3file_t *)p, dst, 1, n); -+mpg123_ssize_t rwops_read(void* p, void* dst, size_t n) { -+ return (mpg123_ssize_t)MP3_RWread((struct mp3file_t *)p, dst, 1, n); - } - - static diff --git a/ports/sdl1-mixer/native_midi.vcxproj.in b/ports/sdl1-mixer/native_midi.vcxproj.in deleted file mode 100644 index eb31ce1dbe..0000000000 --- a/ports/sdl1-mixer/native_midi.vcxproj.in +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F} - - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.28307.799 - - - .\Release\ - .\Release\ - - - .\Debug\ - .\Debug\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/native_midi.pch - Level3 - - - 0x0409 - - - true - .\Release/native_midi.bsc - - - - - Disabled - ..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - .\Debug/native_midi.pch - Level3 - true - OldStyle - - - 0x0409 - - - true - .\Debug/native_midi.bsc - - - - - X64 - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/native_midi.pch - Level3 - - - 0x0409 - - - true - .\Release/native_midi.bsc - - - - - X64 - - - Disabled - ..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - .\Debug/native_midi.pch - Level3 - true - OldStyle - - - 0x0409 - - - true - .\Debug/native_midi.bsc - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ports/sdl1-mixer/playmus.vcxproj.in b/ports/sdl1-mixer/playmus.vcxproj.in deleted file mode 100644 index ba6e37f8e4..0000000000 --- a/ports/sdl1-mixer/playmus.vcxproj.in +++ /dev/null @@ -1,247 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {72CB0DD4-051D-486C-9CB3-75FE16F7D87A} - 10.0.17763.0 - - - - Application - v141 - false - - - Application - v141 - false - - - Application - v141 - false - - - Application - v141 - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.28307.799 - - - .\Debug\ - .\Debug\ - true - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - .\Release\ - .\Release\ - false - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/playmus.tlb - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_DBG@ - .\Debug/playmus.pch - Level3 - true - OldStyle - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) - true - .\Debug/playmus.pdb - Windows - MachineX86 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Debug/playmus.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/playmus.tlb - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_DBG@ - .\Debug/playmus.pch - Level3 - true - OldStyle - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) - true - .\Debug/playmus.pdb - Windows - MachineX64 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Debug/playmus.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/playmus.tlb - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/playmus.pch - Level3 - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/playmus.pdb - Windows - MachineX86 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Release/playmus.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/playmus.tlb - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/playmus.pch - Level3 - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/playmus.pdb - Windows - MachineX64 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Release/playmus.bsc - - - - - - - - {f7e944b3-0815-40cd-b3e4-90b2a15b0e33} - false - - - - - - \ No newline at end of file diff --git a/ports/sdl1-mixer/playwave.vcxproj.in b/ports/sdl1-mixer/playwave.vcxproj.in deleted file mode 100644 index 05fe623414..0000000000 --- a/ports/sdl1-mixer/playwave.vcxproj.in +++ /dev/null @@ -1,247 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {AC86CEAA-9908-476F-B15F-C7193CEF81BD} - 10.0.17763.0 - - - - Application - v141 - false - - - Application - v141 - false - - - Application - v141 - false - - - Application - v141 - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.28307.799 - - - .\Release\ - .\Release\ - false - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - .\Debug\ - .\Debug\ - true - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/playwave.tlb - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/playwave.pch - Level3 - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/playwave.pdb - Windows - MachineX86 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Release/playwave.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/playwave.tlb - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/playwave.pch - Level3 - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/playwave.pdb - Windows - MachineX64 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Release/playwave.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/playwave.tlb - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_DBG@ - .\Debug/playwave.pch - Level3 - true - OldStyle - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) - true - .\Debug/playwave.pdb - Windows - MachineX86 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Debug/playwave.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/playwave.tlb - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_DBG@ - .\Debug/playwave.pch - Level3 - true - OldStyle - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) - true - .\Debug/playwave.pdb - Windows - MachineX64 - @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) - - - true - .\Debug/playwave.bsc - - - - - - - - {f7e944b3-0815-40cd-b3e4-90b2a15b0e33} - false - - - - - - \ No newline at end of file diff --git a/ports/sdl1-mixer/portfile.cmake b/ports/sdl1-mixer/portfile.cmake deleted file mode 100644 index 8cff3ac970..0000000000 --- a/ports/sdl1-mixer/portfile.cmake +++ /dev/null @@ -1,78 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO libsdl-org/SDL_mixer - REF 4c93e0b4bcc3d5ecfd865190f664de6b2c837018 - SHA512 a6beed48c7a804aa5e52c3883edb6edd09b073ffec3481ce5fb27fee020ca4364525d0760e0532d3233a5e0f1500780c2994d9bb9ffcf79047bb6766b818bb0e - HEAD_REF SDL-1.2 - PATCHES - mpg123_ssize_t.patch -) - -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - configure_file("${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL_mixer_2017.sln" COPYONLY) - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LIB_TYPE StaticLibrary) - else() - set(LIB_TYPE DynamicLibrary) - endif() - - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(CRT_TYPE_DBG MultiThreadedDebugDLL) - set(CRT_TYPE_REL MultiThreadedDLL) - else() - set(CRT_TYPE_DBG MultiThreadedDebug) - set(CRT_TYPE_REL MultiThreaded) - endif() - - configure_file("${CURRENT_PORT_DIR}/SDL_mixer.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL_mixer.vcxproj" @ONLY) - configure_file("${CURRENT_PORT_DIR}/native_midi.vcxproj.in" "${SOURCE_PATH}/VisualC/native_midi/native_midi.vcxproj" @ONLY) - configure_file("${CURRENT_PORT_DIR}/timidity.vcxproj.in" "${SOURCE_PATH}/VisualC/timidity/timidity.vcxproj" @ONLY) - configure_file("${CURRENT_PORT_DIR}/playmus.vcxproj.in" "${SOURCE_PATH}/VisualC/playmus/playmus.vcxproj" @ONLY) - configure_file("${CURRENT_PORT_DIR}/playwave.vcxproj.in" "${SOURCE_PATH}/VisualC/playwave/playwave.vcxproj" @ONLY) - - # This text file gets copied as a library, and included as one in the package - file(REMOVE "${SOURCE_PATH}/external/libmikmod/COPYING.LIB") - - # Remove unused external dlls - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libFLAC-8.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libmikmod-2.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libmpg123-0.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libogg-0.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libvorbis-0.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libvorbisfile-3.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libFLAC-8.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libmikmod-2.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libmpg123-0.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libogg-0.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libvorbis-0.dll") - file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libvorbisfile-3.dll") - - file(WRITE "${SOURCE_PATH}/Directory.Build.props" " - - - - ${CURRENT_PACKAGES_DIR}/include;${CURRENT_PACKAGES_DIR}/include/SDL;${CURRENT_INSTALLED_DIR}/include;${CURRENT_INSTALLED_DIR}/include/SDL - - - ") - - vcpkg_msbuild_install( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH VisualC/SDL_mixer_2017.sln - ) - file(COPY "${SOURCE_PATH}/SDL_mixer.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/SDL") -else() - vcpkg_make_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - --enable-music-fluidsynth-midi=no - INCLUDE=#[[ empty ]] - ) - vcpkg_make_install() - vcpkg_fixup_pkgconfig() -endif() - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/sdl1-mixer/timidity.vcxproj.in b/ports/sdl1-mixer/timidity.vcxproj.in deleted file mode 100644 index 2689aefac0..0000000000 --- a/ports/sdl1-mixer/timidity.vcxproj.in +++ /dev/null @@ -1,201 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C} - timidity - - - - StaticLibrary - false - v141 - - - StaticLibrary - false - v141 - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.28307.799 - - - .\Release\ - .\Release\ - - - .\Debug\ - .\Debug\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/timidity.pch - Level3 - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - 0x0409 - - - true - .\Release/timidity.bsc - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - .\Debug/timidity.pch - Level3 - true - OldStyle - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - 0x0409 - - - true - .\Debug/timidity.bsc - - - - - X64 - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - .\Release/timidity.pch - Level3 - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - 0x0409 - - - true - .\Release/timidity.bsc - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - .\Debug/timidity.pch - Level3 - true - OldStyle - @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL - - - 0x0409 - - - true - .\Debug/timidity.bsc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ports/sdl1-mixer/usage b/ports/sdl1-mixer/usage deleted file mode 100644 index a2df185a9d..0000000000 --- a/ports/sdl1-mixer/usage +++ /dev/null @@ -1,5 +0,0 @@ -sdl1-mixer is compatible with built-in CMake variables: - - find_package(SDL_mixer REQUIRED) - target_include_directories(main PRIVATE ${SDL_MIXER_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${SDL_MIXER_LIBRARIES}) diff --git a/ports/sdl1-mixer/vcpkg.json b/ports/sdl1-mixer/vcpkg.json deleted file mode 100644 index 854b40b7cb..0000000000 --- a/ports/sdl1-mixer/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "sdl1-mixer", - "version-date": "2025-09-10", - "description": "An audio mixer that supports various file formats for Simple Directmedia Layer.", - "homepage": "https://www.libsdl.org", - "license": "Zlib", - "supports": "!osx & !uwp & !arm", - "dependencies": [ - "libflac", - "libmikmod", - "libogg", - "libvorbis", - "mpg123", - "sdl1", - { - "name": "vcpkg-make", - "platform": "!windows | mingw" - }, - { - "name": "vcpkg-msbuild", - "host": true, - "platform": "windows & !mingw" - } - ] -} diff --git a/ports/sdl1-net/CMakeLists.txt b/ports/sdl1-net/CMakeLists.txt deleted file mode 100644 index 1e1f951712..0000000000 --- a/ports/sdl1-net/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(SDL1_NET C) - -if (MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996") -endif() - -find_package(SDL) - -add_library(SDL_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc) - -set_target_properties(SDL_net PROPERTIES DEFINE_SYMBOL SDL1_EXPORTS) -target_compile_definitions(SDL_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS) -target_include_directories(SDL_net PRIVATE ${SDL_INCLUDE_DIR}) -target_link_libraries(SDL_net ${SDL_LIBRARY} ws2_32 iphlpapi) - -install(TARGETS SDL_net - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -if(NOT DEFINED SDL_NET_SKIP_HEADERS) - install(FILES SDL_net.h DESTINATION include) -endif() - -message(STATUS "Link-time dependencies:") -message(STATUS " " ${SDL_LIBRARY}) diff --git a/ports/sdl1-net/portfile.cmake b/ports/sdl1-net/portfile.cmake deleted file mode 100644 index 2f21e84157..0000000000 --- a/ports/sdl1-net/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz" - FILENAME "SDL_net-1.2.8.tar.gz" - SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE "${ARCHIVE}" -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG - -DSDL_NET_SKIP_HEADERS=ON) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdl1-net/vcpkg.json b/ports/sdl1-net/vcpkg.json deleted file mode 100644 index 6be7f0e4c6..0000000000 --- a/ports/sdl1-net/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "sdl1-net", - "version": "1.2.8", - "port-version": 6, - "description": "Networking library for SDL", - "dependencies": [ - "sdl1", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/sdl1/SDL.vcxproj.in b/ports/sdl1/SDL.vcxproj.in deleted file mode 100644 index 4c0bcce612..0000000000 --- a/ports/sdl1/SDL.vcxproj.in +++ /dev/null @@ -1,462 +0,0 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} - SDL - - - - @LIB_TYPE@ - v141 - false - - - @LIB_TYPE@ - v141 - false - - - @LIB_TYPE@ - v141 - false - - - @LIB_TYPE@ - v141 - false - - - @LIB_TYPE@ - v141 - false - - - @LIB_TYPE@ - v141 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.27924.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/SDL.tlb - - - Disabled - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - false - - .\Debug/SDL.pch - Level3 - true - OldStyle - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Debug/SDL.dll - true - false - true - .\Debug/SDL.pdb - Windows - false - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/SDL.tlb - - - Disabled - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - false - - .\Debug/SDL.pch - Level3 - true - OldStyle - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Debug/SDL.dll - true - false - true - .\Debug/SDL.pdb - Windows - MachineX64 - false - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/SDL.tlb - - - Disabled - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - false - - - .\Debug/SDL.pch - Level3 - true - OldStyle - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Debug/SDL.dll - true - false - true - .\Debug/SDL.pdb - Windows - false - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/SDL.tlb - - - OnlyExplicitInline - false - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - false - true - - .\Release/SDL.pch - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/SDL.dll - true - false - .\Release/SDL.pdb - Windows - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/SDL.tlb - - - OnlyExplicitInline - false - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - false - true - - .\Release/SDL.pch - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/SDL.dll - true - false - .\Release/SDL.pdb - Windows - MachineX64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/SDL.tlb - - - OnlyExplicitInline - false - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - false - true - - - .\Release/SDL.pch - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/SDL.dll - true - false - .\Release/SDL.pdb - Windows - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ports/sdl1/SDL1_2017.sln.in b/ports/sdl1/SDL1_2017.sln.in deleted file mode 100644 index 811f89448a..0000000000 --- a/ports/sdl1/SDL1_2017.sln.in +++ /dev/null @@ -1,65 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2003 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM64 = Debug|ARM64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_NoSTDIO|ARM64 = Release_NoSTDIO|ARM64 - Release_NoSTDIO|Win32 = Release_NoSTDIO|Win32 - Release_NoSTDIO|x64 = Release_NoSTDIO|x64 - Release|ARM64 = Release|ARM64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|ARM64.Build.0 = Debug|ARM64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|ARM64.ActiveCfg = Release|ARM64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|ARM64.Build.0 = Release|ARM64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.Build.0 = Release|Win32 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.ActiveCfg = Release|x64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.Build.0 = Release|x64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|ARM64.ActiveCfg = Release|ARM64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|ARM64.Build.0 = Release|ARM64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|ARM64.Build.0 = Debug|ARM64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|ARM64.ActiveCfg = Release_NoSTDIO|ARM64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|ARM64.Build.0 = Release_NoSTDIO|ARM64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.ActiveCfg = Release_NoSTDIO|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.Build.0 = Release_NoSTDIO|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.ActiveCfg = Release_NoSTDIO|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.Build.0 = Release_NoSTDIO|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|ARM64.ActiveCfg = Release|ARM64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|ARM64.Build.0 = Release|ARM64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D0FB7C52-B8AE-4A23-A002-2F7DEF5F6BD6} - EndGlobalSection -EndGlobal diff --git a/ports/sdl1/SDLmain.vcxproj.in b/ports/sdl1/SDLmain.vcxproj.in deleted file mode 100644 index 5d393f8d58..0000000000 --- a/ports/sdl1/SDLmain.vcxproj.in +++ /dev/null @@ -1,313 +0,0 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release_NoSTDIO - ARM64 - - - Release_NoSTDIO - Win32 - - - Release_NoSTDIO - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} - - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.27924.0 - - - .\Release\ - .\Release\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - .\Release_NOSTDIO\ - .\Release_NOSTDIO\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - .\Debug\ - .\Debug\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - - .\Release/SDLmain.pch - Level3 - Default - - - - - X64 - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - - .\Release/SDLmain.pch - Level3 - Default - - - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - - - .\Release/SDLmain.pch - Level3 - Default - - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - - .\Release_NOSTDIO/SDLmain.pch - Level3 - Default - - - - - X64 - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - - .\Release_NOSTDIO/SDLmain.pch - Level3 - Default - - - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) - true - @CRT_TYPE_REL@ - true - - - .\Release_NOSTDIO/SDLmain.pch - Level3 - Default - - - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - - .\Debug/SDLmain.pch - Level3 - OldStyle - Default - - - - - X64 - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - - .\Debug/SDLmain.pch - Level3 - OldStyle - Default - - - - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - @CRT_TYPE_DBG@ - - - .\Debug/SDLmain.pch - Level3 - OldStyle - Default - - - - - - - - - \ No newline at end of file diff --git a/ports/sdl1/export-symbols-only-in-shared-build.patch b/ports/sdl1/export-symbols-only-in-shared-build.patch deleted file mode 100644 index c1ea96dc3b..0000000000 --- a/ports/sdl1/export-symbols-only-in-shared-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r 8df7a59b5528 -r 46ec9baae30c include/begin_code.h ---- a/include/begin_code.h Fri Sep 22 11:25:52 2017 -0700 -+++ b/include/begin_code.h Sun Sep 24 14:32:30 2017 +0300 -@@ -54,8 +54,10 @@ - # else - # define DECLSPEC __declspec(dllimport) - # endif -+# elif defined(_DLL) -+# define DECLSPEC __declspec(dllexport) - # else --# define DECLSPEC __declspec(dllexport) -+# define DECLSPEC - # endif - # elif defined(__OS2__) - # ifdef __WATCOMC__ diff --git a/ports/sdl1/fix-gcc15-function-signatures.patch b/ports/sdl1/fix-gcc15-function-signatures.patch deleted file mode 100644 index 2fada451c2..0000000000 --- a/ports/sdl1/fix-gcc15-function-signatures.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c -index 2cead35..7364078 100644 ---- a/src/video/Xext/XME/xme.c -+++ b/src/video/Xext/XME/xme.c -@@ -206,7 +206,7 @@ static char *xigmisc_extension_name = XIGMISC_PROTOCOL_NAME; - /* - * find_display - locate the display info block - */ --static int XiGMiscCloseDisplay(); -+static int XiGMiscCloseDisplay(Display *, XExtCodes *); - - static XExtensionHooks xigmisc_extension_hooks = { - NULL, /* create_gc */ -diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c -index 4ff42eb..ba07fdd 100644 ---- a/src/video/Xext/Xinerama/Xinerama.c -+++ b/src/video/Xext/Xinerama/Xinerama.c -@@ -50,7 +50,7 @@ static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME; - #define PanoramiXSimpleCheckExtension(dpy,i) \ - XextSimpleCheckExtension (dpy, i, panoramiX_extension_name) - --static int close_display(); -+static int close_display(Display *, XExtCodes *); - static /* const */ XExtensionHooks panoramiX_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ -diff --git a/src/video/Xext/Xv/Xv.c b/src/video/Xext/Xv/Xv.c -index 7147b9e..dcdb710 100644 ---- a/src/video/Xext/Xv/Xv.c -+++ b/src/video/Xext/Xv/Xv.c -@@ -63,9 +63,9 @@ static char *xv_extension_name = XvName; - #define XvCheckExtension(dpy, i, val) \ - XextCheckExtension(dpy, i, xv_extension_name, val) - --static char *xv_error_string(); --static int xv_close_display(); --static Bool xv_wire_to_event(); -+static char *xv_error_string(Display *, int, XExtCodes *, char *, int); -+static int xv_close_display(Display *, XExtCodes *); -+static Bool xv_wire_to_event(Display *, XEvent *, xEvent *); - - static XExtensionHooks xv_extension_hooks = { - NULL, /* create_gc */ diff --git a/ports/sdl1/fix-linux-build.patch b/ports/sdl1/fix-linux-build.patch deleted file mode 100644 index f6ad36c2d6..0000000000 --- a/ports/sdl1/fix-linux-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h -index 4875b98..10bf365 100644 ---- a/src/video/x11/SDL_x11sym.h -+++ b/src/video/x11/SDL_x11sym.h -@@ -165,7 +165,7 @@ SDL_X11_SYM(Bool,XShmQueryExtension,(Display* a),(a),return) - */ - #ifdef LONG64 - SDL_X11_MODULE(IO_32BIT) --SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) -+SDL_X11_SYM(int,_XData32,(Display *dpy,_Xconst register long *data,unsigned len),(dpy,data,len),return) - SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) - #endif - diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake deleted file mode 100644 index b6c4012a76..0000000000 --- a/ports/sdl1/portfile.cmake +++ /dev/null @@ -1,84 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO SDL-Mirror/SDL - REF release-1.2.15 - SHA512 38b94a650ec205377ae1503d0ec8a5254ef6d50ed0acac8d985b57b64bc16ea042cfa41e19e5ef8317980c4afb83186829f5bc3da9433d0a649dfd10554801b5 - HEAD_REF master - PATCHES - export-symbols-only-in-shared-build.patch - fix-linux-build.patch - sdl-config.patch - fix-gcc15-function-signatures.patch -) - -configure_file("${SOURCE_PATH}/include/SDL_config.h.default" "${SOURCE_PATH}/include/SDL_config.h" COPYONLY) - -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - configure_file("${CURRENT_PORT_DIR}/SDL1_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL1_2017.sln" COPYONLY) - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LIB_TYPE StaticLibrary) - else() - set(LIB_TYPE DynamicLibrary) - endif() - - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(CRT_TYPE_DBG MultiThreadedDebugDLL) - set(CRT_TYPE_REL MultiThreadedDLL) - else() - set(CRT_TYPE_DBG MultiThreadedDebug) - set(CRT_TYPE_REL MultiThreaded) - endif() - - configure_file("${CURRENT_PORT_DIR}/SDL.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj" @ONLY) - configure_file("${CURRENT_PORT_DIR}/SDLmain.vcxproj.in" "${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj" @ONLY) - - # This text file gets copied as a library, and included as one in the package - file(REMOVE_RECURSE "${SOURCE_PATH}/src/hermes/COPYING.LIB") - - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH VisualC/SDL1_2017.sln - ) - - #Take all the fils into include/SDL to sovle conflict with SDL2 port - file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/SDL") - - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib") - if(NOT DEFINED VCPKG_BUILD_TYPE) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDLmaind.lib") - endif() -else() - if(VCPKG_TARGET_IS_LINUX) - message("libgles2-mesa-dev must be installed before sdl1 can build. Install it with \"apt install libgles2-mesa-dev\".") - endif() - - find_program(WHICH_COMMAND NAMES which) - if(NOT WHICH_COMMAND) - set(polyfill_scripts "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-bin") - file(REMOVE_RECURSE "${polyfill_scripts}") - file(MAKE_DIRECTORY "${polyfill_scripts}") - vcpkg_host_path_list(APPEND ENV{PATH} "${polyfill_scripts}") - # sdl's autoreconf.sh needs `which`, but our msys root doesn't have it. - file(WRITE "${polyfill_scripts}/which" "#!/bin/sh\nif test -f \"/usr/bin/\$1\"; then echo \"/usr/bin/\$1\"; else false; fi\n") - file(CHMOD "${polyfill_scripts}/which" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) - endif() - - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - --disable-pulseaudio - --disable-video-directfb - ) - - vcpkg_install_make() - vcpkg_fixup_pkgconfig() - - file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3" - ) -endif() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/sdl1/sdl-config.patch b/ports/sdl1/sdl-config.patch deleted file mode 100644 index 0851ade5d0..0000000000 --- a/ports/sdl1/sdl-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sdl-config.in b/sdl-config.in -index e0fcc0c..de602d8 100644 ---- a/sdl-config.in -+++ b/sdl-config.in -@@ -1,6 +1,7 @@ - #!/bin/sh - --prefix=@prefix@ -+DIRNAME=$(dirname $0) -+prefix=$(CDPATH= cd -- "${DIRNAME%/tools/sdl1/*}" && pwd -P) - exec_prefix=@exec_prefix@ - exec_prefix_set=no - libdir=@libdir@ diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json deleted file mode 100644 index 8a650a6f3e..0000000000 --- a/ports/sdl1/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "sdl1", - "version": "1.2.15", - "port-version": 24, - "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", - "homepage": "https://www.libsdl.org", - "license": "LGPL-2.1-or-later", - "supports": "!android & !osx & !uwp", - "dependencies": [ - { - "name": "vcpkg-msbuild", - "host": true, - "platform": "windows & !mingw" - } - ] -} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5a3d8ac478..6d90bdf067 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -970,6 +970,7 @@ openvino:arm64-linux=skip openvino:arm64-osx=skip # conflicts with kleidiai openvino:arm64-windows-static-md=fail openvino:arm64-windows=fail +openvino:x64-linux=fail openvr:x64-windows-static=fail openxr-loader:arm64-linux=fail openzl:arm64-windows-static-md=fail @@ -1035,7 +1036,6 @@ rtmidi:x64-android=fail salome-medcoupling:x64-linux=fail saucer:arm64-osx=fail # std::move_only_function is not supported saucer:x64-linux=fail # requires gcc14 or later -sdl1:arm64-linux=fail sentry-native:arm64-linux=fail septag-sx:x64-android=fail sfgui:arm-neon-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 19eb96f4b6..542407f4cd 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -987,12 +987,11 @@ openzl:x64-windows=fail orc:arm64-linux=fail orc(android)=fail # try_run for time_t properties osg:arm64-linux=fail -osg[examples]:arm64-linux=cascade +osg[examples]:arm64-linux=combination-fails osg[nvtt](android | arm)=cascade -osg[plugins]:arm64-linux=cascade -osg[sdl1]:arm64-linux=cascade -osg[sdl1](android | osx)=cascade -osg[tools]:arm64-linux=cascade +osg[plugins]:arm64-linux=combination-fails +osg[sdl]:arm64-linux=combination-fails +osg[tools]:arm64-linux=combination-fails osg-qt:arm64-linux=cascade osgearth:arm64-linux=cascade osgearth[tools]:arm64-osx=feature-fails # Undefined _NSSearchPathForDirectoriesInDomains @@ -1274,10 +1273,6 @@ saucer:arm64-linux=cascade saucer:arm64-osx=fail # std::move_only_function is not supported saucer:x64-linux=fail # requires gcc14 or later sdformat13:x64-windows-static=cascade -sdl1:arm64-linux=fail -sdl1-mixer(android)=cascade -sdl1-net:arm64-linux=cascade -sdl1-net(android | osx)=cascade sdl2-gfx:arm64-linux=cascade sdl2-mixer-ext:arm64-linux=cascade sdl2-net:arm64-linux=cascade diff --git a/versions/baseline.json b/versions/baseline.json index 99a260724f..bdb422c114 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5962,7 +5962,7 @@ }, "libwebp": { "baseline": "1.6.0", - "port-version": 2 + "port-version": 3 }, "libwebsockets": { "baseline": "4.5.8", @@ -7638,7 +7638,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 27 + "port-version": 28 }, "osg-qt": { "baseline": "Qt5", @@ -9172,18 +9172,6 @@ "baseline": "15.4.0", "port-version": 0 }, - "sdl1": { - "baseline": "1.2.15", - "port-version": 24 - }, - "sdl1-mixer": { - "baseline": "2025-09-10", - "port-version": 0 - }, - "sdl1-net": { - "baseline": "1.2.8", - "port-version": 6 - }, "sdl2": { "baseline": "2.32.10", "port-version": 1 diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 2e07e3f571..0ee56a52b0 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2ed152baa0795e889f73476fd0bc8e35dafd40b", + "version": "1.6.0", + "port-version": 3 + }, { "git-tree": "5366c6ab4c6a5ece31ab06309b9729d29a5d4da1", "version": "1.6.0", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 2515f254d7..7116d14c95 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcd5d7a462b210af131ed70658c249ff9a2a610f", + "version": "3.6.5", + "port-version": 28 + }, { "git-tree": "8cade93544c5e86bae462e7ac5667d6bb2ed6f04", "version": "3.6.5",