Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dvdauthor for openSUSE:Factory checked in at 2025-10-17 19:02:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dvdauthor (Old) and /work/SRC/openSUSE:Factory/.dvdauthor.new.18484 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dvdauthor" Fri Oct 17 19:02:48 2025 rev:6 rq:1312068 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/dvdauthor/dvdauthor.changes 2025-08-21 16:57:03.484269315 +0200 +++ /work/SRC/openSUSE:Factory/.dvdauthor.new.18484/dvdauthor.changes 2025-10-17 19:02:49.547014380 +0200 @@ -1,0 +2,19 @@ +Fri Oct 17 10:37:18 UTC 2025 - Ana Guerrero <[email protected]> + +- Add all patches from upstream git since last release, they're + all build system fixes: + * 0001-change-to-interim-version-number.patch + * 0002-fix-to-build-with-GraphicsMagick.patch + * 0003-Looks-like-I-need-both-MAGICK_CPPFLAGS-and-MAGICK_CF.patch + * 0004-try-using-simpler-way-of-building-with-ImageEMagick.patch + * 0005-merge-MAGICK_CPPFLAGS-into-MAGICK_CFLAGS.patch + * 0006-use-different-module-names-ImageMagick-vs-GraphicsMa.patch + * 0007-No-longer-automatically-build-with-ImageMagick-or-Gr.patch + * 0008-fix-incorrect-use-of-AC_ARG_WITH.patch + * 0009-Use-pkg-config-to-find-FreeType-thanks-to-Lars-Wendl.patch + * 0010-fix-some-build-warnings.patch + * 0011-Use-PKG_CHECK_MODULES-to-detect-the-libxml2-library.patch + * 0012-Fix-another-build-warning.patch +- Update patch gettext-fix.patch + +------------------------------------------------------------------- @@ -4 +23 @@ -- Disabled i586 build and remove oblolete statements from spec +- Disabled i586 build and remove obsolete statements from spec New: ---- 0001-change-to-interim-version-number.patch 0002-fix-to-build-with-GraphicsMagick.patch 0003-Looks-like-I-need-both-MAGICK_CPPFLAGS-and-MAGICK_CF.patch 0004-try-using-simpler-way-of-building-with-ImageEMagick.patch 0005-merge-MAGICK_CPPFLAGS-into-MAGICK_CFLAGS.patch 0006-use-different-module-names-ImageMagick-vs-GraphicsMa.patch 0007-No-longer-automatically-build-with-ImageMagick-or-Gr.patch 0008-fix-incorrect-use-of-AC_ARG_WITH.patch 0009-Use-pkg-config-to-find-FreeType-thanks-to-Lars-Wendl.patch 0010-fix-some-build-warnings.patch 0011-Use-PKG_CHECK_MODULES-to-detect-the-libxml2-library.patch 0012-Fix-another-build-warning.patch ----------(New B)---------- New: all build system fixes: * 0001-change-to-interim-version-number.patch * 0002-fix-to-build-with-GraphicsMagick.patch New: * 0001-change-to-interim-version-number.patch * 0002-fix-to-build-with-GraphicsMagick.patch * 0003-Looks-like-I-need-both-MAGICK_CPPFLAGS-and-MAGICK_CF.patch New: * 0002-fix-to-build-with-GraphicsMagick.patch * 0003-Looks-like-I-need-both-MAGICK_CPPFLAGS-and-MAGICK_CF.patch * 0004-try-using-simpler-way-of-building-with-ImageEMagick.patch New: * 0003-Looks-like-I-need-both-MAGICK_CPPFLAGS-and-MAGICK_CF.patch * 0004-try-using-simpler-way-of-building-with-ImageEMagick.patch * 0005-merge-MAGICK_CPPFLAGS-into-MAGICK_CFLAGS.patch New: * 0004-try-using-simpler-way-of-building-with-ImageEMagick.patch * 0005-merge-MAGICK_CPPFLAGS-into-MAGICK_CFLAGS.patch * 0006-use-different-module-names-ImageMagick-vs-GraphicsMa.patch New: * 0005-merge-MAGICK_CPPFLAGS-into-MAGICK_CFLAGS.patch * 0006-use-different-module-names-ImageMagick-vs-GraphicsMa.patch * 0007-No-longer-automatically-build-with-ImageMagick-or-Gr.patch New: * 0006-use-different-module-names-ImageMagick-vs-GraphicsMa.patch * 0007-No-longer-automatically-build-with-ImageMagick-or-Gr.patch * 0008-fix-incorrect-use-of-AC_ARG_WITH.patch New: * 0007-No-longer-automatically-build-with-ImageMagick-or-Gr.patch * 0008-fix-incorrect-use-of-AC_ARG_WITH.patch * 0009-Use-pkg-config-to-find-FreeType-thanks-to-Lars-Wendl.patch New: * 0008-fix-incorrect-use-of-AC_ARG_WITH.patch * 0009-Use-pkg-config-to-find-FreeType-thanks-to-Lars-Wendl.patch * 0010-fix-some-build-warnings.patch New: * 0009-Use-pkg-config-to-find-FreeType-thanks-to-Lars-Wendl.patch * 0010-fix-some-build-warnings.patch * 0011-Use-PKG_CHECK_MODULES-to-detect-the-libxml2-library.patch New: * 0010-fix-some-build-warnings.patch * 0011-Use-PKG_CHECK_MODULES-to-detect-the-libxml2-library.patch * 0012-Fix-another-build-warning.patch New: * 0011-Use-PKG_CHECK_MODULES-to-detect-the-libxml2-library.patch * 0012-Fix-another-build-warning.patch - Update patch gettext-fix.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dvdauthor.spec ++++++ --- /var/tmp/diff_new_pack.CP5Gmq/_old 2025-10-17 19:02:50.803067298 +0200 +++ /var/tmp/diff_new_pack.CP5Gmq/_new 2025-10-17 19:02:50.803067298 +0200 @@ -1,7 +1,6 @@ # # spec file for package dvdauthor # -# Copyright (c) 2025 SUSE LLC # Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties @@ -28,7 +27,21 @@ #PATCH-FIX-UPSTREAM dvdauthor-0.7.0_glibc-2.20.patch [email protected] -- Fix build with glibc-2.20 Patch0: dvdauthor-0.7.0_glibc-2.20.patch Patch1: dvdauthor-0.7.2-imagemagick7.patch -Patch2: gettext-fix.patch +# Patches from upstream's git: +Patch3: 0001-change-to-interim-version-number.patch +Patch4: 0002-fix-to-build-with-GraphicsMagick.patch +Patch5: 0003-Looks-like-I-need-both-MAGICK_CPPFLAGS-and-MAGICK_CF.patch +Patch6: 0004-try-using-simpler-way-of-building-with-ImageEMagick.patch +Patch7: 0005-merge-MAGICK_CPPFLAGS-into-MAGICK_CFLAGS.patch +Patch8: 0006-use-different-module-names-ImageMagick-vs-GraphicsMa.patch +Patch9: 0007-No-longer-automatically-build-with-ImageMagick-or-Gr.patch +Patch10: 0008-fix-incorrect-use-of-AC_ARG_WITH.patch +Patch11: 0009-Use-pkg-config-to-find-FreeType-thanks-to-Lars-Wendl.patch +Patch12: 0010-fix-some-build-warnings.patch +Patch13: 0011-Use-PKG_CHECK_MODULES-to-detect-the-libxml2-library.patch +Patch14: 0012-Fix-another-build-warning.patch +Patch15: gettext-fix.patch + BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: docbook-utils ++++++ 0001-change-to-interim-version-number.patch ++++++ >From 072a0a89f4e85718f89734f2eb3d45184c4dc630 Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Thu, 19 Jan 2017 23:22:23 +0000 Subject: [PATCH 01/12] change to interim version number --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f4b270f..b3c020b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(DVDAuthor,0.7.2,[email protected]) +AC_INIT(DVDAuthor,0.7.2+,[email protected]) AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_AUX_DIR(autotools) -- 2.51.0 ++++++ 0002-fix-to-build-with-GraphicsMagick.patch ++++++ >From 84d971def13b7e6317eae44369f49fd709b01030 Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Thu, 19 Jan 2017 23:22:52 +0000 Subject: [PATCH 02/12] fix to build with GraphicsMagick --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index c7f89a9..5ef90c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ endif nodist_bin_SCRIPTS = dvddirdel AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \ - @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ + @XML_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ AM_CFLAGS = -Wall dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \ -- 2.51.0 ++++++ 0003-Looks-like-I-need-both-MAGICK_CPPFLAGS-and-MAGICK_CF.patch ++++++ >From 17609a2785d4ae7654183affd25e357a606a260d Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Wed, 25 Jan 2017 01:26:07 +0000 Subject: [PATCH 03/12] Looks like I need both MAGICK_CPPFLAGS and MAGICK_CFLAGS for GraphicsMagick and ImageMagick. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5ef90c3..045a453 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ endif nodist_bin_SCRIPTS = dvddirdel AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \ - @XML_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ + @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ AM_CFLAGS = -Wall dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \ -- 2.51.0 ++++++ 0004-try-using-simpler-way-of-building-with-ImageEMagick.patch ++++++ >From 1f7426707a6cd90673a01930838cc43fdfea1593 Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Fri, 30 Jun 2017 02:53:20 +0000 Subject: [PATCH 04/12] try using simpler way of building with ImageEMagick --- configure.ac | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index b3c020b..064722e 100644 --- a/configure.ac +++ b/configure.ac @@ -47,22 +47,7 @@ fi usemagick=0 -AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config]) -if test -n "$MAGICKCONFIG"; then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LIBS="$LIBS" - MAGICK_CPPFLAGS="`$MAGICKCONFIG --cppflags`" - MAGICK_LIBS="`$MAGICKCONFIG --ldflags` `$MAGICKCONFIG --libs`" - CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS" - LIBS="$MAGICK_LIBS $LIBS" - AC_CHECK_FUNC(ExportImagePixels, usemagick=1, AC_MSG_NOTICE([ImageMagick does not support the function - ExportImagePixels. Please upgrade to ImageMagick 5.5.7 or newer])) - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" - if test "$usemagick" = 1; then - AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available]) - fi -fi +PKG_CHECK_MODULES([MAGICK], [ImageMagick >= 5.5.7], usemagick=1; AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available]), [:]) if test "$usemagick" != 1; then PKG_CHECK_MODULES([MAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:]) -- 2.51.0 ++++++ 0005-merge-MAGICK_CPPFLAGS-into-MAGICK_CFLAGS.patch ++++++ >From 1910f8c9ad281d03d80970d672c3b839a879d0d3 Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Tue, 4 Jul 2017 05:59:18 +0000 Subject: [PATCH 05/12] merge MAGICK_CPPFLAGS into MAGICK_CFLAGS --- configure.ac | 4 ++-- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 064722e..b18d2a6 100644 --- a/configure.ac +++ b/configure.ac @@ -54,11 +54,11 @@ if test "$usemagick" != 1; then fi if test "$usemagick" != 1; then - MAGICK_CPPFLAGS="$LIBPNG_CFLAGS" + MAGICK_CFLAGS="$LIBPNG_CFLAGS" MAGICK_LIBS="$LIBPNG_LIBS" fi -AC_SUBST(MAGICK_CPPFLAGS) +AC_SUBST(MAGICK_CFLAGS) AC_SUBST(MAGICK_LIBS) PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], [AC_DEFINE(HAVE_FONTCONFIG, 1, [whether Fontconfig is available])], [:]) diff --git a/src/Makefile.am b/src/Makefile.am index 045a453..5ef90c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ endif nodist_bin_SCRIPTS = dvddirdel AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \ - @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ + @XML_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ AM_CFLAGS = -Wall dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \ -- 2.51.0 ++++++ 0006-use-different-module-names-ImageMagick-vs-GraphicsMa.patch ++++++ >From ba1f36271ce31f0ac92444aaf58cc5fd7493464f Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Tue, 4 Jul 2017 06:38:39 +0000 Subject: [PATCH 06/12] use different module names ImageMagick vs GraphicsMagick just to distinguish them in config log --- configure.ac | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index b18d2a6..d65cc32 100644 --- a/configure.ac +++ b/configure.ac @@ -47,15 +47,19 @@ fi usemagick=0 -PKG_CHECK_MODULES([MAGICK], [ImageMagick >= 5.5.7], usemagick=1; AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available]), [:]) - -if test "$usemagick" != 1; then - PKG_CHECK_MODULES([MAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:]) -fi - -if test "$usemagick" != 1; then - MAGICK_CFLAGS="$LIBPNG_CFLAGS" - MAGICK_LIBS="$LIBPNG_LIBS" +PKG_CHECK_MODULES([IMAGEMAGICK], [ImageMagick >= 5.5.7], usemagick=1; AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available]), [:]) +if test "$usemagick" = 1; then + MAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS" + MAGICK_LIBS="$IMAGEMAGICK_LIBS" +else + PKG_CHECK_MODULES([GRAPHICSMAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:]) + if test "$usemagick" = 1; then + MAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS" + MAGICK_LIBS="$GRAPHICSMAGICK_LIBS" + else + MAGICK_CFLAGS="$LIBPNG_CFLAGS" + MAGICK_LIBS="$LIBPNG_LIBS" + fi fi AC_SUBST(MAGICK_CFLAGS) -- 2.51.0 ++++++ 0007-No-longer-automatically-build-with-ImageMagick-or-Gr.patch ++++++ >From a0d57bebb3a5d7259a0508a07a898cfe044155a1 Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Tue, 4 Jul 2017 06:56:00 +0000 Subject: [PATCH 07/12] No longer automatically build with ImageMagick or GraphicsMagick if present; now need to explicitly specify --with-imagemagick or --with-graphicsmagick to configure --- ChangeLog | 5 +++++ configure.ac | 30 ++++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 596e22d..1cf42b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +0.7.2+: 2017 July 4 + No longer automatically build with ImageMagick or GraphicsMagick if + present; now need to explicitly specify --with-imagemagick or + --with-graphicsmagick to configure + 0.7.2: 2016 December 31 Various code-quality and build improvements Support “jump pgc n” and other interaction code-generation improvements diff --git a/configure.ac b/configure.ac index d65cc32..1b7ec6f 100644 --- a/configure.ac +++ b/configure.ac @@ -45,21 +45,27 @@ if test "$enable_shared" = 'no'; then config_static='--static' fi -usemagick=0 +use_imagemagick=0 +use_graphicsmagick=0 +AC_ARG_WITH([imagemagick], AS_HELP_STRING([--with-imagemagick], [Use ImageMagick to augment image import formats]), [use_imagemagick=1]) +AC_ARG_WITH([graphicsmagick], AS_HELP_STRING([--with-graphicsmagick], [Use GraphicsMagick to augment image import formats]), [use_graphicsmagick=1]) +if test "$use_imagemagick" = 1 && test "$use_graphicsmagick" = 1; then + AC_MSG_ERROR([cannot specify both --with-imagemagick and --with-graphicsmagick], 1) +fi -PKG_CHECK_MODULES([IMAGEMAGICK], [ImageMagick >= 5.5.7], usemagick=1; AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available]), [:]) -if test "$usemagick" = 1; then +if test "$use_imagemagick" = 1; then + PKG_CHECK_MODULES([IMAGEMAGICK], [ImageMagick >= 5.5.7], [AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available])], [AC_MSG_ERROR([ImageMagick not available])]) MAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS" MAGICK_LIBS="$IMAGEMAGICK_LIBS" -else - PKG_CHECK_MODULES([GRAPHICSMAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:]) - if test "$usemagick" = 1; then - MAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS" - MAGICK_LIBS="$GRAPHICSMAGICK_LIBS" - else - MAGICK_CFLAGS="$LIBPNG_CFLAGS" - MAGICK_LIBS="$LIBPNG_LIBS" - fi +fi +if test "$use_graphicsmagick" = 1; then + PKG_CHECK_MODULES([GRAPHICSMAGICK], [GraphicsMagick], [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [AC_MSG_ERROR([GraphicsMagick not available])]) + MAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS" + MAGICK_LIBS="$GRAPHICSMAGICK_LIBS" +fi +if test "$use_imagemagick" != 1 && test "$use_graphicsmagick" != 1; then + MAGICK_CFLAGS="$LIBPNG_CFLAGS" + MAGICK_LIBS="$LIBPNG_LIBS" fi AC_SUBST(MAGICK_CFLAGS) -- 2.51.0 ++++++ 0008-fix-incorrect-use-of-AC_ARG_WITH.patch ++++++ >From d926718e9aad9919fbd922ca1e0da8bc07cb67d7 Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Wed, 5 Jul 2017 01:50:49 +0000 Subject: [PATCH 08/12] fix incorrect use of AC_ARG_WITH --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1b7ec6f..c06ac6b 100644 --- a/configure.ac +++ b/configure.ac @@ -47,8 +47,8 @@ fi use_imagemagick=0 use_graphicsmagick=0 -AC_ARG_WITH([imagemagick], AS_HELP_STRING([--with-imagemagick], [Use ImageMagick to augment image import formats]), [use_imagemagick=1]) -AC_ARG_WITH([graphicsmagick], AS_HELP_STRING([--with-graphicsmagick], [Use GraphicsMagick to augment image import formats]), [use_graphicsmagick=1]) +AC_ARG_WITH([imagemagick], AS_HELP_STRING([--with-imagemagick], [Use ImageMagick to augment image import formats]), [if test "$withval" != "no"; then use_imagemagick=1; fi]) +AC_ARG_WITH([graphicsmagick], AS_HELP_STRING([--with-graphicsmagick], [Use GraphicsMagick to augment image import formats]), [if test "$withval" != "no"; then use_graphicsmagick=1; fi]) if test "$use_imagemagick" = 1 && test "$use_graphicsmagick" = 1; then AC_MSG_ERROR([cannot specify both --with-imagemagick and --with-graphicsmagick], 1) fi -- 2.51.0 ++++++ 0009-Use-pkg-config-to-find-FreeType-thanks-to-Lars-Wendl.patch ++++++ >From d5bb0bdd542c33214855a7062fcc485f8977934e Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Fri, 19 Apr 2019 08:00:05 +0000 Subject: [PATCH 09/12] Use pkg-config to find FreeType (thanks to Lars Wendler). --- configure.ac | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index c06ac6b..1194059 100644 --- a/configure.ac +++ b/configure.ac @@ -79,10 +79,8 @@ PKG_CHECK_MODULES([FRIBIDI], [fribidi], [AC_DEFINE(HAVE_FRIBIDI, 1, [whether Fri AC_SUBST(FRIBIDI_CFLAGS) AC_SUBST(FRIBIDI_LIBS) -AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config]) -if test -n "$FREETYPECONFIG"; then - FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`" - FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`" +PKG_CHECK_MODULES(FREETYPE, [freetype2],[ + FREETYPE_CPPFLAGS="$FREETYPE_CFLAGS" AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available]) ac_save_CPPFLAGS="$CPPFLAGS" @@ -91,9 +89,9 @@ if test -n "$FREETYPECONFIG"; then CPPFLAGS="$ac_save_CPPFLAGS" AC_SUBST(FREETYPE_CPPFLAGS) AC_SUBST(FREETYPE_LIBS) -else + ], AC_MSG_ERROR([freetype not found]) -fi +) AC_ARG_ENABLE([default-video-format], -- 2.51.0 ++++++ 0010-fix-some-build-warnings.patch ++++++ >From f93eb78171b6c893b48a945c8ead22c25deb234c Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Mon, 1 Feb 2021 21:09:13 +0000 Subject: [PATCH 10/12] fix some build warnings --- Makefile.am | 2 ++ bootstrap | 2 +- configure.ac | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index de76fc5..7c11310 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,6 @@ SUBDIRS = doc src +ACLOCAL_AMFLAGS = -I m4 +# as per recommendation at <https://www.gnu.org/software/libtool/manual/html_node/Invoking-libtoolize.html> noinst_DATA = dvdauthor.spec diff --git a/bootstrap b/bootstrap index 88b61ae..ecf35f0 100755 --- a/bootstrap +++ b/bootstrap @@ -14,7 +14,7 @@ # # Created by Lawrence D'Oliveiro <[email protected]>. #- -mkdir autotools +mkdir autotools m4 cp /usr/share/gettext/config.rpath autotools/ autoreconf -i diff --git a/configure.ac b/configure.ac index 1194059..63daa71 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_INIT(DVDAuthor,0.7.2+,[email protected]) AC_CONFIG_HEADERS(src/config.h) +AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_AUX_DIR(autotools) AM_INIT_AUTOMAKE -- 2.51.0 ++++++ 0011-Use-PKG_CHECK_MODULES-to-detect-the-libxml2-library.patch ++++++ >From 45705ece5ec5d7d6b9ab3e7a68194796a398e855 Mon Sep 17 00:00:00 2001 From: Hugh McMaster <[email protected]> Date: Wed, 26 Feb 2020 23:44:23 +1100 Subject: [PATCH 11/12] Use PKG_CHECK_MODULES to detect the libxml2 library --- configure.ac | 8 +++----- src/Makefile.am | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 63daa71..1750e3b 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,8 @@ LT_INIT AC_PROG_INSTALL +PKG_PROG_PKG_CONFIG + AC_SYS_LARGEFILE AC_HEADER_STDBOOL @@ -94,6 +96,7 @@ PKG_CHECK_MODULES(FREETYPE, [freetype2],[ AC_MSG_ERROR([freetype not found]) ) +PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.6.0]) AC_ARG_ENABLE([default-video-format], AS_HELP_STRING([--enable-default-video-format=format], [specify a default video format, either NTSC or PAL, to be used if no configuration or input setting is given]), @@ -129,11 +132,6 @@ dnl AM_LANGINFO_CODESET AM_ICONV -ifdef([AM_PATH_XML2], - [AM_PATH_XML2(2.6.0, , AC_MSG_ERROR([You must have libxml2 >= 2.6.0 installed]))], - [errprint([You must have libxml2 (>= 2.6.0) installed -])m4_exit(1)AC_MSG_ERROR([You must have libxml2 (>= 2.6.0) installed])]) - AC_CHECK_DECLS(O_BINARY, , , [ #include <fcntl.h> ] ) AC_OUTPUT(Makefile doc/Makefile src/Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index 5ef90c3..5504b8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ endif nodist_bin_SCRIPTS = dvddirdel AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \ - @XML_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ + @XML2_CFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ AM_CFLAGS = -Wall dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \ @@ -16,17 +16,17 @@ dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \ dvdifo.c dvdvob.c dvdpgc.c \ dvdcli.c readxml.c readxml.h \ conffile.c conffile.h compat.c compat.h rgb.h -dvdauthor_LDADD = $(LIBICONV) $(XML_LIBS) +dvdauthor_LDADD = $(LIBICONV) $(XML2_LIBS) dvdunauthor_SOURCES = dvdunauthor.c dvduncompile.c common.h dvduncompile.h compat.c compat.h -dvdunauthor_LDADD = $(XML_LIBS) $(LIBICONV) -ldvdread +dvdunauthor_LDADD = $(XML2_LIBS) $(LIBICONV) -ldvdread spumux_SOURCES = subgen.c subgen.h rgb.h \ subgen-parse-xml.c readxml.c readxml.h \ subgen-encode.c subgen-image.c subglobals.h \ conffile.c conffile.h compat.c compat.h common.h \ subrender.c subrender.h subreader.c subreader.h subfont.c subfont.h -spumux_LDADD = $(XML_LIBS) $(MAGICK_LIBS) $(FREETYPE_LIBS) \ +spumux_LDADD = $(XML2_LIBS) $(MAGICK_LIBS) $(FREETYPE_LIBS) \ $(FRIBIDI_LIBS) $(FONTCONFIG_LIBS) $(LIBICONV) -lm spuunmux_SOURCES = spuunmux.c rgb.h compat.c compat.h common.h conffile.h conffile.c -- 2.51.0 ++++++ 0012-Fix-another-build-warning.patch ++++++ >From fe8fe3578f95f34889e7ed17591d02dceb4f42ed Mon Sep 17 00:00:00 2001 From: Lawrence D'Oliveiro <[email protected]> Date: Fri, 5 Nov 2021 01:46:27 +0000 Subject: [PATCH 12/12] Fix another build warning --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1750e3b..b843cf4 100644 --- a/configure.ac +++ b/configure.ac @@ -134,4 +134,5 @@ AM_ICONV AC_CHECK_DECLS(O_BINARY, , , [ #include <fcntl.h> ] ) -AC_OUTPUT(Makefile doc/Makefile src/Makefile) +AC_CONFIG_FILES(Makefile doc/Makefile src/Makefile) +AC_OUTPUT -- 2.51.0 ++++++ gettext-fix.patch ++++++ --- /var/tmp/diff_new_pack.CP5Gmq/_old 2025-10-17 19:02:51.035077073 +0200 +++ /var/tmp/diff_new_pack.CP5Gmq/_new 2025-10-17 19:02:51.039077241 +0200 @@ -1,12 +1,8 @@ ---- - bootstrap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - --- a/bootstrap +++ b/bootstrap @@ -16,5 +16,5 @@ #- - mkdir autotools + mkdir autotools m4 cp /usr/share/gettext/config.rpath autotools/ -autoreconf -i +autoreconf -i -I /usr/share/gettext/m4
