From 7ee01860d9c16f2d9d9ea3f5ae5c2a699c7cf1f9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 21 Feb 2018 13:05:08 +0100 Subject: build: restore alphabetical sort order of file lists --- wscript_build.py | 142 +++++++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/wscript_build.py b/wscript_build.py index ff99bfc186..930da8697f 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -161,11 +161,11 @@ def build(ctx): if ctx.dependency_satisfied('macos-cocoa-cb'): swift_source = [ - ( "video/out/cocoa_cb_common.swift" ), - ( "video/out/cocoa-cb/window.swift" ), + ( "osdep/macOS_mpv_helper.swift" ), ( "video/out/cocoa-cb/events_view.swift" ), ( "video/out/cocoa-cb/video_layer.swift" ), - ( "osdep/macOS_mpv_helper.swift" ) + ( "video/out/cocoa-cb/window.swift" ), + ( "video/out/cocoa_cb_common.swift" ), ] ctx( @@ -215,12 +215,10 @@ def build(ctx): sources = [ ## Audio + ( "audio/aframe.c" ), ( "audio/audio_buffer.c" ), ( "audio/chmap.c" ), ( "audio/chmap_sel.c" ), - ( "audio/fmt-conversion.c" ), - ( "audio/format.c" ), - ( "audio/aframe.c" ), ( "audio/decode/ad_lavc.c" ), ( "audio/decode/ad_spdif.c" ), ( "audio/filter/af_format.c" ), @@ -228,15 +226,17 @@ def build(ctx): ( "audio/filter/af_lavrresample.c" ), ( "audio/filter/af_rubberband.c", "rubberband" ), ( "audio/filter/af_scaletempo.c" ), + ( "audio/fmt-conversion.c" ), + ( "audio/format.c" ), ( "audio/out/ao.c" ), ( "audio/out/ao_alsa.c", "alsa" ), ( "audio/out/ao_audiounit.m", "audiounit" ), - ( "audio/out/ao_coreaudio_chmap.c", "audiounit" ), - ( "audio/out/ao_coreaudio_utils.c", "audiounit" ), ( "audio/out/ao_coreaudio.c", "coreaudio" ), + ( "audio/out/ao_coreaudio_chmap.c", "audiounit" ), ( "audio/out/ao_coreaudio_chmap.c", "coreaudio" ), ( "audio/out/ao_coreaudio_exclusive.c", "coreaudio" ), ( "audio/out/ao_coreaudio_properties.c", "coreaudio" ), + ( "audio/out/ao_coreaudio_utils.c", "audiounit" ), ( "audio/out/ao_coreaudio_utils.c", "coreaudio" ), ( "audio/out/ao_jack.c", "jack" ), ( "audio/out/ao_lavc.c", "encoding" ), @@ -250,8 +250,8 @@ def build(ctx): ( "audio/out/ao_sdl.c", "sdl2" ), ( "audio/out/ao_sndio.c", "sndio" ), ( "audio/out/ao_wasapi.c", "wasapi" ), - ( "audio/out/ao_wasapi_utils.c", "wasapi" ), ( "audio/out/ao_wasapi_changenotify.c", "wasapi" ), + ( "audio/out/ao_wasapi_utils.c", "wasapi" ), ( "audio/out/pull.c" ), ( "audio/out/push.c" ), @@ -259,12 +259,12 @@ def build(ctx): ( "common/av_common.c" ), ( "common/av_log.c" ), ( "common/codecs.c" ), - ( "common/encode_lavc.c", "encoding" ), ( "common/common.c" ), - ( "common/tags.c" ), + ( "common/encode_lavc.c", "encoding" ), ( "common/msg.c" ), ( "common/playlist.c" ), ( "common/recorder.c" ), + ( "common/tags.c" ), ( "common/version.c" ), ## Demuxers @@ -281,8 +281,8 @@ def build(ctx): ( "demux/demux_mkv_timeline.c" ), ( "demux/demux_null.c" ), ( "demux/demux_playlist.c" ), - ( "demux/demux_raw.c" ), ( "demux/demux_rar.c" ), + ( "demux/demux_raw.c" ), ( "demux/demux_timeline.c" ), ( "demux/demux_tv.c", "tv" ), ( "demux/ebml.c" ), @@ -319,8 +319,8 @@ def build(ctx): ( "misc/dispatch.c" ), ( "misc/json.c" ), ( "misc/node.c" ), - ( "misc/ring.c" ), ( "misc/rendezvous.c" ), + ( "misc/ring.c" ), ( "misc/thread_pool.c" ), ## Options @@ -338,11 +338,11 @@ def build(ctx): ( "player/command.c" ), ( "player/configfiles.c" ), ( "player/external_files.c" ), + ( "player/javascript.c", "javascript" ), ( "player/loadfile.c" ), + ( "player/lua.c", "lua" ), ( "player/main.c" ), ( "player/misc.c" ), - ( "player/lua.c", "lua" ), - ( "player/javascript.c", "javascript" ), ( "player/osd.c" ), ( "player/playloop.c" ), ( "player/screenshot.c" ), @@ -364,6 +364,7 @@ def build(ctx): ( "stream/stream.c" ), ( "stream/stream_avdevice.c" ), ( "stream/stream_bluray.c", "libbluray" ), + ( "stream/stream_cb.c" ), ( "stream/stream_cdda.c", "cdda" ), ( "stream/stream_dvb.c", "dvbin" ), ( "stream/stream_dvd.c", "dvdread-common" ), @@ -371,7 +372,6 @@ def build(ctx): ( "stream/stream_dvdnav.c", "dvdnav" ), ( "stream/stream_edl.c" ), ( "stream/stream_file.c" ), - ( "stream/stream_cb.c" ), ( "stream/stream_lavf.c" ), ( "stream/stream_libarchive.c", "libarchive" ), ( "stream/stream_memory.c" ), @@ -388,6 +388,7 @@ def build(ctx): ( "sub/ass_mp.c", "libass"), ( "sub/dec_sub.c" ), ( "sub/draw_bmp.c" ), + ( "sub/filter_sdh.c" ), ( "sub/img_convert.c" ), ( "sub/lavc_conv.c" ), ( "sub/osd.c" ), @@ -395,22 +396,10 @@ def build(ctx): ( "sub/osd_libass.c", "libass-osd" ), ( "sub/sd_ass.c", "libass" ), ( "sub/sd_lavc.c" ), - ( "sub/filter_sdh.c" ), ## Video ( "video/csputils.c" ), ( "video/d3d.c", "d3d-hwaccel" ), - ( "video/fmt-conversion.c" ), - ( "video/image_loader.c" ), - ( "video/image_writer.c" ), - ( "video/img_format.c" ), - ( "video/hwdec.c" ), - ( "video/mp_image.c" ), - ( "video/mp_image_pool.c" ), - ( "video/sws_utils.c" ), - ( "video/vaapi.c", "vaapi" ), - ( "video/vdpau.c", "vdpau" ), - ( "video/vdpau_mixer.c", "vdpau" ), ( "video/decode/vd_lavc.c" ), ( "video/filter/refqueue.c" ), ( "video/filter/vf_d3d11vpp.c", "d3d-hwaccel" ), @@ -419,19 +408,28 @@ def build(ctx): ( "video/filter/vf_vapoursynth.c", "vapoursynth-core" ), ( "video/filter/vf_vavpp.c", "vaapi" ), ( "video/filter/vf_vdpaupp.c", "vdpau" ), + ( "video/fmt-conversion.c" ), + ( "video/hwdec.c" ), + ( "video/image_loader.c" ), + ( "video/image_writer.c" ), + ( "video/img_format.c" ), + ( "video/mp_image.c" ), + ( "video/mp_image_pool.c" ), ( "video/out/aspect.c" ), ( "video/out/bitmap_packer.c" ), - ( "video/out/cocoa/video_view.m", "cocoa" ), ( "video/out/cocoa/events_view.m", "cocoa" ), + ( "video/out/cocoa/video_view.m", "cocoa" ), ( "video/out/cocoa/window.m", "cocoa" ), ( "video/out/cocoa_common.m", "cocoa" ), - ( "video/out/dither.c" ), - ( "video/out/filter_kernels.c" ), ( "video/out/d3d11/context.c", "d3d11" ), ( "video/out/d3d11/hwdec_d3d11va.c", "d3d11 && d3d-hwaccel" ), ( "video/out/d3d11/hwdec_dxva2dxgi.c", "d3d11 && d3d9-hwaccel" ), ( "video/out/d3d11/ra_d3d11.c", "d3d11" ), - ( "video/out/opengl/angle_dynamic.c", "egl-angle" ), + ( "video/out/dither.c" ), + ( "video/out/drm_atomic.c", "drm" ), + ( "video/out/drm_common.c", "drm" ), + ( "video/out/drm_prime.c", "drm && drmprime" ), + ( "video/out/filter_kernels.c" ), ( "video/out/gpu/context.c" ), ( "video/out/gpu/d3d11_helpers.c", "d3d11 || egl-angle-win32" ), ( "video/out/gpu/hwdec.c" ), @@ -439,112 +437,114 @@ def build(ctx): ( "video/out/gpu/libmpv_gpu.c" ), ( "video/out/gpu/osd.c" ), ( "video/out/gpu/ra.c" ), + ( "video/out/gpu/shader_cache.c" ), ( "video/out/gpu/spirv.c" ), ( "video/out/gpu/spirv_shaderc.c", "shaderc" ), - ( "video/out/gpu/shader_cache.c" ), ( "video/out/gpu/user_shaders.c" ), ( "video/out/gpu/utils.c" ), ( "video/out/gpu/video.c" ), ( "video/out/gpu/video_shaders.c" ), + ( "video/out/opengl/angle_dynamic.c", "egl-angle" ), ( "video/out/opengl/common.c", "gl" ), - ( "video/out/opengl/formats.c", "gl" ), - ( "video/out/opengl/utils.c", "gl" ), - ( "video/out/opengl/ra_gl.c", "gl" ), - ( "video/out/opengl/libmpv_gl.c", "gl" ), ( "video/out/opengl/context.c", "gl" ), + ( "video/out/opengl/context_android.c", "android" ), ( "video/out/opengl/context_angle.c", "egl-angle-win32" ), ( "video/out/opengl/context_cocoa.c", "gl-cocoa" ), ( "video/out/opengl/context_drm_egl.c", "egl-drm" ), ( "video/out/opengl/context_dxinterop.c","gl-dxinterop" ), + ( "video/out/opengl/context_glx.c", "gl-x11" ), ( "video/out/opengl/context_mali_fbdev.c","mali-fbdev" ), - ( "video/out/opengl/context_android.c", "android" ), ( "video/out/opengl/context_rpi.c", "rpi" ), ( "video/out/opengl/context_vdpau.c", "vdpau-gl-x11" ), ( "video/out/opengl/context_wayland.c", "gl-wayland" ), ( "video/out/opengl/context_win.c", "gl-win32" ), - ( "video/out/opengl/context_glx.c", "gl-x11" ), ( "video/out/opengl/context_x11egl.c", "egl-x11" ), ( "video/out/opengl/cuda_dynamic.c", "cuda-hwaccel" ), ( "video/out/opengl/egl_helpers.c", "egl-helpers" ), + ( "video/out/opengl/formats.c", "gl" ), ( "video/out/opengl/hwdec_cuda.c", "cuda-hwaccel" ), ( "video/out/opengl/hwdec_d3d11egl.c", "d3d-hwaccel && egl-angle" ), ( "video/out/opengl/hwdec_d3d11eglrgb.c","d3d-hwaccel && egl-angle" ), - ( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop-d3d9" ), + ( "video/out/opengl/hwdec_drmprime_drm.c","drmprime && drm" ), ( "video/out/opengl/hwdec_dxva2egl.c", "d3d9-hwaccel && egl-angle" ), - ( "video/out/opengl/hwdec_osx.c", "videotoolbox-gl" ), + ( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop-d3d9" ), ( "video/out/opengl/hwdec_ios.m", "ios-gl" ), - ( "video/out/opengl/hwdec_drmprime_drm.c","drmprime && drm" ), + ( "video/out/opengl/hwdec_osx.c", "videotoolbox-gl" ), ( "video/out/opengl/hwdec_rpi.c", "rpi" ), ( "video/out/opengl/hwdec_vaegl.c", "vaapi-egl" ), ( "video/out/opengl/hwdec_vdpau.c", "vdpau-gl-x11" ), + ( "video/out/opengl/libmpv_gl.c", "gl" ), + ( "video/out/opengl/ra_gl.c", "gl" ), + ( "video/out/opengl/utils.c", "gl" ), ( "video/out/vo.c" ), - ( "video/out/vo_mediacodec_embed.c", "android" ), ( "video/out/vo_caca.c", "caca" ), - ( "video/out/vo_drm.c", "drm" ), ( "video/out/vo_direct3d.c", "direct3d" ), + ( "video/out/vo_drm.c", "drm" ), + ( "video/out/vo_gpu.c" ), ( "video/out/vo_image.c" ), ( "video/out/vo_lavc.c", "encoding" ), - ( "video/out/vo_rpi.c", "rpi" ), ( "video/out/vo_libmpv.c" ), + ( "video/out/vo_mediacodec_embed.c", "android" ), ( "video/out/vo_null.c" ), - ( "video/out/vo_gpu.c" ), + ( "video/out/vo_rpi.c", "rpi" ), ( "video/out/vo_sdl.c", "sdl2" ), ( "video/out/vo_tct.c" ), ( "video/out/vo_vaapi.c", "vaapi-x11 && gpl" ), ( "video/out/vo_vdpau.c", "vdpau" ), ( "video/out/vo_x11.c" , "x11" ), ( "video/out/vo_xv.c", "xv" ), - ( "video/out/w32_common.c", "win32-desktop" ), - ( "video/out/win32/displayconfig.c", "win32-desktop" ), - ( "video/out/win32/droptarget.c", "win32-desktop" ), - ( "video/out/vulkan/utils.c", "vulkan" ), - ( "video/out/vulkan/malloc.c", "vulkan" ), - ( "video/out/vulkan/formats.c", "vulkan" ), - ( "video/out/vulkan/ra_vk.c", "vulkan" ), ( "video/out/vulkan/context.c", "vulkan" ), - ( "video/out/vulkan/context_xlib.c", "vulkan && x11" ), ( "video/out/vulkan/context_wayland.c", "vulkan && wayland" ), ( "video/out/vulkan/context_win.c", "vulkan && win32-desktop" ), + ( "video/out/vulkan/context_xlib.c", "vulkan && x11" ), + ( "video/out/vulkan/formats.c", "vulkan" ), + ( "video/out/vulkan/malloc.c", "vulkan" ), + ( "video/out/vulkan/ra_vk.c", "vulkan" ), ( "video/out/vulkan/spirv_nvidia.c", "vulkan" ), - ( "video/out/wayland_common.c", "wayland" ), - ( "video/out/wayland/xdg-shell-v6.c", "wayland" ), + ( "video/out/vulkan/utils.c", "vulkan" ), + ( "video/out/w32_common.c", "win32-desktop" ), ( "video/out/wayland/idle-inhibit-v1.c", "wayland" ), ( "video/out/wayland/srv-decor.c", "wayland" ), + ( "video/out/wayland/xdg-shell-v6.c", "wayland" ), + ( "video/out/wayland_common.c", "wayland" ), + ( "video/out/win32/displayconfig.c", "win32-desktop" ), + ( "video/out/win32/droptarget.c", "win32-desktop" ), ( "video/out/win_state.c"), ( "video/out/x11_common.c", "x11" ), - ( "video/out/drm_atomic.c", "drm" ), - ( "video/out/drm_common.c", "drm" ), - ( "video/out/drm_prime.c", "drm && drmprime" ), + ( "video/sws_utils.c" ), + ( "video/vaapi.c", "vaapi" ), + ( "video/vdpau.c", "vdpau" ), + ( "video/vdpau_mixer.c", "vdpau" ), ## osdep ( getch2_c ), ( "osdep/io.c" ), + ( "osdep/threads.c" ), ( "osdep/timer.c" ), ( timer_c ), - ( "osdep/threads.c" ), ( "osdep/polldev.c", "posix" ), + ( "osdep/android/posix-spawn.c", "android"), + ( "osdep/android/strnlen.c", "android"), ( "osdep/ar/HIDRemote.m", "apple-remote" ), + ( "osdep/glob-win.c", "glob-win32" ), ( "osdep/macosx_application.m", "cocoa" ), ( "osdep/macosx_events.m", "cocoa" ), ( "osdep/macosx_menubar.m", "cocoa" ), ( "osdep/macosx_touchbar.m", "macos-touchbar" ), - ( "osdep/semaphore_osx.c" ), - ( "osdep/subprocess.c" ), - ( subprocess_c ), + ( "osdep/mpv.rc", "win32-executable" ), ( "osdep/path-macosx.m", "cocoa" ), ( "osdep/path-unix.c"), - ( "osdep/path-win.c", "win32-desktop" ), ( "osdep/path-uwp.c", "uwp" ), - ( "osdep/glob-win.c", "glob-win32" ), - ( "osdep/w32_keyboard.c", "os-win32" ), + ( "osdep/path-win.c", "win32-desktop" ), + ( "osdep/semaphore_osx.c" ), + ( "osdep/subprocess.c" ), + ( subprocess_c ), ( "osdep/w32_keyboard.c", "os-cygwin" ), - ( "osdep/windows_utils.c", "os-win32" ), - ( "osdep/windows_utils.c", "os-cygwin" ), - ( "osdep/mpv.rc", "win32-executable" ), + ( "osdep/w32_keyboard.c", "os-win32" ), ( "osdep/win32/pthread.c", "win32-internal-pthreads"), - ( "osdep/android/posix-spawn.c", "android"), - ( "osdep/android/strnlen.c", "android"), + ( "osdep/windows_utils.c", "os-cygwin" ), + ( "osdep/windows_utils.c", "os-win32" ), ## tree_allocator "ta/ta.c", "ta/ta_talloc.c", "ta/ta_utils.c" -- cgit v1.2.3