pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vlc-git: Rebase current support to head



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Mar 17 21:58:25 2018 +0100
Changeset:	a1fe444b858b6a0f62a980fd56dea4333dc67dd9

Modified Files:
	vlc-git/distinfo
	vlc-git/patches/patch-modules_demux_Makefile.am
Added Files:
	vlc-git/patches/patch-configure.ac

Log Message:
vlc-git: Rebase current support to head

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a1fe444b858b6a0f62a980fd56dea4333dc67dd9

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

diffstat:
 vlc-git/distinfo                                |  3 ++-
 vlc-git/patches/patch-configure.ac              | 13 +++++++++++++
 vlc-git/patches/patch-modules_demux_Makefile.am |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs:
diff --git a/vlc-git/distinfo b/vlc-git/distinfo
index d496c36e6a..d88ff7f718 100644
--- a/vlc-git/distinfo
+++ b/vlc-git/distinfo
@@ -5,12 +5,13 @@ RMD160 (vlc-3.0.0.tar.xz) = c0ad23fdf03ae5c9524ed05c7bc0d63745587287
 SHA512 (vlc-3.0.0.tar.xz) = 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7
 Size (vlc-3.0.0.tar.xz) = 25191148 bytes
 SHA1 (patch-compat_Makefile.am) = 9f796bf1bc044527092d4ca35f51087618e14cf0
+SHA1 (patch-configure.ac) = c64e217af5097b24b17e1b134d640a9477e3e5d5
 SHA1 (patch-modules_access_Makefile.am) = 9f618ccbfb16651dde8046c20c26be1cc2b3614c
 SHA1 (patch-modules_access_http_Makefile.am) = a89edc90685b8c72baac0ac039fa00e4623557fa
 SHA1 (patch-modules_access_rtp_Makefile.am) = 4ebd1734724a43be2bafc9b1a6d7a6110c58efb4
 SHA1 (patch-modules_codec_Makefile.am) = a8f830b500ecf578a357059ac91e546399789c6c
 SHA1 (patch-modules_codec_x264.c) = 575c0efc3d3cbf17c99cd7dcdbc34b84e9e52191
 SHA1 (patch-modules_control_Makefile.am) = f60ae8bb287a83e9b6d655d2c632c7d8927fdcf7
-SHA1 (patch-modules_demux_Makefile.am) = 6b3a7bb477fd6890577e0631d8b8ca6157760ea5
+SHA1 (patch-modules_demux_Makefile.am) = 74da8778258f8edbc2e2dbcaec0b1b63a057e448
 SHA1 (patch-modules_video__chroma_Makefile.am) = 883bdaa9f790fe65571e315a2ba06c3ee706ec3a
 SHA1 (patch-modules_video__filter_Makefile.am) = 1c9cd88b4775391805461232e757fdf80d1c999c
diff --git a/vlc-git/patches/patch-configure.ac b/vlc-git/patches/patch-configure.ac
new file mode 100644
index 0000000000..efdd8c3484
--- /dev/null
+++ b/vlc-git/patches/patch-configure.ac
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.ac.orig	2018-03-17 20:50:20.000000000 +0000
++++ configure.ac
+@@ -4196,7 +4196,7 @@ AS_IF([test "${SYS}" = "mingw32"], [
+     dnl
+     AC_PATH_PROG([SEVENZIP], [7z], [7z])
+ ])
+-AM_CONDITIONAL(HAVE_MAKENSIS, [test "x$MAKENSIS" != "xno" && test "$nsis_version_ok" == "yes"])
++AM_CONDITIONAL(HAVE_MAKENSIS, [test "x$MAKENSIS" != "xno" && test "$nsis_version_ok" = "yes"])
+ 
+ dnl
+ dnl Check wether we have the PROCESS_MITIGATION_IMAGE_LOAD_POLICY 
diff --git a/vlc-git/patches/patch-modules_demux_Makefile.am b/vlc-git/patches/patch-modules_demux_Makefile.am
index 2be2ce34c8..623839303d 100644
--- a/vlc-git/patches/patch-modules_demux_Makefile.am
+++ b/vlc-git/patches/patch-modules_demux_Makefile.am
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- modules/demux/Makefile.am.orig	2018-03-14 06:17:49.000000000 +0000
+--- modules/demux/Makefile.am.orig	2018-03-17 20:50:20.000000000 +0000
 +++ modules/demux/Makefile.am
 @@ -2,7 +2,7 @@ demuxdir = $(pluginsdir)/demux
  demux_LTLIBRARIES =
@@ -10,4 +10,4 @@ $NetBSD$
 +libxiph_metadata_la_LDFLAGS =
  noinst_LTLIBRARIES += libxiph_metadata.la
  
- libflacsys_plugin_la_SOURCES = demux/flac.c
+ libflacsys_plugin_la_SOURCES = demux/flac.c packetizer/flac.h


Home | Main Index | Thread Index | Old Index