Merge pull request #88439 from primeos/libaom
libaom: 1.0.0-errata1 -> 2.0.0
This commit is contained in:
commit
775f0fda78
@ -2,14 +2,16 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libaom";
|
pname = "libaom";
|
||||||
version = "1.0.0-errata1";
|
version = "2.0.0";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://aomedia.googlesource.com/aom";
|
url = "https://aomedia.googlesource.com/aom";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f";
|
sha256 = "1616xjhj6770ykn82ml741h8hx44v507iky3s9h7a5lnk9d4cxzy";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./outputs.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
yasm perl cmake pkgconfig python3
|
yasm perl cmake pkgconfig python3
|
||||||
];
|
];
|
||||||
@ -24,10 +26,30 @@ stdenv.mkDerivation rec {
|
|||||||
export PATH=$NIX_BUILD_TOP:$PATH
|
export PATH=$NIX_BUILD_TOP:$PATH
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Configuration options:
|
||||||
|
# https://aomedia.googlesource.com/aom/+/refs/heads/master/build/cmake/aom_config_defaults.cmake
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DBUILD_SHARED_LIBS=ON"
|
||||||
|
"-DENABLE_TESTS=OFF"
|
||||||
|
];
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
moveToOutput lib/libaom.a "$static"
|
||||||
|
'';
|
||||||
|
|
||||||
|
outputs = [ "out" "bin" "dev" "static" ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "AV1 Bitstream and Decoding Library";
|
description = "Alliance for Open Media AV1 codec library";
|
||||||
|
longDescription = ''
|
||||||
|
Libaom is the reference implementation of the AV1 codec from the Alliance
|
||||||
|
for Open Media. It contains an AV1 library as well as applications like
|
||||||
|
an encoder (aomenc) and a decoder (aomdec).
|
||||||
|
'';
|
||||||
homepage = "https://aomedia.org/av1-features/get-started/";
|
homepage = "https://aomedia.org/av1-features/get-started/";
|
||||||
maintainers = with maintainers; [ kiloreux ];
|
changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${version}/CHANGELOG";
|
||||||
|
maintainers = with maintainers; [ primeos kiloreux ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
};
|
};
|
||||||
|
45
pkgs/development/libraries/libaom/outputs.patch
Normal file
45
pkgs/development/libraries/libaom/outputs.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
--- a/build/cmake/aom_install.cmake
|
||||||
|
+++ b/build/cmake/aom_install.cmake
|
||||||
|
@@ -45,2 +45,2 @@ macro(setup_aom_install_targets)
|
||||||
|
- -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()
|
||||||
|
endif()
|
||||||
|
--- a/build/cmake/pkg_config.cmake
|
||||||
|
+++ b/build/cmake/pkg_config.cmake
|
||||||
|
@@ -14,2 +14,2 @@
|
||||||
|
- "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()
|
||||||
|
-set(prefix "${CMAKE_INSTALL_PREFIX}")
|
||||||
|
-set(bindir "${CMAKE_INSTALL_BINDIR}")
|
||||||
|
-set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||||
|
-set(libdir "${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
+get_filename_component(prefix "${CMAKE_INSTALL_FULL_INCLUDEDIR}" DIRECTORY)
|
||||||
|
+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")
|
||||||
|
-file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}\n")
|
||||||
|
+file(APPEND "${pkgconfig_file}" "exec_prefix=${exec_prefix}\n")
|
Loading…
x
Reference in New Issue
Block a user