devedeNG, dvdauthor: ver. bump

2020-09-27 15:00:55 +03:00
parent bc33c72fe7
commit 8f3b41d5fe
6 changed files with 152 additions and 21 deletions
@@ -0,0 +1,115 @@
+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 f4b270f..1194059 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT(DVDAuthor,0.7.2,dvdauthor-users@lists.sourceforge.net)
+AC_INIT(DVDAuthor,0.7.2+,dvdauthor-users@lists.sourceforge.net)
+ 
+ AC_CONFIG_HEADERS(src/config.h)
+ AC_CONFIG_AUX_DIR(autotools)
+@@ -45,35 +45,30 @@ if test "$enable_shared" = 'no'; then
+     config_static='--static'
+ 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
+use_imagemagick=0
+use_graphicsmagick=0
+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
+ 
+-if test "$usemagick" != 1; then
+-    PKG_CHECK_MODULES([MAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:])
+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"
+ fi
+-
+-if test "$usemagick" != 1; then
+-    MAGICK_CPPFLAGS="$LIBPNG_CFLAGS"
+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_CPPFLAGS)
+AC_SUBST(MAGICK_CFLAGS)
+ AC_SUBST(MAGICK_LIBS)
+ 
+ PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], [AC_DEFINE(HAVE_FONTCONFIG, 1, [whether Fontconfig is available])], [:])
+@@ -84,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"
+@@ -96,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],
+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 \