diff options
| author |   Anders Rune Jensen <arj@gentoo.org> | 2004-08-11 03:51:01 +0000 |
|---|---|---|
| committer | Anders Rune Jensen <arj@gentoo.org> | 2004-08-11 03:51:01 +0000 |
| commit | a1e88ac71b49b2aeb1419f7f1236dc660acb5bd7 (patch) | |
| tree | 9d2497598c0edc8a2e6009b8585fcbfb48b65cc0 /media-video/mplayer | |
| parent | fix DEPEND (Manifest recommit) (diff) | |
| download | gentoo-2-a1e88ac71b49b2aeb1419f7f1236dc660acb5bd7.tar.gz gentoo-2-a1e88ac71b49b2aeb1419f7f1236dc660acb5bd7.tar.bz2 gentoo-2-a1e88ac71b49b2aeb1419f7f1236dc660acb5bd7.zip | |
fix bug 59200
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.0_pre5-alsa-gui.patch | 18 |
2 files changed, 18 insertions, 6 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/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 |