68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
From 231505b7a0a17b15b74c2fa741783b6268c8e8e2 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Engberg <diizzy@FreeBSD.org>
|
|
Date: Sat, 24 Jun 2023 18:32:53 +0200
|
|
Subject: 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
|
|
--
|
|
cgit v1.2.3
|
|
|