From 17ea1e0d0aa0be9a2450ec856911c8af549304e6 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 13 Aug 2013 22:30:04 +0000
Subject: [PATCH] x264: remove

This is now in OE-Core.

(From meta-openembedded rev: 440d3fd3d62bdb390806a834324c31920c5c409e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 .../don-t-default-to-cortex-a9-with-neon.patch     | 20 ---------
 .../meta-oe/recipes-multimedia/x264/x264_git.bb    | 47 ----------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
 delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/x264/x264_git.bb

diff --git a/meta-openembedded/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta-openembedded/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
deleted file mode 100644
index b844d88..0000000
--- a/meta-openembedded/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-openembedded/meta-oe/recipes-multimedia/x264/x264_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/x264/x264_git.bb
deleted file mode 100644
index c767ffd..0000000
--- a/meta-openembedded/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}
-}
-- 
2.7.4