From 9d9759991b0afc0be39e2fb29ce65ac477822308 Mon Sep 17 00:00:00 2001 From: Rafostar <40623528+Rafostar@users.noreply.github.com> Date: Mon, 26 Oct 2020 22:41:22 +0100 Subject: [PATCH] Update flatpak sources --- pkgs/flatpak/codecs/ffmpeg.json | 9 ++++- pkgs/flatpak/codecs/gst-libav.json | 6 +-- pkgs/flatpak/codecs/gst-plugins-bad-927.patch | 28 ------------- pkgs/flatpak/codecs/gst-plugins-bad.json | 13 +++--- pkgs/flatpak/codecs/gst-plugins-ugly.json | 6 +-- pkgs/flatpak/codecs/libass.json | 1 + pkgs/flatpak/codecs/libdvdcss.json | 1 + pkgs/flatpak/codecs/libdvdnav.json | 1 + pkgs/flatpak/codecs/libdvdread.json | 1 + pkgs/flatpak/com.github.rafostar.Clapper.yml | 40 +++++++++---------- 10 files changed, 41 insertions(+), 65 deletions(-) delete mode 100644 pkgs/flatpak/codecs/gst-plugins-bad-927.patch diff --git a/pkgs/flatpak/codecs/ffmpeg.json b/pkgs/flatpak/codecs/ffmpeg.json index 2e83ad18..aa815a12 100644 --- a/pkgs/flatpak/codecs/ffmpeg.json +++ b/pkgs/flatpak/codecs/ffmpeg.json @@ -1,5 +1,10 @@ { "name": "ffmpeg", + "cleanup": [ + "/lib/codecs/share/ffmpeg/examples", + "/lib/codecs/lib/pkgconfig", + "/lib/codecs/include" + ], "config-opts": [ "--prefix=/app/lib/codecs/", "--libdir=/app/lib/codecs/lib", @@ -42,8 +47,8 @@ { "type": "git", "url": "https://git.ffmpeg.org/ffmpeg.git", - "tag": "n4.2.4", - "commit": "f9f95ceebfbd7b7f43c1b7ad34e25d366e6e2d2b" + "tag": "n4.3.1", + "commit": "6b6b9e593dd4d3aaf75f48d40a13ef03bdef9fdb" } ] } diff --git a/pkgs/flatpak/codecs/gst-libav.json b/pkgs/flatpak/codecs/gst-libav.json index 278b0f41..5a41abed 100644 --- a/pkgs/flatpak/codecs/gst-libav.json +++ b/pkgs/flatpak/codecs/gst-libav.json @@ -8,8 +8,8 @@ { "type": "git", "url": "https://gitlab.freedesktop.org/gstreamer/gst-libav.git", - "tag": "1.16.2", - "commit": "090cfd40aad49ad645a9bf4bdd62e65b739c95f3" + "tag": "1.18.0", + "commit": "215b3ed959f2b307065319f94855cc9e1ce7be95" }, { "type": "patch", @@ -18,6 +18,6 @@ ], "post-install": [ "mkdir -p /app/lib/codecs/lib/gstreamer-1.0", - "mv /app/lib/gstreamer-1.0/*.so /app/lib/codecs/lib/gstreamer-1.0" + "mv /app/lib/gstreamer-1.0/*.so /app/lib/codecs/lib/gstreamer-1.0/" ] } diff --git a/pkgs/flatpak/codecs/gst-plugins-bad-927.patch b/pkgs/flatpak/codecs/gst-plugins-bad-927.patch deleted file mode 100644 index 056d229c..00000000 --- a/pkgs/flatpak/codecs/gst-plugins-bad-927.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 40ab4538575dffc7791c7d289d60d30153723307 Mon Sep 17 00:00:00 2001 -From: Nicolas Dufresne -Date: Thu, 19 Dec 2019 15:19:29 -0500 -Subject: [PATCH] autoconvert: Fix lock-less exchange or free condition - -Before this change, we would free the list we just have saved. - -Fixes #1158 ---- - gst/autoconvert/gstautoconvert.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c -index 46bec1314..7bf7cac3c 100644 ---- a/gst/autoconvert/gstautoconvert.c -+++ b/gst/autoconvert/gstautoconvert.c -@@ -895,7 +895,7 @@ gst_auto_convert_load_factories (GstAutoConvert * autoconvert) - - g_assert (all_factories); - -- if (g_atomic_pointer_compare_and_exchange (&autoconvert->factories, NULL, -+ if (!g_atomic_pointer_compare_and_exchange (&autoconvert->factories, NULL, - all_factories)) { - gst_plugin_feature_list_free (all_factories); - } --- -2.22.2 - diff --git a/pkgs/flatpak/codecs/gst-plugins-bad.json b/pkgs/flatpak/codecs/gst-plugins-bad.json index a7d98393..f8a999c4 100644 --- a/pkgs/flatpak/codecs/gst-plugins-bad.json +++ b/pkgs/flatpak/codecs/gst-plugins-bad.json @@ -4,22 +4,19 @@ "cleanup": [ "/bin/*webrtc*", "/bin/crossfade", "/bin/tsparser", "/bin/playout" ], "config-opts": [ "-Dopenh264=disabled", - "-Dvdpau=disabled" + "-Dvdpau=disabled", + "-Dvulkan=disabled" ], "sources": [ { "type": "git", "url": "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git", - "tag": "1.16.2", - "commit": "a6f26408f74a60d02ce6b4f0daee392ce847055f" - }, - { - "type": "patch", - "path": "gst-plugins-bad-927.patch" + "tag": "1.18.0", + "commit": "7cb583bb0427819a6b59b783e7df67961df2155f" } ], "post-install": [ "mkdir -p /app/lib/codecs/lib/gstreamer-1.0", - "mv /app/lib/gstreamer-1.0/*.so /app/lib/codecs/lib/gstreamer-1.0" + "mv /app/lib/gstreamer-1.0/*.so /app/lib/codecs/lib/gstreamer-1.0/" ] } diff --git a/pkgs/flatpak/codecs/gst-plugins-ugly.json b/pkgs/flatpak/codecs/gst-plugins-ugly.json index 1f7c8a63..7f56d139 100644 --- a/pkgs/flatpak/codecs/gst-plugins-ugly.json +++ b/pkgs/flatpak/codecs/gst-plugins-ugly.json @@ -8,12 +8,12 @@ { "type": "git", "url": "https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly.git", - "tag": "1.16.2", - "commit": "4b2943ee2788331e4000f0f7e226cd5ce2c135a4" + "tag": "1.18.0", + "commit": "ae91a81d9aa913cee1e8310af93a8fff5445628d" } ], "post-install": [ "mkdir -p /app/lib/codecs/lib/gstreamer-1.0", - "mv /app/lib/gstreamer-1.0/*.so /app/lib/codecs/lib/gstreamer-1.0" + "mv /app/lib/gstreamer-1.0/*.so /app/lib/codecs/lib/gstreamer-1.0/" ] } diff --git a/pkgs/flatpak/codecs/libass.json b/pkgs/flatpak/codecs/libass.json index a968b406..ef7c5a1f 100644 --- a/pkgs/flatpak/codecs/libass.json +++ b/pkgs/flatpak/codecs/libass.json @@ -1,5 +1,6 @@ { "name": "libass", + "config-opts": [ "--enable-shared", "--disable-static" ], "sources": [ { "type": "git", diff --git a/pkgs/flatpak/codecs/libdvdcss.json b/pkgs/flatpak/codecs/libdvdcss.json index a706b71a..e25a41c9 100644 --- a/pkgs/flatpak/codecs/libdvdcss.json +++ b/pkgs/flatpak/codecs/libdvdcss.json @@ -1,5 +1,6 @@ { "name": "libdvdcss", + "config-opts": [ "--enable-shared", "--disable-static" ], "sources": [ { "type": "git", diff --git a/pkgs/flatpak/codecs/libdvdnav.json b/pkgs/flatpak/codecs/libdvdnav.json index fef6a1c3..0dc65d4c 100644 --- a/pkgs/flatpak/codecs/libdvdnav.json +++ b/pkgs/flatpak/codecs/libdvdnav.json @@ -1,5 +1,6 @@ { "name": "libdvdnav", + "config-opts": [ "--enable-shared", "--disable-static" ], "sources": [ { "type": "git", diff --git a/pkgs/flatpak/codecs/libdvdread.json b/pkgs/flatpak/codecs/libdvdread.json index 0c2255bb..b7a2e2af 100644 --- a/pkgs/flatpak/codecs/libdvdread.json +++ b/pkgs/flatpak/codecs/libdvdread.json @@ -1,5 +1,6 @@ { "name": "libdvdread", + "config-opts": [ "--enable-shared", "--disable-static" ], "sources": [ { "type": "git", diff --git a/pkgs/flatpak/com.github.rafostar.Clapper.yml b/pkgs/flatpak/com.github.rafostar.Clapper.yml index 77b1e34f..afbfb6d3 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper.yml +++ b/pkgs/flatpak/com.github.rafostar.Clapper.yml @@ -1,6 +1,6 @@ app-id: com.github.rafostar.Clapper runtime: org.gnome.Platform -runtime-version: 3.36 +runtime-version: 3.38 sdk: org.gnome.Sdk command: com.github.rafostar.Clapper finish-args: @@ -8,34 +8,32 @@ finish-args: - --socket=fallback-x11 - --socket=wayland - --device=dri - - --filesystem=xdg-videos + - --filesystem=xdg-config/clapper - --socket=pulseaudio - --share=network - --env=GST_PLUGIN_PATH=/app/lib/codecs/lib/gstreamer-1.0 + - --env=GST_VAAPI_ALL_DRIVERS=1 modules: - - name: gst-vaapi - buildsystem: meson - sources: - - type: git - url: git://anongit.freedesktop.org/gstreamer/gstreamer-vaapi - tag: 1.16.2 - post-install: - - mkdir -p /app/lib/codecs/lib/gstreamer-1.0 - - mv /app/lib/gstreamer-1.0/*.so /app/lib/codecs/lib/gstreamer-1.0 - #- codecs/liba52.json - #- codecs/libmpeg2.json - #- codecs/gst-plugins-ugly.json - #- codecs/libdvdcss.json - #- codecs/libdvdread.json - #- codecs/libdvdnav.json - #- codecs/libass.json - #- codecs/ffmpeg.json + - codecs/liba52.json + - codecs/libmpeg2.json + - codecs/libdvdcss.json + - codecs/libdvdread.json + - codecs/libdvdnav.json + - codecs/libass.json + - codecs/ffmpeg.json + - codecs/gst-plugins-bad.json + - codecs/gst-plugins-ugly.json - codecs/gst-libav.json - #- codecs/gst-plugins-bad.json + - codecs/gst-vaapi.json - name: clapper buildsystem: meson sources: - type: git url: https://github.com/Rafostar/clapper.git - commit: 6938f014332562e1b7c8f22bf755338268b98d5f + commit: ac06e84851a592a2536e799c7d381796ef81d758 + +cleanup-commands: + - mv /app/lib/libdvd*.* /app/lib/liba52*.* /app/lib/codecs/lib/ + - mv /app/lib/libass.* /app/lib/codecs/lib/ + - mkdir -p /app/lib/ffmpeg