media-libs/libinstrudeo: Moved media-video/ffmpeg > virtual/ffmpeg, Fix it for curren...

svn path=/sunrise/; revision=12000

diff --git a/media-libs/libinstrudeo/Manifest b/media-libs/libinstrudeo/Manifest
index fbfdd26598ba0f3a3b45dbdf4cde7739d7177d3c..265a160ac8da308206c8589d3cadf4700d87f18d 100644 (file)
--- a/media-libs/libinstrudeo/Manifest
+++ b/media-libs/libinstrudeo/Manifest
@@ -1,5 +1,5 @@
-AUX img_convert_to_sws_scale.patch 3922 RMD160 60ea82d12c34bf691466c315212079b05654a466 SHA1 ed41ad067f04d92519aedadd73d0c2eda48b99cb SHA256 e784217705bf967b2ebad223b8584c6f0fa39e557aae11a89338c908d3ce4c86
+AUX 0.1.4-img_convert_to_sws_scale.patch 4131 RMD160 1163370c255954b32ffc9e9483bba93fa2111768 SHA1 0d9e42f9b58e778863ccb1431c5caff5161003ff SHA256 36c1d728b6ed2ac35cc518baf59c76d57564e6c4c2b7c168d495cb4deb73787e
 DIST libinstrudeo-0.1.4.tar.gz 791506 RMD160 43503ba0e4164abddbd8291cd7381cb6216c6d37 SHA1 49ca4a084edc61d84c04899dde26206ed6f0def7 SHA256 6e9fd562ce138d3e27d06ebadc2200afee6ac5c00e9f13793cb18af7ea24671e
-EBUILD libinstrudeo-0.1.4.ebuild 1080 RMD160 f065b4ab123dc3b93071f662ce35967a4dc27ebd SHA1 74b26a17ca7a8820c13750389cd3601249d0834b SHA256 5b780cc7d4604c61fd5813f9cf8b02748aafcb4320626098f0727a9dc483d6c5
+EBUILD libinstrudeo-0.1.4.ebuild 854 RMD160 0c6bc5a42bd37160cc39d9801c6fe9bf7c25bf16 SHA1 c7e6f6407f1f1cb4da1bff1f48799e542da57105 SHA256 207bff953e41b4f326572023e232c153461a3155bc3d0cab5a4a449a8cc9a538
 MISC ChangeLog 1670 RMD160 383124f8c492982c493d8e92852a0c94ecb1fdd3 SHA1 75f1305d72ace69c79ee90d32d72d1d0c0ba06be SHA256 0307c4bfd6913dcb428186e62a773cf5676c3d5fccb967ae6b69cba727928cf7
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/media-libs/libinstrudeo/files/img_convert_to_sws_scale.patch b/media-libs/libinstrudeo/files/0.1.4-img_convert_to_sws_scale.patch
similarity index 68%
rename from media-libs/libinstrudeo/files/img_convert_to_sws_scale.patch
rename to media-libs/libinstrudeo/files/0.1.4-img_convert_to_sws_scale.patch
index 976f27a5c6c7f68408d6716d63596692d859d4e1..562105d813a89ca522678adcccb6f138ee29a6f0 100644 (file)
--- a/media-libs/libinstrudeo/files/img_convert_to_sws_scale.patch
+++ b/media-libs/libinstrudeo/files/0.1.4-img_convert_to_sws_scale.patch
@@ -1,8 +1,13 @@
-Index: libinstrudeo-0.1.4/configure.ac
-===================================================================
---- libinstrudeo-0.1.4.orig/configure.ac
-+++ libinstrudeo-0.1.4/configure.ac
-@@ -92,6 +92,7 @@ AC_CHECK_LIB([vorbisenc], [vorbis_encode
+ configure.ac                           |    3 ++-
+ src/libinstrudeo/isdffmpegexporter.cpp |   17 +++++++++++------
+ src/libinstrudeo/isdffmpegexporter.h   |    7 +++++--
+ 3 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2549623..002f4f4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,6 +92,7 @@ AC_CHECK_LIB([vorbisenc], [vorbis_encode_init], , AC_MSG_ERROR([*** vorbisenc mi
  AC_CHECK_LIB([theora], [theora_info_init], , AC_MSG_ERROR([*** theora missing - please install libtheora development package ***]))
  AC_CHECK_LIB([avcodec], [avcodec_init], , AC_MSG_ERROR([*** avcodec missing - please install avcodec development package ***]), [-lavutil])
  AC_CHECK_LIB([avformat], [av_open_input_stream], , AC_MSG_ERROR([*** avformat missing - please install avformat development package ***]), [-lavutil])
@@ -15,12 +20,12 @@ Index: libinstrudeo-0.1.4/configure.ac
  
  AC_CONFIG_FILES(Makefile src/Makefile src/libinstrudeo/webservice/Makefile src/libinstrudeo/Makefile src/isdexport/Makefile data/Makefile data/commentboxes/Makefile data/fonts/Makefile)
 -AC_OUTPUT
-\ Pas de fin de ligne à la fin du fichier.
+\ No newline at end of file
 +AC_OUTPUT
-Index: libinstrudeo-0.1.4/src/libinstrudeo/isdffmpegexporter.cpp
-===================================================================
---- libinstrudeo-0.1.4.orig/src/libinstrudeo/isdffmpegexporter.cpp
-+++ libinstrudeo-0.1.4/src/libinstrudeo/isdffmpegexporter.cpp
+diff --git a/src/libinstrudeo/isdffmpegexporter.cpp b/src/libinstrudeo/isdffmpegexporter.cpp
+index 3bf38f5..62836c2 100644
+--- a/src/libinstrudeo/isdffmpegexporter.cpp
++++ b/src/libinstrudeo/isdffmpegexporter.cpp
 @@ -79,6 +79,7 @@ ISDFFmpegExporter::~ISDFFmpegExporter()
  ISDObject::ISDErrorCode ISDFFmpegExporter::doExport(char* pixelBuffer)
  {
@@ -29,18 +34,17 @@ Index: libinstrudeo-0.1.4/src/libinstrudeo/isdffmpegexporter.cpp
      
      if (!initOK) {
        LOG_WARNING("Export routine called without initializing the encoder.");
-@@ -96,6 +97,10 @@ ISDObject::ISDErrorCode ISDFFmpegExporte
+@@ -95,6 +96,9 @@ ISDObject::ISDErrorCode ISDFFmpegExporter::doExport(char* pixelBuffer)
+       int bufSize = videoProperties->getHeight()*videoProperties->getWidth()*videoProperties->getBytesPerPixel();
        grabBuffer = (char*)malloc(bufSize);
      }
- 
 +    toYUV_convert_ctx = sws_getContext(codecContext->width, codecContext->height, inputPixFmt,
 +                    outputContext->streams[0]->codec->width, outputContext->streams[0]->codec->height,
 +                    FFMPEG_STREAM_PIX_FMT, SWS_BICUBIC, NULL, NULL, NULL);
-+
+ 
      /*
       * Note: video time is in milliseconds, so if we have a framerate
-      * of 25, we must increment the loop with 1000/25 milliseconds
-@@ -126,13 +131,13 @@ ISDObject::ISDErrorCode ISDFFmpegExporte
+@@ -126,12 +130,13 @@ ISDObject::ISDErrorCode ISDFFmpegExporter::doExport(char* pixelBuffer)
        }
            
        //convert input pic to yuv420p
@@ -50,7 +54,6 @@ Index: libinstrudeo-0.1.4/src/libinstrudeo/isdffmpegexporter.cpp
 -              LOG_WARNING("Pixel format conversion not handled while exporting.");
 -              RETURN_ERROR(ISD_EXPORT_FORMAT_ERROR);
 -          }
--          
 +        if (sws_scale(toYUV_convert_ctx, inputPicture.data, inputPicture.linesize, 0, codecContext->height,
 +                        yuvInputPicture.data, yuvInputPicture.linesize) < 0)
 +            {
@@ -58,20 +61,22 @@ Index: libinstrudeo-0.1.4/src/libinstrudeo/isdffmpegexporter.cpp
 +                RETURN_ERROR(ISD_EXPORT_FORMAT_ERROR);
 +            }
 +
+           
        outSize = avcodec_encode_video(codecContext, outputBuf, outputBufSize, inputFrame);
        //if zero size, it means the image was buffered
-       if (outSize > 0) {
-Index: libinstrudeo-0.1.4/src/libinstrudeo/isdffmpegexporter.h
-===================================================================
---- libinstrudeo-0.1.4.orig/src/libinstrudeo/isdffmpegexporter.h
-+++ libinstrudeo-0.1.4/src/libinstrudeo/isdffmpegexporter.h
+diff --git a/src/libinstrudeo/isdffmpegexporter.h b/src/libinstrudeo/isdffmpegexporter.h
+index 06082ec..b69f317 100644
+--- a/src/libinstrudeo/isdffmpegexporter.h
++++ b/src/libinstrudeo/isdffmpegexporter.h
 @@ -47,8 +47,11 @@
  
  #include <libinstrudeo/isdexporter.h>
  
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
 +extern "C" {
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
 +#include <libswscale/swscale.h>
 +}
  

diff --git a/media-libs/libinstrudeo/libinstrudeo-0.1.4.ebuild b/media-libs/libinstrudeo/libinstrudeo-0.1.4.ebuild
index cdc5957d4517302b5de9ddebc913fdd47eefaaa3..9b664b9e5e19848ed1dc3783d64a31904f752abc 100644 (file)
--- a/media-libs/libinstrudeo/libinstrudeo-0.1.4.ebuild
+++ b/media-libs/libinstrudeo/libinstrudeo-0.1.4.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils autotools
+EAPI=4
+
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Provides the necessary logic to capture screen recordings and to process them"
 HOMEPAGE="http://libinstrudeo.sourceforge.net/"
@@ -13,37 +15,26 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND=">=dev-cpp/libxmlpp-2.10.0
-       >=media-libs/freetype-2.1.9
-       >=dev-libs/glib-2.10.0
-       >=dev-cpp/glibmm-2.8.4
+DEPEND="
+       dev-cpp/libxmlpp:2.6
+       media-libs/freetype
+       dev-libs/glib:2
+       dev-cpp/glibmm:2
        media-libs/freeglut
        media-libs/libvorbis
-       =media-libs/libdc1394-1*
+       media-libs/libdc1394:1
        media-libs/libdca
        media-libs/libtheora
        media-libs/ftgl
-       media-video/ffmpeg
+       virtual/ffmpeg
        media-sound/gsm
        net-misc/curl
        dev-libs/openssl
        sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_unpack(){
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}/img_convert_to_sws_scale.patch"
+src_prepare(){
+       epatch "${FILESDIR}/${PV}-img_convert_to_sws_scale.patch"
        eautoreconf
-}
-
-src_compile() {
-       CXXFLAGS="${CXXFLAGS} -D__STDC_CONSTANT_MACROS" econf || die "econf failed"
-       emake || die "emake failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc AUTHORS ChangeLog NEWS README
+       append-cxxflags -D__STDC_CONSTANT_MACROS
 }