From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by mail.openembedded.org (Postfix) with ESMTP id 900BB7FC7D for ; Mon, 13 Jan 2020 19:48:14 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id x8so5194748pgk.8 for ; Mon, 13 Jan 2020 11:48:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=KRfRTE0w9XBO1TJ73/ZgmAxSaYER1XfoO3iCLkXgeKU=; b=DujliAWeM+iSxLiTisfCJI6OTBd+kPXRnmQt5Hag85lyA0aZGmNqMTvpMLdJgTUpIc 139gMqNXi3E+1ewAAIUxxPYB187AW5PeiXqQAcSCe7XH4tMDSKmHIwFB1FTMz1k1i6x5 0N6EQHmrdhgh1gi0fCcXrkB+qlIVe0F6FrMakzVDVvMoYi1zzm4zGyYnV9HKoniMbk6F kVv8S79t3HA4DoGH5ldxRNMkma50tL7neRPXQCy+UGxk+FqS4KP4We/Kwf5HrvwDXlNR t3aBvRfZd/a8Z7ZZKn7hzm4MHTrhYK1hJV6xTVzJmXJc4fWzvf5b4JiY0FuD2sy44XIs i3Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=KRfRTE0w9XBO1TJ73/ZgmAxSaYER1XfoO3iCLkXgeKU=; b=DTWM93Ub2kwLBeovZQcfxKDh23KYkDJ1L1wtK+Zx/OPfXrNyxIQFPvbTMxZsPF6/dg Bn2B13rURxL/ir0jDKJaq29xJTMTqV4Ba3cSqY+tjrDuaa+Qszi2jwhf31m8TQ/FCKIx Sw+75WK/ObVwohpdQLwtrK6yMZuQZojje5GEyNWwMAZzD3fzP5n+YGXbLLO9d8fbFNuj 6PjqNdmBJLLydGDsw+xizbHvSe/40LKrmyLNpn4xe8b04cSdbtsgwj5Fk1w/O/flkZs+ arvzdjsjbrTTEswSYfNpbQsEzcsVPwmpoVGHmada7mPt4Wwjrxvbamz9fQSdJgpGsXDY HVdQ== X-Gm-Message-State: APjAAAVKKQ/exvvGj/V9bzOhUXU5pDx4Ep95TaIuheC+cwCQ9NL1xbZu ZsTlr/WmR/UGp3iQfanMIhdXjvDJrrk= X-Google-Smtp-Source: APXvYqy6/JnNQ3on/vsG2ONHvbQ39gSA2cb84rNR/fRE+1URgl/ulSPi//Vyf19RIph01lYc/3Cy2A== X-Received: by 2002:a65:52ca:: with SMTP id z10mr23030877pgp.47.1578944895268; Mon, 13 Jan 2020 11:48:15 -0800 (PST) Received: from apollo.localdomain ([2601:646:9200:4e0::e77a]) by smtp.gmail.com with ESMTPSA id r20sm14191482pgu.89.2020.01.13.11.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2020 11:48:14 -0800 (PST) Date: Mon, 13 Jan 2020 11:48:12 -0800 From: Khem Raj To: Carlos Rafael Giani Message-ID: <20200113194812.p5bdii6duo77k4rv@apollo.localdomain> References: <20200112135954.23868-1-crg7475@mailbox.org> <20200112135954.23868-4-crg7475@mailbox.org> MIME-Version: 1.0 In-Reply-To: Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCH 04/12] gstreamer1.0-plugins-good: Transition to meson based builds X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jan 2020 19:48:14 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 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 > > > --- > > > .../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