2520 replies to this topic

[metoo]

Thx Building now atnd this night

git checkout gst-1 is the magic

Where can i find the image when it is done ?

by me

/home/gerlubuntu/openpli4/openpli-openpli-oe-core/build/tmp/deploy/images/et6x00

[theparasol]

now removed build/tmp and build/sstate-cache and started all over again.

 

I did apply (modded for xp1000) patches from blzr and mx3L while the build was in progress (aborted it, patched and started build again)

Lets wait another 2 days to see if this attempt works out...

[mx3L]

@theparasol

We are missing patch for enigma2-plugins, it is in post #282. They need to be little adjusted for openpli-oe-core.

Apparently for xtrend there was no dependency for enigma2-plugins, since my builds were successfull

Edited by mx3L, 27 January 2015 - 21:40.

[theparasol]

Did I understand you correctly:

 

Missing enigma2-plugins.bbappend

 

FILESEXTRAPATHS_prepend := "${THISDIR}:"
SRC_URI += "file://gst10-fix-enigma2-plugins.patch"
EXTRA_OECONF += "--with-gstversion=1.0"

 

Missing gst10-fix-enigma2-plugins.patch

From 3007a3e9619e2121af8c1f4967fee8813662187f Mon Sep 17 00:00:00 2001
From: christophecvr <stefansat@telenet.be>
Date: Fri, 31 Jan 2014 18:49:54 +0100
Subject: [PATCH]  On branch GST10-PATCH-enigma2-plugins

    modified:   configure.ac
    modified:   merlinmusicplayer/src/merlinmp3player/merlinmp3player.cpp
---
 configure.ac                                       |   12 +++++++++++-
 .../src/merlinmp3player/merlinmp3player.cpp        |   16 ++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 82785ec..419333a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,11 @@ AC_INIT([enigma2-plugins],[3.2.0],[enigma2-devel@lists.elitedvb.net])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign no-define tar-pax])
 AC_CONFIG_HEADERS([enigma2-plugins-config.h])
 
+#dnl versions of gstreamer and plugins-base
+AC_ARG_WITH(gstversion,
+    AS_HELP_STRING([--with-gstversion],[use gstreamer version (major.minor)]),
+    [GST_MAJORMINOR=$withval],[GST_MAJORMINOR=0.10])
+
 # Silent rules are available since 1.11, but older versions
 # are still in use. So don't use them unconditionally.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -23,7 +28,12 @@ AX_PTHREAD
 TUXBOX_APPS_DVB
 
 PKG_CHECK_MODULES(ENIGMA2, enigma2)
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-pbutils-0.10)
+if test "x$GST_MAJORMINOR" < "x1"; then
+    PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-pbutils-0.10)
+else
+    PKG_CHECK_MODULES(GSTREAMER, gstreamer-1.0 gstreamer-pbutils-1.0)
+fi
+
 PKG_CHECK_MODULES(LIBCRYPTO, libcrypto)
 
 AC_ARG_WITH(tpm,
diff --git a/merlinmusicplayer/src/merlinmp3player/merlinmp3player.cpp b/merlinmusicplayer/src/merlinmp3player/merlinmp3player.cpp
index 0f25e41..d1aa58f 100644
--- a/merlinmusicplayer/src/merlinmp3player/merlinmp3player.cpp
+++ b/merlinmusicplayer/src/merlinmp3player/merlinmp3player.cpp
@@ -123,7 +123,11 @@ eServiceMerlinMP3Player::eServiceMerlinMP3Player(eServiceReference ref):  m_ref(
        g_object_set (G_OBJECT (source), "location", m_filename.c_str(), NULL);
        gst_bin_add_many (GST_BIN (m_gst_pipeline), source, decoder, sink, NULL);
        gst_element_link_many (source, decoder, sink, NULL);
+#if GST_VERSION_MAJOR < 1
        gst_bus_set_sync_handler(gst_pipeline_get_bus (GST_PIPELINE (m_gst_pipeline)), gstBusSyncHandler, this);
+#else
+        gst_bus_set_sync_handler(gst_pipeline_get_bus (GST_PIPELINE (m_gst_pipeline)), gstBusSyncHandler, this, NULL);
+#endif
        gst_element_set_state (m_gst_pipeline, GST_STATE_PLAYING);
    }
    else
@@ -240,9 +244,13 @@ RESULT eServiceMerlinMP3Player::getLength(pts_t &pts)
     
     GstFormat fmt = GST_FORMAT_TIME;
     gint64 len;
-    
+#if GST_VERSION_MAJOR < 1    
     if (!gst_element_query_duration(m_gst_pipeline, &fmt, &len))
         return -1;
+#else
+    if (!gst_element_query_duration(m_gst_pipeline, fmt, &len))
+        return -1;
+#endif
     
         /* len is in nanoseconds. we have 90 000 pts per second. */
     
@@ -295,9 +303,13 @@ RESULT eServiceMerlinMP3Player::getPlayPosition(pts_t &pts)
     
     GstFormat fmt = GST_FORMAT_TIME;
     gint64 len;
-    
+#if GST_VERSION_MAJOR < 1    
     if (!gst_element_query_position(m_gst_pipeline, &fmt, &len))
         return -1;
+#else
+    if (!gst_element_query_position(m_gst_pipeline, fmt, &len))
+        return -1;
+#endif
     
         /* len is in nanoseconds. we have 90 000 pts per second. */
     pts = len / 11111;
--
1.7.9.5

 

Added now.... damn "Merlin" music player!

[mx3L]

Thats right, but I'm having some rejects after this patch

[theparasol]

Well, started from scratch so not yet arrived at this point. Think the merlin source has been changed and patch isnt appliable any longer?

[mx3L]

Thats right, merlin part now shouldn't be there at all, just configure.ac

[theparasol]

changed it into:

 

diff --git a/configure.ac b/configure.ac
index 82785ec..419333a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,11 @@ AC_INIT([enigma2-plugins],[3.2.0],[enigma2-devel@lists.elitedvb.net])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign no-define tar-pax])
 AC_CONFIG_HEADERS([enigma2-plugins-config.h])
 
+#dnl versions of gstreamer and plugins-base
+AC_ARG_WITH(gstversion,
+    AS_HELP_STRING([--with-gstversion],[use gstreamer version (major.minor)]),
+    [GST_MAJORMINOR=$withval],[GST_MAJORMINOR=0.10])
+
 # Silent rules are available since 1.11, but older versions
 # are still in use. So don't use them unconditionally.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -23,7 +28,12 @@ AX_PTHREAD
 TUXBOX_APPS_DVB
 
 PKG_CHECK_MODULES(ENIGMA2, enigma2)
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-pbutils-0.10)
+if test "x$GST_MAJORMINOR" < "x1"; then
+    PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-pbutils-0.10)
+else
+    PKG_CHECK_MODULES(GSTREAMER, gstreamer-1.0 gstreamer-pbutils-1.0)
+fi
+
 PKG_CHECK_MODULES(LIBCRYPTO, libcrypto)
 
 AC_ARG_WITH(tpm,

[mx3L]

Now it applies cleanly, this patch should be added directly to openpli-plugins-enigma2 git.

 

and this to openpli-oe-core:

diff --git a/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
index d02d5c5..1f054e9 100644
--- a/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
+++ b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
@@ -31,6 +31,7 @@ EXTRA_OECONF = " \
        STAGING_INCDIR=${STAGING_INCDIR} \
        STAGING_LIBDIR=${STAGING_LIBDIR} \
        --without-debug \
+       ${@base_contains("GST_VERSION", "1.0", "--with-gstversion=1.0", "", d)} \
        ${@base_contains("MACHINE_FEATURES", "tpm", "--with-tpm" , "", d)} \
 "
 

[theparasol]

Ok, ik heb inmiddels een xp1000 image weten te brouwen, na wat hickups die ik gelukkig zelf dan wel met meer ervaren gebruikers hier heb kunnen resolven.

 

Het recept voor anderen met een xp1000 die dit ook willen doen:

 

Ik gebruik virtualbox (freeware van oracle) met een ergens gedownloade kant en klaar image van ubuntu 14.04 server voor virtualbox (scheelt gewoon tijd)

 

Log niet in als root!

 

mkdir openpli4
cd openpli4
sudo apt install git
git clone git://git.code.sf.net/p/openpli/openpli-oe-core openpli-openpli-oe-core
cd openpli-openpli-oe-core/
git checkout gst-1
sudo apt install diffstat
sudo apt install chrpath
sudo apt install texinfo
sudo apt install zip
sudo apt install subversion
git apply gst1_xp1000.patch
 
MACHINE=xp1000 make image

 

inhoud additionele "gst1_xp1000.patch" die nodig is tov gst-1 branch (situatie per 29-01-2015):

 

diff --git a/meta-openpli/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.%.bbappend b/meta-openpli/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.
index 67fedac..f73d38a 100644
--- a/meta-openpli/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.%.bbappend
+++ b/meta-openpli/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.%.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-DEPENDS += "librtmp libdca"
-EXTRA_OECONF := "${@bb.data.getVar('EXTRA_OECONF',d,1).replace('--disable-rtmp', '--enable-rtmp --enable-mpegdemux').replace('--disable-dts', '--enable-dts')}"
-PACKAGECONFIG += "faac faad libmms hls dash smoothstreaming webp"
+DEPENDS += "libdca"
+EXTRA_OECONF := "${@bb.data.getVar('EXTRA_OECONF',d,1).replace('--disable-dts', '--enable-dts --enable-mpegdemux')}"
+PACKAGECONFIG += "faac faad libmms hls dash smoothstreaming webp rtmp"
 SRC_URI += "file://0001-rtmp-fix-seeking-and-potential-segfault.patch"

 # Do not strip binary
diff --git a/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
index d02d5c5..1f054e9 100644
--- a/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
+++ b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
@@ -31,6 +31,7 @@ EXTRA_OECONF = " \
        STAGING_INCDIR=${STAGING_INCDIR} \
        STAGING_LIBDIR=${STAGING_LIBDIR} \
        --without-debug \
+       ${@base_contains("GST_VERSION", "1.0", "--with-gstversion=1.0", "", d)} \
        ${@base_contains("MACHINE_FEATURES", "tpm", "--with-tpm" , "", d)} \
 "

diff --git a/meta-openpli/recipes-openpli/enigma2/enigma2.bb b/meta-openpli/recipes-openpli/enigma2/enigma2.bb
index 535252f..71f1924 100644
--- a/meta-openpli/recipes-openpli/enigma2/enigma2.bb
+++ b/meta-openpli/recipes-openpli/enigma2/enigma2.bb
@@ -28,6 +28,7 @@ RDEPENDS_${PN} = " \
        "

 RRECOMMENDS_${PN} = " \
+       ca-certificates \
        enigma2-plugin-skins-pli-hd \
        ${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugin-subsink", "gst-plugin-subsink", d)} \
        glib-networking \
diff --git a/meta-xp/conf/machine/include/xp.inc b/meta-xp/conf/machine/include/xp.inc
index 377a3b7..6697a8b 100644
--- a/meta-xp/conf/machine/include/xp.inc
+++ b/meta-xp/conf/machine/include/xp.inc
@@ -13,13 +13,14 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
 KERNEL_MODULE_AUTOLOAD += "xfs"

 MACHINE_EXTRA_RRECOMMENDS = " \
-       gst-plugin-dvbmediasink \
+       gstreamer1.0-plugin-dvbmediasink \
        ntfs-3g \
        "

 CHIPSET = "bcm7358"

 DVBMEDIASINK_CONFIG = "--with-wma --with-wmv --with-pcm --with-dts --with-eac3"
+GST_VERSION = "1.0"

 TARGET_ARCH = "mipsel"
 DEFAULTTUNE ?= "mips32el"

 

Vanavond gaan we het baksel proberen

[mx3L]

If possible, I think it's safe to apply patches from #471 and #488 to openpli-oe-core gst-1 branch and #487 to openpli-plugins-enigma2, so we don't have to do it manually.

[theparasol]

The results for gstreamer 1.x with my XP1000:

 

"This image is justed based on openpli and so, not genuine."

 

Shoutcast streams -> OK!

NPO uitzending gemist -> OK!

RTL4 uitzending gemist -> OK!

SBS6 uitzending gemist -> OK!

Veronica uitzending gemist -> OK!

NET5 uitzending gemist -> OK!

 

RTL4 part of uitzendinggemist needs some rework since RTL4 changed their website code once more for RTL XL A-Z, but RTL XL gemist part does work fine

 

mp3 files play fine, and any mkv files I had sitting on my nas play ok.

 

I can say the image works fine for my kind of usage!

[korsan]

I would like to test this image too for XP1000.

Edited by korsan, 29 January 2015 - 22:55.

[MastaG]

Thx Parasol! Je bent de bom!

Goed werk

 

So has anyone looked into replacing the dvbmediasink for Vu or Dreambox receivers yet?

I'd really like to try it out

[theparasol]

I find it too much honour for just compiling and testing something that is already there for some time

[MastaG]

Of course props go to everyone who helped achieving this: athoik, mx3L, betacentauri, christophecvr, Erik Slagter, all the compilers/beta-testers and anyone else I forgot to mention.

I think it's great that the new gstreamer framework has been adapted, allowing us to play hls streams now

[Robinson]

Will it be integrated into the latest OpenPLi images for ET9x00?

[littlesat]

When it is performing well during the tests.... So when it is pulled into the master branch...

[Erik Slagter]

Can I please have a set of current and correct patches? I believe some of the patches mentioned above are no longer current?

[theparasol]

For my XP1000 this should work:

 

commit 413a2b589dc01cddaef96a862007bb29d8f26e4c
Author: Theparasol
Date:   Fri Jan 30 20:18:49 2015 +0100

    Fix for GST1.0 for XP1000

diff --git a/meta-openpli/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.%.bbappend b/meta-openpli/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.%.bbappend
index 67fedac..f73d38a 100644
--- a/meta-openpli/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.%.bbappend
+++ b/meta-openpli/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.%.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-DEPENDS += "librtmp libdca"
-EXTRA_OECONF := "${@bb.data.getVar('EXTRA_OECONF',d,1).replace('--disable-rtmp', '--enable-rtmp --enable-mpegdemux').replace('--disable-dts', '--enable-dts')}"
-PACKAGECONFIG += "faac faad libmms hls dash smoothstreaming webp"
+DEPENDS += "libdca"
+EXTRA_OECONF := "${@bb.data.getVar('EXTRA_OECONF',d,1).replace('--disable-dts', '--enable-dts --enable-mpegdemux')}"
+PACKAGECONFIG += "faac faad libmms hls dash smoothstreaming webp rtmp"
 SRC_URI += "file://0001-rtmp-fix-seeking-and-potential-segfault.patch"
 
 # Do not strip binary
diff --git a/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
index 3aed9bb..65bc435 100644
--- a/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
+++ b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
@@ -30,6 +30,7 @@ EXTRA_OECONF = " \
     STAGING_INCDIR=${STAGING_INCDIR} \
     STAGING_LIBDIR=${STAGING_LIBDIR} \
     --without-debug \
+    ${@base_contains("GST_VERSION", "1.0", "--with-gstversion=1.0", "", d)} \
 "
 
 CONFFILES_${PN} += "${sysconfdir}/enigma2/movietags"
diff --git a/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bbappend b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bbappend
new file mode 100755
index 0000000..ec033e0
--- /dev/null
+++ b/meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}:"
+SRC_URI += "file://gst10-fix-enigma2-plugins.patch"
+EXTRA_OECONF += "--with-gstversion=1.0"
diff --git a/meta-openpli/recipes-openpli/enigma2-plugins/gst10-fix-enigma2-plugins.patch b/meta-openpli/recipes-openpli/enigma2-plugins/gst10-fix-enigma2-plugins.patch
new file mode 100755
index 0000000..28d4010
--- /dev/null
+++ b/meta-openpli/recipes-openpli/enigma2-plugins/gst10-fix-enigma2-plugins.patch
@@ -0,0 +1,31 @@
+diff --git a/configure.ac b/configure.ac
+index 82785ec..419333a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,6 +2,11 @@ AC_INIT([enigma2-plugins],[3.2.0],[enigma2-devel@lists.elitedvb.net])
+ AM_INIT_AUTOMAKE([dist-bzip2 foreign no-define tar-pax])
+ AC_CONFIG_HEADERS([enigma2-plugins-config.h])
+
++#dnl versions of gstreamer and plugins-base
++AC_ARG_WITH(gstversion,
++    AS_HELP_STRING([--with-gstversion],[use gstreamer version (major.minor)]),
++    [GST_MAJORMINOR=$withval],[GST_MAJORMINOR=0.10])
++
+ # Silent rules are available since 1.11, but older versions
+ # are still in use. So don't use them unconditionally.
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+@@ -23,7 +28,12 @@ AX_PTHREAD
+ TUXBOX_APPS_DVB
+
+ PKG_CHECK_MODULES(ENIGMA2, enigma2)
+-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-pbutils-0.10)
++if test "x$GST_MAJORMINOR" < "x1"; then
++    PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-pbutils-0.10)
++else
++    PKG_CHECK_MODULES(GSTREAMER, gstreamer-1.0 gstreamer-pbutils-1.0)
++fi
++
+ PKG_CHECK_MODULES(LIBCRYPTO, libcrypto)
+
+ AC_ARG_WITH(tpm,
+
\ No newline at end of file
diff --git a/meta-openpli/recipes-openpli/enigma2/enigma2.bb b/meta-openpli/recipes-openpli/enigma2/enigma2.bb
index 44b6764..c9cd02b 100644
--- a/meta-openpli/recipes-openpli/enigma2/enigma2.bb
+++ b/meta-openpli/recipes-openpli/enigma2/enigma2.bb
@@ -29,6 +29,7 @@ RDEPENDS_${PN} = " \
     "
 
 RRECOMMENDS_${PN} = " \
+    ca-certificates \
     enigma2-plugin-skins-pli-hd \
     ${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugin-subsink", "gst-plugin-subsink", d)} \
     glib-networking \
diff --git a/meta-xp/conf/machine/include/xp.inc b/meta-xp/conf/machine/include/xp.inc
index 377a3b7..6697a8b 100644
--- a/meta-xp/conf/machine/include/xp.inc
+++ b/meta-xp/conf/machine/include/xp.inc
@@ -13,13 +13,14 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
 KERNEL_MODULE_AUTOLOAD += "xfs"
 
 MACHINE_EXTRA_RRECOMMENDS = " \
-    gst-plugin-dvbmediasink \
+    gstreamer1.0-plugin-dvbmediasink \
     ntfs-3g \
     "
 
 CHIPSET = "bcm7358"
 
 DVBMEDIASINK_CONFIG = "--with-wma --with-wmv --with-pcm --with-dts --with-eac3"
+GST_VERSION = "1.0"
 
 TARGET_ARCH = "mipsel"
 DEFAULTTUNE ?= "mips32el"

 

Need to retest it since I manged to destroy my local repository again I had to apply all from scratch again

Hope some day me and git will get along