add docs, versioned provides, sync with Arch extra

2 files changed, 54 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4cd296d7003b..3e185883f20f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,36 @@
 pkgbase = dav1d-git
-	pkgdesc = AV1 cross-platform Decoder, focused on speed and correctness
-	pkgver = 0.8.2.r22.gd432a39
-	pkgrel = 1
+	pkgdesc = AV1 cross-platform decoder focused on speed and correctness
+	pkgver = 1.0.0.r12.gffb5968
+	pkgrel = 2
 	url = https://code.videolan.org/videolan/dav1d
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
 	license = BSD
+	makedepends = git
 	makedepends = meson
 	makedepends = ninja
-	makedepends = git
 	makedepends = nasm
+	makedepends = doxygen
+	makedepends = graphviz
 	makedepends = xxhash
 	makedepends = sdl2
 	makedepends = vulkan-headers
 	makedepends = libplacebo
-	optdepends = sdl2: for the dav1dplay example
-	optdepends = libplacebo: for the dav1dplay example
-	provides = dav1d
-	provides = libdav1d.so
-	conflicts = dav1d
 	source = git+https://code.videolan.org/videolan/dav1d.git
 	sha256sums = SKIP
 
 pkgname = dav1d-git
+	depends = glibc
+	optdepends = dav1d-doc-git: HTML documentation
+	optdepends = libplacebo: for the dav1dplay example
+	optdepends = sdl2: for the dav1dplay example
+	provides = dav1d=1.0.0.r12.gffb5968
+	provides = libdav1d.so
+	conflicts = dav1d
+
+pkgname = dav1d-doc-git
+	pkgdesc = AV1 cross-platform decoder focused on speed and correctness (documentation)
+	arch = any
+	provides = dav1d-doc
+	conflicts = dav1d-doc
diff --git a/PKGBUILD b/PKGBUILD
index 635fb10929c0..3b0c6d4834c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,16 @@
 # Maintainer: Marcell Meszaros < marcell.meszaros AT runbox.eu >
 # Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 
-pkgname=dav1d-git
-pkgver=0.8.2.r22.gd432a39
-pkgrel=1
-license=('BSD')
-pkgdesc='AV1 cross-platform Decoder, focused on speed and correctness'
+pkgbase=dav1d-git
+pkgname=(dav1d-git dav1d-doc-git)
+pkgver=1.0.0.r12.gffb5968
+pkgrel=2
+pkgdesc='AV1 cross-platform decoder focused on speed and correctness'
 url='https://code.videolan.org/videolan/dav1d'
 arch=('x86_64' 'armv7h' 'aarch64')
-provides=('dav1d' 'libdav1d.so')
-conflicts=('dav1d')
-makedepends=('meson' 'ninja' 'git' 'nasm' 'xxhash' 'sdl2' 'vulkan-headers' 'libplacebo')
-optdepends=('sdl2: for the dav1dplay example'
-            'libplacebo: for the dav1dplay example')
-source=('git+https://code.videolan.org/videolan/dav1d.git')
+license=('BSD')
+makedepends=('git' 'meson' 'ninja' 'nasm' 'doxygen' 'graphviz' 'xxhash' 'sdl2' 'vulkan-headers' 'libplacebo')
+source=("git+${url}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -23,12 +20,35 @@ pkgver() {
 
 build() {
     cd dav1d
-    arch-meson build -Denable_examples=true
-    ninja -C build
+    arch-meson build \
+        -Denable_examples=true \
+        -Denable_docs=true \
+        -Denable_tests=false
+    ninja -C build all doc/html
 }
 
-package() {
+package_dav1d-git() {
+    depends=('glibc')
+    optdepends=('dav1d-doc-git: HTML documentation'
+                'libplacebo: for the dav1dplay example'
+                'sdl2: for the dav1dplay example')
+    provides=("${pkgname%-git}=${pkgver}" 'libdav1d.so')
+    conflicts=("${pkgname%-git}")
+
     cd dav1d
     DESTDIR="${pkgdir}" ninja -C build install
-    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+    install -Dm 644 README.md CONTRIBUTING.md NEWS -t "${pkgdir}/usr/share/doc/${pkgname}"
+    install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_dav1d-doc-git() {
+    pkgdesc+=" (documentation)"
+    arch=('any')
+    provides=("${pkgname%-git}")
+    conflicts=("${pkgname%-git}")
+
+    cd dav1d
+    install -d "${pkgdir}/usr/share/doc/${pkgbase}"
+    cp -r build/doc/html -t "${pkgdir}/usr/share/doc/${pkgbase}"
+    install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }