Update cflags patch for live ebuild (bug #482994).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4F064CA3

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index aaba34d1083fa5f589150fee2d6eb45b36647aee..efe4def4501fd17857cf5bcf493e9d34548d2304 100644 (file)
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.112 2014/08/25 11:00:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.113 2014/12/02 16:17:07 radhermit Exp $
+
+  02 Dec 2014; Tim Harder <radhermit@gentoo.org> x264-0.0.20130912.ebuild,
+  x264-0.0.20140308.ebuild, +files/x264-0.0.20130912-cflags.patch,
+  files/x264-cflags.patch:
+  Update cflags patch for live ebuild (bug #482994).
 
   25 Aug 2014; Agostino Sarubbo <ago@gentoo.org> x264-0.0.20140308.ebuild:
   Stable for alpha, wrt bug #512012

diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 343d86877001a62398148dad091684bb38841f2d..1644011250958632a5d77e7886c46e5d9623933d 100644 (file)
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -3,7 +3,8 @@ Hash: SHA256
 
 AUX x264-0.0.20120707-gcc48.patch 5240 SHA256 24631c7c429099958366c172df6467264a894c13ff64e3979414715fec4d28bc SHA512 561b0f37ffd2b2116d35d33cdccaf098983904b501b71f928d93cdbe3028f462662cbb468000ff5a9eac3acf344919244aa9994641f9136325515b0d8cbf5859 WHIRLPOOL 2f3f17cdb125678e02d1134065eae2b17e6b6f0fef88ba51112b17f945eb37e6e77a959ab0d8ea009824126def2c934f3800a05e63afe642f6364334b4cdf75f
 AUX x264-0.0.20130731-cflags.patch 2315 SHA256 e8fc30f0e07da1831a9673d9564fd1b71a366b3835644511e60a5c05c2e97def SHA512 d14b5c15bb891fc660cebdb0c2e184b2c339276736bd401ab7b842088bb1991191dee52ebadd1acd942e5bf1b9603436f7eb289235f5ead6b056019245038435 WHIRLPOOL ca871b7145ab946f02831a2303c901ecd77545852f2e88458ce990a396bd965353dd1f18c2c3c3f07dc91261373a761a210e9367547205a97116ac16be51ff6c
-AUX x264-cflags.patch 2057 SHA256 b48656ac6233cccd30bfe36a4fbf879af0e4fa6df74dc49f75842acf0a86a311 SHA512 1753a3109075deb934801b14b0b8714ca0bb1edac14d907c14f0a5c5f00d2face1854e1a8ad32b00ecaf171e9d748d8108d6f26a0443db4c1aae8486964b55a4 WHIRLPOOL 5b1d441c6761c9fa3942862ce11ed34305c8e55cd275ec5a32bde752b7a4e08ee73f2a7d372500bc8d1df78dad18533833372d784ee7cf17cb02029edbc426b5
+AUX x264-0.0.20130912-cflags.patch 2057 SHA256 b48656ac6233cccd30bfe36a4fbf879af0e4fa6df74dc49f75842acf0a86a311 SHA512 1753a3109075deb934801b14b0b8714ca0bb1edac14d907c14f0a5c5f00d2face1854e1a8ad32b00ecaf171e9d748d8108d6f26a0443db4c1aae8486964b55a4 WHIRLPOOL 5b1d441c6761c9fa3942862ce11ed34305c8e55cd275ec5a32bde752b7a4e08ee73f2a7d372500bc8d1df78dad18533833372d784ee7cf17cb02029edbc426b5
+AUX x264-cflags.patch 2122 SHA256 41bbe8a0271fc8d79dd4407e89ce1a8c6bfef300a49b7fd988669b6e72d50573 SHA512 0372bcb41d326be7224ed5b47e3095958ba1704d785fd61ce8e86efb5d81e916e62249b2c4da2ad55d67cf5c5fa047fdb5f2d7581e02043b366847130c2ba96a WHIRLPOOL 5712f15ffe58c81d9a56aaa387afcd1963792e904caf8cb27f106ff440fd937b9b3cad882d72054eac8dc2bdb2a95ad0d1c0dad7ac9d2b4062ad862978fb7196
 AUX x264-nostrip.patch 433 SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa SHA512 4103c43f54aebc814f4c5aecac0f115ff9f25fef352ce5945b37eb9d7a191fc21c1f608f81b6fb3d534a0a72b8bc4e49c6ed7e1e0d86fe39d18ad4d55241d6dd WHIRLPOOL ae648a2a61d2fcd3c35f5fe16b110249b7acbe2b2bac497b980c557bb3e95f8975296361f7482b5419ca88a1cf25258da60be53805feb6fa426b865dcd0ff4e3
 AUX x264-onlylib-20110425.patch 1120 SHA256 a0bdcfe1a86fdde9f56d7842f203d90eefcc4080664653ea42a8a4cc6231dbbe SHA512 a94d93b4a9f1243b41db4c82b8483767a5da4b69dcbd0ad9414ae4dbb7caa4dee6bb10b2b9f8325d9cda2341e78d9aa89d79f24844ea405cfddbe8d857f43457 WHIRLPOOL 4aa9ba6e18e1b9de1ad6a8e8c90635a399bfa0ae64be89c0b0383a844022fb474686774a5887903b0a639406c5e7165ec862dc03fa7710f1714d03bdeb8aa8df
 AUX x264-x32.patch 1224 SHA256 1daaa89caef24923d703528f438918496360bfbf3e2b56334a4edb5e7659a000 SHA512 ad1ff51b086b7f11adff73ea997feee1d9dfec47bbb457cfd47e0681c11d6bde1b62b5b896d032707a7cb70c9f739cffe500c4c9c5be2e19fe4ccc3463b314db WHIRLPOOL 17d1a51fad912ab5b728335c629f73b00572f033fa52ba7154604664e92fbf91ae192c9e3ab61048e48e5517f829e1582aba2c95b905aca35c21f920490d13e6
@@ -19,25 +20,19 @@ EBUILD x264-0.0.20120327.ebuild 2369 SHA256 652c96142181d3339fb820c0add88ebc2164
 EBUILD x264-0.0.20120707.ebuild 2880 SHA256 c1058ae73c205292a5ef7e6e8afc48293b74258f353f796a11518e9e78c8f60f SHA512 2091ef73ef17a7fd84ddf41e03593f0b224c1eaa8be8a6e2410ec3352a8146b19e9e89bda5c9d5fcd3a6d9306b126bf96a32f196288b2aab7c76deb82ae8d82d WHIRLPOOL 0ec1b5c56d0e5af2fb285f2f6d662e73e0449ee0a1dcf31fe2d54c82cd26d9bde03f5ffd95ad8350fee1b5de9552663d553a9ae8b87115bfecf2652a4bd1cb9d
 EBUILD x264-0.0.20130506.ebuild 2302 SHA256 786b0f1b8d8c6a4b8fd1065b0226a03b708b76e46fc0210bcc6b9e26eba2652a SHA512 a2e3dded5d7a0a2622d71f3580e96a449d0b245f829be2972946ba5e04fd6235fe7848bfe7dad4a9af3d184cf9dd744a47876b7f67d689da943e385d8598d1d5 WHIRLPOOL 84c2008e676189812b95f0b972b27d3ef47e1ae442ff194c965951691b3bbe9281c3193aea90170453746ec4dde2e4f6df060a5e6a4b9925a0a03038490bf43d
 EBUILD x264-0.0.20130731.ebuild 2108 SHA256 d5a3a2d177cd1aeeca3e16c9a55ea26c404aa373904a5a3872c0528fe3b8707c SHA512 12e9a07a8ce25f14e5e0c7ff17ef6c572cd1bd5da2e1cf49956002695618e63d7e5e28422f019cd5075e6ba7494640d2a5b4bc241db7dede3f299c572dcc0224 WHIRLPOOL 9f28386bc74a0f227f096aa8f59bc29264fa0865a65afa71cbfc47e98f1133debdc7c8ae55413d1bdd8c6dc253d6021e89aaf39eaefe4ad125ed7d4d477a08aa
-EBUILD x264-0.0.20130912.ebuild 2110 SHA256 bdb79cdb4a27e02fe44a322815ee192866aa5fe2e7a9ccb8eb3a44b9d975c815 SHA512 0f0d544ca8046ff654c391441f03d21670724ad3307a71d8af87609325898c414f58993b5806d72150e05a3545fd44162f6fabcba4f7f2e191cda832e6a7dcf3 WHIRLPOOL bd89de36eff41d8cf7839f7ab9c381994a24fe63cceb62ddb069adb139ff2599306c38c32af794836f924682c29a823aef20407d3a143b2f797f47e2ae69d521
-EBUILD x264-0.0.20140308.ebuild 2206 SHA256 fe069789d83779330b5ac7c8e5429196fd91bca5726bbbe0fcab89be43325da2 SHA512 c89ee385b4f0f9c2ba4f35b64a1ad9f4affa10eb0d6ba021cd3eacd830d63f35ff17e25c919e0a376e28a0366964b38837ac68e1f99de827372902a9be64c608 WHIRLPOOL 10564618b3e507447aae30725c11e6af8eb63e560503a8fdb9016cf1200826b4d5cdb05d3b52cd04a28806eb4783fdeae532f70afff0ba20cb380799a9fa7121
+EBUILD x264-0.0.20130912.ebuild 2110 SHA256 f8d4d7dba50a27a7d61094364dfd046610a7b3c0f670d8309e2d32d9a77df877 SHA512 ca6bc2740ccc65e8c7496240f36d5247d66e2536a4a1a533b1c26b38b37510c68d9e893de0a40cdb901c834739faf71eb52fc594dab748b0e61790b0fd175f51 WHIRLPOOL 8e01eb2bdad92e58443f5130ec4dee6cc68217b5a31994bfe3fc5c22fc20566b0ec62d5fbbab7e038e007ed54b40e6dae57ddd314ecebbf39f0728559b3c1317
+EBUILD x264-0.0.20140308.ebuild 2226 SHA256 67cf7bd62fd5e2f95294761c9818f8a887ccc869e2bb08be7b11999f29cfc386 SHA512 7930574a98149fd4395556bf18e3b32f167190e0750e86729fdd201f2d4c8f2b67f8307d64ddb6e88503006e73ce2d6df7206aadf8acf5099ea27412ddfdee0f WHIRLPOOL ac29f856824936b063012bc3aea30bdd8e119622dc547020dddc1f9412491a2f41a0e494354bc0dcf13ddbd03d2481642f9b28f836a0116e0b4fdf04466e7eb5
 EBUILD x264-9999.ebuild 2209 SHA256 dfc88987b57736ac9d63d26acbc50e4db8aa2d0f9b8a8e8d7d15440e3959c73e SHA512 994f4796b6cd5c9d82663eca73721101c20940a04b97638b73dcaa09518b45b611dd8abfd09e51d2ab247c15bb9906db4529f4bfceed91cecaff1393fe76fc2a WHIRLPOOL 9d18b7faf23419fbfba605bcdd64846033ec87a49b528682c428d226c3ec7ae3ad8813d497b47984e2228d3b8e7c08a11e31040e6a3be547cd5d55b0d11d3115
-MISC ChangeLog 16601 SHA256 a4ffd702ac2479362cc16549c86339785ee9b29d28a0548d90cc4990df034deb SHA512 6ec33d6131ad304a0e1f9e17cfb75239e3df36423bb0cbd07e69b0c2a013c4bcf1f3db77b10e7e0525aec605cc9a4a4ee5333d4b6a800a20c2ac329b589b9ad2 WHIRLPOOL 69c23bcbdc89ed79f301951403518f8e3600a3705c9ec7a5db56072b74581f41f3da5eef06b156d95e9ae615928f3259a5edf18bb231c3f135834f4bb6a268f2
+MISC ChangeLog 16830 SHA256 9297b1f939fb098b97b3c57581e8d86b6130aa15276370f34130a7804c51a1b9 SHA512 e32fd00e167fb3832bd1081b119cfc49e69c251e00d22aa26e051ab8c1742d598861e5965faad2595f5b2e62325323c1e27ea299502da45fe28679c752a7ac73 WHIRLPOOL 62ea6d04839ee12ce341e8b1ff9db1a5f0c096e539b5c1ba7caa3e88060c60f59803a25283d7a8511847c150e94654241b4404580c2fcfd4932aefaa74be49e0
 MISC metadata.xml 606 SHA256 175feae20fc3d84511ce15a469df3ccbd75c02fa75eef9d5ad7c3d5c6c3fead3 SHA512 3ee5bd067211cb998771e58ac79e18a9cf7e87d2aaed48b4f766d226ccac3b74199934e1f911bba3389b16ca28661a9e04bbf7fa65069a10682c0327dc4b4b4b WHIRLPOOL 6637b3208323e2eee0dc64572659b6841e29a45232dc3b2209aa4c0b723a39fb75953209da958435510abbbc377b5f36d8890918600dbd837fa553a413823e1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT+xdDAAoJELp701BxlEWfX0AQAKEuQk1jwnLM9pUATgdx9JJS
-DQwtRb1K/SltfloBcOOYJtxzra+1hAg/YaMteGLwvyif/7vDFtiejORx1aM1YTy9
-gXYtlMtkVzr2VhsdWsk1vPslDK6wV8mR5NnxRUfXAHkuBw3ha/U7qJvfLH+Jm2y+
-TVMbVbuXgX8iplxIGISZGSwnvN2WocAm8Y6pxM/PaoaEf8DaHh78XYiAjJuruI8q
-Kd4X8u/4u9epxe3NlBh33aFXCkYq5XM98JUubxiCSXtAHkM8NpHKTt38kdiDLnUv
-CnpRG8gML3anZfWohWq+CctHeGzkoC9RcQWEcvfxlfVUDahXVMN+NTwvT61mUekK
-UvE52HXPYrcoONaN9De6Gg9WyMhM8uHP3en9sWONljYbySt04cLc8RWBACl2Om3S
-qhfXTjQ3mOfHq5MHHv7Z4UDZYexeCO1Dl8OixB8yJ5ILgqFjywMi0go0825n6MND
-YvPfZBfpfFi9PD2hNWq8mx3mdDov3ZLX57Zpl9ZfayUtiU/6oZE8RDyiY21LvPwb
-jS0YqIYUe2AjBkbNDrmX9VfN60GjvxvaJlHZ7iUR/mgvXPQBPcJY+gvvUOMVa15H
-ot/PvsnicMl6c0e3NPm9Nn8yoCBZCrMOLKNyGrfR1KuiC90dKUgzZVzAysvWVCWI
-JVJf5DKaKkwiJqgVbnNE
-=0ojk
+iQEcBAEBCAAGBQJUfeYqAAoJEEqz6FtPBkyjsegH/0YyqvXL588XpeF3Rkg5VuMv
+f985/kq9b+mnd8wAY3A6OFKeHTD9Al1tzQ4gY85nKqJmvxZ0ZHYIXz8IfxGkxDsj
+Jmi+KSYg0GMEJaP4WJlOE7NoX8XU8Q9VtCwvvRLNzHhwQVEKvycATyC8DTsZaKgF
+X9dlgOnEKEFVTxzTiF5Co8H5LsvU8k/zQ5mh2sWf0bGhCSbCppgaMuuxstyy2v4/
+55guTmIh6AcvnZyONks1eh4mDwvhTaKgnbvz060eLTcUEIhuDMpRxIQK5TUC1AvM
+nF1XUvkjaQSjtLx5KA3XD1Kc5/oDPX3uaOpMpupMjdvLoEjpCgGRx6teORPWaQM=
+=0LIz
 -----END PGP SIGNATURE-----

diff --git a/media-libs/x264/files/x264-0.0.20130912-cflags.patch b/media-libs/x264/files/x264-0.0.20130912-cflags.patch
new file mode 100644 (file)
index 0000000..c08a0d7
--- /dev/null
+++ b/media-libs/x264/files/x264-0.0.20130912-cflags.patch
@@ -0,0 +1,54 @@
+diff --git a/configure b/configure
+index 07796b1..afdda94 100755
+--- a/configure
++++ b/configure
+@@ -556,11 +556,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"
+         else
+             # icc on linux has various degrees of mod16 stack support
+             if [ $SYS = LINUX ]; then
+@@ -591,13 +586,8 @@ case $host_cpu in
+     x86_64)
+         ARCH="X86_64"
+         AS="yasm"
+-        [ $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 _
+@@ -605,7 +595,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)
+@@ -971,10 +965,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
+     CFLAGS="$CFLAGS -s"
+     LDFLAGS="$LDFLAGS -s"

diff --git a/media-libs/x264/files/x264-cflags.patch b/media-libs/x264/files/x264-cflags.patch
index c08a0d7e3de167dcf239e86d710ccd568c1c3426..a5f4d79119e931fc0343cad63e9543e33790fab7 100644 (file)
--- a/media-libs/x264/files/x264-cflags.patch
+++ b/media-libs/x264/files/x264-cflags.patch
@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 07796b1..afdda94 100755
+index 0a4cb94..8f7ef75 100755
 --- a/configure
 +++ b/configure
-@@ -556,11 +556,6 @@ case $host_cpu in
+@@ -591,11 +591,6 @@ case $host_cpu in
              if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
                  CFLAGS="$CFLAGS -march=i686"
              fi
@@ -11,13 +11,13 @@ index 07796b1..afdda94 100755
 -            fi
 -            CFLAGS="-m32 $CFLAGS"
 -            LDFLAGS="-m32 $LDFLAGS"
-         else
+         elif [ $compiler = ICC ]; then
              # icc on linux has various degrees of mod16 stack support
              if [ $SYS = LINUX ]; then
-@@ -591,13 +586,8 @@ case $host_cpu in
-     x86_64)
+@@ -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"
@@ -28,7 +28,7 @@ index 07796b1..afdda94 100755
          elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
              ASFLAGS="$ASFLAGS -f win32 -m amd64"
              # only the GNU toolchain is inconsistent in prefixing function names with _
-@@ -605,7 +595,11 @@ case $host_cpu in
+@@ -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
@@ -41,7 +41,7 @@ index 07796b1..afdda94 100755
          fi
          ;;
      powerpc|powerpc64)
-@@ -971,10 +965,6 @@ if [ "$pic" = "yes" ] ; then
+@@ -1006,10 +1000,6 @@ if [ "$pic" = "yes" ] ; then
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
@@ -50,5 +50,6 @@ index 07796b1..afdda94 100755
 -fi
 -
  if [ "$strip" = "yes" ]; then
-     CFLAGS="$CFLAGS -s"
      LDFLAGS="$LDFLAGS -s"
+ fi
+

diff --git a/media-libs/x264/x264-0.0.20130912.ebuild b/media-libs/x264/x264-0.0.20130912.ebuild
index 7ade35a84367c534163aff0e7366148e56dd2a01..426420e3e6cf34b831222a5e1e2db2a3e6c71c42 100644 (file)
--- a/media-libs/x264/x264-0.0.20130912.ebuild
+++ b/media-libs/x264/x264-0.0.20130912.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130912.ebuild,v 1.2 2013/09/22 09:19:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130912.ebuild,v 1.3 2014/12/02 16:17:07 radhermit Exp $
 
 EAPI=5
 
@@ -36,7 +36,7 @@ DOCS="AUTHORS doc/*.txt"
 src_prepare() {
        # Initial support for x32 ABI, bug #420241
        # Avoid messing too much with CFLAGS.
-       epatch "${FILESDIR}"/x264-cflags.patch
+       epatch "${FILESDIR}"/${P}-cflags.patch
 }
 
 multilib_src_configure() {

diff --git a/media-libs/x264/x264-0.0.20140308.ebuild b/media-libs/x264/x264-0.0.20140308.ebuild
index 0d81456a087ec03a6cbb4a330797476bec2dfc56..5fcdc1dd908e543d97a9632034463448a115da70 100644 (file)
--- a/media-libs/x264/x264-0.0.20140308.ebuild
+++ b/media-libs/x264/x264-0.0.20140308.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20140308.ebuild,v 1.9 2014/08/25 11:00:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20140308.ebuild,v 1.10 2014/12/02 16:17:07 radhermit Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ DOCS="AUTHORS doc/*.txt"
 src_prepare() {
        # Initial support for x32 ABI, bug #420241
        # Avoid messing too much with CFLAGS.
-       epatch "${FILESDIR}"/x264-cflags.patch
+       epatch "${FILESDIR}"/x264-0.0.20130912-cflags.patch
 }
 
 multilib_src_configure() {