From 36164196ffd4f410966fe1b55d9efa7a21ccb40b Mon Sep 17 00:00:00 2001 From: pepijn-devries Date: Sat, 26 Oct 2024 11:37:01 +0200 Subject: [PATCH 1/4] Create rules for openmpt port openmpt is currently a private repository containing R bindings for libopenmpt. These rules are required to set up a CHECK workflow for the R package. --- rules/openmpt.json | 115 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 rules/openmpt.json diff --git a/rules/openmpt.json b/rules/openmpt.json new file mode 100644 index 0000000..1a29727 --- /dev/null +++ b/rules/openmpt.json @@ -0,0 +1,115 @@ +{ + "patterns": ["\\bopenmpt\\b"], + "dependencies": [ + { + "packages": ["libopenmpt-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "distribution": "debian" + } + ] + }, + { + "packages": ["libopenmpt-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "opensuse" + }, + { + "os": "linux", + "distribution": "fedora" + } + ] + }, + { + "packages": ["libopenmpt-devel"], + "pre_install": [ + { "command": "yum install -y epel-release" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "centos" + }, + { + "os": "linux", + "distribution": "rockylinux" + }, + { + "os": "linux", + "distribution": "redhat" + } + ] + }, + { + "packages": ["libopenmpt-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "alpine" + } + ] + } + { + "packages": ["portaudio19-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "distribution": "debian" + } + ] + }, + { + "packages": ["portaudio-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "opensuse" + }, + { + "os": "linux", + "distribution": "fedora" + } + ] + }, + { + "packages": ["portaudio-devel"], + "pre_install": [ + { "command": "yum install -y epel-release" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "centos" + }, + { + "os": "linux", + "distribution": "rockylinux" + }, + { + "os": "linux", + "distribution": "redhat" + } + ] + }, + { + "packages": ["portaudio19-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "alpine" + } + ] + } + ] +} From 35a2242bd81ad9c8fc1d298e2920c2557e0dd320 Mon Sep 17 00:00:00 2001 From: pepijn-devries Date: Tue, 29 Oct 2024 08:46:10 +0100 Subject: [PATCH 2/4] Fix for https://github.com/rstudio/r-system-requirements/pull/191/files/0b5780a5e810f6aad6c15c56c6f1714d5b1f930c#r1819909228 --- rules/openmpt.json | 63 +++------------------------------------------- 1 file changed, 4 insertions(+), 59 deletions(-) diff --git a/rules/openmpt.json b/rules/openmpt.json index 1a29727..4624ee6 100644 --- a/rules/openmpt.json +++ b/rules/openmpt.json @@ -2,7 +2,7 @@ "patterns": ["\\bopenmpt\\b"], "dependencies": [ { - "packages": ["libopenmpt-dev"], + "packages": ["libopenmpt-dev", "portaudio19-dev"], "constraints": [ { "os": "linux", @@ -15,7 +15,7 @@ ] }, { - "packages": ["libopenmpt-devel"], + "packages": ["libopenmpt-devel", "portaudio-devel"], "constraints": [ { "os": "linux", @@ -28,7 +28,7 @@ ] }, { - "packages": ["libopenmpt-devel"], + "packages": ["libopenmpt-devel", "portaudio-devel"], "pre_install": [ { "command": "yum install -y epel-release" } ], @@ -48,7 +48,7 @@ ] }, { - "packages": ["libopenmpt-dev"], + "packages": ["libopenmpt-dev", "portaudio19-dev"], "constraints": [ { "os": "linux", @@ -56,60 +56,5 @@ } ] } - { - "packages": ["portaudio19-dev"], - "constraints": [ - { - "os": "linux", - "distribution": "ubuntu" - }, - { - "os": "linux", - "distribution": "debian" - } - ] - }, - { - "packages": ["portaudio-devel"], - "constraints": [ - { - "os": "linux", - "distribution": "opensuse" - }, - { - "os": "linux", - "distribution": "fedora" - } - ] - }, - { - "packages": ["portaudio-devel"], - "pre_install": [ - { "command": "yum install -y epel-release" } - ], - "constraints": [ - { - "os": "linux", - "distribution": "centos" - }, - { - "os": "linux", - "distribution": "rockylinux" - }, - { - "os": "linux", - "distribution": "redhat" - } - ] - }, - { - "packages": ["portaudio19-dev"], - "constraints": [ - { - "os": "linux", - "distribution": "alpine" - } - ] - } ] } From faa19caf216e0f26993df11dae1adbb13150262f Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Tue, 29 Oct 2024 15:05:06 -0500 Subject: [PATCH 3/4] Update rules/openmpt.json --- rules/openmpt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/openmpt.json b/rules/openmpt.json index 4624ee6..765ba54 100644 --- a/rules/openmpt.json +++ b/rules/openmpt.json @@ -48,7 +48,7 @@ ] }, { - "packages": ["libopenmpt-dev", "portaudio19-dev"], + "packages": ["libopenmpt-dev", "portaudio-dev"], "constraints": [ { "os": "linux", From ecc0c9dc19a904559feca6d3d6b340b6d87fcda3 Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Tue, 29 Oct 2024 15:18:07 -0500 Subject: [PATCH 4/4] Update rules/openmpt.json --- rules/openmpt.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/openmpt.json b/rules/openmpt.json index 765ba54..e1f41e2 100644 --- a/rules/openmpt.json +++ b/rules/openmpt.json @@ -52,7 +52,8 @@ "constraints": [ { "os": "linux", - "distribution": "alpine" + "distribution": "alpine", + "versions": [ "3.18", "3.19", "3.20", "edge" ] } ] }