Skip to content

Commit e8862ad

Browse files
Merge remote-tracking branch 'origin/master'
2 parents d511cf6 + dff1cd4 commit e8862ad

File tree

9 files changed

+384
-253
lines changed

9 files changed

+384
-253
lines changed

DOCKER_README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Sunshine images are available with the following tag suffixes, based on their re
2626

2727
- `archlinux`
2828
- `debian-bookworm`
29-
- `fedora-39`
30-
- `fedora-40`
3129
- `ubuntu-22.04`
3230
- `ubuntu-24.04`
3331

@@ -157,8 +155,6 @@ The architectures supported by these images are shown in the table below.
157155
|-----------------|--------------|---------------|
158156
| archlinux | ✅ | ❌ |
159157
| debian-bookworm | ✅ | ✅ |
160-
| fedora-39 | ✅ | ❌ |
161-
| fedora-40 | ✅ | ❌ |
162158
| ubuntu-22.04 | ✅ | ✅ |
163159
| ubuntu-24.04 | ✅ | ✅ |
164160

docker/fedora-39.dockerfile

Lines changed: 0 additions & 104 deletions
This file was deleted.

docker/fedora-40.dockerfile

Lines changed: 0 additions & 104 deletions
This file was deleted.

docs/getting_started.md

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,21 @@ CUDA is used for NVFBC capture.
5454
</tr>
5555
<tr>
5656
<td rowspan="1">12.0.0</td>
57-
<td rowspan="3">525.60.13</td>
57+
<td rowspan="2">525.60.13</td>
5858
<td rowspan="4">50;52;60;61;62;70;72;75;80;86;87;89;90</td>
5959
<td>sunshine-debian-bookworm-{arch}.deb</td>
6060
</tr>
61-
<tr>
62-
<td rowspan="1">12.4.0</td>
63-
<td>sunshine-fedora-39-{arch}.rpm</td>
64-
</tr>
6561
<tr>
6662
<td rowspan="1">12.5.1</td>
6763
<td>sunshine.pkg.tar.zst</td>
6864
</tr>
6965
<tr>
70-
<td rowspan="1">12.6.2</td>
71-
<td rowspan="1">560.35.03</td>
66+
<td rowspan="2">12.6.2</td>
67+
<td rowspan="2">560.35.03</td>
7268
<td>sunshine_{arch}.flatpak</td>
7369
</tr>
7470
<tr>
75-
<td>n/a</td>
76-
<td>n/a</td>
77-
<td>n/a</td>
78-
<td>sunshine-fedora-40-{arch}.rpm</td>
71+
<td>Sunshine (copr)</td>
7972
</tr>
8073
</table>
8174

@@ -165,26 +158,27 @@ sudo apt remove sunshine
165158
```
166159

167160
#### Fedora
161+
@tip{The package name is case-sensitive.}
162+
168163
##### Install
169-
1. Add `rpmfusion` repositories.
164+
1. Enable copr repository.
170165
```bash
171-
sudo dnf install \
172-
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
173-
https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
166+
sudo dnf copr enable lizardbyte/stable
174167
```
175-
2. Download `sunshine-{distro}-{distro-version}-{arch}.rpm` and run the following command.
168+
169+
or
176170
```bash
177-
sudo dnf install ./sunshine-{distro}-{distro-version}-{arch}.rpm
171+
sudo dnf copr enable lizardbyte/beta
178172
```
179173

180-
@note{The `{distro-version}` is the version of the distro we built the package on. The `{arch}` is the
181-
architecture of your operating system.}
182-
183-
@tip{You can double-click the rpm file to see details about the package and begin installation.}
174+
2. Install the package.
175+
```bash
176+
sudo dnf install Sunshine
177+
```
184178

185179
##### Uninstall
186180
```bash
187-
sudo dnf remove sunshine
181+
sudo dnf remove Sunshine
188182
```
189183

190184
#### Flatpak

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"serve": "serve ./tests/fixtures/http --no-port-switching"
99
},
1010
"dependencies": {
11-
"@lizardbyte/shared-web": "2024.901.195233",
12-
"vue": "3.5.3",
11+
"@lizardbyte/shared-web": "2024.921.191855",
12+
"vue": "3.5.11",
1313
"vue-i18n": "9.14.0"
1414
},
1515
"devDependencies": {
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#! /bin/sh -x
2+
3+
# This file is not used directly in this repository. It should be uploaded to Copr whenever the file changes.
4+
# Replicate to each package in "pulls", "beta", and "stable" Copr repositories
5+
6+
set -e
7+
resultdir="${COPR_RESULTDIR}"
8+
git clone "https://github.com/${COPR_OWNER}/${COPR_PACKAGE}.git" --depth 1
9+
cd "${COPR_PACKAGE}"
10+
11+
# optional part; drop if building against 'master' is enough
12+
if test -z "$REVISION"; then
13+
# the hook_payload file contains webhook JSON payload (copr creates it for
14+
# us); it is created only if the build is triggered by Custom webhook.
15+
if test -f "$resultdir"/hook_payload; then
16+
git clone https://github.com/praiskup/copr-ci-tooling \
17+
"$resultdir/cct" --depth 1
18+
export PATH="$resultdir/cct:$PATH"
19+
20+
echo "---"
21+
cat "$resultdir"/hook_payload
22+
echo "---"
23+
24+
# use jq to get the pr_id from the hook_payload
25+
PR=$(jq -r '.pr_id' "$resultdir"/hook_payload)
26+
if [ -z "$PR" ]; then
27+
BRANCH="master"
28+
else
29+
BRANCH="pr/${PR}"
30+
fi
31+
32+
copr-travis-checkout "$resultdir"/hook_payload
33+
fi
34+
else
35+
git checkout "$REVISION"
36+
fi
37+
38+
# initialize the submodules
39+
git submodule update --init --recursive
40+
41+
# get the tag of this commit IF it has one
42+
TAG=$(git tag --points-at HEAD | head -n1)
43+
if [ -z "$TAG" ]; then
44+
TAG="0.0.$PR"
45+
fi
46+
TAG=$(echo "$TAG" | sed 's/^v//') # remove v prefix from the tag
47+
echo "TAG=$TAG"
48+
49+
# get the commit
50+
COMMIT=$(git rev-parse HEAD)
51+
echo "COMMIT=$COMMIT"
52+
53+
# move spec file to the correct location
54+
mv packaging/linux/fedora/*.spec "${resultdir}"
55+
56+
# use sed to replace these values in the spec file
57+
sed -i "s|%global build_version 0|%global build_version ${TAG}|" "${resultdir}"/*.spec
58+
sed -i "s|%global branch 0|%global branch ${BRANCH}|" "${resultdir}"/*.spec
59+
sed -i "s|%global commit 0|%global commit ${COMMIT}|" "${resultdir}"/*.spec
60+
61+
# create a tarball of the source code
62+
tar -czf "${resultdir}/tarball.tar.gz" .

0 commit comments

Comments
 (0)