diff --git a/Dockerfile b/Dockerfile index f2eb1a30ee..4f17f377f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.21 AS builder RUN apk --no-cache add go npm libwebp-dev libwebp-static git make clang musl-dev COPY . /pixlet WORKDIR /pixlet -RUN npm install && npm run build && STATIC=1 make build +RUN npm install && npm run build && STATIC=1 CC=clang make build FROM scratch diff --git a/encode/encode_test.go b/encode/encode_test.go index 78b86ab664..6f712ac727 100644 --- a/encode/encode_test.go +++ b/encode/encode_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "github.com/ingmarstein/go-libwebp/webp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tidbyt/go-libwebp/webp" "tidbyt.dev/pixlet/render" "tidbyt.dev/pixlet/runtime" ) diff --git a/encode/webp.go b/encode/webp.go index fb3586e1e5..b20373d009 100644 --- a/encode/webp.go +++ b/encode/webp.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/tidbyt/go-libwebp/webp" + "github.com/ingmarstein/go-libwebp/webp" ) // Renders a screen to WebP. Optionally pass filters for diff --git a/go.mod b/go.mod index da0cd1381c..6c1c2b864e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module tidbyt.dev/pixlet -go 1.23 +go 1.23.6 require ( github.com/Code-Hex/Neo-cowsay/v2 v2.0.4 @@ -17,6 +17,7 @@ require ( github.com/google/tink/go v1.7.0 github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket v1.5.3 + github.com/ingmarstein/go-libwebp v0.0.0-20250210064648-2a5c38d63a1b github.com/manifoldco/promptui v0.9.0 github.com/mitchellh/hashstructure/v2 v2.0.2 github.com/nathan-osman/go-sunrise v1.1.0 @@ -33,7 +34,6 @@ require ( github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef github.com/stretchr/testify v1.10.0 github.com/tidbyt/gg v0.0.0-20220808163829-95806fa1d427 - github.com/tidbyt/go-libwebp v0.0.0-20230922075150-fb11063b2a6a github.com/vmihailenco/msgpack/v5 v5.4.1 github.com/zachomedia/go-bdf v0.0.0-20220611021443-a3af701111be go.starlark.net v0.0.0-20250205221240-492d3672b3f4 diff --git a/go.sum b/go.sum index a942130d51..d4cba6f538 100644 --- a/go.sum +++ b/go.sum @@ -161,6 +161,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20240912202439-0a2b6291aafd/go.mod h1: github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/ingmarstein/go-libwebp v0.0.0-20250210064648-2a5c38d63a1b h1:Krdm0Ud4gdyfuac9pIJzjb2XS1uvzstuL15ShkvPsYM= +github.com/ingmarstein/go-libwebp v0.0.0-20250210064648-2a5c38d63a1b/go.mod h1:IpH5jI96BLlagb2XZnNHNOh37XP6KW/aKI66kR6lU/4= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -305,8 +307,6 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tidbyt/gg v0.0.0-20220808163829-95806fa1d427 h1:br5WYVw/jr4G0PZpBBx2fBAANVUrI8KKHMSs3LVqO9A= github.com/tidbyt/gg v0.0.0-20220808163829-95806fa1d427/go.mod h1:+SCm6iJHe2lfsQzlbLCsd5XsTKYSD0VqtQmWMnNs9OE= -github.com/tidbyt/go-libwebp v0.0.0-20230922075150-fb11063b2a6a h1:zvAhEO3ZB7m1Lc3BwJXLTDrLrHVAbcDByJ7XkL4WR+s= -github.com/tidbyt/go-libwebp v0.0.0-20230922075150-fb11063b2a6a/go.mod h1:JU6yp7mldR7lmftjHPtaDs+Q8xn7l2tMR1XYx5iJELg= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= diff --git a/render/image_webp.go b/render/image_webp.go index 9081e75e63..c0963be543 100644 --- a/render/image_webp.go +++ b/render/image_webp.go @@ -5,7 +5,7 @@ package render import ( "fmt" - "github.com/tidbyt/go-libwebp/webp" + "github.com/ingmarstein/go-libwebp/webp" ) func (p *Image) InitFromWebP(data []byte) error {