Make the slider work again. The problem here is that NetBSD defines int64_t

as __int64_t, and when moc parses and creates the signal string prototype
functions, it uses "int64_t", but when the code that calls them is compiled
the strings formed are tokenized, so they become "__int64_t" so there is a
mismatch. Fixing the NetBSD headers would be TRT to do, but it is too involved.
Instead since the use of int64_t is limited in parameter types, define a
new pctime_t as int64_t and use that instead. I think that moc functions
should use only qt-specified typedefs to avoid portability problems anyway.

10 files changed, 193 insertions, 3 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c6f56d96acf..8eb2d7e05d4 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2012/07/13 14:22:58 wiz Exp $
+# $NetBSD: Makefile,v 1.135 2012/08/30 18:54:40 christos Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index a26149f9dee..9bb21c48117 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,9 +1,17 @@
-$NetBSD: distinfo,v 1.54 2012/01/12 15:54:00 drochner Exp $
+$NetBSD: distinfo,v 1.55 2012/08/30 18:54:41 christos Exp $
 
 SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648
 RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d
 Size (vlc-1.1.13.tar.bz2) = 26226587 bytes
 SHA1 (patch-aa) = 684f7ad6a20ed6b9b8a8be2fc61836e6b471b686
+SHA1 (patch-ab) = bf5aaf7c201d0c28796956f58ebeb769a15d454e
+SHA1 (patch-ac) = d00c4037f29b84730156355e5635b485d996d3c6
+SHA1 (patch-ad) = 2fb479bfa88f6c93b135b38fe2d41fb7bb92d94a
+SHA1 (patch-ae) = b20e8e41dfa2c77c99584640d85f853fb1098750
+SHA1 (patch-af) = f5aec21c08a09bbfadad398bd57d3627164d1b6f
+SHA1 (patch-ag) = 5e23bac844429632c0dee0dea4ecbdfb5f8ba2fd
+SHA1 (patch-ah) = 6d5d5c0e17bd845fad757e75a9e68db698510374
+SHA1 (patch-ai) = 328bd66ef6c11275894c74012e7d6fec8fcbd5d3
 SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
 SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
new file mode 100644
index 00000000000..2335ec530b0
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.9 2012/08/30 18:54:41 christos Exp $
+
+--- modules/gui/qt4/components/controller.cpp	2011-07-12 21:11:24.000000000 +0300
++++ modules/gui/qt4/components/controller.cpp	2012-08-30 17:46:29.000000000 +0300
+@@ -292,8 +292,8 @@
+         InputSlider *slider = new InputSlider( Qt::Horizontal, NULL );
+ 
+         /* 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/vlc/patches/patch-ac b/multimedia/vlc/patches/patch-ac
new file mode 100644
index 00000000000..a04864638f3
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.6 2012/08/30 18:54:41 christos Exp $
+
+--- modules/gui/qt4/components/extended_panels.cpp	2011-09-29 23:32:38.000000000 +0300
++++ modules/gui/qt4/components/extended_panels.cpp	2012-08-30 17:46:39.000000000 +0300
+@@ -1411,7 +1411,7 @@
+ {
+     b_userAction = false;
+ 
+-    int64_t i_delay;
++    putime_t i_delay;
+     if( THEMIM->getInput() )
+     {
+         i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" );
+@@ -1427,7 +1427,7 @@
+ {
+     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 );
+     }
+ }
+@@ -1436,7 +1436,7 @@
+ {
+     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/vlc/patches/patch-ad b/multimedia/vlc/patches/patch-ad
new file mode 100644
index 00000000000..4ad4fba73d4
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.8 2012/08/30 18:54:42 christos Exp $
+
+--- modules/gui/qt4/components/interface_widgets.cpp	2011-07-12 21:11:24.000000000 +0300
++++ modules/gui/qt4/components/interface_widgets.cpp	2012-08-30 17:46:45.000000000 +0300
+@@ -524,14 +524,14 @@
+         + qtr( "Double click to jump to a chosen time position" ) );
+     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() );
+ }
+ 
+-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/vlc/patches/patch-ae b/multimedia/vlc/patches/patch-ae
new file mode 100644
index 00000000000..0a25ea20448
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.7 2012/08/30 18:54:42 christos Exp $
+
+--- modules/gui/qt4/components/interface_widgets.hpp	2011-07-12 21:11:24.000000000 +0300
++++ modules/gui/qt4/components/interface_widgets.hpp	2012-08-30 17:46:48.000000000 +0300
+@@ -146,7 +146,7 @@
+ 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/vlc/patches/patch-af b/multimedia/vlc/patches/patch-af
new file mode 100644
index 00000000000..7d4433fe4ab
--- /dev/null
+++ b/multimedia/vlc/patches/patch-af
@@ -0,0 +1,40 @@
+$NetBSD: patch-af,v 1.1 2012/08/30 18:54:42 christos Exp $
+
+--- modules/gui/qt4/input_manager.cpp	2011-10-18 18:56:16.000000000 +0300
++++ modules/gui/qt4/input_manager.cpp	2012-08-30 17:46:07.000000000 +0300
+@@ -397,7 +397,7 @@
+ {
+     /* Update position */
+     int i_length;
+-    int64_t i_time;
++    putime_t i_time;
+     float f_pos;
+     i_length = var_GetTime(  p_input , "length" ) / 1000000;
+     i_time = var_GetTime(  p_input , "time");
+@@ -889,21 +889,21 @@
+     {
+         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/vlc/patches/patch-ag b/multimedia/vlc/patches/patch-ag
new file mode 100644
index 00000000000..4f963b1f1a6
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.4 2012/08/30 18:54:42 christos Exp $
+
+--- modules/gui/qt4/input_manager.hpp	2011-07-12 21:11:24.000000000 +0300
++++ modules/gui/qt4/input_manager.hpp	2012-08-30 17:45:48.000000000 +0300
+@@ -36,6 +36,7 @@
+ #include <QObject>
+ #include <QEvent>
+ 
++typedef int64_t putime_t;
+ 
+ enum {
+     PositionUpdate_Type = QEvent::User + IMEventType + 1,
+@@ -200,11 +201,11 @@
+ 
+ private slots:
+     void togglePlayPause();
+-    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/vlc/patches/patch-ah b/multimedia/vlc/patches/patch-ah
new file mode 100644
index 00000000000..d61e3438678
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.3 2012/08/30 18:54:42 christos Exp $
+
+--- modules/gui/qt4/util/input_slider.cpp	2011-07-12 21:11:24.000000000 +0300
++++ modules/gui/qt4/util/input_slider.cpp	2012-08-30 17:47:01.000000000 +0300
+@@ -62,7 +62,7 @@
+     CONNECT( timer, timeout(), this, seekTick() );
+ }
+ 
+-void InputSlider::setPosition( float pos, int64_t a, int b )
++void InputSlider::setPosition( float pos, putime_t a, int b )
+ {
+     if( pos == -1.0 )
+     {
diff --git a/multimedia/vlc/patches/patch-ai b/multimedia/vlc/patches/patch-ai
new file mode 100644
index 00000000000..293f0706cac
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.3 2012/08/30 18:54:42 christos Exp $
+
+--- modules/gui/qt4/util/input_slider.hpp	2011-07-12 21:11:24.000000000 +0300
++++ modules/gui/qt4/util/input_slider.hpp	2012-08-30 17:57:46.000000000 +0300
+@@ -33,6 +33,8 @@
+ #include <QWheelEvent>
+ #include <QTimer>
+ 
++typedef int64_t putime_t;
++
+ /* Input Slider derived from QSlider */
+ class InputSlider : public QSlider
+ {
+@@ -54,7 +56,7 @@
+     QTimer *timer;
+ 
+ public slots:
+-    void setPosition( float, int64_t, int );
++    void setPosition( float, putime_t, int );
+ private slots:
+     void userDrag( int );
+     void seekTick();