diff options
| -rw-r--r-- | media-video/transcode/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/transcode/Manifest | 30 | ||||
| -rw-r--r-- | media-video/transcode/files/digest-transcode-0.6.14-r1 | 1 | ||||
| -rw-r--r-- | media-video/transcode/files/transcode-0.6.14-amd64_mmx.patch | 21 | ||||
| -rw-r--r-- | media-video/transcode/files/transcode-0.6.14-libquicktime094.patch | 109 | ||||
| -rw-r--r-- | media-video/transcode/transcode-0.6.14-r1.ebuild | 129 |
6 files changed, 285 insertions, 14 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog index 98c2e520b01c..ffeffe66f15f 100644 --- a/media-video/transcode/ChangeLog +++ b/media-video/transcode/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/transcode # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.92 2005/04/05 20:44:58 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.93 2005/04/13 16:31:02 luckyduck Exp $ + +*transcode-0.6.14-r1 (13 Apr 2005) + + 13 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> + +files/transcode-0.6.14-amd64_mmx.patch, + +files/transcode-0.6.14-libquicktime094.patch, +transcode-0.6.14-r1.ebuild: + added patch to fix compilation with libquicktime >= 0.9.4, fixes #85865 05 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> -transcode-0.6.10.ebuild, -transcode-0.6.12.ebuild, diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest index 6f9c4fbc398b..8c00e63df651 100644 --- a/media-video/transcode/Manifest +++ b/media-video/transcode/Manifest @@ -1,28 +1,32 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 01e432998c2deb1fa457f3cc63e6bbde ChangeLog 16914 -MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 +MD5 239a4c003cc918034bd041419daccaad transcode-0.6.14-r1.ebuild 3861 MD5 b305088d6babfcdbc1640285df331480 transcode-0.6.11.ebuild 3879 -MD5 b2575706251f8d608ded9ce2eb4c3fd5 transcode-0.6.12-r1.ebuild 3683 MD5 888fabc580c2ef6e1e5fb0722631628e transcode-0.6.12-r2.ebuild 4374 MD5 89bfa93308a46f45e9b41adb7747ad0f transcode-0.6.13-r1.ebuild 2843 +MD5 b2575706251f8d608ded9ce2eb4c3fd5 transcode-0.6.12-r1.ebuild 3683 +MD5 ad2f6e0923f51095219f9da7eabe3a81 ChangeLog 17197 +MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 MD5 119a7d425650a2c2ad7ee46ed133bcda transcode-0.6.14.ebuild 3566 +MD5 936b66bb309cb3c1dfa33924d3114fa9 files/transcode-0.6.13-r1-bitstream.patch 446 +MD5 157144ea855da2e35b32ff043fc7f851 files/transcode-0.6.14-amd64_mmx.patch 743 +MD5 a61546c26ec03e13a25a25eaced110e0 files/transcode-0.6.14-libquicktime094.patch 3880 +MD5 b2561dbf66455c878a08afd19868dc5d files/transcode-0.6.12-gcc-3.4.patch 2503 MD5 bc1cb5a39d56ce5216c803c74e73545d files/digest-transcode-0.6.11 69 -MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r1 69 -MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r2 69 -MD5 870fbce21a78f1dcde8efc61df838497 files/digest-transcode-0.6.13-r1 69 MD5 613fd9a0d03f4df95d439dd0a4c1bccb files/digest-transcode-0.6.14 69 MD5 3b957eef288ce095a2ff0a256aec7c93 files/transcode-0.6.11-no-mmx.patch 1491 -MD5 b2561dbf66455c878a08afd19868dc5d files/transcode-0.6.12-gcc-3.4.patch 2503 -MD5 085f514d559cd32a401241bbbf639d39 files/transcode-0.6.12-r2-dvdmenu.patch 4840 MD5 90f42fff1c2a0b4be8df0b015ac2b309 files/transcode-0.6.12-r2-gcc34.patch 2963 -MD5 936b66bb309cb3c1dfa33924d3114fa9 files/transcode-0.6.13-r1-bitstream.patch 446 +MD5 085f514d559cd32a401241bbbf639d39 files/transcode-0.6.12-r2-dvdmenu.patch 4840 +MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r1 69 +MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r2 69 +MD5 870fbce21a78f1dcde8efc61df838497 files/digest-transcode-0.6.13-r1 69 +MD5 613fd9a0d03f4df95d439dd0a4c1bccb files/digest-transcode-0.6.14-r1 69 MD5 2cb7b1a00a0529a8256fc0104b5f2a09 files/transcode-gcc34.patch 460 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCUvjnArHZZzCEUG0RAusdAJ4qw7zf4HZNLsftSqT3qAxENIFIGgCeMbFc -nGkvaiyJQLvtHT2WNYqlbxU= -=om5+ +iD8DBQFCXUla06ebR+OMO78RAsbsAJsHMAvXYMXmZ5mwB2yAB7t2sMUPYwCghR11 +rkVXLoDNuL9WiVxmn73EbYQ= +=2amw -----END PGP SIGNATURE----- diff --git a/media-video/transcode/files/digest-transcode-0.6.14-r1 b/media-video/transcode/files/digest-transcode-0.6.14-r1 new file mode 100644 index 000000000000..76fd263f2079 --- /dev/null +++ b/media-video/transcode/files/digest-transcode-0.6.14-r1 @@ -0,0 +1 @@ +MD5 9bfef83b7e0fe2c27d25d871fef75a92 transcode-0.6.14.tar.gz 2614579 diff --git a/media-video/transcode/files/transcode-0.6.14-amd64_mmx.patch b/media-video/transcode/files/transcode-0.6.14-amd64_mmx.patch new file mode 100644 index 000000000000..f364d079eccf --- /dev/null +++ b/media-video/transcode/files/transcode-0.6.14-amd64_mmx.patch @@ -0,0 +1,21 @@ +diff -ur transcode-0.6.14.orig/libvo/yuv2rgb.c transcode-0.6.14/libvo/yuv2rgb.c +--- transcode-0.6.14.orig/libvo/yuv2rgb.c 2004-11-03 04:45:39.000000000 +0100 ++++ transcode-0.6.14/libvo/yuv2rgb.c 2005-04-13 01:37:20.095054432 +0200 +@@ -71,7 +71,8 @@ + void yuv2rgb_init (int bpp, int mode) + { + yuv2rgb = NULL; +-#ifdef ARCH_X86 ++#ifdef HAVE_MMX ++# if defined(ARCH_X86) || defined(ARCH_X86_64) + if ((yuv2rgb == NULL) && (vo_mm_accel & MM_ACCEL_X86_MMXEXT)) { + yuv2rgb = yuv2rgb_init_mmxext (bpp, mode); + if (yuv2rgb != NULL) +@@ -82,6 +83,7 @@ + if (yuv2rgb != NULL) + fprintf (stderr, "Using MMX for colorspace transform\n"); + } ++# endif + #endif + #ifdef LIBVO_MLIB + if ((yuv2rgb == NULL) && (vo_mm_accel & MM_ACCEL_MLIB)) { diff --git a/media-video/transcode/files/transcode-0.6.14-libquicktime094.patch b/media-video/transcode/files/transcode-0.6.14-libquicktime094.patch new file mode 100644 index 000000000000..bd6ae1051a05 --- /dev/null +++ b/media-video/transcode/files/transcode-0.6.14-libquicktime094.patch @@ -0,0 +1,109 @@ +diff -ur transcode-0.6.14.orig/configure.in transcode-0.6.14/configure.in +--- transcode-0.6.14.orig/configure.in 2004-11-15 07:16:27.000000000 +0100 ++++ transcode-0.6.14/configure.in 2005-04-13 01:49:51.437832968 +0200 +@@ -958,6 +958,10 @@ + [C], [quicktime/lqt.h], quicktime, quicktime_open) + if test x"$have_libquicktime" = x"yes" ; then + AC_DEFINE([HAVE_LIBQUICKTIME], 1, [have libquicktime support]) ++ AC_CHECK_LIB(quicktime, lqt_encode_video, ++ [AC_DEFINE([LIBQUICKTIME_000904], [1], [Have libquicktime 0.9.4 or newer])], ++ [], ++ [$LIBQUICKTIME_EXTRA_LIBS]) + fi + AM_CONDITIONAL(HAVE_LIBQUICKTIME, test x"$have_libquicktime" = x"yes") + AC_SUBST(LIBQUICKTIME_CFLAGS) +diff -ur transcode-0.6.14.orig/export/export_mov.c transcode-0.6.14/export/export_mov.c +--- transcode-0.6.14.orig/export/export_mov.c 2004-11-03 04:45:52.000000000 +0100 ++++ transcode-0.6.14/export/export_mov.c 2005-04-13 01:50:03.246037848 +0200 +@@ -102,6 +102,20 @@ + {"info", "", "Info string (no '=' or ',' allowed) "}, + {NULL, NULL, NULL}}; + ++#ifdef LIBQUICKTIME_000904 ++/* from libquicktime */ ++int tc_quicktime_get_timescale(double frame_rate) ++{ ++ int timescale = 600; ++ /* Encode the 29.97, 23.976, 59.94 framerates */ ++ if(frame_rate - (int)frame_rate != 0) ++ timescale = (int)(frame_rate * 1001 + 0.5); ++ else ++ if((600 / frame_rate) - (int)(600 / frame_rate) != 0) ++ timescale = (int)(frame_rate * 100 + 0.5); ++ return timescale; ++} ++#endif + + /* print list of things. Shamelessly stolen from export_ffmpeg.c */ + static int list(char *list_type) +@@ -262,8 +276,16 @@ + return(TC_EXPORT_ERROR); + } + ++#if !defined(LIBQUICKTIME_000904) + /* set proposed video codec */ + lqt_set_video(qtfile, 1, w, h, vob->ex_fps,qt_codec_info[0]); ++#else ++ fprintf(stderr, "\n \n %i \n \n", tc_quicktime_get_timescale(vob->ex_fps)); ++ /* set proposed video codec */ ++ lqt_set_video(qtfile, 1, w, h, ++ tc_quicktime_get_timescale(vob->ex_fps) / vob->ex_fps+0.5, ++ tc_quicktime_get_timescale(vob->ex_fps), qt_codec_info[0]); ++#endif + } + + /* set color model */ +diff -ur transcode-0.6.14.orig/import/decode_mov.c transcode-0.6.14/import/decode_mov.c +--- transcode-0.6.14.orig/import/decode_mov.c 2004-11-03 04:45:41.000000000 +0100 ++++ transcode-0.6.14/import/decode_mov.c 2005-04-13 01:49:51.438832816 +0200 +@@ -160,6 +160,7 @@ + } + free(p_buffer); + } ++#if !defined(LIBQUICKTIME_000904) + else if((strcasecmp(p_a_codec,QUICKTIME_RAW)==0) || (strcasecmp(p_a_codec,QUICKTIME_TWOS)==0)) + { + s_sample=(1.00 * s_channel * s_bits *s_audio_rate)/(s_fps*8); +@@ -180,6 +181,7 @@ + quicktime_close(p_qt_structure); + free(p_buffer); + } ++#endif + else + { + quicktime_close(p_qt_structure); +diff -ur transcode-0.6.14.orig/import/import_mov.c transcode-0.6.14/import/import_mov.c +--- transcode-0.6.14.orig/import/import_mov.c 2004-11-03 04:45:42.000000000 +0100 ++++ transcode-0.6.14/import/import_mov.c 2005-04-13 01:49:51.438832816 +0200 +@@ -136,11 +136,13 @@ + if(quicktime_supported_audio(qt_audio, 0)!=0) { + rawAudioMode = 0; + } ++#if !defined(LIBQUICKTIME_000904) + /* RAW PCM is directly supported */ + else if(strcasecmp(codec,QUICKTIME_RAW)==0) { + rawAudioMode = 1; + fprintf(stderr,"[%s] using RAW audio mode!\n",MOD_NAME); + } ++#endif + /* unsupported codec */ + else { + fprintf(stderr, "error: quicktime audio codec '%s' not supported!\n", +@@ -334,12 +336,14 @@ + } + + /* raw read mode */ ++#if !defined(LIBQUICKTIME_000904) + if(rawAudioMode) { + bytes_read = quicktime_read_audio(qt_audio, + param->buffer, param->size, 0); +- } +- /* decode audio mode */ +- else { ++ } else ++#endif ++ { ++ /* decode audio mode */ + long pos = quicktime_audio_position(qt_audio,0); + long samples = param->size; + if(bits==16) diff --git a/media-video/transcode/transcode-0.6.14-r1.ebuild b/media-video/transcode/transcode-0.6.14-r1.ebuild new file mode 100644 index 000000000000..97e626d78eba --- /dev/null +++ b/media-video/transcode/transcode-0.6.14-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r1.ebuild,v 1.1 2005/04/13 16:31:02 luckyduck Exp $ + +inherit libtool flag-o-matic eutils multilib + +MY_P="${P/_pre/.}" +S=${WORKDIR}/${MY_P} +DESCRIPTION="video stream processing tool" +HOMEPAGE="http://www.transcoding.org/cgi-bin/transcode" +SRC_URI="http://www.jakemsr.com/transcode/${P}.tar.gz + http://www.ligo.caltech.edu/~pehrens/${P}.tar.gz + http://www.kraymer.de/mirroring/${P}.tar.gz + http://rebels.plukwa.net/linux-video/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="X 3dnow a52 avi altivec divx4linux dv dvdread encode fame truetype \ + gtk imagemagick jpeg lzo mjpeg mpeg mmx network oggvorbis pvm quicktime \ + sdl sse sse2 theora v4l xvid xml2" + +DEPEND="a52? ( >=media-libs/a52dec-0.7.4 ) + =sys-devel/gcc-3* + dv? ( >=media-libs/libdv-0.99 ) + x86? ( >=dev-lang/nasm-0.98.36 ) + dvdread? ( >=media-libs/libdvdread-0.9.0 ) + >=media-video/ffmpeg-0.4.9_pre1 + xvid? ( >=media-libs/xvid-1.0.2 ) + mjpeg? ( >=media-video/mjpegtools-1.6.2-r3 ) + lzo? ( >=dev-libs/lzo-1.08 ) + fame? ( >=media-libs/libfame-0.9.1 ) + imagemagick? ( >=media-gfx/imagemagick-5.5.6.0 ) + media-libs/netpbm + media-libs/libexif + X? ( virtual/x11 ) + avi? ( >=media-video/avifile-0.7.41.20041001 ) + divx4linux? ( x86? ( >=media-libs/divx4linux-20030428 ) ) + mpeg? ( media-libs/libmpeg3 ) + encode? ( >=media-sound/lame-3.93 ) + sdl? ( media-libs/libsdl ) + quicktime? ( >=media-libs/libquicktime-0.9.3 ) + oggvorbis? ( media-libs/libvorbis + media-libs/libogg ) + theora? ( media-libs/libtheora ) + jpeg? ( media-libs/jpeg ) + gtk? ( =x11-libs/gtk+-1.2* ) + truetype? ( >=media-libs/freetype-2 ) + pvm? ( >=sys-cluster/pvm-3.4 )" + +src_unpack() { + unpack ${A} + cd ${S} + + # needed for libquicktime >= 0.9.4, see #85865 + epatch ${FILESDIR}/${P}-libquicktime094.patch + + # apply amd64 and mmx patches from upstream CVS + epatch ${FILESDIR}/${P}-amd64_mmx.patch +} + +src_compile() { + libtoolize --copy --force + autoreconf || die "autoreconf failed" + + filter-flags -maltivec -mabi=altivec -momit-leaf-frame-pointer + use ppc && append-flags -U__ALTIVEC__ + # fix invalid paths in .la files of plugins + elibtoolize + + use pvm \ + && myconf="${myconf} --enable-pvm3 \ + --with-pvm3-lib=${PVM_ROOT}/lib/LINUX \ + --with-pvm3-include=${PVM_ROOT}/include" + use xvid \ + && myconf="${myconf} --with-default-xvid=xvid4" + + # Use the MPlayer libpostproc if present + [ -f ${ROOT}/usr/$(get_libdir)/libpostproc.a ] && \ + [ -f ${ROOT}/usr/include/postproc/postprocess.h ] && \ + myconf="${myconf} --with-libpostproc-builddir=${ROOT}/usr/$(get_libdir)" + + append-flags -DDCT_YUV_PRECISION=1 + econf \ + --with-mod-path=/usr/$(get_libdir)/transcode \ + $(use_enable X x) \ + $(use_enable 3dnow) \ + $(use_enable a52) \ + $(use_enable altivec) \ + $(use_enable avi avifile) \ + $(use_enable dv libdv) \ + $(use_enable dvdread libdvdread) \ + $(use_enable encode lame) \ + $(use_enable fame libfame) \ + $(use_enable truetype freetype2) \ + $(use_enable gtk) \ + $(use_enable imagemagick) \ + $(use_enable jpeg libjpeg) \ + $(use_enable lzo) \ + $(use_enable mjpeg mjpegtools) \ + $(use_enable mmx) \ + $(use_enable mpeg libmpeg3) \ + $(use_enable network netstream) \ + $(use_enable oggvorbis ogg) \ + $(use_enable oggvorbis vorbis) \ + $(use_enable quicktime libquicktime) \ + $(use_enable sdl) \ + $(use_enable sse) \ + $(use_enable sse2) \ + $(use_enable theora) \ + $(use_enable v4l) \ + $(use_enable xml2 libxml2) \ + ${myconf} \ + || die + + emake -j1 all || die + + if use pvm; then + sed -i -e "s:\${exec_prefix}/bin/pvmgs:\$(DESTDIR)/\${exec_prefix}/bin/pvmgs:" ${S}/pvm3/Makefile || die + fi +} + +src_install () { + make \ + DESTDIR=${D} \ + install || die + + dodoc AUTHORS COPYING ChangeLog README TODO +} |