343c2bf2ae
pkgsrc changes:
o Switch all mplayer packages to use multimedia/ffmpeg2 instead of the
version bundled with MPlayer. This will make maintainership of mplayer
packages probably a bit easier (and it's particular relevant when dealing
vulnerability issues). Discussed with wiz@.
o Adjust CONFIGURE_ARGS and other part of the Makefile* to reflect the switch
to multimedia/ffmpeg2.
Changes:
1.2.1:
Fixes:
* misc GUI fixes
* fix build regression in FreeBSD
* fix many crashes with fuzzed files
* fix errors for multichannels files and pulseaudio >= 6
Other:
* building with system FFmpeg libs is possible without a local copy of
of private FFmpeg headers
* docs building does not require FFmpeg anymore
* FFmpeg updated to 2.8.5
16 lines
746 B
Text
16 lines
746 B
Text
$NetBSD: patch-Makefile,v 1.1 2016/02/07 13:34:33 leot Exp $
|
|
|
|
Do not treat codec-cfg specially. It needs ffmpeg headers altough they were
|
|
previously hardcoded via HOSTCFLAGS. Adjust that like other executables.
|
|
|
|
--- Makefile.orig 2015-06-03 11:58:05.000000000 +0000
|
|
+++ Makefile
|
|
@@ -752,7 +752,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
|
|
codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
|
|
codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
|
|
codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
|
|
- $(HOST_CC) $(HOSTCFLAGS) -o $@ $<
|
|
+ $(HOST_CC) $(CC_DEPFLAGS) $(CFLAGS) $(HOSTCFLAGS) -o $@ $<
|
|
|
|
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
|
|
./$^ > $@
|