Skip to content

Commit

Permalink
update in macos for m89 (#3)
Browse files Browse the repository at this point in the history
* update in macos for m89

Signed-off-by: Yuji Ito <[email protected]>

* fix for m89 on linux

Signed-off-by: Yuji Ito <[email protected]>

* update how to test

Signed-off-by: Yuji Ito <[email protected]>
  • Loading branch information
llamerada-jp authored Apr 1, 2021
1 parent 0c08de8 commit b47a579
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 27 deletions.
18 changes: 7 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ There is an archive file in `opt/linux_amd64`.
At amd64 linux environment.

```sh
sudo apt install qemu-usr-static g++-i686-linux-gnu
sudo apt install qemu-user-static g++-i686-linux-gnu

go run . build --arch=i386
go run . test --arch=i386
Expand All @@ -43,13 +43,11 @@ There is an archive file in `opt/linux_i386`.
At amd64 linux environment.

```sh
sudo apt install qemu-usr-static g++-arm-linux-gnueabihf

sudo ln -s /usr/arm-linux-gnueabihf/lib /lib/arm-linux-gnueabihf
sudo ln -s /lib/arm-linux-gnueabihf/ld-2.*.so /lib/ld-linux-armhf.so.3
sudo apt install qemu-user-static g++-arm-linux-gnueabihf
sudo ln -s /usr/arm-linux-gnueabihf/lib/ld-2.*.so /lib/ld-linux-armhf.so.3

go run . build --arch=armhf
go run . test --arch=armhf
LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib go run . test --arch=armhf
```

There is an archive file in `opt/linux_armhf`.
Expand All @@ -59,13 +57,11 @@ There is an archive file in `opt/linux_armhf`.
At amd64 linux environment.

```sh
sudo apt install qemu-usr-static g++-aarch64-linux-gnu

sudo ln -s /usr/aarch64-linux-gnu/lib/ /lib/aarch64-linux-gnu
sudo ln -s /lib/aarch64-linux-gnu/ld-2.23.so /lib/ld-linux-aarch64.so.1
sudo apt install qemu-user-static g++-aarch64-linux-gnu
sudo ln -s /usr/aarch64-linux-gnu/lib/ld-2.*.so /lib/ld-linux-aarch64.so.1

go run . build --arch=arm64
go run . test --arch=arm64
LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib go run . test --arch=arm64
```

There is an archive file in `opt/linux_arm64`.
Expand Down
2 changes: 1 addition & 1 deletion cmd/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path"
"runtime"

"github.com/colonio/libwebrtc/pkg/build"
"github.com/llamerada-jp/libwebrtc/pkg/build"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/colonio/libwebrtc/pkg/test"
"github.com/llamerada-jp/libwebrtc/pkg/test"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 2 additions & 0 deletions configs/linux_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ Headers:
# add by myself
- '.'
- 'call'
- 'common_video'
- 'common_video/include'
- 'common_video/generic_frame_descriptor'
- 'logging/rtc_event_log'
- 'logging/rtc_event_log/events'
- 'modules/async_audio_processing'
- 'modules/rtp_rtcp/source/rtcp_packet'
- 'modules/video_coding'
- 'modules/video_coding/codecs/interface'
Expand Down
2 changes: 2 additions & 0 deletions configs/linux_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@ Headers:
# add by myself
- '.'
- 'call'
- 'common_video'
- 'common_video/include'
- 'common_video/generic_frame_descriptor'
- 'logging/rtc_event_log'
- 'logging/rtc_event_log/events'
- 'modules/async_audio_processing'
- 'modules/rtp_rtcp/source/rtcp_packet'
- 'modules/video_coding'
- 'modules/video_coding/codecs/interface'
Expand Down
2 changes: 2 additions & 0 deletions configs/linux_armhf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,12 @@ Headers:
# add by myself
- '.'
- 'call'
- 'common_video'
- 'common_video/include'
- 'common_video/generic_frame_descriptor'
- 'logging/rtc_event_log'
- 'logging/rtc_event_log/events'
- 'modules/async_audio_processing'
- 'modules/rtp_rtcp/source/rtcp_packet'
- 'modules/video_coding'
- 'modules/video_coding/codecs/interface'
Expand Down
2 changes: 2 additions & 0 deletions configs/linux_i386.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@ Headers:
# add by myself
- '.'
- 'call'
- 'common_video'
- 'common_video/include'
- 'common_video/generic_frame_descriptor'
- 'logging/rtc_event_log'
- 'logging/rtc_event_log/events'
- 'modules/async_audio_processing'
- 'modules/rtp_rtcp/source/rtcp_packet'
- 'modules/video_coding'
- 'modules/video_coding/codecs/interface'
Expand Down
2 changes: 2 additions & 0 deletions configs/macos_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ Headers:
# add by myself
- '.'
- 'call'
- 'common_video'
- 'common_video/include'
- 'common_video/generic_frame_descriptor'
- 'logging/rtc_event_log'
- 'logging/rtc_event_log/events'
- 'modules/async_audio_processing'
- 'modules/rtp_rtcp/source/rtcp_packet'
- 'modules/video_coding'
- 'modules/video_coding/codecs/interface'
Expand Down
16 changes: 3 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
module github.com/colonio/libwebrtc
module github.com/llamerada-jp/libwebrtc

go 1.14

require (
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/mitchellh/mapstructure v1.3.0 // indirect
github.com/pelletier/go-toml v1.7.0 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v1.0.0
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.7.0
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 // indirect
gopkg.in/ini.v1 v1.56.0 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
github.com/spf13/cobra v1.1.3
github.com/spf13/viper v1.7.1
)
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/colonio/libwebrtc/cmd"
import "github.com/llamerada-jp/libwebrtc/cmd"

func main() {
cmd.Execute()
Expand Down

0 comments on commit b47a579

Please sign in to comment.