diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-cdr/backlite | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-cdr/backlite')
-rw-r--r-- | app-cdr/backlite/Manifest | 1 | ||||
-rw-r--r-- | app-cdr/backlite/backlite-1.0.3-r1.ebuild | 48 | ||||
-rw-r--r-- | app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch | 363 | ||||
-rw-r--r-- | app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch | 18 | ||||
-rw-r--r-- | app-cdr/backlite/files/backlite-1.0.3-includepaths.patch | 89 | ||||
-rw-r--r-- | app-cdr/backlite/metadata.xml | 15 |
6 files changed, 534 insertions, 0 deletions
diff --git a/app-cdr/backlite/Manifest b/app-cdr/backlite/Manifest new file mode 100644 index 000000000000..d4f47f7c9e9c --- /dev/null +++ b/app-cdr/backlite/Manifest @@ -0,0 +1 @@ +DIST backlite-1.0.3.tar.gz 1597117 SHA256 f181667b585a26e7b44c2cd89e46ed00e4b0363542f2cfeb9ae2378d1718e5ca SHA512 6deb5cf33594da26a4ba1a4a01999feda10e8225b82c141df06eb958b559e5162be18b54a285ef34f4cf06af88dc635a4b2a27845a51a7fdecc96b94ac27f4c1 WHIRLPOOL b061a308443e226be9a1f479247e11baf0d14876b03bc87f8c7d39b0b42cc220725635f5433519f134c4e983401b4253a2ab66d5a952692b0499ef6082b3f5e7 diff --git a/app-cdr/backlite/backlite-1.0.3-r1.ebuild b/app-cdr/backlite/backlite-1.0.3-r1.ebuild new file mode 100644 index 000000000000..7120a7c3794d --- /dev/null +++ b/app-cdr/backlite/backlite-1.0.3-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit qt4-r2 eutils + +DESCRIPTION="backlite is a pure QT4 version of k9copy" +HOMEPAGE="http://k9copy.sourceforge.net/" +SRC_URI="mirror://sourceforge/k9copy/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="mplayer" + +# According to the author of backlite/k9copy libdvdread and libdvdnav are +# bundled internal because newer versions produce bad DVD copies. +# This will be fixed later. +# DEPEND="media-libs/libdvdread" + +DEPEND=">=media-libs/libmpeg2-0.5.1 + media-video/ffmpeg + dev-qt/qtgui:4 + dev-qt/qtdbus:4 + || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )" + +RDEPEND="${DEPEND} + media-video/dvdauthor + mplayer? ( media-video/mplayer )" + +src_prepare() { + sed -i -e '/^MimeTypes=.*/d' \ + -e '/^Encoding=.*/d' *.desktop || die + epatch "${FILESDIR}/${P}-ffmpeg-0.11.patch" \ + "${FILESDIR}/${P}-includepaths.patch" \ + "${FILESDIR}/${P}-ffmpeg2.patch" +} + +src_configure() { + eqmake4 backlite.pro PREFIX="${D}"/usr +} + +src_install() { + unset INSTALL_ROOT + default +} diff --git a/app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch new file mode 100644 index 000000000000..7feb3f9871da --- /dev/null +++ b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch @@ -0,0 +1,363 @@ +From slackware: +http://www.slackware.org.uk/slackbuilds.org/14.0/multimedia/backlite/ +https://bugs.gentoo.org/show_bug.cgi?id=443192 + +diff -Nru backlite-1.0.3.orig/backlite.pro backlite-1.0.3/backlite.pro +--- backlite-1.0.3.orig/backlite.pro 2011-12-07 21:34:56.000000000 +0100 ++++ backlite-1.0.3/backlite.pro 2012-11-23 10:02:55.000000000 +0100 +@@ -386,6 +386,11 @@ + INCLUDEPATH += $$a/ffmpeg + INCLUDEPATH += $$a/ffmpeg/libavformat + } ++ exists($$a/ffmpeg/libavutil) { ++ message(found $$a/ffmpeg!) ++ INCLUDEPATH += $$a/ffmpeg ++ INCLUDEPATH += $$a/ffmpeg/libavutil ++ } + exists($$a/ffmpeg/libswscale) { + message(found $$a/ffmpeg!) + INCLUDEPATH += $$a/ffmpeg +@@ -400,6 +405,10 @@ + message(found $$a/libavformat!) + INCLUDEPATH += $$a/libavformat + } ++ exists($$a/libavutil) { ++ message(found $$a/libavutil!) ++ INCLUDEPATH += $$a/libavutil ++ } + exists($$a/libswscale) { + message(found $$a/libswscale!) + INCLUDEPATH += $$a/libswscale +diff -Nru backlite-1.0.3.orig/src/backup/k9mp4enc.cpp backlite-1.0.3/src/backup/k9mp4enc.cpp +--- backlite-1.0.3.orig/src/backup/k9mp4enc.cpp 2011-12-07 21:34:56.000000000 +0100 ++++ backlite-1.0.3/src/backup/k9mp4enc.cpp 2012-12-11 10:01:39.507859366 +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 backlite-1.0.3.orig/src/core/k9audiocodecs.cpp backlite-1.0.3/src/core/k9audiocodecs.cpp +--- backlite-1.0.3.orig/src/core/k9audiocodecs.cpp 2011-12-07 21:34:56.000000000 +0100 ++++ backlite-1.0.3/src/core/k9audiocodecs.cpp 2012-12-11 10:01:39.510859330 +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 backlite-1.0.3.orig/src/core/k9videocodecs.cpp backlite-1.0.3/src/core/k9videocodecs.cpp +--- backlite-1.0.3.orig/src/core/k9videocodecs.cpp 2011-12-07 21:34:56.000000000 +0100 ++++ backlite-1.0.3/src/core/k9videocodecs.cpp 2012-12-11 10:01:39.512859304 +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 backlite-1.0.3.orig/src/import/k9avidecode.cpp backlite-1.0.3/src/import/k9avidecode.cpp +--- backlite-1.0.3.orig/src/import/k9avidecode.cpp 2011-12-07 21:34:56.000000000 +0100 ++++ backlite-1.0.3/src/import/k9avidecode.cpp 2012-11-23 09:39:06.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 backlite-1.0.3.orig/src/import/k9avidecode.h backlite-1.0.3/src/import/k9avidecode.h +--- backlite-1.0.3.orig/src/import/k9avidecode.h 2011-12-07 21:34:56.000000000 +0100 ++++ backlite-1.0.3/src/import/k9avidecode.h 2012-11-23 09:39:06.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 --git a/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch new file mode 100644 index 000000000000..63739350460b --- /dev/null +++ b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/show_bug.cgi?id=515160 + +Index: backlite-1.0.3/src/import/k9avidecode.h +=================================================================== +--- backlite-1.0.3.orig/src/import/k9avidecode.h ++++ backlite-1.0.3/src/import/k9avidecode.h +@@ -40,7 +40,11 @@ typedef int (*avformat_find_stream_info_ + #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 diff --git a/app-cdr/backlite/files/backlite-1.0.3-includepaths.patch b/app-cdr/backlite/files/backlite-1.0.3-includepaths.patch new file mode 100644 index 000000000000..bd9cdba6ffe3 --- /dev/null +++ b/app-cdr/backlite/files/backlite-1.0.3-includepaths.patch @@ -0,0 +1,89 @@ +libavutil/time.h in recent ffmpeg versions pollute the includes. +include libav* headers correcly. + +Index: backlite-1.0.3/backlite.pro +=================================================================== +--- backlite-1.0.3.orig/backlite.pro ++++ backlite-1.0.3/backlite.pro +@@ -383,39 +383,31 @@ for(a, INCLOC ) { + exists($$a/ffmpeg/libavcodec) { + message(found $$a/ffmpeg!) + INCLUDEPATH += $$a/ffmpeg +- INCLUDEPATH += $$a/ffmpeg/libavcodec + } + exists($$a/ffmpeg/libavformat) { + message(found $$a/ffmpeg!) + INCLUDEPATH += $$a/ffmpeg +- INCLUDEPATH += $$a/ffmpeg/libavformat + } + exists($$a/ffmpeg/libavutil) { + message(found $$a/ffmpeg!) + INCLUDEPATH += $$a/ffmpeg +- INCLUDEPATH += $$a/ffmpeg/libavutil + } + exists($$a/ffmpeg/libswscale) { + message(found $$a/ffmpeg!) + INCLUDEPATH += $$a/ffmpeg +- INCLUDEPATH += $$a/ffmpeg/libswscale + DEFINES += HAVE_SWSCALE + } + exists($$a/libavcodec) { + message(found $$a/libavcodec!) +- INCLUDEPATH += $$a/libavcodec + } + exists($$a/libavformat) { + message(found $$a/libavformat!) +- INCLUDEPATH += $$a/libavformat + } + exists($$a/libavutil) { + message(found $$a/libavutil!) +- INCLUDEPATH += $$a/libavutil + } + exists($$a/libswscale) { + message(found $$a/libswscale!) +- INCLUDEPATH += $$a/libswscale + DEFINES += HAVE_SWSCALE + } + } +Index: backlite-1.0.3/src/import/k9avidecode.cpp +=================================================================== +--- backlite-1.0.3.orig/src/import/k9avidecode.cpp ++++ backlite-1.0.3/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: backlite-1.0.3/src/import/k9avidecode.h +=================================================================== +--- backlite-1.0.3.orig/src/import/k9avidecode.h ++++ backlite-1.0.3/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> diff --git a/app-cdr/backlite/metadata.xml b/app-cdr/backlite/metadata.xml new file mode 100644 index 000000000000..b6c0377a2637 --- /dev/null +++ b/app-cdr/backlite/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>billie@gentoo.org</email> + <name>Daniel Pielmeier</name> + </maintainer> + <use> + <flag name="mplayer">Add support for mplayer preview in addition to X11 + and phonon</flag> + </use> + <upstream> + <remote-id type="sourceforge">k9copy</remote-id> + </upstream> +</pkgmetadata> |