Skip to content

Commit

Permalink
x11-toolkits/gtk40: Remove broken FFmpeg option
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
Daniel Engberg authored and Daniel Engberg committed Jun 24, 2023
1 parent 1965c3f commit 231505b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
10 changes: 2 additions & 8 deletions x11-toolkits/gtk40/Makefile
Expand Up @@ -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}
Expand All @@ -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

Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion x11-toolkits/gtk40/pkg-plist
Expand Up @@ -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
Expand Down

0 comments on commit 231505b

Please sign in to comment.