diff --git a/org.videolan.VLC.yaml b/org.videolan.VLC.yaml index f21a322..c9aa3c3 100644 --- a/org.videolan.VLC.yaml +++ b/org.videolan.VLC.yaml @@ -1,12 +1,13 @@ app-id: org.videolan.VLC runtime: org.kde.Platform -runtime-version: 5.15-24.08 +runtime-version: '6.8' sdk: org.kde.Sdk command: vlc finish-args: - --require-version=0.11.4 - --share=ipc - - --socket=x11 + - --socket=wayland + - --socket=fallback-x11 - --socket=pulseaudio - --share=network - --filesystem=host @@ -18,10 +19,9 @@ finish-args: - --talk-name=org.mpris.MediaPlayer2.Player - --own-name=org.mpris.MediaPlayer2.vlc - --device=all - - --filesystem=xdg-run/gvfs add-extensions: org.videolan.VLC.Plugin: - versions: 3-5.15-24.08;3-24.08 + versions: 4-6.8;4-24.08 directory: share/vlc/extra subdirectories: true merge-dirs: plugins @@ -43,7 +43,7 @@ cleanup-commands: - mkdir -p /app/share/vlc/extra - ln -s /app/share/vlc/extra/plugins /app/lib/vlc/plugins/extra - rm -f /app/lib/vlc/plugins/plugins.dat - - /app/lib/vlc/vlc-cache-gen /app/lib/vlc/plugins + - /app/libexec/vlc/vlc-cache-gen /app/lib/vlc/plugins build-options: env: V: '1' @@ -373,14 +373,14 @@ modules: - --enable-libopus sources: - type: archive - url: https://ffmpeg.org/releases/ffmpeg-4.4.5.tar.xz - sha256: f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07 + url: https://ffmpeg.org/releases/ffmpeg-7.1.tar.xz + sha256: 40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6 x-checker-data: type: anitya project-id: 5405 versions: - '>=': '4' - <: '5' + '>=': '7' + '<': '8' url-template: https://ffmpeg.org/releases/ffmpeg-$version.tar.xz - shared-modules/libsecret/libsecret.json # libgcrypt-1.11.0 build fails with freedeskop 24.08 @@ -455,20 +455,6 @@ modules: type: anitya project-id: 10017 url-template: https://github.com/libmtp/libmtp/releases/download/v$version/libmtp-$version.tar.gz - - name: chromaprint - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_SHARED_LIBS=ON - - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - sources: - - type: archive - url: https://github.com/acoustid/chromaprint/releases/download/v1.5.1/chromaprint-1.5.1.tar.gz - sha256: a1aad8fa3b8b18b78d3755b3767faff9abb67242e01b478ec9a64e190f335e1c - x-checker-data: - type: anitya - project-id: 286 - url-template: https://github.com/acoustid/chromaprint/releases/download/v$version/chromaprint-$version.tar.gz - name: fluidlite buildsystem: cmake-ninja config-opts: @@ -492,18 +478,63 @@ modules: - name: libplacebo buildsystem: meson config-opts: - - -Dvulkan=false + - -Dvulkan=enabled + - -Dshaderc=enabled sources: - - type: archive - url: https://github.com/haasn/libplacebo/archive/refs/tags/v0.2.1.tar.gz - sha256: d5d920a1745e4209287d32e8b96a85127b61b843304813980e11104cd9f15e82 - x-checker-data: - type: anitya - project-id: 20101 - versions: - '>=': '0.2' - <: '0.3' - url-template: https://github.com/haasn/libplacebo/archive/refs/tags/v$version.tar.gz + - type: git + url: https://code.videolan.org/videolan/libplacebo.git + mirror-urls: + - https://github.com/haasn/libplacebo.git + tag: v5.264.1 + commit: ed29e541a55acf28022738440b2a925386292551 +# x-checker-data: +# type: git +# tag-pattern: ^v([\d.]+)$ + modules: + - name: shaderc + buildsystem: cmake-ninja + builddir: true + config-opts: + - -DSHADERC_SKIP_COPYRIGHT_CHECK=ON + - -DSHADERC_SKIP_EXAMPLES=ON + - -DSHADERC_SKIP_TESTS=ON + - -DSPIRV_SKIP_EXECUTABLES=ON + - -DENABLE_GLSLANG_BINARIES=OFF + cleanup: + - /bin + - /lib/cmake + sources: + - type: git + url: https://github.com/google/shaderc.git + tag: v2023.4 + commit: 45b735dfddefe26a99b77e5a74e30d860713ac64 +# x-checker-data: +# type: git +# tag-pattern: ^v(\d{4}\.\d{1,2})$ + - type: git + url: https://github.com/KhronosGroup/SPIRV-Tools.git + tag: v2023.2 + commit: 44d72a9b36702f093dd20815561a56778b2d181e + dest: third_party/spirv-tools +# x-checker-data: +# type: git +# tag-pattern: ^v(\d{4}\.\d{1})$ + - type: git + url: https://github.com/KhronosGroup/SPIRV-Headers.git + tag: sdk-1.3.246.1 + commit: 1feaf4414eb2b353764d01d88f8aa4bcc67b60db + dest: third_party/spirv-headers +# x-checker-data: +# type: git +# tag-pattern: ^sdk-([\d.]+)$ + - type: git + url: https://github.com/KhronosGroup/glslang.git + tag: 12.2.0 + commit: d1517d64cfca91f573af1bf7341dc3a5113349c0 + dest: third_party/glslang +# x-checker-data: +# type: git +# tag-pattern: ^(\d{1,2}\.\d{1,2}\.\d{1,4})$ - name: lmdb sources: - sha256: dd70a8c67807b3b8532b3e987b0a4e998962ecc28643e1af5ec77696b081c9b0 @@ -623,6 +654,15 @@ modules: url-template: https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-cpp-3.$version.tar.gz cleanup: - /bin + - name: medialibrary + buildsystem: meson + config-opts: + - -Dlibvlc=disabled + - -Dlibtool_workaround=true + sources: + - type: archive + url: https://code.videolan.org/videolan/medialibrary/-/archive/0.13.1/medialibrary-0.13.1.tar.bz2 + sha256: e838dc093eae490879f69ca8b07dd5de90367bc8693943f4eefa38289c33ec2d - name: vlc config-opts: - BUILDCC=/usr/bin/gcc -std=gnu99 @@ -641,20 +681,11 @@ modules: - tar xf chrpath-0.16.tar.gz && cd chrpath-0.16 && ./configure && make - ./chrpath-0.16/chrpath -d /app/lib/vlc/plugins/access/liblibbluray_plugin.so sources: - - type: archive - url: https://download.videolan.org/videolan/vlc/3.0.21/vlc-3.0.21.tar.xz - sha256: 24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0 - x-checker-data: - type: anitya - project-id: 6504 - versions: - '>=': '3' - <: '4' - url-template: https://download.videolan.org/videolan/vlc/$version/vlc-$version.tar.xz + - type: git + url: https://code.videolan.org/videolan/vlc.git + commit: 3c8ec534e26513c6ce769b2aa9a34e3f831d43fc - type: patch path: vlc-fix-appdata.patch - - type: patch - path: vlc-disc-shortcuts.patch - type: patch path: vlc-ignore-time-for-cache.patch - type: file diff --git a/vlc-disc-shortcuts.patch b/vlc-disc-shortcuts.patch deleted file mode 100644 index 0b28d8c..0000000 --- a/vlc-disc-shortcuts.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- - share/Makefile.am | 5 +++-- - share/vlc-openbd.desktop.in | 9 +++++++++ - share/vlc-opencda.desktop.in | 9 +++++++++ - share/vlc-opendvd.desktop.in | 9 +++++++++ - share/vlc-openvcd.desktop.in | 9 +++++++++ - share/vlc.desktop.mimetypes | 4 ---- - 6 files changed, 39 insertions(+), 6 deletions(-) - create mode 100644 share/vlc-openbd.desktop.in - create mode 100644 share/vlc-opencda.desktop.in - create mode 100644 share/vlc-opendvd.desktop.in - create mode 100644 share/vlc-openvcd.desktop.in - -diff --git a/share/Makefile.am b/share/Makefile.am -index bf81792..75add73 100644 ---- a/share/Makefile.am -+++ b/share/Makefile.am -@@ -5,7 +5,7 @@ - desktopdir = $(datadir)/applications - if !HAVE_WIN32 - if !HAVE_DARWIN --desktop_DATA = vlc.desktop -+desktop_DATA = vlc.desktop vlc-openbd.desktop vlc-opendvd.desktop vlc-openvcd.desktop vlc-opencda.desktop - appdatadir = $(datarootdir)/metainfo - appdata_DATA = $(appdata_in_files:.xml.in=.xml) - appdata_in_files = vlc.appdata.xml.in -@@ -13,9 +13,10 @@ - endif - - EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes -+EXTRA_DIST += vlc-openbd.desktop.in vlc-opendvd.desktop.in vlc-openvcd.desktop.in vlc-opencda.desktop.in - CLEANFILES += $(desktop_DATA) $(appdata_DATA) - --vlc.desktop: vlc.desktop.in $(top_builddir)/config.status -+%.desktop: %.desktop.in $(top_builddir)/config.status - $(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' $(srcdir)/vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; \ - sed \ - -e 's,\@bindir\@,$(bindir),g' \ -diff --git a/share/vlc-openbd.desktop.in b/share/vlc-openbd.desktop.in -new file mode 100644 -index 0000000..386eb20 ---- /dev/null -+++ b/share/vlc-openbd.desktop.in -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Version=1.0 -+Name=VLC media player (Blu-ray) -+NoDisplay=true -+Exec=@bindir@/vlc --started-from-file bluray://%f -+Icon=vlc -+Terminal=false -+Type=Application -+MimeType=x-content/video-bluray -diff --git a/share/vlc-opencda.desktop.in b/share/vlc-opencda.desktop.in -new file mode 100644 -index 0000000..503d5a8 ---- /dev/null -+++ b/share/vlc-opencda.desktop.in -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Version=1.0 -+Name=VLC media player (Audio CD) -+NoDisplay=true -+Exec=@bindir@/vlc --started-from-file cdda://%f -+Icon=vlc -+Terminal=false -+Type=Application -+MimeType=x-content/audio-cdda -diff --git a/share/vlc-opendvd.desktop.in b/share/vlc-opendvd.desktop.in -new file mode 100644 -index 0000000..aadc44a ---- /dev/null -+++ b/share/vlc-opendvd.desktop.in -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Version=1.0 -+Name=VLC media player (DVD) -+NoDisplay=true -+Exec=@bindir@/vlc --started-from-file dvd://%f -+Icon=vlc -+Terminal=false -+Type=Application -+MimeType=x-content/video-dvd -diff --git a/share/vlc-openvcd.desktop.in b/share/vlc-openvcd.desktop.in -new file mode 100644 -index 0000000..c6dd894 ---- /dev/null -+++ b/share/vlc-openvcd.desktop.in -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Version=1.0 -+Name=VLC media player (VCD) -+NoDisplay=true -+Exec=@bindir@/vlc --started-from-file vcd://%f -+Icon=vlc -+Terminal=false -+Type=Application -+MimeType=x-content/video-vcd;x-content/video-svcd -diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes -index 0d866f7..d521c6c 100644 ---- a/share/vlc.desktop.mimetypes -+++ b/share/vlc.desktop.mimetypes -@@ -119,10 +119,6 @@ x-scheme-handler/icyx # Icecast - - # Linux desktop environment hooks for ISOs etc. - application/x-cd-image --x-content/video-vcd --x-content/video-svcd --x-content/video-dvd --x-content/audio-cdda - x-content/audio-player - - # Playlists / text/xml list with URLs -… - diff --git a/vlc-fix-appdata.patch b/vlc-fix-appdata.patch index bafd617..130bbe7 100644 --- a/vlc-fix-appdata.patch +++ b/vlc-fix-appdata.patch @@ -24,13 +24,13 @@ index cc9c39a..e55c8d6 100644 + matmaul_at_gmail.com - -- http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg +- https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-poney.jpg - - -- http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-open.jpg +- https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-open.jpg - - -- http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg +- https://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg - + https://raw.githubusercontent.com/flathub/org.videolan.VLC/master/vlc_screenshot_gnome3.jpg + https://raw.githubusercontent.com/flathub/org.videolan.VLC/master/vlc_screenshot_gnome3_dark.jpg diff --git a/vlc-packetizer-flac-fix-CRC-from-emulated-sync.patch b/vlc-packetizer-flac-fix-CRC-from-emulated-sync.patch deleted file mode 100644 index ece4766..0000000 --- a/vlc-packetizer-flac-fix-CRC-from-emulated-sync.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Francois Cartegnie -Date: Mon, 7 Nov 2022 15:02:57 +0100 -Subject: [PATCH] packetizer: flac: fix CRC from emulated sync - -also skips some memcpy - -refs #27454 #27477 - -(cherry picked from commit c14b5aa6a7bd3aa25fa951e2b4136aff70f5702a) ---- - modules/packetizer/flac.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/modules/packetizer/flac.c b/modules/packetizer/flac.c -index 7c7bc06b84..02a43f7653 100644 ---- a/modules/packetizer/flac.c -+++ b/modules/packetizer/flac.c -@@ -78,6 +78,7 @@ struct decoder_sys_t - - size_t i_last_frame_size; - uint16_t crc; -+ size_t i_buf_offset; /* in final buffer before crc check / validation / retry */ - size_t i_buf; - uint8_t *p_buf; - -@@ -386,6 +387,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block) - p_sys->headerinfo = headerinfo; - p_sys->i_state = STATE_NEXT_SYNC; - p_sys->i_offset = FLAC_FRAME_SIZE_MIN; -+ p_sys->i_buf_offset = 0; - p_sys->crc = 0; - - /* We have to read until next frame sync code to compute current frame size -@@ -461,6 +463,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block) - block_SkipBytes( &p_sys->bytestream, FLAC_HEADER_SIZE_MAX + 2 ); - block_BytestreamFlush( &p_sys->bytestream ); - p_sys->crc = 0; -+ p_sys->i_buf_offset = 0; - p_sys->i_offset = 0; - p_sys->i_state = STATE_NOSYNC; - p_sys->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY; -@@ -484,10 +487,12 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block) - } - - /* Copy from previous sync point up to to current (offset) */ -- block_PeekOffsetBytes( &p_sys->bytestream, 0, p_sys->p_buf, p_sys->i_offset ); -+ block_PeekOffsetBytes( &p_sys->bytestream, p_sys->i_buf_offset, -+ &p_sys->p_buf[p_sys->i_buf_offset], -+ p_sys->i_offset - p_sys->i_buf_offset ); - - /* update crc to include this data chunk */ -- for( size_t i = 0; i < p_sys->i_offset - 2; i++ ) -+ for( size_t i = p_sys->i_buf_offset; i < p_sys->i_offset - 2; i++ ) - p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[i] ); - - uint16_t stream_crc = GetWBE(&p_sys->p_buf[p_sys->i_offset - 2]); -@@ -497,6 +502,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block) - /* Add the 2 last bytes which were not the CRC sum, and go for next sync point */ - p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[p_sys->i_offset - 2] ); - p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[p_sys->i_offset - 1] ); -+ p_sys->i_buf_offset = p_sys->i_offset; - p_sys->i_offset += 1; - p_sys->i_state = !pp_block ? STATE_NOSYNC : STATE_NEXT_SYNC; - break; /* continue */ -@@ -513,6 +519,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block) - block_BytestreamFlush( &p_sys->bytestream ); - p_sys->i_offset = 0; - p_sys->crc = 0; -+ p_sys->i_buf_offset = 0; - - if( block_BytestreamRemaining(&p_sys->bytestream) > 0 || pp_block == NULL /* drain */) - p_sys->i_state = STATE_SEND_DATA; -@@ -553,6 +560,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block) - else - free( p_sys->p_buf ); - -+ p_sys->i_buf_offset = 0; - p_sys->i_buf = 0; - p_sys->p_buf = NULL; - p_sys->i_offset = 0; -@@ -587,6 +595,7 @@ static int Open(vlc_object_t *p_this) - p_sys->b_stream_info = false; - p_sys->i_last_frame_size = FLAC_FRAME_SIZE_MIN; - p_sys->headerinfo.i_pts = VLC_TS_INVALID; -+ p_sys->i_buf_offset = 0; - p_sys->i_buf = 0; - p_sys->p_buf = NULL; - p_sys->i_next_block_flags = 0; --- -2.30.2 -