diff options
-rw-r--r-- | cspell/PKGBUILD | 4 | ||||
-rw-r--r-- | ffmpeg/PKGBUILD | 35 | ||||
-rw-r--r-- | ffmpeg/add-av_stream_get_first_dts-for-chromium.patch | 31 | ||||
-rw-r--r-- | mpv/PKGBUILD | 28 |
4 files changed, 18 insertions, 80 deletions
diff --git a/cspell/PKGBUILD b/cspell/PKGBUILD index cf50ee7..59fe070 100644 --- a/cspell/PKGBUILD +++ b/cspell/PKGBUILD @@ -2,7 +2,7 @@ _npmname=cspell pkgname=cspell-jxir -pkgver=8.3.0 +pkgver=8.7.0 pkgrel=1 pkgdesc="A Spelling Checker for Code!" arch=(any) @@ -12,7 +12,7 @@ depends=('nodejs' 'npm') optdepends=() source=(https://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz) noextract=($_npmname-$pkgver.tgz) -sha1sums=('647c080acfeaa99736e2359c9da937ea4b189666') +sha1sums=('41797a9f3ab07a83bcf463499b690ab0985eb0ff') package() { cd $srcdir diff --git a/ffmpeg/PKGBUILD b/ffmpeg/PKGBUILD index 8a40386..0685bd3 100644 --- a/ffmpeg/PKGBUILD +++ b/ffmpeg/PKGBUILD @@ -2,46 +2,27 @@ _pkgname=ffmpeg pkgname=$_pkgname-jxir -_tag=3cdfac27d3ea06f8719faed48b4ae2e75e94a463 # 6.1 -pkgver=6.1 -pkgrel=4 +pkgver=7.0 +pkgrel=1 pkgdesc='Complete solution to record, convert and stream audio and video' arch=('x86_64') url='https://ffmpeg.org/' -license=('GPL3') +license=('GPL-3.0-only') depends=('libva') makedepends=('git' 'nasm') provides=('libavcodec.so' 'libavfilter.so' 'libavformat.so' 'libavutil.so' 'libswresample.so' 'libswscale.so' 'ffmpeg') conflicts=('ffmpeg') -source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=$_tag" - 'add-av_stream_get_first_dts-for-chromium.patch') -sha256sums=('SKIP' - '57e26caced5a1382cb639235f9555fc50e45e7bf8333f7c9ae3d49b3241d3f77') - -prepare() { - cd "$srcdir/$_pkgname" - # FS#79281: fix assembling with binutil as >= 2.41 - git cherry-pick -n effadce6c756247ea8bae32dc13bb3e6f464f0eb - # FS#77813: fix playing ogg files with mplayer - git cherry-pick -n cbcc817353a019da4332ad43deb7bbc4e695d02a - patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779 - # use non-deprecated nvenc GUID for conftest - git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f - git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500 - # Fix VDPAU vo - git cherry-pick -n e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7 - # Fix bug in av_fft_end - git cherry-pick -n a562cfee2e214252f8b3f516527272ae32ef9532 - git cherry-pick -n 250471ea1745fc703eb346a2a662304536a311b1 -} +source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n$pkgver") +sha256sums=('SKIP') build() { - cd "$srcdir/$_pkgname" + cd "$_pkgname" ./configure \ --prefix='/usr' \ --disable-debug \ + --enable-lto \ --enable-gpl \ --enable-version3 \ --disable-static \ @@ -68,6 +49,6 @@ build() { } package() { - cd "$srcdir/$_pkgname" + cd "$_pkgname" make DESTDIR="$pkgdir" install install-man } diff --git a/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch b/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch deleted file mode 100644 index 20ea725..0000000 --- a/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff '--color=auto' -rupN ffmpeg.orig/libavformat/avformat.h ffmpeg/libavformat/avformat.h ---- ffmpeg.orig/libavformat/avformat.h 2022-08-19 17:42:47.323422603 +0200 -+++ ffmpeg/libavformat/avformat.h 2022-08-19 17:42:51.347130436 +0200 -@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_g - */ - int64_t av_stream_get_end_pts(const AVStream *st); - -+// Chromium: We use the internal field first_dts vvv -+int64_t av_stream_get_first_dts(const AVStream *st); -+// Chromium: We use the internal field first_dts ^^^ -+ - #define AV_PROGRAM_RUNNING 1 - - /** -diff '--color=auto' -rupN ffmpeg.orig/libavformat/mux_utils.c ffmpeg/libavformat/mux_utils.c ---- ffmpeg.orig/libavformat/mux_utils.c 2022-08-19 17:42:47.346758108 +0200 -+++ ffmpeg/libavformat/mux_utils.c 2022-08-19 17:47:28.549589002 +0200 -@@ -37,6 +37,13 @@ int64_t av_stream_get_end_pts(const AVSt - return AV_NOPTS_VALUE; - } - -+// Chromium: We use the internal field first_dts vvv -+int64_t av_stream_get_first_dts(const AVStream *st) -+{ -+ return cffstream(st)->first_dts; -+} -+// Chromium: We use the internal field first_dts ^^^ -+ - int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, - int std_compliance) - { diff --git a/mpv/PKGBUILD b/mpv/PKGBUILD index 03bf4c5..6762b76 100644 --- a/mpv/PKGBUILD +++ b/mpv/PKGBUILD @@ -3,32 +3,22 @@ _pkgname=mpv pkgname=$_pkgname-jxir epoch=1 -_tag='807b9343ef911d138950411cdb83c16a151d2018' -pkgver=0.37.0.r0.g818ce7c51a -pkgrel=1 +pkgver=0.38.0 +pkgrel=2 pkgdesc='a free, open source, and cross-platform media player' arch=('x86_64') -# We link against libraries that are licensed GPLv3 explicitly, so our -# package is GPLv3 only as well. (Is this still correct?) -license=('GPL3') +license=('GPL-2.0-or-later AND LGPL-2.1-or-later') url='https://mpv.io/' -depends=('ffmpeg' 'libplacebo' 'libass' 'libva' 'libxinerama' 'libxpresent' 'libxss' 'luajit' 'pipewire') +depends=('ffmpeg' 'libplacebo' 'libass' 'libva' 'libxpresent' 'libxss' 'luajit' 'pipewire') makedepends=('git' 'meson' 'python-docutils') -optdepends=('yt-dlp: for video-sharing websites playback' - 'youtube-dl: for video-sharing websites playback') +optdepends=('yt-dlp: for video-sharing websites playback') provides=("$_pkgname") conflicts=("$_pkgname") -options=('!emptydirs') -source=("git+https://github.com/mpv-player/mpv.git#tag=$_tag") -sha256sums=('SKIP') - -pkgver() { - cd "$srcdir/$_pkgname" - git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g;' -} +options=(!emptydirs) +source=("git+https://github.com/mpv-player/mpv.git#tag=v$pkgver") +sha256sums=('b37b91d0ae4518594b22338ebe979f13bdc56b6fa26d589e5c3f7b96a31bab3d') build() { - local _meson_options=( --auto-features auto @@ -94,7 +84,6 @@ build() { -Dgl-win32=disabled -Dgl-x11=disabled -Djpeg=disabled - -Drpi=disabled -Dsdl2-video=disabled -Dshaderc=disabled -Dsixel=disabled @@ -118,7 +107,6 @@ build() { -Dd3d9-hwaccel=disabled -Dgl-dxinterop-d3d9=disabled -Dios-gl=disabled - -Drpi-mmal=disabled -Dvideotoolbox-gl=disabled -Dvideotoolbox-pl=disabled -Dvulkan-interop=disabled |