Date: Fri, 21 Oct 2005 18:09:20 -0600 (MDT) From: Phil Oleson <oz@nixil.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/87823: [maintainer-update] multimedia/qdvdauthor update to 0.0.10 Message-ID: <200510220009.j9M09KVP073102@nixil.net> Resent-Message-ID: <200510220010.j9M0AJ3P024169@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87823
>Category: ports
>Synopsis: [maintainer-update] multimedia/qdvdauthor update to 0.0.10
>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: Sat Oct 22 00:10:19 GMT 2005
>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 #42: Tue Jun 21 10:33:20 MDT 2005 root@fc2:/usr/src/sys/compile/nixil i386
>Description:
Upgrade qdvdauthor to 0.0.10.
>How-To-Repeat:
.
>Fix:
patch deletes all patch-files in the files directory as they
were integrated into upstream source.
--- patch-qdvdauthor begins here ---
diff -ruN qdvdauthor.orig/Makefile qdvdauthor/Makefile
--- qdvdauthor.orig/Makefile Fri Oct 21 17:55:28 2005
+++ qdvdauthor/Makefile Fri Sep 23 17:03:14 2005
@@ -6,8 +6,7 @@
#
PORTNAME= qdvdauthor
-PORTVERSION= 0.0.9
-PORTREVISION= 2
+PORTVERSION= 0.0.10
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -ruN qdvdauthor.orig/distinfo qdvdauthor/distinfo
--- qdvdauthor.orig/distinfo Fri Oct 21 17:55:28 2005
+++ qdvdauthor/distinfo Fri Sep 23 17:03:41 2005
@@ -1,2 +1,2 @@
-MD5 (qdvdauthor-0.0.9.tar.gz) = 465d888ef6f29162fe9b36ff8c49791c
-SIZE (qdvdauthor-0.0.9.tar.gz) = 913252
+MD5 (qdvdauthor-0.0.10.tar.gz) = da494965fb5ed14037acdbdf75af0857
+SIZE (qdvdauthor-0.0.10.tar.gz) = 1168130
diff -ruN qdvdauthor.orig/files/patch-configure qdvdauthor/files/patch-configure
--- qdvdauthor.orig/files/patch-configure Fri Oct 21 17:55:28 2005
+++ qdvdauthor/files/patch-configure Wed Dec 31 17:00:00 1969
@@ -1,36 +0,0 @@
---- configure.orig Sat Feb 12 22:46:49 2005
-+++ configure Mon Feb 14 20:39:36 2005
-@@ -295,20 +295,20 @@
- esac;
- done;
- # Sanity check to make sure we have at least one media library ...
-- if [ $WITH_MPLAYER_SUPPORT$WITH_VLC_SUPPORT$WITH_XINE_SUPPORT == "000" ];
-+ if [ $WITH_MPLAYER_SUPPORT$WITH_VLC_SUPPORT$WITH_XINE_SUPPORT -eq "000" ];
- then
- export WITH_XINE_SUPPORT=1
- fi;
- # Here we check for xine, or mplayer
-- if [ $WITH_XINE_SUPPORT == 1 ];
-+ if [ $WITH_XINE_SUPPORT -eq 1 ];
- then
- check_xinelibs;
- fi;
-- if [ $WITH_VLC_SUPPORT == 1 ];
-+ if [ $WITH_VLC_SUPPORT -eq 1 ];
- then
- check_vlclibs;
- fi;
-- if [ $WITH_MPLAYER_SUPPORT == 1 ];
-+ if [ $WITH_MPLAYER_SUPPORT -eq 1 ];
- then
- check_mplayerlibs;
- fi;
-@@ -316,7 +316,7 @@
- # Next we write CONFIG.h
- echo "#ifndef CONFIG_H" > qdvdauthor/CONFIG.h
- echo "#define CONFIG_H" >> qdvdauthor/CONFIG.h
-- echo "#define PREFIX_DIRECTORY $PREFIX" >> qdvdauthor/CONFIG.h
-+ echo "#define PREFIX_DIRECTORY \"$PREFIX\"" >> qdvdauthor/CONFIG.h
- echo "#endif // CONFIG_H" >> qdvdauthor/CONFIG.h
-
-
diff -ruN qdvdauthor.orig/files/patch-qdvdauthor-qdvdauthor.pro qdvdauthor/files/patch-qdvdauthor-qdvdauthor.pro
--- qdvdauthor.orig/files/patch-qdvdauthor-qdvdauthor.pro Fri Oct 21 17:55:28 2005
+++ qdvdauthor/files/patch-qdvdauthor-qdvdauthor.pro Wed Dec 31 17:00:00 1969
@@ -1,22 +0,0 @@
---- qdvdauthor/qdvdauthor.pro.orig Mon Feb 14 20:40:21 2005
-+++ qdvdauthor/qdvdauthor.pro Mon Feb 14 20:40:39 2005
-@@ -29,19 +29,6 @@
- isEmpty(WHICH_PREFIX) {
- WHICH_PREFIX = /usr
- }
--# Here we create CONFIG.h according to the set-up ...
--system (echo -e '\x23ifndef CONFIG_H' > CONFIG.h )
--system (echo -e '\x23define CONFIG_H' >> CONFIG.h )
--system (echo -e '\x23define PREFIX_DIRECTORY "$$WHICH_PREFIX"' >> CONFIG.h )
--system (echo -e '\x23endif // CONFIG_H' >> CONFIG.h )
--
--# Next we create the MEDIA_CONFIG.h - file
--system (echo -e '\x23ifndef MEDIA_CONFIG_H' > qplayer/MEDIA_CONFIG.h )
--system (echo -e '\x23define MEDIA_CONFIG_H' >> qplayer/MEDIA_CONFIG.h )
--contains ( HAS_MPLAYER_SUPPORT, 1 ) { system (echo -e '\x23define MPLAYER_SUPPORT $$(WITH_MPLAYER_SUPPORT)' >> qplayer/MEDIA_CONFIG.h ) }
--contains ( HAS_XINE_SUPPORT, 1 ) { system (echo -e '\x23define XINE_SUPPORT $$(WITH_XINE_SUPPORT)' >> qplayer/MEDIA_CONFIG.h ) }
--contains ( HAS_VLC_SUPPORT, 1 ) { system (echo -e '\x23define VLC_SUPPORT $$(WITH_VLC_SUPPORT)' >> qplayer/MEDIA_CONFIG.h ) }
--system (echo -e '\x23endif // MEDIA_CONFIG_H' >> qplayer/MEDIA_CONFIG.h )
-
- SOURCES += main.cpp\
- utils.cpp \
diff -ruN qdvdauthor.orig/files/patch-qdvdauthor-qplayer-engines-qxinewidget.h qdvdauthor/files/patch-qdvdauthor-qplayer-engines-qxinewidget.h
--- qdvdauthor.orig/files/patch-qdvdauthor-qplayer-engines-qxinewidget.h Fri Oct 21 17:55:28 2005
+++ qdvdauthor/files/patch-qdvdauthor-qplayer-engines-qxinewidget.h Wed Dec 31 17:00:00 1969
@@ -1,10 +0,0 @@
---- qdvdauthor/qplayer/engines/qxinewidget.h.orig Wed Feb 16 02:14:23 2005
-+++ qdvdauthor/qplayer/engines/qxinewidget.h Wed Feb 16 02:15:10 2005
-@@ -31,6 +31,7 @@
- #include <qtimer.h>
- #include <qevent.h>
- #include <qthread.h>
-+#include <pthread.h>
-
- #include <xine.h>
-
diff -ruN qdvdauthor.orig/files/patch-qdvdauthor-qplayer-mediacreator.cpp qdvdauthor/files/patch-qdvdauthor-qplayer-mediacreator.cpp
--- qdvdauthor.orig/files/patch-qdvdauthor-qplayer-mediacreator.cpp Fri Oct 21 17:55:28 2005
+++ qdvdauthor/files/patch-qdvdauthor-qplayer-mediacreator.cpp Wed Dec 31 17:00:00 1969
@@ -1,20 +0,0 @@
---- qdvdauthor/qplayer/mediacreator.cpp.orig Mon Feb 14 20:53:57 2005
-+++ qdvdauthor/qplayer/mediacreator.cpp Mon Feb 14 20:53:59 2005
-@@ -189,7 +189,7 @@
- pParent = pParent;
- pName = pName;
- pExistingEngine = pExistingEngine;
--#ifdef VLC_SUPPORT
-+#if (VLC_SUPPORT == 1)
- pMediaInterface = (MediaInterface *) new VLCWidget (pParent, "VLCPart", pExistingEngine);
- #endif
- return pMediaInterface;
-@@ -206,7 +206,7 @@
- if (m_qsPreferredEngine == "QMPlayerWidget")
- pInfo = (MediaInfo *) new MPlayerInfo (pVoid);
- #endif
--#ifdef VLC_SUPPORT
-+#if (VLC_SUPPORT == 1)
- if (m_qsPreferredEngine == "VLCWidget")
- pInfo = (MediaInfo *) new VLCInfo (pVoid);
- #endif
diff -ruN qdvdauthor.orig/files/patch-qdvdauthor-qplayer-qplayer.pro qdvdauthor/files/patch-qdvdauthor-qplayer-qplayer.pro
--- qdvdauthor.orig/files/patch-qdvdauthor-qplayer-qplayer.pro Fri Oct 21 17:55:28 2005
+++ qdvdauthor/files/patch-qdvdauthor-qplayer-qplayer.pro Wed Dec 31 17:00:00 1969
@@ -1,19 +0,0 @@
---- qdvdauthor/qplayer/qplayer.pro.orig Mon Feb 14 20:41:59 2005
-+++ qdvdauthor/qplayer/qplayer.pro Mon Feb 14 20:42:05 2005
-@@ -25,16 +25,6 @@
- CREATE_MEDIA_CONFIG = 1
- }
-
--# So the question is if we should create the MEDIA_CONFIG.h - file ?
--contains (CREATE_MEDIA_CONFIG, 1) {
--system (echo -e '\x23ifndef MEDIA_CONFIG_H' > MEDIA_CONFIG.h )
--system (echo -e '\x23define MEDIA_CONFIG_H' >> MEDIA_CONFIG.h )
--contains ( HAS_MPLAYER_SUPPORT, 1 ) { system (echo -e '\x23define MPLAYER_SUPPORT $$(WITH_MPLAYER_SUPPORT)' >> MEDIA_CONFIG.h ) }
--contains ( HAS_XINE_SUPPORT, 1 ) { system (echo -e '\x23define XINE_SUPPORT $$(WITH_XINE_SUPPORT)' >> MEDIA_CONFIG.h ) }
--contains ( HAS_VLC_SUPPORT, 1 ) { system (echo -e '\x23define VLC_SUPPORT $$(WITH_VLC_SUPPORT)' >> MEDIA_CONFIG.h ) }
--system (echo -e '\x23endif // MEDIA_CONFIG_H' >> MEDIA_CONFIG.h )
--}
--
- DISTFILES = README
-
- SOURCES += qplayer.cpp \
--- patch-qdvdauthor ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510220009.j9M09KVP073102>