From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by mail.openembedded.org (Postfix) with ESMTP id 35201609B2 for ; Fri, 8 Aug 2014 14:07:42 +0000 (UTC) Received: by mail-wg0-f41.google.com with SMTP id z12so5660733wgg.0 for ; Fri, 08 Aug 2014 07:07:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=7aodJFS55rjdkrILiCYYw7Kl/6MYygD6ZUtFaxfBsvY=; b=M6GqaSE9GYSMWkyOEY6yI8BLoQyrWTB8p8UnxBByhyFeS+beQnUqCS/K2+bjwoWA4A jwemtO211mCMUb7xiGgolQqHvK9SszIfY8PxnholLoLr4jIQ64pMZhikW3hA6siO41fT eE1UHtXjuUVUJmWMM0GIR7zzsFF61exC6vSsELiZHq9cHVbEfbfk3lZw1b5ackP4qx3j jVzZHdWaH7eHJbcAQn/PonFSCeRseT1fqSDgn6rnTttsV/wgB7YJ2tDIvogINtmhD0kK 5R3TR3MYbz28KhknpqNuQXi4HhPB0e+boc6kKKzwpm5ZtOXWu/d6jAkV0uyYR5SAZbrT glPg== X-Received: by 10.180.105.6 with SMTP id gi6mr4362263wib.81.1407506863803; Fri, 08 Aug 2014 07:07:43 -0700 (PDT) Received: from localhost (ip-89-176-104-3.net.upcbroadband.cz. [89.176.104.3]) by mx.google.com with ESMTPSA id fr4sm7516132wic.16.2014.08.08.07.07.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Aug 2014 07:07:42 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa Date: Fri, 8 Aug 2014 16:08:15 +0200 To: openembedded-core@lists.openembedded.org Message-ID: <20140808140815.GG14848@jama> References: <20140808102805.GD14848@jama> <1407506787-3692-1-git-send-email-Martin.Jansa@gmail.com> MIME-Version: 1.0 In-Reply-To: <1407506787-3692-1-git-send-email-Martin.Jansa@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [RFC][PATCH] libav: drop older 0.8.11 and use libav-9 by default 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: Fri, 08 Aug 2014 14:07:50 -0000 X-Groupsio-MsgNum: 56155 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="169fIVB/g4KxrKrw" Content-Disposition: inline --169fIVB/g4KxrKrw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Aug 08, 2014 at 04:06:27PM +0200, Martin Jansa wrote: > Signed-off-by: Martin Jansa > --- > .../gstreamer/gst-ffmpeg_0.10.13.bb | 3 +-- > meta/recipes-multimedia/libav/libav.inc | 8 ++++++++ > .../0001-configure-enable-pic-for-AArch64.patch | 23 ----------------= ------ > meta/recipes-multimedia/libav/libav_0.8.11.bb | 20 ----------------= --- > meta/recipes-multimedia/libav/libav_9.13.bb | 12 ----------- > 5 files changed, 9 insertions(+), 57 deletions(-) > delete mode 100644 meta/recipes-multimedia/libav/libav/0001-configure-en= able-pic-for-AArch64.patch > delete mode 100644 meta/recipes-multimedia/libav/libav_0.8.11.bb There is at least one missing piece: gst-ffmpeg_0.10.13.bb:DEPENDS =3D "gstreamer gst-plugins-base zlib bzip2 ya= sm-native libpostproc" so libpostproc recipe from meta-oe would need to be imported to oe-core > diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/me= ta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb > index bd7b8ce..04c08cc 100644 > --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb > +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb > @@ -53,7 +53,7 @@ SRC_URI =3D "http://gstreamer.freedesktop.org/src/${BPN= }/${BPN}-${PV}.tar.bz2 \ > file://0001-qdm2-check-array-index-before-use-fix-out-of-arra= y-a.patch \ > file://0001-lavf-compute-probe-buffer-size-more-reliably.patc= h \ > file://0001-ffserver-set-oformat.patch \ > - ${@bb.utils.contains('PACKAGECONFIG', 'libav9', 'file://libav= -9.patch', '', d)} \=20 > + file://libav-9.patch \ > " > =20 > SRC_URI[md5sum] =3D "7f5beacaf1312db2db30a026b36888c4" > @@ -80,7 +80,6 @@ EXTRA_OECONF =3D "${FFMPEG_EXTRA_CONFIGURE_COMMON}" > PACKAGECONFIG ??=3D "external-libav" > PACKAGECONFIG[external-libav] =3D "--with-system-ffmpeg,,libav" > PACKAGECONFIG[orc] =3D "--enable-orc,--disable-orc,orc" > -PACKAGECONFIG[libav9] =3D ",,," > =20 > FILES_${PN} +=3D "${libdir}/gstreamer-0.10/*.so" > FILES_${PN}-dbg +=3D "${libdir}/gstreamer-0.10/.debug" > diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multi= media/libav/libav.inc > index 8b470c1..21c29fc 100644 > --- a/meta/recipes-multimedia/libav/libav.inc > +++ b/meta/recipes-multimedia/libav/libav.inc > @@ -10,6 +10,13 @@ SECTION =3D "libs" > LICENSE =3D "GPLv2+" > LICENSE_FLAGS =3D "commercial" > =20 > +LIC_FILES_CHKSUM =3D "file://COPYING.GPLv2;md5=3Db234ee4d69f5fce4486a80f= daf4a4263 \ > + file://COPYING.GPLv3;md5=3Dd32239bcb673463ab874e80d4= 7fae504 \ > + file://COPYING.LGPLv2.1;md5=3Dbd7a443320af8c812e4c18= d1b79df004 \ > + file://COPYING.LGPLv3;md5=3De6a600fd5e1d9cbde2d98368= 0233ad02" > + > +SRC_URI =3D "http://libav.org/releases/${BP}.tar.xz" > + > # Provides ffmpeg compat, see http://libav.org/about.html > PROVIDES =3D "ffmpeg" > =20 > @@ -86,6 +93,7 @@ do_install_append() { > } > =20 > PACKAGES +=3D "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" > +PACKAGES_DYNAMIC +=3D "^lib(av(codec|device|filter|format|util)|swscale)= =2E*" > =20 > RSUGGESTS_${PN} =3D "mplayer" > FILES_${PN} =3D "${bindir}" > diff --git a/meta/recipes-multimedia/libav/libav/0001-configure-enable-pi= c-for-AArch64.patch b/meta/recipes-multimedia/libav/libav/0001-configure-en= able-pic-for-AArch64.patch > deleted file mode 100644 > index d9b22b9..0000000 > --- a/meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-A= Arch64.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001 > -From: Marcin Juszkiewicz > -Date: Thu, 10 Jan 2013 12:42:19 +0100 > -Subject: [PATCH] configure: enable pic for AArch64 > - > -Signed-off-by: Marcin Juszkiewicz > - > -Upstream-Status: Backport > ---- > - configure | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > ---- git.orig/configure > -+++ git/configure > -@@ -2393,7 +2393,7 @@ check_host_cflags -std=3Dc99 > - check_host_cflags -Wall > -=20 > - case "$arch" in > -- alpha|ia64|mips|parisc|ppc|sparc) > -+ alpha|ia64|mips|parisc|ppc|sparc|aarch64) > - spic=3D$shared > - ;; > - x86) > diff --git a/meta/recipes-multimedia/libav/libav_0.8.11.bb b/meta/recipes= -multimedia/libav/libav_0.8.11.bb > deleted file mode 100644 > index 1344a2a..0000000 > --- a/meta/recipes-multimedia/libav/libav_0.8.11.bb > +++ /dev/null > @@ -1,20 +0,0 @@ > -require libav.inc > - > -SRC_URI =3D "http://libav.org/releases/${BP}.tar.xz \ > - file://0001-configure-enable-pic-for-AArch64.patch" > - > -SRC_URI[md5sum] =3D "cdc9b53c56a375baf73ea38cf7ade4f9" > -SRC_URI[sha256sum] =3D "5934e4f0dbf6e0fc4987de86cdd079f1d11a1410ae275e9f= 46472af17f05155a" > - > -LIC_FILES_CHKSUM =3D "file://COPYING.GPLv2;md5=3Db234ee4d69f5fce4486a80f= daf4a4263 \ > - file://COPYING.GPLv3;md5=3Dd32239bcb673463ab874e80d4= 7fae504 \ > - file://COPYING.LGPLv2.1;md5=3De344c8fa836c3a41c4cbd7= 9d7bd3a379 \ > - file://COPYING.LGPLv3;md5=3De6a600fd5e1d9cbde2d98368= 0233ad02" > - > -PROVIDES +=3D "libpostproc" > - > -EXTRA_OECONF +=3D " \ > - --enable-postproc \ > -" > - > -PACKAGES_DYNAMIC +=3D "^lib(av(codec|device|filter|format|util)|postproc= |swscale).*" > diff --git a/meta/recipes-multimedia/libav/libav_9.13.bb b/meta/recipes-m= ultimedia/libav/libav_9.13.bb > index f9c413f..e922403 100644 > --- a/meta/recipes-multimedia/libav/libav_9.13.bb > +++ b/meta/recipes-multimedia/libav/libav_9.13.bb > @@ -1,16 +1,4 @@ > require libav.inc > =20 > -LIC_FILES_CHKSUM =3D "file://COPYING.GPLv2;md5=3Db234ee4d69f5fce4486a80f= daf4a4263 \ > - file://COPYING.GPLv3;md5=3Dd32239bcb673463ab874e80d4= 7fae504 \ > - file://COPYING.LGPLv2.1;md5=3Dbd7a443320af8c812e4c18= d1b79df004 \ > - file://COPYING.LGPLv3;md5=3De6a600fd5e1d9cbde2d98368= 0233ad02" > - > -SRC_URI =3D "http://libav.org/releases/${BP}.tar.xz" > - > SRC_URI[md5sum] =3D "23b9e34bffdaee366710fdf20157a570" > SRC_URI[sha256sum] =3D "2ff05df6cd2259b3bb277eb16c234214f8e0530700d0c774= d033eba23edde6ca" > - > -DEFAULT_PREFERENCE =3D "-1" > - > -# unlike 0.8.11 we don't provide libpostproc > -PACKAGES_DYNAMIC +=3D "^lib(av(codec|device|filter|format|util)|swscale)= =2E*" > --=20 > 2.0.4 >=20 --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --169fIVB/g4KxrKrw Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlPk2c8ACgkQN1Ujt2V2gBwccwCgso3Udy1M5wiXqBBqctQudQIj 6FUAn0meAXZTOuhYVGSdHB8dOsnwM1q4 =gA6y -----END PGP SIGNATURE----- --169fIVB/g4KxrKrw--