diff options
| author | ahze <ahze@FreeBSD.org> | 2008-04-04 03:24:06 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2008-04-04 03:24:06 +0800 |
| commit | 37d0dd9e877c157e16cadf50d7937e8cdfff2a1e (patch) | |
| tree | 47523697624690ad1fd7be1feb64c76a6efb17d6 /multimedia | |
| parent | 8bb246633678564c8202d287fe264320e931433b (diff) | |
| download | freebsd-ports-gnome-37d0dd9e877c157e16cadf50d7937e8cdfff2a1e.tar.gz freebsd-ports-gnome-37d0dd9e877c157e16cadf50d7937e8cdfff2a1e.tar.zst freebsd-ports-gnome-37d0dd9e877c157e16cadf50d7937e8cdfff2a1e.zip | |
Remove 2 patches that aren't needed anymore
Reported by: Jon Tibble <meths@btinternet.com>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/files/patch-include-vlc_threads_funcs.h | 38 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-modules_demux_mkv.cpp | 20 |
2 files changed, 0 insertions, 58 deletions
diff --git a/multimedia/vlc/files/patch-include-vlc_threads_funcs.h b/multimedia/vlc/files/patch-include-vlc_threads_funcs.h deleted file mode 100644 index 5e9b5286ea17..000000000000 --- a/multimedia/vlc/files/patch-include-vlc_threads_funcs.h +++ /dev/null @@ -1,38 +0,0 @@ ---- include/vlc_threads_funcs.h.orig 2007-08-08 14:53:27.000000000 +0200 -+++ include/vlc_threads_funcs.h 2007-08-08 14:55:58.000000000 +0200 -@@ -111,7 +111,7 @@ - i_result = pthread_mutex_lock( &p_mutex->mutex ); - if ( i_result ) - { -- i_thread = (int)pthread_self(); -+ i_thread = (intptr_t)pthread_self(); - psz_error = strerror(i_result); - } - -@@ -184,7 +184,7 @@ - i_result = pthread_mutex_unlock( &p_mutex->mutex ); - if ( i_result ) - { -- i_thread = (int)pthread_self(); -+ i_thread = (intptr_t)pthread_self(); - psz_error = strerror(i_result); - } - -@@ -322,7 +322,7 @@ - i_result = pthread_cond_signal( &p_condvar->cond ); - if ( i_result ) - { -- i_thread = (int)pthread_self(); -+ i_thread = (intptr_t)pthread_self(); - psz_error = strerror(i_result); - } - -@@ -512,7 +512,7 @@ - - if ( i_result ) - { -- i_thread = (int)pthread_self(); -+ i_thread = (intptr_t)pthread_self(); - psz_error = strerror(i_result); - } - diff --git a/multimedia/vlc/files/patch-modules_demux_mkv.cpp b/multimedia/vlc/files/patch-modules_demux_mkv.cpp deleted file mode 100644 index a9b041021953..000000000000 --- a/multimedia/vlc/files/patch-modules_demux_mkv.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/demux/mkv.cpp.orig 2008-02-24 14:01:53.000000000 -0500 -+++ modules/demux/mkv.cpp 2008-03-19 13:11:29.000000000 -0400 -@@ -5845,7 +5845,7 @@ - binary *p_data = (*index)->GetBuffer(); - size_t i_size = *p_data++; - // avoid reading too much from the buffer -- i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 ); -+ i_size = min<size_t>( i_size, ((*index)->GetSize() - 1) >> 3 ); - for ( ; i_size > 0; i_size--, p_data += 8 ) - { - msg_Dbg( &sys.demuxer, "Matroska DVD enter command" ); -@@ -5868,7 +5868,7 @@ - binary *p_data = (*index)->GetBuffer(); - size_t i_size = *p_data++; - // avoid reading too much from the buffer -- i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 ); -+ i_size = min<size_t>( i_size, ((*index)->GetSize() - 1) >> 3 ); - for ( ; i_size > 0; i_size--, p_data += 8 ) - { - msg_Dbg( &sys.demuxer, "Matroska DVD leave command" ); |