From 9f700867b29ee5c137c7c1b118eae35b7784c1fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Mon, 31 Aug 2009 20:49:31 +0200 Subject: [PATCH] Galaktos does no longer exist. --- extras/package/rpm/vlc.altlinux.spec | 14 +------------- extras/package/rpm/vlc.fedora.spec | 2 -- extras/package/rpm/vlc.suse.spec | 1 - src/audio_output/input.c | 17 ----------------- 4 files changed, 1 insertion(+), 33 deletions(-) diff --git a/extras/package/rpm/vlc.altlinux.spec b/extras/package/rpm/vlc.altlinux.spec index ef626f317e..b9b3c23704 100644 --- a/extras/package/rpm/vlc.altlinux.spec +++ b/extras/package/rpm/vlc.altlinux.spec @@ -397,14 +397,6 @@ Requires: fonts-ttf-dejavu This package contains freetype subtitles and OSD text output plugin to VLC Media Player. -%package plugin-galaktos -Summary: Galaktos visualization plugin for VLC Media Player -Group: Video -Requires: lib%name = %version-%release - -%description plugin-galaktos -This package contains Galaktos visualization plugin for VLC Media Player. - %if_enabled ggi %package plugin-ggi Summary: GGI video output plugin for VLC Media Player @@ -811,7 +803,7 @@ This package contains fortunes from VLC Media Player. %package maxi Summary: Maxi package for VLC Media Player Group: Video -Requires: vlc vlc-interface-ncurses vlc-interface-skins2 vlc-interface-wxwidgets vlc-interface-lirc vlc-interface-telnet vlc-interface-http vlc-plugin-a52 vlc-plugin-aa vlc-plugin-alsa vlc-plugin-arts vlc-plugin-audiocd vlc-plugin-caca vlc-plugin-cmml vlc-plugin-dvb vlc-plugin-dvdnav vlc-plugin-dvdread vlc-plugin-esd vlc-plugin-faad vlc-plugin-ffmpeg vlc-plugin-framebuffer vlc-plugin-flac vlc-plugin-freetype vlc-plugin-galaktos vlc-plugin-glx vlc-plugin-gnutls vlc-plugin-goom vlc-plugin-h264 vlc-plugin-hal vlc-plugin-jack vlc-plugin-image vlc-plugin-mad vlc-plugin-mga vlc-plugin-modplug vlc-plugin-mpeg2 vlc-plugin-musepack vlc-plugin-ogg vlc-plugin-opengl vlc-plugin-osd vlc-plugin-oss vlc-plugin-png vlc-plugin-podcast vlc-plugin-realrtsp vlc-plugin-screen vlc-plugin-sdl vlc-plugin-sdlimage vlc-plugin-shout vlc-plugin-snapshot vlc-plugin-speex vlc-plugin-theora vlc-plugin-v4l vlc-plugin-videocd vlc-plugin-x11 vlc-plugin-xml vlc-plugin-xvideo libvlc mozilla-plugin-vlc vim-plugin-vlc-syntax vlc-plugin-bonjour vlc-plugin-matroska vlc-plugin-ts vlc-plugin-notify vlc-plugin-live555 vlc-plugin-twolame vlc-plugin-dv +Requires: vlc vlc-interface-ncurses vlc-interface-skins2 vlc-interface-wxwidgets vlc-interface-lirc vlc-interface-telnet vlc-interface-http vlc-plugin-a52 vlc-plugin-aa vlc-plugin-alsa vlc-plugin-arts vlc-plugin-audiocd vlc-plugin-caca vlc-plugin-cmml vlc-plugin-dvb vlc-plugin-dvdnav vlc-plugin-dvdread vlc-plugin-esd vlc-plugin-faad vlc-plugin-ffmpeg vlc-plugin-framebuffer vlc-plugin-flac vlc-plugin-freetype vlc-plugin-glx vlc-plugin-gnutls vlc-plugin-goom vlc-plugin-h264 vlc-plugin-hal vlc-plugin-jack vlc-plugin-image vlc-plugin-mad vlc-plugin-mga vlc-plugin-modplug vlc-plugin-mpeg2 vlc-plugin-musepack vlc-plugin-ogg vlc-plugin-opengl vlc-plugin-osd vlc-plugin-oss vlc-plugin-png vlc-plugin-podcast vlc-plugin-realrtsp vlc-plugin-screen vlc-plugin-sdl vlc-plugin-sdlimage vlc-plugin-shout vlc-plugin-snapshot vlc-plugin-speex vlc-plugin-theora vlc-plugin-v4l vlc-plugin-videocd vlc-plugin-x11 vlc-plugin-xml vlc-plugin-xvideo libvlc mozilla-plugin-vlc vim-plugin-vlc-syntax vlc-plugin-bonjour vlc-plugin-matroska vlc-plugin-ts vlc-plugin-notify vlc-plugin-live555 vlc-plugin-twolame vlc-plugin-dv %{?_enable_dca:Requires: vlc-plugin-dca} %{?_enable_svg:Requires: vlc-plugin-svg} %{?_enable_ggi:Requires: vlc-plugin-ggi} @@ -889,7 +881,6 @@ export JAVA_HOME=%_libdir/j2se1.5-sun --enable-flac \ --enable-freetype \ --enable-fribidi \ - --enable-galaktos \ %{subst_enable ggi} \ --enable-glx \ %{subst_enable gnomevfs} \ @@ -1457,9 +1448,6 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl %_vlc_pluginsdir/access/libaccess_gnomevfs_plugin.so* %endif -%files plugin-galaktos -%_vlc_pluginsdir/visualization/libgalaktos_plugin.so* - %files plugin-freetype %_vlc_pluginsdir/misc/libfreetype_plugin.so* diff --git a/extras/package/rpm/vlc.fedora.spec b/extras/package/rpm/vlc.fedora.spec index 057356421b..3700f0ba95 100644 --- a/extras/package/rpm/vlc.fedora.spec +++ b/extras/package/rpm/vlc.fedora.spec @@ -417,7 +417,6 @@ export JAVA_HOME=%{_prefix}/lib/jvm/java --enable-jack \ --enable-ncurses \ --enable-xosd \ - --enable-galaktos \ %if %rpmfusion --enable-goom \ --enable-ggi \ @@ -811,7 +810,6 @@ rm -rf $RPM_BUILD_ROOT __doc - Enabled --enable-snapshot - Enabled --enable-portaudio - Enabled --enable-jack -- Enabled --enable-galaktos - waiting --enable-mediacontrol-python-bindings (default install error) - waiting --enable-cddax (new version of libcdio 0.78.2) - waiting --enable-vcdx (new version of libcdio 0.78.2) diff --git a/extras/package/rpm/vlc.suse.spec b/extras/package/rpm/vlc.suse.spec index f7deae7746..0c165b70a1 100644 --- a/extras/package/rpm/vlc.suse.spec +++ b/extras/package/rpm/vlc.suse.spec @@ -148,7 +148,6 @@ export XPIDL_INCL=$(xulrunner-config --idlflags) --enable-release \ --enable-sout \ --with-ffmpeg-faac \ - --disable-galaktos \ --enable-httpd \ --disable-jack \ --enable-mozilla \ diff --git a/src/audio_output/input.c b/src/audio_output/input.c index 627ec926a7..1f11ae0d88 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -127,13 +127,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); } - /* Look for galaktos plugin */ - if( module_exists( "galaktos" ) ) - { - val.psz_string = (char*)"galaktos"; text.psz_string = (char*)"GaLaktos"; - var_Change( p_aout, "visual", VLC_VAR_ADDCHOICE, &val, &text ); - } - /* Look for libprojectM plugin */ if( module_exists( "projectm" ) ) { @@ -849,7 +842,6 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, { ChangeFiltersString( p_aout, "audio-visual", "goom", false ); ChangeFiltersString( p_aout, "audio-visual", "visual", false ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", false ); ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } else @@ -858,20 +850,12 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, { ChangeFiltersString( p_aout, "audio-visual", "visual", false ); ChangeFiltersString( p_aout, "audio-visual", "goom", true ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", false ); ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } - else if( !strcmp( "galaktos", psz_mode ) ) - { - ChangeFiltersString( p_aout, "audio-visual", "visual", false ); - ChangeFiltersString( p_aout, "audio-visual", "goom", false ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", true ); - } else if( !strcmp( "projectm", psz_mode ) ) { ChangeFiltersString( p_aout, "audio-visual", "visual", false ); ChangeFiltersString( p_aout, "audio-visual", "goom", false ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", false ); ChangeFiltersString( p_aout, "audio-visual", "projectm", true ); } else @@ -881,7 +865,6 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd, ChangeFiltersString( p_aout, "audio-visual", "goom", false ); ChangeFiltersString( p_aout, "audio-visual", "visual", true ); - ChangeFiltersString( p_aout, "audio-visual", "galaktos", false ); ChangeFiltersString( p_aout, "audio-visual", "projectm", false ); } } -- 2.39.2