Duplicating makemkv 1.7.8 patch for 1.8.0, will see how it behaves during testing.

Package-Manager: portage-2.1.11.51/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

3 files changed, 35 insertions, 9 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 97a910dfeacd..af1c8a9eabf3 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.14 2013/02/22 03:19:51 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.15 2013/02/22 03:25:29 mattm Exp $
+
+  22 Feb 2013; Matthew Marlowe <mattm@gentoo.org>
+  +files/makemkv-1.8.0-makefile.linux.patch:
+  Duplicating makemkv 1.7.8 patch for 1.8.0, will see how it behaves during
+  testing.
 
 *makemkv-1.8.0 (22 Feb 2013)
 
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 45b42f519287..1b083ce694b2 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -6,22 +6,23 @@ AUX makemkv-1.7.4-makefile.linux.patch 582 SHA256 4378b25a34ed9b3dedcdddd58bbe53
 AUX makemkv-1.7.6-makefile.linux.patch 592 SHA256 85ec887388dba2bfde25138ee21920172772abf89b4e6efbc578acdbed2b1e42 SHA512 5865f967944ff6b7bd29a18e9abd886059d5b6fb24e99deb849fb2008919fdaf61eb7d8c774d42a7166e8dc623b69da25dc62d64b1bb3097689eeb81e4cf0434 WHIRLPOOL 5a5c14bda50e461720ff3486c3977a1cb82afe2bfe847ed9028c46600e7d9f8d738e10214e7fd340763bcb60c397d19f1fde4d2c205cff9e85c808b2b38aeaec
 AUX makemkv-1.7.7-makefile.linux.patch 580 SHA256 1611738fdf817fbcd37f8c393e8b08246540b5afff970c7e122a5370a68c5278 SHA512 f61ce5504526b3085f3182c048330b618b422fc96a18de465c8c739dd63f122ca6765fe81b50b6a051eb4902e8b4c28c6fd88069836191bb0db83e24cdf0fc30 WHIRLPOOL 97603aac617a82bd1aa6e26ae3ffd58b6ee0f1e543a4a343a7eb33c4c18016d861f9ce8b856fe240628d9cdbbe7d28cda0d7bd27078c6326361b149f154bf14f
 AUX makemkv-1.7.8-makefile.linux.patch 580 SHA256 afcd8a8f87ef3b1ffdbc4da54bc9fcee50df57a15b0d3ccf48061a738425589d SHA512 e9feca180b4599580e36a83970f04101d964a554d1cf3c5906037057208602c1a518671bc187f8960154098925002a789067c03593b870657130780e75e1ee40 WHIRLPOOL 62e41964effb8d7394dd9c6550923596424cdd93d42392accd0549c31ee64985b8a930720a3c2f7a3f5e647ce2b0aa80da79cef50a235b536e9915ef63b788bf
+AUX makemkv-1.8.0-makefile.linux.patch 580 SHA256 b6559cfcf534fe5ee855f9b0a774c240fa5a82d9a77b20a0669a78fa4da306e4 SHA512 b06502ad59147eb98b844d366b6d659fa1e377cc0dc6a8d81518af4fddf595cfe006efda27d7c7d51dd7e6ee54227629b40439a56b1582a525efabba8506d275 WHIRLPOOL e639e2880f9087401330420202567d4311ec15b13e02935525d20ef8b79a58c8f892b2aaee99b41df9b2f4e5fc888da0dabd9965fd00b8bea8f0fcaec114a957
 DIST makemkv-bin-1.7.8.tar.gz 6817550 SHA256 76fa7a58e986537663c4fe8e6dd429f818d494133f9cc26052b7917e9d38d395 SHA512 251c30659d2e202b3a7197618feedfb1b0db38bde9ae573191578b4d19dbc0a87925d8bfc219e043678fa69bedfc0615e2db7fe04f9aa800ea06643aa089042f WHIRLPOOL 997762677f030f862af1e89315e226b3a3928a9a2cb6e2c6c0e690a009de2b61a41050da4d77bbd09ed9040a6349cb7f9a7273318a78bfa0cd97eabb4797fc40
 DIST makemkv-bin-1.8.0.tar.gz 4843544 SHA256 0c8c4914336c8d864bac81222eb555f37b0f5aa4755767618176c5b25b2e86b8 SHA512 f20332d7cebb140611e8209ccdd99eaec6c04d57df2eb4e0b02c24126447a99bbaf1f422b01c2fad951bcec82dd7770f8f1915be31b64b0c4321eb67193959da WHIRLPOOL bedd7f23a19dda25f8053516c9c12279a958aa610fdf64c7f4261964b82dd954a9862063e65c813c0b39cb081a3027359ace83372c1037bcef161354b6097251
 DIST makemkv-oss-1.7.8.tar.gz 493693 SHA256 f972df373570ea0f3cc8f829c23c9f3efc23a89c7b38f7c07869fdbb9dc8ab37 SHA512 f6d51f27afde358a81c6734fee8f2af63e6573371ecafd2a19374d26ec6c48e23b32dbb17ab56fdbf00ebd445586ff6ee856aeb666498e755a9868f6d9b49bd3 WHIRLPOOL e2d5753b149d280557ff506adc64ff37a00da5050574cfa23c395c52c4cf44e67e57b1ead5830d7b0563dd3e08e28ce36e111cae9e7900ed9983bd2b64c5cdbd
 DIST makemkv-oss-1.8.0.tar.gz 4108929 SHA256 636ab28378b6301f4f83a31695877452cc041777bfbdb622889b89ffe7ad414e SHA512 c7db83ceca9d609325abade39f12a8c323091146a0f35abe25f249f5c1887a294828d9b2cddf61302255533a6ebf137dec56158a642ca40d9690b6ccc5ca7187 WHIRLPOOL 7c1223fef4a23b6164db989f2326cf9514fffa990b46a76c3bb79174b1790a60e846e897bca0591aba301554d1f1df756eb2311031425b7a95253ea82b4b191d
 EBUILD makemkv-1.7.8.ebuild 2763 SHA256 1ba5547e0f02d492be248aabd861d5b4282943cc0162ba4215db6b145c748c98 SHA512 b08ddbc34d8fdef80af99e819d3c5a4ce86a9417f6aa339a10fd20f01dfdfb53521a3b08d7a250f7419f807ae37839ea6d9206c78eb0f8c431999682c8abe108 WHIRLPOOL 81ea3c0cfe019c580d42e9149f3b5da9624eb869899e7adfd454beeeaf9a990666cb01379c0fad915063fdcafdbcc854af3a44a651ae94bd6e863ea0451f3236
 EBUILD makemkv-1.8.0.ebuild 2744 SHA256 e2d63497e0123b19940958ddab526302e8be6ecfea198336e3cf3a31b65ddc9a SHA512 8b48d82be803e4079eb084033b80aa23a63f91e11635352e65b26c8468e9a2e208d0bc8a44cbd75422d921da86f440fab29bcfcade80f2503df9eba4a07034bd WHIRLPOOL b3e40782ecef1ddb7e8f17ce1e2e5052310c62a8f1b9c587cd36dd5127f7a929d84e5360d7df44742a823474c8633dd4624714d7a7441d079d77d5cf3d010e37
-MISC ChangeLog 2875 SHA256 d5d34022f8920e9b89ae5323bdf464455fce0c80791a63145263aa3ba426812f SHA512 2ba727b5e10676c8e3f5856235b280f7362187c6a0109cec2d0d3880db497e5a10ff09668c53e67f0b92fe29a9fbd391a02c9fcd38c24a5632bce51a9e17977a WHIRLPOOL f7035e8f5a65e0bc7917d658e50471b1accbac640662188b12e4f48ce90048e5d0f6e0e97cf037994727ae6f72914326df28a4b5bf7e7c3afa57bfa01b12d99f
+MISC ChangeLog 3058 SHA256 11c69494884919048d5eef99e933b52e8cf0c7e4f5830f14231ea6e67d875623 SHA512 fcc1d713417fa14f917958fc8a70685bc9d4bb854b03615f78bc5d6966eb0976be219856e37b42ff99bcd3acbd8694802401b3cbf59f18085e757d5339f0aad7 WHIRLPOOL fa9d06b986a21a644b6b6a64df7d094645db81e5f97ab3a3db81557ccf28e964eae53fccc6c72a7eea3fa50d85e1170aa0eadc0817ef1a7b0a919d785926731c
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRJuPeAAoJEC1LWXx4YDenyzYH/1wQyjCjurJecJBcXn4PdWFG
-JVkAbBLjHhpKyFjgW2+5gN/R47Dup6hzIVHqXLXcdNwdckjtnZJ+OEEAfFnmn2qu
-ohb9O1BFRQY9SghqKaxWvzvg5t5X7ibVylSpUOdUNIY5AWcobWPnYjHkSopiQruc
-0wKkiFlpBO20sxHsaCcyhBEAO7x5his6gfSP68SGGCV+jxQZGtfOivLa86PDDq8O
-AGoM2JCjHNHrBfp2dp+vRgWE70SeNYsQwpKG8LVbj03OnBcSSss4W1i13R4I855o
-MvIVtndVqjoWr0B2JaU+embStgFnegoL546AFh8ZROdRqORzkw+gRH8jKT8f7Jg=
-=YtzR
+iQEcBAEBCAAGBQJRJuUvAAoJEC1LWXx4YDenALUH/RJFIgq8WqeFFPwgYZat9pZK
+0dK7w+52WsJvbyPOKXn6iHcWosQZX5QBLNZ/2Z+Cr+XQiYxz7NVMFw/P/ut4gDgS
+0SNOkDSy6P3qwfSZTcn3YPAZRSr/vZOUDP1Y7fGLv8g9phSBc7v7NCNdghMaIaD5
+xYYdr1fpoLTavUMifgW3cQ4V/hD21/3/DPDEKBgBgYL1Bnytso62XdQ//pBcb7e1
+QQ53I1vfDYJnVf3iC/z1R6oPJY332MWjnYLr7rKH+5tVzWZfkyyUE37anebTC0Lr
+h2Sm38I3xw65CAoOBkFr5tAdHLo96TYffHXq5/S7pc9GVFPfvkf1rgw170k7iQ4=
+=AICn
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/files/makemkv-1.8.0-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.0-makefile.linux.patch
new file mode 100644
index 000000000000..e387147f479d
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-1.8.0-makefile.linux.patch
@@ -0,0 +1,20 @@
+--- makemkv-oss-1.8.0/makefile.linux.orig
++++ makemkv-oss-1.8.0/makefile.linux
+@@ -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