GraphicsMagick: BMP does not need to depend on additional librar...

GraphicsMagick Commits <[email protected]> Fri, 22 Sep 2023 18:27:18 -0500
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.2830.1695425247.1462.graphicsmagick-commit@lists.sourceforge.net>
changeset 7bab2a506b65 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=7bab2a506b65
summary: BMP does not need to depend on additional libraries.

diffstat:

 ChangeLog                              |  5 +++--
 Makefile.in                            |  6 +++---
 VisualMagick/installer/inc/version.isx |  4 ++--
 coders/Makefile.am                     |  2 +-
 magick/version.h                       |  4 ++--
 www/Changelog.html                     |  8 ++++++++
 6 files changed, 19 insertions(+), 10 deletions(-)

diffs (99 lines):

diff -r 983d1b425cea -r 7bab2a506b65 ChangeLog
--- a/ChangeLog	Fri Sep 22 17:25:13 2023 -0500
+++ b/ChangeLog	Fri Sep 22 18:27:16 2023 -0500
@@ -1,7 +1,8 @@
 2023-09-22  Bob Friesenhahn  <[email protected]>
 
-	* coders/Makefile.am (coders_bmp_la_LIBADD): BMP coder is now also
-	dependent on everything that PNG coder depends on.
+	* coders/Makefile.am (coders_bmp_la_LIBADD): Extra modules are not
+	needed because the dependencies are taken care of by loading other
+	modules.
 
 2023-09-23  Fojtik Jaroslav  <[email protected]>
 
diff -r 983d1b425cea -r 7bab2a506b65 Makefile.in
--- a/Makefile.in	Fri Sep 22 17:25:13 2023 -0500
+++ b/Makefile.in	Fri Sep 22 18:27:16 2023 -0500
@@ -358,8 +358,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(coders_avs_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_avs_la_rpath = -rpath $(codersdir)
-am__DEPENDENCIES_1 =
-coders_bmp_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1)
+coders_bmp_la_DEPENDENCIES = $(LIBMAGICK)
 am_coders_bmp_la_OBJECTS = coders/bmp_la-bmp.lo
 coders_bmp_la_OBJECTS = $(am_coders_bmp_la_OBJECTS)
 coders_bmp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -398,6 +397,7 @@
 	$(AM_CFLAGS) $(CFLAGS) $(coders_cineon_la_LDFLAGS) $(LDFLAGS) \
 	-o $@
 @WITH_MODULES_TRUE@am_coders_cineon_la_rpath = -rpath $(codersdir)
+am__DEPENDENCIES_1 =
 coders_clipboard_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1)
 am_coders_clipboard_la_OBJECTS = coders/clipboard_la-clipboard.lo
 coders_clipboard_la_OBJECTS = $(am_coders_clipboard_la_OBJECTS)
@@ -3150,7 +3150,7 @@
 coders_bmp_la_SOURCES = coders/bmp.c
 coders_bmp_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
 coders_bmp_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_bmp_la_LIBADD = $(LIBMAGICK) $(LIB_JPEG)
+coders_bmp_la_LIBADD = $(LIBMAGICK)
 
 # Braille coder module
 coders_braille_la_SOURCES = coders/braille.c
diff -r 983d1b425cea -r 7bab2a506b65 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Fri Sep 22 17:25:13 2023 -0500
+++ b/VisualMagick/installer/inc/version.isx	Fri Sep 22 18:27:16 2023 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230923"
-#define public MagickPackageReleaseDate "snapshot-20230923"
+#define public MagickPackageVersionAddendum ".020230922"
+#define public MagickPackageReleaseDate "snapshot-20230922"
diff -r 983d1b425cea -r 7bab2a506b65 coders/Makefile.am
--- a/coders/Makefile.am	Fri Sep 22 17:25:13 2023 -0500
+++ b/coders/Makefile.am	Fri Sep 22 18:27:16 2023 -0500
@@ -302,7 +302,7 @@
 coders_bmp_la_SOURCES      = coders/bmp.c
 coders_bmp_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
 coders_bmp_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_bmp_la_LIBADD       = $(LIBMAGICK) $(LIB_PNG) $(LIB_JPEG) $(LIB_ZLIB) $(LIB_MATH)
+coders_bmp_la_LIBADD       = $(LIBMAGICK)
 
 # Braille coder module
 coders_braille_la_SOURCES  = coders/braille.c
diff -r 983d1b425cea -r 7bab2a506b65 magick/version.h
--- a/magick/version.h	Fri Sep 22 17:25:13 2023 -0500
+++ b/magick/version.h	Fri Sep 22 18:27:16 2023 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272403
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,3
-#define MagickChangeDate   "20230923"
-#define MagickReleaseDate  "snapshot-20230923"
+#define MagickChangeDate   "20230922"
+#define MagickReleaseDate  "snapshot-20230922"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 983d1b425cea -r 7bab2a506b65 www/Changelog.html
--- a/www/Changelog.html	Fri Sep 22 17:25:13 2023 -0500
+++ b/www/Changelog.html	Fri Sep 22 18:27:16 2023 -0500
@@ -37,6 +37,14 @@
 </div>
 
 <div class="document">
+<p>2023-09-22  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/Makefile.am (coders_bmp_la_LIBADD): Extra modules are not
+needed because the dependencies are taken care of by loading other
+modules.</p></li>
+</ul>
+</blockquote>
 <p>2023-09-23  Fojtik Jaroslav  &lt;<a class="reference external" href="mailto:JaFojtik&#37;&#52;&#48;yandex&#46;com">JaFojtik<span>&#64;</span>yandex<span>&#46;</span>com</a>&gt;</p>
 <blockquote>
 <ul>