diff options
| -rw-r--r-- | kde-base/mplayerthumbs/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/mplayerthumbs/files/mplayerthumbs-4.2.85-phonon.patch | 96 | ||||
| -rw-r--r-- | kde-base/mplayerthumbs/mplayerthumbs-4.2.85.ebuild | 5 |
3 files changed, 103 insertions, 1 deletions
diff --git a/kde-base/mplayerthumbs/Manifest b/kde-base/mplayerthumbs/Manifest index 8b642216b7e..098a016ce57 100644 --- a/kde-base/mplayerthumbs/Manifest +++ b/kde-base/mplayerthumbs/Manifest @@ -1,5 +1,6 @@ +AUX mplayerthumbs-4.2.85-phonon.patch 3362 RMD160 94c135175df68b5eb944c52293c050b6bf78df21 SHA1 a04ab5a61f94767e3ca9df7b179d4668579e425a SHA256 3ad6e69f5a952990c5600fe6cde3bbba620ea2b8a080ac7443fdf62c6679248e DIST kdemultimedia-4.2.85.tar.bz2 1576756 RMD160 1c036756070244198f4575c7baf16609da7d50b4 SHA1 a69b6c2dc2cfe95d1ce293aecd34cfaa29387c04 SHA256 a0f5b433b9d054e1e55743cc4dcb7056a7cf4a6a6f6038dbd24b2ffa2cb090e2 -EBUILD mplayerthumbs-4.2.85.ebuild 661 RMD160 6ea4aae0d476bdfbcafdb6c898ddbc44d2456bf8 SHA1 a2f49f3c6214b3be3fa9020aadba39080f9fdc84 SHA256 05cf69ba5c73a9b48f4fd16dd6669143d3ea930c3950726868898638a6ac3b5a +EBUILD mplayerthumbs-4.2.85.ebuild 724 RMD160 f1a0ef97e80f0b2b8e0e95101ebc022fe4ac46cf SHA1 f5b8bad6dd0a4f4963e3f5896cadf8aa20f2add2 SHA256 94c7ee3ed5eccd4b09d95a0813d1b261872a42159b042d4a282c1ecbfb16af4d EBUILD mplayerthumbs-9999.ebuild 692 RMD160 d8dba03c643049b90ac8a66722af722d465c4019 SHA1 00c5f7a6e3ad87384b9761d417cc1e9df4258f3b SHA256 51aa1368220e7c96406ccf7ab98c2495bdedc1f64ea9c50453ff4aed30df7b0d MISC ChangeLog 274 RMD160 d0b13dd48188a7f45ed76b8147b20f4df02d9bb4 SHA1 25245623f2320c455fa82b87215b2f09f8479f80 SHA256 8612a57e5567c5b566a8d17080b5c09aeb1add8c28278d7aa3ffd805921f263b MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/mplayerthumbs/files/mplayerthumbs-4.2.85-phonon.patch b/kde-base/mplayerthumbs/files/mplayerthumbs-4.2.85-phonon.patch new file mode 100644 index 00000000000..a79a2f5e5c3 --- /dev/null +++ b/kde-base/mplayerthumbs/files/mplayerthumbs-4.2.85-phonon.patch @@ -0,0 +1,96 @@ +--- tags/KDE/4.2.85/kdemultimedia/mplayerthumbs/src/mplayerthumbs-config.h.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ tags/KDE/4.2.85/kdemultimedia/mplayerthumbs/src/mplayerthumbs-config.h.cmake 2009-05-10 19:11:54.514003199 +0200 +@@ -0,0 +1,2 @@ ++/* If phonon support is enabled */ ++#cmakedefine PHONON_API 1 + +--- tags/KDE/4.2.85/kdemultimedia/mplayerthumbs/src/servicesfactory.cpp 2009/05/08 14:11:27 965318 ++++ tags/KDE/4.2.85/kdemultimedia/mplayerthumbs/src/servicesfactory.cpp 2009/05/08 14:12:14 965319 +@@ -16,13 +16,20 @@ + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + */ ++ + #include "constants.h" + #include "servicesfactory.h" + #include "previewingfile.h" + #include "videobackendiface.h" + #include "mplayervideobackend.h" + #include "mplayerthumbs.h" +-#include "phononbackend.h" ++#include "mplayerthumbs-config.h" ++ ++ ++#ifdef PHONON_API ++ #include "phononbackend.h" ++#endif ++ + PreviewingFile* ServicesFactory::previewingFile(const QString& filePath, unsigned int scalingWidth, unsigned int scalingHeight, QObject* parent) { + return new PreviewingFile(filePath, scalingWidth, scalingHeight, parent); + } +@@ -33,9 +40,13 @@ + 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; ++#endif + } + // Well, we should never be here... + return NULL; + +--- tags/KDE/4.2.85/kdemultimedia/mplayerthumbs/src/CMakeLists.txt 2009/05/08 14:11:27 965318 ++++ tags/KDE/4.2.85/kdemultimedia/mplayerthumbs/src/CMakeLists.txt 2009/05/08 14:12:14 965319 +@@ -1,10 +1,37 @@ +-set(videopreview_PART_SRCS frameselector.cpp phononbackend.cpp videopreview.cpp mplayervideobackend.cpp videobackendiface.cpp previewingfile.cpp thumbnail.cpp thumbnailsmap.cpp servicesfactory.cpp) ++include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) + +-kde4_add_kcfg_files(videopreview_PART_SRCS mplayerthumbs.kcfgc) ++set(PHONON_API FALSE) ++ ++if(ENABLE_PHONON_SUPPORT) ++ set(PHONON_API TRUE) ++endif(ENABLE_PHONON_SUPPORT) ++ ++configure_file(mplayerthumbs-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/mplayerthumbs-config.h ) ++ ++set(videopreview_PART_SRCS ++ frameselector.cpp ++ videopreview.cpp ++ mplayervideobackend.cpp ++ videobackendiface.cpp ++ previewingfile.cpp ++ thumbnail.cpp ++ thumbnailsmap.cpp ++ servicesfactory.cpp) + ++if( PHONON_API ) ++ set( videopreview_PART_SRCS ++ ${videopreview_PART_SRCS} ++ phononbackend.cpp ) ++endif( PHONON_API ) ++ ++kde4_add_kcfg_files(videopreview_PART_SRCS mplayerthumbs.kcfgc) + kde4_add_plugin(videopreview ${videopreview_PART_SRCS}) + +-target_link_libraries(videopreview ${KDE4_KIO_LIBS} ${PHONON_LIBRARY} ) ++target_link_libraries(videopreview ${KDE4_KIO_LIBS} ) ++ ++if( PHONON_API ) ++ target_link_libraries(videopreview ${PHONON_LIBRARY} ) ++endif( PHONON_API ) + + install(TARGETS videopreview DESTINATION ${PLUGIN_INSTALL_DIR}) + +--- tags/KDE/4.2.85/kdemultimedia/mplayerthumbs/CMakeLists.txt 2009/05/08 14:11:27 965318 ++++ tags/KDE/4.2.85/kdemultimedia/mplayerthumbs/CMakeLists.txt 2009/05/08 14:12:14 965319 +@@ -1,2 +1,3 @@ + project(mplayerthumbs) ++ + add_subdirectory( src ) + + diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.2.85.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.2.85.ebuild index b16da85d2c0..625b0ec8477 100644 --- a/kde-base/mplayerthumbs/mplayerthumbs-4.2.85.ebuild +++ b/kde-base/mplayerthumbs/mplayerthumbs-4.2.85.ebuild @@ -25,3 +25,8 @@ RDEPEND=" media-video/mplayer-bin ) " + +PATCHES=( + "${FILESDIR}/mplayerthumbs-4.2.85-phonon.patch" +) + |