summaryrefslogtreecommitdiff
path: root/multimedia/x264/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/x264/files/patch-Makefile')
-rw-r--r--multimedia/x264/files/patch-Makefile23
1 files changed, 16 insertions, 7 deletions
diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile
index 6d5646214e2c..6c90cc2e7a26 100644
--- a/multimedia/x264/files/patch-Makefile
+++ b/multimedia/x264/files/patch-Makefile
@@ -1,23 +1,23 @@
---- Makefile.orig 2014-08-27 15:45:08.000000000 -0500
-+++ Makefile 2014-10-21 16:18:59.299348000 -0500
-@@ -85,12 +85,12 @@
+--- Makefile.orig 2014-08-27 20:45:08 UTC
++++ Makefile
+@@ -85,12 +85,12 @@ X86SRC0 += sad-a.asm
endif
X86SRC = $(X86SRC0:%=common/x86/%)
-
+
-ifeq ($(ARCH),X86)
+ifeq ($(ARCH),i386)
ARCH_X86 = yes
ASMSRC = $(X86SRC) common/x86/pixel-32.asm
endif
-
+
-ifeq ($(ARCH),X86_64)
+ifeq ($(ARCH),amd64)
ARCH_X86 = yes
ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
endif
-@@ -104,7 +104,14 @@
+@@ -104,7 +104,14 @@ endif
endif
-
+
# AltiVec optims
-ifeq ($(ARCH),PPC)
+ifeq ($(ARCH),powerpc)
@@ -31,3 +31,12 @@
ifneq ($(AS),)
SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
common/ppc/quant.c common/ppc/deblock.c \
+@@ -113,7 +120,7 @@ endif
+ endif
+
+ # NEON optims
+-ifeq ($(ARCH),ARM)
++ifeq ($(ARCH),armv6)
+ ifneq ($(AS),)
+ ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
+ common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \