diff options
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch | 38 | ||||
-rw-r--r-- | media-video/vlc/vlc-3.0.18-r3.ebuild (renamed from media-video/vlc/vlc-3.0.18-r2.ebuild) | 3 | ||||
-rw-r--r-- | media-video/vlc/vlc-3.0.9999.ebuild | 3 | ||||
-rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 2 |
4 files changed, 43 insertions, 3 deletions
diff --git a/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch b/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch new file mode 100644 index 000000000000..6cd7019f6ed0 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch @@ -0,0 +1,38 @@ +Nothing uses this. + +From 6cd8ac42e8c296eb1c9e154b3e99dab8bffcad0a Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Thu, 12 Apr 2018 13:24:38 +0200 +Subject: [PATCH] configure: remove minizip check not referenced anywhere + +(cherry picked from commit d22de99eb8c46786ca2feb4abca2e4f25ceeb0a8) +--- a/configure.ac ++++ b/configure.ac +@@ -890,23 +890,14 @@ AS_IF([test -n "${PKG_CONFIG}" ],[ + + + dnl +-dnl Check for zlib.h and -lz along with system -lminizip if available ++dnl Check for zlib.h and -lz if available + dnl + AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ]) + AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ]) + if test "${have_zlib}" = "yes" + then + VLC_ADD_LIBS([sap],[-lz]) +- PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [ +- AC_CHECK_HEADERS([unzip.h], [ +- have_minizip=yes +- MINIZIP_LIBS="-lminizip -lz" +- ], [ +- have_minizip=no +- ]) +- ]) + fi +-AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) + + + dnl +-- +2.41.0 + diff --git a/media-video/vlc/vlc-3.0.18-r2.ebuild b/media-video/vlc/vlc-3.0.18-r3.ebuild index fda17b56a01a..8090dd85c579 100644 --- a/media-video/vlc/vlc-3.0.18-r2.ebuild +++ b/media-video/vlc/vlc-3.0.18-r3.ebuild @@ -64,7 +64,7 @@ BDEPEND=" RDEPEND=" media-libs/libvorbis net-dns/libidn:= - sys-libs/zlib[minizip] + sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) @@ -234,6 +234,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch + "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch "${FILESDIR}"/${P}-flac-crc.patch ) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 1ada73f5cf53..345109f70eab 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -64,7 +64,7 @@ BDEPEND=" RDEPEND=" media-libs/libvorbis net-dns/libidn:= - sys-libs/zlib[minizip] + sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) @@ -234,6 +234,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch + "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index d3a241d4baf7..712516931946 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -63,7 +63,7 @@ BDEPEND=" RDEPEND=" media-libs/libvorbis net-dns/libidn:= - sys-libs/zlib[minizip] + sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) |