From 5e870913edc0294254db82d2a329684650d1d547 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@videolan.org>
Date: Fri, 18 Aug 2000 17:02:03 +0000
Subject: [PATCH]  . removed the sdlvlc alias  . added the vlc-sdl package in
 the Debian control files

---
 ChangeLog            | 8 +++++---
 Makefile.in          | 6 +++++-
 configure            | 2 +-
 configure.in         | 2 +-
 debian/control       | 9 +++++++++
 debian/rules         | 9 +++++----
 debian/vlc-sdl.files | 2 ++
 plugins/sdl/sdl.c    | 5 -----
 8 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 debian/vlc-sdl.files

diff --git a/ChangeLog b/ChangeLog
index 74144a63ad..ecfd80c870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,11 @@
 Thu Aug 18 00:21:33 BST 2000
 0.1.99g :
 
-	* added support for the SDL vout : the --display fullscreen allows 
-		fullscreen when possible. Disabled by default.
-	* added sdlvlc (which probably should start in fullscreen, no ?)
+  * added support for the SDL vout : the --display fullscreen allows 
+    fullscreen when possible. Disabled by default.
+  * added sdlvlc (which probably should start in fullscreen, no ?)
+  * removed sdlvlc :)
+  * updated debian directory to build vlc-sdl
  
 Wed Aug 16 01:07:14 CEST 2000
 0.1.99g :
diff --git a/Makefile.in b/Makefile.in
index 198656e791..ee8d791366 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -409,7 +409,11 @@ else
 	$(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)	
 endif
 
-sdlvlc gvlc xvlc fbvlc: vlc
+#
+# Gnome and Framebuffer aliases - don't add new aliases which could bloat
+# the namespace
+#
+gvlc fbvlc: vlc
 	rm -f $@ && ln -s vlc $@
 
 plugins: $(PLUGINS)
diff --git a/configure b/configure
index 6afae2bf10..2c1b95d50c 100755
--- a/configure
+++ b/configure
@@ -3102,7 +3102,7 @@ fi
 # Check whether --enable-sdl or --disable-sdl was given.
 if test "${enable_sdl+set}" = set; then
   enableval="$enable_sdl"
-  if test x$enable_sdl = xyes; then PLUGINS=${PLUGINS}"sdl "; ALIASES=${ALIASES}"sdlvlc ";fi
+  if test x$enable_sdl = xyes; then PLUGINS=${PLUGINS}"sdl "; fi
 fi
 
 # Check whether --enable-glide or --disable-glide was given.
diff --git a/configure.in b/configure.in
index 3387ef934e..7398bbedc9 100644
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ AC_ARG_ENABLE(ggi,
   [if test x$enable_ggi = xyes; then PLUGINS=${PLUGINS}"ggi "; fi])
 AC_ARG_ENABLE(sdl,
   [  --enable-sdl			 SDL support (default disabled)],
-  [if test x$enable_sdl = xyes; then PLUGINS=${PLUGINS}"sdl "; ALIASES=${ALIASES}"sdlvlc ";fi])
+  [if test x$enable_sdl = xyes; then PLUGINS=${PLUGINS}"sdl "; fi])
 AC_ARG_ENABLE(glide,
   [  --enable-glide          Glide (3dfx) support (default disabled)],
   [if test x$enable_glide = xyes; then PLUGINS=${PLUGINS}"glide "; fi])
diff --git a/debian/control b/debian/control
index b0b3a4e85b..f84af33e10 100644
--- a/debian/control
+++ b/debian/control
@@ -56,3 +56,12 @@ Description: Esound plugin for the VideoLAN MPEG2 and DVD player vlc
  This plugin adds support for the Enlightened Sound Daemon to
  the VideoLAN Client.
 
+Package: vlc-sdl
+Architecture: any
+Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Description: SDL plugin for the VideoLAN MPEG2 and DVD player vlc
+ VideoLAN is a free MPEG2 software solution.
+ .
+ This plugin adds support for the Simple DirectMedia Layer library to
+ the VideoLAN Client.
+
diff --git a/debian/rules b/debian/rules
index a31624bfed..cec54c570e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,8 @@ build-stamp:
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--enable-mmx --enable-gnome --enable-fb \
-		--enable-ggi --enable-esd --enable-glide
+		--enable-ggi --enable-esd --enable-glide \
+		--enable-sdl
 	$(MAKE)
 
 	touch build-stamp
@@ -39,7 +40,7 @@ install: build
 	$(MAKE) install prefix=`pwd`/debian/tmp/usr
 
 	# make symlinks for packages
-	for alias in ggi gnome fb glide esd ; do \
+	for alias in ggi gnome fb glide esd sdl ; do \
 		ln -s vlc debian/tmp/usr/share/doc/vlc-$$alias ; done
 	ln -s vlc.1.gz debian/tmp/usr/share/man/man1/fbvlc.1.gz
 	ln -s vlc.1.gz debian/tmp/usr/share/man/man1/gvlc.1.gz
@@ -63,10 +64,10 @@ binary-arch: build install
 #	dh_installpam
 #	dh_installinit
 	dh_installcron
-	dh_installmanpages -Nvlc-gnome -Nvlc-fb -Nvlc-ggi -Nvlc-glide -Nvlc-esd
+	dh_installmanpages -Nvlc-gnome -Nvlc-fb -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl
 	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs -Nvlc-gnome -Nvlc-fb -Nvlc-ggi -Nvlc-glide -Nvlc-esd
+	dh_installchangelogs -Nvlc-gnome -Nvlc-fb -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl
 	dh_link
 	dh_strip
 	dh_compress
diff --git a/debian/vlc-sdl.files b/debian/vlc-sdl.files
new file mode 100644
index 0000000000..44850b7ced
--- /dev/null
+++ b/debian/vlc-sdl.files
@@ -0,0 +1,2 @@
+usr/lib/videolan/vlc/sdl.so
+usr/share/doc/vlc-sdl
diff --git a/plugins/sdl/sdl.c b/plugins/sdl/sdl.c
index 632de13699..6c161765e7 100644
--- a/plugins/sdl/sdl.c
+++ b/plugins/sdl/sdl.c
@@ -81,11 +81,6 @@ plugin_info_t * GetConfig( void )
      * initialization part at least, even if we fail afterwards */
     p_info->i_score = 0x100;
 
-    if( TestProgram( "sdlvlc" ) )
-    {
-        p_info->i_score += 0x180;
-    }
-
     /* If this plugin was requested, score it higher */
     if( TestMethod( VOUT_METHOD_VAR, "sdl" ) )
     {