Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 06/25] gstreamer1.0-plugins-good: minor formatting improvements
Date: Wed, 20 Jan 2016 18:43:04 -0800	[thread overview]
Message-ID: <1453344203-7118-7-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1453344203-7118-1-git-send-email-armccurdy@gmail.com>

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 .../gstreamer/gstreamer1.0-plugins-good.inc        | 37 +++++++++++-----------
 .../gstreamer/gstreamer1.0-plugins-good_1.6.2.bb   |  1 +
 .../gstreamer/gstreamer1.0-plugins-good_git.bb     |  5 ++-
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index 3d17497..e79da9e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -2,53 +2,52 @@ require gstreamer1.0-plugins.inc
 
 LICENSE = "GPLv2+ & LGPLv2.1+"
 
-# libid3tag
-DEPENDS += "gstreamer1.0-plugins-base zlib bzip2 libcap"
+DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2"
 
 inherit gettext
 
-
 PACKAGECONFIG ??= " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
-    orc cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \
-    "
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+    cairo flac gdk-pixbuf gudev jpeg libpng orc soup speex taglib v4l2 \
+"
 
 X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
-PACKAGECONFIG[x11]        = "--enable-x,--disable-x,${X11DEPENDS}"
-PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
+
 PACKAGECONFIG[cairo]      = "--enable-cairo,--disable-cairo,cairo"
+PACKAGECONFIG[dv1394]     = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394"
 PACKAGECONFIG[flac]       = "--enable-flac,--disable-flac,flac"
 PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
 PACKAGECONFIG[gudev]      = "--with-gudev,--without-gudev,libgudev"
-PACKAGECONFIG[libv4l2]    = "--with-libv4l2,--without-libv4l2,libv4l2"
 PACKAGECONFIG[jack]       = "--enable-jack,--disable-jack,jack"
 PACKAGECONFIG[jpeg]       = "--enable-jpeg,--disable-jpeg,jpeg"
 PACKAGECONFIG[libpng]     = "--enable-libpng,--disable-libpng,libpng"
+PACKAGECONFIG[libv4l2]    = "--with-libv4l2,--without-libv4l2,libv4l2"
+PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
 PACKAGECONFIG[soup]       = "--enable-soup,--disable-soup,libsoup-2.4"
 PACKAGECONFIG[speex]      = "--enable-speex,--disable-speex,speex"
 PACKAGECONFIG[taglib]     = "--enable-taglib,--disable-taglib,taglib"
+PACKAGECONFIG[v4l2]       = "--enable-gst_v4l2,--disable-gst_v4l2"
 PACKAGECONFIG[vpx]        = "--enable-vpx,--disable-vpx,libvpx"
 PACKAGECONFIG[wavpack]    = "--enable-wavpack,--disable-wavpack,wavpack"
-PACKAGECONFIG[dv1394]     = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394"
-PACKAGECONFIG[v4l2]       = "--enable-gst_v4l2,--disable-gst_v4l2"
+PACKAGECONFIG[x11]        = "--enable-x,--disable-x,${X11DEPENDS}"
 
 EXTRA_OECONF += " \
+    --enable-bz2 \
     --enable-oss \
     --enable-zlib \
-    --enable-bz2 \
-    --disable-directsound \
-    --disable-waveform \
-    --disable-oss4 \
-    --disable-sunaudio \
-    --disable-osx_audio \
-    --disable-osx_video \
     --disable-aalib \
     --disable-aalibtest \
+    --disable-directsound \
+    --disable-examples \
     --disable-libcaca \
     --disable-libdv \
+    --disable-oss4 \
+    --disable-osx_audio \
+    --disable-osx_video \
     --disable-shout2 \
-    --disable-examples \
+    --disable-sunaudio \
+    --disable-waveform \
 "
 
 FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb
index 92ebe1d..022cfd2 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
 
 SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch"
+
 SRC_URI[md5sum] = "ef4f5bc4f31f706832a234b0f603967b"
 SRC_URI[sha256sum] = "876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92"
 
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 2c0e0ef..d60eaff 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
@@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
                     file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
 
-S = "${WORKDIR}/git"
-
 SRCREV = "fd0123800c8c1cf1468c0fa5d592ad0d0d8b4140"
 
+S = "${WORKDIR}/git"
+
 do_configure_prepend() {
 	cd ${S}
 	./autogen.sh --noconfigure
 	cd ${B}
 }
-
-- 
1.9.1



  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 ` [PATCH 05/25] gstreamer1.0-plugins-base: " Andre McCurdy
2016-01-21  2:43 ` Andre McCurdy [this message]
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-7-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