Mercurial > mxe-octave
comparison src/x264.mk @ 4029:c4a341e3e014
ffmpeg: updates to work in windows
* src/ffmpeg.mk: add --extra-libs='-mconsole'
* src/libvpx.mk: set as to yasm
* src/x264-1-fix-bin-bash.patch: update vpx patch from mxe.cc
* src/x264.mk: update version,checksum for 20141130-2245
* src/xvidcore.mk: dont rename xvidcore.dll to libxvidecore.dll
author | John Donoghue |
---|---|
date | Fri, 18 Sep 2015 08:05:55 -0400 |
parents | 13be64f9f16d |
children | 9ebb98431899 |
comparison
equal
deleted
inserted
replaced
4028:8803dfa40236 | 4029:c4a341e3e014 |
---|---|
1 # This file is part of MXE. | 1 # This file is part of MXE. |
2 # See index.html for further information. | 2 # See index.html for further information. |
3 | 3 |
4 PKG := x264 | 4 PKG := x264 |
5 $(PKG)_IGNORE := | 5 $(PKG)_IGNORE := |
6 $(PKG)_VERSION := 20111018-2245 | 6 $(PKG)_VERSION := 20141130-2245 |
7 $(PKG)_CHECKSUM := a6c4a6786a2347b5b1d50dc0ddfd378bf1890481 | 7 $(PKG)_CHECKSUM := e2a4f5dd0a773a3e89f7c5cf1b3d2efc95f282b8 |
8 $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) | 8 $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) |
9 $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 | 9 $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 |
10 $(PKG)_URL := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE) | 10 $(PKG)_URL := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE) |
11 $(PKG)_DEPS := | 11 $(PKG)_DEPS := |
12 | 12 |
13 define $(PKG)_UPDATE | 13 define $(PKG)_UPDATE |
14 date -d yesterday +%Y%m%d-2245 | 14 date -d yesterday +%Y%m%d-2245 |
15 endef | 15 endef |
16 | 16 |
17 ifeq ($(MXE_NATIVE_BUILD),no) | |
17 define $(PKG)_BUILD | 18 define $(PKG)_BUILD |
18 cd '$(1)' && ./configure \ | 19 cd '$(1)' && ./configure \ |
19 --cross-prefix='$(MXE_TOOL_PREFIX)' \ | |
20 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ | 20 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ |
21 --prefix='$(HOST_PREFIX)' \ | 21 --prefix='$(HOST_PREFIX)' \ |
22 $(ENABLE_SHARED_OR_STATIC) \ | 22 $(ENABLE_SHARED_OR_STATIC) \ |
23 --cross-prefix='$(MXE_TOOL_PREFIX)' \ | |
24 --disable-lavf \ | |
25 --disable-swscale \ | |
23 --enable-win32thread | 26 --enable-win32thread |
24 $(MAKE) -C '$(1)' -j 1 uninstall | 27 $(MAKE) -C '$(1)' -j 1 uninstall |
25 $(MAKE) -C '$(1)' -j '$(JOBS)' | 28 $(MAKE) -C '$(1)' -j '$(JOBS)' |
26 $(MAKE) -C '$(1)' -j 1 install | 29 $(MAKE) -C '$(1)' -j 1 install |
27 endef | 30 endef |
31 else | |
32 define $(PKG)_BUILD | |
33 cd '$(1)' && ./configure \ | |
34 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ | |
35 --prefix='$(HOST_PREFIX)' \ | |
36 $(ENABLE_SHARED_OR_STATIC) \ | |
37 --disable-lavf \ | |
38 --disable-swscale | |
39 $(MAKE) -C '$(1)' -j 1 uninstall | |
40 $(MAKE) -C '$(1)' -j '$(JOBS)' | |
41 $(MAKE) -C '$(1)' -j 1 install | |
42 endef | |
43 endif |