diff options
| author | marcus <marcus@FreeBSD.org> | 2006-01-18 14:45:55 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-01-18 14:45:55 +0000 |
| commit | df7c13b0816362d38dba14f83ec9ead4e148f207 (patch) | |
| tree | 86e04c9ab963dca7f3bc572b9f24a5ff3533a6df | |
| parent | 2b02ffb3db23f2473c8d347aae1aabc2d7f50341 (diff) | |
| download | FreeBSD-ports-df7c13b0816362d38dba14f83ec9ead4e148f207.zip FreeBSD-ports-df7c13b0816362d38dba14f83ec9ead4e148f207.tar.gz | |
Workaround a lockup that only affects BSD systems.
PR: 91952
Obtained from: mplayerplug-in CVS
| -rw-r--r-- | www/mplayer-plugin/Makefile | 1 | ||||
| -rw-r--r-- | www/mplayer-plugin/files/patch-Source_plugin.cpp | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile index 68d8a66..afb2001 100644 --- a/www/mplayer-plugin/Makefile +++ b/www/mplayer-plugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= mplayerplug-in PORTVERSION= 3.17 +PORTREVISION= 1 CATEGORIES= www multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mplayerplug-in diff --git a/www/mplayer-plugin/files/patch-Source_plugin.cpp b/www/mplayer-plugin/files/patch-Source_plugin.cpp new file mode 100644 index 0000000..f929a3a --- /dev/null +++ b/www/mplayer-plugin/files/patch-Source_plugin.cpp @@ -0,0 +1,22 @@ +=================================================================== +RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v +retrieving revision 1.263 +retrieving revision 1.264 +diff -u -r1.263 -r1.264 +--- Source/plugin.cpp 2005/12/12 14:05:08 1.263 ++++ Source/plugin.cpp 2006/01/02 16:49:23 1.264 +@@ -388,9 +388,13 @@ + paused = 0; + } + sendCommand(this, "quit\n"); +- pthread_mutex_lock(&read_mutex); ++#ifndef BSD ++ pthread_mutex_lock(&read_mutex); ++#endif + cancelled = 1; ++#ifndef BSD + pthread_mutex_unlock(&read_mutex); ++#endif + pthread_mutex_unlock(&control_mutex); + pthread_cancel(player_thread); + pthread_join(player_thread, NULL); |
