tb/contrib
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

dvdauthor: 0.7.1 -> 0.7.2

Browse Source
This commit is contained in:
Danny Rawlins 2019-10-13 20:26:55 +11:00
parent a349622763
commit dc6402ec69
6 changed files with 146 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dvdauthor/.footprint
View File

@ -6,16 +6,18 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/mpeg2desc
-rwxr-xr-x root/root usr/bin/spumux
-rwxr-xr-x root/root usr/bin/spuunmux
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/dvdauthor.1.gz
-rw-r--r-- root/root usr/man/man1/dvddirdel.1.gz
-rw-r--r-- root/root usr/man/man1/dvdunauthor.1.gz
-rw-r--r-- root/root usr/man/man1/mpeg2desc.1.gz
-rw-r--r-- root/root usr/man/man1/spumux.1.gz
-rw-r--r-- root/root usr/man/man1/spuunmux.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/dvdauthor/
-rw-r--r-- root/root usr/share/dvdauthor/common.xsd
-rw-r--r-- root/root usr/share/dvdauthor/dvdauthor.xsd
-rw-r--r-- root/root usr/share/dvdauthor/spumux.xsd
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/dvdauthor.1.gz
-rw-r--r-- root/root usr/share/man/man1/dvddirdel.1.gz
-rw-r--r-- root/root usr/share/man/man1/dvdunauthor.1.gz
-rw-r--r-- root/root usr/share/man/man1/mpeg2desc.1.gz
-rw-r--r-- root/root usr/share/man/man1/spumux.1.gz
-rw-r--r-- root/root usr/share/man/man1/spuunmux.1.gz
drwxr-xr-x root/root usr/share/man/man7/
-rw-r--r-- root/root usr/share/man/man7/video_format.7.gz

11
dvdauthor/.signature
View File

@ -1,6 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3071iGUiH/jEgiJRr3hylOxF9YHZLH4Md+WubvVJjsHKdXqpTvRKVw9EnojVSiQWT+IQXM3IwQ9fDS0Q7ybYwAQ=
SHA256 (Pkgfile) = 2902e56a1f09f9de68582b2e069880c66bfe4037da8152e60dfb5b73817a4b25
SHA256 (.footprint) = dd0c129af8239df060b50b4a53896ae44b2be51d94c805b84969630791e6d792
SHA256 (dvdauthor-0.7.1.tar.gz) = 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9
SHA256 (dvdauthor-0.7.1-glibc220.patch) = e74c5ab228fe0bdaaf66b7662507b980f2790cd8df3722a3666e2bb560633e00
RWSagIOpLGJF393TCDZIn0XpAorihXEhzdRA3coO6KjcWhiOhny8PdXwp/Ad1Qgn0OGscCymKLU+SovmXl4NjhtPmrW2Ttf91gs=
SHA256 (Pkgfile) = bd37af7cedd0d1decf45b90b287670d8ba1fac3aab99b1b76a86e77f813220c5
SHA256 (.footprint) = e9e3f40d8b3e9d3ae67a18a14249472672d4365795ec06d5d54f49ba5126b567
SHA256 (dvdauthor-0.7.2.tar.gz) = 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7
SHA256 (dvdauthor-freetype_pkgconfig.patch) = b9999b749f9253ac8330c7088d3eb4a49e7e22c05bc11a8c7984e342772a7af7
SHA256 (dvdauthor-0.7.2-imagemagick7.patch) = 4af828142564ef8fc73f92be3f0300866df8f4437baf99d87027c4c8cbba8d41

21
dvdauthor/Pkgfile
View File

@ -1,23 +1,26 @@
# Description: DVD authoring tools.
# URL: http://dvdauthor.sourceforge.net/
# Maintainer: Danny Rawlins, crux at romster dot me
# Packager: Matt Housh, jaeger at morpheus dot net
# Depends on: freetype fribidi libdvdnav libxml2
# Optional: imagemagick
name=dvdauthor
version=0.7.1
release=2
source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz
dvdauthor-0.7.1-glibc220.patch)
version=0.7.2
release=1
source=(https://sourceforge.net/projects/$name/files/$name-$version.tar.gz
dvdauthor-freetype_pkgconfig.patch
dvdauthor-0.7.2-imagemagick7.patch)
build() {
cd $name
patch -p1 -i $SRC/dvdauthor-0.7.1-glibc220.patch
patch -p1 -i $SRC/dvdauthor-freetype_pkgconfig.patch
./configure \
--prefix=/usr \
--mandir=/usr/man
prt-get isinst imagemagick && patch -p1 -i $SRC/dvdauthor-0.7.2-imagemagick7.patch
autoreconf -vi
./configure --prefix=/usr
make
make DESTDIR=$PKG install

162
dvdauthor/dvdauthor-0.7.1-glibc220.patch
View File

@ -1,162 +0,0 @@
From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 19 Jul 2014 21:06:58 +0300
Subject: [PATCH] compat.h needs stuff from config.h so include it there
This was brought up by dvdvml.* not including it and thus causing a
build failure on Fedora (22) devel. While at it, uninclude config.h
from files where it was included just for compat.h reasons.
---
src/compat.h | 2 ++
src/conffile.c | 1 -
src/dvdauthor.c | 2 --
src/dvdcompile.c | 2 --
src/dvdpgc.c | 1 -
src/dvdunauthor.c | 2 --
src/dvduncompile.c | 1 -
src/dvdvob.c | 2 --
src/readxml.c | 2 --
src/spuunmux.c | 1 -
src/subgen-encode.c | 2 --
11 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/compat.h b/src/compat.h
index 126dcd7..93de081 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -1,6 +1,8 @@
// basic headers
#define _GNU_SOURCE /* really just for strndup */
+#include "config.h"
+
#ifdef HAVE_STDBOOL_H
# include <stdbool.h>
#else
diff --git a/src/conffile.c b/src/conffile.c
index cab661a..36ded07 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -21,7 +21,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
#include "compat.h"
#include <errno.h>
#include "conffile.h"
diff --git a/src/dvdauthor.c b/src/dvdauthor.c
index d591d68..4860258 100644
--- a/src/dvdauthor.c
+++ b/src/dvdauthor.c
@@ -20,8 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <sys/types.h>
diff --git a/src/dvdcompile.c b/src/dvdcompile.c
index fd232b6..47f13e5 100644
--- a/src/dvdcompile.c
+++ b/src/dvdcompile.c
@@ -20,8 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <assert.h>
diff --git a/src/dvdpgc.c b/src/dvdpgc.c
index e0adc61..cf6eb04 100644
--- a/src/dvdpgc.c
+++ b/src/dvdpgc.c
@@ -20,7 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
#include "compat.h"
#include <errno.h>
#include <assert.h>
diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c
index ccd422f..f988cdf 100644
--- a/src/dvdunauthor.c
+++ b/src/dvdunauthor.c
@@ -23,8 +23,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <ctype.h>
diff --git a/src/dvduncompile.c b/src/dvduncompile.c
index 0c5eaf1..a064011 100644
--- a/src/dvduncompile.c
+++ b/src/dvduncompile.c
@@ -22,7 +22,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
#include "compat.h"
#include <stdio.h>
diff --git a/src/dvdvob.c b/src/dvdvob.c
index 2d7e2b8..2146689 100644
--- a/src/dvdvob.c
+++ b/src/dvdvob.c
@@ -20,8 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <assert.h>
diff --git a/src/readxml.c b/src/readxml.c
index 61ff0a1..3b83f07 100644
--- a/src/readxml.c
+++ b/src/readxml.c
@@ -20,8 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <assert.h>
diff --git a/src/spuunmux.c b/src/spuunmux.c
index 1981e41..94fcb10 100644
--- a/src/spuunmux.c
+++ b/src/spuunmux.c
@@ -31,7 +31,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
#include "compat.h"
#include <fcntl.h>
diff --git a/src/subgen-encode.c b/src/subgen-encode.c
index 53ed4b2..962e902 100644
--- a/src/subgen-encode.c
+++ b/src/subgen-encode.c
@@ -21,8 +21,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <assert.h>

75
dvdauthor/dvdauthor-0.7.2-imagemagick7.patch Normal file
View File

@ -0,0 +1,75 @@
--- dvdauthor/src/subgen-image.c
+++ dvdauthor/src/subgen-image.c
@@ -30,7 +30,7 @@
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
#include <stdarg.h>
-#include <magick/api.h>
+#include <MagickWand/MagickWand.h>
#else
#include <png.h>
#endif
@@ -176,18 +176,18 @@
{
Image *im;
ImageInfo *ii;
- ExceptionInfo ei;
+ ExceptionInfo *ei;
int x,y;
unsigned long magickver;
unsigned char amask;
- GetExceptionInfo(&ei);
+ ei = AcquireExceptionInfo();
ii=CloneImageInfo(NULL);
strcpy(ii->filename,s->fname);
- im=ReadImage(ii,&ei);
+ im=ReadImage(ii,ei);
if( !im ) {
- MagickError(ei.severity,"Unable to load file",ii->filename);
+ MagickError(ei->severity,"Unable to load file",ii->filename);
return -1;
}
@@ -202,10 +202,10 @@
for( y=0; y<im->rows; y++ ) {
char pdata[MAXX*4];
- if(!ExportImagePixels(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);
+ if(!ExportImagePixels(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);
DestroyImage(im);
return -1;
}
@@ -219,7 +219,7 @@
}
}
DestroyImage(im);
- DestroyExceptionInfo(&ei);
+ DestroyExceptionInfo(ei);
fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
return 0;
@@ -1098,13 +1098,13 @@
void image_init()
{
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
- InitializeMagick(NULL);
+ MagickCoreGenesis("", MagickFalse);
#endif
}
void image_shutdown()
{
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
- DestroyMagick();
+ MagickCoreTerminus();
#endif
}

43
dvdauthor/dvdauthor-freetype_pkgconfig.patch Normal file
View File

@ -0,0 +1,43 @@
From 259f892fe61f16c26733506d2511eec7ff136dc4 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Mon, 7 May 2018 09:18:48 +0200
Subject: [PATCH] Use pkg-config to find freetype
As of freetype-2.9.1 the freetype-config file no longer gets installed
by default.
---
configure.ac | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index c06ac6b..1194059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,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"
@@ -91,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],
--
2.17.0