Upgrade to kplayer-0.3.0

6 files changed, 158 insertions, 42 deletions

diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index 1bd6dafa22ee..0b640375ecb3 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	kplayer
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	kplayer-0.2.0-src
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Movie player based on mplayer
 
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
-WRKSRC=		${WRKDIR}/kplayer-0.2/
+USE_BZIP2=	yes
+USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
diff --git a/multimedia/kplayer-kde4/distinfo b/multimedia/kplayer-kde4/distinfo
index da800681d8e0..05ba19f07fec 100644
--- a/multimedia/kplayer-kde4/distinfo
+++ b/multimedia/kplayer-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (kplayer-0.2.0-src.tar.gz) = b8b3cb95a7379c2de60a586e67f1a9d5
-SIZE (kplayer-0.2.0-src.tar.gz) = 696934
+MD5 (kplayer-0.3.0.tar.bz2) = 3667c083b3b9cb7cc5bd6e94cd6c62b9
+SIZE (kplayer-0.3.0.tar.bz2) = 548322
diff --git a/multimedia/kplayer-kde4/files/patch-kplayer.cpp b/multimedia/kplayer-kde4/files/patch-kplayer.cpp
index 15cc1c84965b..b5e50da0b4da 100644
--- a/multimedia/kplayer-kde4/files/patch-kplayer.cpp
+++ b/multimedia/kplayer-kde4/files/patch-kplayer.cpp
@@ -1,18 +1,76 @@
---- kplayer/kplayer.cpp~	Wed Mar 26 12:14:07 2003
-+++ kplayer/kplayer.cpp	Fri Apr 11 09:35:05 2003
-@@ -824,6 +824,15 @@
-   kPlayerProcess() -> stop();
+--- kplayer/kplayer.cpp~	Sat Jul 26 15:49:07 2003
++++ kplayer/kplayer.cpp	Sun Aug  3 10:36:45 2003
+@@ -395,7 +395,7 @@
+   setSaturation (value);
+   if ( kPlayerProcess() -> length() > 0 )
+     sliderAction ("player_progress") -> slider() ->
+-      setPageStep (int (roundf (kPlayerProcess() -> length() * settings -> progressMarks())));
++      setPageStep (int (rintf (kPlayerProcess() -> length() * settings -> progressMarks())));
+   QApplication::postEvent (this, new QEvent (QEvent::LayoutHint));
+ //layout() -> activate();
+   recentFilesAction() -> setMaxItems (settings -> recentFileListSize());
+@@ -1192,7 +1192,7 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   int seek = settings -> progressNormalSeekUnits() ? settings -> progressNormalSeek() :
+     kPlayerProcess() -> length() == 0 ? 10 :
+-    int (roundf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
++    int (rintf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
+   if ( seek == 0 )
+     seek = 1;
+   kPlayerProcess() -> relativeSeek (seek);
+@@ -1203,7 +1203,7 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   int seek = settings -> progressFastSeekUnits() ? settings -> progressFastSeek() :
+     kPlayerProcess() -> length() == 0 ? 60 :
+-    int (roundf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
++    int (rintf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
+   if ( seek == 0 )
+     seek = 2;
+   kPlayerProcess() -> relativeSeek (seek);
+@@ -1214,7 +1214,7 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   int seek = settings -> progressNormalSeekUnits() ? settings -> progressNormalSeek() :
+     kPlayerProcess() -> length() == 0 ? 10 :
+-    int (roundf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
++    int (rintf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
+   if ( seek == 0 )
+     seek = 1;
+   kPlayerProcess() -> relativeSeek (- seek);
+@@ -1225,7 +1225,7 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   int seek = settings -> progressFastSeekUnits() ? settings -> progressFastSeek() :
+     kPlayerProcess() -> length() == 0 ? 60 :
+-    int (roundf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
++    int (rintf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
+   if ( seek == 0 )
+     seek = 2;
+   kPlayerProcess() -> relativeSeek (- seek);
+@@ -1586,7 +1586,7 @@
+     return;
+   kdDebug() << "Seek to " << progress << ": " << kPlayerProcess() -> position() << " => " << ((progress + 50) / 100) << " / " << kPlayerProcess() -> length() << "\n";
+   kPlayerProcess() -> absoluteSeek ((progress + 50) / 100);
+-/*int seek = int (roundf (float (progress) / 100 - kPlayerProcess() -> position()));
++/*int seek = int (rintf (float (progress) / 100 - kPlayerProcess() -> position()));
+   if ( seek == 0 )
+     return;
+   kPlayerProcess() -> relativeSeek (seek);*/
+@@ -1714,7 +1714,7 @@
+   int maxValue = slider -> maxValue();
+   if ( maxValue )
+   {
+-    int value = int (roundf (progress * 100));
++    int value = int (rintf (progress * 100));
+     if ( value > maxValue )
+       slider -> setMaxValue (value);
+     slider -> setValue (value);
+@@ -1757,8 +1757,8 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   kdDebug() << "Info available. Detected length: " << kPlayerProcess() -> length() << "\n";
+   KPlayerSlider* slider = sliderAction ("player_progress") -> slider();
+-  slider -> setMaxValue (int (roundf (kPlayerProcess() -> length() * 100)));
+-  slider -> setPageStep (int (roundf (kPlayerProcess() -> length() * settings -> progressMarks())));
++  slider -> setMaxValue (int (rintf (kPlayerProcess() -> length() * 100)));
++  slider -> setPageStep (int (rintf (kPlayerProcess() -> length() * settings -> progressMarks())));
+   enablePlayerActions();
  }
  
-+#ifdef __FreeBSD__
-+int roundf(double number)
-+{
-+  if (number > 0.0)
-+    return (int)(number + 0.5);
-+  return (int)(number -0.5);
-+}
-+#endif
-+
- void KPlayer::onPlayerForward (void)
- {
-   int seek = kPlayerProcess() -> length() == 0 ? 10 :
diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile
index 1bd6dafa22ee..0b640375ecb3 100644
--- a/multimedia/kplayer/Makefile
+++ b/multimedia/kplayer/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	kplayer
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	kplayer-0.2.0-src
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Movie player based on mplayer
 
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
-WRKSRC=		${WRKDIR}/kplayer-0.2/
+USE_BZIP2=	yes
+USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
diff --git a/multimedia/kplayer/distinfo b/multimedia/kplayer/distinfo
index da800681d8e0..05ba19f07fec 100644
--- a/multimedia/kplayer/distinfo
+++ b/multimedia/kplayer/distinfo
@@ -1,2 +1,2 @@
-MD5 (kplayer-0.2.0-src.tar.gz) = b8b3cb95a7379c2de60a586e67f1a9d5
-SIZE (kplayer-0.2.0-src.tar.gz) = 696934
+MD5 (kplayer-0.3.0.tar.bz2) = 3667c083b3b9cb7cc5bd6e94cd6c62b9
+SIZE (kplayer-0.3.0.tar.bz2) = 548322
diff --git a/multimedia/kplayer/files/patch-kplayer.cpp b/multimedia/kplayer/files/patch-kplayer.cpp
index 15cc1c84965b..b5e50da0b4da 100644
--- a/multimedia/kplayer/files/patch-kplayer.cpp
+++ b/multimedia/kplayer/files/patch-kplayer.cpp
@@ -1,18 +1,76 @@
---- kplayer/kplayer.cpp~	Wed Mar 26 12:14:07 2003
-+++ kplayer/kplayer.cpp	Fri Apr 11 09:35:05 2003
-@@ -824,6 +824,15 @@
-   kPlayerProcess() -> stop();
+--- kplayer/kplayer.cpp~	Sat Jul 26 15:49:07 2003
++++ kplayer/kplayer.cpp	Sun Aug  3 10:36:45 2003
+@@ -395,7 +395,7 @@
+   setSaturation (value);
+   if ( kPlayerProcess() -> length() > 0 )
+     sliderAction ("player_progress") -> slider() ->
+-      setPageStep (int (roundf (kPlayerProcess() -> length() * settings -> progressMarks())));
++      setPageStep (int (rintf (kPlayerProcess() -> length() * settings -> progressMarks())));
+   QApplication::postEvent (this, new QEvent (QEvent::LayoutHint));
+ //layout() -> activate();
+   recentFilesAction() -> setMaxItems (settings -> recentFileListSize());
+@@ -1192,7 +1192,7 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   int seek = settings -> progressNormalSeekUnits() ? settings -> progressNormalSeek() :
+     kPlayerProcess() -> length() == 0 ? 10 :
+-    int (roundf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
++    int (rintf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
+   if ( seek == 0 )
+     seek = 1;
+   kPlayerProcess() -> relativeSeek (seek);
+@@ -1203,7 +1203,7 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   int seek = settings -> progressFastSeekUnits() ? settings -> progressFastSeek() :
+     kPlayerProcess() -> length() == 0 ? 60 :
+-    int (roundf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
++    int (rintf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
+   if ( seek == 0 )
+     seek = 2;
+   kPlayerProcess() -> relativeSeek (seek);
+@@ -1214,7 +1214,7 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   int seek = settings -> progressNormalSeekUnits() ? settings -> progressNormalSeek() :
+     kPlayerProcess() -> length() == 0 ? 10 :
+-    int (roundf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
++    int (rintf (kPlayerProcess() -> length() * settings -> progressNormalSeek() / 100));
+   if ( seek == 0 )
+     seek = 1;
+   kPlayerProcess() -> relativeSeek (- seek);
+@@ -1225,7 +1225,7 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   int seek = settings -> progressFastSeekUnits() ? settings -> progressFastSeek() :
+     kPlayerProcess() -> length() == 0 ? 60 :
+-    int (roundf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
++    int (rintf (kPlayerProcess() -> length() * settings -> progressFastSeek() / 100));
+   if ( seek == 0 )
+     seek = 2;
+   kPlayerProcess() -> relativeSeek (- seek);
+@@ -1586,7 +1586,7 @@
+     return;
+   kdDebug() << "Seek to " << progress << ": " << kPlayerProcess() -> position() << " => " << ((progress + 50) / 100) << " / " << kPlayerProcess() -> length() << "\n";
+   kPlayerProcess() -> absoluteSeek ((progress + 50) / 100);
+-/*int seek = int (roundf (float (progress) / 100 - kPlayerProcess() -> position()));
++/*int seek = int (rintf (float (progress) / 100 - kPlayerProcess() -> position()));
+   if ( seek == 0 )
+     return;
+   kPlayerProcess() -> relativeSeek (seek);*/
+@@ -1714,7 +1714,7 @@
+   int maxValue = slider -> maxValue();
+   if ( maxValue )
+   {
+-    int value = int (roundf (progress * 100));
++    int value = int (rintf (progress * 100));
+     if ( value > maxValue )
+       slider -> setMaxValue (value);
+     slider -> setValue (value);
+@@ -1757,8 +1757,8 @@
+   KPlayerSettings* settings = kPlayerSettings();
+   kdDebug() << "Info available. Detected length: " << kPlayerProcess() -> length() << "\n";
+   KPlayerSlider* slider = sliderAction ("player_progress") -> slider();
+-  slider -> setMaxValue (int (roundf (kPlayerProcess() -> length() * 100)));
+-  slider -> setPageStep (int (roundf (kPlayerProcess() -> length() * settings -> progressMarks())));
++  slider -> setMaxValue (int (rintf (kPlayerProcess() -> length() * 100)));
++  slider -> setPageStep (int (rintf (kPlayerProcess() -> length() * settings -> progressMarks())));
+   enablePlayerActions();
  }
  
-+#ifdef __FreeBSD__
-+int roundf(double number)
-+{
-+  if (number > 0.0)
-+    return (int)(number + 0.5);
-+  return (int)(number -0.5);
-+}
-+#endif
-+
- void KPlayer::onPlayerForward (void)
- {
-   int seek = kPlayerProcess() -> length() == 0 ? 10 :