mxe.diff (2865B)
1 diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk 2 index 8b90d69..fab1a73 100644 3 --- a/src/ffmpeg.mk 4 +++ b/src/ffmpeg.mk 5 @@ -3,13 +3,13 @@ 6 7 PKG := ffmpeg 8 $(PKG)_IGNORE := 2% 9 -$(PKG)_VERSION := 1.2.3 10 -$(PKG)_CHECKSUM := f083c92075fe010f17416bc880dfca101535276d 11 +$(PKG)_VERSION := 2.0.2 12 +$(PKG)_CHECKSUM := 47d3b3d172ae81f0571549e4dfaadfe5b4fe06cc 13 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) 14 $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 15 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) 16 $(PKG)_URL_2 := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE) 17 -$(PKG)_DEPS := gcc bzip2 lame libass libnut libvpx opencore-amr opus sdl speex theora vo-aacenc vo-amrwbenc vorbis x264 xvidcore zlib 18 +$(PKG)_DEPS := gcc bzip2 opus zlib 19 20 define $(PKG)_UPDATE 21 $(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \ 22 @@ -31,26 +31,20 @@ define $(PKG)_BUILD 23 --disable-pthreads \ 24 --enable-w32threads \ 25 --disable-doc \ 26 + --disable-programs \ 27 --enable-gpl \ 28 --enable-version3 \ 29 --disable-nonfree \ 30 - --enable-avisynth \ 31 - --enable-libass \ 32 - --disable-libfaac \ 33 - --enable-libmp3lame \ 34 - --enable-libnut \ 35 - --enable-libopencore-amrnb \ 36 - --enable-libopencore-amrwb \ 37 - --enable-libopus \ 38 - --enable-libspeex \ 39 - --enable-libtheora \ 40 - --enable-libvo-aacenc \ 41 - --enable-libvo-amrwbenc \ 42 - --enable-libvorbis \ 43 - --enable-libvpx \ 44 - --enable-libx264 \ 45 - --enable-libxvid \ 46 - --enable-postproc 47 + --disable-avdevice \ 48 + --disable-swresample \ 49 + --disable-swscale \ 50 + --disable-postproc \ 51 + --disable-avfilter \ 52 + --disable-encoders \ 53 + --disable-muxers \ 54 + --disable-devices \ 55 + --disable-filters \ 56 + --enable-libopus 57 $(MAKE) -C '$(1)' -j '$(JOBS)' 58 $(MAKE) -C '$(1)' -j 1 install 59 endef 60 diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk 61 index db37a9a..8f37ffd 100644 62 --- a/src/wxwidgets.mk 63 +++ b/src/wxwidgets.mk 64 @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 0bab57ecd6d065a3672ec5fbb09d287456727ea4 65 $(PKG)_SUBDIR := wxWidgets-$($(PKG)_VERSION) 66 $(PKG)_FILE := wxWidgets-$($(PKG)_VERSION).tar.bz2 67 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/$($(PKG)_VERSION)/$($(PKG)_FILE) 68 -$(PKG)_DEPS := gcc libiconv libpng jpeg tiff sdl zlib expat 69 +$(PKG)_DEPS := gcc libiconv libpng jpeg tiff zlib expat 70 71 define $(PKG)_UPDATE 72 $(WGET) -q -O- 'http://sourceforge.net/projects/wxwindows/files/' | \ 73 @@ -39,7 +39,6 @@ define $(PKG)_CONFIGURE_OPTS 74 --with-regex=yes \ 75 --with-zlib=sys \ 76 --with-expat=sys \ 77 - --with-sdl \ 78 --without-gtk \ 79 --without-motif \ 80 --without-mac \