diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/libaom | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libaom')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libaom/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libaom/outputs.patch | 68 |
2 files changed, 48 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 9a8ac1be95fe..82e440333136 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "3.1.2"; + version = "3.2.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "1c7yrhb56qj5c3lz54n1f9cbrvdr32g2yrrdiiy72sib8ycq9hz2"; + sha256 = "0fmnbzpl481i7kchx4hbvb507r5pfgyrzfrlrs7jk3bicycm75qv"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/development/libraries/libaom/outputs.patch b/nixpkgs/pkgs/development/libraries/libaom/outputs.patch index 7c0ff397dfee..bbf660aaa5c9 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/outputs.patch +++ b/nixpkgs/pkgs/development/libraries/libaom/outputs.patch @@ -1,37 +1,55 @@ +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 -@@ -45,2 +45,2 @@ macro(setup_aom_install_targets) +@@ -42,8 +42,8 @@ macro(setup_aom_install_targets) + -DAOM_ROOT=${AOM_ROOT} + -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} - -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR} + -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR} -@@ -82,14 +82,14 @@ macro(setup_aom_install_targets) - install( - FILES ${AOM_INSTALL_INCS} -- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/aom") -+ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/aom") - install( - FILES "${AOM_PKG_CONFIG_FILE}" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") - install(TARGETS ${AOM_INSTALL_LIBS} DESTINATION -- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") -+ "${CMAKE_INSTALL_FULL_LIBDIR}") - - if(ENABLE_EXAMPLES) - install(TARGETS ${AOM_INSTALL_BINS} DESTINATION -- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") -+ "${CMAKE_INSTALL_FULL_BINDIR}") - endif() + -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME} + -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD} + -DCONFIG_TUNE_VMAF=${CONFIG_TUNE_VMAF} +@@ -84,12 +84,12 @@ macro(setup_aom_install_targets) + # Setup the install rules. install() will automatically prepend + # CMAKE_INSTALL_PREFIX to relative paths + install(FILES ${AOM_INSTALL_INCS} +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aom") ++ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/aom") + install(FILES "${AOM_PKG_CONFIG_FILE}" +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + install(TARGETS ${AOM_INSTALL_LIBS};${AOM_INSTALL_BINS} +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ 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 -@@ -14,2 +14,2 @@ +@@ -11,8 +11,8 @@ + cmake_minimum_required(VERSION 3.5) + + set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "CMAKE_INSTALL_PREFIX" - "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR" - "CMAKE_INSTALL_LIBDIR" "CMAKE_PROJECT_NAME" + "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_FULL_INCLUDEDIR" + "CMAKE_INSTALL_FULL_LIBDIR" "CMAKE_PROJECT_NAME" -@@ -38,4 +38,4 @@ endif() + "CONFIG_MULTITHREAD" "HAVE_PTHREAD_H") + + foreach(arg ${REQUIRED_ARGS}) +@@ -35,15 +35,15 @@ else() + endif() + + # Write pkg-config info. -set(prefix "${CMAKE_INSTALL_PREFIX}") -set(bindir "${CMAKE_INSTALL_BINDIR}") -set(includedir "${CMAKE_INSTALL_INCLUDEDIR}") @@ -40,6 +58,12 @@ +get_filename_component(exec_prefix "${CMAKE_INSTALL_FULL_LIBDIR}" DIRECTORY) +get_filename_component(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}" NAME) +get_filename_component(libdir "${CMAKE_INSTALL_FULL_LIBDIR}" NAME) -@@ -46 +46 @@ file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n") + set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc") + string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name) + file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n") + file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n") -file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}\n") +file(APPEND "${pkgconfig_file}" "exec_prefix=${exec_prefix}\n") + file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/${includedir}\n") + file(APPEND "${pkgconfig_file}" "libdir=\${exec_prefix}/${libdir}\n\n") + file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n") |