automatic version update by autodist [release 4.12.1-1mamba;Thu Aug 31 2023]

This commit is contained in:
Automatic Build System 2024-01-06 04:30:29 +01:00
parent 2e6b9a22e1
commit c652bd20a5
2 changed files with 85 additions and 12 deletions

View File

@ -0,0 +1,67 @@
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

View File

@ -8,7 +8,7 @@
#%define gdk_pixbuf_version 2.26.0 #%define gdk_pixbuf_version 2.26.0
Name: libgtk Name: libgtk
Version: 4.10.1 Version: 4.12.1
Release: 1mamba Release: 1mamba
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs Summary: The GIMP ToolKit (GTK+), a library for creating GUIs
Group: System/Libraries Group: System/Libraries
@ -22,6 +22,7 @@ Source2: im-cedilla.conf
# https://bugzilla.gnome.org/show_bug.cgi?id=583273 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
Patch0: 0001-New-tooltip-style.patch Patch0: 0001-New-tooltip-style.patch
Patch1: libgtk3-fix-gtk-show-uri-crash.patch Patch1: libgtk3-fix-gtk-show-uri-crash.patch
Patch2: libgtk-4.12.1-upstream-disable-ffmpeg.patch
License: LGPL License: LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -34,10 +35,6 @@ BuildRequires: libXfixes-devel
BuildRequires: libXi-devel BuildRequires: libXi-devel
BuildRequires: libXinerama-devel BuildRequires: libXinerama-devel
BuildRequires: libXrandr-devel BuildRequires: libXrandr-devel
BuildRequires: libavcodec-ffmpeg-devel
BuildRequires: libavdevice-ffmpeg-devel
BuildRequires: libavformat-ffmpeg-devel
BuildRequires: libavutil-ffmpeg-devel
BuildRequires: libcairo-devel BuildRequires: libcairo-devel
BuildRequires: libcolord-devel BuildRequires: libcolord-devel
BuildRequires: libcups-devel BuildRequires: libcups-devel
@ -54,8 +51,6 @@ BuildRequires: libjpeg-devel
BuildRequires: libpango-devel BuildRequires: libpango-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: librsvg-devel BuildRequires: librsvg-devel
BuildRequires: libswresample-ffmpeg-devel
BuildRequires: libswscale-ffmpeg-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libvulkan-devel BuildRequires: libvulkan-devel
BuildRequires: libwayland-devel BuildRequires: libwayland-devel
@ -82,6 +77,7 @@ BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libat-spi2-atk-devel BuildRequires: libat-spi2-atk-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: shaderc
BuildRequires: wayland-protocols BuildRequires: wayland-protocols
Requires(post):libglib Requires(post):libglib
Requires(post):libgdk-pixbuf Requires(post):libgdk-pixbuf
@ -138,7 +134,6 @@ gtk+ API documentation.
%meson \ %meson \
-Dx11-backend=true \ -Dx11-backend=true \
-Dwayland-backend=true \ -Dwayland-backend=true \
-Dmedia-ffmpeg=enabled \
-Dmedia-gstreamer=enabled \ -Dmedia-gstreamer=enabled \
-Dprint-cups=enabled \ -Dprint-cups=enabled \
-Dvulkan=enabled \ -Dvulkan=enabled \
@ -146,6 +141,7 @@ gtk+ API documentation.
-Dman-pages=true \ -Dman-pages=true \
-Dintrospection=enabled -Dintrospection=enabled
# -Dmedia-ffmpeg=enabled \
# -Dgtk_doc=true \ # -Dgtk_doc=true \
%meson_build %meson_build
@ -201,7 +197,7 @@ FS=`stat -c %s %{_sysconfdir}/gtk-%{libver}/gtk-pixbuf.loaders 2>/dev/null`
%dir %{_libdir}/gtk-%{libver} %dir %{_libdir}/gtk-%{libver}
%dir %{_libdir}/gtk-%{libver}/%{binver} %dir %{_libdir}/gtk-%{libver}/%{binver}
%ghost %{_libdir}/gtk-%{libver}/%{binver}/immodules.cache %ghost %{_libdir}/gtk-%{libver}/%{binver}/immodules.cache
%{_libdir}/gtk-%{libver}/%{binver}/media/libmedia-ffmpeg.so #%{_libdir}/gtk-%{libver}/%{binver}/media/libmedia-ffmpeg.so
%{_libdir}/gtk-%{libver}/%{binver}/media/libmedia-gstreamer.so %{_libdir}/gtk-%{libver}/%{binver}/media/libmedia-gstreamer.so
%dir %{_libdir}/gtk-%{libver}/%{binver}/printbackends %dir %{_libdir}/gtk-%{libver}/%{binver}/printbackends
#%{_libdir}/gtk-%{libver}/%{binver}/printbackends/libprintbackend-*.la #%{_libdir}/gtk-%{libver}/%{binver}/printbackends/libprintbackend-*.la
@ -249,6 +245,7 @@ FS=`stat -c %s %{_sysconfdir}/gtk-%{libver}/gtk-pixbuf.loaders 2>/dev/null`
%{_bindir}/gtk4-icon-browser %{_bindir}/gtk4-icon-browser
%{_bindir}/gtk4-node-editor %{_bindir}/gtk4-node-editor
%{_bindir}/gtk4-print-editor %{_bindir}/gtk4-print-editor
%{_bindir}/gtk4-rendernode-tool
%{_bindir}/gtk4-widget-factory %{_bindir}/gtk4-widget-factory
%dir %{_includedir}/gtk-%{libver} %dir %{_includedir}/gtk-%{libver}
%dir %{_includedir}/gtk-%{libver}/gsk %dir %{_includedir}/gtk-%{libver}/gsk
@ -263,13 +260,18 @@ FS=`stat -c %s %{_sysconfdir}/gtk-%{libver}/gtk-pixbuf.loaders 2>/dev/null`
%{_includedir}/gtk-%{libver}/gtk/css/* %{_includedir}/gtk-%{libver}/gtk/css/*
%dir %{_includedir}/gtk-%{libver}/gtk/deprecated %dir %{_includedir}/gtk-%{libver}/gtk/deprecated
%{_includedir}/gtk-%{libver}/gtk/deprecated/*.h %{_includedir}/gtk-%{libver}/gtk/deprecated/*.h
%dir %{_includedir}/gtk-%{libver}/gtk/print
%{_includedir}/gtk-%{libver}/gtk/print/*
%dir %{_includedir}/gtk-%{libver}/unix-print
%{_includedir}/gtk-%{libver}/unix-print/*
%dir %{_includedir}/gtk-%{libver}/gdk %dir %{_includedir}/gtk-%{libver}/gdk
%{_includedir}/gtk-%{libver}/gdk/*.h %{_includedir}/gtk-%{libver}/gdk/*.h
%dir %{_includedir}/gtk-%{libver}/gdk/deprecated
%{_includedir}/gtk-%{libver}/gdk/deprecated/*
%dir %{_includedir}/gtk-%{libver}/gdk/version
%{_includedir}/gtk-%{libver}/gdk/version/*
%dir %{_includedir}/gtk-%{libver}/gdk/wayland %dir %{_includedir}/gtk-%{libver}/gdk/wayland
%{_includedir}/gtk-%{libver}/gdk/wayland/*.h %{_includedir}/gtk-%{libver}/gdk/wayland/*.h
%dir %{_includedir}/gtk-%{libver}/unix-print
%dir %{_includedir}/gtk-%{libver}/unix-print/gtk
%{_includedir}/gtk-%{libver}/unix-print/gtk/*.h
%dir %{_includedir}/gtk-%{libver}/gdk/x11 %dir %{_includedir}/gtk-%{libver}/gdk/x11
%{_includedir}/gtk-%{libver}/gdk/x11/*.h %{_includedir}/gtk-%{libver}/gdk/x11/*.h
%{_libdir}/libgtk-4.so %{_libdir}/libgtk-4.so
@ -312,6 +314,7 @@ FS=`stat -c %s %{_sysconfdir}/gtk-%{libver}/gtk-pixbuf.loaders 2>/dev/null`
%{_mandir}/man1/gtk4-encode-symbolic-svg.1* %{_mandir}/man1/gtk4-encode-symbolic-svg.1*
%{_mandir}/man1/gtk4-icon-browser.1* %{_mandir}/man1/gtk4-icon-browser.1*
%{_mandir}/man1/gtk4-node-editor.1* %{_mandir}/man1/gtk4-node-editor.1*
%{_mandir}/man1/gtk4-rendernode-tool.1*
%{_mandir}/man1/gtk4-widget-factory.1* %{_mandir}/man1/gtk4-widget-factory.1*
#%doc ChangeLog HACKING NEWS README #%doc ChangeLog HACKING NEWS README
@ -321,6 +324,9 @@ FS=`stat -c %s %{_sysconfdir}/gtk-%{libver}/gtk-pixbuf.loaders 2>/dev/null`
#%{_datadir}/gtk-doc/html/gtk4/* #%{_datadir}/gtk-doc/html/gtk4/*
%changelog %changelog
* Thu Aug 31 2023 Automatic Build System <autodist@mambasoft.it> 4.12.1-1mamba
- automatic version update by autodist
* Wed Mar 15 2023 Automatic Build System <autodist@mambasoft.it> 4.10.1-1mamba * Wed Mar 15 2023 Automatic Build System <autodist@mambasoft.it> 4.10.1-1mamba
- automatic version update by autodist - automatic version update by autodist