fix some pointer/int mixup to make it compile on amd64, from

Mihai Chelaru per PM

2 files changed, 125 insertions, 1 deletions

diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index cdacc84b4e6..f0b1db9eceb 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2007/01/13 07:32:36 wiz Exp $
+$NetBSD: distinfo,v 1.10 2007/02/22 16:36:10 drochner Exp $
 
 SHA1 (vlc-0.8.5.tar.bz2) = 2f0a26a336a5211f32c7bcc653dfd0b27f1fb26b
 RMD160 (vlc-0.8.5.tar.bz2) = d24140a5b4bf771754028090e103bb5c171e4fd8
@@ -9,3 +9,4 @@ SHA1 (patch-ad) = 374f8deb5179c72b4055cdbd37d318a44b3c9e7e
 SHA1 (patch-ag) = 44061c0018d97c45d4edfdb2a16192f3c99024f8
 SHA1 (patch-ah) = 5a355a70b7b39c0a33db7cc37e3944f903686d3f
 SHA1 (patch-ai) = 655df187ab529eb30753531dafbf4b68f7a85785
+SHA1 (patch-aj) = ff16b192696f7a8517b2bf343697cb81c6041015
diff --git a/multimedia/vlc/patches/patch-aj b/multimedia/vlc/patches/patch-aj
new file mode 100644
index 00000000000..8357c4308f0
--- /dev/null
+++ b/multimedia/vlc/patches/patch-aj
@@ -0,0 +1,123 @@
+$NetBSD: patch-aj,v 1.1 2007/02/22 16:36:10 drochner Exp $
+
+--- include/vlc_threads_funcs.h.orig	2006-05-06 17:52:25.000000000 +0200
++++ include/vlc_threads_funcs.h
+@@ -69,7 +69,7 @@ static inline int __vlc_mutex_lock( cons
+ {
+     int i_result;
+     /* In case of error : */
+-    int i_thread = -1;
++    pthread_t i_thread = NULL;
+     const char * psz_error = "";
+ 
+ #if defined( PTH_INIT_IN_PTH_H )
+@@ -111,7 +111,7 @@ static inline int __vlc_mutex_lock( cons
+     i_result = pthread_mutex_lock( &p_mutex->mutex );
+     if ( i_result )
+     {
+-        i_thread = (int)pthread_self();
++        i_thread = pthread_self();
+         psz_error = strerror(i_result);
+     }
+ 
+@@ -124,7 +124,7 @@ static inline int __vlc_mutex_lock( cons
+     if( i_result )
+     {
+         msg_Err( p_mutex->p_this,
+-                 "thread %u: mutex_lock failed at %s:%d (%d:%s)",
++                 "thread %p: mutex_lock failed at %s:%d (%d:%s)",
+                  i_thread, psz_file, i_line, i_result, psz_error );
+     }
+     return i_result;
+@@ -141,7 +141,7 @@ static inline int __vlc_mutex_unlock( co
+ {
+     int i_result;
+     /* In case of error : */
+-    int i_thread = -1;
++    pthread_t i_thread = NULL;
+     const char * psz_error = "";
+ 
+ #if defined( PTH_INIT_IN_PTH_H )
+@@ -184,7 +184,7 @@ static inline int __vlc_mutex_unlock( co
+     i_result = pthread_mutex_unlock( &p_mutex->mutex );
+     if ( i_result )
+     {
+-        i_thread = (int)pthread_self();
++        i_thread = pthread_self();
+         psz_error = strerror(i_result);
+     }
+ 
+@@ -197,7 +197,7 @@ static inline int __vlc_mutex_unlock( co
+     if( i_result )
+     {
+         msg_Err( p_mutex->p_this,
+-                 "thread %u: mutex_unlock failed at %s:%d (%d:%s)",
++                 "thread %p: mutex_unlock failed at %s:%d (%d:%s)",
+                  i_thread, psz_file, i_line, i_result, psz_error );
+     }
+ 
+@@ -227,7 +227,7 @@ static inline int __vlc_cond_signal( con
+ {
+     int i_result;
+     /* In case of error : */
+-    int i_thread = -1;
++    pthread_t i_thread = NULL;
+     const char * psz_error = "";
+ 
+ #if defined( PTH_INIT_IN_PTH_H )
+@@ -322,7 +322,7 @@ static inline int __vlc_cond_signal( con
+     i_result = pthread_cond_signal( &p_condvar->cond );
+     if ( i_result )
+     {
+-        i_thread = (int)pthread_self();
++        i_thread = pthread_self();
+         psz_error = strerror(i_result);
+     }
+ 
+@@ -339,7 +339,7 @@ static inline int __vlc_cond_signal( con
+     if( i_result )
+     {
+         msg_Err( p_condvar->p_this,
+-                 "thread %u: cond_signal failed at %s:%d (%d:%s)",
++                 "thread %p: cond_signal failed at %s:%d (%d:%s)",
+                  i_thread, psz_file, i_line, i_result, psz_error );
+     }
+ 
+@@ -357,7 +357,7 @@ static inline int __vlc_cond_wait( const
+ {
+     int i_result;
+     /* In case of error : */
+-    int i_thread = -1;
++    pthread_t i_thread = NULL;
+     const char * psz_error = "";
+ 
+ #if defined( PTH_INIT_IN_PTH_H )
+@@ -499,8 +499,8 @@ static inline int __vlc_cond_wait( const
+     {
+         /* People keep pissing me off with this. --Meuuh */
+         msg_Dbg( p_condvar->p_this,
+-                  "thread %u: secret message triggered "
+-                  "at %s:%d (%s)", (int)pthread_self(),
++                  "thread %p: secret message triggered "
++                  "at %s:%d (%s)", pthread_self(),
+                   psz_file, i_line, strerror(i_result) );
+ 
+         i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
+@@ -512,7 +512,7 @@ static inline int __vlc_cond_wait( const
+ 
+     if ( i_result )
+     {
+-        i_thread = (int)pthread_self();
++        i_thread = pthread_self();
+         psz_error = strerror(i_result);
+     }
+ 
+@@ -525,7 +525,7 @@ static inline int __vlc_cond_wait( const
+     if( i_result )
+     {
+         msg_Err( p_condvar->p_this,
+-                 "thread %u: cond_wait failed at %s:%d (%d:%s)",
++                 "thread %p: cond_wait failed at %s:%d (%d:%s)",
+                  i_thread, psz_file, i_line, i_result, psz_error );
+     }
+