Commit 85e4b3a1 authored by Sam Hocevar's avatar Sam Hocevar

  ./debian/control: updated list of supported architectures.
  ./share/*: added 16x16 and 32x32 versions of PNG icons.
parent 1e053ea0
......@@ -2,8 +2,16 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev [alpha i386 ia64 m68k powerpc] (>=0.9.0beta7), libmad0-dev
Standards-Version: 3.0.1
Build-Depends: debhelper (>=2.2.0),
xlibs-dev,
libgnome-dev,
libggi2-dev,
libglide2-dev [i386],
libesd0-dev,
libsdl1.2-dev (>=1.2.2-3.1),
libqt-dev,
libasound2-dev [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc] (>=0.9.0beta7)
Standards-Version: 3.5.6
Package: vlc
Architecture: any
......@@ -23,7 +31,7 @@ Description: a portable abstraction library for DVD decryption
libdvdcss is a portable abstraction library for DVD decryption, it
provides a simple API to access a DVD device as a block device.
.
This package contains the libdvdcss0 runtime library.
This package contains the libdvdcss1 runtime library.
Package: libdvdcss1-dev
Architecture: any
......@@ -34,7 +42,7 @@ Description: development files for libdvdcss1
provides a simple API to access a DVD device as a block device.
.
This package contains the header files and static library needed to
compile applications that use libdvdcss0.
compile applications that use libdvdcss1.
Package: vlc-gnome
Architecture: any
......@@ -66,7 +74,7 @@ Description: Esound plugin for vlc
vlc, the VideoLAN Client.
Package: vlc-alsa
Architecture: alpha i386 ia64 m68k powerpc
Architecture: alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: ALSA plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
......
......@@ -26,7 +26,7 @@ build-stamp:
case $(DEB_BUILD_ARCH) in \
i386) \
ARCH_FLAGS="--enable-alsa --with-glide" ;; \
alpha|ia64|m68k|powerpc) \
alpha|arm|hppa|ia64|m68k|mips|mipsel|powerpc|s390|sparc) \
ARCH_FLAGS="--enable-alsa" ;; \
*) \
ARCH_FLAGS="" ;; \
......@@ -74,13 +74,13 @@ install: build
mv debian/vlc/usr/bin/gnome-vlc debian/vlc-gnome/usr/bin/
mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/
mv debian/vlc/$(VIDDIR)/vlc.png debian/vlc/$(PIXDIR)
mv debian/vlc/$(VIDDIR)/gvlc.xpm debian/vlc-gtk/$(VIDDIR)
mv debian/vlc/$(VIDDIR)/gvlc.png debian/vlc-gtk/$(PIXDIR)
mv debian/vlc/$(VIDDIR)/gnome-vlc.xpm debian/vlc-gnome/$(VIDDIR)
mv debian/vlc/$(VIDDIR)/gnome-vlc.png debian/vlc-gnome/$(PIXDIR)
mv debian/vlc/$(VIDDIR)/qvlc.xpm debian/vlc-qt/$(VIDDIR)
mv debian/vlc/$(VIDDIR)/qvlc.png debian/vlc-qt/$(PIXDIR)
mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/vlc-gtk/$(VIDDIR)/gvlc.xpm
mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/vlc-gtk/$(PIXDIR)/gvlc.png
mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/vlc-gnome/$(VIDDIR)/gnome-vlc.xpm
mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/vlc-gnome/$(PIXDIR)/gnome-vlc.png
mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/vlc-qt/$(VIDDIR)/qvlc.xpm
mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/vlc-qt/$(PIXDIR)/qvlc.png
cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
cp debian/gvlc.desktop debian/vlc-gtk/$(GNOMEDIR)
......@@ -136,7 +136,7 @@ binary-arch: build install
case $(DEB_BUILD_ARCH) in \
i386) \
ARCH_EXCLUDE="" ;; \
alpha|ia64|m68k|powerpc) \
alpha|arm|hppa|ia64|m68k|mips|mipsel|powerpc|s390|sparc) \
ARCH_EXCLUDE="-Nvlc-glide" ;; \
*) \
ARCH_EXCLUDE="-Nvlc-glide -Nvlc-alsa" ;; \
......
......@@ -2,7 +2,7 @@
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: wall.c,v 1.8 2002/01/07 02:12:29 sam Exp $
* $Id: wall.c,v 1.9 2002/01/07 17:02:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -134,8 +134,8 @@ static int vout_Create( vout_thread_t *p_vout )
return( 1 );
}
p_vout->p_sys->i_col = 6;
p_vout->p_sys->i_row = 6;
p_vout->p_sys->i_col = 3;
p_vout->p_sys->i_row = 3;
p_vout->p_sys->pp_vout = malloc( p_vout->p_sys->i_row *
p_vout->p_sys->i_col *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment