From 9506a12ea1280b25dec985edd237ab1a99610560 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Wed, 18 May 2011 03:49:34 +0200
Subject: upgrade packages: glew imagemagick libpaper x264

---
 src/glew.mk                   | 4 ++--
 src/imagemagick.mk            | 4 ++--
 src/libpaper.mk               | 4 ++--
 src/x264-1-fix-bin-bash.patch | 6 +++---
 src/x264.mk                   | 6 ++++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/glew.mk b/src/glew.mk
index b9b4a46..3701f18 100644
--- a/src/glew.mk
+++ b/src/glew.mk
@@ -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/
diff --git a/src/imagemagick.mk b/src/imagemagick.mk
index 150f80e..8f9bbb9 100644
--- a/src/imagemagick.mk
+++ b/src/imagemagick.mk
@@ -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/
diff --git a/src/libpaper.mk b/src/libpaper.mk
index 5f7ca03..d13e640 100644
--- a/src/libpaper.mk
+++ b/src/libpaper.mk
@@ -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
diff --git a/src/x264-1-fix-bin-bash.patch b/src/x264-1-fix-bin-bash.patch
index e7c98b9..fa5b7e7 100644
--- a/src/x264-1-fix-bin-bash.patch
+++ b/src/x264-1-fix-bin-bash.patch
@@ -6,16 +6,16 @@ diff -urN x264-snapshot-20100714-2245/configure x264-snapshot-20100714-2245.new/
 +++ 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
diff --git a/src/x264.mk b/src/x264.mk
index 3752fb2..8aa6687 100644
--- a/src/x264.mk
+++ b/src/x264.mk
@@ -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 @@ define $(PKG)_BUILD
         --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)'
-- 
cgit v0.12