[meta-multimedia][PATCH] gstd: Fix the version number

[meta-multimedia][PATCH] gstd: Fix the version number

[Adrian Bunk]

This is Gstd 0.6.3 for GStreamer 1.x.

Also merge the inc into the recipe.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
 .../recipes-multimedia/gstreamer-1.0/gstd_1.0.bb            | 3 ---
 .../gstreamer-1.0/{gstd.inc => gstd_git.bb}                 | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
 rename meta-multimedia/recipes-multimedia/gstreamer-1.0/{gstd.inc => gstd_git.bb} (82%)

diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
deleted file mode 100644
index 94f6b575b..000000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require gstd.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
similarity index 82%
rename from meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc
rename to meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
index 455d89684..828caa883 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc
+++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
@@ -1,8 +1,9 @@
-DESCRIPTION = "Gstreamer Daemon 1.0"
+DESCRIPTION = "Gstreamer Daemon"
 SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages"
 HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0"
 SECTION = "multimedia"
 LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon"
 
@@ -14,6 +15,9 @@ SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SR
            "
 S = "${WORKDIR}/git"
 
+# Remove the +really when upstream version is > 1.0
+PV = "1.0+really0.6.3"
+
 inherit autotools pkgconfig gettext gtk-doc
 
 do_configure_prepend() {
-- 
2.17.1

Re: [meta-multimedia][PATCH] gstd: Fix the version number

[Khem Raj]

On Mon, Oct 28, 2019 at 7:55 PM Adrian Bunk <bunk@stusta.de> wrote:

> This is Gstd 0.6.3 for GStreamer 1.x.
>
> Also merge the inc into the recipe.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> ---
>  .../recipes-multimedia/gstreamer-1.0/gstd_1.0.bb            | 3 ---
>  .../gstreamer-1.0/{gstd.inc => gstd_git.bb}                 | 6 +++++-
>  2 files changed, 5 insertions(+), 4 deletions(-)
>  delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-1.0/
> gstd_1.0.bb
>  rename meta-multimedia/recipes-multimedia/gstreamer-1.0/{gstd.inc =>
> gstd_git.bb} (82%)
>
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
> b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
> deleted file mode 100644
> index 94f6b575b..000000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -require gstd.inc
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc
> b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
> similarity index 82%
> rename from meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc
> rename to meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
> index 455d89684..828caa883 100644
> --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc
> +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
> @@ -1,8 +1,9 @@
> -DESCRIPTION = "Gstreamer Daemon 1.0"
> +DESCRIPTION = "Gstreamer Daemon"
>  SUMMARY = "GStreamer framework for controlling audio and video streaming
> using TCP connection messages"
>  HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0"
>  SECTION = "multimedia"
>  LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>
>  DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base
> gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon"
>
> @@ -14,6 +15,9 @@ SRC_URI = "git://
> git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SR
> <http://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=$%7BSR>
>             "
>  S = "${WORKDIR}/git"
>
> +# Remove the +really when upstream version is > 1.0
> +PV = "1.0+really0.6.3"


We already have 1.0 so will this sort above that ?
If not we have to maybe either keep it faking 1.0 or bump PE


> +
>  inherit autotools pkgconfig gettext gtk-doc
>
>  do_configure_prepend() {
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-multimedia][PATCH] gstd: Fix the version number

[Adrian Bunk]

On Mon, Oct 28, 2019 at 08:36:32PM +0100, Khem Raj wrote:
> On Mon, Oct 28, 2019 at 7:55 PM Adrian Bunk <bunk@stusta.de> wrote:
>...
> > +# Remove the +really when upstream version is > 1.0
> > +PV = "1.0+really0.6.3"
> 
> We already have 1.0 so will this sort above that ?
>...

That's the point, similar to +git in PV.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed