Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Feb 2020 23:18:55 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r525508 - in head/multimedia/aom: . files
Message-ID:  <202002072318.017NItA2056231@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Feb  7 23:18:55 2020
New Revision: 525508
URL: https://svnweb.freebsd.org/changeset/ports/525508

Log:
  multimedia/aom: update to 1.0.0.3059
  
  Changes:	https://aomedia.googlesource.com/aom/+log/bfcd04a71..fc038664e

Deleted:
  head/multimedia/aom/files/patch-build_cmake_aom__optimization.cmake
Modified:
  head/multimedia/aom/Makefile   (contents, props changed)
  head/multimedia/aom/distinfo   (contents, props changed)
  head/multimedia/aom/files/patch-CMakeLists.txt   (contents, props changed)
  head/multimedia/aom/files/patch-aom__dsp_vmaf.c   (contents, props changed)
  head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake   (contents, props changed)

Modified: head/multimedia/aom/Makefile
==============================================================================
--- head/multimedia/aom/Makefile	Fri Feb  7 20:42:53 2020	(r525507)
+++ head/multimedia/aom/Makefile	Fri Feb  7 23:18:55 2020	(r525508)
@@ -3,8 +3,8 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 # XXX Switch to release after https://bugs.chromium.org/p/aomedia/issues/detail?id=2545
-DISTVERSION=	1.0.0-3044
-DISTVERSIONSUFFIX=	-gbfcd04a71
+DISTVERSION=	1.0.0-3059
+DISTVERSIONSUFFIX=	-gfc038664e
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org

Modified: head/multimedia/aom/distinfo
==============================================================================
--- head/multimedia/aom/distinfo	Fri Feb  7 20:42:53 2020	(r525507)
+++ head/multimedia/aom/distinfo	Fri Feb  7 23:18:55 2020	(r525508)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580944086
-SHA256 (jbeich-aom-v1.0.0-3044-gbfcd04a71_GH0.tar.gz) = 9c3e77ecf1f76d6263decc7cdc5626950967ed7614ddc7dc190de97b64c2b29a
-SIZE (jbeich-aom-v1.0.0-3044-gbfcd04a71_GH0.tar.gz) = 3509731
+TIMESTAMP = 1581094745
+SHA256 (jbeich-aom-v1.0.0-3059-gfc038664e_GH0.tar.gz) = 1b05c073687b71cdbb1c62690b6260e92cf57a8e477aa36fd79a4dbac4e67165
+SIZE (jbeich-aom-v1.0.0-3059-gfc038664e_GH0.tar.gz) = 3512580

Modified: head/multimedia/aom/files/patch-CMakeLists.txt
==============================================================================
--- head/multimedia/aom/files/patch-CMakeLists.txt	Fri Feb  7 20:42:53 2020	(r525507)
+++ head/multimedia/aom/files/patch-CMakeLists.txt	Fri Feb  7 23:18:55 2020	(r525508)
@@ -1,15 +1,12 @@
-- Stop linking shared library statically
 - Depend on C++ runtime to unbreak consumers
 
---- CMakeLists.txt.orig	2020-02-01 16:39:54 UTC
+--- CMakeLists.txt.orig	2020-02-07 16:59:05 UTC
 +++ CMakeLists.txt
-@@ -400,7 +400,8 @@ if(CONFIG_AV1_ENCODER)
+@@ -429,6 +429,7 @@ if(CONFIG_AV1_ENCODER)
        message(FATAL_ERROR "VMAF library not found.")
      endif()
      message("-- Found VMAF library: " ${VMAF})
--    target_link_libraries(aom PRIVATE ${VMAF} -static)
-+    target_link_libraries(aom PRIVATE ${VMAF})
 +    set_property(TARGET aom PROPERTY LINKER_LANGUAGE CXX)
-     if(BUILD_SHARED_LIBS)
-       target_link_libraries(aom_static PRIVATE ${VMAF} -static)
-     endif()
+     target_link_libraries(aom PRIVATE ${VMAF})
+   endif()
+ endif()

Modified: head/multimedia/aom/files/patch-aom__dsp_vmaf.c
==============================================================================
--- head/multimedia/aom/files/patch-aom__dsp_vmaf.c	Fri Feb  7 20:42:53 2020	(r525507)
+++ head/multimedia/aom/files/patch-aom__dsp_vmaf.c	Fri Feb  7 23:18:55 2020	(r525508)
@@ -4,62 +4,17 @@ aom_dsp/vmaf.c:12:10: fatal error: 'libvmaf/libvmaf.h'
 #include <libvmaf/libvmaf.h>
          ^~~~~~~~~~~~~~~~~~~
 
-Don't use CLI symbols in shared library
-
-  /usr/lib/libaom.so: undefined reference to `fatal'
-
---- aom_dsp/vmaf.c.orig	2020-01-17 20:13:03 UTC
+--- aom_dsp/vmaf.c.orig	2020-02-07 16:59:05 UTC
 +++ aom_dsp/vmaf.c
-@@ -9,13 +9,17 @@
-  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+@@ -10,7 +10,11 @@
   */
+ 
  #include <assert.h>
 +#if __has_include(<libvmaf/libvmaf.h>)
  #include <libvmaf/libvmaf.h>
 +#else
 +#include <libvmaf.h>
 +#endif
-+#include <stdio.h>
+ #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
- 
- #include "aom_dsp/vmaf.h"
- #include "aom_ports/system_state.h"
--#include "common/tools_common.h"
- 
- typedef struct FrameData {
-   const YV12_BUFFER_CONFIG *source;
-@@ -82,7 +86,10 @@ void aom_calc_vmaf(const char *model_path, const YV12_
- 
-   aom_clear_system_state();
-   *vmaf = vmaf_score;
--  if (ret) fatal("Failed to compute VMAF scores.");
-+  if (ret) {
-+    fprintf(stderr, "Failed to compute VMAF scores.\n");
-+    exit(EXIT_FAILURE);
-+  }
- }
- 
- void aom_calc_vmaf_multi_frame(
-@@ -102,7 +109,10 @@ void aom_calc_vmaf_multi_frame(
-       /*do_ms_ssim=*/0, /*pool_method=*/NULL, /*n_thread=*/0,
-       /*n_subsample=*/1, /*enable_conf_interval=*/0);
-   FILE *vmaf_log = fopen("vmaf_scores.xml", "r");
--  if (vmaf_log == NULL || ret) fatal("Failed to compute VMAF scores.");
-+  if (vmaf_log == NULL || ret) {
-+    fprintf(stderr, "Failed to compute VMAF scores.\n");
-+    exit(EXIT_FAILURE);
-+  }
- 
-   int frame_index = 0;
-   char buf[512];
-@@ -114,7 +124,8 @@ void aom_calc_vmaf_multi_frame(
-         *p2 = '\0';
-         const double score = atof(&p[6]);
-         if (score < 0.0 || score > 100.0) {
--          fatal("Failed to compute VMAF scores.");
-+          fprintf(stderr, "Failed to compute VMAF scores.\n");
-+          exit(EXIT_FAILURE);
-         }
-         vmaf[frame_index++] = score;
-       }

Modified: head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
==============================================================================
--- head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake	Fri Feb  7 20:42:53 2020	(r525507)
+++ head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake	Fri Feb  7 23:18:55 2020	(r525508)
@@ -1,30 +1,22 @@
-- More ELF platforms can use GNU assembler on non-x86
+- ARM uses compiler intrinsics, so don't require GNU as
 
---- build/cmake/aom_configure.cmake.orig	2019-10-07 23:31:01 UTC
+--- build/cmake/aom_configure.cmake.orig	2020-02-07 16:59:05 UTC
 +++ build/cmake/aom_configure.cmake
-@@ -154,21 +154,15 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm")
-   if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
-     set(AS_EXECUTABLE as)
-     set(AOM_AS_FLAGS -arch ${AOM_TARGET_CPU} -isysroot ${CMAKE_OSX_SYSROOT})
--  elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
--    if(NOT AS_EXECUTABLE)
--      set(AS_EXECUTABLE as)
--    endif()
-   elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Windows")
-     if(NOT AS_EXECUTABLE)
-       set(AS_EXECUTABLE ${CMAKE_C_COMPILER} -c -mimplicit-it=always)
+@@ -162,17 +162,6 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm")
+       set(AS_EXECUTABLE as)
      endif()
-+  else()
-+    if(NOT AS_EXECUTABLE)
-+      set(AS_EXECUTABLE as)
-+    endif()
    endif()
--  if(NOT AS_EXECUTABLE)
+-  find_program(as_executable_found ${AS_EXECUTABLE})
+-  if(NOT as_executable_found)
 -    message(
 -      FATAL_ERROR
--        "Unknown assembler for: ${AOM_TARGET_CPU}-${AOM_TARGET_SYSTEM}")
+-        "Unable to find assembler and optimizations are enabled."
+-        "Searched for ${AS_EXECUTABLE}. Install it, add it to your path, or "
+-        "set the assembler directly by adding -DAS_EXECUTABLE=<assembler path> "
+-        "to your CMake command line."
+-        "To build without optimizations, add -DAOM_TARGET_CPU=generic to your "
+-        "cmake command line.")
 -  endif()
--
    string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS)
  endif()
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002072318.017NItA2056231>