From f921742e031ccaf044c43648bc2f723b8488b503 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:12:21 +0100 Subject: [PATCH 01/10] Check with initial .drone.yml --- .drone.yml | 10 ++++++++++ .gitmodules | 3 +++ plugins/obs-studio-plugin-openmax | 1 + 3 files changed, 14 insertions(+) create mode 100644 .drone.yml create mode 160000 plugins/obs-studio-plugin-openmax diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..c22cd7a --- /dev/null +++ b/.drone.yml @@ -0,0 +1,10 @@ +kind: pipeline +type: docker +name: default + +steps: + - name: Build obs + image: debian:buster + comands: + - apt install build-essential + - debuild diff --git a/.gitmodules b/.gitmodules index fa1c4f1..3d1d1fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "plugins/obs-outputs/ftl-sdk"] path = plugins/obs-outputs/ftl-sdk url = https://github.com/Mixer/ftl-sdk.git +[submodule "plugins/obs-studio-plugin-openmax"] + path = plugins/obs-studio-plugin-openmax + url = https://github.com/audiohacked/obs-studio-plugin-openmax.git diff --git a/plugins/obs-studio-plugin-openmax b/plugins/obs-studio-plugin-openmax new file mode 160000 index 0000000..af20ec2 --- /dev/null +++ b/plugins/obs-studio-plugin-openmax @@ -0,0 +1 @@ +Subproject commit af20ec21d67afae51e160c5d47c23efe07441842 From c7eb760c42e137419b52a4df44d8849f015970e5 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:13:12 +0100 Subject: [PATCH 02/10] Update container on start --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index c22cd7a..191e212 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,5 +6,7 @@ steps: - name: Build obs image: debian:buster comands: + - apt update + - apt upgrade - apt install build-essential - debuild From 02f2bfe84adcacef7b1f8d304d1536873f835623 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:13:47 +0100 Subject: [PATCH 03/10] Fix typo --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 191e212..6237473 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: default steps: - name: Build obs image: debian:buster - comands: + commands: - apt update - apt upgrade - apt install build-essential From 00c35b2f8f3c7d54883f782014f635c5c9e378a2 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:14:37 +0100 Subject: [PATCH 04/10] Fix broken apt --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6237473..7056976 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,6 @@ steps: image: debian:buster commands: - apt update - - apt upgrade - - apt install build-essential + - apt upgrade -y + - apt install -y build-essential - debuild From 0ced8af6641211fdefe3914e6db8f309447592a5 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:16:37 +0100 Subject: [PATCH 05/10] Fix dependencies --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7056976..6146217 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,5 +8,5 @@ steps: commands: - apt update - apt upgrade -y - - apt install -y build-essential + - apt install -y build-essential devscripts lintian - debuild From 2bdc7abe8763f6e6363787bbb5c9c7d88d81014e Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:21:25 +0100 Subject: [PATCH 06/10] Do not install unnecessary pkgs --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 6146217..f8e35d1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,5 +8,5 @@ steps: commands: - apt update - apt upgrade -y - - apt install -y build-essential devscripts lintian + - apt install -y --no-install-recommends build-essential devscripts lintian - debuild From 70cc0bbfc67b61c8fc05c48c251a8f24192f234f Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:27:21 +0100 Subject: [PATCH 07/10] obs-studio (26.1.0-2) --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 946ca48..2c28592 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +obs-studio (26.1.0-2) unstable; urgency=medium + * Add openMax Module + + -- lagertonne Fri, 1 Jan 22:25:48 +0100 + obs-studio (26.1.0+dfsg1-1) unstable; urgency=medium * New upstream release From 5c041a95c492dae2b390ec132116e069bc2afce6 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:31:53 +0100 Subject: [PATCH 08/10] Fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2c28592..b8efe9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ obs-studio (26.1.0-2) unstable; urgency=medium * Add openMax Module - -- lagertonne Fri, 1 Jan 22:25:48 +0100 + -- lagertonne Fri, 01 Jan 2021 22:25:48 +0100 obs-studio (26.1.0+dfsg1-1) unstable; urgency=medium From 9812dd8cf876dd15f75e9ce4282c3fd6f7a38327 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 22:36:40 +0100 Subject: [PATCH 09/10] Try to fix misfunctioning debuild --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f8e35d1..5d3b91d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,4 +9,4 @@ steps: - apt update - apt upgrade -y - apt install -y --no-install-recommends build-essential devscripts lintian - - debuild + - debuild --no-tgz-check From eabee78e0e734db38bf7a30f079332b078cee015 Mon Sep 17 00:00:00 2001 From: lagertonne Date: Fri, 1 Jan 2021 23:03:10 +0100 Subject: [PATCH 10/10] Install deps --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 5d3b91d..513019e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,4 +9,5 @@ steps: - apt update - apt upgrade -y - apt install -y --no-install-recommends build-essential devscripts lintian + - mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control - debuild --no-tgz-check