From nobody Thu Apr 27 12:04:18 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6ZCk47ZZz474jq; Thu, 27 Apr 2023 12:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q6ZCk263Bz3mNq; Thu, 27 Apr 2023 12:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NScd8AUj44sZqjqsdzXUCPsq6IQtJS0QZSuIYS5CTM=; b=I0K1GE7QAnAhmY6S/cMT4E5gkrlLzdB8jjMy4aQVA+T642Adp5mAQ2OBh3oSgZXKNiC1Ui besxMi3EgN1fft9JSzZVam34ZhQKvwD+N98KtnoaOCr7RVE/ONOt2E75cDupfcZF68eTHL 0QOFTP44Vpz/XneuryDHc+mkoChpXGRK6EivOelDUzGLsFkFepAxLSdKc+ChF5ZcY47qgA Eu2Vg80lYIynTFiDzXoGmxGWsQoOJm2tQmy0uKRUAgh0OT9EYzAhJNXdW1CJaCz5EtD9Vf Ohbh0CVcgDxs8MEIMCJKtmf2InomapQAewLFEOZueK73lyT0Hl20npCVhf1sNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NScd8AUj44sZqjqsdzXUCPsq6IQtJS0QZSuIYS5CTM=; b=Y+ZRmZL4dWFHif7/u5LyrXCiL3fgOEIe3/V1fZ+K/I6vzykcexrGjqapMocrJPCbuCcwEB u0TfUtlpCn/ZsPtZapSE9nulfLgmBtZH+HbeJOM3+eD6fQWIpR9xElNP798kxKhnR/gkwG /yGQ9J88E4szL8FNVZhbh1RT3ej8zMLZCf7mNHosIeciZ7CfyXrZ1CZ4HwVt3kyhr0UZTL 1e9lrgguMzb1n5lEabjqJJBw1EZUUqe8+0qYZwBcvI4bBiOvN98tOQojIexQL2uS5KyRSm ZaR3T8V90J68rIocbfRI3QbkW/7J00u6q6175iGb3T3tRhT/6/oxHberkgl9pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597058; a=rsa-sha256; cv=none; b=gc12pTlScewbgMZxJIu1WHO96o+Qejwi9Ke0GDUIsddZ0UY9sQMFehPt+ogX+Rjwv5GY0D C0KtcLy1/aPDczleLmp076Ryez16Q74H82dOzKlJMqDnqvCzuPC6PzrcRbqaAsEab6s3Zs hDhBoj2hj57gIN8mN7k4/DhpdSUw4nM+THsA5CZNY5CPVNHvDOw4zteJRgkAThbFs/Q0O5 HeOcLRULCqQYr9leLQQQ4PM0woDMYPn1X8ySV8Kk1hQ1+H2fZp5bDP0gNGGVPlukw0CZB5 EnIjhI35yzuqrQrtgAztZoMY3uVbDV3rcE3jyCohCWqmJLBtrK0ptjSYS0RBXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6ZCk1CSKzGp6; Thu, 27 Apr 2023 12:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RC4ITE046512; Thu, 27 Apr 2023 12:04:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC4I6D046511; Thu, 27 Apr 2023 12:04:18 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:18 GMT Message-Id: <202304271204.33RC4I6D046511@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: b4630a2ae5e5 - main - multimedia/ffmpegthumbnailer: Update to latest commit (2022-10-21) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4630a2ae5e5f7ca9a20e77394b007f6ea79d662 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4630a2ae5e5f7ca9a20e77394b007f6ea79d662 commit b4630a2ae5e5f7ca9a20e77394b007f6ea79d662 Author: Daniel Engberg AuthorDate: 2023-04-27 10:38:01 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:44 +0000 multimedia/ffmpegthumbnailer: Update to latest commit (2022-10-21) Fixes build with FFmpeg 6.0 PR: 270224 --- multimedia/ffmpegthumbnailer/Makefile | 23 +++++----- multimedia/ffmpegthumbnailer/distinfo | 6 +-- .../ffmpegthumbnailer/files/patch-CMakeLists.txt | 52 ---------------------- 3 files changed, 15 insertions(+), 66 deletions(-) diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 5233f6156363..b686ad34347b 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -1,8 +1,7 @@ PORTNAME= ffmpegthumbnailer -PORTVERSION= 2.2.2 -PORTREVISION= 1 +DISTVERSION= 2.2.2.a.20221021 CATEGORIES= multimedia graphics -MASTER_SITES= https://github.com/dirkvdb/${PORTNAME}/releases/download/${PORTVERSION}/ +#MASTER_SITES= https://github.com/dirkvdb/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight video thumbnailer that can be used by file managers @@ -14,24 +13,26 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libavformat.so:multimedia/ffmpeg -USES= cmake compiler:c++11-lib gnome jpeg localbase pkgconfig tar:bz2 +USES= cmake:testing compiler:c++11-lib gnome jpeg localbase pkgconfig tar:bz2 +USE_GITHUB= yes +GH_ACCOUNT= dirkvdb +GH_TAGNAME= e0bf01d + USE_GNOME= glib20 USE_LDCONFIG= yes EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar +CMAKE_TESTING_ON= ENABLE_TESTS +CMAKE_OFF= ENABLE_TESTS CMAKE_ON= ENABLE_GIO -OPTIONS_DEFINE= TEST THUMBNAILER -THUMBNAILER_DESC=Register as a system thumbnailer -OPTIONS_SUB= yes +OPTIONS_DEFINE= THUMBNAILER OPTIONS_DEFAULT=THUMBNAILER +OPTIONS_SUB= yes -TEST_CMAKE_BOOL= ENABLE_TESTS +THUMBNAILER_DESC= Register as a system thumbnailer THUMBNAILER_CMAKE_ON= -DENABLE_THUMBNAILER:BOOL=ON -do-test: - (cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest) - .include diff --git a/multimedia/ffmpegthumbnailer/distinfo b/multimedia/ffmpegthumbnailer/distinfo index e3f4747e9420..fe6986688b27 100644 --- a/multimedia/ffmpegthumbnailer/distinfo +++ b/multimedia/ffmpegthumbnailer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595238599 -SHA256 (ffmpegthumbnailer-2.2.2.tar.bz2) = 1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b -SIZE (ffmpegthumbnailer-2.2.2.tar.bz2) = 1201838 +TIMESTAMP = 1678817076 +SHA256 (dirkvdb-ffmpegthumbnailer-2.2.2.a.20221021-e0bf01d_GH0.tar.gz) = 56e100ef6e6a8ce18e6015b79efad6601a636b03b6bcf9abf6b6f73c501e13e7 +SIZE (dirkvdb-ffmpegthumbnailer-2.2.2.a.20221021-e0bf01d_GH0.tar.gz) = 1291600 diff --git a/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt b/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt deleted file mode 100644 index 2d065734fdf0..000000000000 --- a/multimedia/ffmpegthumbnailer/files/patch-CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ ---- CMakeLists.txt.orig 2019-10-03 19:51:17 UTC -+++ CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.5) -+cmake_minimum_required(VERSION 3.12) - - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - -@@ -92,6 +92,15 @@ add_library(libffmpegthumbnailerobj OBJECT - libffmpegthumbnailer/filmstripfilter.cpp - ) - -+target_link_libraries(libffmpegthumbnailerobj -+ FFmpeg::avformat -+ FFmpeg::avcodec -+ FFmpeg::avutil -+ FFmpeg::avfilter -+ $<$:${JPEG_LIBRARIES}> -+ $<$:PNG::PNG> -+) -+ - # we use our own deprecated struct menbers, so disable the warning about it - set_source_files_properties(libffmpegthumbnailer/videothumbnailerc.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations) - -@@ -118,12 +127,7 @@ set (FFMPEGTHUMBNAILER_SOVERSION_AGE 1) - if (ENABLE_STATIC) - add_library(libffmpegthumbnailerstatic STATIC $) - target_link_libraries(libffmpegthumbnailerstatic -- FFmpeg::avformat -- FFmpeg::avcodec -- FFmpeg::avutil -- FFmpeg::avfilter -- $<$:${JPEG_LIBRARIES}> -- $<$:PNG::PNG> -+ libffmpegthumbnailerobj - $<$:${CMAKE_DL_LIBS}> - ) - -@@ -140,12 +144,7 @@ endif () - if (ENABLE_SHARED) - add_library(libffmpegthumbnailer SHARED $) - target_link_libraries(libffmpegthumbnailer -- FFmpeg::avformat -- FFmpeg::avcodec -- FFmpeg::avutil -- FFmpeg::avfilter -- $<$:${JPEG_LIBRARIES}> -- $<$:PNG::PNG> -+ libffmpegthumbnailerobj - ) - - set_target_properties(libffmpegthumbnailer PROPERTIES