Remove doxygen from conflicts

2 files changed, 5 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df6a02b6d0c6..b9be80386ede 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg-amd-full-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features for AMD; git version)
-	pkgver = 4.3.r97205.g3935c891e9
-	pkgrel = 4
+	pkgver = 4.3.r97217.g99ebb033d2
+	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = i686
 	arch = x86_64
@@ -127,7 +127,6 @@ pkgbase = ffmpeg-amd-full-git
 	provides = ffmpeg-full
 	provides = ffmpeg-git
 	conflicts = ffmpeg
-	conflicts = doxygen
 	conflicts = svt-av1-git
 	source = git+https://git.ffmpeg.org/ffmpeg.git
 	source = ffmpeg-full-git-add-svt-hevc-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2066e40128e4..4b7dedf8f540 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@ _svt_vp9_ver='0.1.0'
 
 pkgname=ffmpeg-amd-full-git
 _srcname=ffmpeg
-pkgver=4.3.r97205.g3935c891e9
-pkgrel=4
+pkgver=4.3.r97217.g99ebb033d2
+pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features for AMD; git version)'
 arch=('i686' 'x86_64')
 url='https://www.ffmpeg.org/'
@@ -46,7 +46,7 @@ makedepends=(
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavutil.so' 'libpostproc.so' 'libavresample.so' 'libswscale.so'
           'libswresample.so' 'ffmpeg' 'ffmpeg-full' 'ffmpeg-git')
-conflicts=('ffmpeg' 'doxygen' 'svt-av1-git')
+conflicts=('ffmpeg' 'svt-av1-git')
 source=('git+https://git.ffmpeg.org/ffmpeg.git'
         "ffmpeg-full-git-add-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
         "ffmpeg-full-git-add-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"