* [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2
@ 2011-03-01 16:19 Gustavo Zacarias
2011-03-01 16:19 ` [Buildroot] [PATCH 2/4] file: bump to version 5.05 Gustavo Zacarias
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Gustavo Zacarias @ 2011-03-01 16:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/mpg123/mpg123.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index f6eaddb..a22ef18 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
#
#############################################################
-MPG123_VERSION = 1.13.1
+MPG123_VERSION = 1.13.2
MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/4] file: bump to version 5.05
2011-03-01 16:19 [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2 Gustavo Zacarias
@ 2011-03-01 16:19 ` Gustavo Zacarias
2011-03-06 21:24 ` Peter Korsgaard
2011-03-01 16:20 ` [Buildroot] [PATCH 3/4] ffmpeg: bump to version 0.6.1 Gustavo Zacarias
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Gustavo Zacarias @ 2011-03-01 16:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/file/file-nocxx.patch | 31 -------------------------------
package/file/file.mk | 2 +-
2 files changed, 1 insertions(+), 32 deletions(-)
delete mode 100644 package/file/file-nocxx.patch
diff --git a/package/file/file-nocxx.patch b/package/file/file-nocxx.patch
deleted file mode 100644
index 3b0eec6..0000000
--- a/package/file/file-nocxx.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 126fcb5d08d69693eb4c6e5f5c3d1082b6910121 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 7 Jun 2010 11:40:04 -0300
-Subject: [PATCH] Disable configure script from checking for CXX since it's not needed
-
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure | 6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index a6e812b..ac2587f 100755
---- a/configure
-+++ b/configure
-@@ -6136,10 +6136,8 @@ if $ac_preproc_ok; then
- :
- else
- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&5;}
-+ { echo "C++ sucks, ignoring ..." >&5; }; }
- fi
-
- ac_ext=cpp
---
-1.6.4.4
-
diff --git a/package/file/file.mk b/package/file/file.mk
index b8281d0..d405c26 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,7 +4,7 @@
#
#############################################################
-FILE_VERSION = 5.04
+FILE_VERSION = 5.05
FILE_SITE = ftp://ftp.astron.com/pub/file/
FILE_DEPENDENCIES = host-file zlib
HOST_FILE_DEPENDENCIES = host-zlib
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/4] ffmpeg: bump to version 0.6.1
2011-03-01 16:19 [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2 Gustavo Zacarias
2011-03-01 16:19 ` [Buildroot] [PATCH 2/4] file: bump to version 5.05 Gustavo Zacarias
@ 2011-03-01 16:20 ` Gustavo Zacarias
2011-03-06 22:36 ` Peter Korsgaard
2011-03-01 16:20 ` [Buildroot] [PATCH 4/4] gst-ffmpeg: bump to version 0.10.11 Gustavo Zacarias
2011-03-06 21:24 ` [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2 Peter Korsgaard
3 siblings, 1 reply; 8+ messages in thread
From: Gustavo Zacarias @ 2011-03-01 16:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/ffmpeg/Config.in | 5 ++-
.../ffmpeg-0.5.2-fix-sdl-config-search.patch | 17 -------------
package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch | 17 +++++++++++++
package/multimedia/ffmpeg/ffmpeg.mk | 26 +++++++++++++++----
4 files changed, 40 insertions(+), 25 deletions(-)
delete mode 100644 package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch
create mode 100644 package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in
index 2f94991..7a9513c 100644
--- a/package/multimedia/ffmpeg/Config.in
+++ b/package/multimedia/ffmpeg/Config.in
@@ -1,9 +1,10 @@
-comment "ffmpeg requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+comment "ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
+ depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
menuconfig BR2_PACKAGE_FFMPEG
bool "ffmpeg"
depends on BR2_LARGEFILE
+ depends on BR2_INET_IPV6
help
FFmpeg is a complete, cross-platform solution to record, convert
and stream audio and video.
diff --git a/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch b/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch
deleted file mode 100644
index 58d08aa..0000000
--- a/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Allow FFmpeg's ./configure script to use a custom sdl-config command.
-
-Inspired from:
-http://www.mail-archive.com/uclinux-dist-commits at blackfin.uclinux.org/msg01099.html
-
-diff -u ffmpeg-0.5.2-orig/configure ffmpeg-0.5.2/configure
---- a/configure
-+++ b/configure
-@@ -2066,7 +2066,7 @@
-
- disable sdl_too_old
- disable sdl
--SDL_CONFIG="${cross_prefix}sdl-config"
-+SDL_CONFIG="${SDL_CONFIG-${cross_prefix}sdl-config}"
- if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
- sdl_cflags=`"${SDL_CONFIG}" --cflags`
- temp_cflags $sdl_cflags
diff --git a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch b/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
new file mode 100644
index 0000000..de2c004
--- /dev/null
+++ b/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
@@ -0,0 +1,17 @@
+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 <gustavo@zacarias.com.ar>
+
+diff -Nura ffmpeg-0.6.1/configure ffmpeg-0.6.1.sdl/configure
+--- ffmpeg-0.6.1/configure 2010-06-15 16:44:30.000000000 -0300
++++ ffmpeg-0.6.1.sdl/configure 2011-02-25 17:13:12.979168176 -0300
+@@ -2640,7 +2640,7 @@
+ die "ERROR: No version of libdc1394 found "
+ fi
+
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="${SDL_CONFIG}"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+ sdl_cflags=$("${SDL_CONFIG}" --cflags)
+ sdl_libs=$("${SDL_CONFIG}" --libs)
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index b37ac90..1e8f09a 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -3,17 +3,16 @@
# ffmpeg
#
#############################################################
-FFMPEG_VERSION := 0.5.2
-FFMPEG_SOURCE := ffmpeg-$(FFMPEG_VERSION).tar.bz2
-FFMPEG_SITE := http://ffmpeg.org/releases
+
+FFMPEG_VERSION = 0.6.1
+FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
+FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
-FFMPEG_INSTALL_TARGET = YES
FFMPEG_CONF_OPT = \
--prefix=/usr \
--enable-shared \
--disable-avfilter \
- --disable-vhook \
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_CONF_OPT += --enable-gpl
@@ -129,6 +128,21 @@ ifeq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pent
FFMPEG_CONF_OPT += --disable-mmx
endif
+# ARM defaults to v5: clear if less, add extra if more
+ifeq ($(BR2_generic_arm)$(BR2_arm7tdmi)$(BR2_arm610)$(BR2_arm710)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t),y)
+FFMPEG_CONF_OPT += --disable-armv5te
+endif
+ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y)
+FFMPEG_CONF_OPT += --enable-armv6
+endif
+ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a8)$(BR2_cortex_a9),y)
+FFMPEG_CONF_OPT += --enable-armvfp
+endif
+# NEON is optional for A9
+ifeq ($(BR2_cortex_a8),y)
+FFMPEG_CONF_OPT += --enable-neon
+endif
+
FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
# Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
@@ -143,8 +157,8 @@ define FFMPEG_CONFIGURE_CMDS
--sysroot=$(STAGING_DIR) \
--host-cc="$(HOSTCC)" \
--arch=$(BR2_ARCH) \
+ --target-os=linux \
--extra-cflags=-fPIC \
- $(DISABLE_IPV6) \
$(FFMPEG_CONF_OPT) \
)
endef
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 4/4] gst-ffmpeg: bump to version 0.10.11
2011-03-01 16:19 [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2 Gustavo Zacarias
2011-03-01 16:19 ` [Buildroot] [PATCH 2/4] file: bump to version 5.05 Gustavo Zacarias
2011-03-01 16:20 ` [Buildroot] [PATCH 3/4] ffmpeg: bump to version 0.6.1 Gustavo Zacarias
@ 2011-03-01 16:20 ` Gustavo Zacarias
2011-03-06 22:37 ` Peter Korsgaard
2011-03-06 21:24 ` [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2 Peter Korsgaard
3 siblings, 1 reply; 8+ messages in thread
From: Gustavo Zacarias @ 2011-03-01 16:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/gst-ffmpeg/Config.in | 6 +++---
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/multimedia/gst-ffmpeg/Config.in
index 17873f0..537101e 100644
--- a/package/multimedia/gst-ffmpeg/Config.in
+++ b/package/multimedia/gst-ffmpeg/Config.in
@@ -2,16 +2,16 @@ config BR2_PACKAGE_GST_FFMPEG
bool "gst-ffmpeg"
depends on BR2_PACKAGE_GSTREAMER
select BR2_PACKAGE_GST_PLUGINS_BASE
- select BR2_PACKAGE_LIBOIL
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_GPL
select BR2_PACKAGE_FFMPEG_POSTPROC
select BR2_PACKAGE_FFMPEG_SWSCALE
depends on BR2_LARGEFILE
+ depends on BR2_INET_IPV6
help
GStreamer plugin using FFmpeg.
http://gstreamer.freedesktop.org/
-comment "gst-ffmpeg requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+comment "gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
+ depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index 6e91ad5..021ad00 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -3,11 +3,12 @@
# gst-ffmpeg
#
#############################################################
-GST_FFMPEG_VERSION = 0.10.9
-GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
+
+GST_FFMPEG_VERSION = 0.10.11
+#GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
GST_FFMPEG_INSTALL_STAGING = YES
-GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg liboil
+GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg
GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
ifeq ($(BR2_PACKAGE_BZIP2),y)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2
2011-03-01 16:19 [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2 Gustavo Zacarias
` (2 preceding siblings ...)
2011-03-01 16:20 ` [Buildroot] [PATCH 4/4] gst-ffmpeg: bump to version 0.10.11 Gustavo Zacarias
@ 2011-03-06 21:24 ` Peter Korsgaard
3 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2011-03-06 21:24 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/4] file: bump to version 5.05
2011-03-01 16:19 ` [Buildroot] [PATCH 2/4] file: bump to version 5.05 Gustavo Zacarias
@ 2011-03-06 21:24 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2011-03-06 21:24 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/4] ffmpeg: bump to version 0.6.1
2011-03-01 16:20 ` [Buildroot] [PATCH 3/4] ffmpeg: bump to version 0.6.1 Gustavo Zacarias
@ 2011-03-06 22:36 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2011-03-06 22:36 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 4/4] gst-ffmpeg: bump to version 0.10.11
2011-03-01 16:20 ` [Buildroot] [PATCH 4/4] gst-ffmpeg: bump to version 0.10.11 Gustavo Zacarias
@ 2011-03-06 22:37 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2011-03-06 22:37 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> +#GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
Committed except for that line - Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-03-06 22:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-01 16:19 [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2 Gustavo Zacarias
2011-03-01 16:19 ` [Buildroot] [PATCH 2/4] file: bump to version 5.05 Gustavo Zacarias
2011-03-06 21:24 ` Peter Korsgaard
2011-03-01 16:20 ` [Buildroot] [PATCH 3/4] ffmpeg: bump to version 0.6.1 Gustavo Zacarias
2011-03-06 22:36 ` Peter Korsgaard
2011-03-01 16:20 ` [Buildroot] [PATCH 4/4] gst-ffmpeg: bump to version 0.10.11 Gustavo Zacarias
2011-03-06 22:37 ` Peter Korsgaard
2011-03-06 21:24 ` [Buildroot] [PATCH 1/4] mpg123: bump to version 1.13.2 Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox