Skip to content

vo-aacenc.wrap: Fix building as a subproject #2425

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

Merged
nirbheek merged 4 commits into from
Feb 19, 2026
Merged

vo-aacenc.wrap: Fix building as a subproject #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
937c08a
vo-aacenc.wrap: Fix building as a subproject
nirbheek Sep 30, 2025
d0bc907
vo-aacenc: Add license as required by CI
nirbheek Sep 30, 2025
e98a226
vo-aacenc.wrap: Use meson.override_dependency()
nirbheek Dec 12, 2025
ee4b966
vo-aacenc: Bump meson requirement to 1.2.0
nirbheek Dec 12, 2025
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 @@ -4593,6 +4593,7 @@
"vo-aacenc"
],
"versions": [
"0.1.3-2",
"0.1.3-1"
]
},
Expand Down
524 changes: 524 additions & 0 deletions subprojects/packagefiles/vo-aacenc/LICENSE.build
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions subprojects/packagefiles/vo-aacenc/common/include/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ if cc.get_define('_MSC_VER') != '' and cc.get_define('__clang__') != ''
),
]
endif

subdir('vo-aacenc')
8 changes: 8 additions & 0 deletions subprojects/packagefiles/vo-aacenc/common/include/vo-aacenc/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fs = import('fs')
foreach h : aacencinclude_headers
configure_file(
input: h,
output: fs.name(h),
copy: true,
)
endforeach
5 changes: 4 additions & 1 deletion subprojects/packagefiles/vo-aacenc/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
],
license: 'Apache-2.0',
version: '0.1.3',
meson_version: '>= 0.52.0',
# Need 1.2.0 for cc.compiles() with a file generated at setup time. This is only used on arm, so the CI will warn on x86_64.
meson_version: '>= 1.2.0',

Check warning on line 12 in subprojects/packagefiles/vo-aacenc/meson.build

View workflow job for this annotation

GitHub Actions / Ubuntu (x86_64)

Minimum Meson version is 0.63.0 

0.56.0: oldest version supported by WrapDB
0.59.0: fs.name with file
0.63.0: c_std in subproject default_options
)

armv7neon = false
Expand Down Expand Up @@ -137,6 +138,8 @@
include_directories: libvo_aacenc_includes,
)

meson.override_dependency('vo-aacenc', libvo_aacenc_dep)

if not get_option('example').disabled()
example = executable(
'aac-enc',
Expand Down
2 changes: 1 addition & 1 deletion subprojects/vo-aacenc.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ source_hash = e51a7477a359f18df7c4f82d195dab4e14e7414cbd48cf79cc195fc446850f36
patch_directory = vo-aacenc

[provide]
vo-aacenc = libvo_aacenc_dep
dependency_names = vo-aacenc