From b954677841fd949a537fa92fa456add5d370fb0f Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 21 Nov 2019 13:46:55 -0500 Subject: WIP: makemkv-oss try to fix build deps for obs --- makemkv-oss/debian/changelog | 6 ++++++ makemkv-oss/debian/control | 1 + 2 files changed, 7 insertions(+) (limited to 'makemkv-oss') diff --git a/makemkv-oss/debian/changelog b/makemkv-oss/debian/changelog index 3d2c9db..084217b 100644 --- a/makemkv-oss/debian/changelog +++ b/makemkv-oss/debian/changelog @@ -1,3 +1,9 @@ +makemkv-oss (1.14.5-2+devuan) obs; urgency=low + + * Change build deps for OBS + + -- B Stack Thu, 21 Nov 2019 13:20:28 -0500 + makemkv-oss (1.14.5-1+devuan) manual; urgency=low * Update diff --git a/makemkv-oss/debian/control b/makemkv-oss/debian/control index 4b2e1d9..4a1f0ed 100644 --- a/makemkv-oss/debian/control +++ b/makemkv-oss/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: B Stack Build-Depends: debhelper (>=11~), libavcodec-dev, + libavcodec58 || libavcodec-extra58, libc6-dev, libexpat1-dev, libgl1-mesa-dev, -- cgit From 4971265aea319446479daa7cd6446358613c6250 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 21 Nov 2019 16:19:08 -0500 Subject: 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. --- makemkv-oss/debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'makemkv-oss') 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 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 -- cgit From be9f835f01836dfb3b7ba302c2e060720692ac92 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sat, 23 Nov 2019 15:27:55 -0500 Subject: fix typo --- makemkv-oss/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makemkv-oss') diff --git a/makemkv-oss/debian/control b/makemkv-oss/debian/control index 09b2912..7c55684 100644 --- a/makemkv-oss/debian/control +++ b/makemkv-oss/debian/control @@ -14,7 +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 +# libavcodec58 is listed only to prevent the "two choices available" error in obs. makemkv-oss handles the dependencies Package: makemkv-oss Architecture: any -- cgit