All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anton Leontiev <aleontiev@elvees.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] ffmpeg: bump to 0.11.1
Date: Fri, 15 Jun 2012 16:44:54 +0400	[thread overview]
Message-ID: <4FDB2E46.8090705@elvees.com> (raw)

Signed-off-by: Anton Leontiev <aleontiev@elvees.com>

---
  package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch |  16 ++++++++--------
  package/multimedia/ffmpeg/ffmpeg.mk              |   2 +-
  2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch 
b/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
--- a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
+++ b/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
@@ -2,16 +2,16 @@
  So just pass the whole string to make things simpler.

  Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Anton Leontiev <aleontiev@elvees.com>

-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
+--- ffmpeg-0.11.1/configure    2012-06-08 01:01:19.000000000 +0400
++++ ffmpeg-0.11.1.patched/configure    2012-06-09 13:35:36.378143678 +0400
+@@ -3266,7 +3266,7 @@
+     die "ERROR: No version of libdc1394 found "
+ fi

  -SDL_CONFIG="${cross_prefix}sdl-config"
-+SDL_CONFIG="${SDL_CONFIG}"
- if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
++# SDL_CONFIG is passed through environment by Buildroot
+ if check_pkg_config sdl SDL_events.h SDL_PollEvent; 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/multimedia/ffmpeg/ffmpeg.mk 
b/package/multimedia/ffmpeg/ffmpeg.mk
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
  #
  #############################################################

-FFMPEG_VERSION = 0.8.11
+FFMPEG_VERSION = 0.11.1
  FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
  FFMPEG_SITE = http://ffmpeg.org/releases
  FFMPEG_INSTALL_STAGING = YES
--

-- 
Anton Leontiev <aleontiev@elvees.com>

             reply	other threads:[~2012-06-15 12:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-15 12:44 Anton Leontiev [this message]
2012-06-17  9:09 ` [Buildroot] [PATCH] ffmpeg: bump to 0.11.1 Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4FDB2E46.8090705@elvees.com \
    --to=aleontiev@elvees.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.