Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 16/25] gstreamer1.0-plugins-bad.inc: don't set ${S} or apply version specific patch
Date: Wed, 20 Jan 2016 18:43:14 -0800	[thread overview]
Message-ID: <1453344203-7118-17-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1453344203-7118-1-git-send-email-armccurdy@gmail.com>

gstreamer1.0-plugins-bad.inc is shared by both the 1.6.2 and git
recipes, so must not set ${S} or apply any version specific patches.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc      | 4 ----
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 4aa2f56..689d3ad 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -4,10 +4,6 @@ LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+"
 
 DEPENDS += "gstreamer1.0-plugins-base libpng jpeg"
 
-SRC_URI += "file://configure-allow-to-disable-libssh2.patch"
-
-S = "${WORKDIR}/gst-plugins-bad-${PV}"
-
 inherit gettext bluetooth
 
 # opengl packageconfig factored out to make it easy for distros
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
index c1c322b..004d053 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
@@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
                     file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \
                     file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a"
 
-SRC_URI += "file://0001-glimagesink-Downrank-to-marginal.patch"
+SRC_URI += " \
+    file://configure-allow-to-disable-libssh2.patch \
+    file://0001-glimagesink-Downrank-to-marginal.patch \
+"
 
 SRC_URI[md5sum] = "7c73bec1d389f0e184ebbbbb9e9f883d"
 SRC_URI[sha256sum] = "650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe"
-- 
1.9.1



  parent reply	other threads:[~2016-01-21  2:44 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 ` [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 ` Andre McCurdy [this message]
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-17-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