diff --git a/releases.json b/releases.json index 391167722..8ff23930a 100644 --- a/releases.json +++ b/releases.json @@ -4593,6 +4593,7 @@ "vo-aacenc" ], "versions": [ + "0.1.3-2", "0.1.3-1" ] }, diff --git a/subprojects/packagefiles/vo-aacenc/LICENSE.build b/subprojects/packagefiles/vo-aacenc/LICENSE.build new file mode 100644 index 000000000..56a5bc918 --- /dev/null +++ b/subprojects/packagefiles/vo-aacenc/LICENSE.build @@ -0,0 +1,19 @@ +Copyright (c) 2025 The Meson development team + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/subprojects/packagefiles/vo-aacenc/common/include/meson.build b/subprojects/packagefiles/vo-aacenc/common/include/meson.build index 64f4096d0..3bda3dde7 100644 --- a/subprojects/packagefiles/vo-aacenc/common/include/meson.build +++ b/subprojects/packagefiles/vo-aacenc/common/include/meson.build @@ -20,3 +20,5 @@ if cc.get_define('_MSC_VER') != '' and cc.get_define('__clang__') != '' ), ] endif + +subdir('vo-aacenc') diff --git a/subprojects/packagefiles/vo-aacenc/common/include/vo-aacenc/meson.build b/subprojects/packagefiles/vo-aacenc/common/include/vo-aacenc/meson.build new file mode 100644 index 000000000..0704324aa --- /dev/null +++ b/subprojects/packagefiles/vo-aacenc/common/include/vo-aacenc/meson.build @@ -0,0 +1,8 @@ +fs = import('fs') +foreach h : aacencinclude_headers + configure_file( + input: h, + output: fs.name(h), + copy: true, + ) +endforeach diff --git a/subprojects/packagefiles/vo-aacenc/meson.build b/subprojects/packagefiles/vo-aacenc/meson.build index 630fe02e9..3761cb4c0 100644 --- a/subprojects/packagefiles/vo-aacenc/meson.build +++ b/subprojects/packagefiles/vo-aacenc/meson.build @@ -8,7 +8,7 @@ project( ], license: 'Apache-2.0', version: '0.1.3', - meson_version: '>= 0.52.0', + meson_version: '>= 1.2.0', ) armv7neon = false @@ -137,6 +137,8 @@ libvo_aacenc_dep = declare_dependency( include_directories: libvo_aacenc_includes, ) +meson.override_dependency('vo-aacenc', libvo_aacenc_dep) + if not get_option('example').disabled() example = executable( 'aac-enc', diff --git a/subprojects/vo-aacenc.wrap b/subprojects/vo-aacenc.wrap index 3c51afb8b..f2e8df756 100644 --- a/subprojects/vo-aacenc.wrap +++ b/subprojects/vo-aacenc.wrap @@ -6,4 +6,4 @@ source_hash = e51a7477a359f18df7c4f82d195dab4e14e7414cbd48cf79cc195fc446850f36 patch_directory = vo-aacenc [provide] -vo-aacenc = libvo_aacenc_dep +dependency_names = vo-aacenc