aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBe <be.0@gmx.com>2021-01-20 00:21:37 +0000
committerGitHub <noreply@github.com>2021-01-19 16:21:37 -0800
commitf1b73fb7fcbffc9b513a4b4a17c0bdced5db9db2 (patch)
tree1c10c1e0924cbe5baa167d4f2994fc4c36e72d95
parent2b78e19efafe5d8e3031ff79f3c0beb86013ee48 (diff)
downloadvcpkg-f1b73fb7fcbffc9b513a4b4a17c0bdced5db9db2.tar.gz
vcpkg-f1b73fb7fcbffc9b513a4b4a17c0bdced5db9db2.zip
[libopusenc] fix macOS and Linux build (#15671)
-rw-r--r--port_versions/baseline.json2
-rw-r--r--port_versions/l-/libopusenc.json5
-rw-r--r--ports/libopusenc/CMakeLists.txt4
-rw-r--r--ports/libopusenc/CONTROL6
-rw-r--r--ports/libopusenc/vcpkg.json11
5 files changed, 20 insertions, 8 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index 4050d5721..509fa9658 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -3178,7 +3178,7 @@
},
"libopusenc": {
"baseline": "0.2.1",
- "port-version": 0
+ "port-version": 1
},
"libosip2": {
"baseline": "5.1.0-4",
diff --git a/port_versions/l-/libopusenc.json b/port_versions/l-/libopusenc.json
index 9fbd47b56..e40c0de5b 100644
--- a/port_versions/l-/libopusenc.json
+++ b/port_versions/l-/libopusenc.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "132909a5cb3c33e038cf9728427910fce455591d",
+ "version-string": "0.2.1",
+ "port-version": 1
+ },
+ {
"git-tree": "7e66eafbd3552eda0c0243edb904fd8af36d370a",
"version-string": "0.2.1",
"port-version": 0
diff --git a/ports/libopusenc/CMakeLists.txt b/ports/libopusenc/CMakeLists.txt
index 4ab1a4e9d..442d19a6d 100644
--- a/ports/libopusenc/CMakeLists.txt
+++ b/ports/libopusenc/CMakeLists.txt
@@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 3.4)
project(libopusenc C)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4996 /wd4101 /wd4018")
+if(MSVC)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4996 /wd4101 /wd4018")
+endif()
find_path(OPUS_INCLUDE_DIR opus.h PATH_SUFFIXES opus)
find_library(OPUS_LIBRARY opus)
diff --git a/ports/libopusenc/CONTROL b/ports/libopusenc/CONTROL
deleted file mode 100644
index 7e52b1353..000000000
--- a/ports/libopusenc/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: libopusenc
-Version: 0.2.1
-Homepage: https://github.com/xiph/libopusenc
-Description: Library for encoding .opus audio files and live streams.
-Build-Depends: opus
-Supports: !uwp \ No newline at end of file
diff --git a/ports/libopusenc/vcpkg.json b/ports/libopusenc/vcpkg.json
new file mode 100644
index 000000000..0ce806c81
--- /dev/null
+++ b/ports/libopusenc/vcpkg.json
@@ -0,0 +1,11 @@
+{
+ "name": "libopusenc",
+ "version-string": "0.2.1",
+ "port-version": 1,
+ "description": "Library for encoding .opus audio files and live streams.",
+ "homepage": "https://github.com/xiph/libopusenc",
+ "supports": "!uwp",
+ "dependencies": [
+ "opus"
+ ]
+}