Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Nov 2024 08:54:29 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: de48d365aad2 - main - multimedia/libgav1: Improve port
Message-ID:  <202411230854.4AN8sTVJ074498@gitrepo.freebsd.org>

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

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

commit de48d365aad26affb3bdab811a5ce70ed9bfccbe
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-11-23 08:52:40 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-11-23 08:52:45 +0000

    multimedia/libgav1: Improve port
    
    * Use DEBIAN packaged source instead of unofficial repo
    * Use upstream release archive for third party dependency
    * Define LICENSE_FILE
    * Build with c++17 instead of gnu17
    * Fix install path of pkg-config file
---
 multimedia/libgav1/Makefile                        | 27 +++++++++++++++-------
 multimedia/libgav1/distinfo                        | 10 ++++----
 .../files/patch-cmake_libgav1__install.cmake       | 11 +++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/multimedia/libgav1/Makefile b/multimedia/libgav1/Makefile
index aa2db2abe924..597ff91dbccf 100644
--- a/multimedia/libgav1/Makefile
+++ b/multimedia/libgav1/Makefile
@@ -1,25 +1,36 @@
 PORTNAME=	libgav1
-DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19.0
 PORTREVISION=	1
 CATEGORIES=	multimedia
+MASTER_SITES=	DEBIAN:DEFAULT \
+		https://github.com/google/googletest/releases/download/v1.15.2/:googletest
+DISTFILES=	${PORTNAME}_${DISTVERSION}.orig${EXTRACT_SUFX}:DEFAULT \
+		googletest-1.15.2.tar.gz:googletest
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Main profile (0) & High profile (1) compliant AV1 decoder
 WWW=		https://chromium.googlesource.com/codecs/libgav1
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libabsl_synchronization.so:devel/abseil
 
-USES=		cmake:testing compiler:c++17-lang localbase:ldflags
-USE_GITHUB=	yes
+USES=		cmake:testing compiler:c++17-lang localbase:ldflags tar:xz
 USE_LDCONFIG=	yes
-GH_ACCOUNT=	mirrorstogooglesource
-GH_TUPLE=	google:googletest:release-1.11.0:gtest/third_party/googletest
-CMAKE_ON=	BUILD_SHARED_LIBS
-CMAKE_OFF+=	${CMAKE_TESTING_ON}
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
+LDFLAGS+=	-Wl,--as-needed
+
 CMAKE_TESTING_ON=	LIBGAV1_ENABLE_TESTS
-LDFLAGS+=	-Wl,--as-needed # avoid overlinking (abseil deps)
+
+CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	CMAKE_CXX_EXTENSIONS \
+		LIBGAV1_ENABLE_TESTS
+
+post-extract:
+	@${MKDIR} ${WRKSRC}/third_party
+	@${MV} ${WRKDIR}/googletest-1.15.2 ${WRKSRC}/third_party/googletest
 
 .include <bsd.port.mk>
diff --git a/multimedia/libgav1/distinfo b/multimedia/libgav1/distinfo
index a39f04e81f4a..9841c6c41ecc 100644
--- a/multimedia/libgav1/distinfo
+++ b/multimedia/libgav1/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698785112
-SHA256 (mirrorstogooglesource-libgav1-v0.19.0_GH0.tar.gz) = 156a831e236560508a591b386fee8b7b77c73278ea0609cbc7fb4256b244debf
-SIZE (mirrorstogooglesource-libgav1-v0.19.0_GH0.tar.gz) = 1194750
-SHA256 (google-googletest-release-1.11.0_GH0.tar.gz) = b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
-SIZE (google-googletest-release-1.11.0_GH0.tar.gz) = 886330
+TIMESTAMP = 1732349680
+SHA256 (libgav1_0.19.0.orig.tar.xz) = d73f413b9e71ad354c6f3893ae492f5d589072fb70648bc0e18f2c52a10cf2f8
+SIZE (libgav1_0.19.0.orig.tar.xz) = 757740
+SHA256 (googletest-1.15.2.tar.gz) = 7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926
+SIZE (googletest-1.15.2.tar.gz) = 872667
diff --git a/multimedia/libgav1/files/patch-cmake_libgav1__install.cmake b/multimedia/libgav1/files/patch-cmake_libgav1__install.cmake
new file mode 100644
index 000000000000..bd5cb78c72eb
--- /dev/null
+++ b/multimedia/libgav1/files/patch-cmake_libgav1__install.cmake
@@ -0,0 +1,11 @@
+--- cmake/libgav1_install.cmake.orig	2024-11-23 08:48:59 UTC
++++ cmake/libgav1_install.cmake
+@@ -33,7 +33,7 @@ macro(libgav1_setup_install_target)
+     configure_file("${libgav1_root}/cmake/libgav1.pc.template"
+                    "${libgav1_build}/libgav1.pc" @ONLY NEWLINE_STYLE UNIX)
+     install(FILES "${libgav1_build}/libgav1.pc"
+-            DESTINATION "${prefix}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++            DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
+ 
+     # CMake config: libgav1-config.cmake
+     set(LIBGAV1_INCLUDE_DIRS "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")



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