Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/dvbcut/Manifest22
-rw-r--r--media-video/dvbcut/dvbcut-0.5.4-r1.ebuild65
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.3-ffmpeg-compat.patch38
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-avformat-api-changes.patch16
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff112
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat2.patch129
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat3.patch199
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-gcc42.patch13
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-gcc43.patch24
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-lavc.patch42
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-open.patch13
-rw-r--r--media-video/dvbcut/files/dvbcut-0.5.4-scons.patch14
12 files changed, 0 insertions, 687 deletions
diff --git a/media-video/dvbcut/Manifest b/media-video/dvbcut/Manifest
index d48a96889b82..3fecf42c5a5d 100644
--- a/media-video/dvbcut/Manifest
+++ b/media-video/dvbcut/Manifest
@@ -1,28 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX dvbcut-0.5.3-ffmpeg-compat.patch 1380 RMD160 3c52b5997d0c25eebdbe32161074504b05aa710b SHA1 84e5ff8d2137aad5fe5a7eb74af20590eeb722ff SHA256 0fe452450ac506b4660324e1e1b038844fce79821c0df7f3580969a3b9171f4a
-AUX dvbcut-0.5.4-avformat-api-changes.patch 444 RMD160 9619c01f90d947450181726d72576cfb5e396eee SHA1 260649d80cec68940294f9a8f690c68caa481eeb SHA256 02015824e0c6879d4c54fc48a6b486f556ff9c09841bda6cdad378afb378f5b6
-AUX dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff 3503 RMD160 36fe73e9b3ca368de84f0cd7ce1d59a043f6cc6f SHA1 dba836368e2807206bffd852c0f760c801866433 SHA256 3eb0171b3e9b41ca7880b76a4a7c4bacf9c3968ae60620e5c4d4c2abace587db
-AUX dvbcut-0.5.4-ffmpeg-compat2.patch 3262 RMD160 8c819ffab5b6a54246915a2eb575efa6674bef24 SHA1 9aa636d911da28d29bcc7024ad9eafba2e7d80c2 SHA256 aec5a2c92fc839e87da35a6875ee273c93d1dd36292be9e2e9f7a5a8782286c1
-AUX dvbcut-0.5.4-ffmpeg-compat3.patch 6179 RMD160 4c6721d92fd508b56924975779acc02dfc6fe350 SHA1 294f4e686570c21291129128e9f019897ecda570 SHA256 018c5a88c11692259397610db6d5456154d2bbd0912994e17a664e5135fc2170
-AUX dvbcut-0.5.4-gcc42.patch 576 RMD160 6e84fa4a525f4bba1f4f8263048b8dd89ddd2294 SHA1 adb11d4d8eb3b48c1c5a437fb70013c6e3b0e104 SHA256 9792d58872aa949233d3b554019cf63ba08c8ee4a2bd03ece55b69392f521a83
-AUX dvbcut-0.5.4-gcc43.patch 728 RMD160 60ddd508f1dc360294c69c29f00a73f441e002a8 SHA1 2786e584515aca073cd96091192c02b15b6065fc SHA256 59dcaeaec52c021cda26252f153a0b427b25763afb89dba3ac0ca9b114b2f7a2
-AUX dvbcut-0.5.4-lavc.patch 1826 RMD160 74c476d64fc4fa3b4334fdd5d08d7df8b40de71f SHA1 5f85feff3a0446e07fe2ea2e88200025a9755413 SHA256 86d1d0c4533cca0940e62b8018e807525df39fa4af483dcfb850651144cc74c6
-AUX dvbcut-0.5.4-open.patch 498 RMD160 50b4e5b1a54a3244cc8590764b47e0ef03cab23e SHA1 7888892160538474c8c29a45e2bb527c9598bf88 SHA256 0ea589d76327ca43a9b264ba846cdca2f52dc566854bb8544894168d5bbf9580
-AUX dvbcut-0.5.4-scons.patch 611 RMD160 483b17b11abcd633cf142dc8ee55d5bf58af3bbe SHA1 f3444dd91285611502ac4471edf707c4c783fc34 SHA256 ef52402ebc6e9fb584954e8df2a1fe152ddabaa9d4f600d9aedd3a4b4b977b2b
AUX dvbcut-0.6.0-gcc-4.4.patch 506 RMD160 0e37c9014393af5a6c32ef41ab2fe680d5edf835 SHA1 244d1380ae6cb5483e573e37462bf9bc65ebdf3e SHA256 74c7cd4fb342641ecf3dd47b717d6a316bad8df3d534354a8b4f67760de88a47
AUX dvbcut-0.6.0-parallel-install.patch 319 RMD160 b77932ffcc495e2a0dcd2ed18f38fd330e72c7c3 SHA1 8afc0cce2afae267e4ac014534e40d75615f8a9c SHA256 452340d7af791a7ae6bae7a1df61326751b0d47270af731fee7f1f81922be1de
DIST dvbcut-0.6.0.tar.gz 1056571 RMD160 666cc08932cb045a85be6a2e1b28ea731748d213 SHA1 babeaad1c1eb9063c9e7274d3948bd1ad94222a7 SHA256 41f15fe8112f1c52d2c598718422d03138fb3c18a83c44591ea560f065129b6d
-DIST dvbcut_0.5.4.tar.bz2 795991 RMD160 fc36b9d3abd818495498c1d8181e1250f43e0057 SHA1 2bf174ec05fd92a9ac5878498c91f90bd307a2ca SHA256 db6500fc327585be6ee5a36135c9940828d22bde936daa17b6a5cce852ad9f70
-EBUILD dvbcut-0.5.4-r1.ebuild 1816 RMD160 1fd44a3258bc94de035f2ed9a779215a2485590e SHA1 2f0533086ad1cb6f957269c7309b80bdf6a07f75 SHA256 bc840afa1f6a4ef70a9713d800040971f738e9fb66b588c54ecbf4d2859bb363
EBUILD dvbcut-0.6.0.ebuild 979 RMD160 16ea9c6f96bba7fe7bc1e0d0f224bd335dc6b972 SHA1 7c26986a311b6bc970ad129d71be8fba92ad0e6d SHA256 1f8ab90f784680765bd6cdd971dc3385cb995758c2edfd0ccc679acee4496c5c
MISC ChangeLog 4345 RMD160 f162e102bd7a3ba5c4297b9eae9c5017512a4fd6 SHA1 a954a9fb66242c22beef39070ffc343d93be484c SHA256 ae0585bb43f5845c276552e04f3b2271e3bf7eb39c0d727436118376ec11ae4b
MISC metadata.xml 324 RMD160 f2aa5564dcf9f6eb7125b4108036b461daafa0f8 SHA1 024ad1285614637f4714ed73e44c8775baa5dbb8 SHA256 f489aa35e389cfd8948dd6a5a4260fe644c2b1cf3d6173feb4d5a71d4a26915d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iEYEARECAAYFAkpB/OAACgkQt2vP6XvVdOeVPwCfQji2wbV/+swFyHD3Dbz65eLE
-fjIAniKq3rhpUZCcwyPQtZbVjG1Ah4+i
-=rypQ
------END PGP SIGNATURE-----
diff --git a/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild b/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild
deleted file mode 100644
index f583fbf4559a..000000000000
--- a/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild,v 1.9 2009/03/08 17:22:13 aballier Exp $
-
-EAPI=1
-
-inherit qt3 eutils
-
-IUSE=""
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="frame-accurate editing of MPEG-2 video with MPEG and AC3 audio"
-HOMEPAGE="http://dvbcut.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-libs/qt:3
- media-libs/libao
- >=media-video/ffmpeg-0.4.9_p20070330"
-
-DEPEND="${RDEPEND}
- dev-util/scons"
-
-pkg_setup() {
- if ! built_with_use --missing true media-video/ffmpeg a52; then
- eerror "This package requires media-video/ffmpeg compiled with A/52 (a.k.a. AC-3) support."
- eerror "Please reemerge media-video/ffmpeg with USE=\"a52\"."
- die "Please reemerge media-video/ffmpeg with USE=\"a52\"."
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${PN}-0.5.3-ffmpeg-compat.patch"
- epatch "${FILESDIR}/${P}-gcc42.patch"
- epatch "${FILESDIR}/${P}-gcc43.patch"
- epatch "${FILESDIR}/${P}-ffmpeg-compat2.patch"
- epatch "${FILESDIR}/${P}-ffmpeg-compat3.patch"
- epatch "${FILESDIR}/${P}-avformat-api-changes.patch"
- epatch "${FILESDIR}/${P}-lavc.patch"
- epatch "${FILESDIR}/${P}-scons.patch"
- epatch "${FILESDIR}/${P}-open.patch"
-
- if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then
- epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326.diff"
- fi
-}
-
-src_compile() {
- emake FFMPEG=/usr || die "build failed"
-}
-
-src_install() {
- emake FFMPEG=/usr DESTDIR="${D}" PREFIX="/usr" MANPATH="/usr/share/man" install \
- || die "install failed"
- make_desktop_entry dvbcut DVBcut \
- || die "Couldn't make dvbcut desktop entry"
- dodoc CREDITS ChangeLog README README.ffmpeg README.icons
-}
diff --git a/media-video/dvbcut/files/dvbcut-0.5.3-ffmpeg-compat.patch b/media-video/dvbcut/files/dvbcut-0.5.3-ffmpeg-compat.patch
deleted file mode 100644
index fdb8a4eab2b2..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.3-ffmpeg-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: dvbcut-0.5.3/SConstruct
-===================================================================
---- dvbcut-0.5.3.orig/SConstruct
-+++ dvbcut-0.5.3/SConstruct
-@@ -101,6 +101,7 @@ if (ffmpegpath!='/usr'):
- env.Append(LIBPATH=os.path.join(str(ffmpegpath),'lib'))
- env.Append(LIBS=['avformat','avcodec','avutil'])
-
-+env.Append(CPPDEFINES="__STDC_CONSTANT_MACROS")
- ###### WORK
-
- env.bin_targets=[]
-Index: dvbcut-0.5.3/src/psfile.cpp
-===================================================================
---- dvbcut-0.5.3.orig/src/psfile.cpp
-+++ dvbcut-0.5.3/src/psfile.cpp
-@@ -100,7 +100,7 @@ psfile::psfile(const std::string &filena
- streamnumber[sid]=audiostream(audiostreams);
- stream *S=&s[audiostream(audiostreams++)];
- S->id=sid;
-- S->dec=&ac3_decoder;
-+ S->dec=&liba52_decoder;
- S->type=streamtype::ac3audio;
- if (audiostreams>=MAXAUDIOSTREAMS)
- break;
-Index: dvbcut-0.5.3/src/tsfile.cpp
-===================================================================
---- dvbcut-0.5.3.orig/src/tsfile.cpp
-+++ dvbcut-0.5.3/src/tsfile.cpp
-@@ -73,7 +73,7 @@ tsfile::tsfile(const std::string &filena
- stream *S=&s[audiostream(audiostreams++)];
- S->id=it->second;
- if (it->first==0xbd) {
-- S->dec=&ac3_decoder;
-+ S->dec=&liba52_decoder;
- S->enc=&ac3_encoder;
- S->type=streamtype::ac3audio;
- } else {
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-avformat-api-changes.patch b/media-video/dvbcut/files/dvbcut-0.5.4-avformat-api-changes.patch
deleted file mode 100644
index e9e7a58b188e..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-avformat-api-changes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/lavfmuxer.cpp
-===================================================================
---- src/lavfmuxer.cpp (revision 101)
-+++ src/lavfmuxer.cpp (working copy)
-@@ -120,7 +120,11 @@
- if (fileopened) {
- av_write_trailer(avfc);
- if (!(fmt->flags & AVFMT_NOFILE))
-+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
-+ url_fclose(avfc->pb);
-+#else
- url_fclose(&avfc->pb);
-+#endif
- }
-
- av_free(avfc);
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff b/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff
deleted file mode 100644
index e5f1fe225fbf..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ru dvbcut-0.5.4-orig/src/avframe.h dvbcut-0.5.4/src/avframe.h
---- dvbcut-0.5.4-orig/src/avframe.h 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/avframe.h 2008-05-10 16:54:14.084008546 +0200
-@@ -20,9 +20,9 @@
- #define _DVBCUT_AVFRAME_H
-
- extern "C" {
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- #ifdef HAVE_LIB_SWSCALE
--#include <ffmpeg/swscale.h>
-+#include <libswscale/swscale.h>
- #endif
- }
-
-diff -ru dvbcut-0.5.4-orig/src/lavfmuxer.cpp dvbcut-0.5.4/src/lavfmuxer.cpp
---- dvbcut-0.5.4-orig/src/lavfmuxer.cpp 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/lavfmuxer.cpp 2008-05-10 16:55:13.324030353 +0200
-@@ -17,7 +17,7 @@
- */
-
- extern "C" {
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- }
- #include <string.h>
- #include <utility>
-diff -ru dvbcut-0.5.4-orig/src/lavfmuxer.h dvbcut-0.5.4/src/lavfmuxer.h
---- dvbcut-0.5.4-orig/src/lavfmuxer.h 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/lavfmuxer.h 2008-05-10 16:55:43.134010915 +0200
-@@ -20,7 +20,7 @@
- #define _DVBCUT_LAVFMUXER_H
-
- extern "C" {
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- }
- #include "mpgfile.h"
- #include "muxer.h"
-diff -ru dvbcut-0.5.4-orig/src/main.cpp dvbcut-0.5.4/src/main.cpp
---- dvbcut-0.5.4-orig/src/main.cpp 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/main.cpp 2008-05-10 16:58:17.424008441 +0200
-@@ -28,7 +28,7 @@
-
- #include <qapplication.h>
- extern "C" {
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- }
- #include <qimage.h>
- #include <qsettings.h>
-diff -ru dvbcut-0.5.4-orig/src/mpgfile.h dvbcut-0.5.4/src/mpgfile.h
---- dvbcut-0.5.4-orig/src/mpgfile.h 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/mpgfile.h 2008-05-10 16:55:03.334007370 +0200
-@@ -20,7 +20,7 @@
- #define _DVBCUT_MPGFILE_H
-
- extern "C" {
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- }
-
- #include <string>
-diff -ru dvbcut-0.5.4-orig/src/playaudio.cpp dvbcut-0.5.4/src/playaudio.cpp
---- dvbcut-0.5.4-orig/src/playaudio.cpp 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/playaudio.cpp 2008-05-10 16:58:26.614013343 +0200
-@@ -20,7 +20,7 @@
- #include <stdio.h>
- #include <ao/ao.h>
- extern "C" {
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- }
-
- #include "playaudio.h"
-diff -ru dvbcut-0.5.4-orig/src/psfile.cpp dvbcut-0.5.4/src/psfile.cpp
---- dvbcut-0.5.4-orig/src/psfile.cpp 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/psfile.cpp 2008-05-10 16:58:44.414009258 +0200
-@@ -21,7 +21,7 @@
- #include "stream.h"
-
- extern "C" {
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- }
-
- psfile::psfile(const std::string &filename, inbuffer &b, int initial_offset)
-diff -ru dvbcut-0.5.4-orig/src/streamdata.h dvbcut-0.5.4/src/streamdata.h
---- dvbcut-0.5.4-orig/src/streamdata.h 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/streamdata.h 2008-05-10 16:54:54.624010142 +0200
-@@ -22,7 +22,7 @@
- #include <string>
- #include <list>
- extern "C" {
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- }
-
- #include "port.h"
-diff -ru dvbcut-0.5.4-orig/src/tsfile.cpp dvbcut-0.5.4/src/tsfile.cpp
---- dvbcut-0.5.4-orig/src/tsfile.cpp 2008-05-10 16:53:51.834017093 +0200
-+++ dvbcut-0.5.4/src/tsfile.cpp 2008-05-10 16:58:35.974008055 +0200
-@@ -23,7 +23,7 @@
- #include <utility>
-
- extern "C" {
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- }
-
- tsfile::tsfile(const std::string &filename, inbuffer &b, int initial_offset)
-
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat2.patch b/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat2.patch
deleted file mode 100644
index b58228630965..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat2.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Index: dvbcut-0.5.4/src/avframe.h
-===================================================================
---- dvbcut-0.5.4.orig/src/avframe.h
-+++ dvbcut-0.5.4/src/avframe.h
-@@ -19,7 +19,9 @@
- #ifndef _DVBCUT_AVFRAME_H
- #define _DVBCUT_AVFRAME_H
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- class QImage;
-
-Index: dvbcut-0.5.4/src/lavfmuxer.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/lavfmuxer.cpp
-+++ dvbcut-0.5.4/src/lavfmuxer.cpp
-@@ -16,7 +16,9 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
- #include <string.h>
- #include <utility>
- #include <list>
-Index: dvbcut-0.5.4/src/lavfmuxer.h
-===================================================================
---- dvbcut-0.5.4.orig/src/lavfmuxer.h
-+++ dvbcut-0.5.4/src/lavfmuxer.h
-@@ -19,7 +19,9 @@
- #ifndef _DVBCUT_LAVFMUXER_H
- #define _DVBCUT_LAVFMUXER_H
-
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
- #include "mpgfile.h"
- #include "muxer.h"
-
-Index: dvbcut-0.5.4/src/main.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/main.cpp
-+++ dvbcut-0.5.4/src/main.cpp
-@@ -27,7 +27,9 @@
- #endif // HAVE_LIB_AO
-
- #include <qapplication.h>
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
- #include <qimage.h>
- #include <qsettings.h>
- #include "dvbcut.h"
-Index: dvbcut-0.5.4/src/mpgfile.h
-===================================================================
---- dvbcut-0.5.4.orig/src/mpgfile.h
-+++ dvbcut-0.5.4/src/mpgfile.h
-@@ -19,7 +19,10 @@
- #ifndef _DVBCUT_MPGFILE_H
- #define _DVBCUT_MPGFILE_H
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-+
- #include <string>
- #include <vector>
- #include <list>
-Index: dvbcut-0.5.4/src/playaudio.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/playaudio.cpp
-+++ dvbcut-0.5.4/src/playaudio.cpp
-@@ -19,7 +19,10 @@
- #ifdef HAVE_LIB_AO
- #include <stdio.h>
- #include <ao/ao.h>
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-+
- #include "playaudio.h"
-
- #define MIN_BUFFER_SAMPLES (1536*6)
-Index: dvbcut-0.5.4/src/psfile.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/psfile.cpp
-+++ dvbcut-0.5.4/src/psfile.cpp
-@@ -19,7 +19,10 @@
- #include "psfile.h"
- #include "streamhandle.h"
- #include "stream.h"
-+
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- psfile::psfile(const std::string &filename, inbuffer &b, int initial_offset)
- : mpgfile(filename, b, initial_offset)
-Index: dvbcut-0.5.4/src/streamdata.h
-===================================================================
---- dvbcut-0.5.4.orig/src/streamdata.h
-+++ dvbcut-0.5.4/src/streamdata.h
-@@ -21,7 +21,9 @@
-
- #include <string>
- #include <list>
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
-
- #include "port.h"
- #include "tsfile.h"
-Index: dvbcut-0.5.4/src/tsfile.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/tsfile.cpp
-+++ dvbcut-0.5.4/src/tsfile.cpp
-@@ -22,7 +22,9 @@
- #include <list>
- #include <utility>
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- tsfile::tsfile(const std::string &filename, inbuffer &b, int initial_offset)
- : mpgfile(filename, b, initial_offset)
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat3.patch b/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat3.patch
deleted file mode 100644
index 53e762a1b741..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-compat3.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-Index: dvbcut-svn/src/psfile.cpp
-===================================================================
---- dvbcut-svn.orig/src/psfile.cpp
-+++ dvbcut-svn/src/psfile.cpp
-@@ -90,7 +90,7 @@ psfile::psfile(const std::string &filena
- streamnumber[sid]=audiostream(audiostreams);
- stream *S=&s[audiostream(audiostreams++)];
- S->id=sid;
-- S->dec=&mp2_decoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MP2);
- S->type=streamtype::mpegaudio;
- if (audiostreams>=MAXAUDIOSTREAMS)
- break;
-@@ -100,7 +100,7 @@ psfile::psfile(const std::string &filena
- streamnumber[sid]=audiostream(audiostreams);
- stream *S=&s[audiostream(audiostreams++)];
- S->id=sid;
-- S->dec=&liba52_decoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_AC3);
- S->type=streamtype::ac3audio;
- if (audiostreams>=MAXAUDIOSTREAMS)
- break;
-@@ -114,8 +114,8 @@ psfile::psfile(const std::string &filena
- S->allocavcc();
- S->avcc->codec_type=CODEC_TYPE_VIDEO;
- S->avcc->codec_id=CODEC_ID_MPEG2VIDEO;
-- S->dec=&mpeg2video_decoder;
-- S->enc=&mpeg2video_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
-+ S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO);
- S->type=streamtype::mpeg2video;
- }
-
-Index: dvbcut-svn/src/tsfile.cpp
-===================================================================
---- dvbcut-svn.orig/src/tsfile.cpp
-+++ dvbcut-svn/src/tsfile.cpp
-@@ -78,12 +78,12 @@ tsfile::tsfile(const std::string &filena
- stream *S=&s[audiostream(audiostreams++)];
- S->id=it->second;
- if (it->first==0xbd) {
-- S->dec=&liba52_decoder;
-- S->enc=&ac3_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_AC3);
-+ S->enc=avcodec_find_encoder(CODEC_ID_AC3);
- S->type=streamtype::ac3audio;
- } else {
-- S->dec=&mp2_decoder;
-- S->enc=&mp2_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MP2);
-+ S->enc=avcodec_find_decoder(CODEC_ID_MP2);
- S->type=streamtype::mpegaudio;
- }
- if (audiostreams>=MAXAUDIOSTREAMS)
-@@ -98,8 +98,8 @@ tsfile::tsfile(const std::string &filena
- S->allocavcc();
- S->avcc->codec_type=CODEC_TYPE_VIDEO;
- S->avcc->codec_id=CODEC_ID_MPEG2VIDEO;
-- S->dec=&mpeg2video_decoder;
-- S->enc=&mpeg2video_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
-+ S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO);
- S->type=streamtype::mpeg2video;
- }
-
-Index: dvbcut-svn/src/avframe.cpp
-===================================================================
---- dvbcut-svn.orig/src/avframe.cpp
-+++ dvbcut-svn/src/avframe.cpp
-@@ -23,7 +23,11 @@
- #include <stdio.h>
- #include "avframe.h"
-
-+#ifdef HAVE_LIB_SWSCALE
-+avframe::avframe() : tobefreed(0),w(0),h(0),dw(0),pix_fmt(),img_convert_ctx(0)
-+#else
- avframe::avframe() : tobefreed(0),w(0),h(0),dw(0),pix_fmt()
-+#endif
- {
- f=avcodec_alloc_frame();
- }
-@@ -54,7 +58,11 @@ avframe::avframe(AVFrame *src, AVCodecCo
- h=ctx->height;
- pix_fmt=ctx->pix_fmt;
- dw=w*ctx->sample_aspect_ratio.num/ctx->sample_aspect_ratio.den;
--
-+#ifdef HAVE_LIB_SWSCALE
-+ img_convert_ctx=sws_getContext(w, h, pix_fmt,
-+ w, h, PIX_FMT_BGR24, SWS_BICUBIC,
-+ NULL, NULL, NULL);
-+#endif
- }
-
- avframe::~avframe()
-@@ -63,11 +71,19 @@ avframe::~avframe()
- free(tobefreed);
- if (f)
- av_free(f);
-+#ifdef HAVE_LIB_SWSCALE
-+ if (img_convert_ctx)
-+ sws_freeContext(img_convert_ctx);
-+#endif
- }
-
- QImage avframe::getqimage(bool scaled, int viewscalefactor)
- {
-+#ifdef HAVE_LIB_SWSCALE
-+ if (w<=0 || h<=0 || img_convert_ctx==NULL)
-+#else
- if (w<=0 || h<=0)
-+#endif
- return QImage();
-
- uint8_t *rgbbuffer=(uint8_t*)malloc(avpicture_get_size(PIX_FMT_RGB24, w, h)+64);
-@@ -79,11 +95,20 @@ QImage avframe::getqimage(bool scaled, i
- rgbbuffer+headerlen,
- PIX_FMT_RGB24,w,h);
-
-+#ifdef HAVE_LIB_SWSCALE
-+ sws_scale(img_convert_ctx, f->data, f->linesize, 0, h,
-+ avframergb->data, avframergb->linesize);
-+#else
- img_convert((AVPicture *)avframergb, PIX_FMT_RGB24, (AVPicture*)f, pix_fmt, w, h);
-+#endif
-
- QImage im;
- im.loadFromData(rgbbuffer, headerlen+w*h*3, "PPM");
-
-+#ifdef HAVE_LIB_SWSCALE
-+ im = im.swapRGB();
-+#endif
-+
- if ((scaled && w!=dw)||(viewscalefactor!=1)) {
- #ifdef SMOOTHSCALE
- im = im.smoothScale((scaled?dw:w)/viewscalefactor, h/viewscalefactor);
-Index: dvbcut-svn/src/avframe.h
-===================================================================
---- dvbcut-svn.orig/src/avframe.h
-+++ dvbcut-svn/src/avframe.h
-@@ -23,6 +23,9 @@
-
- extern "C" {
- #include <ffmpeg/avcodec.h>
-+#ifdef HAVE_LIB_SWSCALE
-+#include <ffmpeg/swscale.h>
-+#endif
- }
-
- class QImage;
-@@ -37,6 +40,9 @@ protected:
- void *tobefreed;
- int w,h,dw;
- enum PixelFormat pix_fmt;
-+#ifdef HAVE_LIB_SWSCALE
-+ struct SwsContext *img_convert_ctx;
-+#endif
-
- public:
- avframe();
-Index: dvbcut-svn/SConstruct
-===================================================================
---- dvbcut-svn.orig/SConstruct
-+++ dvbcut-svn/SConstruct
-@@ -88,10 +88,6 @@ if (not env.GetOption('clean')):
- print "Checking for libao... found"
- else:
- print "Checking for libao... not found"
--
--### FINISH
--
--env=conf.Finish()
-
- ###### BUILD ENVIRONMENT (pt2)
-
-@@ -117,8 +113,23 @@ if (ffmpegpath!='/usr'):
- env.Append(CPPPATH=os.path.join(str(ffmpegpath),'include'))
- env.Append(LIBPATH=os.path.join(str(ffmpegpath),'lib'))
- env.Append(LIBS=['avformat','avcodec','avutil'])
-+if (localffmpeg==False):
-+ env.Append(CPPDEFINES=["__STDC_CONSTANT_MACROS", "__STDC_LIMIT_MACROS"])
-+
-+
-+### LIBSWSCALE
-+if (not env.GetOption('clean') and not localffmpeg):
-+ if (conf.TryAction('pkg-config --exists libswscale')[0]):
-+ conf.env.Append(CPPDEFINES="HAVE_LIB_SWSCALE")
-+ conf.env.ParseConfig('pkg-config --cflags --libs libswscale')
-+ print "Checking for C library swscale... yes"
-+ elif (conf.CheckLibWithHeader('swscale', 'ffmpeg/swscale.h', 'C')):
-+ conf.env.Append(CPPDEFINES="HAVE_LIB_SWSCALE")
-+
-+### FINISH
-+
-+env=conf.Finish()
-
--env.Append(CPPDEFINES="__STDC_CONSTANT_MACROS")
- ###### WORK
-
- env.bin_targets=[]
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-gcc42.patch b/media-video/dvbcut/files/dvbcut-0.5.4-gcc42.patch
deleted file mode 100644
index ba61fcdca064..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-gcc42.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dvbcut-0.5.4/src/playaudio.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/playaudio.cpp
-+++ dvbcut-0.5.4/src/playaudio.cpp
-@@ -38,7 +38,7 @@ void playaudio(const void *data, uint32_
- const uint8_t *d=(const uint8_t*)data;
-
- while (len>0) {
-- int16_t samples[MIN_BUFFER_SAMPLES >? avcc->frame_size];
-+ int16_t samples[MIN_BUFFER_SAMPLES > avcc->frame_size ? MIN_BUFFER_SAMPLES : avcc->frame_size ];
- int frame_size;
-
- int bytesDecoded=avcodec_decode_audio(avcc,samples,&frame_size,(uint8_t*)d,len);
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-gcc43.patch b/media-video/dvbcut/files/dvbcut-0.5.4-gcc43.patch
deleted file mode 100644
index 7bf06bb7fcd9..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-gcc43.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dvbcut-0.5.4/src/mpegmuxer.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/mpegmuxer.cpp
-+++ dvbcut-0.5.4/src/mpegmuxer.cpp
-@@ -16,6 +16,7 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+#include <cstdlib>
- #include <string.h>
- #include <strings.h>
- #include <unistd.h>
-Index: dvbcut-0.5.4/src/mpgfile.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/mpgfile.cpp
-+++ dvbcut-0.5.4/src/mpgfile.cpp
-@@ -16,6 +16,7 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+#include <cstdlib>
- #include <string.h>
- #include <stdint.h>
- #include <errno.h>
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-lavc.patch b/media-video/dvbcut/files/dvbcut-0.5.4-lavc.patch
deleted file mode 100644
index 2306ad906b9c..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-lavc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: dvbcut-0.5.4/src/avframe.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/avframe.cpp
-+++ dvbcut-0.5.4/src/avframe.cpp
-@@ -39,7 +39,7 @@ avframe::avframe(AVFrame *src, AVCodecCo
- (u_int8_t*)tobefreed,
- ctx->pix_fmt,ctx->width,ctx->height);
-
-- img_copy((AVPicture *)f, (const AVPicture *) src,
-+ av_picture_copy((AVPicture *)f, (const AVPicture *) src,
- ctx->pix_fmt, ctx->width, ctx->height);
-
- f->pict_type = src->pict_type;
-Index: dvbcut-0.5.4/src/mpgfile.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/mpgfile.cpp
-+++ dvbcut-0.5.4/src/mpgfile.cpp
-@@ -250,7 +250,7 @@ void mpgfile::initaudiocodeccontext(int
-
- int16_t samples[6*1536]; // must be enough for 6 AC-3 channels --mr
- int frame_size=sizeof(samples);
-- avcodec_decode_audio(S->avcc,samples,&frame_size,(uint8_t*) sd->getdata(),sd->inbytes());
-+ avcodec_decode_audio2(S->avcc,samples,&frame_size,(uint8_t*) sd->getdata(),sd->inbytes());
- avcodec_close(S->avcc);
- }
-
-Index: dvbcut-0.5.4/src/playaudio.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/playaudio.cpp
-+++ dvbcut-0.5.4/src/playaudio.cpp
-@@ -42,9 +42,9 @@ void playaudio(const void *data, uint32_
-
- while (len>0) {
- int16_t samples[MIN_BUFFER_SAMPLES > avcc->frame_size ? MIN_BUFFER_SAMPLES : avcc->frame_size ];
-- int frame_size;
-+ int frame_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;;
-
-- int bytesDecoded=avcodec_decode_audio(avcc,samples,&frame_size,(uint8_t*)d,len);
-+ int bytesDecoded=avcodec_decode_audio2(avcc,samples,&frame_size,(uint8_t*)d,len);
-
- if (bytesDecoded<0) {
- fprintf(stderr,"avcodec_decode_audio returned %d\n",bytesDecoded);
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-open.patch b/media-video/dvbcut/files/dvbcut-0.5.4-open.patch
deleted file mode 100644
index 4bffe20717f8..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-open.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dvbcut-0.5.4/src/buffer.cpp
-===================================================================
---- dvbcut-0.5.4.orig/src/buffer.cpp
-+++ dvbcut-0.5.4/src/buffer.cpp
-@@ -392,7 +392,7 @@ outbuffer::~outbuffer()
- int outbuffer::open(const char* filename)
- {
- close=true;
-- return fd=::open(filename,O_WRONLY|O_CREAT|O_TRUNC|O_BINARY);
-+ return fd=::open(filename,O_WRONLY|O_CREAT|O_TRUNC|O_BINARY,0644);
- }
-
- int outbuffer::putdata(const void *data, unsigned int len, bool autoresize)
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-scons.patch b/media-video/dvbcut/files/dvbcut-0.5.4-scons.patch
deleted file mode 100644
index 5a4f1768db90..000000000000
--- a/media-video/dvbcut/files/dvbcut-0.5.4-scons.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- SConstruct 2007-04-13 19:36:40.000000000 +0200
-+++ SConstruct 2008-06-29 22:38:32.000000000 +0200
-@@ -7,9 +7,9 @@
-
- opts=Options()
-
--opt=opts.Add(PathOption('PREFIX', 'Directory to install under', '/usr/local'))
-+opt=opts.Add(PathOption('PREFIX', 'Directory to install under', '/usr'))
- opt=opts.Add(PathOption('BINDIR', 'Directory to install under', os.path.join('$PREFIX','bin')))
--opt=opts.Add(PathOption('MANPATH', 'Directory to install under', os.path.join('$PREFIX','man')))
-+opt=opts.Add(PathOption('MANPATH', 'Directory to install under', os.path.join('$PREFIX','share/man')))
-
- ### DEBUG MODE
-