From 74d9ed95ee961f719a8f5c6f19ecb664d5ebc837 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 03:13:15 +0200 Subject: Merging debian version 0.38.0-1. Signed-off-by: Daniel Baumann --- debian/changelog | 14 ++++++++++++++ debian/control | 2 +- debian/copyright | 2 -- debian/patches/0001-Add-keywords-to-desktop-file.patch | 17 ----------------- debian/patches/series | 1 - debian/rules | 9 +++++++++ 6 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 debian/patches/0001-Add-keywords-to-desktop-file.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 042958f..e756c6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +mpv (0.38.0-1) unstable; urgency=medium + + [ Unit 193 ] + * New upstream release. + - Drop patch applied upstream. + - Fix incompatibilities with ffmpeg 7.0 (Closes: #1068660) + * Update Standards-Version to 4.7.0. + + [ Sebastian Ramacher ] + * debian/rules: Disable Windows and macOS specific features + * debian/copyright: Drop removed files + + -- Sebastian Ramacher Wed, 01 May 2024 11:10:27 +0200 + mpv (0.37.0-1~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/control b/debian/control index f8570f2..8e09cdc 100644 --- a/debian/control +++ b/debian/control @@ -61,7 +61,7 @@ Build-Depends: python3-docutils, spirv-cross, wayland-protocols, -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: https://mpv.io/ Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/mpv Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/mpv diff --git a/debian/copyright b/debian/copyright index b5545e3..85b3636 100644 --- a/debian/copyright +++ b/debian/copyright @@ -53,9 +53,7 @@ Files: libmpv/stream_cb.h misc/thread_pool.c misc/thread_tools.c - osdep/semaphore_osx.c osdep/win32-console-wrapper.c - osdep/win32/* player/client.c player/lua/console.lua ta/* diff --git a/debian/patches/0001-Add-keywords-to-desktop-file.patch b/debian/patches/0001-Add-keywords-to-desktop-file.patch deleted file mode 100644 index 254e32a..0000000 --- a/debian/patches/0001-Add-keywords-to-desktop-file.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: =?utf-8?q?Mateusz_=C5=81ukasik?= -Date: Tue, 7 Sep 2021 10:50:26 +0200 -Subject: Add keywords to desktop file - ---- - etc/mpv.desktop | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/etc/mpv.desktop b/etc/mpv.desktop -index db71520..5b48ba1 100644 ---- a/etc/mpv.desktop -+++ b/etc/mpv.desktop -@@ -42,3 +42,4 @@ Categories=AudioVideo;Audio;Video;Player;TV; - MimeType=application/ogg;application/x-ogg;application/mxf;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/aiff;audio/x-aiff;audio/m4a;audio/x-m4a;application/x-extension-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/mpeg2;audio/mpeg3;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/musepack;audio/x-musepack;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg2;video/x-mpeg3;video/mp4v-es;video/x-m4v;video/mp4;application/x-extension-mp4;video/divx;video/vnd.divx;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;audio/x-ms-asf;application/vnd.ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/avi;video/x-flic;video/fli;video/x-flc;video/flv;video/x-flv;video/x-theora;video/x-theora+ogg;video/x-matroska;video/mkv;audio/x-matroska;application/x-matroska;video/webm;audio/webm;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;video/x-ogm;video/x-ogm+ogg;application/x-ogm;application/x-ogm-audio;application/x-ogm-video;application/x-shorten;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;audio/eac3;audio/amr-wb;video/mp2t;audio/flac;audio/mp4;application/x-mpegurl;video/vnd.mpegurl;application/vnd.apple.mpegurl;audio/x-pn-au;video/3gp;video/3gpp;video/3gpp2;audio/3gpp;audio/3gpp2;video/dv;audio/dv;audio/opus;audio/vnd.dts;audio/vnd.dts.hd;audio/x-adpcm;application/x-cue;audio/m3u; - X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb,srt,rist,webdav,webdavs - StartupWMClass=mpv -+Keywords=mpv;media;player;video;audio;tv; diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 34f03ff..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Add-keywords-to-desktop-file.patch diff --git a/debian/rules b/debian/rules index 0a90277..c2ca7f0 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,16 @@ override_dh_auto_configure: -Dcdda=enabled \ -Ddvdnav=enabled \ -Dsdl2=enabled \ + -Davfoundation=disabled \ + -Degl-angle-win32=disabled \ + -Dgl-cocoa=disabled \ + -Dgl-win32=disabled \ + -Dios-gl=disabled \ -Dsndio=disabled \ + -Duwp=disabled \ + -Dvaapi-win32=disabled \ + -Dwasapi=disabled \ + -Dwin32-threads=disabled \ $(ARCH_CONFIGURE) execute_after_dh_auto_install: -- cgit v1.2.3