diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-12-16 11:19:20 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-16 11:19:20 +0000 |
| commit | 9b980bb72e320955f44e95c77a28729b3d0bf395 (patch) | |
| tree | 0c214b72d1ae1fcfb70ab17392a95c18bf096623 /conf | |
| parent | 6a7579558e63245e9d50d112345bb39a2b605096 (diff) | |
Revert "media-video/ffmpeg : add workaround for broken build (vulkan && opencl flags seem to conflict)"
This reverts commit 6a7579558e63245e9d50d112345bb39a2b605096.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/intel/portage/package.mask/00-media-video | 1 | ||||
| -rw-r--r-- | conf/intel/portage/package.use/00-media-video | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/intel/portage/package.mask/00-media-video b/conf/intel/portage/package.mask/00-media-video index fe10dc4..3f8258d 100644 --- a/conf/intel/portage/package.mask/00-media-video +++ b/conf/intel/portage/package.mask/00-media-video @@ -1,3 +1,4 @@ # This file has been automatically generated, do not edit. +>=media-video/ffmpeg-6.1::gentoo >=media-video/obs-studio-30.0.0::gentoo diff --git a/conf/intel/portage/package.use/00-media-video b/conf/intel/portage/package.use/00-media-video index 1b41a74..266233e 100644 --- a/conf/intel/portage/package.use/00-media-video +++ b/conf/intel/portage/package.use/00-media-video @@ -1,6 +1,6 @@ # This file has been automatically generated, do not edit. -media-video/ffmpeg amr amrenc frei0r libdrm librtmp libv4l openh264 snappy twolame -chromium -opencl +media-video/ffmpeg amr amrenc frei0r libdrm librtmp libv4l openh264 snappy twolame -chromium media-video/mpv cdda cli libmpv -sdl media-video/obs-studio imagemagick -python media-video/pipewire echo-cancel extra flatpak gsettings jack-sdk lv2 pipewire-alsa sound-server |