* [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0
@ 2016-03-18 14:06 Vicente Olivert Riera
2016-03-18 14:06 ` [Buildroot] [PATCH 2/3] ffmpeg: cosmetic change. Puts mipsfpu conf opts in one line Vicente Olivert Riera
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Vicente Olivert Riera @ 2016-03-18 14:06 UTC (permalink / raw)
To: buildroot
- Remove non-existen configure options:
- --disable-mips32r2
- --disable-libvo-aacenc
- Amend renamed configure options:
- --disable-mipsdspr1 has been renamed to --disable-mipsdsp
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/ffmpeg/ffmpeg.hash | 4 ++--
package/ffmpeg/ffmpeg.mk | 13 ++-----------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
index 8643bff..3456883 100644
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256 25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea6e07fa ffmpeg-2.8.6.tar.xz
+# Locally calculated (PGP Signature: https://ffmpeg.org/releases/ffmpeg-3.0.tar.xz.asc)
+sha256 12f32cee41c74435f608c30793fd616bdf53467bb513278e273e135a4c58e470 ffmpeg-3.0.tar.xz
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index ddfac20..75c0128 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FFMPEG_VERSION = 2.8.6
+FFMPEG_VERSION = 3.0
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
@@ -41,7 +41,7 @@ FFMPEG_CONF_OPTS = \
--enable-runtime-cpudetect \
--disable-hardcoded-tables \
--disable-memalign-hack \
- --disable-mipsdspr1 \
+ --disable-mipsdsp \
--disable-mipsdspr2 \
--disable-msa \
--enable-hwaccels \
@@ -58,7 +58,6 @@ FFMPEG_CONF_OPTS = \
--disable-libnut \
--disable-libopenjpeg \
--disable-libschroedinger \
- --disable-libvo-aacenc \
--disable-libvo-amrwbenc \
--disable-symver \
--disable-doc
@@ -437,14 +436,6 @@ FFMPEG_CONF_OPTS += \
--enable-mipsfpu
endif
-ifeq ($(BR2_mips_32r2),y)
-FFMPEG_CONF_OPTS += \
- --enable-mips32r2
-else
-FFMPEG_CONF_OPTS += \
- --disable-mips32r2
-endif
-
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
FFMPEG_CONF_OPTS += --enable-altivec
else
--
2.7.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 2/3] ffmpeg: cosmetic change. Puts mipsfpu conf opts in one line.
2016-03-18 14:06 [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0 Vicente Olivert Riera
@ 2016-03-18 14:06 ` Vicente Olivert Riera
2016-03-19 13:35 ` Thomas Petazzoni
2016-03-18 14:06 ` [Buildroot] [PATCH 3/3] ffmpeg: default to --cpu=generic for MIPS architecture Vicente Olivert Riera
2016-03-18 15:41 ` [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0 Bernd Kuhls
2 siblings, 1 reply; 12+ messages in thread
From: Vicente Olivert Riera @ 2016-03-18 14:06 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/ffmpeg/ffmpeg.mk | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 75c0128..3115fc7 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -429,11 +429,9 @@ FFMPEG_CONF_OPTS += --enable-neon
endif
ifeq ($(BR2_MIPS_SOFT_FLOAT),y)
-FFMPEG_CONF_OPTS += \
- --disable-mipsfpu
+FFMPEG_CONF_OPTS += --disable-mipsfpu
else
-FFMPEG_CONF_OPTS += \
- --enable-mipsfpu
+FFMPEG_CONF_OPTS += --enable-mipsfpu
endif
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
--
2.7.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/3] ffmpeg: cosmetic change. Puts mipsfpu conf opts in one line.
2016-03-18 14:06 ` [Buildroot] [PATCH 2/3] ffmpeg: cosmetic change. Puts mipsfpu conf opts in one line Vicente Olivert Riera
@ 2016-03-19 13:35 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2016-03-19 13:35 UTC (permalink / raw)
To: buildroot
Vicente,
On Fri, 18 Mar 2016 14:06:05 +0000, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> package/ffmpeg/ffmpeg.mk | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
This patch does not apply, probably because PATCH 1/3 was not applied.
Also the commit log is a bit weird, maybe it should be just:
ffmpeg: cosmetic change for the mips fpu option
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/3] ffmpeg: default to --cpu=generic for MIPS architecture
2016-03-18 14:06 [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0 Vicente Olivert Riera
2016-03-18 14:06 ` [Buildroot] [PATCH 2/3] ffmpeg: cosmetic change. Puts mipsfpu conf opts in one line Vicente Olivert Riera
@ 2016-03-18 14:06 ` Vicente Olivert Riera
2016-03-19 13:35 ` Thomas Petazzoni
2016-03-18 15:41 ` [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0 Bernd Kuhls
2 siblings, 1 reply; 12+ messages in thread
From: Vicente Olivert Riera @ 2016-03-18 14:06 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/ffmpeg/ffmpeg.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 3115fc7..f96213e 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -452,6 +452,11 @@ else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)
endif
+# Default to --cpu=generic for MIPS architecture
+ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
+FFMPEG_CONF_OPTS += --cpu=generic
+endif
+
FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
# Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
--
2.7.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/3] ffmpeg: default to --cpu=generic for MIPS architecture
2016-03-18 14:06 ` [Buildroot] [PATCH 3/3] ffmpeg: default to --cpu=generic for MIPS architecture Vicente Olivert Riera
@ 2016-03-19 13:35 ` Thomas Petazzoni
2016-03-26 20:57 ` Bernd Kuhls
0 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2016-03-19 13:35 UTC (permalink / raw)
To: buildroot
Dear Vicente Olivert Riera,
On Fri, 18 Mar 2016 14:06:06 +0000, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> package/ffmpeg/ffmpeg.mk | 5 +++++
> 1 file changed, 5 insertions(+)
Why ? Your commit log only says what the patch is doing, but not why.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/3] ffmpeg: default to --cpu=generic for MIPS architecture
2016-03-19 13:35 ` Thomas Petazzoni
@ 2016-03-26 20:57 ` Bernd Kuhls
0 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2016-03-26 20:57 UTC (permalink / raw)
To: buildroot
Am Sat, 19 Mar 2016 14:35:56 +0100 schrieb Thomas Petazzoni:
> Dear Vicente Olivert Riera,
>
> On Fri, 18 Mar 2016 14:06:06 +0000, Vicente Olivert Riera wrote:
>> Signed-off-by: Vicente Olivert Riera
>> <Vincent.Riera@imgtec.com>
>> ---
>> package/ffmpeg/ffmpeg.mk | 5 +++++
>> 1 file changed, 5 insertions(+)
>
> Why ? Your commit log only says what the patch is doing, but not why.
Hi Thomas,
this patch prevents this message from ffmpeg configure:
WARNING: unknown CPU. Disabling all MIPS optimizations.
I will add a description about this in my re-spin of Vicentes patch
series. Please note that the ffmpeg 3.0 bump will not only need updates
for Kodi but also libdcadec, mediastreamer, opencv, opencv3, squeezelite
and freerdp; all of them are currently part of my WIP patch series.
Regards, Bernd
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0
2016-03-18 14:06 [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0 Vicente Olivert Riera
2016-03-18 14:06 ` [Buildroot] [PATCH 2/3] ffmpeg: cosmetic change. Puts mipsfpu conf opts in one line Vicente Olivert Riera
2016-03-18 14:06 ` [Buildroot] [PATCH 3/3] ffmpeg: default to --cpu=generic for MIPS architecture Vicente Olivert Riera
@ 2016-03-18 15:41 ` Bernd Kuhls
2016-03-18 16:21 ` Vicente Olivert Riera
2 siblings, 1 reply; 12+ messages in thread
From: Bernd Kuhls @ 2016-03-18 15:41 UTC (permalink / raw)
To: buildroot
Am Fri, 18 Mar 2016 14:06:04 +0000 schrieb Vicente Olivert Riera:
> -FFMPEG_VERSION = 2.8.6
> +FFMPEG_VERSION = 3.0
Hi Vicente,
did you test to compile Kodi with ffmpeg 3.0?
Regards, Bernd
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0
2016-03-18 15:41 ` [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0 Bernd Kuhls
@ 2016-03-18 16:21 ` Vicente Olivert Riera
2016-03-18 17:00 ` Bernd Kuhls
0 siblings, 1 reply; 12+ messages in thread
From: Vicente Olivert Riera @ 2016-03-18 16:21 UTC (permalink / raw)
To: buildroot
Hi Bernd,
no, I haven't.
Regards,
Vincent.
On 18/03/16 15:41, Bernd Kuhls wrote:
> Am Fri, 18 Mar 2016 14:06:04 +0000 schrieb Vicente Olivert Riera:
>
>> -FFMPEG_VERSION = 2.8.6
>> +FFMPEG_VERSION = 3.0
>
> Hi Vicente,
>
> did you test to compile Kodi with ffmpeg 3.0?
>
> Regards, Bernd
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0
2016-03-18 16:21 ` Vicente Olivert Riera
@ 2016-03-18 17:00 ` Bernd Kuhls
2016-03-18 17:07 ` Vicente Olivert Riera
0 siblings, 1 reply; 12+ messages in thread
From: Bernd Kuhls @ 2016-03-18 17:00 UTC (permalink / raw)
To: buildroot
Vicente Olivert Riera <Vincent.Riera@imgtec.com>
wrote in news:56EC2AED.3090803 at imgtec.com:
> Hi Bernd,
>
> no, I haven't.
Hi Vincent,
it will fail, you need to patch Kodi:
http://forum.kodi.tv/showthread.php?tid=264007&pid=2279546#pid2279546
In the next days I will try to do it locally, until then:
NACK.
Regards, Bernd
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0
2016-03-18 17:00 ` Bernd Kuhls
@ 2016-03-18 17:07 ` Vicente Olivert Riera
2016-03-18 19:04 ` Bernd Kuhls
0 siblings, 1 reply; 12+ messages in thread
From: Vicente Olivert Riera @ 2016-03-18 17:07 UTC (permalink / raw)
To: buildroot
Hi Bernd,
On 18/03/16 17:00, Bernd Kuhls wrote:
> Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> wrote in news:56EC2AED.3090803 at imgtec.com:
>
>> Hi Bernd,
>>
>> no, I haven't.
>
> Hi Vincent,
>
> it will fail, you need to patch Kodi:
> http://forum.kodi.tv/showthread.php?tid=264007&pid=2279546#pid2279546
>
> In the next days I will try to do it locally, until then:
>
> NACK.
don't you prefer to backport that Gentoo patch into Buildroot?
Regards,
Vincent.
> Regards, Bernd
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0
2016-03-18 17:07 ` Vicente Olivert Riera
@ 2016-03-18 19:04 ` Bernd Kuhls
2016-03-22 20:07 ` Bernd Kuhls
0 siblings, 1 reply; 12+ messages in thread
From: Bernd Kuhls @ 2016-03-18 19:04 UTC (permalink / raw)
To: buildroot
Vicente Olivert Riera <Vincent.Riera@imgtec.com>
wrote in news:56EC35DD.60804 at imgtec.com:
> don't you prefer to backport that Gentoo patch into Buildroot?
Hi Vicente,
that?s exactly what I am planing to do combined with a runtime test.
Regards, Bernd
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0
2016-03-18 19:04 ` Bernd Kuhls
@ 2016-03-22 20:07 ` Bernd Kuhls
0 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2016-03-22 20:07 UTC (permalink / raw)
To: buildroot
Bernd Kuhls <bernd.kuhls@t-online.de> wrote in
news:XnsA5CFCC40DEAC4berndkuhlsPkbjNfxxIA at bernd-kuhls.de:
> Vicente Olivert Riera <Vincent.Riera-
1AXoQHu6uovQT0dZR+AlfA@public.gmane.org>
> wrote in news:56EC35DD.60804 at imgtec.com:
>
>> don't you prefer to backport that Gentoo patch into Buildroot?
>
> Hi Vicente,
>
> that?s exactly what I am planing to do combined with a runtime test.
Hi Vicente,
one hour ago I started with the runtime test:
20:11:53 T:3027584768 NOTICE: Starting Kodi (16.1-RC2
Git:a7caa16680f09810). Platform: Linux x86 32-bit
20:11:53 T:3027584768 NOTICE: Using Debug Kodi x32 build
20:11:53 T:3027584768 NOTICE: Kodi compiled Mar 22 2016 by GCC 4.9.2 for
Linux x86 32-bit version 3.14.25 (200217)
20:11:53 T:3027584768 NOTICE: Running on fli4l 3.10.5-r45046-testing 0.0,
kernel: Linux x86 32-bit version 3.18.29-nonfree
20:11:53 T:3027584768 NOTICE: FFmpeg version: 3.0
20:11:53 T:3027584768 NOTICE: Host CPU: Intel(R) Core(TM) i3-4330T CPU @
3.00GHz, 4 cores available
So far looking good, no crashes, CPU load like before. I will continue to
test for a few days, especially because popcornmix, a Team-Kodi member,
wrote
http://forum.kodi.tv/showthread.php?tid=264007&pid=2278559#pid2278559
and OpenELEC did not bump yet:
https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/multimedia/ffm
peg/package.mk
The Kodi project itself already prepared the ffmpeg bump:
https://github.com/xbmc/FFmpeg/commits/release/3.0-xbmc
but did not commit it yet:
https://github.com/xbmc/xbmc/blob/master/tools/depends/target/ffmpeg/FFMPEG
-VERSION
Regards, Bernd
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-03-26 20:57 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-18 14:06 [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0 Vicente Olivert Riera
2016-03-18 14:06 ` [Buildroot] [PATCH 2/3] ffmpeg: cosmetic change. Puts mipsfpu conf opts in one line Vicente Olivert Riera
2016-03-19 13:35 ` Thomas Petazzoni
2016-03-18 14:06 ` [Buildroot] [PATCH 3/3] ffmpeg: default to --cpu=generic for MIPS architecture Vicente Olivert Riera
2016-03-19 13:35 ` Thomas Petazzoni
2016-03-26 20:57 ` Bernd Kuhls
2016-03-18 15:41 ` [Buildroot] [PATCH 1/3] ffmpeg: bump to version 3.0 Bernd Kuhls
2016-03-18 16:21 ` Vicente Olivert Riera
2016-03-18 17:00 ` Bernd Kuhls
2016-03-18 17:07 ` Vicente Olivert Riera
2016-03-18 19:04 ` Bernd Kuhls
2016-03-22 20:07 ` Bernd Kuhls
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.