File fix-vendor.patch of Package gyroflow
--- vendor/ffmpeg-sys-next-7.0.0/build.rs.orig 2024-05-13 13:30:31.316139841 +0200
+++ vendor/ffmpeg-sys-next-7.0.0/build.rs 2024-05-13 13:31:43.521025397 +0200
@@ -684,12 +684,12 @@
// Use prebuilt library
else if let Ok(ffmpeg_dir) = env::var("FFMPEG_DIR") {
let ffmpeg_dir = PathBuf::from(ffmpeg_dir);
- if ffmpeg_dir.join("lib/amd64").exists()
+ if ffmpeg_dir.join("lib64").exists()
&& env::var("CARGO_CFG_TARGET_ARCH").as_deref() == Ok("x86_64")
{
println!(
"cargo:rustc-link-search=native={}",
- ffmpeg_dir.join("lib/amd64").to_string_lossy()
+ ffmpeg_dir.join("lib64").to_string_lossy()
);
} else if ffmpeg_dir.join("lib/armhf").exists()
&& env::var("CARGO_CFG_TARGET_ARCH").as_deref() == Ok("arm")
@@ -712,7 +712,7 @@
);
}
link_to_libraries(statik);
- vec![ffmpeg_dir.join("include")]
+ vec![ffmpeg_dir.join("include/ffmpeg")]
} else if let Some(paths) = try_vcpkg(statik) {
// vcpkg doesn't detect the "system" dependencies
if statik {
--- vendor/ffmpeg-sys-next-7.0.0/.cargo-checksum.json.orig 2024-05-13 13:33:06.069467963 +0200
+++ vendor/ffmpeg-sys-next-7.0.0/.cargo-checksum.json 2024-05-13 13:33:19.706428445 +0200
@@ -1 +1 @@
-{"files":{"Cargo.toml":"59cfabf8634c210ef94e9063817f01712f056049b20deec544806617e97b8ba3","README.md":"ceff249ee9fd20f4928399296b72a3e8d2becb4e53fea9f92e6761d209cdf897","build.rs":"49db1ce8ab975d70632cff458b265d508370324f54d11ddedbe9c53f2162dcd6","channel_layout_fixed.h":"92fcdb293bcedb128f7d0593fa2e6cd96ce001831139a7dd6ddb4661d1c7c0cf","src/avutil/error.rs":"ef650ef21d031358256be0f86e4442a23d9262d6dcc80a7afc2eb98b4f7c9f6f","src/avutil/macros.rs":"c04e7c69c64e958f4fb15d4419de54abc0430e968a3a339a969be4bfd640c531","src/avutil/mod.rs":"2f8a079b50ccc7a95c1a3547f49f54498644c6c35c57fbeb7e1d5b5c459109ac","src/avutil/pixfmt.rs":"87699d67104c9899669f41e7d2512f4f3b65d0262e8e94db01a855407d6c8c77","src/avutil/rational.rs":"02978ec0cc6fa14572e6e91cab59fc2d1b92abedd7f74aa245875fee3bcecd39","src/avutil/util.rs":"af223ba3a223f526372945739151e36261ed35a682657912227418014a8ca9dd","src/lib.rs":"fbf49df49257d9a4998c98b74910741771e9f1bd17ef030ae90225ee5cb900d4"},"package":"972a460dd8e901b737ce0482bf71a837e1751e3dd7c8f8b0a4ead808e7f174a5"}
\ Kein Zeilenumbruch am Dateiende.
+{"files":{"Cargo.toml":"59cfabf8634c210ef94e9063817f01712f056049b20deec544806617e97b8ba3","README.md":"ceff249ee9fd20f4928399296b72a3e8d2becb4e53fea9f92e6761d209cdf897","build.rs":"41ab07e41bdaac65e22ecfa8c8343f0daf54b5357f25621045330ba74b497ebd","channel_layout_fixed.h":"92fcdb293bcedb128f7d0593fa2e6cd96ce001831139a7dd6ddb4661d1c7c0cf","src/avutil/error.rs":"ef650ef21d031358256be0f86e4442a23d9262d6dcc80a7afc2eb98b4f7c9f6f","src/avutil/macros.rs":"c04e7c69c64e958f4fb15d4419de54abc0430e968a3a339a969be4bfd640c531","src/avutil/mod.rs":"2f8a079b50ccc7a95c1a3547f49f54498644c6c35c57fbeb7e1d5b5c459109ac","src/avutil/pixfmt.rs":"87699d67104c9899669f41e7d2512f4f3b65d0262e8e94db01a855407d6c8c77","src/avutil/rational.rs":"02978ec0cc6fa14572e6e91cab59fc2d1b92abedd7f74aa245875fee3bcecd39","src/avutil/util.rs":"af223ba3a223f526372945739151e36261ed35a682657912227418014a8ca9dd","src/lib.rs":"fbf49df49257d9a4998c98b74910741771e9f1bd17ef030ae90225ee5cb900d4"},"package":"972a460dd8e901b737ce0482bf71a837e1751e3dd7c8f8b0a4ead808e7f174a5"}
--- vendor/qml-video-rs-0.1.0/build.rs.orig 2024-05-13 13:34:24.397822213 +0200
+++ vendor/qml-video-rs-0.1.0/build.rs 2024-05-13 13:36:31.887235625 +0200
@@ -117,23 +117,7 @@
}
let out_dir = env::var("OUT_DIR").unwrap();
if !Path::new(&format!("{}/mdk-sdk/{}", out_dir, check)).exists() {
- let ext = if url.contains(".tar.xz") { ".tar.xz" } else { ".7z" };
- {
- let mut reader = ureq::get(url).call().map_err(|_| std::io::ErrorKind::Other)?.into_reader();
- let mut file = File::create(format!("{}/mdk-sdk{}", out_dir, ext))?;
- std::io::copy(&mut reader, &mut file)?;
- }
- Command::new("7z").current_dir(&out_dir).args(&["x", "-y", &format!("mdk-sdk{}", ext)]).status()?;
- std::fs::remove_file(format!("{}/mdk-sdk{}", out_dir, ext))?;
- if ext == ".tar.xz" {
- let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
- if target_os == "macos" || target_os == "ios" || target_os == "linux" {
- Command::new("tar").current_dir(&out_dir).args(&["-xf", "mdk-sdk.tar"]).status()?;
- } else {
- Command::new("7z").current_dir(&out_dir).args(&["x", "-y", "mdk-sdk.tar"]).status()?;
- }
- std::fs::remove_file(format!("{}/mdk-sdk.tar", out_dir))?;
- }
+ Command::new("tar").current_dir(&out_dir).args(&["-xf", "/home/abuild/rpmbuild/SOURCES/mdk-sdk-linux.tar.xz"]).status()?;
}
Ok(format!("{}/mdk-sdk/", out_dir))
--- vendor/qml-video-rs-0.1.0/.cargo-checksum.json.orig 2024-05-13 13:37:12.374774592 +0200
+++ vendor/qml-video-rs-0.1.0/.cargo-checksum.json 2024-05-13 13:37:25.291719553 +0200
@@ -1 +1 @@
-{"files":{"Cargo.toml":"56d99e94565b9d3fc8bd615d9a9d5af95200d04ed13d636b79160f8263fdaccc","LICENSE":"a3acfcc937b02ea81c4ae3985ac23355389a578fd04863a8e955dd99360be4d4","README.md":"045f618c7e6d25b068d3855cbfbc2296aa30416eda3798962f3a21283ab00742","build.rs":"441752fa53ca5d725718156c57ad02d9d0c8b5a853ca537499625a9155ea8c52","src/cpp/MDKPlayer.cpp":"f88bc6fba04bd06c8ab602b37a94f78b142ede4542a84d2158dbfcfc0f2b2441","src/cpp/MDKPlayer.h":"7f5388ec3f1e565f4069cb0b66f8d74af22d1ea344356dec3717ab7127e2ab3c","src/cpp/VideoTextureNode.cpp":"b9c66dfbc76d13e0f52ad52d1ef2d69ebe7e789065d16fc3de4eb66b9a445576","src/cpp/VideoTextureNode.h":"a70380f29a0e7a7267357aebb5e0165172b8eddd244a48e8af1dfbf23ca14796","src/lib.rs":"e64f758bbbeef2463041b28240f3553b2cdf67245ecd4ff28d9a41caf35ab451","src/video_item.rs":"d7e628980cf8a25af90b4b71ed416f7a4788e885a9e48db8499dc682c55c4548","src/video_player.rs":"91fdca11b4a7b3c50e7a42bd79d9788ea2494bbc052fe874e217cedaa8679165"},"package":null}
\ Kein Zeilenumbruch am Dateiende.
+{"files":{"Cargo.toml":"56d99e94565b9d3fc8bd615d9a9d5af95200d04ed13d636b79160f8263fdaccc","LICENSE":"a3acfcc937b02ea81c4ae3985ac23355389a578fd04863a8e955dd99360be4d4","README.md":"045f618c7e6d25b068d3855cbfbc2296aa30416eda3798962f3a21283ab00742","build.rs":"ecb1bcbe9692dddefd44080a6ac8c5cdf8e6ef104463fd5614be219a531d16a7","src/cpp/MDKPlayer.cpp":"f88bc6fba04bd06c8ab602b37a94f78b142ede4542a84d2158dbfcfc0f2b2441","src/cpp/MDKPlayer.h":"7f5388ec3f1e565f4069cb0b66f8d74af22d1ea344356dec3717ab7127e2ab3c","src/cpp/VideoTextureNode.cpp":"b9c66dfbc76d13e0f52ad52d1ef2d69ebe7e789065d16fc3de4eb66b9a445576","src/cpp/VideoTextureNode.h":"a70380f29a0e7a7267357aebb5e0165172b8eddd244a48e8af1dfbf23ca14796","src/lib.rs":"e64f758bbbeef2463041b28240f3553b2cdf67245ecd4ff28d9a41caf35ab451","src/video_item.rs":"d7e628980cf8a25af90b4b71ed416f7a4788e885a9e48db8499dc682c55c4548","src/video_player.rs":"91fdca11b4a7b3c50e7a42bd79d9788ea2494bbc052fe874e217cedaa8679165"},"package":null}