. removed the sdlvlc alias

 . added the vlc-sdl package in the Debian control files

diff --git a/ChangeLog b/ChangeLog
index 74144a63adbd290e07e6fbd142a73fc7987a25d1..ecfd80c8702e39e2b6954e5babe9c42cd08d5afe 100644 (file)
--- 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 198656e791fb685563f54ef618a54711093b8d10..ee8d791366cf319eac2b6794e63d07e5db9b60d7 100644 (file)
--- 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 6afae2bf10b5a8ec2d4b4fd8d9c9e88fc8ef5cfe..2c1b95d50c237e94b714b77810593749e89edac1 100755 (executable)
--- 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 3387ef934eed83137e97a0756c63ead9ef0af1c2..7398bbedc983b2f6ca19e728c006b9c4d27c83b2 100644 (file)
--- 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 b0b3a4e85be0269ef7cd76837a010955fd0c6ade..f84af33e109b8edb47d77fa3861d39d22e6fe488 100644 (file)
--- 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 a31624bfed85fb1d98e19c76535fe51a3538854d..cec54c570e14fe8a448d88afa1e1ac8704ac268e 100755 (executable)
--- 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 (file)
index 0000000..44850b7
--- /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 632de136996638df42f59fcf6d45c548c95b0977..6c161765e70e060baac363a05223e9dc3f9146da 100644 (file)
--- 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" ) )
     {