diff options
Diffstat (limited to 'source/xap/xine-ui')
| -rwxr-xr-x | source/xap/xine-ui/xine-ui.SlackBuild | 12 | ||||
| -rw-r--r-- | source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff | 11 | ||||
| -rw-r--r-- | source/xap/xine-ui/xine-ui.png14.diff | 11 |
3 files changed, 18 insertions, 16 deletions
diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild index 61650223..65a18c18 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, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ 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. -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -47,11 +47,9 @@ mkdir -p $TMP $PKG/usr cd $TMP rm -rf xine-ui-$VERSION -tar xvf $CWD/xine-ui-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/xine-ui-$VERSION.tar.?z* || 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 \) \ @@ -59,11 +57,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/xine-ui.no.deprecated.curl.headers.diff.gz | patch -p1 --verbose || exit 1 + XINE_BUILD=$TARGET \ ./configure \ --prefix=/usr \ --with-aalib \ --with-caca \ + --disable-lirc \ + --mandir=/usr/man \ --build=$TARGET make $NUMJOBS || make || exit 1 diff --git a/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff b/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff new file mode 100644 index 00000000..63e57717 --- /dev/null +++ b/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff @@ -0,0 +1,11 @@ +--- ./src/xitk/download.c.orig 2009-12-18 18:34:22.000000000 -0600 ++++ ./src/xitk/download.c 2012-09-09 12:47:15.757552304 -0500 +@@ -28,8 +28,6 @@ + + #ifdef HAVE_CURL + #include <curl/curl.h> +-#include <curl/types.h> +-#include <curl/easy.h> + #endif + + #include "common.h" diff --git a/source/xap/xine-ui/xine-ui.png14.diff b/source/xap/xine-ui/xine-ui.png14.diff deleted file mode 100644 index 35a06513..00000000 --- a/source/xap/xine-ui/xine-ui.png14.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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) { |