From 5c471b60e02bc664ff2444178b8390dcd146ae73 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 9 Oct 2023 15:40:28 -0400
Subject: [PATCH] F39

---
 container.yaml |  9 ++---
 mpv.yaml       | 93 --------------------------------------------------
 2 files changed, 5 insertions(+), 97 deletions(-)
 delete mode 100644 mpv.yaml

diff --git a/container.yaml b/container.yaml
index 7ab5104..674df6c 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,6 +1,3 @@
-compose:
-    modules:
-    - mpv:stable
 flatpak:
     id: io.mpv.Mpv
     branch: stable
@@ -25,5 +22,9 @@ flatpak:
         --own-name=org.mpris.MediaPlayer2.mpv.*
         --talk-name=org.gnome.SessionManager
     cleanup-commands: |
-        sed -i -e '1s/-sP/-P/' /app/bin/yt-dlp
         sed -i -e 's/io\.mpv\.mpv/io.mpv.Mpv/' /app/share/metainfo/mpv.metainfo.xml
+    runtime-name: flatpak-runtime
+    runtime-version: f39
+    packages:
+        - mpv
+        - yt-dlp
diff --git a/mpv.yaml b/mpv.yaml
deleted file mode 100644
index 5bea492..0000000
--- a/mpv.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  summary: Movie player playing most video formats and DVDs
-  description: >-
-    Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
-    of video file formats, audio and video codecs, and subtitle types. Special input
-    URL types are available to read input from a variety of sources other than disk
-    files. Depending on platform, a variety of different video and audio output methods
-    are supported.
-
-    Mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many
-    features loved by videophiles, such as video scaling with popular high quality
-    algorithms, color management, frame timing, interpolation, HDR, and more.
-
-    While mpv strives for minimalism and provides no real GUI, it has a small controller
-    on top of the video for basic control.
-
-    Mpv can leverage most hardware decoding APIs on all platforms. Hardware decoding
-    can be enabled at runtime on demand.
-
-    Powerful scripting capabilities can make the player do almost anything. There
-    is a large selection of user scripts on the wiki.
-
-    A straightforward C API was designed from the ground up to make mpv usable as
-    a library and facilitate easy integration into other applications.
-  license:
-    module:
-    - MIT
-  buildopts:
-    arches: [aarch64, x86_64]
-  dependencies:
-  - buildrequires:
-      flatpak-common: [f38]
-      flatpak-runtime: [f38]
-      platform: [f38]
-    requires:
-      flatpak-common: [f38]
-      flatpak-runtime: [f38]
-      platform: [f38]
-  profiles:
-    default:
-      rpms:
-      - mpv
-      - yt-dlp
-  components:
-    rpms:
-      compat-lua:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
-      libXpresent:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
-      libtomcrypt:
-        rationale: Runtime dependency of python-pycryptodomex
-        ref: f38
-        buildorder: 10
-        arches: [aarch64, x86_64]
-      libtommath:
-        rationale: Runtime dependency of libtomcrypt
-        ref: f38
-        arches: [aarch64, x86_64]
-      mpv:
-        rationale: Application package
-        ref: f38
-        buildorder: 100
-        arches: [aarch64, x86_64]
-      python-certifi:
-        rationale: Runtime dependency of yt-dlp
-        ref: f38
-        arches: [aarch64, x86_64]
-      python-mutagen:
-        rationale: Runtime dependency of yt-dlp
-        ref: f38
-        arches: [aarch64, x86_64]
-      python-pycryptodomex:
-        rationale: Runtime dependency of yt-dlp
-        ref: f38
-        buildorder: 20
-        arches: [aarch64, x86_64]
-      python-websockets:
-        rationale: Runtime dependency of yt-dlp
-        ref: f39
-        arches: [aarch64, x86_64]
-      yt-dlp:
-        rationale: Runtime dependency of mpv
-        ref: f38
-        buildorder: 100
-        arches: [aarch64, x86_64]
-...