summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-06-01 08:24:59 +0000
committerTim Harder <radhermit@gentoo.org>2011-06-01 08:24:59 +0000
commita72e4bc74ceedff5e0b66638aa6d98c5c5944255 (patch)
treeaa4b164aad5231a49a50d532bb0892c03198a51c /media-libs/libmediainfo
parentUpdate linux-mod.eclass for building modules on Linux 3.0* kernels. (diff)
downloadhistorical-a72e4bc74ceedff5e0b66638aa6d98c5c5944255.tar.gz
historical-a72e4bc74ceedff5e0b66638aa6d98c5c5944255.tar.bz2
historical-a72e4bc74ceedff5e0b66638aa6d98c5c5944255.zip
Fix build with libmms (bug #366383).
Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libmediainfo')
-rw-r--r--media-libs/libmediainfo/ChangeLog6
-rw-r--r--media-libs/libmediainfo/Manifest19
-rw-r--r--media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch47
-rw-r--r--media-libs/libmediainfo/libmediainfo-0.7.44.ebuild8
4 files changed, 68 insertions, 12 deletions
diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index 31ade1047687..93c40b988be2 100644
--- a/media-libs/libmediainfo/ChangeLog
+++ b/media-libs/libmediainfo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libmediainfo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.14 2011/04/26 07:16:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.15 2011/06/01 08:24:59 radhermit Exp $
+
+ 01 Jun 2011; Tim Harder <radhermit@gentoo.org> libmediainfo-0.7.44.ebuild,
+ +files/libmediainfo-0.7.44-libmms.patch:
+ Fix build with libmms (bug #366383).
*libmediainfo-0.7.44 (26 Apr 2011)
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 10ee92ce7709..e869f4e45b57 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -2,22 +2,23 @@
Hash: SHA1
AUX libmediainfo-0.7.41-curl.patch 930 RMD160 a70ba0a8c080b08161f290e1e309cf57ca1c12ae SHA1 c2cedb22b62a85921b512fc4b368b439e3986b9c SHA256 86719d48417b9ce7aea58eb0665e1e1f9f54c3f47a423423b3608ba96407af8f
+AUX libmediainfo-0.7.44-libmms.patch 1576 RMD160 7fb26bbcff85d78018ee8b43de74f42a5fe4a808 SHA1 8535130c38f6b162f1e1df2fe6fd5aab30edc024 SHA256 49bafa2e7a40a7fdf10bd8b1ac319f5fcb6f0c9dd60d93a51986bf9e1284bd52
DIST libmediainfo_0.7.41.tar.bz2 857972 RMD160 58b59a39f9d2accc873e5a35822b021ff4a8111d SHA1 7d8794542480b920c5f63dcdf84de62bc1184adf SHA256 cd783e4e6e848fc1fa7e36ae936815d385081c9e4e0fae9f434c18e5682e069e
DIST libmediainfo_0.7.43.tar.bz2 865667 RMD160 0100fde76157eacc7bfa6714eb92ed6469245de0 SHA1 bc8b940737f03f8773f10413a8e0fcb2c69de2e9 SHA256 3edb68e3233adf0d10ed97fa12c0f41f3576c687509e1978a6ef26ce6ca8e0cd
DIST libmediainfo_0.7.44.tar.bz2 903019 RMD160 5bf5c45383e7790f24ff345a631aa22051c8e97f SHA1 7e924a71aaa61864ecf46b1361216782366919ca SHA256 ed96a9ed81b799afac6b4434fd53f9c88d78034d94af8bb0ed8d4b12d8086b32
EBUILD libmediainfo-0.7.41.ebuild 1980 RMD160 55301d443ae744aed0cbfcc81df015a96db21e9c SHA1 f66fed7ac743a36950a7df51873a599f9d5695e4 SHA256 f98930a6cef864b51eebf9e40952d8e9c326018122929bb63b5635339d7de6c4
EBUILD libmediainfo-0.7.43.ebuild 1784 RMD160 5bee5eac0f0ebad0b433984c63bae5d449f90f13 SHA1 854c5798d6b32d98545d24fdf762b6b630db10c3 SHA256 4e1a2db565a70bde794ccba0aa0a66ebb677ceb020d4a3ef445421f9a42e3f31
-EBUILD libmediainfo-0.7.44.ebuild 1647 RMD160 cf767e0e75d7879cd6f587007b3bfb9ca9829a4f SHA1 f8f7df429d25d445e17c7a996b90c0d491943e0f SHA256 589057a6dd395b7958cfe25125f30c6355bec6574513ebf83712e4fb5e539e9c
-MISC ChangeLog 2649 RMD160 911ceabc20919353fca3fefc15ef4ff2cb669771 SHA1 89e8209f8e7fc964f2e04d452d4988932e7bbf20 SHA256 205f2d0a101a28ddff7fd2b708a8addc0633b9421f69e3cbbf6f0a37a0798925
+EBUILD libmediainfo-0.7.44.ebuild 1757 RMD160 d9cf2d94824926a633d79904fbeb172df5f83fe6 SHA1 fd232f41904289035ca9f14861bf37f66ad6581b SHA256 86d35baf27df891a25c030967de6880d588bade74f4bdc3cc3012b26d3dfd9c1
+MISC ChangeLog 2809 RMD160 25f84a28a59f16fad3f10c5b5f409a8de0bf9c9f SHA1 5fdd803579f4e5af8b25c8a4359534ee4769086c SHA256 123cd350394a86051b306cfe7db18151ee56d1c53fe7cc06edfe28281cd14b64
MISC metadata.xml 341 RMD160 fdfe7b44e753ea7571e619dd8566cafbcf4eb5ec SHA1 6605883a3ff2065f65794950f03b369b3d425cbc SHA256 1a88f8af2a22f2bd6207cee41a53337b452f6caace96b0b475aace50f27461a8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJNtnFqAAoJEEqz6FtPBkyjgkAIAK/3F58bQgMcm4mXyLNZC8Di
-k+obrovrAfCB70QJhOGUAVeE3Klhev9BW5fHBa/GH2UYjy58A6gJHPIBNO+eU+xN
-op/feC2klnkuqPRW2zi9bCC7YxjSEZ2RztiWi8K3zfz6zGf0uwBKiucqyPlpDhS7
-Tsux9Y7E/xEwpLDR1iKBsaoVv6kwqbnjM9WJggX983wyu10QT2DJyMRpz2HWVtuc
-J0ZFQSg9/O14nrITxg9RfHMmKOvF8TRbOVyo9l+XY3Db5Dfmn9KyDqejAaogHejX
-JyypjGnH2y9O1du3hjjkTIMuLiiCXsQWsbFT1PpVyY9AQihgguLd8Nc+mt2toU0=
-=CNZL
+iQEcBAEBAgAGBQJN5fdkAAoJEEqz6FtPBkyjEqEH/iWHRXiOFxn3Ja7UE2FnH9Ww
+YerYOjnJ2sPih8ZjYyjazrkET77gWWm9V/DEgVQNbDVLg/4pZHYdVC9NGuscPJkw
+kLz2hhznS0Nw6ADBoepuZ4yL8ZAQD715qI0GGmBV9sR+WtIR6xxOUnsOpZCs7r55
+39YCF5IleJw3oha2EVPVkYblSJAxYsVQZy4GlBKU3lmV1EphH1sEL3QnQmTPk1hU
+IkpqUHtVBPyKzJXSTWsaR8AOltHD/FEOoQ6UnRIJW/7G/jj4lU1w+fIZXp89MY63
+kf5CCQ6D83VA6sKno/UT6H3hUZ2VGTNkM65q2nsBlBpdDlhAbL6eLgDx40foLDU=
+=ErkZ
-----END PGP SIGNATURE-----
diff --git a/media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch b/media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch
new file mode 100644
index 000000000000..97ddeb62fc55
--- /dev/null
+++ b/media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch
@@ -0,0 +1,47 @@
+--- MediaInfoLib/Source/MediaInfo/Reader/Reader_libmms.cpp
++++ MediaInfoLib/Source/MediaInfo/Reader/Reader_libmms.cpp
+@@ -37,10 +37,8 @@
+ #else
+ #ifdef MEDIAINFO_LIBMMS_FROMSOURCE
+ #include "mmsx.h"
+- #include "mmsh.h"
+ #else //MEDIAINFO_LIBMMS_FROMSOURCE
+ #include "libmms/mmsx.h"
+- #include "libmms/mmsh.h"
+ #endif //MEDIAINFO_LIBMMS_FROMSOURCE
+ #endif
+ using namespace ZenLib;
+@@ -59,30 +57,10 @@
+ //---------------------------------------------------------------------------
+ size_t Reader_libmms::Format_Test(MediaInfo_Internal* MI, const String &File_Name)
+ {
+- mmsx_t* Handle;
+ //Opening the file
+- if (!MI->Config.File_Mmsh_Describe_Only_Get())
+- {
+- // Use MMS or MMSH (Send a DESCRIBE & PLAY request)
+- Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1);
+- if (Handle==NULL)
+- return 0;
+- }
+- else
+- {
+- // Use MMSH & Send a DESCRIBE request
+- mmsh_t* MmshHandle;
+-
+- MmshHandle = mmsh_describe_request(0, 0, Ztring(File_Name).To_Local().c_str());
+- if(MmshHandle==NULL)
+- return 0;
+-
+- Handle=mmsx_set_mmsh_handle(MmshHandle);
+- if (Handle==NULL) {
+- mmsh_close(MmshHandle);
+- return 0;
+- }
+- }
++ mmsx_t* Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1);
++ if (Handle==NULL)
++ return 0;
+
+ mms_off_t Offset=mmsx_seek(0, Handle, 0, SEEK_SET);
+ uint32_t Length=mmsx_get_length(Handle);
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild
index 58bef51eb129..aeb89f4514ea 100644
--- a/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild,v 1.1 2011/04/26 07:16:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild,v 1.2 2011/06/01 08:24:59 radhermit Exp $
EAPI="4"
-inherit autotools-utils multilib
+inherit autotools-utils multilib eutils
MY_PN="MediaInfo"
DESCRIPTION="MediaInfo libraries"
@@ -29,6 +29,10 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library"
src_prepare() {
+ pushd "${WORKDIR}"/${MY_PN}Lib > /dev/null
+ epatch "${FILESDIR}"/${P}-libmms.patch
+ popd > /dev/null
+
# Don't force -O2 by default
sed -i -e "s:-O2::" configure.ac