multimedia/ffmpeg: simplify ARCH workaround

ARCH is clobbered via .MAKEFLAGS in Mk/bsd.port.mk since r20327.

Approved by:	portmgr blanket

5 files changed, 1 insertions, 44 deletions

diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 28bb528db7cb..0ce3eadaf349 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -20,6 +20,7 @@ USE_XORG=	x11
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
+NOPRECIOUSMAKEVARS=	yes # ARCH
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
diff --git a/multimedia/libav/files/patch-Makefile b/multimedia/libav/files/patch-Makefile
deleted file mode 100644
index f7c2cb79a2bd..000000000000
--- a/multimedia/libav/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2016-05-25 00:36:32 UTC
-+++ Makefile
-@@ -129,7 +129,7 @@ define DOSUBDIR
- $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
- SUBDIR := $(1)/
- include $(SRC_PATH)/$(1)/Makefile
---include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
-+-include $(SRC_PATH)/$(1)/$(LIBAV_ARCH)/Makefile
- -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
- include $(SRC_PATH)/library.mak
- endef
diff --git a/multimedia/libav/files/patch-common.mak b/multimedia/libav/files/patch-common.mak
deleted file mode 100644
index f455be676c3b..000000000000
--- a/multimedia/libav/files/patch-common.mak
+++ /dev/null
@@ -1,13 +0,0 @@
---- common.mak.orig	2016-05-25 00:36:32 UTC
-+++ common.mak
-@@ -28,8 +28,8 @@ PATH_LIBNAME = $(foreach NAME,$(1),lib$(
- DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
- 
- SRC_DIR    := $(SRC_PATH)/lib$(NAME)
--ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
--SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
-+ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(LIBAV_ARCH)/*.h))
-+SKIPHEADERS += $(ARCH_HEADERS:%=$(LIBAV_ARCH)/%) $(SKIPHEADERS-)
- SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
- HOBJS        = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o))
- checkheaders: $(HOBJS)
diff --git a/multimedia/libav/files/patch-configure b/multimedia/libav/files/patch-configure
index 4f9affa1d3c8..6daac586bbf3 100644
--- a/multimedia/libav/files/patch-configure
+++ b/multimedia/libav/files/patch-configure
@@ -19,15 +19,6 @@
      check_cflags -Qunused-arguments
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
-@@ -4644,7 +4644,7 @@ DOCDIR=\$(DESTDIR)$docdir
- MANDIR=\$(DESTDIR)$mandir
- SRC_PATH=$source_path
- CC_IDENT=$cc_ident
--ARCH=$arch
-+LIBAV_ARCH=$arch
- INTRINSICS=$intrinsics
- CC=$cc
- AS=$as
 @@ -4821,7 +4821,7 @@ pkgconfig_generate(){
      requires=${requires%, }
      enabled ${name#lib} || return 0
diff --git a/multimedia/libav/files/patch-libavcodec_Makefile b/multimedia/libav/files/patch-libavcodec_Makefile
deleted file mode 100644
index a9179d6f3e80..000000000000
--- a/multimedia/libav/files/patch-libavcodec_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/Makefile.orig	2016-05-25 00:36:32 UTC
-+++ libavcodec/Makefile
-@@ -704,7 +704,7 @@ SKIPHEADERS                            +
-                                           aac_tablegen_decl.h           \
-                                           fft-internal.h                \
-                                           tableprint.h                  \
--                                          $(ARCH)/vp56_arith.h          \
-+                                          $(LIBAV_ARCH)/vp56_arith.h          \
- 
- SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h