[warrior][PATCH 0/4] vlc adjustments

[warrior][PATCH 0/4] vlc adjustments

[Andreas Müller]

Some cherry-picks for vlc

1. Is mandatory because qt4 support is gone and without qt5 vlc is not useful
   exactly
2.- 4. Are good enhancements. It is upon warrior maintainers if they are
   important enough to make it into stable branch.

Adrian Bunk (3):
  vlc: Remove workaround and patches for problems fixed upstream
  vlc: notify switched to GTK+3 some time ago
  vlc: Remove the obsolete dependency on dbus-glib

Andreas Müller (1):
  vlc: rework qt PACKAGECONFIG

 .../recipes-multimedia/vlc/vlc.inc            | 28 +++++++++++--------
 .../0002-glibc-does-not-provide-strlcpy.patch | 15 ----------
 .../vlc/0005-libpostproc-header-check.patch   | 15 ----------
 .../recipes-multimedia/vlc/vlc_3.0.6.bb       |  5 ----
 4 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch

-- 
2.20.1

[warrior][PATCH 1/4] vlc: rework qt PACKAGECONFIG

[Andreas Müller]

* qt4 support is gone -> move to qt5
* while at it remove noop libtool copy

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-multimedia/vlc/vlc.inc            | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 19ac8206c..9bbc6685d 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -36,12 +36,17 @@ EXTRA_OECONF = "\
     --enable-realrtsp \
     --disable-libtar \
     --enable-avcodec \
-    ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
-    ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
-    ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
+    ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \
+    ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \
+    ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \
 "
 
-PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG ?= " \
+    live555 dc1394 dv1394 notify fontconfig freetype dvdread png \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)}
 
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
@@ -54,7 +59,7 @@ PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
 PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
 PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad"
 PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx"
-PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free"
+PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg"
 PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp"
 PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi"
 PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba"
@@ -76,12 +81,13 @@ PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb,  xcb-util
 PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
 PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
 
-do_configure_prepend() {
-    cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
-}
-
 do_configure_append() {
     sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool
+
+    # moc needs support: precreate build paths
+    for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do
+        mkdir -p "${B}/modules/gui/qt/$qtpath"
+    done
 }
 
 # This recipe packages vlc as a library as well, so qt4 dependencies
-- 
2.20.1

[warrior][PATCH 2/4] vlc: Remove workaround and patches for problems fixed upstream

[Andreas Müller]

From: Adrian Bunk <bunk@stusta.de>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../vlc/0002-glibc-does-not-provide-strlcpy.patch | 15 ---------------
 .../vlc/vlc/0005-libpostproc-header-check.patch   | 15 ---------------
 .../recipes-multimedia/vlc/vlc_3.0.6.bb           |  5 -----
 3 files changed, 35 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch
deleted file mode 100644
index 3db3df34b..000000000
--- a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/input/subtitles.c
-+++ b/src/input/subtitles.c
-@@ -42,6 +42,12 @@
- #include "input_internal.h"
- 
- /**
-+ * Drepper's alternative 
-+ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
-+ */
-+#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
-+
-+/**
-  * The possible extensions for subtitle files we support
-  */
- static const char *const sub_exts[] = { SLAVE_SPU_EXTENSIONS, "" };
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch
deleted file mode 100644
index 77a7d6173..000000000
--- a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* Also look for postprocess.h under libpostproc/
-
-Upstream-status: Pending
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -2589,7 +2589,7 @@ then
-       VLC_SAVE_FLAGS
-       CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
-       CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
--      AC_CHECK_HEADERS(postproc/postprocess.h)
-+      AC_CHECK_HEADERS(postproc/postprocess.h,[],[AC_CHECK_HEADERS(libpostproc/postprocess.h)])
-       VLC_ADD_PLUGIN([postproc])
-       VLC_RESTORE_FLAGS
-     ],[
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb
index 1ae213ff3..fcd321cb0 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb
@@ -1,13 +1,8 @@
 require ${BPN}.inc
 
-# work around build failure
-EXTRA_OECONF += " --enable-libxml2=no"
-
 LDFLAGS_append_riscv64 = " -pthread"
 
 SRC_URI += " \
-            file://0002-glibc-does-not-provide-strlcpy.patch \
-            file://0005-libpostproc-header-check.patch \
             file://0006-make-opencv-configurable.patch \
             file://0007-use-vorbisidec.patch \
             file://0008-fix-luaL-checkint.patch \
-- 
2.20.1

[warrior][PATCH 3/4] vlc: notify switched to GTK+3 some time ago

[Andreas Müller]

From: Adrian Bunk <bunk@stusta.de>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 9bbc6685d..0bedc5da9 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -72,7 +72,7 @@ PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394"
 PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394"
 PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg"
 PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
-PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+"
+PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3"
 PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
 PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
 PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
-- 
2.20.1

[warrior][PATCH 4/4] vlc: Remove the obsolete dependency on dbus-glib

[Andreas Müller]

From: Adrian Bunk <bunk@stusta.de>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 0bedc5da9..5c38be31f 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \
-   dbus dbus-glib libxml2 gnutls \
+   dbus libxml2 gnutls \
    tremor faad2 ffmpeg flac fluidsynth alsa-lib \
    lua-native lua libidn \
    avahi jpeg xz libmodplug mpeg2dec \
-- 
2.20.1

Re: [warrior][PATCH 0/4] vlc adjustments

[Adrian Bunk]

On Sat, Aug 17, 2019 at 10:13:35AM +0200, Andreas Müller wrote:
> Some cherry-picks for vlc
>...
> 2.- 4. Are good enhancements. It is upon warrior maintainers if they are
>    important enough to make it into stable branch.
> 
> Adrian Bunk (3):
>   vlc: Remove workaround and patches for problems fixed upstream
>   vlc: notify switched to GTK+3 some time ago
>   vlc: Remove the obsolete dependency on dbus-glib
>...

The notify change is an actual bugfix that should be added to warrior.

The other two changes are cleanup patches with no (intentional) changes
in the build result, I would recommend against backporting them since
there are no benfits compared to the small regression risk.

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

Re: [warrior][PATCH 1/4] vlc: rework qt PACKAGECONFIG

[akuster808]

On 8/17/19 1:13 AM, Andreas Müller wrote:
I found this buried at the bottom of my inbox so apologies for
responding so late.
> * qt4 support is gone -> move to qt5
By support gone do mean, not supported by Poky or do you mean QT removed
the sources?

- armin
> * while at it remove noop libtool copy
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../recipes-multimedia/vlc/vlc.inc            | 24 ++++++++++++-------
>  1 file changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> index 19ac8206c..9bbc6685d 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> @@ -36,12 +36,17 @@ EXTRA_OECONF = "\
>      --enable-realrtsp \
>      --disable-libtar \
>      --enable-avcodec \
> -    ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
> -    ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
> -    ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
> +    ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \
> +    ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \
> +    ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \
>  "
>  
> -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> +PACKAGECONFIG ?= " \
> +    live555 dc1394 dv1394 notify fontconfig freetype dvdread png \
> +    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
> +"
> +
> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)}
>  
>  PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
>  PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> @@ -54,7 +59,7 @@ PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
>  PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
>  PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad"
>  PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx"
> -PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free"
> +PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg"
>  PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp"
>  PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi"
>  PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba"
> @@ -76,12 +81,13 @@ PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb,  xcb-util
>  PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
>  PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
>  
> -do_configure_prepend() {
> -    cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> -}
> -
>  do_configure_append() {
>      sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool
> +
> +    # moc needs support: precreate build paths
> +    for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do
> +        mkdir -p "${B}/modules/gui/qt/$qtpath"
> +    done
>  }
>  
>  # This recipe packages vlc as a library as well, so qt4 dependencies

Re: [warrior][PATCH 1/4] vlc: rework qt PACKAGECONFIG

[Andreas Müller]

On Thu, Aug 22, 2019 at 6:16 AM akuster808 <akuster808@gmail.com> wrote:
>
>
>
> On 8/17/19 1:13 AM, Andreas Müller wrote:
> I found this buried at the bottom of my inbox so apologies for
> responding so late.
> > * qt4 support is gone -> move to qt5
> By support gone do mean, not supported by Poky or do you mean QT removed
> the sources?
>
As far as I can remember qt4 support was dropped in vlc

Andreas

Re: [warrior][PATCH 0/4] vlc adjustments

[Andreas Müller]

On Sat, Aug 17, 2019 at 1:18 PM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Sat, Aug 17, 2019 at 10:13:35AM +0200, Andreas Müller wrote:
> > Some cherry-picks for vlc
> >...
> > 2.- 4. Are good enhancements. It is upon warrior maintainers if they are
> >    important enough to make it into stable branch.
> >
> > Adrian Bunk (3):
> >   vlc: Remove workaround and patches for problems fixed upstream
> >   vlc: notify switched to GTK+3 some time ago
> >   vlc: Remove the obsolete dependency on dbus-glib
> >...
>
> The notify change is an actual bugfix that should be added to warrior.
>
> The other two changes are cleanup patches with no (intentional) changes
> in the build result, I would recommend against backporting them since
> there are no benfits compared to the small regression risk.
>
> cu
> Adrian
>
Ping

Re: [warrior][PATCH 0/4] vlc adjustments

[akuster808]

On 8/28/19 3:56 PM, Andreas Müller wrote:
> On Sat, Aug 17, 2019 at 1:18 PM Adrian Bunk <bunk@stusta.de> wrote:
>> On Sat, Aug 17, 2019 at 10:13:35AM +0200, Andreas Müller wrote:
>>> Some cherry-picks for vlc
>>> ...
>>> 2.- 4. Are good enhancements. It is upon warrior maintainers if they are
>>>    important enough to make it into stable branch.
>>>
>>> Adrian Bunk (3):
>>>   vlc: Remove workaround and patches for problems fixed upstream
>>>   vlc: notify switched to GTK+3 some time ago
>>>   vlc: Remove the obsolete dependency on dbus-glib
>>> ...
>> The notify change is an actual bugfix that should be added to warrior.
>>
>> The other two changes are cleanup patches with no (intentional) changes
>> in the build result, I would recommend against backporting them since
>> there are no benfits compared to the small regression risk.
>>
>> cu
>> Adrian
>>
> Ping

in stable/warrior-nmut for testing.

Re: [warrior][PATCH 0/4] vlc adjustments

[Andreas Müller]

On Thu, Aug 29, 2019 at 4:16 PM akuster808 <akuster808@gmail.com> wrote:
> > Ping
>
> in stable/warrior-nmut for testing.
>
Thanks

Andreas

Re: [warrior][PATCH 0/4] vlc adjustments

[Andreas Müller]

On Fri, Aug 30, 2019 at 10:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Thu, Aug 29, 2019 at 4:16 PM akuster808 <akuster808@gmail.com> wrote:
> > > Ping
> >
> > in stable/warrior-nmut for testing.
> >
> Thanks
>
Patch 3 was applied / 1,2,4 not. Shall I resend or is there a reason
not to apply them in warrior?

Andreas

Re: [warrior][PATCH 0/4] vlc adjustments

[Adrian Bunk]

On Fri, Sep 20, 2019 at 03:14:04AM +0200, Andreas Müller wrote:
> On Fri, Aug 30, 2019 at 10:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > On Thu, Aug 29, 2019 at 4:16 PM akuster808 <akuster808@gmail.com> wrote:
> > > > Ping
> > >
> > > in stable/warrior-nmut for testing.
> > >
> > Thanks
> >
> Patch 3 was applied / 1,2,4 not. Shall I resend or is there a reason
> not to apply them in warrior?

2 and 4 (written by me) were not applied since I recommended against.

Patch 1 I don't have an opinion about here, but Armin might have 
misunderstood my comment as disapproval also for this one.

> Andreas

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

Re: [warrior][PATCH 0/4] vlc adjustments

[Andreas Müller]

On Fri, Sep 20, 2019 at 8:36 AM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Fri, Sep 20, 2019 at 03:14:04AM +0200, Andreas Müller wrote:
> > On Fri, Aug 30, 2019 at 10:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> > >
> > > On Thu, Aug 29, 2019 at 4:16 PM akuster808 <akuster808@gmail.com> wrote:
> > > > > Ping
> > > >
> > > > in stable/warrior-nmut for testing.
> > > >
> > > Thanks
> > >
> > Patch 3 was applied / 1,2,4 not. Shall I resend or is there a reason
> > not to apply them in warrior?
>
> 2 and 4 (written by me) were not applied since I recommended against.
>
> Patch 1 I don't have an opinion about here, but Armin might have
> misunderstood my comment as disapproval also for this one.
>
* OK let's forget 2 & 4
* Patch 1 is important (for me):
  1. Qt4 support is gone in vlc
  2. Without Qt5 backend vlc is more or less useless

Cheers

Andreas