[PATCH v2 16/32] gstreamer1.0-plugins-bad.inc: don't set ${S} or apply version specific patch

Openembedded Core Discussions
 help / color / mirror / Atom feed

From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 16/32] gstreamer1.0-plugins-bad.inc: don't set ${S} or apply version specific patch
Date: Wed, 20 Jan 2016 21:36:34 -0800	[thread overview]
Message-ID: <1453354610-19218-17-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1453354610-19218-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

next prev parent reply	other threads:[~2016-01-21  5:37 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-21  5:36 [PATCH v2 00/32] gstreamer1.0 cleanups + update git recipes to 1.7.1 Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 01/32] gst-player: minor formatting improvements Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 02/32] gst-plugins-package.inc: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 03/32] gstreamer1.0: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 04/32] gstreamer1.0-plugins.inc: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 05/32] gstreamer1.0-plugins-base: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 06/32] gstreamer1.0-plugins-good: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 07/32] gstreamer1.0-plugins-bad: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 08/32] gstreamer1.0-plugins-ugly: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 09/32] gstreamer1.0-libav: minor formatting improvements + update HOMEPAGE Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 10/32] gstreamer1.0-omx: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 11/32] gstreamer1.0-rtsp-server.inc: minor formatting improvements Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 12/32] gstreamer1.0.inc: add missing glib-2.0-native dependency Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 13/32] gstreamer1.0-plugins.inc: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 14/32] gstreamer1.0-plugins.inc: convert GSTREAMER_1_0_DEBUG to a PACKAGECONFIG Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 15/32] gstreamer1.0-plugins-good.inc: remove duplicate --disable-examples Andre McCurdy
2016-01-21  5:36 ` Andre McCurdy [this message]
2016-01-21  5:36 ` [PATCH v2 17/32] gstreamer1.0-plugins-bad.inc: update hls dependency gnutls -> nettle Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 18/32] gstreamer1.0-plugins.inc: drop obsolete lib-link.m4 workaround Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 19/32] gstreamer1.0-plugins.inc: don't set base SRC_URI via python Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 20/32] gst-plugins-package.inc: drop perl RDEPEND for XXX-apps packages Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 21/32] gstreamer1.0: update 1.6.2 -> 1.6.3 Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 22/32] gstreamer1.0-plugins-base: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 23/32] gstreamer1.0-plugins-good: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 24/32] gstreamer1.0-plugins-bad: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 25/32] gstreamer1.0-plugins-ugly: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 26/32] gstreamer1.0-libav: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 27/32] gstreamer1.0: update git recipe to 1.7.1 Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 28/32] gstreamer1.0-plugins-base: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 29/32] gstreamer1.0-plugins-good: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 30/32] gstreamer1.0-plugins-bad: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 31/32] gstreamer1.0-plugins-ugly: " Andre McCurdy
2016-01-21  5:36 ` [PATCH v2 32/32] gstreamer1.0-libav: " Andre McCurdy

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:4aa2f56 dfblob:689d3ad dfblob:c1c322b dfblob:004d053 )
 OR (
bs:"[PATCH v2 16/32] gstreamer1.0-plugins-bad.inc: don't set ${S} or apply version specific patch" )
	(help)

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=1453354610-19218-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