diff options
| author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-26 13:21:47 +0200 |
|---|---|---|
| committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-26 13:21:47 +0200 |
| commit | 91e4a0a9be2899c65ec96ee87ae3e0a9e1aa6ba4 (patch) | |
| tree | 371da6f1c2cae3647dcfc8120aed4c2da962e379 | |
| parent | aa6604f0372b584fa06f4751c5d5d4a4ba084144 (diff) | |
| download | aports-91e4a0a9be2899c65ec96ee87ae3e0a9e1aa6ba4.tar.bz2 aports-91e4a0a9be2899c65ec96ee87ae3e0a9e1aa6ba4.tar.xz | |
main/vlc: fix build
| -rw-r--r-- | main/vlc/APKBUILD | 26 | ||||
| -rw-r--r-- | main/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch | 29 |
2 files changed, 3 insertions, 52 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 9b8a45bd7d..dd73a71d18 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -69,11 +69,6 @@ makedepends=" xcb-util-keysyms-dev " source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pkgver.tar.xz - uclibc-inhibit-spawn.patch - uclibc-no-xscreensaver.patch - uclibc3.patch - vlc-2.0.8-Fix-live555-breakage-in-last-update.patch - vlc.trigger " _builddir="$srcdir"/$pkgname-$_ver @@ -224,21 +219,6 @@ daemon() { install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc } -md5sums="8c77bda671821f5b9ede96b6816e2ade vlc-2.1.0.tar.xz -28349b8239fdd6987fbe0ca2c758517f uclibc-inhibit-spawn.patch -b84c5a9121440b6a1dcf28792d783eb8 uclibc-no-xscreensaver.patch -94f11ec8394775018222781a0c875444 uclibc3.patch -e592efe7bb65291a84f99cfaa3a9f8a2 vlc-2.0.8-Fix-live555-breakage-in-last-update.patch -350b30698eb784def7d19446eb1d6c81 vlc.trigger" -sha256sums="d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 vlc-2.1.0.tar.xz -e645f2b7457aaa18d7215225a3db116dac6312f2853933d58330d6053fba969f uclibc-inhibit-spawn.patch -1ecd057c4f6cc02c9a98b48b96c03968d44a8a1d92cb6a62afe4dc48446614a1 uclibc-no-xscreensaver.patch -6eaa71e580ea5357f10cc6ffb281d38b22b0e88f30915d028079c0c93a4bc32c uclibc3.patch -5d34628ba57fea33302417e4f363c049e71d0b9eec4ad544b4da78008fbeae6e vlc-2.0.8-Fix-live555-breakage-in-last-update.patch -0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a vlc.trigger" -sha512sums="abf397e1382289d579fec3dc540885c45ba055f158f7c248c5de27a7c50dac5a4c317145c4a786ed3819a9199fc304fa8f43ccde8c33c2938d40c805e7e9b124 vlc-2.1.0.tar.xz -2fa65852a18d4bf0cb0cfd92282b3242b7dfec6a5d1e4550fb8a119a444d174bf97781bd90a3ada31a37a0988e7332aa1692a84a6cf5f1f46747d5fd08d4421f uclibc-inhibit-spawn.patch -66765557f40ec5a48507c2c3a0f82a3245ac19a83b2aa5b4b4b66335b4ca12a3d359a0c9b7a981039fb9ecf842c97ec11633c9c2fa1834f2c7c98ac088a2c891 uclibc-no-xscreensaver.patch -14a01f2cf686903c03c4f3b2783487baa0c4ccb89d570c7201f829b00a8e1a0531f7267f28364f6c5f5e52c694183b9b8d0f514f16803e7bace61b5d7cfacd50 uclibc3.patch -58a5aefe3aefb908df2346b8184756d53aa2dc8300954d99575aa5293997f2e987958943b67453cf71fd4c0332271613f13d02da373653b53c4dee9bc763d18e vlc-2.0.8-Fix-live555-breakage-in-last-update.patch -a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc vlc.trigger" +md5sums="8c77bda671821f5b9ede96b6816e2ade vlc-2.1.0.tar.xz" +sha256sums="d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 vlc-2.1.0.tar.xz" +sha512sums="abf397e1382289d579fec3dc540885c45ba055f158f7c248c5de27a7c50dac5a4c317145c4a786ed3819a9199fc304fa8f43ccde8c33c2938d40c805e7e9b124 vlc-2.1.0.tar.xz" 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 deleted file mode 100644 index 3006cbc8d3..0000000000 --- a/main/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - |