All of lore.kernel.org
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: Carlos Rafael Giani <crg7475@mailbox.org>
Cc: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 04/12] gstreamer1.0-plugins-good: Transition to meson based builds
Date: Mon, 13 Jan 2020 11:48:12 -0800	[thread overview]
Message-ID: <20200113194812.p5bdii6duo77k4rv@apollo.localdomain> (raw)
In-Reply-To: <cf1705b2-70a5-14b4-6704-5f9ad3359cd4@mailbox.org>

On Mon, Jan 13, 2020 at 03:50:09PM +0100, Carlos Rafael Giani wrote:
> Actually, you have a point. I seem to have forgotten to fix this in this
> patch. With meson, it appears that the meta-qt5 bbappend is no longer
> necessary, since meson finds the Qt5 moc/rcc/uic tools on its own, so a
> packageconfig could be added right here. However, I'd like to investigate
> that moc/rcc/uic autodetection more to be sure it does not bring with it
> some "surprises" that could bite us in the behind when doing production
> builds.

I think that might be better

> 
> On 13.01.20 01:52, Khem Raj wrote:
> > On Sun, Jan 12, 2020 at 6:33 AM Carlos Rafael Giani <crg7475@mailbox.org> wrote:
> > > * Removed autotools/M4 related patch
> > >    0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch.
> > > 
> > > * gtk-doc support is handled here, not in gstreamer1.0-plugins-common.inc,
> > >      since unlike with autotools, only some plugin set packages use gtk-doc.
> > > 
> > > * zlib is no longer optional, and glib anyway depends on zlib, therefore
> > >      it gets added to the DEPENDS list.
> > > 
> > > * gettext handling now part of gstreamer1.0-plugins-common.inc.
> > > 
> > > Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
> > > ---
> > >   .../gstreamer1.0-plugins-good_1.16.1.bb       | 79 +++++++++----------
> > >   1 file changed, 38 insertions(+), 41 deletions(-)
> > > 
> > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb
> > > index 0fa7b86ffe..a6eb9986dd 100644
> > > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb
> > > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb
> > > @@ -1,8 +1,7 @@
> > > -require gstreamer1.0-plugins.inc
> > > +require gstreamer1.0-plugins-common.inc
> > > 
> > >   SRC_URI = " \
> > >               https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
> > > -            file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
> > >               "
> > > 
> > >   SRC_URI[md5sum] = "515987ee763256840a11bd8ea098f2bf"
> > > @@ -15,42 +14,41 @@ 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"
> > > 
> > > -DEPENDS += "gstreamer1.0-plugins-base libcap"
> > > +DEPENDS += "gstreamer1.0-plugins-base libcap zlib"
> > >   RPROVIDES_${PN}-pulseaudio += "${PN}-pulse"
> > >   RPROVIDES_${PN}-soup += "${PN}-souphttpsrc"
> > > 
> > > -inherit gettext
> > > -
> > >   PACKAGECONFIG ??= " \
> > >       ${GSTREAMER_ORC} \
> > >       ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
> > > -    bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 zlib \
> > > +    bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \
> > >   "
> > > 
> > >   X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
> > > +X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled -Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled"
> > > +X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled"
> > > 
> > > -PACKAGECONFIG[bz2]        = "--enable-bz2,--disable-bz2,bzip2"
> > > -PACKAGECONFIG[cairo]      = "--enable-cairo,--disable-cairo,cairo"
> > > -PACKAGECONFIG[dv1394]     = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394"
> > > -PACKAGECONFIG[flac]       = "--enable-flac,--disable-flac,flac"
> > > -PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
> > > -PACKAGECONFIG[gtk]        = "--enable-gtk3,--disable-gtk3,gtk+3"
> > > -PACKAGECONFIG[gudev]      = "--with-gudev,--without-gudev,libgudev"
> > > -PACKAGECONFIG[jack]       = "--enable-jack,--disable-jack,jack"
> > > -PACKAGECONFIG[jpeg]       = "--enable-jpeg,--disable-jpeg,jpeg"
> > > -PACKAGECONFIG[lame]       = "--enable-lame,--disable-lame,lame"
> > > -PACKAGECONFIG[libpng]     = "--enable-libpng,--disable-libpng,libpng"
> > > -PACKAGECONFIG[libv4l2]    = "--with-libv4l2,--without-libv4l2,v4l-utils"
> > > -PACKAGECONFIG[mpg123]     = "--enable-mpg123,--disable-mpg123,mpg123"
> > > -PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
> > > -PACKAGECONFIG[soup]       = "--enable-soup,--disable-soup,libsoup-2.4"
> > > -PACKAGECONFIG[speex]      = "--enable-speex,--disable-speex,speex"
> > > -PACKAGECONFIG[taglib]     = "--enable-taglib,--disable-taglib,taglib"
> > > -PACKAGECONFIG[v4l2]       = "--enable-gst_v4l2 --enable-v4l2-probe,--disable-gst_v4l2"
> > > -PACKAGECONFIG[vpx]        = "--enable-vpx,--disable-vpx,libvpx"
> > > -PACKAGECONFIG[wavpack]    = "--enable-wavpack,--disable-wavpack,wavpack"
> > > -PACKAGECONFIG[x11]        = "--enable-x,--disable-x,${X11DEPENDS}"
> > > -PACKAGECONFIG[zlib]       = "--enable-zlib,--disable-zlib,zlib"
> > > +PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
> > > +PACKAGECONFIG[cairo]      = "-Dcairo=enabled,-Dcairo=disabled,cairo"
> > > +PACKAGECONFIG[dv1394]     = "-Ddv1394=enabled,-Ddv1394=disabled,libiec61883 libavc1394 libraw1394"
> > > +PACKAGECONFIG[flac]       = "-Dflac=enabled,-Dflac=disabled,flac"
> > > +PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf"
> > > +PACKAGECONFIG[gtk]        = "-Dgtk3=enabled,-Dgtk3=disabled,gtk+3"
> > > +PACKAGECONFIG[gudev]      = "-Dv4l2-gudev=enabled,-Dv4l2-gudev=disabled,libgudev"
> > > +PACKAGECONFIG[jack]       = "-Djack=enabled,-Djack=disabled,jack"
> > > +PACKAGECONFIG[jpeg]       = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
> > > +PACKAGECONFIG[lame]       = "-Dlame=enabled,-Dlame=disabled,lame"
> > > +PACKAGECONFIG[libpng]     = "-Dpng=enabled,-Dpng=disabled,libpng"
> > > +PACKAGECONFIG[libv4l2]    = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils"
> > > +PACKAGECONFIG[mpg123]     = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123"
> > > +PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
> > > +PACKAGECONFIG[soup]       = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4"
> > > +PACKAGECONFIG[speex]      = "-Dspeex=enabled,-Dspeex=disabled,speex"
> > > +PACKAGECONFIG[taglib]     = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
> > > +PACKAGECONFIG[v4l2]       = "-Dv4l2=enabled -Dv4l2-probe=true,-Dv4l2=disabled -Dv4l2-probe=false"
> > > +PACKAGECONFIG[vpx]        = "-Dvpx=enabled,-Dvpx=disabled,libvpx"
> > > +PACKAGECONFIG[wavpack]    = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
> > > +PACKAGECONFIG[x11]        = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
> > > 
> > >   # qt5 support is disabled, because it is not present in OE core, and requires more work than
> > >   # just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths).
> > > @@ -58,19 +56,18 @@ PACKAGECONFIG[zlib]       = "--enable-zlib,--disable-zlib,zlib"
> > >   # in a gstreamer1.0-plugins-good bbappend).
> > > 
> > >   EXTRA_OECONF += " \
> > > -    --enable-oss \
> > > -    --disable-aalib \
> > > -    --disable-aalibtest \
> > > -    --disable-directsound \
> > > -    --disable-libcaca \
> > > -    --disable-libdv \
> > > -    --disable-oss4 \
> > > -    --disable-osx_audio \
> > > -    --disable-osx_video \
> > > -    --disable-qt \
> > Dont disable it explicitly, meta-qt5 will has a packageconfig for it.
> > 
> > > -    --disable-shout2 \
> > > -    --disable-twolame \
> > > -    --disable-waveform \
> > > +    -Daalib=disabled \
> > > +    -Ddirectsound=disabled \
> > > +    -Ddv=disabled \
> > > +    -Dlibcaca=disabled \
> > > +    -Doss=enabled \
> > > +    -Doss4=disabled \
> > > +    -Dosxaudio=disabled \
> > > +    -Dosxvideo=disabled \
> > > +    -Dqt=disabled \
> > > +    -Dshout2=disabled \
> > > +    -Dtwolame=disabled \
> > > +    -Dwaveform=disabled \
> > >   "
> > > 
> > >   FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
> > > --
> > > 2.17.1
> > > 
> > > --
> > > _______________________________________________
> > > Openembedded-core mailing list
> > > Openembedded-core@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core


  reply	other threads:[~2020-01-13 19:48 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-12 13:59 [PATCH 01/12] gstreamer: Add common .inc files for meson based recipes Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 02/12] gstreamer1.0: Transition to meson based builds Carlos Rafael Giani
2020-01-15  2:49   ` Peter Kjellerstedt
2020-01-16 14:42     ` Ross Burton
2020-01-12 13:59 ` [PATCH 03/12] gstreamer1.0-plugins-base: " Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 04/12] gstreamer1.0-plugins-good: " Carlos Rafael Giani
2020-01-13  0:52   ` Khem Raj
2020-01-13 14:10     ` Adrian Bunk
2020-01-13 14:50     ` Carlos Rafael Giani
2020-01-13 19:48       ` Khem Raj [this message]
2020-01-16 14:40   ` Ross Burton
2020-01-20  4:49   ` Mittal, Anuj
2020-01-12 13:59 ` [PATCH 05/12] gstreamer1.0-plugins-bad: " Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 06/12] gstreamer1.0-plugins-ugly: " Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 07/12] gstreamer1.0-libav: " Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 08/12] gstreamer1.0-vaapi: " Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 09/12] gstreamer1.0-omx: Transition to meson based build Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 10/12] gstreamer1.0-rtsp-server: " Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 11/12] gst-validate: Move recipe specific patch to dedicated subdirectory Carlos Rafael Giani
2020-01-12 13:59 ` [PATCH 12/12] gstreamer: Remove unused common files and patches Carlos Rafael Giani
2020-01-13 12:18 ` [PATCH 01/12] gstreamer: Add common .inc files for meson based recipes Richard Purdie
2020-01-13 12:55   ` Carlos Rafael Giani
2020-01-13 12:59     ` Richard Purdie
2020-01-13 15:37       ` Carlos Rafael Giani
2020-01-13 18:01         ` Alexander Kanavin
2020-01-14 15:51           ` Alexander Kanavin
2020-01-14 18:37             ` Carlos Rafael Giani
2020-01-14 18:55               ` Khem Raj
2020-01-14 19:13                 ` Carlos Rafael Giani
2020-01-13 19:52   ` Khem Raj
2020-01-13 17:37 ` Alexander Kanavin
2020-01-16 22:42 ` Richard Purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200113194812.p5bdii6duo77k4rv@apollo.localdomain \
    --to=raj.khem@gmail.com \
    --cc=crg7475@mailbox.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.