diff options
| author | B Stack <bgstack15@gmail.com> | 2019-11-21 16:19:08 -0500 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-11-21 16:19:08 -0500 |
| commit | 4971265aea319446479daa7cd6446358613c6250 (patch) | |
| tree | af64f30313aeeb36c1b4a997c688d400f70ca34e | |
| parent | WIP: makemkv-oss try to fix build deps for obs (diff) | |
| download | stackrpms-4971265aea319446479daa7cd6446358613c6250.tar.gz stackrpms-4971265aea319446479daa7cd6446358613c6250.tar.bz2 stackrpms-4971265aea319446479daa7cd6446358613c6250.zip | |
makemkv dpkgs: fix dependencies for obs
It appears two packages provide the libavcodec58-dev option:
libavcodec58 and libavcodec-extra58. These two conflict, and
apparently OBS chokes on the choice. So by making my packages pick
one of them, obs can build them.
| -rw-r--r-- | makemkv-bin/debian/changelog | 6 | ||||
| -rw-r--r-- | makemkv-bin/debian/control | 2 | ||||
| -rw-r--r-- | makemkv-oss/debian/control | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/makemkv-bin/debian/changelog b/makemkv-bin/debian/changelog index 51f03d6..35b6629 100644 --- a/makemkv-bin/debian/changelog +++ b/makemkv-bin/debian/changelog @@ -1,3 +1,9 @@ +makemkv-bin (1.14.5-2+devuan) obs; urgency=low + + * Change build deps for OBS + + -- B Stack <bgstack15@gmail.com> Thu, 21 Nov 2019 16:17:41 -0500 + makemkv-bin (1.14.5-1+devuan) manual; urgency=low * Update diff --git a/makemkv-bin/debian/control b/makemkv-bin/debian/control index fd4c301..e963bc3 100644 --- a/makemkv-bin/debian/control +++ b/makemkv-bin/debian/control @@ -3,9 +3,11 @@ Section: video Priority: optional Maintainer: B Stack <bgstack15@gmail.com> Build-Depends: debhelper (>=11~), + libavcodec58, makemkv-oss Standards-Version: 4.1.4 Homepage: https://www.makemkv.com +# libavcodec58 is listed only to prevent the "two choices available" error in obs. makemkv-oss handles the dependencies Package: makemkv-bin Architecture: any diff --git a/makemkv-oss/debian/control b/makemkv-oss/debian/control index 4a1f0ed..09b2912 100644 --- a/makemkv-oss/debian/control +++ b/makemkv-oss/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: B Stack <bgstack15@gmail.com> Build-Depends: debhelper (>=11~), libavcodec-dev, - libavcodec58 || libavcodec-extra58, + libavcodec58, libc6-dev, libexpat1-dev, libgl1-mesa-dev, @@ -14,6 +14,7 @@ Build-Depends: debhelper (>=11~), zlib1g-dev Standards-Version: 4.1.4 Homepage: https://www.makemkv.com +# libavcodec58 is listed only to prevent the "two choies available" error in obs. makemkv-oss handles the dependencies Package: makemkv-oss Architecture: any |