summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2012-05-04 15:00:48 +0000
committermm <mm@FreeBSD.org>2012-05-04 15:00:48 +0000
commitbcb3481b07c2b13507f33072abb5b12f725cfdc8 (patch)
tree7b7ce2a91cf1ae1393109e04549478ea3618aa2e
parent453fd4e1e76ed4216feb44b84bd5e8bfa5df7be1 (diff)
downloadFreeBSD-ports-bcb3481b07c2b13507f33072abb5b12f725cfdc8.zip
FreeBSD-ports-bcb3481b07c2b13507f33072abb5b12f725cfdc8.tar.gz
Fix broken patch
-rw-r--r--multimedia/x264-devel/files/patch-Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile
index 8382667..8af6f39 100644
--- a/multimedia/x264-devel/files/patch-Makefile
+++ b/multimedia/x264-devel/files/patch-Makefile
@@ -1,21 +1,22 @@
---- Makefile.orig 2010-04-20 22:45:09.000000000 +0200
-+++ Makefile 2010-04-21 14:07:39.258797099 +0200
-@@ -54,12 +54,12 @@
- cpu-a.asm dct-32.asm
+--- Makefile.orig 2012-04-24 23:13:17.000000000 +0200
++++ Makefile 2012-05-04 12:21:04.220847109 +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
-@@ -75,7 +75,7 @@
+ ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
+ ASFLAGS += -DARCH_X86_64=1
+@@ -106,7 +106,7 @@
endif
# AltiVec optims
OpenPOWER on IntegriCloud