Skip to content

theora: update to 1.2.0 #2262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+72 −59
Open

theora: update to 1.2.0 #2262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions releases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4044,6 +4044,7 @@
"theora"
],
"versions": [
"1.2.0-1",
"1.1.1-6",
"1.1.1-5",
"1.1.1-4",
Expand Down
120 changes: 66 additions & 54 deletions subprojects/packagefiles/theora/lib/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,60 +38,72 @@ decoder_sources = files(
'state.c',
)

if asm
if conf.get('CPU_x86_64', false)
if cc.get_argument_syntax() != 'msvc'
encoder_sources += files(
'x86/mmxencfrag.c',
'x86/mmxfdct.c',
'x86/mmxfrag.c',
'x86/mmxidct.c',
'x86/mmxstate.c',
'x86/sse2fdct.c',
'x86/x86enc.c',
'x86/x86state.c',
)
decoder_sources += files(
'x86/mmxfrag.c',
'x86/mmxidct.c',
'x86/mmxstate.c',
'x86/x86state.c',
)
endif
elif conf.get('CPU_x86_32', false)
if cc.get_argument_syntax() != 'msvc'
decoder_sources += files(
'x86/mmxfrag.c',
'x86/mmxidct.c',
'x86/mmxstate.c',
'x86/x86state.c',
)
encoder_sources += files(
'x86/mmxencfrag.c',
'x86/mmxfdct.c',
'x86/mmxfrag.c',
'x86/mmxidct.c',
'x86/mmxstate.c',
'x86/x86enc.c',
'x86/x86state.c',
)
else
encoder_sources += files(
'x86_vc/mmxencfrag.c',
'x86_vc/mmxfdct.c',
'x86_vc/mmxfrag.c',
'x86_vc/mmxidct.c',
'x86_vc/mmxstate.c',
'x86_vc/x86enc.c',
'x86_vc/x86state.c',
)
decoder_sources += files(
'x86_vc/mmxfrag.c',
'x86_vc/mmxidct.c',
'x86_vc/mmxstate.c',
'x86_vc/x86state.c',
)
endif
if conf.get('CPU_x86_64', false)
if cc.get_argument_syntax() != 'msvc'
encoder_sources += files(
'x86/mmxencfrag.c',
'x86/mmxfdct.c',
'x86/mmxfrag.c',
'x86/mmxidct.c',
'x86/mmxstate.c',
'x86/sse2encfrag.c',
'x86/sse2fdct.c',
'x86/sse2idct.c',
'x86/x86cpu.c',
'x86/x86enc.c',
'x86/x86enquant.c',
'x86/x86state.c',
)
decoder_sources += files(
'x86/mmxfrag.c',
'x86/mmxidct.c',
'x86/mmxstate.c',
'x86/sse2idct.c',
'x86/x86cpu.c',
'x86/x86state.c',
)
endif
elif conf.get('CPU_x86_32', false)
if cc.get_argument_syntax() != 'msvc'
decoder_sources += files(
'x86/mmxfrag.c',
'x86/mmxidct.c',
'x86/mmxstate.c',
'x86/sse2idct.c',
'x86/x86cpu.c',
'x86/x86state.c',
)
encoder_sources += files(
'x86/mmxencfrag.c',
'x86/mmxfdct.c',
'x86/mmxfrag.c',
'x86/mmxidct.c',
'x86/mmxstate.c',
'x86/sse2encfrag.c',
'x86/sse2idct.c',
'x86/x86cpu.c',
'x86/x86enc.c',
'x86/x86enquant.c',
'x86/x86state.c',
)
else
encoder_sources += files(
'x86_vc/mmxencfrag.c',
'x86_vc/mmxfdct.c',
'x86_vc/mmxfrag.c',
'x86_vc/mmxidct.c',
'x86_vc/mmxstate.c',
'x86_vc/x86cpu.c',
'x86_vc/x86enc.c',
'x86_vc/x86state.c',
)
decoder_sources += files(
'x86_vc/mmxfrag.c',
'x86_vc/mmxidct.c',
'x86_vc/mmxstate.c',
'x86_vc/x86cpu.c',
'x86_vc/x86state.c',
)
endif
endif

Expand Down
2 changes: 1 addition & 1 deletion subprojects/packagefiles/theora/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
'theora',
'c',
'cpp',
version: '1.1.1',
version: '1.2.0',
meson_version: '>= 0.49.0',

Check warning on line 6 in subprojects/packagefiles/theora/meson.build

View workflow job for this annotation

GitHub Actions / Ubuntu (x86_64)

Minimum Meson version is 0.63.0 

0.38.0: configuration_data.get()
0.43.0: compiler.get_supported_arguments
0.46.0: compiler.get_supported_link_arguments, pkgconfig.generate optional positional argument, pkgconfig.generate requirement from non-string object
0.47.0: User option "feature", dict
0.48.0: darwin_versions arg in library
0.49.0: / with string arguments, compiler.get_argument_syntax_method, disabler arg in dependency, disabler arg in find_program
0.63.0: c_std in subproject default_options
license: 'BSD-3-Clause',
default_options: ['c_std=c11'],
)
Expand Down
8 changes: 4 additions & 4 deletions subprojects/theora.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[wrap-file]
directory = libtheora-1.1.1
source_url = https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
source_filename = libtheora-1.1.1.tar.bz2
source_hash = b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc
directory = libtheora-1.2.0
source_url = https://downloads.xiph.org/releases/theora/libtheora-1.2.0.tar.xz
source_filename = libtheora-1.2.0.tar.xz
source_hash = ebdf77a8f5c0a8f7a9e42323844fa09502b34eb1d1fece7b5f54da41fe2122ec
patch_directory = theora

[provide]
Expand Down