Update build

README.md

@@ -18,10 +18,11 @@ It can convert comics to different formats to fit your various devices.
 
 ### Download
 
-* [Windows x86_64](https://github.com/gen2brain/cbconvert/releases/download/0.8.0/cbconvert-0.8.0-windows-x86_64.zip)
+* [Windows x86_64](https://github.com/gen2brain/cbconvert/releases/download/0.8.1/cbconvert-0.8.1-windows-x86_64.zip)
-* [Linux x86_64](https://github.com/gen2brain/cbconvert/releases/download/0.8.0/cbconvert-0.8.0-linux-x86_64.tar.gz)
+* [Linux x86_64](https://github.com/gen2brain/cbconvert/releases/download/0.8.1/cbconvert-0.8.1-linux-x86_64.tar.gz)
-* [macOS x86_64](https://github.com/gen2brain/cbconvert/releases/download/0.8.0/cbconvert-0.8.0-darwin-x86_64.tar.gz)
+* [Linux aarch64](https://github.com/gen2brain/cbconvert/releases/download/0.8.1/cbconvert-0.8.1-linux-aarch64.tar.gz)
-* [macOS aarch64](https://github.com/gen2brain/cbconvert/releases/download/0.8.0/cbconvert-0.8.0-darwin-aarch64.tar.gz)
+* [macOS x86_64](https://github.com/gen2brain/cbconvert/releases/download/0.8.1/cbconvert-0.8.1-darwin-x86_64.zip)
+* [macOS aarch64](https://github.com/gen2brain/cbconvert/releases/download/0.8.1/cbconvert-0.8.1-darwin-aarch64.zip)
 
 ### Using cbconvert in file managers to generate FreeDesktop thumbnails
 
@@ -31,7 +32,7 @@ Copy cbconvert cli binary to your PATH and create file ~/.local/share/thumbnaile
 [Thumbnailer Entry]
 TryExec=cbconvert
 Exec=cbconvert thumbnail --quiet --width %s --outfile %o %i
-MimeType=application/pdf;application/x-pdf;image/pdf;application/x-cbz;application/x-cbr;application/x-cb7;application/x-cbt;application/epub+zip;
+MimeType=application/pdf;application/x-pdf;image/pdf;application/x-cbz;application/x-cbr;application/x-cb7;application/x-cbt;application/epub+zip;application/vnd.comicbook-rar;application/vnd.comicbook+zip;
 ```
 
 This is what it looks like in the PCManFM file manager:
@@ -170,6 +171,6 @@ Extract covers to ~/covers dir for all supported files found in the directory, L
 
 ### Compile
 
-Install ImageMagick 7 libraries and headers and then install to GOBIN:
+Install ImageMagick7 and libheif (with libaom) libraries and headers and then install to GOBIN:
 
 `go install github.com/gen2brain/cbconvert/cmd/cbconvert@latest`

cbconvert.go

@@ -185,17 +185,7 @@ func (c *Convertor) convertImage(ctx context.Context, img image.Image, index int
 	}
 
 	switch c.Opts.Format {
-	case "jpeg":
+	case "jpeg", "png", "tiff", "webp", "avif":
-		err = c.encodeImage(img, fileName)
-		if err != nil {
-			return err
-		}
-	case "png":
-		err = c.encodeImage(img, fileName)
-		if err != nil {
-			return err
-		}
-	case "tiff":
 		err = c.encodeImage(img, fileName)
 		if err != nil {
 			return err
@@ -206,16 +196,6 @@ func (c *Convertor) convertImage(ctx context.Context, img image.Image, index int
 		if err != nil {
 			return err
 		}
-	case "webp":
-		err = c.encodeImage(img, fileName)
-		if err != nil {
-			return err
-		}
-	case "avif":
-		err = c.encodeImage(img, fileName)
-		if err != nil {
-			return err
-		}
 	}
 
 	return nil
@@ -296,9 +276,14 @@ func (c *Convertor) levelImage(img image.Image) (image.Image, error) {
 	}
 
 	blob := mw.GetImageBlob()
-	i, err := c.decodeImage(bytes.NewReader(blob), "levels")
+
+	var i image.Image
+	i, err = c.decodeImage(bytes.NewReader(blob), "levels")
 	if err != nil {
-		return img, fmt.Errorf("levelImage: %w", err)
+		i, err = c.decodeIM(bytes.NewReader(blob), "levels")
+		if err != nil {
+			return nil, fmt.Errorf("levelImage: %w", err)
+		}
 	}
 
 	return i, nil
@@ -397,10 +382,14 @@ func (c *Convertor) convertArchive(fileName string) error {
 				continue
 			}
 
-			img, err := c.decodeImage(bytes.NewReader(data), pathName)
+			var img image.Image
+			img, err = c.decodeImage(bytes.NewReader(data), pathName)
+			if err != nil {
+				img, err = c.decodeIM(bytes.NewReader(data), pathName)
 				if err != nil {
 					return fmt.Errorf("convertArchive: %w", err)
 				}
+			}
 
 			if cover == pathName && c.Opts.NoCover {
 				img = c.transformImage(img)
@@ -469,7 +458,7 @@ func (c *Convertor) convertDirectory(dirPath string) error {
 		if c.isNonImage(img) && !c.Opts.NoNonImage {
 			err = c.copyFile(file, filepath.Join(c.Workdir, filepath.Base(img)))
 			if err != nil {
-				return fmt.Errorf("convertArchive: %w", err)
+				return fmt.Errorf("convertDirectory: %w", err)
 			}
 
 			err = file.Close()
@@ -479,12 +468,24 @@ func (c *Convertor) convertDirectory(dirPath string) error {
 
 			continue
 		} else if c.isImage(img) {
-
+			if c.Opts.NoConvert {
-			i, err := c.decodeImage(file, img)
+				err = c.copyFile(file, filepath.Join(c.Workdir, filepath.Base(img)))
 				if err != nil {
 					return fmt.Errorf("convertDirectory: %w", err)
 				}
 
+				continue
+			}
+
+			var i image.Image
+			i, err = c.decodeImage(file, img)
+			if err != nil {
+				i, err = c.decodeIM(file, img)
+				if err != nil {
+					return fmt.Errorf("coverDirectory: %w", err)
+				}
+			}
+
 			if c.Opts.NoRGB && !c.isGrayScale(i) {
 				i = c.transformImage(i)
 				err = c.encodeImage(i, filepath.Join(c.Workdir, filepath.Base(img)))
@@ -765,10 +766,14 @@ func (c *Convertor) coverArchive(fileName string) (image.Image, error) {
 		return nil, fmt.Errorf("coverArchive: %w", err)
 	}
 
-	img, err := c.decodeImage(bytes.NewReader(data), cover)
+	var img image.Image
+	img, err = c.decodeImage(bytes.NewReader(data), cover)
+	if err != nil {
+		img, err = c.decodeIM(bytes.NewReader(data), cover)
 		if err != nil {
 			return nil, fmt.Errorf("coverArchive: %w", err)
 		}
+	}
 
 	return img, nil
 }
@@ -806,10 +811,14 @@ func (c *Convertor) coverDirectory(dir string) (image.Image, error) {
 	}
 	defer file.Close()
 
-	img, err := c.decodeImage(file, cover)
+	var img image.Image
+	img, err = c.decodeImage(file, cover)
+	if err != nil {
+		img, err = c.decodeIM(file, cover)
 		if err != nil {
 			return nil, fmt.Errorf("coverDirectory: %w", err)
 		}
+	}
 
 	return img, nil
 }
@@ -983,16 +992,29 @@ func (c *Convertor) coverName(images []string) string {
 		return ""
 	}
 
-	for _, i := range images {
+	lower := make([]string, 0)
-		e := c.baseNoExt(i)
+	for idx, img := range images {
-		if strings.HasPrefix(i, "cover") || strings.HasPrefix(i, "front") ||
+		img = strings.ToLower(img)
-			strings.HasSuffix(e, "cover") || strings.HasSuffix(e, "front") {
+		lower = append(lower, img)
-			return i
+		ext := c.baseNoExt(img)
+
+		if strings.HasPrefix(img, "cover") || strings.HasPrefix(img, "front") ||
+			strings.HasSuffix(ext, "cover") || strings.HasSuffix(ext, "front") {
+			return images[idx]
 		}
 	}
 
-	sort.Sort(sortorder.Natural(images))
+	sort.Sort(sortorder.Natural(lower))
-	return images[0]
+	cover := lower[0]
+
+	for idx, img := range images {
+		img = strings.ToLower(img)
+		if img == cover {
+			return images[idx]
+		}
+	}
+
+	return ""
 }
 
 // coverImage returns cover as image.Image.
@@ -1166,16 +1188,36 @@ func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error {
 		fname = abs
 	}
 
-	_ = mw.SetImageFormat("PNG")
+	err = mw.SetImageFormat("PNG")
-	_ = mw.SetImageProperty("Software", "CBconvert")
+	if err != nil {
-	_ = mw.SetImageProperty("Description", "Thumbnail of "+furi)
+		return fmt.Errorf("extractThumbnail: %w", err)
-	_ = mw.SetImageProperty("Thumb::URI", furi)
+	}
-	_ = mw.SetImageProperty("Thumb::MTime", strconv.FormatInt(info.ModTime().Unix(), 10))
+	err = mw.SetImageProperty("Software", "CBconvert")
-	_ = mw.SetImageProperty("Thumb::Size", strconv.FormatInt(info.Size(), 10))
+	if err != nil {
-	_ = mw.SetImageProperty("Thumb::Mimetype", mime.TypeByExtension(filepath.Ext(filename)))
+		return fmt.Errorf("extractThumbnail: %w", err)
+	}
+	err = mw.SetImageProperty("Description", "Thumbnail of "+furi)
+	if err != nil {
+		return fmt.Errorf("extractThumbnail: %w", err)
+	}
+	err = mw.SetImageProperty("Thumb::URI", furi)
+	if err != nil {
+		return fmt.Errorf("extractThumbnail: %w", err)
+	}
+	err = mw.SetImageProperty("Thumb::MTime", strconv.FormatInt(info.ModTime().Unix(), 10))
+	if err != nil {
+		return fmt.Errorf("extractThumbnail: %w", err)
+	}
+	err = mw.SetImageProperty("Thumb::Size", strconv.FormatInt(info.Size(), 10))
+	if err != nil {
+		return fmt.Errorf("extractThumbnail: %w", err)
+	}
+	err = mw.SetImageProperty("Thumb::Mimetype", mime.TypeByExtension(filepath.Ext(filename)))
+	if err != nil {
+		return fmt.Errorf("extractThumbnail: %w", err)
+	}
 
-	_ = mw.WriteImage(fname)
+	return mw.WriteImage(fname)
-	return nil
 }
 
 // Convert converts comic book.

cmd/cbconvert/go.mod

@@ -1,11 +1,9 @@
-module cbconvert
+module github.com/gen2brain/cbconvert/cmd/cbconvert
 
 go 1.19
 
-replace github.com/gen2brain/cbconvert => ../../
-
 require (
-	github.com/gen2brain/cbconvert v0.0.0-20170124143008-5df10a58ee74
+	github.com/gen2brain/cbconvert v0.0.0-20230112123620-c24d7b7e18c4
 	github.com/schollz/progressbar/v3 v3.10.0
 	github.com/spf13/pflag v1.0.5
 )
@@ -14,16 +12,16 @@ require (
 	github.com/chai2010/webp v1.1.1 // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/fvbommel/sortorder v1.0.2 // indirect
-	github.com/gen2brain/go-fitz v1.20.1 // indirect
+	github.com/gen2brain/go-fitz v1.20.2 // indirect
 	github.com/gen2brain/go-unarr v0.1.6 // indirect
 	github.com/hotei/bmp v0.0.0-20150430041436-f620cebab0c7 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/rivo/uniseg v0.3.4 // indirect
 	github.com/strukturag/libheif v1.13.0 // indirect
-	golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 // indirect
+	golang.org/x/image v0.2.0 // indirect
-	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
+	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
 	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
-	gopkg.in/gographics/imagick.v3 v3.4.1 // indirect
+	gopkg.in/gographics/imagick.v3 v3.4.2 // indirect
 )

cmd/cbconvert/go.sum

@@ -7,8 +7,10 @@ github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/fvbommel/sortorder v1.0.2 h1:mV4o8B2hKboCdkJm+a7uX/SIpZob4JzUpc5GGnM45eo=
 github.com/fvbommel/sortorder v1.0.2/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
-github.com/gen2brain/go-fitz v1.20.1 h1:i5GPe/58q/gbNqa2mO+ZcTymwowbJEsDOXp7D0JwxgU=
+github.com/gen2brain/cbconvert v0.0.0-20230112123620-c24d7b7e18c4 h1:DMAjwfDN0yhxfJjrZLqCjL1CSEvcBUbOGPPEW1WhYXw=
-github.com/gen2brain/go-fitz v1.20.1/go.mod h1:UZAxMETTDK4UPpuh80HaRpPzgkSibUihXVzwj2ip5oQ=
+github.com/gen2brain/cbconvert v0.0.0-20230112123620-c24d7b7e18c4/go.mod h1:GO5h+s7160FK66rth/0QS06HgXFwE57jaP3OTX/8Rv0=
+github.com/gen2brain/go-fitz v1.20.2 h1:4FPJCU/ImQ32oojBsYn/+oTkRORxbAhAA+Yw1Fm97MA=
+github.com/gen2brain/go-fitz v1.20.2/go.mod h1:YbQPODTC/UnQ/RK4JyD3zfpDQ19UKiV85nMMT3XpT0s=
 github.com/gen2brain/go-unarr v0.1.6 h1:2TtfIQ2dGuCkgEYa+vPE1ydcpkB3CtBbdYMfRSGLdA8=
 github.com/gen2brain/go-unarr v0.1.6/go.mod h1:P05CsEe8jVEXhxqXqp9mFKUKFV0BKpFmtgNWf8Mcoos=
 github.com/hotei/bmp v0.0.0-20150430041436-f620cebab0c7 h1:NlUATi3cllRJhpM4mfR9BxiLRXT83bcSLcOa+S8lrME=
@@ -33,19 +35,39 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/strukturag/libheif v1.13.0 h1:SuLo/Fl/Nzbw0ixOya1YZSl0Xd27X4fgofGnJdvOHqI=
 github.com/strukturag/libheif v1.13.0/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 h1:Lj6HJGCSn5AjxRAH2+r35Mir4icalbqku+CLUtjnvXY=
+golang.org/x/image v0.2.0 h1:/DcQ0w3VHKCC5p0/P2B0JpAZ9Z++V2KOo2fyU89CXBQ=
-golang.org/x/image v0.0.0-20220902085622-e7cb96979f69/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
+golang.org/x/image v0.2.0/go.mod h1:la7oBXb9w3YFjBqaAwtynVioc1ZvOnNteUNrifGNmAI=
-golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
 golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/gographics/imagick.v3 v3.4.1 h1:CClNBnd1UGxH9KAl4Vuwx+jgNRkyKN+cHlbuFPyt+KU=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-gopkg.in/gographics/imagick.v3 v3.4.1/go.mod h1:+Q9nyA2xRZXrDyTtJ/eko+8V/5E7bWYs08ndkZp8UmA=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/gographics/imagick.v3 v3.4.2 h1:vk6oildvhRBVSBfQ4X3raJstApYSeK6CZsyzoSOZk58=
+gopkg.in/gographics/imagick.v3 v3.4.2/go.mod h1:+Q9nyA2xRZXrDyTtJ/eko+8V/5E7bWYs08ndkZp8UmA=

cmd/cbconvert/make.bash

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
+GLIBC_x86_64="/usr/x86_64-pc-linux-gnu-static"
 MUSL_x86_64="/usr/x86_64-pc-linux-musl"
+MUSL_aarch64="/usr/aarch64-pc-linux-musl"
 MINGW_x86_64="/usr/x86_64-w64-mingw32"
 MACOS_x86_64="/usr/x86_64-apple-darwin"
 MACOS_aarch64="/usr/aarch64-apple-darwin"
@@ -8,17 +10,41 @@ MACOS_aarch64="/usr/aarch64-apple-darwin"
 VERSION="`git --git-dir ../../.git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0'`"
 
 BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
-CC=x86_64-pc-linux-musl-gcc \
+CC=x86_64-pc-linux-gnu-gcc \
-PKG_CONFIG="x86_64-pc-linux-musl-pkg-config" \
+PKG_CONFIG="x86_64-pc-linux-gnu-pkg-config" \
-PKG_CONFIG_PATH="$MUSL_x86_64/usr/lib/pkgconfig" \
+PKG_CONFIG_PATH="$GLIBC_x86_64/usr/lib64/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MUSL_x86_64/usr/lib/pkgconfig" \
+PKG_CONFIG_LIBDIR="$GLIBC_x86_64/usr/lib64/pkgconfig" \
-CGO_CFLAGS="-I$MUSL_x86_64/usr/include" \
+CGO_CFLAGS="-I$GLIBC_x86_64/usr/include" \
-CGO_LDFLAGS="-L$MUSL_x86_64/usr/lib" \
+CGO_LDFLAGS="-L$GLIBC_x86_64/usr/lib64" \
 CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
-go build -trimpath -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w '-extldflags=-static'"
+go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w '-extldflags=-static'" && \
 cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && tar -czf "${BUILDDIR}-linux-x86_64.tar.gz" ${BUILDDIR}
 rm -rf ${BUILDDIR}
 
+#BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+#CC=x86_64-pc-linux-musl-gcc \
+#PKG_CONFIG="x86_64-pc-linux-musl-pkg-config" \
+#PKG_CONFIG_PATH="$MUSL_x86_64/usr/lib/pkgconfig" \
+#PKG_CONFIG_LIBDIR="$MUSL_x86_64/usr/lib/pkgconfig" \
+#CGO_CFLAGS="-I$MUSL_x86_64/usr/include" \
+#CGO_LDFLAGS="-L$MUSL_x86_64/usr/lib" \
+#CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
+#go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w '-extldflags=-static'" && \
+#cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && tar -czf "${BUILDDIR}-linux-x86_64.tar.gz" ${BUILDDIR}
+#rm -rf ${BUILDDIR}
+
+BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+CC=aarch64-pc-linux-musl-gcc \
+PKG_CONFIG="aarch64-pc-linux-musl-pkg-config" \
+PKG_CONFIG_PATH="$MUSL_aarch64/usr/lib/pkgconfig" \
+PKG_CONFIG_LIBDIR="$MUSL_aarch64/usr/lib/pkgconfig" \
+CGO_CFLAGS="-I$MUSL_aarch64/usr/include" \
+CGO_LDFLAGS="-L$MUSL_aarch64/usr/lib" \
+CGO_ENABLED=1 GOOS=linux GOARCH=arm64 \
+go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w '-extldflags=-static'" && \
+cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && tar -czf "${BUILDDIR}-linux-aarch64.tar.gz" ${BUILDDIR}
+rm -rf ${BUILDDIR}
+
 BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
 CC=x86_64-w64-mingw32-gcc \
 PKG_CONFIG="/usr/bin/x86_64-w64-mingw32-pkg-config" \
@@ -27,7 +53,7 @@ PKG_CONFIG_LIBDIR="$MINGW_x86_64/usr/lib/pkgconfig" \
 CGO_CFLAGS="-I$MINGW_x86_64/usr/include" \
 CGO_LDFLAGS="-L$MINGW_x86_64/usr/lib" \
 CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \
-go build -trimpath -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert.exe -ldflags "-s -w '-extldflags=-static -Wl,--allow-multiple-definition'"
+go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert.exe -ldflags "-s -w '-extldflags=-static -Wl,--allow-multiple-definition'" && \
 cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-windows-x86_64.zip" ${BUILDDIR}
 rm -rf ${BUILDDIR}
 
@@ -41,7 +67,7 @@ PKG_CONFIG_LIBDIR="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
 CGO_CFLAGS="-I$MACOS_x86_64/usr/include -I$MACOS_x86_64/macports/pkgs/opt/local/include" \
 CGO_LDFLAGS="-L$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_x86_64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.13" \
 CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 \
-go build -trimpath -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w"
+go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w" && \
 cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-darwin-x86_64.zip" ${BUILDDIR}
 rm -rf ${BUILDDIR}
 
@@ -55,6 +81,6 @@ PKG_CONFIG_LIBDIR="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
 CGO_CFLAGS="-I$MACOS_aarch64/usr/include -I$MACOS_aarch64/macports/pkgs/opt/local/include" \
 CGO_LDFLAGS="-L$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_aarch64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.13" \
 CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 \
-go build -trimpath -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w"
+go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w" && \
 cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-darwin-aarch64.zip" ${BUILDDIR}
 rm -rf ${BUILDDIR}