Skip to contentSkip to conversation

mpg123: bump to version 1.13.2

PATCH New Gustavo Zacarias 2 participants 8 messages Mar 1, 2011 – Mar 6, 2011

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/4 mpg123: bump to version 1.13.2

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/multimedia/mpg123/mpg123.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/multimedia/mpg123/mpg123.mk +1 -1
index f6eaddb..a22ef18 100644
@@ -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
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 2/4 file: bump to version 5.05

Signed-off-by Gustavo Zacarias <[email protected]>
---
 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
package/file/file-nocxx.patch deleted +0 -31
deleted file mode 100644
index 3b0eec6..0000000
@@ -1,31 +0,0 @@
-From 126fcb5d08d69693eb4c6e5f5c3d1082b6910121 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <[email protected]>
-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 <[email protected]>
----
- 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
-
package/file/file.mk +1 -1
index b8281d0..d405c26 100644
@@ -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
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 2/4 file: bump to version 5.05

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 3/4 ffmpeg: bump to version 0.6.1

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 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
package/multimedia/ffmpeg/Config.in +3 -2
index 2f94991..7a9513c 100644
@@ -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.
package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch deleted +0 -17
deleted file mode 100644
index 58d08aa..0000000
@@ -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
package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch new file +17 -0
new file mode 100644
index 0000000..de2c004
@@ -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 <[email protected]>
+
+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)
package/multimedia/ffmpeg/ffmpeg.mk +20 -6
index b37ac90..1e8f09a 100644
@@ -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
Signature · 1 line
1.7.3.4
#4 lore raw

PATCH 3/4 ffmpeg: bump to version 0.6.1

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#5 lore raw

PATCH 4/4 gst-ffmpeg: bump to version 0.10.11

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/multimedia/gst-ffmpeg/Config.in     |    6 +++---
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk |    7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)
package/multimedia/gst-ffmpeg/Config.in +3 -3
index 17873f0..537101e 100644
@@ -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)
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk +4 -3
index 6e91ad5..021ad00 100644
@@ -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)
Signature · 1 line
1.7.3.4
#6 lore raw

PATCH 4/4 gst-ffmpeg: bump to version 0.10.11

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> +#GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2

Committed except for that line - Thanks.

Signature · 1 line
Bye, Peter Korsgaard