[librsvg][gdk-pixbuf] Add librsvg support to gdk-pixbuf by adding librsvg as a dependency to gdk-pixbuf. #38499
+355
−35
Conversation
This file contains 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
AenBleidd
force-pushed
the
vko_add_librsvg_support_to_gdk-pixbuf
branch
from
bc55e89
to
c4ddf02
Compare
dg0yt
reviewed
Apr 30, 2024
| endif | ||
|
|
||
| +svg_opt = get_option('svg') | ||
| +if not svg_opt.disabled() |
There was a problem hiding this comment.
A few days ago I learned that features don't need to be tested for being disabled like this...
| +if not svg_opt.disabled() | ||
| + # We currently don't have a fallback subproject, but this handles error | ||
| + # reporting if svg_opt is enabled. | ||
| + svg_dep = dependency('librsvg-2.0', required: svg_opt) |
There was a problem hiding this comment.
... because they make depencies "not-found" when used like this.
https://mesonbuild.com/Reference-manual_functions.html#dependency_required
https://mesonbuild.com/Build-options.html#features
Comment on lines
+31
to
+34
| { | ||
| "name": "svg", | ||
| "platform": "static" | ||
| }, |
There was a problem hiding this comment.
Do we really want add it as a default feature?
librsvg in vcpkg is outdated and can't update ATM.
ports/librsvg/CMakeLists.txt
Outdated
Comment on lines
142
to
144
| if (ENABLE_GDK_PIXBUF_LOADER) | ||
| if (BUILD_SHARED_LIBS) | ||
| set(gdk_pixbuf_pc_requires_private gdk-pixbuf-2.0) | ||
| pkg_check_modules(GDK_PIXBUF ${gdk_pixbuf_pc_requires_private} IMPORTED_TARGET REQUIRED) | ||
| pkg_get_variable(GDK_PIXBUF_MODULEDIR ${gdk_pixbuf_pc_requires_private} gdk_pixbuf_moduledir) | ||
| endif() |
There was a problem hiding this comment.
I wonder if this patch could be trimmed, by leaving original indent and different grouping of if(BUILD_SHARED_LIBS).
|
|
||
| configure_file("${CMAKE_CURRENT_SOURCE_DIR}/librsvg.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" @ONLY) | ||
| file(READ "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" librsvg_pc) | ||
| list(JOIN librsvg_pc_requires_private " " requires_private) | ||
| string(REPLACE "Requires.private:" "Requires.private: ${requires_private}" librsvg_pc "${librsvg_pc}") | ||
| if (ENABLE_GDK_PIXBUF_LOADER AND NOT BUILD_SHARED_LIBS) | ||
| string(REPLACE "-lm" "-lpixbufloader-svg -lm" librsvg_pc "${librsvg_pc}") |
There was a problem hiding this comment.
Candidates for Libs.private?
AenBleidd
force-pushed
the
vko_add_librsvg_support_to_gdk-pixbuf
branch
6 times, most recently
from
145ad5e
to
6e2813b
Compare
…rsvg as a dependency to gdk-pixbuf. This changes the behavior of librsvg to be able to be built without gdk-pixbuf support (to avoid circular dependency) when built statically, and gdk-pixbuf to be built with librsvg support. librsvg is optional when building gdk-pixbuf dynamically, and enabled by default when building statically. This fixes microsoft#38012. Signed-off-by: Vitalii Koshura <[email protected]>
AenBleidd
force-pushed
the
vko_add_librsvg_support_to_gdk-pixbuf
branch
from
6e2813b
to
03e6723
Compare
MonicaLiu0311
added
the
category:port-feature
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This changes the behavior of librsvg to be able to be built without gdk-pixbuf support (to avoid circular dependency) when built statically, and gdk-pixbuf to be built with librsvg support. librsvg is optional when building gdk-pixbuf dynamically, and enabled by default when building statically.
This fixes #38012.
./vcpkg x-add-version --alland committing the result.