Message ID | 20250415030820.673-1-leimaohui@fujitsu.com |
---|---|
State | New |
Headers | show |
Series | gstreamer1.0-dev: Fix install conflict when enable multilib | expand |
leimaohui via lists.openembedded.org <leimaohui= fujitsu.com@lists.openembedded.org> escreveu (terça, 15/04/2025 à(s) 04:08): > Error: Transaction test error: > file /usr/share/gir-1.0/Gst-1.0.gir conflicts between attempted installs > of lib32-gstreamer1.0-dev-1.26.0-r0.core2_32 and > gstreamer1.0-dev-1.26.0-r0.core2_64 > > fixed-size differs between 32 bit and 64 bit system > > $ diff > /mnt/test/build_auh/tmp/work/core2-64-poky-linux/gstreamer1.0/1.26.0/image/usr/share/gir-1.0/Gst-1.0.gir > /mnt/test/build_auh/tmp/work/core2-32-pokymllib32-linux/lib32-gstreamer1.0/1.26.0/image/usr/share/gir-1.0/Gst-1.0.gir > 31864c31864 > < <array zero-terminated="0" fixed-size="8"> > --- > > <array zero-terminated="0" fixed-size="12"> > > source code: > $ less gstreamer1.0-dev/usr/include/gstreamer-1.0/gst/gstidstr.h > typedef struct { > /* < private > */ > gpointer pointer; > guint8 padding[8]; > guint8 padding[12]; > #error "Only 32 bit and 64 bit pointers supported currently" > } GstIdStr; > > Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> > --- > meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb > b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb > index a908ecd166..5c795ad676 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb > @@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later" > > DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native" > > -inherit meson pkgconfig gettext upstream-version-is-even > gobject-introspection ptest-gnome > +inherit meson pkgconfig gettext upstream-version-is-even > gobject-introspection ptest-gnome multilib_script > > LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ > > file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" > @@ -68,6 +68,8 @@ FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.a > ${libdir}/gstreamer-1.0/include" > FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ > ${datadir}/bash-completion/helpers/gst*" > FILES:${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" > > +MULTILIB_SCRIPTS:append = "${PN}-dev:${datadir}/gir-1.0/Gst-1.0.gir" > + > Missing space on the beginning of the string, it should be: MULTILIB_SCRIPTS:append = " ${PN}-dev:${datadir}/gir-1.0/Gst-1.0.gir" Jose > RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-iso8859-5" > > CVE_PRODUCT = "gstreamer" > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#214816): > https://lists.openembedded.org/g/openembedded-core/message/214816 > Mute This Topic: https://lists.openembedded.org/mt/112270803/5052612 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > quaresma.jose@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb index a908ecd166..5c795ad676 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.bb @@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later" DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native" -inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection ptest-gnome +inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection ptest-gnome multilib_script LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" @@ -68,6 +68,8 @@ FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" FILES:${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" +MULTILIB_SCRIPTS:append = "${PN}-dev:${datadir}/gir-1.0/Gst-1.0.gir" + RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-iso8859-5" CVE_PRODUCT = "gstreamer"