Mercurial > mxe-octave

changeset 4024:8114d05101dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ffmpeg: update to v2.7.2 * src/ffmpeg.mk: update version, checksum, add native vs cross build rules * src/xvidcore.mk: fix typo in install of .dll.a * src/libvpx.mk: set target based on build options
author John Donoghue
date Fri, 11 Sep 2015 15:22:10 -0400
parents e9bc89b98054
children 703b6f9eaea1
files src/ffmpeg.mk src/libvpx.mk src/xvidcore.mk
diffstat 3 files changed, 31 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/ffmpeg.mk	Mon Sep 07 13:46:45 2015 -0400
+++ b/src/ffmpeg.mk	Fri Sep 11 15:22:10 2015 -0400
@@ -3,14 +3,28 @@
 
 PKG             := ffmpeg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0
-$(PKG)_CHECKSUM := bf1f917c4fa26cf225616f2063e60c33cac546be
+$(PKG)_VERSION  := 2.7.2
+$(PKG)_CHECKSUM := b8175a9a729fc4bdbb3c196ffe84a2fca7977ff8
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
 $(PKG)_DEPS     := bzip2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
 
+$(PKG)_CONFIG_OPTS :=
+
+ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_CONFIG_OPTS += \
+        --target-os=mingw32
+endif
+
+ifneq ($(MXE_NATIVE_BUILD),yes)
+    $(PKG)_CONFIG_OPTS += \
+        --cross-prefix='$(MXE_TOOL_PREFIX)' \
+        --enable-cross-compile 
+endif
+
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \
     $(SED) -n 's,.*ffmpeg-\([0-9][^>]*\)\.tar.*,\1,p' | \
@@ -20,10 +34,8 @@
 define $(PKG)_BUILD
     '$(SED)' -i "s^[-]lvpx^`'$(MXE_PKG_CONFIG)' --libs-only-l vpx`^g;" $(1)/configure
     cd '$(1)' && ./configure \
-        --cross-prefix='$(MXE_TOOL_PREFIX)' \
-        --enable-cross-compile \
-        --arch=i686 \
-        --target-os=mingw32 \
+        $($(PKG)_CONFIG_OPTS) \
+        --arch=$(firstword $(subst -, ,$(TARGET))) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-debug \
--- a/src/libvpx.mk	Mon Sep 07 13:46:45 2015 -0400
+++ b/src/libvpx.mk	Fri Sep 11 15:22:10 2015 -0400
@@ -10,6 +10,17 @@
 $(PKG)_URL      := http://webm.googlecode.com/files/$($(PKG)_FILE)
 $(PKG)_DEPS     := pthreads
 
+$(PKG)_TARGET_OPTS := 
+
+ifeq ($(MXE_NATIVE_BUILD),no)
+  ifeq ($(ENABLE_WINDOWS_64),yes)
+    $(PKG)_TARGET_OPTS := --target=x86_64-win64-gcc 
+  else
+    $(PKG)_TARGET_OPTS := --target=x86-win32-gcc 
+  endif
+endif
+
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://code.google.com/p/webm/downloads/list?sort=-uploaded' | \
     $(SED) -n 's,.*libvpx-v\([0-9][^<]*\)\.tar.*,\1,p' | \
@@ -21,7 +32,7 @@
         CROSS='$(MXE_TOOL_PREFIX)' \
         ./configure \
         --prefix='$(HOST_PREFIX)' \
-        --target=x86-win32-gcc \
+        $($(PKG)_TARGET_OPTS) \
         --disable-examples \
         --disable-install-docs
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/xvidcore.mk	Mon Sep 07 13:46:45 2015 -0400
+++ b/src/xvidcore.mk	Fri Sep 11 15:22:10 2015 -0400
@@ -28,7 +28,7 @@
     if [ "x$(BUILD_STATIC)" == "xyes" ]; then \
       $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(HOST_LIBDIR)/libxvidcore.a'; \
     else \
-      $(INSTALL) -m644 '$(1)/build/xvidcore.dll.a' '$(HOST_LIBDIR)/libxvidcore.dll.alibxvidcore.dll.a'; \
+      $(INSTALL) -m644 '$(1)/build/xvidcore.dll.a' '$(HOST_LIBDIR)/libxvidcore.dll.a'; \
       $(INSTALL) -m644 '$(1)/build/xvidcore.dll' '$(HOST_BINDIR)/libxvidcore.dll'; \
     fi
 endef