Date: Tue, 29 Oct 2013 18:10:02 GMT From: KATO Tsuguru <tkato432@yahoo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/181064: multimedia/2mandvd: Update to version 1.8.5 Message-ID: <201310291810.r9TIA2WF021638@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/181064; it has been noted by GNATS. From: KATO Tsuguru <tkato432@yahoo.com> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/181064: multimedia/2mandvd: Update to version 1.8.5 Date: Wed, 30 Oct 2013 02:50:28 +0900 This is a multi-part message in MIME format. --Multipart=_Wed__30_Oct_2013_02_50_28_+0900_yTdtN48dQvMT008Z Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Remake of the patch against current tree. --Multipart=_Wed__30_Oct_2013_02_50_28_+0900_yTdtN48dQvMT008Z Content-Type: text/x-diff; name="multimedia_2mandvd.diff" Content-Disposition: attachment; filename="multimedia_2mandvd.diff" Content-Transfer-Encoding: 7bit diff -urN /usr/ports/multimedia/2mandvd/Makefile multimedia/2mandvd/Makefile --- /usr/ports/multimedia/2mandvd/Makefile 2013-10-14 05:19:47.000000000 +0900 +++ multimedia/2mandvd/Makefile 2013-10-30 00:00:00.000000000 +0900 @@ -2,8 +2,7 @@ # $FreeBSD: head/multimedia/2mandvd/Makefile 330227 2013-10-13 13:03:03Z makc $ PORTNAME= 2ManDVD -PORTVERSION= 1.8.4 -PORTREVISION= 1 +PORTVERSION= 1.8.5 CATEGORIES= multimedia kde MASTER_SITES= http://download.tuxfamily.org/2mandvd/ @@ -25,12 +24,13 @@ tcprobe:${PORTSDIR}/multimedia/transcode \ xine:${PORTSDIR}/multimedia/xine \ bash:${PORTSDIR}/shells/bash \ - growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ - cdrecord:${PORTSDIR}/sysutils/cdrtools + cdrecord:${PORTSDIR}/sysutils/cdrtools \ + growisofs:${PORTSDIR}/sysutils/dvd+rw-tools WRKSRC= ${WRKDIR}/${PORTNAME} -USES= perl5 qmake gmake +USES= desktop-file-utils gmake perl5 qmake:norecursive shebangfix +SHEBANG_FILES= fake.pl USE_QT4= corelib gui opengl \ linguist_build moc_build qmake_build rcc_build uic_build USE_GL= glu @@ -56,25 +56,24 @@ s|/usr/share/applications|${PREFIX}/share/applications| ; \ s|^QMAKE_|#QMAKE_|' ${WRKSRC}/2ManDVD.pro @${REINPLACE_CMD} -e \ - 's|/usr/bin/perl|${LOCALBASE}/bin/perl|' ${WRKSRC}/fake.pl - @${REINPLACE_CMD} -e \ 's|/usr/share/2ManDVD|${PREFIX}/share/pixmaps| ; \ s|/usr/bin/||' ${WRKSRC}/2ManDVD.desktop @${REINPLACE_CMD} -e \ - 's|Ne slideshow|New slidshow|' ${WRKSRC}/2mandvd_en.ts + 's|Ne slideshow|New slideshow|' ${WRKSRC}/2mandvd_en.ts pre-build: (cd ${WRKSRC} && ${LRELEASE} 2mandvd_en.ts) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/2ManDVD ${STAGEDIR}${PREFIX}/bin + (cd ${WRKSRC} && ${INSTALL_PROGRAM} 2ManDVD ${STAGEDIR}${PREFIX}/bin) @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/fake.pl ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.qm ${STAGEDIR}${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} Bibliotheque ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_SCRIPT} fake.pl ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} *.qm ${STAGEDIR}${DATADIR}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} Bibliotheque ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_DATA} ${WRKSRC}/2ManDVD.desktop ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_DATA} ${WRKSRC}/Interface/mandvdico.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps + (cd ${WRKSRC} && ${INSTALL_DATA} 2ManDVD.desktop \ + ${STAGEDIR}${DESKTOPDIR}) + (cd ${WRKSRC}/Interface && ${INSTALL_DATA} mandvdico.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps) .include <bsd.port.mk> diff -urN /usr/ports/multimedia/2mandvd/distinfo multimedia/2mandvd/distinfo --- /usr/ports/multimedia/2mandvd/distinfo 2013-08-16 17:35:16.000000000 +0900 +++ multimedia/2mandvd/distinfo 2013-10-30 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (2ManDVD-1.8.4.tar.gz) = b74e8a62b4e396c4cbb1db2864d77c87ea45f74bb599f4f270608d9e7f91888c -SIZE (2ManDVD-1.8.4.tar.gz) = 29523342 +SHA256 (2ManDVD-1.8.5.tar.gz) = 19c3c02123684220e77b3baa12f37b6feb5ecb523c504c65d306c75136191873 +SIZE (2ManDVD-1.8.5.tar.gz) = 29525071 diff -urN /usr/ports/multimedia/2mandvd/files/patch-videowrapper.cpp multimedia/2mandvd/files/patch-videowrapper.cpp --- /usr/ports/multimedia/2mandvd/files/patch-videowrapper.cpp 2013-10-29 19:45:14.000000000 +0900 +++ multimedia/2mandvd/files/patch-videowrapper.cpp 2013-10-30 00:00:00.000000000 +0900 @@ -10,12 +10,12 @@ if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0) { #else -@@ -90,7 +90,7 @@ +@@ -91,7 +91,7 @@ // *** OUVERTURE DU CODEC *** -- if(avcodec_open(pCodecCtx, pCodec)<0) -+ if(avcodec_open2(pCodecCtx, pCodec, NULL)<0) +- #ifdef av_find_stream_info ++ #if 0 + if(avcodec_open(pCodecCtx, pCodec)<0) { - qDebug() << "CAN'T FIND VIDEO CODEC"; - return 1; + #else diff -urN /usr/ports/multimedia/2mandvd/files/patch-videowrapper.h multimedia/2mandvd/files/patch-videowrapper.h --- /usr/ports/multimedia/2mandvd/files/patch-videowrapper.h 2013-08-16 17:35:16.000000000 +0900 +++ multimedia/2mandvd/files/patch-videowrapper.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,10 +0,0 @@ ---- videowrapper.h.orig -+++ videowrapper.h -@@ -11,6 +11,7 @@ - #include <libavutil/common.h> - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> -+ #include <libavutil/mathematics.h> - #include <libswscale/swscale.h> - } - --Multipart=_Wed__30_Oct_2013_02_50_28_+0900_yTdtN48dQvMT008Z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310291810.r9TIA2WF021638>