From: Simon McVittie Date: Fri, 5 Nov 2021 16:46:26 +0000 (+0000) Subject: d/control.in, d/rules: Gate libgtk-4-media-ffmpeg with a build-profile X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~9 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d863efc919f841ded22664ea86749242516b989e;p=gtk4.git d/control.in, d/rules: Gate libgtk-4-media-ffmpeg with a build-profile If we only build it for experimental uploads, but there is no version currently in experimental, then its entry in the overrides file will be removed after a while, causing the next upload to be considered NEW. --- diff --git a/debian/control b/debian/control index d26824fcca..79482de03f 100644 --- a/debian/control +++ b/debian/control @@ -237,6 +237,7 @@ Description: GStreamer media backend for the GTK graphical user interface librar This package contains the media module that uses GStreamer as backend. Package: libgtk-4-media-ffmpeg +Build-Profiles: Section: x11 Architecture: any Multi-Arch: foreign diff --git a/debian/control.in b/debian/control.in index 0a79349db4..241075ebe9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -237,6 +237,7 @@ Description: GStreamer media backend for the GTK graphical user interface librar This package contains the media module that uses GStreamer as backend. Package: @MEDIA_FFMPEG_PKG@ +Build-Profiles: Section: x11 Architecture: any Multi-Arch: foreign diff --git a/debian/rules b/debian/rules index 5ccb987c41..e8101d501a 100755 --- a/debian/rules +++ b/debian/rules @@ -52,17 +52,6 @@ export README_MD_MAYBE_GZ := README.md$(shell find -maxdepth 1 -size +4k -name R # corresponding ".in" file; pass the list of packages in $(1) dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1))))) -# Upstream consider the ffmpeg backend to be experimental, let's not -# inflict that on suites other than experimental. -ifeq (,$(filter-out Debian/experimental %/UNRELEASED,$(DEB_VENDOR)/$(DEB_DISTRIBUTION))) -$(info Enabling ffmpeg because this is an experimental or UNRELEASED build) -media_ffmpeg = enabled -else -$(info Disabling ffmpeg by default) -media_ffmpeg = disabled -dh_options += -N$(MEDIA_FFMPEG_PKG) -endif - debian/%: debian/%.in dh_testdir sed \ @@ -92,7 +81,6 @@ configure_flags_deb = \ -Dauto_features=enabled \ -Dbroadway-backend=false \ -Dman-pages=true \ - -Dmedia-ffmpeg=$(media_ffmpeg) \ -Dx11-backend=true \ ${NULL} @@ -130,6 +118,14 @@ else configure_flags_deb += -Dinstall-tests=true endif +# Upstream consider the ffmpeg backend to be experimental, let's not +# build that by default. +ifeq ($(filter $(MEDIA_FFMPEG_PKG),$(built_binaries)),) +configure_flags_deb += -Dmedia-ffmpeg=disabled +else +configure_flags_deb += -Dmedia-ffmpeg=enabled +endif + ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes), yes) # Not in main repository configure_flags_deb += -Dcloudproviders=disabled