Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7699d4e336de38b858b8958044a20fa2858bc30f
commit 7699d4e336de38b858b8958044a20fa2858bc30f Author: kikadf <[email protected]> Date: Sat Aug 17 18:42:07 2013 +0200 2mandvd-1.8.5-1-x86_64 * Version bump diff --git a/source/xapps-extra/2mandvd/FrugalBuild b/source/xapps-extra/2mandvd/FrugalBuild index a15e75a..eb66cc1 100644 --- a/source/xapps-extra/2mandvd/FrugalBuild +++ b/source/xapps-extra/2mandvd/FrugalBuild @@ -3,29 +3,31 @@ # Contributor: exceed <[email protected]> # Contributor: Kooda <[email protected]> +options+=('asneeded') + pkgname=2mandvd -pkgver=1.8.4 -pkgrel=3 +pkgver=1.8.5 +pkgrel=1 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.7' 'mjpegtools' 'netpbm' 'cdrtools' 'xine-lib>=1.2.2-1' 'perl' 'exif' 'libqtopengl') +depends=('libqtwebkit' 'ffmpegthumbnailer' 'sox' 'mplayer' 'mencoder' \ + 'dvdauthor>=0.7.0' '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 ffmpeg.patch) +source=(http://download.tuxfamily.org/$pkgname/2ManDVD-$pkgver.tar.gz) _F_desktop_name='2ManDVD' _F_desktop_categories='AudioVideo' _F_desktop_icon='/usr/share/2ManDVD/Interface/mandvdico.png' _F_cd_path="2ManDVD" -sha1sums=('3ed5b79e88c05159ac05cb40a39a702e3c400c79' \ - 'ad1875f10da74175d68533f3065b92c7aed5d691') +sha1sums=('7f7f1ccf34ea8df1f24f6f28be36ea61012e03bd') build() { Fcd - Fpatchall qmake 2ManDVD.pro || Fdie + Fsed 'ifdef avformat_open_input' 'if LIBAVFORMAT_VERSION_MAJOR >= 53' videowrapper.cpp make || Fdie # Install diff --git a/source/xapps-extra/2mandvd/ffmpeg.patch b/source/xapps-extra/2mandvd/ffmpeg.patch deleted file mode 100644 index fa6c831..0000000 --- a/source/xapps-extra/2mandvd/ffmpeg.patch +++ /dev/null @@ -1,45 +0,0 @@ -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
