Update Go to 1.22, go-pdfium to 1.11.0, pdfium to 6281 and libjpeg-tu…

…rbo to 3.0.2 (#37) * Go updates * Update Go in tests/release, update pdfium to 6281, update libjpeg-turbo to 3.0.2 * Download libjpeg-turbo from github
klippa-app · Feb 9, 2024 · 58c053d · 58c053d
1 parent fd9fa2a
commit 58c053d
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/.github/workflows/libturbojpeg.pc b/.github/workflows/libturbojpeg.pc
@@ -1,9 +1,9 @@
-prefix=/opt/libjpegturbo/libjpeg-turbo-3.0.0
-libdir=/opt/libjpegturbo/libjpeg-turbo-3.0.0/build
-includedir=/opt/libjpegturbo/libjpeg-turbo-3.0.0
+prefix=/opt/libjpegturbo/libjpeg-turbo-3.0.2
+libdir=/opt/libjpegturbo/libjpeg-turbo-3.0.2/build
+includedir=/opt/libjpegturbo/libjpeg-turbo-3.0.2
 
 Name: libturbojpeg
 Description: A SIMD-accelerated JPEG codec that provides the TurboJPEG API
-Version: 3.0.0
+Version: 3.0.2
 Libs: -L${libdir} -lturbojpeg
-Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/.github/workflows/pdfium-windows.pc b/.github/workflows/pdfium-windows.pc
@@ -4,7 +4,7 @@ includedir=D:/opt/pdfium/include
 
 Name: PDFium
 Description: PDFium
-Version: 6150
+Version: 6281
 Requires:
 
 Libs: -L${libdir} -lpdfium

diff --git a/.github/workflows/pdfium.pc b/.github/workflows/pdfium.pc
@@ -4,7 +4,7 @@ includedir=/opt/pdfium/include
 
 Name: PDFium
 Description: PDFium
-Version: 6150
+Version: 6281
 Requires:
 
 Libs: -L${libdir} -lpdfium

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,8 +5,8 @@ on:
     types: [created]
 
 env:
-  GO_VERSION: "1.21"
-  PDFIUM_VERSION: "6150"
+  GO_VERSION: "1.22"
+  PDFIUM_VERSION: "6281"
 
 jobs:
   release-webassembly:
@@ -87,7 +87,7 @@ jobs:
     env:
       CGO_ENABLED: 1
       CC: "musl-gcc"
-      LD_LIBRARY_PATH: "/opt/pdfium/lib:/opt/libjpegturbo/libjpeg-turbo-3.0.0/build"
+      LD_LIBRARY_PATH: "/opt/pdfium/lib:/opt/libjpegturbo/libjpeg-turbo-3.0.2/build"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -105,14 +105,14 @@ jobs:
           sudo cp ./.github/workflows/libturbojpeg.pc /usr/lib/pkgconfig/libturbojpeg.pc
           sudo apt-get update -y
           sudo apt-get install -y musl-dev musl-tools
-          sudo curl -L https://master.dl.sourceforge.net/project/libjpeg-turbo/3.0.0/libjpeg-turbo-3.0.0.tar.gz -o libjpeg-turbo-3.0.0.tar.gz && sudo mkdir /opt/libjpegturbo && sudo tar -C /opt/libjpegturbo -xvf libjpeg-turbo-3.0.0.tar.gz
-          cd /opt/libjpegturbo/libjpeg-turbo-3.0.0 && sudo mkdir build && cd build
+          sudo curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.2/libjpeg-turbo-3.0.2.tar.gz -o libjpeg-turbo-3.0.2.tar.gz && sudo mkdir /opt/libjpegturbo && sudo tar -C /opt/libjpegturbo -xvf libjpeg-turbo-3.0.2.tar.gz
+          cd /opt/libjpegturbo/libjpeg-turbo-3.0.2 && sudo mkdir build && cd build
           sudo cmake -G"Unix Makefiles" -DCMAKE_C_COMPILER=musl-gcc -DWITH_JPEG8=1 -DCMAKE_BUILD_TYPE=None ../
           sudo make turbojpeg
 
       - name: Build
         run: |
-          go build --ldflags '-linkmode external -extldflags "-fno-PIC -L/opt/libjpegturbo/libjpeg-turbo-3.0.0/build"' -tags pdfium_experimental,pdfium_cli_use_cgo,pdfium_use_turbojpeg -ldflags "-X 'github.com/klippa-app/pdfium-cli/version.VERSION=${{ github.event.release.name }}'" -o artifacts/pdfium-native-linux-musl-amd64 main.go
+          go build --ldflags '-linkmode external -extldflags "-fno-PIC -L/opt/libjpegturbo/libjpeg-turbo-3.0.2/build"' -tags pdfium_experimental,pdfium_cli_use_cgo,pdfium_use_turbojpeg -ldflags "-X 'github.com/klippa-app/pdfium-cli/version.VERSION=${{ github.event.release.name }}'" -o artifacts/pdfium-native-linux-musl-amd64 main.go
 
       - uses: actions/upload-artifact@v3
         with:
@@ -179,8 +179,8 @@ jobs:
           rm pdfium-win-x64.tgz
           mkdir D:\opt\pkgconfig
           cp ./.github/workflows/pdfium-windows.pc D:\opt\pkgconfig\pdfium.pc
-          curl -L https://master.dl.sourceforge.net/project/libjpeg-turbo/3.0.0/libjpeg-turbo-3.0.0-gcc64.exe -o libjpeg-turbo-3.0.0-gcc64.exe
-          ./libjpeg-turbo-3.0.0-gcc64.exe /S
+          curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.2/libjpeg-turbo-3.0.2-gcc64.exe -o libjpeg-turbo-3.0.2-gcc64.exe
+          ./libjpeg-turbo-3.0.2-gcc64.exe /S
           $Folder = 'C:\libjpeg-turbo-gcc64\lib\pkgconfig'
           while (!(Test-Path -Path $Folder)) {
             "libjpeg-turbo does not exist yet!"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,8 +11,8 @@ on:
       - development
 
 env:
-  GO_VERSION: "1.21"
-  PDFIUM_VERSION: "6150"
+  GO_VERSION: "1.22"
+  PDFIUM_VERSION: "6281"
 
 jobs:
   test-webassembly:
@@ -70,7 +70,7 @@ jobs:
     env:
       CGO_ENABLED: 1
       CC: "musl-gcc"
-      LD_LIBRARY_PATH: "/opt/pdfium/lib:/opt/libjpegturbo/libjpeg-turbo-3.0.0/build"
+      LD_LIBRARY_PATH: "/opt/pdfium/lib:/opt/libjpegturbo/libjpeg-turbo-3.0.2/build"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -88,18 +88,18 @@ jobs:
           sudo cp ./.github/workflows/libturbojpeg.pc /usr/lib/pkgconfig/libturbojpeg.pc
           sudo apt-get update -y
           sudo apt-get install -y musl-dev musl-tools
-          sudo curl -L https://master.dl.sourceforge.net/project/libjpeg-turbo/3.0.0/libjpeg-turbo-3.0.0.tar.gz -o libjpeg-turbo-3.0.0.tar.gz && sudo mkdir /opt/libjpegturbo && sudo tar -C /opt/libjpegturbo -xvf libjpeg-turbo-3.0.0.tar.gz
-          cd /opt/libjpegturbo/libjpeg-turbo-3.0.0 && sudo mkdir build && cd build
+          sudo curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.2/libjpeg-turbo-3.0.2.tar.gz -o libjpeg-turbo-3.0.2.tar.gz && sudo mkdir /opt/libjpegturbo && sudo tar -C /opt/libjpegturbo -xvf libjpeg-turbo-3.0.2.tar.gz
+          cd /opt/libjpegturbo/libjpeg-turbo-3.0.2 && sudo mkdir build && cd build
           sudo cmake -G"Unix Makefiles" -DCMAKE_C_COMPILER=musl-gcc -DWITH_JPEG8=1 -DCMAKE_BUILD_TYPE=None ../
           sudo make turbojpeg
 
       - name: Test Linux
         run: |
-          go test ./... --ldflags '-linkmode external -extldflags "-fno-PIC -L/opt/libjpegturbo/libjpeg-turbo-3.0.0/build"' -tags pdfium_experimental,pdfium_cli_use_cgo,pdfium_use_turbojpeg -v
+          go test ./... --ldflags '-linkmode external -extldflags "-fno-PIC -L/opt/libjpegturbo/libjpeg-turbo-3.0.2/build"' -tags pdfium_experimental,pdfium_cli_use_cgo,pdfium_use_turbojpeg -v
 
       - name: Build
         run: |
-          go build --ldflags '-linkmode external -extldflags "-fno-PIC -L/opt/libjpegturbo/libjpeg-turbo-3.0.0/build"' -tags pdfium_experimental,pdfium_cli_use_cgo,pdfium_use_turbojpeg main.go
+          go build --ldflags '-linkmode external -extldflags "-fno-PIC -L/opt/libjpegturbo/libjpeg-turbo-3.0.2/build"' -tags pdfium_experimental,pdfium_cli_use_cgo,pdfium_use_turbojpeg main.go
 
   test-cgo-macos:
     env:
@@ -150,8 +150,8 @@ jobs:
           rm pdfium-win-x64.tgz
           mkdir D:\opt\pkgconfig
           cp ./.github/workflows/pdfium-windows.pc D:\opt\pkgconfig\pdfium.pc
-          curl -L https://master.dl.sourceforge.net/project/libjpeg-turbo/3.0.0/libjpeg-turbo-3.0.0-gcc64.exe -o libjpeg-turbo-3.0.0-gcc64.exe
-          ./libjpeg-turbo-3.0.0-gcc64.exe /S
+          curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.2/libjpeg-turbo-3.0.2-gcc64.exe -o libjpeg-turbo-3.0.2-gcc64.exe
+          ./libjpeg-turbo-3.0.2-gcc64.exe /S
           $Folder = 'C:\libjpeg-turbo-gcc64\lib\pkgconfig'
           while (!(Test-Path -Path $Folder)) {
             "libjpeg-turbo does not exist yet!"

diff --git a/go.mod b/go.mod
@@ -1,16 +1,16 @@
 module github.com/klippa-app/pdfium-cli
 
-go 1.21
+go 1.22
 
 require (
-	github.com/klippa-app/go-pdfium v1.10.0
+	github.com/klippa-app/go-pdfium v1.11.0
 	github.com/spf13/cobra v1.8.0
 )
 
 require (
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.5.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-hclog v1.6.2 // indirect
 	github.com/hashicorp/go-plugin v1.6.0 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect

diff --git a/go.sum b/go.sum
@@ -20,8 +20,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I=
 github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A=
@@ -34,8 +34,8 @@ github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgf
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
 github.com/jolestar/go-commons-pool/v2 v2.1.2 h1:E+XGo58F23t7HtZiC/W6jzO2Ux2IccSH/yx4nD+J1CM=
 github.com/jolestar/go-commons-pool/v2 v2.1.2/go.mod h1:r4NYccrkS5UqP1YQI1COyTZ9UjPJAAGTUxzcsK1kqhY=
-github.com/klippa-app/go-pdfium v1.10.0 h1:4Mk0JOKwSAyohNOGkzC7+YpRuwgbfWvqKP+Q61F9HHM=
-github.com/klippa-app/go-pdfium v1.10.0/go.mod h1:2pk59Rfu/Klc582wwH10CHwAlBMx9jdXGxtpKRFVmD4=
+github.com/klippa-app/go-pdfium v1.11.0 h1:KV90T+ISCVjSZyAfKmjdlxawhO927NG428DcPelDm0A=
+github.com/klippa-app/go-pdfium v1.11.0/go.mod h1:bqjTi5hsWpr+VZZeib00TAE0YFMkYalrGRoKYHRGl+U=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
@@ -46,10 +46,10 @@ github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY=
-github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw=
-github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
-github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
+github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
+github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
+github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=