rpms/dvdauthor/devel 0001-Use-pkg-config-to-find-FriBidi.patch, NONE, 1.1 0002-Fix-build-with-FriBidi-0.19.x.patch, NONE, 1.1 dvdauthor-0.6.17-graphicsmagick.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 dvdauthor.spec, 1.14, 1.15 sources, 1.5, 1.6 dvdauthor-0.6.14-graphicsmagick.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Sat Jan 2 17:32:39 UTC 2010
- Previous message (by thread): rpms/vdr-streamdev/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-streamdev.spec, 1.3, 1.4
- Next message (by thread): rpms/vdr-streamdev/F-11 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-streamdev.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/dvdauthor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7567
Modified Files:
.cvsignore dvdauthor.spec sources
Added Files:
0001-Use-pkg-config-to-find-FriBidi.patch
0002-Fix-build-with-FriBidi-0.19.x.patch
dvdauthor-0.6.17-graphicsmagick.patch
Removed Files:
dvdauthor-0.6.14-graphicsmagick.patch
Log Message:
* Sat Jan 2 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.6.17-1
- Update to 0.6.17 (new "unofficial" upstream: http://www.joonet.de/dvdauthor/).
- Include HTML docs in package.
- Drop no longer needed libdvdread header dir hack.
0001-Use-pkg-config-to-find-FriBidi.patch:
configure.ac | 9 ++-------
src/Makefile.am | 3 +--
2 files changed, 3 insertions(+), 9 deletions(-)
--- NEW FILE 0001-Use-pkg-config-to-find-FriBidi.patch ---
>From 079ec43050c6fcfecbdfe13d34307730103f7a19 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sat, 2 Jan 2010 18:45:15 +0200
Subject: [PATCH] Use pkg-config to find FriBidi.
fribidi-config no longer exists in 0.19.x, whereas the .pc is
available since 2002.
---
configure.ac | 9 ++-------
src/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index e2433da..431cf51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,14 +75,9 @@ fi
AC_SUBST(MAGICK_CPPFLAGS)
AC_SUBST(MAGICK_LIBS)
-AC_CHECK_PROGS(FRIBIDICONFIG, [fribidi-config])
-if test -n "$FRIBIDICONFIG"; then
- FRIBIDI_CPPFLAGS="`$FRIBIDICONFIG --cflags`"
- FRIBIDI_LIBS="`$FRIBIDICONFIG --libs`"
- AC_DEFINE(HAVE_FRIBIDI, 1, [Whether FriBiDi is available])
-fi
+PKG_CHECK_MODULES([FRIBIDI], [fribidi], [AC_DEFINE(HAVE_FRIBIDI, 1, [Whether FriBiDi is available])])
-AC_SUBST(FRIBIDI_CPPFLAGS)
+AC_SUBST(FRIBIDI_CFLAGS)
AC_SUBST(FRIBIDI_LIBS)
AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
diff --git a/src/Makefile.am b/src/Makefile.am
index 41c8520..33cd80f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ endif
nodist_bin_SCRIPTS = dvddirdel
-AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CPPFLAGS@
+AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@
AM_CFLAGS = -Wall
dvdauthor_SOURCES = dvdauthor.c dvdauthor.h da-internal.h \
--
1.6.2.5
0002-Fix-build-with-FriBidi-0.19.x.patch:
subreader.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE 0002-Fix-build-with-FriBidi-0.19.x.patch ---
>From d99dd01c5502e760c165de1ca1ca525bfcf8acc5 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sat, 2 Jan 2010 19:07:58 +0200
Subject: [PATCH 2/2] Fix build with FriBidi 0.19.x.
---
src/subreader.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/subreader.c b/src/subreader.c
index 01f23e3..6838ea9 100644
--- a/src/subreader.c
+++ b/src/subreader.c
@@ -1082,8 +1082,8 @@ subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
int char_set_num;
fribidi_boolean log2vis;
if(flip_hebrew) { // Please fix the indentation someday
- fribidi_set_mirroring (FRIBIDI_TRUE);
- fribidi_set_reorder_nsm (FRIBIDI_FALSE);
+ fribidi_set_mirroring (1);
+ fribidi_set_reorder_nsm (0);
if( sub_utf8 == 0 ) {
char_set_num = fribidi_parse_charset (fribidi_charset?fribidi_charset:"ISO8859-8");
--
1.6.2.5
dvdauthor-0.6.17-graphicsmagick.patch:
configure.ac | 32 +++++++++++++++++++++++++-------
src/compat.h | 6 +++++-
src/subgen-image.c | 21 ++++++++++++++-------
3 files changed, 44 insertions(+), 15 deletions(-)
--- NEW FILE dvdauthor-0.6.17-graphicsmagick.patch ---
o Do not apply the "RGBA meaning swapped in ImageMagick 6" to GraphicsMagick.
o Do not rely on GraphicsMagick's ImageMagick compat things installed.
o Identify ImageMagick/GraphicsMagick in build spec.
o Upstreamed: http://github.com/ldo/dvdauthor/commit/101466dae973dbb95808570c9804ea9c9f359157
diff -up dvdauthor-0.6.17/configure.ac~ dvdauthor-0.6.17/configure.ac
--- dvdauthor-0.6.17/configure.ac~ 2009-12-28 18:53:34.000000000 +0200
+++ dvdauthor-0.6.17/configure.ac 2010-01-02 17:49:32.000000000 +0200
@@ -27,9 +27,9 @@ AC_CHECK_FUNCS( \
setmode \
)
-AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config GraphicsMagick-config])
-
usemagick=0
+
+AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config])
if test -n "$MAGICKCONFIG"; then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"
@@ -37,11 +37,31 @@ if test -n "$MAGICKCONFIG"; then
MAGICK_LIBS="`$MAGICKCONFIG --ldflags` `$MAGICKCONFIG --libs`"
CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS"
LIBS="$MAGICK_LIBS $LIBS"
- AC_CHECK_FUNC(ExportImagePixels, usemagick=1, AC_MSG_NOTICE([ImageMagick/GraphicsMagick does not support the function
- ExportImagePixels. Please upgrade to ImageMagick 6.3.0 or newer (or
- the corresponding GraphicsMagick version)]))
+ AC_CHECK_FUNC(ExportImagePixels, usemagick=1, AC_MSG_NOTICE([ImageMagick does not support the function
+ ExportImagePixels. Please upgrade to ImageMagick 6.3.0 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
+
+if test "$usemagick" != 1; then
+ AC_CHECK_PROGS(GMAGICKCONFIG, [GraphicsMagick-config])
+ if test -n "$GMAGICKCONFIG"; then
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ ac_save_LIBS="$LIBS"
+ MAGICK_CPPFLAGS="`$GMAGICKCONFIG --cppflags`"
+ MAGICK_LIBS="`$GMAGICKCONFIG --ldflags` `$GMAGICKCONFIG --libs`"
+ CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS"
+ LIBS="$MAGICK_LIBS $LIBS"
+ AC_CHECK_FUNC(DispatchImage, usemagick=1)
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIBS="$ac_save_LIBS"
+ if test "$usemagick" = 1; then
+ AC_DEFINE(HAVE_GMAGICK, 1, [Whether the GraphicsMagick libraries are available])
+ fi
+ fi
fi
if test "$usemagick" != 1; then
@@ -50,8 +70,6 @@ if test "$usemagick" != 1; then
AC_CHECK_LIB(png, png_sig_cmp, test, AC_MSG_ERROR([You must have libpng(-devel) installed]), -lz -lm)
MAGICK_CPPFLAGS=
MAGICK_LIBS="-lpng -lz -lm"
-else
- AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick or GraphicsMagick libraries are available])
fi
AC_SUBST(MAGICK_CPPFLAGS)
diff -up dvdauthor-0.6.17/src/compat.h~ dvdauthor-0.6.17/src/compat.h
--- dvdauthor-0.6.17/src/compat.h~ 2009-12-28 18:46:27.000000000 +0200
+++ dvdauthor-0.6.17/src/compat.h 2010-01-02 17:49:35.000000000 +0200
@@ -49,10 +49,14 @@
// this doesn't really belong here, but it was easiest
#ifdef HAVE_MAGICK
-#define BUILDSPEC_MAGICK " magick"
+#define BUILDSPEC_MAGICK " imagemagick"
+#else
+#ifdef HAVE_GMAGICK
+#define BUILDSPEC_MAGICK " graphicsmagick"
#else
#define BUILDSPEC_MAGICK ""
#endif
+#endif
#ifdef HAVE_GETOPT_LONG
#define BUILDSPEC_GETOPT " gnugetopt"
diff -up dvdauthor-0.6.17/src/subgen-image.c~ dvdauthor-0.6.17/src/subgen-image.c
--- dvdauthor-0.6.17/src/subgen-image.c~ 2009-12-28 18:51:39.000000000 +0200
+++ dvdauthor-0.6.17/src/subgen-image.c 2010-01-02 17:49:30.000000000 +0200
@@ -28,7 +28,7 @@
#include <fcntl.h>
#include <math.h>
-#ifdef HAVE_MAGICK
+#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
#include <stdarg.h>
#include <magick/api.h>
#else
@@ -154,7 +154,7 @@ static void createimage(pict *s,int w,in
}
}
-#ifdef HAVE_MAGICK
+#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
static int read_magick(pict *s)
/* uses ImageMagick to read image s from s->fname. */
{
@@ -182,7 +182,13 @@ static int read_magick(pict *s)
for( y=0; y<im->rows; y++ ) {
char pdata[MAXX*4];
- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
+ if(!
+#ifdef HAVE_MAGICK
+ ExportImagePixels
+#else // HAVE_GMAGICK
+ DispatchImage
+#endif
+ (im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description);
CatchException(&ei);
MagickError(ei.severity,ei.reason,ei.description);
@@ -196,7 +202,8 @@ static int read_magick(pict *s)
p.g=pdata[x*4+1];
p.b=pdata[x*4+2];
// the meaning of RGBA swapped with ImageMagick 6.0.0...
-#if MagickLibVersion >= 0x600
+ // ...but not with GraphicsMagick
+#if defined(HAVE_MAGICK) && MagickLibVersion >= 0x600
p.t=pdata[x*4+3];
#else
p.t=255-pdata[x*4+3];
@@ -336,7 +343,7 @@ static int read_pic(stinfo *s,pict *p)
{
if( !p->fname )
return 0;
-#ifdef HAVE_MAGICK
+#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
r=read_magick(p);
#else
r=read_png(p);
@@ -1075,14 +1082,14 @@ int process_subtitle(stinfo *s)
void image_init()
{
-#ifdef HAVE_MAGICK
+#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
InitializeMagick(NULL);
#endif
}
void image_shutdown()
{
-#ifdef HAVE_MAGICK
+#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
DestroyMagick();
#endif
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 25 Feb 2007 08:09:53 -0000 1.5
+++ .cvsignore 2 Jan 2010 17:32:39 -0000 1.6
@@ -1 +1,2 @@
-dvdauthor-0.6.14.tar.gz
+dvdauthor-0.6.17.tar.gz
+dvdauthor-doc-0.6.17.tar.gz
Index: dvdauthor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/devel/dvdauthor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dvdauthor.spec 24 Jul 2009 20:39:37 -0000 1.14
+++ dvdauthor.spec 2 Jan 2010 17:32:39 -0000 1.15
@@ -1,13 +1,16 @@
Name: dvdauthor
-Version: 0.6.14
-Release: 10%{?dist}
+Version: 0.6.17
+Release: 1%{?dist}
Summary: Command line DVD authoring tool
Group: Applications/Multimedia
License: GPLv2+
URL: http://dvdauthor.sourceforge.net/
-Source0: http://downloads.sourceforge.net/dvdauthor/%{name}-%{version}.tar.gz
-Patch0: %{name}-0.6.14-graphicsmagick.patch
+Source0: http://www.joonet.de/dvdauthor/ftp/%{name}-%{version}.tar.gz
+Source1: http://www.joonet.de/dvdauthor/ftp/%{name}-doc-%{version}.tar.gz
+Patch0: %{name}-0.6.17-graphicsmagick.patch
+Patch1: 0001-Use-pkg-config-to-find-FriBidi.patch
+Patch2: 0002-Fix-build-with-FriBidi-0.19.x.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdvdread-devel >= 0.9.4-4
@@ -18,23 +21,21 @@ BuildRequires: libxml2-devel >= 2.6.0
BuildRequires: fribidi-devel
BuildRequires: freetype-devel
BuildRequires: GraphicsMagick-devel
-# autofoo etc for Patch0
+# autofoo etc for Patch0, Patch1
BuildRequires: autoconf automake gettext-devel
%description
dvdauthor is a program that will generate a DVD movie from a valid
-mpeg2 stream that should play when you put it in a DVD player.
+MPEG-2 stream that should play when you put it in a DVD player.
%prep
-%setup -q
-%patch0 -p1 -b .graphicsmagick
-autoreconf # for Patch0
-
-# Adapt to changed header location in libdvdread 4.1.3. *sigh*
-if [ -d %{_includedir}/libdvdread ] ; then
- sed -i -e 's|<dvdread/|<libdvdread/|g' src/dvdunauthor.c src/dvduncompile.h
-fi
+%setup -q -a 1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+autoreconf # for Patch0, Patch1
+mv %{name}-doc-%{version}/html .
%build
@@ -55,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
+%doc ChangeLog COPYING README TODO html/
%{_bindir}/dvdauthor
%{_bindir}/dvddirdel
%{_bindir}/dvdunauthor
@@ -72,6 +73,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 2 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.6.17-1
+- Update to 0.6.17 (new "unofficial" upstream: http://www.joonet.de/dvdauthor/).
+- Include HTML docs in package.
+- Drop no longer needed libdvdread header dir hack.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.14-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -84,49 +90,49 @@ rm -rf $RPM_BUILD_ROOT
* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.14-7
- rebuild against new GraphicsMagick
-* Tue Jul 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-6
+* Tue Jul 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-6
- Fix build with changed libdvdread 4.1.3 header location.
-* Wed Feb 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-5
+* Wed Feb 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-5
- Build with GraphicsMagick, drop all build time conditionals (#245155).
- Patch to differentiate ImageMagick vs GraphicsMagick at build time, don't
rely on GM's IM compat things installed, fix RGBA treatment with GM.
- Avoid linkage bloat from GraphicsMagick-config --libs.
-* Wed Feb 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-4
+* Wed Feb 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-4
- Add build time conditional for GraphicsMagick, disabled by default (#432651).
- Get rid of need for BuildConflicts.
-* Fri Nov 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-3
+* Fri Nov 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-3
- Rebuild.
-* Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-2
+* Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-2
- License: GPLv2+
-* Sat Feb 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-1
+* Sat Feb 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.14-1
- 0.6.14.
-* Wed Jan 17 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.13-1
+* Wed Jan 17 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.13-1
- 0.6.13.
-* Mon Jan 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.12-1
+* Mon Jan 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.12-1
- 0.6.12.
-* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-9
+* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-9
- First FE build (#219103).
-* Thu Oct 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-8
+* Thu Oct 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-8
- Build without ImageMagick by default due to dependency bloat (#212478).
- Prune pre-2006 changelog entries.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.6.11-7
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-6
+* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-6
- Rebuild.
-* Sun Jul 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-5
+* Sun Jul 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-5
- Rebuild for new ImageMagick (#1087).
-* Thu Mar 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-4
+* Thu Mar 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.11-4
- Remove -ldl hacks, BR fixed libdvdread-devel.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvdauthor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 25 Feb 2007 08:09:53 -0000 1.5
+++ sources 2 Jan 2010 17:32:39 -0000 1.6
@@ -1 +1,2 @@
-bd646b47950c4091ffd781d43fd2c5e9 dvdauthor-0.6.14.tar.gz
+27ef1b20dcdf7a42906c0d2b52e0b461 dvdauthor-0.6.17.tar.gz
+9f2049b0973248bd2e33444bc58243a2 dvdauthor-doc-0.6.17.tar.gz
--- dvdauthor-0.6.14-graphicsmagick.patch DELETED ---
- Previous message (by thread): rpms/vdr-streamdev/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-streamdev.spec, 1.3, 1.4
- Next message (by thread): rpms/vdr-streamdev/F-11 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-streamdev.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list