summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-02-25 00:03:28 +0000
committer Eric Hameleers <alien@slackware.com>2022-02-25 06:59:43 +0100
commit617b679ca8e13492475e7b874c30e232e281fbf0 (patch)
tree56bcbef16a406c587d58a1e9f366952b6999eeec /extra
parent9b8196890bdc3ba4a478f0e9d2d16dd98ee7c826 (diff)
downloadcurrent-617b679ca8e13492475e7b874c30e232e281fbf0.tar.gz
current-617b679ca8e13492475e7b874c30e232e281fbf0.tar.xz
Fri Feb 25 00:03:28 UTC 202220220225000328
ap/inxi-3.3.13_1-noarch-1.txz: Upgraded. d/parallel-20220222-noarch-1.txz: Upgraded. d/patchelf-0.14.5-x86_64-1.txz: Upgraded. d/rust-1.59.0-x86_64-1.txz: Upgraded. n/cyrus-sasl-2.1.28-x86_64-1.txz: Upgraded. This update fixes bugs and security issues. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19906 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24407 (* Security fix *) n/nftables-1.0.2-x86_64-1.txz: Upgraded. n/nghttp2-1.47.0-x86_64-1.txz: Upgraded. n/openssh-8.9p1-x86_64-1.txz: Upgraded. n/whois-5.5.12-x86_64-1.txz: Upgraded. x/mesa-21.3.7-x86_64-1.txz: Upgraded. x/xf86-video-amdgpu-22.0.0-x86_64-1.txz: Upgraded. xap/freerdp-2.6.0-x86_64-1.txz: Upgraded. xap/gftp-2.9.1b-x86_64-1.txz: Upgraded. extra/xv/xv-3.10a-x86_64-10.txz: Rebuilt. Drop JasPer support until xv can be ported to the new JasPer library (or preferably to openjpeg).
Diffstat (limited to 'extra')
-rwxr-xr-xextra/source/xv/xv.SlackBuild3
-rw-r--r--extra/source/xv/xv.no.jasper.diff22
2 files changed, 24 insertions, 1 deletions
diff --git a/extra/source/xv/xv.SlackBuild b/extra/source/xv/xv.SlackBuild
index 526cf1104..e04359eda 100755
--- a/extra/source/xv/xv.SlackBuild
+++ b/extra/source/xv/xv.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xv
VERSION=3.10a
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -65,6 +65,7 @@ if [ "$ARCH" = "x86_64" ]; then
fi
zcat $CWD/xv.jasper.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
zcat $CWD/xv-libpng-1.5.patch.gz | patch -p0 --verbose --backup --suffix=.orig || exit 1
+zcat $CWD/xv.no.jasper.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
make -f Makefile.std || exit 1
strip --strip-unneeded bggen vdcomp xcmap xv xvpictoppm
mkdir -p $PKG/usr/bin
diff --git a/extra/source/xv/xv.no.jasper.diff b/extra/source/xv/xv.no.jasper.diff
new file mode 100644
index 000000000..ca69da3ca
--- /dev/null
+++ b/extra/source/xv/xv.no.jasper.diff
@@ -0,0 +1,22 @@
+--- ./Makefile.std.orig 2022-02-24 14:03:06.099774095 -0600
++++ ./Makefile.std 2022-02-24 14:04:14.407770317 -0600
+@@ -176,15 +176,15 @@
+ ### if, for whatever reason, you're unable to get the JasPer JPEG-2000 library
+ ### to compile on your machine, *COMMENT OUT* the following lines
+ ###
+-JP2K = -DDOJP2K
++#JP2K = -DDOJP2K
+ ###
+ #JP2KDIR = ../../jasper
+-JP2KDIR = /usr
++#JP2KDIR = /usr
+ ###
+ #JP2KINC = -I$(JP2KDIR)
+-JP2KINC = -I/usr/include
++#JP2KINC = -I/usr/include
+ ###
+-JP2KLIB = -L$(JP2KDIR) -ljasper
++#JP2KLIB = -L$(JP2KDIR) -ljasper
+ #JP2KLIB = $(JP2KDIR)/libjasper.a
+
+