Compile and copy all vorbis libraries, fixes #7879 (#9849)

Vorbis actually consists of three libraries: vorbis.a, vorbisfile.a and vorbisenc.a.

This pull request modifies the vorbis port to build and cache these files.

Fixes #7879

Author: Oipo

AUTHORS

@@ -437,6 +437,7 @@ a license to everyone to use it as detailed in LICENSE.)
 * Gernot Lassnig <[email protected]>
 * Christian Boos <[email protected]>
 * Erik Scholz <[email protected]>
+* Michael de Lang <[email protected]>
 * Gergely Nagy <[email protected]>
 * Jan Habermann <[email protected]>
 * John Granström <[email protected]>

embuilder.py

@@ -240,7 +240,7 @@ def is_flag(arg):
     elif what == 'sdl2-net':
       build_port('sdl2-net', libname('libSDL2_net'), ['-s', 'USE_SDL=2', '-s', 'USE_SDL_NET=2'])
     elif what == 'sdl2-mixer':
-      build_port('sdl2-mixer', 'libSDL2_mixer.a', ['-s', 'USE_SDL=2', '-s', 'USE_SDL_MIXER=2', '-s', 'USE_VORBIS=1'])
+      build_port('sdl2-mixer', libname('libSDL2_mixer'), ['-s', 'USE_SDL=2', '-s', 'USE_SDL_MIXER=2', '-s', 'USE_VORBIS=1'])
     elif what == 'freetype':
       build_port('freetype', 'libfreetype.a', ['-s', 'USE_FREETYPE=1'])
     elif what == 'harfbuzz':

tests/sdl2_mixer.c

@@ -37,6 +37,9 @@ int main(int argc, char* argv[]){
         return -1;
     if (Mix_PlayChannel(-1, wave, 0) == -1)
         return -1;
+    // Ensure that the test gives an error if OGG support was not compiled into SDL2_Mixer. See #7879
+    if (Mix_Init(MIX_INIT_OGG) == -1)
+        return -1;
     printf("Starting sound play loop\n");
     emscripten_set_main_loop(sound_loop_then_quit, 0, 1);
     return 0;

tools/ports/boost_headers.py

@@ -35,7 +35,7 @@ def create():
     commands = []
     o_s = []
     o = os.path.join(ports.get_build_dir(), 'boost_headers', 'dummy.cpp.o')
-    command = [shared.PYTHON, shared.EMCC, os.path.join(ports.get_build_dir(), 'boost_headers', 'dummy.cpp'), '-o', o]
+    command = [shared.PYTHON, shared.EMCC, '-c', os.path.join(ports.get_build_dir(), 'boost_headers', 'dummy.cpp'), '-o', o]
     commands.append(command)
     ports.run_commands(commands)
     final = os.path.join(ports.get_build_dir(), 'boost_headers', libname)

tools/ports/bzip2.py

@@ -37,7 +37,7 @@ def create():
     for src in srcs:
       o = os.path.join(ports.get_build_dir(), 'bzip2', src + '.o')
       shared.safe_ensure_dirs(os.path.dirname(o))
-      commands.append([shared.PYTHON, shared.EMCC, os.path.join(dest_path, src), '-O2', '-o', o, '-I' + dest_path, '-w', ])
+      commands.append([shared.PYTHON, shared.EMCC, '-c', os.path.join(dest_path, src), '-O2', '-o', o, '-I' + dest_path, '-w', ])
       o_s.append(o)
     ports.run_commands(commands)
 

tools/ports/cocos2d.py

@@ -41,6 +41,7 @@ def create():
       shared.safe_ensure_dirs(os.path.dirname(o))
       command = [shared.PYTHON,
                  shared.EMCC,
+                 '-c',
                  os.path.join(cocos2dx_root, 'proj.emscripten', src),
                  '-Wno-overloaded-virtual',
                  '-Wno-deprecated-declarations',

tools/ports/regal.py

@@ -120,7 +120,7 @@ def create():
       c = os.path.join(dest_path_src, src)
       o = os.path.join(dest_path_src, src + '.o')
       shared.safe_ensure_dirs(os.path.dirname(o))
-      commands.append([shared.PYTHON, shared.EMCC, c,
+      commands.append([shared.PYTHON, shared.EMCC, '-c', c,
                        # specify the defined symbols as the Regal Makefiles does for Emscripten+Release
                        # the define logic for other symbols will be handled automatically by Regal headers (SYS_EMSCRIPTEN, SYS_EGL, SYS_ES2, etc.)
                        '-DNDEBUG',

tools/ports/sdl2_image.py

@@ -49,7 +49,7 @@ def create():
 
     for src in srcs:
       o = os.path.join(ports.get_build_dir(), 'sdl2_image', src + '.o')
-      commands.append([shared.PYTHON, shared.EMCC, os.path.join(ports.get_dir(), 'sdl2_image', 'SDL2_image-' + TAG, src), '-O2', '-s', 'USE_SDL=2', '-o', o, '-w'] + defs)
+      commands.append([shared.PYTHON, shared.EMCC, '-c', os.path.join(ports.get_dir(), 'sdl2_image', 'SDL2_image-' + TAG, src), '-O2', '-s', 'USE_SDL=2', '-o', o, '-w'] + defs)
       o_s.append(o)
     shared.safe_ensure_dirs(os.path.dirname(o_s[0]))
     ports.run_commands(commands)

tools/ports/sdl2_mixer.py

@@ -1,6 +1,11 @@
+# Copyright 2016 The Emscripten Authors.  All rights reserved.
+# Emscripten is available under two separate licenses, the MIT license and the
+# University of Illinois/NCSA Open Source License.  Both these licenses can be
+# found in the LICENSE file.
+
 import os
 import shutil
-import stat
+import logging
 
 TAG = 'release-2.0.1'
 HASH = '81fac757bd058adcb3eb5b2cc46addeaa44cee2cd4db653dad5d9666bdc0385cdc21bf5b72872e6dd6dd8eb65812a46d7752298827d6c61ad5ce2b6c963f7ed0'
@@ -13,29 +18,28 @@ def get(ports, settings, shared):
   sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
   assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_mixer'
   ports.fetch_project('sdl2_mixer', 'https://github.com/emscripten-ports/SDL2_mixer/archive/' + TAG + '.zip', 'SDL2_mixer-' + TAG, sha512hash=HASH)
+  libname = ports.get_lib_name('libSDL2_mixer')
 
   def create():
-    cwd = os.getcwd()
-    commonflags = ['--disable-shared', '--disable-music-cmd', '--enable-sdltest', '--disable-smpegtest']
-    formatflags = ['--enable-music-wave', '--disable-music-mod', '--disable-music-midi', '--enable-music-ogg', '--disable-music-ogg-shared', '--disable-music-flac', '--disable-music-mp3']
-    configure = os.path.join(ports.get_dir(), 'sdl2_mixer', 'SDL2_mixer-' + TAG, 'configure')
-    build_dir = os.path.join(ports.get_build_dir(), 'sdl2_mixer')
-    dist_dir = os.path.join(ports.get_build_dir(), 'sdl2_mixer', 'dist')
-    out = os.path.join(dist_dir, 'lib', 'libSDL2_mixer.a')
-    final = os.path.join(ports.get_build_dir(), 'sdl2_mixer', 'libSDL2_mixer.a')
-    shared.safe_ensure_dirs(build_dir)
-
-    try:
-      os.chdir(build_dir)
-      os.chmod(configure, os.stat(configure).st_mode | stat.S_IEXEC)
-      shared.run_process([shared.PYTHON, shared.EMCONFIGURE, configure, '--prefix=' + dist_dir] + formatflags + commonflags + ['CFLAGS=-s USE_VORBIS=1'])
-      shared.run_process([shared.PYTHON, shared.EMMAKE, 'make', 'install'])
-      shutil.copyfile(out, final)
-    finally:
-      os.chdir(cwd)
+    logging.info('building port: sdl2_mixer')
+
+    source_path = os.path.join(ports.get_dir(), 'sdl2_mixer', 'SDL2_mixer-' + TAG)
+    dest_path = os.path.join(shared.Cache.get_path('ports-builds'), 'sdl2_mixer')
+
+    shutil.rmtree(dest_path, ignore_errors=True)
+    shutil.copytree(source_path, dest_path)
+    # necessary for proper including of SDL_mixer.h
+    os.symlink(dest_path, os.path.join(dest_path, 'SDL2'))
+
+    final = os.path.join(dest_path, libname)
+    ports.build_port(dest_path, final, [], ['-DOGG_MUSIC', '-s', 'USE_VORBIS=1'],
+                     ['dynamic_flac', 'dynamic_fluidsynth', 'dynamic_mod', 'dynamic_modplug', 'dynamic_mp3',
+                      'dynamic_ogg', 'fluidsynth', 'load_mp3', 'music_cmd', 'music_flac', 'music_mad', 'music_mod',
+                      'music_modplug', 'playmus.c', 'playwave.c'],
+                     ['external', 'native_midi', 'timidity'])
     return final
 
-  return [shared.Cache.get('libSDL2_mixer.a', create, what='port')]
+  return [shared.Cache.get(libname, create, what='port')]
 
 
 def clear(ports, shared):
@@ -51,7 +55,7 @@ def process_dependencies(settings):
 def process_args(ports, args, settings, shared):
   if settings.USE_SDL_MIXER == 2:
     get(ports, settings, shared)
-    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'sdl2_mixer', 'dist', 'include')]
+    args += ['-Xclang', '-isystem' + os.path.join(shared.Cache.get_path('ports-builds'), 'sdl2_mixer')]
   return args
 
 

tools/ports/sdl2_net.py

@@ -7,7 +7,6 @@
 import shutil
 import logging
 
-
 TAG = 'version_2'
 HASH = '317b22ad9b6b2f7b40fac7b7c426da2fa2da1803bbe58d480631f1e5b190d730763f2768c77c72affa806c69a1e703f401b15a1be3ec611cd259950d5ebc3711'
 
@@ -34,7 +33,7 @@ def create():
     o_s = []
     for src in srcs:
       o = os.path.join(ports.get_build_dir(), 'sdl2_net', src + '.o')
-      commands.append([shared.PYTHON, shared.EMCC, os.path.join(ports.get_dir(), 'sdl2_net', 'SDL2_net-' + TAG, src), '-O2', '-s', 'USE_SDL=2', '-o', o, '-w'])
+      commands.append([shared.PYTHON, shared.EMCC, '-c', os.path.join(ports.get_dir(), 'sdl2_net', 'SDL2_net-' + TAG, src), '-O2', '-s', 'USE_SDL=2', '-o', o, '-w'])
       o_s.append(o)
     shared.safe_ensure_dirs(os.path.dirname(o_s[0]))
     ports.run_commands(commands)