diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-10-31 08:36:15 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-10-31 08:36:15 (GMT) |
| commit | 1e068f799eadb3f527f558d69b0e86ef53d3f452 (patch) | |
| tree | d514f251853832a557c90c07c4f7dc4458de34de /src/x264.mk | |
| parent | b181bc8d045ff4e5bb5ecbf53d36c73e1902f9e8 (diff) | |
| download | mxe-1e068f799eadb3f527f558d69b0e86ef53d3f452.zip mxe-1e068f799eadb3f527f558d69b0e86ef53d3f452.tar.gz mxe-1e068f799eadb3f527f558d69b0e86ef53d3f452.tar.bz2 | |
x264: update 20161130 --> 20170626 and use nasm
Based on #1900, repo has been removed
Diffstat (limited to 'src/x264.mk')
| -rw-r--r-- | src/x264.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/x264.mk b/src/x264.mk index e223220..1b90374 100644 --- a/src/x264.mk +++ b/src/x264.mk @@ -3,12 +3,12 @@ PKG := x264 $(PKG)_WEBSITE := https://www.videolan.org/developers/x264.html $(PKG)_IGNORE := -$(PKG)_VERSION := 20161130-2245 -$(PKG)_CHECKSUM := 0825e14945bc373107f9a00e66d45d5389bb86368efd834b92c52cddb2ded1d8 +$(PKG)_VERSION := 20170626-2245 +$(PKG)_CHECKSUM := 28cf90f63964e24e65b05084c75d114a997004c8d3f72feae7229da3a098988e $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE) -$(PKG)_DEPS := gcc liblsmash yasm +$(PKG)_DEPS := gcc liblsmash nasm define $(PKG)_UPDATE $(WGET) -q -O- 'https://git.videolan.org/?p=x264.git;a=shortlog' | \ @@ -18,14 +18,13 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i 's,yasm,$(TARGET)-yasm,g' '$(1)/configure' - cd '$(1)' && ./configure \ + cd '$(BUILD_DIR)' && AS='$(PREFIX)/$(BUILD)/bin/nasm' '$(SOURCE_DIR)/configure'\ $(MXE_CONFIGURE_OPTS) \ --cross-prefix='$(TARGET)'- \ --enable-win32thread \ --disable-lavf \ --disable-swscale # Avoid circular dependency with ffmpeg. Remove if undesired. - $(MAKE) -C '$(1)' -j 1 uninstall - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(BUILD_DIR)' -j 1 uninstall + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef |