CVS commit: pkgsrc/multimedia/dvdview

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Apr 17 13:34:47 UTC 2020

Modified Files:
        pkgsrc/multimedia/dvdview: distinfo
        pkgsrc/multimedia/dvdview/patches: patch-aa
Added Files:
        pkgsrc/multimedia/dvdview/patches: patch-src_input_streamsrc__udp.cc

Log Message:
Resolve socket vs STL conflict


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/dvdview/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/multimedia/dvdview/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/dvdview/patches/patch-src_input_streamsrc__udp.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/dvdview/distinfo
diff -u pkgsrc/multimedia/dvdview/distinfo:1.2 pkgsrc/multimedia/dvdview/distinfo:1.3
--- pkgsrc/multimedia/dvdview/distinfo:1.2      Tue Nov  3 23:54:23 2015
+++ pkgsrc/multimedia/dvdview/distinfo  Fri Apr 17 13:34:47 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 23:54:23 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/04/17 13:34:47 joerg Exp $
 
 SHA1 (dvdview-1.2.2.tar.gz) = d7d00aee0a5553f97b5a7673d7fa7174d173c12e
 RMD160 (dvdview-1.2.2.tar.gz) = 6563a006ecb788d5c9554016c97fbecb69814dab
 SHA512 (dvdview-1.2.2.tar.gz) = d67299f08aac102fa10eeaf30d601e46846ba7ce42540a49ecc67e418dd9b204a12610bd9ec594637a9900b08c77bc8ad8db819acd0a750a40b386eca99b7fdb
 Size (dvdview-1.2.2.tar.gz) = 209143 bytes
-SHA1 (patch-aa) = b691e2988b1394002a1e57512216cdf55a592665
+SHA1 (patch-aa) = 1851dba28923a5b2dd43673180c35bb8ae92daba
 SHA1 (patch-ab) = 6509989ade7aff868c15436b859679ddd6b35a36
 SHA1 (patch-ac) = 68773260cfc04b8fd1ac8ac3a33ad685fecabc38
+SHA1 (patch-src_input_streamsrc__udp.cc) = 9db39dba255bde35b3eefa2d65e88010ffb1f718

Index: pkgsrc/multimedia/dvdview/patches/patch-aa
diff -u pkgsrc/multimedia/dvdview/patches/patch-aa:1.1.1.1 pkgsrc/multimedia/dvdview/patches/patch-aa:1.2
--- pkgsrc/multimedia/dvdview/patches/patch-aa:1.1.1.1  Thu Apr 13 20:15:50 2006
+++ pkgsrc/multimedia/dvdview/patches/patch-aa  Fri Apr 17 13:34:47 2020
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/04/13 20:15:50 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2020/04/17 13:34:47 joerg Exp $
 
---- src/guis/shell/main_shell.cc.orig  Tue Feb  4 13:01:17 2003
-+++ src/guis/shell/main_shell.cc       Tue Feb  4 13:07:30 2003
-@@ -463,8 +463,10 @@
+--- src/guis/shell/main_shell.cc.orig  2002-11-11 00:20:24.000000000 +0000
++++ src/guis/shell/main_shell.cc
+@@ -463,9 +463,11 @@ void start_GUI_shell(int argc,char** arg
  #if HAVE_X11
    outputobject = &videosink_x11;
  
 +#if 0
    if (!default_x11server.AskDisplay())
      { cerr << "Cannot open display.\n"; throw "no display"; }
-+#endif
  #endif
++#endif
    resizer = &pp_resize;
  #endif
+ 

Added files:

Index: pkgsrc/multimedia/dvdview/patches/patch-src_input_streamsrc__udp.cc
diff -u /dev/null pkgsrc/multimedia/dvdview/patches/patch-src_input_streamsrc__udp.cc:1.1
--- /dev/null   Fri Apr 17 13:34:47 2020
+++ pkgsrc/multimedia/dvdview/patches/patch-src_input_streamsrc__udp.cc Fri Apr 17 13:34:47 2020
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_input_streamsrc__udp.cc,v 1.1 2020/04/17 13:34:47 joerg Exp $
+
+--- src/input/streamsrc_udp.cc.orig    2020-04-17 11:18:20.162881242 +0000
++++ src/input/streamsrc_udp.cc
+@@ -81,7 +81,7 @@ int StreamSource_udp::SetUDPEndpoint(con
+       sa.sin_addr.s_addr = htonl(INADDR_ANY);
+       sa.sin_port = htons(port);
+ 
+-      if(bind(sock_, (struct sockaddr*) & sa,
++      if(::bind(sock_, (struct sockaddr*) & sa,
+             sizeof(sa)) < 0)
+       {
+         fprintf(stderr, "bind() failed, %s\n", strerror(errno)); 
+@@ -103,7 +103,7 @@ int StreamSource_udp::SetUDPEndpoint(con
+     {
+       /* address it not multicast, do the regular bind */
+       /* Bind the socket to port */
+-      if(bind(sock_, (struct sockaddr *) & sa, sizeof(sa)) < 0)
++      if(::bind(sock_, (struct sockaddr *) & sa, sizeof(sa)) < 0)
+       {
+         fprintf(stderr, "bind() failed, %s\n", strerror(errno));
+       }