summaryrefslogtreecommitdiff
path: root/source/xap
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap')
-rw-r--r--source/xap/xine-lib/xine-lib-imagemagick7.patch13
-rwxr-xr-xsource/xap/xine-lib/xine-lib.SlackBuild4
-rwxr-xr-xsource/xap/xlockmore/xlockmore.SlackBuild2
3 files changed, 17 insertions, 2 deletions
diff --git a/source/xap/xine-lib/xine-lib-imagemagick7.patch b/source/xap/xine-lib/xine-lib-imagemagick7.patch
new file mode 100644
index 00000000..34062222
--- /dev/null
+++ b/source/xap/xine-lib/xine-lib-imagemagick7.patch
@@ -0,0 +1,13 @@
+http://git.pld-linux.org/?p=packages/xine-lib.git;a=blob;f=imagemagick7.patch;h=d050323cdf509c9bb5f8edbad90084e8ce5c1b38;hb=HEAD
+
+--- xine-lib-1.2.6/src/video_dec/image.c
++++ xine-lib-1.2.6/src/video_dec/image.c
+@@ -39,7 +39,7 @@
+ #define LOG
+ */
+
+-#include <wand/magick_wand.h>
++#include <MagickWand/MagickWand.h>
+ #ifdef PACKAGE_NAME
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild
index e7c6776c..6dd61e8d 100755
--- a/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/source/xap/xine-lib/xine-lib.SlackBuild
@@ -32,7 +32,7 @@ DIRVER=1.2.9
# Version used for the Slackware package
PKGVER=1.2.9
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -95,6 +95,8 @@ cd xine-lib-$DIRVER || exit 1
# sed -e 's/\(xcb-shape >= 1.0\)/xcb \1/' \
# -i m4/video_out.m4 &&
+zcat $CWD/xine-lib-imagemagick7.patch.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/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild
index a75f9ffa..ef6d12c7 100755
--- a/source/xap/xlockmore/xlockmore.SlackBuild
+++ b/source/xap/xlockmore/xlockmore.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xlockmore
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then