20200103.1 global branch merge.current-20200103.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

79 files changed, 2125 insertions, 1345 deletions

diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild
index 0bdf6b18bb..e6f616dba4 100644
--- a/multimedia/aegisub/aegisub.SlackBuild
+++ b/multimedia/aegisub/aegisub.SlackBuild
@@ -69,10 +69,16 @@ 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 {} \;
 
-sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile
+patch -Np1 < $CWD/boost.patch
+sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp # boost 1.69
+sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile # missing link flag
+patch -Np1 < $CWD/icu.patch
+
+./autogen.sh
 
 LDFLAGS="$LDFLAGS -lz" \
 CFLAGS="$SLKCFLAGS" \
+CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/multimedia/aegisub/boost.patch b/multimedia/aegisub/boost.patch
new file mode 100644
index 0000000000..5d917f607e
--- /dev/null
+++ b/multimedia/aegisub/boost.patch
@@ -0,0 +1,34 @@
+From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 9 Jul 2018 20:15:29 +0000
+Subject: [PATCH] Keep using std::distance after Boost 1.68
+
+src/search_replace_engine.cpp:256:14: error: call to
+      'distance' is ambiguous
+                                count += distance(
+                                         ^~~~~~~~
+/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
+      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
+distance(_InputIter __first, _InputIter __last)
+^
+/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
+      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
+        distance(SinglePassIterator first, SinglePassIterator last)
+        ^
+---
+ src/search_replace_engine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/search_replace_engine.cpp b/src/search_replace_engine.cpp
+index 594c21e5e..14c71680d 100644
+--- a/src/search_replace_engine.cpp
++++ b/src/search_replace_engine.cpp
+@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
+ 			if (MatchState ms = matches(&diag, 0)) {
+ 				auto& diag_field = diag.*get_dialogue_field(settings.field);
+ 				std::string const& text = diag_field.get();
+-				count += distance(
++				count += std::distance(
+ 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
+ 					boost::u32regex_iterator<std::string::const_iterator>());
+ 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/multimedia/aegisub/icu.patch b/multimedia/aegisub/icu.patch
new file mode 100644
index 0000000000..2145140ed0
--- /dev/null
+++ b/multimedia/aegisub/icu.patch
@@ -0,0 +1,11 @@
+diff -upr aegisub-3.2.2.orig/src/utils.cpp aegisub-3.2.2/src/utils.cpp
+--- aegisub-3.2.2.orig/src/utils.cpp	2014-12-08 02:07:09.000000000 +0200
++++ aegisub-3.2.2/src/utils.cpp	2017-04-26 11:11:15.438239182 +0300
+@@ -44,6 +44,7 @@
+ #include <boost/filesystem/path.hpp>
+ #include <map>
+ #include <unicode/locid.h>
++#include <unicode/unistr.h>
+ #include <wx/clipbrd.h>
+ #include <wx/filedlg.h>
+ #include <wx/stdpaths.h>
diff --git a/multimedia/bombono-dvd/bombono-dvd.SlackBuild b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
index 4ad1cf1197..831f0d46b0 100644
--- a/multimedia/bombono-dvd/bombono-dvd.SlackBuild
+++ b/multimedia/bombono-dvd/bombono-dvd.SlackBuild
@@ -83,6 +83,8 @@ patch -p1 < $CWD/patches/fix_ptr2bool_cast.patch
 patch -p1 < $CWD/patches/fix_c++11_literal_warnings.patch
 patch -p1 < $CWD/patches/autoptr2uniqueptr.patch
 patch -p1 < $CWD/patches/boost.patch
+patch -p1 < $CWD/patches/fix_operator_ambiguity.patch
+patch -p1 < $CWD/patches/fix_throw_specifications.patch
 
 # Fix for ffmpeg-3
 patch -p1 < $CWD/patches/ffmpeg3.patch
diff --git a/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch b/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch
new file mode 100644
index 0000000000..5fcfaf0466
--- /dev/null
+++ b/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch
@@ -0,0 +1,352 @@
+diff -ruN old/src/mbase/project/serialization.h new/src/mbase/project/serialization.h
+--- old/src/mbase/project/serialization.h	2017-06-01 13:54:44.086895687 +0430
++++ new/src/mbase/project/serialization.h	2017-06-01 14:09:16.523275880 +0430
+@@ -75,7 +75,9 @@
+ template<typename T>
+ std::string MakeString(const T& t)
+ {
+-    return (str::stream() << t).str();
++    str::stream ss;
++    ss << t;
++    return ss.str();
+ }
+ 
+ template<typename T>
+diff -ruN old/src/mgui/dvdimport.cpp new/src/mgui/dvdimport.cpp
+--- old/src/mgui/dvdimport.cpp	2017-06-01 13:54:44.086895687 +0430
++++ new/src/mgui/dvdimport.cpp	2017-06-01 14:06:42.488114237 +0430
+@@ -211,10 +211,11 @@
+                 row[VF().selState]  = false;
+                 row[VF().name]      = VobFName(vob.pos);
+                 row[VF().thumbnail] = vob.aspect == af4_3 ? pix4_3 : pix16_9;
+-                std::string desc = (str::stream(Mpeg::SecToHMS(vob.tmLen, true)) <<  ", "
+-                                    << vob.sz.x << "x" << vob.sz.y << ", "
+-                                    << (vob.aspect == af4_3 ? "4:3" : "16:9") << ", " 
+-                                    << std::fixed << std::setprecision(2) << vob.Count()/512. << " " << _("MB")).str();
++                str::stream ss (Mpeg::SecToHMS(vob.tmLen, true));
++                ss << ", " << vob.sz.x << "x" << vob.sz.y << ", "
++                  << (vob.aspect == af4_3 ? "4:3" : "16:9") << ", " 
++                  << std::fixed << std::setprecision(2) << vob.Count()/512. << " " << _("MB");
++                std::string desc = ss.str();
+                 row[VF().desc]      = desc;
+             }
+             CompleteSelection(id, false);
+diff -ruN old/src/mbase/project/media.cpp new/src/mbase/project/media.cpp
+--- old/src/mbase/project/media.cpp	2017-06-01 14:25:09.492134844 +0430
++++ new/src/mbase/project/media.cpp	2017-06-01 14:37:53.196336367 +0430
+@@ -58,7 +58,9 @@
+ 
+ std::string MakeAutoName(const std::string& str, int old_sz)
+ {
+-    return (str::stream() << str << " " << old_sz+1).str();
++    str::stream ss;
++    ss << str << " " << old_sz+1;
++    return ss.str();
+ }
+ 
+ void VideoMD::AddChapter(ChapterItem chp)
+diff -ruN old/src/mbase/project/menu.cpp new/src/mbase/project/menu.cpp
+--- old/src/mbase/project/menu.cpp	2017-06-01 14:25:09.495468141 +0430
++++ new/src/mbase/project/menu.cpp	2017-06-01 14:39:42.004331141 +0430
+@@ -166,7 +166,9 @@
+ static std::string MakeObjectPath(int idx, const char* type)
+ {
+     ASSERT( idx != NO_HNDL );
+-    return (str::stream() << type << "." << idx).str();
++    str::stream ss;
++    ss << type << "." << idx;
++    return ss.str();
+ }
+ 
+ std::string GetMediaRef(MediaItem mi)
+@@ -197,7 +199,9 @@
+ void RefMaker::Visit(VideoChapterMD& obj)
+ {
+     refStr  = GetMediaRef(obj.owner);
+-    refStr += (str::stream() << "." << ChapterPosInt(&obj)).str();
++    str::stream ss;
++    ss << "." << ChapterPosInt(&obj);
++    refStr += ss.str();
+ }
+ 
+ std::string Media2Ref(MediaItem mi)
+@@ -233,8 +237,9 @@
+ 
+ std::string ThrowBadIndex(const char* prefix, int idx)
+ {
+-    throw std::runtime_error(
+-        (str::stream() << prefix << idx).str() );
++    str::stream ss;
++    ss << prefix << idx;
++    throw std::runtime_error(ss.str());
+ }
+ 
+ MediaItem TryGetMedia(int idx)
+diff -ruN old/src/mbase/project/srl-common.cpp new/src/mbase/project/srl-common.cpp
+--- old/src/mbase/project/srl-common.cpp	2017-06-01 14:25:09.495468141 +0430
++++ new/src/mbase/project/srl-common.cpp	2017-06-01 14:40:56.524722225 +0430
+@@ -36,10 +36,12 @@
+ std::string ToString(const RGBA::Pixel& pxl)
+ {
+     using Mpeg::set_hms;
+-    return (str::stream("#") << std::hex 
+-            << set_hms() << (int)pxl.red 
+-            << set_hms() << (int)pxl.green 
+-            << set_hms() << (int)pxl.blue << (int)pxl.alpha).str();
++    str::stream ss ("#");
++    ss << std::hex 
++      << set_hms() << (int)pxl.red 
++      << set_hms() << (int)pxl.green 
++      << set_hms() << (int)pxl.blue << (int)pxl.alpha;
++    return ss.str();
+ }
+ 
+ // как pango_color_parse()
+diff -ruN old/src/mgui/author/render.cpp new/src/mgui/author/render.cpp
+--- old/src/mgui/author/render.cpp	2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/author/render.cpp	2017-06-01 14:28:08.901379890 +0430
+@@ -1307,7 +1307,9 @@
+ 
+ bool RenderMainPicture(const std::string& out_dir, Menu mn, int i)
+ {
+-    Author::Info((str::stream() << "Rendering menu \"" << mn->mdName << "\" ...").str());
++    str::stream ss;
++    ss << "Rendering menu \"" << mn->mdName << "\" ...";
++    Author::Info(ss.str());
+     const std::string mn_dir = MakeMenuPath(out_dir, mn, i);
+ 
+     if( IsMotion(mn) )
+diff -ruN old/src/mgui/author/script.cpp new/src/mgui/author/script.cpp
+--- old/src/mgui/author/script.cpp	2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/author/script.cpp	2017-06-01 14:31:23.248978018 +0430
+@@ -130,7 +130,9 @@
+     {
+         VideoItem vi = IsVideo(mi);
+         ASSERT( vi );
+-        str = (str::stream() << "title " << GetAuthorNumber(vi)).str();
++        str::stream ss;
++        ss << "title " << GetAuthorNumber(vi);
++        str = ss.str();
+     }
+     return str;
+ }
+@@ -179,7 +181,9 @@
+     // Потому: для удоства пользователей даем создавать нулевую главу, разрешая это здесь 
+     // (однако доп. нулевые главы будут приводить к ошибке Cannot jump to chapter N ... only M exist)
+     int c_num = ChapterPosInt(&obj) + (owner->List()[0]->chpTime ? 2 : 1) ;
+-    res = (str::stream() << "jump title " << v_num << " chapter " << c_num << ";").str();
++    str::stream ss;
++    ss << "jump title " << v_num << " chapter " << c_num << ";";
++    res = ss.str();
+ }
+ 
+ static std::string MakeButtonJump(MediaItem mi, bool vts_domain)
+@@ -204,7 +208,9 @@
+     if( !fs::native(name) )
+         name = "Menu";
+ 
+-    std::string fname = (str::stream() << idx+1 << "." << name).str();
++    str::stream ss;
++    ss << idx+1 << "." << name;
++    std::string fname = ss.str();
+     return cnv_from_utf8 ? ConvertPathFromUtf8(fname) : fname ;
+ }
+ 
+@@ -626,7 +632,9 @@
+ void AuthorSectionInfo(const std::string& str)
+ {
+     Author::Info("\n#", false);
+-    Author::Info((str::stream() << "# " << str).str(), false);
++    str::stream ss;
++    ss << "# " << str;
++    Author::Info(ss.str(), false);
+     Author::Info("#\n", false);
+ }
+ 
+@@ -1082,7 +1090,9 @@
+ 
+ static void AuthorImpl(const std::string& out_dir)
+ {
+-    AuthorSectionInfo((str::stream() << "Build DVD-Video in folder: " << out_dir).str());
++    str::stream ss;
++    ss << "Build DVD-Video in folder: " << out_dir;
++    AuthorSectionInfo(ss.str());
+     IteratePendingEvents();
+ 
+     IndexVideosForAuthoring();
+diff -ruN old/src/mgui/project/add.cpp new/src/mgui/project/add.cpp
+--- old/src/mgui/project/add.cpp	2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/project/add.cpp	2017-06-01 14:33:26.303387642 +0430
+@@ -86,7 +86,9 @@
+ 
+ static std::string FpsToStr(const Point& frate)
+ {
+-    return (str::stream() << (double)frate.x/frate.y).str();
++    str::stream ss;
++    ss << (double)frate.x/frate.y;
++    return ss.str();
+ }
+ 
+ static std::string TVTypeStr(bool is_ntsc)
+@@ -163,7 +165,9 @@
+     // *
+     bool is_aspect_ok = vid.sarCode == af4_3 || vid.sarCode == af16_9;
+     Point aspect = vid.SizeAspect();
+-    std::string aspect_str = (str::stream() << aspect.x << ':' << aspect.y).str();
++    str::stream ss;
++    ss << aspect.x << ':' << aspect.y;
++    std::string aspect_str = ss.str();
+     SetImportError(ed, is_aspect_ok, 
+                    std::string(_("Aspect ratio")) + ": \t" + MarkError(aspect_str, is_aspect_ok),
+                    BF_(Descriptions[2]) % tv_type % bf::stop);
+diff -ruN old/src/mgui/sdk/cairo_utils.cpp new/src/mgui/sdk/cairo_utils.cpp
+--- old/src/mgui/sdk/cairo_utils.cpp	2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/sdk/cairo_utils.cpp	2017-06-01 14:35:20.831246046 +0430
+@@ -27,6 +27,8 @@
+ std::string MakeSVGFilename(const char* prefix)
+ {
+     static int idx = 1;
+-    return (str::stream() << prefix << "-" << Mpeg::set_hms() << idx++ << ".svg" ).str();
++    str::stream ss;
++    ss << prefix << "-" << Mpeg::set_hms() << idx++ << ".svg";
++    return ss.str();
+ }
+ 
+diff -ruN old/src/mgui/timeline/layout.cpp new/src/mgui/timeline/layout.cpp
+--- old/src/mgui/timeline/layout.cpp	2017-06-01 14:25:09.502134734 +0430
++++ new/src/mgui/timeline/layout.cpp	2017-06-01 14:36:36.152095784 +0430
+@@ -600,8 +600,10 @@
+ void FramesToTime(std::string& str, int cnt, double fps)
+ {
+     time4_t t4 = FramesToTime(cnt, fps);
+-    str = (str::stream() << Mpeg::set_hms() << t4.hh << ":" << Mpeg::set_hms() << t4.mm << ":"
+-                         << Mpeg::set_hms() << t4.ss << ";" << Mpeg::set_hms() << t4.ff).str();
++    str::stream ss;
++    ss << Mpeg::set_hms() << t4.hh << ":" << Mpeg::set_hms() << t4.mm << ":"
++      << Mpeg::set_hms() << t4.ss << ";" << Mpeg::set_hms() << t4.ff;
++    str = ss.str();
+ }
+ 
+ } // namespace TimeLine
+diff -ruN old/src/mgui/win_utils.cpp new/src/mgui/win_utils.cpp
+--- old/src/mgui/win_utils.cpp	2017-06-01 14:25:09.498801438 +0430
++++ new/src/mgui/win_utils.cpp	2017-06-01 14:26:50.898112082 +0430
+@@ -132,7 +132,9 @@
+ 
+ std::string ColorToString(const unsigned int rgba)
+ {
+-    return (str::stream() << std::hex << (rgba >> 8)).str();
++    str::stream ss;
++    ss << std::hex << (rgba >> 8);
++    return ss.str();
+ }
+ 
+ CR::Color GetBGColor(Gtk::Widget& wdg)
+diff -ruN old/src/mdemux/dvdread.cpp new/src/mdemux/dvdread.cpp
+--- old/src/mdemux/dvdread.cpp	2017-06-01 14:48:30.110355679 +0430
++++ new/src/mdemux/dvdread.cpp	2017-06-01 14:50:50.141065674 +0430
+@@ -35,8 +35,10 @@
+ std::string VobFName(VobPos& pos, const std::string& suffix)
+ {
+     using Mpeg::set_hms;
+-    return (str::stream("Video") << set_hms() << int(pos.Vts()) 
+-            << "-" << set_hms() << pos.VobId() << suffix << ".vob").str();
++    str::stream ss ("Video");
++    ss << set_hms() << int(pos.Vts()) 
++      << "-" << set_hms() << pos.VobId() << suffix << ".vob";
++    return ss.str();
+ }
+ 
+ typedef boost::function<void(int, double)> VobTimeFnr;
+@@ -282,9 +284,11 @@
+ static void TryDVDReadBlocks(dvd_file_t* file, int off, size_t cnt, char* buf)
+ {
+     int real_cnt = DVDReadBlocks(file, off, cnt, (unsigned char*)buf);
+-    if( (int)cnt != real_cnt )
+-        throw std::runtime_error( (str::stream() << real_cnt << 
+-                                   " != DVDReadBlocks(" << cnt << ")").str() );
++    if( (int)cnt != real_cnt ) {
++        str::stream ss;
++        ss << real_cnt << " != DVDReadBlocks(" << cnt << ")";
++        throw std::runtime_error( ss.str() );
++    }
+ }
+ 
+ // размер буфера должен соответствовать читаемому диапазону
+diff -ruN old/src/mdemux/mpeg2demux.cpp new/src/mdemux/mpeg2demux.cpp
+--- old/src/mdemux/mpeg2demux.cpp	2017-06-01 14:48:30.110355679 +0430
++++ new/src/mdemux/mpeg2demux.cpp	2017-06-01 14:55:35.784165916 +0430
+@@ -71,7 +71,9 @@
+ 
+ static std::string MakePESKey(int id, const char* ext)
+ {
+-    return (str::stream() << id << "." << ext).str();
++    str::stream ss;
++    ss << id << "." << ext;
++    return ss.str();
+ }
+ 
+ static bool ReadPart(io::stream& strm, uint8_t* buf, int sz, int& len)
+@@ -110,7 +112,9 @@
+         ASSERT(0);
+     }
+ 
+-    std::string header_str = (str::stream() << sample_rate << ":" << channels << ":" << bps << ".lpcm").str();
++    str::stream ss;
++    ss << sample_rate << ":" << channels << ":" << bps << ".lpcm";
++    std::string header_str = ss.str();
+     return MakePESKey(track, header_str.c_str());
+ }
+ 
+diff -ruN old/src/mdemux/seek.cpp new/src/mdemux/seek.cpp
+--- old/src/mdemux/seek.cpp	2017-06-01 14:48:30.110355679 +0430
++++ new/src/mdemux/seek.cpp	2017-06-01 14:52:09.669280234 +0430
+@@ -37,8 +37,10 @@
+     int hh    = min / 60;
+     int mm    = min - hh*60;
+ 
+-    return (str::stream() << set_hms() << hh << ":" 
+-                          << set_hms() << mm << ":" << set_hms() << ss).str();
++    str::stream strss;
++    strss << set_hms() << hh << ":"
++      << set_hms() << mm << ":" << set_hms() << ss;
++    return strss.str();
+ }
+ 
+ bool MediaInfo::InitBegin(VideoLine& vl)
+diff -ruN old/src/mlib/sdk/misc.cpp new/src/mlib/sdk/misc.cpp
+--- old/src/mlib/sdk/misc.cpp	2017-06-01 14:48:30.120355606 +0430
++++ new/src/mlib/sdk/misc.cpp	2017-06-01 14:53:25.504549937 +0430
+@@ -173,12 +173,16 @@
+ std::string Double2Str(double val)
+ {
+     //return boost::format("%1%") % val % bf::stop;
+-    return (str::stream() << val).str();
++    str::stream ss;
++    ss << val;
++    return ss.str();
+ }
+ 
+ std::string Int2Str(int val)
+ {
+-    return (str::stream() << val).str();
++    str::stream ss;
++    ss << val;
++    return ss.str();
+ }
+ 
+ static bool ICaseMatch(const std::string& str, const std::string& pat_str)
+diff -ruN old/src/mlib/sdk/system.cpp new/src/mlib/sdk/system.cpp
+--- old/src/mlib/sdk/system.cpp	2017-06-01 14:48:30.120355606 +0430
++++ new/src/mlib/sdk/system.cpp	2017-06-01 14:54:13.980777662 +0430
+@@ -28,7 +28,9 @@
+ int GetMemSize()
+ {
+     pid_t pid = getpid();
+-    std::string str = (str::stream() << "/proc/" << pid << "/statm").str();
++    str::stream ss;
++    ss << "/proc/" << pid << "/statm";
++    std::string str = ss.str();
+ 
+     io::stream strm(str.c_str(), iof::in);
+     int mem;
diff --git a/multimedia/bombono-dvd/patches/fix_throw_specifications.patch b/multimedia/bombono-dvd/patches/fix_throw_specifications.patch
new file mode 100644
index 0000000000..f2f4c40d4f
--- /dev/null
+++ b/multimedia/bombono-dvd/patches/fix_throw_specifications.patch
@@ -0,0 +1,24 @@
+diff -ruN old/src/mbase/project/table.h new/src/mbase/project/table.h
+--- old/src/mbase/project/table.h	2017-06-01 13:54:44.086895687 +0430
++++ new/src/mbase/project/table.h	2017-06-01 13:55:58.089107253 +0430
+@@ -128,7 +128,7 @@
+                  void  ClearSettings();
+ 
+                  void  Load(const std::string& fname,
+-                            const std::string& cur_dir = std::string()) throw (std::exception);
++                            const std::string& cur_dir = std::string());
+                  bool  Save();
+ 
+                  bool  SaveAs(const std::string& fname,
+diff -ruN old/src/mbase/project/srl-db.cpp new/src/mbase/project/srl-db.cpp
+--- old/src/mbase/project/srl-db.cpp	2017-06-01 14:25:09.495468141 +0430
++++ new/src/mbase/project/srl-db.cpp	2017-06-01 14:41:49.699901753 +0430
+@@ -102,7 +102,7 @@
+ }
+ 
+ void ADatabase::Load(const std::string& fname,
+-                     const std::string& cur_dir) throw (std::exception)
++                     const std::string& cur_dir)
+ {
+     try
+     {
diff --git a/multimedia/cinelerra/README b/multimedia/cinelerra/README
index 3ddd60f57e..321c71df3f 100644
--- a/multimedia/cinelerra/README
+++ b/multimedia/cinelerra/README
@@ -1,5 +1,7 @@
 cinelerra (GNU/Linux Video/Audio Studio)
 
+5.x variant of Cinelerra by WP Morrow (aka goodguy).
+
 Cinelerra CV is the most advanced non-linear video editor and compositor
 for Linux. It does primarily 3 main things: capturing, compositing,
 and editing audio and video with sample level accuracy.
diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild
index dfc6c9308c..7a3072d564 100644
--- a/multimedia/cinelerra/cinelerra.SlackBuild
+++ b/multimedia/cinelerra/cinelerra.SlackBuild
@@ -23,9 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cinelerra
-SRCNAM=CinelerraCV
-VERSION=${VERSION:-2.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20190930_6ca0a78}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -66,9 +65,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -77,32 +76,29 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 ./autogen.sh
-LDFLAGS="-ldl" \
-CFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
-CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-plugindir=/usr/lib${LIBDIRSUFFIX}/cinelerra \
-  --disable-static \
   --mandir=/usr/man \
-  --with-pic \
-  --with-x \
-  --enable-opengl \
   --build=$ARCH-slackware-linux \
   $mmx
 
 make
 make install DESTDIR=$PKG
 
+rm -f $PKG/usr/share/applications/cin.desktop
+install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/cinelerra/cinelerra.desktop b/multimedia/cinelerra/cinelerra.desktop
new file mode 100644
index 0000000000..b71239453c
--- /dev/null
+++ b/multimedia/cinelerra/cinelerra.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=cinelerra
+Comment=MultiMedia Editor
+Comment[fr]=Éditeur multimédia
+Categories=AudioVideo;AudioVideoEditing;
+Encoding=UTF-8
+Exec=cin
+Icon=/usr/share/pixmaps/cin.xpm
+Terminal=false
+Type=Application
diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info
index e866c597cb..97c4dfcca7 100644
--- a/multimedia/cinelerra/cinelerra.info
+++ b/multimedia/cinelerra/cinelerra.info
@@ -1,8 +1,8 @@
 PRGNAM="cinelerra"
-VERSION="2.3"
-HOMEPAGE="https://cinelerra-cv.org/"
-DOWNLOAD="https://gentoo.osuosl.org/distfiles/CinelerraCV-2.3.tar.xz"
-MD5SUM="a1e7bfaf9827f74900d58d25955bdf3f"
+VERSION="20190930_6ca0a78"
+HOMEPAGE="https://cinelerra-gg.org"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cinelerra-20190930_6ca0a78.tar.xz"
+MD5SUM="f9b485a2f4c72f83de4fd12eae3346d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac faad2 imlib2 libavc1394 libdv libiec61883 mjpegtools lame x264"
diff --git a/multimedia/cinelerra/slack-desc b/multimedia/cinelerra/slack-desc
index bbeb099ad8..fb333a1c70 100644
--- a/multimedia/cinelerra/slack-desc
+++ b/multimedia/cinelerra/slack-desc
@@ -8,12 +8,12 @@
          |-----handy-ruler------------------------------------------------------|
 cinelerra: cinelerra (GNU/Linux Video/Audio Studio)
 cinelerra:
+cinelerra: 5.x variant of Cinelerra by WP Morrow (aka goodguy).
+cinelerra:
 cinelerra: Cinelerra CV is the most  advanced non-linear video editor
 cinelerra: and compositor for Linux.  It does primarily three main
 cinelerra: things:  capturing, compositing, and  editing audio and
 cinelerra: video with sample level accuracy.
 cinelerra:
-cinelerra: Homepage: http://cinelerra-cv.org/
-cinelerra:
-cinelerra:
+cinelerra: Homepage: http://cinelerra-gg.org
 cinelerra:
diff --git a/multimedia/dvdauthor/dvdauthor-0.7.2-imagemagick7.patch b/multimedia/dvdauthor/dvdauthor-0.7.2-imagemagick7.patch
new file mode 100644
index 0000000000..7cef5127f8
--- /dev/null
+++ b/multimedia/dvdauthor/dvdauthor-0.7.2-imagemagick7.patch
@@ -0,0 +1,74 @@
+--- dvdauthor/src/subgen-image.c	2014-01-21 00:12:37.000000000 +0100
++++ dvdauthor/src/subgen-image.c	2017-11-27 20:26:53.682914041 +0100
+@@ -30,7 +30,7 @@
+ 
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+ #include <stdarg.h>
+-#include <magick/api.h>
++#include <MagickWand/MagickWand.h>
+ #else
+ #include <png.h>
+ #endif
+@@ -176,18 +176,18 @@
+ {
+     Image *im;
+     ImageInfo *ii;
+-    ExceptionInfo ei;
++    ExceptionInfo *ei;
+     int x,y;
+     unsigned long magickver;
+     unsigned char amask;
+ 
+-    GetExceptionInfo(&ei);
++    ei = AcquireExceptionInfo();
+     ii=CloneImageInfo(NULL);
+     strcpy(ii->filename,s->fname);
+-    im=ReadImage(ii,&ei);
++    im=ReadImage(ii,ei);
+ 
+     if( !im ) {
+-        MagickError(ei.severity,"Unable to load file",ii->filename);
++        MagickError(ei->severity,"Unable to load file",ii->filename);
+         return -1;
+     }
+ 
+@@ -202,10 +202,10 @@
+     for( y=0; y<im->rows; y++ ) {
+         char pdata[MAXX*4];
+ 
+-        if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
+-            fprintf(stderr,"ERR:  Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description);
+-            CatchException(&ei);
+-            MagickError(ei.severity,ei.reason,ei.description);
++        if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
++            fprintf(stderr,"ERR:  Extracting row %d from %s (%s,%s)\n",y,s->fname,ei->reason,ei->description);
++            CatchException(ei);
++            MagickError(ei->severity,ei->reason,ei->description);
+             DestroyImage(im);
+             return -1;
+         }
+@@ -219,7 +219,7 @@
+         }
+     }
+     DestroyImage(im);
+-    DestroyExceptionInfo(&ei);
++    DestroyExceptionInfo(ei);
+     fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
+ 
+     return 0;
+@@ -1098,13 +1098,13 @@
+ void image_init()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+-    InitializeMagick(NULL);
++    MagickCoreGenesis("", MagickFalse);
+ #endif
+ }
+ 
+ void image_shutdown()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+-    DestroyMagick();
++    MagickCoreTerminus();
+ #endif
+ }
diff --git a/multimedia/dvdauthor/dvdauthor.SlackBuild b/multimedia/dvdauthor/dvdauthor.SlackBuild
index bf785bab21..2044823a6d 100644
--- a/multimedia/dvdauthor/dvdauthor.SlackBuild
+++ b/multimedia/dvdauthor/dvdauthor.SlackBuild
@@ -75,6 +75,8 @@ 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 {} \;
 
+patch -p1 < $CWD/dvdauthor-0.7.2-imagemagick7.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/multimedia/dvdstyler/dvdstyler.SlackBuild b/multimedia/dvdstyler/dvdstyler.SlackBuild
index b60c41a311..c6b120f88a 100644
--- a/multimedia/dvdstyler/dvdstyler.SlackBuild
+++ b/multimedia/dvdstyler/dvdstyler.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for dvdstyler
 
-# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=dvdstyler
 SPRGNAM=DVDStyler
-VERSION=${VERSION:-3.0.4}
+VERSION=${VERSION:-3.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/dvdstyler/dvdstyler.info b/multimedia/dvdstyler/dvdstyler.info
index 69ed107c37..c6e20c260d 100644
--- a/multimedia/dvdstyler/dvdstyler.info
+++ b/multimedia/dvdstyler/dvdstyler.info
@@ -1,8 +1,8 @@
 PRGNAM="dvdstyler"
-VERSION="3.0.4"
+VERSION="3.1.2"
 HOMEPAGE="http://www.dvdstyler.org/"
-DOWNLOAD="http://downloads.sf.net/dvdstyler/DVDStyler-3.0.4.tar.bz2"
-MD5SUM="5008ea1488809fb0ca877b4e617ae5a7"
+DOWNLOAD="http://downloads.sf.net/dvdstyler/DVDStyler-3.1.2.tar.bz2"
+MD5SUM="8d5e977900ade9f57ae1e13c2e50b1ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dvdauthor libavc1394 libmspack libquicktime mjpegtools mpgtx wxsvg"
diff --git a/multimedia/dvgrab/dvgrab.SlackBuild b/multimedia/dvgrab/dvgrab.SlackBuild
index 73e1d982cb..56cf622cf7 100644
--- a/multimedia/dvgrab/dvgrab.SlackBuild
+++ b/multimedia/dvgrab/dvgrab.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
deleted file mode 100644
index cc3af60b8c..0000000000
--- a/multimedia/ffmpeg/README
+++ /dev/null
@@ -1,70 +0,0 @@
-ffmpeg (Software to record, convert and stream audio and video)
-
-FFmpeg is a complete solution to record, convert and stream audio
-and video. It includes libavcodec, the leading audio/video codec
-library.
-
-You can enable a lot of optional (not-autodetected) features by
-passing variables to the script (VAR=yes/no ./ffmpeg.SlackBuild):
-ASS=yes|no (default: no), requires libass
-BLURAY=yes|no (default: no), requires libbluray
-BS2B=yes|no (default: no), requires libbs2b
-CELT=yes|no (default: no), requires celt
-CHROMAPRINT=yes|no (default: no), requires chromaprint
-DC1394=yes|no (default: no), requires libdc1394
-DECKLINK=yes|no (default: no), requires decklink-sdk
-EBUR128=yes|no (default: no), requires libebur128
-FDK_AAC=yes|no (default: no), requires libfdk-aac (creates non-redistributable binary)
-FLITE=yes|no (default: no), requires flite
-FREI0R=yes|no (default: no), requires frei0r
-GME=yes|no (default: no), requires libgme
-GSM=yes|no (default: no), requires gsm
-IEC61883=yes|no (default: no), requires libiec61883 and libavc1394
-ILBC=yes|no (default: no), requires libilbc
-LADSPA=yes|no (default: no), requires ladspa_sdk
-LAME=yes|no (default: no), requires lame
-MODPLUG=yes|no (default: no), requires libmodplug
-NETCDF=yes|no (default: no), requires netcdf
-OPENAL=yes|no (default: no), requires OpenAL
-OPENCORE=yes|no (default: no), requires opencore-amr
-OPENCV=yes|no (default: no), requires opencv-legacy
-OPENSSL=yes|no (default: no), creates non-redistributable binary
-OPUS=yes|no (default: no), requires opus
-RTMP=yes|no (default: no), requires rtmpdump
-RUBBERBAND=yes|no (default: no), requires rubberband
-SCHROEDINGER=yes|no (default: no), requires schroedinger
-SNAPPY=yes|no (default: no), requires snappy
-SPEEX=yes|no (default: no), requires speex
-TESSERACT=yes|no (default: no), requires tesseract
-TWOLAME=yes|no (default: no), requires twolame
-VIDSTAB=yes|no (default: no), requires vid.stab
-WEBP=yes|no (default: no), requires libwebp
-X264=yes|no (default: no), requires x264
-X265=yes|no (default: no), requires x265
-XVID=yes|no (default: no), requires xvidcore
-ZMQ=yes|no (default: no), requires zeromq
-ZVBI=yes|no (default: no), requires zvbi
-
-Additional optional (autodetected) dependencies are jack-audio-connection-kit and
-SDL2. The latter is needed for building ffplay.
-
-Further, there are some more features with dependencies already available
-in core Slackware. These are enabled by default, but can be disabled similar
-to the other switches above:
-CACA=yes|no (default: yes)
-FONTCONFIG=yes|no (default: yes)
-FREETYPE=yes|no (default: yes)
-FRIBIDI=yes|no (default: yes)
-GNUTLS=yes|no (default: yes)
-JP2=yes|no (default: yes)
-LIBCDIO=yes|no (default: yes)
-LIBSSH=yes|no (default: yes)
-OPENGL=yes|no (default: yes)
-PULSEAUDIO=yes|no (default: yes)
-SAMBA=yes|no (default: yes)
-THEORA=yes|no (default: yes)
-V4L2=yes|no (default: yes)
-VORBIS=yes|no (default: yes)
-VPX=yes|no (default: yes)
-WAVPACK=yes|no (default: yes)
-X11GRAB=yes|no (default: yes)
diff --git a/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch b/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch
deleted file mode 100644
index 03d831d72d..0000000000
--- a/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/libfdk-aacenc.c.orig	2017-02-10 23:25:26.000000000 +1000
-+++ libavcodec/libfdk-aacenc.c	2018-12-10 07:59:22.515000000 +1000
-@@ -286,7 +286,7 @@
-     }
- 
-     avctx->frame_size = info.frameLength;
--    avctx->initial_padding = info.encoderDelay;
-+    avctx->initial_padding = info.nDelay;
-     ff_af_queue_init(avctx, &s->afq);
- 
-     if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
diff --git a/multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch b/multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch
deleted file mode 100644
index 65e17d4449..0000000000
--- a/multimedia/ffmpeg/ffmpeg-3.2.4-openjpeg2.3.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Naur ffmpeg-3.2.4.orig/configure ffmpeg-3.2.4/configure
---- ffmpeg-3.2.4.orig/configure	2017-02-10 14:25:25.000000000 +0100
-+++ ffmpeg-3.2.4/configure	2017-10-12 08:36:03.395867915 +0200
-@@ -1831,6 +1831,8 @@
-     machine_ioctl_meteor_h
-     malloc_h
-     opencv2_core_core_c_h
-+    openjpeg_2_3_openjpeg_h
-+    openjpeg_2_2_openjpeg_h
-     openjpeg_2_1_openjpeg_h
-     openjpeg_2_0_openjpeg_h
-     openjpeg_1_5_openjpeg_h
-@@ -5721,7 +5723,11 @@
-                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg       && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg       && { { check_lib2 openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib2 openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
-+                               { check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
-+                               { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
-                                { check_lib2 openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                { check_lib2 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-diff -Naur ffmpeg-3.2.4.orig/libavcodec/libopenjpegdec.c ffmpeg-3.2.4/libavcodec/libopenjpegdec.c
---- ffmpeg-3.2.4.orig/libavcodec/libopenjpegdec.c	2017-02-10 14:25:26.000000000 +0100
-+++ ffmpeg-3.2.4/libavcodec/libopenjpegdec.c	2017-10-12 08:38:20.676315554 +0200
-@@ -34,7 +34,11 @@
- #include "internal.h"
- #include "thread.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+#  include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +48,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +433,7 @@
-     opj_stream_set_read_function(stream, stream_read);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader);
-diff -Naur ffmpeg-3.2.4.orig/libavcodec/libopenjpegenc.c ffmpeg-3.2.4/libavcodec/libopenjpegenc.c
---- ffmpeg-3.2.4.orig/libavcodec/libopenjpegenc.c	2017-02-10 14:25:26.000000000 +0100
-+++ ffmpeg-3.2.4/libavcodec/libopenjpegenc.c	2017-10-12 08:40:43.411456456 +0200
-@@ -32,7 +32,11 @@
- #include "avcodec.h"
- #include "internal.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+#  include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -42,7 +46,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -306,7 +310,7 @@
- 
-     opj_set_default_encoder_parameters(&ctx->enc_params);
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     switch (ctx->cinema_mode) {
-     case OPJ_CINEMA2K_24:
-         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -771,7 +775,7 @@
-     opj_stream_set_write_function(stream, stream_write);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer);
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
deleted file mode 100644
index bba18397a9..0000000000
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ffmpeg
-
-# Copyright 2010-2017 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2017  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Originally written by core (eroc@linuxmail.org)
-# Modified by Robby Workman <rworkman@slackbuilds.org>
-
-PRGNAM=ffmpeg
-VERSION=${VERSION:-3.2.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-# You can enable a lot of optional (not-autodetected) features by
-# passing variables to the script (VAR=yes/no ./ffmpeg.SlackBuild).
-# Unfortunately ffmpeg's configure doesn't support --enable-feature=yes
-# syntax, so we have to do it the complicated way :/
-# Additional optional (autodetected) dependencies are:
-# - jack-audio-connection-kit
-# - libva
-# - libvdpau
-# - libX11
-# - libxcb
-# - sdl2
-# - xz
-# - zlib
-
-mp3lame=""    ; [ "${LAME:-no}" != "no" ]         && mp3lame="--enable-libmp3lame"
-libx264=""    ; [ "${X264:-no}" != "no" ]         && libx264="--enable-libx264"
-libcelt=""    ; [ "${CELT:-no}" != "no" ]         && libcelt="--enable-libcelt"
-libdc1394=""  ; [ "${DC1394:-no}" != "no" ]       && libdc1394="--enable-libdc1394"
-libfrei0r=""  ; [ "${FREI0R:-no}" != "no" ]       && libfrei0r="--enable-frei0r"
-libgsm=""     ; [ "${GSM:-no}" != "no" ]          && libgsm="--enable-libgsm"
-librtmp=""    ; [ "${RTMP:-no}" != "no" ]         && librtmp="--enable-librtmp"
-dirac_fast="" ; [ "${SCHROEDINGER:-no}" != "no" ] && dirac_fast="--enable-libschroedinger"
-libspeex=""   ; [ "${SPEEX:-no}" != "no" ]        && libspeex="--enable-libspeex"
-libxvid=""    ; [ "${XVID:-no}" != "no" ]         && libxvid="--enable-libxvid"
-libbluray=""  ; [ "${BLURAY:-no}" != "no" ]       && libbluray="--enable-libbluray"
-libass=""     ; [ "${ASS:-no}" != "no" ]          && libass="--enable-libass"
-libopenal=""  ; [ "${OPENAL:-no}" != "no" ]       && libopenal="--enable-openal"
-libiec61883=""; [ "${IEC61883:-no}" != "no" ]     && libiec61883="--enable-libiec61883"
-libilbc=""    ; [ "${ILBC:-no}" != "no" ]         && libilbc="--enable-libilbc"
-libmodplug="" ; [ "${MODPLUG:-no}" != "no" ]      && libmodplug="--enable-libmodplug"
-libopus=""    ; [ "${OPUS:-no}" != "no" ]         && libopus="--enable-libopus"
-libtwolame="" ; [ "${TWOLAME:-no}" != "no" ]      && libtwolame="--enable-libtwolame"
-ladspa=""     ; [ "${LADSPA:-no}" != "no" ]       && ladspa="--enable-ladspa"
-libflite=""   ; [ "${FLITE:-no}" != "no" ]        && libflite="--enable-libflite"
-libvidstab="" ; [ "${VIDSTAB:-no}" != "no" ]      && libvidstab="--enable-libvidstab"
-libx265=""    ; [ "${X265:-no}" != "no" ]         && libx265="--enable-libx265"
-libzvbi=""    ; [ "${ZVBI:-no}" != "no" ]         && libzvbi="--enable-libzvbi"
-libopencv=""  ; [ "${OPENCV:-no}" != "no" ]       && libopencv="--enable-libopencv"
-libgme=""     ; [ "${GME:-no}" != "no" ]          && libgme="--enable-libgme"
-libsnappy=""  ; [ "${SNAPPY:-no}" != "no" ]       && libsnappy="--enable-libsnappy"
-libwebp=""    ; [ "${WEBP:-no}" != "no" ]         && libwebp="--enable-libwebp"
-libzmq=""     ; [ "${ZMQ:-no}" != "no" ]          && libzmq="--enable-libzmq"
-libbs2b=""    ; [ "${BS2B:-no}" != "no" ]         && libbs2b="--enable-libbs2b"
-libebur128="" ; [ "${EBUR128:-no}" != "no" ]      && libebur128="--enable-libebur128"
-rubberband="" ; [ "${RUBBERBAND:-no}" != "no" ]   && rubberband="--enable-librubberband"
-tesseract=""  ; [ "${TESSERACT:-no}" != "no" ]    && tesseract="--enable-libtesseract"
-netcdf=""     ; [ "${NETCDF:-no}" != "no" ]       && netcdf="--enable-netcdf"
-chromaprint=""  ; [ "${CHROMAPRINT:-no}" != "no" ] && chromaprint="--enable-chromaprint"
-opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ]    && \
-  opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
-fdk=""          ; [ "${FDK_AAC:-no}" != "no" ]  && \
-  { fdk="--enable-libfdk-aac"; non_free="--enable-nonfree" ; }
-ssl=""          ; [ "${OPENSSL:-no}" != "no" ]  && \
-  { ssl="--enable-openssl" ; non_free="--enable-nonfree" ; }
-decklink=""   ; [ "${DECKLINK:-no}" != "no" ]   && \
-  { decklink="--enable-decklink" ; \
-    SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink" ; }
-
-# Default enabled features:
-#opencl=""     ; [ "${OPENCL:-yes}" != "no" ]      && opencl="--enable-opencl"
-fontconfig="" ; [ "${FONTCONFIG:-yes}" != "no" ]  && fontconfig="--enable-libfontconfig"
-freetype=""   ; [ "${FREETYPE:-yes}" != "no" ]    && freetype="--enable-libfreetype"
-fribidi=""    ; [ "${FRIBIDI:-yes}" != "no" ]     && fribidi="--enable-libfribidi"
-gnutls=""     ; [ "${GNUTLS:-yes}" != "no" ]      && gnutls="--enable-gnutls"
-libcaca=""    ; [ "${CACA:-yes}" != "no" ]        && libcaca="--enable-libcaca"
-libcdio=""    ; [ "${LIBCDIO:-yes}" != "no" ]     && libcdio="--enable-libcdio"
-libssh=""     ; [ "${LIBSSH:-yes}" != "no" ]      && libssh="--enable-libssh"
-libtheora=""  ; [ "${THEORA:-yes}" != "no" ]      && libtheora="--enable-libtheora"
-libv4l2=""    ; [ "${V4L2:-yes}" != "no" ]        && libv4l2="--enable-libv4l2"
-libvorbis=""  ; [ "${VORBIS:-yes}" != "no" ]      && libvorbis="--enable-libvorbis"
-libvpx=""     ; [ "${VPX:-yes}" != "no" ]         && libvpx="--enable-libvpx"
-opengl=""     ; [ "${OPENGL:-yes}" != "no" ]      && opengl="--enable-opengl"
-openjpeg=""   ; [ "${JP2:-yes}" != "no" ]         && openjpeg="--enable-libopenjpeg"
-pulse=""      ; [ "${PULSEAUDIO:-yes}" != "no" ]  && pulse="--enable-libpulse"
-samba=""      ; [ "${SAMBA:-yes}" != "no" ]       && samba="--enable-libsmbclient"
-wavpack=""    ; [ "${WAVPACK:-yes}" != "no" ]     && wavpack="--enable-libwavpack"
-x11grab=""    ; [ "${X11GRAB:-yes}" != "no" ]     && x11grab="--enable-x11grab"
-
-# Disable patent encumbered features:
-aac=""        ; [ "${AAC:-yes}" != "yes" ]           && aac="--disable-encoder=aac"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Patch for openjpeg-2.3.0
-patch -p1 < $CWD/ffmpeg-3.2.4-openjpeg2.3.patch
-
-#patch for libfdk-aac 2.0.0
-patch -p0 < $CWD/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch
-
-# Fix linking with flite:
-sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \
-  ./configure
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --shlibdir=/usr/lib${LIBDIRSUFFIX} \
-  --docdir=/usr/doc/$PRGNAM-$VERSION/html \
-  --mandir=/usr/man \
-  --disable-debug \
-  --enable-shared \
-  --disable-static \
-  --enable-gpl \
-  --enable-version3 \
-  --enable-avresample \
-  --arch=$ARCH \
-  $non_free \
-  $aac \
-  $chromaprint \
-  $decklink \
-  $dirac_fast \
-  $fdk \
-  $fontconfig \
-  $freetype \
-  $fribidi \
-  $gnutls \
-  $ladspa \
-  $libass \
-  $libbluray \
-  $libbs2b \
-  $libcaca \
-  $libcdio \
-  $libcelt \
-  $libdc1394 \
-  $libebur128 \
-  $libflite \
-  $libfrei0r \
-  $libgme \
-  $libgsm \
-  $libiec61883 \
-  $libilbc \
-  $libmodplug \
-  $libopenal \
-  $libopencv \
-  $libopus \
-  $librtmp \
-  $libsnappy \
-  $libspeex \
-  $libssh \
-  $libtheora \
-  $libtwolame \
-  $libv4l2 \
-  $libvidstab \
-  $libvorbis \
-  $libvpx \
-  $libwebp \
-  $libx264 \
-  $libx265 \
-  $libxvid \
-  $libzmq \
-  $libzvbi \
-  $mp3lame \
-  $netcdf \
-  $opencore_amr \
-  $opengl \
-  $openjpeg \
-  $pulse \
-  $rubberband \
-  $samba \
-  $ssl \
-  $tesseract \
-  $wavpack \
-  $x11grab
-
-make
-make install DESTDIR=$PKG
-make install-man DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
-  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/txt
-cp -a Changelog COPYING* CREDITS INSTALL* LICENSE* MAINTAINERS README* \
-  RELEASE VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION/txt/
-find . -name "RELEASE_NOTES" -exec cp -a {} $PKG/usr/doc/$PRGNAM-$VERSION/ \;
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info
deleted file mode 100644
index f187f17aa0..0000000000
--- a/multimedia/ffmpeg/ffmpeg.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ffmpeg"
-VERSION="3.2.4"
-HOMEPAGE="http://www.ffmpeg.org"
-DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-3.2.4.tar.xz"
-MD5SUM="39fd71024ac76ba35f04397021af5606"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="%README%"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/multimedia/ffmpeg/slack-desc b/multimedia/ffmpeg/slack-desc
deleted file mode 100644
index 6d47b332b4..0000000000
--- a/multimedia/ffmpeg/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-ffmpeg: ffmpeg (Software to record, convert and stream audio and video)
-ffmpeg:
-ffmpeg: FFmpeg is a complete solution to record, convert and stream audio
-ffmpeg: and video. It includes libavcodec, the leading audio/video codec
-ffmpeg: library. FFmpeg is developed under Linux, but it can compiled
-ffmpeg: under most operating systems, including Windows.
-ffmpeg:
-ffmpeg: Homepage: http://ffmpeg.mplayerhq.hu
-ffmpeg:
-ffmpeg:
-ffmpeg:
diff --git a/multimedia/ffmpeg4/README b/multimedia/ffmpeg4/README
deleted file mode 100644
index 9d9c5e4ed1..0000000000
--- a/multimedia/ffmpeg4/README
+++ /dev/null
@@ -1,85 +0,0 @@
-ffmpeg4 (Software to record, convert and stream audio and video).
-
-ffmpeg4 should be installable alongside ffmpeg 3.x without conflict.
-
-FFmpeg is a complete solution to record, convert and stream audio
-and video. It includes libavcodec, the leading audio/video codec
-library.
-
-By default it will not build the ffmpeg binaries or man-pages, in order
-not to conflict with an ffmpeg 3.x package. You can change this by
-using the following environment variable setting:
-
-  BINS=yes
-
-It can optionally link to a number of extra libraries that are available
-on SBo by setting the relevant env vars, which all default to "no":
-
-  CHROMAPRINT=yes    # requires chromaprint
-  DECKLINK=yes       # requires decklink-sdk
-  FREI0R=yes         # requires frei0r
-  LADSPA=yes         # requires ladspa_sdk
-  LIBAOM=yes         # requires libaom
-  LIBBLURAY=yes      # requires libbluray
-  LIBBS2B=yes        # requires libbs2b
-  LIBCELT=yes        # requires celt
-  LIBDC1394=yes      # requires libdc1394
-  LIBFDK_AAC=yes     # requires libfdk-aac (non-redistributable)
-  LIBFLITE=yes       # requires flite
-  LIBGME=yes         # requires libgme
-  LIBGSM=yes         # requires gsm
-  LIBIEC61883=yes    # requires libiec61883 and libavc1394
-  LIBILBC=yes        # requires libilbc
-  LIBMODPLUG=yes     # requires libmodplug
-  LIBMP3LAME=yes     # requires lame
-  LIBOPENCORE=yes    # requires opencore-amr
-  LIBOPENCV=yes      # requires opencv
-  LIBOPUS=yes        # requires opus
-  LIBRTMP=yes        # requires rtmpdump
-  LIBRUBBERBAND=yes  # requires rubberband
-  LIBSNAPPY=yes      # requires snappy
-  LIBSPEEX=yes       # requires speex
-  LIBTESSERACT=yes   # requires tesseract
-  LIBTWOLAME=yes     # requires twolame
-  LIBVIDSTAB=yes     # requires vid.stab
-  LIBWEBP=yes        # requires libwebp
-  LIBX264=yes        # requires x264
-  LIBX265=yes        # requires x265
-  LIBXVID=yes        # requires xvidcore
-  LIBZMQ=yes         # requires zeromq
-  LIBZVBI=yes        # requires zvbi
-
-By default, ffmpeg4 is built to link with openssl. This creates a non-
-redistributable binary (just like linking with libfdk-aac does). If you
-want a redistributable binary you can change from linking with openssl
-to linking with gnutls instead by setting:
-
-  OPENSSL=no
-  GNUTLS=yes
-
-Both of these libraries are available in Slackware itself.
-
-There are a few other libraries available in Slackware that are also
-linked to by default, and you can disable them by changing the default
-of "yes" to "no" with the following settings:
-
-  LIBCACA=no
-  LIBCDIO=no
-  LIBFONTCONFIG=no
-  LIBFREETYPE=no
-  LIBFRIBIDI=no
-  LIBOPENJPEG=no
-  LIBPULSE=no
-  LIBSMBCLIENT=no
-  LIBSSH=no
-  LIBTHEORA=no
-  LIBV4L2=no
-  LIBVORBIS=no
-  LIBVPX=no
-  LIBWAVPACK=no
-  OPENGL=no
-
-To link to this version of the ffmpeg libraries, you'll need to set
-the PKG_CONFIG_PATH to "/usr/lib${LIBDIRSUFFIX}/ffmpeg4/pkgconfig"
-where ${LIBDIRSUFFIX} is either 64 or an empty string, depending on
-your architecture.
diff --git a/multimedia/ffmpeg4/ffmpeg4.SlackBuild b/multimedia/ffmpeg4/ffmpeg4.SlackBuild
deleted file mode 100644
index 565dc68ae9..0000000000
--- a/multimedia/ffmpeg4/ffmpeg4.SlackBuild
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ffmpeg4
-
-# Copyright 2018 Andreas Guldstrand
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ffmpeg4
-SRCNAM=ffmpeg
-VERSION=${VERSION:-4.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-enable() {
-  VAR="$1"; shift
-  DEF="$1"; shift
-  YES="$1"; shift
-  NO="$1"; shift
-  eval "$VAR=\${$VAR:-$DEF}"
-  eval "enable_$VAR=\"$NO\""
-  eval "[ \"\$$VAR\" = \"yes\" ] && enable_$VAR=\"$YES\""
-}
-
-# set "enable_$VAR" variables
-       # ENV VAR      DEFAULT    IF YES                  IF NO
-enable "BINS"          "no"  ""                       "--disable-programs --disable-manpages"
-enable "CHROMAPRINT"   "no"  "--enable-chromaprint"   ""
-enable "DECKLINK"      "no"  "--enable-decklink"      ""
-enable "FREI0R"        "no"  "--enable-frei0r"        ""
-enable "GNUTLS"        "no"  "--enable-gnutls"        ""
-enable "LADSPA"        "no"  "--enable-ladspa"        ""
-enable "LIBAOM"        "no"  "--enable-libaom"        ""
-enable "LIBBLURAY"     "no"  "--enable-libbluray"     ""
-enable "LIBBS2B"       "no"  "--enable-libbs2b"       ""
-enable "LIBCACA"       "yes" "--enable-libcaca"       ""
-enable "LIBCDIO"       "yes" "--enable-libcdio"       ""
-enable "LIBCELT"       "no"  "--enable-libcelt"       ""
-enable "LIBDC1394"     "no"  "--enable-libdc1394"     ""
-enable "LIBFDK_AAC"    "no"  "--enable-nonfree --enable-libfdk_aac" ""
-enable "LIBFLITE"      "no"  "--enable-libflite"      ""
-enable "LIBFONTCONFIG" "yes" "--enable-libfontconfig" ""
-enable "LIBFREETYPE"   "yes" "--enable-libfreetype"   ""
-enable "LIBFRIBIDI"    "yes" "--enable-libfribidi"    ""
-enable "LIBGME"        "no"  "--enable-libgme"        ""
-enable "LIBGSM"        "no"  "--enable-libgsm"        ""
-enable "LIBIEC61883"   "no"  "--enable-libiec61883"   ""
-enable "LIBILBC"       "no"  "--enable-libilbc"       ""
-enable "LIBMODPLUG"    "no"  "--enable-libmodplug"    ""
-enable "LIBMP3LAME"    "no"  "--enable-libmp3lame"    ""
-enable "LIBOPENCORE"   "no"  "--enable-libopencore-amrnb --enable-libopencore-amrwb" ""
-enable "LIBOPENCV"     "no"  "--enable-libopencv"     ""
-enable "LIBOPENJPEG"   "yes" "--enable-libopenjpeg"   ""
-enable "LIBOPUS"       "no"  "--enable-libopus"       ""
-enable "LIBPULSE"      "yes" "--enable-libpulse"      ""
-enable "LIBRTMP"       "no"  "--enable-librtmp"       ""
-enable "LIBRUBBERBAND" "no"  "--enable-librubberband" ""
-enable "LIBSMBCLIENT"  "yes" "--enable-libsmbclient"  ""
-enable "LIBSNAPPY"     "no"  "--enable-libsnappy"     ""
-enable "LIBSPEEX"      "no"  "--enable-libspeex"      ""
-enable "LIBSSH"        "yes" "--enable-libssh"        ""
-enable "LIBTESSERACT"  "no"  "--enable-libtesseract"  ""
-enable "LIBTHEORA"     "yes" "--enable-libtheora"     ""
-enable "LIBTWOLAME"    "no"  "--enable-libtwolame"    ""
-enable "LIBV4L2"       "yes" "--enable-libv4l2"       ""
-enable "LIBVIDSTAB"    "no"  "--enable-libvidstab"    ""
-enable "LIBVORBIS"     "yes" "--enable-libvorbis"     ""
-enable "LIBVPX"        "yes" "--enable-libvpx"        ""
-enable "LIBWAVPACK"    "yes" "--enable-libwavpack"    ""
-enable "LIBWEBP"       "no"  "--enable-libwebp"       ""
-enable "LIBX264"       "no"  "--enable-libx264"       ""
-enable "LIBX265"       "no"  "--enable-libx265"       ""
-enable "LIBXVID"       "no"  "--enable-libxvid"       ""
-enable "LIBZMQ"        "no"  "--enable-libzmq"        ""
-enable "LIBZVBI"       "no"  "--enable-libzvbi"       ""
-enable "OPENAL"        "no"  "--enable-openal"        ""
-enable "OPENGL"        "yes" "--enable-opengl"        ""
-enable "OPENSSL"       "yes" "--enable-nonfree --enable-openssl" ""
-
-[ "$DECKLINK" = "yes" ] && SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink"
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX}/ffmpeg4 \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION/html \
-  --incdir=/usr/include/ffmpeg4 \
-  --datadir=/usr/share/ffmpeg4 \
-  --enable-rpath \
-  --disable-podpages \
-  --disable-txtpages \
-  --arch=$ARCH \
-  --enable-gpl \
-  --enable-version3 \
-  --enable-shared \
-  --disable-static \
-  --disable-debug \
-  --enable-libass \
-  $enable_BINS \
-  $enable_CHROMAPRINT \
-  $enable_DECKLINK \
-  $enable_FREI0R \
-  $enable_GNUTLS \
-  $enable_LADSPA \
-  $enable_LIBAOM \
-  $enable_LIBBLURAY \
-  $enable_LIBBS2B \
-  $enable_LIBCACA \
-  $enable_LIBCDIO \
-  $enable_LIBCELT \
-  $enable_LIBDC1394 \
-  $enable_LIBFDK_AAC \
-  $enable_LIBFLITE \
-  $enable_LIBFONTCONFIG \
-  $enable_LIBFREETYPE \
-  $enable_LIBFRIBIDI \
-  $enable_LIBGME \
-  $enable_LIBGSM \
-  $enable_LIBIEC61883 \
-  $enable_LIBILBC \
-  $enable_LIBMODPLUG \
-  $enable_LIBMP3LAME \
-  $enable_LIBOPENCORE \
-  $enable_LIBOPENCV \
-  $enable_LIBOPENJPEG \
-  $enable_LIBOPUS \
-  $enable_LIBPULSE \
-  $enable_LIBRTMP \
-  $enable_LIBRUBBERBAND \
-  $enable_LIBSMBCLIENT \
-  $enable_LIBSNAPPY \
-  $enable_LIBSPEEX \
-  $enable_LIBSSH \
-  $enable_LIBTESSERACT \
-  $enable_LIBTHEORA \
-  $enable_LIBTWOLAME \
-  $enable_LIBV4L2 \
-  $enable_LIBVIDSTAB \
-  $enable_LIBVORBIS \
-  $enable_LIBVPX \
-  $enable_LIBWAVPACK \
-  $enable_LIBWEBP \
-  $enable_LIBX264 \
-  $enable_LIBX265 \
-  $enable_LIBXVID \
-  $enable_LIBZMQ \
-  $enable_LIBZVBI \
-  $enable_OPENAL \
-  $enable_OPENGL \
-  $enable_OPENSSL
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-if [ "$BINS" = "yes" ]; then
-  find $PKG/usr/man -type f -exec gzip -9 {} \;
-  for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  Changelog CONTRIBUTING.md COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3 \
-  CREDITS INSTALL.md LICENSE.md MAINTAINERS README.md RELEASE RELEASE_NOTES VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/ffmpeg4/ffmpeg4.info b/multimedia/ffmpeg4/ffmpeg4.info
deleted file mode 100644
index 50c38934da..0000000000
--- a/multimedia/ffmpeg4/ffmpeg4.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ffmpeg4"
-VERSION="4.1"
-HOMEPAGE="https://ffmpeg.org/"
-DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.1.tar.bz2"
-MD5SUM="8107e8f22a33b27a5e34b38e628eecc6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libass"
-MAINTAINER="Andreas Guldstrand"
-EMAIL="andreas.guldstrand@gmail.com"
diff --git a/multimedia/ffmpeg4/slack-desc b/multimedia/ffmpeg4/slack-desc
deleted file mode 100644
index 838032d34c..0000000000
--- a/multimedia/ffmpeg4/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-ffmpeg4: ffmpeg4 (Software to record, convert and stream audio and video)
-ffmpeg4:
-ffmpeg4: ffmpeg4 should be installable alongside ffmpeg 3.x without conflict.
-ffmpeg4:
-ffmpeg4: FFmpeg is a complete solution to record, convert and stream audio and
-ffmpeg4: video. It includes libavcodec, the leading audio/video codec library.
-ffmpeg4:
-ffmpeg4: Homepage: https://ffmpeg.org/
-ffmpeg4:
-ffmpeg4:
-ffmpeg4:
diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild
index 99a4c07c84..af273fa898 100644
--- a/multimedia/gnash/gnash.SlackBuild
+++ b/multimedia/gnash/gnash.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnash
-VERSION=${VERSION:-0.8.10}
-BUILD=${BUILD:-7}
+VERSION=${VERSION:-20170308_8a11e60}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -78,33 +78,17 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go-w,a+rX-st .
-
-# Fix compilation with GCC 4.7.
-patch -p1 < $CWD/patch/gcc47.patch
-
-# Fix a boost linking error, paths for kde plugin, and a cve patch.
-# Ripped from gentoo
-patch -p1 < $CWD/patch/gnash-0.8.10-boost-1.50.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-klash.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-kde4-libdir.patch
-patch -p1 < $CWD/patch/gnash-0.8.10-cve-2012-1175.patch
-
-# Fix building with giflib-5.0
-# Also ripped from gentoo :-)
-patch -p1 < $CWD/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
-patch -p1 < $CWD/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
-
-# Fix build with new Boost
-# Taken from ARCH
-patch -p1 < $CWD/patch/gnash-boost.patch
-
-# The FFmpeg engine doesn't compile with FFmpeg 0.11.1.  Patches welcome.
-# In the meantime, set --enable-media=gst to avoid autodetecting FFmpeg.
-autoreconf -vif
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -115,14 +99,14 @@ autoreconf -vif
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
   --disable-dependency-tracking \
-  --enable-media=gst \
   --enable-python \
   --enable-ssh \
   --enable-ssl \
   --enable-write \
   --without-gconf \
   --with-plugins-install=system \
-  --with-speexdsp-incl=/usr/include/speex \
+  --with-speexdsp-incl=/usr/include \
+  --disable-npapi \
   $KLASH_OPT \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/gnash/gnash.info b/multimedia/gnash/gnash.info
index 012dd88c5f..a9525da636 100644
--- a/multimedia/gnash/gnash.info
+++ b/multimedia/gnash/gnash.info
@@ -1,10 +1,10 @@
 PRGNAM="gnash"
-VERSION="0.8.10"
+VERSION="20170308_8a11e60"
 HOMEPAGE="https://www.gnu.org/software/gnash/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
-MD5SUM="63e9f79c41d93d48c5a2fa94856548c4"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/gnash-20170308_8a11e60.tar.xz"
+MD5SUM="be7f2af072481869395d9f7f8c57cce1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="agg xulrunner"
+REQUIRES="agg"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
diff --git a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch b/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
deleted file mode 100644
index b3242ce0d3..0000000000
--- a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 58dcdd9338d965e54c8f03ce3d2757388d82b7a3 Mon Sep 17 00:00:00 2001
-From: gustavo <gbuschle@hotmail.com>
-Date: Thu, 11 Sep 2014 14:12:17 +0000
-Subject: Add support for giflib 5.1
-
----
-diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
-index 84b09ce..2ae5ddb 100644
---- a/libbase/GnashImageGif.cpp
-+++ b/libbase/GnashImageGif.cpp
-@@ -120,7 +120,11 @@ GifInput::GifInput(std::shared_ptr<IOChannel> in)
- GifInput::~GifInput()
- {
-     // Clean up allocated data.
--    DGifCloseFile(_gif);
-+#if GIFLIB_MAJOR==5 && GIFLIB_MINOR==1
-+	DGifCloseFile(_gif, 0);
-+#else
-+	DGifCloseFile(_gif);
-+#endif
- }
- 
- size_t
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch b/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
deleted file mode 100644
index 6e90737d51..0000000000
--- a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cc22f2d0597f3a9547980f4786d918f8b5635472 Mon Sep 17 00:00:00 2001
-From: OBATA Akio <obata@lins.jp>
-Date: Mon, 15 Jul 2013 07:16:39 +0000
-Subject: Add support fir GIFLIB-5.0 (bug #39482)
-
-Signed-off-by: Sandro Santilli <strk@keybit.net>
----
-diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
-index eeba4b7..26865c1 100644
---- a/libbase/GnashImageGif.cpp
-+++ b/libbase/GnashImageGif.cpp
-@@ -269,7 +269,17 @@ GifInput::processRecord(GifRecordType record)
- void
- GifInput::read()
- {
-+#if GIFLIB_MAJOR >= 5
-+    int errorCode;
-+    _gif = DGifOpen(_inStream.get(), &readData, &errorCode); 
-+#else
-     _gif = DGifOpen(_inStream.get(), &readData); 
-+#endif
-+
-+    if ( ! _gif ) {
-+        // TODO: decode errorCode if available
-+        throw ParserException("Could not open input GIF stream");
-+    }
- 
-     GifRecordType record;
- 
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/gcc47.patch b/multimedia/gnash/patch/gcc47.patch
deleted file mode 100644
index 7886b097c9..0000000000
--- a/multimedia/gnash/patch/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/plugin/klash4/klash_part.cpp b/plugin/klash4/klash_part.cpp
---- a/plugin/klash4/klash_part.cpp
-+++ b/plugin/klash4/klash_part.cpp
-@@ -27,6 +27,7 @@
- #include <QByteArray>
- #include <QMenu>
- #include <QTimer>
-+#include <unistd.h>
- 
- #include <klibloader.h>
- #include <kdebug.h>
diff --git a/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch b/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch
deleted file mode 100644
index 23282d1e89..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/macros/boost.m4 b/macros/boost.m4
---- a/macros/boost.m4	2012-09-03 17:11:43.000000000 +0200
-+++ b/macros/boost.m4	2012-10-16 01:58:28.000000000 +0200
-@@ -37,7 +37,7 @@
-   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
-   dnl this is a list of *required* libraries. If any of these are missing, this
-   dnl test will return a failure, and Gnash won't build.
--  boost_libs="thread program_options iostreams"
-+  boost_libs="thread program_options iostreams system"
-
-   dnl this is a list of *recommended* libraries. If any of these are missing, this
-   dnl test will return a warning, and Gnash will build, but testing won't work.
-diff -ur a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am
---- a/plugin/npapi/Makefile.am	2012-09-03 17:11:43.000000000 +0200
-+++ b/plugin/npapi/Makefile.am	2012-10-16 01:58:57.000000000 +0200
-@@ -78,7 +78,7 @@
-
- libgnashplugin_la_LIBADD   = \
-	$(GLIB_LIBS) \
--	-lboost_iostreams \
-+	$(BOOST_LIBS) \
-	$(NULL)
- 
- # Scriptable plugin support
diff --git a/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch b/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch
deleted file mode 100644
index 9a218d9216..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527 Mon Sep 17 00:00:00 2001
-From: Benjamin Wolsey <bwy@benjaminwolsey.de>
-Date: Sat, 10 Mar 2012 14:52:50 +0000
-Subject: Fix crash in GnashImage.cpp
-
----
-diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
-index 11c6956..03a6939 100644
---- a/libbase/GnashImage.cpp
-+++ b/libbase/GnashImage.cpp
-@@ -26,6 +26,7 @@
- #include <boost/scoped_array.hpp>
- #include <boost/shared_ptr.hpp>
- #include <algorithm>
-+#include <cassert>
- 
- #ifdef USE_PNG
- # include "GnashImagePng.h"
-@@ -44,6 +45,21 @@ namespace image {
- 
- namespace {
-     void processAlpha(GnashImage::iterator imageData, size_t pixels);
-+    bool checkValidSize(size_t width, size_t height, size_t channels) {
-+
-+        if (width == 0 || height == 0) return false;
-+
-+        assert(channels > 0);
-+
-+        boost::uint32_t maxSize = std::numeric_limits<boost::int32_t>::max();
-+        if (width >= maxSize || height >= maxSize) return false;
-+
-+        maxSize /= channels;
-+        maxSize /= width;
-+        maxSize /= height;
-+
-+        return maxSize > 0;
-+    }
- }
- 
- GnashImage::GnashImage(iterator data, size_t width, size_t height,
-@@ -55,6 +71,8 @@ GnashImage::GnashImage(iterator data, size_t width, size_t height,
-     _height(height),
-     _data(data)
- {
-+    // Callers should check dimensions
-+    assert(checkValidSize(_width, _height, channels()));
- }
- 
- /// Create an image allocating a buffer of height*pitch bytes
-@@ -66,8 +84,9 @@ GnashImage::GnashImage(size_t width, size_t height, ImageType type,
-     _width(width),
-     _height(height)
- {
--    const size_t max = std::numeric_limits<boost::int32_t>::max();
--    if (size() > max) {
-+    // Constructed from external input, so restrict dimensions to avoid
-+    // overflow in size calculations
-+    if (!checkValidSize(_width, _height, channels())) {
-         throw std::bad_alloc();
-     }
-     _data.reset(new value_type[size()]);
---
-cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch b/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch
deleted file mode 100644
index b3279441d2..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4	2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4	2011-11-25 18:09:25.000000000 +0100
-@@ -198,7 +198,7 @@
-       if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then
-         KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
-       else
--        KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
-+        KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4"
-       fi
-     fi
-     if test x"${with_kde4_servicesdir}" != x ; then 
diff --git a/multimedia/gnash/patch/gnash-0.8.10-klash.patch b/multimedia/gnash/patch/gnash-0.8.10-klash.patch
deleted file mode 100644
index e6afec04d2..0000000000
--- a/multimedia/gnash/patch/gnash-0.8.10-klash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/macros/kde4.m4 b/macros/kde4.m4
---- a/macros/kde4.m4	2011-02-26 19:11:08.000000000 +0100
-+++ b/macros/kde4.m4	2011-03-21 00:04:38.845997945 +0100
-@@ -210,7 +210,7 @@
-       KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
-     fi
-     if test x"${KDE4_APPSDATADIR}" = x ; then 
--      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
-+      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
-     fi
- 
-   if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/multimedia/gnash/patch/gnash-boost.patch b/multimedia/gnash/patch/gnash-boost.patch
deleted file mode 100644
index 55208f1ae3..0000000000
--- a/multimedia/gnash/patch/gnash-boost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnash-0.8.10/libbase/accumulator.h.orig	2016-02-08 02:56:17.059694787 +0700
-+++ gnash-0.8.10/libbase/accumulator.h	2016-02-08 02:57:58.375615249 +0700
-@@ -61,6 +61,11 @@
-     virtual unsigned min_tokens() const { return 0; }
-     virtual unsigned max_tokens() const { return 0; }
- 
-+    #if BOOST_VERSION >= 105900
-+    /// There are no tokens, so this is indifferent.
-+    virtual bool adjacent_tokens_only() const { return false; }
-+    #endif
-+
-     /// Accumulating from different sources is silly.
-     virtual bool is_composing() const { return false; }
- 
diff --git a/multimedia/gpac/gpac-ffmpeg-4.0.patch b/multimedia/gpac/gpac-ffmpeg-4.0.patch
new file mode 100644
index 0000000000..05132e19e8
--- /dev/null
+++ b/multimedia/gpac/gpac-ffmpeg-4.0.patch
@@ -0,0 +1,42 @@
+diff -rupN gpac-0.7.1.orig/applications/dashcast/video_encoder.c gpac-0.7.1/applications/dashcast/video_encoder.c
+--- gpac-0.7.1.orig/applications/dashcast/video_encoder.c	2018-04-26 09:19:52.938118328 +0200
++++ gpac-0.7.1/applications/dashcast/video_encoder.c	2018-04-26 09:20:03.165170164 +0200
+@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
+ 	}
+ 
+ 	//the global header gives access to the extradata (SPS/PPS)
+-	video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++	video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+ 	video_output_file->vstream_idx = 0;//video_stream->index;
+ 
+diff -rupN gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
+--- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c	2018-04-26 09:19:53.034788555 +0200
++++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c	2018-04-26 09:30:09.739463486 +0200
+@@ -49,7 +49,7 @@
+ static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
+ 	uint8_t * buffer;
+ 	/* Size of buffer must be larger, see avcodec_decode_video2 documentation */
+-	u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
++	u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
+ 	if (oldBuffer)
+ 		gf_free(oldBuffer);
+ 	buffer = (uint8_t*)gf_malloc( allocatedSz );
+@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+ 		capability->cap.valueInt = 1;
+ 		return GF_OK;
+ 	case GF_CODEC_PADDING_BYTES:
+-		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+ 		return GF_OK;
+ 	case GF_CODEC_REORDER:
+ 		capability->cap.valueInt = 1;
+@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+ 		break;
+ 
+ 	case GF_CODEC_PADDING_BYTES:
+-		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+ 		break;
+ 	default:
+ 		capability->cap.valueInt = 0;
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index 396ceae938..c7cd430d33 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -88,6 +88,12 @@ find -L . \
 # configure doesn't have --libdir option.
 sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure
 
+# remove this to let it build against openssl-1.1.x
+sed -i "/SSLeay_add_all_algorithms/d" src/utils/downloader.c
+
+# patch for ffmpeg-4.x
+patch -p1 < $CWD/gpac-ffmpeg-4.0.patch
+
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
diff --git a/multimedia/gst-libav/README b/multimedia/gst-libav/README
deleted file mode 100644
index eca4522c85..0000000000
--- a/multimedia/gst-libav/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This module contains a GStreamer plugin for libav, as well as an
-internal copy of the libav source code.
diff --git a/multimedia/gst-libav/gst-libav.SlackBuild b/multimedia/gst-libav/gst-libav.SlackBuild
deleted file mode 100644
index ed629a2f96..0000000000
--- a/multimedia/gst-libav/gst-libav.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for gst-libav
-
-# Copyright (C) 2010  Juan Valencia <jvalenciae@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=gst-libav
-VERSION=${VERSION:-1.6.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-    case "$( uname -m )" in
-        i?86) ARCH=i486 ;;
-        arm*) ARCH=arm ;;
-        *) ARCH=$( uname -m ) ;;
-    esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/gst-libav/gst-libav.info b/multimedia/gst-libav/gst-libav.info
deleted file mode 100644
index ab38270126..0000000000
--- a/multimedia/gst-libav/gst-libav.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="gst-libav"
-VERSION="1.6.2"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.6.2.tar.xz"
-MD5SUM="09644a38827d233f53edeac815dd0ec0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/multimedia/gst-libav/slack-desc b/multimedia/gst-libav/slack-desc
deleted file mode 100644
index 352ee23dbd..0000000000
--- a/multimedia/gst-libav/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-         |-----handy-ruler------------------------------------------------------|
-gst-libav: gst-libav (A GStreamer libav/ffmpeg plugin)
-gst-libav:
-gst-libav: This module contains a GStreamer plugin for libav as well as an
-gst-libav: internal copy of the libav source code.
-gst-libav:
-gst-libav: http://gstreamer.freedesktop.org/
-gst-libav:
-gst-libav:
-gst-libav:
-gst-libav:
-gst-libav:
diff --git a/multimedia/gst-plugins-bad/README b/multimedia/gst-plugins-bad/README
index d71085b6fc..195c4b4f60 100644
--- a/multimedia/gst-plugins-bad/README
+++ b/multimedia/gst-plugins-bad/README
@@ -5,6 +5,10 @@ a real live maintainer, or some actual wide use.
 
 This optionally depends on OpenAL, TiMidity++, amrnb, amrwb, celt, faac,
 faad2, flite, fluidsynth, gsm, libass, libcdaudio, libdc1394, libdca,
-libkate, liblrdf, libmimic, libmodplug, libmusicbrainz, libofa,
-libquicktime, libwebp, lv2, musepack-tools, opencv, rtmpdump,
-schroedinger, soundtouch, swfdec, and xvidcore.
+libfdk-aac, libkate, liblrdf, libmimic, libmodplug, libmusicbrainz,
+libofa, libquicktime, libwebp, lv2, musepack-tools, opencv, rtmpdump,
+schroedinger, soundtouch, swfdec, nvidia*driver, and xvidcore.
+
+Note that if you have any version of the nvidia drivers installed the
+script will autodetect cwthemit and will try to build its nvdec support,
+requiring the presence on the system of cudatoolkit too.
diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
index c9cfb68a14..25e9f35d7b 100644
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gst-plugins-bad
-VERSION=${VERSION:-1.6.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.16.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,8 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+autoreconf -fiv
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++11" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -78,6 +79,7 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-examples \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.info b/multimedia/gst-plugins-bad/gst-plugins-bad.info
index 553c0edef7..5ba8fd8067 100644
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.info
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-plugins-bad"
-VERSION="1.6.2"
+VERSION="1.16.0"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.2.tar.xz"
-MD5SUM="7c73bec1d389f0e184ebbbbb9e9f883d"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.0.tar.xz"
+MD5SUM="e9e562d86c1527c44d904500dd35e326"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
index a4e113d47c..5c01fe1470 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gst-plugins-ugly
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
index 1fc6a4908f..8b2ef15629 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-plugins-ugly"
-VERSION="1.6.2"
+VERSION="1.16.0"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.2.tar.xz"
-MD5SUM="0f0e30336e3155443cd5bfec5c215d56"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.0.tar.xz"
+MD5SUM="1ec343c58d4b17d682f7befa8453c11c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild b/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild
index bf58d16c6d..eb15077724 100644
--- a/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild
+++ b/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild
@@ -71,6 +71,8 @@ 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 {} \;
 
+patch -p1 < $CWD/orc-0.4.30.patch
+
 # Fix for gcc-4.7.x
 sed -i -e 's/"g"/"rm"/' gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
 
diff --git a/multimedia/gst0-ffmpeg/orc-0.4.30.patch b/multimedia/gst0-ffmpeg/orc-0.4.30.patch
new file mode 100644
index 0000000000..8ad9796c07
--- /dev/null
+++ b/multimedia/gst0-ffmpeg/orc-0.4.30.patch
@@ -0,0 +1,26 @@
+https://anonhg.netbsd.org/pkgsrc/rev/b7ba46cae228
+
+diff -Naur gst-ffmpeg-0.10.13.orig/ext/libpostproc/gstpostproc.c gst-ffmpeg-0.10.13/ext/libpostproc/gstpostproc.c
+--- gst-ffmpeg-0.10.13.orig/ext/libpostproc/gstpostproc.c	2011-07-12 16:35:27.000000000 +0200
++++ gst-ffmpeg-0.10.13/ext/libpostproc/gstpostproc.c	2019-11-17 20:04:03.283000000 +0100
+@@ -299,7 +299,7 @@
+     ppflags = (mmx_flags & ORC_TARGET_MMX_MMX ? PP_CPU_CAPS_MMX : 0)
+         | (mmx_flags & ORC_TARGET_MMX_MMXEXT ? PP_CPU_CAPS_MMX2 : 0)
+         | (mmx_flags & ORC_TARGET_MMX_3DNOW ? PP_CPU_CAPS_3DNOW : 0)
+-        | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC :
++        | (altivec_flags & ORC_TARGET_POWERPC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC :
+         0);
+ #else
+     mmx_flags = 0;
+diff -Naur gst-ffmpeg-0.10.13.orig/ext/libswscale/gstffmpegscale.c gst-ffmpeg-0.10.13/ext/libswscale/gstffmpegscale.c
+--- gst-ffmpeg-0.10.13.orig/ext/libswscale/gstffmpegscale.c	2011-11-02 14:04:05.000000000 +0100
++++ gst-ffmpeg-0.10.13/ext/libswscale/gstffmpegscale.c	2019-11-17 20:05:18.947000000 +0100
+@@ -638,7 +638,7 @@
+   swsflags = (mmx_flags & ORC_TARGET_MMX_MMX ? SWS_CPU_CAPS_MMX : 0)
+       | (mmx_flags & ORC_TARGET_MMX_MMXEXT ? SWS_CPU_CAPS_MMX2 : 0)
+       | (mmx_flags & ORC_TARGET_MMX_3DNOW ? SWS_CPU_CAPS_3DNOW : 0)
+-      | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0);
++      | (altivec_flags & ORC_TARGET_POWERPC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0);
+ #else
+   mmx_flags = 0;
+   altivec_flags = 0;
diff --git a/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild b/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild
index c06474d672..1083e93c41 100644
--- a/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild
+++ b/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild
@@ -79,6 +79,8 @@ patch -p1 < $CWD/libmodplug-include.patch
 # Fix build against libvpx 1.4.0.
 patch -p1 < $CWD/drop-vpx-compat-defines.patch
 
+CPPFLAGS="-I/usr/include/openssl-1.0" \
+LIBS="-L/usr/lib$LIBDIRSUFFIX/openssl-1.0" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
index a6c97ac873..ed7c4cc6fd 100644
--- a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
+++ b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
@@ -129,6 +129,7 @@ find -L . \
 # patches from upstream and community:
 patch -p1 < $CWD/patches/k9copy-mimetype.patch
 patch -p0 < $CWD/patches/k9copy-tempdir.patch
+patch -p1 < $CWD/patches/ffmpeg3andgcc6.patch
 
 # Needed to link with the ffmpeg static libs we just built:
 export PKG_CONFIG_PATH="${FFMPEGDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig"
diff --git a/multimedia/k9copy-reloaded/patches/ffmpeg3andgcc6.patch b/multimedia/k9copy-reloaded/patches/ffmpeg3andgcc6.patch
new file mode 100644
index 0000000000..68218a20a3
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/ffmpeg3andgcc6.patch
@@ -0,0 +1,74 @@
+--- k9copy/src/core/k9tools.cpp.orig	2016-07-04 03:37:07.537698816 +0100
++++ k9copy/src/core/k9tools.cpp	2016-07-04 03:37:15.044797764 +0100
+@@ -88,7 +88,7 @@ bool k9Tools::checkProgram(QString _prog
+     #if QT_VERSION >= 0x050000
+     bool res=QStandardPaths::findExecutable( _progName) !=NULL ;
+     #else // Qt4 Code
+-    bool res= KStandardDirs::findExe( _progName,NULL,false) !=NULL ;
++    bool res= KStandardDirs::findExe( _progName,NULL,0) !=NULL ;
+     #endif
+     if (_msg && !res)
+         k9Dialogs::error(i18n("Error starting program %1").arg(_progName),i18n("Running program"));
+--- k9copy/src/backup/k9dvdbackup.cpp.orig	2016-07-04 03:45:28.518294176 +0100
++++ k9copy/src/backup/k9dvdbackup.cpp	2016-07-04 03:48:20.856559514 +0100
+@@ -33,6 +33,7 @@
+ #include <stdarg.h>
+ #include <errno.h>
+ #include <string.h>
++#include <math.h>
+ #include <qdir.h>
+ 
+ #include <kmessagebox.h>
+@@ -907,7 +908,8 @@ k9Vobu * k9DVDBackup::remapOffset(uint32
+ 
+ 
+         if ((vobu1 !=NULL) && (vobu2!=NULL)) {
+-            *_offset = abs(vobu1->newSector - vobu2->newSector)  | maskOffset1 ;
++            *_offset = fabs(vobu1->newSector - vobu2->newSector);
++            *_offset |= maskOffset1;
+             *_offset |= maskOffset2;
+             return vobu2;
+         }
+--- k9copy/src/import/k9avidecode.cpp.orig	2016-07-04 03:53:55.963959712 +0100
++++ k9copy/src/import/k9avidecode.cpp	2016-07-04 04:09:58.766458043 +0100
+@@ -26,7 +26,6 @@ static int sws_flags = SWS_BICUBIC;
+ void av_free_packet_internal(AVPacket *pkt)
+ {
+     if (pkt) {
+-        if (pkt->destruct) pkt->destruct(pkt);
+         pkt->data = NULL; pkt->size = 0;
+     }
+ }
+@@ -238,14 +237,14 @@ bool k9AviDecode::open(const QString & _
+ 
+     int numBytes;
+ // Determine required buffer size and allocate buffer
+-    numBytes=avpicture_get_size(PIX_FMT_RGB24, m_CodecCtx->width,
++    numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, m_CodecCtx->width,
+                                 m_CodecCtx->height);
+     m_buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t));
+ 
+ // Assign appropriate parts of buffer to image planes in pFrameRGB
+ // Note that pFrameRGB is an AVFrame, but AVFrame is a superset
+ // of AVPicture
+-    avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, PIX_FMT_RGB24,
++    avpicture_fill((AVPicture *)m_FrameRGB, m_buffer, AV_PIX_FMT_RGB24,
+                    m_CodecCtx->width, m_CodecCtx->height);
+ 
+  
+@@ -317,13 +316,13 @@ void k9AviDecode::readFrame(double _seco
+                     bFound=true;
+ #ifndef HAVE_SWSCALE
+                   // Convert the image from its native format to RGB
+-                    img_convert((AVPicture *)m_FrameRGB, PIX_FMT_RGB24,
++                    img_convert((AVPicture *)m_FrameRGB, AV_PIX_FMT_RGB24,
+                                 (AVPicture*)m_Frame, m_CodecCtx->pix_fmt,
+                                 m_CodecCtx->width, m_CodecCtx->height);
+                     SaveFrame(m_FrameRGB, m_CodecCtx->width,
+                               m_CodecCtx->height);
+ #else
+-		    toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL);
++		    toRGB_convert_ctx=sws_getContext(m_CodecCtx->width, m_CodecCtx->height, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height, AV_PIX_FMT_RGB24, sws_flags,NULL,NULL,NULL);
+         		   sws_scale(toRGB_convert_ctx, m_Frame->data, m_Frame->linesize, 0, m_CodecCtx->height, m_FrameRGB->data,m_FrameRGB->linesize);
+                     // convert frame to QImage
+                     SaveFrame(m_FrameRGB, m_CodecCtx->width,
diff --git a/multimedia/kdenlive/kdenlive.SlackBuild b/multimedia/kdenlive/kdenlive.SlackBuild
index 9304f04db7..7327a58c3e 100644
--- a/multimedia/kdenlive/kdenlive.SlackBuild
+++ b/multimedia/kdenlive/kdenlive.SlackBuild
@@ -101,6 +101,9 @@ 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 {} \;
 
+# Needed for gcc >= 6.x
+sed -i "s|\ abs(| fabs(|" src/scopes/audioscopes/spectrogram.cpp
+
 mkdir build
 cd build
 cmake \
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
index 173fe0b26d..aaa926757a 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
+++ b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mkvtoolnix
-VERSION=${VERSION:-34.0.0}
+VERSION=${VERSION:-41.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.info b/multimedia/mkvtoolnix/mkvtoolnix.info
index 7dfe9e7827..4e689d6582 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.info
+++ b/multimedia/mkvtoolnix/mkvtoolnix.info
@@ -1,8 +1,8 @@
 PRGNAM="mkvtoolnix"
-VERSION="34.0.0"
+VERSION="41.0.0"
 HOMEPAGE="https://mkvtoolnix.download/"
-DOWNLOAD="https://mkvtoolnix.download/sources/mkvtoolnix-34.0.0.tar.xz"
-MD5SUM="f8cdbcd2d9f87c21309eacf5f6ff7642"
+DOWNLOAD="https://mkvtoolnix.download/sources/mkvtoolnix-41.0.0.tar.xz"
+MD5SUM="1a5815905dc89cb0fa749503f2d43198"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cmark"
diff --git a/multimedia/mlt/mlt.SlackBuild b/multimedia/mlt/mlt.SlackBuild
index f2f9273682..28b265ab9b 100644
--- a/multimedia/mlt/mlt.SlackBuild
+++ b/multimedia/mlt/mlt.SlackBuild
@@ -74,14 +74,14 @@ OUTPUT=${OUTPUT:-/tmp}
 
 # Autodetect which SWIG Languages bindings to build
 # according to what's installed on the system:
-if [ -f "$(which javac)" ]; then java="java"; else java=""; fi
+java="" # if [ -f "$(which javac)" ]; then java="java"; else java=""; fi
 if [ -f "$(which lua)" ]; then lua="lua"; else lua=""; fi
 if [ -f "$(which perl)" ]; then perl="perl"; else perl=""; fi
-if [ -f "$(which php)" ]; then php="php"; else php=""; fi
+php="" # if [ -f "$(which php)" ]; then php="php"; else php=""; fi
 if [ -f "$(which python)" ]; then python="python"; else python=""; fi
 if [ -h "$(which tclsh)" ]; then tcl="tcl"; else tcl=""; fi
 if [ -f "$(which csharp)" ]; then csharp="csharp"; else csharp=""; fi
-if [ -f "$(which ruby)" ]; then ruby="ruby"; else ruby=""; fi
+ruby="" # if [ -f "$(which ruby)" ]; then ruby="ruby"; else ruby=""; fi
 
 # Use qt5 if present, otherwise system default
 if pkg-config --exists Qt5 ; then
diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild
index f4957c9a36..82364053cd 100644
--- a/multimedia/mpv/mpv.SlackBuild
+++ b/multimedia/mpv/mpv.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpv
-VERSION=${VERSION:-0.29.1}
+VERSION=${VERSION:-0.31.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/mpv/mpv.info b/multimedia/mpv/mpv.info
index d811d661fc..f94342e6e6 100644
--- a/multimedia/mpv/mpv.info
+++ b/multimedia/mpv/mpv.info
@@ -1,12 +1,12 @@
 PRGNAM="mpv"
-VERSION="0.29.1"
+VERSION="0.31.0"
 HOMEPAGE="https://mpv.io/"
-DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.29.1/mpv-0.29.1.tar.gz \
+DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.31.0/mpv-0.31.0.tar.gz \
           https://waf.io/waf-2.0.9"
-MD5SUM="2cd070c6aed980786177b7cb5b73664b \
+MD5SUM="d383604619c77904ad190ad69876b7e4 \
         3bc28bcd4868999798a6d2675211e23f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docutils ffmpeg4 lua"
+REQUIRES="docutils ffmpeg4 libplacebo lua"
 MAINTAINER="Andreas Guldstrand"
 EMAIL="andreas.guldstrand@gmail.com"
diff --git a/multimedia/mythtv/libvpxenc.patch b/multimedia/mythtv/libvpxenc.patch
deleted file mode 100644
index e8c21288cb..0000000000
--- a/multimedia/mythtv/libvpxenc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Mon, 19 Oct 2015 22:44:11 -0700
-Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings
-
-VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
-from libvpx and the remaining values were never used here
-
-Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
-Signed-off-by: James Zern <jzern@google.com>
----
- libavcodec/libvpxenc.c |    8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
-index 5f39783..992122c 100644
---- a/libavcodec/libvpxenc.c
-+++ b/libavcodec/libvpxenc.c
-@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
- 
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
--    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
--    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
--    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
--    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
--    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
--    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
-     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
-     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
-     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
--    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
-     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
-     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
--    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
-     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
-     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
-     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
--- 
-1.7.10.4
-
-
diff --git a/multimedia/mythtv/mythtv.SlackBuild b/multimedia/mythtv/mythtv.SlackBuild
index 35b9780127..34b8f8dce5 100644
--- a/multimedia/mythtv/mythtv.SlackBuild
+++ b/multimedia/mythtv/mythtv.SlackBuild
@@ -28,7 +28,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mythtv
-VERSION=${VERSION:-0.27.6}
+VERSION=${VERSION:-29.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +65,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,9 +80,6 @@ sed -i \
   -e"s|--without-documentation|--without-documentation --libdir=/usr/lib$LIBDIRSUFFIX|" \
   configure
 
-# Thanks to ARCH Linux
-patch -d external/FFmpeg -p1 < $CWD/libvpxenc.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -103,7 +100,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-nonfree \
   --enable-opengl-video \
   --enable-libmp3lame \
-  --enable-libfaac \
   --enable-libx264 \
   --enable-libvpx \
   --enable-libxvid \
diff --git a/multimedia/mythtv/mythtv.info b/multimedia/mythtv/mythtv.info
index d364c7f70b..8e3236dbfe 100644
--- a/multimedia/mythtv/mythtv.info
+++ b/multimedia/mythtv/mythtv.info
@@ -1,10 +1,10 @@
 PRGNAM="mythtv"
-VERSION="0.27.6"
+VERSION="29.0"
 HOMEPAGE="https://www.mythtv.org/"
-DOWNLOAD="https://github.com/MythTV/mythtv/archive/v0.27.6.tar.gz"
-MD5SUM="30dce5263a03687a14ff34331ea537ad"
+DOWNLOAD="https://github.com/MythTV/mythtv/archive/v29.0/mythtv-29.0.tar.gz"
+MD5SUM="b76210627050e1adaabf8d7180f3402b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libass faac lame MySQL-python lxml urlgrabber perl-http-message libwww-perl perl-Net-UPnP perl-IO-Socket-INET6 x264 xvidcore"
+REQUIRES="libass faac lame MySQL-python lxml urlgrabber perl-http-message libwww-perl perl-Net-UPnP perl-IO-Socket-INET6 qt5 x264 xvidcore"
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
diff --git a/multimedia/oggvideotools/oggvideotools.SlackBuild b/multimedia/oggvideotools/oggvideotools.SlackBuild
index d284d00cae..7f06b2c20f 100644
--- a/multimedia/oggvideotools/oggvideotools.SlackBuild
+++ b/multimedia/oggvideotools/oggvideotools.SlackBuild
@@ -83,7 +83,7 @@ cd build
   CXXFLAGS="$SLKCFLAGS" \
   cmake .. \
     -DCMAKE_INSTALL_PREFIX:STRING="/usr" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=narrowing" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE"
   make
diff --git a/multimedia/openshot/openshot.SlackBuild b/multimedia/openshot/openshot.SlackBuild
index 5c118c1ff2..db22135d60 100644
--- a/multimedia/openshot/openshot.SlackBuild
+++ b/multimedia/openshot/openshot.SlackBuild
@@ -46,7 +46,7 @@
 
 PRGNAM=openshot
 SRCNAM=openshot-qt
-VERSION=${VERSION:-2.4.4}
+VERSION=${VERSION:-20191111_7351f50}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,7 +84,7 @@ mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xf $CWD/$SRCNAM-$VERSION.tar.?z
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/multimedia/openshot/openshot.info b/multimedia/openshot/openshot.info
index 8f0c07439f..f7c18a7cb3 100644
--- a/multimedia/openshot/openshot.info
+++ b/multimedia/openshot/openshot.info
@@ -1,8 +1,8 @@
 PRGNAM="openshot"
-VERSION="2.4.4"
+VERSION="20191111_7351f50"
 HOMEPAGE="http://www.openshotvideo.com"
-DOWNLOAD="https://github.com/OpenShot/openshot-qt/archive/v2.4.4/openshot-qt-2.4.4.tar.gz"
-MD5SUM="6addaf63691bd9bbe75a2fb854997bbe"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/openshot-qt-20191111_7351f50.tar.xz"
+MD5SUM="f32334decec013b8b3002897c5ce22e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-PyQt5 python3-pyzmq libopenshot python-chardet httplib2 jack-audio-connection-kit python3-certifi python-requests"
diff --git a/multimedia/rtmpdump/rtmpdump.SlackBuild b/multimedia/rtmpdump/rtmpdump.SlackBuild
index 7728e656d5..bb3e9064f2 100644
--- a/multimedia/rtmpdump/rtmpdump.SlackBuild
+++ b/multimedia/rtmpdump/rtmpdump.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rtmpdump
 
-# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -74,6 +74,12 @@ find -L . \
 # patch makefiles for shared library install
 patch -p1 < $CWD/librtmp-makefile.patch
 
+# use gnutls instead of openssl
+sed -i \
+  -e 's/^CRYPTO=OPENSSL/#CRYPTO=OPENSSL/' \
+  -e 's/#CRYPTO=GNUTLS/CRYPTO=GNUTLS/' \
+  Makefile librtmp/Makefile
+
 XCFLAGS="$SLKCFLAGS" \
 make \
   prefix=/usr \
diff --git a/multimedia/smpeg/smpeg.SlackBuild b/multimedia/smpeg/smpeg.SlackBuild
index 19a3a4f6c6..b2560d4b2b 100644
--- a/multimedia/smpeg/smpeg.SlackBuild
+++ b/multimedia/smpeg/smpeg.SlackBuild
@@ -69,9 +69,11 @@ 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 {} \;
 
+sed -i "s|^gtv_LDADD.*|gtv_LDADD = @GTK_LIBS@ libsmpeg.la -lX11|" Makefile.am
+
 ./autogen.sh
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=narrowing" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/multimedia/subtitleeditor/subtitleeditor.SlackBuild b/multimedia/subtitleeditor/subtitleeditor.SlackBuild
index 4d941c98c8..1d4ab89f2a 100644
--- a/multimedia/subtitleeditor/subtitleeditor.SlackBuild
+++ b/multimedia/subtitleeditor/subtitleeditor.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for subtitleeditor
 
 # Copyright (C) 2010  Georgy Shepelev <geo.shepelev@gmail.com>
+# Copyright (C) 2020  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=subtitleeditor
-VERSION=${VERSION:-0.52.1}
+VERSION=${VERSION:-20191130_4c215f4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,13 +70,8 @@ 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 {} \;
 
-# https://gna.org/bugs/?23714
-patch -p0 < $CWD/fix-23714-cxx11-v2.patch
-
-autoreconf -fi
-
 CFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
diff --git a/multimedia/subtitleeditor/subtitleeditor.info b/multimedia/subtitleeditor/subtitleeditor.info
index b553c7d07f..fc9e2d5068 100644
--- a/multimedia/subtitleeditor/subtitleeditor.info
+++ b/multimedia/subtitleeditor/subtitleeditor.info
@@ -1,8 +1,8 @@
 PRGNAM="subtitleeditor"
-VERSION="0.52.1"
-HOMEPAGE="https://launchpad.net/subtitleeditor"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/subtitleeditor-0.52.1.tar.gz"
-MD5SUM="d25a3f6966f4d6355485d3dfbcfb437a"
+VERSION="20191130_4c215f4"
+HOMEPAGE="http://kitone.github.io/subtitleeditor/"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/subtitleeditor-20191130_4c215f4.tar.xz"
+MD5SUM="3a29d641369031b32f93536f9e59fcd5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gstreamermm libxml++"
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch
new file mode 100644
index 0000000000..9ad765e1c3
--- /dev/null
+++ b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch
@@ -0,0 +1,508 @@
+Index: transcode-1.1.7/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/encode/encode_lavc.c
++++ transcode-1.1.7/encode/encode_lavc.c
+@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
+     int luma_elim_threshold;
+     int chroma_elim_threshold;
+     int quantizer_noise_shaping;
++    int inter_quant_bias;
++    int intra_quant_bias;
++    int scenechange_factor;
++    int rc_strategy;
++    float rc_initial_cplx;
++    float rc_qsquish;
++    float border_masking;
+ 
+     /* same as above for flags */
+     struct {
+@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
+     switch (vob->divxmultipass) {
+       case 1:
+         CAN_DO_MULTIPASS(multipass_flag);
+-        pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
+         pd->stats_file = fopen(vob->divxlogfile, "w");
+         if (pd->stats_file == NULL) {
+             tc_log_error(MOD_NAME, "could not create 2pass log file"
+@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
+         break;
+       case 2:
+         CAN_DO_MULTIPASS(multipass_flag);
+-        pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
+         pd->stats_file = fopen(vob->divxlogfile, "r");
+         if (pd->stats_file == NULL){
+             tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
+@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
+         break;
+       case 3:
+         /* fixed qscale :p */
+-        pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
+         pd->ff_venc_frame.quality = vob->divxbitrate;
+         break;
+     }
+@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
+     pd->confdata.rc_buffer_size  = 0;
+     pd->confdata.lmin            = 2;
+     pd->confdata.lmax            = 31;
+-    pd->confdata.me_method       = ME_EPZS;
++    pd->confdata.me_method       = 0;
+ 
+     memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
+     pd->confdata.turbo_setup = 0;
+@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.me_range                = 0;
+     pd->ff_vcontext.mb_decision             = 0;
+     pd->ff_vcontext.scenechange_threshold   = 0;
+-    pd->ff_vcontext.scenechange_factor      = 1;
++    pd->confdata.scenechange_factor         = 1;
+     pd->ff_vcontext.b_frame_strategy        = 0;
+     pd->ff_vcontext.b_sensitivity           = 40;
+     pd->ff_vcontext.brd_scale               = 0;
+     pd->ff_vcontext.bidir_refine            = 0;
+-    pd->ff_vcontext.rc_strategy             = 2;
++    pd->confdata.rc_strategy                = 2;
+     pd->ff_vcontext.b_quant_factor          = 1.25;
+     pd->ff_vcontext.i_quant_factor          = 0.8;
+     pd->ff_vcontext.b_quant_offset          = 1.25;
+@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.qblur                   = 0.5;
+     pd->ff_vcontext.qcompress               = 0.5;
+     pd->ff_vcontext.mpeg_quant              = 0;
+-    pd->ff_vcontext.rc_initial_cplx         = 0.0;
+-    pd->ff_vcontext.rc_qsquish              = 1.0;
++    pd->confdata.rc_initial_cplx            = 0.0;
++    pd->confdata.rc_qsquish              = 1.0;
+     pd->confdata.luma_elim_threshold     = 0;
+     pd->confdata.chroma_elim_threshold   = 0;
+     pd->ff_vcontext.strict_std_compliance   = 0;
+@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.temporal_cplx_masking   = 0.0;
+     pd->ff_vcontext.spatial_cplx_masking    = 0.0;
+     pd->ff_vcontext.p_masking               = 0.0;
+-    pd->ff_vcontext.border_masking          = 0.0;
++    pd->confdata.border_masking          = 0.0;
+     pd->ff_vcontext.me_pre_cmp              = 0;
+     pd->ff_vcontext.me_cmp                  = 0;
+     pd->ff_vcontext.me_sub_cmp              = 0;
+@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.pre_me                  = 1;
+     pd->ff_vcontext.me_subpel_quality       = 8;
+     pd->ff_vcontext.refs                    = 1;
+-    pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+-    pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.noise_reduction         = 0;
+     pd->confdata.quantizer_noise_shaping = 0;
+     pd->ff_vcontext.flags                   = 0;
+@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa
+  */
+ static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
+ {
++    char buf[1024];
+     /* some translation... */
+     pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
+     pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
+     pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
+     pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
+-    pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
+-    pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
+-    pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
++    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
++    av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
++    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
++    av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
+ 
+     pd->ff_vcontext.flags = 0;
+-    SET_FLAG(pd, mv0);
+     SET_FLAG(pd, qpel);
+-    SET_FLAG(pd, naq);
+     SET_FLAG(pd, ilme);
+     SET_FLAG(pd, ildct);
+     SET_FLAG(pd, aic);
+@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC
+     }
+     if (pd->interlacing.active) {
+         /* enforce interlacing */
+-        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
+-        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
+     }
+     if (pd->confdata.flags.alt) {
+         av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
+@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC
+     if (pd->confdata.flags.cbp) {
+     	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
+     }
++    if (pd->confdata.flags.mv0) {
++    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
++    }
++    if (pd->confdata.flags.naq) {
++    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
++    }
+ 
+-    char buf[1024];
+ #define set_dict_opt(val, opt) \
+     snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
+     av_dict_set(&(pd->ff_opts), opt, buf, 0)
++#define set_dict_float_opt(val, opt) \
++    snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
++    av_dict_set(&(pd->ff_opts), opt, buf, 0)
+ 
+     set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
+     set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
+     set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
++    set_dict_opt(inter_quant_bias, "pbias");
++    set_dict_opt(intra_quant_bias, "ibias");
++    set_dict_opt(me_method, "me_method");
++    set_dict_opt(scenechange_factor, "sc_factor");
++    set_dict_opt(rc_strategy, "rc_strategy");
++    set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
++    set_dict_float_opt(rc_qsquish, "qsquish");
++    set_dict_float_opt(border_masking, "border_mask");
+ }
+ 
+ #undef SET_FLAG
+@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri
+         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+-        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
++        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX },
+         { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, },
+         { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
+         { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+         { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
+-        { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
++        { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
+         { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+         { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
+         { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
+         { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
+         { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
+         { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
+-        { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
++        { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
+         { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
+         { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
+         { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
+@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri
+         { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         //  { "vrc_eq",     }, // not yet supported
+         { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
+-        { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
++        { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+         //  { "vrc_init_occupancy",   }, // not yet supported
+-        { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
++        { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+         { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+         { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
+         { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+         { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+         { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+-        { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
++        { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+         { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
+         { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
+         { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
+@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
+         { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+         { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
+         { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
+-        { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+-        { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
++        { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
++        { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+         { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+     
+-        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
++        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+-        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
++        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
+         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+-        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+-        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
+-        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
++        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
++        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
++        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
+ #else        
+-        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
++        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
+ #endif
+         { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+-        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
++        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
+ #else
+         { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #endif
+-        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
+-        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
+-        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
++        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
++        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
++        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
+     
+         //  { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet  supported
+         /* End of the config file */
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -831,14 +831,11 @@ MOD_init
+ 
+     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
+     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
+-    lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
+-    lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
+     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
+     lavc_venc_context->qcompress          = lavc_param_vqcompress;
+     lavc_venc_context->qblur              = lavc_param_vqblur;
+     lavc_venc_context->max_b_frames       = lavc_param_vmax_b_frames;
+     lavc_venc_context->b_quant_factor     = lavc_param_vb_qfactor;
+-    lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
+     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
+     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
+ 
+@@ -846,8 +843,23 @@ MOD_init
+ #define set_dict_opt(val, opt) \
+ 	snprintf(buf, sizeof(buf), "%i", val); \
+ 	av_dict_set(&lavc_venc_opts, opt, buf, 0)
++#define set_dict_float_opt(val, opt) \
++	snprintf(buf, sizeof(buf), "%f", val); \
++	av_dict_set(&lavc_venc_opts, opt, buf, 0)
+     set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
+     set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
++    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
++    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
++    set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
++    set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
++    set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
++    set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
++    set_dict_opt(lavc_param_rc_eq, "rc_eq");
++    set_dict_opt(lavc_param_vme, "me_method");
++    set_dict_opt(lavc_param_ibias, "ibias");
++    set_dict_opt(lavc_param_pbias, "pbias");
++    set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity");
++    set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
+     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     if (lavc_param_packet_size)
+@@ -856,15 +868,9 @@ MOD_init
+     lavc_venc_context->strict_std_compliance= lavc_param_strict;
+     lavc_venc_context->i_quant_factor     = lavc_param_vi_qfactor;
+     lavc_venc_context->i_quant_offset     = lavc_param_vi_qoffset;
+-    lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
+-    lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
+-    lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
+-    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
+     lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
+     lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
+     lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 1024;
+-    lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
+-    lavc_venc_context->rc_initial_cplx    = lavc_param_rc_initial_cplx;
+     lavc_venc_context->debug              = lavc_param_debug;
+     lavc_venc_context->last_predictor_count= lavc_param_last_pred;
+     lavc_venc_context->pre_me             = lavc_param_pre_me;
+@@ -872,8 +878,6 @@ MOD_init
+     lavc_venc_context->pre_dia_size       = lavc_param_pre_dia_size;
+     lavc_venc_context->me_subpel_quality  = lavc_param_me_subpel_quality;
+     lavc_venc_context->me_range           = lavc_param_me_range;
+-    lavc_venc_context->intra_quant_bias   = lavc_param_ibias;
+-    lavc_venc_context->inter_quant_bias   = lavc_param_pbias;
+     lavc_venc_context->coder_type         = lavc_param_coder;
+     lavc_venc_context->context_model      = lavc_param_context;
+     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+@@ -1079,6 +1083,8 @@ MOD_init
+     lavc_venc_context->flags |= lavc_param_mv0;
+     if(lavc_param_qp_rd)
+     	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
++    if (lavc_param_normalize_aqp)
++    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
+     lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     lavc_venc_context->flags |= lavc_param_trell;
+@@ -1087,9 +1093,7 @@ MOD_init
+ #endif
+ 
+     if (lavc_param_gray)
+-        lavc_venc_context->flags |= CODEC_FLAG_GRAY;
+-    if (lavc_param_normalize_aqp)
+-        lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
++        lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
+ 
+     switch(vob->encode_fields) {
+     case TC_ENCODE_FIELDS_TOP_FIRST:
+@@ -1107,9 +1111,9 @@ MOD_init
+     }
+ 
+     lavc_venc_context->flags |= interlacing_active ?
+-        CODEC_FLAG_INTERLACED_DCT : 0;
++        AV_CODEC_FLAG_INTERLACED_DCT : 0;
+     lavc_venc_context->flags |= interlacing_active ?
+-        CODEC_FLAG_INTERLACED_ME : 0;
++        AV_CODEC_FLAG_INTERLACED_ME : 0;
+ 
+     lavc_venc_context->flags |= lavc_param_psnr;
+     do_psnr = lavc_param_psnr;
+@@ -1156,7 +1160,7 @@ MOD_init
+                   "encoding.");
+           return TC_EXPORT_ERROR;
+         }
+-        lavc_venc_context->flags |= CODEC_FLAG_PASS1;
++        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
+         stats_file = fopen(vob->divxlogfile, "w");
+         if (stats_file == NULL){
+           tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
+@@ -1170,7 +1174,7 @@ MOD_init
+                   "encoding.");
+           return TC_EXPORT_ERROR;
+         }
+-        lavc_venc_context->flags |= CODEC_FLAG_PASS2;
++        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
+         stats_file= fopen(vob->divxlogfile, "r");
+         if (stats_file==NULL){
+           tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
+@@ -1201,12 +1205,11 @@ MOD_init
+         break;
+       case 3:
+         /* fixed qscale :p */
+-        lavc_venc_context->flags   |= CODEC_FLAG_QSCALE;
++        lavc_venc_context->flags   |= AV_CODEC_FLAG_QSCALE;
+         lavc_venc_frame->quality  = vob->divxbitrate;
+         break;
+     }
+ 
+-    lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+ 
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ 	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
+ int lavc_param_pre_me= 1;
+ int lavc_param_me_subpel_quality= 8;
+ int lavc_param_me_range=0;
+-int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
+-int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
++int lavc_param_ibias=0;
++int lavc_param_pbias=0;
+ int lavc_param_coder=0;
+ int lavc_param_context=0;
+ char *lavc_param_intra_matrix = NULL;
+@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
+     {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000},
+     {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
+-    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
++    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
+     {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
+ //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={
+     {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
+     {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
+     {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+-    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
++    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX},
+ //    {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
+     {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
+     {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
+     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+     {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
+ //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+-    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
++    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
+     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
+@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
+     {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20},
+     {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
+     {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
+-    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
++    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
+     {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+     {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+     {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
+     {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+     {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
+     {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
+-    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
++    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+-    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
++    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT},
+ #else
+     {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
+ #endif
+@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
+     {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8},
+     {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+-    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
++    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC},
+ #else
+-    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
++    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
+ #endif    
+     {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={
+     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+     {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
+-    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
++    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
+-    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
++    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME},
+     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+     {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
+-    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
+-    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED},
+-    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP},
++    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
++    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED},
++    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP},
+     {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
+     {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+     {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+Index: transcode-1.1.7/import/import_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/import_ffmpeg.c
++++ transcode-1.1.7/import/import_ffmpeg.c
+@@ -361,7 +361,7 @@ do_avi:
+     lavc_dec_context->width  = x_dim;
+     lavc_dec_context->height = y_dim;
+ 
+-    if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
++    if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+     lavc_dec_context->error_resilience  = 2;
+ #else
diff --git a/multimedia/transcode/transcode-imagemagick7.patch b/multimedia/transcode/transcode-imagemagick7.patch
new file mode 100644
index 0000000000..b9f1476646
--- /dev/null
+++ b/multimedia/transcode/transcode-imagemagick7.patch
@@ -0,0 +1,794 @@
+http://git.pld-linux.org/?p=packages/transcode.git;a=blob_plain;f=imagemagick7.patch;h=8411f89b843764eff8f4aaddb314d7773d1bcec8;hb=HEAD
+
+--- transcode-1.1.7/configure.in
++++ transcode-1.1.7/configure.in
+@@ -1105,8 +1105,8 @@
+ dnl ImageMagick
+ dnl
+ IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS $($PKG_CONFIG --libs ImageMagick)"
+-TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, no, [magick/api.h],
+- none, InitializeMagick, Wand, [http://www.imagemagick.org/])
++TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, no, [MagickWand/MagickWand.h],
++ none, InitializeMagick, MagickWand, [http://www.imagemagick.org/])
+ TC_PKG_HAVE(imagemagick, IMAGEMAGICK)
+ if test x"$have_imagemagick" = x"yes" ; then
+   SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -1114,6 +1114,7 @@
+   AC_CHECK_HEADER([wand/magick-wand.h],
+     [AC_DEFINE([HAVE_BROKEN_WAND], [1], ["have old wand header"])])
+   CPPFLAGS="$SAVE_CPPFLAGS"
++  IMAGEMAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS $($PKG_CONFIG --cflags ImageMagick)"
+ fi
+ 
+ dnl
+--- transcode-1.1.7/export/export_im.c
++++ transcode-1.1.7/export/export_im.c
+@@ -23,7 +23,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -82,7 +82,7 @@
+ 
+       codec = (vob->im_v_codec == CODEC_YUV) ? CODEC_YUV : CODEC_RGB;
+ 
+-      InitializeMagick("");
++      MagickCoreGenesis("", MagickFalse);
+ 
+       image_info=CloneImageInfo((ImageInfo *) NULL);
+ 
+@@ -169,8 +169,8 @@
+ MOD_encode
+ {
+ 
+-  ExceptionInfo exception_info;
+-  char *out_buffer = param->buffer;
++  ExceptionInfo *exception_info;
++  unsigned char *out_buffer = param->buffer;
+   Image *image=NULL;
+   int res;
+ 
+@@ -179,7 +179,7 @@
+ 
+   if(param->flag == TC_VIDEO) {
+ 
+-    GetExceptionInfo(&exception_info);
++    exception_info = AcquireExceptionInfo();
+ 
+     res = tc_snprintf(buf2, PATH_MAX, "%s%06d.%s", prefix, counter++, type);
+     if (res < 0) {
+@@ -193,11 +193,11 @@
+       out_buffer = tmp_buffer;
+     }
+ 
+-    image=ConstituteImage (width, height, "RGB", CharPixel, out_buffer, &exception_info);
++    image=ConstituteImage (width, height, "RGB", CharPixel, out_buffer, exception_info);
+ 
+     strlcpy(image->filename, buf2, MaxTextExtent);
+ 
+-    WriteImage(image_info, image);
++    WriteImage(image_info, image, exception_info);
+     DestroyImage(image);
+ 
+     return(0);
+@@ -220,8 +220,7 @@
+ 
+   if(param->flag == TC_VIDEO) {
+     DestroyImageInfo(image_info);
+-    ConstituteComponentTerminus();
+-    DestroyMagick();
++    MagickCoreTerminus();
+ 
+     free(tmp_buffer);
+     tmp_buffer = NULL;
+--- transcode-1.1.7/filter/filter_compare.c
++++ transcode-1.1.7/filter/filter_compare.c
+@@ -24,7 +24,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -111,9 +111,9 @@
+ 	Image *pattern, *resized, *orig = 0;
+ 	ImageInfo *image_info;
+ 
+-	PixelPacket *pixel_packet;
++	Quantum *pixel_quantum;
+ 	pixelsMask *pixel_last;
+-	ExceptionInfo exception_info;
++	ExceptionInfo *exception_info;
+ 
+ 	if(ptr->tag & TC_FILTER_GET_CONFIG) {
+ 		char buf[128];
+@@ -139,7 +139,7 @@
+ 	if(ptr->tag & TC_FILTER_INIT)
+ 	{
+ 
+-		unsigned int t,r,index;
++		unsigned int t,r;
+ 		pixelsMask *temp;
+ 
+ 		compare[instance] = tc_malloc(sizeof(compareData));
+@@ -190,22 +190,22 @@
+ 				tc_log_perror(MOD_NAME, "could not open file for writing");
+ 			}
+ 
+-			InitializeMagick("");
++			MagickCoreGenesis("", MagickFalse);
+ 			if (verbose > 1)
+                 tc_log_info(MOD_NAME, "Magick Initialized successfully");
+ 
+-			GetExceptionInfo(&exception_info);
++			exception_info = AcquireExceptionInfo();
+ 			image_info = CloneImageInfo ((ImageInfo *) NULL);
+ 			strlcpy(image_info->filename, pattern_name, MaxTextExtent);
+ 			if (verbose > 1)
+ 			     tc_log_info(MOD_NAME, "Trying to open image");
+ 			orig = ReadImage(image_info,
+-					 &exception_info);
++					 exception_info);
+ 
+ 			if (orig == (Image *) NULL) {
+-				MagickWarning(exception_info.severity,
+-					      exception_info.reason,
+-					      exception_info.description);
++				MagickWarning(exception_info->severity,
++					      exception_info->reason,
++					      exception_info->description);
+ 				strlcpy(pattern_name, "/dev/null", sizeof(pattern_name));
+ 			}else{
+ 			       if (verbose > 1)
+@@ -228,42 +228,41 @@
+ 		if (orig != NULL){
+                         // Flip and resize
+ 			if (compare[instance]->vob->im_v_codec == CODEC_YUV)
+-				TransformRGBImage(orig,YCbCrColorspace);
++				TransformImageColorspace(orig, YCbCrColorspace, exception_info);
+ 			if (verbose > 1) tc_log_info(MOD_NAME, "Resizing the Image");
+ 			resized = ResizeImage(orig,
+ 					      compare[instance]->width,
+ 					      compare[instance]->height,
+ 					      GaussianFilter,
+-					      1,
+-					      &exception_info);
++					      exception_info);
+ 			if (verbose > 1)
+ 				tc_log_info(MOD_NAME, "Flipping the Image");
+-			pattern = FlipImage(resized, &exception_info);
++			pattern = FlipImage(resized, exception_info);
+ 			if (pattern == (Image *) NULL) {
+-				MagickError (exception_info.severity,
+-					     exception_info.reason,
+-					     exception_info.description);
++				MagickError (exception_info->severity,
++					     exception_info->reason,
++					     exception_info->description);
+ 			}
+ 
+ 			// Filling the matrix with the pixels values not
+ 			// alpha
+ 
+ 			if (verbose > 1) tc_log_info(MOD_NAME, "GetImagePixels");
+-			pixel_packet = GetImagePixels(pattern,0,0,
++			pixel_quantum = GetAuthenticPixels(pattern,0,0,
+ 						      pattern->columns,
+-						      pattern->rows);
++						      pattern->rows,
++						      exception_info);
+ 
+ 			if (verbose > 1) tc_log_info(MOD_NAME, "Filling the Image matrix");
+ 			for (t = 0; t < pattern->rows; t++)
+ 				for (r = 0; r < pattern->columns; r++){
+-					index = t*pattern->columns + r;
+-					if (pixel_packet[index].opacity == 0){
++					if (GetPixelAlpha(pattern, pixel_quantum) == QuantumRange) {
+ 						temp=tc_malloc(sizeof(struct pixelsMask));
+ 						temp->row=t;
+ 						temp->col=r;
+-						temp->r = (uint8_t)ScaleQuantumToChar(pixel_packet[index].red);
+-						temp->g = (uint8_t)ScaleQuantumToChar(pixel_packet[index].green);
+-						temp->b = (uint8_t)ScaleQuantumToChar(pixel_packet[index].blue);
++						temp->r = (uint8_t)ScaleQuantumToChar(GetPixelRed(pattern, pixel_quantum));
++						temp->g = (uint8_t)ScaleQuantumToChar(GetPixelGreen(pattern, pixel_quantum));
++						temp->b = (uint8_t)ScaleQuantumToChar(GetPixelBlue(pattern, pixel_quantum));
+ 						temp->next=NULL;
+ 
+ 						if (pixel_last == NULL){
+@@ -274,6 +273,7 @@
+ 							pixel_last = temp;
+ 						}
+ 					}
++					pixel_quantum += GetPixelChannels(pattern);
+ 				}
+ 
+ 			if (verbose)
+@@ -297,7 +297,7 @@
+ 			fclose(compare[instance]->results);
+ 			free(compare[instance]);
+ 		}
+-		DestroyMagick();
++		MagickCoreTerminus();
+ 		compare[instance]=NULL;
+ 
+ 		return(0);
+--- transcode-1.1.7/filter/filter_logoaway.c
++++ transcode-1.1.7/filter/filter_logoaway.c
+@@ -70,7 +70,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -103,10 +103,10 @@
+ 
+   int           alpha;
+ 
+-  ExceptionInfo exception_info;
++  ExceptionInfo *exception_info;
+   Image         *image;
+   ImageInfo     *image_info;
+-  PixelPacket   *pixel_packet;
++  Quantum       *pixel_packet;
+ 
+   int           dump;
+   char          *dump_buf;
+@@ -174,7 +174,7 @@
+  *          instance    filter instance
+  * @return  void        nothing
+  *********************************************************/
+-static void work_with_rgb_frame(logoaway_data *LD, char *buffer, int width, int height)
++static void work_with_rgb_frame(logoaway_data *LD, unsigned char *buffer, int width, int height)
+ {
+   int row, col, i;
+   int xdistance, ydistance, distance_west, distance_north;
+@@ -201,10 +201,10 @@
+       }
+     }
+ 
+-    LD->dumpimage = ConstituteImage(LD->width-LD->xpos, LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, &LD->exception_info);
++    LD->dumpimage = ConstituteImage(LD->width-LD->xpos, LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, LD->exception_info);
+     tc_snprintf(LD->dumpimage->filename, MaxTextExtent, "dump[%d].png", LD->id);
+ 
+-    WriteImage(LD->dumpimage_info, LD->dumpimage);
++    WriteImage(LD->dumpimage_info, LD->dumpimage, LD->exception_info);
+   }
+ 
+   switch(LD->mode) {
+@@ -218,27 +218,28 @@
+       for(row=LD->ypos; row<LD->height; ++row) {
+         for(col=LD->xpos; col<LD->width; ++col) {
+ 
++          Quantum *pixel = LD->pixel_packet + (row*LD->width+col)*GetPixelChannels(LD->image);
+           buf_off = ((height-row)*width+col) * 3;
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
+           /* R */
+           if (!LD->alpha) {
+               buffer[buf_off +0] = LD->rcolor;
+           } else {
+-              alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++              alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+               buffer[buf_off +0] = alpha_blending(buffer[buf_off +0], LD->rcolor, alpha_px);
+           }
+           /* G */
+           if (!LD->alpha) {
+               buffer[buf_off +1] = LD->gcolor;
+           } else {
+-              alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].green);
++              alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelGreen(LD->image, pixel));
+               buffer[buf_off +1] = alpha_blending(buffer[buf_off +1], LD->gcolor, alpha_px);
+           }
+           /* B */
+           if (!LD->alpha) {
+               buffer[buf_off +2] = LD->bcolor;
+           } else {
+-              alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].blue);
++              alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelBlue(LD->image, pixel));
+               buffer[buf_off +2] = alpha_blending(buffer[buf_off +2], LD->bcolor, alpha_px);
+           }
+         }
+@@ -268,6 +269,7 @@
+           buf_off = ((height-row)*width+col) * 3;
+ 
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++          Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
+ 
+           /* R */
+           hcalc  = alpha_blending(buffer[buf_off_xpos +0], buffer[buf_off_width  +0], alpha_hori);
+@@ -276,7 +278,7 @@
+           if (!LD->alpha) {
+               buffer[buf_off +0] = new_px;
+           } else {
+-              alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++              alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+               buffer[buf_off +0] = alpha_blending(buffer[buf_off +0], new_px, alpha_px);
+           }
+           /* G */
+@@ -286,7 +288,7 @@
+           if (!LD->alpha) {
+               buffer[buf_off +1] = new_px;
+           } else {
+-              alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].green);
++              alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelGreen(LD->image, pixel));
+               buffer[buf_off +1] = alpha_blending(buffer[buf_off +1], new_px, alpha_px);
+           }
+           /* B */
+@@ -296,7 +298,7 @@
+           if (!LD->alpha) {
+               buffer[buf_off +2] = new_px;
+           } else {
+-              alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++              alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelBlue(LD->image, pixel));
+               buffer[buf_off +2] = alpha_blending(buffer[buf_off +2], new_px, alpha_px);
+           }
+         }
+@@ -327,28 +329,28 @@
+           buf_off_height = ((height-LD->height)*width+col) * 3;
+ 
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col-i>LD->xpos))
+             i++;
+           buf_off_xpos   = ((height-row)*width + col-i) * 3;
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col+i<LD->width))
+             i++;
+           buf_off_width  = ((height-row)*width + col+i) * 3;
+ 
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row-i>LD->ypos))
+             i++;
+           buf_off_ypos   = (height*width*3)-((row-i)*width - col) * 3;
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row+i<LD->height))
+             i++;
+           buf_off_height = (height*width*3)-((row+i)*width - col) * 3;
+ 
+-          alpha_px     = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px     = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+           /* R */
+           hcalc  = alpha_blending(buffer[buf_off_xpos +0], buffer[buf_off_width  +0], alpha_hori);
+           vcalc  = alpha_blending(buffer[buf_off_ypos +0], buffer[buf_off_height +0], alpha_vert);
+@@ -405,7 +407,7 @@
+  *          instance    filter instance
+  * @return  void        nothing
+  *********************************************************/
+-static void work_with_yuv_frame(logoaway_data *LD, char *buffer, int width, int height)
++static void work_with_yuv_frame(logoaway_data *LD, unsigned char *buffer, int width, int height)
+ {
+   int row, col, i;
+   int craddr, cbaddr;
+@@ -431,10 +433,11 @@
+ 
+           buf_off = row*width+col;
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++	  Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
+           if (!LD->alpha) {
+             buffer[buf_off] = LD->ycolor;
+           } else {
+-            alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++            alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+             buffer[buf_off] = alpha_blending(buffer[buf_off], LD->ycolor, alpha_px);
+           }
+         }
+@@ -446,8 +449,9 @@
+ 
+           buf_off = row*width/2+col;
+           pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos);
++	  Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
+           /* sic */
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+           if (!LD->alpha) {
+             buffer[craddr + buf_off] = LD->ucolor;
+             buffer[cbaddr + buf_off] = LD->vcolor;
+@@ -483,10 +487,11 @@
+           buf_off_height = LD->height*width+col;
+ 
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++	  Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
+ 
+           hcalc = alpha_blending(buffer[buf_off_xpos], buffer[buf_off_width],  alpha_hori);
+           vcalc = alpha_blending(buffer[buf_off_ypos], buffer[buf_off_height], alpha_vert);
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel));
+           new_px = (hcalc*LD->xweight + vcalc*LD->yweight)/100;
+           if (!LD->alpha) {
+             buffer[buf_off] = new_px;
+@@ -517,7 +522,8 @@
+           buf_off_height = LD->height/2*width/2+col;
+ 
+           pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos);
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); 
++	  Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel)); 
+           /* sic, reuse red alpha_px */
+ 
+           hcalc  = alpha_blending(buffer[craddr + buf_off_xpos], buffer[craddr + buf_off_width],  alpha_hori);
+@@ -560,30 +566,30 @@
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
+ 
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col-i>LD->xpos))
+             i++;
+           buf_off_xpos   = (row*width + col-i);
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col+i<LD->width))
+             i++;
+           buf_off_width  = (row*width + col+i);
+ 
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row-i>LD->ypos))
+             i++;
+           buf_off_ypos   = ((row-i)*width + col);
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row+i<LD->height))
+             i++;
+           buf_off_height = ((row+i)*width + col);
+ 
+           hcalc  = alpha_blending( buffer[buf_off_xpos], buffer[buf_off_width],  alpha_hori );
+           vcalc  = alpha_blending( buffer[buf_off_ypos], buffer[buf_off_height], alpha_vert );
+-          alpha_px     = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px     = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+           new_px = (hcalc*LD->xweight + vcalc*LD->yweight)/100;
+           buffer[buf_off] = alpha_blending(buffer[buf_off], new_px, alpha_px);
+         }
+@@ -603,23 +609,23 @@
+           alpha_hori = xdistance * distance_west;
+ 
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col-i>LD->xpos))
+             i++;
+           buf_off_xpos   = (row*width/2 + col-i);
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col+i<LD->width))
+             i++;
+           buf_off_width  = (row*width/2 + col+i);
+ 
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row-i>LD->ypos))
+             i++;
+           buf_off_ypos   = ((row-i)*width/2 + col);
+           i = 0;
+-          alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row+i<LD->height))
+             i++;
+           buf_off_height = ((row+i)*width/2 + col);
+@@ -630,7 +636,7 @@
+ 
+           pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos);
+ 
+-          alpha_px    = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px    = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+           /* sic: reuse the red component */
+           hcalc  = alpha_blending(buffer[craddr + buf_off_xpos], buffer[craddr + buf_off_width],  alpha_hori);
+           vcalc  = alpha_blending(buffer[craddr + buf_off_ypos], buffer[craddr + buf_off_height], alpha_vert);
+@@ -815,17 +821,17 @@
+     }
+ 
+     if((data[instance]->alpha) || (data[instance]->dump)) {
+-      InitializeMagick("");
+-      GetExceptionInfo(&data[instance]->exception_info);
++      MagickCoreGenesis("", MagickFalse);
++      data[instance]->exception_info = AcquireExceptionInfo();
+ 
+       if(data[instance]->alpha) {
+         data[instance]->image_info = CloneImageInfo((ImageInfo *) NULL);
+ 
+         strlcpy(data[instance]->image_info->filename, data[instance]->file, MaxTextExtent);
+-        data[instance]->image = ReadImage(data[instance]->image_info, &data[instance]->exception_info);
++        data[instance]->image = ReadImage(data[instance]->image_info, data[instance]->exception_info);
+         if (data[instance]->image == (Image *) NULL) {
+           tc_log_error(MOD_NAME, "\n");
+-          MagickWarning (data[instance]->exception_info.severity, data[instance]->exception_info.reason, data[instance]->exception_info.description);
++          MagickWarning (data[instance]->exception_info->severity, data[instance]->exception_info->reason, data[instance]->exception_info->description);
+           return TC_ERROR;
+         }
+ 
+@@ -835,7 +841,7 @@
+           return TC_ERROR;
+         }
+ 
+-        data[instance]->pixel_packet = GetImagePixels(data[instance]->image, 0, 0, data[instance]->image->columns, data[instance]->image->rows);
++        data[instance]->pixel_packet = GetAuthenticPixels(data[instance]->image, 0, 0, data[instance]->image->columns, data[instance]->image->rows, data[instance]->exception_info);
+       }
+       if(data[instance]->dump) {
+         if((data[instance]->dump_buf = tc_malloc ((data[instance]->width-data[instance]->xpos)*(data[instance]->height-data[instance]->ypos)*3)) == NULL)
+@@ -865,10 +871,9 @@
+     if (data[instance]->dumpimage != (Image *)NULL) {
+       DestroyImage(data[instance]->dumpimage);
+       DestroyImageInfo(data[instance]->dumpimage_info);
+-      ConstituteComponentTerminus();
+     }
+-    DestroyExceptionInfo(&data[instance]->exception_info);
+-    DestroyMagick();
++    DestroyExceptionInfo(data[instance]->exception_info);
++    MagickCoreTerminus();
+ 
+     if(data[instance]->dump_buf) free(data[instance]->dump_buf);
+     if(data[instance]) free(data[instance]);
+--- transcode-1.1.7/filter/filter_logo.c
++++ transcode-1.1.7/filter/filter_logo.c
+@@ -36,7 +36,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -227,7 +227,8 @@
+                                ImageFormat  ifmt,
+                                int          do_rgbswap)
+ {
+-    PixelPacket *pixel_packet;
++    ExceptionInfo *exception_info;
++    Quantum *pixel_packet;
+     uint8_t *dst_ptr = dst;
+ 
+     int row, col;
+@@ -246,16 +247,17 @@
+     }
+     g_off = 1;
+ 
+-    pixel_packet = GetImagePixels(src, 0, 0, width, height);
++    exception_info = AcquireExceptionInfo();
++    pixel_packet = GetAuthenticPixels(src, 0, 0, width, height, exception_info);
+ 
+     for (row = 0; row < height; row++) {
+         for (col = 0; col < width; col++) {
+-            *(dst_ptr + r_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->red);
+-            *(dst_ptr + g_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->green);
+-            *(dst_ptr + b_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->blue);
++            *(dst_ptr + r_off) = (uint8_t)ScaleQuantumToChar(GetPixelRed(src, pixel_packet));
++            *(dst_ptr + g_off) = (uint8_t)ScaleQuantumToChar(GetPixelGreen(src, pixel_packet));
++            *(dst_ptr + b_off) = (uint8_t)ScaleQuantumToChar(GetPixelBlue(src, pixel_packet));
+ 
+             dst_ptr += 3;
+-            pixel_packet++;
++            pixel_packet += GetPixelChannels(src);
+         }
+     }
+ 
+@@ -310,7 +312,7 @@
+         Image         *timg;
+         Image         *nimg;
+         ImageInfo     *image_info;
+-        ExceptionInfo  exception_info;
++        ExceptionInfo *exception_info;
+ 
+         int rgb_off = 0;
+ 
+@@ -376,19 +378,19 @@
+          * semaphore.
+          */
+         magick_usecount++;
+-        if (!IsMagickInstantiated()) {
+-            InitializeMagick("");
++        if (!IsMagickCoreInstantiated()) {
++            MagickCoreGenesis("", MagickFalse);
+         }
+ 
+-        GetExceptionInfo(&exception_info);
++        exception_info = AcquireExceptionInfo();
+         image_info = CloneImageInfo((ImageInfo *) NULL);
+         strlcpy(image_info->filename, mfd->file, MaxTextExtent);
+ 
+-        mfd->image = ReadImage(image_info, &exception_info);
++        mfd->image = ReadImage(image_info, exception_info);
+         if (mfd->image == (Image *) NULL) {
+-            MagickWarning(exception_info.severity,
+-                          exception_info.reason,
+-                          exception_info.description);
++            MagickWarning(exception_info->severity,
++                          exception_info->reason,
++                          exception_info->description);
+             strlcpy(mfd->file, "/dev/null", PATH_MAX);
+             return 0;
+         }
+@@ -413,11 +415,11 @@
+ 
+         while (mfd->images != (Image *)NULL) {
+             if (mfd->flip || flip) {
+-                timg = FlipImage(mfd->images, &exception_info);
++                timg = FlipImage(mfd->images, exception_info);
+                 if (timg == (Image *) NULL) {
+-                    MagickError(exception_info.severity,
+-                                exception_info.reason,
+-                                exception_info.description);
++                    MagickError(exception_info->severity,
++                                exception_info->reason,
++                                exception_info->description);
+                     return -1;
+                 }
+                 AppendImageToList(&nimg, timg);
+@@ -573,7 +575,7 @@
+         /* Set up image/video coefficient lookup tables */
+         if (img_coeff_lookup[0] < 0) {
+             int i;
+-            float maxrgbval = (float)MaxRGB; // from ImageMagick
++            float maxrgbval = (float)QuantumRange; // from ImageMagick
+ 
+             for (i = 0; i <= MAX_UINT8_VAL; i++) {
+                 float x = (float)ScaleCharToQuantum(i);
+@@ -615,8 +617,8 @@
+         }
+ 
+         magick_usecount--;
+-        if (magick_usecount == 0 && IsMagickInstantiated()) {
+-            DestroyMagick();
++        if (magick_usecount == 0 && IsMagickCoreInstantiated()) {
++            MagickCoreTerminus();
+         }
+ 
+         return 0;
+@@ -638,7 +640,8 @@
+         && (ptr->tag & TC_VIDEO)
+         && !(ptr->attributes & TC_FRAME_IS_SKIPPED)
+     ) {
+-        PixelPacket *pixel_packet;
++        ExceptionInfo *exception_info;
++        Quantum *pixel_packet;
+         uint8_t     *video_buf;
+ 
+         int   do_fade    = 0;
+@@ -647,6 +650,7 @@
+ 
+         /* Note: ImageMagick defines opacity = 0 as fully visible, and
+          * opacity = MaxRGB as fully transparent.
++         * alpha rather than opacity (0 transparent; QuantumRange opaque).
+          */
+         Quantum opacity;
+ 
+@@ -682,9 +686,11 @@
+             mfd->cur_delay = mfd->images->delay * vob->fps/100;
+         }
+ 
+-        pixel_packet = GetImagePixels(mfd->images, 0, 0,
++        exception_info = AcquireExceptionInfo();
++        pixel_packet = GetAuthenticPixels(mfd->images, 0, 0,
+                                       mfd->images->columns,
+-                                      mfd->images->rows);
++                                      mfd->images->rows,
++                                      exception_info);
+ 
+         if (vob->im_v_codec == CODEC_RGB) {
+             unsigned long r_off, g_off, b_off;
+@@ -702,30 +708,30 @@
+                 video_buf = ptr->video_buf + 3 * ((row + mfd->posy) * vob->ex_v_width + mfd->posx);
+ 
+                 for (col = 0; col < mfd->image->columns; col++) {
+-                    opacity = pixel_packet->opacity;
++                    opacity = QuantumRange - GetPixelAlpha(mfd->images, pixel_packet);
+ 
+                     if (do_fade)
+-                        opacity += (Quantum)((MaxRGB - opacity) * fade_coeff);
++                        opacity += (Quantum)((QuantumRange - opacity) * fade_coeff);
+ 
+                     if (opacity == 0) {
+-                        *(video_buf + r_off) = ScaleQuantumToChar(pixel_packet->red);
+-                        *(video_buf + g_off) = ScaleQuantumToChar(pixel_packet->green);
+-                        *(video_buf + b_off) = ScaleQuantumToChar(pixel_packet->blue);
+-                    } else if (opacity < MaxRGB) {
++                        *(video_buf + r_off) = ScaleQuantumToChar(GetPixelRed(mfd->images, pixel_packet));
++                        *(video_buf + g_off) = ScaleQuantumToChar(GetPixelGreen(mfd->images, pixel_packet));
++                        *(video_buf + b_off) = ScaleQuantumToChar(GetPixelBlue(mfd->images, pixel_packet));
++                    } else if (opacity < QuantumRange) {
+                         unsigned char opacity_uchar = ScaleQuantumToChar(opacity);
+                         img_coeff = img_coeff_lookup[opacity_uchar];
+                         vid_coeff = vid_coeff_lookup[opacity_uchar];
+ 
+                         *(video_buf + r_off) = (uint8_t)((*(video_buf + r_off)) * vid_coeff)
+-                                                + (uint8_t)(ScaleQuantumToChar(pixel_packet->red)   * img_coeff);
++                                                + (uint8_t)(ScaleQuantumToChar(GetPixelRed(mfd->images, pixel_packet))   * img_coeff);
+                         *(video_buf + g_off) = (uint8_t)((*(video_buf + g_off)) * vid_coeff)
+-                                                + (uint8_t)(ScaleQuantumToChar(pixel_packet->green) * img_coeff);
++                                                + (uint8_t)(ScaleQuantumToChar(GetPixelGreen(mfd->images, pixel_packet)) * img_coeff);
+                         *(video_buf + b_off) = (uint8_t)((*(video_buf + b_off)) * vid_coeff)
+-                                                + (uint8_t)(ScaleQuantumToChar(pixel_packet->blue)  * img_coeff);
++                                                + (uint8_t)(ScaleQuantumToChar(GetPixelBlue(mfd->images, pixel_packet))  * img_coeff);
+                     }
+ 
+                     video_buf += 3;
+-                    pixel_packet++;
++                    pixel_packet += GetPixelChannels(mfd->images);
+                 }
+             }
+         } else { /* !RGB */
+@@ -745,10 +751,10 @@
+                 vid_pixel_V = vid_pixel_U + vid_size/4;
+                 for (col = 0; col < mfd->images->columns; col++) {
+                     int do_UV_pixels = (mfd->grayout == 0 && !(row % 2) && !(col % 2)) ? 1 : 0;
+-                    opacity = pixel_packet->opacity;
++                    opacity = QuantumRange - GetPixelAlpha(mfd->images, pixel_packet);
+ 
+                     if (do_fade)
+-                        opacity += (Quantum)((MaxRGB - opacity) * fade_coeff);
++                        opacity += (Quantum)((QuantumRange - opacity) * fade_coeff);
+ 
+                     if (opacity == 0) {
+                         *vid_pixel_Y = *img_pixel_Y;
+@@ -756,7 +762,7 @@
+                                 *vid_pixel_U = *img_pixel_U;
+                                 *vid_pixel_V = *img_pixel_V;
+                         }
+-                    } else if (opacity < MaxRGB) {
++                    } else if (opacity < QuantumRange) {
+                         unsigned char opacity_uchar = ScaleQuantumToChar(opacity);
+                         img_coeff = img_coeff_lookup[opacity_uchar];
+                         vid_coeff = vid_coeff_lookup[opacity_uchar];
+--- transcode-1.1.7/import/import_im.c
++++ transcode-1.1.7/import/import_im.c
+@@ -34,9 +34,9 @@
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+ #ifdef HAVE_BROKEN_WAND
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ #else /* we have a SANE wand header */
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #endif /* HAVE_BROKEN_WAND */
+ 
+ #undef PACKAGE_BUGREPORT
+--- transcode-1.1.7/import/import_imlist.c
++++ transcode-1.1.7/import/import_imlist.c
+@@ -34,9 +34,9 @@
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+ #ifdef HAVE_BROKEN_WAND
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ #else /* we have a SANE wand header */
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #endif /* HAVE_BROKEN_WAND */
+ 
+ #undef PACKAGE_BUGREPORT
+--- transcode-1.1.7/import/probe_im.c
++++ transcode-1.1.7/import/probe_im.c
+@@ -40,9 +40,9 @@
+ # undef PACKAGE_VERSION
+ 
+ # ifdef HAVE_BROKEN_WAND
+-# include <wand/magick-wand.h>
++# include <MagickWand/MagickWand.h>
+ # else /* we have a SANE wand header */
+-# include <wand/MagickWand.h>
++# include <MagickWand/MagickWand.h>
+ # endif /* HAVE_BROKEN_WAND */
+ 
+ # undef PACKAGE_BUGREPORT
diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild
index 1c07cbc57e..eb46ecdf59 100644
--- a/multimedia/transcode/transcode.SlackBuild
+++ b/multimedia/transcode/transcode.SlackBuild
@@ -80,6 +80,11 @@ patch -p1 -i $CWD/transcode-1.1.7-preset-force.patch
 patch -p1 -i $CWD/transcode-1.1.7-ffmpeg2.patch
 patch -p1 -i $CWD/transcode-1.1.7-ffmpeg24.patch
 patch -p1 -i $CWD/transcode-1.1.7-ffmpeg29.patch
+patch -p1 -i $CWD/transcode-1.1.7-ffmpeg4.patch
+# ...and with the newer imagemagick
+patch -p1 < $CWD/transcode-imagemagick7.patch
+
+autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild
index 623f21723f..eafdedb449 100644
--- a/multimedia/tvheadend/tvheadend.SlackBuild
+++ b/multimedia/tvheadend/tvheadend.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tvheadend
-VERSION=${VERSION:-3.4patch1}
+VERSION=${VERSION:-20170619_14bd7eb}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,7 +69,6 @@ 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 {} \;
 
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/multimedia/tvheadend/tvheadend.info b/multimedia/tvheadend/tvheadend.info
index ad7caed7c3..43e370d966 100644
--- a/multimedia/tvheadend/tvheadend.info
+++ b/multimedia/tvheadend/tvheadend.info
@@ -1,8 +1,8 @@
 PRGNAM="tvheadend"
-VERSION="3.4patch1"
+VERSION="20170619_14bd7eb"
 HOMEPAGE="https://tvheadend.org"
-DOWNLOAD="https://github.com/tvheadend/tvheadend/archive/3.4patch1.tar.gz"
-MD5SUM="86d1be0ad6e02bd2aecd3d529a026797"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/tvheadend-20170619_14bd7eb.tar.xz"
+MD5SUM="29d6ad6e10ef3eb8a96f1e947bec3c1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/tvtime/tvtime.SlackBuild b/multimedia/tvtime/tvtime.SlackBuild
index ed2d612d24..c065c9ff79 100644
--- a/multimedia/tvtime/tvtime.SlackBuild
+++ b/multimedia/tvtime/tvtime.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tvtime
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.0.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,16 +40,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# The INSTALL file recommends avoiding the use of the "-march" flag,
-# and -fPIC on x86_64 results in failure
-if [ "$ARCH" = "i486" ]; then
+# The INSTALL file recommends avoiding the use of the "-march" flag
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -69,7 +68,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -87,13 +86,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # Let's not clobber the config file
 mv $PKG/etc/tvtime/tvtime.xml $PKG/etc/tvtime/tvtime.xml.new
@@ -101,7 +98,7 @@ mv $PKG/etc/tvtime/tvtime.xml $PKG/etc/tvtime/tvtime.xml.new
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README docs/html \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/tvtime/tvtime.info b/multimedia/tvtime/tvtime.info
index 366e36ce63..04126667b2 100644
--- a/multimedia/tvtime/tvtime.info
+++ b/multimedia/tvtime/tvtime.info
@@ -1,8 +1,8 @@
 PRGNAM="tvtime"
-VERSION="1.0.7"
+VERSION="1.0.11"
 HOMEPAGE="http://tvtime.sourceforge.net/"
-DOWNLOAD="http://linuxtv.org/downloads/tvtime/tvtime-1.0.7.tar.gz"
-MD5SUM="d3cea3053ce8ff0d555da82fad138b44"
+DOWNLOAD="http://linuxtv.org/downloads/tvtime/tvtime-1.0.11.tar.gz"
+MD5SUM="f4adba831376a8baad92dbda49056138"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/vcdimager/vcdimager.SlackBuild b/multimedia/vcdimager/vcdimager.SlackBuild
index ef61d17058..5e0068fada 100644
--- a/multimedia/vcdimager/vcdimager.SlackBuild
+++ b/multimedia/vcdimager/vcdimager.SlackBuild
@@ -17,13 +17,13 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=vcdimager
-VERSION=${VERSION:-0.7.24}
+VERSION=${VERSION:-2.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -34,8 +34,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ] ; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ] ; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ] ; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -58,8 +58,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 400 -o -perm 440 \) -exec chmod 644 {} \; -o \
- \( -perm 777 -o -perm 775 -o -perm 511 -o -perm 711 -o -perm 555 \) -exec chmod 755 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/vcdimager/vcdimager.info b/multimedia/vcdimager/vcdimager.info
index 05ec47da33..66be249cdb 100644
--- a/multimedia/vcdimager/vcdimager.info
+++ b/multimedia/vcdimager/vcdimager.info
@@ -1,8 +1,8 @@
 PRGNAM="vcdimager"
-VERSION="0.7.24"
+VERSION="2.0.1"
 HOMEPAGE="http://www.gnu.org/software/vcdimager/"
-DOWNLOAD="http://mirrors.kernel.org/gnu/vcdimager/vcdimager-0.7.24.tar.gz"
-MD5SUM="3af22978fd79c79d5fda6513b6811145"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/vcdimager/vcdimager-2.0.1.tar.gz"
+MD5SUM="3890d73da62d0607c87962c41cd33a29"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/vlc/README b/multimedia/vlc/README
index 5490cd6e4c..9d901b0659 100644
--- a/multimedia/vlc/README
+++ b/multimedia/vlc/README
@@ -35,7 +35,3 @@ Please advise the maintainer to suggest support for any further options.
 *NOTES*
 - the qt4 interface seems not to be working ATM so the qt5 one is
   enabled by default: this means qt5 is a new mandatory dependency
-- you *need* to version-bump the libva and libva-intel-driver in
-  Slackware to versions 1.7.3 for VAAPI support: as we suppose
-  a standard install, "--enable-libva=no" is added between the
-  configure options, instead 
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 6f4294ca38..75c6fed10b 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -81,6 +81,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 
+sed -i '/DEPRECATED/s:^://:' modules/text_renderer/freetype/text_layout.c
+
 patch -p0 < $CWD/patch-projectM-fontpath.diff
 patch -p0 < $CWD/patch_vlc_cache_gen.diff
 
@@ -124,7 +126,8 @@ LDFLAGS="$SLKLDFLAGS" \
   $wayland \
   $opencv \
   --enable-merge-ffmpeg \
-  --enable-libva=no \
+  --disable-opencv \
+  --disable-vpx \
   --with-kde-solid=no \
 
 make
@@ -133,8 +136,7 @@ make DESTDIR=$PKG install
 mkdir -p $PKG/usr/man/man1
 gzip -9c doc/vlc.1 > $PKG/usr/man/man1/vlc.1.gz
 
-mkdir -p $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)
-cp extras/analyser/vlc.vim $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)/
+install -D -m0644 extras/analyser/vlc.vim $PKG/usr/share/vim/vimfiles/syntax/vlc.vim
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION