Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
Date: Mon, 12 Oct 2020 21:08:56
Message-Id: 1602536904.43a573c4850f15bd97b15db5b481eebf9c4d9f28.chewi@gentoo
1 commit: 43a573c4850f15bd97b15db5b481eebf9c4d9f28
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 12 21:08:24 2020 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 12 21:08:24 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a573c4
7
8 media-video/makemkv: Patch around missing quotes in configure
9
10 I have reported this upstream and I believe they will use a proper
11 autoconf macro to set the -std flag in future.
12
13 Closes: https://bugs.gentoo.org/746368
14 Suggested-By: Matt Whitlock
15 Package-Manager: Portage-3.0.8, Repoman-3.0.1
16 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
17
18 .../makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch | 12 ++++++++++++
19 media-video/makemkv/makemkv-1.15.3.ebuild | 6 +++++-
20 2 files changed, 17 insertions(+), 1 deletion(-)
21
22 diff --git a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
23 new file mode 100644
24 index 00000000000..3dfe508a24a
25 --- /dev/null
26 +++ b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
27 @@ -0,0 +1,12 @@
28 +diff -Naur makemkv-oss-1.15.3~/configure makemkv-oss-1.15.3/configure
29 +--- makemkv-oss-1.15.3~/configure 2020-10-01 13:59:27.000000000 +0000
30 ++++ makemkv-oss-1.15.3/configure 2020-10-03 20:49:45.588257151 +0000
31 +@@ -11726,7 +11726,7 @@
32 + ENABLE_DEBUG=$enable_debug
33 +
34 +
35 +-if test -z $CXXFLAGS; then
36 ++if test -z "$CXXFLAGS"; then
37 + CXXFLAGS='-std=c++11'
38 + fi
39 +
40
41 diff --git a/media-video/makemkv/makemkv-1.15.3.ebuild b/media-video/makemkv/makemkv-1.15.3.ebuild
42 index 4d94806d84d..3c81c3d3988 100644
43 --- a/media-video/makemkv/makemkv-1.15.3.ebuild
44 +++ b/media-video/makemkv/makemkv-1.15.3.ebuild
45 @@ -47,7 +47,11 @@ BDEPEND="
46
47 CONFIG_CHECK="~CHR_DEV_SG"
48 S="${WORKDIR}/${MY_P}"
49 -PATCHES=( "${FILESDIR}"/${PN}-path.patch )
50 +
51 +PATCHES=(
52 + "${FILESDIR}"/${PN}-path.patch
53 + "${FILESDIR}"/${PV}-configure-CXXFLAGS-quoting.patch
54 +)
55
56 src_configure() {
57 # See bug #439380.