CVS commit: pkgsrc/multimedia/vlc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 31 09:23:58 UTC 2016

Modified Files:
        pkgsrc/multimedia/vlc: Makefile distinfo
        pkgsrc/multimedia/vlc/patches: patch-compat_Makefile.in

Log Message:
Updated vlc to 2.2.4.

Changes between 2.2.3 and 2.2.4:
--------------------------------

Decoder:
 * Fix crash in G.711 wav files
 * Fix mp3 crash in libmad
 * Fix out-of-bound write in adpcm QT IMA codec (CVE-2016-5108)

Qt:
 * Fix resizing issues

Win32:
 * Fix overlay creation on Windows XP for DirectDraw video output

Misc:
 * Build fixes for Hurd

Translations:
 * Update of Bulgarian, Catalan, German, French, Italian, Marathi, Norwegian
   Bokmål, Norwegian Nynorsk, Portuguese, Slovak, Spanish (Mexico), Swedish,
   Simplified Chinese, and Traditional Chinese translations


To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 pkgsrc/multimedia/vlc/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/multimedia/vlc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.in

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/Makefile
diff -u pkgsrc/multimedia/vlc/Makefile:1.193 pkgsrc/multimedia/vlc/Makefile:1.194
--- pkgsrc/multimedia/vlc/Makefile:1.193        Wed Aug 17 00:06:45 2016
+++ pkgsrc/multimedia/vlc/Makefile      Wed Aug 31 09:23:58 2016
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.193 2016/08/17 00:06:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.194 2016/08/31 09:23:58 wiz Exp $
 
 DISTNAME=              vlc-${VLC_VERSION}
-PKGREVISION=           4
 CATEGORIES=            multimedia
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vlc/} \
                        http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=          .tar.xz
 
-VLC_VERSION=           2.2.3
+VLC_VERSION=           2.2.4
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.videolan.org/

Index: pkgsrc/multimedia/vlc/distinfo
diff -u pkgsrc/multimedia/vlc/distinfo:1.70 pkgsrc/multimedia/vlc/distinfo:1.71
--- pkgsrc/multimedia/vlc/distinfo:1.70 Tue Jun 21 17:58:05 2016
+++ pkgsrc/multimedia/vlc/distinfo      Wed Aug 31 09:23:58 2016
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.70 2016/06/21 17:58:05 joerg Exp $
+$NetBSD: distinfo,v 1.71 2016/08/31 09:23:58 wiz Exp $
 
-SHA1 (vlc-2.2.3.tar.xz) = 8d83c7b81e63956fdcb5cbee58cb2474d06baeae
-RMD160 (vlc-2.2.3.tar.xz) = 8c6d4194da37210fe409c965f430898fbe7f2416
-SHA512 (vlc-2.2.3.tar.xz) = 8469a8e0a6ff7ef4beac940d69d310dd4a4c9d44fb1dc8101dc8b697fc6357b5fda03f8f1096015aae7c425c6cca196415b9567fe7d96a991f020d452f976e5e
-Size (vlc-2.2.3.tar.xz) = 21835204 bytes
+SHA1 (vlc-2.2.4.tar.xz) = ec171b0ad731d9d114540cd7b7fcb41fc3293696
+RMD160 (vlc-2.2.4.tar.xz) = 2fe178bb9a4b2ad5ca0294d3e52ceb992b22e8ee
+SHA512 (vlc-2.2.4.tar.xz) = 2fc1fe957ba7903f2e0c9640884ed850cb10a60132d80658dee8da0b5abaf4a6ccdf95fa2b8c0a4a827be5e7e40341318bce44662a5248e04442f4779010f85c
+Size (vlc-2.2.4.tar.xz) = 22199316 bytes
 SHA1 (patch-bin_override.c) = 0190b65ec29ccdb7ef89d7c6af74a6bfdfc17076
 SHA1 (patch-compat_Makefile.am) = 983e9e29380702326d114274db99af72b5bdb3dd
-SHA1 (patch-compat_Makefile.in) = 809b1b00f14a5d85a17cd81b0385529ae24f39ee
+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

Index: pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.in
diff -u pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.in:1.1 pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.in:1.2
--- pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.in:1.1  Sun Oct 25 11:00:18 2015
+++ pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.in      Wed Aug 31 09:23:58 2016
@@ -1,10 +1,10 @@
-$NetBSD: patch-compat_Makefile.in,v 1.1 2015/10/25 11:00:18 wiz Exp $
+$NetBSD: patch-compat_Makefile.in,v 1.2 2016/08/31 09:23:58 wiz Exp $
 
 See comment on patch_compat_Makefile.am.
 
---- compat/Makefile.in.orig    2015-04-13 08:16:15.000000000 +0000
+--- compat/Makefile.in.orig    2016-05-31 16:56:35.000000000 +0000
 +++ compat/Makefile.in
-@@ -135,7 +135,7 @@ am__uninstall_files_from_dir = { \
+@@ -132,7 +132,7 @@ am__uninstall_files_from_dir = { \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
  am__installdirs = "$(DESTDIR)$(pkglibdir)"
@@ -13,7 +13,7 @@ See comment on patch_compat_Makefile.am.
  libcompat_la_DEPENDENCIES = $(LTLIBOBJS)
  am_libcompat_la_OBJECTS = dummy.lo
  libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS)
-@@ -993,10 +993,10 @@ top_builddir = @top_builddir@
+@@ -983,10 +983,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  vlcdatadir = @vlcdatadir@
  vlclibdir = @vlclibdir@
@@ -26,7 +26,7 @@ See comment on patch_compat_Makefile.am.
  BUILT_SOURCES = dummy.c
  CLEANFILES = dummy.c
  all: $(BUILT_SOURCES)
-@@ -1034,33 +1034,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+@@ -1025,33 +1025,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(am__aclocal_m4_deps):
  
@@ -63,7 +63,7 @@ See comment on patch_compat_Makefile.am.
        locs=`for p in $$list; do echo $$p; done | \
              sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
              sort -u`; \
-@@ -1070,7 +1046,7 @@ clean-pkglibLTLIBRARIES:
+@@ -1061,7 +1037,7 @@ clean-pkglibLTLIBRARIES:
        }
  
  libcompat.la: $(libcompat_la_OBJECTS) $(libcompat_la_DEPENDENCIES) $(EXTRA_libcompat_la_DEPENDENCIES) 
@@ -72,7 +72,7 @@ See comment on patch_compat_Makefile.am.
  
  mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-@@ -1227,9 +1203,6 @@ check: $(BUILT_SOURCES)
+@@ -1218,9 +1194,6 @@ check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
  all-am: Makefile $(LTLIBRARIES)
  installdirs:
@@ -82,7 +82,7 @@ See comment on patch_compat_Makefile.am.
  install: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) install-am
  install-exec: install-exec-am
-@@ -1265,7 +1238,7 @@ maintainer-clean-generic:
+@@ -1256,7 +1229,7 @@ maintainer-clean-generic:
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  clean: clean-am
  
@@ -91,7 +91,7 @@ See comment on patch_compat_Makefile.am.
        mostlyclean-am
  
  distclean: distclean-am
-@@ -1292,7 +1265,7 @@ install-dvi: install-dvi-am
+@@ -1283,7 +1256,7 @@ install-dvi: install-dvi-am
  
  install-dvi-am:
  
@@ -100,7 +100,7 @@ See comment on patch_compat_Makefile.am.
  
  install-html: install-html-am
  
-@@ -1332,24 +1305,23 @@ ps: ps-am
+@@ -1323,24 +1296,23 @@ ps: ps-am
  
  ps-am:
  
@@ -130,5 +130,5 @@ See comment on patch_compat_Makefile.am.
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags tags-am uninstall uninstall-am
  
- .PRECIOUS: Makefile
  
+ dummy.c: