| 1 |
commit: 38d31a9754e26f7db69cd86383d0db30caf583c5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 13 23:31:41 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 13 23:38:21 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d31a97 |
| 7 |
|
| 8 |
media-video/vlc: Compact lines |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-video/vlc/vlc-3.0.0-r1.ebuild | 7 ++++--- |
| 13 |
media-video/vlc/vlc-3.0.9999.ebuild | 7 ++++--- |
| 14 |
media-video/vlc/vlc-9999.ebuild | 7 ++++--- |
| 15 |
3 files changed, 12 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/vlc/vlc-3.0.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild |
| 18 |
index db7fcef6308..2690e5572c6 100644 |
| 19 |
--- a/media-video/vlc/vlc-3.0.0-r1.ebuild |
| 20 |
+++ b/media-video/vlc/vlc-3.0.0-r1.ebuild |
| 21 |
@@ -254,7 +254,8 @@ S="${WORKDIR}/${MY_P}" |
| 22 |
src_prepare() { |
| 23 |
default |
| 24 |
|
| 25 |
- has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch |
| 26 |
+ has_version '>=net-libs/libupnp-1.8.0' && \ |
| 27 |
+ eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch |
| 28 |
|
| 29 |
# Bootstrap when we are on a git checkout. |
| 30 |
if [[ ${PV} = *9999 ]] ; then |
| 31 |
@@ -458,8 +459,8 @@ src_configure() { |
| 32 |
econf ${myeconfargs[@]} |
| 33 |
|
| 34 |
# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. |
| 35 |
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. |
| 36 |
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file |
| 37 |
+ # Other values may break the build (bug 523144), so definition should not be removed. |
| 38 |
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h |
| 39 |
sed -i '1i#undef _FORTIFY_SOURCE' config.h || die |
| 40 |
} |
| 41 |
|
| 42 |
|
| 43 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 44 |
index db7fcef6308..2690e5572c6 100644 |
| 45 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 46 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 47 |
@@ -254,7 +254,8 @@ S="${WORKDIR}/${MY_P}" |
| 48 |
src_prepare() { |
| 49 |
default |
| 50 |
|
| 51 |
- has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch |
| 52 |
+ has_version '>=net-libs/libupnp-1.8.0' && \ |
| 53 |
+ eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch |
| 54 |
|
| 55 |
# Bootstrap when we are on a git checkout. |
| 56 |
if [[ ${PV} = *9999 ]] ; then |
| 57 |
@@ -458,8 +459,8 @@ src_configure() { |
| 58 |
econf ${myeconfargs[@]} |
| 59 |
|
| 60 |
# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. |
| 61 |
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. |
| 62 |
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file |
| 63 |
+ # Other values may break the build (bug 523144), so definition should not be removed. |
| 64 |
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h |
| 65 |
sed -i '1i#undef _FORTIFY_SOURCE' config.h || die |
| 66 |
} |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 70 |
index 000f28b2d09..20e11569243 100644 |
| 71 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 72 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 73 |
@@ -254,7 +254,8 @@ S="${WORKDIR}/${MY_P}" |
| 74 |
src_prepare() { |
| 75 |
default |
| 76 |
|
| 77 |
- has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch |
| 78 |
+ has_version '>=net-libs/libupnp-1.8.0' && \ |
| 79 |
+ eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch |
| 80 |
|
| 81 |
# Bootstrap when we are on a git checkout. |
| 82 |
if [[ ${PV} = *9999 ]] ; then |
| 83 |
@@ -458,8 +459,8 @@ src_configure() { |
| 84 |
econf ${myeconfargs[@]} |
| 85 |
|
| 86 |
# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. |
| 87 |
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. |
| 88 |
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file |
| 89 |
+ # Other values may break the build (bug 523144), so definition should not be removed. |
| 90 |
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h |
| 91 |
sed -i '1i#undef _FORTIFY_SOURCE' config.h || die |
| 92 |
} |
Archives