summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2013-02-13 07:46:08 (GMT)
committerTony Theodore <tonyt@logyst.com>2013-02-13 07:46:08 (GMT)
commitb038f58ef6a4e57d8ffb6359220d3bae0148d8e1 (patch)
tree6b8b72556d39d296009abb96dd6f7ee8760a98c7 /src
parent05c0bf5b8e70ee1e8c75bda8d440c7b9251e1d9f (diff)
parent4a10787c2a80236a75fe7582843eae424cd65656 (diff)
downloadmxe-b038f58ef6a4e57d8ffb6359220d3bae0148d8e1.zip
mxe-b038f58ef6a4e57d8ffb6359220d3bae0148d8e1.tar.gz
mxe-b038f58ef6a4e57d8ffb6359220d3bae0148d8e1.tar.bz2
Merge pull request #144 from alexkay/master
Update FFmpeg and enable opus support
Diffstat (limited to 'src')
-rw-r--r--src/ffmpeg.mk7
-rw-r--r--src/opus.mk26
2 files changed, 30 insertions, 3 deletions
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 03653e0..80d89c4 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -3,12 +3,12 @@
PKG := ffmpeg
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := ad02037de190fb04611ec5347c5a97130249bebf
+$(PKG)_CHECKSUM := 1fb1c2019ff13440b3670dc83846c654b245c4c9
$(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 := gcc bzip2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
+$(PKG)_DEPS := gcc bzip2 lame libvpx opencore-amr opus sdl speex theora vorbis x264 xvidcore zlib
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \
@@ -44,7 +44,8 @@ define $(PKG)_BUILD
--enable-libopencore-amrnb \
--enable-libopencore-amrwb \
--enable-libx264 \
- --enable-libvpx
+ --enable-libvpx \
+ --enable-libopus
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
diff --git a/src/opus.mk b/src/opus.mk
new file mode 100644
index 0000000..15c93c7
--- /dev/null
+++ b/src/opus.mk
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := opus
+$(PKG)_IGNORE :=
+$(PKG)_CHECKSUM := 37dd3d69b10612cd513ccf26675ef6d61eda24b4
+$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL := http://downloads.xiph.org/releases/$(PKG)/$($(PKG)_FILE)
+$(PKG)_DEPS := gcc
+
+define $(PKG)_UPDATE
+ $(WGET) -q -O- 'http://www.xiph.org/downloads/' | \
+ $(SED) -n 's,.*opus-\([0-9][^>]*\)\.tar.*,\1,p' | \
+ head -1
+endef
+
+define $(PKG)_BUILD
+ cd '$(1)' && ./configure \
+ --host='$(TARGET)' \
+ --build="`config.guess`" \
+ --disable-shared \
+ --prefix='$(PREFIX)/$(TARGET)'
+ $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+ $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef