[afterimage] mv to builtins subdir, for consistency with other builtins

graf2d/asimage/src/libAfterImage/CMakeLists.txt → builtins/libAfterImage/CMakeLists.txt

@@ -4,6 +4,9 @@
 # For the licensing terms see $ROOTSYS/LICENSE.
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
+# Forked from libAfterImage-20080306, see https://github.com/root-project/root/commit/20399dbaeada26020134297a42d3b1b0e9ac0878
+# This builtin is hard-coded, we do not ever use system libafterimage since it's missing many patches for ROOT to work correctly
+
 project(AfterImage)
 
 set(LIB_NAME libAfterImage)

cmake/modules/SearchInstalledSoftware.cmake

@@ -380,6 +380,8 @@ if(asimage)
     get_target_property(TIFF_LIBRARY_LOCATION TIFF::TIFF IMPORTED_LOCATION)
   endif()
   list(APPEND ASEXTRA_LIBRARIES TIFF::TIFF)
+
+  add_subdirectory(builtins/libAfterImage) # It's a hard-coded builtin, was forked in 2008, system-wide version misses many patches
 endif()
 
 #---Check for Python installation-------------------------------------------------------

graf2d/asimage/CMakeLists.txt

@@ -9,8 +9,6 @@
 # @author Pere Mato, CERN
 ############################################################################
 
-add_subdirectory(src/libAfterImage)
-
 ROOT_STANDARD_LIBRARY_PACKAGE(ASImage
   NO_INSTALL_HEADERS
   HEADERS
@@ -25,13 +23,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImage
   DICTIONARY_OPTIONS
     -writeEmptyRootPCM
   LIBRARIES
-    libAfterImage
-    JPEG::JPEG
-    PNG::PNG
-    GIF::GIF
     libAfterImage
     Freetype::Freetype
-    ZLIB::ZLIB
   DEPENDENCIES
     Core
     Graf
@@ -54,18 +47,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImageGui
     -writeEmptyRootPCM
   LIBRARIES
     libAfterImage
-    ${ASEXTRA_LIBRARIES}
-    ${FREETYPE_LIBRARIES}
-    ${X11_LIBRARIES}
-    ZLIB::ZLIB
   DEPENDENCIES
     Gui
     ASImage
 )
 
-target_link_libraries(ASImageGui PRIVATE JPEG::JPEG PNG::PNG GIF::GIF libAfterImage Freetype::Freetype)
-if (x11)
-  target_link_libraries(ASImageGui PRIVATE X11::X11)
-endif()
-
 ROOT_INSTALL_HEADERS()