-
Notifications
You must be signed in to change notification settings - Fork 5
Update Freedesktop runtime to 25.08 #38
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
Open
dgruss
wants to merge
5
commits into
flathub:master
Choose a base branch
from
dgruss:codex-update-freedesktop-runtime
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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
Some comments aren't visible on the classic Files Changed page.
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
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,10 @@ | ||
| diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake | ||
| index cfa2be7..20b6fd9 100644 | ||
| --- a/cmake/OpenCVGenPkgconfig.cmake | ||
| +++ b/cmake/OpenCVGenPkgconfig.cmake | ||
| @@ -113,4 +113,4 @@ else() # DEFINED CMAKE_HELPER_SCRIPT | ||
| -cmake_minimum_required(VERSION 2.8.12.2) | ||
| +cmake_minimum_required(VERSION 3.5) | ||
| cmake_policy(SET CMP0012 NEW) | ||
| include("${CMAKE_HELPER_SCRIPT}") | ||
| include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake") | ||
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,22 @@ | ||
| diff --git a/configure.ac b/configure.ac | ||
| index 31c9e37..28f6658 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -8,3 +8,3 @@ AC_PROG_CXX | ||
| AC_CONFIG_MACRO_DIRS([m4 m4/autoconf-archive]) | ||
| -AX_CHECK_GL | ||
| +USDX_AX_CHECK_GL | ||
| AC_CHECK_LIB(c, dlopen, LIBDL="", AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")) | ||
| diff --git a/m4/autoconf-archive/ax_check_gl.m4 b/m4/autoconf-archive/ax_check_gl.m4 | ||
| index 92c8919..0c6f7d2 100644 | ||
| --- a/m4/autoconf-archive/ax_check_gl.m4 | ||
| +++ b/m4/autoconf-archive/ax_check_gl.m4 | ||
| @@ -251,7 +251,7 @@ AC_DEFUN_ONCE([_WITH_XQUARTZ_GL],[ | ||
| # [CFLAGS="$GL_CFLAGS $CFLAGS" | ||
| # LIBS="$GL_LIBS $LIBS"] | ||
| # ) | ||
| -AC_DEFUN([AX_CHECK_GL], | ||
| +AC_DEFUN([USDX_AX_CHECK_GL], | ||
| [AC_REQUIRE([AC_CANONICAL_HOST]) | ||
| AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
| AC_ARG_VAR([GL_CFLAGS],[C compiler flags for GL, overriding configure script defaults]) |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fixed since OpenCV 4.12. See opencv/opencv@cb80308