Update from latest upstream

Makefile.am

@@ -2,7 +2,10 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = src data docs po
 
-EXTRA_DIST = README.md AUTHORS meson.build docs/meson.build test/meson.build test/test-option-parser.c meson-post-install.py po/meson.build
+EXTRA_DIST = \
+	README.md AUTHORS meson-post-install.py \
+	meson.build docs/meson.build test/meson.build po/meson.build \
+	test/test-option-parser.c test/test-playlist-model.c
 
 UPDATE_DESKTOP = update-desktop-database -q || :
 UPDATE_ICON = gtk-update-icon-cache -q $(datadir)/icons/hicolor/ || :

README

@@ -6,35 +6,32 @@ mpv's powerful playback capabilities.
 
 ![Screenshot](https://celluloid-player.github.io/images/screenshot-0.png)
 
+Repository Mirror: https://codeberg.org/celluloid-player/celluloid
+
 ## Dependencies
 
-- appstream-glib<sup>[[1]](#note1)</sup> (build)
-- autoconf >= 2.69<sup>[[1]](#note1)</sup> (build)
-- autoconf-archive<sup>[[1]](#note1)</sup> (build)
-- automake >= 1.12<sup>[[1]](#note1)</sup> (build)
+- appstream-glib (build)
 - pkg-config (build)
 - gcc (build)
-- glib >= 2.44
-- gtk >= 3.22
+- glib >= 2.66
+- gtk >= 4.6.1
+- libadwaita >= 1.2.0
 - mpv >= 0.32
 - epoxy
 - lua (optional)
 - youtube-dl (optional)
 
-<a name="note1">[1]</a>: Not required when building from release tarballs
-
 ## Installation
 
-### GNU/Linux packages
-- Arch Linux: https://www.archlinux.org/packages/celluloid
-- Arch Linux (Git): https://aur.archlinux.org/packages/celluloid-git
-- Debian: https://tracker.debian.org/pkg/celluloid
-- Fedora (rpmfusion): https://admin.rpmfusion.org/pkgdb/package/free/celluloid/
-- OpenSUSE: https://software.opensuse.org/package/celluloid
-- Gentoo: https://packages.gentoo.org/packages/media-video/celluloid
-- Guix: https://guix.gnu.org/en/packages/celluloid-0.20
-- Solus: https://packages.getsol.us/shannon/g/gnome-mpv/
-- Ubuntu: https://launchpad.net/~xuzhen666/+archive/ubuntu/gnome-mpv
+### Packages
+
+<a href="https://repology.org/project/celluloid/versions">
+    <img src="https://repology.org/badge/vertical-allrepos/celluloid.svg?columns=4" alt="Packaging status">
+</a>
+
+Ubuntu users can use
+[this PPA](https://launchpad.net/~xuzhen666/+archive/ubuntu/gnome-mpv) to get
+more up-to-date versions of Celluloid.
 
 ### Flatpak
 
@@ -48,30 +45,19 @@ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flat
 flatpak install flathub io.github.celluloid_player.Celluloid
 ```
 
-Development versions are also packaged:
+### Snap
+
+Stable releases are hosted on [Snapcraft](https://snapcraft.io):
 
 ```sh
-flatpak install https://dl.tingping.se/flatpak/gnome-mpv.flatpakref
+sudo snap install celluloid
 ```
 
-
 ### Source code
 Run the following command in the source code directory to build and install:
 
 ```sh
-meson build && cd build && ninja && sudo ninja install
-```
-
-Alternatively, you can use Autotools:
-
-```sh
-./autogen.sh && make && sudo make install
-```
-
-When building from release tarballs, replace `./autogen.sh` with `./configure`:
-
-```sh
-./configure && make && sudo make install
+meson setup build && cd build && ninja && sudo ninja install
 ```
 
 ## Usage
@@ -100,19 +86,21 @@ your keyboard.
 
 ### Configuration
 
-Celluloid can be configured using the preferences dialog accessible via the
-"Preferences" menu item. Additional configuration options can be set from an
-external file using the same syntax as mpv's `mpv.conf`.
-See [mpv's manual](https://mpv.io/manual/stable/) for the full list of options.
-The file must be specified and enabled in the preferences dialog under the "MPV
-Configuration" section.
+Celluloid can be configured using the preferences dialog accessible through the
+`Preferences` menu item. A number of less common options are also available in
+the `dconf` database. You can configure these using a tool like
+[Dconf Editor](https://wiki.gnome.org/Apps/DconfEditor).
 
-It is also possible to set mpv options by putting the options &mdash; as you
-would pass to mpv on the command line &mdash; in `Extra MPV Options` text box in
-the preferences dialog. You can also pass options directly on the command line
-by adding `mpv-` prefix to the option name. For example, using the option
-`--mpv-vf=flip` when launching Celluloid is equivalent to using `--vf=flip` in
-mpv.
+mpv-specific options can be set by creating a configuration file using mpv's
+`mpv.conf` syntax. See [mpv's manual](https://mpv.io/manual/stable/) for the
+full list of options. The file must be specified and enabled in the preferences
+dialog under the "MPV Configuration" section for it to take effect.
+
+It is also possible to set mpv options by putting the options as you would pass
+to mpv on the command line in the `Extra MPV Options` text box in the
+preferences dialog. If you want to set these options on the command line, you
+can do so by adding `mpv-` prefix to the name of the option you want to set.
+For example, the option `--mpv-vf=flip` is equivalent to `--vf=flip` in mpv.
 
 ### User Scripts
 
@@ -140,12 +128,10 @@ Additional keybindings can be defined in an external file using mpv's
 
 ## Contributing Translations
 
-Celluloid uses [Zanata](https://zanata.org) to coordinate
-translations. You can find Celluloid's page
-[here](https://translate.zanata.org/iteration/view/celluloid/master). To
-start translating, follow the instructions
-[here](http://docs.zanata.org/en/release/user-guide/translator-guide/). If you'd
-like to add a new language, open an issue on GitHub.
+![Translation Status](https://hosted.weblate.org/widgets/celluloid/-/celluloid/horizontal-auto.svg)
+
+Celluloid uses [Weblate](https://weblate.org) to coordinate translations. You
+can find Celluloid's page [here](https://hosted.weblate.org/projects/celluloid).
 
 While translating, you will find the string `translator-credits`. You should not
 translate this string. Instead, you should put your name, and optionally your

celluloid.doap

@@ -0,0 +1,27 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:gnome="http://api.gnome.org/doap-extensions#"
+         xmlns="http://usefulinc.com/ns/doap#">
+
+  <name xml:lang="en">Celluloid</name>
+  <shortdesc xml:lang="en">Plays videos</shortdesc>
+  <homepage rdf:resource="https://celluloid-player.github.io" />
+  <bug-database rdf:resource="https://github.com/celluloid-player/celluloid/issues" />
+  <programming-language>C</programming-language>
+  <platform>GTK 4</platform>
+  <platform>Libadwaita</platform>
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>gnome-mpv</foaf:name>
+      <foaf:mbox rdf:resource="mailto:[email protected]" />
+      <foaf:account>
+        <foaf:OnlineAccount>
+          <foaf:accountServiceHomepage rdf:resource="https://github.com" />
+          <foaf:accountName>gnome-mpv</foaf:accountName>
+        </foaf:OnlineAccount>
+      </foaf:account>
+    </foaf:Person>
+  </maintainer>
+</Project>

configure.ac

@@ -1,7 +1,7 @@
 AC_PREREQ([2.69])
 
 AC_INIT(	[celluloid],
-		[0.21],
+		[0.27],
 		[http://github.com/celluloid-player/celluloid/issues],
 		[celluloid],
 		[http://github.com/celluloid/celluloid] )
@@ -90,14 +90,14 @@ AS_IF([test "x$GLIB_GENMARSHAL" = "x"], [
 	AC_MSG_ERROR([Could not find glib-genmarshal])
 ])
 
-PKG_CHECK_MODULES(DEPS, [gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.107 epoxy])
+PKG_CHECK_MODULES(DEPS, [gtk4 >= 4.6.1 glib-2.0 >= 2.66 libadwaita-1 >= 1.2.0 mpv >= 1.107 epoxy])
 AC_SEARCH_LIBS([sqrt], [m])
 
-AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_44], [Dont warn using older APIs])
-AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_44], [Prevents using newer APIs])
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_66], [Dont warn using older APIs])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_66], [Prevents using newer APIs])
 
-AC_DEFINE([GDK_VERSION_MIN_REQUIRED], [GDK_VERSION_3_22], [Dont warn using older APIs])
-AC_DEFINE([GDK_VERSION_MAX_ALLOWED], [GDK_VERSION_3_22], [Prevents using newer APIs])
+AC_DEFINE([GDK_VERSION_MIN_REQUIRED], [GDK_VERSION_4_6], [Dont warn using older APIs])
+AC_DEFINE([GDK_VERSION_MAX_ALLOWED], [GDK_VERSION_4_6], [Prevents using newer APIs])
 
 AC_DEFINE_UNQUOTED([G_LOG_DOMAIN], "$PACKAGE_NAME", [Default logging facility])
 
@@ -114,6 +114,10 @@ AC_CONFIG_FILES([Makefile src/Makefile data/Makefile docs/Makefile po/Makefile.i
 AC_OUTPUT
 
 echo "
+################################################################################
+#    THE AUTOMAKE BUILD SCRIPT IS DEPRECATED. CONSIDER USING MESON INSTEAD.    #
+################################################################################
+
 	$PACKAGE $VERSION
 
 	prefix ........: $prefix

data/Makefile.am

@@ -1,4 +1,4 @@
-gsettings_SCHEMAS = io.github.celluloid_player.Celluloid.gschema.xml io.github.GnomeMpv.gschema.xml
+gsettings_SCHEMAS = io.github.celluloid_player.Celluloid.gschema.xml
 
 @GSETTINGS_RULES@
 
@@ -35,7 +35,6 @@ EXTRA_DIST =	$(appstream_in_files) \
 		$(dbusservice_in_files) \
 		io.github.celluloid_player.Celluloid.svg \
 		io.github.celluloid_player.Celluloid-symbolic.svg \
-		io.github.GnomeMpv.gschema.xml \
 		io.github.celluloid_player.Celluloid.gschema.xml \
 		celluloid-mpris-gdbus.xml \
 		celluloid-marshal.lst \