mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 11:20:10 +00:00
libaom: 3.12.1 -> 3.14.1
Changelog: https://aomedia.googlesource.com/aom/+/refs/tags/v3.14.1/CHANGELOG
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
|
||||
index 0bd2bf035..5cf5acea8 100644
|
||||
--- a/build/cmake/aom_install.cmake
|
||||
+++ b/build/cmake/aom_install.cmake
|
||||
@@ -42,8 +42,8 @@ macro(setup_aom_install_targets)
|
||||
diff --git a/cmake/aom_install.cmake b/cmake/aom_install.cmake
|
||||
index a8f6d64361..c5223462ed 100644
|
||||
--- a/cmake/aom_install.cmake
|
||||
+++ b/cmake/aom_install.cmake
|
||||
@@ -45,8 +45,8 @@ macro(setup_aom_install_targets)
|
||||
-DAOM_ROOT=${AOM_ROOT}
|
||||
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
|
||||
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
|
||||
@@ -11,9 +11,9 @@ index 0bd2bf035..5cf5acea8 100644
|
||||
+ -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
|
||||
+ -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
|
||||
-DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
|
||||
-DCMAKE_THREAD_LIBS_INIT=${CMAKE_THREAD_LIBS_INIT}
|
||||
-DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
|
||||
-DCONFIG_TUNE_VMAF=${CONFIG_TUNE_VMAF}
|
||||
@@ -84,12 +84,12 @@ macro(setup_aom_install_targets)
|
||||
@@ -115,13 +115,13 @@ macro(setup_aom_install_targets)
|
||||
# Setup the install rules. install() will automatically prepend
|
||||
# CMAKE_INSTALL_PREFIX to relative paths
|
||||
install(FILES ${AOM_INSTALL_INCS}
|
||||
@@ -23,6 +23,7 @@ index 0bd2bf035..5cf5acea8 100644
|
||||
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
||||
+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
|
||||
install(TARGETS ${AOM_INSTALL_LIBS};${AOM_INSTALL_BINS}
|
||||
EXPORT "${AOM_TARGETS_EXPORT_NAME}"
|
||||
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
|
||||
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||
@@ -31,12 +32,12 @@ index 0bd2bf035..5cf5acea8 100644
|
||||
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||
endif()
|
||||
endmacro()
|
||||
diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake
|
||||
index e8fff2e77..b8a73aad4 100644
|
||||
--- a/build/cmake/pkg_config.cmake
|
||||
+++ b/build/cmake/pkg_config.cmake
|
||||
diff --git a/cmake/pkg_config.cmake b/cmake/pkg_config.cmake
|
||||
index ad3cf77009..1b46040cd1 100644
|
||||
--- a/cmake/pkg_config.cmake
|
||||
+++ b/cmake/pkg_config.cmake
|
||||
@@ -11,8 +11,8 @@
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "CMAKE_INSTALL_PREFIX"
|
||||
- "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR"
|
||||
|
||||
@@ -23,11 +23,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libaom";
|
||||
version = "3.12.1";
|
||||
version = "3.14.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://aomedia.googlesource.com/aom/+archive/v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-AAS6wfq4rZ4frm6+gwKoIS3+NVzPhhfW428WXJQ2tQ8=";
|
||||
hash = "sha256-ddMrDkWV5jUbpPGKsMQl7s4r43205WbBtCEYtZNgwAM=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user