Ticket #9141: build.patch

File build.patch, 1.2 KB (added by jonno.conder@…, 16 years ago)

patch to fix build problems

  • external/FFmpeg/Makefile 

    diff -ru a/external/FFmpeg/Makefile b/external/FFmpeg/Makefile
    a b  
    3333
    3434FFLIBS := avutil
    3535
    36 DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
     36DATA_FILES := $(wildcard $(SRC_PATH_BARE)/external/FFmpeg/ffpresets/*.ffpreset)
    3737
    3838SKIPHEADERS = cmdutils_common_opts.h
    3939
    … …  
    5858        $(STRIP) $@
    5959
    6060config.h: .config
    61 .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
     61.config: $(wildcard $(FFLIBS:%=$(SRC_PATH_BARE)/external/FFmpeg/lib%/all*.c))
    6262        @-tput bold 2>/dev/null
    6363        @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
    6464        @-tput sgr0 2>/dev/null

  • external/FFmpeg/version.sh 

    diff -ru a/external/FFmpeg/version.sh b/external/FFmpeg/version.sh
    a b  
    2626test $revision || revision=UNKNOWN
    2727
    2828# releases extract the version number from the VERSION file
    29 version=$(cd "$1" && cat VERSION 2> /dev/null)
     29version=$(. "$1/VERSION" 2> /dev/null && echo "$SOURCE_VERSION")
    3030test $version || version=$revision
    3131
    3232test -n "$3" && version=$version-$3