Changes in / [0512fca:40bdc14]

Files:

• .circleci/config.yml (modified) (1 diff)
• .travis.yml (modified) (2 diffs)
• azure-pipelines.yml (modified) (1 diff)
• src/io/sink_vorbis.c (added)
• src/wscript_build (modified) (1 diff)
• tests/src/io/test-sink_vorbis.c (added)
• wscript (modified) (2 diffs)

.circleci/config.yml

@@ -3 +3 @@
   command: |
     sudo apt-get update
-    sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev
+    sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev libvorbis-dev
 
 pip-install: &pip-install

.travis.yml

@@ -58 +58 @@
     - libsndfile1-dev
     - libsamplerate-dev
+    - libvorbis-dev
     - libjack-dev
     - libasound2-dev
@@ -68 +69 @@
     - ffmpeg
     - libsndfile
+    - libvorbis
     - lcov
     #update: true

azure-pipelines.yml

@@ -30 +30 @@
       brew update
       brew install pkg-config gnupg
-      brew install sox ffmpeg libsndfile lcov
+      brew install sox ffmpeg libsndfile libvorbis lcov
     displayName: 'brew install'
   - script: |

src/wscript_build

@@ -12 +12 @@
 uselib += ['AVRESAMPLE']
 uselib += ['AVUTIL']
+uselib += ['VORBISENC']
 uselib += ['BLAS']
 

wscript

@@ -67 +67 @@
             help_str = 'compile with libavcodec (auto)',
             help_disable_str = 'disable libavcodec')
+    add_option_enable_disable(ctx, 'vorbis', default = None,
+            help_str = 'compile with libvorbis (auto)',
+            help_disable_str = 'disable libvorbis')
     add_option_enable_disable(ctx, 'samplerate', default = None,
             help_str = 'compile with samplerate (auto)',
@@ -429 +432 @@
                 ctx.define('HAVE_AVRESAMPLE', 1)
             ctx.define('HAVE_LIBAV', 1)
+
+    # check for vorbisenc
+    if (ctx.options.enable_vorbis != False):
+        ctx.check_cfg(package = 'vorbisenc',
+                args = '--cflags --libs',
+                uselib_store = 'VORBISENC',
+                mandatory = ctx.options.enable_vorbis)
 
     if (ctx.options.enable_wavread != False):