summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2014-05-31 14:45:27 +0000
committerTom Wijsman <tomwij@gentoo.org>2014-05-31 14:45:27 +0000
commit3728df0d7e3b2838380b90cb130d531cf0ff298b (patch)
tree758a12fc0e733713c619f7171e9b807724665d53
parentFix segfault, see ChangeLog for more (diff)
downloadhistorical-3728df0d7e3b2838380b90cb130d531cf0ff298b.tar.gz
historical-3728df0d7e3b2838380b90cb130d531cf0ff298b.tar.bz2
historical-3728df0d7e3b2838380b90cb130d531cf0ff298b.zip
Remove Qt5 MOC/UIC export code from live version, as it is automatically detected by autoconf; fixes bug #511776, reported by Uwe L. Korn (uwelk).
Package-Manager: portage-HEAD/cvs/Linux x86_64 Manifest-Sign-Key: 0x6D34E57D
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/Manifest18
-rw-r--r--media-video/vlc/vlc-9999.ebuild8
3 files changed, 15 insertions, 17 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 375a77667da8..b9d954b3d62e 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.902 2014/04/25 00:35:39 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.903 2014/05/31 14:45:22 tomwij Exp $
+
+ 31 May 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
+ Remove Qt5 MOC/UIC export code from live version, as it is automatically
+ detected by autoconf; fixes bug #511776, reported by Uwe L. Korn (uwelk).
25 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+files/vlc-2.0.7-include-flac-1.3.x-support.patch, vlc-2.0.5.ebuild,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 8a31047c99fe..ec0c79ea2114 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -33,18 +33,18 @@ EBUILD vlc-2.1.1.ebuild 14111 SHA256 064cd3dcc88fbf40334d9345c3fb801a4f1cebc2663
EBUILD vlc-2.1.2.ebuild 14111 SHA256 bacaf3cd5b1182023386370d5fcc8c00484c8f258095413466e48277dc80cfb8 SHA512 cc29d52ef9ff0dc2eb2474baa57720d3db3788860c0051fe59d3d2ed312242186d25b49e385b5a90c2f48950c1cceb2bb85e4ba9b06c8d550fec2272cf9332ac WHIRLPOOL 5224e7ecf47f38b6ae2e5dedb1c0bed9b4d866d33234d4f501d6ab9dba6d581e4061b9bf2471bcc5a2e4ff1aeb3fdc5447352ba243746d6f6fa702d62d6a9927
EBUILD vlc-2.1.4.ebuild 14486 SHA256 c721e2a128eae51845d8c1d0da6445c1e2b0bb9af759fb1bbfa33c1dfc11d81d SHA512 246751eff0f68b45eb98e837c7820f2fdd30c916520abd8a7bf192a9ad88c9e1d9ab3c76d296909ca90a777c64e4a6380d61ff771ce0a07d596455bc7627d775 WHIRLPOOL e13d9462e210b465d106794901c6eb1575ef17efc5174f1e836c99e556673159e65cd0c906d43cfcfb72a0661fcc1150e5b623270a80c3f6632d5011c2c267bc
EBUILD vlc-2.1.9999.ebuild 14502 SHA256 d8e0953c9d87a504ab568deb78c9b45c389ee8ece76254462cfe505dfb53fc33 SHA512 0d4e03ad3f20dde3a23d5ce5d0ac74aa22dec39ea01ea167d43f734bd22f1aea6d755446954154683818f06a4934189f1a6bea842ef6a26ab3b1cb25c0041dc8 WHIRLPOOL 9bd9cf0f3cc0937343ea2be90803cb77f7fbd058cc3e9f882b8d0c6f7d9b6169206cfd343fe9d727c330c8f1c6b4f5e0ce7a04004c50f6bc4c3e0d4a91480721
-EBUILD vlc-9999.ebuild 14866 SHA256 2ff7851453e92c6b814f1c0ea0983a81d3de029695231cbce504fb44b15de967 SHA512 1f344f50550039b51e0cd1dfe1e8173424106c33bbc4d2a442e12a7585c5d3e39e78587a1a415de8014d2f98d675db3ddb88a24c909defa78f14e15c9cc597d6 WHIRLPOOL a58a7cdd97be07f0829fdfba3e5f9687483ecf4dc6f5e87406554fc058d6319c34234c490050114a6c806bff724718d5cfe89668b1c27ba6baed9076ae1635f7
-MISC ChangeLog 27131 SHA256 aabe77fbb081160094c235c39bef8a4b48c460ad0f9c0d88fd5d2a953c640b2e SHA512 5ff0abf28d3d65ae5b80b17e3a7fe45f25c3f7447b94ea51d56fea670b0db2addb9c27fc032479a06b6830f6d11cf4591905d6b46e59a87d9872c0cd6dec88c5 WHIRLPOOL a787129bd19babc35b070508986de1890e5aaeb5ec94a0c79799bd956f690bc2d13bfd41787761b619db78ad3fd0347653c15580391adfcc250e01c0e549f803
+EBUILD vlc-9999.ebuild 14746 SHA256 befed7dbdb6f8f2ce45fdd2433be284839d720ff04c97eedfd91ab7d4e55d93a SHA512 4d46e022beff609c9ac27510e2c5f3ce3219f5b39eed05c4f7fe4b42f4fd82bc551098bf7ec2e3d8e6341aa570ceca477c0d690d3f0c37f1d1a656968bec459b WHIRLPOOL b45f1c7a2e798365fb2d218376c0bb84d1a21d36ba7e401a5449d28eaa32467ac8e7886776e6107fcf7146ea42dec8a2df66e354dccf72f3837efe0f876f87ca
+MISC ChangeLog 27347 SHA256 e507bc189ed363c4ad977d8d6588ca2f944560be60199b31e53af36f411df452 SHA512 d79bddc1ae663eba0d1d2aadc144cd94542a138fda14dc7a4e62cb3409ee13d9de181c260093279cdd38ae976a11461668316842398bd6246bf9bbef3f1e6249 WHIRLPOOL 0841b7bd853eb663f521c5130c9586bb0f162c6a5c79e3ad75a37a7f0e5ba50772baedac5bba47dcf72f1f5eb4c34e403f27aa5f5d36aafe82bed47805f16cb8
MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
MISC metadata.xml 7078 SHA256 06f15f0f664689d21c79529dcd73781bc7be5c087df60cb7512c634445ab62bd SHA512 0186ee55a67cc50a935a7fb39bcbc3119165f27c342bef97695262c6cebf05a792babd899a7933dc79e2255b01d26b9f737c1f55b2b329078edeac3ab4a57319 WHIRLPOOL 674a810ff112b97d341e2453d97d15f4e82bddbf83c61baa970e19ebdf45d3193bd7509f889fea72c309a64146c2879e1bedcb0f9d0b18a3c71fef3990b080c9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJTWa2jAAoJEJWyH81tNOV9wVEH/15h0dp4mFQIeKSSkOohQriI
-/netr4KtCTFhHoNF1p0Ln1U3IRY8zJvWXAHsY5Dinxcqlr1UWhIwOwsn76Ee1nKk
-wAp1nqEJ/bdRY+dA3olOT04ptIYi9qHKHkhpSz/OBaONUJVvkoVNTRRPj/FzorvZ
-skCZN7OYBsaZCAqS+5FnDjjHkfqQfeJ7t6qYybmUeKGBUAnK1N30qG8Wn6rgm8HC
-exRUZKZ6MsQJyRtuf0PAwDKc8cod/vU3kpca9dJ+kDNzOnq1ulIuGbeYF/7294Mg
-rzzeEFeDN/Cc+BdDEWqX+AKZ4J7vkNrkk4oinyn1fKh+ClU/MCaQhoD0+hxSozc=
-=KbYv
+iQEcBAEBCAAGBQJTierbAAoJEJWyH81tNOV9zpIH/2QQwGe6VVu4GdbEKaIP0e+x
+15Lj23dKuQQXVCP+Z6kamUFciG7lb+qLs3AR0qm0b+CJlGsDsPXht7h8qucArx7S
+ywJENI4x9BPxlkm7Zn1TNvV9+MB+TAOEk+bSJYZcwFYHt/Cx/wcIBLjvLbMgQUFS
+4iil/EKOMzimi+9ZLngSnzcsJVoItIc0t2MiXkz2n1FQP50RBbd97MU+9w+jsPKo
+s2BhwSoSeT9d12+OAuUxSkebID86iYSUOZ+AJPD3fUj4MHWVT1LdtF9oKdgPCeNx
+X9OoAFWbWluB4PwFaWmZTSOCQLqTgjW/BzeFmiHW/H38DDCuJIS0W6BhCUQeP6o=
+=QNfs
-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index b10bd7251a5a..219bbbb4ed77 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.219 2014/04/23 13:52:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.220 2014/05/31 14:45:22 tomwij Exp $
EAPI="5"
@@ -209,12 +209,6 @@ src_unpack() {
}
src_prepare() {
- # Support for Qt5.
- if use qt5 ; then
- export UIC="/usr/lib64/qt5/bin/uic"
- export MOC="/usr/lib64/qt5/bin/moc"
- fi
-
# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
#