[pkgsrc/trunk]: pkgsrc/multimedia/vlc Bugfix: setsockopt IP_MULTICAST_TTL tak...

[manu <manu%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ae05a1c3920
branches:  trunk
changeset: 478642:1ae05a1c3920
user:      manu <manu%pkgsrc.org@localhost>
date:      Tue Jul 27 17:18:41 2004 +0000

description:
Bugfix: setsockopt IP_MULTICAST_TTL takes an an unsigned char, not an int.

diffstat:

 multimedia/vlc/Makefile         |   5 ++++-
 multimedia/vlc/PLIST            |   4 +++-
 multimedia/vlc/distinfo         |   3 ++-
 multimedia/vlc/patches/patch-aa |  17 +++++++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diffs (71 lines):

diff -r 8d51f01cb32c -r 1ae05a1c3920 multimedia/vlc/Makefile
--- a/multimedia/vlc/Makefile   Tue Jul 27 16:43:07 2004 +0000
+++ b/multimedia/vlc/Makefile   Tue Jul 27 17:18:41 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/07/23 15:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/27 17:18:41 manu Exp $
 #
 
 DISTNAME=              vlc-${VLC_VER}
+PKGREVISION=           1
 CATEGORIES=            multimedia
 MASTER_SITES=          http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
 EXTRACT_SUFX=          .tar.bz2
@@ -49,6 +50,8 @@
 pre-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/admin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins/default
+       ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/man/man1
+       ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/man/man1
 
 ORIGFNT=               /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
 DEFAULT_FONT?=         ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
diff -r 8d51f01cb32c -r 1ae05a1c3920 multimedia/vlc/PLIST
--- a/multimedia/vlc/PLIST      Tue Jul 27 16:43:07 2004 +0000
+++ b/multimedia/vlc/PLIST      Tue Jul 27 17:18:41 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/06/20 18:43:26 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/07/27 17:18:41 manu Exp $
 bin/vlc
 bin/vlc-config
 bin/wxvlc
@@ -174,6 +174,8 @@
 share/doc/vlc/intf-vcd.txt
 share/doc/vlc/vlc-howto.sgml
 share/doc/vlc/web-streaming.html
+man/man1/vlc.1 
+man/man1/vlc-config.1 
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/vlc.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/vlc.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/vlc.mo
diff -r 8d51f01cb32c -r 1ae05a1c3920 multimedia/vlc/distinfo
--- a/multimedia/vlc/distinfo   Tue Jul 27 16:43:07 2004 +0000
+++ b/multimedia/vlc/distinfo   Tue Jul 27 17:18:41 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/06/20 18:43:26 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/07/27 17:18:41 manu Exp $
 
 SHA1 (vlc-0.7.2.tar.bz2) = 938eaea128af02451fcbf0305c84ce290c9d8c21
 Size (vlc-0.7.2.tar.bz2) = 4516835 bytes
+SHA1 (patch-aa) = ce9a579b67612f5a6af3513f30dcff4355f39b80
diff -r 8d51f01cb32c -r 1ae05a1c3920 multimedia/vlc/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc/patches/patch-aa   Tue Jul 27 17:18:41 2004 +0000
@@ -0,0 +1,17 @@
+--- modules/misc/network/ipv4.c.orig   Tue Jul 27 19:01:35 2004
++++ modules/misc/network/ipv4.c        Tue Jul 27 19:02:52 2004
+@@ -405,9 +405,13 @@
+ #if !defined( UNDER_CE ) && !defined( SYS_BEOS )
+         if( IN_MULTICAST( ntohl(inet_addr(psz_server_addr) ) ) )
+         {
+             /* set the time-to-live */
++#ifdef __NetBSD__
++            unsigned char ttl = p_socket->i_ttl;
++#else
+             int ttl = p_socket->i_ttl;
++#endif
+             if( ttl < 1 )
+             {
+                 ttl = config_GetInt( p_this, "ttl" );
+             }
+