Date: Fri, 4 Oct 2013 16:20:34 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329335 - in head/multimedia/dvbcut: . files Message-ID: <201310041620.r94GKYqS080943@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se (src committer) Date: Fri Oct 4 16:20:34 2013 New Revision: 329335 URL: http://svnweb.freebsd.org/changeset/ports/329335 Log: Fix build on -CURRENT. Added: head/multimedia/dvbcut/files/patch-avframe.cpp (contents, props changed) head/multimedia/dvbcut/files/patch-main.cpp (contents, props changed) Deleted: head/multimedia/dvbcut/files/patch-src_Makefile.in Modified: head/multimedia/dvbcut/Makefile head/multimedia/dvbcut/files/patch-src_playaudio.cpp head/multimedia/dvbcut/files/use-qt4.diff.bz2 Modified: head/multimedia/dvbcut/Makefile ============================================================================== --- head/multimedia/dvbcut/Makefile Fri Oct 4 16:14:27 2013 (r329334) +++ head/multimedia/dvbcut/Makefile Fri Oct 4 16:20:34 2013 (r329335) @@ -22,7 +22,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GCC= any USES= cmake -USE_QT4= gui qt3support xml moc_build qmake_build rcc_build uic_build +USE_QT4= gui qt3support xml moc_build qmake_build rcc_build uic_build CXXFLAGS+= -I${PREFIX}/include \ -I${PREFIX}/include/libavcodec \ -I${PREFIX}/include/libavformat \ @@ -32,8 +32,6 @@ MAN1= dvbcut.1 PLIST_FILES= bin/dvbcut NO_STAGE= yes -#post-extract: -# ${RM} ${WRKSRC}/src/mplayererrorbase.h pre-patch: cd ${WRKSRC} && ${BZCAT} ${FILESDIR}/use-qt4.diff.bz2 | ${PATCH} -p2 Added: head/multimedia/dvbcut/files/patch-avframe.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvbcut/files/patch-avframe.cpp Fri Oct 4 16:20:34 2013 (r329335) @@ -0,0 +1,10 @@ +--- src/avframe.cpp.orig 2011-04-22 23:51:29.000000000 +0200 ++++ src/avframe.cpp 2013-10-04 11:04:43.876355112 +0200 +@@ -18,6 +18,7 @@ + + /* $Id: avframe.cpp 141 2009-01-09 17:53:48Z too-tired $ */ + ++#include <sys/types.h> + #include <qimage.h> + #include <cstdlib> + #include <cstdio> Added: head/multimedia/dvbcut/files/patch-main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvbcut/files/patch-main.cpp Fri Oct 4 16:20:34 2013 (r329335) @@ -0,0 +1,10 @@ +--- /usr/work/usr/svn/ports/head/multimedia/dvbcut/work/dvbcut-0.6.1/src/main.cpp~ 2011-04-22 23:51:29.000000000 +0200 ++++ /usr/work/usr/svn/ports/head/multimedia/dvbcut/work/dvbcut-0.6.1/src/main.cpp 2013-10-04 11:10:52.016225398 +0200 +@@ -21,6 +21,7 @@ + #include <cstring> + #include <cstdlib> + #include <cstdio> ++#include <unistd.h> + #include <cerrno> + #include <clocale> + #include <string> Modified: head/multimedia/dvbcut/files/patch-src_playaudio.cpp ============================================================================== --- head/multimedia/dvbcut/files/patch-src_playaudio.cpp Fri Oct 4 16:14:27 2013 (r329334) +++ head/multimedia/dvbcut/files/patch-src_playaudio.cpp Fri Oct 4 16:20:34 2013 (r329335) @@ -1,6 +1,14 @@ --- src/playaudio.cpp.orig 2010-06-06 16:19:25.000000000 +0200 -+++ src/playaudio.cpp 2010-06-06 16:19:47.000000000 +0200 -@@ -55,6 +55,7 @@ public: ++++ src/playaudio.cpp 2013-10-03 13:56:54.373309704 +0200 +@@ -19,6 +19,7 @@ + /* $Id: playaudio.cpp 58 2007-07-23 07:03:07Z too-tired $ */ + + #include <stdint.h> ++#include <string.h> + #include <algorithm> + #include <string> + #include <sstream> +@@ -55,6 +56,7 @@ ao_sample_format format; Modified: head/multimedia/dvbcut/files/use-qt4.diff.bz2 ============================================================================== Binary file (source and/or target). No diff available.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310041620.r94GKYqS080943>