diff options
Diffstat (limited to 'multimedia')
65 files changed, 659 insertions, 1395 deletions
diff --git a/multimedia/MuseScore/MuseScore.SlackBuild b/multimedia/MuseScore/MuseScore.SlackBuild index cdbf20d539..dbef00470b 100644 --- a/multimedia/MuseScore/MuseScore.SlackBuild +++ b/multimedia/MuseScore/MuseScore.SlackBuild @@ -52,6 +52,9 @@ else LIBDIRSUFFIX="" fi +# Disable crash reporter as breakpad is broken with the newer glibcs :/ +sed 's/option(BUILD_CRASH_REPORTER "Build with crash reporter" ON)/option(BUILD_CRASH_REPORTER "Build with crash reporter" OFF)/' -i CMakeLists.txt + sed -i 's| qmake| qmake-qt5|' build/FindQt5.cmake make release PREFIX=/usr CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-pthread" make install PREFIX=/usr DESTDIR=$PKG UPDATE_CACHE=FALSE 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/avidemux/README b/multimedia/avidemux/README index c51dee2b3a..32c356af2c 100644 --- a/multimedia/avidemux/README +++ b/multimedia/avidemux/README @@ -3,18 +3,5 @@ encoding tasks. It supports many file types, including AVI, DVD compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. -By default only the cli and qt4 interfaces are built. Upstream currently -does not support the gtk interface and while it may build, the gtk gui -crashes during startup. To enable (or disable) an interface, use the -WITH_CLI, WITH_QT4, and WITH_GTK variables as such: - -WITH_CLI=NO sh ./avidemux.SlackBuild - -or, if you use fakeroot: - -fakeroot env WITH_GTK=YES sh ./avidemux.SlackBuild - -though building the gtk is not recommended or supported. - Optional dependencies are aften, amrnb, jack-audio-connection-kit, -and x265. +nv-codec-headers and x265. diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index eb6fc5c7b3..a3ade7fdae 100644 --- a/multimedia/avidemux/avidemux.SlackBuild +++ b/multimedia/avidemux/avidemux.SlackBuild @@ -5,7 +5,7 @@ # Derived from a SlackBuild by Eric Hameleers. # Copyright 2009, 2010, 2011, 2013 Eric Hameleers, Eindhoven, NL # Copyright 2015 John Vogel Corning, NY USA -# Copyright 2017-2018 Matteo Bernardini, Pisa, IT +# Copyright 2017-2019 Matteo Bernardini, Pisa, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=avidemux -VERSION=${VERSION:-2.7.1} +VERSION=${VERSION:-2.7.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,145 +74,21 @@ 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 {} \; -WITH_CLI=${WITH_CLI:-YES} -WITH_QT4=${WITH_QT4:-YES} -WITH_GTK=${WITH_GTK:-NO} - -mkdir -p build_core -cd build_core -cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DFAKEROOT="$PKG" \ - ../avidemux_core -make -make -j 1 install DESTDIR=$PKG -cd .. - -if [ "x$WITH_QT4" = "xYES" ]; then - mkdir -p build_qt4 - cd build_qt4 - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DFAKEROOT="$PKG" \ - ../avidemux/qt4 - make - make -j 1 install DESTDIR=$PKG - cd .. -fi - -if [ "x$WITH_GTK" = "xYES" ]; then - mkdir -p build_gtk - cd build_gtk - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DFAKEROOT="$PKG" \ - ../avidemux/gtk - make - make -j 1 install DESTDIR=$PKG - cd .. -fi - -if [ "x$WITH_CLI" = "xYES" ]; then - mkdir -p build_cli - cd build_cli - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DFAKEROOT="$PKG" \ - ../avidemux/cli - make - make -j 1 install DESTDIR=$PKG - cd .. -fi +sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash +sed -e 's|0.19|1.0|' -i avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt -mkdir -p build_plugins_common -cd build_plugins_common - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DAVIDEMUX_SOURCE_DIR="$TMP/${PRGNAM}_${VERSION}" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPLUGIN_UI=COMMON \ - -DFAKEROOT="$PKG" \ - ../avidemux_plugins - make - make -j 1 install DESTDIR=$PKG -cd .. - -if [ "x$WITH_QT4" = "xYES" ]; then - mkdir -p build_plugins_qt4 - cd build_plugins_qt4 - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DAVIDEMUX_SOURCE_DIR="$TMP/${PRGNAM}_${VERSION}" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPLUGIN_UI=QT4 \ - -DFAKEROOT="$PKG" \ - ../avidemux_plugins - make - make -j 1 install DESTDIR=$PKG - cd .. -fi +bash bootStrap.bash --with-core --with-cli --with-plugins -if [ "x$WITH_GTK" = "xYES" ]; then - mkdir -p build_plugins_gtk - cd build_plugins_gtk - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DAVIDEMUX_SOURCE_DIR="$TMP/${PRGNAM}_${VERSION}" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPLUGIN_UI=GTK \ - -DFAKEROOT="$PKG" \ - ../avidemux_plugins - make - make -j 1 install DESTDIR=$PKG - cd .. -fi +make -C buildCli DESTDIR="$PKG" install +make -C buildCore DESTDIR="$PKG" install +make -C buildPluginsCLI DESTDIR="$PKG" install +make -C buildPluginsCommon DESTDIR="$PKG" install -if [ "x$WITH_CLI" = "xYES" ]; then - mkdir -p build_plugins_cli - cd build_plugins_cli - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DAVIDEMUX_SOURCE_DIR="$TMP/${PRGNAM}_${VERSION}" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPLUGIN_UI=CLI \ - -DFAKEROOT="$PKG" \ - ../avidemux_plugins - make - make -j 1 install DESTDIR=$PKG - cd .. -fi +install -Dm 644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png +install -Dm 644 man/avidemux.1 $PKG/usr/man/man1 -mkdir -p $PKG/usr/share/applications -mkdir -p $PKG/usr/share/pixmaps -if [ "x$WITH_QT4" = "xYES" ]; then - cat avidemux2.desktop | sed -e 's/avidemux2$/avidemux/' -e 's/3_qt5/3_qt4/' >\ - $PKG/usr/share/applications/avidemux_qt.desktop -fi -if [ "x$WITH_GTK" = "xYES" ]; then - cat avidemux2.desktop | sed -e 's/avidemux2$/avidemux/' -e 's/2_gtk/3_gtk/' >\ - $PKG/usr/share/applications/avidemux_gtk.desktop -fi -install -m644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png -for sz in 16x16 32x32 48x48 64x64 ; do - mkdir -p $PKG/usr/share/icons/hicolor/$sz/apps - convert avidemux_icon.png -resize $sz \ - $PKG/usr/share/icons/hicolor/$sz/apps/avidemux.png -done - -mkdir -p $PKG/usr/man/man1 -gzip -c man/avidemux.1 > $PKG/usr/man/man1/avidemux.1.gz +make -C buildQt5 DESTDIR="$PKG" install +make -C buildPluginsQt5 DESTDIR="$PKG" install 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 diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 879c10f349..3c873ef13b 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,10 +1,10 @@ PRGNAM="avidemux" -VERSION="2.7.1" +VERSION="2.7.3" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.7.1.tar.gz" -MD5SUM="e3510c858c9371283551b1b4b67d288b" +DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.7.3.tar.gz" +MD5SUM="f01d2cfeda010b56ce0f1fb111201463" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="faac faad2 lame libdca x264 xvidcore" +REQUIRES="faac faad2 lame libdca qt5 x264 xvidcore" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" 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/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/ffmpeg4.SlackBuild b/multimedia/ffmpeg4/ffmpeg4.SlackBuild index 565dc68ae9..77734df93e 100644 --- a/multimedia/ffmpeg4/ffmpeg4.SlackBuild +++ b/multimedia/ffmpeg4/ffmpeg4.SlackBuild @@ -98,7 +98,7 @@ 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 "LIBSMBCLIENT" "no" "--enable-libsmbclient" "" enable "LIBSNAPPY" "no" "--enable-libsnappy" "" enable "LIBSPEEX" "no" "--enable-libspeex" "" enable "LIBSSH" "yes" "--enable-libssh" "" 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.SlackBuild b/multimedia/gpac/gpac.SlackBuild index 396ceae938..34f60d4754 100644 --- a/multimedia/gpac/gpac.SlackBuild +++ b/multimedia/gpac/gpac.SlackBuild @@ -88,6 +88,9 @@ 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 + ./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-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/lightspark/lightspark.SlackBuild b/multimedia/lightspark/lightspark.SlackBuild index 209f60e0d2..a366d39312 100644 --- a/multimedia/lightspark/lightspark.SlackBuild +++ b/multimedia/lightspark/lightspark.SlackBuild @@ -84,6 +84,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ -Wno-dev \ + -DBoost_NO_BOOST_CMAKE=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/multimedia/mlt/mlt.SlackBuild b/multimedia/mlt/mlt.SlackBuild index 7e37fc5e4e..98bec3984d 100644 --- a/multimedia/mlt/mlt.SlackBuild +++ b/multimedia/mlt/mlt.SlackBuild @@ -73,10 +73,10 @@ 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 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..256237ba72 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:-20190503_cabd2c4} 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..2644b9211c 100644 --- a/multimedia/openshot/openshot.info +++ b/multimedia/openshot/openshot.info @@ -1,8 +1,8 @@ PRGNAM="openshot" -VERSION="2.4.4" +VERSION="20190503_cabd2c4" 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-20190503_cabd2c4.tar.xz" +MD5SUM="c2146987a858c0ce0803af60c303272b" 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/spotify/spotify.SlackBuild b/multimedia/spotify/spotify.SlackBuild index d1945d7589..c01f4f4c59 100644 --- a/multimedia/spotify/spotify.SlackBuild +++ b/multimedia/spotify/spotify.SlackBuild @@ -27,12 +27,11 @@ PRGNAM=spotify SRCNAM=spotify-client -VERSION=${VERSION:-1.0.72} +VERSION=${VERSION:-1.0.89} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} case "$(uname -m)" in - i?86) DEBARCH="*-*_i386" ; LIBDIRSUFFIX="" ; ARCH=i386 ;; x86_64) DEBARCH="*-*_amd64" ; LIBDIRSUFFIX="64" ; ARCH=x86_64 ;; *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;; esac @@ -69,6 +68,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION ## we make our own launcher cat <<EOT > $PKG/usr/bin/$PRGNAM #!/bin/sh +export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/spotify/usr/lib /opt/$PRGNAM/usr/bin/$PRGNAM "\$@" EOT @@ -84,6 +84,11 @@ chmod 755 $PKG/usr/bin/$PRGNAM done ) +# add libraries from ubuntu to which the spotify client links +# these must be hand-extracted from ubuntu packages :( +( cd $PKG/opt/$PRGNAM + tar xf $CWD/$SRCNAM-$VERSION-additional_libs.tar.xz ) + mkdir -p $PKG/usr/share/applications/ mv $PKG/opt/$PRGNAM/usr/share/$PRGNAM/$PRGNAM.desktop \ $PKG/usr/share/applications/$SRCNAM.desktop diff --git a/multimedia/spotify/spotify.info b/multimedia/spotify/spotify.info index bebc5fa081..ea57cc04d4 100644 --- a/multimedia/spotify/spotify.info +++ b/multimedia/spotify/spotify.info @@ -1,10 +1,12 @@ PRGNAM="spotify" -VERSION="1.0.72" +VERSION="1.0.89" HOMEPAGE="https://www.spotify.com" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/spotify/spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb" -MD5SUM="c8e54d60452bda40f6de23f11c909b2d" -DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/spotify/spotify-client_1.0.72.117.g6bd7cc73-35_amd64.deb" -MD5SUM_x86_64="35392fb7d108e2830f22942c0a4ec717" -REQUIRES="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/spotify/spotify-client_1.0.89.313.g34a58dea-5_amd64.deb \ + http://ponce.cc/slackware/sources/repo/spotify/spotify-client-1.0.89-additional_libs.tar.xz" +MD5SUM_x86_64="5298643a2d3f0063ba80d59aa002789c \ + 1f5a70be35981a628844f64a732346e4" +REQUIRES="rtmpdump" MAINTAINER="DhabyX" EMAIL="slack.dhabyx@gmail.com" diff --git a/multimedia/subtitleeditor/fix-23714-cxx11-v2.patch b/multimedia/subtitleeditor/fix-23714-cxx11-v2.patch deleted file mode 100644 index 2a74a55a74..0000000000 --- a/multimedia/subtitleeditor/fix-23714-cxx11-v2.patch +++ /dev/null @@ -1,273 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac (révision 956) -+++ configure.ac (copie de travail) -@@ -18,8 +18,9 @@ - AC_C_INLINE - - # Checks for programs. -+AC_LANG([C++]) - AC_PROG_CXX --#AC_PROG_CC -+AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) - - # Checks for library functions. - AC_FUNC_SELECT_ARGTYPES -@@ -253,7 +254,7 @@ - - if test "$enable_debug" = "yes"; then - CXXFLAGS="$CXXFLAGS -DDEBUG -g" -- LDFLAGS="$LDFLAGS -g -ansi -Wall" -+ LDFLAGS="$LDFLAGS -g -Wall" - fi - - # ========================================================================= -@@ -265,13 +266,13 @@ - - if test "$enable_profile" = "yes"; then - CXXFLAGS="$CXXFLAGS -pg" -- LDFLAGS="$LDFLAGS -pg -ansi -Wall" -+ LDFLAGS="$LDFLAGS -pg -Wall" - fi - - # ========================================================================= - # gcc flags - --CXXFLAGS="$CXXFLAGS -ansi -Wall -Wextra -Wconversion" #-Werror -+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wconversion" #-Werror - - # ========================================================================= - # make use of ccache -Index: m4/ax_cxx_compile_stdcxx_11.m4 -=================================================================== ---- m4/ax_cxx_compile_stdcxx_11.m4 (nonexistent) -+++ m4/ax_cxx_compile_stdcxx_11.m4 (copie de travail) -@@ -0,0 +1,172 @@ -+# ============================================================================ -+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -+# ============================================================================ -+# -+# SYNOPSIS -+# -+# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the C++11 -+# standard; if necessary, add switches to CXXFLAGS to enable support. -+# -+# The first argument, if specified, indicates whether you insist on an -+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -+# -std=c++11). If neither is specified, you get whatever works, with -+# preference for an extended mode. -+# -+# The second argument, if specified 'mandatory' or if left unspecified, -+# indicates that baseline C++11 support is required and that the macro -+# should error out if no mode with that support is found. If specified -+# 'optional', then configuration proceeds regardless, after defining -+# HAVE_CXX11 if and only if a supporting mode is found. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> -+# Copyright (c) 2012 Zack Weinberg <zackw@panix.com> -+# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu> -+# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com> -+# Copyright (c) 2015 Paul Norman <penorman@mac.com> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 13 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ -+ template <typename T> -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ struct Base { -+ virtual void f() {} -+ }; -+ struct Child : public Base { -+ virtual void f() override {} -+ }; -+ -+ typedef check<check<bool>> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check<int> check_type; -+ check_type c; -+ check_type&& cr = static_cast<check_type&&>(c); -+ -+ auto d = a; -+ auto l = [](){}; -+ // Prevent Clang error: unused variable 'l' [-Werror,-Wunused-variable] -+ struct use_l { use_l() { l(); } }; -+ -+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae -+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this -+ namespace test_template_alias_sfinae { -+ struct foo {}; -+ -+ template<typename T> -+ using member = typename T::member_type; -+ -+ template<typename T> -+ void func(...) {} -+ -+ template<typename T> -+ void func(member<T>*) {} -+ -+ void test(); -+ -+ void test() { -+ func<foo>(0); -+ } -+ } -+ -+ // Check for C++11 attribute support -+ void noret [[noreturn]] () { throw 0; } -+]]) -+ -+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl -+ m4_if([$1], [], [], -+ [$1], [ext], [], -+ [$1], [noext], [], -+ [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl -+ m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], -+ [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], -+ [$2], [optional], [ax_cxx_compile_cxx11_required=false], -+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])]) -+ AC_LANG_PUSH([C++])dnl -+ ac_success=no -+ AC_CACHE_CHECK(whether $CXX supports C++11 features by default, -+ ax_cv_cxx_compile_cxx11, -+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [ax_cv_cxx_compile_cxx11=yes], -+ [ax_cv_cxx_compile_cxx11=no])]) -+ if test x$ax_cv_cxx_compile_cxx11 = xyes; then -+ ac_success=yes -+ fi -+ -+ m4_if([$1], [noext], [], [dnl -+ if test x$ac_success = xno; then -+ for switch in -std=gnu++11 -std=gnu++0x; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ -+ m4_if([$1], [ext], [], [dnl -+ if test x$ac_success = xno; then -+ dnl HP's aCC needs +std=c++11 according to: -+ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf -+ dnl Cray's crayCC needs "-h std=c++11" -+ for switch in -std=c++11 -std=c++0x +std=c++11 "-h std=c++11"; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ AC_LANG_POP([C++]) -+ if test x$ax_cxx_compile_cxx11_required = xtrue; then -+ if test x$ac_success = xno; then -+ AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) -+ fi -+ else -+ if test x$ac_success = xno; then -+ HAVE_CXX11=0 -+ AC_MSG_NOTICE([No compiler with C++11 support was found]) -+ else -+ HAVE_CXX11=1 -+ AC_DEFINE(HAVE_CXX11,1, -+ [define if the compiler supports basic C++11 syntax]) -+ fi -+ -+ AC_SUBST(HAVE_CXX11) -+ fi -+]) -Index: plugins/actions/dialoguize/dialoguize.cc -=================================================================== ---- plugins/actions/dialoguize/dialoguize.cc (révision 956) -+++ plugins/actions/dialoguize/dialoguize.cc (copie de travail) -@@ -23,7 +23,7 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - --#include <auto_ptr.h> -+#include <memory.h> - #include "extension/action.h" - #include "i18n.h" - #include "debug.h" -Index: plugins/actions/documentmanagement/documentmanagement.cc -=================================================================== ---- plugins/actions/documentmanagement/documentmanagement.cc (révision 956) -+++ plugins/actions/documentmanagement/documentmanagement.cc (copie de travail) -@@ -178,9 +178,9 @@ - - ui_id = ui->new_merge_id(); - -- #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name); -- #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name); -- #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name); -+ #define ADD_UI(name) ui->add_ui(ui_id, Glib::ustring::compose("%1/%2","/menubar/menu-file", name), name, name); -+ #define ADD_OPEN_UI(name) ui->add_ui(ui_id, Glib::ustring::compose("%1/%2","/menubar/menu-file/menu-open", name), name, name); -+ #define ADD_SAVE_UI(name) ui->add_ui(ui_id, Glib::ustring::compose("%1/%2","/menubar/menu-file/menu-save", name), name, name); - - ADD_UI("new-document"); - ADD_OPEN_UI("open-document"); -Index: src/subtitleview.cc -=================================================================== ---- src/subtitleview.cc (révision 956) -+++ src/subtitleview.cc (copie de travail) -@@ -1363,7 +1363,7 @@ - { - int num; - std::istringstream ss(event->string); -- bool is_num = ss >> num != 0; -+ bool is_num = static_cast<bool>(ss >> num) != 0; - // Update only if it's different - if(is_num != get_enable_search()) - set_enable_search(is_num); -Index: src/utility.h -=================================================================== ---- src/utility.h (révision 956) -+++ src/utility.h (copie de travail) -@@ -91,7 +91,7 @@ - std::istringstream s(src); - // return s >> dest != 0; - -- bool state = s >> dest != 0; -+ bool state = static_cast<bool>(s >> dest) != 0; - - if(!state) - se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str()); diff --git a/multimedia/subtitleeditor/subtitleeditor.SlackBuild b/multimedia/subtitleeditor/subtitleeditor.SlackBuild index 4d941c98c8..20b02ffd70 100644 --- a/multimedia/subtitleeditor/subtitleeditor.SlackBuild +++ b/multimedia/subtitleeditor/subtitleeditor.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=subtitleeditor -VERSION=${VERSION:-0.52.1} +VERSION=${VERSION:-0.53.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,11 +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 {} \; -# https://gna.org/bugs/?23714 -patch -p0 < $CWD/fix-23714-cxx11-v2.patch - -autoreconf -fi - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/subtitleeditor/subtitleeditor.info b/multimedia/subtitleeditor/subtitleeditor.info index e15bf271dc..a5e5bd87e7 100644 --- a/multimedia/subtitleeditor/subtitleeditor.info +++ b/multimedia/subtitleeditor/subtitleeditor.info @@ -1,8 +1,8 @@ PRGNAM="subtitleeditor" -VERSION="0.52.1" +VERSION="0.53.0" HOMEPAGE="https://launchpad.net/subtitleeditor" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/subtitleeditor-0.52.1.tar.gz" -MD5SUM="d25a3f6966f4d6355485d3dfbcfb437a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/subtitleeditor-0.53.0.tar.gz" +MD5SUM="bcd3ce93a4759ed3f99a56dc7e4c4e00" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gstreamermm libxml++" 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 cfdbfe7e55..27b020d21c 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 e35b99cbed..4930ccb7f1 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 |