diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/sabbu/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/sabbu/Manifest | 5 | ||||
| -rw-r--r-- | media-video/sabbu/files/sabbu-0.3.0-new-ffmpeg.patch | 100 | ||||
| -rw-r--r-- | media-video/sabbu/sabbu-0.3.0.ebuild | 31 |
4 files changed, 17 insertions, 125 deletions
diff --git a/media-video/sabbu/ChangeLog b/media-video/sabbu/ChangeLog index 0b6761b00..093228c77 100644 --- a/media-video/sabbu/ChangeLog +++ b/media-video/sabbu/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for media-video/sabbu -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Apr 2011; Justin Lecher <jlec@gentoo.org> sabbu-0.3.0.ebuild, + -files/sabbu-0.3.0-new-ffmpeg.patch: + Fix deps for gnome3, Removed ffmpeg support as none of current ffmpeg works + 28 Oct 2007; Markus Ullmann <jokey@gentoo.org> sabbu-0.3.0: don't install ABOUT-NLS file diff --git a/media-video/sabbu/Manifest b/media-video/sabbu/Manifest index 6c6a2a273..4e643c61e 100644 --- a/media-video/sabbu/Manifest +++ b/media-video/sabbu/Manifest @@ -1,5 +1,4 @@ -AUX sabbu-0.3.0-new-ffmpeg.patch 3519 RMD160 fa73045f44ed04596c125b0e8e6e23741c0533d2 SHA1 ae1500cfa5d2f5f54a9c72896475b4114900f77d SHA256 2d33a33d143b10b4b9b645c5f5a7ebe98fb4442f712bfab86312924f5d62dd48 DIST sabbu-0.3.0.tar.bz2 605499 RMD160 b8e59d6d260acb1493d14913f1541066cedcbd63 SHA1 7bcb6c5f9b53355e4f28b6067a741fb639edffc0 SHA256 e510cb2947d45ff6e8a2b5e470f90e1695919e6b3be09f721674b61155b88b98 -EBUILD sabbu-0.3.0.ebuild 859 RMD160 9b7fce209f1472550ee016180d0f636340106036 SHA1 a61df9dc9ce2248254b5a74ffdf9b632274c2b0d SHA256 e2f9d22ea4738c4b783f3fb395355157cdf2ae340d86b4a21d3fd99d0e7b9105 -MISC ChangeLog 478 RMD160 7d44679c16ef4c12e4e1d0f63d241a82559caaf8 SHA1 13b45ba4f015bb84e73c0bab71bde06dae9e6e59 SHA256 470c437c1f2ee46a0a61a39e76957007498b5e22dbc87ab61a602a7de9726145 +EBUILD sabbu-0.3.0.ebuild 592 RMD160 187a929829a59c6d5729eb8e4a38dc6e75cf48cb SHA1 465a94a2e125a1c1c0b9ea476a909d8295514455 SHA256 0bde201cb1757e0950bc2e9a63d6befe721d38c0fe606ff59ceb001690684598 +MISC ChangeLog 663 RMD160 5d2e12f8410f678f8e423eefd3f54e9c8c8485bf SHA1 2192c9b680b0c6ad2cb092197fb60b37a014b5e4 SHA256 2b2e6be86b949174fd364daa2628cacffbf60e63d7d83cd335eaccc9a1be8713 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f diff --git a/media-video/sabbu/files/sabbu-0.3.0-new-ffmpeg.patch b/media-video/sabbu/files/sabbu-0.3.0-new-ffmpeg.patch deleted file mode 100644 index 03fbe88ef..000000000 --- a/media-video/sabbu/files/sabbu-0.3.0-new-ffmpeg.patch +++ /dev/null @@ -1,100 +0,0 @@ -Index: Source/video.cpp -=================================================================== -RCS file: /cvsroot/sabbu/sabbu/Source/video.cpp,v -retrieving revision 1.36 -diff -u -r1.36 video.cpp ---- Source/video.cpp 11 Aug 2005 17:16:17 -0000 1.36 -+++ Source/video.cpp 24 Nov 2005 09:40:33 -0000 -@@ -213,7 +213,7 @@ - - for(i = 0; i < video->ic->nb_streams; i++) - { -- AVCodecContext *enc = &video->ic->streams[i]->codec; -+ AVCodecContext *enc = video->ic->streams[i]->codec; - if(enc->codec_type == CODEC_TYPE_VIDEO) - { - video->video_index = i; -@@ -227,7 +227,7 @@ - throw kryError(_("The video file does not seem to contain a video stream.")); - } - -- enc = &video->ic->streams[video->video_index]->codec; -+ enc = video->ic->streams[video->video_index]->codec; - enc->debug_mv = 0; - enc->debug = 0; - enc->workaround_bugs = 1; -@@ -291,9 +291,9 @@ - frame = avcodec_alloc_frame(); - while(1) - { -- len = avcodec_decode_video(&video->ic->streams[video->video_index]->codec, -- frame, &got_picture, -- video->last_pkt->data, video->last_pkt->size); -+ len = avcodec_decode_video(video->ic->streams[video->video_index]->codec, -+ frame, &got_picture, -+ video->last_pkt->data, video->last_pkt->size); - - if(got_picture) - break; -@@ -302,14 +302,14 @@ - return FALSE; - } - -- width = video->ic->streams[video->video_index]->codec.width; -- height = video->ic->streams[video->video_index]->codec.height; -+ width = video->ic->streams[video->video_index]->codec->width; -+ height = video->ic->streams[video->video_index]->codec->height; - - pict->data[0] = (uint8_t*) malloc(4 * width * height); - pict->linesize[0] = width * 4; - - if(img_convert(pict, dst_pix_fmt, -- (AVPicture *) frame, video->ic->streams[video->video_index]->codec.pix_fmt, -+ (AVPicture *) frame, video->ic->streams[video->video_index]->codec->pix_fmt, - width, height) < 0) - { - av_free(frame); -@@ -323,17 +323,17 @@ - - int video_get_width(struct video_ffmpeg *video) - { -- return video->ic->streams[video->video_index]->codec.width; -+ return video->ic->streams[video->video_index]->codec->width; - } - - int video_get_height(struct video_ffmpeg *video) - { -- return video->ic->streams[video->video_index]->codec.height; -+ return video->ic->streams[video->video_index]->codec->height; - } - - double video_get_fps(struct video_ffmpeg *video) - { -- return (video->ic->streams[video->video_index]->r_frame_rate / (double) video->ic->streams[video->video_index]->r_frame_rate_base); -+ return (video->ic->streams[video->video_index]->r_frame_rate.num / (double) video->ic->streams[video->video_index]->r_frame_rate.den); - } - - int64_t video_get_duration(struct video_ffmpeg *video) -@@ -348,7 +348,7 @@ - free(video->last_pkt); - video->last_pkt = NULL; - } -- avcodec_close(&video->ic->streams[video->video_index]->codec); -+ avcodec_close(video->ic->streams[video->video_index]->codec); - av_close_input_file(video->ic); - } - -@@ -376,11 +376,11 @@ - if(av_seek_frame(video->ic, -1, target_time) < 0) - #endif - { -- g_warning("seek failed... %lld", target_time); -+ g_warning("seek failed... %lld", (long long) target_time); - return FALSE; - } - -- avcodec_flush_buffers(&video->ic->streams[video->video_index]->codec); -+ avcodec_flush_buffers(video->ic->streams[video->video_index]->codec); - } - - if(video->last_pkt) diff --git a/media-video/sabbu/sabbu-0.3.0.ebuild b/media-video/sabbu/sabbu-0.3.0.ebuild index 8625bd67a..bac10acc3 100644 --- a/media-video/sabbu/sabbu-0.3.0.ebuild +++ b/media-video/sabbu/sabbu-0.3.0.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI=4 + inherit eutils DESCRIPTION="Subtitle script creator/editor" @@ -11,32 +13,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="ffmpeg nls oss" +IUSE="nls oss" -RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051120 ) +RDEPEND=" nls? ( sys-devel/gettext ) - >=x11-libs/gtk+-2.6 + x11-libs/gtk+:2 media-libs/libsndfile" DEPEND="${RDEPEND} dev-util/pkgconfig" -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-new-ffmpeg.patch" -} - src_compile() { - econf $(use_with ffmpeg) \ + # none of the current ffmpeg works here + econf \ + --without-ffmpeg \ $(use_enable nls) \ - $(use_with oss) \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README + $(use_with oss) } |