root
7 years ago
parent
a24d70f2b6
commit
dfd753f344
@ -1,4 +0,0 @@
|
||||
DIST filebeat-1.3.0-i686.tar.gz 3543109 SHA256 0f9649310ec9807177ca72d03b7b0ead33aa6027e20c0afddaf343252c8e1a40 SHA512 ed37a775e5fc17dfb896bf643fab41b10e483e4e8f3b58e9a7c89e36990a7012b4a58f208da80316f4ec5aa159b6449169b66fc6bace51989bce5ec636f7724d WHIRLPOOL e7808dec730d6eccd2982dc150309e634bcc52ded92adfe63c4d7f26a2ac86b089da3cb9802c8b626cd9a283174502a23a96ce2154b52ac589e964991ecc5fa5
|
||||
DIST filebeat-1.3.0-x86_64.tar.gz 3767919 SHA256 c53c14bc45c9b8891f56216afe69f7ae9e60589a99a0b7f8ac4e16677f6717da SHA512 a341acbf6e5b699bac5e73be5139c21a3542effeb59c6d303815650871de917716b79c1310289ddc47243e3ae83e9b286eb214a7d9e948823874068bbd9d8a86 WHIRLPOOL ee020133c6c7f9a0a897afbddb68b2400823bdf6456592ea0ac2b8c793210e97f2f9ae29eabbbb7066747b052f6c60bbb2f1f7a788647c8b07f79d54948230a3
|
||||
DIST filebeat-1.3.1-i686.tar.gz 3543268 SHA256 70acea09be698f0ab91012b22f0c6771ab8d5db7c6cef1ef9673d2758a9e2522 SHA512 98d4bbf094770efcbf1fddc2d11bc648b618c75196db68d2010875aa59b845ac259f0e2b0df6f60551c72efdff2b6f2797c8439ec54f863feaa0475604628601 WHIRLPOOL 258a861ab878259edb02e74cf2939662dd7b0a792277acee3864ec21bdca26292d3b332d9f72537ae5fc5773de2820224e4e383571d18df86c6bb282bf3ed2bb
|
||||
DIST filebeat-1.3.1-x86_64.tar.gz 3768614 SHA256 889b1789386eb584e1fa779f4fd55d11a0e6c8112910088e78136e9d362db2b2 SHA512 e0961e1dca1a4f0708d7a958123e1e7a3aa1b2572e785fb41ca7bef18694283a926505048f4fd3ce530e57bb358310c9be8d2220c9345d77d53751f0e6d6145a WHIRLPOOL c8f4f3407c8b7c473e01c6742587d82e37167279a433b7a41a3a16fdadf6a89f5eb2548206ae031289d94b1cdbadbc737d3fede78b3d39e80a90e0b07fb92ce9
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
MY_PN=${PN/-bin/}
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
|
||||
HOMEPAGE="https://www.elastic.co/products/beats"
|
||||
SRC_URI="amd64? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-x86_64.tar.gz )
|
||||
x86? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-i686.tar.gz )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
QA_PREBUILT="usr/bin/filebeat"
|
||||
|
||||
src_unpack() {
|
||||
if use amd64; then
|
||||
S="${WORKDIR}/${MY_P}-x86_64"
|
||||
elif use x86; then
|
||||
S="${WORKDIR}/${MY_P}-i686"
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/${MY_PN}
|
||||
keepdir /var/lib/${MY_PN}
|
||||
|
||||
fperms 0750 /var/lib/${MY_PN}
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
|
||||
|
||||
insinto /etc/${MY_PN}
|
||||
newins ${MY_PN}.yml ${MY_PN}.yml.example
|
||||
|
||||
dobin ${MY_PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e /etc/${MY_PN}/${MY_PN}.yml ]]; then
|
||||
elog "Before starting filebeat, you need to create a configuration file at:"
|
||||
elog "/etc/${MY_PN}/${MY_PN}.yml"
|
||||
fi
|
||||
}
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
MY_PN=${PN/-bin/}
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
|
||||
HOMEPAGE="https://www.elastic.co/products/beats"
|
||||
SRC_URI="amd64? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-x86_64.tar.gz )
|
||||
x86? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-i686.tar.gz )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
QA_PREBUILT="usr/bin/filebeat"
|
||||
|
||||
src_unpack() {
|
||||
if use amd64; then
|
||||
S="${WORKDIR}/${MY_P}-x86_64"
|
||||
elif use x86; then
|
||||
S="${WORKDIR}/${MY_P}-i686"
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/${MY_PN}
|
||||
keepdir /var/lib/${MY_PN}
|
||||
|
||||
fperms 0750 /var/lib/${MY_PN}
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
|
||||
|
||||
insinto /etc/${MY_PN}
|
||||
newins ${MY_PN}.yml ${MY_PN}.yml.example
|
||||
|
||||
dobin ${MY_PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e /etc/${MY_PN}/${MY_PN}.yml ]]; then
|
||||
elog "Before starting filebeat, you need to create a configuration file at:"
|
||||
elog "/etc/${MY_PN}/${MY_PN}.yml"
|
||||
fi
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
#FILEBEAT_USER=""
|
||||
#FILEBEAT_GROUP=""
|
||||
#FILEBEAT_CONFIG=""
|
||||
#FILEBEAT_STATEDIR=""
|
||||
#FILEBEAT_OPTS=""
|
||||
@ -1,47 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
FILEBEAT_USER="${FILEBEAT_USER:-root}"
|
||||
FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
|
||||
FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
|
||||
FILEBEAT_STATEDIR="${FILEBEAT_STATEDIR:-/var/lib/filebeat}"
|
||||
FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
|
||||
|
||||
command="/usr/bin/filebeat"
|
||||
command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS}"
|
||||
extra_commands="checkconfig"
|
||||
command_background="true"
|
||||
start_stop_daemon_args="--user ${FILEBEAT_USER}:${FILEBEAT_GROUP} \
|
||||
--chdir ${FILEBEAT_STATEDIR}"
|
||||
pidfile="/run/filebeat/filebeat.pid"
|
||||
|
||||
depend() {
|
||||
use net
|
||||
after elasticsearch
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -e ${FILEBEAT_CONFIG} ]; then
|
||||
eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
|
||||
return 1
|
||||
fi
|
||||
|
||||
ebegin "Checking your configuration"
|
||||
${command} ${command_args} -configtest
|
||||
eend $? "Configuration error. Please fix your configuration files."
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkconfig || return 1
|
||||
|
||||
checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "$(dirname "${pidfile}")"
|
||||
checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_STATEDIR}"
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping filebeat"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile=${pidfile} \
|
||||
--retry=TERM/5/KILL/5
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>hydrapolic@gmail.com</email>
|
||||
<name>Tomas Mozes</name>
|
||||
<description>Proxied maintainer; set to assignee in all bugs</description>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1,3 +1,4 @@
|
||||
DIST qtpass-1.0.5.tar.gz 636461 SHA256 0c07bd1eb9e5336c0225f891e5b9a9df103f218619cf7ec6311edf654e8db281 SHA512 e1b63f1058dc9c194f06376d52acbbb8594d429f4d7fe4ba27baed2cafe10b1c36137b3e33626c1bf33c7f3e1444e6fbe48fc66a83e0f7cd82f5b47f0193d178 WHIRLPOOL acb914d89bcd667343f648e38bb9eb316ebbf0b01f75686d3a7694e82eedd3e3f52ffc99f530bbe3ccbb6089ced727796924fcf48a94c071a3e20b27141b28df
|
||||
DIST qtpass-1.1.0.tar.gz 671525 SHA256 60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6 SHA512 da7439f2c18c46cbf4df15538210051ad60d036334e62a1c4f62d6c1ccff8e4327fb0c6030ed89f78ffd87b615fcaae8ed5552099ff8663bff713990216132ae WHIRLPOOL 4288ee76762c41a81fece4b72bacb1560b28d5681ce288f5e9b5fd9257fd778e4038fc0c75951bdb2a967afdf6ac66035fc716606b1ad6148834fc4ca81dfe45
|
||||
DIST qtpass-1.1.5.tar.gz 329958 SHA256 3ab26fdcaec72672557552e309bf3d8f3b8b9e3e0e9379b8c3343a7351597200 SHA512 fa1ab73c0de9d00581c2b8920e50f2110a2a9e4c3552c0468762cdfeaf982702126e3c727e029e82c61e6e44d01a7281b8acb5c26d5299f4ef25cd16a20ca1c0 WHIRLPOOL dc2f73b341735de0a9562ec298eedf1fc8543e0789420ef891da4237c01ed6795cd861af5700120da951b29158aa32429279789cc1796e84b64141fc6535afb6
|
||||
DIST qtpass-1.1.6.tar.gz 325329 SHA256 d24d95de129ce716b9b0fde6114407f860ce8c77106bd0ee6a12e8e4e0deb42b SHA512 64d712a33df97b04ab1a9d5472aa7fa567e38e31ff7ba297e567d087a3f32b1c59097b339cdd4f568efc2bce16b93f2d2316e94d2605b6abac299d7cf7d0c3df WHIRLPOOL 931380ddc0c245cf217ce4b96b57ff4960edd504e12273e7567c1128e4c3512993dc2517d7fc10d3c059abf79843fc48538eb036ff802b46ee7ba6acdee35fb2
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
MY_P="QtPass-${PV}"
|
||||
|
||||
inherit qmake-utils
|
||||
|
||||
DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
|
||||
HOMEPAGE="https://qtpass.org/"
|
||||
SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
IUSE=""
|
||||
DOCS=( FAQ.md README.md CONTRIBUTING.md )
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
RDEPEND="app-admin/pass
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5[xcb]
|
||||
dev-qt/qtnetwork:5
|
||||
dev-qt/qtwidgets:5
|
||||
net-misc/x11-ssh-askpass"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-qt/linguist-tools:5"
|
||||
|
||||
src_configure() {
|
||||
eqmake5 PREFIX="${D}"/usr
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
doman ${PN}.1
|
||||
|
||||
insinto /usr/share/applications
|
||||
doins "${PN}.desktop"
|
||||
|
||||
newicon artwork/icon.svg "${PN}-icon.svg"
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST yadm-1.05.tar.gz 26554 SHA256 2989b458f62cd08a65ee4f43e7ecf18f539b52d4bbb20c52b0ecff619f5e76cd SHA512 74f215957038b38e056b9d5dccb03af11066627215c16171f2fb61c0f7bcc8c042784554f549224a2ba1847a9a8dea399237c3910bc978802e8a798b51f5074f WHIRLPOOL 02e9992589b3ed0a6d4ba13ade1e54377361cb085bb7be93a750fb6f742c439febd5e18af49cfe25e6f55272cd52f013aba3ff7c929581f71b8512ed3daf7876
|
||||
DIST yadm-1.06.tar.gz 27842 SHA256 1f7bfaf4dea088e247ab35c0f571d21ef41be21a6ca66a198878c018ac756f08 SHA512 85941b233ce17fd6371a1b6b11027c65e7e0cc6a42d2674deb433e367b3666a8b7d69c0983d83b4b29797c6591c282a5a8ff890dcaff2f62ced98eb33b46a8ed WHIRLPOOL 5eb85984f77417830c88658a7bddc5d035c2c5658481901dc8fc3babe2b89d0ba4983faa8b2ea47618a461ee57722740817594844e9d8d8872b8dc8c6c3b36e8
|
||||
DIST yadm-1.07.tar.gz 34240 SHA256 39f3974c7d8f3930b9dee00d5b1b2181976e60a4e2cd26c35597951c5919a4f6 SHA512 9bbe33c82a137375cb27916ae5b5a06f06c25a75ae05688be473103c29154309d3472accc0aa0670a80a4714bc6523ab85c41fd6aa8d1909586437c5778b9144 WHIRLPOOL 615c2411f86f284159e1d9623fabc1600ed1c532bcac31b3a06e8ef11ae6685e11fe14a1b914c10eac1802f8edcd8f9e6f8b67a74b0b121f55243e846886e70a
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="A dotfile manager for the config files in your home folder"
|
||||
HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
|
||||
SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
DOCS=( CHANGES CONTRIBUTORS README.md )
|
||||
|
||||
DEPEND="
|
||||
test? (
|
||||
dev-tcltk/expect
|
||||
dev-util/bats
|
||||
dev-vcs/git
|
||||
)"
|
||||
RDEPEND="
|
||||
app-crypt/gnupg
|
||||
dev-vcs/git"
|
||||
|
||||
src_compile() {
|
||||
emake yadm.md
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# 109_accept_encryption tests are interactive, thus fail. Skip them
|
||||
while IFS="" read -d $'\0' -r f ; do
|
||||
bats "${f}" || die "Test ${f} failed"
|
||||
done < <(find test -name '*.bats' -and -not -name '109_accept_encryption.bats' -print0)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
einstalldocs
|
||||
|
||||
dobin "${PN}"
|
||||
doman "${PN}.1"
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST lzip-1.16.tar.gz 86035 SHA256 128cc25baf92c8b69700831e6f984d954016318cc78edca87870d0c033112751 SHA512 8a1c0b254fd10428ddee8b26a2e426b57c4799bdc690e08211c3bc8fdef0d86e3ed69c48a3f6b7be1fe6c65f1e09f44cd3481b233632b60b58f4b8a806175b63 WHIRLPOOL fdb9462a4f7c3efc05b00785f1124e491d316ca44eb0d280542675593861cdca993654b5e6fcbbbabf7a1aa96c552b8ebc3307493af87ee4e154790e448ff8e5
|
||||
DIST lzip-1.18.tar.gz 95569 SHA256 47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd SHA512 cf24756bd657ef48f48304be94bf5c6c18baf7dc4fce276e79c3abeab4c4f801e901ccfb12841fa4b2402e687aeb95f2e537695442f53c45f7cb9081c3062674 WHIRLPOOL 61a76a55afdbd685aa8b16c0cb2f1ae1629d488ea087df589cd96441db9ab6d64caf08b8ba116daaabadf62a37858dc82a03b18b61595c08e0924f51860eef56
|
||||
DIST lzip-1.19-pre1.tar.gz 98914 SHA256 16c257b70309038b344fdba03615f3853cf2f5a6ae6e3b5f7c662f1079c590cd SHA512 38be478667b83ab2dca5f9abb6740ff6a8def922296ded32a176c292b68c2d1c063a55a68c24e9e5adbff6fdf474b57f134764c75835bd3169716d203356ce9f WHIRLPOOL ae4c453e4dbe6a6f43572614e04b99347895fbb400717d1f23858bcdf9974f66707dcc8ca748c58dcb35e5f89aa59332dd166ddc98a3458cac7c77009ea223a2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="lossless data compressor based on the LZMA algorithm"
|
||||
HOMEPAGE="http://www.nongnu.org/lzip/lzip.html"
|
||||
SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
src_configure() {
|
||||
# not autotools-based
|
||||
./configure \
|
||||
--prefix="${EPREFIX}"/usr \
|
||||
CXX="$(tc-getCXX)" \
|
||||
CPPFLAGS="${CPPFLAGS}" \
|
||||
CXXFLAGS="${CXXFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS}" || die
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
DIST k9copy-2.3.8-Source.tar.gz 1589535 SHA256 cf5e2d9faf7821561e478ed1fc9b63bbcc3448405d7b7866f68b018d16b42fdf SHA512 b914e67040ad8abc0537dc8fc1e7d8cc0d6e8b1dae38dbde8dbadf6c0408b040582bac6c53129f26e520bfd106ad1ab8c9079efe12562438ff2dfcb11053fd0c WHIRLPOOL 476a76aedafc3a8f69f7a0dd91e90a8f27c6db8e6771827b9d2c5007fa94ba765d30d294ff5039a31322bb5bb7465c771185dc23eb25b17c674773b2d4c28e10
|
||||
@ -1,567 +0,0 @@
|
||||
Fix build with ffmpeg-0.11 and later.
|
||||
|
||||
From slackware:
|
||||
http://www.slackware.org.uk/slackbuilds.org/14.0/multimedia/k9copy/
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=459980
|
||||
|
||||
diff -Nru k9copy-2.3.8-Source.orig/CMakeLists.txt k9copy-2.3.8-Source/CMakeLists.txt
|
||||
--- k9copy-2.3.8-Source.orig/CMakeLists.txt 2011-12-09 22:08:41.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/CMakeLists.txt 2012-11-23 10:12:56.000000000 +0100
|
||||
@@ -18,6 +18,7 @@
|
||||
INCLUDE(FindXine)
|
||||
INCLUDE(FindAvcodec)
|
||||
INCLUDE(FindAvformat)
|
||||
+INCLUDE(FindAvutil)
|
||||
INCLUDE(FindFFmpegScale)
|
||||
#INCLUDE(FindLibDvdread)
|
||||
|
||||
@@ -68,6 +69,7 @@
|
||||
|
||||
FINDAVFORMAT("avformat")
|
||||
FINDAVCODEC("avcodec")
|
||||
+FINDAVUTIL("avutil")
|
||||
|
||||
add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
|
||||
add_subdirectory( src/dvdnav)
|
||||
@@ -103,6 +105,7 @@
|
||||
#${LIBDVDREAD_INCLUDE_DIR}/dvdread
|
||||
${AVCODEC_INCLUDE_DIR}
|
||||
${AVFORMAT_INCLUDE_DIR}
|
||||
+ ${AVUTIL_INCLUDE_DIR}
|
||||
${FFMPEGSCALE_INCLUDE_DIR}
|
||||
${FFMPEG_INCLUDE_DIR}
|
||||
)
|
||||
diff -Nru k9copy-2.3.8-Source.orig/cmake/FindAvutil.cmake k9copy-2.3.8-Source/cmake/FindAvutil.cmake
|
||||
--- k9copy-2.3.8-Source.orig/cmake/FindAvutil.cmake 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/cmake/FindAvutil.cmake 2012-11-23 10:12:56.000000000 +0100
|
||||
@@ -0,0 +1,35 @@
|
||||
+MACRO (FINDAVUTIL _lib)
|
||||
+
|
||||
+FIND_PATH(AVUTIL_INCLUDE_DIR_FF "ffmpeg/avutil.h" PATHS)
|
||||
+IF (AVUTIL_INCLUDE_DIR_FF)
|
||||
+ SET (AVUTIL_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg")
|
||||
+ELSE (AVUTIL_INCLUDE_DIR_FF)
|
||||
+ FIND_PATH(AVUTIL_INCLUDE_DIR_LAVC "libavutil/avutil.h" PATHS)
|
||||
+ IF (AVUTIL_INCLUDE_DIR_LAVC)
|
||||
+ SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_LAVC}/libavutil")
|
||||
+ ELSE (AVUTIL_INCLUDE_DIR_LAVC)
|
||||
+ FIND_PATH(AVUTIL_INCLUDE_DIR_FF_LAVF "ffmpeg/libavutil/avutil.h" PATHS)
|
||||
+ IF (AVUTIL_INCLUDE_DIR_FF_LAVF)
|
||||
+ SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavutil")
|
||||
+ ENDIF (AVUTIL_INCLUDE_DIR_FF_LAVF)
|
||||
+ ENDIF (AVUTIL_INCLUDE_DIR_LAVC)
|
||||
+ENDIF (AVUTIL_INCLUDE_DIR_FF)
|
||||
+
|
||||
+
|
||||
+
|
||||
+FIND_LIBRARY(AVUTIL_LIBRARY NAMES ${_lib} PATHS )
|
||||
+
|
||||
+IF (AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY)
|
||||
+ SET(INC_FOUND TRUE)
|
||||
+ELSE (AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY)
|
||||
+ SET(INC_FOUND FALSE)
|
||||
+ENDIF (AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY)
|
||||
+
|
||||
+
|
||||
+IF (INC_FOUND)
|
||||
+ MESSAGE(STATUS "Found include avutil.h: ${AVUTIL_INCLUDE_DIR}")
|
||||
+ MESSAGE(STATUS "Found library ${_lib}: ${AVUTIL_LIBRARY}")
|
||||
+ELSE (INC_FOUND)
|
||||
+ MESSAGE(FATAL_ERROR "Could not find ${_lib}")
|
||||
+ENDIF (INC_FOUND)
|
||||
+ENDMACRO (FINDAVUTIL _lib )
|
||||
\ No newline at end of file
|
||||
diff -Nru k9copy-2.3.8-Source.orig/src/backup/k9mp4enc.cpp k9copy-2.3.8-Source/src/backup/k9mp4enc.cpp
|
||||
--- k9copy-2.3.8-Source.orig/src/backup/k9mp4enc.cpp 2011-12-09 22:08:41.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/src/backup/k9mp4enc.cpp 2012-12-11 09:37:02.558323776 +0100
|
||||
@@ -619,7 +619,7 @@
|
||||
// cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";
|
||||
}
|
||||
//synchronize audio
|
||||
- cmd << "-async" << "1" ;
|
||||
+ cmd << "-async" << "44100" ;
|
||||
cmd << "-y" << KShell::quoteArg(path);
|
||||
cmd << slNewAudio;
|
||||
// if (m_extractMkv) {
|
||||
diff -Nru k9copy-2.3.8-Source.orig/src/core/k9audiocodecs.cpp k9copy-2.3.8-Source/src/core/k9audiocodecs.cpp
|
||||
--- k9copy-2.3.8-Source.orig/src/core/k9audiocodecs.cpp 2011-12-09 22:08:42.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/src/core/k9audiocodecs.cpp 2012-12-11 09:37:02.584323452 +0100
|
||||
@@ -75,10 +75,10 @@
|
||||
m_codecs[4]=_k9AudioCodec("sonic","-oac lavc -lavcopts acodec=sonic:abitrate=$AUDBR","mencoder");
|
||||
m_codecs[5]=_k9AudioCodec("aac","-oac faac -faacopts br=$AUDBR","mencoder");
|
||||
m_codecs[6]=_k9AudioCodec("mp3 (lame)","-oac mp3lame -lameopts abr:br=$AUDBR","mencoder");
|
||||
- m_codecs[7]=_k9AudioCodec("copy","-acodec copy","ffmpeg","");
|
||||
- m_codecs[8]=_k9AudioCodec("mp3","-acodec libmp3lame -ab $AUDBRk -ac 2","ffmpeg",".mp3");
|
||||
- m_codecs[9]=_k9AudioCodec("vorbis","-acodec vorbis -ab $AUDBRk -ac 2","ffmpeg",".ogg");
|
||||
- m_codecs[10]=_k9AudioCodec("aac","-acodec libfaac -ab $AUDBRk -ac 2","ffmpeg",".aac");
|
||||
+ m_codecs[7]=_k9AudioCodec("copy","-codec:a copy","ffmpeg","");
|
||||
+ m_codecs[8]=_k9AudioCodec("mp3","-codec:a libmp3lame -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".mp3");
|
||||
+ m_codecs[9]=_k9AudioCodec("vorbis","-codec:a vorbis -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".ogg");
|
||||
+ m_codecs[10]=_k9AudioCodec("aac","-codec:a libfaac -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".aac");
|
||||
|
||||
save();
|
||||
}
|
||||
diff -Nru k9copy-2.3.8-Source.orig/src/core/k9videocodecs.cpp k9copy-2.3.8-Source/src/core/k9videocodecs.cpp
|
||||
--- k9copy-2.3.8-Source.orig/src/core/k9videocodecs.cpp 2011-12-09 22:08:42.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/src/core/k9videocodecs.cpp 2012-12-11 09:37:02.607323163 +0100
|
||||
@@ -98,12 +98,12 @@
|
||||
m_codecs[18]=_k9VideoCodec("ASUS v1","","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
|
||||
m_codecs[19]=_k9VideoCodec("ASUS v2","","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
|
||||
m_codecs[20]=_k9VideoCodec("flv","","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
|
||||
- m_codecs[21]=_k9VideoCodec("copy","","-vcodec copy","-vcodec copy","-vcodec copy","ffmpeg");
|
||||
- m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
|
||||
- m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
|
||||
- m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
|
||||
- m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
|
||||
- m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
|
||||
+ m_codecs[21]=_k9VideoCodec("copy","","-codec:v copy","-codec:v copy","-codec:v copy","ffmpeg");
|
||||
+ m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
|
||||
+ m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
|
||||
+ m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
|
||||
+ m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
|
||||
+ m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
|
||||
|
||||
save();
|
||||
|
||||
diff -Nru k9copy-2.3.8-Source.orig/src/import/k9avidecode.cpp k9copy-2.3.8-Source/src/import/k9avidecode.cpp
|
||||
--- k9copy-2.3.8-Source.orig/src/import/k9avidecode.cpp 2011-12-09 22:08:41.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/src/import/k9avidecode.cpp 2012-11-23 10:12:56.000000000 +0100
|
||||
@@ -37,11 +37,13 @@
|
||||
: QObject(parent) {
|
||||
CodecHandle=0;
|
||||
FormatHandle=0;
|
||||
+ UtilHandle=0;
|
||||
SwscaleHandle=0;
|
||||
glibref=0;
|
||||
if (glibref==0) {
|
||||
CodecHandle=dlopen("libavcodec.so",RTLD_LAZY ); //| RTLD_GLOBAL
|
||||
FormatHandle=dlopen("libavformat.so",RTLD_LAZY);
|
||||
+ UtilHandle=dlopen("libavutil.so",RTLD_LAZY);
|
||||
#ifdef HAVE_SWSCALE
|
||||
SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
|
||||
if (SwscaleHandle==0)
|
||||
@@ -56,6 +58,12 @@
|
||||
if (!FormatHandle ) {
|
||||
errs << i18n("Cannot open the library %1").arg("libavformat");
|
||||
}
|
||||
+# if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
|
||||
+ if (!UtilHandle) {
|
||||
+ m_error =i18n("Cannot open then library %1").arg("libavutil");
|
||||
+ return;
|
||||
+ }
|
||||
+# endif
|
||||
#ifdef HAVE_SWSCALE
|
||||
if (!SwscaleHandle) {
|
||||
errs << i18n("Cannot open the library %1").arg("libswscale");
|
||||
@@ -63,17 +71,32 @@
|
||||
#endif
|
||||
|
||||
av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
|
||||
+ avformat_open_input = (avformat_open_input_t)dlsym(FormatHandle,"avformat_open_input");
|
||||
+# else
|
||||
av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
|
||||
+# endif
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
|
||||
+ avformat_find_stream_info = (avformat_find_stream_info_t)dlsym(FormatHandle,"avformat_find_stream_info");
|
||||
+# else
|
||||
av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
|
||||
+# endif
|
||||
avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||
+ avcodec_open2 = (avcodec_open2_t)dlsym(CodecHandle,"avcodec_open2");
|
||||
+# else
|
||||
avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
|
||||
+# endif
|
||||
avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
|
||||
avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
|
||||
av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
|
||||
avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
|
||||
av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
|
||||
+ avcodec_decode_video2 = (avcodec_decode_video2_t)dlsym(CodecHandle,"avcodec_decode_video2");
|
||||
+# else
|
||||
avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
|
||||
- if (avcodec_decode_video==0) avcodec_decode_video=(avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video2");
|
||||
+# endif
|
||||
#ifndef HAVE_SWSCALE
|
||||
img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
|
||||
//if img_convert is null (deprecated in ffmpeg), we need libswscale
|
||||
@@ -85,7 +108,11 @@
|
||||
if (av_free_packet==0)
|
||||
av_free_packet=av_free_packet_internal;
|
||||
avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
|
||||
+ avformat_close_input = (avformat_close_input_t)dlsym(FormatHandle,"avformat_close_input");
|
||||
+# else
|
||||
av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
|
||||
+# endif
|
||||
av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
|
||||
av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
|
||||
avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
|
||||
@@ -94,7 +121,11 @@
|
||||
sws_getContext=(sws_getContext_t)dlsym(SwscaleHandle,"sws_getContext");
|
||||
sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
|
||||
#endif
|
||||
+# if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
|
||||
+ av_gettime=(av_gettime_t)dlsym(UtilHandle,"av_gettime");
|
||||
+# else
|
||||
av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
|
||||
+# endif
|
||||
|
||||
if (errs.count() >0) {
|
||||
m_error=errs.join("\n");
|
||||
@@ -118,6 +149,8 @@
|
||||
dlclose(FormatHandle);
|
||||
if (CodecHandle)
|
||||
dlclose(CodecHandle);
|
||||
+ if(UtilHandle)
|
||||
+ dlclose(UtilHandle);
|
||||
#ifdef HAVE_SWSCALE
|
||||
if (SwscaleHandle)
|
||||
dlclose(CodecHandle);
|
||||
@@ -134,12 +167,24 @@
|
||||
close();
|
||||
|
||||
// Open video file
|
||||
- if (av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0) {
|
||||
+ if (
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
|
||||
+ avformat_open_input(&m_FormatCtx, _fileName.toUtf8(), 0, 0)!=0
|
||||
+# else
|
||||
+ av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0
|
||||
+# endif
|
||||
+ ) {
|
||||
m_error=i18n("Couldn't open the file %1").arg(_fileName);
|
||||
return false; // Couldn't open file}
|
||||
}
|
||||
// Retrieve stream information
|
||||
- if (av_find_stream_info(m_FormatCtx)<0) {
|
||||
+ if (
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
|
||||
+ avformat_find_stream_info(m_FormatCtx, NULL)<0
|
||||
+# else
|
||||
+ av_find_stream_info(m_FormatCtx)<0
|
||||
+# endif
|
||||
+ ) {
|
||||
m_error =i18n("Couldn't find stream information");
|
||||
return false; // Couldn't find stream information
|
||||
}
|
||||
@@ -168,7 +213,13 @@
|
||||
return false; // Codec not found
|
||||
}
|
||||
// Open codec
|
||||
- if (avcodec_open(m_CodecCtx, m_Codec)<0) {
|
||||
+ if (
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||
+ avcodec_open2(m_CodecCtx, m_Codec, NULL)<0
|
||||
+# else
|
||||
+ avcodec_open(m_CodecCtx, m_Codec)<0
|
||||
+# endif
|
||||
+ ) {
|
||||
m_error =i18n("Could'nt open the codec");
|
||||
return false; // Could not open codec
|
||||
}
|
||||
@@ -245,15 +296,23 @@
|
||||
// Is this a packet from the video stream?
|
||||
if (packet.stream_index==m_videoStream) {
|
||||
// Decode video frame
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
|
||||
+ avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished, &packet);
|
||||
+# else
|
||||
avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,
|
||||
packet.data, packet.size);
|
||||
+# endif
|
||||
|
||||
// Did we get a video frame?
|
||||
if (frameFinished) {
|
||||
// if (m_Frame->pts >=fspos)
|
||||
int64_t cur_dts=fspos;
|
||||
- if (m_FormatCtx->cur_st)
|
||||
- cur_dts= m_FormatCtx->cur_st->cur_dts;
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 0)
|
||||
+ cur_dts= packet.dts;
|
||||
+# else
|
||||
+ if (m_FormatCtx->cur_st)
|
||||
+ cur_dts= m_FormatCtx->cur_st->cur_dts;
|
||||
+# endif
|
||||
if (cur_dts >=fspos) {
|
||||
bFound=true;
|
||||
#ifndef HAVE_SWSCALE
|
||||
@@ -309,7 +368,11 @@
|
||||
avcodec_close(m_CodecCtx);
|
||||
|
||||
// Close the video file
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
|
||||
+ avformat_close_input(&m_FormatCtx);
|
||||
+# else
|
||||
av_close_input_file(m_FormatCtx);
|
||||
+# endif
|
||||
m_opened=false;
|
||||
}
|
||||
}
|
||||
diff -Nru k9copy-2.3.8-Source.orig/src/import/k9avidecode.h k9copy-2.3.8-Source/src/import/k9avidecode.h
|
||||
--- k9copy-2.3.8-Source.orig/src/import/k9avidecode.h 2011-12-09 22:08:41.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/src/import/k9avidecode.h 2012-11-23 10:12:56.000000000 +0100
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "k9common.h"
|
||||
#include <qobject.h>
|
||||
#include <avformat.h>
|
||||
+#include <avutil.h>
|
||||
#include <qimage.h>
|
||||
#include <cstdlib>
|
||||
#include <QObject>
|
||||
@@ -29,10 +30,22 @@
|
||||
//typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t );
|
||||
typedef void (*av_register_all_t) (void);
|
||||
typedef int64_t (*av_gettime_t) (void);
|
||||
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
|
||||
+typedef int (*avformat_open_input_t)(AVFormatContext **, const char *, AVInputFormat *, AVDictionary **);
|
||||
+#else
|
||||
typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *);
|
||||
+#endif
|
||||
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
|
||||
+typedef int (*avformat_find_stream_info_t)(AVFormatContext *, AVDictionary **);
|
||||
+#else
|
||||
typedef int (*av_find_stream_info_t)(AVFormatContext *);
|
||||
+#endif
|
||||
typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
|
||||
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||
+typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
|
||||
+#else
|
||||
typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *);
|
||||
+#endif
|
||||
typedef AVFrame * (*avcodec_alloc_frame_t)(void);
|
||||
|
||||
typedef int (*avpicture_get_size_t)(int , int , int );
|
||||
@@ -40,11 +53,19 @@
|
||||
typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int);
|
||||
typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *);
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
|
||||
+typedef int (*avcodec_decode_video2_t)(AVCodecContext *, AVFrame *, int *, AVPacket *);
|
||||
+#else
|
||||
typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int );
|
||||
+#endif
|
||||
typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int);
|
||||
typedef void (*av_free_t)(void *);
|
||||
typedef int (*avcodec_close_t)(AVCodecContext *);
|
||||
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
|
||||
+typedef void (*avformat_close_input_t)(AVFormatContext **);
|
||||
+#else
|
||||
typedef void (*av_close_input_file_t)(AVFormatContext *);
|
||||
+#endif
|
||||
typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags); typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational ) ;
|
||||
typedef void (*avcodec_flush_buffers_t)(AVCodecContext *);
|
||||
typedef void (*av_free_packet_t)(AVPacket *);
|
||||
@@ -77,21 +98,41 @@
|
||||
|
||||
private:
|
||||
av_register_all_t av_register_all;
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
|
||||
+ avformat_open_input_t avformat_open_input;
|
||||
+# else
|
||||
av_open_input_file_t av_open_input_file;
|
||||
+# endif
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
|
||||
+ avformat_find_stream_info_t avformat_find_stream_info;
|
||||
+# else
|
||||
av_find_stream_info_t av_find_stream_info;
|
||||
+# endif
|
||||
avcodec_find_decoder_t avcodec_find_decoder;
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||
+ avcodec_open2_t avcodec_open2;
|
||||
+# else
|
||||
avcodec_open_t avcodec_open;
|
||||
+# endif
|
||||
avcodec_alloc_frame_t avcodec_alloc_frame;
|
||||
av_seek_frame_t av_seek_frame;
|
||||
avpicture_get_size_t avpicture_get_size;
|
||||
av_malloc_t av_malloc;
|
||||
avpicture_fill_t avpicture_fill;
|
||||
av_read_frame_t av_read_frame;
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
|
||||
+ avcodec_decode_video2_t avcodec_decode_video2;
|
||||
+# else
|
||||
avcodec_decode_video_t avcodec_decode_video;
|
||||
+# endif
|
||||
img_convert_t img_convert;
|
||||
av_free_t av_free;
|
||||
avcodec_close_t avcodec_close;
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
|
||||
+ avformat_close_input_t avformat_close_input;
|
||||
+# else
|
||||
av_close_input_file_t av_close_input_file;
|
||||
+# endif
|
||||
av_rescale_q_t av_rescale_q;
|
||||
av_gettime_t av_gettime;
|
||||
avcodec_flush_buffers_t avcodec_flush_buffers;
|
||||
@@ -103,6 +144,7 @@
|
||||
#endif
|
||||
void *CodecHandle;
|
||||
void *FormatHandle;
|
||||
+ void *UtilHandle;
|
||||
void *SwscaleHandle;
|
||||
int glibref;
|
||||
|
||||
diff -Nru k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.cpp k9copy-2.3.8-Source/src/vamps/k9ffmpeg.cpp
|
||||
--- k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.cpp 2011-12-09 22:08:41.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/src/vamps/k9ffmpeg.cpp 2012-11-23 10:12:56.000000000 +0100
|
||||
@@ -50,20 +50,40 @@
|
||||
avcodec_init =(avcodec_init_t)dlsym(CodecHandle,"avcodec_init");
|
||||
av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
|
||||
avcodec_alloc_context=(avcodec_alloc_context_t)dlsym(CodecHandle,"avcodec_alloc_context");
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
|
||||
+ avformat_open_input = (avformat_open_input_t)dlsym(FormatHandle,"avformat_open_input");
|
||||
+# else
|
||||
av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
|
||||
+# endif
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
|
||||
+ avformat_find_stream_info = (avformat_find_stream_info_t)dlsym(FormatHandle,"avformat_find_stream_info");
|
||||
+# else
|
||||
av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
|
||||
+# endif
|
||||
avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||
+ avcodec_open2 = (avcodec_open2_t)dlsym(CodecHandle,"avcodec_open2");
|
||||
+# else
|
||||
avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
|
||||
+# endif
|
||||
avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
|
||||
avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
|
||||
av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
|
||||
avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
|
||||
av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
|
||||
+ avcodec_decode_video2 = (avcodec_decode_video2_t)dlsym(CodecHandle,"avcodec_decode_video2");
|
||||
+# else
|
||||
avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
|
||||
+# endif
|
||||
img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
|
||||
av_free = (av_free_t)dlsym(CodecHandle,"av_free");
|
||||
avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
|
||||
+ avformat_close_input = (avformat_close_input_t)dlsym(FormatHandle,"avformat_close_input");
|
||||
+# else
|
||||
av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
|
||||
+# endif
|
||||
av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
|
||||
av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
|
||||
avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
|
||||
@@ -73,7 +93,11 @@
|
||||
sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
|
||||
#endif
|
||||
|
||||
+# if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
|
||||
+ av_gettime=(av_gettime_t)dlsym(UtilHandle,"av_gettime");
|
||||
+# else
|
||||
av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
|
||||
+# endif
|
||||
url_fopen=(url_fopen_t)dlsym(FormatHandle,"url_fopen");
|
||||
|
||||
audio_resample_init=(audio_resample_init_t)dlsym(CodecHandle,"audio_resample_init");
|
||||
@@ -110,4 +134,4 @@
|
||||
k9FFMpeg *k9FFMpeg::instance() {
|
||||
return &_FFMpegInstance;
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -Nru k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.h k9copy-2.3.8-Source/src/vamps/k9ffmpeg.h
|
||||
--- k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.h 2011-12-09 22:08:41.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/src/vamps/k9ffmpeg.h 2012-11-23 10:13:39.000000000 +0100
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <QString>
|
||||
#include <avcodec.h>
|
||||
#include <avformat.h>
|
||||
+#include <avutil.h>
|
||||
#include <avio.h>
|
||||
#ifdef HAVE_SWSCALE
|
||||
#include <swscale.h>
|
||||
@@ -28,10 +29,22 @@
|
||||
typedef void (*av_register_all_t) (void);
|
||||
typedef void (*avcodec_init_t)(void);
|
||||
typedef int64_t (*av_gettime_t) (void);
|
||||
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
|
||||
+typedef int (*avformat_open_input_t)(AVFormatContext **, const char *, AVInputFormat *, AVDictionary **);
|
||||
+#else
|
||||
typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *);
|
||||
+#endif
|
||||
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
|
||||
+typedef int (*avformat_find_stream_info_t)(AVFormatContext *, AVDictionary **);
|
||||
+#else
|
||||
typedef int (*av_find_stream_info_t)(AVFormatContext *);
|
||||
+#endif
|
||||
typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
|
||||
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||
+typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
|
||||
+#else
|
||||
typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *);
|
||||
+#endif
|
||||
typedef AVFrame * (*avcodec_alloc_frame_t)(void);
|
||||
typedef AVCodecContext * (*avcodec_alloc_context_t)(void);
|
||||
|
||||
@@ -40,13 +53,21 @@
|
||||
typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int);
|
||||
typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *);
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
|
||||
+typedef int (*avcodec_decode_video2_t)(AVCodecContext *, AVFrame *, int *, AVPacket *);
|
||||
+#else
|
||||
typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int );
|
||||
+#endif
|
||||
typedef int (*avcodec_encode_audio_t)(AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples);
|
||||
|
||||
typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int);
|
||||
typedef void (*av_free_t)(void *);
|
||||
typedef int (*avcodec_close_t)(AVCodecContext *);
|
||||
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
|
||||
+typedef void (*avformat_close_input_t)(AVFormatContext **);
|
||||
+#else
|
||||
typedef void (*av_close_input_file_t)(AVFormatContext *);
|
||||
+#endif
|
||||
typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags);
|
||||
typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational ) ;
|
||||
typedef void (*avcodec_flush_buffers_t)(AVCodecContext *);
|
||||
@@ -89,21 +110,41 @@
|
||||
avcodec_init_t avcodec_init;
|
||||
avcodec_alloc_context_t avcodec_alloc_context;
|
||||
av_register_all_t av_register_all;
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
|
||||
+ avformat_open_input_t avformat_open_input;
|
||||
+# else
|
||||
av_open_input_file_t av_open_input_file;
|
||||
+# endif
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
|
||||
+ avformat_find_stream_info_t avformat_find_stream_info;
|
||||
+# else
|
||||
av_find_stream_info_t av_find_stream_info;
|
||||
+# endif
|
||||
avcodec_find_decoder_t avcodec_find_decoder;
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||
+ avcodec_open2_t avcodec_open2;
|
||||
+# else
|
||||
avcodec_open_t avcodec_open;
|
||||
+# endif
|
||||
avcodec_alloc_frame_t avcodec_alloc_frame;
|
||||
av_seek_frame_t av_seek_frame;
|
||||
avpicture_get_size_t avpicture_get_size;
|
||||
av_malloc_t av_malloc;
|
||||
avpicture_fill_t avpicture_fill;
|
||||
av_read_frame_t av_read_frame;
|
||||
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
|
||||
+ avcodec_decode_video2_t avcodec_decode_video2;
|
||||
+# else
|
||||
avcodec_decode_video_t avcodec_decode_video;
|
||||
+# endif
|
||||
img_convert_t img_convert;
|
||||
av_free_t av_free;
|
||||
avcodec_close_t avcodec_close;
|
||||
+# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
|
||||
+ avformat_close_input_t avformat_close_input;
|
||||
+# else
|
||||
av_close_input_file_t av_close_input_file;
|
||||
+# endif
|
||||
av_rescale_q_t av_rescale_q;
|
||||
av_gettime_t av_gettime;
|
||||
avcodec_flush_buffers_t avcodec_flush_buffers;
|
||||
@ -1,20 +0,0 @@
|
||||
See: https://bugs.gentoo.org/show_bug.cgi?id=505196
|
||||
|
||||
Generated from: https://505196.bugs.gentoo.org/attachment.cgi?id=373958
|
||||
- Split out the existing two patches already applied in the ebuild.
|
||||
- Version check to keep compatibility with older ffmpeg.
|
||||
diff -u k9copy-2.3.8-Source/src/import/k9avidecode.h k9copy-2.3.8-Source/src/import/k9avidecode.h
|
||||
--- k9copy-2.3.8-Source/src/import/k9avidecode.h 2012-11-23 10:12:56.000000000 +0100
|
||||
+++ k9copy-2.3.8-Source/src/import/k9avidecode.h 2014-03-31 07:47:35.119092120 +0100
|
||||
@@ -40,7 +40,11 @@
|
||||
#else
|
||||
typedef int (*av_find_stream_info_t)(AVFormatContext *);
|
||||
#endif
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 55
|
||||
typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
|
||||
+#else
|
||||
+typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
|
||||
+#endif
|
||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||
typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
|
||||
#else
|
||||
@ -1,182 +0,0 @@
|
||||
libavutil/time.h in recent ffmpeg versions pollute the includes.
|
||||
include libav* headers correcly.
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=459980
|
||||
same as for backlite
|
||||
|
||||
Index: k9copy-2.3.8-Source/cmake/FindAvcodec.cmake
|
||||
===================================================================
|
||||
--- k9copy-2.3.8-Source.orig/cmake/FindAvcodec.cmake
|
||||
+++ k9copy-2.3.8-Source/cmake/FindAvcodec.cmake
|
||||
@@ -10,11 +10,11 @@ IF (AVCODEC_INCLUDE_DIR_FF)
|
||||
ELSE (AVCODEC_INCLUDE_DIR_FF)
|
||||
FIND_PATH(AVCODEC_INCLUDE_DIR_LAVC "libavcodec/avcodec.h" PATHS)
|
||||
IF (AVCODEC_INCLUDE_DIR_LAVC)
|
||||
- SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}/libavcodec")
|
||||
+ SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}")
|
||||
ELSE (AVCODEC_INCLUDE_DIR_LAVC)
|
||||
FIND_PATH(AVCODEC_INCLUDE_DIR_FF_LAVC "ffmpeg/libavcodec/avcodec.h" PATHS)
|
||||
IF (AVCODEC_INCLUDE_DIR_FF_LAVC)
|
||||
- SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg/libavcodec")
|
||||
+ SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg")
|
||||
SET (FFMPEG_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg")
|
||||
ENDIF (AVCODEC_INCLUDE_DIR_FF_LAVC)
|
||||
ENDIF (AVCODEC_INCLUDE_DIR_LAVC)
|
||||
@@ -35,4 +35,4 @@ IF (INC_FOUND)
|
||||
ELSE (INC_FOUND)
|
||||
MESSAGE(FATAL_ERROR "Could not find ${_lib}")
|
||||
ENDIF (INC_FOUND)
|
||||
-ENDMACRO (FINDAVCODEC _lib )
|
||||
\ No newline at end of file
|
||||
+ENDMACRO (FINDAVCODEC _lib )
|
||||
Index: k9copy-2.3.8-Source/cmake/FindAvformat.cmake
|
||||
===================================================================
|
||||
--- k9copy-2.3.8-Source.orig/cmake/FindAvformat.cmake
|
||||
+++ k9copy-2.3.8-Source/cmake/FindAvformat.cmake
|
||||
@@ -6,11 +6,11 @@ IF (AVFORMAT_INCLUDE_DIR_FF)
|
||||
ELSE (AVFORMAT_INCLUDE_DIR_FF)
|
||||
FIND_PATH(AVFORMAT_INCLUDE_DIR_LAVC "libavformat/avformat.h" PATHS)
|
||||
IF (AVFORMAT_INCLUDE_DIR_LAVC)
|
||||
- SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/libavformat")
|
||||
+ SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}")
|
||||
ELSE (AVFORMAT_INCLUDE_DIR_LAVC)
|
||||
FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg/libavformat/avformat.h" PATHS)
|
||||
IF (AVFORMAT_INCLUDE_DIR_FF_LAVF)
|
||||
- SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavformat")
|
||||
+ SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg")
|
||||
ENDIF (AVFORMAT_INCLUDE_DIR_FF_LAVF)
|
||||
ENDIF (AVFORMAT_INCLUDE_DIR_LAVC)
|
||||
ENDIF (AVFORMAT_INCLUDE_DIR_FF)
|
||||
@@ -32,4 +32,4 @@ IF (INC_FOUND)
|
||||
ELSE (INC_FOUND)
|
||||
MESSAGE(FATAL_ERROR "Could not find ${_lib}")
|
||||
ENDIF (INC_FOUND)
|
||||
-ENDMACRO (FINDAVFORMAT _lib )
|
||||
\ No newline at end of file
|
||||
+ENDMACRO (FINDAVFORMAT _lib )
|
||||
Index: k9copy-2.3.8-Source/cmake/FindAvutil.cmake
|
||||
===================================================================
|
||||
--- k9copy-2.3.8-Source.orig/cmake/FindAvutil.cmake
|
||||
+++ k9copy-2.3.8-Source/cmake/FindAvutil.cmake
|
||||
@@ -6,11 +6,11 @@ IF (AVUTIL_INCLUDE_DIR_FF)
|
||||
ELSE (AVUTIL_INCLUDE_DIR_FF)
|
||||
FIND_PATH(AVUTIL_INCLUDE_DIR_LAVC "libavutil/avutil.h" PATHS)
|
||||
IF (AVUTIL_INCLUDE_DIR_LAVC)
|
||||
- SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_LAVC}/libavutil")
|
||||
+ SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_LAVC}")
|
||||
ELSE (AVUTIL_INCLUDE_DIR_LAVC)
|
||||
FIND_PATH(AVUTIL_INCLUDE_DIR_FF_LAVF "ffmpeg/libavutil/avutil.h" PATHS)
|
||||
IF (AVUTIL_INCLUDE_DIR_FF_LAVF)
|
||||
- SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavutil")
|
||||
+ SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_FF_LAVF}/ffmpeg")
|
||||
ENDIF (AVUTIL_INCLUDE_DIR_FF_LAVF)
|
||||
ENDIF (AVUTIL_INCLUDE_DIR_LAVC)
|
||||
ENDIF (AVUTIL_INCLUDE_DIR_FF)
|
||||
@@ -32,4 +32,4 @@ IF (INC_FOUND)
|
||||
ELSE (INC_FOUND)
|
||||
MESSAGE(FATAL_ERROR "Could not find ${_lib}")
|
||||
ENDIF (INC_FOUND)
|
||||
-ENDMACRO (FINDAVUTIL _lib )
|
||||
\ No newline at end of file
|
||||
+ENDMACRO (FINDAVUTIL _lib )
|
||||
Index: k9copy-2.3.8-Source/cmake/FindFFmpegScale.cmake
|
||||
===================================================================
|
||||
--- k9copy-2.3.8-Source.orig/cmake/FindFFmpegScale.cmake
|
||||
+++ k9copy-2.3.8-Source/cmake/FindFFmpegScale.cmake
|
||||
@@ -7,11 +7,11 @@ IF (FFMPEGSCALE_INCLUDE_DIR_FF)
|
||||
ELSE (FFMPEGSCALE_INCLUDE_DIR_FF)
|
||||
FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_LAVC "libswscale/swscale.h" PATHS)
|
||||
IF (FFMPEGSCALE_INCLUDE_DIR_LAVC)
|
||||
- SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_LAVC}/libswscale")
|
||||
+ SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_LAVC}")
|
||||
ELSE (FFMPEGSCALE_INCLUDE_DIR_LAVC)
|
||||
FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_FF_SCAL "ffmpeg/libswscale/swscale.h" PATHS)
|
||||
IF (FFMPEGSCALE_INCLUDE_DIR_FF_SCAL)
|
||||
- SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF_SCAL}/ffmpeg/libswscale")
|
||||
+ SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF_SCAL}/ffmpeg")
|
||||
ENDIF (FFMPEGSCALE_INCLUDE_DIR_FF_SCAL)
|
||||
ENDIF (FFMPEGSCALE_INCLUDE_DIR_LAVC)
|
||||
ENDIF (FFMPEGSCALE_INCLUDE_DIR_FF)
|
||||
@@ -34,4 +34,4 @@ ELSE (HAVE_SWSCALE)
|
||||
MESSAGE(STATUS "k9copy will be built without swscale support")
|
||||
#MESSAGE(FATAL_ERROR "Could not find ${_lib}")
|
||||
ENDIF (HAVE_SWSCALE)
|
||||
-ENDMACRO (FINDFFMPEGSCALE _lib )
|
||||
\ No newline at end of file
|
||||
+ENDMACRO (FINDFFMPEGSCALE _lib )
|
||||
Index: k9copy-2.3.8-Source/src/import/k9avidecode.cpp
|
||||
===================================================================
|
||||
--- k9copy-2.3.8-Source.orig/src/import/k9avidecode.cpp
|
||||
+++ k9copy-2.3.8-Source/src/import/k9avidecode.cpp
|
||||
@@ -10,14 +10,14 @@
|
||||
//
|
||||
//
|
||||
#include "k9avidecode.h"
|
||||
-#include <avcodec.h>
|
||||
+#include <libavcodec/avcodec.h>
|
||||
#include <qimage.h>
|
||||
#include <dlfcn.h>
|
||||
#include "k9common.h"
|
||||
|
||||
#ifdef HAVE_SWSCALE
|
||||
|
||||
-#include "swscale.h"
|
||||
+#include <libswscale/swscale.h>
|
||||
|
||||
static int sws_flags = SWS_BICUBIC;
|
||||
|
||||
Index: k9copy-2.3.8-Source/src/import/k9avidecode.h
|
||||
===================================================================
|
||||
--- k9copy-2.3.8-Source.orig/src/import/k9avidecode.h
|
||||
+++ k9copy-2.3.8-Source/src/import/k9avidecode.h
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
#include "k9common.h"
|
||||
#include <qobject.h>
|
||||
-#include <avformat.h>
|
||||
-#include <avutil.h>
|
||||
+#include <libavformat/avformat.h>
|
||||
+#include <libavutil/avutil.h>
|
||||
#include <qimage.h>
|
||||
#include <cstdlib>
|
||||
#include <QObject>
|
||||
#ifdef HAVE_SWSCALE
|
||||
-#include <swscale.h>
|
||||
+#include <libswscale/swscale.h>
|
||||
#endif
|
||||
/**
|
||||
@author Jean-Michel PETIT <k9copy@free.fr>
|
||||
Index: k9copy-2.3.8-Source/src/vamps/k9ffmpeg.cpp
|
||||
===================================================================
|
||||
--- k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.cpp
|
||||
+++ k9copy-2.3.8-Source/src/vamps/k9ffmpeg.cpp
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "k9common.h"
|
||||
#include "k9ffmpeg.h"
|
||||
#ifdef HAVE_SWSCALE
|
||||
-#include "swscale.h"
|
||||
+#include <libswscale/swscale.h>
|
||||
#endif
|
||||
#include <dlfcn.h>
|
||||
#include <klocale.h>
|
||||
Index: k9copy-2.3.8-Source/src/vamps/k9ffmpeg.h
|
||||
===================================================================
|
||||
--- k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.h
|
||||
+++ k9copy-2.3.8-Source/src/vamps/k9ffmpeg.h
|
||||
@@ -13,12 +13,12 @@
|
||||
#define K9FFMPEG_H
|
||||
|
||||
#include <QString>
|
||||
-#include <avcodec.h>
|
||||
-#include <avformat.h>
|
||||
-#include <avutil.h>
|
||||
-#include <avio.h>
|
||||
+#include <libavcodec/avcodec.h>
|
||||
+#include <libavformat/avformat.h>
|
||||
+#include <libavutil/avutil.h>
|
||||
+#include <libavformat/avio.h>
|
||||
#ifdef HAVE_SWSCALE
|
||||
-#include <swscale.h>
|
||||
+#include <libswscale/swscale.h>
|
||||
#endif
|
||||
/**
|
||||
@author Jean-Michel PETIT <k9copy@free.fr>
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDE_DOC_DIRS="doc"
|
||||
KDE_HANDBOOK="optional"
|
||||
KDE_LINGUAS="ca cs da de el es es_AR fr it ja nl pl pt_BR ru sr sr@Latn tr uk zh_TW"
|
||||
KDE_LINGUAS_LIVE_OVERRIDE="true"
|
||||
MY_P=${P}-Source
|
||||
KDE_SCM="svn"
|
||||
inherit kde4-base
|
||||
|
||||
ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
|
||||
ESVN_PROJECT="k9copy"
|
||||
DESCRIPTION="k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5"
|
||||
HOMEPAGE="http://k9copy.sourceforge.net/"
|
||||
[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="4"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="debug mplayer"
|
||||
|
||||
DEPEND="
|
||||
media-libs/libdvdread
|
||||
media-libs/libmpeg2
|
||||
media-libs/xine-lib
|
||||
media-video/ffmpeg
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
media-video/dvdauthor
|
||||
mplayer? ( media-video/mplayer )
|
||||
"
|
||||
DOCS=( README )
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-ffmpeg-0.11.patch"
|
||||
"${FILESDIR}/${P}-includepaths.patch"
|
||||
"${FILESDIR}/${P}-ffmpeg-2.1.patch"
|
||||
)
|
||||
|
||||
pkg_postinst() {
|
||||
kde4-base_pkg_postinst
|
||||
has_version '>=app-cdr/k3b-1.50' || elog "If you want K3b burning support in ${P}, please install app-cdr/k3b separately."
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>kde@gentoo.org</email>
|
||||
<name>Gentoo KDE Project</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>media-video@gentoo.org</email>
|
||||
<name>Gentoo Video project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">k9copy</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue