Few minor updates

Author: varnav

README.md

@@ -25,6 +25,13 @@ makejxl --recursive /home/username/myphotos
 
 You will need cjxl in path. You can get it by running build_cjxl.sh as root
 
+Or simpler alternative that doesn't need this script:
+
+```sh
+apt install imagemagick parallel
+find /path/to/images -type f -iregex '.*\(gif\|jpe?g\|png\)$' | parallel convert {} {.}.jxl
+```
+
 ## Windows
 
 You can download and use it as single Windows binary, see [Releases](https://github.com/varnav/makejxl/releases/)
@@ -39,13 +46,6 @@ You will need [cjxl](https://gitlab.com/wg1/jpeg-xl/-/blob/master/doc/developing
 
 Remember, you need double slashes in Windows.
 
-## Alternatives
-
-```sh
-apt install imagemagick parallel
-find /path/to/images -type f -iregex '.*\(gif\|jpe?g\|png\)$' | parallel convert {} {.}.jxl
-```
-
 ## See also
 * [makejxl](https://github.com/varnav/makejxl/)
 * [filmcompress](https://github.com/varnav/filmcompress/)

build_cjxl.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 if [ "$EUID" -ne 0 ]
   then echo "Please run as root"
@@ -9,28 +9,22 @@ if [ $(grep -c avx2 /proc/cpuinfo) == 0 ]
   then echo "AVX2 support required"
   exit
 fi
-
 set -ex
 
-
-export DEBIAN_FRONTEND=noninteractive
-
 export RUSTFLAGS="-C target-feature=+avx2,+fma"
 export CFLAGS="-mavx2 -mfma -ftree-vectorize -pipe"
-
-export CC=clang-7 CXX=clang++-7
+export MAKEFLAGS=-j$(nproc --ignore=2)
+export DEBIAN_FRONTEND=noninteractive
 
 apt-get update
-apt-get -y install git wget ca-certificates cmake pkg-config libbrotli-dev libgif-dev libjpeg-dev libopenexr-dev libpng-dev libwebp-dev clang-7
+apt-get -y install python3-pip git wget ca-certificates cmake pkg-config libbrotli-dev libgif-dev libjpeg-dev libopenexr-dev libpng-dev libwebp-dev clang
 
 cd /tmp/
-rm -rf jpeg-xl
-git clone  --recursive --depth=1 https://gitlab.com/wg1/jpeg-xl.git
-cd jpeg-xl
+rm -rf libjxl
+git clone https://github.com/libjxl/libjxl.git --recursive
+cd libjxl
 rm -rf build
 mkdir build
 cd build
 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF ..
-cmake --build . -- -j$(nproc)
-
-cp tools/cjxl /usr/bin/
+cmake --build . -- -j$(nproc --ignore=2)

setup.py

@@ -35,7 +35,7 @@
         "Operating System :: OS Independent",
         "Topic :: Scientific/Engineering :: Image Processing",
         "Topic :: Utilities",
-        "Topic :: Multimedia :: Graphics",
+        "Topic :: Multimedia :: Graphics :: Graphics Conversion",
         "Environment :: Console",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3 :: Only",