All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1: fix girdir
@ 2021-12-03  7:34 Fabrice Fontaine
  2021-12-03 16:44 ` Peter Korsgaard
  2021-12-12 17:26 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2021-12-03  7:34 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

As already done for libglib2 in commit
b094f88a4d501101bfba9b65491209e6a0fe0397, fix girdir to avoid the
following build failure with gst1-plugins-base and introspection:

/home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler gst-libs/gst/tag/GstTag-1.0.gir --output gst-libs/gst/tag/GstTag-1.0.typelib --includedir=/usr/share/gir-1.0
Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir

Fixes:
 - http://autobuild.buildroot.org/results/d1e2bdde97777ff61c185d375ba412a93e7ca467

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/gstreamer1/gstreamer1/gstreamer1.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index 9bdd00caec..1aab035e05 100644
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -49,4 +49,14 @@ endif
 
 GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
 
+# By default, girdir uses datadir as its prefix of which pkg-config will not
+# append the sysroot directory. This results in a build failure with
+# gst1-plugins-base. Changing prefix to ${libdir}/../share prevents this error.
+define GSTREAMER1_FIX_GIRDIR
+	$(SED) "s%girdir=.*%girdir=\$${libdir}/../share/gir-1.0%g" \
+		$(STAGING_DIR)/usr/lib/pkgconfig/gstreamer-1.0.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/gstreamer-base-1.0.pc
+endef
+GSTREAMER1_POST_INSTALL_STAGING_HOOKS += GSTREAMER1_FIX_GIRDIR
+
 $(eval $(meson-package))
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1: fix girdir
  2021-12-03  7:34 [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1: fix girdir Fabrice Fontaine
@ 2021-12-03 16:44 ` Peter Korsgaard
  2021-12-12 17:26 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2021-12-03 16:44 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > As already done for libglib2 in commit
 > b094f88a4d501101bfba9b65491209e6a0fe0397, fix girdir to avoid the
 > following build failure with gst1-plugins-base and introspection:

 > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler
 > gst-libs/gst/tag/GstTag-1.0.gir --output
 > gst-libs/gst/tag/GstTag-1.0.typelib --includedir=/usr/share/gir-1.0
 > Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir

 > Fixes:
 >  - http://autobuild.buildroot.org/results/d1e2bdde97777ff61c185d375ba412a93e7ca467

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1: fix girdir
  2021-12-03  7:34 [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1: fix girdir Fabrice Fontaine
  2021-12-03 16:44 ` Peter Korsgaard
@ 2021-12-12 17:26 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2021-12-12 17:26 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > As already done for libglib2 in commit
 > b094f88a4d501101bfba9b65491209e6a0fe0397, fix girdir to avoid the
 > following build failure with gst1-plugins-base and introspection:

 > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler
 > gst-libs/gst/tag/GstTag-1.0.gir --output
 > gst-libs/gst/tag/GstTag-1.0.typelib --includedir=/usr/share/gir-1.0
 > Could not find GIR file 'Gst-1.0.gir'; check XDG_DATA_DIRS or use --includedir

 > Fixes:
 >  - http://autobuild.buildroot.org/results/d1e2bdde97777ff61c185d375ba412a93e7ca467

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x and 2021.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-12-12 17:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-03  7:34 [Buildroot] [PATCH 1/1] package/gstreamer1/gstreamer1: fix girdir Fabrice Fontaine
2021-12-03 16:44 ` Peter Korsgaard
2021-12-12 17:26 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.