diff options
author | Tony Theodore <tonyt@logyst.com> | 2013-10-05 07:31:43 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2013-10-05 07:31:43 (GMT) |
commit | d9a57e62a59f692bbe0370876efe5db1acdef641 (patch) | |
tree | 9daa42d59bf862799eecd9c6eb4a8cc61808ef16 | |
parent | dcb004bcfeb770d460e99c41fdd15e65b06d250f (diff) | |
parent | 01f04128535340595677eb5516347295fc5c0ee6 (diff) | |
download | mxe-d9a57e62a59f692bbe0370876efe5db1acdef641.zip mxe-d9a57e62a59f692bbe0370876efe5db1acdef641.tar.gz mxe-d9a57e62a59f692bbe0370876efe5db1acdef641.tar.bz2 |
Merge pull request #248 from TimothyGu/master
Add two packages
-rw-r--r-- | index.html | 8 | ||||
-rw-r--r-- | src/ffmpeg.mk | 1 | ||||
-rw-r--r-- | src/libnut.mk | 22 | ||||
-rw-r--r-- | src/mpg123.mk | 29 |
4 files changed, 60 insertions, 0 deletions
@@ -1623,6 +1623,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre> <td class="website"><a href="http://www.nongnu.org/libntlm/">Libntlm</a></td> </tr> <tr> + <td class="package">libnut</td> + <td class="website"><a href="https://launchpad.net/libnut">libNUT</a></td> + </tr> + <tr> <td class="package">liboauth</td> <td class="website"><a href="http://liboauth.sourceforge.net/">liboauth</a></td> </tr> @@ -1755,6 +1759,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre> <td class="website"><a href="http://www.multiprecision.org/">GNU MPC</a></td> </tr> <tr> + <td class="package">mpg123</td> + <td class="website"><a href="http://www.mpg123.de/">mpg123</a></td> + </tr> + <tr> <td class="package">mpfr</td> <td class="website"><a href="http://www.mpfr.org/">mpfr</a></td> </tr> diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index 352f194..fa69c6d 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -38,6 +38,7 @@ define $(PKG)_BUILD --enable-libass \ --disable-libfaac \ --enable-libmp3lame \ + --enable-libnut \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ --enable-libopus \ diff --git a/src/libnut.mk b/src/libnut.mk new file mode 100644 index 0000000..9f5a955 --- /dev/null +++ b/src/libnut.mk @@ -0,0 +1,22 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libnut +$(PKG)_IGNORE := +$(PKG)_VERSIONDATE := 20110421 +$(PKG)_VERSIONREV := r678 +$(PKG)_VERSION := $($(PKG)_VERSIONDATE)-$($(PKG)_VERSIONREV) +$(PKG)_CHECKSUM := 4cb226110aaae672a70955fe39062409973bcfdc +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSIONREV) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSIONREV).tar.gz +$(PKG)_URL := https://launchpad.net/$(PKG)/trunk/$($(PKG)_VERSIONREV)/+download/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + echo "TODO: libnut-UPDATE" +endef + +define $(PKG)_BUILD + $(MAKE) -C '$(1)' -j '$(JOBS)' CC='$(TARGET)-gcc' AR='$(TARGET)-ar' RANLIB='$(TARGET)-ranlib' PREFIX='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j 1 install CC='$(TARGET)-gcc' AR='$(TARGET)-ar' RANLIB='$(TARGET)-ranlib' PREFIX='$(PREFIX)/$(TARGET)' +endef diff --git a/src/mpg123.mk b/src/mpg123.mk new file mode 100644 index 0000000..6605b12 --- /dev/null +++ b/src/mpg123.mk @@ -0,0 +1,29 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := mpg123 +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.15.4 +$(PKG)_CHECKSUM := f39d927bcf7abf4f9d857f10cd97c8ceccaffbfa +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc sdl + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://sourceforge.net/projects/mpg123/files/mpg123/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ + --with-default-audio=win32 \ + --with-audio=win32,sdl,dummy \ + --enable-modules=no + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef |