Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix build script and versioning

Browse Source
This commit is contained in:
Josh Holmer 2023-01-23 10:11:43 -05:00
parent 028bdb490c
commit e3d9480221
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg-sys-the-third/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "ffmpeg-sys-the-third" name = "ffmpeg-sys-the-third"
version = "5.1.1" version = "1.0.0+ffmpeg-5.1.2"
build = "build.rs" build = "build.rs"
links = "ffmpeg" links = "ffmpeg"

27
ffmpeg-sys-the-third/build.rs
View File

@ -128,17 +128,16 @@ impl ParseCallbacks for Callbacks {
} }
} }
fn version() -> String { fn ffmpeg_version() -> String {
let major: u8 = env::var("CARGO_PKG_VERSION_MAJOR") env!("CARGO_PKG_VERSION")
.split('+')
.nth(1)
.unwrap() .unwrap()
.parse() .replace("ffmpeg-", "")
.unwrap(); }
let minor: u8 = env::var("CARGO_PKG_VERSION_MINOR")
.unwrap()
.parse()
.unwrap();
format!("{}.{}", major, minor) fn ffmpeg_major_version() -> u32 {
ffmpeg_version().split('.').next().unwrap().parse().unwrap()
} }
fn output() -> PathBuf { fn output() -> PathBuf {
@ -146,7 +145,7 @@ fn output() -> PathBuf {
} }
fn source() -> PathBuf { fn source() -> PathBuf {
output().join(format!("ffmpeg-{}", version())) output().join(format!("ffmpeg-{}", ffmpeg_version()))
} }
fn search() -> PathBuf { fn search() -> PathBuf {
@ -159,14 +158,14 @@ fn search() -> PathBuf {
fn fetch() -> io::Result<()> { fn fetch() -> io::Result<()> {
let output_base_path = output(); let output_base_path = output();
let clone_dest_dir = format!("ffmpeg-{}", version()); let clone_dest_dir = format!("ffmpeg-{}", ffmpeg_version());
let _ = std::fs::remove_dir_all(output_base_path.join(&clone_dest_dir)); let _ = std::fs::remove_dir_all(output_base_path.join(&clone_dest_dir));
let status = Command::new("git") let status = Command::new("git")
.current_dir(&output_base_path) .current_dir(&output_base_path)
.arg("clone") .arg("clone")
.arg("--depth=1") .arg("--depth=1")
.arg("-b") .arg("-b")
.arg(format!("release/{}", version())) .arg(format!("release/{}", ffmpeg_version()))
.arg("https://github.com/FFmpeg/FFmpeg") .arg("https://github.com/FFmpeg/FFmpeg")
.arg(&clone_dest_dir) .arg(&clone_dest_dir)
.status()?; .status()?;
@ -265,7 +264,7 @@ fn build() -> io::Result<()> {
// the binary using ffmpeg-sys cannot be redistributed // the binary using ffmpeg-sys cannot be redistributed
switch(&mut configure, "BUILD_LICENSE_NONFREE", "nonfree"); switch(&mut configure, "BUILD_LICENSE_NONFREE", "nonfree");
let ffmpeg_major_version: u32 = env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(); let ffmpeg_major_version: u32 = ffmpeg_major_version();
// configure building libraries based on features // configure building libraries based on features
for lib in LIBRARIES for lib in LIBRARIES
@ -641,7 +640,7 @@ fn link_to_libraries(statik: bool) {
fn main() { fn main() {
let statik = env::var("CARGO_FEATURE_STATIC").is_ok(); let statik = env::var("CARGO_FEATURE_STATIC").is_ok();
let ffmpeg_major_version: u32 = env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(); let ffmpeg_major_version: u32 = ffmpeg_major_version();
let include_paths: Vec<PathBuf> = if env::var("CARGO_FEATURE_BUILD").is_ok() { let include_paths: Vec<PathBuf> = if env::var("CARGO_FEATURE_BUILD").is_ok() {
println!( println!(