From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 05/25] gstreamer1.0-plugins-base: minor formatting improvements
Date: Wed, 20 Jan 2016 18:43:03 -0800 [thread overview]
Message-ID: <1453344203-7118-6-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1453344203-7118-1-git-send-email-armccurdy@gmail.com>
Fix duplicate x11 dependencies (DEPENDS and x11 PACKAGECONFIG).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../gstreamer/gstreamer1.0-plugins-base.inc | 26 +++++++++++-----------
.../gstreamer/gstreamer1.0-plugins-base_1.6.2.bb | 3 +--
.../gstreamer/gstreamer1.0-plugins-base_git.bb | 8 +++----
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 4375a4b..d543bdd 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -2,38 +2,38 @@ require gstreamer1.0-plugins.inc
LICENSE = "GPLv2+ & LGPLv2+"
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
-DEPENDS += "freetype liboil util-linux iso-codes zlib"
+DEPENDS += "freetype iso-codes liboil util-linux zlib"
inherit gettext
PACKAGES_DYNAMIC =+ "^libgst.*"
PACKAGECONFIG ??= " \
- ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
- orc ivorbis ogg theora vorbis pango gio-unix-2.0 \
- "
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+ gio-unix-2.0 ivorbis ogg orc pango theora vorbis \
+"
-X11DEPENDS = "virtual/libx11 libsm libxrender"
+X11DEPENDS = "virtual/libx11 libsm libxrender libxv"
X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm"
X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm"
-PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
+
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
+PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
+PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0"
PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor"
PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg"
-PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
-PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
-PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0"
+PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual"
-PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
+PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
+PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
EXTRA_OECONF += " \
--enable-zlib \
--disable-freetypetest \
"
-FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
-
CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
+
+FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb
index 473dbcd..d5687a8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.2.bb
@@ -1,9 +1,8 @@
include gstreamer1.0-plugins-base.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
- file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
- "
+ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
SRC_URI += "file://get-caps-from-src-pad-when-query-caps.patch \
file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
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 fbe3a42..f021f98 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
@@ -3,17 +3,15 @@ DEFAULT_PREFERENCE = "-1"
include gstreamer1.0-plugins-base.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
- file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
- "
-
-S = "${WORKDIR}/git"
+ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d"
+S = "${WORKDIR}/git"
+
do_configure_prepend() {
cd ${S}
./autogen.sh --noconfigure
cd ${B}
}
-
--
1.9.1
next prev parent reply other threads:[~2016-01-21 2:43 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-21 2:42 [PATCH 00/25] gstreamer1.0 cleanups + update git recipes to 1.7.1 Andre McCurdy
2016-01-21 2:42 ` [PATCH 01/25] gst-player: minor formatting improvements Andre McCurdy
2016-01-21 2:43 ` [PATCH 02/25] gst-plugins-package.inc: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 03/25] gstreamer1.0: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 04/25] gstreamer1.0-plugins.inc: " Andre McCurdy
2016-01-21 2:43 ` Andre McCurdy [this message]
2016-01-21 2:43 ` [PATCH 06/25] gstreamer1.0-plugins-good: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 07/25] gstreamer1.0-plugins-bad: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 08/25] gstreamer1.0-plugins-ugly: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 09/25] gstreamer1.0-libav: minor formatting improvements + update HOMEPAGE Andre McCurdy
2016-01-21 2:43 ` [PATCH 10/25] gstreamer1.0-omx: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 11/25] gstreamer1.0-rtsp-server.inc: minor formatting improvements Andre McCurdy
2016-01-21 2:43 ` [PATCH 12/25] gstreamer1.0.inc: add missing glib-2.0-native dependency Andre McCurdy
2016-01-21 2:43 ` [PATCH 13/25] gstreamer1.0-plugins.inc: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 14/25] gstreamer1.0-plugins.inc: convert GSTREAMER_1_0_DEBUG to a PACKAGECONFIG Andre McCurdy
2016-01-21 2:43 ` [PATCH 15/25] gstreamer1.0-plugins-good.inc: remove duplicate --disable-examples Andre McCurdy
2016-01-21 2:43 ` [PATCH 16/25] gstreamer1.0-plugins-bad.inc: don't set ${S} or apply version specific patch Andre McCurdy
2016-01-21 2:43 ` [PATCH 17/25] gstreamer1.0-plugins-bad.inc: update hls dependency gnutls -> nettle Andre McCurdy
2016-01-21 2:43 ` [PATCH 18/25] gstreamer1.0-plugins.inc: drop obsolete lib-link.m4 workaround Andre McCurdy
2016-01-21 2:43 ` [PATCH 19/25] gstreamer1.0-plugins.inc: don't set base SRC_URI via python Andre McCurdy
2016-01-21 2:43 ` [PATCH 20/25] gstreamer1.0: update git recipe to 1.7.1 Andre McCurdy
2016-01-21 4:18 ` Khem Raj
2016-01-21 4:39 ` Andre McCurdy
2016-01-21 4:40 ` Khem Raj
2016-01-21 5:03 ` Andre McCurdy
2016-01-21 2:43 ` [PATCH 21/25] gstreamer1.0-plugins-base: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 22/25] gstreamer1.0-plugins-good: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 23/25] gstreamer1.0-plugins-bad: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 24/25] gstreamer1.0-plugins-ugly: " Andre McCurdy
2016-01-21 2:43 ` [PATCH 25/25] gstreamer1.0-libav: " Andre McCurdy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453344203-7118-6-git-send-email-armccurdy@gmail.com \
--to=armccurdy@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox