fix bug 59200

3 files changed, 32 insertions, 20 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 8a1bc7372b3c..904d23a72568 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.192 2004/08/03 08:29:19 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.193 2004/08/11 03:51:01 arj Exp $
+
+  11 Aug 2004; Anders Rune Jensen <arj@gentoo.org> mplayer-1.0_pre5-r2.ebuild, 
+  files/mplayer-1.0_pre5-alsa-gui.patch:
+  Make the alsa patch work with dxr3. Fixes #59200. Caused by #58619.
 
   03 Aug 2004; Chris White <chriswhite@gentoo.org> :
   Fixed digest issues.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 8e1e5f909ac1..085afc3cfc05 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,4 @@
-MD5 8ea0b8ccec32fcc16bc12c3306a4a3fa ChangeLog 35303
+MD5 e5dfbe39bbbb3029940732d15eb9f64b ChangeLog 35488
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 b813a65769af5d2a2ca1ceba1347974d mplayer-0.92-r1.ebuild 11511
 MD5 7eeb1235c1263ecb110925e53de1eb06 mplayer-1.0_pre2-r1.ebuild 11375
@@ -12,7 +12,8 @@ MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
 MD5 1acf21a2d4880f80ab8ef2aadaff45d4 mplayer-1.0_pre4-r7.ebuild 12646
 MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
 MD5 ed1e890fbc67122f4657951df127263c mplayer-1.0_pre5-r2.ebuild 14291
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
@@ -24,8 +25,10 @@ MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r4 358
+MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
+MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r2 358
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
@@ -39,22 +42,19 @@ MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
 MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
 MD5 aaadaff9756ff85c9855b2bbd50da184 files/mplayer-1.0_pre4-gcc34-mtune.patch 3493
 MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
+MD5 7dce8f2598e84e3d94186e2eb50f553b files/mplayer-1.0_pre4-mga-kernel2.6.patch 27826
+MD5 702fb665a765edfafa8fcb3e099ea08f files/mplayer-1.0_pre5-alsa-gui.patch 31929
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
 MD5 ad254e1f8a5166ae1c5b53bc3c76ffd2 files/mplayer-1.0_pre5-yuv2rbg_kludge.patch 12585
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 d7d214ab46189ad1138a0a37eaa859d4 files/noenca.patch 289
 MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
-MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
-MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r2 358
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
-MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
-MD5 7dce8f2598e84e3d94186e2eb50f553b files/mplayer-1.0_pre4-mga-kernel2.6.patch 27826
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
+MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
-MD5 368c4627025375cafb694d5a1cf82aa2 files/mplayer-1.0_pre5-alsa-gui.patch 31662
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gui.patch b/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gui.patch
index 182f41f325d2..822c1442b1fb 100644
--- a/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gui.patch
+++ b/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gui.patch
@@ -168,7 +168,7 @@ retrieving revision 1.63
 diff -u -r1.63 opts.c
 --- Gui/mplayer/gtk/opts.c	26 Jun 2004 13:26:11 -0000	1.63
 +++ Gui/mplayer/gtk/opts.c	24 Jul 2004 22:15:59 -0000
-@@ -152,18 +152,9 @@
+@@ -152,18 +152,13 @@
  static char * vo_driver[3];
  static int    old_video_driver = 0;
  
@@ -176,10 +176,10 @@ diff -u -r1.63 opts.c
 - void ShowOSSConfig( void );
 - void HideOSSConfig( void );
 -#endif
--#ifdef HAVE_DXR3
-- void ShowDXR3Config( void );
-- void HideDXR3Config( void );
--#endif
+ #ifdef HAVE_DXR3
+  void ShowDXR3Config( void );
+  void HideDXR3Config( void );
+ #endif
 -#ifdef HAVE_SDL
 - void ShowSDLConfig( void );
 - void HideSDLConfig( void );
@@ -805,6 +805,14 @@ diff -u -r1.63 opts.c
  
  #ifdef HAVE_DXR3
  // --- dxr3 config box
+@@ -1667,6 +1688,6 @@
+  vbox1=AddVBox( AddDialogFrame( DXR3Config ),0 );
+  vbox2=AddVBox( vbox1,0 );
+  hbox1=AddHBox( vbox2,1 );
+- AddLabel( MSGTR_PREFERENCES_OSS_Device,hbox1 );
++ AddLabel( MSGTR_PREFERENCES_Audio_Device,hbox1 );
+ 
+  CBDevice=AddComboBox( hbox1 );
 Index: Gui/mplayer/gtk/opts.h
 ===================================================================
 RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.h,v