From patchwork Wed Jan 1 20:39:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 305980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 60F2E2C0092 for ; Thu, 2 Jan 2014 07:39:27 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 296582669A; Wed, 1 Jan 2014 20:39:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xhqq0mDnwuZB; Wed, 1 Jan 2014 20:39:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E4E4C2087B; Wed, 1 Jan 2014 20:39:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 92EA91BF834 for ; Wed, 1 Jan 2014 20:39:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8B3C98BF6D for ; Wed, 1 Jan 2014 20:39:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lXMwT5e+ociP for ; Wed, 1 Jan 2014 20:39:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from blu0-omc3-s30.blu0.hotmail.com (blu0-omc3-s30.blu0.hotmail.com [65.55.116.105]) by whitealder.osuosl.org (Postfix) with ESMTP id 687FD8BF6C for ; Wed, 1 Jan 2014 20:39:20 +0000 (UTC) Received: from BLU0-SMTP388 ([65.55.116.72]) by blu0-omc3-s30.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 1 Jan 2014 12:39:19 -0800 X-TMN: [Lh714GPgbVaIP5SCWR+sPPzeo1P7q1RE] X-Originating-Email: [berndkuhls@hotmail.com] Message-ID: Received: from fli4l.lan.fli4l ([79.247.171.147]) by BLU0-SMTP388.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 1 Jan 2014 12:39:18 -0800 Received: from fli4lbuild.lan.fli4l ([192.168.1.50]:45949) by fli4l.lan.fli4l with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1VySZO-0006HH-Ap; Wed, 01 Jan 2014 21:39:16 +0100 From: Bernd Kuhls To: buildroot@busybox.net Date: Wed, 1 Jan 2014 21:39:10 +0100 X-Mailer: git-send-email 1.7.9.5 X-OriginalArrivalTime: 01 Jan 2014 20:39:18.0618 (UTC) FILETIME=[8B236BA0:01CF0731] MIME-Version: 1.0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] ffmpeg: bump to version 1.2.4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Compile tested the following packages which depend on ffmpeg: freerdp mpd gstreamer Signed-off-by: Bernd Kuhls --- 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 diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index ce30605..15d5c16 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -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" diff --git a/package/ffmpeg/ffmpeg-sdlconfig.patch b/package/ffmpeg/ffmpeg-sdlconfig.patch deleted file mode 100644 index 64371b2..0000000 --- a/package/ffmpeg/ffmpeg-sdlconfig.patch +++ /dev/null @@ -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 - -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 && diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index f1fc920..e7a7b57 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 0.8.15 +FFMPEG_VERSION = 1.2.4 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -18,9 +18,61 @@ endif FFMPEG_CONF_OPT = \ --prefix=/usr \ - --disable-avfilter \ + --enable-avfilter \ + --disable-debug \ + --disable-version3 \ + --enable-logging \ + --disable-pic \ + --enable-optimizations \ + --disable-extra-warnings \ + --disable-ffprobe \ + --enable-avdevice \ + --enable-avcodec \ + --enable-avformat \ + --enable-swscale \ + --enable-postproc \ + --disable-x11grab \ + --enable-network \ + --disable-gray \ + --enable-swscale-alpha \ + --disable-small \ + --enable-dct \ + --enable-fft \ + --enable-mdct \ + --enable-rdft \ + --disable-crystalhd \ + --disable-vaapi \ + --disable-vdpau \ + --disable-dxva2 \ + --enable-runtime-cpudetect \ + --disable-hardcoded-tables \ + --disable-memalign-hack \ + --enable-hwaccels \ + --disable-avisynth \ + --disable-frei0r \ + --disable-libopencore-amrnb \ + --disable-libopencore-amrwb \ + --disable-libopencv \ + --disable-libdc1394 \ + --disable-libfaac \ + --disable-libfreetype \ + --disable-libgsm \ + --disable-libmp3lame \ + --disable-libnut \ + --disable-libopenjpeg \ + --disable-librtmp \ + --disable-libschroedinger \ + --disable-libspeex \ + --disable-libtheora \ + --disable-libvo-aacenc \ + --disable-libvo-amrwbenc \ + --disable-vis \ + --disable-sram \ + --disable-symver \ $(if $(BR2_HAVE_DOCUMENTATION),,--disable-doc) +FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) + FFMPEG_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_xtensa),y) @@ -100,7 +152,7 @@ endif ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),all) FFMPEG_CONF_OPT += --disable-bsfs \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),--enable-bsf=$(x)) + $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),--enable-bsfs=$(x)) endif ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_PROTOCOLS)),all) @@ -138,14 +190,70 @@ else FFMPEG_CONF_OPT += --disable-zlib endif -ifeq ($(BR2_i386)$(BR2_x86_64),y) -# MMX on is default for x86, disable it for lowly x86-type processors -ifeq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y) +ifeq ($(BR2_PACKAGE_BZIP2),y) +FFMPEG_CONF_OPT += --enable-bzlib +FFMPEG_DEPENDENCIES += bzip2 +else +FFMPEG_CONF_OPT += --disable-bzlib +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +FFMPEG_CONF_OPT += -enable-openssl +FFMPEG_DEPENDENCIES += openssl +else +FFMPEG_CONF_OPT += --disable-openssl +endif + +ifeq ($(BR2_PACKAGE_LIBVORBIS),y) +FFMPEG_DEPENDENCIES += libvorbis +FFMPEG_CONF_OPT += \ + --enable-libvorbis \ + --enable-muxer=ogg \ + --enable-encoder=libvorbis +endif + +ifeq ($(BR2_X86_CPU_HAS_MMX),y) +FFMPEG_CONF_OPT += --enable-yasm +FFMPEG_DEPENDENCIES += yasm +else +FFMPEG_CONF_OPT += --disable-yasm FFMPEG_CONF_OPT += --disable-mmx +endif + +ifeq ($(BR2_X86_CPU_HAS_SSE),y) +FFMPEG_CONF_OPT += --enable-sse else -# If it is enabled, nasm is required -FFMPEG_DEPENDENCIES += host-nasm +FFMPEG_CONF_OPT += --disable-sse endif + +ifeq ($(BR2_X86_CPU_HAS_SSE2),y) +FFMPEG_CONF_OPT += --enable-sse2 +else +FFMPEG_CONF_OPT += --disable-sse2 +endif + +ifeq ($(BR2_X86_CPU_HAS_SSE3),y) +FFMPEG_CONF_OPT += --enable-sse3 +else +FFMPEG_CONF_OPT += --disable-sse3 +endif + +ifeq ($(BR2_X86_CPU_HAS_SSSE3),y) +FFMPEG_CONF_OPT += --enable-ssse3 +else +FFMPEG_CONF_OPT += --disable-ssse3 +endif + +ifeq ($(BR2_X86_CPU_HAS_SSE4),y) +FFMPEG_CONF_OPT += --enable-sse4 +else +FFMPEG_CONF_OPT += --disable-sse4 +endif + +ifeq ($(BR2_X86_CPU_HAS_SSE42),y) +FFMPEG_CONF_OPT += --enable-sse42 +else +FFMPEG_CONF_OPT += --disable-sse42 endif # Explicitly disable everything that doesn't match for ARM @@ -161,8 +269,6 @@ FFMPEG_CONF_OPT += --disable-armv6 --disable-armv6t2 endif ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) FFMPEG_CONF_OPT += --enable-armvfp -else -FFMPEG_CONF_OPT += --disable-armvfp endif ifeq ($(BR2_ARM_CPU_HAS_NEON),y) FFMPEG_CONF_OPT += --enable-neon @@ -191,8 +297,8 @@ define FFMPEG_CONFIGURE_CMDS --sysroot=$(STAGING_DIR) \ --host-cc="$(HOSTCC)" \ --arch=$(BR2_ARCH) \ - --target-os=linux \ - --extra-cflags=-fPIC \ + --target-os="linux" \ + --cpu=$(BR2_GCC_TARGET_TUNE) \ $(SHARED_STATIC_LIBS_OPTS) \ $(FFMPEG_CONF_OPT) \ )