Mercurial > mxe-octave
changeset 3626:3959e3b1fcbf
xvidcore: update version, enable shared lib
* src/xvidcore.mk: update to 1.3.3, enable shared lib handling
* src/xvidcore-1-fixes.patch: removed old patch
* dist-files.mk: removed xvidcore-1-fixes.patch
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sat, 28 Jun 2014 09:50:22 -0400 |
| parents | c86eb8093b3e |
| children | 9e2ff7672dc2 |
| files | dist-files.mk src/xvidcore-1-fixes.patch src/xvidcore.mk |
| diffstat | 3 files changed, 10 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Sat Jun 28 07:57:32 2014 -0400 +++ b/dist-files.mk Sat Jun 28 09:50:22 2014 -0400 @@ -598,7 +598,6 @@ xine-lib-1-fixes.patch \ xine-lib.mk \ xmlwrapp.mk \ - xvidcore-1-fixes.patch \ xvidcore.mk \ xz.mk \ yasm.mk \
--- a/src/xvidcore-1-fixes.patch Sat Jun 28 07:57:32 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From dce4564d204160aee0da5107e69cbdefe2bec921 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 28 Mar 2011 00:00:51 +0200 -Subject: [PATCH] remove obsolete -mno-cygwin - - -diff --git a/configure.in b/configure.in -index 0536fe1..b954a10 100644 ---- a/configure.in -+++ b/configure.in -@@ -286,8 +286,8 @@ case "$target_os" in - AC_MSG_RESULT([ok]) - STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)" - SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)" -- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" -- SPECIFIC_CFLAGS="-mno-cygwin" -+ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" -+ SPECIFIC_CFLAGS="" - ;; - darwin*|raphsody*) - STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" --- -1.7.4.1 -
--- a/src/xvidcore.mk Sat Jun 28 07:57:32 2014 -0400 +++ b/src/xvidcore.mk Sat Jun 28 09:50:22 2014 -0400 @@ -3,8 +3,8 @@ PKG := xvidcore $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.2 -$(PKG)_CHECKSUM := 56e065d331545ade04c63c91153b9624b51d6e1b +$(PKG)_VERSION := 1.3.3 +$(PKG)_CHECKSUM := 465763c92679ca230526d4890d17dbf6d6974b08 $(PKG)_SUBDIR := xvidcore/build/generic $(PKG)_FILE := xvidcore-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xvid.org/downloads/$($(PKG)_FILE) @@ -20,10 +20,15 @@ cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' - $(MAKE) -C '$(1)' -j '$(JOBS)' BUILD_DIR='build' SHARED_LIB= + $(MAKE) -C '$(1)' -j '$(JOBS)' BUILD_DIR='build' $(if $(filter $(BUILD_STATIC), yes),SHARED,STATIC)_LIB= $(INSTALL) -d '$(HOST_INCDIR)' $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(HOST_INCDIR)' $(INSTALL) -d '$(HOST_LIBDIR)' - $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(HOST_LIBDIR)' - $(INSTALL) -m644 '$(HOST_LIBDIR)/xvidcore.a' '$(HOST_LIBDIR)/libxvidcore.a' + $(INSTALL) -d '$(HOST_BINDIR)' + if [ "x$(BUILD_STATIC)" == "xyes" ]; then \ + $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(HOST_LIBDIR)/libxvidcore.a'; \ + else \ + $(INSTALL) -m644 '$(1)/build/xvidcore.dll.a' '$(HOST_LIBDIR)/libxvidcore.dll.alibxvidcore.dll.a'; \ + $(INSTALL) -m644 '$(1)/build/xvidcore.dll' '$(HOST_BINDIR)/libxvidcore.dll'; \ + fi endef