diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-13 22:30:04 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-08-16 12:58:30 +0200 |
commit | 440d3fd3d62bdb390806a834324c31920c5c409e (patch) | |
tree | d7c3ffa013c768e852fb49f2fe41b49092590b79 /meta-oe/recipes-multimedia | |
parent | 30ba23377ec568a58c43e466582506980b67baad (diff) | |
download | meta-openembedded-contrib-440d3fd3d62bdb390806a834324c31920c5c409e.tar.gz |
x264: remove
This is now in OE-Core.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r-- | meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch | 20 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/x264/x264_git.bb | 47 |
2 files changed, 0 insertions, 67 deletions
diff --git a/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch deleted file mode 100644 index b844d88fe8..0000000000 --- a/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch +++ /dev/null @@ -1,20 +0,0 @@ --march flag is not in CFLAGS so this will always default to -mcpu=cortex-a8 --mfpu=neon. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: git/configure -=================================================================== ---- git.orig/configure 2013-02-10 16:26:40.666343682 +0200 -+++ git/configure 2013-02-10 16:27:49.198341677 +0200 -@@ -703,9 +703,6 @@ - fi - - if [ $asm = auto -a $ARCH = ARM ] ; then -- # set flags so neon is built by default -- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" -- - if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 - cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 - cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON diff --git a/meta-oe/recipes-multimedia/x264/x264_git.bb b/meta-oe/recipes-multimedia/x264/x264_git.bb deleted file mode 100644 index c767ffd6bb..0000000000 --- a/meta-oe/recipes-multimedia/x264/x264_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC format" -HOMEPAGE = "http://www.videolan.org/developers/x264.html" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -PR = "r1" - -DEPENDS = "yasm-native" - -SRC_URI = "git://git.videolan.org/x264.git \ - file://don-t-default-to-cortex-a9-with-neon.patch \ -" -SRCREV = "1cffe9f406cc54f4759fc9eeb85598fb8cae66c7" - -PV = "r2230+git" - -S = "${WORKDIR}/git" - -inherit lib_package pkgconfig - -X264_DISABLE_ASM = "" -X264_DISABLE_ASM_armv4 = "--disable-asm" -X264_DISABLE_ASM_armv5 = "--disable-asm" - -EXTRA_OECONF = '--prefix=${prefix} \ - --host=${HOST_SYS} \ - --cross-prefix=${TARGET_PREFIX} \ - --sysroot=${STAGING_DIR_TARGET} \ - --enable-shared \ - --enable-static \ - --disable-lavf \ - --disable-swscale \ - ${X264_DISABLE_ASM} \ - ' - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -# Get rid of -e -EXTRA_OEMAKE = "" -AS = "${TARGET_PREFIX}gcc" - -do_install() { - oe_runmake install DESTDIR=${D} -} |