From f3c8aed75f51c68d836faf01d9a76dde37d7303f Mon Sep 17 00:00:00 2001 From: Mickael Kerjean Date: Mon, 20 Jan 2020 13:42:20 +1100 Subject: [PATCH] improve (support): prepare support for raspberry pi --- server/plugin/plg_image_light/install.sh | 13 ++++++++++--- server/plugin/plg_image_light/lib_resize.go | 6 +++--- .../plg_image_light/lib_resize_linux_amd64.go | 4 ++++ .../plugin/plg_image_light/lib_resize_linux_arm.go | 4 ++++ server/plugin/plg_image_light/lib_transcode.go | 1 - .../plg_image_light/lib_transcode_linux_amd64.go | 4 ++++ .../plg_image_light/lib_transcode_linux_arm.go | 4 ++++ 7 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 server/plugin/plg_image_light/lib_resize_linux_amd64.go create mode 100644 server/plugin/plg_image_light/lib_resize_linux_arm.go create mode 100644 server/plugin/plg_image_light/lib_transcode_linux_amd64.go create mode 100644 server/plugin/plg_image_light/lib_transcode_linux_arm.go diff --git a/server/plugin/plg_image_light/install.sh b/server/plugin/plg_image_light/install.sh index 8bb01f70..93752614 100755 --- a/server/plugin/plg_image_light/install.sh +++ b/server/plugin/plg_image_light/install.sh @@ -3,6 +3,13 @@ set -e SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" cd "$(dirname "$0")"/deps -echo `pwd` -curl -s https://downloads.filestash.app/upload/libresize_`uname -s`-`uname -m`.a > libresize.a -curl -s https://downloads.filestash.app/upload/libtranscode_`uname -s`-`uname -m`.a > libtranscode.a + +# AMD64 dependencies +curl -s https://downloads.filestash.app/upload/libresize_`uname -s`-`uname -m`.a > libresize_linux_amd64.a & +curl -s https://downloads.filestash.app/upload/libtranscode_`uname -s`-`uname -m`.a > libtranscode_linux_amd64.a & + +# ARM dependencies +curl -s https://downloads.filestash.app/upload/libresize_`uname -s`-`uname -m`.a > libresize_linux_arm.a & +curl -s https://downloads.filestash.app/upload/libtranscode_`uname -s`-`uname -m`.a > libtranscode_linux_arm.a & + +wait diff --git a/server/plugin/plg_image_light/lib_resize.go b/server/plugin/plg_image_light/lib_resize.go index 0aa997bb..4bbc4c84 100644 --- a/server/plugin/plg_image_light/lib_resize.go +++ b/server/plugin/plg_image_light/lib_resize.go @@ -1,9 +1,9 @@ package plg_image_light -// #cgo pkg-config:glib-2.0 + // #cgo CFLAGS: -I./deps/src -// #cgo LDFLAGS: -lm -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -ldl -L./deps -l:libresize.a -// #include "libresize.h" +// #cgo pkg-config:glib-2.0 // #include "glib-2.0/glib.h" +// #include "libresize.h" import "C" import ( diff --git a/server/plugin/plg_image_light/lib_resize_linux_amd64.go b/server/plugin/plg_image_light/lib_resize_linux_amd64.go new file mode 100644 index 00000000..ac1e1a02 --- /dev/null +++ b/server/plugin/plg_image_light/lib_resize_linux_amd64.go @@ -0,0 +1,4 @@ +package plg_image_light + +// #cgo LDFLAGS: -lm -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -ldl -L./deps -l:libresize_linux_amd64.a +import "C" diff --git a/server/plugin/plg_image_light/lib_resize_linux_arm.go b/server/plugin/plg_image_light/lib_resize_linux_arm.go new file mode 100644 index 00000000..d8899c9c --- /dev/null +++ b/server/plugin/plg_image_light/lib_resize_linux_arm.go @@ -0,0 +1,4 @@ +package plg_image_light + +// #cgo LDFLAGS: -lm -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -ldl -L./deps -l:libresize_linux_arm.a +import "C" diff --git a/server/plugin/plg_image_light/lib_transcode.go b/server/plugin/plg_image_light/lib_transcode.go index 29d254ee..a65bcbc4 100644 --- a/server/plugin/plg_image_light/lib_transcode.go +++ b/server/plugin/plg_image_light/lib_transcode.go @@ -1,6 +1,5 @@ package plg_image_light // #cgo CFLAGS: -I./deps/src -// #cgo LDFLAGS: -lm -lpthread -L./deps -l:libtranscode.a // #include "libtranscode.h" import "C" diff --git a/server/plugin/plg_image_light/lib_transcode_linux_amd64.go b/server/plugin/plg_image_light/lib_transcode_linux_amd64.go new file mode 100644 index 00000000..2b428698 --- /dev/null +++ b/server/plugin/plg_image_light/lib_transcode_linux_amd64.go @@ -0,0 +1,4 @@ +package plg_image_light + +// #cgo LDFLAGS: -lm -lpthread -L./deps -l:libtranscode_linux_amd64.a +import "C" diff --git a/server/plugin/plg_image_light/lib_transcode_linux_arm.go b/server/plugin/plg_image_light/lib_transcode_linux_arm.go new file mode 100644 index 00000000..d1f0abff --- /dev/null +++ b/server/plugin/plg_image_light/lib_transcode_linux_arm.go @@ -0,0 +1,4 @@ +package plg_image_light + +// #cgo LDFLAGS: -lm -lpthread -L./deps -l:libtranscode_linux_arm.a +import "C"