vlc-git: Untangle more shared library linking

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Mar 14 08:00:48 2018 +0100
Changeset:	2a6ae51778beb36f0aa0d153b238be5bbcf8897a

Modified Files:
	vlc-git/distinfo
	vlc-git/patches/patch-compat_Makefile.am
Added Files:
	vlc-git/patches/patch-modules_access_Makefile.am
	vlc-git/patches/patch-modules_access_http_Makefile.am
	vlc-git/patches/patch-modules_access_rtp_Makefile.am
	vlc-git/patches/patch-modules_codec_Makefile.am
	vlc-git/patches/patch-modules_codec_x264.c
	vlc-git/patches/patch-modules_control_Makefile.am
	vlc-git/patches/patch-modules_demux_Makefile.am
	vlc-git/patches/patch-modules_video__chroma_Makefile.am
	vlc-git/patches/patch-modules_video__filter_Makefile.am

Log Message:
vlc-git: Untangle more shared library linking

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

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

diffstat:
 vlc-git/distinfo                                   | 11 +++++++-
 vlc-git/patches/patch-compat_Makefile.am           |  2 +-
 vlc-git/patches/patch-modules_access_Makefile.am   | 13 +++++++++
 .../patches/patch-modules_access_http_Makefile.am  | 18 +++++++++++++
 .../patches/patch-modules_access_rtp_Makefile.am   | 13 +++++++++
 vlc-git/patches/patch-modules_codec_Makefile.am    | 31 ++++++++++++++++++++++
 vlc-git/patches/patch-modules_codec_x264.c         | 13 +++++++++
 vlc-git/patches/patch-modules_control_Makefile.am  | 13 +++++++++
 vlc-git/patches/patch-modules_demux_Makefile.am    | 13 +++++++++
 .../patch-modules_video__chroma_Makefile.am        | 13 +++++++++
 .../patch-modules_video__filter_Makefile.am        | 13 +++++++++
 11 files changed, 151 insertions(+), 2 deletions(-)

diffs:
diff --git a/vlc-git/distinfo b/vlc-git/distinfo
index 41b0263275..d496c36e6a 100644
--- a/vlc-git/distinfo
+++ b/vlc-git/distinfo
@@ -4,4 +4,13 @@ SHA1 (vlc-3.0.0.tar.xz) = 50610841b060321242793cf6ad3d58759dc5973b
 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) = 56fe777db0626d9d5f0d38d5d3213247219f9eb4
+SHA1 (patch-compat_Makefile.am) = 9f796bf1bc044527092d4ca35f51087618e14cf0
+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_video__chroma_Makefile.am) = 883bdaa9f790fe65571e315a2ba06c3ee706ec3a
+SHA1 (patch-modules_video__filter_Makefile.am) = 1c9cd88b4775391805461232e757fdf80d1c999c
diff --git a/vlc-git/patches/patch-compat_Makefile.am b/vlc-git/patches/patch-compat_Makefile.am
index 78c48d4c9d..7faf1d4aa0 100644
--- a/vlc-git/patches/patch-compat_Makefile.am
+++ b/vlc-git/patches/patch-compat_Makefile.am
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- compat/Makefile.am.orig	2018-03-14 05:22:09.000000000 +0000
+--- compat/Makefile.am.orig	2018-03-14 06:17:49.000000000 +0000
 +++ compat/Makefile.am
 @@ -1,7 +1,7 @@
 -pkglib_LTLIBRARIES = libcompat.la
diff --git a/vlc-git/patches/patch-modules_access_Makefile.am b/vlc-git/patches/patch-modules_access_Makefile.am
new file mode 100644
index 0000000000..7bb94c862f
--- /dev/null
+++ b/vlc-git/patches/patch-modules_access_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- modules/access/Makefile.am.orig	2018-03-14 06:17:49.000000000 +0000
++++ modules/access/Makefile.am
+@@ -286,7 +286,7 @@ if HAVE_WIN32_DESKTOP
+ # Work-around automake bug:
+ # Use an import library for C++ to retain C linker on other platforms.
+ libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
+-libbda_la_LDFLAGS = -static
++libbda_la_LDFLAGS =
+ libbda_la_LIBADD = -lstrmiids $(LIBCOM) -loleaut32 -luuid
+ noinst_LTLIBRARIES += libbda.la
+ 
diff --git a/vlc-git/patches/patch-modules_access_http_Makefile.am b/vlc-git/patches/patch-modules_access_http_Makefile.am
new file mode 100644
index 0000000000..3385664c51
--- /dev/null
+++ b/vlc-git/patches/patch-modules_access_http_Makefile.am
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- modules/access/http/Makefile.am.orig	2018-03-14 06:17:49.000000000 +0000
++++ modules/access/http/Makefile.am
+@@ -16,11 +16,11 @@ libvlc_http_la_SOURCES = \
+ 	access/http/connmgr.c access/http/connmgr.h
+ libvlc_http_la_CPPFLAGS = -Dneedsomethinghere
+ libvlc_http_la_LIBADD = \
+-	$(LTLIBVLCCORE) ../compat/libcompat.la \
++	$(LTLIBVLCCORE) \
+ 	$(SOCKET_LIBS) $(LIBPTHREAD)
+ #libvlc_http_la_LDFLAGS = -no-undefined -export-symbols-regex ^vlc_http_
+ #pkglib_LTLIBRARIES += libvlc_http.la
+-libvlc_http_la_LDFLAGS = -static
++libvlc_http_la_LDFLAGS =
+ noinst_LTLIBRARIES += libvlc_http.la
+ 
+ hpack_test_SOURCES = access/http/hpack.c access/http/hpack.h
diff --git a/vlc-git/patches/patch-modules_access_rtp_Makefile.am b/vlc-git/patches/patch-modules_access_rtp_Makefile.am
new file mode 100644
index 0000000000..b0e8b7407d
--- /dev/null
+++ b/vlc-git/patches/patch-modules_access_rtp_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- modules/access/rtp/Makefile.am.orig	2018-03-14 06:17:49.000000000 +0000
++++ modules/access/rtp/Makefile.am
+@@ -13,7 +13,7 @@ librtp_plugin_la_LIBADD = $(SOCKET_LIBS)
+ libvlc_srtp_la_SOURCES = access/rtp/srtp.c access/rtp/srtp.h
+ libvlc_srtp_la_CPPFLAGS = -I$(srcdir)/access/rtp
+ libvlc_srtp_la_CFLAGS = $(GCRYPT_CFLAGS)
+-libvlc_srtp_la_LDFLAGS = -static
++libvlc_srtp_la_LDFLAGS =
+ libvlc_srtp_la_LIBADD = $(GCRYPT_LIBS) $(LIBPTHREAD)
+ srtp_test_recv_SOURCES = access/rtp/srtp-test-recv.c
+ srtp_test_recv_LDADD = libvlc_srtp.la
diff --git a/vlc-git/patches/patch-modules_codec_Makefile.am b/vlc-git/patches/patch-modules_codec_Makefile.am
new file mode 100644
index 0000000000..91e84ed6ba
--- /dev/null
+++ b/vlc-git/patches/patch-modules_codec_Makefile.am
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- modules/codec/Makefile.am.orig	2018-03-14 06:17:49.000000000 +0000
++++ modules/codec/Makefile.am
+@@ -370,7 +370,7 @@ libavcodec_common_la_SOURCES = codec/avc
+ 	codec/avcodec/chroma.c codec/avcodec/chroma.h \
+ 	codec/avcodec/avcommon_compat.h
+ libavcodec_common_la_CFLAGS = $(AVCODEC_CFLAGS) $(AM_CFLAGS)
+-libavcodec_common_la_LDFLAGS = -static
++libavcodec_common_la_LDFLAGS =
+ 
+ libavcodec_plugin_la_SOURCES = \
+ 	codec/avcodec/video.c \
+@@ -424,7 +424,7 @@ endif
+ 
+ libd3d9_common_la_SOURCES = video_chroma/d3d9_fmt.c video_chroma/d3d9_fmt.h \
+ 	video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h
+-libd3d9_common_la_LDFLAGS = -static
++libd3d9_common_la_LDFLAGS =
+ if HAVE_WIN32_DESKTOP
+ noinst_LTLIBRARIES += libd3d9_common.la
+ endif
+@@ -441,7 +441,7 @@ endif
+ 
+ libd3d11_common_la_SOURCES = video_chroma/d3d11_fmt.c video_chroma/d3d11_fmt.h \
+ 	video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h
+-libd3d11_common_la_LDFLAGS = -static
++libd3d11_common_la_LDFLAGS =
+ if HAVE_WIN32
+ noinst_LTLIBRARIES += libd3d11_common.la
+ endif
diff --git a/vlc-git/patches/patch-modules_codec_x264.c b/vlc-git/patches/patch-modules_codec_x264.c
new file mode 100644
index 0000000000..febe30f65c
--- /dev/null
+++ b/vlc-git/patches/patch-modules_codec_x264.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- modules/codec/x264.c.orig	2018-03-14 06:17:49.000000000 +0000
++++ modules/codec/x264.c
+@@ -842,7 +842,7 @@ static int  Open ( vlc_object_t *p_this 
+     fullrange |= p_enc->fmt_in.video.b_color_range_full;
+     p_enc->fmt_in.i_codec = fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420;
+     p_sys->i_colorspace = X264_CSP_I420;
+-#if X264_BUILD >= 118
++#if X264_BUILD >= 118 && X264_BUILD < 153
+     char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
+     if( psz_profile )
+     {
diff --git a/vlc-git/patches/patch-modules_control_Makefile.am b/vlc-git/patches/patch-modules_control_Makefile.am
new file mode 100644
index 0000000000..9dcfe69598
--- /dev/null
+++ b/vlc-git/patches/patch-modules_control_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- modules/control/Makefile.am.orig	2018-03-14 06:17:49.000000000 +0000
++++ modules/control/Makefile.am
+@@ -27,7 +27,7 @@ if HAVE_DARWIN
+ libvlc_motion_la_SOURCES += control/unimotion.c control/unimotion.h
+ libvlc_motion_la_CFLAGS = $(AM_CFLAGS) -fconstant-cfstrings
+ endif
+-libvlc_motion_la_LDFLAGS = -static
++libvlc_motion_la_LDFLAGS =
+ noinst_LTLIBRARIES += libvlc_motion.la
+ 
+ libmotion_plugin_la_SOURCES = control/motion.c
diff --git a/vlc-git/patches/patch-modules_demux_Makefile.am b/vlc-git/patches/patch-modules_demux_Makefile.am
new file mode 100644
index 0000000000..2be2ce34c8
--- /dev/null
+++ b/vlc-git/patches/patch-modules_demux_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- modules/demux/Makefile.am.orig	2018-03-14 06:17:49.000000000 +0000
++++ modules/demux/Makefile.am
+@@ -2,7 +2,7 @@ demuxdir = $(pluginsdir)/demux
+ demux_LTLIBRARIES =
+ 
+ libxiph_metadata_la_SOURCES = demux/xiph_metadata.h demux/xiph_metadata.c
+-libxiph_metadata_la_LDFLAGS = -static
++libxiph_metadata_la_LDFLAGS =
+ noinst_LTLIBRARIES += libxiph_metadata.la
+ 
+ libflacsys_plugin_la_SOURCES = demux/flac.c
diff --git a/vlc-git/patches/patch-modules_video__chroma_Makefile.am b/vlc-git/patches/patch-modules_video__chroma_Makefile.am
new file mode 100644
index 0000000000..518254b0b9
--- /dev/null
+++ b/vlc-git/patches/patch-modules_video__chroma_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- modules/video_chroma/Makefile.am.orig	2018-03-14 06:17:50.000000000 +0000
++++ modules/video_chroma/Makefile.am
+@@ -3,7 +3,7 @@ chromadir = $(pluginsdir)/video_chroma
+ libchain_plugin_la_SOURCES = video_chroma/chain.c
+ 
+ libchroma_copy_la_SOURCES = video_chroma/copy.c video_chroma/copy.h
+-libchroma_copy_la_LDFLAGS = -static
++libchroma_copy_la_LDFLAGS =
+ noinst_LTLIBRARIES += libchroma_copy.la
+ 
+ libchroma_omx_plugin_la_SOURCES = video_chroma/omxdl.c
diff --git a/vlc-git/patches/patch-modules_video__filter_Makefile.am b/vlc-git/patches/patch-modules_video__filter_Makefile.am
new file mode 100644
index 0000000000..b84fb53991
--- /dev/null
+++ b/vlc-git/patches/patch-modules_video__filter_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- modules/video_filter/Makefile.am.orig	2018-03-14 06:17:50.000000000 +0000
++++ modules/video_filter/Makefile.am
+@@ -120,7 +120,7 @@ video_filter_LTLIBRARIES += libci_filter
+ endif
+ 
+ libdeinterlace_common_la_SOURCES = video_filter/deinterlace/common.c video_filter/deinterlace/common.h
+-libdeinterlace_common_la_LDFLAGS = -static
++libdeinterlace_common_la_LDFLAGS =
+ noinst_LTLIBRARIES += libdeinterlace_common.la
+ 
+ libdeinterlace_plugin_la_SOURCES = \