From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AA78139085 for ; Thu, 22 Dec 2016 23:27:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E1CC234017; Thu, 22 Dec 2016 23:27:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E56B234017 for ; Thu, 22 Dec 2016 23:27:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C365B341117 for ; Thu, 22 Dec 2016 23:27:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92C5924DE for ; Thu, 22 Dec 2016 23:27:05 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1482449177.3ce567c4fec904f50c03d3ef7020d4e13106c206.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/makemkv/files/makemkv-makefile.patch X-VCS-Directories: media-video/makemkv/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 3ce567c4fec904f50c03d3ef7020d4e13106c206 X-VCS-Branch: master Date: Thu, 22 Dec 2016 23:27:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9cf9817-6b87-4344-b5bb-4c0f3ffd43c5 X-Archives-Hash: 35634301d8d137e1a5927598cbe4d433 commit: 3ce567c4fec904f50c03d3ef7020d4e13106c206 Author: James Le Cuirot gentoo org> AuthorDate: Thu Dec 22 23:26:17 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Dec 22 23:26:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce567c4 media-video/makemkv: multilib-strict fix, closes #603428 Package-Manager: portage-2.3.3 media-video/makemkv/files/makemkv-makefile.patch | 25 ++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/media-video/makemkv/files/makemkv-makefile.patch b/media-video/makemkv/files/makemkv-makefile.patch index 224273a..bc057ca 100644 --- a/media-video/makemkv/files/makemkv-makefile.patch +++ b/media-video/makemkv/files/makemkv-makefile.patch @@ -1,6 +1,23 @@ ---- makemkv-oss-1.9.3/Makefile.in.orig 2015-06-02 13:34:00.000000000 +0200 -+++ makemkv-oss-1.9.3/Makefile.in 2015-06-04 12:32:29.752291023 +0200 -@@ -47,7 +47,7 @@ +--- makemkv-oss-1.10.3/Makefile.in.orig 2016-12-11 16:14:27.000000000 +0000 ++++ makemkv-oss-1.10.3/Makefile.in 2016-12-22 23:11:24.248995344 +0000 +@@ -6,11 +6,12 @@ + + CFLAGS=@CFLAGS_OPT@ -D_linux_ -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS + DESTDIR=@DESTDIR@ +-PREFIX=@prefix@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ + ENABLE_GUI=@ENABLE_GUI@ +-LIBDIR=$(PREFIX)/lib +-BINDIR=$(PREFIX)/bin +-DATADIR=$(PREFIX)/share ++LIBDIR=@libdir@ ++BINDIR=@bindir@ ++DATADIR=@datadir@ + FFMPEG_CFLAGS=@ffmpeg_CFLAGS@ + FFMPEG_LIBS=@ffmpeg_LIBS@ + INSTALL=@INSTALL@ +@@ -47,7 +46,7 @@ endif out/%: out/%.full @@ -9,7 +26,7 @@ out/libdriveio.so.0.full: mkdir -p out -@@ -91,5 +91,5 @@ +@@ -91,5 +90,5 @@ tmp/image_data.o : makemkvgui/bin/image_data.bin mkdir -p tmp