Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d24ec037f3206a4fcbb9084863dc2604c904484
commit 1d24ec037f3206a4fcbb9084863dc2604c904484 Author: crazy <[EMAIL PROTECTED]> Date: Tue Apr 29 18:28:01 2008 +0200 wxsvg-1.0b10-2-x86_64 * release bump * ffmpeg fallout .. diff --git a/source/xlib-extra/wxsvg/FrugalBuild b/source/xlib-extra/wxsvg/FrugalBuild index 993b7b4..e4ed6d6 100644 --- a/source/xlib-extra/wxsvg/FrugalBuild +++ b/source/xlib-extra/wxsvg/FrugalBuild @@ -3,24 +3,27 @@ pkgname=wxsvg pkgver=1.0b10 -pkgrel=1 +pkgrel=2 pkgdesc="wxSVG is C++ library to create, manipulate and render SVG files" _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://www.wxsvg.org/"; -depends=('libart_lgpl' 'libstdc++' 'wxgtk>=2.8.1' 'libxxf86vm' 'expat' 'libxdamage' 'libice' 'ffmpeg') -source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver}.tar.gz) +depends=('libart_lgpl' 'libstdc++' 'wxgtk>=2.8.1' 'libxxf86vm' 'expat' 'libxdamage' 'libice' 'ffmpeg>=20080427-3') +source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver}.tar.gz ffmpeg.patch) groups=('xlib-extra') archs=('i686' 'x86_64') -sha1sums=('e0b7c2ee74051d4538548ab817f7075d71cf9467') +sha1sums=('e0b7c2ee74051d4538548ab817f7075d71cf9467' \ + '56cea1e8a0f80917fd777a8eec8212bef2a5bd74') options=('scriptlet') build() { Fcd + Fpatchall touch NEWS README || Fdie Fautoreconf - Fbuild + Fmake + Fmakeinstall } # optimization OK diff --git a/source/xlib-extra/wxsvg/ffmpeg.patch b/source/xlib-extra/wxsvg/ffmpeg.patch new file mode 100644 index 0000000..2ee30b3 --- /dev/null +++ b/source/xlib-extra/wxsvg/ffmpeg.patch @@ -0,0 +1,26 @@ +diff -Naur wxsvg-1.0b10/configure.in wxsvg-1.0b10-p/configure.in +--- wxsvg-1.0b10/configure.in 2008-01-15 13:59:31.000000000 +0100 ++++ wxsvg-1.0b10-p/configure.in 2008-04-29 18:21:37.000000000 +0200 +@@ -161,7 +161,7 @@ + AC_CHECK_LIB(avformat, av_register_all, [], [AC_MSG_ERROR([*** missing ffmpeg library: libavformat])]) + AC_CHECK_LIB(avcodec, avcodec_decode_audio2, [], [AC_MSG_ERROR([*** missing ffmpeg library: libavcodec])]) + AC_CHECK_LIB(swscale, sws_getContext) +- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([*** missing ffmpeg header file: ffmpeg/avcodec.h.])]) ++ AC_CHECK_HEADERS(libavcodec/avcodec.h, [], [AC_MSG_ERROR([*** missing ffmpeg header file: ffmpeg/avcodec.h.])]) + CXXFLAGS="$CXXFLAGS -DUSE_FFMPEG" + fi + +diff -Naur wxsvg-1.0b10/src/mediadec_ffmpeg.cpp wxsvg-1.0b10-p/src/mediadec_ffmpeg.cpp +--- wxsvg-1.0b10/src/mediadec_ffmpeg.cpp 2008-03-02 19:43:54.000000000 +0100 ++++ wxsvg-1.0b10-p/src/mediadec_ffmpeg.cpp 2008-04-29 18:20:09.000000000 +0200 +@@ -23,8 +23,8 @@ + extern "C" { + #define __STDC_CONSTANT_MACROS + #define __STDC_LIMIT_MACROS +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/swscale.h> ++#include <libavformat/avformat.h> ++#include <libswscale/swscale.h> + } + + wxFfmpegMediaDecoder::wxFfmpegMediaDecoder(): _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
