Skip to content

V
vlc-gpu
Commit fde2aaea authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * ./configure.in: BeOS compilation fixes.
  * ./debian/rules: activated (broken) KDE interface.
  * ./plugins/access/http.c: fixed a segfault.
  * ./plugins/alsa/aout_alsa.c: fixed a segfault.
parent e1634f82
Expand all Show whitespace changes
Inline Side-by-side
Showing with 424 additions and 312 deletions
configure
View file @ fde2aaea
This diff is collapsed.
configure.in
View file @ fde2aaea
...@@ -72,7 +72,7 @@ case x"${target_os}" in ...@@ -72,7 +72,7 @@ case x"${target_os}" in
;; ;;
xbeos) xbeos)
SYS=beos SYS=beos
LIB="${LIB} -lbe -lbind" LIB_IPV4="${LIB_IPV4} -lbind"
LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
PLDFLAGS="${PLDFLAGS} -nostart" PLDFLAGS="${PLDFLAGS} -nostart"
;; ;;
...@@ -84,10 +84,13 @@ esac ...@@ -84,10 +84,13 @@ esac
dnl Check for system libs needed dnl Check for system libs needed
AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty) AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty)
AC_CHECK_FUNC(connect,,[ AC_CHECK_FUNC(connect,,[
AC_CHECK_LIB(socket,connect,LIB="${LIB} -lsocket") AC_CHECK_LIB(socket,connect,LIB_IPV4="${LIB_IPV4} -lsocket")
]) ])
AC_CHECK_FUNC(gethostbyname,,[ AC_CHECK_FUNC(gethostbyname,,[
AC_CHECK_LIB(nsl,gethostbyname,LIB="${LIB} -lnsl") AC_CHECK_LIB(nsl,gethostbyname,LIB_IPV4="${LIB_IPV4} -lnsl")
])
AC_CHECK_FUNC(gethostbyname,,[
AC_CHECK_LIB(bind,gethostbyname,LIB_IPV4="${LIB_IPV4} -lbind")
]) ])
AC_CHECK_FUNC(nanosleep,,[ AC_CHECK_FUNC(nanosleep,,[
AC_CHECK_LIB(rt,nanosleep,LIB="${LIB} -lrt",[ AC_CHECK_LIB(rt,nanosleep,LIB="${LIB} -lrt",[
......
debian/control
View file @ fde2aaea
...@@ -14,7 +14,8 @@ Build-Depends: debhelper (>=2.2.0), ...@@ -14,7 +14,8 @@ Build-Depends: debhelper (>=2.2.0),
libarts-dev, libarts-dev,
libmad0-dev, libmad0-dev,
liblircclient-dev, liblircclient-dev,
a52dec-dev a52dec-dev,
kdelibs-dev (>=2.2.2)
Standards-Version: 3.5.6 Standards-Version: 3.5.6
Package: vlc Package: vlc
...@@ -155,3 +156,11 @@ Description: lirc plugin for vlc ...@@ -155,3 +156,11 @@ Description: lirc plugin for vlc
. .
This plugin is an infrared lirc interface for vlc, the This plugin is an infrared lirc interface for vlc, the
VideoLAN Client. VideoLAN Client.
Package: vlc-kde
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: KDE plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds a KDE interface to vlc, the VideoLAN Client.
debian/rules
View file @ fde2aaea
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
export DH_COMPAT=3 export DH_COMPAT=3
# Compilation options # Compilation options
export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52" export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-kde"
export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared" export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
export VIDDIR="usr/share/videolan" export VIDDIR="usr/share/videolan"
export PIXDIR="usr/share/pixmaps" export PIXDIR="usr/share/pixmaps"
...@@ -57,9 +57,9 @@ install: build ...@@ -57,9 +57,9 @@ install: build
# make symlinks for packages and install plugins # make symlinks for packages and install plugins
case $(DEB_BUILD_ARCH) in \ case $(DEB_BUILD_ARCH) in \
i386) \ i386) \
ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc glide" ;; \ ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc kde glide" ;; \
*) \ *) \
ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc" ;; \ ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc kde" ;; \
esac ;\ esac ;\
for alias in $$ARCH_ALIASES ; do \ for alias in $$ARCH_ALIASES ; do \
ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \ ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
...@@ -69,6 +69,7 @@ install: build ...@@ -69,6 +69,7 @@ install: build
mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/ mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
mv debian/vlc/usr/bin/gnome-vlc debian/vlc-gnome/usr/bin/ 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/usr/bin/qvlc debian/vlc-qt/usr/bin/
mv debian/vlc/usr/bin/kvlc debian/vlc-kde/usr/bin/
mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png 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)/gvlc32x32.xpm debian/vlc-gtk/$(VIDDIR)/gvlc.xpm
...@@ -77,6 +78,8 @@ install: build ...@@ -77,6 +78,8 @@ install: build
mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/vlc-gnome/$(PIXDIR)/gnome-vlc.png 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)/qvlc32x32.xpm debian/vlc-qt/$(VIDDIR)/qvlc.xpm
mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/vlc-qt/$(PIXDIR)/qvlc.png mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/vlc-qt/$(PIXDIR)/qvlc.png
mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/vlc-kde/$(VIDDIR)/kvlc.xpm
mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/vlc-kde/$(PIXDIR)/kvlc.png
cp debian/vlc.desktop debian/vlc/$(GNOMEDIR) cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
cp debian/gvlc.desktop debian/vlc-gtk/$(GNOMEDIR) cp debian/gvlc.desktop debian/vlc-gtk/$(GNOMEDIR)
...@@ -86,6 +89,7 @@ install: build ...@@ -86,6 +89,7 @@ install: build
ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gnome-vlc.1.gz ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gnome-vlc.1.gz
ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz
ln -s vlc.1.gz debian/vlc-kde/usr/share/man/man1/kvlc.1.gz
# libdvdcss start # libdvdcss start
mv debian/vlc/usr/include/videolan/dvdcss.h \ mv debian/vlc/usr/include/videolan/dvdcss.h \
...@@ -117,9 +121,9 @@ binary-arch: build install ...@@ -117,9 +121,9 @@ binary-arch: build install
dh_installman doc/vlc.1 dh_installman doc/vlc.1
# dh_installinfo # dh_installinfo
# dh_undocumented # dh_undocumented
dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 ChangeLog dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 -Nvlc-kde ChangeLog
# libdvdcss start # libdvdcss start
dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 ChangeLog.libdvdcss dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 -Nvlc-kde ChangeLog.libdvdcss
# libdvdcss stop # libdvdcss stop
dh_link dh_link
dh_strip dh_strip
......
debian/vlc-kde.dirs 0 → 100644
View file @ fde2aaea
usr/bin
usr/lib/videolan/vlc
usr/share/doc
usr/share/man/man1
usr/share/pixmaps
usr/share/videolan
debian/vlc-kde.menu 0 → 100644
View file @ fde2aaea
?package(vlc-kde):command="/usr/bin/kvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="KDE VideoLAN Client" \
icon="/usr/share/videolan/kvlc.xpm" hints="Video"
plugins/access/http.c
View file @ fde2aaea
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in * http.c: HTTP access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.4 2002/03/15 04:41:54 sam Exp $ * $Id: http.c,v 1.5 2002/03/19 05:49:30 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -241,11 +241,11 @@ static int HTTPOpen( input_thread_t * p_input ) ...@@ -241,11 +241,11 @@ static int HTTPOpen( input_thread_t * p_input )
if( *p_input->psz_access ) if( *p_input->psz_access )
{ {
/* Find out which shortcut was used */ /* Find out which shortcut was used */
if( !strncmp( p_input->psz_access, "http6", 5 ) ) if( !strncmp( p_input->psz_access, "http6", 6 ) )
{ {
p_access_data->psz_network = "ipv6"; p_access_data->psz_network = "ipv6";
} }
else if( !strncmp( p_input->psz_access, "http4", 5 ) ) else if( !strncmp( p_input->psz_access, "http4", 6 ) )
{ {
p_access_data->psz_network = "ipv4"; p_access_data->psz_network = "ipv4";
} }
...@@ -309,7 +309,7 @@ static int HTTPOpen( input_thread_t * p_input ) ...@@ -309,7 +309,7 @@ static int HTTPOpen( input_thread_t * p_input )
} }
/* Check proxy */ /* Check proxy */
if( (psz_proxy = getenv( "http_proxy" )) != NULL ) if( (psz_proxy = getenv( "http_proxy" )) != NULL && *psz_proxy )
{ {
/* http://myproxy.mydomain:myport/ */ /* http://myproxy.mydomain:myport/ */
int i_proxy_port = 0; int i_proxy_port = 0;
......
plugins/alsa/aout_alsa.c
View file @ fde2aaea
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* aout_alsa.c : Alsa functions library * aout_alsa.c : Alsa functions library
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: aout_alsa.c,v 1.29 2002/03/08 00:26:07 bozo Exp $ * $Id: aout_alsa.c,v 1.30 2002/03/19 05:49:30 sam Exp $
* *
* Authors: Henri Fallon <henri@videolan.org> - Original Author * Authors: Henri Fallon <henri@videolan.org> - Original Author
* Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API * Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
...@@ -68,9 +68,8 @@ typedef struct aout_sys_s ...@@ -68,9 +68,8 @@ typedef struct aout_sys_s
*****************************************************************************/ *****************************************************************************/
static int aout_Open( aout_thread_t *p_aout ) static int aout_Open( aout_thread_t *p_aout )
{ {
int i_ret;
int i_open_returns; char psz_alsadev[128];
char str_alsadev[128];
/* Allocate structures */ /* Allocate structures */
p_aout->p_sys = malloc( sizeof( aout_sys_t ) ); p_aout->p_sys = malloc( sizeof( aout_sys_t ) );
...@@ -78,12 +77,12 @@ static int aout_Open( aout_thread_t *p_aout ) ...@@ -78,12 +77,12 @@ static int aout_Open( aout_thread_t *p_aout )
{ {
intf_ErrMsg( "aout error: failed allocating memory for ALSA (%s)", intf_ErrMsg( "aout error: failed allocating memory for ALSA (%s)",
strerror(ENOMEM) ); strerror(ENOMEM) );
return( 1 ); return -1;
} }
if( p_aout->i_format != AOUT_FMT_AC3 ) if( p_aout->i_format != AOUT_FMT_AC3 )
{ {
strcpy(str_alsadev, "default"); strcpy( psz_alsadev, "default" );
} }
else else
{ {
...@@ -92,24 +91,23 @@ static int aout_Open( aout_thread_t *p_aout ) ...@@ -92,24 +91,23 @@ static int aout_Open( aout_thread_t *p_aout )
s[1] = IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER; s[1] = IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER;
s[2] = 0; s[2] = 0;
s[3] = IEC958_AES3_CON_FS_48000; s[3] = IEC958_AES3_CON_FS_48000;
sprintf( str_alsadev, "iec958:AES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x", sprintf( psz_alsadev, "iec958:AES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x",
s[0], s[1], s[2], s[3] ); s[0], s[1], s[2], s[3] );
} }
/* Open device */ /* Open device */
if( ( i_open_returns = snd_pcm_open(&(p_aout->p_sys->p_alsa_handle), i_ret = snd_pcm_open( &(p_aout->p_sys->p_alsa_handle),
str_alsadev, psz_alsadev, SND_PCM_STREAM_PLAYBACK, 0);
SND_PCM_STREAM_PLAYBACK, 0) ) > 0 ) if( i_ret != 0 )
{ {
intf_ErrMsg( "aout error: could not open ALSA device (%s)", intf_ErrMsg( "aout error: could not open ALSA device (%s)",
snd_strerror(i_open_returns) ); snd_strerror( i_ret ) );
return( -1 ); return -1;
} }
return( 0 ); return 0;
} }
/***************************************************************************** /*****************************************************************************
* aout_SetFormat : sets the alsa output format * aout_SetFormat : sets the alsa output format
***************************************************************************** *****************************************************************************
......
plugins/network/ipv4.c
View file @ fde2aaea
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ipv4.c: IPv4 network abstraction layer * ipv4.c: IPv4 network abstraction layer
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: ipv4.c,v 1.7 2002/03/19 00:30:44 sam Exp $ * $Id: ipv4.c,v 1.8 2002/03/19 05:49:31 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Mathias Kretschmer <mathias@research.att.com> * Mathias Kretschmer <mathias@research.att.com>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
# ifndef IN_MULTICAST # ifndef IN_MULTICAST
# define IN_MULTICAST(a) IN_CLASSD(a) # define IN_MULTICAST(a) IN_CLASSD(a)
# endif # endif
#elif !defined( SYS_BEOS ) && !defined( SYS_NTO ) #elif !defined( SYS_NTO )
# include <netdb.h> /* hostent ... */ # include <netdb.h> /* hostent ... */
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h> # include <netinet/in.h>
......
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