Skip to content
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

Unbreak -DAVIF_BUILD_GDK_PIXBUF=ON build #1525

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Unbreak -DAVIF_BUILD_GDK_PIXBUF=ON build #1525

merged 2 commits into from
Aug 29, 2023

Conversation

jbeich
Copy link
Contributor

@jbeich jbeich commented Aug 28, 2023

Fix #1509 regression and apply part of #296 still required on BSDs.

FreeBSD by default only looks for headers/libraries in base system, so
depending on packages requires passing -isystem + -L or relying on pkg-config.

FAILED: contrib/gdk-pixbuf/libpixbufloader-avif.so
: && /usr/bin/cc -fPIC    -shared  -o contrib/gdk-pixbuf/libpixbufloader-avif.so contrib/gdk-pixbuf/CMakeFiles/pixbufloader-avif.dir/loader.c.o  -Wl,-rpath,/tmp/libavif_build:  -lgdk_pixbuf-2.0  -lgobject-2.0  -lglib-2.0  -lintl  libavif.so.16.0.0 && :
ld: error: unable to find library -lgdk_pixbuf-2.0
ld: error: unable to find library -lgobject-2.0
ld: error: unable to find library -lglib-2.0
ld: error: unable to find library -lintl
cc: error: linker command failed with exit code 1 (use -v to see invocation)
contrib/gdk-pixbuf/loader.c:212:29: error: no member named 'mode' in 'struct avifImageMirror'
        switch (image->imir.mode) {
                ~~~~~~~~~~~ ^

This reverts commit 0f729c1.
@jbeich jbeich changed the title Unbreak gdk-pixbuf Unbreak -DAVIF_BUILD_GDK_PIXBUF=ON build Aug 28, 2023
Copy link
Collaborator

@wantehchang wantehchang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks you for the fix. I'm sorry I missed gdk-pixbuf.

@@ -11,6 +11,7 @@ if(AVIF_BUILD_GDK_PIXBUF)
add_library(pixbufloader-avif MODULE ${GDK_PIXBUF_SRCS})

target_link_libraries(pixbufloader-avif PUBLIC ${GDK_PIXBUF_LIBRARIES} avif)
target_link_directories(pixbufloader-avif PUBLIC ${GDK_PIXBUF_LIBRARY_DIRS})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@novomesk Daniel, could you take a look at this change?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK for me.

@wantehchang wantehchang merged commit 26224fe into AOMediaCodec:main Aug 29, 2023
14 checks passed
@wantehchang
Copy link
Collaborator

We will create a libavif 1.0.1 release to fix the -DAVIF_BUILD_GDK_PIXBUF=ON build.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants