Skip to content

Commit 4a21985

Browse files
committed
theora: update to 1.2.0
Signed-off-by: Rosen Penev <[email protected]>
1 parent 5e3498b commit 4a21985

File tree

4 files changed

+72
-59
lines changed

4 files changed

+72
-59
lines changed

releases.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4044,6 +4044,7 @@
40444044
"theora"
40454045
],
40464046
"versions": [
4047+
"1.2.0-1",
40474048
"1.1.1-6",
40484049
"1.1.1-5",
40494050
"1.1.1-4",

subprojects/packagefiles/theora/lib/meson.build

Lines changed: 66 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -38,60 +38,72 @@ decoder_sources = files(
3838
'state.c',
3939
)
4040

41-
if asm
42-
if conf.get('CPU_x86_64', false)
43-
if cc.get_argument_syntax() != 'msvc'
44-
encoder_sources += files(
45-
'x86/mmxencfrag.c',
46-
'x86/mmxfdct.c',
47-
'x86/mmxfrag.c',
48-
'x86/mmxidct.c',
49-
'x86/mmxstate.c',
50-
'x86/sse2fdct.c',
51-
'x86/x86enc.c',
52-
'x86/x86state.c',
53-
)
54-
decoder_sources += files(
55-
'x86/mmxfrag.c',
56-
'x86/mmxidct.c',
57-
'x86/mmxstate.c',
58-
'x86/x86state.c',
59-
)
60-
endif
61-
elif conf.get('CPU_x86_32', false)
62-
if cc.get_argument_syntax() != 'msvc'
63-
decoder_sources += files(
64-
'x86/mmxfrag.c',
65-
'x86/mmxidct.c',
66-
'x86/mmxstate.c',
67-
'x86/x86state.c',
68-
)
69-
encoder_sources += files(
70-
'x86/mmxencfrag.c',
71-
'x86/mmxfdct.c',
72-
'x86/mmxfrag.c',
73-
'x86/mmxidct.c',
74-
'x86/mmxstate.c',
75-
'x86/x86enc.c',
76-
'x86/x86state.c',
77-
)
78-
else
79-
encoder_sources += files(
80-
'x86_vc/mmxencfrag.c',
81-
'x86_vc/mmxfdct.c',
82-
'x86_vc/mmxfrag.c',
83-
'x86_vc/mmxidct.c',
84-
'x86_vc/mmxstate.c',
85-
'x86_vc/x86enc.c',
86-
'x86_vc/x86state.c',
87-
)
88-
decoder_sources += files(
89-
'x86_vc/mmxfrag.c',
90-
'x86_vc/mmxidct.c',
91-
'x86_vc/mmxstate.c',
92-
'x86_vc/x86state.c',
93-
)
94-
endif
41+
if conf.get('CPU_x86_64', false)
42+
if cc.get_argument_syntax() != 'msvc'
43+
encoder_sources += files(
44+
'x86/mmxencfrag.c',
45+
'x86/mmxfdct.c',
46+
'x86/mmxfrag.c',
47+
'x86/mmxidct.c',
48+
'x86/mmxstate.c',
49+
'x86/sse2encfrag.c',
50+
'x86/sse2fdct.c',
51+
'x86/sse2idct.c',
52+
'x86/x86cpu.c',
53+
'x86/x86enc.c',
54+
'x86/x86enquant.c',
55+
'x86/x86state.c',
56+
)
57+
decoder_sources += files(
58+
'x86/mmxfrag.c',
59+
'x86/mmxidct.c',
60+
'x86/mmxstate.c',
61+
'x86/sse2idct.c',
62+
'x86/x86cpu.c',
63+
'x86/x86state.c',
64+
)
65+
endif
66+
elif conf.get('CPU_x86_32', false)
67+
if cc.get_argument_syntax() != 'msvc'
68+
decoder_sources += files(
69+
'x86/mmxfrag.c',
70+
'x86/mmxidct.c',
71+
'x86/mmxstate.c',
72+
'x86/sse2idct.c',
73+
'x86/x86cpu.c',
74+
'x86/x86state.c',
75+
)
76+
encoder_sources += files(
77+
'x86/mmxencfrag.c',
78+
'x86/mmxfdct.c',
79+
'x86/mmxfrag.c',
80+
'x86/mmxidct.c',
81+
'x86/mmxstate.c',
82+
'x86/sse2encfrag.c',
83+
'x86/sse2idct.c',
84+
'x86/x86cpu.c',
85+
'x86/x86enc.c',
86+
'x86/x86enquant.c',
87+
'x86/x86state.c',
88+
)
89+
else
90+
encoder_sources += files(
91+
'x86_vc/mmxencfrag.c',
92+
'x86_vc/mmxfdct.c',
93+
'x86_vc/mmxfrag.c',
94+
'x86_vc/mmxidct.c',
95+
'x86_vc/mmxstate.c',
96+
'x86_vc/x86cpu.c',
97+
'x86_vc/x86enc.c',
98+
'x86_vc/x86state.c',
99+
)
100+
decoder_sources += files(
101+
'x86_vc/mmxfrag.c',
102+
'x86_vc/mmxidct.c',
103+
'x86_vc/mmxstate.c',
104+
'x86_vc/x86cpu.c',
105+
'x86_vc/x86state.c',
106+
)
95107
endif
96108
endif
97109

subprojects/packagefiles/theora/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project(
22
'theora',
33
'c',
44
'cpp',
5-
version: '1.1.1',
5+
version: '1.2.0',
66
meson_version: '>= 0.49.0',
77
license: 'BSD-3-Clause',
88
default_options: ['c_std=c11'],

subprojects/theora.wrap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[wrap-file]
2-
directory = libtheora-1.1.1
3-
source_url = https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
4-
source_filename = libtheora-1.1.1.tar.bz2
5-
source_hash = b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
2+
directory = libtheora-1.2.0
3+
source_url = https://downloads.xiph.org/releases/theora/libtheora-1.2.0.tar.xz
4+
source_filename = libtheora-1.2.0.tar.xz
5+
source_hash = ebdf77a8f5c0a8f7a9e42323844fa09502b34eb1d1fece7b5f54da41fe2122ec
66
patch_directory = theora
77

88
[provide]

0 commit comments

Comments
 (0)