From b76270bf9e6dd375e495fec92140a79a79415d27 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 19 May 2010 08:58:23 +0000
Subject: Slackware 13.1

Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits.  The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription.  Consider picking up
a copy to help support the project.  Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality.  :-)
Enjoy!
---
 source/xap/xine-ui/xine-ui.SlackBuild | 19 +++++++++++++++----
 source/xap/xine-ui/xine-ui.png14.diff | 11 +++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 source/xap/xine-ui/xine-ui.png14.diff

(limited to 'source/xap/xine-ui')

diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild
index 1dd61f1f6..61650223f 100755
--- a/source/xap/xine-ui/xine-ui.SlackBuild
+++ b/source/xap/xine-ui/xine-ui.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,12 +21,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.99.5
+VERSION=${VERSION:-$(echo xine-ui-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 # I would use "-march=i486 -mcpu=i686" here as usual, but with XINE it's all or nothing.
 # I'd rather have it work well for the i686/Athlon crowd than suck for everyone.
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i686 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 TARGET=${TARGET:-$ARCH-pc-linux-gnu}
-BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -41,6 +50,8 @@ rm -rf xine-ui-$VERSION
 tar xvf $CWD/xine-ui-$VERSION.tar.bz2 || exit 1
 cd xine-ui-$VERSION || exit 1
 
+zcat $CWD/xine-ui.png14.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/xap/xine-ui/xine-ui.png14.diff b/source/xap/xine-ui/xine-ui.png14.diff
new file mode 100644
index 000000000..35a06513c
--- /dev/null
+++ b/source/xap/xine-ui/xine-ui.png14.diff
@@ -0,0 +1,11 @@
+--- ./src/xitk/Imlib-light/load.c.orig	2003-07-14 17:44:10.000000000 -0500
++++ ./src/xitk/Imlib-light/load.c	2010-02-19 13:41:27.000000000 -0600
+@@ -193,7 +193,7 @@
+     return 0;
+   fread(buf, 1, 8, f);
+   rewind(f);
+-  return (int)png_check_sig(buf, 8);
++  return (int)(png_sig_cmp(buf, 0, 8) == 0);
+ }
+ 
+ ImlibImage * Imlib_load_image(ImlibData * id, char *file) {
-- 
cgit v1.2.3-65-gdbad