ABF is currently being migrated to new servers. Pull requests are currently not operational due to git upgrade, they will be fixed as soon as possible.

Project import/dvdauthor - Diff 6731dcd255...226365a0d3

... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -1,3 +1,3 @@
1 1
sources:
2
  dvdauthor-0.7.1.tar.gz: a9636d165bf546e3e2b25b7397c33dbfa2895e6a
2
  dvdauthor-0.7.2.tar.gz: 0e605642140576bfb3e963414d77630d1c073a51
3 3
  dvdauthor-doc-0.6.17.tar.gz: d5e9bf80602a63addad4fda19ff39bd7b75e1779
view file @ 6731dcd255
... ... --- a/dvdauthor-0.7.1-automake-1.13.patch
... ... +++ /dev/null
... ... @@ -1,10 +0,0 @@
0
--- dvdauthor/configure.ac.bero	2013-01-15 19:56:39.463758873 +0100
1
+++ dvdauthor/configure.ac	2013-01-15 19:56:45.572685217 +0100
2
@@ -1,6 +1,6 @@
3
 AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net)
4
 
5
-AM_CONFIG_HEADER(src/config.h)
6
+AC_CONFIG_HEADERS([src/config.h])
7
 AC_CONFIG_AUX_DIR(autotools)
8
 
9
 AM_INIT_AUTOMAKE
view file @ 6731dcd255
... ... --- a/dvdauthor-0.7.1-strndup.patch
... ... +++ /dev/null
... ... @@ -1,24 +0,0 @@
0
Index: dvdauthor/src/dvdvml.l
1
===================================================================
2
--- dvdauthor/src/dvdvml.l
3
+++ dvdauthor/src/dvdvml.l      2014-09-14 19:36:05.098847465 +0000
4
@@ -19,6 +19,7 @@
5
  * USA
6
  */
7
 
8
+#include "config.h"
9
 #include "compat.h" /* needed for bool */
10
 #include "dvdvm.h"
11
 #include "dvdvmy.h"
12
Index: dvdauthor/src/dvdvmy.y
13
===================================================================
14
--- dvdauthor/src/dvdvmy.y
15
+++ dvdauthor/src/dvdvmy.y      2014-09-14 19:36:28.251618378 +0000
16
@@ -19,6 +19,7 @@
17
  * USA
18
  */
19
 
20
+#include "config.h"
21
 #include "compat.h" /* needed for bool */
22
 #include "dvdvm.h"
23
 
view file @ 226365a0d3
... ... --- /dev/null
... ... +++ b/dvdauthor-0.7.2-GraphicsMagick-ImageMagick-choice.patch
... ... @@ -0,0 +1,69 @@
1
diff -rupN dvdauthor.old/configure.ac dvdauthor/configure.ac
2
--- dvdauthor.old/configure.ac	2016-12-31 00:25:38.000000000 +0100
3
+++ dvdauthor/configure.ac	2017-10-06 11:36:02.261584672 +0200
4
@@ -45,35 +45,30 @@ if test "$enable_shared" = 'no'; then
5
     config_static='--static'
6
 fi
7
 
8
-usemagick=0
9
-
10
-AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config])
11
-if test -n "$MAGICKCONFIG"; then
12
-    ac_save_CPPFLAGS="$CPPFLAGS"
13
-    ac_save_LIBS="$LIBS"
14
-    MAGICK_CPPFLAGS="`$MAGICKCONFIG --cppflags`"
15
-    MAGICK_LIBS="`$MAGICKCONFIG --ldflags` `$MAGICKCONFIG --libs`"
16
-    CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS"
17
-    LIBS="$MAGICK_LIBS $LIBS"
18
-    AC_CHECK_FUNC(ExportImagePixels, usemagick=1, AC_MSG_NOTICE([ImageMagick does not support the function
19
-         ExportImagePixels.  Please upgrade to ImageMagick 5.5.7 or newer]))
20
-    CPPFLAGS="$ac_save_CPPFLAGS"
21
-    LIBS="$ac_save_LIBS"
22
-    if test "$usemagick" = 1; then
23
-        AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available])
24
-    fi
25
+use_imagemagick=0
26
+use_graphicsmagick=0
27
+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])
28
+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])
29
+if test "$use_imagemagick" = 1 && test "$use_graphicsmagick" = 1; then
30
+    AC_MSG_ERROR([cannot specify both --with-imagemagick and --with-graphicsmagick], 1)
31
 fi
32
 
33
-if test "$usemagick" != 1; then
34
-    PKG_CHECK_MODULES([MAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:])
35
+if test "$use_imagemagick" = 1; then
36
+    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])])
37
+    MAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS"
38
+    MAGICK_LIBS="$IMAGEMAGICK_LIBS"
39
 fi
40
-
41
-if test "$usemagick" != 1; then
42
-    MAGICK_CPPFLAGS="$LIBPNG_CFLAGS"
43
+if test "$use_graphicsmagick" = 1; then
44
+    PKG_CHECK_MODULES([GRAPHICSMAGICK], [GraphicsMagick], [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [AC_MSG_ERROR([GraphicsMagick not available])])
45
+    MAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS"
46
+    MAGICK_LIBS="$GRAPHICSMAGICK_LIBS"
47
+fi
48
+if test "$use_imagemagick" != 1 && test "$use_graphicsmagick" != 1; then
49
+    MAGICK_CFLAGS="$LIBPNG_CFLAGS"
50
     MAGICK_LIBS="$LIBPNG_LIBS"
51
 fi
52
 
53
-AC_SUBST(MAGICK_CPPFLAGS)
54
+AC_SUBST(MAGICK_CFLAGS)
55
 AC_SUBST(MAGICK_LIBS)
56
 
57
 PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], [AC_DEFINE(HAVE_FONTCONFIG, 1, [whether Fontconfig is available])], [:])
58
diff -rupN dvdauthor.old/src/Makefile.am dvdauthor/src/Makefile.am
59
--- dvdauthor.old/src/Makefile.am	2016-10-25 02:26:59.000000000 +0200
60
+++ dvdauthor/src/Makefile.am	2017-10-06 11:32:02.186740331 +0200
61
@@ -8,7 +8,7 @@ endif
62
 nodist_bin_SCRIPTS = dvddirdel
63
 
64
 AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \
65
-    @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
66
+    @XML_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
67
 AM_CFLAGS = -Wall
68
 
69
 dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \
view file @ 6731dcd255
... ... --- a/dvdauthor-imagemagick-0.7.0.patch
... ... +++ /dev/null
... ... @@ -1,11 +0,0 @@
0
--- ./configure.ac.orig	2010-10-23 04:26:49.000000000 +0200
1
+++ ./configure.ac	2010-10-24 14:37:45.489064778 +0200
2
@@ -31,7 +31,7 @@
3
 
4
 usemagick=0
5
 
6
-AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config])
7
+AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config])
8
 if test -n "$MAGICKCONFIG"; then
9
     ac_save_CPPFLAGS="$CPPFLAGS"
10
     ac_save_LIBS="$LIBS"
view file @ 226365a0d3
... ... --- a/dvdauthor.spec
... ... +++ b/dvdauthor.spec
... ... @@ -1,20 +1,19 @@
1 1
Summary:	A simple set of tools to help you author a DVD
2 2
Name:		dvdauthor
3
Version:	0.7.1
4
Release:	5
3
Version:	0.7.2
4
Release:	1
5 5
License:	GPLv2+
6 6
Group:		Video
7 7
Url:		http://dvdauthor.sourceforge.net/
8
Source0:	http://heanet.dl.sourceforge.net/project/dvdauthor/dvdauthor/%version/dvdauthor-%version.tar.gz
8
Source0:	https://github.com/ldo/dvdauthor/archive/%{name}-%{version}.tar.gz
9 9
Source1:	http://www.joonet.de/dvdauthor/ftp/%{name}-doc-0.6.17.tar.gz
10
Patch0:		dvdauthor-imagemagick-0.7.0.patch
11
Patch1:		dvdauthor-0.7.1-automake-1.13.patch
12
Patch2:		dvdauthor-0.7.1-strndup.patch
10
Patch0:		%{name}-0.7.2-GraphicsMagick-ImageMagick-choice.patch
13 11
14 12
BuildRequires:	bison
15 13
BuildRequires:	flex
16 14
BuildRequires:	gettext-devel
17 15
BuildRequires:	pkgconfig(dvdread)
16
BuildRequires:	pkgconfig(fontconfig)
18 17
BuildRequires:	pkgconfig(freetype2)
19 18
BuildRequires:	pkgconfig(fribidi)
20 19
BuildRequires:	pkgconfig(GraphicsMagick)
... ... @@ -26,15 +25,14 @@ BuildRequires: pkgconfig(zlib)
25 25
A simple set of tools to help you author a DVD. The idea is to be able to
26 26
create menus, buttons, chapters, etc. But for now you can just take an mpeg
27 27
stream (as created by mplex -f 8 from mjpegtools 1.6.0) and write it to DVD.
28
29
N.B. The system-wide default video format is NTSC, to change it modify 
30
/etc/video_format; for per user specific settings creat ~/.config/video_format
31
and put the video format you want (NTSC or PAL) there.
28
NB. The system-wide default video format is NTSC, to change it modify 
29
/etc/video_format; for per user specific settings create
30
~/.config/video_format and put the video format you want (NTSC or PAL) there.
32 31
33 32
%files
34 33
%doc AUTHORS README ChangeLog COPYING INSTALL TODO html
35 34
%{_sysconfdir}/video_format
36
%{_bindir}/dvdauthor
35
%{_bindir}/%{name}
37 36
%{_bindir}/dvddirdel
38 37
%{_bindir}/dvdunauthor
39 38
%{_bindir}/mpeg2desc
... ... @@ -42,6 +40,7 @@ and put the video format you want (NTSC or PAL) there.
40 40
%{_bindir}/spuunmux
41 41
%{_datadir}/%{name}
42 42
%{_mandir}/man1/*
43
%{_mandir}/man7/video_format.7*
43 44
44 45
#----------------------------------------------------------------------------
45 46
... ... @@ -49,14 +48,16 @@ and put the video format you want (NTSC or PAL) there.
48 48
%setup -qn %{name} -a 1
49 49
%apply_patches
50 50
51
autoreconf -fi
51
autoreconf -vfi
52 52
53 53
mv %{name}-doc-0.6.17/html .
54 54
55
55 56
%build
56
%configure2_5x
57
%configure2_5x --with-graphicsmagick
57 58
%make
58 59
60
59 61
%install
60 62
%makeinstall_std
61 63
... ... @@ -66,4 +67,3 @@ mkdir -p %{buildroot}%{_sysconfdir}
67 67
cat > %{buildroot}%{_sysconfdir}/video_format << EOF
68 68
NTSC
69 69
EOF
70