Skip to contentSkip to conversation

gstd: Fix the version number

PATCH In review Adrian Bunk 2 participants 3 messages Oct 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gstd: Fix the version number

This is Gstd 0.6.3 for GStreamer 1.x.

Also merge the inc into the recipe.

---
 .../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%)
meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb deleted +0 -3
deleted file mode 100644
index 94f6b575b..000000000
@@ -1,3 +0,0 @@
-require gstd.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb renamed from meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc +5 -1
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
@@ -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://[email protected]/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() {
Signature · 1 line
2.17.1
#1 lore raw
Quoted 51 lines · Adrian Bunk

This is Gstd 0.6.3 for GStreamer 1.x.

Also merge the inc into the recipe.

---
 .../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%)

meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb deleted +0 -3
deleted file mode 100644
index 94f6b575b..000000000
@@ -1,3 +0,0 @@
-require gstd.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb renamed from meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc +1 -1
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
@@ -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"

meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb renamed from meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc +0 -0
@@ -14,6 +15,9 @@ SRC_URI = "git://

[email protected]/RidgeRun/gstd-1.x.git;protocol=https;branch=${SR
<http://[email protected]/RidgeRun/gstd-1.x.git;protocol=https;branch=$%7BSR>

            "

S = "${WORKDIR}/git"

meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb SRC_URI = "git://[email protected]/RidgeRun/gstd-1.x.git;protocol=https;branch=${SR · line 19

Quoted 2 lines
meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb renamed from meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc +2 -0
+# 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

Quoted 13 lines

+
inherit autotools pkgconfig gettext gtk-doc

do_configure_prepend() {
--
2.17.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 7 lines · Khem Raj

On Mon, Oct 28, 2019 at 7:55 PM Adrian Bunk <[email protected]> wrote:
...

meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb SRC_URI = "git://[email protected]/RidgeRun/gstd-1.x.git;protocol=https;branch=${SR · line 19

Quoted 2 lines
meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb renamed from meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc +2 -0
+# 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

Signature · 4 lines
       "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