Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jan 2006 19:16:12 -0700 (MST)
From:      Phil Oleson <oz@nixil.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/91370: [Maintainer-Update] multimedia/qdvdauthor 0.1.0
Message-ID:  <200601060216.k062GCr4021667@nixil.net>
Resent-Message-ID: <200601060220.k062KCMI057112@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         91370
>Category:       ports
>Synopsis:       [Maintainer-Update] multimedia/qdvdauthor 0.1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 06 02:20:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Phil Oleson
>Release:        FreeBSD 4.7-RELEASE-p28 i386
>Organization:
N/A
>Environment:
System: FreeBSD nixil.net 4.7-RELEASE-p28 FreeBSD 4.7-RELEASE-p28 #43: Wed Jul 20 09:35:30 MDT 200
5 root@nixil:/usr/src/sys/compile/nixil i386

>Description:
        Upgrade qdvdauthor to 0.1.0.  I'm excluding the vlc playback options
in the Makefile for now as vlc-config in 0.8.4 is broke.  I haven't made time
to try out vlc-devel yet, though their subversion logs look promising.

>How-To-Repeat:
        N/A
>Fix:

patch below..

--- qdvdauthor.patch begins here ---
diff -ruN qdvdauthor.orig/Makefile qdvdauthor/Makefile
--- qdvdauthor.orig/Makefile	Thu Jan  5 04:30:59 2006
+++ qdvdauthor/Makefile	Thu Jan  5 19:14:46 2006
@@ -2,12 +2,11 @@
 # Date created:        05/07/04
 # Whom:                oz@nixil.net
 #
-# $FreeBSD: ports/multimedia/qdvdauthor/Makefile,v 1.10 2006/01/05 03:57:29 edwin Exp $
+# $FreeBSD: ports/multimedia/qdvdauthor/Makefile,v 1.9 2005/12/10 21:06:41 nobutaka Exp $
 #
 
 PORTNAME=	qdvdauthor
-PORTVERSION=	0.0.10
-PORTREVISION=	1
+PORTVERSION=	0.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,11 +14,11 @@
 MAINTAINER=	oz@nixil.net
 COMMENT=	QT graphical frontend for dvdauthor
 
-BUILD_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
-		qmake:${PORTSDIR}/devel/qmake
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+
 RUN_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		mpeg2enc:${PORTSDIR}/multimedia/mjpegtools
+		mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
+		dvd-slideshow:${PORTSDIR}/multimedia/dvd-slideshow
 
 PLIST_FILES=	bin/qdvdauthor \
 		bin/qslideshow \
@@ -38,7 +37,6 @@
 		MJPEGTOOLS "Convert background images into mpeg2 movie" on \
 		CDRTOOLS "Create iso images of DVD on the Hard Drive" on \
 		TRANSCODE "Support for movie format conversion" on \
-		DVDSLIDE "Creates slideshow-style dvd with menus" on \
 		DVDRWTOOLS "Optional DVD recording/burning prog" off \
 		MPLAYER "Optional support for mplayer playback" off \
 		TOOLAME "Optional support for audio conversion" off \
@@ -55,9 +53,6 @@
 .if exists(${LOCALBASE}/bin/mkisofs)
 WITH_CDRTOOLS=yes
 .endif
-.if exists(${LOCALBASE}/bin/dvd-slideshow)
-WITH_DVDSLIDE=yes
-.endif
 .if exists(${LOCALBASE}/bin/growisofs)
 WITH_DVDRWTOOLS=yes
 .endif
@@ -82,9 +77,6 @@
 .endif
 .if !defined(WITHOUT_CDRTOOLS)
 RUN_DEPENDS+=	mkisofs:${PORTSDIR}/sysutils/cdrtools
-.endif
-.if !defined(WITHOUT_DVDSLIDE)
-RUN_DEPENDS+=	dvd-slideshow:${PORTSDIR}/multimedia/dvd-slideshow
 .endif
 .if defined(WITH_DVDRWTOOLS)
 RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
diff -ruN qdvdauthor.orig/distinfo qdvdauthor/distinfo
--- qdvdauthor.orig/distinfo	Sun Oct 23 04:30:42 2005
+++ qdvdauthor/distinfo	Thu Jan  5 19:01:04 2006
@@ -1,2 +1,3 @@
-MD5 (qdvdauthor-0.0.10.tar.gz) = da494965fb5ed14037acdbdf75af0857
-SIZE (qdvdauthor-0.0.10.tar.gz) = 1168130
+MD5 (qdvdauthor-0.1.0.tar.gz) = 6016cae51d2d2be1159c5fd2625d25d4
+SHA256 (qdvdauthor-0.1.0.tar.gz) = 527fcdfa5bc1db3db5df07b258d13b2ca25b34a60ba3d8a50cf402e557efcd16
+SIZE (qdvdauthor-0.1.0.tar.gz) = 3483254
diff -ruN qdvdauthor.orig/files/patch-configure qdvdauthor/files/patch-configure
--- qdvdauthor.orig/files/patch-configure	Wed Dec 31 17:00:00 1969
+++ qdvdauthor/files/patch-configure	Thu Jan  5 19:01:04 2006
@@ -0,0 +1,22 @@
+--- configure.orig	Fri Dec 30 01:50:45 2005
++++ configure	Fri Dec 30 02:01:29 2005
+@@ -147,8 +147,8 @@
+ 
+ check_vlclibs()
+ {
+-	export xineVersion=`xine-config --version 2>&1 | awk -F. '{printf ("%.2d%.2d%.2d", $1, $2, $3);}'`;
+-	if [ $xineVersion -lt 010000 ];
++	export vlcVersion=`vlc-config --version 2>&1 | awk -F. '{printf ("%.2d%.2d%.2d", $1, $2, $3);}'`;
++	if [ $vlcVersion -lt 000800 ];
+ 	then
+ 		echo "************************************************"
+ 		echo "**    Attention, vlc-lib version too low.     **"
+@@ -159,7 +159,7 @@
+ 		echo "**           http://www.videolan.org          **"
+ 		echo "************************************************"
+ 		echo "Current VLC-lib version :"
+-		echo "`xine-config --version`"
++		echo "`vlc-config --version`"
+ 		exit;
+ 	fi;
+ }
diff -ruN qdvdauthor.orig/files/patch-qdvdauthor-log.cpp qdvdauthor/files/patch-qdvdauthor-log.cpp
--- qdvdauthor.orig/files/patch-qdvdauthor-log.cpp	Wed Dec 31 17:00:00 1969
+++ qdvdauthor/files/patch-qdvdauthor-log.cpp	Thu Jan  5 19:01:04 2006
@@ -0,0 +1,11 @@
+--- qdvdauthor/log.cpp.orig	Fri Dec 30 03:27:58 2005
++++ qdvdauthor/log.cpp	Fri Dec 30 03:28:15 2005
+@@ -83,7 +83,7 @@
+   log (iLogLevel, (const char *)qsLog);
+ }
+ 
+-void Log::line (void *pObj, unsigned long iThreadID, const char *pFile, const char *pFunction, long iLine, type enLogLevel)
++void Log::line (void *pObj, pthread_t iThreadID, const char *pFile, const char *pFunction, long iLine, type enLogLevel)
+ {
+   m_cBuffer[0] = '\0';
+   if (enLogLevel < m_enLogLevel) {
diff -ruN qdvdauthor.orig/files/patch-qdvdauthor-log.h qdvdauthor/files/patch-qdvdauthor-log.h
--- qdvdauthor.orig/files/patch-qdvdauthor-log.h	Wed Dec 31 17:00:00 1969
+++ qdvdauthor/files/patch-qdvdauthor-log.h	Thu Jan  5 19:01:04 2006
@@ -0,0 +1,11 @@
+--- qdvdauthor/log.h.orig	Fri Dec 30 03:28:24 2005
++++ qdvdauthor/log.h	Fri Dec 30 03:28:35 2005
+@@ -40,7 +40,7 @@
+ 	void log (QString);
+ 	void log (type, QString);
+ 
+-	void line (void *, unsigned long, const char *, const char *, long, type);
++	void line (void *, pthread_t, const char *, const char *, long, type);
+ private:
+ 
+ 	int  m_enLogLevel;
diff -ruN qdvdauthor.orig/pkg-descr qdvdauthor/pkg-descr
--- qdvdauthor.orig/pkg-descr	Thu May 13 10:49:52 2004
+++ qdvdauthor/pkg-descr	Thu Jan  5 19:02:58 2006
@@ -1,6 +1,6 @@
 qdvdauthor is a graphical frontend to the dvd authoring program dvdauthor
 written with the QT toolkit.
 
-The program is alpha quality though still very useful.
+The program is considered beta quality at this point.
 
 WWW: http://qdvdauthor.sourceforge.net/
--- qdvdauthor.patch ends here ---


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601060216.k062GCr4021667>