From nobody Tue Mar 8 12:53:45 2022 X-Original-To: dev-commits-ports-branches@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 C6A5A19F4E02; Tue, 8 Mar 2022 12:53:45 +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 4KCZyK58G7z3mdN; Tue, 8 Mar 2022 12:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646744025; 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=SYOuJAqgIRACKnIxd8DsAUHJVMp9/1T9dREtV8MfXpk=; b=DJDm1DCLJiWIiNpZzMwmG7YGm7nQlQk32TxLWqvTgUXhVnaZCp5ZBTXVzbKXJkxnTxVsqN jjM4hiCCe7WVdg+vMGIzSBhWI1oxOcg2pInBGWwvMkl93MqQHoyrRBUIdrryJMFS4COijS 0G3qT89e9D0D8bD/wQWPHWq9XpkstyYsHSwvcu1W524azJ2NtKrN1VEWlDu5Zvb6tsB9yj VjiXzYYSIwHyRq9qFA4WWPCSYolowK2uaB+aD3FWQyVnyJzr4PnKFW3Ys/zwyA36LPadoi L3S74PhHM7EvEEJTdXOjXS7Cvs+hOcLD6YZf5cqAvCGKqFayIh8cJbK+NEJ8jg== 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 9092B1CF92; Tue, 8 Mar 2022 12:53:45 +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 228CrjIv084332; Tue, 8 Mar 2022 12:53:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 228Crjh0084331; Tue, 8 Mar 2022 12:53:45 GMT (envelope-from git) Date: Tue, 8 Mar 2022 12:53:45 GMT Message-Id: <202203081253.228Crjh0084331@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c763f8fdde58 - 2022Q1 - multimedia/celluloid: unbreak after 861318295f55 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: c763f8fdde5861a60eb97ab769187b409677b2bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646744025; 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=SYOuJAqgIRACKnIxd8DsAUHJVMp9/1T9dREtV8MfXpk=; b=cF7neiNpXnsRZ3BEsQMW5zYC53s5dM7SGTyXpypoe9xQmmCzXuNuTCinwKih74dVP2EJQt BUOU6i3ktOu1k9v3FuRTG8C+8NsK2cHdvZ/H+KVaa/GIKfiv8r/O5mlU2eJx+OjXnv9ljR pB8hO4NZ/f6xQTWSbD8B5uPVz/olz0WQHe8czkF/4Vw+kDlRnxTkoSnyy9ArV1OCTiqn5t wTb3Ruj+1LGsKkZkw4aglAwutOX7IDFxIY6g7ZQVEr7TDNU0kHJeqYRPZg+sse/WiRTCUM w+ujHYCX7sUoEUEvJ1aSBtLHunUDhqznS0wSg+WChup1NM7dnXDDZ+W92BEZUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646744025; a=rsa-sha256; cv=none; b=o8Ofnc2UYW+K7yu/gUaZfkrI+IYyy6DSqJjyFBf82xxqwT8RsUdjg/ISrzsXVv1ErULaPX gV5lW5l2PUpSqqrGdNgtJ8cW4zXvqvNLyhbUL3D7KnLA+sjf4ykK3GaLWUfwP+eDSbnNgB 3MFCmg07WvLRWhxBB2KyMgbn9NmldBm+zEeXc/7bjS3xVF/UcQ5vew6PPzRSjiyljjKdjt WnWbKngyJx+6bJ2JBL23nK02uIwdPZ1SLoBKabWCUTqW9x8KfI6XqXzyt835sEVzERg7ie gUi39a7HvGfmGXEH2GYY1alNUGERk9OV7+ENxp1firVCh7/B9fd1skXtS4atyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c763f8fdde5861a60eb97ab769187b409677b2bb commit c763f8fdde5861a60eb97ab769187b409677b2bb Author: Jan Beich AuthorDate: 2022-03-08 12:49:43 +0000 Commit: Jan Beich CommitDate: 2022-03-08 12:49:45 +0000 multimedia/celluloid: unbreak after 861318295f55 src/meson.build:53:0: ERROR: Invalid version of dependency, need 'gtk4' ['>=4.6.1'] found '4.4.1'. Reported by: pkg-fallout --- multimedia/celluloid/files/patch-gtk-4.4 | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/multimedia/celluloid/files/patch-gtk-4.4 b/multimedia/celluloid/files/patch-gtk-4.4 new file mode 100644 index 000000000000..960d45471dcd --- /dev/null +++ b/multimedia/celluloid/files/patch-gtk-4.4 @@ -0,0 +1,58 @@ +Revert https://github.com/celluloid-player/celluloid/commit/8b68f560628a +as x11-toolkits/gtk40 on 2022Q1 tracks 4.4.* series. + +src/meson.build:53:0: ERROR: Invalid version of dependency, need 'gtk4' ['>=4.6.1'] found '4.4.1'. + +--- README.md.orig 2022-03-06 18:42:38 UTC ++++ README.md +@@ -15,7 +15,7 @@ - glib >= 2.66 + - pkg-config (build) + - gcc (build) + - glib >= 2.66 +-- gtk >= 4.6.1 ++- gtk >= 4.0 + - mpv >= 0.32 + - epoxy + - lua (optional) +--- configure.ac.orig 2022-03-06 18:42:38 UTC ++++ configure.ac +@@ -90,14 +90,14 @@ AS_IF([test "x$GLIB_GENMARSHAL" = "x"], [ + AC_MSG_ERROR([Could not find glib-genmarshal]) + ]) + +-PKG_CHECK_MODULES(DEPS, [gtk4 >= 4.6.1 glib-2.0 >= 2.66 mpv >= 1.107 epoxy]) ++PKG_CHECK_MODULES(DEPS, [gtk4 glib-2.0 >= 2.66 mpv >= 1.107 epoxy]) + AC_SEARCH_LIBS([sqrt], [m]) + + AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_66], [Dont warn using older APIs]) + AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_66], [Prevents using newer APIs]) + +-AC_DEFINE([GDK_VERSION_MIN_REQUIRED], [GDK_VERSION_4_6], [Dont warn using older APIs]) +-AC_DEFINE([GDK_VERSION_MAX_ALLOWED], [GDK_VERSION_4_6], [Prevents using newer APIs]) ++AC_DEFINE([GDK_VERSION_MIN_REQUIRED], [GDK_VERSION_4_0], [Dont warn using older APIs]) ++AC_DEFINE([GDK_VERSION_MAX_ALLOWED], [GDK_VERSION_4_0], [Prevents using newer APIs]) + + AC_DEFINE_UNQUOTED([G_LOG_DOMAIN], "$PACKAGE_NAME", [Default logging facility]) + +--- src/meson.build.orig 2022-03-06 18:42:38 UTC ++++ src/meson.build +@@ -50,7 +50,7 @@ sources += custom_target('authors', + ] + ) + +-libgtk = dependency('gtk4', version: '>=4.6.1') ++libgtk = dependency('gtk4') + localedir = join_paths(get_option('prefix'), get_option('localedir')) + cflags = [ + '-DG_SETTINGS_ENABLE_BACKEND', +@@ -60,8 +60,8 @@ cflags = [ + '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()), + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', + '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66', +- '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_6', +- '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_6' ++ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_0', ++ '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_0' + ] + + if get_option('buildtype') == 'release'