minor gstreamer recipe cleanups

PATCH New Andre McCurdy 1 participant 5 messages Feb 25, 2016

Share & tools

Andre McCurdy

author

2016-02-25 02:15 UTC #0 lore raw

cover minor gstreamer recipe cleanups

Andre McCurdy (4):
gstreamer1.0-libav_git: add --ranlib option to LIBAV_EXTRA_CONFIGURE_COMMON_ARG gstreamer1.0-libav: move LIBAV_EXTRA_CONFIGURE_COMMON_ARG into .inc gstreamer1.0.inc: add explicit PACKAGECONFIG init gstreamer1.0-plugins-XXX: move inherit gettext into common .inc file

 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc        | 7 +++++++
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb   | 6 ------
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb     | 5 -----
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc  | 2 +-
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 2 --
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 --
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc | 2 --
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc      | 2 +-
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc              | 2 ++
 9 files changed, 11 insertions(+), 19 deletions(-)

Signature · 1 line

1.9.1

Andre McCurdy

author

2016-02-25 02:15 UTC #1 lore raw

PATCH 1/4 gstreamer1.0-libav_git: add --ranlib option to LIBAV_EXTRA_CONFIGURE_COMMON_ARG

The versioned gstreamer1.0-libav recipe includes --ranlib in LIBAV_EXTRA_CONFIGURE_COMMON_ARG, but the git recipe does not. It appears to be a historical mistake.

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +1 -0

index 1957a5a..428d401 100644
@@ -35,6 +35,7 @@ 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}'"

Signature · 1 line

1.9.1

Andre McCurdy

author

2016-02-25 02:15 UTC #2 lore raw

PATCH 2/4 gstreamer1.0-libav: move LIBAV_EXTRA_CONFIGURE_COMMON_ARG into .inc

In reply to Andre McCurdy

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 <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc      | 7 +++++++
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb | 6 ------
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb   | 6 ------
 3 files changed, 7 insertions(+), 12 deletions(-)

meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +7 -0

index c90af66..598a349 100644
@@ -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}"'

meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.3.bb +0 -6

index ba7ac7f..687230a 100644
@@ -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}'"

meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +0 -6

index 428d401..ebc8a5e 100644
@@ -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
 }

Signature · 1 line

1.9.1

Andre McCurdy

author

2016-02-25 02:15 UTC #3 lore raw

PATCH 3/4 gstreamer1.0.inc: add explicit PACKAGECONFIG init

In reply to Andre McCurdy

Although gstreamer1.0.inc doesn't currently set any default PACKAGECONFIG options, add explicit initialisation in order to match the style / structure of the other gstreamer1.0 recipes.

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 2 ++
 1 file changed, 2 insertions(+)

meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +2 -0

index 662cd1a..5c212e6 100644
@@ -10,6 +10,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
 
 inherit autotools pkgconfig gettext upstream-version-is-even
 
+PACKAGECONFIG ??= ""
+
 PACKAGECONFIG[check] = "--enable-check,--disable-check"
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests"

Signature · 1 line

1.9.1

Andre McCurdy

author

2016-02-25 02:15 UTC #4 lore raw

PATCH 4/4 gstreamer1.0-plugins-XXX: move inherit gettext into common .inc file

In reply to Andre McCurdy

gstreamer1.0-plugins-base/good/bad/ugly.inc all independently inherit gettext. Move into the common gstreamer1.0-plugins.inc include file.

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc  | 2 +-
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 2 --
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 --
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc | 2 --
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc      | 2 +-
 5 files changed, 2 insertions(+), 8 deletions(-)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +1 -1

index cb6cbad..6117e69 100644
@@ -4,7 +4,7 @@ LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+"
 
 DEPENDS += "gstreamer1.0-plugins-base libpng jpeg"
 
-inherit gettext bluetooth
+inherit bluetooth
 
 # opengl packageconfig factored out to make it easy for distros
 # and BSP layers to pick either (desktop) opengl, gles2, or no GL

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +0 -2

index e04096c..cde0019 100644
@@ -4,8 +4,6 @@ LICENSE = "GPLv2+ & LGPLv2+"
 
 DEPENDS += "iso-codes util-linux zlib"
 
-inherit gettext
-
 PACKAGES_DYNAMIC =+ "^libgst.*"
 
 PACKAGECONFIG ??= " \

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +0 -2

index 8f996d6..3f56d1d 100644
@@ -4,8 +4,6 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
 
 DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2"
 
-inherit gettext
-
 PACKAGECONFIG ??= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +0 -2

index 869022a..839ff8a 100644
@@ -5,8 +5,6 @@ LICENSE_FLAGS = "commercial"
 
 DEPENDS += "gstreamer1.0-plugins-base libid3tag"
 
-inherit gettext
-
 PACKAGECONFIG ??= " \
     a52dec lame mad mpeg2dec orc \
 "

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +1 -1

index 6ea911e..d2b3820 100644
@@ -5,7 +5,7 @@ SECTION = "multimedia"
 
 DEPENDS = "gstreamer1.0 glib-2.0-native"
 
-inherit autotools pkgconfig upstream-version-is-even
+inherit autotools pkgconfig gettext upstream-version-is-even
 
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"

Signature · 1 line

1.9.1