Y4M loader: Various minor changes

- configure.ac: Alphabetic order
- Makefile.am: Alphabetic order, no need for nodelete
- loaders.c: Add to known loaders
- loader_y4m.c: Remove some unneeded headers

configure.ac

@@ -181,6 +181,7 @@ if test "x$have_clock_gettime" != xno; then
 fi
 
 
+# Regular image loaders
 loader_check_gif() {
   AC_CHECK_LIB(gif, DGifOpenFileName, gif_libs="-lgif" gif_ok=yes, gif_ok=no)
   if test "$gif_ok" = yes; then
@@ -194,7 +195,6 @@ loader_check_gif() {
 
 EC_LOADER_CHECK(GIF,  auto, , loader_check_gif)
 EC_LOADER_CHECK(HEIF, auto, libheif)
-EC_LOADER_CHECK(Y4M,  auto, liby4m libyuv)
 EC_LOADER_CHECK(JPEG, auto, libjpeg)
 EC_LOADER_CHECK(J2K,  auto, libopenjp2)
 EC_LOADER_CHECK(JXL,  auto, libjxl libjxl_threads)
@@ -203,7 +203,9 @@ EC_LOADER_CHECK(PS,   auto, libspectre)
 EC_LOADER_CHECK(SVG,  auto, librsvg-2.0 >= 2.46)
 EC_LOADER_CHECK(TIFF, auto, libtiff-4)
 EC_LOADER_CHECK(WEBP, auto, libwebpdemux)
+EC_LOADER_CHECK(Y4M,  auto, liby4m libyuv)
 
+# Decompressors
 loader_check_bz2() {
   AC_CHECK_LIB(bz2, BZ2_bzRead, bz2_ok=yes, bz2_ok=no)
   if test "$bz2_ok" = yes; then
@@ -218,6 +220,7 @@ EC_LOADER_CHECK(BZ2,  auto, bzip2, loader_check_bz2)
 EC_LOADER_CHECK(LZMA, auto, liblzma)
 EC_LOADER_CHECK(ZLIB, auto, zlib)
 
+# Containers
 EC_LOADER_CHECK(ID3,  auto, id3tag)
 
 
@@ -306,7 +309,6 @@ echo "Image loaders:"
 echo " Regular image loaders"
 echo "  GIF.....................: $gif_ok"
 echo "  HEIF....................: $heif_ok"
-echo "  Y4M.....................: $y4m_ok"
 echo "  JPEG....................: $jpeg_ok"
 echo "  J2K.....................: $j2k_ok"
 echo "  JXL.....................: $jxl_ok"
@@ -315,6 +317,7 @@ echo "  PS......................: $ps_ok"
 echo "  SVG.....................: $svg_ok"
 echo "  TIFF....................: $tiff_ok"
 echo "  WEBP....................: $webp_ok"
+echo "  Y4M.....................: $y4m_ok"
 echo " Decompressors"
 echo "  BZIP2...................: $bz2_ok"
 echo "  LZMA(XZ)................: $lzma_ok"

src/lib/loaders.c

@@ -64,6 +64,9 @@ static const char  *const ext_webp[] = { "webp", NULL };
 #endif
 static const char  *const ext_xbm[] = { "xbm", NULL };
 static const char  *const ext_xpm[] = { "xpm", NULL };
+#ifdef BUILD_Y4M_LOADER
+static const char  *const ext_y4m[] = { "y4m", NULL };
+#endif
 
 #ifdef BUILD_BZ2_LOADER
 static const char  *const ext_bz2[] = { "bz2", NULL };
@@ -120,6 +123,10 @@ static const KnownLoader loaders_known[] = {
 #endif
    {"xbm", ext_xbm},
    {"xpm", ext_xpm},
+#ifdef BUILD_Y4M_LOADER
+   {"y4m", ext_y4m},
+#endif
+
 #ifdef BUILD_BZ2_LOADER
    {"bz2", ext_bz2},
 #endif
@@ -129,6 +136,7 @@ static const KnownLoader loaders_known[] = {
 #ifdef BUILD_ZLIB_LOADER
    {"zlib", ext_zlib},
 #endif
+
 #ifdef BUILD_ID3_LOADER
    {"id3", ext_id3},
 #endif

src/modules/loaders/Makefile.am

@@ -21,9 +21,6 @@ endif
 if BUILD_HEIF_LOADER
 pkg_LTLIBRARIES += heif.la
 endif
-if BUILD_Y4M_LOADER
-pkg_LTLIBRARIES += y4m.la
-endif
 if BUILD_JPEG_LOADER
 pkg_LTLIBRARIES += jpeg.la
 endif
@@ -48,6 +45,9 @@ endif
 if BUILD_WEBP_LOADER
 pkg_LTLIBRARIES += webp.la
 endif
+if BUILD_Y4M_LOADER
+pkg_LTLIBRARIES += y4m.la
+endif
 
 if BUILD_BZ2_LOADER
 pkg_LTLIBRARIES += bz2.la
@@ -94,12 +94,6 @@ heif_la_LDFLAGS      = -module -avoid-version -Wl,-z,nodelete
 heif_la_LIBADD       = $(HEIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
 heif_la_LIBTOOLFLAGS = --tag=disable-static
 
-y4m_la_SOURCES       = loader_y4m.c
-y4m_la_CPPFLAGS      = $(Y4M_CFLAGS) $(AM_CPPFLAGS)
-y4m_la_LDFLAGS       = -module -avoid-version -Wl,-z,nodelete
-y4m_la_LIBADD        = $(Y4M_LIBS) $(top_builddir)/src/lib/libImlib2.la
-y4m_la_LIBTOOLFLAGS  = --tag=disable-static
-
 ico_la_SOURCES       = loader_ico.c
 ico_la_LDFLAGS       = -module -avoid-version
 ico_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
@@ -178,6 +172,12 @@ xpm_la_LDFLAGS       = -module -avoid-version
 xpm_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
 xpm_la_LIBTOOLFLAGS  = --tag=disable-static
 
+y4m_la_SOURCES       = loader_y4m.c
+y4m_la_CPPFLAGS      = $(Y4M_CFLAGS) $(AM_CPPFLAGS)
+y4m_la_LDFLAGS       = -module -avoid-version
+y4m_la_LIBADD        = $(Y4M_LIBS) $(top_builddir)/src/lib/libImlib2.la
+y4m_la_LIBTOOLFLAGS  = --tag=disable-static
+
 bz2_la_SOURCES       = loader_bz2.c decompress_load.c compression.h
 bz2_la_CPPFLAGS      = $(BZ2_CFLAGS) $(AM_CPPFLAGS)
 bz2_la_LDFLAGS       = -module -avoid-version

src/modules/loaders/loader_y4m.c

@@ -6,11 +6,7 @@
 #include "config.h"
 #include "Imlib2_Loader.h"
 
-#include <fcntl.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include <y4mTypes.h>