Mercurial > mxe-octave
changeset 1826:90917d6ed4b2
upgrade packages: glew imagemagick libpaper x264
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Wed, 18 May 2011 03:49:34 +0200 |
| parents | c53a6e030c7f |
| children | 111fb87f8734 |
| files | src/glew.mk src/imagemagick.mk src/libpaper.mk src/x264-1-fix-bin-bash.patch src/x264.mk |
| diffstat | 5 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/glew.mk Wed May 18 03:00:27 2011 +0200 +++ b/src/glew.mk Wed May 18 03:49:34 2011 +0200 @@ -4,8 +4,8 @@ # GLEW PKG := glew $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.8 -$(PKG)_CHECKSUM := 450946935faa20ac4950cb42ff025be2c1f7c22e +$(PKG)_VERSION := 1.6.0 +$(PKG)_CHECKSUM := ed555d15d0f01239b262c4cf803e97d60d8a18b6 $(PKG)_SUBDIR := glew-$($(PKG)_VERSION) $(PKG)_FILE := glew-$($(PKG)_VERSION).tgz $(PKG)_WEBSITE := http://glew.sourceforge.net/
--- a/src/imagemagick.mk Wed May 18 03:00:27 2011 +0200 +++ b/src/imagemagick.mk Wed May 18 03:49:34 2011 +0200 @@ -4,8 +4,8 @@ # ImageMagick PKG := imagemagick $(PKG)_IGNORE := -$(PKG)_VERSION := 6.6.9-8 -$(PKG)_CHECKSUM := c175e65f7eef867cd6af78d05820de32f77a9a85 +$(PKG)_VERSION := 6.6.9-9 +$(PKG)_CHECKSUM := 1d46f9d2b9294b11b9e9c03ee8da7e1df8d92fef $(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION) $(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.imagemagick.org/
--- a/src/libpaper.mk Wed May 18 03:00:27 2011 +0200 +++ b/src/libpaper.mk Wed May 18 03:49:34 2011 +0200 @@ -4,8 +4,8 @@ # libpaper PKG := libpaper $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.24 -$(PKG)_CHECKSUM := 6927f75d126373d32d89751d2a7fe3e99cc9b4a1 +$(PKG)_VERSION := 1.1.24+nmu1 +$(PKG)_CHECKSUM := 1f7a810a433a5a68b099aa92777cc2d0b3d03b42 $(PKG)_SUBDIR := libpaper-$($(PKG)_VERSION) $(PKG)_FILE := libpaper_$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://packages.debian.org/unstable/libpaper1
--- a/src/x264-1-fix-bin-bash.patch Wed May 18 03:00:27 2011 +0200 +++ b/src/x264-1-fix-bin-bash.patch Wed May 18 03:49:34 2011 +0200 @@ -6,16 +6,16 @@ +++ x264-snapshot-20100714-2245.new/configure 2010-10-03 23:58:24.000000000 +1100 @@ -1,4 +1,4 @@ -#!/bin/bash -+#!/bin/sh ++#!/usr/bin/env bash if test x"$1" = x"-h" -o x"$1" = x"--help" ; then - + cat <<EOF diff -urN x264-snapshot-20100714-2245/version.sh x264-snapshot-20100714-2245.new/version.sh --- x264-snapshot-20100714-2245/version.sh 2010-07-15 06:45:07.000000000 +1000 +++ x264-snapshot-20100714-2245.new/version.sh 2010-10-03 23:58:24.000000000 +1100 @@ -1,4 +1,4 @@ -#!/bin/bash -+#!/bin/sh ++#!/usr/bin/env bash git rev-list HEAD | sort > config.git-hash LOCALVER=`wc -l config.git-hash | awk '{print $1}'` if [ $LOCALVER \> 1 ] ; then
--- a/src/x264.mk Wed May 18 03:00:27 2011 +0200 +++ b/src/x264.mk Wed May 18 03:49:34 2011 +0200 @@ -4,8 +4,8 @@ # x264 PKG := x264 $(PKG)_IGNORE := -$(PKG)_VERSION := 20110509-2245 -$(PKG)_CHECKSUM := 767cac0d1cdfdf6ce610e5752ef27b881087ecc9 +$(PKG)_VERSION := 20110517-2245 +$(PKG)_CHECKSUM := 51aa8e7ac683ef1bfeec638d0e44e2bd94a25a92 $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.videolan.org/developers/x264.html @@ -21,6 +21,8 @@ --cross-prefix='$(TARGET)'- \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ + --disable-shared \ + --enable-static \ --enable-win32thread $(MAKE) -C '$(1)' -j 1 uninstall $(MAKE) -C '$(1)' -j '$(JOBS)'