Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add cosmic-player #218

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+21 −11
Open

feat: add cosmic-player #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f89739
feat: add cosmic-player
jokeyrhyme Feb 27, 2024
7896762
chore: prefer `cargo clean` instead of `rm -rf ./target`
jokeyrhyme Mar 4, 2024
3fd0eb2
chore(ci): cosmic-player needs ffmpeg
jokeyrhyme Mar 5, 2024
34e86bf
Merge branch 'master' into add-cosmic-player
jokeyrhyme Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
cargo
clang
desktop-file-utils
ffmpeg
git
gtk3
gtk4
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@
path = cosmic-store
url = https://github.com/pop-os/cosmic-store.git
branch = master
[submodule "cosmic-player"]
path = cosmic-player
url = https://github.com/pop-os/cosmic-player.git
branch = master
[submodule "cosmic-wallpapers"]
path = cosmic-wallpapers
url = https://github.com/pop-os/cosmic-wallpapers.git
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Currently an incomplete **alpha**. Testing instructions below for various distri
* [cosmic-notifications](https://github.com/pop-os/cosmic-notifications)
* [cosmic-osd](https://github.com/pop-os/cosmic-osd)
* [cosmic-panel](https://github.com/pop-os/cosmic-panel)
* [cosmic-player](https://github.com/pop-os/cosmic-player)
* [cosmic-randr](https://github.com/pop-os/cosmic-randr)
* [cosmic-screenshot](https://github.com/pop-os/cosmic-screenshot)
* [cosmic-session](https://github.com/pop-os/cosmic-session)
Expand Down
1 change: 1 addition & 0 deletions cosmic-player
Open in desktop
Submodule cosmic-player added at 668177
25 changes: 14 additions & 11 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ build:
{{ just }} cosmic-notifications/build-release
{{ make }} -C cosmic-osd all
{{ just }} cosmic-panel/build-release
{{ just }} cosmic-player/build-release
{{ just }} cosmic-randr/build-release
{{ just }} cosmic-screenshot/build-release
{{ just }} cosmic-settings/build-release
Expand All @@ -39,6 +40,7 @@ install rootdir="" prefix="/usr/local": build
{{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-notifications/install
{{ make }} -C cosmic-osd install DESTDIR={{rootdir}} prefix={{prefix}}
{{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-panel/install
{{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-player/install
{{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-randr/install
{{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-screenshot/install
{{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-settings/install
Expand Down Expand Up @@ -67,21 +69,22 @@ sysext dir=(invocation_directory() / "cosmic-sysext") version=("nightly-" + `git
clean:
rm -rf cosmic-sysext
rm -rf cosmic-applets/target
rm -rf cosmic-applibrary/target
rm -rf cosmic-bg/target
{{ just }} cosmic-applibrary/clean
{{ just }} cosmic-bg/clean
rm -rf cosmic-comp/target
rm -rf cosmic-edit/target
{{ just }} cosmic-edit/clean
{{ just }} cosmic-files/clean
rm -rf cosmic-greeter/target
rm -rf cosmic-launcher/target
rm -rf cosmic-panel/target
rm -rf cosmic-notifications/target
{{ just }} cosmic-greeter/clean
{{ just }} cosmic-launcher/clean
{{ just }} cosmic-notifications/clean
rm -rf cosmic-osd/target
rm -rf cosmic-randr/target
rm -rf cosmic-screenshot/target
rm -rf cosmic-settings/target
{{ just }} cosmic-panel/clean
{{ just }} cosmic-player/clean
{{ just }} cosmic-randr/clean
{{ just }} cosmic-screenshot/clean
{{ just }} cosmic-settings/clean
rm -rf cosmic-settings-daemon/target
rm -rf cosmic-session/target
{{ just }} cosmic-session/clean
{{ just }} cosmic-store/clean
{{ just }} cosmic-term/clean
{{ make }} -C cosmic-wallpapers clean
Expand Down
Loading