diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-06-30 00:54:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 00:54:45 +0200 |
| commit | f96a4a9f6290b8e8c003d4a3a174feccbdedbcd9 (patch) | |
| tree | 434f81406ede44bea7fb4cc837c116c8c50d6ac8 | |
| parent | 637676b9a3404c0d4bd7f2e6790bc15598e8aad8 (diff) | |
| parent | 21ddd67079f8be49fb6b3b1c906b95885cb2f7a8 (diff) | |
Merge pull request #2866 from uklotzde/libebur128
libebur128: Enable dynamic linking on Debian/Ubuntu
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | build/debian/control | 1 | ||||
| -rw-r--r-- | cmake/modules/FindEbur128.cmake | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 701a087e60..a85ff30999 100644 --- a/.travis.yml +++ b/.travis.yml @@ -224,6 +224,7 @@ addons: packages: - libavformat-dev - libchromaprint-dev + - libebur128-dev - libfaad-dev - libflac-dev - libid3tag0-dev diff --git a/appveyor.yml b/appveyor.yml index 95eadc2fef..0cbf1e70fa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -63,6 +63,7 @@ for: libavformat-dev libavutil-dev libchromaprint-dev + libebur128-dev libflac-dev libid3tag0-dev liblilv-dev diff --git a/build/debian/control b/build/debian/control index 165f7aac28..2189d935f7 100644 --- a/build/debian/control +++ b/build/debian/control @@ -51,6 +51,7 @@ Build-Depends: debhelper (>= 9), liblilv-dev, libmodplug-dev, libmp3lame-dev, + libebur128-dev, # for running mixxx-test xvfb Standards-Version: 3.9.8 diff --git a/cmake/modules/FindEbur128.cmake b/cmake/modules/FindEbur128.cmake index 7f4c40c109..30d27d4141 100644 --- a/cmake/modules/FindEbur128.cmake +++ b/cmake/modules/FindEbur128.cmake @@ -45,7 +45,7 @@ The following cache variables may also be set: find_package(PkgConfig QUIET) if(PkgConfig_FOUND) - pkg_check_modules(PC_Ebur128 QUIET libebur128) + pkg_check_modules(PC_Ebur128 QUIET libebur128>=1.2.4) endif() find_path(Ebur128_INCLUDE_DIR |