ports/73407: Upgrade of ports/multimedia/qdvdauthor

[Phil Oleson]

>Number:         73407
>Category:       ports
>Synopsis:       Upgrade of ports/multimedia/qdvdauthor
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 02 09:00:47 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Phil Oleson
>Release:        FreeBSD 4.7-RELEASE-p27 i386
>Organization:
>Environment:
System: FreeBSD nixil.net 4.7-RELEASE-p27 FreeBSD 4.7-RELEASE-p27 #33: Mon Jun 14 16:36:44 MDT 2004


>Description:
        Upgrade of the qdvdauthor port
>How-To-Repeat:
        N/A
>Fix:
	patch below

--- patch-shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patch
#
echo x - patch
sed 's/^X//' >patch << 'END-of-patch'
Xdiff -ruN qdvdauthor.orig/Makefile qdvdauthor/Makefile
X--- qdvdauthor.orig/Makefile	Thu Jul  8 01:31:03 2004
X+++ qdvdauthor/Makefile	Tue Nov  2 00:54:13 2004
X@@ -6,7 +6,7 @@
X #
X 
X PORTNAME=	qdvdauthor
X-PORTVERSION=	0.0.7
X+PORTVERSION=	0.0.8
X CATEGORIES=	multimedia
X MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
X MASTER_SITE_SUBDIR=	${PORTNAME}
X@@ -17,8 +17,7 @@
X BUILD_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
X 		mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
X 		qmake:${PORTSDIR}/devel/qmake
X-LIB_DEPENDS=	Magick.6:${PORTSDIR}/graphics/ImageMagick \
X-		xine.9:${PORTSDIR}/multimedia/libxine
X+LIB_DEPENDS=	xine.9:${PORTSDIR}/multimedia/libxine
X RUN_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
X 		mpeg2enc:${PORTSDIR}/multimedia/mjpegtools
X 
X@@ -27,13 +26,13 @@
X USE_QT_VER=	3
X QT_NONSTANDARD=	yes
X CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
X-CONFIGURE_ARGS=	--qt-dir=${X11BASE} --with-image-magick-lib \
X-		--build-qslideshow --build-wxine
X+CONFIGURE_ARGS=	--qt-dir=${X11BASE} --with-xine-lib \
X+		--build-qslideshow --build-qplayer
X NO_BUILD=	yes
X 
X do-install:
X 	${INSTALL_PROGRAM} ${WRKSRC}/bin/qdvdauthor ${PREFIX}/bin/qdvdauthor
X 	${INSTALL_PROGRAM} ${WRKSRC}/bin/qslideshow ${PREFIX}/bin/qslideshow
X-	${INSTALL_PROGRAM} ${WRKSRC}/bin/qxine      ${PREFIX}/bin/qxine
X+	${INSTALL_PROGRAM} ${WRKSRC}/bin/qplayer    ${PREFIX}/bin/qplayer
X 
X .include <bsd.port.mk>
Xdiff -ruN qdvdauthor.orig/distinfo qdvdauthor/distinfo
X--- qdvdauthor.orig/distinfo	Tue Nov  2 00:11:01 2004
X+++ qdvdauthor/distinfo	Tue Nov  2 00:53:20 2004
X@@ -1,2 +1,2 @@
X-MD5 (qdvdauthor-0.0.7.tar.gz) = bfde1dae2e3f01baa52c624bb8414405
X-SIZE (qdvdauthor-0.0.7.tar.gz) = 610869
X+MD5 (qdvdauthor-0.0.8.tar.gz) = 67294b179464cd07220a8f484545318a
X+SIZE (qdvdauthor-0.0.8.tar.gz) = 679606
Xdiff -ruN qdvdauthor.orig/files/patch-configure qdvdauthor/files/patch-configure
X--- qdvdauthor.orig/files/patch-configure	Wed Dec 31 17:00:00 1969
X+++ qdvdauthor/files/patch-configure	Tue Nov  2 00:19:06 2004
X@@ -0,0 +1,11 @@
X+--- configure.orig	Tue Nov  2 00:18:03 2004
X++++ configure	Tue Nov  2 00:18:38 2004
X+@@ -265,7 +265,7 @@
X+ 		esac;
X+ 	done;
X+ 	# Here we check for xine, or mplayer
X+-	if [ VIDEO_LIB = "xine" ];
X++	if [ $VIDEO_LIB = "xine" ];
X+ 	then
X+ 		check_xinelibs;
X+ 	else
Xdiff -ruN qdvdauthor.orig/files/patch-qdvdauthor-imagemagicklib.inc qdvdauthor/files/patch-qdvdauthor-imagemagicklib.inc
X--- qdvdauthor.orig/files/patch-qdvdauthor-imagemagicklib.inc	Tue Nov  2 00:11:01 2004
X+++ qdvdauthor/files/patch-qdvdauthor-imagemagicklib.inc	Wed Dec 31 17:00:00 1969
X@@ -1,10 +0,0 @@
X---- qdvdauthor/imagemagicklib.inc.old	Tue Jul  6 21:58:42 2004
X-+++ qdvdauthor/imagemagicklib.inc	Tue Jul  6 21:59:02 2004
X-@@ -10,6 +10,7 @@
X- 
X- #include <stdio.h>
X- #include <stdlib.h>
X-+#include <unistd.h>
X- 
X- #include <qimage.h>
X- #include <Magick++.h>
Xdiff -ruN qdvdauthor.orig/files/patch-qdvdauthor-qplayer-qxinewdget.h qdvdauthor/files/patch-qdvdauthor-qplayer-qxinewdget.h
X--- qdvdauthor.orig/files/patch-qdvdauthor-qplayer-qxinewdget.h	Wed Dec 31 17:00:00 1969
X+++ qdvdauthor/files/patch-qdvdauthor-qplayer-qxinewdget.h	Tue Nov  2 00:45:27 2004
X@@ -0,0 +1,10 @@
X+--- qdvdauthor/qplayer/qxinewidget.h.orig	Tue Nov  2 00:43:11 2004
X++++ qdvdauthor/qplayer/qxinewidget.h	Tue Nov  2 00:43:15 2004
X+@@ -31,6 +31,7 @@
X+ #include <qtimer.h>
X+ #include <qevent.h>
X+ #include <qthread.h>
X++#include <pthread.h>
X+ 
X+ #include <xine.h>
X+ 
Xdiff -ruN qdvdauthor.orig/files/patch-qdvdauthor-qxine-qxinewidget.h qdvdauthor/files/patch-qdvdauthor-qxine-qxinewidget.h
X--- qdvdauthor.orig/files/patch-qdvdauthor-qxine-qxinewidget.h	Tue Nov  2 00:11:01 2004
X+++ qdvdauthor/files/patch-qdvdauthor-qxine-qxinewidget.h	Wed Dec 31 17:00:00 1969
X@@ -1,10 +0,0 @@
X---- qdvdauthor/qxine/qxinewidget.h.orig	Mon May 10 03:14:10 2004
X-+++ qdvdauthor/qxine/qxinewidget.h	Mon May 10 22:03:01 2004
X-@@ -31,6 +31,7 @@
X- #include <qtimer.h>
X- #include <qevent.h>
X- #include <qthread.h>
X-+#include <pthread.h>
X- 
X- #include <xine.h>
X- 
Xdiff -ruN qdvdauthor.orig/pkg-plist qdvdauthor/pkg-plist
X--- qdvdauthor.orig/pkg-plist	Tue Nov  2 00:11:01 2004
X+++ qdvdauthor/pkg-plist	Tue Nov  2 01:02:03 2004
X@@ -1,3 +1,3 @@
X bin/qdvdauthor
X bin/qslideshow
X-bin/qxine
X+bin/qplayer
END-of-patch
exit
--- patch-shar ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: