summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2010-12-08 00:35:40 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2010-12-08 00:35:40 (GMT)
commit636c770726783d9a48529cc4329c030a61ffb632 (patch)
tree34549977512082ff4553cc6d205324fef86dfef2
parentaba6a0c28744638c12e8243839f2e6676d0ab5d4 (diff)
downloadmxe-636c770726783d9a48529cc4329c030a61ffb632.zip
mxe-636c770726783d9a48529cc4329c030a61ffb632.tar.gz
mxe-636c770726783d9a48529cc4329c030a61ffb632.tar.bz2
remove non-free package faac
-rw-r--r--src/faac.mk29
-rw-r--r--src/ffmpeg.mk4
2 files changed, 2 insertions, 31 deletions
diff --git a/src/faac.mk b/src/faac.mk
deleted file mode 100644
index dcb023b..0000000
--- a/src/faac.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
-
-# faac
-PKG := faac
-$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.28
-$(PKG)_CHECKSUM := d00b023a3642f81bb1fb13d962a65079121396ee
-$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE := http://www.audiocoding.com/
-$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-src/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc faad2
-
-define $(PKG)_UPDATE
- wget -q -O- 'http://sourceforge.net/projects/faac/files/faac-src/' | \
- $(SED) -n 's,.*/faac-\([0-9][^"]*\)/".*,\1,p' | \
- head -1
-endef
-
-define $(PKG)_BUILD
- cd '$(1)' && ./configure \
- --host='$(TARGET)' \
- --prefix='$(PREFIX)/$(TARGET)' \
- --disable-shared \
- --without-mp4v2
- $(MAKE) -C '$(1)' -j '$(JOBS)'
- $(MAKE) -C '$(1)' -j 1 install
-endef
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 670fa50..358e024 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -11,7 +11,7 @@ $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2
$(PKG)_WEBSITE := http://www.ffmpeg.org/
$(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 faad2 faac lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
+$(PKG)_DEPS := gcc bzip2 faad2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
define $(PKG)_UPDATE
wget -q -O- 'http://www.ffmpeg.org/download.html' | \
@@ -40,7 +40,7 @@ define $(PKG)_BUILD
--enable-libmp3lame \
--enable-libxvid \
--enable-libfaad \
- --enable-libfaac \
+ --disable-libfaac \
--enable-libopencore-amrnb \
--enable-libopencore-amrwb \
--enable-libx264 \