Stab at resolving bug 424477 - added makefile patch that 1.7.6 ebuild wants.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 34 insertions, 9 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 660992adba82..e51325fc95fc 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.6 2012/07/02 04:00:20 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.7 2012/07/02 15:20:40 mattm Exp $
+
+  02 Jul 2012; Matthew Marlowe <mattm@gentoo.org>
+  +files/makemkv-1.7.6-makefile.linux.patch:
+  Stab at resolving bug 424477 - added makefile patch that 1.7.6 ebuild wants.
 
 *makemkv-1.7.6 (02 Jul 2012)
 
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 24c397991bc5..e64f1aaf2d5a 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -3,22 +3,23 @@ Hash: SHA1
 
 AUX makemkv-1.6.16-makefile.linux.patch 579 RMD160 2757c09928bcded8fa385eb906ec19acf56e7bd3 SHA1 b05913e83d079bec55ee1e8e0705eefc1dc9c26f SHA256 ebf3085044c4d1b6c1a06e48de5ab7d601944de42835d421484d6ddb5d15f535
 AUX makemkv-1.7.4-makefile.linux.patch 582 RMD160 f837598caed165a3ac4f64accd3c8826568c7de3 SHA1 ff119e840acb72160a01fe2d0d159dac1caa8583 SHA256 4378b25a34ed9b3dedcdddd58bbe533c46c5582144ee5a1d15cdc49d7111fb52
+AUX makemkv-1.7.6-makefile.linux.patch 685 RMD160 3a816b3c63f3761d4ccb19cbfe5dc9de77d9c900 SHA1 e1ec99b7b16811ff209791d9087ddb9a05226bff SHA256 ef6aaf7e981fdf92b8efe9d49be8a6d542be146faa628415a23911b45165e403
 DIST makemkv-bin-1.7.6.tar.gz 6575452 RMD160 89f96ee623ae386e8e383c5039a10a1efe80b7a3 SHA1 d97f7ed448cd4833d31c31a1a7b66875e1e8513e SHA256 b54cbffb53a82948b9e99c83b662f910c72f310135d4063bc751900250a7d5d0
 DIST makemkv-oss-1.7.6.tar.gz 482065 RMD160 62301e0fb27755b7fe16fc85d6cfb5065b5835b0 SHA1 4da0d3faa5b2ad3bba5f552b0540c587259e39c1 SHA256 037e2073dd5391fe14e1edeaaabdead4a659e55307d1dd90a86c7289fd81d1b6
 DIST makemkv_v1.7.4_bin.tar.gz 6691976 RMD160 12bbd1a5e50b843168eb85d7cb81010abdc42831 SHA1 ee6bf1452b75e4d16c4974879437c4781dc327f3 SHA256 0d0c14243fc8936792f0768d0c67682a071f79af489457f6a53826b543ad502a
 DIST makemkv_v1.7.4_oss.tar.gz 480897 RMD160 c3d327f8723743c28804c27749581f1536906304 SHA1 d53603799936c1c351d806ec97544e39b3e3365d SHA256 14be0175cce35fae31d2e175db5789b561b1859f125b2cd52af77ba180ec2ba1
 EBUILD makemkv-1.7.4-r1.ebuild 2792 RMD160 0a0603610b59a0a20e10298cad848e9d28a14e36 SHA1 1e3206b94eb71183099286c104496d9b3d9b589f SHA256 4415b7f5e60a78976a80805f91da564a8c6d95d37a94891916c73bc3d78f69c3
 EBUILD makemkv-1.7.6.ebuild 2787 RMD160 9b9d5d8ead58f6b892123dabfdc0512831243e9d SHA1 725f320061c185ffc80f42657f2906661b77dfd3 SHA256 f6574239456bf013322bf2ac701dc047bf16d07c0734e682628482c9382482b8
-MISC ChangeLog 1448 RMD160 4f44a0f932180e2b8fe3c433e34b8c87f25cf378 SHA1 1fc3efedbc49876b16789732c8c87b3fb68507ff SHA256 ea10689b857a424db36cbece463aa502fe8e58a67a63acd752bcb55a535d3317
+MISC ChangeLog 1623 RMD160 716d4c2bcf7fd75a87f72ceaf36d7dca2c3afb31 SHA1 b1a8fc4c0c20c75c99f49536fecc87e2d7b9efff SHA256 a41c7d899b05dd7e983c454e9451a2eb5bd839e3107cafd6b1106b1c000f034b
 MISC metadata.xml 260 RMD160 2cfb583c5df98eb9a274ae051562f67b584730fc SHA1 0262c9db67ad475dcd4d2bf94619a7bc22e5d18c SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP8RzfAAoJEC1LWXx4YDenX/QIAIC9GJeLKHT2AAj7m7hbdjjO
-+99J3yT9bLyVzOmZbew9TWUaGg8bmcaVBExRz+R8Ensr6+WYhixe2oBsSp8JTp8z
-fyFNb7pOWB2wI7jbb7aZi+tFT1vvRkSV3n14R5MhqxiqYhMRlTAZVMQyd7XOSwsu
-3R9N8Svy+k5jv0dibSjIKcR4RCpmiv06RLknDjzMkKraXecGzWlLvHWH2foF1tdF
-7gyg0qtmQySekjpusBAJOAV9UNi9o9D3bnr8yPySDn8S/jmCdjXXb3kUo8t2ytER
-pkWaJr27W04YJVIpFTX1SCwhtahM3UVvSSiHxXJ8897APrqUtb1IeX/Olp8hgJs=
-=Chiy
+iQEcBAEBAgAGBQJP8bxTAAoJEC1LWXx4YDenHsAIAIuRGnsgejcvLcj6QizZ5Y1j
+Dk70qqobsMoekSbrMGH6Prj5iFskJJ8NMIVoRp70AI+egr/VtbLHsLp2J3lVGORV
+6bdOgyg2ySyJFMh/eUF2cB2rBI9LkEXyHx3LsCb7/hKc8tr/RH+C2q6/isWeSNdv
+Y+QYAAtJ1Dfa6zIrMSZVJHMLAhhiOK9nLRuDaROdMV9jHXiu7M9/k8TVxoI1Desa
+OQN1ifR2zU1yzSW07BIJkgnZdTqyLQU1vI4A21nzwO6tMQe9TZcjS7StZBqKWYuO
+Onqq+UTOyt175Jq6ZBgC0HxgtNvsgr/NDGjuTKYNzGJrUeKJB8Gr7Cf86a3U3B0=
+=8rfd
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/files/makemkv-1.7.6-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.7.6-makefile.linux.patch
new file mode 100644
index 000000000000..689fdc9e7215
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-1.7.6-makefile.linux.patch
@@ -0,0 +1,20 @@
+--- makemkv-oss-1.7.6/makefile.linux.orig       2012-06-29 04:17:45.000000000 -0700
++++ makemkv-oss-1.7.6/makefile.linux    2012-07-02 08:12:16.388552664 -0700
+@@ -8,7 +8,7 @@
+ MOC=moc
+ endif
+ 
+-CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
++CXXOPTS=-D_GNU_SOURCE -D_linux_
+ 
+ BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine)
+ BUILDINFO_BUILD_DATE=$(shell date)
+@@ -38,7 +38,7 @@
+        install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png
+ 
+ out/%: out/%.full
+-       objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
++       objcopy --discard-all $< $@ 
+ 
+ out/libdriveio.so.0.full:
+        mkdir -p out