Commit ff09b15b authored by Sam Hocevar's avatar Sam Hocevar

  * Added a "make package-beos" rule.
  * Fixed a BeOS compilation issue.
parent b3248bd5
...@@ -381,6 +381,30 @@ package-win32: ...@@ -381,6 +381,30 @@ package-win32:
# Clean up # Clean up
rm -Rf tmp rm -Rf tmp
package-beos:
# Check that tmp isn't in the way
@if test -e tmp; then \
echo "Error: please remove ./tmp, it is in the way"; false; \
else \
echo "OK."; mkdir tmp; \
fi
# Create dir
mkdir -p tmp/vlc/share
# Copy relevant files
cp vlc tmp/vlc/
cp AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
README README.libdvdcss FAQ TODO tmp/vlc/
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/vlc/share/ ; done
# Create package
mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION}
(cd tmp ; find vlc-${VLC_QUICKVERSION} | \
zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip )
mv tmp/vlc-${VLC_QUICKVERSION}-beos.zip .
# Clean up
rm -Rf tmp
libdvdcss-snapshot: snapshot-common libdvdcss-snapshot: snapshot-common
# Remove vlc sources and icons, doc, debian directory... # Remove vlc sources and icons, doc, debian directory...
rm -Rf tmp/vlc/src tmp/vlc/share tmp/vlc/plugins tmp/vlc/doc rm -Rf tmp/vlc/src tmp/vlc/share tmp/vlc/plugins tmp/vlc/doc
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* netutils.c: various network functions * netutils.c: various network functions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: netutils.c,v 1.44 2001/11/12 23:56:53 sam Exp $ * $Id: netutils.c,v 1.45 2001/11/13 00:46:23 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr> * Benoit Steiner <benny@via.ecp.fr>
...@@ -114,14 +114,13 @@ static int GetAdapterInfo ( int i_adapter, char *psz_string ); ...@@ -114,14 +114,13 @@ static int GetAdapterInfo ( int i_adapter, char *psz_string );
int network_BuildLocalAddr( struct sockaddr_in * p_socket, int i_port, int network_BuildLocalAddr( struct sockaddr_in * p_socket, int i_port,
char * psz_broadcast ) char * psz_broadcast )
{ {
char psz_hostname[INPUT_MAX_SOURCE_LENGTH];
struct hostent * p_hostent;
#if defined( SYS_BEOS ) #if defined( SYS_BEOS )
intf_ErrMsg( "error: channel changing is not yet supported under BeOS" ); intf_ErrMsg( "error: channel changing is not yet supported under BeOS" );
return( 1 ); return( 1 );
#endif
#else
char psz_hostname[INPUT_MAX_SOURCE_LENGTH];
struct hostent * p_hostent;
/* Reset struct */ /* Reset struct */
memset( p_socket, 0, sizeof( struct sockaddr_in ) ); memset( p_socket, 0, sizeof( struct sockaddr_in ) );
...@@ -166,6 +165,7 @@ int network_BuildLocalAddr( struct sockaddr_in * p_socket, int i_port, ...@@ -166,6 +165,7 @@ int network_BuildLocalAddr( struct sockaddr_in * p_socket, int i_port,
p_hostent->h_length ); p_hostent->h_length );
} }
return( 0 ); return( 0 );
#endif
} }
/***************************************************************************** /*****************************************************************************
...@@ -173,13 +173,12 @@ int network_BuildLocalAddr( struct sockaddr_in * p_socket, int i_port, ...@@ -173,13 +173,12 @@ int network_BuildLocalAddr( struct sockaddr_in * p_socket, int i_port,
*****************************************************************************/ *****************************************************************************/
int network_BuildRemoteAddr( struct sockaddr_in * p_socket, char * psz_server ) int network_BuildRemoteAddr( struct sockaddr_in * p_socket, char * psz_server )
{ {
struct hostent * p_hostent;
#if defined( SYS_BEOS ) #if defined( SYS_BEOS )
intf_ErrMsg( "error: channel changing is not yet supported under BeOS" ); intf_ErrMsg( "error: channel changing is not yet supported under BeOS" );
return( 1 ); return( 1 );
#endif
#else
struct hostent * p_hostent;
/* Reset structure */ /* Reset structure */
memset( p_socket, 0, sizeof( struct sockaddr_in ) ); memset( p_socket, 0, sizeof( struct sockaddr_in ) );
...@@ -208,6 +207,7 @@ int network_BuildRemoteAddr( struct sockaddr_in * p_socket, char * psz_server ) ...@@ -208,6 +207,7 @@ int network_BuildRemoteAddr( struct sockaddr_in * p_socket, char * psz_server )
p_hostent->h_length ); p_hostent->h_length );
} }
return( 0 ); return( 0 );
#endif
} }
/***************************************************************************** /*****************************************************************************
......
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