summaryrefslogtreecommitdiff
path: root/multimedia/mplayer
diff options
context:
space:
mode:
authorMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2003-03-05 00:11:23 +0000
committerMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2003-03-05 00:11:23 +0000
commit6b11d4a8f6be12e2b92656b3166d426807aec1e9 (patch)
tree017fa4cfde27bc5ac7bc00332d2978601edce35b /multimedia/mplayer
parento Update to 1.0.4 unbreaking the port: developers finally versioned (diff)
o Fix outstanding issue with KDE aRts: do not lockup when exitting
- Background: For some reason, mplayer locks up if we cleanup when exitting by calling arts_free(). Therefore, we trade risk of memory leakage when using KDE aRts over locking up. - Caveat: Memory probably is not witheld after mplayer exits. I won't say that it IS NOT withheld cause I do not know what arts_free() does exactly. So, worst case scenario is probably that we will leak memory for as many files the user tells mplayer to play but only WHILE mplayer is running. o Bump PORTREVISION Reviewed by: kde (some members)
Notes
Notes: svn path=/head/; revision=76888
Diffstat (limited to 'multimedia/mplayer')
-rw-r--r--multimedia/mplayer/Makefile2
-rw-r--r--multimedia/mplayer/files/patch-libao2-ao_arts.c18
2 files changed, 19 insertions, 1 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 0e7e1c59a50e..f4465888e690 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -146,7 +146,7 @@
PORTNAME= mplayer
PORTVERSION= 0.90.0.104
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
diff --git a/multimedia/mplayer/files/patch-libao2-ao_arts.c b/multimedia/mplayer/files/patch-libao2-ao_arts.c
new file mode 100644
index 000000000000..f66c40661213
--- /dev/null
+++ b/multimedia/mplayer/files/patch-libao2-ao_arts.c
@@ -0,0 +1,18 @@
+--- libao2/ao_arts.c.orig Fri Dec 27 14:35:07 2002
++++ libao2/ao_arts.c Mon Mar 3 17:10:38 2003
+@@ -102,8 +102,14 @@
+
+ static void uninit()
+ {
+- arts_close_stream(stream);
++ if (stream != NULL) {
++ arts_close_stream(stream);
++ stream = NULL;
++ }
++/* XXX - we get "MPlayer interrupted by signal 11 in module:
++ exit_player" unless commented :(
+ arts_free();
++*/
+ }
+
+ static int play(void* data,int len,int flags)