diff options
| -rw-r--r-- | media-video/kmplayer/ChangeLog | 12 | ||||
| -rw-r--r-- | media-video/kmplayer/files/0.11.0a-fix_linking.patch | 25 | ||||
| -rw-r--r-- | media-video/kmplayer/files/0.11.0a-npp.patch | 13 | ||||
| -rw-r--r-- | media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch | 75 | ||||
| -rw-r--r-- | media-video/kmplayer/kmplayer-0.10.0c-r2.ebuild (renamed from media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild) | 35 | ||||
| -rw-r--r-- | media-video/kmplayer/kmplayer-0.11.1.ebuild (renamed from media-video/kmplayer/kmplayer-0.11.0a.ebuild) | 24 |
6 files changed, 37 insertions, 147 deletions
diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog index 0ebe11314cc3..9e3516931bd0 100644 --- a/media-video/kmplayer/ChangeLog +++ b/media-video/kmplayer/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-video/kmplayer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.124 2009/05/14 13:23:18 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.125 2009/05/28 12:44:48 scarabeus Exp $ + +*kmplayer-0.11.1 (28 May 2009) +*kmplayer-0.10.0c-r2 (28 May 2009) + + 28 May 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -files/0.11.0a-fix_linking.patch, -files/kmplayer-0.9.4a-vop2vf.patch, + +kmplayer-0.10.0c-r2.ebuild, -files/0.11.0a-npp.patch, + -kmplayer-0.10.0c-r1.ebuild, -kmplayer-0.11.0a.ebuild, + +kmplayer-0.11.1.ebuild: + Version bump. Fix slotting. Per bug #271507. 14 May 2009; Tomas Chvatal <scarabeus@gentoo.org> -kmplayer-0.9.4a-r1.ebuild, -kmplayer-0.10.0.ebuild, diff --git a/media-video/kmplayer/files/0.11.0a-fix_linking.patch b/media-video/kmplayer/files/0.11.0a-fix_linking.patch deleted file mode 100644 index 2aa51ad2046b..000000000000 --- a/media-video/kmplayer/files/0.11.0a-fix_linking.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN kmplayer-0.11.0a/src/kmplayer_part.cpp kmplayer-0.11.0a-patched/src/kmplayer_part.cpp ---- kmplayer-0.11.0a/src/kmplayer_part.cpp 2009-01-26 06:27:46.000000000 +1030 -+++ kmplayer-0.11.0a-patched/src/kmplayer_part.cpp 2009-02-18 11:19:12.000000000 +1030 -@@ -125,6 +125,21 @@ - return new KMPlayerPart (wparent, parent, args); - } - -+KDE_NO_EXPORT QString PartBase::getStatus () { -+ QString rval = "Waiting"; -+ if (source() && source()->document()) { -+ if (source()->document()->unfinished ()) -+ rval = "Playable"; -+ else if (source()->document()->state >= Node::state_deactivated) -+ rval = "Complete"; -+ } -+ return rval; -+} -+ -+KDE_NO_EXPORT QString PartBase::doEvaluate (const QString &) { -+ return "undefined"; -+} -+ - const KComponentData &KMPlayerFactory::componentData () { - kDebug () << "KMPlayerFactory::instance"; - if (!s_instance) diff --git a/media-video/kmplayer/files/0.11.0a-npp.patch b/media-video/kmplayer/files/0.11.0a-npp.patch deleted file mode 100644 index 979baaa27fe5..000000000000 --- a/media-video/kmplayer/files/0.11.0a-npp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN kmplayer-0.11.0a.old/src/kmplayerprocess.cpp kmplayer-0.11.0a/src/kmplayerprocess.cpp ---- kmplayer-0.11.0a.old/src/kmplayerprocess.cpp 2009-01-25 20:57:46.000000000 +0100 -+++ kmplayer-0.11.0a/src/kmplayerprocess.cpp 2009-03-15 16:13:23.000000000 +0100 -@@ -2829,9 +2829,6 @@ - - #else - --KDE_NO_CDTOR_EXPORT NpStream::NpStream (NpPlayer *p, uint32_t sid, const QString &u) -- : QObject (p) {} -- - KDE_NO_CDTOR_EXPORT NpStream::~NpStream () {} - void NpStream::slotResult (KJob*) {} - void NpStream::slotData (KIO::Job*, const QByteArray&) {} diff --git a/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch b/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch deleted file mode 100644 index 1f458ab0ac1f..000000000000 --- a/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Naur kmplayer-0.9.4a.old/src/kmplayerapp.cpp kmplayer-0.9.4a/src/kmplayerapp.cpp ---- kmplayer-0.9.4a.old/src/kmplayerapp.cpp 2007-05-03 03:28:14.000000000 -0400 -+++ kmplayer-0.9.4a/src/kmplayerapp.cpp 2007-05-03 03:29:32.000000000 -0400 -@@ -1827,7 +1827,7 @@ - if (m_player->settings ()->dvddevice.length () > 0) - m_options += QString(" -dvd-device ") + m_player->settings()->dvddevice; - } -- m_recordcmd = m_options + QString (" -vop scale -zoom"); -+ m_recordcmd = m_options + QString (" -vf scale -zoom"); - } - - KDE_NO_EXPORT QString KMPlayerDVDSource::filterOptions () { -diff -Naur kmplayer-0.9.4a.old/src/kmplayerconfig.h kmplayer-0.9.4a/src/kmplayerconfig.h ---- kmplayer-0.9.4a.old/src/kmplayerconfig.h 2007-05-03 03:28:14.000000000 -0400 -+++ kmplayer-0.9.4a/src/kmplayerconfig.h 2007-05-03 03:29:34.000000000 -0400 -@@ -136,8 +136,8 @@ - // postproc thingies - bool postprocessing : 1; - bool disableppauto : 1; -- bool pp_default : 1; // -vop pp=de -- bool pp_fast : 1; // -vop pp=fa -+ bool pp_default : 1; // -vf pp=de -+ bool pp_fast : 1; // -vf pp=fa - bool pp_custom : 1; // coming up - - bool pp_custom_hz : 1; // horizontal deblocking -diff -Naur kmplayer-0.9.4a.old/src/kmplayerpartbase.cpp kmplayer-0.9.4a/src/kmplayerpartbase.cpp ---- kmplayer-0.9.4a.old/src/kmplayerpartbase.cpp 2007-05-03 03:28:14.000000000 -0400 -+++ kmplayer-0.9.4a/src/kmplayerpartbase.cpp 2007-05-03 03:29:33.000000000 -0400 -@@ -1240,11 +1240,11 @@ - if (m_settings->postprocessing) - { - if (m_settings->pp_default) -- PPargs = "-vop pp=de"; -+ PPargs = "-vf pp=de"; - else if (m_settings->pp_fast) -- PPargs = "-vop pp=fa"; -+ PPargs = "-vf pp=fa"; - else if (m_settings->pp_custom) { -- PPargs = "-vop pp="; -+ PPargs = "-vf pp="; - if (m_settings->pp_custom_hz) { - PPargs += "hb"; - if (m_settings->pp_custom_hz_aq && \ -diff -Naur kmplayer-0.9.4a.old/src/kmplayertvsource.cpp kmplayer-0.9.4a/src/kmplayertvsource.cpp ---- kmplayer-0.9.4a.old/src/kmplayertvsource.cpp 2007-05-03 03:28:14.000000000 -0400 -+++ kmplayer-0.9.4a/src/kmplayertvsource.cpp 2007-05-03 03:29:33.000000000 -0400 -@@ -505,7 +505,7 @@ - KDE_NO_EXPORT QString KMPlayerTVSource::filterOptions () { - if (! m_player->settings ()->disableppauto) - return KMPlayer::Source::filterOptions (); -- return QString ("-vop pp=lb"); -+ return QString ("-vf pp=lb"); - } - - KDE_NO_EXPORT bool KMPlayerTVSource::hasLength () { -diff -Naur kmplayer-0.9.4a.old/src/xineplayer.cpp kmplayer-0.9.4a/src/xineplayer.cpp ---- kmplayer-0.9.4a.old/src/xineplayer.cpp 2007-05-03 03:28:14.000000000 -0400 -+++ kmplayer-0.9.4a/src/xineplayer.cpp 2007-05-03 03:29:33.000000000 -0400 -@@ -1183,11 +1183,11 @@ - xine_close_audio_driver (xine, ap); - fprintf (stderr, "audio output: %s\n", *aop); - } -- const char *const * vops = xine_list_video_output_plugins (xine); -- for (const char *const* vop = vops; *vop; vop++) { -- xine_video_port_t * vp = xine_open_video_driver (xine, *vop, XINE_VISUAL_TYPE_NONE, 0L); -+ const char *const * vfs = xine_list_video_output_plugins (xine); -+ for (const char *const* vf = vfs; *vf; vf++) { -+ xine_video_port_t * vp = xine_open_video_driver (xine, *vf, XINE_VISUAL_TYPE_NONE, 0L); - xine_close_video_driver (xine, vp); -- fprintf (stderr, "vidio output: %s\n", *vop); -+ fprintf (stderr, "vidio output: %s\n", *vf); - }*/ - getConfigEntries (buf); - } diff --git a/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild b/media-video/kmplayer/kmplayer-0.10.0c-r2.ebuild index 2f3fe2e5b22d..8a927cd9e581 100644 --- a/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild +++ b/media-video/kmplayer/kmplayer-0.10.0c-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild,v 1.2 2009/05/14 13:23:18 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0c-r2.ebuild,v 1.1 2009/05/28 12:44:48 scarabeus Exp $ EAPI="2" @@ -11,27 +11,28 @@ inherit kde eutils MY_P="${P/_/-}" S="${WORKDIR}/${MY_P}" -DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE." +DESCRIPTION="Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE." HOMEPAGE="http://kmplayer.kde.org/" SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2" -SLOT="0" +SLOT="3.5" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="mplayer xine cairo gstreamer npp" DEPEND="x11-libs/libXv - >=dev-libs/expat-2.0.1 - xine? ( >=media-libs/xine-lib-1.1.1 ) - cairo? ( x11-libs/cairo[X] ) - gstreamer? ( >=media-libs/gstreamer-0.10.11 - npp? ( >=sys-apps/dbus-1.0.2-r2 - >=dev-libs/dbus-glib-0.73 - >=dev-libs/dbus-qt3-old-0.70 ) ) - npp? ( >=dev-libs/nspr-4.6.7 - >=x11-libs/gtk+-2.10.14 )" + >=dev-libs/expat-2.0.1 + xine? ( >=media-libs/xine-lib-1.1.1 ) + cairo? ( x11-libs/cairo[X] ) + gstreamer? ( >=media-libs/gstreamer-0.10.11 + npp? ( >=sys-apps/dbus-1.0.2-r2 + >=dev-libs/dbus-glib-0.73 + >=dev-libs/dbus-qt3-old-0.70 ) ) + npp? ( >=dev-libs/nspr-4.6.7 + >=x11-libs/gtk+-2.10.14 )" RDEPEND="${DEPEND} - mplayer? ( media-video/mplayer )" + !${CATEGORY}/${PN}:0 + mplayer? ( media-video/mplayer )" LANGS="ar be br bs ca csb cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka lt mt nb nl nn pa pl pt_BR pt ro ru rw sk sr@Latn sr sv ta tr uk zh_CN" @@ -78,11 +79,7 @@ src_unpack() { rm -f "${S}/configure" } -src_prepare() { - : -} - -src_compile() { +src_configure() { local myconf="--enable-expat $(use_with gstreamer) $(use_with xine) @@ -92,7 +89,7 @@ src_compile() { $(use_enable npp npplayer)" # The configure script is a bloated mess and won't work correctly without this. - PKG_CONFIG="pkg-config" kde_src_compile + PKG_CONFIG="pkg-config" kde_src_configure } src_install() { diff --git a/media-video/kmplayer/kmplayer-0.11.0a.ebuild b/media-video/kmplayer/kmplayer-0.11.1.ebuild index f74e28291668..3b97b061a8b6 100644 --- a/media-video/kmplayer/kmplayer-0.11.0a.ebuild +++ b/media-video/kmplayer/kmplayer-0.11.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.0a.ebuild,v 1.5 2009/04/06 11:56:28 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.1.ebuild,v 1.1 2009/05/28 12:44:48 scarabeus Exp $ EAPI="2" @@ -13,8 +13,8 @@ SRC_URI="http://${PN}.kde.org/pkgs/${MY_P}.tar.bz2" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" -SLOT="4.1" -IUSE="cairo htmlhandbook npp" +SLOT="4" +IUSE="cairo doc npp" DEPEND=" >=dev-libs/expat-2.0.1 @@ -27,25 +27,21 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !media-video/kmplayer:0 + !${CATEGORY}/${PN}:0 + !${CATEGORY}/${PN}:4.1 media-video/mplayer" S="${WORKDIR}/${MY_P}" -PATCHES=( - "$FILESDIR/${PV}-fix_linking.patch" - "$FILESDIR/${PV}-npp.patch" -) - src_prepare() { - # fixup icon install + # remove duplicate icons (only app icon that is already in oxygen) sed -i \ - -e "s:add_subdirectory(icons):#add_subdirectory(icons):g" \ + -e "/add_subdirectory(icons)/ s/^/#DONOTINSTALL /" \ CMakeLists.txt || die "removing icons failed" - # fixup htmlhandbook - if ! use htmlhandbook; then + # install handbook only when requested + if ! use doc; then sed -i \ - -e "s:add_subdirectory(doc):#add_subdirectory(doc):g" \ + -e "/add_subdirectory(doc)/ s/^/#DONOTINSTALL /" \ CMakeLists.txt || die "removing docs failed" else # fix the install dir for docs |