summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-07-28 09:52:29 +0000
committerjmmv <jmmv>2003-07-28 09:52:29 +0000
commiteae999429dab2b07fbac1638b7154484c46286c3 (patch)
tree98fac4d134d550c904d293c567da542fa50c1c88
parent6713b8f7c5429b66a6b83153b3a47d95423d2285 (diff)
downloadpkgsrc-eae999429dab2b07fbac1638b7154484c46286c3.tar.gz
Add patch to fix audio output problem in plaympeg. From soren@blef.org in
PR pkg/20204.
-rw-r--r--devel/smpeg/distinfo3
-rw-r--r--devel/smpeg/patches/patch-aa26
2 files changed, 28 insertions, 1 deletions
diff --git a/devel/smpeg/distinfo b/devel/smpeg/distinfo
index 9c0fbc54a44..d1dd6b60a3b 100644
--- a/devel/smpeg/distinfo
+++ b/devel/smpeg/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/12/15 10:01:39 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/07/28 09:52:29 jmmv Exp $
SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259
Size (smpeg-0.4.4.tar.gz) = 315054 bytes
+SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0
diff --git a/devel/smpeg/patches/patch-aa b/devel/smpeg/patches/patch-aa
new file mode 100644
index 00000000000..c0b779a9b7a
--- /dev/null
+++ b/devel/smpeg/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.3 2003/07/28 09:52:31 jmmv Exp $
+
+--- plaympeg.c.orig Tue Feb 4 15:59:22 2003
++++ plaympeg.c Tue Feb 4 15:59:48 2003
+@@ -492,6 +492,7 @@
+ int fd;
+ char buf[32];
+ int status;
++ int (*audio_init)();
+
+ /* Get the command line options */
+ use_audio = 1;
+@@ -600,7 +601,12 @@
+ }
+
+ if ( use_audio ) {
+- if ((SDL_Init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) {
++ if ( use_video )
++ audio_init = SDL_InitSubSystem;
++ else
++ audio_init = SDL_Init;
++
++ if ((audio_init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) {
+ fprintf(stderr, "Warning: Couldn't init SDL audio: %s\n",
+ SDL_GetError());
+ fprintf(stderr, "Will ignore audio stream\n");