From d28f450fc855f4441f51e809e8eb400a40470bee Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 28 Sep 2014 16:59:30 +0300 Subject: [PATCH] ffmpeg: version bump to 2.3.1 --- package/ffmpeg/ffmpeg-0001-fminf.patch | 47 ++++++++++++++++++++++ package/ffmpeg/ffmpeg-0002-bfin.patch | 55 ++++++++++++++++++++++++++ package/ffmpeg/ffmpeg.mk | 17 ++++---- package/motioneye/S95motioneye | 2 +- package/motioneye/motioneye.mk | 4 +- 5 files changed, 115 insertions(+), 10 deletions(-) create mode 100644 package/ffmpeg/ffmpeg-0001-fminf.patch create mode 100644 package/ffmpeg/ffmpeg-0002-bfin.patch diff --git a/package/ffmpeg/ffmpeg-0001-fminf.patch b/package/ffmpeg/ffmpeg-0001-fminf.patch new file mode 100644 index 000000000..1e0851745 --- /dev/null +++ b/package/ffmpeg/ffmpeg-0001-fminf.patch @@ -0,0 +1,47 @@ +Fix build error + +CC libavdevice/alldevices.o +In file included from ./libavutil/internal.h:167:0, + from ./libavutil/common.h:415, + from ./libavutil/avutil.h:289, + from ./libavutil/log.h:25, + from libavdevice/avdevice.h:46, + from libavdevice/alldevices.c:22: +./libavutil/libm.h:87:40: error: static declaration of 'fminf' follows non-static declaration + static av_always_inline av_const float fminf(float x, float y) + ^ +make: *** [libavdevice/alldevices.o] Error 1 + +using buildroot-compiled uClibc toolchain, used defconfig: + +BR2_x86_64=y +BR2_x86_corei7=y +BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y +BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y +BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +Signed-off-by: Bernd Kuhls + + +diff -uNr ffmpeg-d028c907004e8a3c0f5161ce595331e4cc57c86c.org/libavutil/libm.h ffmpeg-d028c907004e8a3c0f5161ce595331e4cc57c86c/libavutil/libm.h +--- ffmpeg-d028c907004e8a3c0f5161ce595331e4cc57c86c.org/libavutil/libm.h 2014-07-16 20:37:20.000000000 +0200 ++++ ffmpeg-d028c907004e8a3c0f5161ce595331e4cc57c86c/libavutil/libm.h 2014-07-17 22:58:01.781316442 +0200 +@@ -82,16 +82,6 @@ + #define exp2f(x) ((float)exp2(x)) + #endif /* HAVE_EXP2F */ + +-#if !HAVE_FMINF +-#undef fminf +-static av_always_inline av_const float fminf(float x, float y) +-{ +- //Note, the NaN special case is needed for C spec compliance, it should be +- //optimized away if the users compiler is configured to assume no NaN +- return x > y ? y : (x == x ? x : y); +-} +-#endif +- + #if !HAVE_ISINF + static av_always_inline av_const int isinf(float x) + { diff --git a/package/ffmpeg/ffmpeg-0002-bfin.patch b/package/ffmpeg/ffmpeg-0002-bfin.patch new file mode 100644 index 000000000..c6c84f21d --- /dev/null +++ b/package/ffmpeg/ffmpeg-0002-bfin.patch @@ -0,0 +1,55 @@ +Fix compile error on bfin. + +After the removal of all Blackfin architecture optimizations in +http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b55d3bbeed375f7b74442c4dd274d116a3e3d2e1 +some includes were left behind leading to a compilation error + +http://autobuild.buildroot.net/results/ae0/ae056f267e907091d09d2a1546d6f1ae02fa23b9/ + +CC libavformat/adtsenc.o +In file included from ./libavcodec/get_bits.h:35, + from ./libavcodec/ac3_parser.h:27, + from libavformat/ac3dec.c:23: +./libavcodec/mathops.h:43:29: error: bfin/mathops.h: No such file or directory + +Patch sent upstream: +https://ffmpeg.org/pipermail/ffmpeg-devel/2014-August/160694.html + +Signed-off-by: Bernd Kuhls + +diff -uNr ffmpeg-2.3.1.org/libavcodec/mathops.h ffmpeg-2.3.1/libavcodec/mathops.h +--- ffmpeg-2.3.1.org/libavcodec/mathops.h 2014-07-31 03:18:40.000000000 +0200 ++++ ffmpeg-2.3.1/libavcodec/mathops.h 2014-08-04 20:49:00.340763801 +0200 +@@ -39,8 +39,6 @@ + # include "arm/mathops.h" + #elif ARCH_AVR32 + # include "avr32/mathops.h" +-#elif ARCH_BFIN +-# include "bfin/mathops.h" + #elif ARCH_MIPS + # include "mips/mathops.h" + #elif ARCH_PPC +diff -uNr ffmpeg-2.3.1.org/libavutil/bswap.h ffmpeg-2.3.1/libavutil/bswap.h +--- ffmpeg-2.3.1.org/libavutil/bswap.h 2014-07-31 03:18:47.000000000 +0200 ++++ ffmpeg-2.3.1/libavutil/bswap.h 2014-08-04 20:48:56.028818009 +0200 +@@ -40,8 +40,6 @@ + # include "arm/bswap.h" + #elif ARCH_AVR32 + # include "avr32/bswap.h" +-#elif ARCH_BFIN +-# include "bfin/bswap.h" + #elif ARCH_SH4 + # include "sh4/bswap.h" + #elif ARCH_X86 +diff -uNr ffmpeg-2.3.1.org/libavutil/timer.h ffmpeg-2.3.1/libavutil/timer.h +--- ffmpeg-2.3.1.org/libavutil/timer.h 2014-07-31 03:18:47.000000000 +0200 ++++ ffmpeg-2.3.1/libavutil/timer.h 2014-08-04 20:48:48.832908474 +0200 +@@ -40,8 +40,6 @@ + + #if ARCH_ARM + # include "arm/timer.h" +-#elif ARCH_BFIN +-# include "bfin/timer.h" + #elif ARCH_PPC + # include "ppc/timer.h" + #elif ARCH_X86 diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index f8c152651..e8d4adae3 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 1.2.5 +FFMPEG_VERSION = 2.3.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -41,7 +41,6 @@ FFMPEG_CONF_OPT = \ --enable-mdct \ --enable-rdft \ --disable-crystalhd \ - --disable-vaapi \ --disable-vdpau \ --disable-dxva2 \ --enable-runtime-cpudetect \ @@ -66,7 +65,6 @@ FFMPEG_CONF_OPT = \ --disable-libtheora \ --disable-libvo-aacenc \ --disable-libvo-amrwbenc \ - --disable-vis \ --disable-sram \ --disable-symver \ --disable-doc @@ -209,6 +207,13 @@ FFMPEG_CONF_OPT += \ --enable-encoder=libvorbis endif +ifeq ($(BR2_PACKAGE_LIBVA),y) +FFMPEG_CONF_OPT += --enable-vaapi +FFMPEG_DEPENDENCIES += libva +else +FFMPEG_CONF_OPT += --disable-vaapi +endif + ifeq ($(BR2_X86_CPU_HAS_MMX),y) FFMPEG_CONF_OPT += --enable-yasm FFMPEG_DEPENDENCIES += host-yasm @@ -299,14 +304,11 @@ FFMPEG_CONF_OPT += \ --disable-mipsdspr2 endif -# Set powerpc altivec appropriately -ifeq ($(BR2_powerpc),y) -ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) FFMPEG_CONF_OPT += --enable-altivec else FFMPEG_CONF_OPT += --disable-altivec endif -endif ifeq ($(BR2_PREFER_STATIC_LIB),) FFMPEG_CONF_OPT += --enable-pic @@ -327,6 +329,7 @@ define FFMPEG_CONFIGURE_CMDS --host-cc="$(HOSTCC)" \ --arch=$(BR2_ARCH) \ --target-os="linux" \ + --disable-stripping \ $(if $(BR2_GCC_TARGET_TUNE),--cpu=$(BR2_GCC_TARGET_TUNE)) \ $(SHARED_STATIC_LIBS_OPTS) \ $(FFMPEG_CONF_OPT) \ diff --git a/package/motioneye/S95motioneye b/package/motioneye/S95motioneye index cafdcf751..8b0b4c8a0 100755 --- a/package/motioneye/S95motioneye +++ b/package/motioneye/S95motioneye @@ -71,7 +71,7 @@ start() { stop() { echo -n "Shutting down motioneye: " - killall python2.7 + ps | grep motioneye | grep -v $$ | grep -v grep | tr -s ' ' | cut -d ' ' -f 2 | xargs -r kill echo "done" } diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk index 72825e0f3..8b6184845 100644 --- a/package/motioneye/motioneye.mk +++ b/package/motioneye/motioneye.mk @@ -4,8 +4,8 @@ # ############################################################# -MOTIONEYE_VERSION = a18838f -MOTIONPIE_VERSION = 20140924 +MOTIONEYE_VERSION = 418cdd2 +MOTIONPIE_VERSION = 20140928 MOTIONEYE_SITE = https://bitbucket.org/ccrisan/motioneye/get/ MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz MOTIONEYE_LICENSE = GPLv3