Skip to content

Commit

Permalink
Merge pull request #70 from alexballas/devel
Browse files Browse the repository at this point in the history
1.15.0
  • Loading branch information
alexballas authored Jun 8, 2023
2 parents 86a7b6c + d187bcf commit e0d3ddb
Show file tree
Hide file tree
Showing 74 changed files with 975 additions and 411 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: wget https://dl.google.com/android/repository/android-ndk-r23b-linux.zip && unzip android-ndk-r23b-linux.zip

- name: Package (Android)
run: APATH=$(readlink -e android-ndk-r23b) && cd cmd/go2tv && GO386='softfloat' ANDROID_NDK_HOME=$APATH fyne package -os android -name Go2TV -appID com.alexballas.go2tv -icon ../../assets/go2tv-icon.png && mv Go2TV.apk ../../
run: APATH=$(readlink -e android-ndk-r23b) && cd cmd/go2tv && GO386='softfloat' ANDROID_NDK_HOME=$APATH fyne package -os android -name Go2TV -appID com.alexballas.go2tv -icon ../../assets/go2tv-icon-android.png && mv Go2TV.apk ../../

- uses: actions/upload-artifact@v2
with:
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/build-arm-raspberry-pi.yml.bak

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/build-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
sudo apt update
sudo apt install -y xorg-dev
sudo apt clean
wget -nv https://go.dev/dl/go1.19.linux-armv6l.tar.gz
tar -xzf go1.19.linux-armv6l.tar.gz
rm go1.19.linux-armv6l.tar.gz
wget -nv https://go.dev/dl/go1.20.4.linux-armv6l.tar.gz
tar -xzf go1.20.4.linux-armv6l.tar.gz
rm go1.20.4.linux-armv6l.tar.gz
export GOROOT=/go
cd /go2tv_dir
/go/bin/go build -ldflags "-s -w" -o go2tv cmd/go2tv/go2tv.go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: go install fyne.io/fyne/v2/cmd/fyne@latest

- name: Package (macOS)
run: cd cmd/go2tv && fyne package --release -os darwin -icon ../../assets/go2tv-icon.png && mv go2tv.app ../../
run: cd cmd/go2tv && fyne package --release -os darwin -icon ../../assets/go2tv-icon-desktop.png && mv go2tv.app ../../

- uses: actions/upload-artifact@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-mac_m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ jobs:

- name: Install fyne-cross
run: go install github.com/fyne-io/fyne-cross@latest

- name: Install Homebrew
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"

- name: Install Colima
- name: Install Docker and Colima
run: brew install docker colima

- name: Run Colima
run: colima start

- name: Package (macOS)
run: fyne-cross darwin -arch=arm64 -icon assets/go2tv-icon.png -app-id "com.alexballas.go2tv" ./cmd/go2tv/
run: fyne-cross darwin -arch=arm64 -icon assets/go2tv-icon-desktop.png -app-id "com.alexballas.go2tv" ./cmd/go2tv/

- name: Prepary app for packaging
run: mv fyne-cross/dist/darwin-arm64/go2tv.app .
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ jobs:
- name: Get dependencies
run: sudo apt update && sudo apt install gcc xorg-dev gcc-mingw-w64

- name: Install fyne
run: go install fyne.io/fyne/v2/cmd/fyne@latest

- name: Package (Windows)
run: CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 go build -ldflags " -H=windowsgui -s -w" -o go2tv.exe cmd/go2tv/go2tv.go
run: cd cmd/go2tv && CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ fyne package --release --appID app.go2tv -os windows -icon ../../assets/go2tv-icon-desktop.png && mv go2tv.exe ../../

- uses: actions/upload-artifact@v2
with:
name: go2tv_${{ env.GO2TV_VERSION }}_windows_amd64
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ windows: clean
install: build
mkdir -vp /usr/local/bin/
cp build/go2tv /usr/local/bin/
$(MAKE) clean

uninstall:
rm -vf /usr/local/bin/go2tv
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<br/>
<p align="center">
<img src="https://raw.githubusercontent.com/alexballas/go2tv/main/assets/go2tv-red.svg" width="225" alt="Go2TV logo">
<img src="assets/go2tv-logo-color.svg" width="225" alt="Go2TV logo">
</a>
</p>
<br/>
Expand All @@ -24,8 +24,8 @@ Cast your media files to UPnP/DLNA Media Renderers and Smart TVs.
---
GUI mode
-----
![](https://i.imgur.com/ogbSCZF.png)
![](https://i.imgur.com/ncBpyw4.png)
![](https://i.imgur.com/Pw44BYD.png)
![](https://i.imgur.com/JeUxGGd.png)

CLI mode
-----
Expand Down
Binary file added assets/go2tv-icon-android.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/go2tv-icon-desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/go2tv-icon-small.png
Binary file not shown.
Binary file removed assets/go2tv-icon.png
Binary file not shown.
26 changes: 0 additions & 26 deletions assets/go2tv-icon.svg

This file was deleted.

123 changes: 123 additions & 0 deletions assets/go2tv-logo-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e0d3ddb

Please sign in to comment.