dvdauthor rebuild.

2022-08-08 19:42:40 +03:00
parent cfad0ff92b
commit 2cd1996499
2 changed files with 82 additions and 9 deletions
@@ -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 <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 <ldo@geek-central.gen.nz>.
+# #-
+#-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 <fcntl.h> ] )
+ 
+-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
@@ -12,7 +12,7 @@
        <IsA>app:console</IsA>
        <Summary>A simple DVD tool</Summary>
        <Description>dvdauthor is a set of simple tools to help you author a DVD.</Description>
-        <Archive sha1sum="0e605642140576bfb3e963414d77630d1c073a51" type="targz">https://sourceforge.net/projects/dvdauthor/files/dvdauthor-0.7.2.tar.gz</Archive>
+        <Archive sha1sum="0e605642140576bfb3e963414d77630d1c073a51" type="targz">mirrors://sourceforge/project/dvdauthor/dvdauthor-0.7.2.tar.gz</Archive>
        <BuildDependencies>
            <Dependency>libpng-devel</Dependency>
            <Dependency>gettext-devel</Dependency>
@@ -52,7 +52,7 @@

    <History>
        <Update release="5">
-            <Date>2020-09-27</Date>
+            <Date>2022-08-07</Date>
            <Version>0.7.2</Version>
            <Comment>Version bump.</Comment>
            <Name>fury</Name>