From f4a26b72377380e60d1e7058ba40aaf49b6316e5 Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Tue, 16 Dec 2014 15:46:40 +0000 Subject: [PATCH] gstreamer1.0-* fix configure for out of tree build on git recipes The autogen.sh script lies in the srcdir ($S) and is required to be run on git based checkouts of gstreamer packages in order to generate initial makefiles. So, we fix this by cd'ing to the specific dir, run the required script and then come back to our initial dir which is builddir ($B). Additionally rather than overriding the whole do_configure step we only _prepend to make it clear what we are doing here. Signed-off-by: Awais Belal Signed-off-by: Ross Burton --- meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb | 5 +++-- meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb | 5 +++-- .../gstreamer/gstreamer1.0-plugins-bad_git.bb | 5 +++-- .../gstreamer/gstreamer1.0-plugins-base_git.bb | 5 +++-- .../gstreamer/gstreamer1.0-plugins-good_git.bb | 5 +++-- .../gstreamer/gstreamer1.0-plugins-ugly_git.bb | 5 +++-- meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | 5 +++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb index aa2de69b554..bf1b87e6de7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb @@ -21,8 +21,9 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ ${GSTREAMER_1_0_DEBUG} \ --cross-prefix='${HOST_PREFIX}'" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb index a3902056212..931a7fcc96c 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb @@ -13,8 +13,9 @@ S = "${WORKDIR}/git" SRCREV = "a2db76b048db278ef0aa798e106b7594264e06c0" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb index e1a5904abf1..75859f9a899 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb @@ -19,8 +19,9 @@ EXTRA_OECONF += " \ -disable-openjpeg \ " -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb index a894abe501f..fbe3a42cd77 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb @@ -11,8 +11,9 @@ S = "${WORKDIR}/git" SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb index 8b11b20b1b5..2c0e0efe68f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb @@ -10,8 +10,9 @@ S = "${WORKDIR}/git" SRCREV = "fd0123800c8c1cf1468c0fa5d592ad0d0d8b4140" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb index 2f72497363d..dcf5ffc3c1a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb @@ -9,8 +9,9 @@ S = "${WORKDIR}/git" SRCREV = "06b8ac10cee85c5c304ca320997aa8f44295a66f" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb index 424c90a9e8e..cb00d319a74 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb @@ -10,8 +10,9 @@ S = "${WORKDIR}/git" SRCREV = "3b8181a8c550e74acaba4e8c55bdc649fa551dc9" -do_configure() { +do_configure_prepend() { + cd ${S} ./autogen.sh --noconfigure - oe_runconf + cd ${B} } -- 2.47.3