summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-01-24 12:13:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:49:49 -0800
commitd16219b754a259ec6277bf76001eb8aacd4a210c (patch)
tree591988cabe4932ca608b1d3cd1ae04323470a0ad
parent9a1ac06139591f70a72cd915059a5705d856a1ee (diff)
downloadpoky-d16219b754a259ec6277bf76001eb8aacd4a210c.tar.gz
tremor: remove
Now that Tremor isn't enabled by default in oe-core's GStreamer plugins and has been added to meta-multimedia, it can be removed from oe-core. (From OE-Core rev: 30f5c80943f69884b3d7323b540c8bb0f1efd8fd) (From OE-Core rev: a8b476e7d6a5bf43cceb8c7b2610c9b66fe2f33e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch104
-rw-r--r--meta/recipes-multimedia/tremor/tremor_20150107.bb32
3 files changed, 0 insertions, 151 deletions
diff --git a/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch b/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
deleted file mode 100644
index 7e5102903b..0000000000
--- a/meta/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Submitted [https://trac.xiph.org/ticket/1922]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4Index: configure.in
5===================================================================
6--- configure.in (revision 18764)
7+++ configure.in (working copy)
8@@ -9,7 +9,7 @@
9 AC_CANONICAL_HOST
10 AC_CANONICAL_TARGET
11
12-AM_CONFIG_HEADER([config.h])
13+AC_CONFIG_HEADERS([config.h])
14
15 AM_INIT_AUTOMAKE(libvorbisidec,1.2.1)
diff --git a/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch b/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
deleted file mode 100644
index 2049542227..0000000000
--- a/meta/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
+++ /dev/null
@@ -1,104 +0,0 @@
1From: Xin Ouyang <Xin.Ouyang@windriver.com>
2Date: Mon, 16 Jul 2012 13:29:34 +0800
3Subject: [PATCH] tremor: add IT instructions for arm thumb2 tune flags.
4
5Upstream-Status: Pending
6
7In Thumb-2, most instructions do not have a built in condition code (except for
8conditional branches). Instead, short sequences of instructions which are to be
9executed conditionally can be preceded by a special "IT instruction" which
10describes the condition and which of the following instructions should be
11executed if the condition is false respectively.
12
13For the ARM/Thumb IT(If-Then) instruction:
14http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0489c/Cjabicci.html
15
16Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
17---
18 asm_arm.h | 14 ++++++++++++++
19 1 file changed, 14 insertions(+)
20
21diff --git a/asm_arm.h b/asm_arm.h
22index c3bda00..823c54f 100755
23--- a/asm_arm.h
24+++ b/asm_arm.h
25@@ -108,9 +108,11 @@ static inline void XNPROD31(ogg_int32_t a, ogg_int32_t b,
26 static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) {
27 int tmp;
28 asm volatile("subs %1, %0, #32768\n\t"
29+ "itt pl\n\t"
30 "movpl %0, #0x7f00\n\t"
31 "orrpl %0, %0, #0xff\n"
32 "adds %1, %0, #32768\n\t"
33+ "it mi\n\t"
34 "movmi %0, #0x8000"
35 : "+r"(x),"=r"(tmp)
36 :
37@@ -139,10 +141,12 @@ static inline void lsp_loop_asm(ogg_uint32_t *qip,ogg_uint32_t *pip,
38
39 "ldmdb r0!,{r1,r3};"
40 "subs r1,r1,%4;" //ilsp[j]-wi
41+ "it mi;"
42 "rsbmi r1,r1,#0;" //labs(ilsp[j]-wi)
43 "umull %0,r2,r1,%0;" //qi*=labs(ilsp[j]-wi)
44
45 "subs r1,r3,%4;" //ilsp[j+1]-wi
46+ "it mi;"
47 "rsbmi r1,r1,#0;" //labs(ilsp[j+1]-wi)
48 "umull %1,r3,r1,%1;" //pi*=labs(ilsp[j+1]-wi)
49
50@@ -167,6 +171,7 @@ static inline void lsp_loop_asm(ogg_uint32_t *qip,ogg_uint32_t *pip,
51 "mov r0,#0x4000;\n"
52
53 "subs r1,r1,%4;\n" //ilsp[j]-wi
54+ "it mi;\n"
55 "rsbmi r1,r1,#0;\n" //labs(ilsp[j]-wi)
56 "umull %0,r2,r1,%0;\n" //qi*=labs(ilsp[j]-wi)
57 "umull %1,r3,r0,%1;\n" //pi*=labs(ilsp[j+1]-wi)
58@@ -190,18 +195,23 @@ static inline void lsp_loop_asm(ogg_uint32_t *qip,ogg_uint32_t *pip,
59 "mov r2,#0;"
60 "orr r1,%0,%1;"
61 "tst r1,#0xff000000;"
62+ "itt ne;"
63 "addne r2,r2,#8;"
64 "movne r1,r1,lsr #8;"
65 "tst r1,#0x00f00000;"
66+ "itt ne;"
67 "addne r2,r2,#4;"
68 "movne r1,r1,lsr #4;"
69 "tst r1,#0x000c0000;"
70+ "itt ne;"
71 "addne r2,r2,#2;"
72 "movne r1,r1,lsr #2;"
73 "tst r1,#0x00020000;"
74+ "itt ne;"
75 "addne r2,r2,#1;"
76 "movne r1,r1,lsr #1;"
77 "tst r1,#0x00010000;"
78+ "it ne;"
79 "addne r2,r2,#1;"
80 "mov %0,%0,lsr r2;"
81 "mov %1,%1,lsr r2;"
82@@ -222,15 +232,19 @@ static inline void lsp_norm_asm(ogg_uint32_t *qip,ogg_int32_t *qexpp){
83 ogg_int32_t qexp=*qexpp;
84
85 asm("tst %0,#0x0000ff00;"
86+ "itt eq;"
87 "moveq %0,%0,lsl #8;"
88 "subeq %1,%1,#8;"
89 "tst %0,#0x0000f000;"
90+ "itt eq;"
91 "moveq %0,%0,lsl #4;"
92 "subeq %1,%1,#4;"
93 "tst %0,#0x0000c000;"
94+ "itt eq;"
95 "moveq %0,%0,lsl #2;"
96 "subeq %1,%1,#2;"
97 "tst %0,#0x00008000;"
98+ "itt eq;"
99 "moveq %0,%0,lsl #1;"
100 "subeq %1,%1,#1;"
101 : "+r"(qi),"+r"(qexp)
102--
1031.7.9.5
104
diff --git a/meta/recipes-multimedia/tremor/tremor_20150107.bb b/meta/recipes-multimedia/tremor/tremor_20150107.bb
deleted file mode 100644
index 96834bd9a2..0000000000
--- a/meta/recipes-multimedia/tremor/tremor_20150107.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1SUMMARY = "Fixed-point decoder"
2DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
3SECTION = "libs"
4LICENSE = "BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \
6 file://os.h;beginline=3;endline=14;md5=5c0af5e1bedef3ce8178c89f48cd6f1f"
7DEPENDS = "libogg"
8SRCDATE = "${PV}"
9PR = "r1"
10
11# SVN support for upstream version check isn't implemented yet
12RECIPE_UPSTREAM_VERSION = "20150107"
13RECIPE_UPSTREAM_DATE = "Jan 07, 2015"
14CHECK_DATE = "Aug 12, 2015"
15
16# Only subversion url left in OE-Core, use a mirror tarball instead since
17# this rarely changes.
18# svn://svn.xiph.org/trunk;module=Tremor;rev=19427;protocol=http
19SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/Tremor_svn.xiph.org_.trunk_19427_.tar.gz \
20 file://obsolete_automake_macros.patch;striplevel=0 \
21 file://tremor-arm-thumb2.patch \
22"
23SRC_URI[md5sum] = "b308f9598176c0b5059c0124ab122afe"
24SRC_URI[sha256sum] = "2196802e1635f9ac4474eeee0fe4da12e6c1ad3942862427a67268de2b65b1d4"
25
26S = "${WORKDIR}/Tremor"
27
28inherit autotools pkgconfig
29
30EXTRA_OECONF = "--enable-shared"
31
32ARM_INSTRUCTION_SET = "arm"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 14:03:22 +0000