[PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[Peter Urbanec]

Now builds current git source from master branch. This is probably what
most people would expect, instead of SRCREV snapshots from circa 2013.

The recipes have been modified to prevent infinite recursion when the
python implementation of SRC_URI in gstreamer1.0-plugins.inc references
package version information which depends on SRC_URI when AUTOREV is used.

Any revision from master branch can be built by specifying the desired
SRCREV in the appropriate .conf file or using .bbappend. Patches can also
be applied on top in a similar manner.

Signed-off-by: Peter Urbanec <openembedded-devel@urbanec.net>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb    |  9 +++++++--
 .../gstreamer/gstreamer1.0-plugins-bad_git.bb                  |  9 ++++++++-
 .../gstreamer/gstreamer1.0-plugins-base_git.bb                 | 10 ++++++++--
 .../recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc |  2 +-
 .../gstreamer/gstreamer1.0-plugins-good_git.bb                 | 10 ++++++++--
 .../gstreamer/gstreamer1.0-plugins-ugly_git.bb                 |  9 ++++++++-
 meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb          | 10 ++++++++--
 7 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
index bf1b87e..97d7a9e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
@@ -5,16 +5,21 @@ include gstreamer1.0-libav.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
                     file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
-                    file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \
+                    file://gst-libs/ext/libav/LICENSE;md5=c6d98fb56909e4c624e16fbb717a456d \
                     file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
                     file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
                     file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
+inherit gitpkgv
+
 SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-libav;branch=master"
 S = "${WORKDIR}/git"
 
-SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1"
+SRCREV ?= "${AUTOREV}"
+
+PV = "git"
+PKGV = "git+${GITPKGV}"
 
 LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
   --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index 309505f..03e5ade 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -9,7 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
 
 S = "${WORKDIR}/git"
 
-SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce"
+inherit gitpkgv
+
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-bad;branch=master"
+
+SRCREV ?= "${AUTOREV}"
+
+PV = "git"
+PKGV = "git+${GITPKGV}"
 
 PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
 PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls"
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..c113c2d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
@@ -3,13 +3,19 @@ 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"
 
-SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d"
+inherit gitpkgv
+
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-base;branch=master"
+
+SRCREV ?= "${AUTOREV}"
+
+PV = "git"
+PKGV = "git+${GITPKGV}"
 
 do_configure_prepend() {
 	cd ${S}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index 37217f0..acf260c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -11,7 +11,7 @@ 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 \
+    orc flac gdk-pixbuf gudev jpeg libpng soup speex taglib \
     "
 
 X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
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..8e6f4de 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
@@ -3,12 +3,18 @@ DEFAULT_PREFERENCE = "-1"
 include gstreamer1.0-plugins-good.inc
 
 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"
+inherit gitpkgv
+
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-good;branch=master"
+
+SRCREV ?= "${AUTOREV}"
+
+PV = "git"
+PKGV = "git+${GITPKGV}"
 
 do_configure_prepend() {
 	cd ${S}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
index dcf5ffc..36501a0 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
@@ -7,7 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
 S = "${WORKDIR}/git"
 
-SRCREV = "06b8ac10cee85c5c304ca320997aa8f44295a66f"
+inherit gitpkgv
+
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly;branch=master"
+
+SRCREV ?= "${AUTOREV}"
+
+PV = "git"
+PKGV = "git+${GITPKGV}"
 
 do_configure_prepend() {
 	cd ${S}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
index cb00d31..6b200eb 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
@@ -5,10 +5,16 @@ include gstreamer1.0.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
                     file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
 
-SRC_URI = "git://anongit.freedesktop.org/gstreamer/gstreamer;branch=master"
+inherit gitpkgv
+
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gstreamer;branch=master \
+"
 S = "${WORKDIR}/git"
 
-SRCREV = "3b8181a8c550e74acaba4e8c55bdc649fa551dc9"
+SRCREV ?= "${AUTOREV}"
+
+PV = "git"
+PKGV = "git+${GITPKGV}"
 
 do_configure_prepend() {
 	cd ${S}
-- 
2.3.0

Re: [PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[Richard Purdie]

On Fri, 2015-02-27 at 04:57 +1100, Peter Urbanec wrote:
> Now builds current git source from master branch. This is probably what
> most people would expect, instead of SRCREV snapshots from circa 2013.
> 
> The recipes have been modified to prevent infinite recursion when the
> python implementation of SRC_URI in gstreamer1.0-plugins.inc references
> package version information which depends on SRC_URI when AUTOREV is used.
> 
> Any revision from master branch can be built by specifying the desired
> SRCREV in the appropriate .conf file or using .bbappend. Patches can also
> be applied on top in a similar manner.
> 
> Signed-off-by: Peter Urbanec <openembedded-devel@urbanec.net>
> ---
>  meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb    |  9 +++++++--
>  .../gstreamer/gstreamer1.0-plugins-bad_git.bb                  |  9 ++++++++-
>  .../gstreamer/gstreamer1.0-plugins-base_git.bb                 | 10 ++++++++--
>  .../recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc |  2 +-
>  .../gstreamer/gstreamer1.0-plugins-good_git.bb                 | 10 ++++++++--
>  .../gstreamer/gstreamer1.0-plugins-ugly_git.bb                 |  9 ++++++++-
>  meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb          | 10 ++++++++--
>  7 files changed, 48 insertions(+), 11 deletions(-)
> 
> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
> index bf1b87e..97d7a9e 100644
> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
> @@ -5,16 +5,21 @@ include gstreamer1.0-libav.inc
>  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>                      file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
>                      file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
> -                    file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \
> +                    file://gst-libs/ext/libav/LICENSE;md5=c6d98fb56909e4c624e16fbb717a456d \
>                      file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>                      file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
>                      file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
>                      file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
>  
> +inherit gitpkgv
> +

The gitpkgv class isn't in OE-Core, nor is it going to be (this has been
discussed on the mailing list before). As such if we merge this, OE-Core
won't parse, let alone build.

Cheers,

Richard

Re: [PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[Peter Urbanec]

On 27/02/15 08:45, Richard Purdie wrote:
>> +inherit gitpkgv
>
> The gitpkgv class isn't in OE-Core, nor is it going to be (this has been
> discussed on the mailing list before). As such if we merge this, OE-Core
> won't parse, let alone build.

Does that mean that no packages in oe-core can currently support a clean 
and consistent AUTOREV?

If that is the case, would it make more sense to leave the release 
versions of gstreamer in oe-core and move the git versions to oe-meta 
where I can use the current implementation of gitpkgv?

Re: [PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

On 26 February 2015 at 17:57, Peter Urbanec <openembedded-devel@urbanec.net>
wrote:

> -SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1"
> +SRCREV ?= "${AUTOREV}"
>

I'd say that the git packages should track the tarball releases *and be
tested as such* so that they actually work out of the box and don't break
over time as upstream changes.

If someone wants to make a bleeding-edge build then it's a simple change to
set the SRCREV to AUTOREV at the distro level.

Ross

[-- Attachment #2: Type: text/html, Size: 996 bytes --]

Re: [PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[Peter Urbanec]

On 27/02/15 08:52, Burton, Ross wrote:
>
> On 26 February 2015 at 17:57, Peter Urbanec
> <openembedded-devel@urbanec.net <mailto:openembedded-devel@urbanec.net>>
> wrote:
>
>     -SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1"
>     +SRCREV ?= "${AUTOREV}"
>
>
> I'd say that the git packages should track the tarball releases *and be
> tested as such* so that they actually work out of the box and don't
> break over time as upstream changes.

I disagree. There's no point in having a git version of a package that 
is exactly the same as a release version. Doing so would also bring in 
all the patches specific to that release, which may not be appropriate 
for a different git revision. If you want a tested release, you would 
stick to something like gstreamer1.0*1.4.5.bb instead of choosing a git 
version.

> If someone wants to make a bleeding-edge build then it's a simple change
> to set the SRCREV to AUTOREV at the distro level.

Well, as it's shaping up, that may actually not be possible in oe-core 
packages. It certainly does not work with the current gstreamer1.0*git 
recipes, because as soon as you do that you end up with infinite 
recursion when expanding SRC_URI.

I think there are two main use cases for git builds. Case one is keeping 
up with the bleeding edge, which implies SRCREV="${AUTOREV}". Case two 
is freezing at a particular revision that suits you, which implies 
SRCREV="git-hash". In case one, you will probably want to run a fairly 
lean set of patches (or even none) to track the upstream. In case two, 
you could potentially have a comprehensive set of patches that will only 
apply to that revision. Both cases will be a lot easier to manage if the 
*git.bb recipe gives you a clean git repository without patches.

Re: [PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[Andreas Oberritter]

Hello Peter,

On 27.02.2015 04:06, Peter Urbanec wrote:
> On 27/02/15 08:52, Burton, Ross wrote:
>>
>> On 26 February 2015 at 17:57, Peter Urbanec
>> <openembedded-devel@urbanec.net <mailto:openembedded-devel@urbanec.net>>
>> wrote:
>>
>>     -SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1"
>>     +SRCREV ?= "${AUTOREV}"
>>
>>
>> I'd say that the git packages should track the tarball releases *and be
>> tested as such* so that they actually work out of the box and don't
>> break over time as upstream changes.
> 
> I disagree. There's no point in having a git version of a package that
> is exactly the same as a release version. Doing so would also bring in
> all the patches specific to that release, which may not be appropriate
> for a different git revision. If you want a tested release, you would
> stick to something like gstreamer1.0*1.4.5.bb instead of choosing a git
> version.
> 
>> If someone wants to make a bleeding-edge build then it's a simple change
>> to set the SRCREV to AUTOREV at the distro level.
> 
> Well, as it's shaping up, that may actually not be possible in oe-core
> packages. It certainly does not work with the current gstreamer1.0*git
> recipes, because as soon as you do that you end up with infinite
> recursion when expanding SRC_URI.
> 
> I think there are two main use cases for git builds. Case one is keeping
> up with the bleeding edge, which implies SRCREV="${AUTOREV}". Case two
> is freezing at a particular revision that suits you, which implies
> SRCREV="git-hash". In case one, you will probably want to run a fairly
> lean set of patches (or even none) to track the upstream. In case two,
> you could potentially have a comprehensive set of patches that will only
> apply to that revision. Both cases will be a lot easier to manage if the
> *git.bb recipe gives you a clean git repository without patches.

as far as I remember, OE-Core policy forbids AUTOREV in recipes, because
it would make network access mandatory.

The syntax for enabling it from local.conf is:
SRCREV_pn-gstreamer1.0 = "${AUTOREV}"

Regards,
Andreas

Re: [PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[Peter Urbanec]

On 27/02/15 20:35, Andreas Oberritter wrote:
> as far as I remember, OE-Core policy forbids AUTOREV in recipes, because
> it would make network access mandatory.

Fair enough. If that is the policy, it would probably be appropriate to 
move the gstreamer1.01-*_git.bb recipes out of oe-core or at least fix 
them so that it is possible to use ${AUTOREV} from another layer.

> The syntax for enabling it from local.conf is:
> SRCREV_pn-gstreamer1.0 = "${AUTOREV}"

This only works for the main gstreamer1.0 recipe. It fails with infinite 
recursion on any of the gstreamer1.0-plugins-*.bb recipes as I mentioned 
before. This is because the plugins use a python method for SRC_URI 
which references PV. This blows up when you try to use SRCREV="${AUTOREV}"

I guess the question is what next? Should I just drop this and leave the 
oe-core gstreamer1.0*git.bb recipes as they are (referencing git commits 
from circa 2013) or should I put a bit more effort into cleaning up the 
issues with infinite recursion when used with AUTOREV? I suspect that 
the cleanup will just involve removing the current code and inserting a 
bunch of conditionals that translate "gstreamer1.0-" to "gst-"

In my opinion the current version of the recipes is of limited value. I 
understand that there has recently been some activity on implementing 
something that could deliver the functionality of gitpkgv at the oe-core 
level. Should I perhaps just wait and see how that pans out? 
gstreamer1.0*git.bb could be a good test case. ;-)

Cheers and beers,

	Peter

Re: [PATCH] gstreamer1.0*git: Update to build current AUTOREV from master branch.

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2297 bytes --]

On Fri, Feb 27, 2015 at 11:27:06PM +1100, Peter Urbanec wrote:
> On 27/02/15 20:35, Andreas Oberritter wrote:
> > as far as I remember, OE-Core policy forbids AUTOREV in recipes, because
> > it would make network access mandatory.
> 
> Fair enough. If that is the policy, it would probably be appropriate to 
> move the gstreamer1.01-*_git.bb recipes out of oe-core or at least fix 
> them so that it is possible to use ${AUTOREV} from another layer.
> 
> > The syntax for enabling it from local.conf is:
> > SRCREV_pn-gstreamer1.0 = "${AUTOREV}"
> 
> This only works for the main gstreamer1.0 recipe. It fails with infinite 
> recursion on any of the gstreamer1.0-plugins-*.bb recipes as I mentioned 
> before. This is because the plugins use a python method for SRC_URI 
> which references PV. This blows up when you try to use SRCREV="${AUTOREV}"
> 
> I guess the question is what next? Should I just drop this and leave the 
> oe-core gstreamer1.0*git.bb recipes as they are (referencing git commits 
> from circa 2013) or should I put a bit more effort into cleaning up the 

I think the best compromise is to apply your changes, but instead of
setting SRCREV to AUTOREV set it to some recent revision you've tested
locally.

Then someone can apply AUTOREV from distro config or if we cannot work
around infinite recursion, then you can still set it to AUTOREV in
.bbappend.

Cheers,

> issues with infinite recursion when used with AUTOREV? I suspect that 
> the cleanup will just involve removing the current code and inserting a 
> bunch of conditionals that translate "gstreamer1.0-" to "gst-"
> 
> In my opinion the current version of the recipes is of limited value. I 
> understand that there has recently been some activity on implementing 
> something that could deliver the functionality of gitpkgv at the oe-core 
> level. Should I perhaps just wait and see how that pans out? 
> gstreamer1.0*git.bb could be a good test case. ;-)
> 
> Cheers and beers,
> 
> 	Peter
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]