diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/xine-lib.mk | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/xine-lib.mk')
| -rw-r--r-- | src/xine-lib.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/xine-lib.mk b/src/xine-lib.mk index f775c54..8acdb54 100644 --- a/src/xine-lib.mk +++ b/src/xine-lib.mk @@ -1,16 +1,13 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# xine-lib PKG := xine-lib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.19 -$(PKG)_CHECKSUM := 5afcc28c5cf2bdaab99d951960f6587797e1e5a0 +$(PKG)_CHECKSUM := 68e85049723b491ccb22d5123bf8fa780529868a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.xine-project.org/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc faad2 ffmpeg flac fontconfig freetype libiconv libmng pthreads sdl speex theora vorbis zlib +$(PKG)_DEPS := gcc faad2 ffmpeg flac fontconfig freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis zlib define $(PKG)_UPDATE wget -q -O- 'http://hg.debian.org/hg/xine-lib/xine-lib/tags' | \ @@ -45,7 +42,6 @@ define $(PKG)_BUILD --without-external-a52dec \ --without-external-libmad \ --without-external-libmpcdec \ - --without-imagemagick \ --with-freetype \ --with-fontconfig \ --without-alsa \ @@ -57,7 +53,8 @@ define $(PKG)_BUILD --without-external-libdts \ --without-wavpack \ CFLAGS='-I$(1)/win32/include' \ - PTHREAD_LIBS='-lpthread -lws2_32' + PTHREAD_LIBS='-lpthread -lws2_32' \ + LIBS="`$(TARGET)-pkg-config --libs libmng`" $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef |