aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-04-25 19:09:59 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-04-25 19:09:59 +0000
commit1c34903a44817edda627157ac8909a72f01be989 (patch)
treeee119cbae2214c609a6999b52268d26730206770 /multimedia
parent55950cc9cfca45c98573f1344ddfe9e62667730b (diff)
Notes
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/x264/files/patch-Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile
index 22aa6debe7a5..3d6885b9d9c9 100644
--- a/multimedia/x264/files/patch-Makefile
+++ b/multimedia/x264/files/patch-Makefile
@@ -1,21 +1,22 @@
---- Makefile.orig 2010-07-07 22:45:06.000000000 +0200
-+++ Makefile 2010-07-08 17:08:43.434178535 +0200
-@@ -56,12 +56,12 @@
- cpu-a.asm dct-32.asm bitstream-a.asm
+--- Makefile.orig 2012-04-24 22:45:06.000000000 +0200
++++ Makefile 2012-04-25 10:17:55.692859510 +0200
+@@ -84,13 +84,13 @@
+ endif
X86SRC = $(X86SRC0:%=common/x86/%)
-ifeq ($(ARCH),X86)
+ifeq ($(ARCH),i386)
ARCH_X86 = yes
ASMSRC = $(X86SRC) common/x86/pixel-32.asm
+ ASFLAGS += -DARCH_X86_64=0
endif
-ifeq ($(ARCH),X86_64)
+ifeq ($(ARCH),amd64)
ARCH_X86 = yes
- ASMSRC = $(X86SRC:-32.asm=-64.asm)
- ASFLAGS += -DARCH_X86_64
-@@ -77,7 +77,7 @@
+ ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
+ ASFLAGS += -DARCH_X86_64=1
+@@ -106,7 +106,7 @@
endif
# AltiVec optims