Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Sep 2023 00:05:33 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 83c438929d2d - main - multimedia/aom: update to 3.7.0
Message-ID:  <202309010005.38105XDG094082@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=83c438929d2df3be3046a566835b9fb10dedb5f7

commit 83c438929d2df3be3046a566835b9fb10dedb5f7
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-08-25 19:06:01 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-01 00:05:24 +0000

    multimedia/aom: update to 3.7.0
    
    Changes:        https://aomedia.googlesource.com/aom/+log/v3.7.0-rc1..v3.7.0
    Reported by:    Repology, portscout
---
 multimedia/aom/Makefile                   |  2 +-
 multimedia/aom/distinfo                   |  6 +++---
 multimedia/aom/files/patch-CMakeLists.txt | 19 +++++--------------
 multimedia/aom/pkg-plist                  |  2 +-
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 93209b9d28c7..9bffdf6e9e49 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.7.0-rc1
+DISTVERSION=	3.7.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 949e2bf663d4..8b177a8e22fd 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692048167
-SHA256 (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) = 99fad4d57a763f105b080c6ea483be2287a62929777319e293610618c3369063
-SIZE (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) = 5355997
+TIMESTAMP = 1692990361
+SHA256 (jbeich-aom-v3.7.0_GH0.tar.gz) = f308f0df938233bc37b7d3f463bc877319e60811f1ff82f2a81acfb882b54368
+SIZE (jbeich-aom-v3.7.0_GH0.tar.gz) = 5355031
diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt
index bddd24159c96..91b299b29a9d 100644
--- a/multimedia/aom/files/patch-CMakeLists.txt
+++ b/multimedia/aom/files/patch-CMakeLists.txt
@@ -1,27 +1,18 @@
-- Add missing dependency for aom_static used by ENABLE_EXAMPLES
 - Drop unused static libhwy dependency when using shared libjxl
 
---- CMakeLists.txt.orig	2023-08-14 21:22:47 UTC
+--- CMakeLists.txt.orig	2022-06-16 19:13:50 UTC
 +++ CMakeLists.txt
-@@ -568,17 +568,14 @@ if(CONFIG_AV1_ENCODER)
-       target_include_directories(aom_dsp_encoder PRIVATE ${LIBJXL_INCLUDE_DIRS})
-     else()
-       pkg_check_modules(LIBJXL REQUIRED libjxl)
-+      if(BUILD_SHARED_LIBS)
-+        target_link_libraries(aom_static
-+                              PRIVATE ${LIBJXL_LDFLAGS} ${LIBJXL_LIBRARIES})
-+      endif()
-       target_link_libraries(aom PRIVATE ${LIBJXL_LDFLAGS} ${LIBJXL_LIBRARIES})
-       target_include_directories(aom_dsp_encoder PRIVATE ${LIBJXL_INCLUDE_DIRS})
+@@ -565,13 +565,6 @@ if(CONFIG_AV1_ENCODER)
        if(LIBJXL_CFLAGS)
          append_compiler_flag("${LIBJXL_CFLAGS}")
--      endif()
+       endif()
 -      pkg_check_modules(LIBHWY REQUIRED libhwy)
 -      target_link_libraries(aom PRIVATE ${LIBHWY_LDFLAGS} ${LIBHWY_LIBRARIES})
 -      target_include_directories(aom_dsp_encoder
 -                                 PRIVATE ${LIBLIBHWY_INCLUDE_DIRS})
 -      if(LIBHWY_CFLAGS)
 -        append_compiler_flag("${LIBHWY_CFLAGS}")
-       endif()
+-      endif()
      endif()
  
+     set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
index 4ade64aa8fb4..bcb8a077c108 100644
--- a/multimedia/aom/pkg-plist
+++ b/multimedia/aom/pkg-plist
@@ -10,8 +10,8 @@ include/aom/aom_image.h
 include/aom/aom_integer.h
 include/aom/aomcx.h
 include/aom/aomdx.h
+lib/libaom.a
 lib/libaom.so
 lib/libaom.so.3
 lib/libaom.so.3.7.0
-lib/libaom_static.a
 libdata/pkgconfig/aom.pc



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