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, 50 deletions

diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index b5e3da33edc8..c68d49ab10dd 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -18,6 +18,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2
 
 USES=		compiler:c11 gmake iconv ncurses tar:xz
+NOPRECIOUSMAKEVARS=	yes # ARCH
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc="${CC}" \
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index c2819e4fdeb4..ce11fa00a670 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -167,12 +167,3 @@
  
  CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
  
-@@ -8375,7 +8386,7 @@ TIMER = $_timer
- EXESUF      = $_exesuf
- EXESUFS_ALL = .exe
- 
--ARCH = $arch
-+MPLAYER_ARCH = $arch
- $(mak_enable "$arch_all"    "$arch"    ARCH)
- $(mak_enable "$subarch_all" "$subarch" ARCH)
- $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
diff --git a/multimedia/mplayer/files/patch-ffmpeg_Makefile b/multimedia/mplayer/files/patch-ffmpeg_Makefile
deleted file mode 100644
index e83418d6dd18..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/Makefile.orig	2015-06-19 20:44:35 UTC
-+++ ffmpeg/Makefile
-@@ -92,7 +92,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)/$(MPLAYER_ARCH)/Makefile
- -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
- include $(SRC_PATH)/library.mak
- endef
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
deleted file mode 100644
index 838d380df25b..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/libavcodec/Makefile.orig	2016-02-16 20:31:33 UTC
-+++ ffmpeg/libavcodec/Makefile
-@@ -935,7 +935,7 @@ SKIPHEADERS                            +
-                                           aaccoder_trellis.h            \
-                                           aacenc_quantization.h         \
-                                           aacenc_quantization_misc.h    \
--                                          $(ARCH)/vp56_arith.h          \
-+                                          $(MPLAYER_ARCH)/vp56_arith.h          \
- 
- SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
diff --git a/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile b/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile
deleted file mode 100644
index 8df33e613da6..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- ffmpeg/tests/checkasm/Makefile.orig	2016-04-09 14:32:47 UTC
-+++ ffmpeg/tests/checkasm/Makefile
-@@ -20,7 +20,7 @@ AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += v
- CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
- 
- 
---include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
-+-include $(SRC_PATH)/tests/checkasm/$(MPLAYER_ARCH)/Makefile
- 
- CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
- CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
-@@ -43,6 +43,6 @@ checkasm: $(CHECKASM)
- testclean:: checkasmclean
- 
- checkasmclean:
--	$(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(ARCH)/%)
-+	$(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(MPLAYER_ARCH)/%)
- 
- .PHONY: checkasm