Skip to content
Commits on Source (9)
Expand all Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 46632716
gtk4 (4.10.1+ds-2ubuntu1) lunar; urgency=medium
* Merge with Debian. Remaining changes:
- debian/tests:
+ include the memorytexture test in the flaky set, it has been unreliable
- debian/control:
+ Build-Depend on dh-sequence-translations
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 23 Mar 2023 19:40:46 +0100
gtk4 (4.10.1+ds-2) experimental; urgency=medium
* debian/patches: Add gstreamer-player as subproject.
It's used by gtk media to play videos, but it's currently in
gstreamer-plugins-bad. By just including this library inside gtk we can
avoid having dependency on gstreamer's bad set. (LP: #2011849)
* debian/control: build-depend on libgstreamer-plugins-base1.0-dev.
Remove instead dependency on libgstreamer-plugins-bad1.0-dev
* debian/rules: Also include gstreamer in udebs build.
We include some gstreamer sources in gtk now, so better to provide some
debug symbols too
* debian/control: Recommends libgtk-4-media-gstreamer.
Gtk media is considered a main element of gtk4, and not providing
support for it, implies shipping a broken gtk (as upstream sentenced).
So, let's recommend it. (LP: #2011849)
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 23 Mar 2023 18:23:32 +0100
gtk4 (4.10.1+ds-1ubuntu1) lunar; urgency=medium
* Sync with Debian. Remaining changes:
......
debian/control
View file @ 46632716
......@@ -3,13 +3,12 @@ Section: libs
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Simon McVittie <smcv@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
Uploaders: Simon McVittie <smcv@debian.org>,
Build-Depends: adwaita-icon-theme <!nocheck>,
at-spi2-core <!nocheck>,
dbus-daemon <!nocheck>,
debhelper-compat (= 13),
dh-exec,
dh-sequence-translations,
fonts-cantarell <!nocheck>,
fonts-dejavu-core <!nocheck>,
gnome-pkg-tools,
......@@ -34,7 +33,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
libglib2.0-dev (>= 2.72.0),
libgraphene-1.0-dev (>= 1.10.4~),
libgstreamer1.0-dev,
libgstreamer-plugins-bad1.0-dev,
libgstreamer-plugins-base1.0-dev,
libharfbuzz-dev (>= 2.6.0),
libjpeg-dev,
libjson-glib-dev:native,
......@@ -79,10 +78,8 @@ Build-Depends-Indep: gi-docgen <!nodoc>,
pandoc,
Rules-Requires-Root: no
Standards-Version: 4.6.2
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git
Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4/tree/ubuntu/master
Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git -b ubuntu/master
Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4
Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git
Homepage: https://www.gtk.org/
Package: libgtk-4-1
......@@ -98,8 +95,8 @@ Provides: gtk4-binver-4.0.0
Recommends: libgtk-4-bin,
iso-codes,
librsvg2-common (>= 2.52.0),
Suggests: gvfs,
libgtk-4-media-gstreamer | libgtk-4-media-ffmpeg,
libgtk-4-media-gstreamer,
Suggests: gvfs
Breaks: libgtk-4-0 (<< 4.0.0),
Replaces: libgtk-4-0 (<< 4.0.0),
Pre-Depends: ${misc:Pre-Depends}
......
debian/control.in
View file @ 46632716
......@@ -34,7 +34,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
libglib2.0-dev (>= 2.72.0),
libgraphene-1.0-dev (>= 1.10.4~),
libgstreamer1.0-dev,
libgstreamer-plugins-bad1.0-dev,
libgstreamer-plugins-base1.0-dev,
libharfbuzz-dev (>= 2.6.0),
libjpeg-dev,
libjson-glib-dev:native,
......@@ -98,8 +98,8 @@ Provides: @GTK_BINVER_DEP@
Recommends: @BIN_PKG@,
iso-codes,
librsvg2-common (>= 2.52.0),
Suggests: gvfs,
@MEDIA_GSTREAMER_PKG@ | @MEDIA_FFMPEG_PKG@,
@MEDIA_GSTREAMER_PKG@,
Suggests: gvfs
Breaks: libgtk-4-0 (<< 4.0.0),
Replaces: libgtk-4-0 (<< 4.0.0),
Pre-Depends: ${misc:Pre-Depends}
......
debian/patches/debian/gstreamer-player-1.0-Do-not-install-it-if-it-s-a-subproje.patch 0 → 100644
View file @ 46632716
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
Date: Fri, 17 Mar 2023 19:59:43 +0100
Subject: gstreamer-player-1.0: Do not install it if it's a subproject
Origin: https://gitlab.gnome.org/3v1n0/gtk/-/commits/gst-player-subproject
Forwarded: not-needed
---
subprojects/gstreamer-player-1.0/gst/play/meson.build | 8 ++++++--
subprojects/gstreamer-player-1.0/gst/player/meson.build | 9 +++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/subprojects/gstreamer-player-1.0/gst/play/meson.build b/subprojects/gstreamer-player-1.0/gst/play/meson.build
index 582b70f..b3e82ff 100644
--- a/subprojects/gstreamer-player-1.0/gst/play/meson.build
+++ b/subprojects/gstreamer-player-1.0/gst/play/meson.build
@@ -19,7 +19,9 @@ gstplay_headers = files(
'gstplay-visualization.h',
)
+if not meson.is_subproject()
install_headers(gstplay_headers, subdir : 'gstreamer-' + api_version + '/gst/play/')
+endif
gstplay = library('gstplay-' + api_version,
gstplay_sources,
@@ -28,12 +30,13 @@ gstplay = library('gstplay-' + api_version,
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
- install : true,
+ install : not meson.is_subproject(),
dependencies : [gstbase_dep, gstvideo_dep, gstaudio_dep,
gsttag_dep, gstpbutils_dep],
)
pkg_name = 'gstreamer-play-1.0'
+if not meson.is_subproject()
pkgconfig.generate(gstplay,
libraries : [gst_dep, gstvideo_dep],
variables : pkgconfig_variables,
@@ -41,6 +44,7 @@ pkgconfig.generate(gstplay,
name : pkg_name,
description : 'GStreamer Player convenience library',
)
+endif
library_def = {'lib': gstplay}
gen_sources = []
@@ -54,7 +58,7 @@ if build_gir
'export_packages' : pkg_name,
'includes' : ['Gst-1.0', 'GstPbutils-1.0', 'GstBase-1.0', 'GstVideo-1.0',
'GstAudio-1.0', 'GstTag-1.0'],
- 'install' : true,
+ 'install' : not meson.is_subproject(),
'extra_args' : gir_init_section + ['-DGST_USE_UNSTABLE_API'] + ['--c-include=gst/play/play.h'],
'dependencies' : [gstbase_dep, gstvideo_dep, gstaudio_dep,
gsttag_dep, gstpbutils_dep]
diff --git a/subprojects/gstreamer-player-1.0/gst/player/meson.build b/subprojects/gstreamer-player-1.0/gst/player/meson.build
index 0c273f0..0cfbdd9 100644
--- a/subprojects/gstreamer-player-1.0/gst/player/meson.build
+++ b/subprojects/gstreamer-player-1.0/gst/player/meson.build
@@ -22,7 +22,9 @@ gstplayer_headers = files([
'gstplayer-visualization.h',
])
+if not meson.is_subproject()
install_headers(gstplayer_headers, subdir : 'gstreamer-' + api_version + '/gst/player/')
+endif
gstplayer = library('gstplayer-' + api_version,
gstplayer_sources,
@@ -31,13 +33,15 @@ gstplayer = library('gstplayer-' + api_version,
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
- install : true,
+ install : false,
dependencies : [gstbase_dep, gstvideo_dep, gstaudio_dep, gstplay_dep,
gsttag_dep, gstpbutils_dep],
)
library_def = {'lib': gstplayer}
+
pkg_name = 'gstreamer-player-1.0'
+if not meson.is_subproject()
pkgconfig.generate(gstplayer,
libraries : [gst_dep, gstvideo_dep],
variables : pkgconfig_variables,
@@ -45,6 +49,7 @@ pkgconfig.generate(gstplayer,
name : 'gstreamer-player-1.0',
description : 'GStreamer Player convenience library',
)
+endif
gen_sources = []
if build_gir
@@ -57,7 +62,7 @@ if build_gir
'export_packages' : pkg_name,
'includes' : ['Gst-1.0', 'GstPbutils-1.0', 'GstBase-1.0', 'GstVideo-1.0',
'GstAudio-1.0', 'GstTag-1.0'],
- 'install' : true,
+ 'install' : not meson.is_subproject(),
'extra_args' : gir_init_section + ['-DGST_USE_UNSTABLE_API'] + ['--c-include=gst/player/player.h'],
'dependencies' : [gstbase_dep, gstvideo_dep, gstaudio_dep, gstplay_dep,
gsttag_dep, gstpbutils_dep]
debian/patches/debian/media-Use-gstplayer-from-meson-subproject.patch 0 → 100644
View file @ 46632716
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
Date: Fri, 17 Mar 2023 20:01:40 +0100
Subject: media: Use gstplayer from meson subproject
Origin: https://gitlab.gnome.org/3v1n0/gtk/-/commits/gst-player-subproject
Forwarded: not-needed
---
modules/media/meson.build | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/media/meson.build b/modules/media/meson.build
index 74364e6..556098f 100644
--- a/modules/media/meson.build
+++ b/modules/media/meson.build
@@ -39,6 +39,9 @@ if ffmpeg_found
)
endif
+subproject('gstreamer-player-1.0',
+ required: get_option('media-gstreamer'),
+ default_options: 'default_library=static')
gstplayer_dep = dependency('gstreamer-player-1.0', version: '>= 1.12.3',
required: get_option('media-gstreamer'))
gstgl_dep = dependency('gstreamer-gl-1.0', version: '>= 1.12.3',
debian/patches/series
View file @ 46632716
......@@ -3,3 +3,7 @@ debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
debian/reftests-Allow-minor-differences-to-be-tolerated.patch
debian/Disable-inscription-markup.ui-reftest.patch
debian/Disable-clipboard-test.patch
debian/subprojects-Add-gst-player-1.0-as-subporject.patch
debian/gstreamer-player-1.0-Do-not-install-it-if-it-s-a-subproje.patch
debian/media-Use-gstplayer-from-meson-subproject.patch
debian/gstreamer-player-Use-GtkName-Prefix-to-avoid-issues-if-ac.patch
debian/rules
View file @ 46632716
......@@ -143,7 +143,6 @@ configure_flags_udeb = \
-Ddemos=false \
-Dbuild-tests=false \
-Dinstall-tests=false \
-Dmedia-gstreamer=disabled \
-Dwayland-backend=false \
-Dx11-backend=true \
$(NULL)
......