From nobody Sun Nov 13 23:12:29 2022 X-Original-To: dev-commits-ports-all@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 4N9Srt3ljSz4hQ4P; Sun, 13 Nov 2022 23:12:30 +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 4N9Srt27Wzz3j2R; Sun, 13 Nov 2022 23:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668381150; 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=lr1pO6CDZnVdlgBAD73Dd5j9LeZR9aS7CiEoWYuZhDM=; b=ShwqHVTdZajo4A2XSk7YUv1mnXXRYUf6cgLEa0mNBsD3CTzhK7Owwp+hfagjt+KW7uUr+t JL/2G+f/fW3cbg7cKA9O6Q/XaB0vsbBKh2UvW5xddMgXgDviJa9e7ezsPBQrLjof2vY7PV V8+zEjvwsFsmeaWWqRnG+qsQD5CItqnG9tYlpoWUAV83ZiOVJNuBKWyul6WkMy1DLMxKNi tbny79O2tFayqFlgOahBxP8cspPJxpV9hstjWrpX9Wmk8uPSYFYGjLmqmpGH1iuRqm2eHp 4vy4HiGvhXs+GchJkhZ3Jl78L1WedJAJHMIHcYC31rFv0KeC5Tq2e7dnxBbTUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668381150; 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=lr1pO6CDZnVdlgBAD73Dd5j9LeZR9aS7CiEoWYuZhDM=; b=gDBIOObTWRV7DwgCBrS13b2yl7itow847lxFwdMHLxzCdZDv8wrSYIQybMtsnpc4dePQOu c8ZMYZ+rYLBqYOSfWBT/804S2D+pCMogLshxzLxWtGUVSay8y1Az/g6wgm+dAha7EwvWqc 2u7JQJHGNlAxq4vxWsYc8OxUJ9lYI16jpEnvEnXU0ELPd1fNd0LwgWGkZxEWNzOkH8mu25 dA4qzGZe7J+3AKrCZeOHfGLooey/TTLQjl+QYa2O/aPQf2UyKEoF899H+Oa5f0yLOE/k4p EchqPr+Eb0FjP52iCZvTeqXOj+vnxZuV2Lov6Tt/xNRg/C/t+KNC1OfZkPjp0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668381150; a=rsa-sha256; cv=none; b=KBs2r8w16lC4PxBAAx+nh8QAzM9QcITvxqlDZantW6z6SOiYQs1Xg4qllmyb3itFAG6izt 3wAF4BU6UxYMGAkuDTzX1PWuX0sQM7ymE3xLj1ffPbT+J1C1TlcE2I3OqYHB7MlGM90Ltf Cs1azGp/likakA51+QegZiSNGBVds+LN0Fl+Cl0+8VdtsQq7PAnwInPWf7d7g85iHgbLrQ FW7D67YIAFaQR20b6u4BMpneWq25fApgDdEBUqYTeddn3EUPxF0MsDTLlpgTTGvHABDBNt L6O5bjIJdka4FEEQcmA8M2X4OtrtH7QP9ktMNeoHB8s3hM/RDq96Pym0mQ2TkQ== 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 4N9Srt0fMyzL1L; Sun, 13 Nov 2022 23:12:30 +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 2ADNCTR9002569; Sun, 13 Nov 2022 23:12:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ADNCTfJ002568; Sun, 13 Nov 2022 23:12:29 GMT (envelope-from git) Date: Sun, 13 Nov 2022 23:12:29 GMT Message-Id: <202211132312.2ADNCTfJ002568@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: ac9b20c88deb - main - multimedia/minitube: Fix build with mpv-0.35 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac9b20c88deb90ca6604c7a07f4e36f826bffd6c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac9b20c88deb90ca6604c7a07f4e36f826bffd6c commit ac9b20c88deb90ca6604c7a07f4e36f826bffd6c Author: VVD AuthorDate: 2022-11-13 21:05:53 +0000 Commit: Yuri Victorovich CommitDate: 2022-11-13 23:12:27 +0000 multimedia/minitube: Fix build with mpv-0.35 PR: 267115 --- multimedia/minitube/Makefile | 4 ++-- .../files/patch-lib_media_src_mpv_mpvwidget.cpp | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile index b1c2ff2f3740..9bdb42e834de 100644 --- a/multimedia/minitube/Makefile +++ b/multimedia/minitube/Makefile @@ -1,6 +1,6 @@ PORTNAME= minitube DISTVERSION= 3.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia www MAINTAINER= yuri@FreeBSD.org @@ -10,7 +10,7 @@ WWW= https://flavio.tordini.org/minitube LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libmpv.so.1:multimedia/mpv034 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267115 +LIB_DEPENDS= libmpv.so.2:multimedia/mpv USES= compiler:c++11-lang gl qmake qt:5 USE_GITHUB= yes diff --git a/multimedia/minitube/files/patch-lib_media_src_mpv_mpvwidget.cpp b/multimedia/minitube/files/patch-lib_media_src_mpv_mpvwidget.cpp new file mode 100644 index 000000000000..a6a48f27fadb --- /dev/null +++ b/multimedia/minitube/files/patch-lib_media_src_mpv_mpvwidget.cpp @@ -0,0 +1,18 @@ +- workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267115 to allow to build with mpv-0.35 + +diff -Nur lib/media/src/mpv/mpvwidget.cpp.orig lib/media/src/mpv/mpvwidget.cpp +--- lib/media/src/mpv/mpvwidget.cpp.orig ++++ lib/media/src/mpv/mpvwidget.cpp +@@ -30,7 +30,11 @@ + qDebug() << "initializeGL" << nativeParent; + if (nativeParent == nullptr) qFatal("No native parent"); + +- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) ++ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #else ++ mpv_opengl_init_params gl_init_params{get_proc_address, this}; ++ #endif + mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL}, + {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, + {MPV_RENDER_PARAM_INVALID, nullptr},