From 5579cf3289d7f6ebc613183ff6488d237a357a54 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 8 Sep 2022 02:22:01 +0200 Subject: [PATCH] Remove ancient unused check for FLAC/OGG support Our build-systems do not even have sndfile-info, and we use pkg-config now --- libs/ardour/wscript | 19 ------------------- testfile.flac | Bin 494 -> 0 bytes testfile.ogg | Bin 4433 -> 0 bytes 3 files changed, 19 deletions(-) delete mode 100644 testfile.flac delete mode 100644 testfile.ogg diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 65d2c4a10c..90289517c8 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -284,20 +284,6 @@ libardour_sources = [ 'worker.cc' ] -def flac_supported(): - cmd = subprocess.Popen ("sndfile-info testfile.flac", - stdout = subprocess.PIPE, - stderr = subprocess.STDOUT, shell = True) - out = cmd.communicate()[0].decode('utf-8') - return re.search ('unknown format', out) is None - -def ogg_supported(): - cmd = subprocess.Popen ("sndfile-info testfile.ogg", - stdout = subprocess.PIPE, - stderr = subprocess.STDOUT, shell = True) - out = cmd.communicate()[0].decode('utf-8') - return re.search ('unknown format', out) is None - def options(opt): autowaf.set_options(opt) @@ -366,11 +352,6 @@ def configure(conf): conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False) - if flac_supported(): - conf.define ('HAVE_FLAC', 1) - if ogg_supported(): - conf.define ('HAVE_OGG', 1) - conf.write_config_header('libardour-config.h', remove=False) # Boost headers diff --git a/testfile.flac b/testfile.flac deleted file mode 100644 index af7a7eca2051b5d4aef51935eef6e94e6dd97eab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmWNMv5ONy9EHcT(#AtX1PgkBbFaDI z+A9%s`S1N5v}OH#jL_m@dbO7`@F1tS3m<=wSYb+Z5Nkgt+@lRghvre3P|6^&O<#gt z#sL+C7R4-31SAjUk|$8eI8DDcmUde!ur$pe3ubfWnoz_SJz=sS zF^$QP<*Ziz-T_BSzPP#Ox`0TKiHNds=r(kS2gA}JqqX!vC6)>4Oj*Qb!L8H(!QRjb diff --git a/testfile.ogg b/testfile.ogg deleted file mode 100644 index afc5a7a823e01fca1b673df72143032753177556..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4433 zcmeGge^8T0c0Ul3AVq`-0g*{ClmvrAAb5nsn~x}(L;~dll%U*|A5jq7lSG_yQ)f~I z1PUC6KrtW#A&DkMrgB2Xo0~&hehA7Bk)qd`lWK)p=WaN?n|goUz5Nm>=XKhf>D+(a z*=%;-d;8w*`?34>OFMET1GynrX)p$?$K8m{-M5KQ;^eQj`NcX6aNFI3|DcpQiLVi9 zc;;%sGYJ^&_mH}8jQZCr#ofti3lL-%A1~UTrai(vR-C_|=Fe4dW1^#_(LalpVs?aw zlUOL*wVyytfQVDL!}{sQEQEX!dXq2oX*#SBT8&+T@>Zi9_lBcuT8%ZsoPs*>$V$VN z6mCLj9nuR}4c&{1qm$AjoQMW(r?faV{vwxAo4z1r-TcSv1#jD~+DhJ@6oxZjQ+vQh z5h>?YvMJo;SM#bk(3}m?j`1$GYrP^bb)NQ$8RMQwiFs;iN=!$*6I+Xjk09C&M@ zPc+fzO_Lx3NO0*aHrf8G9#*$#ez=lFW08miU5=K9jF$3~DgLNd#Go}ihQOvIB^uUB z_Ua^~xErsLfhda+tn{<;3ZpLv4{im;wIP4AqGP=zn;#VZZ%%1$q~ z7-}QO1;4u;GaY5*rDr{%1f;MpXF?`8Y!jF>WnBb zDz~sP$uo!!lB!nixbPxG#ahEH^QSg$nORe({uYw%7Y=nMCMqL#XI5s`fs=2kKPdbB zn+?!p?8u#s)68aR=1yuJ3}_C1d`dmw3K(bDJe)6E z6FE3U!lVt4<%V_NMoy=o;Zc0UR)vADHoRWma-_y&Ki~1xZuWX5a*Ap%w$@&(u3f5b z5Y)63*O(lG=40c%&#wPqU5%W*T0T^WoMbJ3P2>!TLv}$l^@&t3oO|3k0}4Hn9Jtm1 z2n{uQ@1xI=bSi3&ikqXNvNCsmf5ZTGPNJHXfMS~w3PR{hi|yWTeEjkor8P-KOvR@m z!-o={ws#+@JKMN*kK!-9jN88J`dg~n|6!$mQRRBYmoKfW!X49!SL|DB|NvUB+3S`Z{jUkBC21_aGy5;GE) zERZr3n@mdJCi(H@J7lHD5ov2=krEY|srvDfe&X2Y#8%|+3jdKG{i#3>o!_m7QC}$-qpq%$G7ny8!2izni zO*mJU8(58D4!B+1Fi}?Se6vPh4D+t{irh1uJuTf zFhn5k5HsP{r9S3n)wN~B4()!++tc}lU>yTDK8)s>eblk*BGDpF|ml0}9$Q%Q2G zg^E!|Sz9O%Ub8`I=UOOA=z;WG;^CLgtgPx;hn_>WS76M)EnVWvl;Xv9ogdH2f%L}C zF2FgC(IAFAIaPV96<`t8LZEAJq7ne+0}00oAh8%J*;nm4$UiOs34utbwrh{2M*C&b z>fVHg7O=TGB0${=gRQ(H0`k_Q28$D7N}O_Ozr4exV{I;211ln?DR@o0Q*h+~=IS8;T!<>@(WI@|Oj4inw zCw!vYcV#Z8pr`-!?m7d8_4I!hW~5?9*cs3>RYZ?`!zt(yFXc4(-Fz9E5e390;0s#| z>+K^s;5aNzU47J?Q8(#<$erUS?G~A?dh4R8_rqI(~Sr=(-ZEBHCv{K&r+r%g8#CxSr zGG(J2II>S8cw2?;t9KA$H zPU)+wix%S(5`RI;cJGlZQ&Qi61rYQtNg{&DbUsG$n8~CUyDkN<5DH!_&TEgnX8NN$ JK@iBx=idvtAA