mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
Merge svn changes up to r26599
This commit is contained in:
Uoti Urpala
commit
431bf1f5b6
@ -3,13 +3,13 @@ MPlayer code and documentation maintainers
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
NOTE: This file (should) contain the up-to-date list of the maintainers of
|
||||
each part/module of the mplayer CVS / source tree, including docs & homepage.
|
||||
each part/module of the mplayer svn / source tree, including docs & homepage.
|
||||
You should NOT commit non-trivial changes without the agreement by the
|
||||
maintainer of the given part. The job of the maintainer is commenting,
|
||||
refusing or accepting patches, suggestions.
|
||||
If you're listed here as maintainer of one or more parts, but you don't want
|
||||
it to be so, tell us and you will be removed... this list has been created
|
||||
based on maillist/cvs activity. It may be wrong.
|
||||
based on maillist/svn activity. It may be wrong.
|
||||
|
||||
Always send the patches (first read DOCS/tech/patches.txt), comments to
|
||||
the mplayer-dev-eng mailing list!!!
|
||||
|
||||
101
Makefile
101
Makefile
@ -631,6 +631,14 @@ ALL_PRG += $(ALL_PRG-yes)
|
||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
|
||||
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
|
||||
|
||||
SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes)
|
||||
SRCS_MENCODER += $(SRCS_MENCODER-yes)
|
||||
SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
|
||||
|
||||
OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) )
|
||||
OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
|
||||
OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
|
||||
|
||||
INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
|
||||
INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
|
||||
INSTALL_TARGETS-$(GUI) += install-gui
|
||||
@ -655,6 +663,17 @@ DIRS = . \
|
||||
libaf \
|
||||
libao2 \
|
||||
libass \
|
||||
ffmpeg/libavcodec \
|
||||
ffmpeg/libavcodec/alpha \
|
||||
ffmpeg/libavcodec/armv4l \
|
||||
ffmpeg/libavcodec/bfin \
|
||||
ffmpeg/libavcodec/i386 \
|
||||
ffmpeg/libavcodec/mlib \
|
||||
ffmpeg/libavcodec/ppc \
|
||||
ffmpeg/libavcodec/sh4 \
|
||||
ffmpeg/libavcodec/sparc \
|
||||
ffmpeg/libavformat \
|
||||
ffmpeg/libavutil \
|
||||
libdvdcss \
|
||||
libfaad2 \
|
||||
libmenu \
|
||||
@ -662,6 +681,8 @@ DIRS = . \
|
||||
libmpcodecs/native \
|
||||
libmpdemux \
|
||||
libmpeg2 \
|
||||
ffmpeg/libpostproc \
|
||||
libswscale \
|
||||
libvo \
|
||||
loader \
|
||||
loader/dshow \
|
||||
@ -681,13 +702,48 @@ all: $(ALL_PRG)
|
||||
recurse:
|
||||
for part in $(PARTS); do $(MAKE) -C $$part; done
|
||||
|
||||
include mpcommon.mak
|
||||
%.d: %.c
|
||||
$(MPDEPEND_CMD) > $@
|
||||
|
||||
%.d: %.cpp
|
||||
$(MPDEPEND_CMD_CXX) > $@
|
||||
|
||||
%.d: %.m
|
||||
$(MPDEPEND_CMD) > $@
|
||||
|
||||
%.ho: %.h
|
||||
$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
|
||||
|
||||
%.o: %.m
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
|
||||
$(DEPS) recurse: help_mp.h version.h codecs.conf.h
|
||||
dep depend: $(DEPS)
|
||||
for part in $(PARTS); do $(MAKE) -C $$part depend; done
|
||||
|
||||
# rebuild at every config.h/config.mak change:
|
||||
version.h: config.h config.mak
|
||||
./version.sh `$(CC) -dumpversion`
|
||||
|
||||
help_mp.h: help/help_mp-en.h $(HELP_FILE)
|
||||
@echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h
|
||||
@echo '// See the help/ subdir for the editable files.' >> help_mp.h
|
||||
@echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h
|
||||
@echo '#define MPLAYER_HELP_MP_H' >> help_mp.h
|
||||
ifeq ($(CHARSET),)
|
||||
@echo '#include "$(HELP_FILE)"' >> help_mp.h
|
||||
else
|
||||
iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
|
||||
endif
|
||||
@echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h
|
||||
|
||||
ifneq ($(HELP_FILE),help/help_mp-en.h)
|
||||
@echo "Adding untranslated messages to help_mp.h"
|
||||
@echo '// untranslated messages from the English master file:' >> help_mp.h
|
||||
@help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h
|
||||
endif
|
||||
|
||||
define RECURSIVE_RULE
|
||||
$(part)/$(notdir $(part)).a:
|
||||
$(MAKE) -C $(part)
|
||||
@ -709,8 +765,6 @@ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
|
||||
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
|
||||
./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
|
||||
|
||||
codec-cfg.o: codecs.conf.h
|
||||
|
||||
codecs2html$(EXESUF): mp_msg.o
|
||||
$(CC) -DCODECS2HTML codec-cfg.c $^ -o $@
|
||||
|
||||
@ -814,16 +868,15 @@ uninstall:
|
||||
done
|
||||
|
||||
clean: toolsclean
|
||||
for part in $(PARTS); do $(MAKE) -C $$part clean; done
|
||||
rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir))))
|
||||
rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
|
||||
codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
|
||||
codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES)
|
||||
rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir))))
|
||||
rm -f mplayer$(EXESUF) mencoder$(EXESUF)
|
||||
|
||||
distclean: clean doxygen_clean
|
||||
for part in $(PARTS); do $(MAKE) -C $$part distclean; done
|
||||
rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir))))
|
||||
rm -f configure.log config.mak config.h
|
||||
rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \
|
||||
version.h $(VIDIX_PCI_FILES) \
|
||||
codec-cfg$(EXESUF) codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \
|
||||
cpuinfo$(EXESUF) TAGS tags
|
||||
|
||||
strip:
|
||||
strip -s $(ALL_PRG)
|
||||
@ -834,40 +887,21 @@ TAGS:
|
||||
tags:
|
||||
rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a
|
||||
|
||||
ALLHEADERS = $(wildcard *.h)
|
||||
checkheaders: $(ALLHEADERS:.h=.ho)
|
||||
|
||||
# ./configure must be rerun if it changed
|
||||
config.mak: configure
|
||||
@echo "############################################################"
|
||||
@echo "####### Please run ./configure again - it's changed! #######"
|
||||
@echo "############################################################"
|
||||
|
||||
# rebuild at every config.h/config.mak/Makefile change:
|
||||
version.h: config.h config.mak Makefile
|
||||
./version.sh `$(CC) -dumpversion`
|
||||
|
||||
doxygen:
|
||||
doxygen DOCS/tech/Doxyfile
|
||||
|
||||
doxygen_clean:
|
||||
-rm -rf DOCS/tech/doxygen
|
||||
|
||||
help_mp.h: help/help_mp-en.h $(HELP_FILE)
|
||||
@echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h
|
||||
@echo '// See the help/ subdir for the editable files.' >> help_mp.h
|
||||
@echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h
|
||||
@echo '#define MPLAYER_HELP_MP_H' >> help_mp.h
|
||||
ifeq ($(CHARSET),)
|
||||
@echo '#include "$(HELP_FILE)"' >> help_mp.h
|
||||
else
|
||||
iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
|
||||
endif
|
||||
@echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h
|
||||
|
||||
ifneq ($(HELP_FILE),help/help_mp-en.h)
|
||||
@echo "Adding untranslated messages to help_mp.h"
|
||||
@echo '// untranslated messages from the English master file:' >> help_mp.h
|
||||
@help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h
|
||||
endif
|
||||
|
||||
|
||||
TOOLS = TOOLS/alaw-gen$(EXESUF) \
|
||||
TOOLS/asfinfo$(EXESUF) \
|
||||
@ -891,7 +925,7 @@ ALLTOOLS = $(TOOLS) \
|
||||
tools: $(TOOLS)
|
||||
alltools: $(ALLTOOLS)
|
||||
|
||||
TOOLS_COMMON_LIBS = mp_msg.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \
|
||||
TOOLS_COMMON_LIBS = mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \
|
||||
-ltermcap -lm
|
||||
|
||||
TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image
|
||||
@ -940,3 +974,4 @@ toolsclean:
|
||||
-include $(DEPS)
|
||||
|
||||
.PHONY: all doxygen *install* recurse strip *tools
|
||||
.PHONY: checkheaders *clean dep depend
|
||||
|
||||
1
configure
vendored
1
configure
vendored
@ -7696,6 +7696,7 @@ WINDRES = $_windres
|
||||
INSTALL = $_install
|
||||
EXTRA_INC = $_inc_extra
|
||||
EXTRAXX_INC = $_inc_extra $_inc_extraxx
|
||||
CFLAGS = $CFLAGS \$(EXTRA_INC)
|
||||
OPTFLAGS = $CFLAGS \$(EXTRA_INC)
|
||||
FFMPEG_OFLAGS = $CFLAGS_FFMPEG \$(EXTRA_INC)
|
||||
CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER
|
||||
|
||||
@ -10,6 +10,7 @@ release 20070930
|
||||
;=============================================================================
|
||||
|
||||
videocodec ffmimic
|
||||
info "FFmpeg Mimic video"
|
||||
status working
|
||||
fourcc ML20
|
||||
out I420
|
||||
@ -17,6 +18,7 @@ videocodec ffmimic
|
||||
dll "mimic"
|
||||
|
||||
videocodec ffkmvc
|
||||
info "FFmpeg Karl Morton Video Codec"
|
||||
status working
|
||||
fourcc KMVC
|
||||
out BGR8
|
||||
|
||||
31
mpcommon.mak
31
mpcommon.mak
@ -1,31 +0,0 @@
|
||||
SRCS_COMMON += $(SRCS_COMMON-yes)
|
||||
SRCS_COMMON += $(SRCS_COMMON-yes-yes)
|
||||
SRCS_COMMON += $(SRCS_COMMON-yes-yes-yes)
|
||||
SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
|
||||
SRCS_MENCODER += $(SRCS_MENCODER-yes)
|
||||
|
||||
OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) )
|
||||
OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
|
||||
OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
|
||||
|
||||
CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
|
||||
|
||||
%.d: %.c
|
||||
$(MPDEPEND_CMD) > $@
|
||||
|
||||
%.d: %.cpp
|
||||
$(MPDEPEND_CMD_CXX) > $@
|
||||
|
||||
%.d: %.m
|
||||
$(MPDEPEND_CMD) > $@
|
||||
|
||||
%.ho: %.h
|
||||
$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
|
||||
|
||||
%.o: %.m
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
ALLHEADERS = $(wildcard *.h)
|
||||
checkheaders: $(ALLHEADERS:.h=.ho)
|
||||
|
||||
.PHONY: checkheaders *clean dep depend
|
||||
Loading…
Reference in New Issue
Block a user