diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-02-24 18:15:23 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:32:38 +0000 |
| commit | f1426ad80035cebbaf9b78e879b8fad6b3eafaaa (patch) | |
| tree | 67df9e44e6c1efbb59950559d47b32b8b4152ba2 /meta | |
| parent | 4b958acb173f250edd6da0c49e486fa62ba91abd (diff) | |
| download | openembedded-core-f1426ad80035cebbaf9b78e879b8fad6b3eafaaa.tar.gz openembedded-core-f1426ad80035cebbaf9b78e879b8fad6b3eafaaa.tar.bz2 openembedded-core-f1426ad80035cebbaf9b78e879b8fad6b3eafaaa.zip | |
gstreamer1.0-libav: move LIBAV_EXTRA_CONFIGURE_COMMON_ARG into .inc
The LIBAV_EXTRA_CONFIGURE_COMMON_ARG definition is now common to both
the git and the versioned gstreamer1.0-libav recipes, so move it into
gstreamer1.0-libav.inc
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
3 files changed, 7 insertions, 12 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc index c90af66c3f..598a349e02 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc @@ -22,6 +22,13 @@ PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native" GSTREAMER_1_0_DEBUG ?= "--disable-debug" LIBAV_EXTRA_CONFIGURE = "--with-libav-extra-configure" + +LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ + --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ + --ranlib='${RANLIB}' \ + ${GSTREAMER_1_0_DEBUG} \ + --cross-prefix='${HOST_PREFIX}'" + LIBAV_EXTRA_CONFIGURE_COMMON = \ '${LIBAV_EXTRA_CONFIGURE}="${LIBAV_EXTRA_CONFIGURE_COMMON_ARG}"' diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb index ba7ac7f3a7..687230a8f4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb @@ -18,9 +18,3 @@ SRC_URI[md5sum] = "cfe9a06913d4fd4067e9e47f6e05fac2" SRC_URI[sha256sum] = "857b9c060a0337de38c6d26238c47352433c02eabf26c2f860c854dbc35bd4ab" S = "${WORKDIR}/gst-libav-${PV}" - -LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ - --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ - --ranlib='${RANLIB}' \ - ${GSTREAMER_1_0_DEBUG} \ - --cross-prefix='${HOST_PREFIX}'" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb index 428d40123d..ebc8a5ef2e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb @@ -33,12 +33,6 @@ SRCREV_FORMAT = "base" S = "${WORKDIR}/git" -LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ - --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ - --ranlib='${RANLIB}' \ - ${GSTREAMER_1_0_DEBUG} \ - --cross-prefix='${HOST_PREFIX}'" - do_configure_prepend() { ${S}/autogen.sh --noconfigure } |