summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/faac.mk4
-rw-r--r--src/faad2-1-uint.patch3
-rw-r--r--src/faad2.mk2
-rw-r--r--src/ffmpeg.mk46
-rw-r--r--src/lame.mk2
-rw-r--r--src/libvpx-1-config.patch3
-rw-r--r--src/libvpx.mk8
-rw-r--r--src/opencore-amr.mk2
-rw-r--r--src/x264-1-ifdef.patch3
-rw-r--r--src/x264.mk6
10 files changed, 44 insertions, 35 deletions
diff --git a/src/faac.mk b/src/faac.mk
index 28548a8..22af9c2 100644
--- a/src/faac.mk
+++ b/src/faac.mk
@@ -20,10 +20,10 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
- --host='$(TARGET)' \
+ --host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared \
- --without-mp4v2
+ --without-mp4v2
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
diff --git a/src/faad2-1-uint.patch b/src/faad2-1-uint.patch
index 3be04d9..04ffe0e 100644
--- a/src/faad2-1-uint.patch
+++ b/src/faad2-1-uint.patch
@@ -1,3 +1,6 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
--- ./frontend/main.c.backup 2010-07-01 16:53:48.563042615 +0200
+++ ./frontend/main.c 2010-07-01 16:54:03.379043126 +0200
@@ -31,7 +31,6 @@
diff --git a/src/faad2.mk b/src/faad2.mk
index 0fa0287..d2a283b 100644
--- a/src/faad2.mk
+++ b/src/faad2.mk
@@ -20,7 +20,7 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
- --host='$(TARGET)' \
+ --host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)'
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 12308e7..9e0d3f2 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -10,7 +10,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.ffmpeg.org/
$(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc xvidcore speex theora vorbis lame faad2 faac opencore-amr x264 libvpx
+$(PKG)_DEPS := gcc bzip2 faad2 faac lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
define $(PKG)_UPDATE
wget -q -O- 'http://www.ffmpeg.org/download.html' | \
@@ -20,30 +20,30 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
- --cross-prefix='$(TARGET)'- \
- --enable-cross-compile \
- --arch=i686 \
- --target-os=mingw32 \
+ --cross-prefix='$(TARGET)'- \
+ --enable-cross-compile \
+ --arch=i686 \
+ --target-os=mingw32 \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared \
- --disable-debug \
- --disable-doc \
- --enable-memalign-hack \
- --enable-gpl \
- --enable-version3 \
- --enable-nonfree \
- --enable-postproc \
- --enable-libspeex \
- --enable-libtheora \
- --enable-libvorbis \
- --enable-libmp3lame \
- --enable-libxvid \
- --enable-libfaad \
- --enable-libfaac \
- --enable-libopencore-amrnb \
- --enable-libopencore-amrwb \
- --enable-libx264 \
- --enable-libvpx
+ --disable-debug \
+ --disable-doc \
+ --enable-memalign-hack \
+ --enable-gpl \
+ --enable-version3 \
+ --enable-nonfree \
+ --enable-postproc \
+ --enable-libspeex \
+ --enable-libtheora \
+ --enable-libvorbis \
+ --enable-libmp3lame \
+ --enable-libxvid \
+ --enable-libfaad \
+ --enable-libfaac \
+ --enable-libopencore-amrnb \
+ --enable-libopencore-amrwb \
+ --enable-libx264 \
+ --enable-libvpx
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
diff --git a/src/lame.mk b/src/lame.mk
index bfce141..c1f2395 100644
--- a/src/lame.mk
+++ b/src/lame.mk
@@ -20,7 +20,7 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
- --host='$(TARGET)' \
+ --host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)'
diff --git a/src/libvpx-1-config.patch b/src/libvpx-1-config.patch
index 7bd66bb..f445745 100644
--- a/src/libvpx-1-config.patch
+++ b/src/libvpx-1-config.patch
@@ -1,3 +1,6 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
diff -Nru libvpx-0.9.1-orig/configure libvpx-0.9.1/configure
--- libvpx-0.9.1-orig/configure 2010-07-09 17:10:49.771062118 +0200
+++ libvpx-0.9.1/configure 2010-07-09 17:16:28.583061657 +0200
diff --git a/src/libvpx.mk b/src/libvpx.mk
index 324950d..dac4ec7 100644
--- a/src/libvpx.mk
+++ b/src/libvpx.mk
@@ -20,11 +20,11 @@ endef
define $(PKG)_BUILD
cd '$(1)' && \
- CROSS='$(TARGET)-' \
- ./configure \
+ CROSS='$(TARGET)-' \
+ ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
- --target=x86-win32-gcc \
- --disable-examples
+ --target=x86-win32-gcc \
+ --disable-examples
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
$(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a
diff --git a/src/opencore-amr.mk b/src/opencore-amr.mk
index 03b144c..8448d9f 100644
--- a/src/opencore-amr.mk
+++ b/src/opencore-amr.mk
@@ -20,7 +20,7 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
- --host='$(TARGET)' \
+ --host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--disable-shared
$(MAKE) -C '$(1)' -j '$(JOBS)'
diff --git a/src/x264-1-ifdef.patch b/src/x264-1-ifdef.patch
index 6d0e6f7..85318f7 100644
--- a/src/x264-1-ifdef.patch
+++ b/src/x264-1-ifdef.patch
@@ -1,3 +1,6 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
diff -Nru x264-snapshot-20100706-2245.orig/x264.c x264-snapshot-20100706-2245/x264.c
--- x264-snapshot-20100706-2245.orig/x264.c 2010-07-07 09:33:15.555062464 +0200
+++ x264-snapshot-20100706-2245/x264.c 2010-07-07 09:33:45.155061361 +0200
diff --git a/src/x264.mk b/src/x264.mk
index a89ba2b..d42a20b 100644
--- a/src/x264.mk
+++ b/src/x264.mk
@@ -20,10 +20,10 @@ endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
- --cross-prefix='$(TARGET)'- \
- --host='$(TARGET)' \
+ --cross-prefix='$(TARGET)'- \
+ --host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
- --disable-pthread
+ --disable-pthread
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
generated by cgit v0.12 at 2024-11-05 02:08:18 (GMT)