diff options
| author |   Steve Arnold <stephen.arnold42@gmail.com> | 2015-05-29 14:14:16 -0700 |
|---|---|---|
| committer | Steve Arnold <stephen.arnold42@gmail.com> | 2015-05-29 14:14:16 -0700 |
| commit | fd4ed9433bb89b25958222a629cc3dfd6a848cf0 (patch) | |
| tree | 3896090097affd2e205300a3e632b692f78b9a5a /media-libs | |
| parent | updated cogl/clutter deps (diff) | |
| download | arm-fd4ed9433bb89b25958222a629cc3dfd6a848cf0.tar.gz arm-fd4ed9433bb89b25958222a629cc3dfd6a848cf0.tar.bz2 arm-fd4ed9433bb89b25958222a629cc3dfd6a848cf0.zip | |
updated cairo git ebuild and added missing patches
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/x264/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/x264/files/x264-cflags.patch | 55 |
2 files changed, 55 insertions, 3 deletions
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index 75119a7..3d91188 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -1,4 +1 @@ -AUX x264-cflags.patch 2057 SHA256 b48656ac6233cccd30bfe36a4fbf879af0e4fa6df74dc49f75842acf0a86a311 SHA512 1753a3109075deb934801b14b0b8714ca0bb1edac14d907c14f0a5c5f00d2face1854e1a8ad32b00ecaf171e9d748d8108d6f26a0443db4c1aae8486964b55a4 WHIRLPOOL 5b1d441c6761c9fa3942862ce11ed34305c8e55cd275ec5a32bde752b7a4e08ee73f2a7d372500bc8d1df78dad18533833372d784ee7cf17cb02029edbc426b5 DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c -EBUILD x264-0.0.20140308.ebuild 2263 SHA256 ce5c92b95488e04dc2afed9bd1a211a865e282aed9c6e267b08402992a090c97 SHA512 396cafda44a7d8f5d550912a043b998eeac7c0f9a3ac248eaa1714a42c7b43d81d8da35b1e447f162fa3c90a642ab52593573c9e16f9ec8c92c87f2500bc5fce WHIRLPOOL 52e93c3bb841fdbed644122667c8cee953a3f68287125d60d6ac93c4a8dc6b8a70bdd88984a30ff6185900fc3ad799435eee9e39f347505a7f30d16dab71bc6a -EBUILD x264-9999.ebuild 2187 SHA256 908ca95e7732d4e02ff554140a9373727d540f255462004af5bf8a9567872769 SHA512 951d53be54fc5b3bccbc7e7817c4aa3d96522206ad759a10044652e75ad21c02cf3e3929bda3a7207454e33082f345ab74ac67953e41b1802b2f50cc3bce14c0 WHIRLPOOL d44d194c30d41ed9fc84886a3bb8b5fff62b4a105785dc2aaeb8fca130bb9f215042656a6c9f41e53e3e7ff5f276f54c021e2326c12f6f41c831c2289554a2a0 diff --git a/media-libs/x264/files/x264-cflags.patch b/media-libs/x264/files/x264-cflags.patch new file mode 100644 index 0000000..a5f4d79 --- /dev/null +++ b/media-libs/x264/files/x264-cflags.patch @@ -0,0 +1,55 @@ +diff --git a/configure b/configure +index 0a4cb94..8f7ef75 100755 +--- a/configure ++++ b/configure +@@ -591,11 +591,6 @@ case $host_cpu in + if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then + CFLAGS="$CFLAGS -march=i686" + fi +- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then +- CFLAGS="$CFLAGS -mfpmath=sse -msse" +- fi +- CFLAGS="-m32 $CFLAGS" +- LDFLAGS="-m32 $LDFLAGS" + elif [ $compiler = ICC ]; then + # icc on linux has various degrees of mod16 stack support + if [ $SYS = LINUX ]; then +@@ -627,13 +622,8 @@ case $host_cpu in + ARCH="X86_64" + AS="yasm" + ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" +- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" + if [ "$SYS" = MACOSX ]; then + ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX" +- if cc_check '' "-arch x86_64"; then +- CFLAGS="$CFLAGS -arch x86_64" +- LDFLAGS="$LDFLAGS -arch x86_64" +- fi + elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then + ASFLAGS="$ASFLAGS -f win32 -m amd64" + # only the GNU toolchain is inconsistent in prefixing function names with _ +@@ -641,7 +631,11 @@ case $host_cpu in + [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase" + [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" + else +- ASFLAGS="$ASFLAGS -f elf -m amd64" ++ if cpp_check "" "" "__ILP32__" ; then ++ ASFLAGS="$ASFLAGS -f elf -m x32" ++ else ++ ASFLAGS="$ASFLAGS -f elf -m amd64" ++ fi + fi + ;; + powerpc|powerpc64) +@@ -1006,10 +1000,6 @@ if [ "$pic" = "yes" ] ; then + [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" + fi + +-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then +- CFLAGS="$CFLAGS -fomit-frame-pointer" +-fi +- + if [ "$strip" = "yes" ]; then + LDFLAGS="$LDFLAGS -s" + fi + |