From owner-svn-ports-all@FreeBSD.ORG Fri Nov 1 23:29:58 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3EB9972E; Fri, 1 Nov 2013 23:29:58 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 295F12058; Fri, 1 Nov 2013 23:29:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1NTwpt002108; Fri, 1 Nov 2013 23:29:58 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1NTvFu002105; Fri, 1 Nov 2013 23:29:57 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201311012329.rA1NTvFu002105@svn.freebsd.org> From: Pawel Pekala Date: Fri, 1 Nov 2013 23:29:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332425 - in head/multimedia/2mandvd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 23:29:58 -0000 Author: pawel Date: Fri Nov 1 23:29:57 2013 New Revision: 332425 URL: http://svnweb.freebsd.org/changeset/ports/332425 Log: - Update to version 1.8.5 - Support staging PR: ports/181064 Submitted by: KATO Tsuguru Deleted: head/multimedia/2mandvd/files/patch-videowrapper.h Modified: head/multimedia/2mandvd/Makefile head/multimedia/2mandvd/distinfo head/multimedia/2mandvd/files/patch-videowrapper.cpp Modified: head/multimedia/2mandvd/Makefile ============================================================================== --- head/multimedia/2mandvd/Makefile Fri Nov 1 23:28:31 2013 (r332424) +++ head/multimedia/2mandvd/Makefile Fri Nov 1 23:29:57 2013 (r332425) @@ -2,8 +2,7 @@ # $FreeBSD$ 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 @@ RUN_DEPENDS= sox:${PORTSDIR}/audio/sox \ 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 @@ post-patch: 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 Modified: head/multimedia/2mandvd/distinfo ============================================================================== --- head/multimedia/2mandvd/distinfo Fri Nov 1 23:28:31 2013 (r332424) +++ head/multimedia/2mandvd/distinfo Fri Nov 1 23:29:57 2013 (r332425) @@ -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 Modified: head/multimedia/2mandvd/files/patch-videowrapper.cpp ============================================================================== --- head/multimedia/2mandvd/files/patch-videowrapper.cpp Fri Nov 1 23:28:31 2013 (r332424) +++ head/multimedia/2mandvd/files/patch-videowrapper.cpp Fri Nov 1 23:29:57 2013 (r332425) @@ -10,12 +10,12 @@ diff -urN videowrapper.cpp videowrapper. 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