diff options
Diffstat (limited to 'main/vlc')
| -rw-r--r-- | main/vlc/APKBUILD | 16 | ||||
| -rw-r--r-- | main/vlc/flac-1.3.patch | 40 | ||||
| -rw-r--r-- | main/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch | 29 |
3 files changed, 37 insertions, 48 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index bacdb28a1a..b85a7c1598 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vlc -pkgver=2.0.7 +pkgver=2.0.8 _pkgver=${pkgver/_/-} pkgrel=0 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" @@ -71,7 +71,7 @@ source="http://download.videolan.org/pub/videolan/$pkgname/$_pkgver/$pkgname-$_p uclibc-inhibit-spawn.patch uclibc-no-xscreensaver.patch uclibc3.patch - flac-1.3.patch + vlc-2.0.8-Fix-live555-breakage-in-last-update.patch vlc.trigger " @@ -223,21 +223,21 @@ daemon() { install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc } -md5sums="3b0e465b0990097b65abaf3e25589957 vlc-2.0.7.tar.xz +md5sums="6445eb55aa087f30abe27423535e1ab8 vlc-2.0.8.tar.xz 28349b8239fdd6987fbe0ca2c758517f uclibc-inhibit-spawn.patch b84c5a9121440b6a1dcf28792d783eb8 uclibc-no-xscreensaver.patch 94f11ec8394775018222781a0c875444 uclibc3.patch -f46cd60450e25f764c66b8713a8546b1 flac-1.3.patch +e592efe7bb65291a84f99cfaa3a9f8a2 vlc-2.0.8-Fix-live555-breakage-in-last-update.patch 350b30698eb784def7d19446eb1d6c81 vlc.trigger" -sha256sums="243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314 vlc-2.0.7.tar.xz +sha256sums="a02af28345d4560e718066623f881b6eaf29ddce3b778fbf839e08b2415d1702 vlc-2.0.8.tar.xz e645f2b7457aaa18d7215225a3db116dac6312f2853933d58330d6053fba969f uclibc-inhibit-spawn.patch 1ecd057c4f6cc02c9a98b48b96c03968d44a8a1d92cb6a62afe4dc48446614a1 uclibc-no-xscreensaver.patch 6eaa71e580ea5357f10cc6ffb281d38b22b0e88f30915d028079c0c93a4bc32c uclibc3.patch -7b5c5a8e4198642f7da3210a038a1ac60b41b93439f0c582304ec2efb448b83e flac-1.3.patch +5d34628ba57fea33302417e4f363c049e71d0b9eec4ad544b4da78008fbeae6e vlc-2.0.8-Fix-live555-breakage-in-last-update.patch 0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a vlc.trigger" -sha512sums="6e8e55e40425cc9d48a174374a6b690f50d0a7cfed9a1b253786c9e7e52658fcd4feda94a5d4f66c58260b517248041b3f393af5171a42bf3a3e1475828b1ab2 vlc-2.0.7.tar.xz +sha512sums="ef096dd71b7e019ea96b1e75235f2e46377ae4c27913486233bcec15c91239bf32b9634b1c81b8cd665512e00e2ed29c3d2bf70244a681298b15d8affa0a939c vlc-2.0.8.tar.xz 2fa65852a18d4bf0cb0cfd92282b3242b7dfec6a5d1e4550fb8a119a444d174bf97781bd90a3ada31a37a0988e7332aa1692a84a6cf5f1f46747d5fd08d4421f uclibc-inhibit-spawn.patch 66765557f40ec5a48507c2c3a0f82a3245ac19a83b2aa5b4b4b66335b4ca12a3d359a0c9b7a981039fb9ecf842c97ec11633c9c2fa1834f2c7c98ac088a2c891 uclibc-no-xscreensaver.patch 14a01f2cf686903c03c4f3b2783487baa0c4ccb89d570c7201f829b00a8e1a0531f7267f28364f6c5f5e52c694183b9b8d0f514f16803e7bace61b5d7cfacd50 uclibc3.patch -359660a3cff988899f09b2f34b833280f2749bead81589d9a387e1e7ca4c1a5f595016c36e0da95c595e7f53e3c4bb30a56db6145640fabbc3556b20ef3a7c6d flac-1.3.patch +58a5aefe3aefb908df2346b8184756d53aa2dc8300954d99575aa5293997f2e987958943b67453cf71fd4c0332271613f13d02da373653b53c4dee9bc763d18e vlc-2.0.8-Fix-live555-breakage-in-last-update.patch a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc vlc.trigger" diff --git a/main/vlc/flac-1.3.patch b/main/vlc/flac-1.3.patch deleted file mode 100644 index 001bd2d7e0..0000000000 --- a/main/vlc/flac-1.3.patch +++ /dev/null @@ -1,40 +0,0 @@ -From patchwork Wed Jan 2 21:44:33 2013 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: Fix build with unreleased FLAC 1.3.x -Date: Wed, 02 Jan 2013 20:44:33 -0000 -From: Nicolas Chauvet <kwizart@gmail.com> -X-Patchwork-Id: 889 -Message-Id: <1357163073-31548-1-git-send-email-kwizart@gmail.com> -To: vlc-devel@videolan.org - -The issue was initialy reported here: -http://bugzilla.redhat.com/891123 - -FLAC upstream has always expected to include <FLAC/ suffix -for included headers as shown in examples/c/decode/file/main.c - -The FLAC suffix will not be be made available in the flac.pc -for the next release: -http://lists.xiph.org/pipermail/flac-dev/2012-April/003355.html - ---- -modules/codec/flac.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/codec/flac.c b/modules/codec/flac.c -index 4cfbfa9..543e8bb 100644 ---- a/modules/codec/flac.c -+++ b/modules/codec/flac.c -@@ -37,8 +37,8 @@ - #include <vlc_plugin.h> - #include <vlc_codec.h> - --#include <stream_decoder.h> --#include <stream_encoder.h> -+#include <FLAC/stream_decoder.h> -+#include <FLAC/stream_encoder.h> - - #include <vlc_block_helper.h> - #include <vlc_bits.h> diff --git a/main/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/main/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch new file mode 100644 index 0000000000..3006cbc8d3 --- /dev/null +++ b/main/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch @@ -0,0 +1,29 @@ +From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Thu, 25 Jul 2013 01:14:32 +0200 +Subject: [PATCH] Fix live555 breakage in last update + +--- + modules/demux/live555.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp +index 9e02630..7a1ab16 100644 +--- a/modules/demux/live555.cpp ++++ b/modules/demux/live555.cpp +@@ -243,7 +243,11 @@ public: + char const* applicationName, portNumBits tunnelOverHTTPPortNum, + demux_sys_t *p_sys) : + RTSPClient( env, rtspURL, verbosityLevel, applicationName, +- tunnelOverHTTPPortNum ) ++ tunnelOverHTTPPortNum ++#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800 ++ , -1 ++#endif ++ ) + { + this->p_sys = p_sys; + } +-- +1.8.3.4 + |