Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Aug 2013 02:54:44 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/181064: multimedia/2mandvd: Update to version 1.8.5
Message-ID:  <20130806025444.47217e072f913e2a7d0ad258@yahoo.com>
Resent-Message-ID: <201308051810.r75IA3ER020181@freefall.freebsd.org>

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

>Number:         181064
>Category:       ports
>Synopsis:       multimedia/2mandvd: Update to version 1.8.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 05 18:10:03 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.8.5

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/multimedia/2mandvd/Makefile multimedia/2mandvd/Makefile
--- /usr/ports/multimedia/2mandvd/Makefile	2013-08-04 00:14:33.000000000 +0900
+++ multimedia/2mandvd/Makefile	2013-08-06 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
 # $FreeBSD: head/multimedia/2mandvd/Makefile 324191 2013-08-03 13:44:00Z mat $
 
 PORTNAME=	2ManDVD
-PORTVERSION=	1.8.4
-PORTREVISION=	1
+PORTVERSION=	1.8.5
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://download.tuxfamily.org/2mandvd/
 
@@ -25,18 +24,18 @@
 		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
+USES=		desktop-file-utils gmake perl5 shebangfix
+SHEBANG_FILES=	fake.pl
 USE_QT4=	corelib gui opengl \
 		linguist_build moc_build qmake_build rcc_build uic_build
 USE_GL=		glu
 USE_SDL=	sdl
 USE_PERL5=	run
-USE_GMAKE=	yes
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
 DATADIR=	${PREFIX}/share/2ManDVD
@@ -58,12 +57,10 @@
 		 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
 
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
diff -urN /usr/ports/multimedia/2mandvd/distinfo multimedia/2mandvd/distinfo
--- /usr/ports/multimedia/2mandvd/distinfo	2013-06-21 03:47:37.000000000 +0900
+++ multimedia/2mandvd/distinfo	2013-08-06 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-06-21 03:47:37.000000000 +0900
+++ multimedia/2mandvd/files/patch-videowrapper.cpp	2013-08-06 00:00:00.000000000 +0900
@@ -1,6 +1,17 @@
 --- videowrapper.cpp.orig
 +++ videowrapper.cpp
-@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper()
+@@ -31,14 +31,17 @@
+ {
+     av_free_packet(&packet);
+     avcodec_close(pCodecCtx);
+-    //av_close_input_file(pFormatCtx);
++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,5,0)
+     avformat_close_input(&pFormatCtx);
++#else
++    av_close_input_file(pFormatCtx);
++#endif
+ }
+ 
  int videowrapper::load_video(QString filename)
  {
      // *** OUVERTURE DU FICHIER VIDEO ***
>Release-Note:
>Audit-Trail:
>Unformatted:



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