diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-11-10 21:12:16 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-11-11 08:59:40 +0100 |
| commit | ccd1c3535c8dddf0cc8df21b4d3bdf6dac2b39bd (patch) | |
| tree | f816ce7398a5fbcf3ea105994696f53bbb5c1e78 /source/xap/xine-lib | |
| parent | cdea680437e2afe627210ed696c16969e268ad84 (diff) | |
| download | current-ccd1c3535c8dddf0cc8df21b4d3bdf6dac2b39bd.tar.gz current-ccd1c3535c8dddf0cc8df21b4d3bdf6dac2b39bd.tar.xz | |
Sun Nov 10 21:12:16 UTC 201920191110211216
a/aaa_elflibs-15.0-x86_64-15.txz: Rebuilt.
Upgraded: libtiff.so.5.5.0, libtiffxx.so.5.5.0.
Added: libexiv2.so.26.0.0, libraw.so.16.0.0, libraw_r.so.16.0.0.
a/kernel-generic-4.19.83-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.83-x86_64-1.txz: Upgraded.
a/kernel-modules-4.19.83-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.83-x86-1.txz: Upgraded.
e/emacs-26.3-x86_64-2.txz: Rebuilt.
Patched and recompiled against imagemagick-7.0.9_2.
k/kernel-source-4.19.83-noarch-1.txz: Upgraded.
l/imagemagick-7.0.9_2-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
l/qt-4.8.7-x86_64-15.txz: Rebuilt.
Disallow SSLv3 connections. Thanks to PJ Beers.
xap/xine-lib-1.2.9-x86_64-7.txz: Rebuilt.
Patched and recompiled against imagemagick-7.0.9_2.
xap/xlockmore-5.59-x86_64-2.txz: Rebuilt.
Recompiled without ImageMagick support.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/xap/xine-lib')
| -rw-r--r-- | source/xap/xine-lib/xine-lib-imagemagick7.patch | 13 | ||||
| -rwxr-xr-x | source/xap/xine-lib/xine-lib.SlackBuild | 4 |
2 files changed, 16 insertions, 1 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 000000000..34062222e --- /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 e7c6776ca..6dd61e8d9 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 \) \ |