[PR PATCH] ffmpeg: enable vulkan and libdrm

[PR PATCH] ffmpeg: enable vulkan and libdrm

[derpmalicious]

[-- Attachment #1: Type: text/plain, Size: 900 bytes --]

There is a new pull request by derpmalicious against master on the void-packages repository

https://github.com/derpmalicious/void-packages master
https://github.com/void-linux/void-packages/pull/33087

ffmpeg: enable vulkan and libdrm
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
- [x] I built this PR locally for these architectures:
  - [x] x86_64-glibc
  - [x] x86_64-musl


A patch file from https://github.com/void-linux/void-packages/pull/33087.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-33087.patch --]
[-- Type: text/x-diff, Size: 1052 bytes --]

From e57f1c048578dcc66e5c6ec2cdc4634711eb185b Mon Sep 17 00:00:00 2001
From: malice <derpmalicious@gmail.com>
Date: Fri, 24 Sep 2021 16:14:37 +0300
Subject: [PATCH] ffmpeg: enable vulkan and libdrm

---
 srcpkgs/ffmpeg/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..7bf8fc5e8066 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=4
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -99,7 +99,8 @@ do_configure() {
 		$(vopt_if dav1d '--enable-libdav1d') \
 		$(vopt_if zimg '--enable-libzimg') \
 		$(vopt_if webp '--enable-libwebp') \
-		$(vopt_if sofa '--enable-libmysofa')
+		$(vopt_if sofa '--enable-libmysofa') \
+		--enable-vulkan --enable-libdrm
 }
 do_build() {
 	make ${makejobs}

Re: ffmpeg: enable vulkan and libdrm

[q66]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33087#issuecomment-926644272

Comment:
make vulkan and drm `build_options`, put them in `build_options_default`

for `vulkan`, add conditional `makedepends` on `vulkan-loader Vulkan-Headers`

for `drm`, add conditional `makedepends` on `libdrm-devel`

Re: ffmpeg: enable vulkan and libdrm

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 562 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/33087#issuecomment-926664028

Comment:
Looks like `libdrm-devel` is pulled in by `harfbuzz-devel -> cairo-devel -> MesaLib-devel -> libdrm-devel` and both `Vulkan-Headers` and `vulkan-loader` is pulled in by `SDL2-devel` and `vulkan-loader` is pulled in by `SDL2-devel` and  Unless the harfbuzz or SDL2 dependency chain changes, these `makedepends` should always be present. We could defer adding conditional `makedepends` until such a change forces our hand.

Re: ffmpeg: enable vulkan and libdrm

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/33087#issuecomment-926664028

Comment:
Looks like `libdrm-devel` is pulled in by `harfbuzz-devel -> cairo-devel -> MesaLib-devel -> libdrm-devel` and both `Vulkan-Headers` and `vulkan-loader` are pulled in by `SDL2-devel`. Unless the harfbuzz or SDL2 dependency chain changes, these `makedepends` should always be present. We could defer adding conditional `makedepends` until such a change forces our hand.

Re: [PR PATCH] [Updated] ffmpeg: enable vulkan and libdrm

[derpmalicious]

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

There is an updated pull request by derpmalicious against master on the void-packages repository

https://github.com/derpmalicious/void-packages master
https://github.com/void-linux/void-packages/pull/33087

ffmpeg: enable vulkan and libdrm
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
- [x] I built this PR locally for these architectures:
  - [x] x86_64-glibc
  - [x] x86_64-musl


A patch file from https://github.com/void-linux/void-packages/pull/33087.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-33087.patch --]
[-- Type: text/x-diff, Size: 2036 bytes --]

From a549e9612a93a280982715bd3e4ab9bf6c17d05f Mon Sep 17 00:00:00 2001
From: malice <derpmalicious@gmail.com>
Date: Fri, 24 Sep 2021 16:14:37 +0300
Subject: [PATCH] ffmpeg: enable vulkan and libdrm

---
 srcpkgs/ffmpeg/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..1cfe6020745c 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=4
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -23,12 +23,14 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel)
  $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
  $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
- $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)"
+ $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)
+ $(vopt_if vulkan "vulkan-loader Vulkan-Headers")
+ $(vopt_if drm libdrm-devel)"
 depends="ffplay>=${version}_${revision}"
 
 build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio
- dav1d zimg webp sofa"
-build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp"
+ dav1d zimg webp sofa vulkan drm"
+build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";;
@@ -99,7 +101,9 @@ do_configure() {
 		$(vopt_if dav1d '--enable-libdav1d') \
 		$(vopt_if zimg '--enable-libzimg') \
 		$(vopt_if webp '--enable-libwebp') \
-		$(vopt_if sofa '--enable-libmysofa')
+		$(vopt_if sofa '--enable-libmysofa') \
+		$(vopt_if vulkan '--enable-vulkan') \
+		$(vopt_if drm '--enable-libdrm')
 }
 do_build() {
 	make ${makejobs}

Re: [PR REVIEW] ffmpeg: enable vulkan and libdrm

[q66]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33087#discussion_r716017835

Comment:
single quotes within vopt_if

Re: [PR PATCH] [Updated] ffmpeg: enable vulkan and libdrm

[derpmalicious]

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

There is an updated pull request by derpmalicious against master on the void-packages repository

https://github.com/derpmalicious/void-packages master
https://github.com/void-linux/void-packages/pull/33087

ffmpeg: enable vulkan and libdrm
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
- [x] I built this PR locally for these architectures:
  - [x] x86_64-glibc
  - [x] x86_64-musl


A patch file from https://github.com/void-linux/void-packages/pull/33087.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-33087.patch --]
[-- Type: text/x-diff, Size: 2036 bytes --]

From 51cbeec63a495641388024e02604eb117ef88b83 Mon Sep 17 00:00:00 2001
From: malice <derpmalicious@gmail.com>
Date: Fri, 24 Sep 2021 16:14:37 +0300
Subject: [PATCH] ffmpeg: enable vulkan and libdrm

---
 srcpkgs/ffmpeg/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..1cfe6020745c 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=4
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -23,12 +23,14 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel)
  $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
  $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
- $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)"
+ $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)
+ $(vopt_if vulkan "vulkan-loader Vulkan-Headers")
+ $(vopt_if drm libdrm-devel)"
 depends="ffplay>=${version}_${revision}"
 
 build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio
- dav1d zimg webp sofa"
-build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp"
+ dav1d zimg webp sofa vulkan drm"
+build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";;
@@ -99,7 +101,9 @@ do_configure() {
 		$(vopt_if dav1d '--enable-libdav1d') \
 		$(vopt_if zimg '--enable-libzimg') \
 		$(vopt_if webp '--enable-libwebp') \
-		$(vopt_if sofa '--enable-libmysofa')
+		$(vopt_if sofa '--enable-libmysofa') \
+		$(vopt_if vulkan '--enable-vulkan') \
+		$(vopt_if drm '--enable-libdrm')
 }
 do_build() {
 	make ${makejobs}

Re: [PR PATCH] [Updated] ffmpeg: enable vulkan and libdrm

[derpmalicious]

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

There is an updated pull request by derpmalicious against master on the void-packages repository

https://github.com/derpmalicious/void-packages master
https://github.com/void-linux/void-packages/pull/33087

ffmpeg: enable vulkan and libdrm
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
- [x] I built this PR locally for these architectures:
  - [x] x86_64-glibc
  - [x] x86_64-musl


A patch file from https://github.com/void-linux/void-packages/pull/33087.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-33087.patch --]
[-- Type: text/x-diff, Size: 2036 bytes --]

From 63428930c0a6a17f50ca0c3c52503be2184ea57b Mon Sep 17 00:00:00 2001
From: malice <derpmalicious@gmail.com>
Date: Fri, 24 Sep 2021 16:14:37 +0300
Subject: [PATCH] ffmpeg: enable vulkan and libdrm

---
 srcpkgs/ffmpeg/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..2d47b5ef117f 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=4
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -23,12 +23,14 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel)
  $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
  $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
- $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)"
+ $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)
+ $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if drm libdrm-devel)"
 depends="ffplay>=${version}_${revision}"
 
 build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio
- dav1d zimg webp sofa"
-build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp"
+ dav1d zimg webp sofa vulkan drm"
+build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";;
@@ -99,7 +101,9 @@ do_configure() {
 		$(vopt_if dav1d '--enable-libdav1d') \
 		$(vopt_if zimg '--enable-libzimg') \
 		$(vopt_if webp '--enable-libwebp') \
-		$(vopt_if sofa '--enable-libmysofa')
+		$(vopt_if sofa '--enable-libmysofa') \
+		$(vopt_if vulkan '--enable-vulkan') \
+		$(vopt_if drm '--enable-libdrm')
 }
 do_build() {
 	make ${makejobs}

Re: [PR PATCH] [Merged]: ffmpeg: enable vulkan and libdrm

[q66]

[-- Attachment #1: Type: text/plain, Size: 738 bytes --]

There's a merged pull request on the void-packages repository

ffmpeg: enable vulkan and libdrm
https://github.com/void-linux/void-packages/pull/33087

Description:
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
- [x] I built this PR locally for these architectures:
  - [x] x86_64-glibc
  - [x] x86_64-musl