From f4f4878c13747580e64cf7874fabc10a14697e89 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 21 Jul 2013 07:22:24 +0000 Subject: Remove masked for removal package --- net-im/qutecom/ChangeLog | 67 ---- net-im/qutecom/Manifest | 29 -- net-im/qutecom/files/qutecom-2.2-boost-1.50.patch | 23 -- net-im/qutecom/files/qutecom-2.2-ffmpeg-1.patch | 416 --------------------- ...om-2.2-no-deprecated-avcodec-decode-video.patch | 18 - net-im/qutecom/metadata.xml | 10 - net-im/qutecom/qutecom-2.2_p20110210.ebuild | 87 ----- 7 files changed, 650 deletions(-) delete mode 100644 net-im/qutecom/ChangeLog delete mode 100644 net-im/qutecom/Manifest delete mode 100644 net-im/qutecom/files/qutecom-2.2-boost-1.50.patch delete mode 100644 net-im/qutecom/files/qutecom-2.2-ffmpeg-1.patch delete mode 100644 net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch delete mode 100644 net-im/qutecom/metadata.xml delete mode 100644 net-im/qutecom/qutecom-2.2_p20110210.ebuild (limited to 'net-im') diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog deleted file mode 100644 index b17586bd5fb3..000000000000 --- a/net-im/qutecom/ChangeLog +++ /dev/null @@ -1,67 +0,0 @@ -# ChangeLog for net-im/qutecom -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/ChangeLog,v 1.17 2013/03/02 22:53:48 hwoarang Exp $ - - 02 Mar 2013; Markos Chandras - qutecom-2.2_p20110210.ebuild: - Move Qt dependencies to the new category - - 18 Jan 2013; Alexis Ballier - qutecom-2.2_p20110210.ebuild, +files/qutecom-2.2-ffmpeg-1.patch: - Fix build with latest ffmpeg: Sanitize include paths and port to the new API. - Part of bug #443254. - - 03 Oct 2012; Chí-Thanh Christopher Nguyễn - +files/qutecom-2.2-boost-1.50.patch, qutecom-2.2_p20110210.ebuild: - Fix building against boost-1.50, bug #425440. - - 26 Jul 2012; Johannes Huber qutecom-2.2_p20110210.ebuild: - Add missing slot dependencies on Qt. - - 17 Jun 2012; Chí-Thanh Christopher Nguyễn - qutecom-2.2_p20110210.ebuild: - Do not include gtypes.h, bug #421415 - - 30 Jan 2012; Chí-Thanh Christopher Nguyễn - qutecom-2.2_p20110210.ebuild, - +files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch: - Fix building against >=ffmpeg-0.8, bug #401175. - - 03 Oct 2011; Chí-Thanh Christopher Nguyễn - qutecom-2.2_p20110210.ebuild: - Allow building against >=linux-headers-2.6.38, bug #361181. - - 31 Mar 2011; Chí-Thanh Christopher Nguyễn - qutecom-2.2_p20110210.ebuild: - Require old kernel headers, bug #361181. - - 28 Mar 2011; Chí-Thanh Christopher Nguyễn - -qutecom-2.2_p20100309.ebuild, -qutecom-2.2_p20100620.ebuild, - qutecom-2.2_p20110210.ebuild: - Depend on virtual/ffmpeg, remove old. - -*qutecom-2.2_p20110210 (13 Feb 2011) - - 13 Feb 2011; Chí-Thanh Christopher Nguyễn - +qutecom-2.2_p20110210.ebuild: - New snapshot. - - 14 Aug 2010; Chí-Thanh Christopher Nguyễn - qutecom-2.2_p20100309.ebuild, qutecom-2.2_p20100620.ebuild: - Filter --as-needed, bug #315045, ack'ed by QA on IRC. - -*qutecom-2.2_p20100620 (21 Jun 2010) - - 21 Jun 2010; Chí-Thanh Christopher Nguyễn - +qutecom-2.2_p20100620.ebuild: - New snapshot. Fixes bug #324317 - - 13 Apr 2010; Chí-Thanh Christopher Nguyễn - qutecom-2.2_p20100309.ebuild: - add qt-webkit dependency, bug 315043 - -*qutecom-2.2_p20100309 (09 Mar 2010) - - 09 Mar 2010; Chí-Thanh Christopher Nguyễn - +qutecom-2.2_p20100309.ebuild: - initial import for bug 237941 diff --git a/net-im/qutecom/Manifest b/net-im/qutecom/Manifest deleted file mode 100644 index 7e365e0c565a..000000000000 --- a/net-im/qutecom/Manifest +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX qutecom-2.2-boost-1.50.patch 670 SHA256 3cf9989e3a19babc01204fcbe54d55fdbb300c533908957850190b0cf92f9c89 SHA512 a42a8c710e2d516911582a467e39f5193ee719cf79717d881b1b8fd844ed1c06a55d882fec9c6ca971f62f07ce55900bf8204230f1dfc3fc2186b4549db43e18 WHIRLPOOL 17e3bafa4d271eeddf204c99aea2bb628219058c3a61e770edf6f46cc108f7ce76f5713b320c40b0c865254c4ced718f24274c31e84fe9453bbe4743a331112a -AUX qutecom-2.2-ffmpeg-1.patch 12942 SHA256 1b1ce7ac1b2d07a70c80a61a1f6db2ddc4444b16f70924f883a2269d26408749 SHA512 e3dd32cfc808b1ea6145bbecbb0cbcfb07f20e5236fd683bcfa4bb207bccb70505f828c6de550f286d144a3d74f33f3a02901b1f7b285a0ab18874dc734bb285 WHIRLPOOL df126baa9d436fea725ca7189e366ebaa0a2e2073d0e51f8281c532553a9bd02edd77db9ac3811b43bcc59e4b8f595bc3ef3968d98d870c3b0dc20fb77c50dd1 -AUX qutecom-2.2-no-deprecated-avcodec-decode-video.patch 673 SHA256 648e557c9364b3cdbd8ffe5f9967dadc64476d45c0ea2b1fedfc5aad2189cf7f SHA512 4a2da30bc7a88e862d4eab41f81f7ccc09ed27fcad49a893e618cdaf0784264458dc6887e7e44c3fdb5abd56ca2b80399cbe9f033688b192ece800f46e83df58 WHIRLPOOL 1594a21fd65eed3f56b8a93fc7af882081810ae55f36a90e9697f1c02667b96b96a72e73cc014a96542d42fbcc94196dc7a1e3e7b2a4d1da61120cd1cffe150a -DIST qutecom-2.2_p20110210.tar.xz 39408892 SHA256 76cdfc2cee5a71c264bcc255b9657ebcd3f70fac0be37772fd47bf3c97f2677e SHA512 0e391ec979b543783ccdb501fa055d943fc8b1958f4c7574ade29f10430ec0ff833113a8f029364308ddf2eda2d13f71da60c77e147c73b2049907a54e67b912 WHIRLPOOL f989c6e4cdf5c88d9a2c51b9e571125ec2133db6b213ed02565906d5659684dfef79e599d4203c572c0065b6c2b2792ca277861395344a89b0b6ecabc185ae0a -EBUILD qutecom-2.2_p20110210.ebuild 2927 SHA256 ff4cb7b57f316862a990688750418ec25a72f5617f97503942715751d0f6a4ee SHA512 bb541b79ab7b41dd537d322e823b95db61ec873a8d75defd9612b90f89a9c32782ebde7b9a9519e9d090b865281957a47fc8f2b77dcd56babff886c483a89cb0 WHIRLPOOL b55f897eb33e844183c1b96dc82842a200a61ee926b4f96ee9ddeae1c06047e6658b0ea507b796e9f9af807085e9932e17fcfbab404f79b6f8ebeab5105e9cd3 -MISC ChangeLog 2565 SHA256 fa73f843a82709fc232635b834b92775657bb577692ce49381b0b3089e0fab8d SHA512 c1c199f994e49f54ab5833b21d14b4aa8119a0632bd5b04a806ab73305819f951e77dc751791f4690ee8086cfd69fbafba0721bf70497f5967e5c8a49e15ec7e WHIRLPOOL 9f3ad5632ac4293ea01f9f375596c2ec58bf9e7e8c953e18288b98c85c0234dc6f6c684bd3c99a87ca2050b5a8182189f1bbd2eb916fbd8a69fb9d2dfa85e40a -MISC metadata.xml 272 SHA256 55558c7efd245be98e0b3a5be45c4e855ecb6f2f4d651edf3d5442d6edbd9298 SHA512 5d8f03c7010fbfafc4581688c60f87f42b9307e17e36579e8a2d863e03d61a014efc760e3546c2b14e910aa79949ac17609c3f29e3527b705ccd2eca00ecc442 WHIRLPOOL 94968efa6ccc49e6df9d74379ea9f59d2840c6f23d7b0e6cfe907f3b8ae0df8a41deb85f3eafe386471c6304cf198ae7ae29bd27eb80c28f4812bcd821da4872 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQJ8BAEBCABmBQJRMoL7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88ASMQAM+QnW+6SeNXVYrBHX0FkpM7 -CUdhwcC4y1aVYh1yxmOW5A00/iQ2kQ8h7iN6JHBAQsCTqCpylX39jpC2AzdZxokm -CjwT+vZR4t+x5xwZp+d5/GNs+MK40FVKJ5FR2NI0jM1xqpU79nKwAjIWqdpfCYNz -AETfFKySHFcH1B1Ok9UzW19X89XHCaOgpnjJY9y/h3LcUw/UhoiT0bVkJfefmrof -tUhIjSvmIb3RwFrTyTsNOSHlxoslDxsv2ndC2k7bCjYsvrpJWIRdhkDuaTgJjLN9 -6YpV0HhElbXdov4yKwvHnged/wUetrWN4XvLuQC3MXR5rouDzYsMegTLNmtxTvvg -oGvBu6aixyDoXUahTuYYWNZghMgdTdD8C1CFWZ7/h/CPB1HrdYtDXQbhhBPOr0FY -KdsdnMl3ZSJhMIHpYq81BBTCnhmUQ+Efn04A8YF0dWxLXztlUwiioPpFMgAaTYAA -uTNVuytlO9V29ZUwXYiqNxzaV14uH/HbUqi+OBbrT1Wy8qVhFlrQ0iCYF4n+racv -hOQVxlyOyfoWncIsnq4tRKsBNrzX6+7dR1KY8jgxjLdq1eRCVe4VKmBb0iH6PIMv -GiZwaGEYz5fW86zxUtzD2LbN732Kkma1eHYFn98FbAHpK549gX1PPWH+J9gwr4Pw -Rxr4YLPpnLu/HEVSALwA -=4CjT ------END PGP SIGNATURE----- diff --git a/net-im/qutecom/files/qutecom-2.2-boost-1.50.patch b/net-im/qutecom/files/qutecom-2.2-boost-1.50.patch deleted file mode 100644 index 91239ec849c2..000000000000 --- a/net-im/qutecom/files/qutecom-2.2-boost-1.50.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur a/libs/owutil/thread/src/Thread.cpp b/libs/owutil/thread/src/Thread.cpp ---- a/libs/owutil/thread/src/Thread.cpp 2011-02-10 11:03:43.000000000 +0100 -+++ b/libs/owutil/thread/src/Thread.cpp 2012-10-03 14:58:00.000000000 +0200 -@@ -24,6 +24,7 @@ - #include - #include - -+#include - #include - #include - -@@ -105,7 +106,11 @@ - } - - boost::xtime xt; -+#if BOOST_VERSION >= 105000 -+ boost::xtime_get(&xt, boost::TIME_UTC_); -+#else - boost::xtime_get(&xt, boost::TIME_UTC); -+#endif /* BOOST_VERSION >= 105000 */ - xt.sec += seconds; - boost::thread::sleep(xt); - } diff --git a/net-im/qutecom/files/qutecom-2.2-ffmpeg-1.patch b/net-im/qutecom/files/qutecom-2.2-ffmpeg-1.patch deleted file mode 100644 index a4cc594986bf..000000000000 --- a/net-im/qutecom/files/qutecom-2.2-ffmpeg-1.patch +++ /dev/null @@ -1,416 +0,0 @@ -Fix build with latest ffmpeg: Sanitize include paths and port to the new API -Part of bug #443254 - -Index: qutecom-2.2_p20110210/libs/pixertool/src/pixertool.cpp -=================================================================== ---- qutecom-2.2_p20110210.orig/libs/pixertool/src/pixertool.cpp -+++ qutecom-2.2_p20110210/libs/pixertool/src/pixertool.cpp -@@ -26,9 +26,10 @@ - #ifdef __cplusplus - extern "C" { - #endif --#include -+#include -+#include - #ifdef HAVE_SWSCALE --#include -+#include - #endif - #ifdef __cplusplus - } -@@ -54,8 +55,6 @@ static uint8_t * _nv12_to_yuv420p(uint8_ - piximage * pix_alloc(pixosi pix, unsigned width, unsigned height) { - piximage * image = (piximage *) malloc(sizeof(piximage)); - -- avcodec_init(); -- - image->width = width; - image->height = height; - image->palette = pix; -@@ -83,7 +82,7 @@ unsigned pix_size(pixosi pix, unsigned w - } - - const char *pix_get_fmt_name(pixosi pixfmt) { -- return avcodec_get_pix_fmt_name(pix_ffmpeg_from_pix_osi(pixfmt)); -+ return av_get_pix_fmt_name(pix_ffmpeg_from_pix_osi(pixfmt)); - } - - pixerrorcode pix_convert(int flags, piximage * img_dst, piximage * img_src) { -Index: qutecom-2.2_p20110210/owbuild/FindFFMPEG.cmake -=================================================================== ---- qutecom-2.2_p20110210.orig/owbuild/FindFFMPEG.cmake -+++ qutecom-2.2_p20110210/owbuild/FindFFMPEG.cmake -@@ -47,16 +47,13 @@ else (FFMPEG_LIBRARIES AND FFMPEG_INCLUD - - find_path(AVCODEC_INCLUDE_DIR - NAMES -- avcodec.h -+ libavcodec/avcodec.h - PATHS - ${_AVCODEC_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /sw/include -- PATH_SUFFIXES -- libavcodec -- ffmpeg - NO_DEFAULT_PATH - ) - -@@ -66,32 +63,26 @@ else (FFMPEG_LIBRARIES AND FFMPEG_INCLUD - - find_path(AVUTIL_INCLUDE_DIR - NAMES -- avutil.h -+ libavutil/avutil.h - PATHS - ${_AVUTIL_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /sw/include -- PATH_SUFFIXES -- libavutil -- ffmpeg - NO_DEFAULT_PATH - ) - mark_as_advanced(AVUTIL_INCLUDE_DIR) - - find_path(AVFORMAT_INCLUDE_DIR - NAMES -- avformat.h -+ libavformat/avformat.h - PATHS - ${_AVFORMAT_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /sw/include -- PATH_SUFFIXES -- libavformat -- ffmpeg - NO_DEFAULT_PATH - ) - mark_as_advanced(AVFORMAT_INCLUDE_DIR) -@@ -99,32 +90,26 @@ else (FFMPEG_LIBRARIES AND FFMPEG_INCLUD - if (FALSE) - find_path(POSTPROC_INCLUDE_DIR - NAMES -- postprocess.h -+ libpostproc/postprocess.h - PATHS - ${_POSTPROC_INCLUDEDIR} - /usr/include/postproc - /usr/local/include/postproc - /opt/local/include/postproc - /sw/include -- PATH_SUFFIXES -- libpostproc -- ffmpeg - ) - mark_as_advanced(POSTPROC_INCLUDE_DIR) - endif(FALSE) - - find_path(SWSCALE_INCLUDE_DIR - NAMES -- swscale.h -+ libswscale/swscale.h - PATHS - ${_SWSCALE_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /sw/include -- PATH_SUFFIXES -- libswscale -- ffmpeg - NO_DEFAULT_PATH - ) - mark_as_advanced(SWSCALE_INCLUDE_DIR) -Index: qutecom-2.2_p20110210/libs/pixertool/include/pixertool/ffmpeg-pixertool.h -=================================================================== ---- qutecom-2.2_p20110210.orig/libs/pixertool/include/pixertool/ffmpeg-pixertool.h -+++ qutecom-2.2_p20110210/libs/pixertool/include/pixertool/ffmpeg-pixertool.h -@@ -28,14 +28,14 @@ - extern "C" { - #endif - #ifdef HAVE_SWSCALE --#include -+#include - #endif --#include -+#include - #ifdef __cplusplus - } - #endif - --#include -+#include - - #ifdef __cplusplus - extern "C" { -Index: qutecom-2.2_p20110210/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c -=================================================================== ---- qutecom-2.2_p20110210.orig/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c -+++ qutecom-2.2_p20110210/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c -@@ -23,9 +23,9 @@ - - #include - --#include -+#include - #ifdef HAVE_SWSCALE --#include -+#include - #endif - - -Index: qutecom-2.2_p20110210/qutecom/src/QuteComBuildId.cpp -=================================================================== ---- qutecom-2.2_p20110210.orig/qutecom/src/QuteComBuildId.cpp -+++ qutecom-2.2_p20110210/qutecom/src/QuteComBuildId.cpp -@@ -29,7 +29,7 @@ - #include - #include - extern "C" { --#include -+#include - #if defined (IMWRAPPER_BACKEND_MULTI) - #include - #include -Index: qutecom-2.2_p20110210/wifo/phapi/phapi-old.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phapi-old.c -+++ qutecom-2.2_p20110210/wifo/phapi/phapi-old.c -@@ -59,7 +59,7 @@ - #define SKIP(x) - - #ifdef PHAPI_VIDEO_SUPPORT --#include -+#include - #include - #endif - -@@ -2295,7 +2295,9 @@ void - ph_avcodec_init() - { - #ifdef PHAPI_VIDEO_SUPPORT -+#if LIBAVCODEC_VERSION_MAJOR < 54 - avcodec_init(); -+#endif - avcodec_register_all(); - //phcfg.video_config.video_line_configuration = PHAPI_VIDEO_LINE_128KBPS; - #endif -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-avcodec-wrapper.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-avcodec-wrapper.c -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-avcodec-wrapper.c -@@ -36,7 +36,7 @@ - - - --#include -+#include - #include - #include - #include -@@ -53,7 +53,9 @@ - - void ph_avcodec_wrapper_init() - { -+#if LIBAVCODEC_VERSION_MAJOR < 54 - avcodec_init(); -+#endif - avcodec_register_all(); - } - -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-avcodec-wrapper.h -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-avcodec-wrapper.h -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-avcodec-wrapper.h -@@ -22,7 +22,7 @@ - #include "phapi.h" - #include "phcall.h" - #include "phmedia.h" --#include -+#include - - #define PHCODEC_DEFAULT_BITRATE 1000000 - // 99 = 11*9 = (176/16)*(144/16) = a partition of macroblocs ( 1 MB = four 8x8 squares) -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-h263.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-h263.c -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-h263.c -@@ -23,7 +23,7 @@ - * - */ - --#include -+#include - #include - #include - #include -@@ -76,7 +76,6 @@ void *h263_encoder_init(void *ctx) { - } - - h263t->encoder_ctx.context->flags |= CODEC_FLAG_QP_RD; -- h263t->encoder_ctx.context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; - h263t->encoder_ctx.context->flags |= CODEC_FLAG_QSCALE; - - //h263t->encoder_ctx.context->flags |= CODEC_FLAG_INPUT_PRESERVED; -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-h263flv1.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-h263flv1.c -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-h263flv1.c -@@ -23,7 +23,7 @@ - * - */ - --#include -+#include - #include - #include - #include -@@ -76,7 +76,6 @@ void *h263flv1_encoder_init(void *ctx) { - } - - h263t->encoder_ctx.context->flags |= CODEC_FLAG_QP_RD; -- h263t->encoder_ctx.context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; - h263t->encoder_ctx.context->flags |= CODEC_FLAG_QSCALE; - - //h263t->encoder_ctx.context->flags |= CODEC_FLAG_INPUT_PRESERVED; -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-h263flv1.h -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-h263flv1.h -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-h263flv1.h -@@ -25,7 +25,7 @@ - #include "phcall.h" - #include "phmedia.h" - #include "phcodec-h263.h" --#include -+#include - #include "phcodec-avcodec-wrapper.h" - - #define MAX_ENC_BUFFER_SIZE (FF_MIN_BUFFER_SIZE * 32) -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-h263.h -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-h263.h -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-h263.h -@@ -24,7 +24,7 @@ - #include "phapi.h" - #include "phcall.h" - #include "phmedia.h" --#include -+#include - #include "phcodec-avcodec-wrapper.h" - - #define MAX_ENC_BUFFER_SIZE (FF_MIN_BUFFER_SIZE * 32) -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-h263plus.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-h263plus.c -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-h263plus.c -@@ -16,7 +16,7 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include - #include - #include - #include -@@ -69,7 +69,6 @@ void *h263p_encoder_init(void *ctx) { - } - - h263t->encoder_ctx.context->flags |= CODEC_FLAG_QP_RD; -- h263t->encoder_ctx.context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; - h263t->encoder_ctx.context->flags |= CODEC_FLAG_QSCALE; - - //h263t->encoder_ctx.context->flags |= CODEC_FLAG_INPUT_PRESERVED; -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-h263plus.h -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-h263plus.h -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-h263plus.h -@@ -25,7 +25,7 @@ - #include "phcall.h" - #include "phmedia.h" - #include "phcodec-h263.h" --#include -+#include - #include "phcodec-avcodec-wrapper.h" - - #define MAX_ENC_BUFFER_SIZE (FF_MIN_BUFFER_SIZE * 32) -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-h264.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-h264.c -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-h264.c -@@ -21,7 +21,7 @@ - * - */ - --#include -+#include - #include - #include - #include -Index: qutecom-2.2_p20110210/wifo/phapi/phcodec-mpeg4.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phcodec-mpeg4.c -+++ qutecom-2.2_p20110210/wifo/phapi/phcodec-mpeg4.c -@@ -24,7 +24,7 @@ - */ - - --#include -+#include - #include - #include - #include -Index: qutecom-2.2_p20110210/wifo/phapi/phmedia-video-bwcontrol.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phmedia-video-bwcontrol.c -+++ qutecom-2.2_p20110210/wifo/phapi/phmedia-video-bwcontrol.c -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - - #include "phlog.h" - #include "phcodec.h" -Index: qutecom-2.2_p20110210/wifo/phapi/phmedia-video.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phmedia-video.c -+++ qutecom-2.2_p20110210/wifo/phapi/phmedia-video.c -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -@@ -867,7 +867,7 @@ int ph_media_video_flush_queue(phvstream - stream->stat_num_decoded_total_over_5s++; - gettimeofday(&now_time, 0); - ph_tvsub(&now_time, &stream->last_decode_time); -- if (picIn->pict_type != FF_I_TYPE && (now_time.tv_usec / 1000) < stream->fps_interleave_time) -+ if (picIn->pict_type != AV_PICTURE_TYPE_I && (now_time.tv_usec / 1000) < stream->fps_interleave_time) - { - stream->stat_num_decoded_dropped_over_5s++; - return 0; -Index: qutecom-2.2_p20110210/wifo/phapi/phmedia-video-control.c -=================================================================== ---- qutecom-2.2_p20110210.orig/wifo/phapi/phmedia-video-control.c -+++ qutecom-2.2_p20110210/wifo/phapi/phmedia-video-control.c -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - - #include "phcodec.h" - #include "phapi.h" diff --git a/net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch b/net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch deleted file mode 100644 index b8f423be791b..000000000000 --- a/net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/wifo/phapi/phcodec-avcodec-wrapper.c b/wifo/phapi/phcodec-avcodec-wrapper.c ---- a/wifo/phapi/phcodec-avcodec-wrapper.c 2011-02-10 11:03:43.000000000 +0100 -+++ b/wifo/phapi/phcodec-avcodec-wrapper.c 2012-01-30 14:05:15.000000000 +0100 -@@ -63,8 +63,12 @@ - int dec_len, got_picture = 0; - ph_avcodec_decoder_ctx_t * decoder_t = (ph_avcodec_decoder_ctx_t *) ctx; - -- dec_len = avcodec_decode_video(decoder_t->context, -- dst, &got_picture, (uint8_t *)src, srcsize); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = (uint8_t*) src; -+ pkt.size = srcsize; -+ dec_len = avcodec_decode_video2(decoder_t->context, -+ dst, &got_picture, &pkt); - - if (got_picture) - { diff --git a/net-im/qutecom/metadata.xml b/net-im/qutecom/metadata.xml deleted file mode 100644 index 11b753103370..000000000000 --- a/net-im/qutecom/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - voip - - chithanh@gentoo.org - Chí-Thanh Christopher Nguyễn - - - diff --git a/net-im/qutecom/qutecom-2.2_p20110210.ebuild b/net-im/qutecom/qutecom-2.2_p20110210.ebuild deleted file mode 100644 index 02677e9a32b4..000000000000 --- a/net-im/qutecom/qutecom-2.2_p20110210.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/qutecom-2.2_p20110210.ebuild,v 1.13 2013/03/02 22:53:48 hwoarang Exp $ - -EAPI="3" - -inherit cmake-utils eutils flag-o-matic versionator - -DESCRIPTION="Multi-protocol instant messenger and VoIP client" -HOMEPAGE="http://www.qutecom.org/" -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa debug oss portaudio xv" - -RDEPEND="dev-libs/boost - dev-libs/glib - dev-libs/openssl - alsa? ( media-libs/alsa-lib ) - media-libs/libsamplerate - media-libs/libsndfile - portaudio? ( media-libs/portaudio ) - media-libs/speex - net-im/pidgin[gnutls] - net-libs/gnutls - >=net-libs/libosip-3 - >=net-libs/libeXosip-3 - net-misc/curl - virtual/ffmpeg - x11-libs/libX11 - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - dev-qt/qtwebkit:4 - xv? ( x11-libs/libXv )" -DEPEND="${RDEPEND} - media-libs/libv4l" - -pkg_setup() { - # fails to find its libraries with --as-needed, bug #315045 - append-ldflags $(no-as-needed) -} - -src_prepare() { - # find correct version of boost, bug #425440 - local boost_PF="$(best_version dev-libs/boost)" - local boost_PV="$(get_version_component_range 5-7 ${boost_PF})" - local boost_PV1="$(get_version_component_range 5-6 ${boost_PF})" - sed -i "s:usr/include:usr/include/boost-$(replace_all_version_separators _ ${boost_PV}):" owbuild/FindBoost.cmake || die - sed -i "s:usr/local/include:usr/include/boost-$(replace_all_version_separators _ ${boost_PV1}):" owbuild/FindBoost.cmake || die - sed -i "s:usr/lib:usr/lib/boost-$(replace_all_version_separators _ ${boost_PV}):" owbuild/FindBoost.cmake || die - sed -i "s:usr/local/lib:usr/lib/boost-$(replace_all_version_separators _ ${boost_PV1}):" owbuild/FindBoost.cmake || die - - # fix building against gcc-4.7, bug #425440 - epatch "${FILESDIR}"/${PN}-2.2-boost-1.50.patch - - # build against >=linux-headers-2.6.38, bug 361181 - sed -i -e "s|linux/videodev.h|libv4l1-videodev.h|" \ - -e "s|__u16|uint16_t|" \ - libs/pixertool/src/v4l/v4l-pixertool.c \ - libs/webcam/include/webcam/V4LWebcamDriver.h \ - libs/webcam/src/v4l/V4LWebcamDriver.cpp || die - epatch "${FILESDIR}"/${PN}-2.2-no-deprecated-avcodec-decode-video.patch \ - "${FILESDIR}"/${PN}-2.2-ffmpeg-1.patch - # do not include gtypes.h, bug #421415 - sed -i '/gtypes.h/d' libs/imwrapper/src/purple/PurpleIMFactory.h || die -} - -src_configure() { - local mycmakeargs="$(cmake-utils_use_enable portaudio PORTAUDIO_SUPPORT) - $(cmake-utils_use_enable alsa PHAPI_AUDIO_ALSA_SUPPORT) - $(cmake-utils_use_enable oss PHAPI_AUDIO_OSS_SUPPORT) - $(cmake-utils_use_enable xv WENGOPHONE_XV_SUPPORT) - -DLIBPURPLE_INTERNAL=OFF - -DPORTAUDIO_INTERNAL=OFF - -DCMAKE_VERBOSE_MAKEFILE=ON " - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - domenu ${PN}/res/${PN}.desktop || die "domenu failed" - doicon ${PN}/res/${PN}_64x64.png || die "doicon failed" - -} -- cgit v1.2.3-65-gdbad