cd-discid: pick up rest of OSX-relevant patch for 1.4
cd-discid: pick up rest of OSX-relevant patch for 1.4

Fixes #46267

Closes #47880.

Signed-off-by: Andrew Janke <02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@apjanke.net>

OJFord/homebrew,retrography/homebrew,nandub/homebrew,muellermartin/homebrew,feelpp/homebrew,decors/homebrew,zchee/homebrew,Chilledheart/homebrew,tschoonj/homebrew,brunchboy/homebrew,apjanke/homebrew,yazuuchi/homebrew,keith/homebrew,sometimesfood/homebrew,pdxdan/homebrew,nandub/homebrew,slyphon/homebrew,kodabb/homebrew,alebcay/homebrew,hanxue/homebrew,elgertam/homebrew,lrascao/homebrew,Asuranceturix/homebrew,filcab/homebrew,getgauge/homebrew,recruit-tech/homebrew,feelpp/homebrew,zchee/homebrew,scorphus/homebrew,esamson/homebrew,jamer/homebrew,3van/homebrew,yazuuchi/homebrew,chadcatlett/homebrew,liamstask/homebrew,afh/homebrew,SuperNEMO-DBD/cadfaelbrew,gnubila-france/linuxbrew,kodabb/homebrew,elgertam/homebrew,treyharris/homebrew,bukzor/linuxbrew,BrewTestBot/homebrew,filcab/homebrew,skatsuta/homebrew,drbenmorgan/linuxbrew,tutumcloud/homebrew,deorth/homebrew,retrography/homebrew,reelsense/homebrew,redpen-cc/homebrew,3van/homebrew,influxdb/homebrew,cscetbon/homebrew,dgageot/homebrew,ralic/homebrew,dutchcoders/homebrew,johanhammar/homebrew,scorphus/homebrew,scpeters/homebrew,sometimesfood/homebrew,slyphon/homebrew,polishgeeks/homebrew,kevinastone/homebrew,MartinDelille/homebrew,hakamadare/homebrew,liamstask/homebrew,yazuuchi/homebrew,base10/homebrew,scpeters/homebrew,ryanfb/homebrew,jamer/homebrew,mobileoverlord/homebrew-1,mobileoverlord/homebrew-1,theeternalsw0rd/homebrew,adamliter/homebrew,royhodgman/homebrew,josa42/homebrew,bigbes/homebrew,kenips/homebrew,decors/homebrew,dutchcoders/homebrew,galaxy001/homebrew,iostat/homebrew2,gnubila-france/linuxbrew,johanhammar/homebrew,decors/homebrew,Red54/homebrew,slyphon/homebrew,quantumsteve/homebrew,osimola/homebrew,Linuxbrew/linuxbrew,ear/homebrew,drewwells/homebrew,marcwebbie/homebrew,booi/homebrew,Angeldude/linuxbrew,ilovezfs/homebrew,ebouaziz/linuxbrew,joshfriend/homebrew,alebcay/homebrew,ebouaziz/linuxbrew,miketheman/homebrew,utzig/homebrew,totalvoidness/homebrew,sometimesfood/homebrew,decors/homebrew,hanxue/homebrew,sometimesfood/homebrew,quantumsteve/homebrew,pcottle/homebrew,AlexejK/homebrew,ybott/homebrew,influxdb/homebrew,iandennismiller/homebrew,galaxy001/homebrew,sakra/homebrew,jarrettmeyer/homebrew,reelsense/linuxbrew,miketheman/homebrew,dongcarl/homebrew,SteveClement/homebrew,bigbes/homebrew,ablyler/homebrew,scorphus/homebrew,gawbul/homebrew,iandennismiller/homebrew,youtux/homebrew,base10/homebrew,menivaitsi/homebrew,dunn/homebrew,utzig/homebrew,royhodgman/homebrew,treyharris/homebrew,cprecioso/homebrew,ybott/homebrew,Homebrew/linuxbrew,ExtremeMan/homebrew,MoSal/homebrew,frodeaa/homebrew,benjaminfrank/homebrew,influxdata/homebrew,brunchboy/homebrew,zchee/homebrew,ralic/homebrew,nandub/homebrew,dgageot/homebrew,mactkg/homebrew,kenips/homebrew,TaylorMonacelli/homebrew,Red54/homebrew,dickeyxxx/homebrew,apjanke/homebrew,sakra/homebrew,totalvoidness/homebrew,georgschoelly/homebrew,ear/homebrew,mobileoverlord/homebrew-1,sakra/homebrew,Asuranceturix/homebrew,haihappen/homebrew,cprecioso/homebrew,haihappen/homebrew,3van/homebrew,frodeaa/homebrew,SteveClement/homebrew,ilovezfs/homebrew,kodabb/homebrew,hongkongkiwi/homebrew,mmizutani/homebrew,keith/homebrew,ilovezfs/homebrew,vigo/homebrew,ybott/homebrew,georgschoelly/homebrew,sjackman/linuxbrew,dplarson/homebrew,emcrisostomo/homebrew,3van/homebrew,scpeters/homebrew,teslamint/homebrew,DoomHammer/linuxbrew,hongkongkiwi/homebrew,benjaminfrank/homebrew,emcrisostomo/homebrew,quantumsteve/homebrew,lrascao/homebrew,Chilledheart/homebrew,iostat/homebrew2,yumitsu/homebrew,jarrettmeyer/homebrew,drewwells/homebrew,jamer/homebrew,gnubila-france/linuxbrew,afh/homebrew,dutchcoders/homebrew,alebcay/homebrew,BrewTestBot/homebrew,mactkg/homebrew,haihappen/homebrew,dongcarl/homebrew,vigo/homebrew,slyphon/homebrew,tutumcloud/homebrew,ExtremeMan/homebrew,knpwrs/homebrew,chadcatlett/homebrew,mkrapp/homebrew,jsjohnst/homebrew,treyharris/homebrew,menivaitsi/homebrew,ralic/homebrew,elgertam/homebrew,teslamint/homebrew,AlexejK/homebrew,kevinastone/homebrew,saketkc/linuxbrew,elyscape/homebrew,reelsense/linuxbrew,scorphus/homebrew,jsjohnst/homebrew,ear/homebrew,bukzor/linuxbrew,influxdb/homebrew,apjanke/homebrew,DoomHammer/linuxbrew,recruit-tech/homebrew,Asuranceturix/homebrew,MoSal/homebrew,liamstask/homebrew,dalanmiller/homebrew,pcottle/homebrew,dongcarl/homebrew,marcwebbie/homebrew,hanxue/homebrew,kodabb/homebrew,optikfluffel/homebrew,ybott/homebrew,hakamadare/homebrew,booi/homebrew,eighthave/homebrew,esamson/homebrew,muellermartin/homebrew,royhodgman/homebrew,MartinDelille/homebrew,michaKFromParis/homebrew-sparks,zchee/homebrew,deorth/homebrew,thinker0/homebrew,emcrisostomo/homebrew,danieroux/homebrew,dericed/homebrew,ryanfb/homebrew,eighthave/homebrew,iandennismiller/homebrew,ralic/homebrew,influxdb/homebrew,dickeyxxx/homebrew,drbenmorgan/linuxbrew,danieroux/homebrew,Chilledheart/homebrew,marcwebbie/homebrew,skinny-framework/homebrew,haihappen/homebrew,mkrapp/homebrew,yumitsu/homebrew,youtux/homebrew,Asuranceturix/homebrew,filcab/homebrew,polishgeeks/homebrew,cscetbon/homebrew,reelsense/homebrew,retrography/homebrew,johanhammar/homebrew,joshfriend/homebrew,base10/homebrew,ablyler/homebrew,alebcay/homebrew,gicmo/homebrew,johanhammar/homebrew,MoSal/homebrew,elyscape/homebrew,gicmo/homebrew,Linuxbrew/linuxbrew,dalanmiller/homebrew,totalvoidness/homebrew,mmizutani/homebrew,sferik/homebrew,yumitsu/homebrew,feelpp/homebrew,ExtremeMan/homebrew,hakamadare/homebrew,Homebrew/homebrew,jamer/homebrew,tutumcloud/homebrew,theeternalsw0rd/homebrew,dericed/homebrew,skatsuta/homebrew,base10/homebrew,princeofdarkness76/homebrew,teslamint/homebrew,keith/homebrew,mmizutani/homebrew,drewwells/homebrew,filcab/homebrew,TaylorMonacelli/homebrew,ExtremeMan/homebrew,recruit-tech/homebrew,gawbul/homebrew,joshfriend/homebrew,Linuxbrew/linuxbrew,redpen-cc/homebrew,menivaitsi/homebrew,Red54/homebrew,polishgeeks/homebrew,ryanfb/homebrew,dgageot/homebrew,skinny-framework/homebrew,mkrapp/homebrew,MartinDelille/homebrew,bigbes/homebrew,OJFord/homebrew,skatsuta/homebrew,hongkongkiwi/homebrew,dplarson/homebrew,dunn/homebrew,princeofdarkness76/homebrew,knpwrs/homebrew,kenips/homebrew,ento/homebrew,DoomHammer/linuxbrew,royhodgman/homebrew,miketheman/homebrew,kevinastone/homebrew,tutumcloud/homebrew,Homebrew/linuxbrew,cprecioso/homebrew,dplarson/homebrew,mmizutani/homebrew,ebouaziz/linuxbrew,gicmo/homebrew,dplarson/homebrew,totalvoidness/homebrew,reelsense/homebrew,skinny-framework/homebrew,dutchcoders/homebrew,sferik/homebrew,princeofdarkness76/homebrew,dunn/homebrew,drewwells/homebrew,tschoonj/homebrew,iostat/homebrew2,osimola/homebrew,LinusU/homebrew,LinusU/homebrew,afh/homebrew,skinny-framework/homebrew,Angeldude/linuxbrew,knpwrs/homebrew,jsjohnst/homebrew,lrascao/homebrew,ento/homebrew,iandennismiller/homebrew,ento/homebrew,sakra/homebrew,scpeters/homebrew,jsjohnst/homebrew,liamstask/homebrew,cosmo0920/homebrew,ilovezfs/homebrew,DoomHammer/linuxbrew,getgauge/homebrew,skatsuta/homebrew,elgertam/homebrew,retrography/homebrew,elyscape/homebrew,BrewTestBot/homebrew,treyharris/homebrew,gicmo/homebrew,OJFord/homebrew,saketkc/linuxbrew,michaKFromParis/homebrew-sparks,princeofdarkness76/homebrew,Homebrew/homebrew,vigo/homebrew,mobileoverlord/homebrew-1,optikfluffel/homebrew,MartinDelille/homebrew,mactkg/homebrew,drbenmorgan/linuxbrew,jarrettmeyer/homebrew,BrewTestBot/homebrew,galaxy001/homebrew,esamson/homebrew,georgschoelly/homebrew,frodeaa/homebrew,SteveClement/homebrew,adamliter/homebrew,utzig/homebrew,nandub/homebrew,youtux/homebrew,danieroux/homebrew,theeternalsw0rd/homebrew,vigo/homebrew,adamliter/homebrew,saketkc/linuxbrew,dalanmiller/homebrew,ryanfb/homebrew,tschoonj/homebrew,mactkg/homebrew,TaylorMonacelli/homebrew,muellermartin/homebrew,reelsense/homebrew,Asuranceturix/homebrew,pcottle/homebrew,theeternalsw0rd/homebrew,cosmo0920/homebrew,dericed/homebrew,quantumsteve/homebrew,menivaitsi/homebrew,MoSal/homebrew,josa42/homebrew,georgschoelly/homebrew,Homebrew/linuxbrew,sferik/homebrew,jarrettmeyer/homebrew,adamliter/homebrew,sferik/homebrew,redpen-cc/homebrew,iostat/homebrew2,thinker0/homebrew,Homebrew/linuxbrew,deorth/homebrew,dgageot/homebrew,emcrisostomo/homebrew,pdxdan/homebrew,knpwrs/homebrew,cscetbon/homebrew,getgauge/homebrew,danieroux/homebrew,elyscape/homebrew,SteveClement/homebrew,booi/homebrew,Homebrew/homebrew,josa42/homebrew,dickeyxxx/homebrew,bukzor/linuxbrew,afh/homebrew,bukzor/linuxbrew,TaylorMonacelli/homebrew,benjaminfrank/homebrew,thinker0/homebrew,optikfluffel/homebrew,dickeyxxx/homebrew,Linuxbrew/linuxbrew,AlexejK/homebrew,miketheman/homebrew,kenips/homebrew,michaKFromParis/homebrew-sparks,marcwebbie/homebrew,brunchboy/homebrew,AlexejK/homebrew,cosmo0920/homebrew,hakamadare/homebrew,muellermartin/homebrew,getgauge/homebrew,esamson/homebrew,kevinastone/homebrew,hongkongkiwi/homebrew,influxdata/homebrew,thinker0/homebrew,Angeldude/linuxbrew,gnubila-france/linuxbrew,SteveClement/homebrew,SuperNEMO-DBD/cadfaelbrew,benjaminfrank/homebrew,LinusU/homebrew,SuperNEMO-DBD/cadfaelbrew,ablyler/homebrew,brunchboy/homebrew,feelpp/homebrew,youtux/homebrew,apjanke/homebrew,dalanmiller/homebrew,dunn/homebrew,ear/homebrew,saketkc/linuxbrew,sjackman/linuxbrew,eighthave/homebrew,recruit-tech/homebrew,Homebrew/homebrew,teslamint/homebrew,ablyler/homebrew,bigbes/homebrew,utzig/homebrew,polishgeeks/homebrew,dongcarl/homebrew,OJFord/homebrew,eighthave/homebrew,keith/homebrew,optikfluffel/homebrew,gawbul/homebrew,Chilledheart/homebrew,influxdata/homebrew,SuperNEMO-DBD/cadfaelbrew,pcottle/homebrew,cosmo0920/homebrew,osimola/homebrew,galaxy001/homebrew,chadcatlett/homebrew,redpen-cc/homebrew,influxdata/homebrew,hanxue/homebrew,dericed/homebrew,reelsense/linuxbrew,ebouaziz/linuxbrew,sjackman/linuxbrew,pcottle/homebrew,pdxdan/homebrew,Angeldude/linuxbrew,osimola/homebrew,sjackman/linuxbrew,frodeaa/homebrew,tschoonj/homebrew,pdxdan/homebrew,drbenmorgan/linuxbrew,yazuuchi/homebrew,LinusU/homebrew,Red54/homebrew,reelsense/linuxbrew,cprecioso/homebrew,ento/homebrew