From 9ec6f4bec387d164b55effd64e8be9fded595df1 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 14 Dec 2019 20:09:12 +0000
Subject: Sat Dec 14 20:09:12 UTC 2019

ap/cups-2.3.1-x86_64-1.txz:  Upgraded.
ap/terminus-font-4.48-noarch-1.txz:  Upgraded.
ap/vim-8.2.0007-x86_64-1.txz:  Upgraded.
l/fribidi-1.0.8-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.2.0007-x86_64-1.txz:  Upgraded.
xap/xine-lib-1.2.10-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/xine-lib-1.2.10-x86_64-1_alsa.txz:  Upgraded.
---
 source/xap/xine-lib/xine-lib-imagemagick7.patch | 13 -------------
 source/xap/xine-lib/xine-lib.SlackBuild         | 24 +++++-------------------
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 source/xap/xine-lib/xine-lib-imagemagick7.patch

(limited to 'source/xap')

diff --git a/source/xap/xine-lib/xine-lib-imagemagick7.patch b/source/xap/xine-lib/xine-lib-imagemagick7.patch
deleted file mode 100644
index 34062222e..000000000
--- a/source/xap/xine-lib/xine-lib-imagemagick7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 6dd61e8d9..3dfa946f2 100755
--- a/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/source/xap/xine-lib/xine-lib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2012, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
 # Copyright 2017  Heinz Wiesinger, Amsterdam, NL
 # All rights reserved.
@@ -26,13 +26,13 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xine-lib
 # Version on the tarball
-VERSION=1.2.9
+VERSION=1.2.10
 # Version used in the source directory to cd into
-DIRVER=1.2.9
+DIRVER=1.2.10
 # Version used for the Slackware package
-PKGVER=1.2.9
+PKGVER=1.2.10
 
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -83,20 +83,6 @@ rm -rf xine-lib-$VERSION
 tar xvf $CWD/xine-lib-$VERSION.tar.xz || exit 1
 cd xine-lib-$DIRVER || exit 1
 
-# # Fix source for ffmpeg-3.2.x:
-# sed -e 's/avcodec_alloc_frame/av_frame_alloc/'        \
-#     -e 's/avcodec_free_frame/av_frame_free/'          \
-#     -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
-#        src/dxr3/ffmpeg_encoder.c &&
-# #sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
-# #    -i src/video_dec/image.c &&
-# sed -e '/xineplug_vo_out_xcbxv_la_LIBADD/s/$(XCB_LIBS)/$(XCBSHM_LIBS) $(XCB_LIBS)/' \
-#     -i src/video_out/Makefile.in &&
-# 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 \) \
-- 
cgit v1.2.3