Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,65 @@
|
||||
gst-ffmpeg libav: Fixes compiling gst-ffmpeg with gcc-4.7
|
||||
|
||||
Fetch from: http://www.slackware.com/~alien/slackbuilds/gst-plugins-ffmpeg/build/gst-ffmpeg-0.10.13_gcc47.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
|
||||
---
|
||||
Submitted By: Andrew Benton <andy@benton.eu.com>
|
||||
Date: 2012-06-15
|
||||
Initial Package Version: 0.10.13
|
||||
Upstream Status: From upstream
|
||||
Origin:
|
||||
http://git.videolan.org/?p=ffmpeg.git;a=patch;h=5f654897e325349dacf2546674e0510bb72ecb50
|
||||
|
||||
Description: Fixes compiling gst-ffmpeg with gcc-4.7
|
||||
|
||||
libavcodec/x86/h264_qpel_mmx.c: Assembler messages:
|
||||
libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp'
|
||||
libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp'
|
||||
libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp'
|
||||
libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp'
|
||||
libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
|
||||
libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
|
||||
libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
|
||||
make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1
|
||||
|
||||
Index: gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
|
||||
===================================================================
|
||||
--- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700
|
||||
+++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700
|
||||
@@ -398,7 +398,7 @@
|
||||
"2: \n\t"\
|
||||
\
|
||||
: "+a"(src), "+c"(dst)\
|
||||
- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
|
||||
+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
|
||||
: "memory"\
|
||||
);\
|
||||
src += 4-(h+5)*srcStride;\
|
||||
@@ -446,7 +446,7 @@
|
||||
QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
|
||||
"2: \n\t"\
|
||||
: "+a"(src)\
|
||||
- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
|
||||
+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
|
||||
: "memory"\
|
||||
);\
|
||||
tmp += 4;\
|
||||
@@ -823,7 +823,7 @@
|
||||
"2: \n\t"\
|
||||
\
|
||||
: "+a"(src), "+c"(dst)\
|
||||
- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
|
||||
+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
|
||||
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
|
||||
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
|
||||
"memory"\
|
||||
@@ -878,7 +878,7 @@
|
||||
QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
|
||||
"2: \n\t"
|
||||
: "+a"(src)
|
||||
- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
|
||||
+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
|
||||
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
|
||||
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)
|
||||
"memory"
|
||||
@@ -0,0 +1,41 @@
|
||||
Date: Mon, 1 Aug 2011 20:21:04 +0300
|
||||
Subject: [libavcodec] arm: Avoid using the movw instruction needlessly
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This fixes building for ARM11 without Thumb2.
|
||||
|
||||
Signed-off-by: Martin Storsjö <martin@martin.st>
|
||||
|
||||
[Arnout: backported to gst-ffmpeg, from ffmpeg 9a83adaf3]
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S
|
||||
index d3058ff..b6aee86 100644
|
||||
--- a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S
|
||||
+++ b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S
|
||||
@@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
|
||||
ldrb r10, [r4], #1
|
||||
1:
|
||||
ldrsh r9, [r0], #2 @ mask[band]
|
||||
- movw r8, #0x1fe0
|
||||
+ mov r8, #0xff0
|
||||
sub r9, r9, r12 @ - snr_offset
|
||||
mov r11, r10
|
||||
ldrb r10, [r4], #1 @ band_start_tab[band++]
|
||||
@@ -44,7 +44,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
|
||||
subs r9, r9, r5 @ - floor
|
||||
movlt r9, #0
|
||||
cmp r10, r3 @ - end
|
||||
- and r9, r9, r8 @ & 0x1fe0
|
||||
+ and r9, r9, r8, lsl #1 @ & 0x1fe0
|
||||
subgt r8, r3, r11
|
||||
suble r8, r10, r11
|
||||
add r9, r9, r5 @ + floor => m
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
config BR2_PACKAGE_GST_FFMPEG
|
||||
bool "gst-ffmpeg"
|
||||
# Unsupported for MIPS R6. It bundles a version of libav which
|
||||
# doesn't have support for MIPS R6.
|
||||
depends on !BR2_mips_32r6 && !BR2_mips_64r6
|
||||
select BR2_PACKAGE_GST_PLUGINS_BASE
|
||||
help
|
||||
GStreamer plugin containing one plugin with a set of elements using
|
||||
the Libav library. It contains most popular decoders as well as
|
||||
colorspace conversion elements.
|
||||
|
||||
This package is configured to use an internal copy of the Libav
|
||||
library.
|
||||
|
||||
http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html
|
||||
|
||||
if BR2_PACKAGE_GST_FFMPEG
|
||||
|
||||
config BR2_PACKAGE_GST_FFMPEG_GPL
|
||||
bool "Enable GPL code"
|
||||
help
|
||||
Allow use of GPL code. The resulting libs and binaries will
|
||||
be under GPL.
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,2 @@
|
||||
# From http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.13.tar.bz2.md5
|
||||
md5 7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2
|
||||
@@ -0,0 +1,89 @@
|
||||
################################################################################
|
||||
#
|
||||
# gst-ffmpeg
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST_FFMPEG_VERSION = 0.10.13
|
||||
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 = host-pkgconf gstreamer gst-plugins-base
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y)
|
||||
GST_FFMPEG_CONF_OPTS += --disable-lgpl
|
||||
GST_FFMPEG_LICENSE = GPLv2+ (gst-ffmpeg), GPLv2+/GPLv3+ (libav)
|
||||
GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
|
||||
else
|
||||
GST_FFMPEG_CONF_OPTS += --enable-lgpl
|
||||
GST_FFMPEG_LICENSE = LGPLv2+ (gst-ffmpeg), LGPLv2.1+/LGPLv3+ (libav)
|
||||
GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3
|
||||
endif
|
||||
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS = \
|
||||
--cross-prefix=$(TARGET_CROSS) \
|
||||
--target-os=linux \
|
||||
--pkg-config='$(PKG_CONFIG_HOST_BINARY)'
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib
|
||||
GST_FFMPEG_DEPENDENCIES += zlib
|
||||
else
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-bzlib
|
||||
GST_FFMPEG_DEPENDENCIES += bzip2
|
||||
else
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-bzlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-yasm
|
||||
GST_FFMPEG_DEPENDENCIES += host-yasm
|
||||
else
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-yasm
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-mmx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-sse
|
||||
else
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-sse
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-ssse3
|
||||
else
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-ssse3
|
||||
endif
|
||||
|
||||
# Explicitly disable everything that doesn't match for ARM
|
||||
# FFMPEG "autodetects" by compiling an extended instruction via AS
|
||||
# This works on compilers that aren't built for generic by default
|
||||
ifeq ($(BR2_ARM_CPU_ARMV4),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te
|
||||
endif
|
||||
ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6
|
||||
else
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
|
||||
endif
|
||||
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-neon
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-altivec
|
||||
else
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),)
|
||||
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic
|
||||
endif
|
||||
|
||||
GST_FFMPEG_CONF_OPTS += --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user