diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-06-01 08:24:59 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-06-01 08:24:59 +0000 |
| commit | a95e78cbb3c1a911a925265d475a3371cad103ca (patch) | |
| tree | 629bb1ac31b97b17f95b56aac6c15f83af0c4e78 /media-libs/libmediainfo | |
| parent | Update linux-mod.eclass for building modules on Linux 3.0* kernels. (diff) | |
| download | gentoo-2-a95e78cbb3c1a911a925265d475a3371cad103ca.tar.gz gentoo-2-a95e78cbb3c1a911a925265d475a3371cad103ca.tar.bz2 gentoo-2-a95e78cbb3c1a911a925265d475a3371cad103ca.zip | |
Fix build with libmms (bug #366383).
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libmediainfo')
| -rw-r--r-- | media-libs/libmediainfo/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch | 47 | ||||
| -rw-r--r-- | media-libs/libmediainfo/libmediainfo-0.7.44.ebuild | 8 |
3 files changed, 58 insertions, 3 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/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 |