Re: [ptxdist] [PATCH 2/4] optee: version bump 3.5.0 → 3.6.0
On Wed, Aug 07, 2019 at 02:38:21PM +0200, Rouven Czerwinski wrote: > On Wed, 2019-08-07 at 12:57 +0200, Michael Olbrich wrote: > > On Thu, Jul 25, 2019 at 11:05:18AM +0200, Rouven Czerwinski wrote: > > > On Thu, 2019-07-25 at 10:53 +0200, Lucas Stach wrote: > > > > Am Donnerstag, den 25.07.2019, 10:25 +0200 schrieb Rouven > > > > Czerwinski: > > > > > The OP-TEE build requires pyelftools in the python3 flavour > > > > > now. > > > > > > > > > > Signed-off-by: Rouven Czerwinski > > > > > --- > > > > > platforms/optee.in | 1 + > > > > > rules/optee.make | 4 ++-- > > > > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > > > > > > > > diff --git a/platforms/optee.in b/platforms/optee.in > > > > > index dc31f66..cfdd44b 100644 > > > > > --- a/platforms/optee.in > > > > > +++ b/platforms/optee.in > > > > > @@ -5,6 +5,7 @@ menuconfig OPTEE > > > > > bool > > > > > depends on ARCH_ARM || ARCH_ARM64 > > > > > depends on !ARCH_ARM64 || BROKEN > > > > > + select HOST_SYSTEM_PYTHON3_PYELFTOOLS > > > > > > > > Missing "select HOST_SYSTEM_PYTHON3". > > > > > > Thanks, fix queued for a V2. > > > > Hmmm, optee currently selects HOST_SYSTEM_PYTHON as well (see > > rules/optee.in). Do we really need both versions? > > Unfortunately, yes. Currently not all scripts are converted to python3. So we always need both versions at build-time? :-/ Please collect the dependencies in on file. I don't care if it's in rules/ or platforms/. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] fbset: Add option to install /etc/fb.modes
On Wed, Aug 07, 2019 at 04:22:03PM +0200, Guillermo Rodriguez Garcia wrote: > El mié., 7 ago. 2019 a las 14:26, Michael Olbrich () > escribió: > > On Mon, Aug 05, 2019 at 10:18:42AM +0200, Guillermo Rodríguez wrote: > > > Signed-off-by: Guillermo Rodriguez > > > --- > > > rules/fbset.in | 14 -- > > > rules/fbset.make | 4 +++- > > > 2 files changed, 15 insertions(+), 3 deletions(-) > > > > > > diff --git a/rules/fbset.in b/rules/fbset.in > > > index c2122c51b..64dd9ec55 100644 > > > --- a/rules/fbset.in > > > +++ b/rules/fbset.in > > > @@ -1,11 +1,21 @@ > > > ## SECTION=multimedia_framebuffer > > > > > > -config FBSET > > > +menuconfig FBSET > > > tristate > > > - prompt "fbset" > > > + prompt "fbset " > > > select HOST_FLEX > > > help > > > fbset is a system utility to show or change the settings > > > of the frame buffer device. The frame buffer device pro- > > > vides a simple and unique interface to access different > > > kinds of graphic displays. > > > + > > > +if FBSET > > > + > > > +config FBSET_FBMODES > > > + bool > > > + prompt "install /etc/fb.modes" > > > + help > > > + Install /etc/fb.modes file. > > > + > > > +endif > > > diff --git a/rules/fbset.make b/rules/fbset.make > > > index 0d34d8959..955480b21 100644 > > > --- a/rules/fbset.make > > > +++ b/rules/fbset.make > > > @@ -45,7 +45,9 @@ $(STATEDIR)/fbset.targetinstall: > > > @$(call install_fixup, fbset,DESCRIPTION,missing) > > > > > > @$(call install_copy, fbset, 0, 0, 0755, -, /usr/sbin/fbset) > > > - > > > +ifdef PTXCONF_FBSET_FBMODES > > > + @$(call install_alternative, fbset, 0, 0, 0644, /etc/fb.modes) > > > +endif > > > > Hmmm, I don't like options that are broken by default. > > > > OK, although this is disabled by default. I assume that users that enable > it have a valid fb.modes file that they want to include.. I do some "enable everything" testing and I prefer to avoid exceptions. > > Please add a default file in projectroot/. > > > > fb modes (timings specifically) are hardware-specific. Is it OK if I add a > default file with no modes defined? (I can e.g. add a comment saying that > it is a placeholder) If that has the same effect as no config, then it's perfect. Of if it fails with some meaningful error at runtime it's also ok. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] fbset: Add option to install /etc/fb.modes
Hi, El mié., 7 ago. 2019 a las 14:26, Michael Olbrich () escribió: > On Mon, Aug 05, 2019 at 10:18:42AM +0200, Guillermo Rodríguez wrote: > > Signed-off-by: Guillermo Rodriguez > > --- > > rules/fbset.in | 14 -- > > rules/fbset.make | 4 +++- > > 2 files changed, 15 insertions(+), 3 deletions(-) > > > > diff --git a/rules/fbset.in b/rules/fbset.in > > index c2122c51b..64dd9ec55 100644 > > --- a/rules/fbset.in > > +++ b/rules/fbset.in > > @@ -1,11 +1,21 @@ > > ## SECTION=multimedia_framebuffer > > > > -config FBSET > > +menuconfig FBSET > > tristate > > - prompt "fbset" > > + prompt "fbset " > > select HOST_FLEX > > help > > fbset is a system utility to show or change the settings > > of the frame buffer device. The frame buffer device pro- > > vides a simple and unique interface to access different > > kinds of graphic displays. > > + > > +if FBSET > > + > > +config FBSET_FBMODES > > + bool > > + prompt "install /etc/fb.modes" > > + help > > + Install /etc/fb.modes file. > > + > > +endif > > diff --git a/rules/fbset.make b/rules/fbset.make > > index 0d34d8959..955480b21 100644 > > --- a/rules/fbset.make > > +++ b/rules/fbset.make > > @@ -45,7 +45,9 @@ $(STATEDIR)/fbset.targetinstall: > > @$(call install_fixup, fbset,DESCRIPTION,missing) > > > > @$(call install_copy, fbset, 0, 0, 0755, -, /usr/sbin/fbset) > > - > > +ifdef PTXCONF_FBSET_FBMODES > > + @$(call install_alternative, fbset, 0, 0, 0644, /etc/fb.modes) > > +endif > > Hmmm, I don't like options that are broken by default. > OK, although this is disabled by default. I assume that users that enable it have a valid fb.modes file that they want to include.. > Please add a default file in projectroot/. > fb modes (timings specifically) are hardware-specific. Is it OK if I add a default file with no modes defined? (I can e.g. add a comment saying that it is a placeholder) Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] nfsutils: don't install nfsiostat without ensuring python is available
On Wed, Aug 07, 2019 at 11:27:33AM +0200, Uwe Kleine-König wrote: > nfsiostat is a python script. Introduce a new suboption to select > PYTHON and don't install nfsiostat if this is disabled. > > Signed-off-by: Uwe Kleine-König > --- > rules/nfsutils.in | 7 +++ > rules/nfsutils.make | 5 - > 2 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/rules/nfsutils.in b/rules/nfsutils.in > index ef7eb7b98d60..34d237737024 100644 > --- a/rules/nfsutils.in > +++ b/rules/nfsutils.in > @@ -9,6 +9,7 @@ menuconfig NFSUTILS > select RPCBIND if RUNTIME > select LIBTIRPC if GLOBAL_IPV6 > select ROOTFS_PROTOCOLS if NFSUTILS_CLIENT > + select PYTHON if NFSUTILS_PYTHON Hmm, I don't like this. The scripts works with python3 as well if PTXCONF_PYTHON3_SYMLINK is enabled. Maybe like this: select PYTHON3 if NFSUTILS_PYTHON && !PYTHON && RUNTIME select PYTHON3_SYMLINK if NFSUTILS_PYTHON && !PYTHON && RUNTIME It's not a build-time dependency, and I think we should prefer Python3 here. Michael > select ROOTFS_VAR_LIB if RUNTIME > help > The Sun Network Filesystem (NFS) protocol provides transparent remote > @@ -32,6 +33,12 @@ config NFSUTILS_SERVER > help > Install all tools and daemons to run an NFS server. > > +config NFSUTILS_PYTHON > + bool > + prompt "install python utilities" > + help > + Install tools depending on Python. Currently this affects nfsiostat > only > + > config NFSUTILS_NFSD_STARTSCRIPT > bool > depends on NFSUTILS_SERVER > diff --git a/rules/nfsutils.make b/rules/nfsutils.make > index 5986d51fd716..ff1f4cae0560 100644 > --- a/rules/nfsutils.make > +++ b/rules/nfsutils.make > @@ -77,7 +77,6 @@ $(STATEDIR)/nfsutils.targetinstall: > @$(call install_fixup, nfsutils,DESCRIPTION,"Network Filesystem > Support") > > @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsstat) > - @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsiostat) > @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/showmount) > > @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/rpc.statd) > @@ -119,6 +118,10 @@ ifdef PTXCONF_NFSUTILS_SERVER > /etc/exports) > endif > > +ifdef PTXCONF_NFSUTILS_PYTHON > + @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsiostat) > +endif > + > ## > ## busybox init: start scripts > ## > -- > 2.20.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/4] optee: version bump 3.5.0 → 3.6.0
On Thu, Jul 25, 2019 at 11:05:18AM +0200, Rouven Czerwinski wrote: > On Thu, 2019-07-25 at 10:53 +0200, Lucas Stach wrote: > > Am Donnerstag, den 25.07.2019, 10:25 +0200 schrieb Rouven Czerwinski: > > > The OP-TEE build requires pyelftools in the python3 flavour now. > > > > > > Signed-off-by: Rouven Czerwinski > > > --- > > > platforms/optee.in | 1 + > > > rules/optee.make | 4 ++-- > > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > > > > diff --git a/platforms/optee.in b/platforms/optee.in > > > index dc31f66..cfdd44b 100644 > > > --- a/platforms/optee.in > > > +++ b/platforms/optee.in > > > @@ -5,6 +5,7 @@ menuconfig OPTEE > > > bool > > > depends on ARCH_ARM || ARCH_ARM64 > > > depends on !ARCH_ARM64 || BROKEN > > > + select HOST_SYSTEM_PYTHON3_PYELFTOOLS > > > > Missing "select HOST_SYSTEM_PYTHON3". > > Thanks, fix queued for a V2. Hmmm, optee currently selects HOST_SYSTEM_PYTHON as well (see rules/optee.in). Do we really need both versions? Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] systemd: Install configuration files for systemd-modules-load.service
On Tue, Jul 23, 2019 at 03:53:11PM +0200, Lars Pedersen wrote: > Signed-off-by: Lars Pedersen No. This is very similar to SYSTEMD_UDEV_CUST_RULES and that turned out to be a bad idea. The problem with stuff like this is, that as soon as BSPs get a little bit more complex, options like this start to conflict with packages that want to install individual files from these directories. And in most cases, there are other files that are installed anyways to use the functionality provided by the modules that are loaded, so the config file should be installed together with those anyways. Michael > --- > v2: Added systemd prefix to title > rules/systemd.in | 5 + > rules/systemd.make | 4 > 2 files changed, 9 insertions(+) > > diff --git a/rules/systemd.in b/rules/systemd.in > index 5ce43b99c..c7f410cf7 100644 > --- a/rules/systemd.in > +++ b/rules/systemd.in > @@ -169,6 +169,11 @@ config SYSTEMD_UDEV_CUST_RULES > This will install the customized udev rules files from > 'projectroot/usr/lib/udev/rules.d' into '/usr/lib/udev/rules.d' > > +config SYSTEMD_MODULES_LOAD_D > + bool > + default n > + prompt "install kernel modules to load at boot" > + > endmenu > > menu "persistent device node links " > diff --git a/rules/systemd.make b/rules/systemd.make > index da375fd89..4bed33be5 100644 > --- a/rules/systemd.make > +++ b/rules/systemd.make > @@ -452,6 +452,10 @@ ifdef PTXCONF_SYSTEMD_UDEV_CUST_RULES > @$(call install_alternative_tree, systemd, 0, 0, /usr/lib/udev/rules.d) > endif > > +ifdef PTXCONF_SYSTEMD_MODULES_LOAD_D > + @$(call install_alternative_tree, systemd, 0, 0, > /usr/lib/modules-load.d) > +endif > + > @$(call install_finish, systemd) > > @$(call touch) > -- > 2.21.0 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] rules: enable use of nconfig for barebox_mlo and custom kernel packages
'ptxdist nconfig' works for the main kernel and barebox packages, so enable it for all other barebox and kernel packages too. Signed-off-by: Roland Hieber --- rules/barebox_mlo.make | 2 +- rules/templates/template-kernel-make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make index 6ede89266179..6bf05902a976 100644 --- a/rules/barebox_mlo.make +++ b/rules/barebox_mlo.make @@ -105,7 +105,7 @@ $(STATEDIR)/barebox_mlo.clean: # oldconfig / menuconfig # -barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract +barebox_mlo_oldconfig barebox_mlo_menuconfig barebox_mlo_nconfig: $(STATEDIR)/barebox_mlo.extract @if test -e $(BAREBOX_MLO_CONFIG); then \ cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ fi diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make index 6cb9cbc80770..8aac072c4522 100644 --- a/rules/templates/template-kernel-make +++ b/rules/templates/template-kernel-make @@ -108,7 +108,7 @@ $(STATEDIR)/kernel-@package@.targetinstall: # oldconfig / menuconfig # -kernel-@package@_oldconfig kernel-@package@_menuconfig: $(STATEDIR)/kernel-@package@.extract +kernel-@package@_oldconfig kernel-@package@_menuconfig kernel-@package@_nconfig: $(STATEDIR)/kernel-@package@.extract @$(call world/kconfig, KERNEL_@PACKAGE@, $(subst kernel-@package@_,,$@)) # vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] nfsutils: don't install nfsiostat without ensuring python is available
nfsiostat is a python script. Introduce a new suboption to select PYTHON and don't install nfsiostat if this is disabled. Signed-off-by: Uwe Kleine-König --- rules/nfsutils.in | 7 +++ rules/nfsutils.make | 5 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rules/nfsutils.in b/rules/nfsutils.in index ef7eb7b98d60..34d237737024 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -9,6 +9,7 @@ menuconfig NFSUTILS select RPCBIND if RUNTIME select LIBTIRPC if GLOBAL_IPV6 select ROOTFS_PROTOCOLS if NFSUTILS_CLIENT + select PYTHON if NFSUTILS_PYTHON select ROOTFS_VAR_LIB if RUNTIME help The Sun Network Filesystem (NFS) protocol provides transparent remote @@ -32,6 +33,12 @@ config NFSUTILS_SERVER help Install all tools and daemons to run an NFS server. +config NFSUTILS_PYTHON + bool + prompt "install python utilities" + help + Install tools depending on Python. Currently this affects nfsiostat only + config NFSUTILS_NFSD_STARTSCRIPT bool depends on NFSUTILS_SERVER diff --git a/rules/nfsutils.make b/rules/nfsutils.make index 5986d51fd716..ff1f4cae0560 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -77,7 +77,6 @@ $(STATEDIR)/nfsutils.targetinstall: @$(call install_fixup, nfsutils,DESCRIPTION,"Network Filesystem Support") @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsstat) - @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsiostat) @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/showmount) @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/rpc.statd) @@ -119,6 +118,10 @@ ifdef PTXCONF_NFSUTILS_SERVER /etc/exports) endif +ifdef PTXCONF_NFSUTILS_PYTHON + @$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsiostat) +endif + # # # # busybox init: start scripts # # -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] networkmanager: version bump 1.18.0 -> 1.20.0
Signed-off-by: Ladislav Michl --- rules/networkmanager.make | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 299468727..3093ce0df 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.18.0 -NETWORKMANAGER_MD5 := c8c27116a8083bab5d5fcca0d03e988a +NETWORKMANAGER_VERSION := 1.20.0 +NETWORKMANAGER_MD5 := 109df9b0813755a98735206f5b2d68da NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.18/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later @@ -39,7 +39,6 @@ NETWORKMANAGER_CONF_OPT = \ --enable-shared \ --disable-nls \ --disable-rpath \ - --disable-config-plugin-ibft \ --disable-ifcfg-rh \ --enable-ifupdown \ --disable-code-coverage \ @@ -68,7 +67,6 @@ NETWORKMANAGER_CONF_OPT = \ --disable-gtk-doc-pdf \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wext \ --without-iwd \ - --without-libnm-glib \ --with-udev-dir=/usr/lib/udev \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-hostname-persist=default \ -- 2.22.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] networkmanager: version bump 1.18.0 -> 1.18.2
On Tue, Aug 06, 2019 at 06:05:29PM +0200, Robert Schwebel wrote: > On Tue, Aug 06, 2019 at 07:29:26AM +0200, Ladislav Michl wrote: > > Signed-off-by: Ladislav Michl > > --- > > rules/networkmanager.make | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > > index 299468727..caf685076 100644 > > --- a/rules/networkmanager.make > > +++ b/rules/networkmanager.make > > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager > > # > > # Paths and names > > # > > -NETWORKMANAGER_VERSION := 1.18.0 > > -NETWORKMANAGER_MD5 := c8c27116a8083bab5d5fcca0d03e988a > > +NETWORKMANAGER_VERSION := 1.18.2 > > +NETWORKMANAGER_MD5 := ca1e6175c6ba97ca1adf65a67861ccd9 > > NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) > > NETWORKMANAGER_SUFFIX := tar.xz > > NETWORKMANAGER_URL := > > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.18/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > > -- > > 2.22.0 > > Care to update to 1.20? I found very incionvenient from NetworkManager's team to release version just a few hours after I sent patch... Update ready, will send it after some runtime testing. l. ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] ffmpeg: version bump 4.1.3 -> 4.2
LICENSE.md was changed to clarify the --enable-nonfree option.
A paragraph about the NVENC library requiring this option was
removed, as the NVENC headers are MIT licensed. For details,
see upstream commits:
bc4137d4aa3a ("configure: Don't require nonfree for nvenc")
9eea2e5daf41 ("LICENSE: Remove an incorrect statement.")
c8b50ff8f9b3 ("LICENSE: Remove nvenc from the non-free section.")
479a5f644f07 ("LICENSE: Clarify --enable-nonfree.")
Signed-off-by: Philipp Zabel
---
rules/ffmpeg.make | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/rules/ffmpeg.make b/rules/ffmpeg.make
index c80b14fd491d..3a643fce7cbc 100644
--- a/rules/ffmpeg.make
+++ b/rules/ffmpeg.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_FFMPEG) += ffmpeg
#
# Paths and names
#
-FFMPEG_VERSION := 4.1.3
-FFMPEG_MD5 := dcc20dd2682ea01c678b7b8324339d43
+FFMPEG_VERSION := 4.2
+FFMPEG_MD5 := fb33a9110251873002869664686b2a3f
FFMPEG := ffmpeg-$(FFMPEG_VERSION)
FFMPEG_SUFFIX := tar.xz
FFMPEG_URL := https://www.ffmpeg.org/releases/$(FFMPEG).$(FFMPEG_SUFFIX)
@@ -24,7 +24,7 @@ FFMPEG_DIR:= $(BUILDDIR)/$(FFMPEG)
# Note: any GPL only code is disabled below with --disable-gpl
FFMPEG_LICENSE := LGPL-2.1-or-later AND BSD-3-Clause
FFMPEG_LICENSE_FILES := \
- file://LICENSE.md;md5=e6c05704638b696e6df04470d7fede29 \
+ file://LICENSE.md;md5=d14d3e3b1e822c8b34b2a233fda0c9d8 \
file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
file://libavcodec/arm/vp8dsp_armv6.S;startline=4;endline=52;md5=24eb31d8cad17de39e517e8d946cdee0
\
file://libavcodec/mips/ac3dsp_mips.c;startline=2;endline=27;md5=5f25aa1db1ecf13c29efc63800bf6ae8
\
@@ -122,6 +122,7 @@ FFMPEG_CONF_OPT := \
--disable-jni \
--disable-ladspa \
--disable-libaom \
+ --disable-libaribb24 \
--disable-libass \
--disable-libbluray \
--disable-libbs2b \
@@ -129,6 +130,7 @@ FFMPEG_CONF_OPT := \
--disable-libcelt \
--disable-libcdio \
--disable-libcodec2 \
+ --disable-libdav1d \
--disable-libdavs2 \
--disable-libdc1394 \
--disable-libfdk-aac \
@@ -193,7 +195,6 @@ FFMPEG_CONF_OPT := \
--disable-lv2 \
--disable-lzma \
--disable-decklink \
- --disable-libndi_newtek \
--disable-mbedtls \
--disable-mediacodec \
--disable-libmysofa \
@@ -201,6 +202,7 @@ FFMPEG_CONF_OPT := \
--disable-opencl \
--disable-opengl \
--disable-openssl \
+ --disable-pocketsphinx \
--disable-sndio \
--disable-schannel \
--disable-sdl2 \
@@ -210,7 +212,8 @@ FFMPEG_CONF_OPT := \
--disable-zlib \
--disable-amf \
--disable-audiotoolbox \
- --disable-cuda-sdk \
+ --disable-cuda-nvcc \
+ --disable-cuda-llvm \
--disable-cuvid \
--disable-d3d11va \
--disable-dxva2 \
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
