From d5862de22e3cd9a865f8fe00451b9c649bcb5b7a Mon Sep 17 00:00:00 2001 From: RSWilli Date: Fri, 1 Sep 2023 13:07:37 +0200 Subject: [PATCH] change github action to build all packages * fix issues * add build script to build all packages locally --- .github/workflows/build.yml | 17 ++++++++++------- buildAll.sh | 8 ++++++++ examples/discoverer/main.go | 2 +- gst/audio/gst_audio_meta.go | 6 +++--- gst/pbutils/discoverer.go | 1 - gst/video/c_util.go | 1 - gst/video/convert_frame.go | 1 - 7 files changed, 22 insertions(+), 14 deletions(-) create mode 100755 buildAll.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08711cb..bf9d945 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,20 +9,23 @@ jobs: matrix: strategy: matrix: - os: [ubuntu-latest, windows-latest, 'macos-latest'] + os: [ubuntu-latest, windows-latest, "macos-latest"] runs-on: ${{ matrix.os }} steps: - name: Setup GStreamer - id: setup_gstreamer + id: setup_gstreamer uses: blinemedical/setup-gstreamer@45324555100927b587d390d8cf3940f91fd3bdc9 with: version: 1.22.0 - uses: actions/setup-go@v4 with: - go-version: '^1.21.0' + go-version: "^1.21.0" - name: checkout uses: actions/checkout@v3 - - name: build the appsink - run: cd examples/appsink && go build -x . - - + - name: build + shell: bash + run: | + packages=$(go list ./...) + for package in $packages; do + go build $package || exit 1 + done diff --git a/buildAll.sh b/buildAll.sh new file mode 100755 index 0000000..ef23aff --- /dev/null +++ b/buildAll.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# this script builds all go packages in the current directory + +packages=$(go list ./...) +for package in $packages; do + go build -o /dev/null "$package" || exit 1 +done diff --git a/examples/discoverer/main.go b/examples/discoverer/main.go index 93f3580..8028568 100644 --- a/examples/discoverer/main.go +++ b/examples/discoverer/main.go @@ -30,7 +30,7 @@ func main() { uri := os.Args[1] - discoverer, err := pbutils.NewDiscoverer(time.Second * 15) + discoverer, err := pbutils.NewDiscoverer(gst.ClockTime(time.Second * 15)) if err != nil { fmt.Println("ERROR:", err) os.Exit(2) diff --git a/gst/audio/gst_audio_meta.go b/gst/audio/gst_audio_meta.go index 580b493..0da1188 100644 --- a/gst/audio/gst_audio_meta.go +++ b/gst/audio/gst_audio_meta.go @@ -13,11 +13,11 @@ import ( ) // AudioMeta is a Go representation of a GstAudioMeta. -type AudioMeta struct{ *Object } +type AudioMeta struct{ *glib.Object } // FromGstAudioMetaUnsafeNone wraps the given audioMeta with a ref and finalizer. func FromGstAudioMetaUnsafeNone(audioMeta unsafe.Pointer) *AudioMeta { - return &AudioMeta{wrapObject(glib.TransferNone(audioMeta))} + return &AudioMeta{glib.TransferNone(audioMeta)} } func BufferAddAudioMeta(buffer *gst.Buffer, info *Info, samples int, offsets []int) *AudioMeta { @@ -34,6 +34,6 @@ func BufferAddAudioMeta(buffer *gst.Buffer, info *Info, samples int, offsets []i (*C.GstBuffer)(unsafe.Pointer(buffer.Instance())), info.ptr, C.gsize(samples), - offsets, + nil, ))) } diff --git a/gst/pbutils/discoverer.go b/gst/pbutils/discoverer.go index 8e50200..d8a6dc6 100644 --- a/gst/pbutils/discoverer.go +++ b/gst/pbutils/discoverer.go @@ -6,7 +6,6 @@ package pbutils import "C" import ( - "time" "unsafe" "github.com/go-gst/go-glib/glib" diff --git a/gst/video/c_util.go b/gst/video/c_util.go index 4aec0bd..a602f50 100644 --- a/gst/video/c_util.go +++ b/gst/video/c_util.go @@ -9,7 +9,6 @@ import "C" import ( "errors" - "time" "unsafe" "github.com/go-gst/go-gst/gst" diff --git a/gst/video/convert_frame.go b/gst/video/convert_frame.go index a2c0202..790ee7c 100644 --- a/gst/video/convert_frame.go +++ b/gst/video/convert_frame.go @@ -19,7 +19,6 @@ void cgoVideoConvertSampleCb (GstSample * sample, GError * gerr, gpointer user_d import "C" import ( - "time" "unsafe" "github.com/go-gst/go-gst/gst"