Skip to content

Commit

Permalink
Build ffmpeg as mythffmpeg and install
Browse files Browse the repository at this point in the history
This will allow nuvexport to standardize on using the snapshotted ffmpeg which
is built against the libmythav* libraries, as is mythtv itself.  This will
get rid of the constant changes in ffmpeg command-line arguments once and for
all.  At every ffmpeg resync, we will need to be sure that this is recreated,
and then that nuvexport uses whatever changed command-line arguments that the
new sync uses.
  • Loading branch information
Beirdo committed Dec 11, 2010
1 parent fdd6b2f commit 8c6de46
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions mythtv/configure
Expand Up @@ -1955,6 +1955,7 @@ enable avutil
enable asm enable asm
enable debug enable debug
#enable doc #enable doc
enable ffmpeg
enable fastdiv enable fastdiv
enable gpl enable gpl
enable mpegaudio_hp enable mpegaudio_hp
Expand Down
3 changes: 3 additions & 0 deletions mythtv/external/.gitignore
Expand Up @@ -8,3 +8,6 @@ version.h
config.mak config.mak
config.h config.h
avconfig.h avconfig.h
ffmpeg
ffmpeg_g
mythffmpeg
11 changes: 10 additions & 1 deletion mythtv/external/FFmpeg/Makefile
Expand Up @@ -16,6 +16,7 @@ MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
HTMLPAGES = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes))) HTMLPAGES = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes)))
TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher)) TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher))
HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64) HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64)
MYTHPROGS = $(addprefix myth, ${PROGS})


BASENAMES = ffmpeg ffplay ffprobe ffserver BASENAMES = ffmpeg ffplay ffprobe ffserver
ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES))
Expand Down Expand Up @@ -46,7 +47,8 @@ FF_DEP_LIBS := $(DEP_LIBS)
ALL_TARGETS-$(CONFIG_DOC) += documentation ALL_TARGETS-$(CONFIG_DOC) += documentation


ifdef PROGS ifdef PROGS
INSTALL_TARGETS-yes += install-progs install-data INSTALL_TARGETS-yes += install-mythprogs
#INSTALL_TARGETS-yes += install-progs install-data
INSTALL_TARGETS-$(CONFIG_DOC) += install-man INSTALL_TARGETS-$(CONFIG_DOC) += install-man
endif endif
INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
Expand All @@ -57,6 +59,9 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
$(CP) $< $@ $(CP) $< $@
$(STRIP) $@ $(STRIP) $@


${MYTHPROGS}: myth%: %
$(CP) $< $@

config.h: .config config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c)) .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
@-tput bold 2>/dev/null @-tput bold 2>/dev/null
Expand Down Expand Up @@ -137,6 +142,10 @@ install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
$(Q)mkdir -p "$(BINDIR)" $(Q)mkdir -p "$(BINDIR)"
$(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)" $(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"


install-mythprogs: $(MYTHPROGS) $(INSTALL_PROGS_TARGETS-yes)
$(Q)mkdir -p "$(BINDIR)"
$(INSTALL) -c -m 755 $(MYTHPROGS) "$(BINDIR)"

install-data: $(DATA_FILES) install-data: $(DATA_FILES)
$(Q)mkdir -p "$(DATADIR)" $(Q)mkdir -p "$(DATADIR)"
$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)" $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
Expand Down

0 comments on commit 8c6de46

Please sign in to comment.