From nobody Sat Jun 24 16:38:12 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 4QpKY04SgFz4h9PJ; Sat, 24 Jun 2023 16:38:12 +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 4QpKY03Qy9z4PKq; Sat, 24 Jun 2023 16:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687624692; 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=Z7n1aQv9P3qYmETfK9Yn/yoyAA87byT4LgkYgC3owF0=; b=UWiwwMPmPPe13xlVSHEZRhBrwKcoGAX32we+ygOeE2QRy2qkYeVxeqcsYlgrhQXCM0mSmX +NJQjdl/U1YBynuCe0OknTBGMb9D5rtBvypbvsW0EZjivpjSXSkMKOCsabtica39OjDFfL ms6JdG/HfZq+Q/ql1s9q1uHQKX87r/EP4/nZMJCbfwjekoTsu5WVUiYlowh8dQBn13AsnW tQnOjX5t/F7Koeu4A6IwQGy/gstiyTF+sv6KQMb8CXQWNnC9W1/PZpnj2hjcAkcsX+kXe5 JBbg6V+vJ8/N/yPt/G8YnbikdIUoB7RA9QkT7DbyA7KZ9imPHOck8auC6hlf3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687624692; 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=Z7n1aQv9P3qYmETfK9Yn/yoyAA87byT4LgkYgC3owF0=; b=iTmB/iLkqmjtDpa65RCazk9Z6TywJpccbrCbaBha37SUSX2dFTEm0zvyK0l/3GsGnkHXcP No3ktwCJrxKFGlX0jr7Pp1FeFAVY8zsQW8FlXBNLwREVJIdmD5Oc0Xy383TADovGkUZ1gz vuxERwPgEP041x7MtaTvnexfCyC/xSxlih62WxPeZDp6v/bNaekLyETxVpbQb8BM6doauf MR90ulasGA31HS6X+jJwyRtbzdEB9vZJff8ato4m0E+FN6752Y95PsXPfBzZRp7zMVlKxT kzEHIztSn5mXEFnwxqP0x7j+mnSX/c1lPzDrIG7f+Og4ppCTBBAh7hplizRs+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687624692; a=rsa-sha256; cv=none; b=H+53lslPz8ZZy1k4RF9nxOrfUMqlvbxc2DY4Mx+aOsxWmAzxQpoWOqQIS3JErxy8zKt4/0 OUvFFS2pU6bZbNMn2sPdwEG4xijPoVs+LFJwTiAotYfuAZELKdfZ9WPEKJwE/x2za9P4lp I6P9kaYvgybWQHEbiqXxl5l8w9xUmhFAtpmgVUmKCwDf5yWYd8qrXuD6UohW1g/Z8JjRw+ qMN76KptkK+fXMxNuZtW780+oli6+sNtskkcAwd69MxLY3DZ9dfaed9OuWK98cOX4zR5by vX5e0W2srEKqis6pX1hnCP6mp7Hu679gVzausECqQCNp56FNYlgMDi+xvKVn0w== 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 4QpKY029TFzt8y; Sat, 24 Jun 2023 16:38:12 +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 35OGcCZ4060301; Sat, 24 Jun 2023 16:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OGcCJ9060300; Sat, 24 Jun 2023 16:38:12 GMT (envelope-from git) Date: Sat, 24 Jun 2023 16:38:12 GMT Message-Id: <202306241638.35OGcCJ9060300@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: 231505b7a0a1 - main - x11-toolkits/gtk40: Remove broken FFmpeg option 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: 231505b7a0a17b15b74c2fa741783b6268c8e8e2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=231505b7a0a17b15b74c2fa741783b6268c8e8e2 commit 231505b7a0a17b15b74c2fa741783b6268c8e8e2 Author: Daniel Engberg AuthorDate: 2023-06-24 16:32:53 +0000 Commit: Daniel Engberg CommitDate: 2023-06-24 16:36:14 +0000 x11-toolkits/gtk40: Remove broken FFmpeg option This option is considered experimental by upstream and there's little to no interest of maintaining it so remove it Reference: https://gitlab.gnome.org/GNOME/gtk/-/issues/5581 PR: 271145 Approved by: desktop (maintainer timeout, 6+ weeks) --- x11-toolkits/gtk40/Makefile | 10 ++-------- x11-toolkits/gtk40/pkg-plist | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile index 9d331d94c4f4..f732caf88310 100644 --- a/x11-toolkits/gtk40/Makefile +++ b/x11-toolkits/gtk40/Makefile @@ -32,7 +32,7 @@ USE_LDCONFIG= yes USE_PERL5= build USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango \ librsvg2:run -MESON_ARGS= -Dbuild-testsuite=false +MESON_ARGS= -Dbuild-testsuite=false -Dmedia-ffmpeg=disabled LDFLAGS+= -lexecinfo BINARY_ALIAS= python3=${PYTHON_CMD} @@ -46,8 +46,7 @@ GLIB_SCHEMAS= org.gtk.Demo4.gschema.xml \ org.gtk.gtk4.Settings.EmojiChooser.gschema.xml \ org.gtk.gtk4.Settings.FileChooser.gschema.xml -OPTIONS_DEFINE= CUPS COLORD DEBUG BROADWAY FFMPEG \ - GSTREAMER VULKAN WAYLAND X11 +OPTIONS_DEFINE= CUPS COLORD DEBUG BROADWAY GSTREAMER VULKAN WAYLAND X11 OPTIONS_DEFAULT=CUPS COLORD BROADWAY GSTREAMER VULKAN WAYLAND X11 OPTIONS_SUB= yes @@ -61,11 +60,6 @@ COLORD_MESON_ENABLED= colord CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_MESON_ENABLED= print-cups -FFMPEG_DESC= FFmpeg multimedia backend -FFMPEG_MESON_ENABLED= media-ffmpeg -FFMPEG_RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg - GSTREAMER_DESC= GStreamer multimedia backend GSTREAMER_MESON_ENABLED=media-gstreamer GSTREAMER_USES= gstreamer diff --git a/x11-toolkits/gtk40/pkg-plist b/x11-toolkits/gtk40/pkg-plist index d89ce582b1bb..05f6e06e5645 100644 --- a/x11-toolkits/gtk40/pkg-plist +++ b/x11-toolkits/gtk40/pkg-plist @@ -389,7 +389,6 @@ lib/girepository-1.0/Gdk-4.0.typelib %%X11%%lib/girepository-1.0/GdkX11-4.0.typelib lib/girepository-1.0/Gsk-4.0.typelib lib/girepository-1.0/Gtk-4.0.typelib -%%FFMPEG%%lib/gtk-4.0/4.0.0/media/libmedia-ffmpeg.so %%GSTREAMER%%lib/gtk-4.0/4.0.0/media/libmedia-gstreamer.so %%CUPS%%lib/gtk-4.0/4.0.0/printbackends/libprintbackend-cups.so lib/gtk-4.0/4.0.0/printbackends/libprintbackend-file.so