Bug 181064 - multimedia/2mandvd: Update to version 1.8.5
Summary: multimedia/2mandvd: Update to version 1.8.5
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-08-05 19:10 UTC by tkato432
Modified: 2013-11-01 23:40 UTC (History)
0 users

See Also:


Attachments
file.diff (2.97 KB, patch)
2013-08-05 19:10 UTC, tkato432
no flags Details | Diff
multimedia_xine.diff (1.62 KB, patch)
2013-08-16 18:59 UTC, tkato432
no flags Details | Diff
multimedia_2mandvd.diff (2.97 KB, patch)
2013-09-03 18:57 UTC, tkato432
no flags Details | Diff
multimedia_xine.diff (1.64 KB, patch)
2013-09-03 18:57 UTC, tkato432
no flags Details | Diff
multimedia_2mandvd.diff (3.92 KB, patch)
2013-10-14 18:50 UTC, tkato432
no flags Details | Diff
multimedia_2mandvd.diff (4.38 KB, patch)
2013-10-29 17:50 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-08-05 19:10:03 UTC
- Update to version 1.8.5
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-08-05 19:11:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-08-14 09:45:27 UTC
State Changed
From-To: open->feedback

plist broken https://po.miwibox.org/latest-per-pkg/2ManDVD/1.8.5/
Comment 3 tkato432 2013-08-16 18:59:38 UTC
It seems that error is caused by external ports which lack
required dependency for desktop-file-utils. In this case,
multimedia/xine has to be updated to add missing
USES=desktop-file-utils.
Comment 4 tkato432 2013-09-03 18:57:27 UTC
Remake of the patch against current tree.
Comment 5 Bryan Drewery freebsd_committer freebsd_triage 2013-09-22 15:13:26 UTC
Responsible Changed
From-To: miwi->freebsd-ports-bugs

Back to the heap due to timeout
Comment 6 tkato432 2013-10-14 18:50:36 UTC
Remake of the patch against current tree.
Comment 7 tkato432 2013-10-29 17:50:28 UTC
Remake of the patch against current tree.
Comment 8 Pawel Pekala freebsd_committer freebsd_triage 2013-11-01 22:10:16 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 9 dfilter service freebsd_committer freebsd_triage 2013-11-01 23:30:05 UTC
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 <tkato432@yahoo.com>

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 <bsd.port.mk>

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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 10 Pawel Pekala freebsd_committer freebsd_triage 2013-11-01 23:30:24 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!