diff options
| author |   Matteo Bernardini | 2023-05-27 10:17:05 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2023-05-27 10:17:05 +0200 |
| commit | 6ed1b74c4df44c1eae6faa161096fa3a526a15d6 (patch) | |
| tree | 48a9fb86d849868229f4d10ca485544b90070556 /multimedia | |
| parent | 5f0dbb7bfc6471bf497a49a7721db448a82e8b96 (diff) | |
| download | slackbuilds-6ed1b74c4df44c1eae6faa161096fa3a526a15d6.tar.gz | |
20230527.1 global branch merge.current-20230527.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'multimedia')
34 files changed, 562 insertions, 1983 deletions
diff --git a/multimedia/dvdstyler/dvdstyler.SlackBuild b/multimedia/dvdstyler/dvdstyler.SlackBuild index 06e3562ed8..8a6f256618 100644 --- a/multimedia/dvdstyler/dvdstyler.SlackBuild +++ b/multimedia/dvdstyler/dvdstyler.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for dvdstyler -# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2022 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dvdstyler SPRGNAM=DVDStyler -VERSION=${VERSION:-3.1.2} +VERSION=${VERSION:-3.3b3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/dvdstyler/dvdstyler.info b/multimedia/dvdstyler/dvdstyler.info index 0dfb7e863b..581bbad6cb 100644 --- a/multimedia/dvdstyler/dvdstyler.info +++ b/multimedia/dvdstyler/dvdstyler.info @@ -1,8 +1,8 @@ PRGNAM="dvdstyler" -VERSION="3.1.2" +VERSION="3.3b3" HOMEPAGE="http://www.dvdstyler.org/" -DOWNLOAD="http://downloads.sf.net/dvdstyler/DVDStyler-3.1.2.tar.bz2" -MD5SUM="8d5e977900ade9f57ae1e13c2e50b1ac" +DOWNLOAD="http://downloads.sf.net/dvdstyler/DVDStyler-3.3b3.tar.bz2" +MD5SUM="d92cc509cb6c39d74f2ce56d6f686cff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libavc1394 libmspack libquicktime mjpegtools mpgtx wxsvg" diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild index 3d47f2be9d..cf901dd523 100644 --- a/multimedia/gpac/gpac.SlackBuild +++ b/multimedia/gpac/gpac.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="gpac" -VERSION=${VERSION:-1.0.1} +VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info index 9b1adc7085..c0c3c6c726 100644 --- a/multimedia/gpac/gpac.info +++ b/multimedia/gpac/gpac.info @@ -1,8 +1,8 @@ PRGNAM="gpac" -VERSION="1.0.1" +VERSION="2.0.0" HOMEPAGE="http://gpac.wp.mines-telecom.fr" -DOWNLOAD="https://github.com/gpac/gpac/archive/v1.0.1/gpac-1.0.1.tar.gz" -MD5SUM="52f6711e43a8d271ebec0c2ea2afab4a" +DOWNLOAD="https://github.com/gpac/gpac/archive/v2.0.0/gpac-2.0.0.tar.gz" +MD5SUM="8e412a155f558f71609c26a282e682b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild index 5fdcb0305a..6838769671 100644 --- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild +++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gst-plugins-bad-nonfree -# Copyright 2013-2021 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2023 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gst-plugins-bad-nonfree -VERSION=${VERSION:-1.18.5} +VERSION=${VERSION:-1.22.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info index 43340d39f2..f25c536ab7 100644 --- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info +++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info @@ -1,8 +1,8 @@ PRGNAM="gst-plugins-bad-nonfree" -VERSION="1.18.5" +VERSION="1.22.0" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz" -MD5SUM="4ab1c19c3cf1ba79c20c65f6be78e7fd" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz" +MD5SUM="6c4df68e7d32e2ae6a682b7dbc22e35a" 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 d5d9e11406..88b88b278e 100644 --- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild +++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gst-plugins-ugly -# Copyright 2013-2021 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2023 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gst-plugins-ugly -VERSION=${VERSION:-1.18.5} +VERSION=${VERSION:-1.22.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -90,8 +90,7 @@ cd build --localstatedir=/var \ --mandir=/usr/man \ --prefix=/usr \ - --sysconfdir=/etc \ - -Dexamples=disabled + --sysconfdir=/etc "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info index 5a55a8aa0f..85c54d9eff 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.18.5" +VERSION="1.22.0" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz" -MD5SUM="049f90b7a3a72e241ad47564b5cd7a7a" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz" +MD5SUM="ac97c1ca8d9c7a9878ca15796b70d809" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild index 0d62385bcf..2ee8b58586 100644 --- a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild +++ b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-gmmlib -VERSION=${VERSION:-21.3.1} +VERSION=${VERSION:-22.3.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/intel-gmmlib/intel-gmmlib.info b/multimedia/intel-gmmlib/intel-gmmlib.info index 56c6e5218b..5ed4cf479d 100644 --- a/multimedia/intel-gmmlib/intel-gmmlib.info +++ b/multimedia/intel-gmmlib/intel-gmmlib.info @@ -1,8 +1,8 @@ PRGNAM="intel-gmmlib" -VERSION="21.3.1" +VERSION="22.3.3" HOMEPAGE="https://github.com/intel/gmmlib/" -DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-21.3.1/gmmlib-intel-gmmlib-21.3.1.tar.gz" -MD5SUM="e6755c5d0f44e336f298cee9c7c3fdae" +DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-22.3.3/gmmlib-intel-gmmlib-22.3.3.tar.gz" +MD5SUM="723f4086d567c645fa51fd73e49bab18" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/intel-media-driver/intel-media-driver.SlackBuild b/multimedia/intel-media-driver/intel-media-driver.SlackBuild index dfb1b3b30b..97f1f5172e 100644 --- a/multimedia/intel-media-driver/intel-media-driver.SlackBuild +++ b/multimedia/intel-media-driver/intel-media-driver.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-media-driver -VERSION=${VERSION:-21.3.5} +VERSION=${VERSION:-22.6.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -95,7 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CODEOWNERS LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/intel-media-driver/intel-media-driver.info b/multimedia/intel-media-driver/intel-media-driver.info index 1967da2f92..6f4243028f 100644 --- a/multimedia/intel-media-driver/intel-media-driver.info +++ b/multimedia/intel-media-driver/intel-media-driver.info @@ -1,8 +1,8 @@ PRGNAM="intel-media-driver" -VERSION="21.3.5" +VERSION="22.6.6" HOMEPAGE="https://github.com/intel/media-driver/" -DOWNLOAD="https://github.com/intel/media-driver/archive/intel-media-21.3.5/media-driver-intel-media-21.3.5.tar.gz" -MD5SUM="3ace8aec373b3990acb1e3270e4a9e0b" +DOWNLOAD="https://github.com/intel/media-driver/archive/intel-media-22.6.6/media-driver-intel-media-22.6.6.tar.gz" +MD5SUM="db97cd7f79a29e4479b083006604d93f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="intel-gmmlib" diff --git a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild index 2c3f1e67bf..f77584d317 100644 --- a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild +++ b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-media-sdk -VERSION=${VERSION:-21.3.5} +VERSION=${VERSION:-22.5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/intel-media-sdk/intel-media-sdk.info b/multimedia/intel-media-sdk/intel-media-sdk.info index 8ac23ebd28..24dff2ec02 100644 --- a/multimedia/intel-media-sdk/intel-media-sdk.info +++ b/multimedia/intel-media-sdk/intel-media-sdk.info @@ -1,8 +1,8 @@ PRGNAM="intel-media-sdk" -VERSION="21.3.5" +VERSION="22.5.4" HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK/" -DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-21.3.5/MediaSDK-intel-mediasdk-21.3.5.tar.gz" -MD5SUM="7a71beb6def13ab71348785a8880dd0a" +DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-22.5.4/MediaSDK-intel-mediasdk-22.5.4.tar.gz" +MD5SUM="e0f2030fecc8767ac6a4f98b971d7044" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index 61e4e03224..a74d3e7c4a 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -34,6 +34,7 @@ TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} # Versions used below +ffmpegVER=${ffmpegVER:-4.4.1-Nexus-Alpha1} crossguidVER=${crossguiVER:-ca1bf4b810e2d188d04cb6286f957008ee1b7681} fmtVER=${fmtVER:-9.1.0} fstrcmpVER=${fstrcmpVER:-0.7.D001} @@ -124,6 +125,7 @@ cd $TMP/$PRGNAM-build -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DAPP_RENDER_SYSTEM=gl \ -DCORE_PLATFORM_NAME="$PLATFORM" \ + -DENABLE_INTERNAL_FFMPEG=ON \ -DENABLE_INTERNAL_CROSSGUID=ON \ -DENABLE_INTERNAL_RapidJSON=ON \ -DENABLE_INTERNAL_FSTRCMP=ON \ @@ -138,6 +140,7 @@ cd $TMP/$PRGNAM-build -DENABLE_LIRCCLIENT=$LIRC \ -DENABLE_MICROHTTPD=$WEBSERVER \ -DENABLE_NFS=$NFS \ + -DFFMPEG_URL=$CWD/ffmpeg-$ffmpegVER.tar.gz \ -DCROSSGUID_URL=$CWD/crossguid-$crossguidVER.tar.gz \ -DFMT_URL=$CWD/fmt-$fmtVER.tar.gz \ -DFSTRCMP_URL=$CWD/fstrcmp-$fstrcmpVER.tar.gz \ diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info index d9ffbe7e65..d3be853c26 100644 --- a/multimedia/kodi/kodi.info +++ b/multimedia/kodi/kodi.info @@ -2,6 +2,7 @@ PRGNAM="kodi" VERSION="20.1" HOMEPAGE="https://kodi.tv/" DOWNLOAD="https://github.com/xbmc/xbmc/archive/20.1-Nexus/xbmc-20.1-Nexus.tar.gz \ + https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1/ffmpeg-4.4.1-Nexus-Alpha1.tar.gz \ https://github.com/xbmc/crossguid/archive/ca1bf4b/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz \ https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2/libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz \ https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2/libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz \ @@ -12,6 +13,7 @@ DOWNLOAD="https://github.com/xbmc/xbmc/archive/20.1-Nexus/xbmc-20.1-Nexus.tar.gz https://code.videolan.org/videolan/libudfread/-/archive/1.1.2/libudfread-1.1.2.tar.gz \ https://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz" MD5SUM="ed115f2fac4d425fdd4fd228065ef2c4 \ + 9f84fff2a7ddbaa83e6e85e3a12a5f91 \ d4a8d62f3f8d6d946be75cf5bfa92687 \ 42dc3770ae928103e8033a18b007e79d \ 2349cde54d950af21fa4936371ad3349 \ diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild index 29f3e9318b..d95e68314f 100644 --- a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild +++ b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild @@ -78,6 +78,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/ruby-3.2.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/mkvtoolnix/ruby-3.2.patch b/multimedia/mkvtoolnix/ruby-3.2.patch new file mode 100644 index 0000000000..2dd5e2e08f --- /dev/null +++ b/multimedia/mkvtoolnix/ruby-3.2.patch @@ -0,0 +1,382 @@ +From ab6455f68c597ede3d6959597a38f2ecbc198011 Mon Sep 17 00:00:00 2001 +From: Moritz Bunkus <mo@bunkus.online> +Date: Mon, 2 Jan 2023 22:27:27 +0100 +Subject: [PATCH] build system: fix compatibility with Ruby 3.2.0 + +Several deprecated functions were removed: `Dir.exists?`, +`File.exists?` & `FileTest.exists?`. Instead of those +`FileTest.exist?` must be used (without the `s`). See the release +notes for Ruby 3.2.0 as well as the issue for removing the functions: + +https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/ +https://bugs.ruby-lang.org/issues/17391 +--- + NEWS.md | 9 +++++++++ + Rakefile | 12 ++++++------ + .../file_list_to_nsi_uninstaller_instructions.rb | 2 +- + rake.d/compilation_database.rb | 4 ++-- + rake.d/config.rb | 4 ++-- + rake.d/helpers.rb | 10 +++++----- + rake.d/online_file.rb | 4 ++-- + rake.d/tarball.rb | 2 +- + tests/test-0382split_chapters.rb | 2 +- + tests/test-0532chapter_generation_when_appending.rb | 2 +- + tests/test-0533chapter_generation_interval.rb | 2 +- + ...34chapter_generation_when_appending_audio_only.rb | 2 +- + ...est-0535chapter_generation_interval_audio_only.rb | 2 +- + tests/test.d/simple_test.rb | 6 +++--- + tests/test.d/test.rb | 6 +++--- + tools/development/update_translations.rb | 4 ++-- + 16 files changed, 41 insertions(+), 32 deletions(-) + +diff --git a/NEWS.md b/NEWS.md +index 1b67afb44..80a7bceb8 100644 +--- a/NEWS.md ++++ b/NEWS.md +@@ -1,3 +1,12 @@ ++# Version ? ++ ++## Bug fixes ++ ++* build system: fixed compatibility with Ruby 3.2.0 by using `FileTest.exist?` ++ instead of `File.exists?`, `Dir.exists?` & `FileTest.exists?` which were ++ removed in that release. ++ ++ + # Version 73.0.0 "25 or 6 to 4" 2023-01-02 + + ## New features and enhancements +diff --git a/Rakefile b/Rakefile +index 8bf87d647..89cf8f1cd 100644 +--- a/Rakefile ++++ b/Rakefile +@@ -277,7 +277,7 @@ def define_default_task + targets << ($run_unit_tests ? 'tests:run_unit' : 'tests:unit') if $have_gtest + + # The tags file -- but only if it exists already +- if File.exists?("TAGS") ++ if FileTest.exist?("TAGS") + targets << "TAGS" if !c(:ETAGS).empty? + targets << "BROWSE" if !c(:EBROWSE).empty? + end +@@ -454,7 +454,7 @@ end + rule '.1' => '.xml' do |t| + filter = lambda do |code, lines| + if (0 == code) && lines.any? { |line| /^error|parser error/i.match(line) } +- File.unlink(t.name) if File.exists?(t.name) ++ File.unlink(t.name) if FileTest.exist?(t.name) + result = 1 + puts lines.join('') + +@@ -668,7 +668,7 @@ EOT + if $po4a_cfg + desc "Update the man pages' translation files" + task :manpages do +- FileUtils.touch($po4a_pot) if !FileTest.exists?($po4a_pot) ++ FileUtils.touch($po4a_pot) if !FileTest.exist?($po4a_pot) + + runq "po4a", "#{$po4a_cfg} (update PO/POT)", "#{c(:PO4A)} #{$flags[:po4a]} --no-translations ${po4a_cfg}" + $all_man_po_files.each do |po_file| +@@ -822,8 +822,8 @@ if $po4a_cfg + po4a_sources += $available_languages[:manpages].map { |language| "doc/man/po4a/po/#{language}.po" } + + file $po4a_stamp => po4a_sources do |t| +- File.unlink($po4a_stamp) if FileTest.exists?($po4a_stamp) +- FileUtils.touch($po4a_pot) if !FileTest.exists?($po4a_pot) ++ File.unlink($po4a_stamp) if FileTest.exist?($po4a_stamp) ++ FileUtils.touch($po4a_pot) if !FileTest.exist?($po4a_pot) + + runq "po4a", "#{$po4a_cfg}", "#{c(:PO4A)} #{$flags[:po4a]} #{$po4a_cfg}", :filter_output => po4a_output_filter + runq_touch $po4a_stamp +@@ -1054,7 +1054,7 @@ task :clean do + + remove_files_by_patterns patterns + +- if Dir.exists? $dependency_dir ++ if FileTest.exist? $dependency_dir + puts_vaction "rm -rf", :target => "#{$dependency_dir}" + FileUtils.rm_rf $dependency_dir + end +diff --git a/packaging/windows/file_list_to_nsi_uninstaller_instructions.rb b/packaging/windows/file_list_to_nsi_uninstaller_instructions.rb +index 045f59aca..d62cb5713 100755 +--- a/packaging/windows/file_list_to_nsi_uninstaller_instructions.rb ++++ b/packaging/windows/file_list_to_nsi_uninstaller_instructions.rb +@@ -7,7 +7,7 @@ fail "Missing file list name" if ARGV.empty? + + config = read_config + file_name = ARGV[0] +-file_name = "#{config['file_list_dir']}/#{file_name}.txt" if !FileTest.exists?(file_name) ++file_name = "#{config['file_list_dir']}/#{file_name}.txt" if !FileTest.exist?(file_name) + files = IO.readlines(file_name).map { |file| file.chomp.gsub(%r{^\.}, '').gsub(%r{^/}, '').gsub(%r{/}, '\\') } + dirs = {} + +diff --git a/rake.d/compilation_database.rb b/rake.d/compilation_database.rb +index 67f05b143..00ef35406 100644 +--- a/rake.d/compilation_database.rb ++++ b/rake.d/compilation_database.rb +@@ -8,7 +8,7 @@ module Mtx + end + + def self.read +- return {} unless FileTest.exists?(@file_name) ++ return {} unless FileTest.exist?(@file_name) + + Hash[ + *JSON.parse(IO.readlines(@file_name).join("")). +@@ -19,7 +19,7 @@ module Mtx + + def self.write + return if @compilation_commands.empty? +- return if !FileTest.exists?(@file_name) && !c?(:BUILD_COMPILATION_DATABASE) ++ return if !FileTest.exist?(@file_name) && !c?(:BUILD_COMPILATION_DATABASE) + + entries = self.read.merge(@compilation_commands).values.sort_by { |e| e["file"] } + File.open(@file_name, "w") do |f| +diff --git a/rake.d/config.rb b/rake.d/config.rb +index 1869e4eac..c3b0d3811 100644 +--- a/rake.d/config.rb ++++ b/rake.d/config.rb +@@ -13,10 +13,10 @@ end + def read_build_config + dir = File.dirname(__FILE__) + '/..' + +- fail "build-config not found: please run ./configure" unless File.exists?("#{dir}/build-config") ++ fail "build-config not found: please run ./configure" unless FileTest.exist?("#{dir}/build-config") + + config = read_config_file("#{dir}/build-config") +- config = config.merge(read_config_file("#{dir}/build-config.local")) if File.exists?("#{dir}/build-config.local") ++ config = config.merge(read_config_file("#{dir}/build-config.local")) if FileTest.exist?("#{dir}/build-config.local") + + config + end +diff --git a/rake.d/helpers.rb b/rake.d/helpers.rb +index 97041d8fc..bdabc7730 100644 +--- a/rake.d/helpers.rb ++++ b/rake.d/helpers.rb +@@ -181,7 +181,7 @@ def import_dependencies + Dir.glob("#{$dependency_dir}/*.dep").each do |file_name| + lines = IO.readlines(file_name).collect(&:chomp) + target = lines.shift +- file target => lines.select { |dep_name| File.exists? dep_name } ++ file target => lines.select { |dep_name| FileTest.exist? dep_name } + end + end + +@@ -211,7 +211,7 @@ def install_data(destination, *files) + end + + def remove_files_by_patterns patterns +- patterns.collect { |pattern| FileList[pattern].to_a }.flatten.uniq.select { |file_name| File.exists? file_name }.each do |file_name| ++ patterns.collect { |pattern| FileList[pattern].to_a }.flatten.uniq.select { |file_name| FileTest.exist? file_name }.each do |file_name| + puts_vaction "rm", :target => file_name + File.unlink file_name + end +@@ -254,7 +254,7 @@ def check_version required, actual + end + + def ensure_file file_name, content = "" +- if FileTest.exists?(file_name) ++ if FileTest.exist?(file_name) + current_content = IO.readlines(file_name).join("\n") + return if current_content == content + end +@@ -267,7 +267,7 @@ def update_version_number_include + current_version = nil + wanted_version = c(:PACKAGE_VERSION) + +- if FileTest.exists?($version_header_name) ++ if FileTest.exist?($version_header_name) + lines = IO.readlines($version_header_name) + + if !lines.empty? && %r{#define.*?"([0-9.]+)"}.match(lines[0]) +@@ -352,7 +352,7 @@ def update_qrc_worker qrc + double_size = size * 2 + double_file = "share/icons/#{double_size}x#{double_size}/#{base_name}.png" + +- next unless FileTest.exists?(double_file) ++ next unless FileTest.exist?(double_file) + + add_node.call(double_file, 'alias' => name_alias) + seen[file.gsub(%r{.*/icons}, 'icons')] = true +diff --git a/rake.d/online_file.rb b/rake.d/online_file.rb +index 7daf5dc97..f5219ebec 100644 +--- a/rake.d/online_file.rb ++++ b/rake.d/online_file.rb +@@ -9,7 +9,7 @@ module Mtx::OnlineFile + file_name ||= url.gsub(%r{.*/}, '') + file_name = "tmp/#{file_name}" + +- if !FileTest.exists?(file_name) ++ if !FileTest.exist?(file_name) + @@to_unlink << file_name + + runq "wget", url, "wget --quiet -O #{file_name} #{url}" +@@ -30,7 +30,7 @@ module Mtx::OnlineFile + return if c?(:KEEP_DOWNLOADED_FILES) + + @@to_unlink. +- select { |fn| FileTest.exists? fn }. ++ select { |fn| FileTest.exist? fn }. + each { |fn| File.unlink fn } + end + end +diff --git a/rake.d/tarball.rb b/rake.d/tarball.rb +index c9cc3fd82..6b840b772 100644 +--- a/rake.d/tarball.rb ++++ b/rake.d/tarball.rb +@@ -1,6 +1,6 @@ + def create_source_tarball suffix = "" + tarball = "#{Dir.pwd}/../mkvtoolnix-#{c(:PACKAGE_VERSION)}#{suffix}.tar.xz" +- fail "#{tarball} does already exist" if FileTest.exists?(tarball) ++ fail "#{tarball} does already exist" if FileTest.exist?(tarball) + + Dir.mktmpdir do |dir| + clone_dir = "#{dir}/mkvtoolnix-#{c(:PACKAGE_VERSION)}" +diff --git a/tests/test-0382split_chapters.rb b/tests/test-0382split_chapters.rb +index db2ae297f..0319a73a8 100644 +--- a/tests/test-0382split_chapters.rb ++++ b/tests/test-0382split_chapters.rb +@@ -7,7 +7,7 @@ avi = "data/avi/v-h264-aac.avi" + chapters = "data/text/chapters-v-h264-aac.txt" + + def hash_results max +- ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ File.exists?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' ++ ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ FileTest.exist?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' + end + + test "chapters-in-mkv: numbers 1 & 7" do +diff --git a/tests/test-0532chapter_generation_when_appending.rb b/tests/test-0532chapter_generation_when_appending.rb +index a36cf9c65..4f396dda1 100755 +--- a/tests/test-0532chapter_generation_when_appending.rb ++++ b/tests/test-0532chapter_generation_when_appending.rb +@@ -5,7 +5,7 @@ file = "data/avi/v-h264-aac.avi" + describe "mkvmerge / generate chapter »when-appending«" + + def hash_results max +- ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ File.exists?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' ++ ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ FileTest.exist?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' + end + + test_merge "#{file} + #{file} + #{file}", :args => "--generate-chapters when-appending" +diff --git a/tests/test-0533chapter_generation_interval.rb b/tests/test-0533chapter_generation_interval.rb +index e584915a7..b2210642c 100755 +--- a/tests/test-0533chapter_generation_interval.rb ++++ b/tests/test-0533chapter_generation_interval.rb +@@ -5,7 +5,7 @@ file = "data/avi/v-h264-aac.avi" + describe "mkvmerge / generate chapter »interval«" + + def hash_results max +- ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ File.exists?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' ++ ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ FileTest.exist?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' + end + + test_merge "#{file} + #{file} + #{file}", :args => "--generate-chapters interval:30s" +diff --git a/tests/test-0534chapter_generation_when_appending_audio_only.rb b/tests/test-0534chapter_generation_when_appending_audio_only.rb +index 2a3dbc7d3..8984cb31f 100755 +--- a/tests/test-0534chapter_generation_when_appending_audio_only.rb ++++ b/tests/test-0534chapter_generation_when_appending_audio_only.rb +@@ -5,7 +5,7 @@ file = "data/simple/v.mp3" + describe "mkvmerge / generate chapter »when-appending« without video tracks" + + def hash_results max +- ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ File.exists?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' ++ ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ FileTest.exist?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' + end + + test_merge "#{file} + #{file} + #{file}", :args => "--generate-chapters when-appending" +diff --git a/tests/test-0535chapter_generation_interval_audio_only.rb b/tests/test-0535chapter_generation_interval_audio_only.rb +index 7fa7270b6..3d3c96ed6 100755 +--- a/tests/test-0535chapter_generation_interval_audio_only.rb ++++ b/tests/test-0535chapter_generation_interval_audio_only.rb +@@ -5,7 +5,7 @@ file = "data/simple/v.mp3" + describe "mkvmerge / generate chapter »interval« without video tracks" + + def hash_results max +- ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ File.exists?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' ++ ( (1..max).collect { |i| hash_file(sprintf("%s-%02d", tmp, i)) } + [ FileTest.exist?(sprintf("%s-%02d", tmp, max + 1)) ? 'bad' : 'ok' ]).join '+' + end + + test_merge "#{file} + #{file} + #{file}", :args => "--generate-chapters interval:30s" +diff --git a/tests/test.d/simple_test.rb b/tests/test.d/simple_test.rb +index 1ba6ea167..7490d2738 100644 +--- a/tests/test.d/simple_test.rb ++++ b/tests/test.d/simple_test.rb +@@ -85,7 +85,7 @@ class SimpleTest + end + + def clean_tmp +- File.unlink(@tmp) if @tmp && File.exists?(@tmp) && !ENV["KEEP_TMPFILES"].nil? && (ENV["KEEP_TMPFILES"] != "1") ++ File.unlink(@tmp) if @tmp && FileTest.exist?(@tmp) && !ENV["KEEP_TMPFILES"].nil? && (ENV["KEEP_TMPFILES"] != "1") + @tmp = nil + end + +@@ -106,7 +106,7 @@ class SimpleTest + re = %r{^#{self.tmp_name_prefix}} + Dir.entries($temp_dir).each do |entry| + file = "#{$temp_dir}/#{entry}" +- File.unlink(file) if re.match(file) and File.exists?(file) ++ File.unlink(file) if re.match(file) and FileTest.exist?(file) + end + end + +@@ -326,7 +326,7 @@ class SimpleTest + command = "../src/mkvpropedit --engage no_variable_data #{file_name} #{args.first}" + *result = self.sys command, :exit_code => options[:exit_code], :no_result => options[:no_result] + +- self.sys "../src/tools/ebml_validator -M #{file_name}", dont_record_command: true if FileTest.exists?("../src/tools/ebml_validator") ++ self.sys "../src/tools/ebml_validator -M #{file_name}", dont_record_command: true if FileTest.exist?("../src/tools/ebml_validator") + + return *result + end +diff --git a/tests/test.d/test.rb b/tests/test.d/test.rb +index 88384dd49..f9053d310 100644 +--- a/tests/test.d/test.rb ++++ b/tests/test.d/test.rb +@@ -25,7 +25,7 @@ class Test + re = /^#{self.tmp_name_prefix}/ + Dir.entries($temp_dir).each do |entry| + file = "#{$temp_dir}/#{entry}" +- File.unlink(file) if re.match(file) and File.exists?(file) ++ File.unlink(file) if re.match(file) and FileTest.exist?(file) + end + end + +@@ -84,7 +84,7 @@ class Test + output = hash_file @tmp + + if erase +- File.unlink(@tmp) if File.exists?(@tmp) && (ENV["KEEP_TMPFILES"] != "1") ++ File.unlink(@tmp) if FileTest.exist?(@tmp) && (ENV["KEEP_TMPFILES"] != "1") + @debug_commands << "rm #{@tmp}" + @tmp = nil + end +@@ -111,7 +111,7 @@ class Test + command = "../src/mkvpropedit --engage no_variable_data #{file_name} #{args.shift}" + *result = sys command, retcode + +- sys "../src/tools/ebml_validator -M #{file_name}", :dont_record_command => true if FileTest.exists?("../src/tools/ebml_validator") ++ sys "../src/tools/ebml_validator -M #{file_name}", :dont_record_command => true if FileTest.exist?("../src/tools/ebml_validator") + + return *result + end +diff --git a/tools/development/update_translations.rb b/tools/development/update_translations.rb +index fc7e4d7e4..6f5bad185 100755 +--- a/tools/development/update_translations.rb ++++ b/tools/development/update_translations.rb +@@ -106,11 +106,11 @@ module AddPo + base ||= '' + target = "#{$po_dir}/qt/qt#{base}_#{language}.ts" + +- if !FileTest.exists?(target) && /^([a-z]+)_[a-z]+/i.match(language) ++ if !FileTest.exist?(target) && /^([a-z]+)_[a-z]+/i.match(language) + target = "#{$po_dir}/qt/qt#{base}_#{$1}.ts" + end + +- fail "target file does not exist yet: #{target} (wrong language?)" if !FileTest.exists?(target) ++ fail "target file does not exist yet: #{target} (wrong language?)" if !FileTest.exist?(target) + + File.open(target, "w") { |file| file.puts content.map(&:chomp).join("\n") } + File.unlink file_name +-- +GitLab + diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch deleted file mode 100644 index ea737c8b09..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/401287 - ---- filter/filter_pp.c -+++ filter/filter_pp.c -@@ -38,8 +38,8 @@ - - /* FIXME: these use the filter ID as an index--the ID can grow - * arbitrarily large, so this needs to be fixed */ --static pp_mode_t *mode[100]; --static pp_context_t *context[100]; -+static pp_mode *mode[100]; -+static pp_context *context[100]; - static int width[100], height[100]; - static int pre[100]; - diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch deleted file mode 100644 index 871d073fea..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch +++ /dev/null @@ -1,303 +0,0 @@ -Fix build with ffmpeg 0.11. -https://bugs.gentoo.org/show_bug.cgi?id=419551 -Author: Brennan Shacklett - -diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c ---- transcode-1.1.7-orig/encode/encode_lavc.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/encode/encode_lavc.c 2012-07-03 10:47:03.528009149 -0700 -@@ -114,6 +114,7 @@ - - AVFrame ff_venc_frame; - AVCodecContext ff_vcontext; -+ AVDictionary ** ff_opts; - - AVCodec *ff_vcodec; - -@@ -1036,14 +1037,10 @@ - SET_FLAG(pd, mv0); - SET_FLAG(pd, cbp); - SET_FLAG(pd, qpel); -- SET_FLAG(pd, alt); -- SET_FLAG(pd, vdpart); - SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); - SET_FLAG(pd, ildct); - SET_FLAG(pd, aic); -- SET_FLAG(pd, aiv); -- SET_FLAG(pd, umv); - SET_FLAG(pd, psnr); - SET_FLAG(pd, trell); - SET_FLAG(pd, gray); -@@ -1064,6 +1061,18 @@ - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; - } -+ if (pd->confdata.flags.alt) { -+ av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); -+ } -+ if (pd->confdata.flags.vdpart) { -+ av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); -+ } -+ if (pd->confdata.flags.umv) { -+ av_dict_set(pd->ff_opts, "umv", "1", 0); -+ } -+ if (pd->confdata.flags.aiv) { -+ av_dict_set(pd->ff_opts, "aiv", "1", 0); -+ } - } - - #undef SET_FLAG -@@ -1184,18 +1193,18 @@ - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, -- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, -+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, - { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, - { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, -- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART }, -+ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, - #else - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, - #endif -- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV }, -- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV }, -+ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, -+ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, -@@ -1387,7 +1396,7 @@ - pd->confdata.thread_count, - (pd->confdata.thread_count > 1) ?"s" :""); - } -- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count); -+ pd->ff_vcontext.thread_count = pd->confdata.thread_count; - - pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); - if (pd->ff_vcodec == NULL) { -@@ -1397,11 +1406,11 @@ - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec); -+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); - TC_UNLOCK_LIBAVCODEC; - - if (ret < 0) { -- tc_log_error(MOD_NAME, "avcodec_open() failed"); -+ tc_log_error(MOD_NAME, "avcodec_open2() failed"); - goto failed; - } - /* finally, pass up the extradata, if any */ -diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c ---- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 13:15:23.918019415 -0700 -@@ -122,6 +122,7 @@ - static AVFrame *lavc_convert_frame = NULL; - - static AVCodec *lavc_venc_codec = NULL; -+static AVDictionary **lavc_venc_opts = NULL; - static AVFrame *lavc_venc_frame = NULL; - static AVCodecContext *lavc_venc_context; - static avi_t *avifile = NULL; -@@ -180,7 +181,7 @@ - - - /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ --#include <libavcodec/opt.h> -+#include <libavutil/opt.h> - #include <libavutil/avstring.h> - #include <libswscale/swscale.h> - -@@ -470,7 +471,6 @@ - } - - TC_LOCK_LIBAVCODEC; -- avcodec_init(); - avcodec_register_all(); - TC_UNLOCK_LIBAVCODEC; - -@@ -634,7 +634,7 @@ - lavc_param_rc_max_rate = 2516; - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; -+ lavc_param_scan_offset = 1; - - break; - -@@ -674,7 +674,7 @@ - - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; -+ lavc_param_scan_offset = 1; - - break; - -@@ -887,7 +887,7 @@ - lavc_venc_context->thread_count); - } - -- avcodec_thread_init(lavc_venc_context, lavc_param_threads); -+ lavc_venc_context->thread_count = lavc_param_threads; - - if (lavc_param_intra_matrix) { - char *tmp; -@@ -1065,15 +1065,10 @@ - lavc_venc_context->flags |= lavc_param_closedgop; - lavc_venc_context->flags |= lavc_param_trunc; - lavc_venc_context->flags |= lavc_param_aic; -- lavc_venc_context->flags |= lavc_param_umv; - lavc_venc_context->flags |= lavc_param_v4mv; -- lavc_venc_context->flags |= lavc_param_data_partitioning; - lavc_venc_context->flags |= lavc_param_cbp; - lavc_venc_context->flags |= lavc_param_mv0; - lavc_venc_context->flags |= lavc_param_qp_rd; -- lavc_venc_context->flags |= lavc_param_scan_offset; -- lavc_venc_context->flags |= lavc_param_ss; -- lavc_venc_context->flags |= lavc_param_alt; - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1203,7 +1198,6 @@ - - lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - -- - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; -@@ -1241,20 +1235,39 @@ - } - } - -+ if (lavc_param_scan_offset) { -+ av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); -+ } -+ -+ if (lavc_param_ss) { -+ av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); -+ } -+ -+ if (lavc_param_alt) { -+ av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); -+ } -+ -+ if (lavc_param_umv) { -+ av_dict_set(lavc_venc_opts, "umv", "1", 0); -+ } -+ -+ if (lavc_param_data_partitioning) { -+ av_dict_set(lavc_venc_opts, "vdpart", "1", 0); -+ } - - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_venc_context, lavc_venc_codec); -+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); - return TC_EXPORT_ERROR; - } - -- if (lavc_venc_context->codec->encode == NULL) { -+ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec " -- "(lavc_venc_context->codec->encode == NULL)"); -+ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); - return TC_EXPORT_ERROR; - } - -diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c ---- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/ffmpeg_cfg.c 2012-07-03 10:09:25.011003254 -0700 -@@ -160,9 +160,9 @@ - {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, -- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, -+ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -211,7 +211,7 @@ - #else - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, - #endif -- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, -+ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -223,9 +223,9 @@ - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, -- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, -- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, -- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, -+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, -diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c ---- transcode-1.1.7-orig/import/decode_lavc.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/decode_lavc.c 2012-07-03 10:21:46.085005182 -0700 -@@ -181,7 +181,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c ---- transcode-1.1.7-orig/import/import_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/import_ffmpeg.c 2012-07-03 10:19:36.936004841 -0700 -@@ -314,7 +314,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c ---- transcode-1.1.7-orig/import/probe_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/probe_ffmpeg.c 2012-07-03 10:41:42.782008306 -0700 -@@ -99,8 +99,8 @@ - - TC_INIT_LIBAVCODEC; - -- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, -- NULL, 0, NULL); -+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, -+ NULL, NULL); - if (ret != 0) { - tc_log_error(__FILE__, "unable to open '%s'" - " (libavformat failure)", -diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h ---- transcode-1.1.7-orig/libtc/tcavcodec.h 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/libtc/tcavcodec.h 2012-07-03 10:34:43.648007213 -0700 -@@ -53,7 +53,6 @@ - - #define TC_INIT_LIBAVCODEC do { \ - TC_LOCK_LIBAVCODEC; \ -- avcodec_init(); \ - avcodec_register_all(); \ - TC_UNLOCK_LIBAVCODEC; \ - } while (0) diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg.patch deleted file mode 100644 index be7a6cbaeb..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- encode/encode_lavc.c -+++ encode/encode_lavc.c -@@ -955,8 +955,6 @@ - /* - * context *transcode* (not libavcodec) defaults - */ -- pd->ff_vcontext.mb_qmin = 2; -- pd->ff_vcontext.mb_qmax = 31; - pd->ff_vcontext.max_qdiff = 3; - pd->ff_vcontext.max_b_frames = 0; - pd->ff_vcontext.me_range = 0; -@@ -1116,8 +1114,6 @@ - // handled by transcode core - // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - // handled by transcode core -- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, -- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, ---- export/ffmpeg_cfg.c -+++ export/ffmpeg_cfg.c -@@ -34,8 +34,6 @@ - //int lavc_param_vqscale = 0; - //int lavc_param_vqmin = 2; - //int lavc_param_vqmax = 31; --int lavc_param_mb_qmin = 2; --int lavc_param_mb_qmax = 31; - int lavc_param_lmin = 2; - int lavc_param_lmax = 31; - int lavc_param_vqdiff = 3; -@@ -143,8 +141,6 @@ - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, ---- export/ffmpeg_cfg.h -+++ export/ffmpeg_cfg.h -@@ -13,8 +13,6 @@ - //extern int lavc_param_vqscale; - //extern int lavc_param_vqmin; - //extern int lavc_param_vqmax; --extern int lavc_param_mb_qmin; --extern int lavc_param_mb_qmax; - extern int lavc_param_lmin; - extern int lavc_param_lmax; - extern int lavc_param_vqdiff; diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch deleted file mode 100644 index 9a770a6a0d..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch +++ /dev/null @@ -1,557 +0,0 @@ -Fix build with ffmpeg-2.0. -Fix segfaults introduced by wrong usage of the av_dict API. -Fix forgotten parts in the libav9 patch. - -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -74,6 +74,9 @@ struct tclavcconfigdata_ { - int lmin; - int lmax; - int me_method; -+ int luma_elim_threshold; -+ int chroma_elim_threshold; -+ int quantizer_noise_shaping; - - /* same as above for flags */ - struct { -@@ -114,7 +117,7 @@ struct tclavcprivatedata_ { - - AVFrame ff_venc_frame; - AVCodecContext ff_vcontext; -- AVDictionary ** ff_opts; -+ AVDictionary * ff_opts; - - AVCodec *ff_vcodec; - -@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou - TC_CODEC_ERROR - }; - -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static const enum CodecID tc_lavc_internal_codecs[] = { - CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4, - CODEC_ID_H263I, CODEC_ID_H263P, -@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern - CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3, - CODEC_ID_NONE - }; -+#else -+static const enum AVCodecID tc_lavc_internal_codecs[] = { -+ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4, -+ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P, -+ AV_CODEC_ID_H264, -+ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, -+ AV_CODEC_ID_RV10, -+ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1, -+ AV_CODEC_ID_DVVIDEO, -+ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG, -+ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3, -+ AV_CODEC_ID_NONE -+}; -+#endif - - static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR }; - -@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL - static void tc_lavc_config_defaults(TCLavcPrivateData *pd) - { - /* first of all reinitialize lavc data */ -+#if LIBAVCODEC_VERSION_MAJOR < 55 - avcodec_get_context_defaults(&pd->ff_vcontext); -+#else -+ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL); -+#endif - - pd->confdata.thread_count = 1; - -@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.mpeg_quant = 0; - pd->ff_vcontext.rc_initial_cplx = 0.0; - pd->ff_vcontext.rc_qsquish = 1.0; -- pd->ff_vcontext.luma_elim_threshold = 0; -- pd->ff_vcontext.chroma_elim_threshold = 0; -+ pd->confdata.luma_elim_threshold = 0; -+ pd->confdata.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; - pd->ff_vcontext.dct_algo = FF_DCT_AUTO; - pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; -@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.noise_reduction = 0; -- pd->ff_vcontext.quantizer_noise_shaping = 0; -+ pd->confdata.quantizer_noise_shaping = 0; - pd->ff_vcontext.flags = 0; - } - -@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC - - pd->ff_vcontext.flags = 0; - SET_FLAG(pd, mv0); -- SET_FLAG(pd, cbp); - SET_FLAG(pd, qpel); - SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); -@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; - } - if (pd->confdata.flags.alt) { -- av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); -+ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); - } - if (pd->confdata.flags.vdpart) { -- av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); -+ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0); - } - if (pd->confdata.flags.umv) { -- av_dict_set(pd->ff_opts, "umv", "1", 0); -+ av_dict_set(&(pd->ff_opts), "umv", "1", 0); - } - if (pd->confdata.flags.aiv) { -- av_dict_set(pd->ff_opts, "aiv", "1", 0); -+ av_dict_set(&(pd->ff_opts), "aiv", "1", 0); - } -+ if (pd->confdata.flags.cbp) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); -+ } -+ -+ char buf[1024]; -+#define set_dict_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ -+ av_dict_set(&(pd->ff_opts), opt, buf, 0) -+ -+ set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); -+ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); -+ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); - } - - #undef SET_FLAG -@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri - { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported - { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -+ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -+ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, - { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri - { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, -+ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, -- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, -+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, -@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns - - pd = self->userdata; - -+ pd->ff_opts = NULL; -+ - pd->flush_flag = vob->encoder_flush; - - /* FIXME: move into core? */ -@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); -+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts)); - TC_UNLOCK_LIBAVCODEC; - - if (ret < 0) { -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -122,7 +122,7 @@ static uint8_t *img_buffer = - static AVFrame *lavc_convert_frame = NULL; - - static AVCodec *lavc_venc_codec = NULL; --static AVDictionary **lavc_venc_opts = NULL; -+static AVDictionary *lavc_venc_opts = NULL; - static AVFrame *lavc_venc_frame = NULL; - static AVCodecContext *lavc_venc_context; - static avi_t *avifile = NULL; -@@ -486,7 +486,7 @@ MOD_init - codec->name, codec->fourCC, codec->comments); - } - -- lavc_venc_context = avcodec_alloc_context(); -+ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); - lavc_venc_frame = avcodec_alloc_frame(); - - lavc_convert_frame= avcodec_alloc_frame(); -@@ -838,8 +838,13 @@ MOD_init - lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; -- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; -- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; -+ -+ char buf[1024]; -+#define set_dict_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%i", val); \ -+ av_dict_set(&lavc_venc_opts, opt, buf, 0) -+ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); -+ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -870,7 +875,7 @@ MOD_init - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; - lavc_venc_context->noise_reduction = lavc_param_noise_reduction; -- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; -+ set_dict_opt(lavc_param_inter_threshold, "inter_threshold"); - lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; - lavc_venc_context->skip_top = lavc_param_skip_top; - lavc_venc_context->skip_bottom = lavc_param_skip_bottom; -@@ -1066,9 +1071,11 @@ MOD_init - lavc_venc_context->flags |= lavc_param_trunc; - lavc_venc_context->flags |= lavc_param_aic; - lavc_venc_context->flags |= lavc_param_v4mv; -- lavc_venc_context->flags |= lavc_param_cbp; -+ if(lavc_param_cbp) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0); - lavc_venc_context->flags |= lavc_param_mv0; -- lavc_venc_context->flags |= lavc_param_qp_rd; -+ if(lavc_param_qp_rd) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1238,29 +1245,29 @@ MOD_init - } - - if (lavc_param_scan_offset) { -- av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); -+ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0); - } - - if (lavc_param_ss) { -- av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); -+ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0); - } - - if (lavc_param_alt) { -- av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); -+ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0); - } - - if (lavc_param_umv) { -- av_dict_set(lavc_venc_opts, "umv", "1", 0); -+ av_dict_set(&lavc_venc_opts, "umv", "1", 0); - } - - if (lavc_param_data_partitioning) { -- av_dict_set(lavc_venc_opts, "vdpart", "1", 0); -+ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0); - } - - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); -+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={ - {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, -- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, -+ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, -+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, - {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, -Index: transcode-1.1.7/export/aud_aux.c -=================================================================== ---- transcode-1.1.7.orig/export/aud_aux.c -+++ transcode-1.1.7/export/aud_aux.c -@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec) - - switch (o_codec) { - case 0x50: -+#if LIBAVCODEC_VERSION_MAJOR < 55 - codeid = CODEC_ID_MP2; -+#else -+ codeid = AV_CODEC_ID_MP2; -+#endif - break; - case 0x2000: -+#if LIBAVCODEC_VERSION_MAJOR < 55 - codeid = CODEC_ID_AC3; -+#else -+ codeid = AV_CODEC_ID_AC3; -+#endif - break; - default: - tc_warn("cannot init ffmpeg with %x", o_codec); -@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - - //-- set parameters (bitrate, channels and sample-rate) -- - //-------------------------------------------------------- -- avcodec_get_context_defaults(&mpa_ctx); -+ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); - #if LIBAVCODEC_VERSION_MAJOR < 53 - mpa_ctx.codec_type = CODEC_TYPE_AUDIO; - #else -@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&mpa_ctx, mpa_codec); -+ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", -@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec) - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", -- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3"); -+#if LIBAVCODEC_VERSION_MAJOR < 55 -+ (codeid == CODEC_ID_MP2) -+#else -+ (codeid == AV_CODEC_ID_MP2) -+#endif -+ ?"mpa" :"ac3"); - return(TC_EXPORT_ERROR); - } - -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -58,6 +58,7 @@ struct ffmpeg_codec { - }; - - // fourCC to ID mapping taken from MPlayer's codecs.conf -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", - {"MP41", "DIV1", ""}}, -@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", - {"Y42B", ""}}, - {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#else -+static struct ffmpeg_codec ffmpeg_codecs[] = { -+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", -+ {"MP41", "DIV1", ""}}, -+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", -+ {"MP42", "DIV2", ""}}, -+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", -+ {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, -+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", -+ {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, -+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", -+ {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, -+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", -+ {"MPG1", ""}}, -+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", -+ {"DVSD", ""}}, -+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", -+ {"WMV1", ""}}, -+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", -+ {"WMV2", ""}}, -+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", -+ {"HFYU", ""}}, -+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", -+ {"I263", ""}}, -+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", -+ {"H263", "U263", "VIV1", ""}}, -+ {AV_CODEC_ID_H264, TC_CODEC_H264, "h264", -+ {"H264", "h264", "X264", "x264", "avc1", ""}}, -+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", -+ {"RV10", "RV13", ""}}, -+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", -+ {"SVQ1", ""}}, -+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", -+ {"SVQ3", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", -+ {"MPG2", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", -+ {"MPG2", ""}}, -+ {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", -+ {"ASV1", ""}}, -+ {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", -+ {"ASV2", ""}}, -+ {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", -+ {"FFV1", ""}}, -+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", -+ {"I420", "IYUV", ""}}, -+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", -+ {"Y42B", ""}}, -+ {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#endif - - #define BUFFER_SIZE SIZE_RGB_FRAME - -@@ -302,7 +302,7 @@ do_avi: - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); - if (lavc_dec_context == NULL) { - tc_log_error(MOD_NAME, "Could not allocate enough memory."); - return TC_IMPORT_ERROR; -@@ -324,6 +375,7 @@ do_avi: - // XXX: some codecs need extra data - switch (codec->id) - { -+#if LIBAVCODEC_VERSION_MAJOR < 55 - case CODEC_ID_MJPEG: extra_data_size = 28; break; - case CODEC_ID_LJPEG: extra_data_size = 28; break; - case CODEC_ID_HUFFYUV: extra_data_size = 1000; break; -@@ -331,6 +383,15 @@ do_avi: - case CODEC_ID_ASV2: extra_data_size = 8; break; - case CODEC_ID_WMV1: extra_data_size = 4; break; - case CODEC_ID_WMV2: extra_data_size = 4; break; -+#else -+ case AV_CODEC_ID_MJPEG: extra_data_size = 28; break; -+ case AV_CODEC_ID_LJPEG: extra_data_size = 28; break; -+ case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break; -+ case AV_CODEC_ID_ASV1: extra_data_size = 8; break; -+ case AV_CODEC_ID_ASV2: extra_data_size = 8; break; -+ case AV_CODEC_ID_WMV1: extra_data_size = 4; break; -+ case AV_CODEC_ID_WMV2: extra_data_size = 4; break; -+#endif - default: extra_data_size = 0; break; - } - -@@ -344,7 +344,7 @@ do_avi: - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_dec_context, lavc_dec_codec); -+ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", -@@ -360,7 +421,11 @@ do_avi: - frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim); - - // we adapt the color space -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if(codec->id == CODEC_ID_MJPEG) { -+#else -+ if(codec->id == AV_CODEC_ID_MJPEG) { -+#endif - enable_levels_filter(); - } - break; -@@ -434,7 +499,11 @@ do_dv: - } - - // we adapt the color space -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if(codec->id == CODEC_ID_MJPEG) { -+#else -+ if(codec->id == AV_CODEC_ID_MJPEG) { -+#endif - enable_levels_filter(); - } - -@@ -504,13 +573,25 @@ MOD_decode { - int bkey = 0; - - // check for keyframes -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if (codec->id == CODEC_ID_MSMPEG4V3) { -+#else -+ if (codec->id == AV_CODEC_ID_MSMPEG4V3) { -+#endif - if (divx3_is_key(buffer)) bkey = 1; - } -+#if LIBAVCODEC_VERSION_MAJOR < 55 - else if (codec->id == CODEC_ID_MPEG4) { -+#else -+ else if (codec->id == AV_CODEC_ID_MPEG4) { -+#endif - if (mpeg4_is_key(buffer, bytes_read)) bkey = 1; - } -+#if LIBAVCODEC_VERSION_MAJOR < 55 - else if (codec->id == CODEC_ID_MJPEG) { -+#else -+ else if (codec->id == AV_CODEC_ID_MJPEG) { -+#endif - bkey = 1; - } - ---- a/import/decode_lavc.c -+++ b/import/decode_lavc.c -@@ -57,6 +57,7 @@ struct ffmpeg_codec { - }; - - // fourCC to ID mapping taken from MPlayer's codecs.conf -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", - {"MP41", "DIV1", ""}}, -@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", - {"MPG2", ""}}, - {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#else -+static struct ffmpeg_codec ffmpeg_codecs[] = { -+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", -+ {"MP41", "DIV1", ""}}, -+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", -+ {"MP42", "DIV2", ""}}, -+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", -+ {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, -+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", -+ {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, -+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", -+ {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, -+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", -+ {"MPG1", ""}}, -+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", -+ {"DVSD", ""}}, -+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", -+ {"WMV1", ""}}, -+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", -+ {"WMV2", ""}}, -+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", -+ {"HFYU", ""}}, -+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", -+ {"I263", ""}}, -+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", -+ {"H263", "U263", "VIV1", ""}}, -+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", -+ {"RV10", "RV13", ""}}, -+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", -+ {"SVQ1", ""}}, -+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", -+ {"SVQ3", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", -+ {"MPG2", ""}}, -+ {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#endif - - - static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id) diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch deleted file mode 100644 index 57a91774ab..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=520190 - -Index: transcode-1.1.7/import/probe_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/probe_ffmpeg.c -+++ transcode-1.1.7/import/probe_ffmpeg.c -@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe) - - translate_info(lavf_dmx_context, ipipe->probe_info); - -+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0) -+ avformat_close_input(&lavf_dmx_context); -+#else - av_close_input_file(lavf_dmx_context); -+#endif - return; - } - diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch deleted file mode 100644 index 7901fc3cc3..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch +++ /dev/null @@ -1,352 +0,0 @@ -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - } - -@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf - IMG_YUV_DEFAULT, - pd->ff_vcontext.width, pd->ff_vcontext.height); - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV422P, -+ AV_PIX_FMT_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(src, IMG_YUV_DEFAULT, - pd->ff_venc_frame.data, IMG_YUV422P, -@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL - IMG_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(src, IMG_YUV422P, - pd->ff_venc_frame.data, IMG_YUV420P, -@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, -- PIX_FMT_YUV422P, -+ AV_PIX_FMT_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - - } -@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT, - pd->ff_venc_frame.data, IMG_YUV420P, -@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri - case CODEC_YUV: - if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { - pd->tc_pix_fmt = TC_CODEC_YUV422P; -- pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P; -+ pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P; - pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv; - } else { - pd->tc_pix_fmt = TC_CODEC_YUV420P; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ420P -- : PIX_FMT_YUV420P; -+ ? AV_PIX_FMT_YUVJ420P -+ : AV_PIX_FMT_YUV420P; - pd->pre_encode_video = pre_encode_video_yuv420p; - } - break; - case CODEC_YUV422: - pd->tc_pix_fmt = TC_CODEC_YUV422P; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ422P -- : PIX_FMT_YUV422P; -+ ? AV_PIX_FMT_YUVJ422P -+ : AV_PIX_FMT_YUV422P; - if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { - pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv; - } else { -@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri - case CODEC_RGB: - pd->tc_pix_fmt = TC_CODEC_RGB; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) -- ? PIX_FMT_YUV422P -+ ? AV_PIX_FMT_YUV422P - : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ420P -- : PIX_FMT_YUV420P; -+ ? AV_PIX_FMT_YUVJ420P -+ : AV_PIX_FMT_YUV420P; - pd->pre_encode_video = pre_encode_video_rgb24; - break; - default: -@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns - /* FIXME: move into core? */ - TC_INIT_LIBAVCODEC; - -- avcodec_get_frame_defaults(&pd->ff_venc_frame); -+ av_frame_unref(&pd->ff_venc_frame); - /* - * auxiliary config data needs to be blanked too - * before any other operation -@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule - vframe_list_t *outframe) - { - TCLavcPrivateData *pd = NULL; -+ AVPacket pkt; -+ int ret, got_packet = 0; - - TC_MODULE_SELF_CHECK(self, "encode_video"); - -@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule - - pd->pre_encode_video(pd, inframe); - -+ av_init_packet(&pkt); -+ pkt.data = outframe->video_buf; -+ pkt.size = inframe->video_size; -+ - TC_LOCK_LIBAVCODEC; -- outframe->video_len = avcodec_encode_video(&pd->ff_vcontext, -- outframe->video_buf, -- inframe->video_size, -- &pd->ff_venc_frame); -+ ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt, -+ &pd->ff_venc_frame, &got_packet); - TC_UNLOCK_LIBAVCODEC; -+ outframe->video_len = ret ? ret : pkt.size; - - if (outframe->video_len < 0) { - tc_log_warn(MOD_NAME, "encoder error: size (%i)", -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c - for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){ - /* GLUE: +if */ - if (type == AVMEDIA_TYPE_VIDEO) { -- const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); -- if(o2) -- ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o); -+ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); -+ if(o) -+ ret = av_opt_set(avcodec_opts[type], opt, arg, 0); - /* GLUE: +if */ - } - } -@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c - if(opt[0] == 'a') - ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o); - else */ if(opt[0] == 'v') -- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o); -+ { -+ o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0); -+ ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0); -+ } - /* GLUE: disabling - else if(opt[0] == 's') - ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); -@@ -487,10 +490,10 @@ MOD_init - } - - lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); -- lavc_venc_frame = avcodec_alloc_frame(); -+ lavc_venc_frame = av_frame_alloc(); - -- lavc_convert_frame= avcodec_alloc_frame(); -- size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); -+ lavc_convert_frame= av_frame_alloc(); -+ size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); - enc_buffer = tc_malloc(size); - - if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { -@@ -1114,7 +1117,7 @@ MOD_init - lavc_venc_context->prediction_method = lavc_param_prediction_method; - - if(is_huffyuv) -- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; - else - { - switch(pix_fmt) -@@ -1123,18 +1126,18 @@ MOD_init - case CODEC_RGB: - { - if(is_mjpeg) -- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P; - else -- lavc_venc_context->pix_fmt = PIX_FMT_YUV420P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P; - break; - } - - case CODEC_YUV422: - { - if(is_mjpeg) -- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P; - else -- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; - break; - } - -@@ -1596,6 +1599,8 @@ MOD_encode - - int out_size; - const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; -+ AVPacket pkt; -+ int ret, got_packet = 0; - - if (param->flag == TC_VIDEO) { - -@@ -1620,7 +1625,7 @@ MOD_encode - YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, - lavc_venc_context->width, lavc_venc_context->height); - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV422P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV422P, lavc_venc_context->width, - lavc_venc_context->height); - /* FIXME: can't use tcv_convert (see decode_lavc.c) */ - ac_imgconvert(src, IMG_YUV_DEFAULT, -@@ -1650,7 +1655,7 @@ MOD_encode - lavc_venc_context->width, - lavc_venc_context->height); - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV420P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV420P, lavc_venc_context->width, - lavc_venc_context->height); - ac_imgconvert(src, IMG_YUV422P, - lavc_venc_frame->data, IMG_YUV420P, -@@ -1661,7 +1666,7 @@ MOD_encode - - case CODEC_RGB: - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV420P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV420P, lavc_venc_context->width, - lavc_venc_context->height); - ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT, - lavc_venc_frame->data, IMG_YUV420P, -@@ -1674,13 +1679,17 @@ MOD_encode - return TC_EXPORT_ERROR; - } - -+ av_init_packet(&pkt); -+ pkt.data = enc_buffer; -+ pkt.size = size; - - TC_LOCK_LIBAVCODEC; -- out_size = avcodec_encode_video(lavc_venc_context, -- enc_buffer, size, -- lavc_venc_frame); -+ ret = avcodec_encode_video2(lavc_venc_context, &pkt, -+ lavc_venc_frame, &got_packet); - TC_UNLOCK_LIBAVCODEC; - -+ out_size = ret ? ret : pkt.size; -+ - if (out_size < 0) { - tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); - return TC_EXPORT_ERROR; -Index: transcode-1.1.7/import/decode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/import/decode_lavc.c -+++ transcode-1.1.7/import/decode_lavc.c -@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode) - - // Convert avcodec image to the requested YUV or RGB format - switch (lavc_dec_context->pix_fmt) { -- case PIX_FMT_YUVJ420P: -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUVJ420P: -+ case AV_PIX_FMT_YUV420P: - // Remove "dead space" at right edge of planes, if any - if (picture.linesize[0] != lavc_dec_context->width) { - int y; -@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUV411P: -+ case AV_PIX_FMT_YUV411P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUVJ422P: -- case PIX_FMT_YUV422P: -+ case AV_PIX_FMT_YUVJ422P: -+ case AV_PIX_FMT_YUV422P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUVJ444P: -- case PIX_FMT_YUV444P: -+ case AV_PIX_FMT_YUVJ444P: -+ case AV_PIX_FMT_YUV444P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -661,8 +661,8 @@ retry: - - // Convert avcodec image to our internal YUV or RGB format - switch (lavc_dec_context->pix_fmt) { -- case PIX_FMT_YUVJ420P: -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUVJ420P: -+ case AV_PIX_FMT_YUV420P: - src_fmt = IMG_YUV420P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -693,7 +693,7 @@ retry: - } - break; - -- case PIX_FMT_YUV411P: -+ case AV_PIX_FMT_YUV411P: - src_fmt = IMG_YUV411P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -721,8 +721,8 @@ retry: - } - break; - -- case PIX_FMT_YUVJ422P: -- case PIX_FMT_YUV422P: -+ case AV_PIX_FMT_YUVJ422P: -+ case AV_PIX_FMT_YUV422P: - src_fmt = IMG_YUV422P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -750,8 +750,8 @@ retry: - } - break; - -- case PIX_FMT_YUVJ444P: -- case PIX_FMT_YUV444P: -+ case AV_PIX_FMT_YUVJ444P: -+ case AV_PIX_FMT_YUV444P: - src_fmt = IMG_YUV444P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch deleted file mode 100644 index 9ad765e1c3..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch +++ /dev/null @@ -1,508 +0,0 @@ -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -77,6 +77,13 @@ struct tclavcconfigdata_ { - int luma_elim_threshold; - int chroma_elim_threshold; - int quantizer_noise_shaping; -+ int inter_quant_bias; -+ int intra_quant_bias; -+ int scenechange_factor; -+ int rc_strategy; -+ float rc_initial_cplx; -+ float rc_qsquish; -+ float border_masking; - - /* same as above for flags */ - struct { -@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc - switch (vob->divxmultipass) { - case 1: - CAN_DO_MULTIPASS(multipass_flag); -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1; - pd->stats_file = fopen(vob->divxlogfile, "w"); - if (pd->stats_file == NULL) { - tc_log_error(MOD_NAME, "could not create 2pass log file" -@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc - break; - case 2: - CAN_DO_MULTIPASS(multipass_flag); -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2; - pd->stats_file = fopen(vob->divxlogfile, "r"); - if (pd->stats_file == NULL){ - tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\"" -@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc - break; - case 3: - /* fixed qscale :p */ -- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE; - pd->ff_venc_frame.quality = vob->divxbitrate; - break; - } -@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa - pd->confdata.rc_buffer_size = 0; - pd->confdata.lmin = 2; - pd->confdata.lmax = 31; -- pd->confdata.me_method = ME_EPZS; -+ pd->confdata.me_method = 0; - - memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags)); - pd->confdata.turbo_setup = 0; -@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.me_range = 0; - pd->ff_vcontext.mb_decision = 0; - pd->ff_vcontext.scenechange_threshold = 0; -- pd->ff_vcontext.scenechange_factor = 1; -+ pd->confdata.scenechange_factor = 1; - pd->ff_vcontext.b_frame_strategy = 0; - pd->ff_vcontext.b_sensitivity = 40; - pd->ff_vcontext.brd_scale = 0; - pd->ff_vcontext.bidir_refine = 0; -- pd->ff_vcontext.rc_strategy = 2; -+ pd->confdata.rc_strategy = 2; - pd->ff_vcontext.b_quant_factor = 1.25; - pd->ff_vcontext.i_quant_factor = 0.8; - pd->ff_vcontext.b_quant_offset = 1.25; -@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.qblur = 0.5; - pd->ff_vcontext.qcompress = 0.5; - pd->ff_vcontext.mpeg_quant = 0; -- pd->ff_vcontext.rc_initial_cplx = 0.0; -- pd->ff_vcontext.rc_qsquish = 1.0; -+ pd->confdata.rc_initial_cplx = 0.0; -+ pd->confdata.rc_qsquish = 1.0; - pd->confdata.luma_elim_threshold = 0; - pd->confdata.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; -@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.temporal_cplx_masking = 0.0; - pd->ff_vcontext.spatial_cplx_masking = 0.0; - pd->ff_vcontext.p_masking = 0.0; -- pd->ff_vcontext.border_masking = 0.0; -+ pd->confdata.border_masking = 0.0; - pd->ff_vcontext.me_pre_cmp = 0; - pd->ff_vcontext.me_cmp = 0; - pd->ff_vcontext.me_sub_cmp = 0; -@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.pre_me = 1; - pd->ff_vcontext.me_subpel_quality = 8; - pd->ff_vcontext.refs = 1; -- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; -- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.noise_reduction = 0; - pd->confdata.quantizer_noise_shaping = 0; - pd->ff_vcontext.flags = 0; -@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa - */ - static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd) - { -+ char buf[1024]; - /* some translation... */ - pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000; - pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000; - pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000; - pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024; -- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5); -- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5); -- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5)); -+ av_dict_set(&(pd->ff_opts), "lmin", buf, 0); -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5)); -+ av_dict_set(&(pd->ff_opts), "lmax", buf, 0); - - pd->ff_vcontext.flags = 0; -- SET_FLAG(pd, mv0); - SET_FLAG(pd, qpel); -- SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); - SET_FLAG(pd, ildct); - SET_FLAG(pd, aic); -@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC - } - if (pd->interlacing.active) { - /* enforce interlacing */ -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME; - } - if (pd->confdata.flags.alt) { - av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); -@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC - if (pd->confdata.flags.cbp) { - av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); - } -+ if (pd->confdata.flags.mv0) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0); -+ } -+ if (pd->confdata.flags.naq) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); -+ } - -- char buf[1024]; - #define set_dict_opt(val, opt) \ - snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ - av_dict_set(&(pd->ff_opts), opt, buf, 0) -+#define set_dict_float_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\ -+ av_dict_set(&(pd->ff_opts), opt, buf, 0) - - set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); - set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); - set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); -+ set_dict_opt(inter_quant_bias, "pbias"); -+ set_dict_opt(intra_quant_bias, "ibias"); -+ set_dict_opt(me_method, "me_method"); -+ set_dict_opt(scenechange_factor, "sc_factor"); -+ set_dict_opt(rc_strategy, "rc_strategy"); -+ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx"); -+ set_dict_float_opt(rc_qsquish, "qsquish"); -+ set_dict_float_opt(border_masking, "border_mask"); - } - - #undef SET_FLAG -@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, -- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES }, -+ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX }, - { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, }, - { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, - { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 }, -- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, -+ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, - { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, - { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 }, - { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri - { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, - { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, - { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 }, -- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, -+ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, - { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, - { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, - { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 }, -@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri - { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 }, - // { "vrc_eq", }, // not yet supported - { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 }, -- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, -+ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported -- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -+ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, - { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri - { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, -- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, -+ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 }, - { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, - { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, -@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri - { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 }, - { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 }, -- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -+ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -+ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - -- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, -+ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, -+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL }, - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, -- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, -- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, -+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME }, -+ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT }, -+ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, - #else -- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, -+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED }, - #endif - { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, -+ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, - #else - { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #endif -- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY }, -- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV }, -- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP }, -+ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY }, -+ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV }, -+ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP }, - - // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported - /* End of the config file */ -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -831,14 +831,11 @@ MOD_init - - lavc_venc_context->bit_rate = vob->divxbitrate * 1000; - lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; -- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); -- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); - lavc_venc_context->max_qdiff = lavc_param_vqdiff; - lavc_venc_context->qcompress = lavc_param_vqcompress; - lavc_venc_context->qblur = lavc_param_vqblur; - lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames; - lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor; -- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; - -@@ -846,8 +843,23 @@ MOD_init - #define set_dict_opt(val, opt) \ - snprintf(buf, sizeof(buf), "%i", val); \ - av_dict_set(&lavc_venc_opts, opt, buf, 0) -+#define set_dict_float_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%f", val); \ -+ av_dict_set(&lavc_venc_opts, opt, buf, 0) - set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); - set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin"); -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax"); -+ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy"); -+ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish"); -+ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp"); -+ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq"); -+ set_dict_opt(lavc_param_rc_eq, "rc_eq"); -+ set_dict_opt(lavc_param_vme, "me_method"); -+ set_dict_opt(lavc_param_ibias, "ibias"); -+ set_dict_opt(lavc_param_pbias, "pbias"); -+ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity"); -+ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx"); - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -856,15 +868,9 @@ MOD_init - lavc_venc_context->strict_std_compliance= lavc_param_strict; - lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor; - lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset; -- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish; -- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp; -- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq; -- lavc_venc_context->rc_eq = lavc_param_rc_eq; - lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000; - lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000; - lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024; -- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; -- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx; - lavc_venc_context->debug = lavc_param_debug; - lavc_venc_context->last_predictor_count= lavc_param_last_pred; - lavc_venc_context->pre_me = lavc_param_pre_me; -@@ -872,8 +878,6 @@ MOD_init - lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size; - lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality; - lavc_venc_context->me_range = lavc_param_me_range; -- lavc_venc_context->intra_quant_bias = lavc_param_ibias; -- lavc_venc_context->inter_quant_bias = lavc_param_pbias; - lavc_venc_context->coder_type = lavc_param_coder; - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; -@@ -1079,6 +1083,8 @@ MOD_init - lavc_venc_context->flags |= lavc_param_mv0; - if(lavc_param_qp_rd) - av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); -+ if (lavc_param_normalize_aqp) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1087,9 +1093,7 @@ MOD_init - #endif - - if (lavc_param_gray) -- lavc_venc_context->flags |= CODEC_FLAG_GRAY; -- if (lavc_param_normalize_aqp) -- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY; - - switch(vob->encode_fields) { - case TC_ENCODE_FIELDS_TOP_FIRST: -@@ -1107,9 +1111,9 @@ MOD_init - } - - lavc_venc_context->flags |= interlacing_active ? -- CODEC_FLAG_INTERLACED_DCT : 0; -+ AV_CODEC_FLAG_INTERLACED_DCT : 0; - lavc_venc_context->flags |= interlacing_active ? -- CODEC_FLAG_INTERLACED_ME : 0; -+ AV_CODEC_FLAG_INTERLACED_ME : 0; - - lavc_venc_context->flags |= lavc_param_psnr; - do_psnr = lavc_param_psnr; -@@ -1156,7 +1160,7 @@ MOD_init - "encoding."); - return TC_EXPORT_ERROR; - } -- lavc_venc_context->flags |= CODEC_FLAG_PASS1; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1; - stats_file = fopen(vob->divxlogfile, "w"); - if (stats_file == NULL){ - tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".", -@@ -1170,7 +1174,7 @@ MOD_init - "encoding."); - return TC_EXPORT_ERROR; - } -- lavc_venc_context->flags |= CODEC_FLAG_PASS2; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2; - stats_file= fopen(vob->divxlogfile, "r"); - if (stats_file==NULL){ - tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for " -@@ -1201,12 +1205,11 @@ MOD_init - break; - case 3: - /* fixed qscale :p */ -- lavc_venc_context->flags |= CODEC_FLAG_QSCALE; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE; - lavc_venc_frame->quality = vob->divxbitrate; - break; - } - -- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0; - int lavc_param_pre_me= 1; - int lavc_param_me_subpel_quality= 8; - int lavc_param_me_range=0; --int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS; --int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS; -+int lavc_param_ibias=0; -+int lavc_param_pbias=0; - int lavc_param_coder=0; - int lavc_param_context=0; - char *lavc_param_intra_matrix = NULL; -@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000}, - {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, -- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV}, -+ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV}, - {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5}, - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, - {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, - {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, -- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES}, -+ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX}, - // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={ - {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20}, - {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0}, - {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, -- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR}, -+ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR}, - {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, -@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={ - {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, - {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, -- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL}, -+ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL}, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT}, -+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT}, - #else - {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1}, - #endif -@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={ - {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8}, - {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000}, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC}, -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC}, - #else -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED}, - #endif - {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, -@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={ - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, -- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, -+ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, - {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, -- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, -+ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, -- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, -- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, -- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, -+ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED}, -+ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP}, - {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, - {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, - {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -361,7 +361,7 @@ do_avi: - lavc_dec_context->width = x_dim; - lavc_dec_context->height = y_dim; - -- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY; -+ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else diff --git a/multimedia/transcode/transcode-1.1.7-libav-10.patch b/multimedia/transcode/transcode-1.1.7-libav-10.patch deleted file mode 100644 index 1f4a24039d..0000000000 --- a/multimedia/transcode/transcode-1.1.7-libav-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -fix building w/libav-10 - -https://wiki.libav.org/Migration/10 - ---- a/filter/filter_resample.c -+++ b/filter/filter_resample.c -@@ -37,6 +37,7 @@ - #include "libtc/optstr.h" - #include "libtc/tcavcodec.h" - #include "libtc/tcmodule-plugin.h" -+#include <libavresample/avresample.h> - - - typedef struct { -@@ -45,7 +46,7 @@ typedef struct { - - int bytes_per_sample; - -- ReSampleContext *resample_ctx; -+ AVAudioResampleContext *resample_ctx; - } ResamplePrivateData; - - static const char resample_help[] = "" ---- a/import/probe_ffmpeg.c -+++ b/import/probe_ffmpeg.c -@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info) - info->bitrate = st->codec->bit_rate / 1000; - info->width = st->codec->width; - info->height = st->codec->height; -- if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) { -- info->fps = av_q2d(st->r_frame_rate); -+ if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) { -+ info->fps = av_q2d(st->avg_frame_rate); - } else { - /* watch out here */ - info->fps = 1.0/av_q2d(st->codec->time_base); diff --git a/multimedia/transcode/transcode-1.1.7-libav-9.patch b/multimedia/transcode/transcode-1.1.7-libav-9.patch deleted file mode 100644 index 3989d3d83a..0000000000 --- a/multimedia/transcode/transcode-1.1.7-libav-9.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 -+++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 -@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe) - return; - } - -- ret = av_find_stream_info(lavf_dmx_context); -+ ret = avformat_find_stream_info(lavf_dmx_context, NULL); - if (ret < 0) { - tc_log_error(__FILE__, "unable to fetch informations from '%s'" - " (libavformat failure)", ---- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 -+++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 -@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode) - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(NULL); - if (lavc_dec_context == NULL) { - tc_log_error(__FILE__, "Could not allocate enough memory."); - goto decoder_error; -@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode) - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; - -- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { -+ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { - tc_log_error(__FILE__, "Could not initialize the '%s' codec.", - codec->name); - goto decoder_error; diff --git a/multimedia/transcode/transcode-1.1.7-preset-force.patch b/multimedia/transcode/transcode-1.1.7-preset-force.patch deleted file mode 100644 index 0d1da8b4f6..0000000000 --- a/multimedia/transcode/transcode-1.1.7-preset-force.patch +++ /dev/null @@ -1,28 +0,0 @@ -Do not force using a preset. Do not try to open non-existant preset by default. - -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -1206,7 +1206,7 @@ MOD_init - lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ -- if (lavc_param_video_preset) { -+ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; - video_codec_name = av_strdup(ffmpeg_codec_name(codec->name)); - -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -124,7 +124,7 @@ int lavc_param_gmc = 0; - //int lavc_param_atag = 0; - //int lavc_param_abitrate = 224; - --char *lavc_param_video_preset = "medium"; -+char *lavc_param_video_preset = "none"; - char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; - - TCConfigEntry lavcopts_conf[]={ diff --git a/multimedia/transcode/transcode-1.1.7-preset-free.patch b/multimedia/transcode/transcode-1.1.7-preset-free.patch deleted file mode 100644 index 00494b94ba..0000000000 --- a/multimedia/transcode/transcode-1.1.7-preset-free.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix invalid free when preset file not found -https://bugs.gentoo.org/show_bug.cgi?id=322945 -Author: Brennan Shacklett - -diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c ---- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 20:07:05.669083945 -0700 -@@ -321,7 +321,7 @@ - } - - if(!f){ -- fprintf(stderr, "File for preset '%s' not found\n", arg); -+ tc_log_error(MOD_NAME, "File for preset '%s' not found", arg); - av_exit(1); - } - -@@ -1207,7 +1207,7 @@ - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; -- video_codec_name = ffmpeg_codec_name(codec->name); -+ video_codec_name = av_strdup(ffmpeg_codec_name(codec->name)); - - const char *preset_start = lavc_param_video_preset; - while (preset_start) { -@@ -1225,6 +1225,8 @@ - if (opt_preset("vpre", preset_name) != 0) { - tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name); - } -+ av_free(video_codec_name); -+ video_codec_name = NULL; - if (verbose) { - int i; - tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count); diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild index d9a7341eb2..5f02f16f62 100644 --- a/multimedia/transcode/transcode.SlackBuild +++ b/multimedia/transcode/transcode.SlackBuild @@ -79,18 +79,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix building with newer ffmpeg -patch -p0 -i $CWD/transcode-1.1.7-ffmpeg.patch -patch -p0 -i $CWD/transcode-1.1.7-ffmpeg-0.10.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg-0.11.patch -patch -p1 -i $CWD/transcode-1.1.7-preset-free.patch -patch -p0 -i $CWD/transcode-1.1.7-libav-9.patch -patch -p1 -i $CWD/transcode-1.1.7-libav-10.patch -patch -p1 -i $CWD/transcode-1.1.7-preset-force.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg2.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg24.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg29.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg4.patch # Fix building with imagemagick 7.x patch -p1 -i $CWD/transcode-1.1.7-imagemagick7.patch patch -p1 -i $CWD/transcode-1.1.7-gcc10.patch @@ -100,6 +88,7 @@ autoreconf -vif export MAGICKCORE_QUANTUM_DEPTH=32 +# unfortunately ffmpeg >= 5.x breaks compatibility and no patches are available... CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -109,6 +98,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --mandir=/usr/man \ + --disable-ffmpeg \ + --enable-alsa \ --enable-alsa \ --enable-v4l \ --enable-libv4lconvert \ diff --git a/multimedia/xjadeo/ffmpeg-5.1.patch b/multimedia/xjadeo/ffmpeg-5.1.patch new file mode 100644 index 0000000000..4fa4d6d3cc --- /dev/null +++ b/multimedia/xjadeo/ffmpeg-5.1.patch @@ -0,0 +1,105 @@ +From 973f0046cf0dad1a5c5d847aaa02c8bfb21b5804 Mon Sep 17 00:00:00 2001 +From: Robin Gareus <robin@gareus.org> +Date: Fri, 2 Sep 2022 10:26:12 +0200 +Subject: [PATCH] ffmpeg 5.1 compat -- closes #51 + +--- + src/xjadeo/ffcompat.h | 11 +++++++++++ + src/xjadeo/xjadeo.c | 28 +++++++++++----------------- + 2 files changed, 22 insertions(+), 17 deletions(-) + +diff --git a/src/xjadeo/ffcompat.h b/src/xjadeo/ffcompat.h +index b60baad..4aadde9 100644 +--- a/src/xjadeo/ffcompat.h ++++ b/src/xjadeo/ffcompat.h +@@ -151,5 +151,16 @@ register_codecs_compat () + #endif + } + ++static inline void ++maybe_avcodec_flush_buffers(AVCodecContext *avctx) ++{ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 26, 100) ++ if (avctx->codec->flush) { ++ avcodec_flush_buffers(avctx); ++ } ++#else ++ avcodec_flush_buffers(avctx); ++#endif ++} + + #endif /* FFCOMPAT_H */ +diff --git a/src/xjadeo/xjadeo.c b/src/xjadeo/xjadeo.c +index d626f92..a8807f3 100644 +--- a/src/xjadeo/xjadeo.c ++++ b/src/xjadeo/xjadeo.c +@@ -575,9 +575,7 @@ static int seek_frame (AVPacket *packet, int64_t framenumber) { + seek = av_seek_frame (pFormatCtx, videoStream, fidx[framenumber].seekpts, AVSEEK_FLAG_BACKWARD); + } + +- if (pCodecCtx->codec->flush) { +- avcodec_flush_buffers (pCodecCtx); +- } ++ maybe_avcodec_flush_buffers (pCodecCtx); + + if (seek < 0) { + if (!want_quiet) +@@ -915,9 +913,7 @@ static int index_frames () { + error |= 16; + break; + } +- if (pCodecCtx->codec->flush) { +- avcodec_flush_buffers (pCodecCtx); +- } ++ maybe_avcodec_flush_buffers (pCodecCtx); + + int err = 0; + int bailout = 100; +@@ -1053,9 +1049,7 @@ static int index_frames () { + printf("NOBYTE 2\n"); + break; + } +- if (pCodecCtx->codec->flush) { +- avcodec_flush_buffers (pCodecCtx); +- } ++ maybe_avcodec_flush_buffers (pCodecCtx); + + int64_t pts = AV_NOPTS_VALUE; + while (!got_pic) { +@@ -1118,9 +1112,7 @@ static int index_frames () { + } else { + av_seek_frame (pFormatCtx, videoStream, fidx[i].seekpts, AVSEEK_FLAG_BACKWARD); + } +- if (pCodecCtx->codec->flush) { +- avcodec_flush_buffers (pCodecCtx); +- } ++ maybe_avcodec_flush_buffers (pCodecCtx); + while (!got_pic) { + + if (av_read_frame (pFormatCtx, &packet) < 0) { +@@ -1192,9 +1184,7 @@ static int index_frames () { + } + + av_seek_frame (pFormatCtx, videoStream, 0, AVSEEK_FLAG_BACKWARD); +- if (pCodecCtx->codec->flush) { +- avcodec_flush_buffers (pCodecCtx); +- } ++ maybe_avcodec_flush_buffers (pCodecCtx); + if (!error) { + scan_complete = 1; + } +@@ -1271,8 +1261,12 @@ static void clear_info () { + + int open_movie (char* file_name) { + int i; +- AVCodec *pCodec; +- AVStream *av_stream; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 0, 100) ++ AVCodec* pCodec; ++#else ++ AVCodec const* pCodec; ++#endif ++ AVStream* av_stream; + + if (pFrameFMT) { + close_movie (); diff --git a/multimedia/xjadeo/ffmpeg-5.patch b/multimedia/xjadeo/ffmpeg-5.patch new file mode 100644 index 0000000000..c54e9bab56 --- /dev/null +++ b/multimedia/xjadeo/ffmpeg-5.patch @@ -0,0 +1,25 @@ +From 69877e30c86771d2a99d9820cbc8d96415bb3395 Mon Sep 17 00:00:00 2001 +From: Robin Gareus <robin@gareus.org> +Date: Sat, 23 Apr 2022 02:32:54 +0200 +Subject: [PATCH] Fix ffmpeg compatibility + +--- + src/xjadeo/ffcompat.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/xjadeo/ffcompat.h b/src/xjadeo/ffcompat.h +index 6c71292..b60baad 100644 +--- a/src/xjadeo/ffcompat.h ++++ b/src/xjadeo/ffcompat.h +@@ -75,8 +75,10 @@ static inline void av_packet_unref (AVPacket *pkt) + #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 63, 100) + static inline int av_image_get_buffer_size (enum AVPixelFormat pix_fmt, int width, int height, int align) + { +- return avpicture_get_size (pix_fmt, width, height) ++ return avpicture_get_size (pix_fmt, width, height); + } ++#else ++#include <libavutil/imgutils.h> + #endif + + #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 2, 0) diff --git a/multimedia/xjadeo/xjadeo.SlackBuild b/multimedia/xjadeo/xjadeo.SlackBuild index 8811d28851..6f616ec317 100644 --- a/multimedia/xjadeo/xjadeo.SlackBuild +++ b/multimedia/xjadeo/xjadeo.SlackBuild @@ -5,7 +5,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xjadeo -VERSION=${VERSION:-0.8.10} +VERSION=${VERSION:-0.8.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -59,6 +59,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 {} \; +patch -p1 < $CWD/ffmpeg-5.patch +patch -p1 < $CWD/ffmpeg-5.1.patch + # libporttime is included in libportmidi sed -i 's/-lporttime//g' configure diff --git a/multimedia/xjadeo/xjadeo.info b/multimedia/xjadeo/xjadeo.info index 6ce604dac1..a5449a6a69 100644 --- a/multimedia/xjadeo/xjadeo.info +++ b/multimedia/xjadeo/xjadeo.info @@ -1,8 +1,8 @@ PRGNAM="xjadeo" -VERSION="0.8.10" +VERSION="0.8.11" HOMEPAGE="http://xjadeo.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/xjadeo/xjadeo-0.8.10.tar.gz" -MD5SUM="a064aeb351682a7303c60c747591eb3a" +DOWNLOAD="http://downloads.sourceforge.net/xjadeo/xjadeo-0.8.11.tar.gz" +MD5SUM="b0ecd39d526e819c583e5ea51c9b25f7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="liblo" |