Skip to content

Commit 899a9d5

Browse files
committed
feat: update vcpkg and deps to around 2023-03-02
This updates the following direct dependencies: * curl 8.2.1 -> 8.6.0 * fmt 10.1.1 -> 10.2.1 * giflib 5.2.1 -> removed * glfw3 3.3.8 -> 3.4 * libjpeg-turbo 3.0.0 -> removed * liblzma 5.4.3 -> removed * libpng 1.6.39 -> removed * libsodium 1.0.18 -> removed * zlib 1.3 -> 1.3.1 We cannot track anything newer at the moment as the next commit makes pkg-config run out of resources while validating Abseil packaging. See microsoft/vcpkg#37213 for more information. libsodium replaced with a vendored and modified copy of curl's `curl_base64.h` and `base64.c`.
1 parent 61477ee commit 899a9d5

File tree

8 files changed

+332
-97
lines changed

8 files changed

+332
-97
lines changed

CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ set(SIMPLEGRAPHIC_SOURCES
2525
"dep/stb/stb_image.h"
2626
"dep/stb/stb_image_resize.h"
2727
"dep/stb/stb_image_write.h"
28-
"engine/common/common.cpp"
2928
"engine/common.h"
29+
"engine/common/base64.c"
30+
"engine/common/base64.h"
31+
"engine/common/common.cpp"
3032
"engine/common/console.cpp"
3133
"engine/common/console.h"
3234
"engine/common/keylist.h"
@@ -107,7 +109,6 @@ find_package(fmt CONFIG REQUIRED)
107109
find_package(glfw3 CONFIG REQUIRED)
108110
find_package(LuaJIT REQUIRED)
109111
find_package(re2 CONFIG REQUIRED)
110-
find_package(unofficial-sodium CONFIG REQUIRED)
111112
find_package(Threads REQUIRED)
112113
find_package(ZLIB REQUIRED)
113114

@@ -151,7 +152,6 @@ target_include_directories(SimpleGraphic
151152
PRIVATE
152153
${CMAKE_CURRENT_SOURCE_DIR}/dep/glad/include
153154
${CMAKE_CURRENT_SOURCE_DIR}/dep/stb
154-
${JPEG_INCLUDE_DIR}
155155
)
156156

157157
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -188,7 +188,6 @@ target_link_libraries(SimpleGraphic
188188
imgui
189189
LuaJIT::LuaJIT
190190
re2::re2
191-
unofficial-sodium::sodium
192191
Threads::Threads
193192
ZLIB::ZLIB
194193
)

LICENSE

-82
Original file line numberDiff line numberDiff line change
@@ -175,29 +175,6 @@ without including the above copyright and permission notices.
175175

176176
*******************************************************************************
177177

178-
libsodium:
179-
180-
*******************************************************************************
181-
182-
ISC License
183-
184-
Copyright (c) 2013-2024
185-
Frank Denis <j at pureftpd dot org>
186-
187-
Permission to use, copy, modify, and/or distribute this software for any
188-
purpose with or without fee is hereby granted, provided that the above
189-
copyright notice and this permission notice appear in all copies.
190-
191-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
192-
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
193-
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
194-
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
195-
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
196-
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
197-
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
198-
199-
******************************************+++++++++++++++++++++++**************
200-
201178
re2:
202179

203180
*******************************************************************************
@@ -478,62 +455,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
478455
SOFTWARE.
479456

480457
*******************************************************************************
481-
482-
libjpeg-turbo:
483-
484-
*******************************************************************************
485-
486-
Copyright (C)2009-2019 D. R. Commander. All Rights Reserved.
487-
Copyright (C)2015 Viktor Szathmáry. All Rights Reserved.
488-
489-
Redistribution and use in source and binary forms, with or without
490-
modification, are permitted provided that the following conditions are met:
491-
492-
- Redistributions of source code must retain the above copyright notice,
493-
this list of conditions and the following disclaimer.
494-
- Redistributions in binary form must reproduce the above copyright notice,
495-
this list of conditions and the following disclaimer in the documentation
496-
and/or other materials provided with the distribution.
497-
- Neither the name of the libjpeg-turbo Project nor the names of its
498-
contributors may be used to endorse or promote products derived from this
499-
software without specific prior written permission.
500-
501-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
502-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
503-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
504-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
505-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
506-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
507-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
508-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
509-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
510-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
511-
POSSIBILITY OF SUCH DAMAGE.
512-
513-
*******************************************************************************
514-
515-
GIFLIB:
516-
517-
*******************************************************************************
518-
519-
The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond
520-
521-
Permission is hereby granted, free of charge, to any person obtaining a copy
522-
of this software and associated documentation files (the "Software"), to deal
523-
in the Software without restriction, including without limitation the rights
524-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
525-
copies of the Software, and to permit persons to whom the Software is
526-
furnished to do so, subject to the following conditions:
527-
528-
The above copyright notice and this permission notice shall be included in
529-
all copies or substantial portions of the Software.
530-
531-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
532-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
533-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
534-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
535-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
536-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
537-
THE SOFTWARE.
538-
539-
*******************************************************************************

0 commit comments

Comments
 (0)