Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=1c466705cccb94bf6a3f5e92ec2dca4b894e4b51
commit 1c466705cccb94bf6a3f5e92ec2dca4b894e4b51 Author: James Buren <[email protected]> Date: Tue May 8 06:47:55 2012 -0500 qutecom-2.2.1-4-x86_64 * fix build with new patches * add x86_64 to archs diff --git a/source/xapps-extra/qutecom/FrugalBuild b/source/xapps-extra/qutecom/FrugalBuild index 80fccd7..dcf14f3 100644 --- a/source/xapps-extra/qutecom/FrugalBuild +++ b/source/xapps-extra/qutecom/FrugalBuild @@ -13,10 +13,14 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude cmake gnome-scriptlet groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar $url/downloads/" -source=(http://trac.qutecom.org/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('14ff024101d5630726bdb847231ce42ff7e96ad7') +source=(http://trac.qutecom.org/downloads/$pkgname-$pkgver.tar.gz \ + qutecom-2.2-no-deprecated-avcodec-decode-video.patch \ + fixes.patch) +sha1sums=('14ff024101d5630726bdb847231ce42ff7e96ad7' \ + '8ebc432a9a2dc94d1f8d83ea2ac483d4b18173c6' \ + '9b52d1478396221fc8671662e725f82ae716bfe1') build() { Fcd diff --git a/source/xapps-extra/qutecom/fixes.patch b/source/xapps-extra/qutecom/fixes.patch new file mode 100644 index 0000000..89a9fca --- /dev/null +++ b/source/xapps-extra/qutecom/fixes.patch @@ -0,0 +1,11 @@ +diff -ur a/libs/imwrapper/src/purple/PurpleIMFactory.h b/libs/imwrapper/src/purple/PurpleIMFactory.h +--- a/libs/imwrapper/src/purple/PurpleIMFactory.h 2012-05-08 06:27:33.492005629 -0500 ++++ b/libs/imwrapper/src/purple/PurpleIMFactory.h 2012-05-08 06:28:02.751004529 -0500 +@@ -24,7 +24,6 @@ + #include <imwrapper/IMAccount.h> + + #include <glib.h> +-#include <glib/gtypes.h> + + class PurpleAccountMngr; + class PurpleChatMngr; diff --git a/source/xapps-extra/qutecom/qutecom-2.2-no-deprecated-avcodec-decode-video.patch b/source/xapps-extra/qutecom/qutecom-2.2-no-deprecated-avcodec-decode-video.patch new file mode 100644 index 0000000..b8f423b --- /dev/null +++ b/source/xapps-extra/qutecom/qutecom-2.2-no-deprecated-avcodec-decode-video.patch @@ -0,0 +1,18 @@ +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) + { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
