[Pkg-voip-commits] r5808 - in /wengophone/trunk/debian: changelog control patches/head/cmake-swscale.patch patches/head/ffmpeg-swscale-api.patch patches/head/img_resample.patch patches/series rules
cavedon-guest at alioth.debian.org
cavedon-guest at alioth.debian.org
Mon May 26 22:57:41 UTC 2008
Author: cavedon-guest
Date: Mon May 26 22:57:41 2008
New Revision: 5808
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5808
Log:
* Add ffmpeg-swscale-api.patch and img_resample.patch from 2.2 branch in
order to use swscale instead of img_resample (removed from ffmpeg)
* Remove build dependency on libavformat-dev
* Add cmake-swscale.patch to link against libswscale and not agains
libavformat
Added:
wengophone/trunk/debian/patches/head/cmake-swscale.patch
wengophone/trunk/debian/patches/head/ffmpeg-swscale-api.patch
wengophone/trunk/debian/patches/head/img_resample.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/control
wengophone/trunk/debian/patches/series
wengophone/trunk/debian/rules
Modified: wengophone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/changelog?rev=5808&op=diff
==============================================================================
--- wengophone/trunk/debian/changelog (original)
+++ wengophone/trunk/debian/changelog Mon May 26 22:57:41 2008
@@ -1,8 +1,13 @@
wengophone (2.1.2.dfsg0-5) UNRELEASED; urgency=low
* Add build dependency on libx11-dev and python-dev. Closes: #479920
-
- -- Ludovico Cavedon <cavedon at sssup.it> Sun, 25 May 2008 22:46:04 +0200
+ * Add ffmpeg-swscale-api.patch and img_resample.patch from 2.2 branch in
+ order to use swscale instead of img_resample (removed from ffmpeg)
+ * Remove build dependency on libavformat-dev
+ * Add cmake-swscale.patch to link against libswscale and not agains
+ libavformat
+
+ -- Ludovico Cavedon <cavedon at sssup.it> Tue, 27 May 2008 00:54:14 +0200
wengophone (2.1.2.dfsg0-4) unstable; urgency=low
Modified: wengophone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/control?rev=5808&op=diff
==============================================================================
--- wengophone/trunk/debian/control (original)
+++ wengophone/trunk/debian/control Mon May 26 22:57:41 2008
@@ -6,14 +6,14 @@
Build-Depends: cdbs (>= 0.4.27), bzip2, debhelper (>= 4.1.0), quilt,
patchutils (>= 0.2.25), cmake (>= 2.4.4), libqt4-dev (>= 4.1.4),
libglib2.0-dev (>= 2.10.3), libavcodec-dev (>= 0.cvs20060823-3.1),
- libavformat-dev (>= 0.cvs20060823-3.1), libswscale-dev (>= 0.cvs20060823-3.1),
- libgnutls-dev (>= 1.2.9), libboost-serialization-dev (>= 1.34.0),
- libboost-thread-dev (>= 1.34.0), libboost-regex-dev (>= 1.34.0),
- libboost-signals-dev (>= 1.34.0), libboost-program-options-dev (>= 1.34.0),
- uuid-dev, libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12),
- libssl-dev (>= 0.9.8a), libxml2-dev (>= 2.6.24),
- libsamplerate0-dev (>= 0.1.2), libsndfile1-dev (>= 1.0.12),
- libcurl4-openssl-dev (>= 7.16.1), dpkg-dev (>= 1.13.19), libx11-dev, python-dev
+ libswscale-dev (>= 0.cvs20060823-3.1), libgnutls-dev (>= 1.2.9),
+ libboost-serialization-dev (>= 1.34.0), libboost-thread-dev (>= 1.34.0),
+ libboost-regex-dev (>= 1.34.0), libboost-signals-dev (>= 1.34.0),
+ libboost-program-options-dev (>= 1.34.0), uuid-dev,
+ libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12), libssl-dev (>= 0.9.8a),
+ libxml2-dev (>= 2.6.24), libsamplerate0-dev (>= 0.1.2),
+ libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
+ dpkg-dev (>= 1.13.19), libx11-dev, python-dev
Standards-Version: 3.7.3
Homepage: http://www.openwengo.org/
Vcs-Svn: svn://svn.debian.org/pkg-voip/wengophone/trunk/
Added: wengophone/trunk/debian/patches/head/cmake-swscale.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/head/cmake-swscale.patch?rev=5808&op=file
==============================================================================
--- wengophone/trunk/debian/patches/head/cmake-swscale.patch (added)
+++ wengophone/trunk/debian/patches/head/cmake-swscale.patch Mon May 26 22:57:41 2008
@@ -1,0 +1,65 @@
+Index: owbuild/FindFFMPEG.cmake
+===================================================================
+--- owbuild/FindFFMPEG.cmake.orig 2007-01-16 18:13:55.000000000 +0100
++++ owbuild/FindFFMPEG.cmake 2008-05-27 00:51:25.000000000 +0200
+@@ -21,6 +21,7 @@
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ include(UsePkgConfig)
++ include(CheckFunctionExists)
+
+ pkgconfig(libavcodec _FFMPEGIncDir _FFMPEGLinkDir _FFMPEGLinkFlags _FFMPEGCflags)
+
+@@ -61,9 +62,20 @@
+ /sw/lib
+ )
+
+- find_library(AVFORMAT_LIBRARY
++# find_library(AVFORMAT_LIBRARY
++# NAMES
++# avformat
++# PATHS
++# ${_FFMPEGLinkDir}
++# /usr/lib
++# /usr/local/lib
++# /opt/local/lib
++# /sw/lib
++# )
++
++ find_library(SWSCALE_LIBRARY
+ NAMES
+- avformat
++ swscale
+ PATHS
+ ${_FFMPEGLinkDir}
+ /usr/lib
+@@ -92,12 +104,26 @@
+ )
+ endif (AVCODEC_LIBRARY)
+
+- if (AVFORMAT_LIBRARY)
++# if (AVFORMAT_LIBRARY)
++# set(FFMPEG_LIBRARIES
++# ${FFMPEG_LIBRARIES}
++# ${AVFORMAT_LIBRARY}
++# )
++# endif (AVFORMAT_LIBRARY)
++
++ if (SWSCALE_LIBRARY)
+ set(FFMPEG_LIBRARIES
+ ${FFMPEG_LIBRARIES}
+- ${AVFORMAT_LIBRARY}
++ ${SWSCALE_LIBRARY}
+ )
+- endif (AVFORMAT_LIBRARY)
++ endif (SWSCALE_LIBRARY)
++
++ set(CMAKE_REQUIRED_INCLUDES ${FFMPEG_INCLUDE_DIR})
++ set(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES})
++ check_function_exists(
++ sws_scale HAVE_SWSCALE
++ )
++
+
+ if (FFMPEG_INCLUDE_DIRS AND FFMPEG_LIBRARIES)
+ set(FFMPEG_FOUND TRUE)
Added: wengophone/trunk/debian/patches/head/ffmpeg-swscale-api.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/head/ffmpeg-swscale-api.patch?rev=5808&op=file
==============================================================================
--- wengophone/trunk/debian/patches/head/ffmpeg-swscale-api.patch (added)
+++ wengophone/trunk/debian/patches/head/ffmpeg-swscale-api.patch Mon May 26 22:57:41 2008
@@ -1,0 +1,282 @@
+Index: wengophone-2.1.2.dfsg0/libs/owpixertool/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/libs/owpixertool/CMakeLists.txt 2008-05-25 22:50:14.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owpixertool/CMakeLists.txt 2008-05-25 22:50:19.000000000 +0000
+@@ -17,6 +17,7 @@
+
+ ow_add_public_include_dirs(
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
++ ${CMAKE_CURRENT_BINARY_DIR}
+ )
+
+ ow_add_sources(
+@@ -49,3 +50,5 @@
+ endif (UNIX AND NOT WIN32)
+
+ ow_create_binary()
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
++
+Index: wengophone-2.1.2.dfsg0/libs/owpixertool/config.h.cmake
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owpixertool/config.h.cmake 2008-05-25 22:50:19.000000000 +0000
+@@ -0,0 +1,6 @@
++#ifndef PIXERTOOL_CONFIG_H
++#define PIXERTOOL_CONFIG_H
++
++#cmakedefine HAVE_SWSCALE
++
++#endif
+Index: wengophone-2.1.2.dfsg0/libs/owpixertool/include/pixertool/ffmpeg-pixertool.h
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/libs/owpixertool/include/pixertool/ffmpeg-pixertool.h 2008-05-25 22:50:14.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owpixertool/include/pixertool/ffmpeg-pixertool.h 2008-05-25 22:50:19.000000000 +0000
+@@ -22,7 +22,18 @@
+
+ #include <pixertool/pixertool.h>
+
++#include "config.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++#ifdef HAVE_SWSCALE
++#include <swscale.h>
++#endif
+ #include <avcodec.h>
++#ifdef __cplusplus
++}
++#endif
+
+ #ifdef __cplusplus
+ extern "C" {
+Index: wengophone-2.1.2.dfsg0/libs/owpixertool/src/ffmpeg/ffmpeg-pixertool.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/libs/owpixertool/src/ffmpeg/ffmpeg-pixertool.c 2008-05-25 22:50:14.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owpixertool/src/ffmpeg/ffmpeg-pixertool.c 2008-05-25 22:50:19.000000000 +0000
+@@ -17,15 +17,23 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#include "config.h"
++
+ #include <pixertool/ffmpeg-pixertool.h>
+
++#include <stdlib.h>
++
+ #include <avcodec.h>
++#ifdef HAVE_SWSCALE
++#include <swscale.h>
++#endif
+
+-#include <stdlib.h>
+
+ /** Used by pix_convert_avpicture */
+ static AVPicture * pictureBuffer = NULL;
+
++
++
+ /** Called at program exit */
+ static void pix_ffmpeg_cleanup(void);
+
+@@ -123,8 +131,12 @@
+ }
+
+ pixerrorcode pix_convert_avpicture(int flags, piximage * img_dst, AVPicture * img_src, pixosi src_fmt) {
++#ifdef HAVE_SWSCALE
++ struct SwsContext *convert_context;
++#endif
+ pixosi desiredPalette = pix_ffmpeg_from_pix_osi(img_dst->palette);
+
++
+ if (!pictureBuffer) {
+ pictureBuffer = (AVPicture *) malloc(sizeof(AVPicture));
+ atexit(pix_ffmpeg_cleanup);
+@@ -132,9 +144,22 @@
+
+ avpicture_fill(pictureBuffer, img_dst->data, desiredPalette, img_dst->width, img_dst->height);
+
+- img_convert(pictureBuffer, desiredPalette,
+- img_src, pix_ffmpeg_from_pix_osi(src_fmt),
+- img_dst->width, img_dst->height);
++#ifndef HAVE_SWSCALE
++ img_convert(pictureBuffer, desiredPalette,
++ img_src, pix_ffmpeg_from_pix_osi(src_fmt),
++ img_dst->width, img_dst->height);
++#else
++ convert_context = sws_getContext(img_dst->width, img_dst->height, pix_ffmpeg_from_pix_osi(src_fmt),
++ img_dst->width, img_dst->height, desiredPalette,
++ SWS_BICUBIC, NULL, NULL, NULL);
++ if(!convert_context) {
++ return PIX_NOK;
++ }
++ sws_scale(convert_context, img_src->data, img_src->linesize,
++ 0, img_dst->height,
++ pictureBuffer->data, pictureBuffer->linesize);
++ sws_freeContext(convert_context);
++#endif
+
+ //pictureBuffer->data[0] should contain only valid data
+
+Index: wengophone-2.1.2.dfsg0/libs/owpixertool/src/pixertool.cpp
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/libs/owpixertool/src/pixertool.cpp 2008-05-25 22:50:14.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owpixertool/src/pixertool.cpp 2008-05-25 22:50:19.000000000 +0000
+@@ -17,10 +17,23 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#include "config.h"
++
+ #include <pixertool/pixertool.h>
+
+ #include <pixertool/ffmpeg-pixertool.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++#include <avcodec.h>
++#ifdef HAVE_SWSCALE
++#include <swscale.h>
++#endif
++#ifdef __cplusplus
++}
++#endif
++
+ #include <stdlib.h>
+ #include <string.h>
+
+@@ -73,6 +86,9 @@
+
+ uint8_t * buf_source = img_src->data;
+ int need_avfree = 0;
++#ifdef HAVE_SWSCALE
++ struct SwsContext *convert_context;
++#endif
+
+ //If the format is NV12, transforming it
+ if (img_src->palette == PIX_OSI_NV12) {
+@@ -90,7 +106,7 @@
+ }
+ ////
+
+- int len_target = pix_size(img_dst->palette, img_src->width, img_src->height);
++ //int len_target = pix_size(img_dst->palette, img_src->width, img_src->height);
+
+ int pix_fmt_source = pix_ffmpeg_from_pix_osi(img_src->palette);
+ int pix_fmt_target = pix_ffmpeg_from_pix_osi(img_dst->palette);
+@@ -121,43 +137,73 @@
+ return PIX_NOK;
+ }
+
+- //TODO optimize this part but will need the preparation of contexts
+- ImgReSampleContext * resample_context = img_resample_init(img_dst->width, img_dst->height,
+- img_src->width, img_src->height);
++#ifndef HAVE_SWSCALE
++ //TODO optimize this part but will need the preparation of contexts
++ ImgReSampleContext * resample_context = img_resample_init(img_dst->width, img_dst->height,
++ img_src->width, img_src->height);
++
++ if (!resample_context) {
++ return PIX_NOK;
++ }
++
++ AVPicture avp_tmp_target;
++
++ //we need to prepare a tmp buffer
++ uint8_t * buf_tmp_target = (uint8_t *)av_malloc(avpicture_get_size(pix_fmt_source, img_dst->width, img_dst->height) * sizeof(uint8_t));
++ avpicture_fill(&avp_tmp_target, buf_tmp_target, pix_fmt_source, img_dst->width, img_dst->height);
++ //
++
++ //do the resampling
++ img_resample(resample_context, &avp_tmp_target, &avp_source);
++ img_resample_close(resample_context);
++ //
+
+- if (!resample_context) {
++ //do the conversion
++ if (img_convert(&avp_target, pix_fmt_target,
++ &avp_tmp_target, pix_fmt_source,
++ img_dst->width, img_dst->height) == -1) {
++ av_free(buf_tmp_target);
++ return PIX_NOK;
++ }
++ av_free(buf_tmp_target);
++#else
++ //do the conversion
++ convert_context = sws_getContext(img_src->width, img_src->height, pix_fmt_source, img_dst->width, img_dst->height, pix_fmt_target, SWS_BICUBIC, NULL, NULL, NULL);
++ if(!convert_context) {
+ return PIX_NOK;
+ }
++ if (sws_scale(convert_context, avp_source.data, avp_source.linesize,
++ 0, img_src->height,
++ avp_target.data, avp_target.linesize) == -1) {
++ sws_freeContext(convert_context);
+
+- AVPicture avp_tmp_target;
+-
+- //we need to prepare a tmp buffer
+- uint8_t * buf_tmp_target = (uint8_t *)av_malloc(avpicture_get_size(pix_fmt_source, img_dst->width, img_dst->height) * sizeof(uint8_t));
+- avpicture_fill(&avp_tmp_target, buf_tmp_target, pix_fmt_source, img_dst->width, img_dst->height);
+- //
+-
+- //do the resampling
+- img_resample(resample_context, &avp_tmp_target, &avp_source);
+- img_resample_close(resample_context);
+- //
+-
+- //do the conversion
+- if (img_convert(&avp_target, pix_fmt_target,
+- &avp_tmp_target, pix_fmt_source,
+- img_dst->width, img_dst->height) == -1) {
+-
+- av_free(buf_tmp_target);
+ return PIX_NOK;
+ }
+- av_free(buf_tmp_target);
++ sws_freeContext(convert_context);
+ //
++#endif
++
+
+ } else {
+- if (img_convert(&avp_target, pix_fmt_target,
+- &avp_source, pix_fmt_source,
+- img_src->width, img_src->height) == -1) {
++#ifndef HAVE_SWSCALE
++ if (img_convert(&avp_target, pix_fmt_target,
++ &avp_source, pix_fmt_source,
++ img_src->width, img_src->height) == -1) {
++ return PIX_NOK;
++ }
++#else
++ convert_context = sws_getContext(img_src->width, img_src->height, pix_fmt_source, img_dst->width, img_dst->height, pix_fmt_target, SWS_BICUBIC, NULL, NULL, NULL);
++ if(!convert_context) {
++ return PIX_NOK;
++ }
++ if (sws_scale(convert_context, avp_source.data, avp_source.linesize,
++ 0, img_src->height,
++ avp_target.data, avp_target.linesize) == -1) {
++ sws_freeContext(convert_context);
+ return PIX_NOK;
+ }
++ sws_freeContext(convert_context);
++#endif
+ }
+ ////
+
+Index: wengophone-2.1.2.dfsg0/wengophone/src/WengoPhoneBuildId.cpp
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wengophone/src/WengoPhoneBuildId.cpp 2008-05-25 22:50:38.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wengophone/src/WengoPhoneBuildId.cpp 2008-05-25 22:50:48.000000000 +0000
+@@ -27,9 +27,9 @@
+ #include <portaudio.h>
+ #endif
+ #include <boost/version.hpp>
+-#include <avcodec.h>
+ #include <tinyxml.h>
+ extern "C" {
++#include <avcodec.h>
+ #include <glib.h>
+ #include <gaim/core.h>
+ }
Added: wengophone/trunk/debian/patches/head/img_resample.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/head/img_resample.patch?rev=5808&op=file
==============================================================================
--- wengophone/trunk/debian/patches/head/img_resample.patch (added)
+++ wengophone/trunk/debian/patches/head/img_resample.patch Mon May 26 22:57:41 2008
@@ -1,0 +1,97 @@
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-avcodec-wrapper.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-avcodec-wrapper.c 2006-10-09 22:44:22.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-avcodec-wrapper.c 2008-05-25 22:20:45.000000000 +0000
+@@ -128,13 +128,8 @@
+ encoder_t->context->rtp_payload_size = 1000;
+ encoder_t->context->rtp_callback = phcodec_avcodec_video_rtp_callback;
+
+- encoder_t->res_ctx = img_resample_init(
+- dest_width, dest_height,
+- meta_t->frame_width, meta_t->frame_height
+- );
+-
+- encoder_t->resized_pic = avcodec_alloc_frame();
+- encoder_t->sampled_frame = avcodec_alloc_frame();
++ encoder_t->resized_pic = avcodec_alloc_frame();
++ encoder_t->sampled_frame = avcodec_alloc_frame();
+
+ return 0;
+ }
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-avcodec-wrapper.h
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-avcodec-wrapper.h 2006-05-12 01:16:29.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-avcodec-wrapper.h 2008-05-25 22:20:05.000000000 +0000
+@@ -49,7 +49,6 @@
+ AVPicture pictureOut;
+ AVFrame *resized_pic, *sampled_frame;
+ AVCodecContext *context;
+- ImgReSampleContext *res_ctx;
+ AVCodec* encoder;
+ int maxencodesize;
+ };
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-h263.c 2007-01-25 14:49:02.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263.c 2008-05-25 22:20:05.000000000 +0000
+@@ -113,7 +113,7 @@
+
+ void h263_encoder_cleanup(void *ctx) {
+ ph_h263_encoder_ctx_t * encoder = (ph_h263_encoder_ctx_t *) ctx;
+- img_resample_close(encoder->encoder_ctx.res_ctx);
++
+ //avcodec_flush_buffers(encoder->encoder_ctx.context);
+ avcodec_close(encoder->encoder_ctx.context);
+ av_free(encoder->encoder_ctx.resized_pic);
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263flv1.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-h263flv1.c 2007-02-22 19:17:04.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263flv1.c 2008-05-25 22:20:05.000000000 +0000
+@@ -113,7 +113,7 @@
+
+ void h263flv1_encoder_cleanup(void *ctx) {
+ ph_h263_encoder_ctx_t * encoder = (ph_h263_encoder_ctx_t *) ctx;
+- img_resample_close(encoder->encoder_ctx.res_ctx);
++
+ //avcodec_flush_buffers(encoder->encoder_ctx.context);
+ avcodec_close(encoder->encoder_ctx.context);
+ av_free(encoder->encoder_ctx.resized_pic);
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263plus.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-h263plus.c 2007-02-22 19:17:04.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263plus.c 2008-05-25 22:20:05.000000000 +0000
+@@ -106,7 +106,7 @@
+
+ void h263p_encoder_cleanup(void *ctx) {
+ ph_h263_encoder_ctx_t * encoder = (ph_h263_encoder_ctx_t *) ctx;
+- img_resample_close(encoder->encoder_ctx.res_ctx);
++
+ //avcodec_flush_buffers(encoder->encoder_ctx.context);
+ avcodec_close(encoder->encoder_ctx.context);
+ av_free(encoder->encoder_ctx.resized_pic);
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h264.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-h264.c 2006-10-09 22:44:22.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h264.c 2008-05-25 22:20:05.000000000 +0000
+@@ -98,7 +98,7 @@
+
+ void h264_encoder_cleanup(void *ctx) {
+ ph_h264_encoder_ctx_t * encoder = (ph_h264_encoder_ctx_t *) ctx;
+- img_resample_close(encoder->encoder_ctx.res_ctx);
++
+ av_free(encoder->encoder_ctx.resized_pic);
+ av_free(encoder->encoder_ctx.sampled_frame);
+ av_free(encoder->data_enc);
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-mpeg4.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-mpeg4.c 2007-04-11 11:08:44.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-mpeg4.c 2008-05-25 22:20:05.000000000 +0000
+@@ -116,7 +116,7 @@
+
+ void mpeg4_encoder_cleanup(void *ctx) {
+ ph_mpeg4_encoder_ctx_t * encoder = (ph_mpeg4_encoder_ctx_t *) ctx;
+- img_resample_close(encoder->encoder_ctx.res_ctx);
++
+ av_free(encoder->encoder_ctx.resized_pic);
+ av_free(encoder->encoder_ctx.sampled_frame);
+ av_free(encoder->data_enc);
Modified: wengophone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/series?rev=5808&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/series (original)
+++ wengophone/trunk/debian/patches/series Mon May 26 22:57:41 2008
@@ -1,6 +1,9 @@
head/alsa-plughw-default.patch
head/qt-fix-bad-window-size.patch
head/phapi-alsa-code-from-2.2.patch
+head/img_resample.patch
+head/ffmpeg-swscale-api.patch
+head/cmake-swscale.patch -p0
generic/qobjectthreadsafe-fix-qt42.patch
generic/cmake-fix-ENABLE_CRASHREPORT.patch
generic/cmake-static-coredumper.patch
Modified: wengophone/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/rules?rev=5808&op=diff
==============================================================================
--- wengophone/trunk/debian/rules (original)
+++ wengophone/trunk/debian/rules Mon May 26 22:57:41 2008
@@ -18,7 +18,8 @@
-DSPEEX_INTERNAL=OFF \
-DSAMPLERATE_INTERNAL=OFF \
-DCURL_INTERNAL=OFF \
- -DPHAPI_VIDEO_SUPPORT=ON
+ -DPHAPI_VIDEO_SUPPORT=ON \
+ -DHAVE_SWSCALE=1
ifeq ($(DEB_HOST_ARCH), i386)
More information about the Pkg-voip-commits
mailing list