pull in the slider fix from ../vlc, bump PKGREV

10 files changed, 195 insertions, 2 deletions

diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index 6dd4bf85d30..5fc95dece31 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/07/24 18:40:42 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/31 21:00:39 drochner Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index 37018665b12..d59d584c00e 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,9 +1,17 @@
-$NetBSD: distinfo,v 1.8 2012/07/29 17:37:57 marino Exp $
+$NetBSD: distinfo,v 1.9 2012/08/31 21:00:39 drochner Exp $
 
 SHA1 (vlc-2.0.3.tar.xz) = 9f161d997eae613bc6431bcb2459e1aefad8d529
 RMD160 (vlc-2.0.3.tar.xz) = 7d4498c21676a9221ef0b632cb454584c9986e16
 Size (vlc-2.0.3.tar.xz) = 18268208 bytes
 SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87
+SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905
+SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270
+SHA1 (patch-ad) = bfcca3f794bc5dac7366210b4548ab45d23040d8
+SHA1 (patch-ae) = 91cf64607a33dab18cd2d92464ab9731008f6a68
+SHA1 (patch-af) = 8c9de1d74252ae3232bf2ac6755057ccef650228
+SHA1 (patch-ag) = 9fd4a1d0a43b7032b2db6597ac21fd609631733c
+SHA1 (patch-ah) = 7eb1bb9ff4ab55317ca4c2ab3669208dce70a9e3
+SHA1 (patch-ai) = 83d3aa9aa048aa81671640334b3b2c9d4f44a495
 SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
 SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
diff --git a/multimedia/vlc2/patches/patch-ab b/multimedia/vlc2/patches/patch-ab
new file mode 100644
index 00000000000..90ae64499f7
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2012/08/31 21:00:39 drochner Exp $
+
+--- modules/gui/qt4/components/controller.cpp.orig	2012-04-27 17:14:57.000000000 +0000
++++ modules/gui/qt4/components/controller.cpp
+@@ -352,8 +352,8 @@ QWidget *AbstractController::createWidge
+         slider->setChapters( chapters );
+ 
+         /* Update the position when the IM has changed */
+-        CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ),
+-                slider, setPosition( float, int64_t, int ) );
++        CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ),
++                slider, setPosition( float, putime_t, int ) );
+         /* And update the IM, when the position has changed */
+         CONNECT( slider, sliderDragged( float ),
+                  THEMIM->getIM(), sliderUpdate( float ) );
diff --git a/multimedia/vlc2/patches/patch-ac b/multimedia/vlc2/patches/patch-ac
new file mode 100644
index 00000000000..49b688c3c26
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1 2012/08/31 21:00:40 drochner Exp $
+
+--- modules/gui/qt4/components/extended_panels.cpp.orig	2012-04-27 17:14:57.000000000 +0000
++++ modules/gui/qt4/components/extended_panels.cpp
+@@ -1621,7 +1621,7 @@ void SyncControls::update()
+ {
+     b_userAction = false;
+ 
+-    int64_t i_delay;
++    putime_t i_delay;
+     if( THEMIM->getInput() )
+     {
+         i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" );
+@@ -1638,7 +1638,7 @@ void SyncControls::advanceAudio( double 
+ {
+     if( THEMIM->getInput() && b_userAction )
+     {
+-        int64_t i_delay = f_advance * 1000000;
++        putime_t i_delay = f_advance * 1000000;
+         var_SetTime( THEMIM->getInput(), "audio-delay", i_delay );
+     }
+ }
+@@ -1647,7 +1647,7 @@ void SyncControls::advanceSubs( double f
+ {
+     if( THEMIM->getInput() && b_userAction )
+     {
+-        int64_t i_delay = f_advance * 1000000;
++        putime_t i_delay = f_advance * 1000000;
+         var_SetTime( THEMIM->getInput(), "spu-delay", i_delay );
+     }
+ }
diff --git a/multimedia/vlc2/patches/patch-ad b/multimedia/vlc2/patches/patch-ad
new file mode 100644
index 00000000000..61f425f29f3
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2012/08/31 21:00:40 drochner Exp $
+
+--- modules/gui/qt4/components/interface_widgets.cpp.orig	2012-04-27 17:14:57.000000000 +0000
++++ modules/gui/qt4/components/interface_widgets.cpp
+@@ -579,8 +579,8 @@ TimeLabel::TimeLabel( intf_thread_t *_p_
+ 
+     bufTimer->setSingleShot( true );
+ 
+-    CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ),
+-              this, setDisplayPosition( float, int64_t, int ) );
++    CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ),
++              this, setDisplayPosition( float, putime_t, int ) );
+     CONNECT( THEMIM->getIM(), cachingChanged( float ),
+               this, updateBuffering( float ) );
+     CONNECT( bufTimer, timeout(), this, updateBuffering() );
+@@ -588,7 +588,7 @@ TimeLabel::TimeLabel( intf_thread_t *_p_
+     this->setContentsMargins( 4, 0, 4, 0 );
+ }
+ 
+-void TimeLabel::setDisplayPosition( float pos, int64_t t, int length )
++void TimeLabel::setDisplayPosition( float pos, putime_t t, int length )
+ {
+     showBuffering = false;
+     bufTimer->stop();
diff --git a/multimedia/vlc2/patches/patch-ae b/multimedia/vlc2/patches/patch-ae
new file mode 100644
index 00000000000..7bed5cf1713
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2012/08/31 21:00:40 drochner Exp $
+
+--- modules/gui/qt4/components/interface_widgets.hpp.orig	2012-01-05 13:20:55.000000000 +0000
++++ modules/gui/qt4/components/interface_widgets.hpp
+@@ -162,7 +162,7 @@ private:
+ signals:
+     void timeLabelDoubleClicked();
+ private slots:
+-    void setDisplayPosition( float pos, int64_t time, int length );
++    void setDisplayPosition( float pos, putime_t time, int length );
+     void setDisplayPosition( float pos );
+     void updateBuffering( float );
+     void updateBuffering();
diff --git a/multimedia/vlc2/patches/patch-af b/multimedia/vlc2/patches/patch-af
new file mode 100644
index 00000000000..9707d1ca319
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-af
@@ -0,0 +1,40 @@
+$NetBSD: patch-af,v 1.1 2012/08/31 21:00:40 drochner Exp $
+
+--- modules/gui/qt4/input_manager.cpp.orig	2012-07-04 22:14:09.000000000 +0000
++++ modules/gui/qt4/input_manager.cpp
+@@ -407,7 +407,7 @@ void InputManager::UpdatePosition()
+ {
+     /* Update position */
+     int i_length;
+-    int64_t i_time;
++    putime_t i_time;
+     float f_pos;
+     i_length = var_GetTime(  p_input , "length" ) / CLOCK_FREQ;
+     i_time = var_GetTime(  p_input , "time");
+@@ -902,21 +902,21 @@ void InputManager::setAtoB()
+     {
+         timeB = var_GetTime( THEMIM->getInput(), "time"  );
+         var_SetTime( THEMIM->getInput(), "time" , timeA );
+-        CONNECT( this, positionUpdated( float, int64_t, int ),
+-                 this, AtoBLoop( float, int64_t, int ) );
++        CONNECT( this, positionUpdated( float, putime_t, int ),
++                 this, AtoBLoop( float, putime_t, int ) );
+     }
+     else
+     {
+         timeA = 0;
+         timeB = 0;
+-        disconnect( this, SIGNAL( positionUpdated( float, int64_t, int ) ),
+-                    this, SLOT( AtoBLoop( float, int64_t, int ) ) );
++        disconnect( this, SIGNAL( positionUpdated( float, putime_t, int ) ),
++                    this, SLOT( AtoBLoop( float, putime_t, int ) ) );
+     }
+     emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) );
+ }
+ 
+ /* Function called regularly when in an AtoB loop */
+-void InputManager::AtoBLoop( float, int64_t i_time, int )
++void InputManager::AtoBLoop( float, putime_t i_time, int )
+ {
+     if( timeB )
+     {
diff --git a/multimedia/vlc2/patches/patch-ag b/multimedia/vlc2/patches/patch-ag
new file mode 100644
index 00000000000..029ab8114c8
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.1 2012/08/31 21:00:40 drochner Exp $
+
+--- modules/gui/qt4/input_manager.hpp.orig	2012-03-12 10:32:27.000000000 +0000
++++ modules/gui/qt4/input_manager.hpp
+@@ -37,6 +37,7 @@
+ #include <QObject>
+ #include <QEvent>
+ 
++typedef int64_t putime_t;
+ 
+ enum {
+     PositionUpdate_Type = QEvent::User + IMEventType + 1,
+@@ -207,11 +208,11 @@ public slots:
+     void setAtoB();
+ 
+ private slots:
+-    void AtoBLoop( float, int64_t, int );
++    void AtoBLoop( float, putime_t, int );
+ 
+ signals:
+     /// Send new position, new time and new length
+-    void positionUpdated( float , int64_t, int );
++    void positionUpdated( float , putime_t, int );
+     void seekRequested( float pos );
+     void rateChanged( float );
+     void nameChanged( const QString& );
diff --git a/multimedia/vlc2/patches/patch-ah b/multimedia/vlc2/patches/patch-ah
new file mode 100644
index 00000000000..1bc3489c2f4
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2012/08/31 21:00:40 drochner Exp $
+
+--- modules/gui/qt4/util/input_slider.cpp.orig	2012-06-07 14:38:39.000000000 +0000
++++ modules/gui/qt4/util/input_slider.cpp
+@@ -122,7 +122,7 @@ void SeekSlider::setChapters( SeekPoints
+  * \param time Elapsed time. Unused
+  * \param legnth Duration time.
+  ***/
+-void SeekSlider::setPosition( float pos, int64_t time, int length )
++void SeekSlider::setPosition( float pos, putime_t time, int length )
+ {
+     VLC_UNUSED(time);
+     if( pos == -1.0 )
diff --git a/multimedia/vlc2/patches/patch-ai b/multimedia/vlc2/patches/patch-ai
new file mode 100644
index 00000000000..466d0430b47
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2012/08/31 21:00:40 drochner Exp $
+
+--- modules/gui/qt4/util/input_slider.hpp.orig	2012-02-22 11:26:51.000000000 +0000
++++ modules/gui/qt4/util/input_slider.hpp
+@@ -40,6 +40,8 @@ class QTimer;
+ class SeekPoints;
+ class QPropertyAnimation;
+ 
++typedef int64_t putime_t;
++
+ /* Input Slider derived from QSlider */
+ class SeekSlider : public QSlider
+ {
+@@ -86,7 +88,7 @@ private:
+     QTimer *hideHandleTimer;
+ 
+ public slots:
+-    void setPosition( float, int64_t, int );
++    void setPosition( float, putime_t, int );
+     void updateBuffering( float );
+     void hideHandle();
+