Comparing this to my WIP patch of the snapshot in September:
https://git.yoctoproject.org/poky-contrib/commit/?h=ross/cairo&id=9216e710b322581e2ebec5f763fa345cb16e0409
The BUGTRACKER field needs updating.
> +SRC_URI[md5sum] = "3f0685fbadc530606f965b9645bb51d9"
Drop.
> X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
This list of dependencies is smaller now, so I inlined it.
> +PACKAGECONFIG ??= " \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
> +"
> +
> PACKAGECONFIG:class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11',
> 'x11 xcb', '', d)}"
> PACKAGECONFIG:class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES',
> 'x11', 'x11 xcb', '', d)}”
Same line three times, no need for the overrides.
> +PACKAGECONFIG[x11] = "-Dxlib=enabled,-Dxlib=disabled,${X11DEPENDS}"
> +PACKAGECONFIG[xcb] = "-Dxcb=enabled,-Dxcb=disabled,libxcb"
Inline the dependencies, and rename x11 to xlib, as that’s what the option is
called.
The do_install:append can be trimmed, see my WIP.
> -FILES:${PN} = "${libdir}/libcairo.so.*"
> +FILES:${PN} = "${libdir}/libcairo.so.* ${libdir}/cairo/libcairo-fdr.so*"
> FILES:${PN}-gobject = "${libdir}/libcairo-gobject.so.*"
> FILES:${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"
> FILES:${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la
> ${libdir}/cairo/libcairo-trace.so”
cairo-fdr should be in perf-utils, not the core library.
Ross
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190210):
https://lists.openembedded.org/g/openembedded-core/message/190210
Mute This Topic: https://lists.openembedded.org/mt/102413265/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
