search

reticulatedpines / magiclantern_simplified

A Git based version of Magic Lantern, for those unwilling or unable to work using Mercurial. The vast majority of branches have been removed, with those thought to be important brought in individually and merged.
GNU General Public License v2.0
147 stars 51 forks source link

Fix race condition in makefiles, unify rgb_vram_info handling for (non)compositor use, fix CONFIG_ADDITIONAL_VERSION #9

Closed kitor closed 3 years ago

kitor commented 3 years ago

9392bc8 contains a fix for race condition that is visible for me in WSL

magiclantern.lds: $(SRC_DIR)/magiclantern.lds.S
    $(call build,CPP,$(CPP) $(CFLAGS) $< | $(GREP) -v '^#' > $@)

This target was simultaneously creating magiclantern.lds and redirecting grep output into the same file. On WSL it resulted in damaged file content 90% of time. Workaround applied - grep redirected to temporary file, moved into place after first command succeeded.

b08d98f - as discussed previously, I unified rgb_vram_info handling between FEATURE_VRAM_RGBA and FEATURE_COMPOSITOR_XCM. With this change rgb_vram_info is always a pointer controlled by us, by default initialized to Canon GUI RGBA layer.

6f78faf seems to fix CONFIG_ADDITIONAL_VERSION. I moved it from preinit task into our main task - it's in the same place where -ml-off is set if SET is held at startup.

140de0e simplified minimal/hello-world and digic-explorer drawing routines

[e] 6f78faf reverted as per Discord discussion. This needs a better solution.