| Submitter | Andreas Oberritter |
|---|---|
| Date | March 22, 2012, 2:46 p.m. |
| Message ID | <1332427616-11816-1-git-send-email-obi@opendreambox.org> |
| Download | mbox | patch |
| Permalink | /patch/24135/ |
| State | New |
| Headers | show |
Comments
On Thu, 2012-03-22 at 15:46 +0100, Andreas Oberritter wrote: > * The sed script replacing ${bindir}/orcc with > ${STAGING_BINDIR_NATIVE}/orcc causes orcc to not be found. > It may have been a workaround for older versions of pkg-config > or older gst-plugins. Removing it makes gst-plugins use > orcc from 'orc-native' successfully, if available. > > Signed-off-by: Andreas Oberritter <obi@opendreambox.org> > --- > meta/recipes-multimedia/gstreamer/gst-plugins.inc | 10 +--------- > 1 files changed, 1 insertions(+), 9 deletions(-) I'll take this patch if we add --disable-orc to the OECONF lines in all gstreamer pieces that don't have a DEPENDS on orc-native. I say this since I suspect it will start using a host system /usr/bin/orcc otherwise and break deterministic builds. Cheers, Richard
Patch
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc index a71a868..d2df58b 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc @@ -6,7 +6,7 @@ DEPENDS = "gstreamer" inherit autotools pkgconfig -PR = "r1" +PR = "r2" FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" @@ -16,14 +16,6 @@ EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples " acpaths = "-I ${S}/common/m4 -I ${S}/m4" -# orc.m4 calls pkg-config ----variable=orcc orc-0.4 to get the path to orcc, -# resulting in /usr/bin/orcc. Force it to use the staged orcc. -do_configure_append() { - for i in $(find ${S} -name "Makefile") ; do - sed -i -e s:${bindir}/orcc:${STAGING_BINDIR_NATIVE}/orcc:g $i - done -} - require gst-plugins-package.inc PACKAGES_DYNAMIC = "${PN}-*"
* The sed script replacing ${bindir}/orcc with ${STAGING_BINDIR_NATIVE}/orcc causes orcc to not be found. It may have been a workaround for older versions of pkg-config or older gst-plugins. Removing it makes gst-plugins use orcc from 'orc-native' successfully, if available. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- meta/recipes-multimedia/gstreamer/gst-plugins.inc | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-)