Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump version to 0.16.0+ffmpeg.7.0 #125

Merged
merged 3 commits into from
Aug 25, 2024
Merged

Bump version to 0.16.0+ffmpeg.7.0 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73d2732
Update `bindgen` to `0.70`
ldm0 Aug 25, 2024
65f43c1
Don't import `vcpkg` on Windows by default
ldm0 Aug 25, 2024
c851583
Bump version to `0.16.0+ffmpeg.7.0`
ldm0 Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rusty_ffmpeg"
version = "0.15.0+ffmpeg.7.0"
version = "0.16.0+ffmpeg.7.0"
authors = ["ldm0 <[email protected]>"]
edition = "2021"
description = "A library that provides Rust bindings for FFmpeg"
Expand All @@ -25,21 +25,18 @@ doctest = false
libc = "0.2"

[build-dependencies]
bindgen = "0.69"
camino = "1.0.9"
bindgen = "0.70"
camino = "1.1"
once_cell = "1.12"
vcpkg = { version = "0.2", optional = true }

[target.'cfg(not(windows))'.build-dependencies]
pkg-config = "0.3"

[target.'cfg(windows)'.build-dependencies]
vcpkg = "0.2"

[features]
# linking system ffmpeg as fallback.
# Probe and link FFmpeg with pkg-config
link_system_ffmpeg = []
# link against vcpkg ffmpeg
# Probe and link FFmpeg with vcpkg
link_vcpkg_ffmpeg = ["vcpkg"]
# FFmpeg 5.* support
ffmpeg5 = []
Expand Down
9 changes: 4 additions & 5 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ fn static_linking(env_vars: &EnvVars) {
output_binding_path: &Path,
) -> Result<(), pkg_config::Error> {
// Probe libraries(enable emitting cargo metadata)
let include_paths = linking_with_pkg_config(&*LIBS)?;
let include_paths = pkg_config_linking::linking_with_pkg_config(&*LIBS)?;
if let Some(ffmpeg_binding_path) = env_vars.ffmpeg_binding_path.as_ref() {
use_prebuilt_binding(ffmpeg_binding_path, output_binding_path);
} else if let Some(ffmpeg_include_dir) = env_vars.ffmpeg_include_dir.as_ref() {
Expand All @@ -419,7 +419,6 @@ fn static_linking(env_vars: &EnvVars) {
}
Ok(())
}
use pkg_config_linking::*;
// Hint: set PKG_CONFIG_PATH to some placeholder value will let pkg_config probing system library.
if let Some(ffmpeg_pkg_config_path) = env_vars.ffmpeg_pkg_config_path.as_ref() {
if !Path::new(ffmpeg_pkg_config_path).exists() {
Expand Down Expand Up @@ -447,9 +446,9 @@ fn static_linking(env_vars: &EnvVars) {
panic!(
"
!!!!!!! rusty_ffmpeg: No linking method set!
Use FFMPEG_PKG_CONFIG_PATH or FFMPEG_LIBS_DIR if you have prebuilt FFmpeg libraries.
Enable `link_system_ffmpeg` feature if you want to link ffmpeg libraries install in system path.
Enable `link_vcpkg_ffmpeg` feature if you want to link ffmpeg provided by vcpkg.
Use `FFMPEG_PKG_CONFIG_PATH` or `FFMPEG_LIBS_DIR` if you have prebuilt FFmpeg libraries.
Enable `link_system_ffmpeg` feature if you want to link ffmpeg libraries installed in system path(which can be probed by pkg-config).
Enable `link_vcpkg_ffmpeg` feature if you want to link ffmpeg libraries installed by vcpkg.
"
);
#[cfg(any(feature = "link_system_ffmpeg", feature = "link_vcpkg_ffmpeg"))]
Expand Down
Loading
Loading