pkgsrc-WIP-changes archive

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

vlc-git: Improve this package



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Mar 18 01:50:15 2018 +0100
Changeset:	8ffb5dc58f70c2c6f54bd28b08293a962b96d8e9

Modified Files:
	vlc-git/Makefile
	vlc-git/distinfo
	vlc-git/patches/patch-modules_access_http_Makefile.am
Removed Files:
	vlc-git/patches/patch-modules_access_Makefile.am
	vlc-git/patches/patch-modules_access_rtp_Makefile.am
	vlc-git/patches/patch-modules_codec_Makefile.am
	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: Improve this package

Require realpath.
Use LIBTOOL_FLAGS=--tag=disable-static to workaround insanity.

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

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

diffstat:
 vlc-git/Makefile                                   |  6 ++++-
 vlc-git/distinfo                                   |  9 +------
 vlc-git/patches/patch-modules_access_Makefile.am   | 13 ---------
 .../patches/patch-modules_access_http_Makefile.am  |  7 +----
 .../patches/patch-modules_access_rtp_Makefile.am   | 13 ---------
 vlc-git/patches/patch-modules_codec_Makefile.am    | 31 ----------------------
 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 ---------
 10 files changed, 7 insertions(+), 124 deletions(-)

diffs:
diff --git a/vlc-git/Makefile b/vlc-git/Makefile
index 5ad6f9d776..dcf8960da3 100644
--- a/vlc-git/Makefile
+++ b/vlc-git/Makefile
@@ -14,7 +14,7 @@ LICENSE=		gnu-gpl-v2
 CONFLICTS=		vlc07-[0-9]* vlc08-[0-9]*
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl pkg-config autoreconf autoconf automake bison autopoint
+USE_TOOLS+=		gmake perl pkg-config autoreconf autoconf automake bison autopoint realpath
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -135,6 +135,10 @@ SUBST_MESSAGE.fnt=	Fixing hardcoded font paths.
 CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 			lib/libvlccore.so*
 
+#BUILD_MAKE_FLAGS=		V=1
+
+LIBTOOL_FLAGS=		--tag=disable-static
+
 pre-configure:
 	${RUN} cd ${WRKSRC} && ${SH} ./bootstrap
 
diff --git a/vlc-git/distinfo b/vlc-git/distinfo
index d88ff7f718..18ba8ff16b 100644
--- a/vlc-git/distinfo
+++ b/vlc-git/distinfo
@@ -6,12 +6,5 @@ SHA512 (vlc-3.0.0.tar.xz) = 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba
 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_access_http_Makefile.am) = 522b08c778ba967e5c86e25d40914b5f55f2a37a
 SHA1 (patch-modules_codec_x264.c) = 575c0efc3d3cbf17c99cd7dcdbc34b84e9e52191
-SHA1 (patch-modules_control_Makefile.am) = f60ae8bb287a83e9b6d655d2c632c7d8927fdcf7
-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-modules_access_Makefile.am b/vlc-git/patches/patch-modules_access_Makefile.am
deleted file mode 100644
index 7bb94c862f..0000000000
--- a/vlc-git/patches/patch-modules_access_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
index 3385664c51..2404d313d0 100644
--- a/vlc-git/patches/patch-modules_access_http_Makefile.am
+++ b/vlc-git/patches/patch-modules_access_http_Makefile.am
@@ -2,7 +2,7 @@ $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 = \
+@@ -16,7 +16,7 @@ libvlc_http_la_SOURCES = \
  	access/http/connmgr.c access/http/connmgr.h
  libvlc_http_la_CPPFLAGS = -Dneedsomethinghere
  libvlc_http_la_LIBADD = \
@@ -11,8 +11,3 @@ $NetBSD$
  	$(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
deleted file mode 100644
index b0e8b7407d..0000000000
--- a/vlc-git/patches/patch-modules_access_rtp_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 91e84ed6ba..0000000000
--- a/vlc-git/patches/patch-modules_codec_Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-$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_control_Makefile.am b/vlc-git/patches/patch-modules_control_Makefile.am
deleted file mode 100644
index 9dcfe69598..0000000000
--- a/vlc-git/patches/patch-modules_control_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 623839303d..0000000000
--- a/vlc-git/patches/patch-modules_demux_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- 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 =
- 
- 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 packetizer/flac.h
diff --git a/vlc-git/patches/patch-modules_video__chroma_Makefile.am b/vlc-git/patches/patch-modules_video__chroma_Makefile.am
deleted file mode 100644
index 518254b0b9..0000000000
--- a/vlc-git/patches/patch-modules_video__chroma_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index b84fb53991..0000000000
--- a/vlc-git/patches/patch-modules_video__filter_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$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 = \


Home | Main Index | Thread Index | Old Index