Mercurial > mxe-octave
diff 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 |
line wrap: on
line diff
--- a/src/x264.mk Wed Sep 16 07:51:27 2015 -0400 +++ b/src/x264.mk Fri Sep 18 08:05:55 2015 -0400 @@ -3,8 +3,8 @@ PKG := x264 $(PKG)_IGNORE := -$(PKG)_VERSION := 20111018-2245 -$(PKG)_CHECKSUM := a6c4a6786a2347b5b1d50dc0ddfd378bf1890481 +$(PKG)_VERSION := 20141130-2245 +$(PKG)_CHECKSUM := e2a4f5dd0a773a3e89f7c5cf1b3d2efc95f282b8 $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE) @@ -14,14 +14,30 @@ date -d yesterday +%Y%m%d-2245 endef +ifeq ($(MXE_NATIVE_BUILD),no) define $(PKG)_BUILD cd '$(1)' && ./configure \ - --cross-prefix='$(MXE_TOOL_PREFIX)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ + --cross-prefix='$(MXE_TOOL_PREFIX)' \ + --disable-lavf \ + --disable-swscale \ --enable-win32thread $(MAKE) -C '$(1)' -j 1 uninstall $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef +else +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + $(ENABLE_SHARED_OR_STATIC) \ + --disable-lavf \ + --disable-swscale + $(MAKE) -C '$(1)' -j 1 uninstall + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef +endif