diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-10-10 10:39:05 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-10-10 10:39:05 +0200 |
| commit | b3c6cf1eee6fb13c4a92ed82eb9d6fe3192bf471 (patch) | |
| tree | ffe57d827726cb256e25402df41eb5980ef5a2cf /media-libs | |
| parent | dev-python/wxpython: Stable for HPPA PPC64 (bug #562482). (diff) | |
| parent | media-libs/gavl: Add patch for x32, bug #472288 (diff) | |
| download | gentoo-b3c6cf1eee6fb13c4a92ed82eb9d6fe3192bf471.tar.gz gentoo-b3c6cf1eee6fb13c4a92ed82eb9d6fe3192bf471.tar.bz2 gentoo-b3c6cf1eee6fb13c4a92ed82eb9d6fe3192bf471.zip | |
media-libs/gavl: Merge "Add patch for x32"
Pull-Request: https://github.com/gentoo/gentoo/pull/170
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/gavl/files/1.4.0-x32.diff | 29 | ||||
| -rw-r--r-- | media-libs/gavl/gavl-1.4.0-r1.ebuild | 2 |
2 files changed, 31 insertions, 0 deletions
diff --git a/media-libs/gavl/files/1.4.0-x32.diff b/media-libs/gavl/files/1.4.0-x32.diff new file mode 100644 index 000000000000..4b510a550699 --- /dev/null +++ b/media-libs/gavl/files/1.4.0-x32.diff @@ -0,0 +1,29 @@ +------------------------------------------------------------------------ +r4209 | gmerlin | 2014-06-02 16:38:33 +0200 (Mon, 02 Jun 2014) | 2 lines + +* Compilation fix + + +Index: gavl/cputest.c +=================================================================== +--- gavl/cputest.c (revision 4208) ++++ gavl/cputest.c (revision 4209) +@@ -69,6 +69,8 @@ + int rval = 0; + int eax, ebx, ecx, edx; + int max_std_level, max_ext_level, std_caps=0, ext_caps=0; ++ ++#ifndef ARCH_X86_64 + long a, c; + + __asm__ __volatile__ ( +@@ -94,6 +96,7 @@ + + if (a == c) + return 0; /* CPUID not supported */ ++#endif // !ARCH_X86_64 + + cpuid(0, max_std_level, ebx, ecx, edx); + + +------------------------------------------------------------------------ diff --git a/media-libs/gavl/gavl-1.4.0-r1.ebuild b/media-libs/gavl/gavl-1.4.0-r1.ebuild index a6674fa770b6..ba8915872135 100644 --- a/media-libs/gavl/gavl-1.4.0-r1.ebuild +++ b/media-libs/gavl/gavl-1.4.0-r1.ebuild @@ -23,6 +23,8 @@ DEPEND="doc? ( app-doc/doxygen ) DOCS=( AUTHORS README TODO ) src_prepare() { + epatch "${FILESDIR}/${PV}-x32.diff" + # AC_CONFIG_HEADERS, bug #467736 sed -i \ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ |