Skip to contentSkip to conversation

ffmpeg: bump to version 1.2.4

PATCH Superseded Bernd Kuhls 2 participants 4 messages Jan 1, 2014

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 ffmpeg: bump to version 1.2.4

Compile tested the following packages which depend on ffmpeg:

freerdp
mpd
gstreamer

Signed-off-by Bernd Kuhls <[email protected]>
---
 arch/Config.in.x86                    |    4 +
 package/ffmpeg/ffmpeg-sdlconfig.patch |   17 -----
 package/ffmpeg/ffmpeg.mk              |  130 ++++++++++++++++++++++++++++++---
 3 files changed, 122 insertions(+), 29 deletions(-)
 delete mode 100644 package/ffmpeg/ffmpeg-sdlconfig.patch
arch/Config.in.x86 +4 -0
index ce30605..15d5c16 100644
@@ -9,6 +9,10 @@ config BR2_X86_CPU_HAS_SSE3
 	bool
 config BR2_X86_CPU_HAS_SSSE3
 	bool
+config BR2_X86_CPU_HAS_SSE4
+	bool
+config BR2_X86_CPU_HAS_SSE42
+	bool
 
 choice
 	prompt "Target Architecture Variant"
package/ffmpeg/ffmpeg-sdlconfig.patch deleted +0 -17
deleted file mode 100644
index 64371b2..0000000
@@ -1,17 +0,0 @@
-We need to pass the location sdl-config so that ffmpeg picks it up.
-So just pass the whole string to make things simpler.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura ffmpeg-0.8.7.orig/configure ffmpeg-0.8.7/configure
---- ffmpeg-0.8.7.orig/configure	2011-11-21 16:49:30.000000000 -0300
-+++ ffmpeg-0.8.7/configure	2011-12-02 08:13:36.746619395 -0300
-@@ -2957,7 +2957,7 @@
- enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore
- enabled mlib       && require  mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
- 
--SDL_CONFIG="${cross_prefix}sdl-config"
-+SDL_CONFIG="${SDL_CONFIG}"
- if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
-     check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
-     enable sdl &&
package/ffmpeg/ffmpeg.mk +118 -12

171 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/1 ffmpeg: bump to version 1.2.4

In reply to Bernd Kuhls

Hi Bernd,

Quoted 7 lines · Bernd Kuhls

Compile tested the following packages which depend on ffmpeg:

freerdp
mpd
gstreamer

Signed-off-by Bernd Kuhls <[email protected]>

[...]

package/ffmpeg/ffmpeg.mk else · line 201

Quoted 2 lines
package/ffmpeg/ffmpeg.mk +2 -0
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+FFMPEG_CONF_OPT += -enable-openssl

You need double dash before 'enable-openssl'.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#3 lore raw

PATCH 1/1 ffmpeg: bump to version 1.2.4

Baruch Siach <[email protected]> wrote in
news:20140101205744.GE6589 at tarshish:

Quoted 1 line

You need double dash before 'enable-openssl'.

Hi,

oops, thanks for the hint. I mixed up an older version of the patch. An updated version of my patch was sent to the mailinglist.

Regards, Bernd