From 2cd19964991d8b13a03b59908e73902f17d25f52 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Mon, 8 Aug 2022 19:42:40 +0300 Subject: [PATCH] dvdauthor rebuild. --- .../dvdauthor/files/backport_from_git.patch | 87 +++++++++++++++++-- multimedia/editor/dvdauthor/pspec.xml | 4 +- 2 files changed, 82 insertions(+), 9 deletions(-) diff --git a/multimedia/editor/dvdauthor/files/backport_from_git.patch b/multimedia/editor/dvdauthor/files/backport_from_git.patch index 0d23ea0fdf..4ba7398b89 100644 --- a/multimedia/editor/dvdauthor/files/backport_from_git.patch +++ b/multimedia/editor/dvdauthor/files/backport_from_git.patch @@ -11,17 +11,53 @@ index 596e22d..1cf42b1 100644 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/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 + + 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 . +# #- +#-mkdir autotools +#+mkdir autotools m4 +# cp /usr/share/gettext/config.rpath autotools/ +# autoreconf -i +# diff --git a/configure.ac b/configure.ac -index f4b270f..1194059 100644 +index f4b270f..b843cf4 100644 --- a/configure.ac +++ b/configure.ac -@@ -1,4 +1,4 @@ +@@ -1,6 +1,7 @@ -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_MACRO_DIRS([m4]) AC_CONFIG_AUX_DIR(autotools) -@@ -45,35 +45,30 @@ if test "$enable_shared" = 'no'; then + + AM_INIT_AUTOMAKE +@@ -8,6 +9,8 @@ LT_INIT + + AC_PROG_INSTALL + ++PKG_PROG_PKG_CONFIG ++ + AC_SYS_LARGEFILE + + AC_HEADER_STDBOOL +@@ -45,35 +48,30 @@ if test "$enable_shared" = 'no'; then config_static='--static' fi @@ -75,7 +111,7 @@ index f4b270f..1194059 100644 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 +@@ -84,10 +82,8 @@ PKG_CHECK_MODULES([FRIBIDI], [fribidi], [AC_DEFINE(HAVE_FRIBIDI, 1, [whether Fri AC_SUBST(FRIBIDI_CFLAGS) AC_SUBST(FRIBIDI_LIBS) @@ -88,7 +124,7 @@ index f4b270f..1194059 100644 AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available]) ac_save_CPPFLAGS="$CPPFLAGS" -@@ -96,9 +89,9 @@ if test -n "$FREETYPECONFIG"; then +@@ -96,10 +92,11 @@ if test -n "$FREETYPECONFIG"; then CPPFLAGS="$ac_save_CPPFLAGS" AC_SUBST(FREETYPE_CPPFLAGS) AC_SUBST(FREETYPE_LIBS) @@ -98,10 +134,26 @@ index f4b270f..1194059 100644 -fi +) ++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]), +@@ -135,11 +132,7 @@ 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 ] ) + +-AC_OUTPUT(Makefile doc/Makefile src/Makefile) ++AC_CONFIG_FILES(Makefile doc/Makefile src/Makefile) ++AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am -index c7f89a9..5ef90c3 100644 +index c7f89a9..5504b8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ endif @@ -109,7 +161,28 @@ index c7f89a9..5ef90c3 100644 AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \ - @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@ -+ @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 diff --git a/multimedia/editor/dvdauthor/pspec.xml b/multimedia/editor/dvdauthor/pspec.xml index df2d1cef1c..0460661ca1 100644 --- a/multimedia/editor/dvdauthor/pspec.xml +++ b/multimedia/editor/dvdauthor/pspec.xml @@ -12,7 +12,7 @@ app:console A simple DVD tool dvdauthor is a set of simple tools to help you author a DVD. - https://sourceforge.net/projects/dvdauthor/files/dvdauthor-0.7.2.tar.gz + mirrors://sourceforge/project/dvdauthor/dvdauthor-0.7.2.tar.gz libpng-devel gettext-devel @@ -52,7 +52,7 @@ - 2020-09-27 + 2022-08-07 0.7.2 Version bump. fury