Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=5ccb3eddaf4860a067eb6bac08842afdfa09874c
commit 5ccb3eddaf4860a067eb6bac08842afdfa09874c Author: James Buren <[email protected]> Date: Mon Oct 29 05:53:58 2012 -0500 2mandvd-1.8.4-3-x86_64 * rebuild with ffmpeg diff --git a/source/xapps-extra/2mandvd/FrugalBuild b/source/xapps-extra/2mandvd/FrugalBuild index e44d3fd..a15e75a 100644 --- a/source/xapps-extra/2mandvd/FrugalBuild +++ b/source/xapps-extra/2mandvd/FrugalBuild @@ -5,24 +5,26 @@ pkgname=2mandvd pkgver=1.8.4 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to easily make video DVDs" url="http://2mandvd.tuxfamily.org/"; depends=('libqtwebkit' 'webkit' 'ffmpegthumbnailer' 'sox' 'mplayer' 'mencoder' 'dvdauthor>=0.7.0' \ - 'transcode>=1.1.5' 'mjpegtools' 'netpbm' 'cdrtools' 'xine-lib>=1.2.1-1' 'perl' 'exif' 'libqtopengl') + 'transcode>=1.1.7' 'mjpegtools' 'netpbm' 'cdrtools' 'xine-lib>=1.2.2-1' 'perl' 'exif' 'libqtopengl') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.tuxfamily.org/2mandvd/ | sed 's|2ManDVD|2mandvd|g' | Flasttar" -source=(http://download.tuxfamily.org/$pkgname/2ManDVD-$pkgver.tar.gz) +source=(http://download.tuxfamily.org/$pkgname/2ManDVD-$pkgver.tar.gz ffmpeg.patch) _F_desktop_name='2ManDVD' _F_desktop_categories='AudioVideo' _F_desktop_icon='/usr/share/2ManDVD/Interface/mandvdico.png' _F_cd_path="2ManDVD" -sha1sums=('3ed5b79e88c05159ac05cb40a39a702e3c400c79') +sha1sums=('3ed5b79e88c05159ac05cb40a39a702e3c400c79' \ + 'ad1875f10da74175d68533f3065b92c7aed5d691') build() { Fcd + Fpatchall qmake 2ManDVD.pro || Fdie make || Fdie @@ -39,3 +41,5 @@ build() Fdesktop2 } + +# optimization OK diff --git a/source/xapps-extra/2mandvd/ffmpeg.patch b/source/xapps-extra/2mandvd/ffmpeg.patch new file mode 100644 index 0000000..fa6c831 --- /dev/null +++ b/source/xapps-extra/2mandvd/ffmpeg.patch @@ -0,0 +1,45 @@ +diff -ur a/videowrapper.cpp b/videowrapper.cpp +--- a/videowrapper.cpp 2012-10-28 22:26:28.227203734 -0500 ++++ b/videowrapper.cpp 2012-10-29 05:46:47.230377249 -0500 +@@ -31,36 +31,25 @@ + { + av_free_packet(&packet); + avcodec_close(pCodecCtx); +- av_close_input_file(pFormatCtx); +- //avformat_close_input(&pFormatCtx); ++ //av_close_input_file(pFormatCtx); ++ avformat_close_input(&pFormatCtx); + } + + int videowrapper::load_video(QString filename) + { + // *** OUVERTURE DU FICHIER VIDEO *** +- #ifdef avformat_open_input +- if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0) +- { +- #else +- if (av_open_input_file(&pFormatCtx,filename.toAscii().data(),NULL,0,NULL)!=0) +- { +- #endif ++ if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0) ++ { + qDebug() << "CAN'T OPEN VIDEO FILE : " << filename; + return 1; + } + + // *** RECUPERATION DES INFORMATIONS DU MEDIA *** +- if(av_find_stream_info(pFormatCtx)<0) +- { ++ if (avformat_find_stream_info(pFormatCtx, NULL) < 0) { + qDebug() << "CAN'T READ INFORMATION FROM VIDEO FILE : " << filename; + return 1; + } + +- /*if (avformat_find_stream_info(pFormatCtx, NULL) < 0) { +- qDebug() << "CAN'T READ INFORMATION FROM VIDEO FILE : " << filename; +- return 1; +- }*/ +- + // *** RECHERCHE STREAM VIDEO *** + + videoStream=-1; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
