CVS commit: [pkgsrc-2017Q1] pkgsrc/multimedia/vlc

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jun  5 09:01:01 UTC 2017

Modified Files:
        pkgsrc/multimedia/vlc [pkgsrc-2017Q1]: distinfo
        pkgsrc/multimedia/vlc/patches [pkgsrc-2017Q1]:
            patch-include_vlc_atomic.h
Added Files:
        pkgsrc/multimedia/vlc/patches [pkgsrc-2017Q1]:
            patch-modules_services__discovery_mtp.c

Log Message:
Pullup ticket #5443 - requested by sevan
multimedia/vlc: build fix

Revisions pulled up:
- multimedia/vlc/distinfo                                       1.72
- multimedia/vlc/patches/patch-include_vlc_atomic.h             1.2
- multimedia/vlc/patches/patch-modules_services__discovery_mtp.c 1.1

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Mon May 15 10:26:19 UTC 2017

   Modified Files:
           pkgsrc/multimedia/vlc: distinfo
           pkgsrc/multimedia/vlc/patches: patch-include_vlc_atomic.h
   Added Files:
           pkgsrc/multimedia/vlc/patches:
   patch-modules_services__discovery_mtp.c

   Log Message:
   Fix includes.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.71.6.1 pkgsrc/multimedia/vlc/distinfo
cvs rdiff -u -r1.1 -r1.1.12.1 \
    pkgsrc/multimedia/vlc/patches/patch-include_vlc_atomic.h
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c

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

Modified files:

Index: pkgsrc/multimedia/vlc/distinfo
diff -u pkgsrc/multimedia/vlc/distinfo:1.71 pkgsrc/multimedia/vlc/distinfo:1.71.6.1
--- pkgsrc/multimedia/vlc/distinfo:1.71 Wed Aug 31 09:23:58 2016
+++ pkgsrc/multimedia/vlc/distinfo      Mon Jun  5 09:01:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2016/08/31 09:23:58 wiz Exp $
+$NetBSD: distinfo,v 1.71.6.1 2017/06/05 09:01:01 bsiegert Exp $
 
 SHA1 (vlc-2.2.4.tar.xz) = ec171b0ad731d9d114540cd7b7fcb41fc3293696
 RMD160 (vlc-2.2.4.tar.xz) = 2fe178bb9a4b2ad5ca0294d3e52ceb992b22e8ee
@@ -9,7 +9,7 @@ SHA1 (patch-compat_Makefile.am) = 983e9e
 SHA1 (patch-compat_Makefile.in) = 640cd0ae1bb653f02b3780ee3617807399b6bb3f
 SHA1 (patch-include_vlc__common.h) = 26ab2c96230e3fbe26dd4bce60db7c5331eb3f6c
 SHA1 (patch-include_vlc__fixups.h) = 1a9f58b70f43fb87381d75d856682e3bcad14f6c
-SHA1 (patch-include_vlc_atomic.h) = 682ad69ece0267d41b62ef85429a8de312c17688
+SHA1 (patch-include_vlc_atomic.h) = 5d6d3cbe75695505588b9dd354672d70d568360a
 SHA1 (patch-modules_access_directory.c) = 95bc95cb7eb0bf44684c04d2cecc2c4e8339f0f7
 SHA1 (patch-modules_access_file.c) = 22eb568aa5a1fea765e65a770432282024baaaf1
 SHA1 (patch-modules_access_rtp_Makefile.am) = cd2c1bcbde8fc04c15f4030ff8708e32b800dd53
@@ -27,5 +27,6 @@ SHA1 (patch-modules_gui_qt4_util_input__
 SHA1 (patch-modules_gui_qt4_util_input__slider.hpp) = 146f2a2e5a9fc70b7aaefefd859a59cb39555e6a
 SHA1 (patch-modules_gui_skins2_src_theme__loader.cpp) = cbf1dfa33aa89bbb9382b789d77f6eea69d85b04
 SHA1 (patch-modules_misc_inhibit_xdg.c) = f84a8d629c8cd98c30b0acf41d87d55c7dc90d30
+SHA1 (patch-modules_services__discovery_mtp.c) = 03ad7d3efecc95bb27aaa216b78719662999102e
 SHA1 (patch-modules_video__output_sdl.c) = fcb5daacd5fe0627dcf1eaad79c8e2a27d6c948a
 SHA1 (patch-src_config_file.c) = 87c53b6d3a2d1fa9cf5b7e8e672ab2a08cafe3bb

Index: pkgsrc/multimedia/vlc/patches/patch-include_vlc_atomic.h
diff -u pkgsrc/multimedia/vlc/patches/patch-include_vlc_atomic.h:1.1 pkgsrc/multimedia/vlc/patches/patch-include_vlc_atomic.h:1.1.12.1
--- pkgsrc/multimedia/vlc/patches/patch-include_vlc_atomic.h:1.1        Sun Nov  1 20:15:06 2015
+++ pkgsrc/multimedia/vlc/patches/patch-include_vlc_atomic.h    Mon Jun  5 09:01:01 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-include_vlc_atomic.h,v 1.1 2015/11/01 20:15:06 tnn Exp $
+$NetBSD: patch-include_vlc_atomic.h,v 1.1.12.1 2017/06/05 09:01:01 bsiegert Exp $
 
 clang ships everything we need, just use <atomic> instead of the
 vlc_atomic.h #ifdef maze.
 
---- include/vlc_atomic.h.orig  2014-08-14 07:20:03.000000000 +0000
+--- include/vlc_atomic.h.orig  2015-02-02 19:42:28.000000000 +0000
 +++ include/vlc_atomic.h
-@@ -32,6 +32,11 @@
+@@ -32,7 +32,14 @@
  /*** Native C11 atomics ***/
  #  include <stdatomic.h>
  
@@ -15,5 +15,8 @@ vlc_atomic.h #ifdef maze.
 +using std::atomic_uintptr_t;
 +using std::atomic_uint;
  # else
++#include <sys/types.h>
++#include <stdint.h>
  
  #  define ATOMIC_FLAG_INIT false
+ 

Added files:

Index: pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c:1.1.2.2
--- /dev/null   Mon Jun  5 09:01:01 2017
+++ pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c       Mon Jun  5 09:01:01 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-modules_services__discovery_mtp.c,v 1.1.2.2 2017/06/05 09:01:01 bsiegert Exp $
+
+Need strings.h for rindex().
+
+--- modules/services_discovery/mtp.c.orig      2015-02-02 19:42:29.000000000 +0000
++++ modules/services_discovery/mtp.c
+@@ -24,6 +24,7 @@
+ # include "config.h"
+ #endif
+ 
++#include <strings.h>
+ #include <vlc_common.h>
+ #include <vlc_plugin.h>
+ #include <vlc_services_discovery.h>