-
Notifications
You must be signed in to change notification settings - Fork 18
Open
Description
ADSupport requires X11 under Linux. Although this is only needed for xwindow.c in GraphicsMagick. This is especially inconvenient for cross-compiling. I seriously doubt that anyone uses it anyways. Attached is a small patch that switches off X11. Another patch must be applied to ADCore then simultaneously. Hence, not a pull request.
ADSupport:
diff -ruN ADSupport-R1-10/supportApp/GraphicsMagickSrc/Magick++/lib/Makefile ADSupport/supportApp/GraphicsMagickSrc/Magick++/lib/Makefile
--- ADSupport-R1-10/supportApp/GraphicsMagickSrc/Magick++/lib/Makefile 2021-05-26 17:17:55.000000000 +0000
+++ ADSupport/supportApp/GraphicsMagickSrc/Magick++/lib/Makefile 2025-05-28 09:42:03.681444919 +0000
@@ -70,8 +70,6 @@
LIB_LIBS += Magick
LIB_LIBS += coders
- LIB_SYS_LIBS_Linux += Xext
-
endif # ($(GRAPHICSMAGICK_EXTERNAL),NO)
endif # ($(WITH_GRAPHICSMAGICK),YES)
diff -ruN ADSupport-R1-10/supportApp/GraphicsMagickSrc/magick/Makefile ADSupport/supportApp/GraphicsMagickSrc/magick/Makefile
--- ADSupport-R1-10/supportApp/GraphicsMagickSrc/magick/Makefile 2021-05-26 17:17:55.000000000 +0000
+++ ADSupport/supportApp/GraphicsMagickSrc/magick/Makefile 2025-05-28 09:37:36.070121557 +0000
@@ -210,7 +210,6 @@
endif
LIB_SYS_LIBS_WIN32 += Advapi32 User32 Gdi32
- LIB_SYS_LIBS_Linux += Xext
endif # ($(GRAPHICSMAGICK_EXTERNAL),NO)
endif # ($(WITH_GRAPHICSMAGICK),YES)
diff -ruN ADSupport-R1-10/supportApp/GraphicsMagickSrc/magick/magick_config_Linux.h ADSupport/supportApp/GraphicsMagickSrc/magick/magick_config_Linux.h
--- ADSupport-R1-10/supportApp/GraphicsMagickSrc/magick/magick_config_Linux.h 2021-05-26 17:17:55.000000000 +0000
+++ ADSupport/supportApp/GraphicsMagickSrc/magick/magick_config_Linux.h 2025-05-28 09:37:34.626103623 +0000
@@ -441,7 +441,7 @@
/* #undef HasWMFlite */
/* Define if you have X11 library */
-#define HasX11 1
+/* #define HasX11 1 */
/* Define if you have XML library */
#define HasXML 1ADCore:
diff -ru ADCore-R3-14/ADApp/commonDriverMakefile ADCore/ADApp/commonDriverMakefile
--- ADCore-R3-14/ADApp/commonDriverMakefile 2024-12-01 20:53:53.000000000 +0000
+++ ADCore/ADApp/commonDriverMakefile 2025-05-28 10:36:03.249816271 +0000
@@ -67,7 +67,7 @@
endif
endif
# The following system libraries must be installed to use GraphicsMagick
- PROD_SYS_LIBS_Linux += X11 Xext
+ # PROD_SYS_LIBS_Linux += X11 Xext
endif
ifeq ($(WITH_TIFF),YES)
diff -ru ADCore-R3-14/ADApp/commonLibraryMakefile ADCore/ADApp/commonLibraryMakefile
--- ADCore-R3-14/ADApp/commonLibraryMakefile 2024-12-01 20:53:53.000000000 +0000
+++ ADCore/ADApp/commonLibraryMakefile 2025-05-28 10:35:45.585596515 +0000
@@ -39,7 +39,7 @@
endif
endif
# The following system libraries must be installed to use GraphicsMagick
- LIB_SYS_LIBS_Linux += X11 Xext
+ # LIB_SYS_LIBS_Linux += X11 Xext
endif
ifeq ($(WITH_TIFF),YES)
Metadata
Metadata
Assignees
Labels
No labels