diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2024-01-20 18:45:29 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2024-01-20 18:45:29 -0500 |
| commit | 88ea5bdca85fc0954d1dd64309a308199c1af4a8 (patch) | |
| tree | ef9dc778b9c42ab2fecce8810f777ccc133cebef /subprojects | |
| parent | b79f074a86525ece1394af7bc5870516a8c38ba9 (diff) | |
| download | camu-88ea5bdca85fc0954d1dd64309a308199c1af4a8.tar.gz camu-88ea5bdca85fc0954d1dd64309a308199c1af4a8.tar.bz2 camu-88ea5bdca85fc0954d1dd64309a308199c1af4a8.zip | |
wip
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/ffmpeg.wrap | 4 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/subprojects/ffmpeg.wrap b/subprojects/ffmpeg.wrap index 76dcda1..c030027 100644 --- a/subprojects/ffmpeg.wrap +++ b/subprojects/ffmpeg.wrap @@ -1,6 +1,10 @@ [wrap-file] directory = ffmpeg-6.1.1 +#directory = ffmpeg-5.1.4 source_url = https://www.ffmpeg.org/releases/ffmpeg-6.1.1.tar.gz +#source_url = https://www.ffmpeg.org/releases/ffmpeg-5.1.4.tar.gz source_filename = ffmpeg-6.1.1.tar.gz +#source_filename = ffmpeg-5.1.4.tar.gz source_hash = b0aee531e4a91fed6bc031445dfc3ad8eb36de1fcb0fa2acdb589ecc9f8dc9cb +#source_hash = ad1d83e0f022ba405928ea4985c9cab978c4698bb7937738a1085808c3eb78b4 patch_directory = ffmpeg diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index c4ab72d..cff10e9 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -31,7 +31,7 @@ endif #'--extra-ldflags=-L/home/pizza/c/camu/build6/subprojects/libalabaster -l:libalabaster.a', #'--malloc-prefix=al_', -decoders = 'flac,mp3,aac,opus,alac,mjpeg,jpeg2000,h264,hevc,vp9' +decoders = 'flac,mp3,mp3float,aac,opus,alac,mjpeg,jpeg2000,h264,hevc,vp9' #decoders += ',pcm_f32be,pcm_f32le,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,pcm_s32be,pcm_s32le,pcm_s32le_planar,pcm_dvd,apng,mpegvideo,mpeg2video' #decoders += ',ass,srt' @@ -106,5 +106,5 @@ avcodec = proj.dependency('avcodec') swresample = proj.dependency('swresample') swscale = proj.dependency('swscale') -inc = include_directories('.') -libdir = meson.project_build_root() + '/dist/usr/locallib' +av_inc_dep = declare_dependency(include_directories: include_directories('.', 'build/')) +av_lib_dir = join_paths(meson.project_build_root(), 'dist/usr/locallib') |