Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=93b4855a3f4eeb8263ee49ef3cd1e1d234828444
commit 93b4855a3f4eeb8263ee49ef3cd1e1d234828444 Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Jan 20 22:26:04 2009 +0100 moonlight-1.0-1-i686 *version bump diff --git a/source/xlib-extra/moonlight/FixFF3svn.diff b/source/xlib-extra/moonlight/FixFF3svn.diff new file mode 100644 index 0000000..ec87044 --- /dev/null +++ b/source/xlib-extra/moonlight/FixFF3svn.diff @@ -0,0 +1,24 @@ +--- moonlightold/configure.ac 2008-12-14 16:12:26.000000000 +0100 ++++ moonlight/configure.ac 2008-12-14 17:16:27.000000000 +0100 +@@ -74,21 +74,7 @@ + with_mozilla=no + + AC_ARG_WITH(ff3,[ --with-ff3=no,yes If you want to enable the xulrunner 1.9 (Firefox 3) bridge],[],[with_ff3=yes]) +-if test x$with_ff3 = xyes; then +- FF3_MODULES="libxul-unstable mozilla-plugin mozilla-js" +- +- PKG_CHECK_EXISTS($FF3_MODULES, +- [with_ff3=yes], +- [with_ff3=no +- ff3_reason="(reason: missing FF3 development packages)"]) + +- if test x$with_ff3 = xyes; then +- AC_DEFINE([HAVE_GECKO_1_9],[1],[Gecko 1.9 support]) +- PKG_CHECK_MODULES(FF3, [$FF3_MODULES glib-2.0]) +- dnl Strip out problem libraries (should already be in process space) +- FF3_LIBS="$(echo $FF3_LIBS | sed -e 's/-lmozjs\|-lplds4\|-lplc4\|-lnspr4//g')" +- fi +-fi + AM_CONDITIONAL(HAVE_GECKO_1_9,test x$with_ff3 = xyes) + + AC_ARG_WITH(ff2,[ --with-ff2=no,yes If you want to enable the xulrunner 1.8.1 (Firefox 2)],[],[with_ff2=yes]) diff --git a/source/xlib-extra/moonlight/FrugalBuild b/source/xlib-extra/moonlight/FrugalBuild index 63c0492..43be485 100644 --- a/source/xlib-extra/moonlight/FrugalBuild +++ b/source/xlib-extra/moonlight/FrugalBuild @@ -9,10 +9,9 @@ # System.ServiceModel.Web.dll # System.ServiceModel.dll USE_DEVEL=${USE_DEVEL:-"n"} +USE_DEVELUNSATBLE=${USE_DEVELUNSATBLE:-"n"} -#For build assemblies mono, don't forget to split when that work fine -#For now we don't build -USE_BUILDMONO=${USE_BUILDMONO:-"n"} +USE_BUILDMONO=${USE_BUILDMONO:-"y"} #for tested mozilla-extension http://go-mono.com/moonlight/MoonlightStatus.aspx #To launch Firefox with shape caching and ffmpeg converters use:" @@ -33,38 +32,41 @@ archs=('i686') subpkgs=("$pkgname-mozilla") subdescs=('moonlight extension for Mozilla') -subdepends=("$pkgname=$pkgver") +subdepends=("moonlight=$pkgver") subgroups=('xlib-extra') subarchs=('i686') if ! Fuse $USE_DEVEL; then _F_archive_name=moon - pkgver=0.8.1 + pkgver=1.0 up2date="lynx -dump ftp://ftp.novell.com/pub/mono/sources/$_F_archive_name/ | Flasttarbz2" source=(ftp://ftp.novell.com/pub/mono/sources/$_F_archive_name/$_F_archive_name-$pkgver.tar.bz2 \ - moonlight-0.8-expat.patch \ - moonlight-0.8-cairo.patch \ - ff3.diff \ - silverlight-ff3-quirks.user.js) - - #delete patch ff3.diff and FF3_XXX when we have xulrunner-1.9 - + FixFF3svn.diff silverlight-ff3-quirks.user.js) Finclude mono - sha1sums=('056201721e7f90a06197ce8cd4747146a29e3500' \ - 'ffd8e1ef10b52f214ee3569fa5eb40882edc334c' \ - 'fce4effcee9a3aea0c198cf2893195ea6080603e' \ - '911b8e6a54fb7c5d96a92452de14fa0632575a01' \ - 'c22294f495294351ae5e2ba3c64797de536d7369') - + sha1sums=('ff37aadf57e2c471608f5d7c6481d27e77e8241a' \ + '06287166bb84689a80a1c9709b4c58dc9b2d2ca3' \ + 'c22294f495294351ae5e2ba3c64797de536d7369') else - pkgver=0.8.2_20082010svn - _F_scm_type="subversion" - _F_scm_url="http://anonsvn.mono-project.com/source/trunk/moon" - Finclude scm mono - _F_cd_path=$pkgname - Finclude mono scm - up2date=$pkgver + if ! Fuse $USE_DEVELUNSATBLE; then + pkgver=0.8.2_svn120125 + _F_scm_type="subversion" + _F_scm_url="http://anonsvn.mono-project.com/source/tags/moon/1.0b1p2" + Finclude scm mono + _F_cd_path=$pkgname + Finclude mono scm + source=($source FixFF3svn1.diff) + #up2date=$pkgver + else + pkgver=0.8.2_svn121479 + _F_scm_type="subversion" + _F_scm_url="http://anonsvn.mono-project.com/source/trunk/moon" + Finclude scm mono + _F_cd_path=$pkgname + Finclude mono scm + source=($source FixFF3svn.diff) + #up2date=$pkgver + fi fi Fconfopts="${fconfop...@]} --disable-libtool-lock --with-cairo=system --with-debug=no \ @@ -75,7 +77,8 @@ Fconfopts="${fconfop...@]} --disable-libtool-lock --with-cairo=system --with-deb --with-pulseaudio=no \ --with-PACKAGE=yes \ --with-cairo=system \ - --with-pixman=system" + --with-pixman=system \ + --with-debug=no" if ! Fuse $USE_BUILDMONO; then Fconfopts="${fconfop...@]} --with-mono=no \ @@ -97,10 +100,19 @@ build() { if Fuse $USE_DEVEL; then Funpack_scm + Fcd + if ! Fuse $USE_DEVELUNSATBLE; then + Fpatch FixFF3svn1.diff + else + Fpatch FixFF3svn.diff + fi + sh ./autogen.sh $Fconfopts || Fdie + else + Fcd + Fpatchall + Fautoreconf fi - Fcd - Fpatchall - Fautoreconf + #For find ffmpeg Fsed "\$(avutil_libdir)/" "/usr/lib/" plugin/install/Makefile.in Fsed "\$(avcodec_libdir)/" "/usr/lib/" plugin/install/Makefile.in _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git