diff options
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xvidcap/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-misc/xvidcap/Manifest | 6 | ||||
| -rw-r--r-- | x11-misc/xvidcap/files/xvidcap-1.1.7_rc1-ffmpeg.patch | 149 | ||||
| -rw-r--r-- | x11-misc/xvidcap/files/xvidcap-1.1.7_rc1-new-ffmpeg-headers.patch | 49 | ||||
| -rw-r--r-- | x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild | 55 |
5 files changed, 268 insertions, 2 deletions
diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog index 382c2f086665..c6c54cf98bdb 100644 --- a/x11-misc/xvidcap/ChangeLog +++ b/x11-misc/xvidcap/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-misc/xvidcap # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.40 2008/01/07 03:55:47 omp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.41 2008/04/13 23:27:54 yngwin Exp $ + +*xvidcap-1.1.7_rc1 (13 Apr 2008) + + 13 Apr 2008; Ben de Groot <yngwin@gentoo.org> + +files/xvidcap-1.1.7_rc1-ffmpeg.patch, + +files/xvidcap-1.1.7_rc1-new-ffmpeg-headers.patch, + +xvidcap-1.1.7_rc1.ebuild: + New rc version, patched to work with new ffmpeg. Masked until new ffmpeg + is unmasked. 07 Jan 2008; David Shakaryan <omp@gentoo.org> xvidcap-1.1.4_rc1.ebuild: Add dev-util/pkgconfig to DEPEND. (bug #204579) diff --git a/x11-misc/xvidcap/Manifest b/x11-misc/xvidcap/Manifest index 6be3bf61137a..a084d33531b5 100644 --- a/x11-misc/xvidcap/Manifest +++ b/x11-misc/xvidcap/Manifest @@ -1,7 +1,11 @@ AUX xvidcap-1.1.6-ffmpeg.patch 426 RMD160 feb6301777033bc3ff18bbc73ac9fde1d50b85a1 SHA1 b1f3942b3addb454d3d5aadce4c89ed9eb774e8c SHA256 7de6304ece3db116174d59f1c61d020d334c7289584993c6d193c69980c37561 +AUX xvidcap-1.1.7_rc1-ffmpeg.patch 6973 RMD160 f20d8adadbc07df0230ee3304f596faceba57eac SHA1 33d16bb2ae95ab89b376c5b625001a65daa010f3 SHA256 886066f9c59c9323e3c0c52a56307c4f45adbe188d5f3f6baf69eff45f30833c +AUX xvidcap-1.1.7_rc1-new-ffmpeg-headers.patch 1685 RMD160 2960af16c3f3170d1e1fddc9b5667d18fc981f1b SHA1 6f09848845416b04b526bf5dfb2e66c9ba5c97a0 SHA256 be990d311777f362625973fa633ee174eb8b0bb64fda6bf19953d37b633f9453 DIST xvidcap-1.1.4rc1.tar.gz 2642762 RMD160 9e0d13da57feb6991a6ebe0d42db399d97da3c18 SHA1 473c9d4dd7dcae645077b711de4d5fcb56bab9fd SHA256 912df39e610397e78d40197dc603178d62d1e9de1c522de53a82db92810d8648 DIST xvidcap-1.1.6.tar.gz 4298103 RMD160 d204c5285ad7d7926b844b543b6233c2adce5a0c SHA1 64a179c301a9b3d06fe47f596721033be9a1a305 SHA256 17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba +DIST xvidcap-1.1.7rc1.tar.gz 4459712 RMD160 a2fb829fb4e7c220de6ffeea513dd995bf0fa340 SHA1 88d935ee17857b190454fbee11cd394f41af60c0 SHA256 487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f EBUILD xvidcap-1.1.4_rc1.ebuild 1051 RMD160 eacabe656a41c52448c1d956a90e8a149cb2504b SHA1 233d7ae0c015628fb776af0e907a067feb44ec22 SHA256 4cc37fd9c0ab83acd723bc3146c47c7cb6bea992791cb59c7b19dcc959308dfd EBUILD xvidcap-1.1.6-r2.ebuild 1300 RMD160 ac82088a47da81dafa73ad566cc2ab7e4b19bb86 SHA1 199d91006e42f03e5a040af074e2627198541d0b SHA256 a4c2e1e25bc9a08674714870f36cc3ea6fd56d7b69afee63a3ec4d27fd771aba -MISC ChangeLog 6069 RMD160 fcf78a10f899cfcd3912c0dddde9016dafcb448c SHA1 35495246fc84886ba56f96608b27d4ba096aed04 SHA256 c3d1fdddc1d02251668bbb3755251d18f9e6193987a0c7eec09e904d44954778 +EBUILD xvidcap-1.1.7_rc1.ebuild 1422 RMD160 7e87b09ffc78958142b87e326d3085e5d44b507a SHA1 6ec9f51fb8cd3ead10620efbdb4369a39eeb10d9 SHA256 623a17a2095a556d8d4038650c17c34fbbcafda3c8d53e76130066574da5f932 +MISC ChangeLog 6368 RMD160 000fd01402d085107476ec895cb097f19a3a7b28 SHA1 e792b9462a5d38b7d918081d980cc58553823f58 SHA256 47d2c484c93b32ae2100ab9d9c3d50b1a1c6a1111a70573f3b4ab07849605712 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7_rc1-ffmpeg.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7_rc1-ffmpeg.patch new file mode 100644 index 000000000000..067d63eabc15 --- /dev/null +++ b/x11-misc/xvidcap/files/xvidcap-1.1.7_rc1-ffmpeg.patch @@ -0,0 +1,149 @@ +Index: src/xtoffmpeg.c +=================================================================== +--- src/xtoffmpeg.c (Revision 302) ++++ src/xtoffmpeg.c (Arbeitskopie) +@@ -58,6 +58,7 @@ + // ffmpeg stuff + #include <ffmpeg/avcodec.h> + #include <ffmpeg/avformat.h> ++#include <ffmpeg/avdevice.h> + //#include <ffmpeg/dsputil.h> + #include <ffmpeg/swscale.h> + #include <ffmpeg/rgb2rgb.h> +@@ -291,13 +292,13 @@ + + // prepare input stream + memset (ap, 0, sizeof (*ap)); +- ap->device = job->snd_device; ++// ap->device = job->snd_device; + + if (grab_audio) { + ap->sample_rate = target->sndrate; + ap->channels = target->sndchannels; + +- grab_iformat = av_find_input_format ("audio_device"); ++ grab_iformat = av_find_input_format ("oss"); + #ifdef DEBUG + printf ("%s %s: grab iformat %p\n", DEBUGFILE, DEBUGFUNCTION, + grab_iformat); +@@ -308,7 +309,7 @@ + } + + err = +- av_open_input_file (&ic, ap->device, (grab_audio ? grab_iformat : NULL), ++ av_open_input_file (&ic, job->snd_device, (grab_audio ? grab_iformat : NULL), + 0, ap); + if (err < 0) { + fprintf (stderr, _("%s %s: error opening input file %s: %i\n"), +@@ -1432,7 +1433,8 @@ + input_pixfmt = guess_input_pix_fmt (image, job->c_info); + + // register all libav* related stuff +- av_register_all (); ++ avdevice_register_all(); ++ av_register_all(); + + // guess AVOutputFormat + if (job->target >= CAP_MF) +@@ -1763,7 +1765,7 @@ + } + + if (job->target < CAP_MF) +- url_fclose (&output_file->pb); ++ url_fclose (output_file->pb); + + #ifdef HAVE_FFMPEG_AUDIO + /* +@@ -1828,7 +1830,7 @@ + * close file if multi-frame capture ... otherwise closed already + */ + if (job->target >= CAP_MF) +- url_fclose (&output_file->pb); ++ url_fclose (output_file->pb); + /* + * free streams + */ +Index: configure.in +=================================================================== +--- configure.in (Revision 302) ++++ configure.in (Arbeitskopie) +@@ -103,6 +103,7 @@ + rm ffmpeg/adler32.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/avcodec.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/avutil.h >/dev/null 2>&1 || echo "" > /dev/null ++rm ffmpeg/avdevice.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/common.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/dsputil.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/integer.h >/dev/null 2>&1 || echo "" > /dev/null +@@ -118,6 +119,8 @@ + rm ffmpeg/rtspcodes.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/rtp_h264.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/rtp_internal.h >/dev/null 2>&1 || echo "" > /dev/null ++rm ffmpeg/rtp_aac.h >/dev/null 2>&1 || echo "" > /dev/null ++rm ffmpeg/rtp_mpv.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/fifo.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/swscale.h >/dev/null 2>&1 || echo "" > /dev/null + rm ffmpeg/rgb2rgb.h >/dev/null 2>&1 || echo "" > /dev/null +@@ -356,7 +359,7 @@ + # build embedded ffmpeg + echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && \ + ( cd ./ffmpeg/ && \ +- ./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lib_switch} --enable-pthreads --enable-swscaler --disable-ffserver --disable-ffplay && \ ++ ./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lib_switch} --enable-pthreads --enable-swscale --disable-ffserver --disable-ffplay && \ + ln -s libavcodec/avcodec.h ./ && \ + ln -s libavcodec/dsputil.h ./ && \ + ln -s libavformat/avformat.h ./ && \ +@@ -371,11 +374,12 @@ + ln -s libavutil/fifo.h ./ && \ + ln -s libswscale/swscale.h ./ && \ + ln -s libswscale/rgb2rgb.h ./ && \ ++ ln -s libavdevice/avdevice.h ./ && \ + ${MAKE-make} ) + # try to link it statically, or reset cache, set static_avcodec=no + top_srcdir=`pwd` +- ac_my_ldflags_save=${LDFLAGS} ; LDFLAGS="${LDFLAGS} -L$top_srcdir/ffmpeg/libavcodec -L$top_srcdir/ffmpeg/libavformat -L$top_srcdir/ffmpeg/libavutil -L$top_srcdir/ffmpeg/libswscale" +- ac_my_cflags_save=${CFLAGS} ; CFLAGS="${CFLAGS} -I $top_srcdir -I[$top_srcdir]/ffmpeg/libavcodec -I[$top_srcdir]/ffmpeg/libavformat -I[$top_srcdir]/ffmpeg/libavutil -I[$top_srcdir]/ffmpeg/libswscale" ++ ac_my_ldflags_save=${LDFLAGS} ; LDFLAGS="${LDFLAGS} -L$top_srcdir/ffmpeg/libavcodec -L$top_srcdir/ffmpeg/libavformat -L$top_srcdir/ffmpeg/libavutil -L$top_srcdir/ffmpeg/libswscale -L$top_srcdir/ffmpeg/libavdevice" ++ ac_my_cflags_save=${CFLAGS} ; CFLAGS="${CFLAGS} -I $top_srcdir -I[$top_srcdir]/ffmpeg/libavcodec -I[$top_srcdir]/ffmpeg/libavformat -I[$top_srcdir]/ffmpeg/libavutil -I[$top_srcdir]/ffmpeg/libswscale -I[$top_srcdir]/ffmpeg/libavdevice" + AC_CHECK_LIB_STATIC(avutil, av_rescale,,[unset ac_cv_lib_avutil_av_rescale ; static_avcodec=no ; LDFLAGS=$ac_my_ldflags_save ; CFLAGS=$ac_my_cflags_save]) + fi + +@@ -392,16 +396,21 @@ + + # if avutil is linked statically, avcodec should, too + static_avcodec=$static_avutil +-ac_my_avcodec_libs="" +-test x`(uname -s)` = xSunOS && ac_my_avcodec_libs="-lnsl -lsocket" ++ac_my_avcodec_libs="-lz" ++test x`(uname -s)` = xSunOS && ac_my_avcodec_libs="-lz -lnsl -lsocket" + AC_CHECK_LIB_STATIC(avcodec, avcodec_encode_video,,[unset ac_cv_lib_avcodec_avcodec_encode_video ; static_avcodec=no ; AC_CHECK_LIB(avcodec, avcodec_encode_video,,,[$ac_my_avcodec_libs])],[$ac_my_avcodec_libs]) + + # if avcodec is linked statically, avformat should, too + static_avformat=$static_avcodec +-ac_my_avformat_libs="" +-test x`(uname -s)` = xSunOS && ac_my_avformat_libs="-lnsl -lsocket" ++ac_my_avformat_libs="-lz" ++test x`(uname -s)` = xSunOS && ac_my_avformat_libs="-lz -lnsl -lsocket" + AC_CHECK_LIB_STATIC(avformat, av_write_header,,[unset ac_cv_lib_avformat_av_write_header ; static_avformat=no ; AC_CHECK_LIB(avformat, av_write_header,,,[$ac_my_avformat_libs])],[$ac_my_avformat_libs]) + ++# if avcodec is linked statically, avdevice should, too ++static_avdevice=$static_avcodec ++ac_my_avdevice_libs="-lz" ++test x`(uname -s)` = xSunOS && ac_my_avdevice_libs="-lz -lnsl -lsocket" ++AC_CHECK_LIB_STATIC(avdevice, avdevice_register_all,,[unset ac_cv_lib_avdevice_avdevice_register_all ; static_avdevice=no ; AC_CHECK_LIB(avdevice, avdevice_register_all,,,[$ac_my_avdevice_libs])],[$ac_my_avdevice_libs]) + + # only use ffmpeg if ALL required libs are present + if ( `test x$ac_cv_lib_avcodec_avcodec_encode_video = xyes -a x$ac_cv_lib_avformat_av_write_header = xyes -a x$ac_cv_lib_avutil_av_rescale = xyes -a x$ac_cv_lib_swscale_sws_scale = xyes` ) ; then +Index: config.h.in +=================================================================== +--- config.h.in (Revision 302) ++++ config.h.in (Arbeitskopie) +@@ -51,6 +51,9 @@ + /* Define to 1 if you have the `avcodec' library (-lavcodec). */ + #undef HAVE_LIBAVCODEC + ++/* Define to 1 if you have the `avdevice' library (-lavdevice). */ ++#undef HAVE_LIBAVDEVICE ++ + /* Define to 1 if you have the `avformat' library (-lavformat). */ + #undef HAVE_LIBAVFORMAT diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7_rc1-new-ffmpeg-headers.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7_rc1-new-ffmpeg-headers.patch new file mode 100644 index 000000000000..4d4da99d04d5 --- /dev/null +++ b/x11-misc/xvidcap/files/xvidcap-1.1.7_rc1-new-ffmpeg-headers.patch @@ -0,0 +1,49 @@ +diff -burN xvidcap-orig/src/codecs.c xvidcap-1.1.6/src/codecs.c +--- xvidcap-orig/src/codecs.c 2007-12-16 23:01:38.000000000 +0100 ++++ xvidcap-1.1.6/src/codecs.c 2008-04-13 22:21:45.000000000 +0200 +@@ -43,8 +43,8 @@ + #include <locale.h> + + #ifdef USE_FFMPEG +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> + #endif // USE_FFMPEG + + #include "app_data.h" +diff -burN xvidcap-orig/src/main.c xvidcap-1.1.6/src/main.c +--- xvidcap-orig/src/main.c 2007-12-01 00:52:51.000000000 +0100 ++++ xvidcap-1.1.6/src/main.c 2008-04-13 22:21:14.000000000 +0200 +@@ -45,7 +45,7 @@ + #include <locale.h> + + #ifdef USE_FFMPEG +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + #endif // USE_FFMPEG + + #include "control.h" +diff -burN xvidcap-orig/src/xtoffmpeg.c xvidcap-1.1.6/src/xtoffmpeg.c +--- xvidcap-orig/src/xtoffmpeg.c 2008-04-13 22:00:04.000000000 +0200 ++++ xvidcap-1.1.6/src/xtoffmpeg.c 2008-04-13 22:20:31.000000000 +0200 +@@ -56,13 +56,13 @@ + #include "xvidcap-intl.h" + + // ffmpeg stuff +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avdevice.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libavdevice/avdevice.h> + //#include <ffmpeg/dsputil.h> +-#include <ffmpeg/swscale.h> +-#include <ffmpeg/rgb2rgb.h> +-#include <ffmpeg/fifo.h> ++#include <libswscale/swscale.h> ++#include <libswscale/rgb2rgb.h> ++#include <libavutil/fifo.h> + #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \ + || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \ + || (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 \ diff --git a/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild b/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild new file mode 100644 index 000000000000..2b40f101fadf --- /dev/null +++ b/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild,v 1.1 2008/04/13 23:27:54 yngwin Exp $ + +GCONF_DEBUG="no" + +inherit eutils autotools gnome2 + +MY_P=${P/_rc/rc} +DESCRIPTION="Screen capture utility enabling you to create videos of your desktop for illustration or documentation purposes." +HOMEPAGE="http://xvidcap.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="mp3 theora" + +RDEPEND=">=x11-libs/gtk+-2.6 + gnome-base/libglade + >=media-video/ffmpeg-0.4.9_p20080326 + mp3? ( media-sound/lame ) + theora? ( media-libs/libtheora )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool + virtual/libintl + app-text/scrollkeeper + dev-perl/XML-Parser + app-text/gnome-doc-utils" + +S=${WORKDIR}/${PN}-1.1.6 + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-ffmpeg.patch + epatch "${FILESDIR}"/${P}-new-ffmpeg-headers.patch + eautoreconf +} + +src_compile() { + econf --without-forced-embedded-ffmpeg \ + $(use_enable mp3 libmp3lame) \ + $(use_enable theora libtheora) + emake || die "emake failed." +} + +src_install() { + emake DESTDIR="${D}" install || "emake install failed." + + # Almost like bug #58322 but directory name changed. + rm -rf "${D}"/usr/share/doc/${PN} + dodoc AUTHORS ChangeLog README TODO.tasks +} |