Revert "python/build/libs.py: remove flac, switch to Meson wrap"

This reverts commit 6ed4aff4d3.  The
Meson wrap is broken on non-x86, because it unconditionally includes
<cpuid.h> which is an x86 only header.

android/build.py

@@ -151,6 +151,7 @@ thirdparty_libs = [
     libmpdclient,
     libogg,
     opus,
+    flac,
     libid3tag,
     libmodplug,
     wildmidi,

meson.build

@@ -13,7 +13,6 @@ project(
     # If we build those libraries as Meson subproject, they shall be
     # linked statically into the MPD executable.
     'expat:default_library=static',
-    'flac:default_library=static',
     'fmt:default_library=static',
     'gtest:default_library=static',
     'sqlite3:default_library=static',
@@ -22,8 +21,6 @@ project(
     # Not interested in compiler warnings from subprojects.
     'expat:werror=false',
     'expat:warning_level=0',
-    'flac:werror=false',
-    'flac:warning_level=0',
     'fmt:warning_level=0',
     'gtest:warning_level=0',
     'sqlite3:warning_level=0',

python/build/libs.py

@@ -42,6 +42,18 @@ opus = AutotoolsProject(
     cppflags='-DOPUS_EXPORT=',
 )
 
+flac = AutotoolsProject(
+    'http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz',
+    '213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748',
+    'lib/libFLAC.a',
+    [
+        '--disable-shared', '--enable-static',
+        '--disable-xmms-plugin', '--disable-cpplibs',
+        '--disable-doxygen-docs',
+    ],
+    subdirs=['include', 'src/libFLAC'],
+)
+
 zlib = ZlibProject(
     'http://zlib.net/zlib-1.2.11.tar.xz',
     '4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066',

src/lib/xiph/meson.build

@@ -1,6 +1,4 @@
-libflac_dep = dependency('flac', version: '>= 1.2',
+libflac_dep = dependency('flac', version: '>= 1.2', required: get_option('flac'))
-                         fallback: ['flac', 'flac_dep'],
-                         required: get_option('flac'))
 libopus_dep = dependency('opus', required: get_option('opus'))
 
 if get_option('tremor').enabled()

subprojects/.gitignore

@@ -1,7 +1,6 @@
 /packagecache/
 
 /expat-*/
-/flac-*/
 /fmt-*/
 /googletest-*/
 /sqlite-*/

subprojects/flac.wrap

@@ -1,12 +0,0 @@
-[wrap-file]
-directory = flac-1.3.3
-source_url = https://github.com/xiph/flac/archive/refs/tags/1.3.3.tar.gz
-source_filename = 1.3.3.tar.gz
-source_hash = 668cdeab898a7dd43cf84739f7e1f3ed6b35ece2ef9968a5c7079fe9adfe1689
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/flac/1.3.3/1/get_zip
-patch_filename = flac-1.3.3-1-wrap.zip
-patch_hash = bcd79061d1d29f8871646a356eb15ee2b6bacdc960594f584dcd4f90d7e0d4dd
-
-[provide]
-flac = flac_dep
-

win32/build.py

@@ -94,6 +94,7 @@ thirdparty_libs = [
     libmpdclient,
     libogg,
     opus,
+    flac,
     zlib,
     libid3tag,
     liblame,