diff -u mplayerthumbs-1.2-kde4.3.0/debian/changelog mplayerthumbs-1.2-kde4.3.0/debian/changelog --- mplayerthumbs-1.2-kde4.3.0/debian/changelog +++ mplayerthumbs-1.2-kde4.3.0/debian/changelog @@ -1,3 +1,11 @@ +mplayerthumbs (1.2-kde4.3.0-0ubuntu2) karmic; urgency=low + + * Add kubuntu_02_mplayer_default_backend.diff to make mplayer the default + backend because kde phonon one doesn't exist since we build phonon from Qt + * Bump Standards-Version to 3.8.3 and kdelib5-dev to 4:4.3.0 + + -- Alessandro Ghersi Tue, 01 Sep 2009 04:48:05 +0200 + mplayerthumbs (1.2-kde4.3.0-0ubuntu1) karmic; urgency=low * New upstream release diff -u mplayerthumbs-1.2-kde4.3.0/debian/control mplayerthumbs-1.2-kde4.3.0/debian/control --- mplayerthumbs-1.2-kde4.3.0/debian/control +++ mplayerthumbs-1.2-kde4.3.0/debian/control @@ -3,8 +3,8 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Cyril Breuil -Build-Depends: cdbs, debhelper (>= 7), quilt, kdelibs5-dev (>= 4:4.2.85) -Standards-Version: 3.8.2 +Build-Depends: cdbs, debhelper (>= 7), quilt, kdelibs5-dev (>= 4:4.3.0) +Standards-Version: 3.8.3 Homepage: http://kde-apps.org/content/show.php?content=41180 Package: mplayerthumbs diff -u mplayerthumbs-1.2-kde4.3.0/debian/patches/series mplayerthumbs-1.2-kde4.3.0/debian/patches/series --- mplayerthumbs-1.2-kde4.3.0/debian/patches/series +++ mplayerthumbs-1.2-kde4.3.0/debian/patches/series @@ -1,0 +2 @@ +kubuntu_02_mplayer_default_backend.diff only in patch2: unchanged: --- mplayerthumbs-1.2-kde4.3.0.orig/debian/patches/kubuntu_02_mplayer_default_backend.diff +++ mplayerthumbs-1.2-kde4.3.0/debian/patches/kubuntu_02_mplayer_default_backend.diff @@ -0,0 +1,68 @@ +Index: mplayerthumbs-1.2-kde4.3.0/src/mplayervideobackend.cpp +=================================================================== +--- mplayerthumbs-1.2-kde4.3.0.orig/src/mplayervideobackend.cpp 2009-09-01 04:39:49.939215333 +0200 ++++ mplayerthumbs-1.2-kde4.3.0/src/mplayervideobackend.cpp 2009-09-01 04:40:42.280965106 +0200 +@@ -99,7 +99,7 @@ + + + MPlayerVideoBackend::~MPlayerVideoBackend() { +- foreach(ArgsCalculator *argsCalculator, seekArguments.values()) delete argsCalculator; ++ foreach(ArgsCalculator *argsCalculator, seekArguments) delete argsCalculator; + delete mplayerprocess; + tryUnlink(tmpdir); + delete tmpdir; +@@ -121,8 +121,12 @@ + KMD5 md5builder(previewingFile->getFilePath().toLatin1() ); + QString md5file=md5builder.hexDigest().data(); + QString tmpDirPath = tmpdir->name() + md5file + QDir::separator(); +- args << "-nocache" << "-idx" /*@TODO check if it's too slow..*/ << "-ao" << "null"/*"-nosound" << */<< "-speed" << "99" /*<< "-sstep" << "5"*/ +- << "-vo" << QString("jpeg:outdir=%1").arg(tmpDirPath ) << "-vf" << QString("scale=%1:%2").arg(scalingWidth).arg(scalingHeight); ++ args << "-nocache" ++ // << "-idx" /*@TODO check if it's too slow..*/ Update: probably yes... ++ << "-ao" << "null"/*"-nosound" << */<< "-speed" << "99" /*<< "-sstep" << "5"*/ ++ << "-vo" << QString("jpeg:outdir=%1").arg(tmpDirPath ) ++// << "-vf" << QString("scale=%1:%2").arg(scalingWidth).arg(scalingHeight) // This is probably just a waste of resources, as KDE API suggests to not scale the image. ++ ; + args+=customargs; + + if (! startAndWaitProcess(args) ) return NULL; +@@ -182,5 +186,3 @@ + bool MPlayerVideoBackend::playerCannotPreview() { + return ! findPlayerBin(); + } +- +- +Index: mplayerthumbs-1.2-kde4.3.0/src/servicesfactory.cpp +=================================================================== +--- mplayerthumbs-1.2-kde4.3.0.orig/src/servicesfactory.cpp 2009-09-01 04:40:59.250215263 +0200 ++++ mplayerthumbs-1.2-kde4.3.0/src/servicesfactory.cpp 2009-09-01 04:41:24.784965517 +0200 +@@ -37,16 +37,19 @@ + VideoBackendIFace *ServicesFactory::videoBackend(PreviewingFile* previewingFile, MPlayerThumbsCfg* cfg) { + kDebug(DBG_AREA) << "videopreview: backend: " << cfg->backend() << endl; + switch(cfg->backend() ) { +- case VideoBackendIFace::MPlayer: +- kDebug(DBG_AREA) << "videopreview: Selected mplayer backend\n"; +- return new MPlayerVideoBackend(previewingFile, cfg); +- break; + #ifdef PHONON_API + case VideoBackendIFace::Phonon: + kDebug(DBG_AREA) << "videopreview: Selected phonon backend\n"; + return new PhononBackend(previewingFile, cfg); + break; ++ case VideoBackendIFace::MPlayer: ++#else ++ #warning using mplayer as only backend ++ default: + #endif ++ kDebug(DBG_AREA) << "videopreview: Selected mplayer backend\n"; ++ return new MPlayerVideoBackend(previewingFile, cfg); ++ break; + } + // Well, we should never be here... + return NULL; +@@ -59,5 +62,3 @@ + ServicesFactory::~ServicesFactory() { + + } +- +-