diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 30 |
3 files changed, 22 insertions, 26 deletions
@@ -1,7 +1,7 @@ pkgbase = ffmpeg-libfdk_aac pkgdesc = Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support) - pkgver = 6.1.1 - pkgrel = 7 + pkgver = 7.0 + pkgrel = 3 epoch = 2 url = https://ffmpeg.org arch = x86_64 @@ -29,7 +29,6 @@ pkgbase = ffmpeg-libfdk_aac depends = glib2 depends = glibc depends = gmp - depends = gnutls depends = gsm depends = harfbuzz depends = jack @@ -39,6 +38,8 @@ pkgbase = ffmpeg-libfdk_aac depends = libbluray depends = libbs2b depends = libdrm + depends = libdvdnav + depends = libdvdread depends = libgl depends = libiec61883 depends = libjxl @@ -61,6 +62,7 @@ pkgbase = ffmpeg-libfdk_aac depends = libxext depends = libxml2 depends = libxv + depends = mbedtls depends = ocl-icd depends = onevpl depends = opencore-amr @@ -102,10 +104,10 @@ pkgbase = ffmpeg-libfdk_aac provides = libswscale.so conflicts = ffmpeg options = debug - source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=6f4048827982a8f48f71f551a6e1ed2362816eec + source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=fa053f314a0150bebe073438867e454182909c53 source = add-av_stream_get_first_dts-for-chromium.patch validpgpkeys = DD1EC9E8DE085C629B3E1846B18E8928B3948D64 - b2sums = 9c19bd6b68d4224af2a93fdce199fd0ce9b00432c8818801d124ca993ac45a01d3a7618b66804c02c1f26787a5ca88d2d9f682f3e819cee8c2b6b3dc77e64052 + b2sums = 4b2057fb68a0137bf149779beee3b7066835216a830896d4de4d31d0c00c2ab13419d4a3f0ccba1ab6d0cb063bdc91f2fc35d5916ddd65288c327880cbdefc41 b2sums = 555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de pkgname = ffmpeg-libfdk_aac @@ -120,7 +122,6 @@ pkgname = ffmpeg-libfdk_aac depends = glib2 depends = glibc depends = gmp - depends = gnutls depends = gsm depends = harfbuzz depends = jack @@ -130,6 +131,8 @@ pkgname = ffmpeg-libfdk_aac depends = libbluray depends = libbs2b depends = libdrm + depends = libdvdnav + depends = libdvdread depends = libgl depends = libiec61883 depends = libjxl @@ -152,6 +155,7 @@ pkgname = ffmpeg-libfdk_aac depends = libxext depends = libxml2 depends = libxv + depends = mbedtls depends = ocl-icd depends = onevpl depends = opencore-amr diff --git a/.gitignore b/.gitignore index 25eabff72954..fdc01831b123 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ ffmpeg/ +src/ +pkg/ @@ -8,8 +8,8 @@ # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg-libfdk_aac -pkgver=6.1.1 -pkgrel=7 +pkgver=7.0 +pkgrel=3 epoch=2 pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)' arch=(x86_64) @@ -28,7 +28,6 @@ depends=( glib2 glibc gmp - gnutls gsm harfbuzz jack @@ -38,6 +37,8 @@ depends=( libbluray libbs2b libdrm + libdvdnav + libdvdread libgl libiec61883 libjxl @@ -60,6 +61,7 @@ depends=( libxext libxml2 libxv + mbedtls ocl-icd onevpl opencore-amr @@ -120,32 +122,18 @@ provides=( options=( debug ) -_tag=6f4048827982a8f48f71f551a6e1ed2362816eec +_tag=fa053f314a0150bebe073438867e454182909c53 source=( git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag} add-av_stream_get_first_dts-for-chromium.patch ) -b2sums=('9c19bd6b68d4224af2a93fdce199fd0ce9b00432c8818801d124ca993ac45a01d3a7618b66804c02c1f26787a5ca88d2d9f682f3e819cee8c2b6b3dc77e64052' +b2sums=('4b2057fb68a0137bf149779beee3b7066835216a830896d4de4d31d0c00c2ab13419d4a3f0ccba1ab6d0cb063bdc91f2fc35d5916ddd65288c327880cbdefc41' '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de') validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc> prepare() { cd ffmpeg - # 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 - # Fix build with latest vulkan headers - git cherry-pick -n fef22c87ada4517441701e6e61e062c9f4399c8e } pkgver() { @@ -167,7 +155,6 @@ build() { --enable-fontconfig \ --enable-frei0r \ --enable-gmp \ - --enable-gnutls \ --enable-gpl \ --enable-ladspa \ --enable-libaom \ @@ -176,6 +163,8 @@ build() { --enable-libbs2b \ --enable-libdav1d \ --enable-libdrm \ + --enable-libdvdnav \ + --enable-libdvdread \ --enable-libfreetype \ --enable-libfribidi \ --enable-libgsm \ @@ -215,6 +204,7 @@ build() { --enable-libxml2 \ --enable-libxvid \ --enable-libzimg \ + --enable-mbedtls \ --enable-nvdec \ --enable-nvenc \ --enable-opencl \ |