From 8ecc448be32e4808b86f4b40710ba2fa6abeb17a Mon Sep 17 00:00:00 2001 From: Gary Buhrmaster Date: Mon, 12 Feb 2024 15:04:24 +0000 Subject: [PATCH 1/4] Add support for cmake and android builds --- roles/mythtv-deb/tasks/main.yml | 7 +++++++ roles/mythtv-dnf/tasks/main.yml | 7 +++++++ roles/mythtv-freebsd/tasks/main.yml | 7 +++++++ roles/mythtv-homebrew/tasks/main.yml | 8 ++++++++ roles/mythtv-pacman/tasks/main.yml | 7 +++++++ roles/mythtv-suse/tasks/main.yml | 7 +++++++ 6 files changed, 43 insertions(+) diff --git a/roles/mythtv-deb/tasks/main.yml b/roles/mythtv-deb/tasks/main.yml index 33197f3..11f7aa9 100644 --- a/roles/mythtv-deb/tasks/main.yml +++ b/roles/mythtv-deb/tasks/main.yml @@ -15,6 +15,11 @@ - libtool - ccache - pkg-config + - cmake + - patch + - ninja-build + - gperf + - meson # add mythtv essential build libraries - uuid-dev @@ -66,6 +71,8 @@ - libdatetime-format-iso8601-perl - libsoap-lite-perl - libjson-perl + - libfindbin-libs-perl + - perl-modules # add mythtv essential plugin libraries - libvorbis-dev diff --git a/roles/mythtv-dnf/tasks/main.yml b/roles/mythtv-dnf/tasks/main.yml index 4fff13d..5ced945 100644 --- a/roles/mythtv-dnf/tasks/main.yml +++ b/roles/mythtv-dnf/tasks/main.yml @@ -51,6 +51,11 @@ - pkgconfig - which - diffutils + - cmake + - patch + - ninja-build + - gperf + - meson # packages in repo for fedora, and in epel for centos7/rhel7 - nasm - ccache @@ -237,6 +242,8 @@ - perl-Image-Size - perl-Net-UPnP - perl(Sys::Hostname) + - perl(FindBin) + - perl(IPC::Cmd) - name: add mythtv essential plugin libraries set_fact: diff --git a/roles/mythtv-freebsd/tasks/main.yml b/roles/mythtv-freebsd/tasks/main.yml index 7919a5e..3de92f2 100644 --- a/roles/mythtv-freebsd/tasks/main.yml +++ b/roles/mythtv-freebsd/tasks/main.yml @@ -18,6 +18,11 @@ - autoconf - automake - pkgconf + - cmake + - patch + - ninja + - gperf + - meson - name: add essential libraries set_fact: @@ -99,6 +104,8 @@ - p5-SOAP-Lite - p5-XML-XPath - p5-XML-Simple + - p5-FindBin-libs + - p5-IPC-Cmd - name: add packages moved to main repository (freebsd11+) set_fact: diff --git a/roles/mythtv-homebrew/tasks/main.yml b/roles/mythtv-homebrew/tasks/main.yml index fd41b43..0caa542 100644 --- a/roles/mythtv-homebrew/tasks/main.yml +++ b/roles/mythtv-homebrew/tasks/main.yml @@ -32,6 +32,11 @@ - autoconf - automake - pkgconfig + - cmake + - gpatch + - ninja + - gperf + - meson - name: add essential libraries set_fact: @@ -233,6 +238,9 @@ SOAP::Lite XML::XPath XML::Simple + FindBin + IPC::Cmd + - name: cpanm - install DBD-mysql vwith special handling for mysql8 become: false diff --git a/roles/mythtv-pacman/tasks/main.yml b/roles/mythtv-pacman/tasks/main.yml index ad24ba5..475aa3d 100644 --- a/roles/mythtv-pacman/tasks/main.yml +++ b/roles/mythtv-pacman/tasks/main.yml @@ -16,6 +16,11 @@ - nasm - ccache - git + - cmake + - patch + - ninja + - gperf + - meson - name: add mythtv essential build libraries set_fact: @@ -80,6 +85,8 @@ - perl-datetime-format-iso8601 - perl-soap-lite - perl-json + - perl-findbin + - perl-ipc-cmd - name: add mythtv essential plugin libraries set_fact: diff --git a/roles/mythtv-suse/tasks/main.yml b/roles/mythtv-suse/tasks/main.yml index 6623e5f..a9c538a 100644 --- a/roles/mythtv-suse/tasks/main.yml +++ b/roles/mythtv-suse/tasks/main.yml @@ -14,6 +14,11 @@ - pkg-config - nasm - ccache + - cmake + - patch + - ninja + - gperf + - meson - name: add gcc13 for Leap set_fact: @@ -148,6 +153,8 @@ - perl-JSON - perl-Image-Size - perl-Net-UPnP + - perl(FindBin) + - perl(IPC::Cmd) - name: add mythtv essential plugin libraries set_fact: From 942a3d4ab2c75297785683ba89219bbd09203d3c Mon Sep 17 00:00:00 2001 From: Bill Meek Date: Thu, 22 Feb 2024 11:16:39 -0600 Subject: [PATCH 2/4] re=add workflow_dispatch: --- .github/workflows/ansible.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml index 3458e49..b2b77cd 100644 --- a/.github/workflows/ansible.yml +++ b/.github/workflows/ansible.yml @@ -23,6 +23,8 @@ on: # yamllint disable-line rule:truthy pull_request: + workflow_dispatch: + permissions: contents: read From 6228a6f8f43986b91ad90259cb720daf7018c58d Mon Sep 17 00:00:00 2001 From: Gary Buhrmaster Date: Thu, 22 Feb 2024 16:12:46 +0000 Subject: [PATCH 3/4] Don't try to install python3-oauth2 on tumbleweed Fixes: #44 --- roles/mythtv-suse/tasks/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/mythtv-suse/tasks/main.yml b/roles/mythtv-suse/tasks/main.yml index a9c538a..a27269e 100644 --- a/roles/mythtv-suse/tasks/main.yml +++ b/roles/mythtv-suse/tasks/main.yml @@ -94,9 +94,15 @@ - python3-lxml - python3-urlgrabber - python3-requests - - python3-oauth2 when: ansible_distribution == "openSUSE Leap" or ansible_distribution == "openSUSE Tumbleweed" +- name: add mythtv essential python modules only available in Leap + set_fact: + zypper_pkg_lst: + - '{{ zypper_pkg_lst }}' + - python3-oauth2 + when: ansible_distribution == "openSUSE Leap" + - name: set Suse repository set_fact: suse_repo: From d33f4e591eac00107bb3c2e60f0d05599691a6c5 Mon Sep 17 00:00:00 2001 From: Gary Buhrmaster Date: Thu, 22 Feb 2024 17:39:58 +0000 Subject: [PATCH 4/4] Fix typo in README.md for macports --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b1fa59..12a28a4 100755 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Archlinux | pacman -S ansible Centos | yum install ansible (enable the [EPEL](https://fedoraproject.org/wiki/EPEL) repository first) Debian (and derivatives) | apt install ansible Fedora | dnf install ansible -MacOSX (macoports) | port install py311-ansible +MacOSX (macports) | port install py311-ansible MacOSX (homebrew) | brew install ansible FreeBSD | pkg install py27-ansible OpenSuse | zypper install ansible