-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[qt5-imageformats] freeglut is not a dependency on osx #9686
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
ba747c8
freeglut is not a dependency on osx
Neumann-A d73e520
[glfw3] Update to 3.3.1 (#9626)
crackedmind a982079
[akali] Update to v1.41 (#9617)
winsoft666 fc5134c
[soem] Add new port (#9572)
seanyen a3b9437
[glad] Update to 0.1.33 (#9627)
crackedmind 45d31c9
[libxml2] Apply fixes to the target of libxml2 (#9636)
Neumann-A 3367e55
[gettext] Add dependency on iconv (#9610)
375gnu 3135a31
[xlnt] Upgrade to v1.4.0 (#9609)
cnbatch ed76c7e
[cpr] Add find_dependency to cprConfig.cmake (#9567)
JackBoosY d989ad4
[gperf] Initial implementation (#9505)
matwey 2dde9fb
[sfml] Declare Windows library export (#9190)
JackBoosY ece3fc2
[qt5-base] fixing missing iconv flag in fontconfig libs (osx + linux)
Neumann-A 991c0bc
Merge remote-tracking branch 'origin/fix_qt_osx' into fix_qt_osx
Neumann-A File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: akali | ||
| Version: 1.39 | ||
| Version: 1.41 | ||
| Description: C++ Common Library. | ||
| Homepage: https://github.com/winsoft666/akali |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: cpr | ||
| Version: 1.3.0-7 | ||
| Version: 1.3.0-8 | ||
| Homepage: https://github.com/whoshuu/cpr | ||
| Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project. | ||
| Build-Depends: curl[core] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: gettext | ||
| Version: 0.19-11 | ||
| Version: 0.19-12 | ||
| Homepage: https://www.gnu.org/software/gettext/ | ||
| Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl. | ||
| Build-Depends: libiconv |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| Source: glad | ||
| Version: 0.1.31 | ||
| Version: 0.1.33 | ||
| Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs. | ||
| Build-Depends: egl-registry, opengl-registry | ||
| Homepage: https://github.com/Dav1dde/glad |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: glfw3 | ||
| Version: 3.3-3 | ||
| Version: 3.3.1 | ||
| Homepage: https://github.com/glfw/glfw | ||
| Description: GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc. |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| cmake_minimum_required(VERSION 3.0) | ||
| project(gperf LANGUAGES C CXX) | ||
|
|
||
| include(CheckCXXSourceCompiles) | ||
| include(GNUInstallDirs) | ||
|
|
||
| CHECK_CXX_SOURCE_COMPILES("int main(int n) { int dynamic_array[n]; }" HAVE_DYNAMIC_ARRAY) | ||
|
|
||
| set(LIBGP_SOURCES | ||
| lib/getline.cc | ||
| lib/getline.h | ||
| lib/getopt.c | ||
| lib/getopt.h | ||
| lib/getopt1.c | ||
| lib/hash.cc | ||
| lib/hash.h) | ||
| add_library(gp STATIC ${LIBGP_SOURCES}) | ||
| target_include_directories(gp PUBLIC "${CMAKE_SOURCE_DIR}/lib") | ||
|
|
||
| set(GPERF_SOURCES | ||
| src/bool-array.cc | ||
| src/bool-array.h | ||
| src/bool-array.icc | ||
| src/hash-table.cc | ||
| src/hash-table.h | ||
| src/input.cc | ||
| src/input.h | ||
| src/keyword-list.cc | ||
| src/keyword-list.h | ||
| src/keyword-list.icc | ||
| src/keyword.cc | ||
| src/keyword.h | ||
| src/keyword.icc | ||
| src/main.cc | ||
| src/options.cc | ||
| src/options.h | ||
| src/options.icc | ||
| src/output.cc | ||
| src/output.h | ||
| src/positions.cc | ||
| src/positions.h | ||
| src/positions.icc | ||
| src/search.cc | ||
| src/search.h | ||
| src/version.cc | ||
| src/version.h) | ||
| add_executable(gperf ${GPERF_SOURCES}) | ||
| target_link_libraries(gperf gp) | ||
| target_include_directories(gperf PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") | ||
|
|
||
| configure_file(config.h.in config.h @ONLY) | ||
|
|
||
| install(TARGETS gperf RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Source: gperf | ||
| Version: 3.1-1 | ||
| Description: GNU perfect hash function generator | ||
| Homepage: https://www.gnu.org/software/gperf/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #cmakedefine HAVE_DYNAMIC_ARRAY @HAVE_DYNAMIC_ARRAY@ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| vcpkg_fail_port_install(ON_TARGET "UWP") | ||
|
|
||
| set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) | ||
|
|
||
| vcpkg_download_distfile(ARCHIVE | ||
| URLS http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz | ||
| FILENAME gperf-3.1.tar.gz | ||
| SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4 | ||
| ) | ||
|
|
||
| vcpkg_extract_source_archive_ex( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| ARCHIVE ${ARCHIVE} | ||
| ) | ||
|
|
||
| file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) | ||
| file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) | ||
|
|
||
| vcpkg_configure_cmake( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| OPTIONS_RELEASE -DCMAKE_INSTALL_BINDIR=tools | ||
| ) | ||
|
|
||
| vcpkg_install_cmake() | ||
|
|
||
| file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) | ||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) | ||
| if(VCPKG_LIBRARY_LINKAGE STREQUAL static) | ||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) | ||
| endif() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: libxml2 | ||
| Version: 2.9.9-4 | ||
| Version: 2.9.9-5 | ||
| Homepage: https://xmlsoft.org/ | ||
| Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform) | ||
| Build-Depends: zlib, libiconv, liblzma |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: qt5-imageformats | ||
| Version: 5.12.5-2 | ||
| Version: 5.12.5-3 | ||
| Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP | ||
| Build-Depends: qt5-base, tiff, libwebp, jasper | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: sfml | ||
| Version: 2.5.1-4 | ||
| Version: 2.5.1-5 | ||
| Homepage: https://github.com/sfml/sfml | ||
| Description: Simple and fast multimedia library | ||
| Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| diff --git a/src/SFML/System/CMakeLists.txt b/src/SFML/System/CMakeLists.txt | ||
| index d1b712d..5c12801 100644 | ||
| --- a/src/SFML/System/CMakeLists.txt | ||
| +++ b/src/SFML/System/CMakeLists.txt | ||
| @@ -96,7 +96,7 @@ endif() | ||
| if(SFML_OS_LINUX) | ||
| target_link_libraries(sfml-system PRIVATE rt) | ||
| elseif(SFML_OS_WINDOWS) | ||
| - target_link_libraries(sfml-system PRIVATE winmm) | ||
| + target_link_libraries(sfml-system PUBLIC winmm) | ||
| elseif(SFML_OS_ANDROID) | ||
| target_link_libraries(sfml-system PRIVATE android log) | ||
| endif() | ||
| diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt | ||
| index 98ea439..53c1ac7 100644 | ||
| --- a/src/SFML/Window/CMakeLists.txt | ||
| +++ b/src/SFML/Window/CMakeLists.txt | ||
| @@ -276,7 +276,7 @@ if(SFML_OS_LINUX) | ||
| sfml_find_package(UDev INCLUDE "UDEV_INCLUDE_DIR" LINK "UDEV_LIBRARIES") | ||
| target_link_libraries(sfml-window PRIVATE UDev) | ||
| elseif(SFML_OS_WINDOWS) | ||
| - target_link_libraries(sfml-window PRIVATE winmm gdi32) | ||
| + target_link_libraries(sfml-window PUBLIC winmm gdi32) | ||
| elseif(SFML_OS_FREEBSD) | ||
| target_link_libraries(sfml-window PRIVATE usbhid) | ||
| elseif(SFML_OS_MACOSX) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.