Here's a sitrep :-)
ffmpeg -- on -current only, building against openjpeg-2 is broken.
(The ffmpeg trac indicates that Heinz already knows about this.
Unfortunately the ffmpeg upstream and the openjpeg upstream need to
have a mutual understanding...)
audio/xmms2 -- needs a patch (attached)
multimedia/vlc -- big problem. vlc-2.1.6 refuses to build with the new
version of ffmpeg ("configure: error: libavcodec versions 56 and later
are not supported yet"). vlc-2.2.1 accepts the new version of ffmpeg
but needs newer versions of cairo, libdvdread and taglib than are in
Slackware 14.1. There was a prior thread about vlc-2.2.1 on this
mailing list.
multimedia/stills2dv -- this builds on 14.1 but it fails on -current.
The failure is caused by using libpng internal interfaces that went
away in libpng-1.6. Upstream is dead since 2010. Other distros
abandoned stills2dv some time ago. It may soon be time to say
goodbye...
multimedia/gpac -- (not an ffmpeg problem) the download url needs a
small change (attached)
Unrelated to ffmpeg, the following packages needed various fixes to
build on -current (attached for Ponce's enjoyment ;-)
audio-kid3
audio-lastfm
games-alephone [note, this patch is additional to, and independent of,
the ffmpeg patch I previously posted]
games-dolphin-emu
games-vcmi
graphics-hugin
libraries-OpenSceneGraph
libraries-belle-sip
libraries-libgnomeprint
libraries-libgnomeprintui
libraries-libkate
libraries-ptlib
multimedia-ffmpeg2theora
network-avahi
As Heinz said, I am sure that the maintainers will do a better job, so
if I've mentioned any of your packages, your help will be greatly
appreciated. In particular, none of my patches have been properly
tested :O
It might be some time before I can say that everything builds on i486
-current, because qt5, webkitgtk and webkitgtk3 all need rebuilding
first :-(
Best regards to all
-D.
Using too many smileys since 2015
From ea3ec818aed87ae319a24976aaf45f4bd0e6594f Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Mon, 1 Jun 2015 07:14:40 +0100
Subject: [PATCH 30/32] audio/xmms2: Patched for building with ffmpeg and
libmodplug.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
audio/xmms2/xmms2-ffmpeg2.patch | 37 +++++++++++++++++++++++++++++++++++++
audio/xmms2/xmms2.SlackBuild | 8 +++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 audio/xmms2/xmms2-ffmpeg2.patch
diff --git a/audio/xmms2/xmms2-ffmpeg2.patch b/audio/xmms2/xmms2-ffmpeg2.patch
new file mode 100644
index 0000000..87cc974
--- /dev/null
+++ b/audio/xmms2/xmms2-ffmpeg2.patch
@@ -0,0 +1,37 @@
+diff -rupN a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+--- a/src/plugins/avcodec/avcodec.c 2011-10-20 21:26:08.000000000 +0200
++++ b/src/plugins/avcodec/avcodec.c 2013-07-22 17:17:53.098385978 +0200
+@@ -134,7 +134,6 @@ xmms_avcodec_init (xmms_xform_t *xform)
+
+ xmms_xform_private_data_set (xform, data);
+
+- avcodec_init ();
+ avcodec_register_all ();
+
+ mimetype = xmms_xform_indata_get_str (xform,
+@@ -200,7 +199,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ }
+ }
+
+- data->codecctx = avcodec_alloc_context ();
++ data->codecctx = avcodec_alloc_context3 (NULL);
+ data->codecctx->sample_rate = data->samplerate;
+ data->codecctx->channels = data->channels;
+ data->codecctx->bit_rate = data->bitrate;
+@@ -211,7 +210,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ data->codecctx->codec_id = codec->id;
+ data->codecctx->codec_type = codec->type;
+
+- if (avcodec_open (data->codecctx, codec) < 0) {
++ if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
+ XMMS_DBG ("Opening decoder '%s' failed", codec->name);
+ goto err;
+ } else {
+diff -rupN a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
+--- a/src/plugins/avcodec/avcodec_compat.h 2011-10-20 21:26:08.000000000 +0200
++++ b/src/plugins/avcodec/avcodec_compat.h 2013-07-22 17:16:15.841723560 +0200
+@@ -65,3 +65,4 @@ typedef struct AVPacket {
+ # define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
+ #endif
+
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild
index 9099fa6..37b3284 100644
--- a/audio/xmms2/xmms2.SlackBuild
+++ b/audio/xmms2/xmms2.SlackBuild
@@ -57,12 +57,18 @@ find -L . \
# Fix for the newer libcdio
sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || exit 1
+# Fix include path for libmodplug (thanks to Arch Linux)
+sed -i 's:modplug.h:libmodplug/modplug.h:' src/plugins/modplug/modplug.c
+
# https://bugs.xmms2.org/view.php?id=2578
patch -p1 < $CWD/xmms2-0.8-explicitly-link-to-vorbis-and-ogg.patch
# unbreak xmms2 building on cython-0.19.1
patch -p1 < $CWD/xmms2-0.8-cython-0.19.1.patch
+# Fix for ffmpeg-2.x (thanks to Arch Linux)
+patch -p1 < $CWD/xmms2-ffmpeg2.patch
+
export CCFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
@@ -72,7 +78,7 @@ export CXXFLAGS="$SLKCFLAGS"
--with-pkgconfigdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \
--mandir=/usr/man \
--without-ldconfig \
- --without-plugins=apefile,avcodec,flv,tta \
+ --without-plugins=apefile,flv,tta \
--with-perl-archdir=/usr/lib$LIBDIRSUFFIX/perl5 \
-p configure
--
2.3.5
From e111057788b5eb798148a40ef7f6c491b914bd9f Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Tue, 31 Mar 2015 21:25:38 +0100
Subject: [PATCH 15/32] multimedia/gpac: Fix download url.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
multimedia/gpac/gpac.info | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info
index 8b93a91..b32fa96 100644
--- a/multimedia/gpac/gpac.info
+++ b/multimedia/gpac/gpac.info
@@ -1,7 +1,7 @@
PRGNAM="gpac"
VERSION="svn_r5564"
HOMEPAGE="http://gpac.wp.institut-telecom.fr/";
-DOWNLOAD="https://www.dropbox.com/s/pun5nsyowv4wuax/gpac-svn_r5564.tar.xz?dl=0";
+DOWNLOAD="https://www.dropbox.com/s/pun5nsyowv4wuax/gpac-svn_r5564.tar.xz?dl=1";
MD5SUM="a9ad34d56dc7edfe6b85e0ba6fbf7a19"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
--
2.3.5
From d0dea1205bb713b95955d2c4a6e883fad0a64148 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Fri, 29 May 2015 11:45:36 +0100
Subject: [PATCH 24/32] audio/kid3: Updated for version 3.2.1.
This version removes the need for an X display during building.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
audio/kid3/kid3.SlackBuild | 2 +-
audio/kid3/kid3.info | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/audio/kid3/kid3.SlackBuild b/audio/kid3/kid3.SlackBuild
index ae7a93b..125cea7 100644
--- a/audio/kid3/kid3.SlackBuild
+++ b/audio/kid3/kid3.SlackBuild
@@ -3,7 +3,7 @@
# Written by Michales Michaloudes kor...@gmail.com
PRGNAM=kid3
-VERSION=${VERSION:-3.2.0}
+VERSION=${VERSION:-3.2.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/audio/kid3/kid3.info b/audio/kid3/kid3.info
index 9db910f..8b1ae17 100644
--- a/audio/kid3/kid3.info
+++ b/audio/kid3/kid3.info
@@ -1,8 +1,8 @@
PRGNAM="kid3"
-VERSION="3.2.0"
+VERSION="3.2.1"
HOMEPAGE="http://kid3.sourceforge.net/";
-DOWNLOAD="http://prdownloads.sourceforge.net/kid3/kid3-3.2.0.tar.gz";
-MD5SUM="5e95dd3f708985b3346bc59b816c81f6"
+DOWNLOAD="http://prdownloads.sourceforge.net/kid3/kid3-3.2.1.tar.gz";
+MD5SUM="9aa4afff030953c8ffaf1895420234b7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="id3lib"
--
2.3.5
From cbb082eb826193cbce37fc02afedb07d430b1b6c Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Thu, 28 May 2015 22:52:36 +0100
Subject: [PATCH 19/32] audio/lastfm: Fixed build on -current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
audio/lastfm/github-192b979c57a.patch | 22 ++++++++++++++++++++++
audio/lastfm/lastfm.SlackBuild | 3 +++
2 files changed, 25 insertions(+)
create mode 100644 audio/lastfm/github-192b979c57a.patch
diff --git a/audio/lastfm/github-192b979c57a.patch b/audio/lastfm/github-192b979c57a.patch
new file mode 100644
index 0000000..fc3e682
--- /dev/null
+++ b/audio/lastfm/github-192b979c57a.patch
@@ -0,0 +1,22 @@
+From 192b979c57aa0b9a2df4f11ad4851ce4fbf5d38b Mon Sep 17 00:00:00 2001
+From: Spiek <sp...@ymail.com>
+Date: Fri, 27 Dec 2013 13:27:11 +0100
+Subject: [PATCH] Fix missing Cast
+
+---
+ app/client/Services/RadioService/RadioService.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/client/Services/RadioService/RadioService.cpp b/app/client/Services/RadioService/RadioService.cpp
+index 05f22c8..10094b6 100644
+--- a/app/client/Services/RadioService/RadioService.cpp
++++ b/app/client/Services/RadioService/RadioService.cpp
+@@ -307,7 +307,7 @@ RadioService::mute()
+ void
+ RadioService::onPhononStateChanged( Phonon::State newstate, Phonon::State oldstate )
+ {
+- qDebug() << oldstate << " -> " << newstate;
++ qDebug() << (int)oldstate << " -> " << (int)newstate;
+ if (m_mediaObject == 0) {
+ qDebug() << "m_mediaObject is null!";
+ return;
diff --git a/audio/lastfm/lastfm.SlackBuild b/audio/lastfm/lastfm.SlackBuild
index b08ad8f..142b932 100644
--- a/audio/lastfm/lastfm.SlackBuild
+++ b/audio/lastfm/lastfm.SlackBuild
@@ -74,6 +74,9 @@ cat $CWD/package-paths.patch | sed -e "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" \
| patch -p1
# Fix for ffmpeg 2.x.
patch -p1 < $CWD/ffmpeg-2.0.patch
+# Fix for "ambiguous overload for ‘operator<<’" in gcc-4.9
+# thanks to Spiek on github (https://github.com/lastfm/lastfm-desktop/pull/44)
+patch -p1 < $CWD/github-192b979c57a.patch
# Turn on verbose compile output.
sed -i 's|^CONFIG.*|#&|' admin/include.qmake
--
2.3.5
From 07da8837c42ee7d67d654bbba18ece161c0ca89c Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Fri, 29 May 2015 22:24:22 +0100
Subject: [PATCH 26/32] games/alephone: Patched for building on -current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
games/alephone/alephone.SlackBuild | 4 ++++
games/alephone/r5012.diff | 13 +++++++++++++
2 files changed, 17 insertions(+)
create mode 100644 games/alephone/r5012.diff
diff --git a/games/alephone/alephone.SlackBuild b/games/alephone/alephone.SlackBuild
index 73d2a82..b152370 100644
--- a/games/alephone/alephone.SlackBuild
+++ b/games/alephone/alephone.SlackBuild
@@ -64,7 +64,11 @@ patch -p0 < $CWD/r5010.diff
patch -p0 < $CWD/r5013.diff
patch -p0 < $CWD/r5033.diff
patch -p0 < $CWD/r5037.diff
+# Fix build with boost-1.58 (-current)
+patch -p0 < $CWD/r5012.diff
+aclocal
+automake --add-missing
autoreconf
[ "${FFMPEG:-yes}" = "no" ] && EXTRAOPT=--disable-ffmpeg
diff --git a/games/alephone/r5012.diff b/games/alephone/r5012.diff
new file mode 100644
index 0000000..ed7b12f
--- /dev/null
+++ b/games/alephone/r5012.diff
@@ -0,0 +1,13 @@
+Index: Source_Files/Sound/SoundManager.cpp
+===================================================================
+--- Source_Files/Sound/SoundManager.cpp (revision 5011)
++++ Source_Files/Sound/SoundManager.cpp (revision 5012)
+@@ -19,6 +19,8 @@
+ http://www.gnu.org/licenses/gpl.html
+
+ */
++
++#include <iostream>
+
+ #include "SoundManager.h"
+ #include "ReplacementSounds.h"
--
2.3.5
From fdf94a2787d0da570280f466c5d22d48c38e4ec0 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Thu, 28 May 2015 20:49:33 +0100
Subject: [PATCH 17/32] games/dolphin-emu: Patched to fix build on -current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
games/dolphin-emu/CommonFuncs.patch | 24 ++++++++++++++++++++++++
games/dolphin-emu/dolphin-emu.SlackBuild | 4 ++++
2 files changed, 28 insertions(+)
create mode 100644 games/dolphin-emu/CommonFuncs.patch
diff --git a/games/dolphin-emu/CommonFuncs.patch b/games/dolphin-emu/CommonFuncs.patch
new file mode 100644
index 0000000..60cfc53
--- /dev/null
+++ b/games/dolphin-emu/CommonFuncs.patch
@@ -0,0 +1,24 @@
+--- Source/Core/Common/Src/CommonFuncs.h.orig 2015-02-23 09:00:42.000000000 +0100
++++ Source/Core/Common/Src/CommonFuncs.h 2015-02-23 10:04:34.000000000 +0100
+@@ -12,6 +12,11 @@
+ #define SLEEP(x) usleep(x*1000)
+ #endif
+
++#if defined __FreeBSD__
++#include <sys/cdefs.h>
++#define __GNUC_PREREQ __GNUC_PREREQ__
++#endif
++
+ #include <cstddef>
+ #include <type_traits>
+
+@@ -30,7 +35,8 @@
+ #define b32(x) (b16(x) | (b16(x) >>16) )
+ #define ROUND_UP_POW2(x) (b32(x - 1) + 1)
+
+-#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC
++#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \
++ !defined __SSSE3__ && defined _M_X86
+ #include <emmintrin.h>
+ static __inline __m128i __attribute__((__always_inline__))
+ _mm_shuffle_epi8(__m128i a, __m128i mask)
diff --git a/games/dolphin-emu/dolphin-emu.SlackBuild b/games/dolphin-emu/dolphin-emu.SlackBuild
index 7b03331..e2d0c3a 100644
--- a/games/dolphin-emu/dolphin-emu.SlackBuild
+++ b/games/dolphin-emu/dolphin-emu.SlackBuild
@@ -69,6 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks to FreeBSD for this patch to fix building on gcc-4.9
+# https://svnweb.freebsd.org/ports/head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-CommonFuncs.h?revision=379673&view=co&pathrev=379673
+patch -p0 < $CWD/CommonFuncs.patch
+
mkdir build
cd build
cmake -G "Unix Makefiles" \
--
2.3.5
From dfbd699a1c9cef4d578eacb6456a555ed7b1596e Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Fri, 29 May 2015 11:02:07 +0100
Subject: [PATCH] games/vcmi: Patched to fix build on -current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
games/vcmi/github-aa00fdbd0e9.patch.gz | Bin 0 -> 901 bytes
games/vcmi/vcmi.SlackBuild | 4 ++++
2 files changed, 4 insertions(+)
create mode 100644 games/vcmi/github-aa00fdbd0e9.patch.gz
diff --git a/games/vcmi/github-aa00fdbd0e9.patch.gz b/games/vcmi/github-aa00fdbd0e9.patch.gz
new file mode 100644
index 0000000000000000000000000000000000000000..64fbf948cb2b0349087ea05ffe1c54b57a8d6c4e
GIT binary patch
literal 901
zcmV;01A6=)iwFp@{%chL17~S;Xmw&OVPP;ZW@KVyFl9L|aA9;~XaKEMU2oes5PY_P
z{D-}lK#C)Ul5N>yTqCKIv;q2sB<MXH4h1PvF<V*`NIGfJ^uHe|+pXNXz~OL)A(_ja
zk+?IvzS3$5gdkKg$`CIKno-Wn!6Ylk`FKq7AuIBXj)xOgQh2RuxaAF`V?YSEU&s(j
zgDXda;YKZlg*QSkiG->4tGZnjXZK4YWKyc-EVv++WB8M^W60q(`QjMT5u^o9b395R
zMk9oR+ZFxDON-&JcjtHWmw&^R_zZL<Bop;LJPNyj=Smq1X)>B5K@i7r0P{JKl9KXM
zQZ@~AKTnWB-(^TaPv+;^z9co1TzB$zGG34+zpg8_!?(>CKqVwMP%cP)?@uuRQ5&wU
zP_+sBkq<B~`Fb5kLBK>+K^)(^;*gWwm!!MvK-7$Xh6zFiEyqd1NH#%?LW)p69QsrK
z%n<bZ{a;wl&LEzk<1zHxt6M%O!G6>SW6evw5_YaRu`A6@Sh|<BFn@9J$ffi(K2r4K
zF>J!;ddb<f`$_7O!x69m4g#P`$u21qW+{x>l7{=iE$^*V_WA-`to-y&naHtyJqY5S
zsKPL8B>BSi>=}vx4i5nwBA!{kY~DWBT*DvFV4V@c(-Va4ZcAk5YE|1Xnr1Do-KaTd
z<`psa)@OuK<Q~;;AG7B8p7=lVL$9Z~t3VAEk%pfhwAJce2t%Fkw&j7w1GW`7ZrKEj
zT=tG%_F0zhi*CG=v4Sy_CJ91WPV#)$JNs~J2kqPOKFY_bH`4m%0@Sx1#;WoDCUR;l
z!}!7Vs?t-B7ZoY((d=*r9X5=mFxF3rxg^Gf@I4c|!j#1DP6VId+<myYe04p?-CAlc
zMQMC7dyH3PCEav5IWY|{g&Q|ygEn9mY9$%e$^zxUwIgTVT3eoaC1qpvsrSJ)_OA~W
zM(qoHbC++etiNitcX-g>?`?ELqm<I3Op=U@3R>*bZ7;f`-rjw$;SdeHhU=RPbdCqp
zZRfvjCvK<7oq|6zVtmi-dtrnnRC0$fp{VU309TVr>F~E)&fS2)#<PbG*rk}rA-{Tc
zTuW{`a=Mksw_n>9Zc@0WbO?+u-(SADi=6Na!JN7eympdT{$Fg3HeS^qT>pu|dCnUn
bX;x<O!5`btfauig?oRp->5<DtGY0?w>^Z!4
literal 0
HcmV?d00001
diff --git a/games/vcmi/vcmi.SlackBuild b/games/vcmi/vcmi.SlackBuild
index ff62cd7..7cdb64a 100644
--- a/games/vcmi/vcmi.SlackBuild
+++ b/games/vcmi/vcmi.SlackBuild
@@ -70,6 +70,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix building with boost-1.58
+# Thanks to rohit-n on github https://github.com/vcmi/vcmi/pull/102
+zcat $CWD/github-aa00fdbd0e9.patch.gz | patch -p1
+
mkdir -p build
cd build
cmake \
--
2.3.5
From 4818bf1beffc6fcd03d2da8e9763412e7ace76c1 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Sun, 31 May 2015 10:55:09 +0100
Subject: [PATCH 29/32] graphics/hugin: Patched to build on -current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
graphics/hugin/hugin-2013.0.0-boost-phoenix3.patch.gz | Bin 0 -> 835 bytes
graphics/hugin/hugin.SlackBuild | 3 +++
2 files changed, 3 insertions(+)
create mode 100644 graphics/hugin/hugin-2013.0.0-boost-phoenix3.patch.gz
diff --git a/graphics/hugin/hugin-2013.0.0-boost-phoenix3.patch.gz b/graphics/hugin/hugin-2013.0.0-boost-phoenix3.patch.gz
new file mode 100644
index 0000000000000000000000000000000000000000..272a48d5834791a273b2754d407bdd0cfced0c41
GIT binary patch
literal 835
zcmV-J1HAkniwFq2%xYBt188+;X>KhtFflVOFfK4HVsCGAbS-dbZ)I+2crz|=VRU0?
z0PR*yZ<|06Jr^neVVYbZfLTmzHzabMs*dVQ9K~tmM3pRTmKX^G-CYvf`S|S}KI{<3
zksYbMl>=IaH#2YE6T7&+=YgKYFivj$P_Gixs*nmXI2#!viUMw&JB-uzG_H)|_}BAx
zI7!#_?U2u(Qh;s}z1jei*yf>4sui-hKqV$2lB%lPl}oGDbW+uc1=Xs3Kx~Ut8YZdL
zh_$TNYJqMYXmwEW-hft1f;~SR1&K@HIPfRF;LV+K%omh7B4TNDM^g7(>iHpsZ{2S1
za?m^PTy!o6KYQ)L`Hyb<tkWM{Szx{@FpMHD3?BQ;7sefB+>gS_IF9o+9(>L#x^hwM
zs(sPxbk7uce1z8_I0iDsAxWA^8H*U~o(Kr2!v*xR22eDBYQ+Rbe<wbp?(R-Dc8zGJ
z32M#M4smV>oeAZ!Gop}*$Rsd~IJ&0{yd)e6EP`#gV95wuIP=*6Uk)(zup{Y!m!Ok4
za0E^$W-(2xL0^OA`np-*iV}?SBoOeBA#h~qXR9N4Izm~qg2f9rN`?U~5(XJ4)BZzU
z`w+#sak3)!VXDD3%oG?!As0ozqE87|L=ar8UNX{zbaYr;jEaPXIGt<TsEmwBGv%lN
zJmreltxWNHHCKF9%v5ohL~ar!96WTh=z8Y_3FRy5BksTYYt{Eq8kGNy`i;6~H9&1x
znq{rZpQ@S3j~^fxIMIZLVnuP^`-tGB_01;num6eo>lmyxLW3Kaf834bYW~I-eZ`k4
ze1#d<FkcK<dMD?mIYTZ_m8MDcno>e949v8_$y1N+nG?t9zJ#Ah5;|=5-VT+d@eQV(
zmSj3HH#v1;{w=H4_r>}p%}>G8(vV|r>5jbbE!N7?o>KOE-;F0D=pD5&6%P^A!g0Y5
zMFcLrMYct8e2}x^i*BxhBwt6?L6$5E2JXK3B|XZs)6upkju_i^mgR(k<Cf|l=h;m;
zBf5ql_Q?q%(-(sHu!-PW$XkNjP&06f1wH9|`agwdxzESctpHpmXgeJOEdNIiApJ*?
N{s8v_Bbj*#005)@jF12T
literal 0
HcmV?d00001
diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild
index 70dd5f9..db7891f 100644
--- a/graphics/hugin/hugin.SlackBuild
+++ b/graphics/hugin/hugin.SlackBuild
@@ -73,6 +73,9 @@ cd $PRGNAM-$VERSION
# mailing list. Thanks to Francesco Riosa!
# https://bugs.gentoo.org/show_bug.cgi?id=524700
patch -p1 < $CWD/patch.lensfun-0.3.0
+# Fix for boost-1.58 (thanks to Fedora)
+# (patch is gzipped to preserve line endings)
+zcat $CWD/hugin-2013.0.0-boost-phoenix3.patch.gz | patch -p1
chown -R root:root .
find -L . \
--
2.3.5
From 595be541535550f84a715327dbf97cd3487ce1ba Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Fri, 29 May 2015 11:00:31 +0100
Subject: [PATCH 20/32] libraries/OpenSceneGraph: Patched to fix build on
-current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild | 5 ++++-
libraries/OpenSceneGraph/giflib.patch | 12 ++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 libraries/OpenSceneGraph/giflib.patch
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
index 4720604..bd24ea7 100644
--- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
+++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild
@@ -54,7 +54,10 @@ find -L . \
sed -i 's|#include <curl/types.h>||' src/osgPlugins/curl/ReaderWriterCURL.cpp
-# Our ffmpeg is incompatible ATM
+# Fix building with giflib-5.1.1 -- thanks to Arch Linux
+# https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib.patch?h=packages/openscenegraph
+patch -p1 < $CWD/giflib.patch
+
cmake \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
diff --git a/libraries/OpenSceneGraph/giflib.patch b/libraries/OpenSceneGraph/giflib.patch
new file mode 100644
index 0000000..8bb72a8
--- /dev/null
+++ b/libraries/OpenSceneGraph/giflib.patch
@@ -0,0 +1,12 @@
+diff -wbBur OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp
+--- OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp 2013-06-03 18:04:02.000000000 +0400
++++ OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp 2014-05-29 19:00:40.163985068 +0400
+@@ -561,7 +561,7 @@
+ *width_ret = giffile->SWidth;
+ *height_ret = giffile->SHeight;
+ *numComponents_ret = 4;
+- DGifCloseFile(giffile);
++ DGifCloseFile(giffile, NULL);
+ return buffer;
+ }
+
--
2.3.5
From a99077436b2e244ed24517bb23ca6bf46976670b Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Fri, 29 May 2015 11:23:43 +0100
Subject: [PATCH 23/32] libraries/belle-sip: Fixed building on -current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
libraries/belle-sip/belle-sip.SlackBuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libraries/belle-sip/belle-sip.SlackBuild b/libraries/belle-sip/belle-sip.SlackBuild
index 8c162b6..c836986 100644
--- a/libraries/belle-sip/belle-sip.SlackBuild
+++ b/libraries/belle-sip/belle-sip.SlackBuild
@@ -85,6 +85,9 @@ sed -i \
configure.ac
autoreconf -ivf
+# Kill the accursed -Werror (fix for -current)
+SLKCFLAGS="$SLKCFLAGS -Wno-error"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CPPFLAGS="${CPPFLAGS} -I/usr/include/antlr3" \
--
2.3.5
From bad43407c94c6d2442ce08250723eb4f33ec29e9 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Thu, 28 May 2015 20:14:30 +0100
Subject: [PATCH 16/32] libraries/libgnomeprint: Patched to fix build on
-current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
.../libgnomeprint-2.18.8-bison3.patch | 39 ++++++++++++++++++++++
.../libgnomeprint-2.18.8-cups-config.patch | 39 ++++++++++++++++++++++
libraries/libgnomeprint/libgnomeprint.SlackBuild | 4 +++
3 files changed, 82 insertions(+)
create mode 100644 libraries/libgnomeprint/libgnomeprint-2.18.8-bison3.patch
create mode 100644 libraries/libgnomeprint/libgnomeprint-2.18.8-cups-config.patch
diff --git a/libraries/libgnomeprint/libgnomeprint-2.18.8-bison3.patch b/libraries/libgnomeprint/libgnomeprint-2.18.8-bison3.patch
new file mode 100644
index 0000000..d9fbbdd
--- /dev/null
+++ b/libraries/libgnomeprint/libgnomeprint-2.18.8-bison3.patch
@@ -0,0 +1,39 @@
+http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch
+
+--- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig 2010-02-09 13:32:51.000000000 +0100
++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y 2013-11-03 21:44:59.859877696 +0100
+@@ -6,8 +6,6 @@
+ #include <libgnomeprint/types.h>
+ #include <libgnomeprint/gnome-print-filter.h>
+
+-#define YYPARSE_PARAM graph
+-
+ static void
+ set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s)
+ {
+@@ -99,7 +97,7 @@
+ }
+
+ static int yylex (void *lvalp);
+-static int yyerror (const char *s);
++static int yyerror (graph_t *g, const char *s);
+ %}
+
+ %union {
+@@ -117,6 +115,7 @@
+ %type <p> pool
+
+ %pure_parser
++%parse-param { graph_t *graph }
+
+ %start graph
+ %%
+@@ -185,7 +184,7 @@
+ %%
+
+ static int
+-yyerror (const char *s)
++yyerror (graph_t *g, const char *s)
+ {
+ return -1;
+ }
diff --git a/libraries/libgnomeprint/libgnomeprint-2.18.8-cups-config.patch b/libraries/libgnomeprint/libgnomeprint-2.18.8-cups-config.patch
new file mode 100644
index 0000000..999c6f0
--- /dev/null
+++ b/libraries/libgnomeprint/libgnomeprint-2.18.8-cups-config.patch
@@ -0,0 +1,39 @@
+From ffbc68cc8518c7e7263a42d4284b749b40c5e871 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org>
+Date: Sun, 29 Jun 2014 10:47:41 +0200
+Subject: [PATCH] Use AC_PATH_TOOL to find proper cups-config.
+
+---
+ configure.in | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 729278d..186fabf 100644
+--- a/configure.in
++++ b/configure.in
+@@ -223,17 +223,18 @@ AC_ARG_WITH(cups,
+ )
+ if test "x$try_cups" = "xyes"; then
+ PKG_CHECK_MODULES(CUPS, "gmodule-2.0")
++ AC_PATH_TOOL(CUPS_CONFIG, cups-config)
+ AC_MSG_CHECKING(for CUPS libraries version >= 1.1.20)
+- if cups-config --version --libs > /dev/null 2>&1; then
+- verstxt=`cups-config --version`
++ if $CUPS_CONFIG --version --libs > /dev/null 2>&1; then
++ verstxt=`$CUPS_CONFIG --version`
+ vers=`echo "$verstxt" | \
+ awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+ if test "$vers" -lt 1001020; then
+ AC_MSG_RESULT(Cups found but the version found is less than 1.1.20)
+ cups_msg="Version requirement not satisfied"
+ else
+- CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`"
+- CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`"
++ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --libs`"
++ CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`"
+ AC_MSG_RESULT(Found version $verstxt)
+ fi
+
+--
+2.0.0
+
diff --git a/libraries/libgnomeprint/libgnomeprint.SlackBuild b/libraries/libgnomeprint/libgnomeprint.SlackBuild
index e2e508e..9795ed6 100644
--- a/libraries/libgnomeprint/libgnomeprint.SlackBuild
+++ b/libraries/libgnomeprint/libgnomeprint.SlackBuild
@@ -71,7 +71,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Thanks to Gentoo for these three patches
+# https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/libgnomeprint/files/
patch -p1 -i $CWD/libgnomeprint-2.18.8-stdio-include.patch
+patch -p1 -i $CWD/libgnomeprint-2.18.8-bison3.patch
+patch -p1 -i $CWD/libgnomeprint-2.18.8-cups-config.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
--
2.3.5
From dec8e93013f1202e1970349755d6a2f153685d13 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Fri, 29 May 2015 17:02:26 +0100
Subject: [PATCH 25/32] libraries/libgnomeprintui: Patched for building on
-current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
...libgnomeprintui-2.18.6-adwaita-icon-theme.patch | 12 ++++++
...omeprintui-2.18.6-orientation-for-preview.patch | 44 ++++++++++++++++++++++
.../libgnomeprintui/libgnomeprintui.SlackBuild | 5 +++
3 files changed, 61 insertions(+)
create mode 100644 libraries/libgnomeprintui/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
create mode 100644 libraries/libgnomeprintui/libgnomeprintui-2.18.6-orientation-for-preview.patch
diff --git a/libraries/libgnomeprintui/libgnomeprintui-2.18.6-adwaita-icon-theme.patch b/libraries/libgnomeprintui/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
new file mode 100644
index 0000000..f1fc454
--- /dev/null
+++ b/libraries/libgnomeprintui/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
@@ -0,0 +1,12 @@
+diff -up ./configure.in.orig ./configure.in
+--- ./configure.in.orig 2014-05-04 11:07:55.308844477 +0300
++++ ./configure.in 2014-05-04 11:08:26.884571685 +0300
+@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [
+ gtk+-2.0 >= 2.6.0
+ libgnomeprint-2.2 >= 2.12.1
+ libgnomecanvas-2.0 >= 1.117.0
+- gnome-icon-theme >= 1.1.92
++ adwaita-icon-theme >= 1.1.92
+ ])
+ AC_SUBST(LIBGNOMEPRINTUI_CFLAGS)
+ AC_SUBST(LIBGNOMEPRINTUI_LIBS)
diff --git a/libraries/libgnomeprintui/libgnomeprintui-2.18.6-orientation-for-preview.patch b/libraries/libgnomeprintui/libgnomeprintui-2.18.6-orientation-for-preview.patch
new file mode 100644
index 0000000..3a6aa63
--- /dev/null
+++ b/libraries/libgnomeprintui/libgnomeprintui-2.18.6-orientation-for-preview.patch
@@ -0,0 +1,44 @@
+--- ./libgnomeprintui/gnome-print-job-preview.c.orig 2012-02-23 22:48:42.000000000 +0600
++++ ./libgnomeprintui/gnome-print-job-preview.c 2012-02-25 00:18:43.000000000 +0600
+@@ -152,6 +152,7 @@
+ GtkWidget *last;
+ GnomeCanvas *canvas;
+ GnomePrintConfig *config;
++ guchar *paper_orientation_save;
+
+ guint current_page, current_offset;
+
+@@ -2187,6 +2188,19 @@
+ if (jp->config)
+ g_object_unref (G_OBJECT (jp->config));
+ jp->config = config;
++ if( config ) {
++ guchar *txt = gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
++ if( ( g_ascii_strcasecmp(( const gchar* )txt, "R90") == 0 ) ||
++ ( g_ascii_strcasecmp(( const gchar* )txt, "R270") == 0 ) ) {
++ jp->paper_orientation_save =
++ gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION );
++ gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, txt );
++ g_free ( txt );
++ }
++ else {
++ jp->paper_orientation_save = NULL;
++ }
++ }
+ if (!jp->config)
+ return;
+ g_object_ref (G_OBJECT (jp->config));
+@@ -2389,6 +2403,13 @@
+ {
+ GnomePrintJobPreview *jp = GNOME_PRINT_JOB_PREVIEW (object);
+
++ if( jp->paper_orientation_save ) {
++ gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION,
++ jp->paper_orientation_save );
++ g_free ( jp->paper_orientation_save );
++ jp->paper_orientation_save = NULL;
++ }
++
+ gnome_print_job_preview_set_config (jp, NULL);
+ gnome_print_job_preview_set_job (jp, NULL);
+
diff --git a/libraries/libgnomeprintui/libgnomeprintui.SlackBuild b/libraries/libgnomeprintui/libgnomeprintui.SlackBuild
index 7247bb3..1372db2 100644
--- a/libraries/libgnomeprintui/libgnomeprintui.SlackBuild
+++ b/libraries/libgnomeprintui/libgnomeprintui.SlackBuild
@@ -71,6 +71,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Thanks to Mageia for these patches:
+patch -p1 < $CWD/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
+patch -p1 < $CWD/libgnomeprintui-2.18.6-orientation-for-preview.patch
+autoconf
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--
2.3.5
From 74ea8c0af9dae57fb6793dfa822941f66c745867 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Sat, 30 May 2015 06:38:08 +0100
Subject: [PATCH 27/32] libraries/libkate: Patched to fix building with
-current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
libraries/libkate/libkate-0.4.1-no-libfl.patch | 88 ++++++++++++++++++++++++++
libraries/libkate/libkate.SlackBuild | 7 ++
2 files changed, 95 insertions(+)
create mode 100644 libraries/libkate/libkate-0.4.1-no-libfl.patch
diff --git a/libraries/libkate/libkate-0.4.1-no-libfl.patch b/libraries/libkate/libkate-0.4.1-no-libfl.patch
new file mode 100644
index 0000000..a5183d2
--- /dev/null
+++ b/libraries/libkate/libkate-0.4.1-no-libfl.patch
@@ -0,0 +1,88 @@
+diff -u -r libkate-0.4.1-orig/Makefile.in libkate-0.4.1/Makefile.in
+--- libkate-0.4.1-orig/Makefile.in 2011-08-21 23:46:58.000000000 +0100
++++ libkate-0.4.1/Makefile.in 2015-05-28 23:52:21.389946971 +0100
+@@ -260,7 +260,6 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+-LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@
+ LIBOBJS = @LIBOBJS@
+diff -u -r libkate-0.4.1-orig/configure.ac libkate-0.4.1/configure.ac
+--- libkate-0.4.1-orig/configure.ac 2011-08-21 23:44:32.000000000 +0100
++++ libkate-0.4.1/configure.ac 2015-05-30 06:28:33.306682481 +0100
+@@ -7,7 +7,7 @@
+
+ AC_CANONICAL_TARGET
+
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+ AC_CONFIG_HEADERS([include/config.h])
+
+ ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
+diff -u -r libkate-0.4.1-orig/doc/Makefile.in libkate-0.4.1/doc/Makefile.in
+--- libkate-0.4.1-orig/doc/Makefile.in 2011-08-21 23:47:10.000000000 +0100
++++ libkate-0.4.1/doc/Makefile.in 2015-05-28 23:52:49.742054572 +0100
+@@ -125,7 +125,6 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+-LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@
+ LIBOBJS = @LIBOBJS@
+diff -u -r libkate-0.4.1-orig/tests/Makefile.in libkate-0.4.1/tests/Makefile.in
+--- libkate-0.4.1-orig/tests/Makefile.in 2011-08-21 23:46:58.000000000 +0100
++++ libkate-0.4.1/tests/Makefile.in 2015-05-28 23:52:36.542004463 +0100
+@@ -156,7 +156,6 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+-LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@
+ LIBOBJS = @LIBOBJS@
+diff -u -r libkate-0.4.1-orig/tools/KateDJ/Makefile.in libkate-0.4.1/tools/KateDJ/Makefile.in
+--- libkate-0.4.1-orig/tools/KateDJ/Makefile.in 2011-08-21 23:46:58.000000000 +0100
++++ libkate-0.4.1/tools/KateDJ/Makefile.in 2015-05-28 23:53:11.981139017 +0100
+@@ -99,7 +99,6 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+-LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@
+ LIBOBJS = @LIBOBJS@
+diff -u -r libkate-0.4.1-orig/tools/Makefile.am libkate-0.4.1/tools/Makefile.am
+--- libkate-0.4.1-orig/tools/Makefile.am 2011-08-21 13:42:10.000000000 +0100
++++ libkate-0.4.1/tools/Makefile.am 2015-05-28 23:54:03.293333914 +0100
+@@ -20,7 +20,7 @@
+ endif
+ katedec_SOURCES=katedec.c kkate.c ksrt.c klrc.c kutil.c kfuzz.c kstream.c kread.c kstrings.c
+ katalyzer_SOURCES=katalyzer.c kutil.c kstream.c kread.c kstrings.c kstats.c
+-kateenc_LDADD=../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ @PNG_LIBS@ @LEXLIB@
++kateenc_LDADD=../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ @PNG_LIBS@
+ katedec_LDADD=../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@
+ katalyzer_LDADD=../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@
+ kateenc_CFLAGS=@CWARNFLAGS_LIGHT@ @CFLAGS_FORTIFY_SOURCE@ @CFLAGS_DEBUG@ @OGG_CFLAGS@ @PNG_CFLAGS@
+diff -u -r libkate-0.4.1-orig/tools/Makefile.in libkate-0.4.1/tools/Makefile.in
+--- libkate-0.4.1-orig/tools/Makefile.in 2011-08-21 23:46:58.000000000 +0100
++++ libkate-0.4.1/tools/Makefile.in 2015-05-28 23:54:21.805404270 +0100
+@@ -223,7 +223,6 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+-LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@
+ LIBOBJS = @LIBOBJS@
+@@ -351,7 +350,7 @@
+ @HAVE_OGG_TRUE@ $(am__append_1)
+ @HAVE_OGG_TRUE@katedec_SOURCES = katedec.c kkate.c ksrt.c klrc.c kutil.c kfuzz.c kstream.c kread.c kstrings.c
+ @HAVE_OGG_TRUE@katalyzer_SOURCES = katalyzer.c kutil.c kstream.c kread.c kstrings.c kstats.c
+-@HAVE_OGG_TRUE@kateenc_LDADD = ../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ @PNG_LIBS@ @LEXLIB@
++@HAVE_OGG_TRUE@kateenc_LDADD = ../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ @PNG_LIBS@
+ @HAVE_OGG_TRUE@katedec_LDADD = ../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@
+ @HAVE_OGG_TRUE@katalyzer_LDADD = ../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@
+ @HAVE_OGG_TRUE@kateenc_CFLAGS = @CWARNFLAGS_LIGHT@ @CFLAGS_FORTIFY_SOURCE@ @CFLAGS_DEBUG@ @OGG_CFLAGS@ @PNG_CFLAGS@
diff --git a/libraries/libkate/libkate.SlackBuild b/libraries/libkate/libkate.SlackBuild
index c218d25..c7e0dc2 100644
--- a/libraries/libkate/libkate.SlackBuild
+++ b/libraries/libkate/libkate.SlackBuild
@@ -72,6 +72,13 @@ find -L . \
\( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \
-exec chmod 755 {} \;
+# Don't link against flex (fix for -current)
+set -x
+patch -p1 < $CWD/libkate-0.4.1-no-libfl.patch
+libtoolize --copy --force
+aclocal
+automake --add-missing --copy --force-missing
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--
2.3.5
From ebb8264bf4e927003d2fdde4463eff7425f926f7 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Fri, 29 May 2015 11:03:56 +0100
Subject: [PATCH 22/32] libraries/ptlib: Patched to fix build on -current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
.../ptlib/ptlib-2.10.10-mga-bison-parameter.patch | 39 ++++++++++++++++++++++
libraries/ptlib/ptlib.SlackBuild | 4 +++
2 files changed, 43 insertions(+)
create mode 100644 libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch
diff --git a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch
new file mode 100644
index 0000000..fcc8d0d
--- /dev/null
+++ b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch
@@ -0,0 +1,39 @@
+--- ptlib-2.10.11/./src/ptlib/common/getdate.y 2013-08-15 01:20:26.000000000 +0200
++++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y 2013-12-15 00:24:27.866481490 +0100
+@@ -121,9 +121,9 @@
+ static int yylex();
+
+ #ifdef __GNUC__
+-static int yyerror(char const *msg);
++static int yyerror(void *, char const *msg);
+ #else
+-static void yyerror(char const *msg);
++static void yyerror(void *, char const *msg);
+ #endif
+
+
+@@ -132,7 +132,8 @@
+
+ %}
+
+-%pure_parser
++%pure-parser
++%parse-param {void *parseParam}
+
+ %union {
+ time_t Number;
+@@ -1018,12 +1019,12 @@
+ #endif
+
+ #ifdef __GNUC__
+-int yyerror(const char * s)
++int yyerror(void *var, const char * s)
+ {
+ return 0;
+ }
+ #else
+-static void yyerror(const char * s)
++static void yyerror(void *var, const char * s)
+ {
+ }
+ #endif
diff --git a/libraries/ptlib/ptlib.SlackBuild b/libraries/ptlib/ptlib.SlackBuild
index 4a837a3..c5ff9be 100644
--- a/libraries/ptlib/ptlib.SlackBuild
+++ b/libraries/ptlib/ptlib.SlackBuild
@@ -67,6 +67,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix building with bison-3.0.4
+# thanks to Dan Fandrich / OpalVOIP https://sourceforge.net/p/opalvoip/patches/259/
+patch -p1 < $CWD/ptlib-2.10.10-mga-bison-parameter.patch
+
# The "LIBS" variable is set to fix OpenLDAP support
#
# The --disable-avc is here to avoid build problems when both libdv and
--
2.3.5
From 250ba646ae4286d2f27c189e909e7d98dcfdbb14 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Sat, 30 May 2015 07:11:36 +0100
Subject: [PATCH 28/32] multimedia/ffmpeg2theora: Patched to fix building with
-current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild | 3 +++
multimedia/ffmpeg2theora/link-libm.patch | 16 ++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 multimedia/ffmpeg2theora/link-libm.patch
diff --git a/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild b/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild
index aae5c08..f2efde2 100644
--- a/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild
+++ b/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild
@@ -73,6 +73,9 @@ for diff in $CWD/patches/*.diff; do
echo $diff
patch -p1 < $diff
done
+# Fix underlinking on -current
+# thanks to Debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768674
+patch -p1 < $CWD/link-libm.patch
scons install APPEND_CCFLAGS="$SLKCFLAGS" prefix=/usr destdir=$PKG
diff --git a/multimedia/ffmpeg2theora/link-libm.patch b/multimedia/ffmpeg2theora/link-libm.patch
new file mode 100644
index 0000000..326889b
--- /dev/null
+++ b/multimedia/ffmpeg2theora/link-libm.patch
@@ -0,0 +1,16 @@
+Description: Link libm for ceil
+Author: Sebastian Ramacher <sramac...@debian.org>
+Last-Update: 2014-11-09
+Bug-Debian: https://bugs.debian.org/768674
+
+--- ffmpeg2theora-0.29.0~git+20140316.orig/SConstruct
++++ ffmpeg2theora-0.29.0~git+20140316/SConstruct
+@@ -221,6 +221,8 @@ if not env.GetOption('clean'):
+ env.Append(LIBS=['m'])
+ elif env['static']:
+ env.Append(LIBS=['m', 'dl'])
++ else:
++ env.Append(LIBS=['m'])
+
+
+ env = conf.Finish()
--
2.3.5
From fd9f9f66af351245fd9d87b7b50719e481d60f05 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.resea...@googlemail.com>
Date: Thu, 28 May 2015 21:07:06 +0100
Subject: [PATCH 18/32] network/avahi: Fixed build on -current.
Signed-off-by: David Spencer <baildon.resea...@googlemail.com>
---
network/avahi/avahi.SlackBuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
index f478df2..8f9dcfe 100644
--- a/network/avahi/avahi.SlackBuild
+++ b/network/avahi/avahi.SlackBuild
@@ -99,6 +99,11 @@ find -L . \
# Thanks to Robby Workman for this patch.
patch -p1 --verbose < $CWD/fixup_avahi-dnsconfd.action.patch
+# Permit deprecated functions, see https://bugzilla.redhat.com/show_bug.cgi?id=1001676#c9
+# There's a cmake option for this, but no configure option,
+# so thanks to Arch Linux for this one-liner:
+sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--
2.3.5
_______________________________________________
SlackBuilds-users mailing list
SlackBuilds-users@slackbuilds.org
http://lists.slackbuilds.org/mailman/listinfo/slackbuilds-users
Archives - http://lists.slackbuilds.org/pipermail/slackbuilds-users/
FAQ - http://slackbuilds.org/faq/
