diff options
85 files changed, 1131 insertions, 3496 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index b4c2ff3af..b109ae0c5 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103111 2013-12-26 13:52:36Z svenstaro $ +# $Id: PKGBUILD 103787 2014-01-11 20:08:18Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad pkgver=a15 _pkgver=0.0.15-alpha -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://play0ad.com/" diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index 8bd2d48a8..d052647f7 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,42 +1,41 @@ -# $Id: PKGBUILD 99199 2013-10-25 12:58:18Z giovanni $ +# $Id: PKGBUILD 103788 2014-01-11 20:08:20Z eric $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: kozec <kozec@kozec.com> # Contributor: Limao Luo <luolimao+AUR@gmail.com> pkgname=aegisub -pkgver=3.0.4 -pkgrel=5 +pkgver=3.1.0 +pkgrel=2 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64') url="http://www.aegisub.org" license=('GPL' 'BSD') -depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') -makedepends=('mesa') +depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk') +makedepends=('boost' 'intltool' 'mesa') install="${pkgname}.install" source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" - 'wxgtk2.9.5.patch') -sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a' - '8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c') + 'aegisub-wx-stl.patch') +sha256sums=('3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987' + '1306b2caf2e192597a99931b4519023ea63b684f330e0838b1152d52b279f6c1') prepare() { - cd ${pkgname}/${pkgname} + cd ${pkgname}-${pkgver} - patch -Np2 -i ../../wxgtk2.9.5.patch + patch -Np1 -i ../aegisub-wx-stl.patch } build() { - cd ${pkgname}/${pkgname} + cd ${pkgname}-${pkgver}/${pkgname} - ./configure --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' + ./configure --prefix='/usr' --without-{portaudio,openal,oss} make } package() { - cd ${pkgname}/${pkgname} + cd ${pkgname}-${pkgver}/${pkgname} make DESTDIR="${pkgdir}" install -# License install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE } diff --git a/community/aegisub/aegisub-wx-stl.patch b/community/aegisub/aegisub-wx-stl.patch new file mode 100644 index 000000000..d174d8308 --- /dev/null +++ b/community/aegisub/aegisub-wx-stl.patch @@ -0,0 +1,61 @@ +From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001 +From: Thomas Goyne <plorkyeran@aegisub.org> +Date: Sun, 5 Jan 2014 08:10:08 -0800 +Subject: [PATCH 1/4] Fix compilation with wx built with --enable-stl + +--enable-stl replaces the implicit conversion to char/wchar_t* with one +to std::[w]string. This breaks conversions to boost::filesytem::path and +makes some ternaries ambiguous (which GCC helpfully reports as no +conversion existing rather than an ambiguous conversion). +--- + aegisub/src/base_grid.cpp | 6 +++--- + aegisub/src/command/video.cpp | 2 +- + aegisub/src/dialog_attachments.cpp | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp +index 9422bf9..4675ad5 100644 +--- a/aegisub/src/base_grid.cpp ++++ b/aegisub/src/base_grid.cpp +@@ -570,9 +570,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx + if (paint_columns[4]) strings[4] = to_wx(line->Style); + if (paint_columns[5]) strings[5] = to_wx(line->Actor); + if (paint_columns[6]) strings[6] = to_wx(line->Effect); +- if (paint_columns[7]) strings[7] = line->Margin[0] ? std::to_wstring(line->Margin[0]) : wxString(); +- if (paint_columns[8]) strings[8] = line->Margin[1] ? std::to_wstring(line->Margin[1]) : wxString(); +- if (paint_columns[9]) strings[9] = line->Margin[2] ? std::to_wstring(line->Margin[2]) : wxString(); ++ if (paint_columns[7]) strings[7] = line->Margin[0] ? wxString(std::to_wstring(line->Margin[0])) : wxString(); ++ if (paint_columns[8]) strings[8] = line->Margin[1] ? wxString(std::to_wstring(line->Margin[1])) : wxString(); ++ if (paint_columns[9]) strings[9] = line->Margin[2] ? wxString(std::to_wstring(line->Margin[2])) : wxString(); + + if (paint_columns[10]) { + strings[10].clear(); +diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp +index 010da90..47bf259 100644 +--- a/aegisub/src/command/video.cpp ++++ b/aegisub/src/command/video.cpp +@@ -476,7 +476,7 @@ static void save_snapshot(agi::Context *c, bool raw) { + // If where ever that is isn't defined, we can't save there + if ((basepath == "\\") || (basepath == "/")) { + // So save to the current user's home dir instead +- basepath = wxGetHomeDir(); ++ basepath = wxGetHomeDir().c_str(); + } + } + // Actual fixed (possibly relative) path, decode it +diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp +index 5465b39..2ff696e 100644 +--- a/aegisub/src/dialog_attachments.cpp ++++ b/aegisub/src/dialog_attachments.cpp +@@ -150,7 +150,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) { + + // Multiple or single? + if (listView->GetNextSelected(i) != -1) +- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())); ++ path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str(); + else { + path = SaveFileSelector( + _("Select the path to save the file to:"), +-- +1.8.5.2 + diff --git a/community/aegisub/wxgtk2.9.5.patch b/community/aegisub/wxgtk2.9.5.patch deleted file mode 100644 index b50fac01b..000000000 --- a/community/aegisub/wxgtk2.9.5.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/aegisub/src/utils.cpp -+++ b/aegisub/src/utils.cpp -@@ -121,8 +121,7 @@ void RestartAegisub() { - config::opt->Flush(); - - #if defined(__WXMSW__) -- wxStandardPaths stand; -- wxExecute("\"" + stand.GetExecutablePath() + "\""); -+ wxExecute("\"" + wxStandardPaths::Get().GetExecutablePath() + "\""); - #elif defined(__WXMAC__) - std::string bundle_path = agi::util::OSX_GetBundlePath(); - std::string helper_path = agi::util::OSX_GetBundleAuxillaryExecutablePath("restart-helper"); -@@ -132,8 +131,7 @@ void RestartAegisub() { - LOG_I("util/restart/exec") << exec; - wxExecute(exec); - #else -- wxStandardPaths stand; -- wxExecute(stand.GetExecutablePath()); -+ wxExecute(wxStandardPaths::Get().GetExecutablePath()); - #endif - } - ---- a/aegisub/src/menu.cpp -+++ b/aegisub/src/menu.cpp -@@ -457,11 +457,11 @@ namespace menu { - window->Bind(wxEVT_COMMAND_MENU_SELECTED, &CommandManager::OnMenuClick, &menu->cm); - window->SetMenuBar(menu.get()); - --#ifdef __WXGTK__ -- // GTK silently swallows keypresses for accelerators whose associated -- // menu items are disabled. As we don't update the menu until it's -- // opened, this means that conditional hotkeys don't work if the menu -- // hasn't been opened since they became valid. -+#if defined(__WXGTK__) && !wxCHECK_VERSION(2, 9, 5) -+ // Older versions of wxGTK silently swallow keypresses for accelerators -+ // whose associated menu items are disabled. As we don't update the -+ // menu until it's opened, this means that conditional hotkeys don't -+ // work if the menu hasn't been opened since they became valid. - // - // To work around this, we completely disable accelerators from menu - // item. wxGTK doesn't expose any way to do this other that at wx diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD index 773b8ee10..08e586013 100644 --- a/community/codeblocks/PKGBUILD +++ b/community/codeblocks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103157 2013-12-28 06:25:03Z bpiotrowski $ +# $Id: PKGBUILD 103790 2014-01-11 20:08:22Z eric $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Robert Hollencamp <rhollencamp@gmail.com> # Contributor: Daniel J Griffiths <griffithsdj@inbox.com> @@ -6,13 +6,13 @@ pkgname=codeblocks pkgver=13.12 -pkgrel=1 +pkgrel=2 pkgdesc='Open source and cross-platform C/C++ IDE' arch=('i686' 'x86_64') url='http://www.codeblocks.org' license=('GPL3') depends=('boost-libs' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache' - 'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk' 'libsm') + 'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk2.8' 'libsm') makedepends=('boost' 'zip') install=codeblocks.install source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}-1.tar.gz) @@ -20,6 +20,7 @@ md5sums=('4b450f620d9f1875ecf6882ab3c11402') build() { cd $pkgname-$pkgver + export WX_CONFIG_PATH=/usr/bin/wx-config-2.8 ./configure --prefix=/usr --with-contrib-plugins=all make } diff --git a/community/dolphin-emu/PKGBUILD b/community/dolphin-emu/PKGBUILD index 1dbe03bb0..bf4b81e48 100644 --- a/community/dolphin-emu/PKGBUILD +++ b/community/dolphin-emu/PKGBUILD @@ -3,7 +3,7 @@ pkgname=dolphin-emu pkgver=4.0.2 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='A Gamecube / Wii / Triforce emulator' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://dolphin-emu.org' license=('GPL2') makedepends=('cmake' 'git' 'opencl-headers') -depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.9') +depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk') optdepends=('pulseaudio: PulseAudio backend') source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}" diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index a0d0a37b2..2a8dd1396 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 102244 2013-12-07 10:36:28Z bpiotrowski $ +# $Id: PKGBUILD 103792 2014-01-11 20:08:25Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b33 -pkgrel=12 +pkgrel=14 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64') url="http://community.electricsheep.org/" license=('GPL') -depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee') +depends=('curl' 'flam3' 'ffmpeg' 'wxgtk' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee') makedepends=('boost' 'mesa' 'glu' 'tinyxml') optdepends=('xscreensaver: to use electricsheep with xscreensaver') options=('!emptydirs') @@ -36,7 +36,6 @@ mksource() { prepare() { cd ${pkgname}-${pkgver} - sed -i 's/wx-config/wx-config-2.9/g' configure.ac sed -i -e 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac sed -i '12 i\ #include <cstdio>' Common/Singleton.h diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index ba84645f5..acdff8c7a 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103465 2014-01-06 12:41:09Z arodseth $ +# $Id: PKGBUILD 103793 2014-01-11 20:08:27Z eric $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -9,7 +9,7 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') pkgver=R16B03 -pkgrel=4 +pkgrel=5 arch=('x86_64' 'i686') url='http://www.erlang.org/' license=('custom') @@ -35,7 +35,7 @@ build() { package_erlang() { pkgdesc='General-purpose concurrent functional programming language developed by Ericsson' - depends=('ncurses' 'glu' 'wxgtk' 'wxgtk2.9' 'openssl') + depends=('ncurses' 'glu' 'wxgtk' 'openssl') optdepends=('erlang-unixodbc: database support' 'java-environment: for Java support' 'lksctp-tools: for SCTP support') diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD index 3d291a8fd..5c891ee70 100644 --- a/community/ettercap/PKGBUILD +++ b/community/ettercap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99738 2013-10-30 23:24:51Z allan $ +# $Id: PKGBUILD 103822 2014-01-11 20:36:36Z bgyorgy $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') pkgver=0.8.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://ettercap.github.com/ettercap/" license=('GPL') @@ -48,25 +48,8 @@ package_ettercap-gtk() { backup=('etc/ettercap/etter.conf') conflicts=('ettercap') provides=('ettercap') - optdepends=('polkit-gnome') - install='ettercap-gtk.install' + optdepends=('polkit: to run ettercap directly from menu') - install -d $pkgdir/usr/share/polkit-1/actions/ cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build make DESTDIR="${pkgdir}" install - -#install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop" -#install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg" - - # Install policy file - #install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy" - - # We need rename the original script - #mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf" - - # Install launcher script - #echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap - #echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap - #chmod 755 ${pkgdir}/usr/bin/ettercap - } diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install deleted file mode 100644 index e8f6bed8f..000000000 --- a/community/ettercap/ettercap-gtk.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo 'If you use a lightweight windowmanager, remember to run' - echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' - echo 'graphical authentication, which may be needed for pkexec to work.' -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 216568378..111957f53 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 95254 2013-08-07 20:59:40Z bluewind $ +# $Id: PKGBUILD 103794 2014-01-11 20:08:28Z eric $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla pkgver=3.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64') url="http://filezilla-project.org/" license=('GPL') -depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite') +depends=('dbus-core' 'xdg-utils' 'wxgtk2.8' 'libidn' 'hicolor-icon-theme' 'sqlite') install=filezilla.install source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2") build() { cd "${pkgname}-${pkgver}" - ./autogen.sh + export WX_CONFIG_PATH='/usr/bin/wx-config-2.8' + export WXRC='/usr/bin/wxrc-2.8' + ./autogen.sh ./configure \ --prefix=/usr \ --disable-manualupdatecheck \ diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 41949824d..15d7eb819 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 100632 2013-11-06 16:42:49Z foutrelis $ +# $Id: PKGBUILD 103779 2014-01-11 14:29:12Z bgyorgy $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=gcompris pkgver=13.11 -pkgrel=1 +pkgrel=2 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64') url="http://gcompris.net/" license=('GPL3') -depends=('pygtk' 'librsvg' 'python2-pysqlite' 'gstreamer0.10-base-plugins') +depends=('pygtk' 'librsvg' 'gstreamer0.10-base-plugins') optdepends=('gnucap: for computer simulation within the electricity activity' 'tuxpaint: for the painting activity') -makedepends=('texinfo' 'texi2html' 'intltool' 'gettext') +makedepends=('texinfo' 'texi2html' 'intltool') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) sha256sums=('418dad2c8f0fc90e16e97ab67b6700e3af5f33ae05d83f28f3b1117183f88c57') @@ -30,7 +30,7 @@ build() { } package() { - depends+=("gcompris-data=$pkgver-$pkgrel") + depends+=("gcompris-data=$pkgver") cd $pkgname-$pkgver make DESTDIR="$pkgdir" install-exec diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD index 852b0ea58..fe03013e1 100644 --- a/community/gsmartcontrol/PKGBUILD +++ b/community/gsmartcontrol/PKGBUILD @@ -2,49 +2,50 @@ pkgname=gsmartcontrol pkgver=0.8.7 -pkgrel=3 +pkgrel=4 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool." arch=('i686' 'x86_64') url="http://gsmartcontrol.berlios.de/home/index.php/en/Home" license=('GPL3') -depends=('smartmontools' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme' 'polkit') -optdepends=('polkit-gnome: to run gsmartcontrol directly from menu') +depends=('smartmontools' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme') +optdepends=('polkit: to run gsmartcontrol directly from menu') install=${pkgname}.install source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2 - org.archlinux.pkexec.gsmartcontrol.policy) + org.archlinux.pkexec.gsmartcontrol.policy + gsmartcontrol_polkit) md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30' - 'e403f8e06e6b8a3d1a99da5e584b2257') + '503989a7e6a9a287d81e91243d03f162' + '33bdda04d8db1525f2507485f3f2a663') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Modify desktop file + sed -i "s|^Exec=.*|Exec="@prefix@/bin/gsmartcontrol_polkit"|" \ + data/gsmartcontrol.desktop.in +} build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install - # We need rename the original binary - mv "${pkgdir}/usr/bin/gsmartcontrol" "${pkgdir}/usr/bin/gsmartcontrol.elf" - # Install launcher script - echo '#!/bin/sh' > ${pkgdir}/usr/bin/gsmartcontrol - echo 'pkexec --disable-internal-agent "/usr/bin/gsmartcontrol.elf" "$@"' \ - >> ${pkgdir}/usr/bin/gsmartcontrol - chmod 755 ${pkgdir}/usr/bin/gsmartcontrol - - # Modify desktop file - sed -i -e "s|^Exec=.*|Exec=/usr/bin/gsmartcontrol|" \ - "${pkgdir}/usr/share/applications/gsmartcontrol.desktop" + install -m755 ${srcdir}/gsmartcontrol_polkit \ + "${pkgdir}/usr/bin/gsmartcontrol_polkit" # Install policy file - install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \ - $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy + install -Dm644 ${srcdir}/org.archlinux.pkexec.gsmartcontrol.policy \ + "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy" } diff --git a/community/gsmartcontrol/gsmartcontrol.desktop b/community/gsmartcontrol/gsmartcontrol.desktop deleted file mode 100644 index e65a26ef6..000000000 --- a/community/gsmartcontrol/gsmartcontrol.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=GSmartControl -GenericName=Hard Disk Health Inspection -Comment=Monitor and control SMART data on hard disks -Icon=gsmartcontrol -Exec=pkexec /usr/bin/gsmartcontrol -Type=Application -Categories=GTK;GNOME;System;Filesystem; diff --git a/community/gsmartcontrol/gsmartcontrol.install b/community/gsmartcontrol/gsmartcontrol.install index f636406f2..b711352cb 100644 --- a/community/gsmartcontrol/gsmartcontrol.install +++ b/community/gsmartcontrol/gsmartcontrol.install @@ -1,14 +1,11 @@ post_install() { which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true - echo 'If you use a lightweight windowmanager, remember to run' - echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' - echo 'graphical authentication, which may be needed for pkexec to work.' } post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + post_install $1 } post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + post_install $1 } diff --git a/community/gsmartcontrol/gsmartcontrol_polkit b/community/gsmartcontrol/gsmartcontrol_polkit new file mode 100644 index 000000000..fa7ec8557 --- /dev/null +++ b/community/gsmartcontrol/gsmartcontrol_polkit @@ -0,0 +1,6 @@ +#!/bin/bash +if [ $(which pkexec) ]; then + pkexec --disable-internal-agent "/usr/bin/gsmartcontrol" "$@" +else + /usr/bin/gsmartcontrol "$@" +fi diff --git a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy index b71db7904..471cd0e86 100644 --- a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy +++ b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy @@ -12,7 +12,7 @@ <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol.elf</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> </action> diff --git a/community/guayadeque/PKGBUILD b/community/guayadeque/PKGBUILD index d720c56b2..cb9cad2a9 100755 --- a/community/guayadeque/PKGBUILD +++ b/community/guayadeque/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 86605 2013-03-20 15:17:37Z alucryd $ +# $Id: PKGBUILD 103795 2014-01-11 20:08:28Z eric $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Sial <sial@cpan.org> # Contributor: Martin Herndl <martin.herndl@gmail.com> pkgname=guayadeque pkgver=0.3.5 -pkgrel=5 +pkgrel=6 pkgdesc="Lightweight music player" arch=('i686' 'x86_64') url="http://guayadeque.org/" license=('GPL3') -depends=('curl' 'dbus' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk') +depends=('curl' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk2.8') makedepends=('cmake') optdepends=('gstreamer0.10-good-plugins: Support for additional file formats' 'gvfs: Support for external devices') @@ -18,17 +18,25 @@ install=$pkgname.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") sha256sums=('8281286a715731b567097238e1c0aaf962e052fbc7e2761b10f36407eb6ec4d5') +prepare() { + cd ${pkgname}-${pkgver}/src + + xgettext -d guayadeque -o guayadeque.pot -C --keyword=_ *.cpp + mv guayadeque.pot ../po +} + build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} + + rm -rf build + mkdir build && cd build -# Build - ./build + cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver}/build -# Install make DESTDIR="${pkgdir}" install } diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index e7c2708ee..ced9c2120 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92569 2013-06-08 18:17:35Z kkeen $ +# $Id: PKGBUILD 103796 2014-01-11 20:08:29Z eric $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Marq Schneider <queueRAM@gmail.com> @@ -6,25 +6,28 @@ pkgname=kicad pkgver=20130518 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} _pkgbzr=4017 -pkgrel=1 +pkgrel=2 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64') url="http://iut-tice.ujf-grenoble.fr/kicad/" license=('GPL') -depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils') +depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm') makedepends=('cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources-stable_${_pkgver}_BZR${_pkgbzr}.zip - kicad-boost-polygon-declare-gtlsort-earlier.patch) + kicad-boost-polygon-declare-gtlsort-earlier.patch + wxgtk3.0.patch) md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79' - 'a2c39704238946e74a5ed0c38326345f') + 'a2c39704238946e74a5ed0c38326345f' + 'ec3e7581c814ca2b76becc7b30a8529f') build() { cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}" patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch" + patch -p1 < "$srcdir/wxgtk3.0.patch" # harmless build blocking error # see https://lists.launchpad.net/kicad-developers/msg07841.html diff --git a/community/kicad/wxgtk3.0.patch b/community/kicad/wxgtk3.0.patch new file mode 100644 index 000000000..532fd5da9 --- /dev/null +++ b/community/kicad/wxgtk3.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/common/edaappl.cpp b/common/edaappl.cpp +--- a/common/edaappl.cpp 2013-03-09 21:07:56.000000000 +0000 ++++ b/common/edaappl.cpp 2014-01-07 07:49:38.984938912 +0000 +@@ -451,7 +451,7 @@ bool EDA_APP::SetBinDir() + + // Linux and Unix + #elif defined(__UNIX__) +- m_BinDir = wxStandardPaths().GetExecutablePath(); ++ m_BinDir = wxStandardPaths::Get().GetExecutablePath(); + #else + m_BinDir = argv[0]; + #endif // __UNIX__ diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 19364319c..09c8ce3ec 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 101328 2013-11-22 17:36:49Z spupykin $ +# $Id: PKGBUILD 103797 2014-01-11 20:08:30Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui pkgver=0.7.65 -pkgrel=1 +pkgrel=5 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') url="http://mediainfo.sourceforge.net" license=('GPL') -depends=('libmediainfo' 'wxgtk') +depends=('libmediainfo' 'wxgtk' 'libsm') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 5f4953b1a..3a6d02234 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101155 2013-11-18 15:23:29Z svenstaro $ +# $Id: PKGBUILD 103798 2014-01-11 20:08:31Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest pkgver=3.9.0 _pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" @@ -14,7 +14,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' ' 'libircclient' 'miniupnpc' 'wxgtk' 'glu') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz") -md5sums=('b599e8a71376640bc0d191d6c92c9073') +md5sums=('0b1a921fcba10fa3fdf9035c64d8adef') build() { cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ diff --git a/community/minicom/PKGBUILD b/community/minicom/PKGBUILD index 42961ce69..420cf919b 100644 --- a/community/minicom/PKGBUILD +++ b/community/minicom/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 102303 2013-12-07 19:40:29Z giovanni $ +# $Id: PKGBUILD 103744 2014-01-11 10:02:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com> pkgname=minicom -pkgver=2.6.2 -pkgrel=2 +pkgver=2.7 +pkgrel=1 pkgdesc="A serial communication program" arch=('i686' 'x86_64') url="http://alioth.debian.org/projects/minicom/" @@ -14,8 +14,8 @@ license=('GPL') depends=('bash') optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols') backup=('etc/minirc.dfl') -source=("https://alioth.debian.org/frs/download.php/file/3869/${pkgname}-${pkgver}.tar.gz") -md5sums=('203c56c4b447f45e2301b0cc4e83da3c') +source=("https://alioth.debian.org/frs/download.php/file/3977/${pkgname}-${pkgver}.tar.gz") +md5sums=('7044ca3e291268c33294f171d426dc2d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 0924e4de8..40834a6ed 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99921 2013-10-31 02:29:03Z allan $ +# $Id: PKGBUILD 103761 2014-01-11 12:23:34Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver -pkgver=0.9.4 -pkgrel=5 +pkgver=0.9.5 +pkgrel=1 pkgdesc='C/C++ debugger for GNOME' arch=('x86_64' 'i686') license=('GPL') @@ -14,7 +14,7 @@ depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gsettings-desk makedepends=('boost' 'intltool' 'itstool') source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") options=('!emptydirs') -sha256sums=('12cc5b6092ba720f2524f59928bee4d736e5e5ffeeffb6fd06f99695f17d683f') +sha256sums=('33590e3964092cabb629a6ba8415786b054702063a944eca5fe4156048baf8d9') build() { cd "$pkgname-$pkgver" diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index 314f4e50f..e94dee04b 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99091 2013-10-24 10:41:34Z spupykin $ +# $Id: PKGBUILD 103799 2014-01-11 20:08:32Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> @@ -6,7 +6,7 @@ pkgname=pgadmin3 pkgver=1.18.1 -pkgrel=3 +pkgrel=7 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64') url="http://www.pgadmin.org" @@ -22,7 +22,7 @@ build() { convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png cd "pgadmin3-${pkgver}" - [ -f Makefile ] || ./configure --prefix=/usr + [ -f Makefile ] || ./configure --prefix=/usr --with-wx-version=3.0 make } diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index 5a38e785c..c04d4263e 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 96184 2013-08-21 12:27:48Z spupykin $ +# $Id: PKGBUILD 103800 2014-01-11 20:08:33Z eric $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alexander Fehr <pizzapunk@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=poedit -pkgver=1.5.7 -pkgrel=4 +pkgver=1.6.3 +pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64') url="http://www.poedit.net/" -license=('custom') -depends=('wxgtk2.9' 'gtkspell' 'db' 'hicolor-icon-theme' 'gettext') -makedepends=('pkgconfig' 'boost') +license=('MIT') +depends=('wxgtk' 'desktop-file-utils' 'lucene++') +makedepends=('boost' 'libsm') install=poedit.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('f5b53ec66a606f088b0aa388595ea5f9') +source=(http://www.poedit.net/dl/poedit-$pkgver.tar.gz) +md5sums=('f58be3cee666d3c586a85c26abba7816') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|Wx/filename.h|wx/filename.h|' src/tm/transmem.cpp +} build() { - cd ${srcdir}/${pkgname}-${pkgver} - export WX_CONFIG_PATH=/usr/bin/wx-config-2.9 - ./configure --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexecdir=/usr/lib/poedit make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index c82d36b9a..408f7dae9 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101735 2013-11-30 16:21:06Z seblu $ +# $Id: PKGBUILD 103783 2014-01-11 19:10:38Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.9.7 +pkgver=1.9.8 pkgrel=1 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' @@ -12,9 +12,10 @@ license=('custom') depends=('glibc' 'libdaemon') arch=('i686' 'x86_64') backup=('etc/radvd.conf') -source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" +source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.xz"{,.asc} "$pkgname.service") -sha1sums=('92f7eadfee951f787e861f41c344689416f3f504' +sha1sums=('69db8ee2e74e2312db482882bb68726f7bbd3477' + 'SKIP' '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc') build() { cd ${pkgname}-${pkgver} diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD index c74e53342..22bcb0eb5 100644 --- a/community/rapidsvn/PKGBUILD +++ b/community/rapidsvn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100277 2013-11-02 08:47:54Z spupykin $ +# $Id: PKGBUILD 103801 2014-01-11 20:08:34Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: AqD <aquila.deus@gmail.com> @@ -6,12 +6,12 @@ pkgname=rapidsvn pkgver=0.12.1 -pkgrel=2 +pkgrel=6 pkgdesc="A cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework." url='http://rapidsvn.tigris.org/' arch=('i686' 'x86_64') license=('GPL') -depends=('subversion' 'wxgtk') +depends=('subversion' 'wxgtk2.8') makedepends=('python2' 'automake' 'libtool') source=(http://www.rapidsvn.org/download/release/$pkgver/rapidsvn-$pkgver.tar.gz $pkgname.desktop) @@ -24,7 +24,10 @@ build() { ./autogen.sh sed -i 's#src/tests/svncpp/Makefile##' configure - [ "$NOEXTRACT" == 1 ] || ./configure --prefix=/usr --with-apu-config="`which apu-1-config`" --with-apr-config="`which apr-1-config`" + [ "$NOEXTRACT" == 1 ] || ./configure --prefix=/usr \ + --with-apu-config="`which apu-1-config`" \ + --with-apr-config="`which apr-1-config`" \ + --with-wx-config="`which wx-config-2.8`" sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/*.py sed -i 's|python|python2|' src/locale/Makefile diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 895426e9b..affb09d7e 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92590 2013-06-09 15:08:48Z stativ $ +# $Id: PKGBUILD 103786 2014-01-11 19:56:49Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=4.0.11 +pkgver=4.0.12 pkgrel=1 epoch=1 pkgdesc="RAW photo editor" @@ -13,10 +13,13 @@ arch=('i686' 'x86_64') url="http://www.rawtherapee.com/" license=('GPL3') depends=('fftw' 'gtkmm' 'libcanberra' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('cmake') +makedepends=('cmake' 'mercurial') +#makedepends=('cmake') install=rawtherapee.install -source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz") -md5sums=('d30a54e6446326d8299c06ec76c281d8') +source=("rawtherapee-$pkgver::hg+https://code.google.com/p/rawtherapee/#tag=$pkgver") +md5sums=('SKIP') +#source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz") +#md5sums=('d30a54e6446326d8299c06ec76c281d8') build() { mkdir "$srcdir/$pkgname-build" diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD index 61bf7cb63..8bee147b4 100644 --- a/community/scorched3d/PKGBUILD +++ b/community/scorched3d/PKGBUILD @@ -5,12 +5,12 @@ pkgname=scorched3d pkgver=43.3.d _pkgver=43.3d -pkgrel=5 +pkgrel=6 pkgdesc="3D artillery combat game" arch=('i686' 'x86_64') url="http://www.scorched3d.co.uk/" license=('GPL') -depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils') +depends=('sdl_net' 'wxgtk2.8' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils') makedepends=('gendesk' 'mesa') install=scorched3d.install source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz" @@ -20,12 +20,16 @@ source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.t 'scorched3d-libpng1.5.patch' 'libpng14.patch') md5sums=('9c3043282a9e7451468ff325bef3b04c' - '0f7e570f586c227873e909ebbc17c84d' + 'cc3217f5b3baa6950a4619aac72d8a75' '053769f77a38c252eef1d967b18e93e6' 'dfde556559d95bca07c4a390c60790b4' 'ec6958191751b5a2c44aa15abfc75269' 'c8c03855fd3693122fd39427fa3638c1') +prepare() { + gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Scorched3d" +} + build() { cd "$srcdir/scorched" @@ -35,13 +39,14 @@ build() { # patch -Np0 -i ${srcdir}/libpng14.patch WANT_WXGTK=gtk2 - sh autogen.sh \ + ./configure \ --prefix=/usr \ --datadir=/usr/share/scorched3d \ --disable-openaltest \ - --with-wx-config=wx-config + --with-wx-config=wx-config-2.8 sed -i '1 i #include <unistd.h>' src/client/client/SecureID.cpp + sed -i 's|freetype/||g' src/launcher/wxdialogs/TrueTypeFont.h src/client/GLEXT/GLFont2dFreeType.h #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1 #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1 @@ -49,10 +54,8 @@ build() { } package() { - cd "$srcdir" - gendesk - cd scorched + make DESTDIR=${pkgdir} install cd .. diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD index d704adebe..d609cafa6 100644 --- a/community/scummvm-tools/PKGBUILD +++ b/community/scummvm-tools/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 90088 2013-05-06 19:39:30Z foutrelis $ +# $Id: PKGBUILD 103803 2014-01-11 20:08:37Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jérémie Dimino <jeremie@dimino.org> # Contributor: Sebastian Hase <sebastian_hase@gmx.de> # Contributor: Joe Davison <joe@thosedamnpeanuts.com> pkgname=scummvm-tools -pkgver=1.4.0 -pkgrel=3 +pkgver=1.6.0 +pkgrel=1 pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM" url="http://www.scummvm.org/" license=('GPL') -depends=('libpng' 'wxgtk' 'flac' 'libvorbis') +depends=('libpng' 'wxgtk2.8' 'flac' 'libvorbis') arch=('i686' 'x86_64') -source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz) -md5sums=('43cbf9f5c4939876cf4149dd59e68044') +source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.bz2) +md5sums=('9a5c74a49707c513e8853004e3a699e4') build() { cd ${pkgname}-${pkgver} + sed -i 's/wxgtk2-2.8-config/wx-config-2.8/' configure ./configure --prefix=/usr make } diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index a21949f6b..78fdfe6b3 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 102279 2013-12-07 10:37:11Z bpiotrowski $ +# $Id: PKGBUILD 103730 2014-01-11 01:37:55Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.95.0 -_pkgver=95.0 -pkgrel=2 +pkgver=0.96.0 +_pkgver=96.0 +pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" @@ -18,7 +18,7 @@ optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('2030100b4c51a1906408aad417a39b1b') +md5sums=('2aeaaed4cf316ea22761efc0ef849a73') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma diff --git a/community/spring/boost-1.50.patch b/community/spring/boost-1.50.patch deleted file mode 100644 index f8a8b5695..000000000 --- a/community/spring/boost-1.50.patch +++ /dev/null @@ -1,2539 +0,0 @@ -diff -ru spring_89.0/rts/Game/Camera/CameraController.cpp /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp ---- spring_89.0/rts/Game/Camera/CameraController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -59,7 +59,7 @@ - bool CCameraController::GetUseDistToGroundForIcons() { - - const float3& dir = GetDir().UnsafeNormalize(); -- const float dot = std::min(1.0f, std::max(0.0f, fabs(dir.dot(UpVector)))); -+ const float dot = std::min(1.0f, std::max(0.0f, math::fabs(dir.dot(UpVector)))); - - if (dot < switchVal) { - // flat angle (typical for first person camera) -diff -ru spring_89.0/rts/Game/Camera/FPSController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp ---- spring_89.0/rts/Game/Camera/FPSController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -80,9 +80,9 @@ - oldHeight = pos.y - gndHeight; - } - -- dir.x = (float)(cos(camera->rot.x) * sin(camera->rot.y)); -- dir.z = (float)(cos(camera->rot.x) * cos(camera->rot.y)); -- dir.y = (float)(sin(camera->rot.x)); -+ dir.x = (float)(math::cos(camera->rot.x) * math::sin(camera->rot.y)); -+ dir.z = (float)(math::cos(camera->rot.x) * math::cos(camera->rot.y)); -+ dir.y = (float)(math::sin(camera->rot.x)); - dir.ANormalize(); - } - -diff -ru spring_89.0/rts/Game/Camera/FreeController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp ---- spring_89.0/rts/Game/Camera/FreeController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -51,9 +51,9 @@ - dir = float3(0.0f, -2.0f, -1.0f); - dir.ANormalize(); - if (camera) { -- const float hDist = sqrt((dir.x * dir.x) + (dir.z * dir.z)); -- camera->rot.y = atan2(dir.x, dir.z); -- camera->rot.x = atan2(dir.y, hDist); -+ const float hDist = math::sqrt((dir.x * dir.x) + (dir.z * dir.z)); -+ camera->rot.y = math::atan2(dir.x, dir.z); -+ camera->rot.x = math::atan2(dir.y, hDist); - } - pos -= (dir * 1000.0f); - -@@ -84,14 +84,14 @@ - - // lock the view direction to the target - const float3 diff(trackPos - pos); -- const float rads = atan2(diff.x, diff.z); -+ const float rads = math::atan2(diff.x, diff.z); - camera->rot.y = rads; - - const float len2D = diff.Length2D(); -- if (fabs(len2D) <= 0.001f) { -+ if (math::fabs(len2D) <= 0.001f) { - camera->rot.x = 0.0f; - } else { -- camera->rot.x = atan2((trackPos.y - pos.y), len2D); -+ camera->rot.x = math::atan2((trackPos.y - pos.y), len2D); - } - - camera->UpdateForward(); -@@ -130,11 +130,11 @@ - if (pos.y < (gndHeight + gndOffset + 1.0f)) { - float3 hDir; - hDir.y = 0.0f; -- hDir.x = (float)sin(camera->rot.y); -- hDir.z = (float)cos(camera->rot.y); -+ hDir.x = (float)math::sin(camera->rot.y); -+ hDir.z = (float)math::cos(camera->rot.y); - const float3 gndNormal = ground->GetSmoothNormal(pos.x, pos.z, false); - const float dot = gndNormal.dot(hDir); -- const float gndRotX = (float)acos(dot) - (PI * 0.5f); -+ const float gndRotX = (float)math::acos(dot) - (PI * 0.5f); - const float rotXdiff = (gndRotX - camera->rot.x); - autoTiltVel = (autoTilt * rotXdiff); - } -@@ -214,8 +214,8 @@ - // convert the angular velocity into its positional change - const float3 diff2 = (pos - trackPos); - const float deltaRad = (avel.y * ft); -- const float cos_val = cos(deltaRad); -- const float sin_val = sin(deltaRad); -+ const float cos_val = math::cos(deltaRad); -+ const float sin_val = math::sin(deltaRad); - pos.x = trackPos.x + ((cos_val * diff2.x) + (sin_val * diff2.z)); - pos.z = trackPos.z + ((cos_val * diff2.z) - (sin_val * diff2.x)); - } -@@ -246,7 +246,7 @@ - if (pos.y < minHeight) { - pos.y = minHeight; - if (gndLock) { -- vel.y = min(fabs(scrollSpeed), ((minHeight - prevPos.y) / ft)); -+ vel.y = min(math::fabs(scrollSpeed), ((minHeight - prevPos.y) / ft)); - } else { - vel.y = 0.0f; - } -@@ -263,7 +263,7 @@ - camera->rot.x = -xRotLimit; - avel.x = 0.0f; - } -- camera->rot.y = fmod(camera->rot.y, PI * 2.0f); -+ camera->rot.y = math::fmod(camera->rot.y, PI * 2.0f); - - // setup for the next loop - prevVel = vel; -@@ -277,9 +277,9 @@ - float3 CFreeController::GetDir() const - { - float3 dir; -- dir.x = (float)(sin(camera->rot.y) * cos(camera->rot.x)); -- dir.z = (float)(cos(camera->rot.y) * cos(camera->rot.x)); -- dir.y = (float)(sin(camera->rot.x)); -+ dir.x = (float)(math::sin(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.z = (float)(math::cos(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.y = (float)(math::sin(camera->rot.x)); - dir.ANormalize(); - return dir; - } -@@ -373,7 +373,7 @@ - if ((yDiff * dir.y) >= 0.0f) { - pos = float3(newPos.x, h, newPos.z); - } else { -- pos = target - (dir * fabs(yDiff / dir.y)); -+ pos = target - (dir * math::fabs(yDiff / dir.y)); - } // FIXME - /* - const float oldPosY = pos.y; -diff -ru spring_89.0/rts/Game/Camera/OrbitController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp ---- spring_89.0/rts/Game/Camera/OrbitController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -51,8 +51,8 @@ - const float3 w = (v / v.Length()); // do not normalize v in-place - - const float d = v.Length(); -- const float e = RAD2DEG(acos(v.Length2D() / d)); -- const float r = RAD2DEG(acos(w.x)); -+ const float e = RAD2DEG(math::acos(v.Length2D() / d)); -+ const float r = RAD2DEG(math::acos(w.x)); - - distance = cDistance = d; - elevation = cElevation = e; -@@ -251,12 +251,12 @@ - float tx = cx; - - tx = cx; -- cx = cx * cos(beta) + cy * sin(beta); -- cy = tx * sin(beta) + cy * cos(beta); -+ cx = cx * math::cos(beta) + cy * math::sin(beta); -+ cy = tx * math::sin(beta) + cy * math::cos(beta); - - tx = cx; -- cx = cx * cos(gamma) - cz * sin(gamma); -- cz = tx * sin(gamma) + cz * cos(gamma); -+ cx = cx * math::cos(gamma) - cz * math::sin(gamma); -+ cz = tx * math::sin(gamma) + cz * math::cos(gamma); - - return float3(cx, cy, cz); - } -diff -ru spring_89.0/rts/Game/Camera/OverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp ---- spring_89.0/rts/Game/Camera/OverheadController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -52,7 +52,7 @@ - move.x = -move.x; - move.y = -move.y; - } -- move *= sqrt(move.z) * 200; -+ move *= math::sqrt(move.z) * 200; - - pos.x += move.x * pixelSize * 2.0f * scrollSpeed; - pos.z -= move.y * pixelSize * 2.0f * scrollSpeed; -diff -ru spring_89.0/rts/Game/Camera/RotOverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp ---- spring_89.0/rts/Game/Camera/RotOverheadController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -29,7 +29,7 @@ - - void CRotOverheadController::KeyMove(float3 move) - { -- move *= sqrt(move.z) * 400; -+ move *= math::sqrt(move.z) * 400; - - float3 flatForward = camera->forward; - if(camera->forward.y < -0.9f) -@@ -68,9 +68,9 @@ - - void CRotOverheadController::UpdateVectors() - { -- dir.x=(float)(sin(camera->rot.y) * cos(camera->rot.x)); -- dir.y=(float)(sin(camera->rot.x)); -- dir.z=(float)(cos(camera->rot.y) * cos(camera->rot.x)); -+ dir.x=(float)(math::sin(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.y=(float)(math::sin(camera->rot.x)); -+ dir.z=(float)(math::cos(camera->rot.y) * math::cos(camera->rot.x)); - dir.ANormalize(); - - pos.x = Clamp(pos.x, 0.01f, gs->mapx * SQUARE_SIZE - 0.01f); -diff -ru spring_89.0/rts/Game/Camera/SmoothController.cpp /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp ---- spring_89.0/rts/Game/Camera/SmoothController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -55,7 +55,7 @@ - move.y = -move.y; - } - -- move *= sqrt(move.z) * 200.0f; -+ move *= math::sqrt(move.z) * 200.0f; - - const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed); - -@@ -103,7 +103,7 @@ - move.x = -move.x; - move.y = -move.y; - } -- move *= sqrt(move.z) * 200.0f; -+ move *= math::sqrt(move.z) * 200.0f; - - const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed); - -diff -ru spring_89.0/rts/Game/Camera/TWController.cpp /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp ---- spring_89.0/rts/Game/Camera/TWController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -35,7 +35,7 @@ - flatForward.y=0; - flatForward.ANormalize(); - -- move *= sqrt(move.z) * 200; -+ move *= math::sqrt(move.z) * 200; - pos += (camera->right * move.x + flatForward * move.y) * scrollSpeed; - UpdateVectors(); - } -@@ -79,9 +79,9 @@ - - camera->rot.x = Clamp(camera->rot.x, -PI * 0.4f, -0.1f); - -- dir.x = sin(camera->rot.y) * cos(camera->rot.x); -- dir.y = sin(camera->rot.x); -- dir.z = cos(camera->rot.y) * cos(camera->rot.x); -+ dir.x = math::sin(camera->rot.y) * math::cos(camera->rot.x); -+ dir.y = math::sin(camera->rot.x); -+ dir.z = math::cos(camera->rot.y) * math::cos(camera->rot.x); - dir.ANormalize(); - } - -diff -ru spring_89.0/rts/Game/Camera.cpp /home/svenstaro/src/spring/rts/Game/Camera.cpp ---- spring_89.0/rts/Game/Camera.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -89,7 +89,7 @@ - up.UnsafeANormalize(); - - const float aspect = globalRendering->aspectRatio; -- const float viewx = tan(aspect * halfFov); -+ const float viewx = math::tan(aspect * halfFov); - const float viewy = tanHalfFov; - - if (globalRendering->viewSizeY <= 0) { -@@ -218,9 +218,9 @@ - - void CCamera::UpdateForward() - { -- forward.z = cos(rot.y) * cos(rot.x); -- forward.x = sin(rot.y) * cos(rot.x); -- forward.y = sin(rot.x); -+ forward.z = math::cos(rot.y) * math::cos(rot.x); -+ forward.x = math::sin(rot.y) * math::cos(rot.x); -+ forward.y = math::sin(rot.x); - forward.Normalize(); - } - -@@ -229,7 +229,7 @@ - { - fov = myfov; - halfFov = (fov * 0.5f) * (PI / 180.f); -- tanHalfFov = tan(halfFov); -+ tanHalfFov = math::tan(halfFov); - } - - -@@ -330,7 +330,7 @@ - float3 pInt; - - // prevent DIV0 when calculating line.dir -- if (fabs(xdir.z) < 0.001f) -+ if (math::fabs(xdir.z) < 0.001f) - xdir.z = 0.001f; - - if (ydir.y != 0.0f) { -diff -ru spring_89.0/rts/Game/CameraHandler.cpp /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp ---- spring_89.0/rts/Game/CameraHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -139,7 +139,7 @@ - cameraTimeLeft = std::max(0.0f, (cameraTimeLeft - globalRendering->lastFrameTime)); - const float nextTime = cameraTimeLeft; - const float exp = cameraTimeExponent; -- const float ratio = 1.0f - (float)pow((nextTime / currTime), exp); -+ const float ratio = 1.0f - (float)math::pow((nextTime / currTime), exp); - - const float deltaFOV = wantedCamFOV - camera->GetFov(); - const float3 deltaPos = wantedCamPos - camera->pos; -diff -ru spring_89.0/rts/Game/GameServer.cpp /home/svenstaro/src/spring/rts/Game/GameServer.cpp ---- spring_89.0/rts/Game/GameServer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/GameServer.cpp 2012-07-13 06:34:42.936060485 +0200 -@@ -253,7 +253,7 @@ - // Something in CGameServer::CGameServer borks the FPU control word - // maybe the threading, or something in CNet::InitServer() ?? - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - } - -diff -ru spring_89.0/rts/Game/SelectedUnitsAI.cpp /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp ---- spring_89.0/rts/Game/SelectedUnitsAI.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp 2012-07-13 06:34:43.086060494 +0200 -@@ -179,7 +179,7 @@ - const float3 sideDir = frontdir.cross(UpVector); - - // calculate so that the units form in an aproximate square -- float length = 100.0f + (sqrt((float)nbrOfSelectedUnits) * 32.0f); -+ float length = 100.0f + (math::sqrt((float)nbrOfSelectedUnits) * 32.0f); - - // push back some extra params so it confer with a front move - c.params.push_back(pos.x + (sideDir.x * length)); -diff -ru spring_89.0/rts/Game/TraceRay.cpp /home/svenstaro/src/spring/rts/Game/TraceRay.cpp ---- spring_89.0/rts/Game/TraceRay.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/TraceRay.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -75,7 +75,7 @@ - if (closeFlatLength > length) - closeFlatLength = length; - -- if (fabs(linear - quadratic * closeFlatLength) < 0.15f) { -+ if (math::fabs(linear - quadratic * closeFlatLength) < 0.15f) { - // relatively flat region -> use approximation - dif.y -= (linear + quadratic * closeFlatLength) * closeFlatLength; - -diff -ru spring_89.0/rts/Game/UI/EndGameBox.cpp /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp ---- spring_89.0/rts/Game/UI/EndGameBox.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -29,11 +29,11 @@ - - if (num == 0) { - sprintf(c, "0"); -- } else if (fabs(num) < 10 * mul) { -+ } else if (math::fabs(num) < 10 * mul) { - sprintf(c, "%.1f", num); -- } else if (fabs(num) < 10000 * mul) { -+ } else if (math::fabs(num) < 10000 * mul) { - sprintf(c, "%.0f", num); -- } else if (fabs(num) < 10000000 * mul) { -+ } else if (math::fabs(num) < 10000000 * mul) { - sprintf(c, "%.0fk", num / 1000); - } else { - sprintf(c, "%.0fM", num / 1000000); -@@ -165,7 +165,7 @@ - if (dispMode > 0 ) { - if ((mx > (box.x1 + 0.01f)) && (mx < (box.x1 + 0.12f)) && - (my < (box.y1 + 0.57f)) && (my > (box.y1 + 0.571f - stats.size()*0.02f))) { -- int sel = (int) floor(-(my - box.y1 - 0.57f) * 50); -+ int sel = (int) math::floor(-(my - box.y1 - 0.57f) * 50); - - if (button == 1) { - stat1 = sel; -@@ -341,7 +341,7 @@ - - if ((mx > box.x1 + 0.01f) && (mx < box.x1 + 0.12f) && - (my < box.y1 + 0.57f) && (my > box.y1 + 0.571f - (stats.size() * 0.02f))) { -- const int sel = (int) floor(50 * -(my - box.y1 - 0.57f)); -+ const int sel = (int) math::floor(50 * -(my - box.y1 - 0.57f)); - - glColor4f(0.7f, 0.2f, 0.2f, guiAlpha); - glDisable(GL_TEXTURE_2D); -diff -ru spring_89.0/rts/Game/UI/EndGameBox.h /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h ---- spring_89.0/rts/Game/UI/EndGameBox.h 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h 2012-07-13 06:34:43.066060493 +0200 -@@ -60,8 +60,8 @@ - if (team >= 0 && static_cast<size_t>(team) >= values.size()) { - values.resize(team + 1); - } -- if (values[team].size() > 0 && fabs(value-values[team].back()) > maxdif) { -- maxdif = fabs(value-values[team].back()); -+ if (values[team].size() > 0 && math::fabs(value-values[team].back()) > maxdif) { -+ maxdif = math::fabs(value-values[team].back()); - } - - values[team].push_back(value); -diff -ru spring_89.0/rts/Game/UI/MouseCursor.cpp /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp ---- spring_89.0/rts/Game/UI/MouseCursor.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -355,7 +355,7 @@ - return; - } - -- animTime = fmod(animTime + globalRendering->lastFrameTime, animPeriod); -+ animTime = math::fmod(animTime + globalRendering->lastFrameTime, animPeriod); - - if (animTime < frames[currentFrame].startTime) { - currentFrame = 0; -diff -ru spring_89.0/rts/Game/UI/ResourceBar.cpp /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp ---- spring_89.0/rts/Game/UI/ResourceBar.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -48,11 +48,11 @@ - - if (num == 0) - sprintf(c, "0"); -- if ( fabs(num) < (10 * mul)) { -+ if ( math::fabs(num) < (10 * mul)) { - sprintf(c, "%.1f", num); -- } else if (fabs(num) < (10000 * mul)) { -+ } else if (math::fabs(num) < (10000 * mul)) { - sprintf(c, "%.0f", num); -- } else if (fabs(num) < (10000000 * mul)) { -+ } else if (math::fabs(num) < (10000000 * mul)) { - sprintf(c, "%.0fk", num / 1000); - } else { - sprintf(c, "%.0fM", num / 1000000); -@@ -180,11 +180,11 @@ - - smallFont->SetTextColor(1.0f, 0.3f, 0.3f, 1.0f); // Expenses - smallFont->glFormat(metalx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)", -- FloatToSmallString(fabs(myTeam->prevMetalPull)).c_str(), -- FloatToSmallString(fabs(myTeam->metalSent)).c_str()); -+ FloatToSmallString(math::fabs(myTeam->prevMetalPull)).c_str(), -+ FloatToSmallString(math::fabs(myTeam->metalSent)).c_str()); - smallFont->glFormat(energyx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)", -- FloatToSmallString(fabs(myTeam->prevEnergyPull)).c_str(), -- FloatToSmallString(fabs(myTeam->energySent)).c_str()); -+ FloatToSmallString(math::fabs(myTeam->prevEnergyPull)).c_str(), -+ FloatToSmallString(math::fabs(myTeam->energySent)).c_str()); - - smallFont->SetTextColor(0.4f, 1.0f, 0.4f, 0.95f); // Income - smallFont->glFormat(metalx + 0.044f, box.y2 - 2*globalRendering->pixelY, labelsFontSize, FONT_ASCENDER | fontOptions, "+%s", -diff -ru spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp ---- spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -367,9 +367,9 @@ - camera->rot.x=-1; - - float3 wantedCamDir; -- wantedCamDir.x=(float)(sin(camera->rot.y)*cos(camera->rot.x)); -- wantedCamDir.y=(float)(sin(camera->rot.x)); -- wantedCamDir.z=(float)(cos(camera->rot.y)*cos(camera->rot.x)); -+ wantedCamDir.x=(float)(math::sin(camera->rot.y)*math::cos(camera->rot.x)); -+ wantedCamDir.y=(float)(math::sin(camera->rot.x)); -+ wantedCamDir.z=(float)(math::cos(camera->rot.y)*math::cos(camera->rot.x)); - wantedCamDir.ANormalize(); - - camHandler->GetCurrentController().SetPos(sel->pos - wantedCamDir*800); -diff -ru spring_89.0/rts/Game/UI/UnitTracker.cpp /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp ---- spring_89.0/rts/Game/UI/UnitTracker.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -297,8 +297,8 @@ - modPlanePos.y = minHeight; - } - -- trackPos += (modPlanePos - trackPos) * (1 - pow(0.95f, deltaTime)); -- trackDir += (u->frontdir - trackDir) * (1 - pow(0.90f, deltaTime)); -+ trackPos += (modPlanePos - trackPos) * (1 - math::pow(0.95f, deltaTime)); -+ trackDir += (u->frontdir - trackDir) * (1 - math::pow(0.90f, deltaTime)); - trackDir.ANormalize(); - - camera->pos = trackPos; -diff -ru spring_89.0/rts/lib/gml/gmlsrv.h /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h ---- spring_89.0/rts/lib/gml/gmlsrv.h 2012-07-10 00:10:09.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h 2012-07-13 06:34:43.209393834 +0200 -@@ -361,7 +361,7 @@ - if (gmlShareLists) { - ogc[thr]->WorkerThreadPost(); - } -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - while(dorun) { - gmlClientSub(); - } -@@ -452,7 +452,7 @@ - Threading::SetThreadName("sim"); - Watchdog::RegisterThread(WDT_SIM, true); - set_threadnum(GML_SIM_THREAD_NUM); -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - while(dorun) { - gmlClientAuxSub(); - } -diff -ru spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp ---- spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp 2012-07-10 00:10:09.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp 2012-07-13 06:35:00.626061514 +0200 -@@ -12,10 +12,16 @@ - extern "C" { - #endif - -+#if (BOOST_VERSION >= 105000) //boost 1.50 renamed TIME_UTC to TIME_UTC_ -+ #define SPRING_UTCTIME boost::TIME_UTC_ -+#else -+ #define SPRING_UTCTIME boost::TIME_UTC -+#endif -+ - int stub_sdl_getSystemMilliSeconds() { - - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, SPRING_UTCTIME); - const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000); - return milliSeconds; - } -@@ -23,7 +29,7 @@ - void stub_sdl_sleepMilliSeconds(int milliSeconds) { - - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, SPRING_UTCTIME); - t.nsec += 1000000 * milliSeconds; - boost::thread::sleep(t); - } -diff -ru spring_89.0/rts/lib/streflop/streflopC.cpp /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp ---- spring_89.0/rts/lib/streflop/streflopC.cpp 2012-07-10 00:10:10.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -9,16 +9,16 @@ - #endif - - void streflop_init_Simple() { -- streflop_init<Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void streflop_init_Double() { -- streflop_init<Double>(); -+ streflop::streflop_init<streflop::Double>(); - } - - #if defined(Extended) - void streflop_init_Extended() { -- streflop_init<Extended>(); -+ streflop::streflop_init<streflop::Extended>(); - } - #endif // defined(Extended) - -diff -ru spring_89.0/rts/lib/streflop/streflop_cond.h /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h ---- spring_89.0/rts/lib/streflop/streflop_cond.h 2012-07-10 00:10:10.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h 2012-07-13 06:34:42.906060483 +0200 -@@ -11,8 +11,6 @@ - - #if defined(STREFLOP_X87) || defined(STREFLOP_SSE) || defined(STREFLOP_SOFT) - #include "streflop.h" --using namespace streflop; -- - namespace math { - using namespace streflop; - } -@@ -20,6 +18,7 @@ - #include <cmath> - namespace math { - using std::fabs; -+ // We are using fastmath::sqrt_sse instead! - // using std::sqrt; - using std::sin; - using std::cos; -diff -ru spring_89.0/rts/Map/BasicMapDamage.cpp /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp ---- spring_89.0/rts/Map/BasicMapDamage.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -33,7 +33,7 @@ - - for (int a = 0; a <= CRATER_TABLE_SIZE; ++a) { - const float r = a / float(CRATER_TABLE_SIZE); -- const float d = cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * cos(std::max(0.0f, r * 3 - 2) * PI)); -+ const float d = math::cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * math::cos(std::max(0.0f, r * 3 - 2) * PI)); - craterTable[a] = d; - } - -@@ -83,7 +83,7 @@ - const float* curHeightMap = readmap->GetCornerHeightMapSynced(); - const float* orgHeightMap = readmap->GetOriginalHeightMapSynced(); - const unsigned char* typeMap = readmap->GetTypeMapSynced(); -- const float baseStrength = -pow(strength, 0.6f) * 3 / mapHardness; -+ const float baseStrength = -math::pow(strength, 0.6f) * 3 / mapHardness; - const float invRadius = 1.0f / radius; - - for (int y = e->y1; y <= e->y2; ++y) { -@@ -111,7 +111,7 @@ - orgHeightMap[y * gs->mapxp1 + x]; - - if (prevDif * dif > 0.0f) { -- dif /= fabs(prevDif) * 0.1f + 1; -+ dif /= math::fabs(prevDif) * 0.1f + 1; - } - - e->squares.push_back(dif); -@@ -148,7 +148,7 @@ - orgHeightMap[z * gs->mapxp1 + x]; - - if (prevDif * dif > 0.0f) { -- dif /= fabs(prevDif) * 0.1f + 1; -+ dif /= math::fabs(prevDif) * 0.1f + 1; - } - - totalDif += dif; -diff -ru spring_89.0/rts/Map/Ground.cpp /home/svenstaro/src/spring/rts/Map/Ground.cpp ---- spring_89.0/rts/Map/Ground.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/Ground.cpp 2012-07-13 06:34:43.086060494 +0200 -@@ -433,8 +433,8 @@ - - float3 CGround::GetSmoothNormal(float x, float y, bool synced) const - { -- int sx = (int) floor(x / SQUARE_SIZE); -- int sy = (int) floor(y / SQUARE_SIZE); -+ int sx = (int) math::floor(x / SQUARE_SIZE); -+ int sy = (int) math::floor(y / SQUARE_SIZE); - - if (sy < 1) - sy = 1; -diff -ru spring_89.0/rts/Map/SM3/Plane.cpp /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp ---- spring_89.0/rts/Map/SM3/Plane.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -15,7 +15,7 @@ - a = ry1*rz2 - ry2*rz1; - b = rz1*rx2 - rz2*rx1; - c = rx1*ry2 - rx2*ry1; -- float len = (float)sqrt(a*a + b*b + c*c); -+ float len = (float)math::sqrt(a*a + b*b + c*c); - a /= len; - b /= len; - c /= len; -@@ -37,10 +37,10 @@ - bool Plane::EpsilonCompare(const Plane& pln, float epsilon) - { - Plane t; -- t.a = fabs(a - pln.a); -- t.b = fabs(b - pln.b); -- t.c = fabs(c - pln.c); -- t.d = fabs(d - pln.d); -+ t.a = math::fabs(a - pln.a); -+ t.b = math::fabs(b - pln.b); -+ t.c = math::fabs(c - pln.c); -+ t.d = math::fabs(d - pln.d); - if (t.a > epsilon || t.b > epsilon || t.c > epsilon || t.d > epsilon) { - return false; - } -diff -ru spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp ---- spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -197,7 +197,7 @@ - continue; - } - -- float len = sqrt(dx*dx + dy*dy); -+ float len = math::sqrt(dx*dx + dy*dy); - const float step = 5.0f; - float invLength2d = step / len; - dx *= invLength2d; -diff -ru spring_89.0/rts/Map/SM3/terrain/Textures.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp ---- spring_89.0/rts/Map/SM3/terrain/Textures.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -248,7 +248,7 @@ - } - - // flatness=dotproduct of surface normal with up vector -- float slope = 1.0f - fabs(norm_y); -+ float slope = 1.0f - math::fabs(norm_y); - - if (slope < gi->minSlope - gi->minSlopeFuzzy) { - bm->at(x,y) = 0.0f; -@@ -307,7 +307,7 @@ - Vector3 n; - - if (sx*sx + sy*sy < 32*32) { -- const int sz = (int)sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy)); -+ const int sz = (int)math::sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy)); - n = Vector3(sx, sy, sz); - n.ANormalize(); - } -diff -ru spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp ---- spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -99,7 +99,7 @@ - const int minz = bty * smfReadMap->bigTexSize; - const int maxz = minz + smfReadMap->bigTexSize; - const float miny = readmap->currMinHeight; -- const float maxy = fabs(cam->pos.y); -+ const float maxy = math::fabs(cam->pos.y); - - const float3 mins( 0, miny, minz); - const float3 maxs(smfReadMap->mapSizeX, maxy, maxz); -diff -ru spring_89.0/rts/Map/SMF/ROAM/Patch.cpp /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp ---- spring_89.0/rts/Map/SMF/ROAM/Patch.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -405,7 +405,7 @@ - - // Variance of this triangle is the actual height at it's hypotenuse midpoint minus the interpolated height. - // Use values passed on the stack instead of re-accessing the Height Field. -- float myVariance = fabs(centerZ - ((leftZ + rightZ) / 2)); -+ float myVariance = math::fabs(centerZ - ((leftZ + rightZ) / 2)); - - if (leftZ*rightZ<0 || leftZ*centerZ<0 || rightZ*centerZ<0) - myVariance = std::max(myVariance * 1.5f, 20.0f); //shore lines get more variance for higher accuracy -diff -ru spring_89.0/rts/Map/SMF/SMFRenderState.cpp /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp ---- spring_89.0/rts/Map/SMF/SMFRenderState.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -385,7 +385,7 @@ - smfShaderCurrARB->SetUniformTarget(GL_VERTEX_PROGRAM_ARB); - smfShaderCurrARB->SetUniform4f(10, 1.0f / (gs->pwr2mapx * SQUARE_SIZE), 1.0f / (gs->pwr2mapy * SQUARE_SIZE), 0, 1); - smfShaderCurrARB->SetUniform4f(12, 1.0f / smfMap->bigTexSize, 1.0f / smfMap->bigTexSize, 0, 1); -- smfShaderCurrARB->SetUniform4f(13, -floor(camera->pos.x * 0.02f), -floor(camera->pos.z * 0.02f), 0, 0); -+ smfShaderCurrARB->SetUniform4f(13, -math::floor(camera->pos.x * 0.02f), -math::floor(camera->pos.z * 0.02f), 0, 0); - smfShaderCurrARB->SetUniform4f(14, 0.02f, 0.02f, 0, 1); - smfShaderCurrARB->SetUniformTarget(GL_FRAGMENT_PROGRAM_ARB); - smfShaderCurrARB->SetUniform4f(10, ambientColor.x, ambientColor.y, ambientColor.z, 1); -diff -ru spring_89.0/rts/Rendering/Env/AdvSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp ---- spring_89.0/rts/Rendering/Env/AdvSky.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -65,8 +65,8 @@ - memset(thicknessTransform, 0, 1024); - memset(covers, 0, 4 * 32 * sizeof(float)); - -- domeheight = cos(PI / 16) * 1.01f; -- domeWidth = sin(2 * PI / 32) * 400 * 1.7f; -+ domeheight = math::cos(PI / 16) * 1.01f; -+ domeWidth = math::sin(2 * PI / 32) * 400 * 1.7f; - - UpdateSkyDir(); - InitSun(); -@@ -383,7 +383,7 @@ - case 0: { - for(int a=0; a<CLOUD_DETAIL; a++) { - float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a))); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - if(fade>1) { - fade = 2 - fade; - if(!cloudDown[a]) { -@@ -417,11 +417,11 @@ - int qcda=(4<<CLOUD_DETAIL)>>a; - int *pkernel=kernel; - for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) { -- float ydist=fabs(1.0f+y-cs8a)/cs8a; -+ float ydist=math::fabs(1.0f+y-cs8a)/cs8a; - ydist=ydist*ydist*(3-2*ydist); - int *pkrn=pkernel; - for(int x=0; x<cs4a; ++x) { -- float xdist=fabs(1.0f+x-cs8a)/cs8a; -+ float xdist=math::fabs(1.0f+x-cs8a)/cs8a; - xdist=xdist*xdist*(3-2*xdist); - - float contrib=(1-xdist)*(1-ydist); -@@ -533,7 +533,7 @@ - unsigned char *tt=thicknessTransform; - for(int a=0;a<1024;++a){ - float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f; -- float alpha=pow(f*2,3); -+ float alpha=math::pow(f*2,3); - if(alpha>1) - alpha=1; - *at=(int) (alpha*255); -@@ -560,11 +560,11 @@ - - float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256; - float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f; -- int baseY=int(floor(fy))&CLOUD_MASK; -- fy-=floor(fy); -+ int baseY=int(math::floor(fy))&CLOUD_MASK; -+ fy-=math::floor(fy); - float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f; -- int baseX=int(floor(fx))&CLOUD_MASK; -- fx-=floor(fx); -+ int baseX=int(math::floor(fx))&CLOUD_MASK; -+ fx-=math::floor(fx); - - float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3]; - if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){ -@@ -622,8 +622,8 @@ - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE); - glBegin(GL_TRIANGLE_STRIP); - for(int x=0;x<257;++x){ -- float dx = sin(x*2*PI/256.0f); -- float dy = cos(x*2*PI/256.0f); -+ float dx = math::sin(x*2*PI/256.0f); -+ float dy = math::cos(x*2*PI/256.0f); - - glTexCoord2f(x/256.0f,0.125f); - glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f); -@@ -646,7 +646,7 @@ - mem[(y*128+x)*4+0]=255; - mem[(y*128+x)*4+1]=255; - mem[(y*128+x)*4+2]=255; -- float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); -+ float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); - if(dist>60) - mem[(y*128+x)*4+3]=0; - else -@@ -749,7 +749,7 @@ - - for(int a=0;a<5;++a){ - float fade = gs->frameNum / float(30<<a); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - int size = std::min(32,256>>a); - - if(fade>1){ -@@ -770,7 +770,7 @@ - - } - float tSize = std::max(1,8>>a); -- float c = pow(2.0f,a)*6/255.0f; -+ float c = math::pow(2.0f,a)*6/255.0f; - CVertexArray* va = GetVertexArray(); - va->Initialize(); - va->CheckInitSize(4*VA_SIZE_T); -@@ -867,10 +867,10 @@ - - const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z); - const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle; -- const float fy = asin(hdist / 400); -+ const float fy = math::asin(hdist / 400); - -- dir.x = hdist * cos(ang); -- dir.z = hdist * sin(ang); -+ dir.x = hdist * math::cos(ang); -+ dir.z = hdist * math::sin(ang); - dir.y = (fastmath::cos(fy) - domeheight) * 400; - - dir.ANormalize(); -@@ -903,7 +903,7 @@ - const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f); - - const float sunInt = skyLight->GetLightIntensity(); -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50; - const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 3.0f / (1 + sunDist)); - - const float green = std::min(1.0f, (0.55f + sunMod)); -@@ -918,7 +918,7 @@ - void CAdvSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) { - const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f); - -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70; - const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist); - - const float red = std::min(skyColor.x + sunMod * sunColor.x, 1.0f); -diff -ru spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp ---- spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -229,7 +229,7 @@ - std::list<FallingTree>::iterator prev = fti++; - fallingTrees.erase(prev); - } else { -- fti->speed += (sin(fti->fallPos) * 0.04f); -+ fti->speed += (math::sin(fti->fallPos) * 0.04f); - ++fti; - } - } -@@ -616,7 +616,7 @@ - if (camera->InView(pos + float3(0.0f, MAX_TREE_HEIGHT / 2, 0.0f), MAX_TREE_HEIGHT / 2.0f)) { - const float ang = fti->fallPos * PI; - -- const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang)); -+ const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang)); - const float3 zvec((yvec.cross(float3(-1.0f, 0.0f, 0.0f))).ANormalize()); - const float3 xvec(yvec.cross(zvec)); - -@@ -957,7 +957,7 @@ - if (camera->InView(pos + float3(0, MAX_TREE_HEIGHT / 2, 0), MAX_TREE_HEIGHT / 2)) { - const float ang = fti->fallPos * PI; - -- const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang)); -+ const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang)); - const float3 zvec((yvec.cross(float3(1.0f, 0.0f, 0.0f))).ANormalize()); - const float3 xvec(zvec.cross(yvec)); - -diff -ru spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp ---- spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -159,9 +159,9 @@ - int numIter=(int)max(3.0f,size*10); - for(int a=0;a<=numIter;a++){ - float angle=a/(float)numIter*2*PI; -- float col=0.4f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f; -- barkva->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col)); -- barkva->AddVertexTN(end+orto1*sin(angle)*size*0.2f+orto2*cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col)); -+ float col=0.4f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f; -+ barkva->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col)); -+ barkva->AddVertexTN(end+orto1*math::sin(angle)*size*0.2f+orto2*math::cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col)); - } - barkva->EndStrip(); - } -@@ -176,18 +176,18 @@ - - for (int a = 0; a < numBranch; ++a) { - const float angle = baseAngle + (a * 3.88f) + fRand(0.5f); -- float3 dir = orto1 * sin(angle) + orto2 * cos(angle); -+ float3 dir = orto1 * math::sin(angle) + orto2 * math::cos(angle); - dir.y = 0.3f + fRand(0.4f); - dir.ANormalize(); - const float3 start(0, (a + 5) * height / (numBranch + 5), 0); -- const float length = (height * (0.4f + fRand(0.1f))) * sqrt(float(numBranch - a) / numBranch); -+ const float length = (height * (0.4f + fRand(0.1f))) * math::sqrt(float(numBranch - a) / numBranch); - - TrunkIterator(start, dir, length, length * 0.05f, 1); - } - - for (int a = 0; a < 3; ++a) { - const float angle = (a * 3.88f) + fRand(0.5f); -- float3 dir = orto1*sin(angle)+orto2*cos(angle); -+ float3 dir = orto1*math::sin(angle)+orto2*math::cos(angle); - dir.y = 0.8f; - dir.ANormalize(); - const float3 start(0, height - 0.3f, 0); -@@ -225,7 +225,7 @@ - const float newLength = length * (float(numTrunks - a) / (numTrunks + 1)); - - float3 newbase = start + dir * length * (float(a + 1) / (numTrunks + 1)); -- float3 newDir = dir + orto1 * cos(angle) * dirDif + orto2 * sin(angle) * dirDif; -+ float3 newDir = dir + orto1 * math::cos(angle) * dirDif + orto2 * math::sin(angle) * dirDif; - newDir.ANormalize(); - - TrunkIterator(newbase, newDir, newLength, newLength * 0.05f, depth - 1); -@@ -245,8 +245,8 @@ - - float3 pos = start + dir * length * (0.7f + fRand(0.3f)); - pos += -- (orto1 * sin(angle) + orto2 * cos(angle)) * -- (sqrt((float) a + 1) * 0.6f + fRand(0.4f)) * -+ (orto1 * math::sin(angle) + orto2 * math::cos(angle)) * -+ (math::sqrt((float) a + 1) * 0.6f + fRand(0.4f)) * - 0.1f * MAX_TREE_HEIGHT; - - if (pos.y < 0.2f * MAX_TREE_HEIGHT) -@@ -538,12 +538,12 @@ - float baseAngle=fRand(2*PI); - for(int a=0;a<numBranch;++a){ - float sh = 0.2f + fRand(0.2f); -- float h = height * pow(sh + float(a)/numBranch * (1-sh), (float)0.7f); -+ float h = height * math::pow(sh + float(a)/numBranch * (1-sh), (float)0.7f); - float angle = baseAngle + (a * 0.618f + fRand(0.1f)) * 2 * PI; -- float3 dir(orto1 * sin(angle) + orto2 * cos(angle)); -+ float3 dir(orto1 * math::sin(angle) + orto2 * math::cos(angle)); - dir.y = (a - numBranch) * 0.01f - (0.2f + fRand(0.2f)); - dir.ANormalize(); -- float size = sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT; -+ float size = math::sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT; - DrawPineBranch(float3(0,h,0),dir,size); - } - //create the top -@@ -569,16 +569,16 @@ - for(int a=0;a<numIter;a++){ - float angle=a/(float)numIter*2*PI; - float angle2=(a+1)/(float)numIter*2*PI; -- float col=0.45f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f; -- float col2=0.45f+(((orto1*sin(angle2)+orto2*cos(angle2)).dot(flatSun)))*0.3f; -+ float col=0.45f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f; -+ float col2=0.45f+(((orto1*math::sin(angle2)+orto2*math::cos(angle2)).dot(flatSun)))*0.3f; - -- va->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size, angle/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col)); -- va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -- va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -- -- va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -- va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -- va->AddVertexTN(end+orto1*sin(angle2)*size*0.1f+orto2*cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2)); -+ va->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size, angle/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col)); -+ va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -+ va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -+ -+ va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -+ va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -+ va->AddVertexTN(end+orto1*math::sin(angle2)*size*0.1f+orto2*math::cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2)); - } - } - -diff -ru spring_89.0/rts/Rendering/Env/AdvWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp ---- spring_89.0/rts/Rendering/Env/AdvWater.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -48,7 +48,7 @@ - for (int y = 0; y < 64; ++y) { - for (int x = 0; x < 64; ++x) { - scrap[(y*64 + x)*4 + 0] = 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)(sin(y*PI*2.0f/64.0f)*128 + 128); -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)(math::sin(y*PI*2.0f/64.0f)*128 + 128); - scrap[(y*64 + x)*4 + 2] = 0; - scrap[(y*64 + x)*4 + 3] = 255; - } -@@ -62,8 +62,8 @@ - for (int x = 0; x < 64; ++x) { - const float ang = 26.5f*PI/180.0f; - const float pos = y*2+x; -- scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128; -+ scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128; -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128; - } - } - glBindTexture(GL_TEXTURE_2D, rawBumpTexture[1]); -@@ -75,8 +75,8 @@ - for (int x = 0; x < 64; ++x) { - const float ang = -19*PI/180.0f; - const float pos = 3*y - x; -- scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128; -+ scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128; -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128; - } - } - glBindTexture(GL_TEXTURE_2D, rawBumpTexture[2]); -@@ -192,14 +192,14 @@ - dir = xbase + dv; - dir.ANormalize(); - zpos = camera->pos + dir*(camera->pos.y / -dir.y); -- zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; -+ zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; - col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255); - va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY - yInc, col); - - dir = xbase; - dir.ANormalize(); - zpos = camera->pos + dir*(camera->pos.y / -dir.y); -- zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; -+ zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; - col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255); - va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY, col); - -diff -ru spring_89.0/rts/Rendering/Env/BasicSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp ---- spring_89.0/rts/Rendering/Env/BasicSky.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -67,8 +67,8 @@ - rawClouds=newmat2<int>(CLOUD_SIZE,CLOUD_SIZE); - blendMatrix=newmat3<int>(CLOUD_DETAIL,32,32); - -- domeheight=cos(PI/16)*1.01f; -- domeWidth=sin(PI/16)*400*1.7f; -+ domeheight=math::cos(PI/16)*1.01f; -+ domeWidth=math::sin(PI/16)*400*1.7f; - - UpdateSkyDir(); - InitSun(); -@@ -369,7 +369,7 @@ - case 0: { - for(int a=0; a<CLOUD_DETAIL; a++) { - float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a))); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - if(fade>1) { - fade = 2 - fade; - if(!cloudDown[a]) { -@@ -403,11 +403,11 @@ - int qcda=(4<<CLOUD_DETAIL)>>a; - int *pkernel=kernel; - for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) { -- float ydist=fabs(1.0f+y-cs8a)/cs8a; -+ float ydist=math::fabs(1.0f+y-cs8a)/cs8a; - ydist=ydist*ydist*(3-2*ydist); - int *pkrn=pkernel; - for(int x=0; x<cs4a; ++x) { -- float xdist=fabs(1.0f+x-cs8a)/cs8a; -+ float xdist=math::fabs(1.0f+x-cs8a)/cs8a; - xdist=xdist*xdist*(3-2*xdist); - - float contrib=(1-xdist)*(1-ydist); -@@ -506,7 +506,7 @@ - unsigned char *tt=thicknessTransform; - for(int a=0;a<1024;++a){ - float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f; -- float alpha=pow(f*2,3); -+ float alpha=math::pow(f*2,3); - if(alpha>1) - alpha=1; - *at=(unsigned char)(alpha*255); -@@ -533,11 +533,11 @@ - - float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256; - float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f; -- int baseY=int(floor(fy))&CLOUD_MASK; -- fy-=floor(fy); -+ int baseY=int(math::floor(fy))&CLOUD_MASK; -+ fy-=math::floor(fy); - float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f; -- int baseX=int(floor(fx))&CLOUD_MASK; -- fx-=floor(fx); -+ int baseX=int(math::floor(fx))&CLOUD_MASK; -+ fx-=math::floor(fx); - - float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3]; - if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){ -@@ -589,8 +589,8 @@ - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE); - glBegin(GL_TRIANGLE_STRIP); - for(int x=0;x<257;++x){ -- float dx=sin(x*2*PI/256.0f); -- float dy=cos(x*2*PI/256.0f); -+ float dx=math::sin(x*2*PI/256.0f); -+ float dy=math::cos(x*2*PI/256.0f); - - glTexCoord2f(x/256.0f,0.25f); - glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f); -@@ -613,7 +613,7 @@ - mem[(y*128+x)*4+0]=255; - mem[(y*128+x)*4+1]=255; - mem[(y*128+x)*4+2]=255; -- float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); -+ float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); - if(dist>60) - mem[(y*128+x)*4+3]=0; - else -@@ -764,10 +764,10 @@ - - const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z); - const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle; -- const float fy = asin(hdist / 400); -+ const float fy = math::asin(hdist / 400); - -- dir.x = hdist * cos(ang); -- dir.z = hdist * sin(ang); -+ dir.x = hdist * math::cos(ang); -+ dir.z = hdist * math::sin(ang); - dir.y = (fastmath::cos(fy) - domeheight) * 400; - - dir.ANormalize(); -@@ -800,7 +800,7 @@ - const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f); - - const float sunInt = skyLight->GetLightIntensity(); -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50; - const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 2.0f / sunDist); - - const float green = std::min(1.0f, (0.55f + sunMod)); -@@ -814,7 +814,7 @@ - void CBasicSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) { - const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f); - -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70; - const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist); - - const float red = std::min(skyColor.x + sunMod * sunColor.x, 1.0f); -diff -ru spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp ---- spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -269,7 +269,7 @@ - for (int x = 0; x < size; ++x) { - const float3 dir = (cdir + (xdif * (x + 0.5f)) / size + (ydif * (y + 0.5f)) / size).Normalize(); - const float dot = std::max(0.0f, dir.dot(sky->GetLight()->GetLightDir())); -- const float spec = std::min(1.0f, pow(dot, mapInfo->light.specularExponent) + pow(dot, 3.0f) * 0.25f); -+ const float spec = std::min(1.0f, math::pow(dot, mapInfo->light.specularExponent) + math::pow(dot, 3.0f) * 0.25f); - - buf[x * 4 + 0] = (mapInfo->light.unitSpecularColor.x * spec * 255); - buf[x * 4 + 1] = (mapInfo->light.unitSpecularColor.y * spec * 255); -diff -ru spring_89.0/rts/Rendering/Env/DynWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp ---- spring_89.0/rts/Rendering/Env/DynWater.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -88,9 +88,9 @@ - - for (int y = 0; y < 64; ++y) { - for (int x = 0; x < 64; ++x) { -- temp[(y*64 + x)*4 + 0] = sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f; -+ temp[(y*64 + x)*4 + 0] = math::sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f; - temp[(y*64 + x)*4 + 1] = temp[(y*64 + x)*4 + 0]; -- temp[(y*64 + x)*4 + 2] = cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f; -+ temp[(y*64 + x)*4 + 2] = math::cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f; - temp[(y*64 + x)*4 + 3] = 0; - } - } -@@ -197,7 +197,7 @@ - const float dy = y - 31.5f; - for (int x = 0; x < 64; ++x) { - const float dx = x-31.5f; -- const float dist = sqrt(dx*dx + dy*dy); -+ const float dist = math::sqrt(dx*dx + dy*dy); - temp[(y*64 + x)*4 + 0] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f); - temp[(y*64 + x)*4 + 1] = std::max(0.0f, 1 - dist/30.f); - temp[(y*64 + x)*4 + 2] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f); -@@ -425,8 +425,8 @@ - - oldCamPosBig = camPosBig; - -- camPosBig.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -- camPosBig.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); - - glDisable(GL_DEPTH_TEST); - glDepthMask(0); -@@ -835,8 +835,8 @@ - va = GetVertexArray(); - va->Initialize(); - -- camPosBig2.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -- camPosBig2.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig2.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig2.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); - - // FIXME: - // 1. DynWater::UpdateCamRestraints was never called ==> <this->left> and <this->right> were always empty -@@ -1132,8 +1132,8 @@ - // hovercraft - const float3& pos = unit->pos; - -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -- (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -+ (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -@@ -1144,7 +1144,7 @@ - if ((pos.y > -4.0f) && (pos.y < 4.0f)) { - const float3 frontAdd = unit->frontdir * unit->radius * 0.75f; - const float3 sideAdd = unit->rightdir * unit->radius * 0.75f; -- const float depth = sqrt(sqrt(unit->mass)) * 0.4f; -+ const float depth = math::sqrt(math::sqrt(unit->mass)) * 0.4f; - const float3 n(depth, 0.05f * depth, depth); - - va2->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n); -@@ -1156,8 +1156,8 @@ - // surface ship - const float3& pos = unit->pos; - -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -- (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -+ (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -@@ -1171,7 +1171,7 @@ - - const float3 frontAdd = unit->frontdir * unit->radius * 0.75f; - const float3 sideAdd = unit->rightdir * unit->radius * 0.18f; -- const float depth = sqrt(sqrt(unit->mass)); -+ const float depth = math::sqrt(math::sqrt(unit->mass)); - const float3 n(depth, 0.04f * unit->speed.Length2D() * depth, depth); - - va->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n); -@@ -1249,8 +1249,8 @@ - for (std::vector<Explosion>::iterator ei = explosions.begin(); ei != explosions.end(); ++ei) { - Explosion& explo = *ei; - float3 pos = explo.pos; -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) -- || (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) -+ || (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -diff -ru spring_89.0/rts/Rendering/Env/GrassDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp ---- spring_89.0/rts/Rendering/Env/GrassDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -75,11 +75,11 @@ - } - - // TODO: get rid of the magic constants -- maxGrassDist = 800 + sqrt((float) detail) * 240; -+ maxGrassDist = 800 + math::sqrt((float) detail) * 240; - maxDetailedDist = 146 + detail * 24; - detailedBlocks = int((maxDetailedDist - 24) / bMSsq) + 1; - numTurfs = 3 + int(detail * 0.5f); -- strawPerTurf = 50 + int(sqrt((float) detail) * 10); -+ strawPerTurf = 50 + int(math::sqrt((float) detail) * 10); - - blocksX = gs->mapx / grassSquareSize /grassBlockSize; - blocksY = gs->mapy / grassSquareSize / grassBlockSize; -@@ -641,7 +641,7 @@ - const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize(); - const float3 billboardDirY = billboardDirX.cross(billboardDirZ); - -- const float ang = acos(billboardDirZ.y); -+ const float ang = math::acos(billboardDirZ.y); - const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30)))); - - if (globalRendering->haveGLSL) { -@@ -673,7 +673,7 @@ - const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize(); - const float3 billboardDirY = billboardDirX.cross(billboardDirZ); - -- const float ang = acos(billboardDirZ.y); -+ const float ang = math::acos(billboardDirZ.y); - const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30)))); - - if (globalRendering->haveGLSL) { -@@ -820,7 +820,7 @@ - float3 forwardVect = sideVect.cross(UpVector); - sideVect *= mapInfo->grass.bladeWidth; - -- const float3 cornerPos = (UpVector * cos(maxAng) + forwardVect * sin(maxAng)) * length; -+ const float3 cornerPos = (UpVector * math::cos(maxAng) + forwardVect * math::sin(maxAng)) * length; - float3 basePos(30.0f, 0.0f, 30.0f); - - while (basePos.SqLength2D() > (turfSize * turfSize / 4)) { -@@ -837,10 +837,10 @@ - - const float3 edgePosL = - -sideVect * (1 - h) + -- (UpVector * cos(ang) + forwardVect * sin(ang)) * length * h; -+ (UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h; - const float3 edgePosR = - sideVect * (1.0f - h) + -- (UpVector * cos(ang) + forwardVect * sin(ang)) * length * h; -+ (UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h; - - if (b == 0) { - va->AddVertexT(basePos + (edgePosR - float3(0.0f, 0.1f, 0.0f)), xtexBase + xtexOffset, h); -diff -ru spring_89.0/rts/Rendering/Env/SkyLight.cpp /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp ---- spring_89.0/rts/Rendering/Env/SkyLight.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -72,7 +72,7 @@ - bool DynamicSkyLight::SetLightDir(const float4& newLightDir) { - if (newLightDir != lightDir) { - static float4 lastUpdate = ZeroVector; -- static const float minCosAngle = cos(1.5f * (PI/180.f)); -+ static const float minCosAngle = math::cos(1.5f * (PI/180.f)); - - if (lastUpdate.dot(newLightDir) < minCosAngle) { - lastUpdate = newLightDir; -@@ -92,7 +92,7 @@ - const float angularVelocity = 2.0f * PI / sunOrbitTime; - - const float sunAng = startAngle - initialSunAngle - angularVelocity * gameSeconds; -- const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * cos(sunAng), sunOrbitHeight, sunOrbitRad * sin(sunAng))); -+ const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * math::cos(sunAng), sunOrbitHeight, sunOrbitRad * math::sin(sunAng))); - - return sunPos; - } -@@ -108,18 +108,18 @@ - if (newLightDir.w == FLT_MAX) { - // old: newLightDir is position where sun reaches highest altitude - const float sunLen = newLightDir.Length2D(); -- const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : atan(newLightDir.y / sunLen); -- const float sunHeight = tan(sunAzimuth - 0.001f); -+ const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : math::atan(newLightDir.y / sunLen); -+ const float sunHeight = math::tan(sunAzimuth - 0.001f); - -- float3 v1(cos(initialSunAngle), sunHeight, sin(initialSunAngle)); -+ float3 v1(math::cos(initialSunAngle), sunHeight, math::sin(initialSunAngle)); - v1.ANormalize(); - - if (v1.y <= orbitMinSunHeight) { - newLightDir = UpVector; - sunOrbitHeight = v1.y; -- sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); -+ sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); - } else { -- float3 v2(cos(initialSunAngle + PI), orbitMinSunHeight, sin(initialSunAngle + PI)); -+ float3 v2(math::cos(initialSunAngle + PI), orbitMinSunHeight, math::sin(initialSunAngle + PI)); - v2.ANormalize(); - float3 v3 = v2 - v1; - sunOrbitRad = v3.Length() / 2.0f; -@@ -137,7 +137,7 @@ - } else { - // new: newLightDir is center position of orbit, and newLightDir.w is orbit height - sunOrbitHeight = std::max(-1.0f, std::min(newLightDir.w, 1.0f)); -- sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); -+ sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); - } - - sunRotation.LoadIdentity(); -diff -ru spring_89.0/rts/Rendering/GL/glExtra.cpp /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp ---- spring_89.0/rts/Rendering/GL/glExtra.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -83,7 +83,7 @@ - float adjustment = rad/2; - float ydiff = 0; - int j; -- for(j = 0; j < 50 && fabs(adjRadius - rad) + ydiff > .01*rad; j++){ -+ for(j = 0; j < 50 && math::fabs(adjRadius - rad) + ydiff > .01*rad; j++){ - if(adjRadius > rad) { - rad += adjustment; - } else { -@@ -93,7 +93,7 @@ - pos.x = center.x + (sinR * rad); - pos.z = center.z + (cosR * rad); - float newY = ground->GetHeightAboveWater(pos.x, pos.z, false); -- ydiff = fabs(pos.y - newY); -+ ydiff = math::fabs(pos.y - newY); - pos.y = newY; - heightDiff = (pos.y - center.y); - adjRadius = weapon ? weapon->GetRange2D(heightDiff*weapon->heightMod) : rad; -diff -ru spring_89.0/rts/Rendering/GroundDecalHandler.cpp /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp ---- spring_89.0/rts/Rendering/GroundDecalHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp 2012-07-13 06:34:43.082727161 +0200 -@@ -963,7 +963,7 @@ - radius = damage * 0.25f; - - if (damage > 400) -- damage = 400 + sqrt(damage - 399); -+ damage = 400 + math::sqrt(damage - 399); - - pos.ClampInBounds(); - -diff -ru spring_89.0/rts/Rendering/InMapDrawView.cpp /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp ---- spring_89.0/rts/Rendering/InMapDrawView.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -38,7 +38,7 @@ - for (int y = 0; y < 64; y++) { - // circular thingy - for (int x = 0; x < 64; x++) { -- float dist = sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32)); -+ float dist = math::sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32)); - if (dist > 31.0f) { - // do nothing - leave transparent - } else if (dist > 30.0f) { -diff -ru spring_89.0/rts/Rendering/LineDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp ---- spring_89.0/rts/Rendering/LineDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -29,7 +29,7 @@ - void CLineDrawer::UpdateLineStipple() - { - stippleTimer += (globalRendering->lastFrameTime * cmdColors.StippleSpeed()); -- stippleTimer = fmod(stippleTimer, (16.0f / 20.0f)); -+ stippleTimer = math::fmod(stippleTimer, (16.0f / 20.0f)); - } - - -diff -ru spring_89.0/rts/Rendering/Models/S3OParser.cpp /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp ---- spring_89.0/rts/Rendering/Models/S3OParser.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -319,7 +319,7 @@ - float3& t = tTangents[vrtIdx]; - int h = 1; - -- if (isnan(n.x) || isnan(n.y) || isnan(n.z)) { -+ if (math::isnan(n.x) || math::isnan(n.y) || math::isnan(n.z)) { - n = float3(0.0f, 0.0f, 1.0f); - } - if (s == ZeroVector) { s = float3(1.0f, 0.0f, 0.0f); } -diff -ru spring_89.0/rts/Sim/Misc/LosMap.cpp /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp ---- spring_89.0/rts/Sim/Misc/LosMap.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -182,7 +182,7 @@ - - y = (int)i; - x = 1; -- y = (int) (sqrt((float)r2 - 1) + 0.5f); -+ y = (int) (math::sqrt((float)r2 - 1) + 0.5f); - while (x < y) { - if(!PaintTable[x+y*Radius]) { - DrawLine(PaintTable, x, y, Radius); -@@ -198,7 +198,7 @@ - } - - x += 1; -- y = (int) (sqrt((float)r2 - x*x) + 0.5f); -+ y = (int) (math::sqrt((float)r2 - x*x) + 0.5f); - } - if (x == y) { - if(!PaintTable[x+y*Radius]) { -diff -ru spring_89.0/rts/Sim/Misc/QuadField.cpp /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp ---- spring_89.0/rts/Sim/Misc/QuadField.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -329,12 +329,12 @@ - float zp = start.z; - const float invQuadSize = 1.0f / QUAD_SIZE; - -- if ((floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) && -- (floor(start.z * invQuadSize) == floor(to.z * invQuadSize))) -+ if ((math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) && -+ (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize))) - { - *endQuad = ((int(start.x * invQuadSize)) + (int(start.z * invQuadSize)) * numQuadsX); - ++endQuad; -- } else if (floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) { -+ } else if (math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) { - const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX); - const int last = (int)(to.x * invQuadSize) + ((int)(to.z * invQuadSize) * numQuadsX); - -@@ -347,7 +347,7 @@ - *endQuad = a; ++endQuad; - } - } -- } else if (floor(start.z * invQuadSize) == floor(to.z * invQuadSize)) { -+ } else if (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)) { - const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX); - const int last = (int)(to.x * invQuadSize) + ((int)(to.z * invQuadSize) * numQuadsX); - -@@ -369,14 +369,14 @@ - ++endQuad; - - if (dx > 0) { -- xn = (floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx; -+ xn = (math::floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx; - } else { -- xn = (floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx; -+ xn = (math::floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx; - } - if (dz > 0) { -- zn = (floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz; -+ zn = (math::floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz; - } else { -- zn = (floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz; -+ zn = (math::floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz; - } - - if (xn < zn) { -@@ -388,8 +388,8 @@ - } - - keepgoing = -- (fabs(xp - start.x) < fabs(to.x - start.x)) && -- (fabs(zp - start.z) < fabs(to.z - start.z)); -+ (math::fabs(xp - start.x) < math::fabs(to.x - start.x)) && -+ (math::fabs(zp - start.z) < math::fabs(to.z - start.z)); - } - } - -diff -ru spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp 2012-07-13 06:34:43.256060504 +0200 -@@ -386,7 +386,7 @@ - - const float dif = wSpeed - currentSpeed; - -- if (fabs(dif) < 0.05f) { -+ if (math::fabs(dif) < 0.05f) { - deltaSpeed = dif * 0.125f; - nextDeltaSpeedUpdate = gs->frameNum + 8; - } else if (dif > 0.0f) { -@@ -529,7 +529,7 @@ - skidRotSpeed = 0.0f; - owner->physicalState = oldPhysState; - owner->moveType->useHeading = true; -- float rp = floor(skidRotPos2 + skidRotSpeed2 + 0.5f); -+ float rp = math::floor(skidRotPos2 + skidRotSpeed2 + 0.5f); - skidRotSpeed2 = (rp - skidRotPos2) * 0.5f; - ChangeHeading(owner->heading); - } else { -@@ -545,10 +545,10 @@ - } - - float remTime=speedf/speedReduction-1; -- float rp=floor(skidRotPos2+skidRotSpeed2*remTime+0.5f); -+ float rp=math::floor(skidRotPos2+skidRotSpeed2*remTime+0.5f); - skidRotSpeed2=(remTime+1 == 0 ) ? 0 : (rp-skidRotPos2)/(remTime+1); - -- if(floor(skidRotPos2)!=floor(skidRotPos2+skidRotSpeed2)){ -+ if(math::floor(skidRotPos2)!=math::floor(skidRotPos2+skidRotSpeed2)){ - skidRotPos2=0; - skidRotSpeed2=0; - } -@@ -571,7 +571,7 @@ - speed*=0.95f; - } - else { -- speed += (normal*(fabs(speed.dot(normal)) + .1))*1.9f; -+ speed += (normal*(math::fabs(speed.dot(normal)) + .1))*1.9f; - speed*=.8; - } - } -@@ -625,7 +625,7 @@ - float totRad = owner->radius + u->radius; - - if (sqDist < totRad * totRad && sqDist != 0) { -- float dist = sqrt(sqDist); -+ float dist = math::sqrt(sqDist); - float3 dif = midPos - u->midPos; - dif /= std::max(dist, 1.f); - -@@ -682,7 +682,7 @@ - float sqDist=(midPos-u->midPos).SqLength(); - float totRad=owner->radius+u->radius; - if(sqDist<totRad*totRad && sqDist!=0){ -- float dist=sqrt(sqDist); -+ float dist=math::sqrt(sqDist); - float3 dif=midPos-u->midPos; - dif/=std::max(dist, 1.f); - float impactSpeed = -owner->speed.dot(dif); -@@ -721,8 +721,8 @@ - - skidRotPos2 += skidRotSpeed2; - -- float cosp = cos(skidRotPos2 * PI * 2.0f); -- float sinp = sin(skidRotPos2 * PI * 2.0f); -+ float cosp = math::cos(skidRotPos2 * PI * 2.0f); -+ float sinp = math::sin(skidRotPos2 * PI * 2.0f); - - float3 f1 = skidRotVector * skidRotVector.dot(owner->frontdir); - float3 f2 = owner->frontdir - f1; -@@ -812,7 +812,7 @@ - float objectDistToAvoidDirCenter = objectToUnit.dot(rightOfAvoid); - - if (objectToUnit.dot(avoidanceDir) < radiusSum && -- fabs(objectDistToAvoidDirCenter) < radiusSum && -+ math::fabs(objectDistToAvoidDirCenter) < radiusSum && - (o->moveDef || Distance2D(owner, o) >= 0)) { - - if (objectDistToAvoidDirCenter > 0.0f) { -@@ -824,7 +824,7 @@ - rightOfAvoid = avoidanceDir.cross(float3(0.0f, 1.0f, 0.0f)); - } else { - avoidLeft += -- (radiusSum - fabs(objectDistToAvoidDirCenter)) * -+ (radiusSum - math::fabs(objectDistToAvoidDirCenter)) * - AVOIDANCE_STRENGTH * fastmath::isqrt2(distanceToObjectSq); - avoidanceDir -= (rightOfAvoid * avoidLeft); - avoidanceDir.Normalize(); -@@ -952,7 +952,7 @@ - if (!decRate) { - return 0.0f; - } -- return fabs(speed*speed / decRate); -+ return math::fabs(speed*speed / decRate); - } - - float3 CClassicGroundMoveType::Here() -@@ -1043,7 +1043,7 @@ - const float zmove = (owner->mapPos.y + owner->zsize / 2) * SQUARE_SIZE; - const float xmove = (owner->mapPos.x + owner->xsize / 2) * SQUARE_SIZE; - -- if (fabs(owner->frontdir.x) > fabs(owner->frontdir.z)) { -+ if (math::fabs(owner->frontdir.x) > math::fabs(owner->frontdir.z)) { - if (newmp.y < owner->mapPos.y) { - haveCollided |= CheckColV(newmp.y, newmp.x, newmp.x + owner->xsize - 1, zmove - 3.99f, owner->mapPos.y); - newmp = owner->GetMapPos(); -@@ -1261,20 +1261,20 @@ - float xp = start.x; - float zp = start.z; - -- if (floor(start.x) == floor(to.x)) { -+ if (math::floor(start.x) == math::floor(to.x)) { - if (dz > 0.0f) { -- for (int a = 1; a < floor(to.z); ++a) -+ for (int a = 1; a < math::floor(to.z); ++a) - lineTable[yt][xt].push_back(int2(0, a)); - } else { -- for (int a = -1; a > floor(to.z); --a) -+ for (int a = -1; a > math::floor(to.z); --a) - lineTable[yt][xt].push_back(int2(0, a)); - } -- } else if (floor(start.z) == floor(to.z)) { -+ } else if (math::floor(start.z) == math::floor(to.z)) { - if (dx > 0.0f) { -- for (int a = 1; a < floor(to.x); ++a) -+ for (int a = 1; a < math::floor(to.x); ++a) - lineTable[yt][xt].push_back(int2(a, 0)); - } else { -- for (int a = -1; a > floor(to.x); --a) -+ for (int a = -1; a > math::floor(to.x); --a) - lineTable[yt][xt].push_back(int2(a, 0)); - } - } else { -@@ -1283,14 +1283,14 @@ - - while (keepgoing) { - if (dx > 0.0f) { -- xn = (floor(xp) + 1.0f - xp) / dx; -+ xn = (math::floor(xp) + 1.0f - xp) / dx; - } else { -- xn = (floor(xp) - xp) / dx; -+ xn = (math::floor(xp) - xp) / dx; - } - if (dz > 0.0f) { -- zn = (floor(zp) + 1.0f - zp) / dz; -+ zn = (math::floor(zp) + 1.0f - zp) / dz; - } else { -- zn = (floor(zp) - zp) / dz; -+ zn = (math::floor(zp) - zp) / dz; - } - - if (xn < zn) { -@@ -1302,10 +1302,10 @@ - } - - keepgoing = -- fabs(xp - start.x) < fabs(to.x - start.x) && -- fabs(zp - start.z) < fabs(to.z - start.z); -+ math::fabs(xp - start.x) < math::fabs(to.x - start.x) && -+ math::fabs(zp - start.z) < math::fabs(to.z - start.z); - -- lineTable[yt][xt].push_back( int2(int(floor(xp)), int(floor(zp))) ); -+ lineTable[yt][xt].push_back( int2(int(math::floor(xp)), int(math::floor(zp))) ); - } - - lineTable[yt][xt].pop_back(); -@@ -1335,7 +1335,7 @@ - const MoveDef& md = *(owner->unitDef->moveDef); - const float cmod = movemath->GetPosSpeedMod(md, moveSquareX * 2, moveSquareY * 2); - -- if (fabs(owner->frontdir.x) < fabs(owner->frontdir.z)) { -+ if (math::fabs(owner->frontdir.x) < math::fabs(owner->frontdir.z)) { - if (newMoveSquareX > moveSquareX) { - const float nmod = movemath->GetPosSpeedMod(md, newMoveSquareX * 2, newMoveSquareY * 2); - if (cmod > 0.01f && nmod <= 0.01f) { -diff -ru spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp 2012-07-13 06:34:43.249393836 +0200 -@@ -1808,20 +1808,20 @@ - float xp = start.x; - float zp = start.z; - -- if (floor(start.x) == floor(to.x)) { -+ if (math::floor(start.x) == math::floor(to.x)) { - if (dz > 0.0f) { -- for (int a = 1; a <= floor(to.z); ++a) -+ for (int a = 1; a <= math::floor(to.z); ++a) - lineTable[yt][xt].push_back(int2(0, a)); - } else { -- for (int a = -1; a >= floor(to.z); --a) -+ for (int a = -1; a >= math::floor(to.z); --a) - lineTable[yt][xt].push_back(int2(0, a)); - } -- } else if (floor(start.z) == floor(to.z)) { -+ } else if (math::floor(start.z) == math::floor(to.z)) { - if (dx > 0.0f) { -- for (int a = 1; a <= floor(to.x); ++a) -+ for (int a = 1; a <= math::floor(to.x); ++a) - lineTable[yt][xt].push_back(int2(a, 0)); - } else { -- for (int a = -1; a >= floor(to.x); --a) -+ for (int a = -1; a >= math::floor(to.x); --a) - lineTable[yt][xt].push_back(int2(a, 0)); - } - } else { -@@ -1830,14 +1830,14 @@ - - while (keepgoing) { - if (dx > 0.0f) { -- xn = (floor(xp) + 1.0f - xp) / dx; -+ xn = (math::floor(xp) + 1.0f - xp) / dx; - } else { -- xn = (floor(xp) - xp) / dx; -+ xn = (math::floor(xp) - xp) / dx; - } - if (dz > 0.0f) { -- zn = (floor(zp) + 1.0f - zp) / dz; -+ zn = (math::floor(zp) + 1.0f - zp) / dz; - } else { -- zn = (floor(zp) - zp) / dz; -+ zn = (math::floor(zp) - zp) / dz; - } - - if (xn < zn) { -@@ -1851,7 +1851,7 @@ - keepgoing = - math::fabs(xp - start.x) <= math::fabs(to.x - start.x) && - math::fabs(zp - start.z) <= math::fabs(to.z - start.z); -- int2 pt(int(floor(xp)), int(floor(zp))); -+ int2 pt(int(math::floor(xp)), int(math::floor(zp))); - - static const int MIN_IDX = -int(LINETABLE_SIZE / 2); - static const int MAX_IDX = -MIN_IDX; -diff -ru spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -325,7 +325,7 @@ - { - #define NOZERO(x) std::max(x, 0.0001f) - -- const float driftSpeed = fabs(owner->unitDef->dlHoverFactor); -+ const float driftSpeed = math::fabs(owner->unitDef->dlHoverFactor); - float3 deltaVec = goalPos - owner->pos; - float3 deltaDir = float3(deltaVec.x, 0.0f, deltaVec.z); - float l = NOZERO(deltaDir.Length2D()); -@@ -342,7 +342,7 @@ - deltaDir -= owner->speed; - l = deltaDir.SqLength2D(); - if (l > (maxSpeed * maxSpeed)) { -- deltaDir *= maxSpeed / NOZERO(sqrt(l)); -+ deltaDir *= maxSpeed / NOZERO(math::sqrt(l)); - } - wantedSpeed = owner->speed + deltaDir; - -diff -ru spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -412,7 +412,7 @@ - } - } - -- if (fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) { -+ if (math::fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) { - elevator = 1; - } - UpdateAirPhysics(0, aileron, elevator, 1, owner->frontdir); -@@ -528,13 +528,13 @@ - if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && frontdir.y > -0.2f && speedf > 2.0f && gs->randFloat() > 0.996f) - maneuver = 1; - -- if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) { -+ if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && math::fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) { - maneuver = 2; - maneuverSubState = 0; - } - - // roll -- if (speedf > 0.45f && pos.y + owner->speed.y * 60 * fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + fabs(rightdir.y) * 150) { -+ if (speedf > 0.45f && pos.y + owner->speed.y * 60 * math::fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + math::fabs(rightdir.y) * 150) { - const float goalBankDif = goalDotRight + rightdir.y * 0.2f; - if (goalBankDif > maxAileron * speedf * 4.0f) { - aileron = 1; -@@ -706,7 +706,7 @@ - } else if (goalBankDif < -maxAileron * speedf * 4 && rightdir.y < maxBank) { - aileron = -1; - } else { -- if (fabs(rightdir.y) < maxBank) { -+ if (math::fabs(rightdir.y) < maxBank) { - aileron = goalBankDif / (maxAileron * speedf * 4); - } else { - if (rightdir.y < 0.0f && goalBankDif < 0.0f) { -@@ -762,7 +762,7 @@ - } else if (hdif > (maxElevator * speedf * speedf * 20) && frontdir.y < maxPitch) { - elevator = 1; - } else { -- if (fabs(frontdir.y) < maxPitch) -+ if (math::fabs(frontdir.y) < maxPitch) - elevator = hdif / (maxElevator * speedf * speedf * 20); - } - } -diff -ru spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp ---- spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -201,7 +201,7 @@ - - void CPathEstimator::CalcOffsetsAndPathCosts(int thread) { - //! reset FPU state for synced computations -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - // NOTE: EstimatePathCosts() [B] is temporally dependent on CalculateBlockOffsets() [A], - // A must be completely finished before B_i can be safely called. This means we cannot -diff -ru spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp ---- spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp 2012-07-13 06:34:43.016060490 +0200 -@@ -251,7 +251,7 @@ - - - void QTPFS::PathManager::InitNodeLayersThreaded(const SRectangle& rect) { -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - char loadMsg[512] = {'\0'}; - const char* fmtString = "[PathManager::%s] using %u threads for %u node-layers (cached? %s)"; -@@ -310,7 +310,7 @@ - } - #endif - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void QTPFS::PathManager::InitNodeLayersThread( -@@ -360,7 +360,7 @@ - - - void QTPFS::PathManager::UpdateNodeLayersThreaded(const SRectangle& rect) { -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - #ifdef QTPFS_OPENMP_ENABLED - { -@@ -375,7 +375,7 @@ - } - #endif - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void QTPFS::PathManager::UpdateNodeLayersThread( -@@ -569,7 +569,7 @@ - SCOPED_TIMER("PathManager::Update"); - - #ifdef QTPFS_ENABLE_THREADED_UPDATE -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - // allow ThreadUpdate to run one iteration - condThreadUpdate->notify_one(); -@@ -579,7 +579,7 @@ - // wait for the ThreadUpdate iteration to finish - condThreadUpdated->wait(lock); - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #else - ThreadUpdate(); - #endif -diff -ru spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp ---- spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp 2012-07-13 06:34:43.082727161 +0200 -@@ -262,7 +262,7 @@ - damage *= gfxMod; - damage = std::max(damage, 0.0f); - -- const float sqrtDmg = sqrt(damage); -+ const float sqrtDmg = math::sqrt(damage); - const float camLength = camVect.Length(); - float moveLength = radius * 0.03f; - -@@ -283,7 +283,7 @@ - if (airExplosion || waterExplosion) { smokeDamage *= 0.6f; } - - if (smokeDamage > 0.01f) { -- smokeDamageSQRT = sqrt(smokeDamage); -+ smokeDamageSQRT = math::sqrt(smokeDamage); - smokeDamageISQRT = 1.0f / (smokeDamageSQRT * 0.35f); - } - -@@ -507,17 +507,17 @@ - } - case OP_SAWTOOTH: { - // this translates to modulo except it works with floats -- val -= (*(float*) code) * floor(val / (*(float*) code)); -+ val -= (*(float*) code) * math::floor(val / (*(float*) code)); - code += 4; - break; - } - case OP_DISCRETE: { -- val = (*(float*) code) * floor(val / (*(float*) code)); -+ val = (*(float*) code) * math::floor(val / (*(float*) code)); - code += 4; - break; - } - case OP_SINE: { -- val = (*(float*) code) * sin(val); -+ val = (*(float*) code) * math::sin(val); - code += 4; - break; - } -@@ -538,12 +538,12 @@ - break; - } - case OP_POW: { -- val = pow(val, (*(float*) code)); -+ val = math::pow(val, (*(float*) code)); - code += 4; - break; - } - case OP_POWBUFF: { -- val = pow(val, buffer[(*(int*) code)]); -+ val = math::pow(val, buffer[(*(int*) code)]); - code += 4; - break; - } -diff -ru spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -111,7 +111,7 @@ - oldSmokeDir.Normalize(); - const float3 camDir = (pos - camera->pos).Normalize(); - -- if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) { -+ if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) { - drawTrail = false; - } - -@@ -334,7 +334,7 @@ - - if (!drawTrail) { - float3 camDir = (pos - camera->pos).Normalize(); -- if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(dir))) * 3000 > 300) { -+ if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(dir))) * 3000 > 300) { - drawTrail = true; - } - } -@@ -373,7 +373,7 @@ - const float3 dif2 = (oldSmokePos - camera->pos).Normalize(); - const float3 dir2 = (dif2.cross(oldSmokeDir)).Normalize(); - -- float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + fabs(dif.dot(dir))); -+ float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif.dot(dir))); - float alpha = std::min(255.0f, std::max(0.f, a1)); - col[0] = (unsigned char) (color * alpha); - col[1] = (unsigned char) (color * alpha); -@@ -381,7 +381,7 @@ - col[3] = (unsigned char) (alpha); - - unsigned char col2[4]; -- float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + fabs(dif2.dot(oldSmokeDir))); -+ float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif2.dot(oldSmokeDir))); - - if (age < 8) - a2 = 0; -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -188,7 +188,7 @@ - particles[i].size = particleSize + gu->usRandFloat()*particleSizeSpread; - particles[i].pos = pos; - -- particles[i].speed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); -+ particles[i].speed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); - } - - drawRadius = (particleSpeed + particleSpeedSpread) * (particleLife * particleLifeSpread); -@@ -232,7 +232,7 @@ - const float az = gu->usRandFloat() * 2 * PI; - const float ay = (emitRot + emitRotSpread*gu->usRandFloat()) * (PI / 180.0); - -- float3 pspeed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); -+ float3 pspeed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); - - CGenericParticleProjectile* particle = new CGenericParticleProjectile(pos + explosionPos, pspeed, owner); - -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -124,7 +124,7 @@ - if (lastSegment) { - a1 = 0; - } -- a1 *= 0.7f + fabs(dif1.dot(dir1)); -+ a1 *= 0.7f + math::fabs(dif1.dot(dir1)); - float alpha = std::min(255.f, std::max(0.f, a1)); - col[0] = (unsigned char) (color * alpha); - col[1] = (unsigned char) (color * alpha); -@@ -136,7 +136,7 @@ - if (firstSegment) { - a2 = 0; - } -- a2 *= 0.7f + fabs(dif2.dot(dir2)); -+ a2 *= 0.7f + math::fabs(dif2.dot(dir2)); - alpha = std::min(255.f, std::max(0.0f, a2)); - col2[0] = (unsigned char) (color * alpha); - col2[1] = (unsigned char) (color * alpha); -@@ -153,7 +153,7 @@ - - unsigned char col3[4]; - float a2 = (1 - (float)(age + 4) / lifeTime) * 255; -- a2 *= 0.7f + fabs(dif3.dot(middir)); -+ a2 *= 0.7f + math::fabs(dif3.dot(middir)); - alpha = std::min(255.0f, std::max(0.0f, a2)); - col3[0] = (unsigned char) (color * alpha); - col3[1] = (unsigned char) (color * alpha); -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -49,7 +49,7 @@ - const float yp = (y + ypart) / 16.0f*PI - PI/2; - for (int x = 0; x < 5; ++x) { - float xp = (x + xpart) / 32.0f*2*PI; -- vectors[y*5 + x] = float3(sin(xp)*cos(yp), sin(yp), cos(xp)*cos(yp)); -+ vectors[y*5 + x] = float3(math::sin(xp)*math::cos(yp), math::sin(yp), math::cos(xp)*math::cos(yp)); - } - } - pos = centerPos+vectors[12] * sphereSize; -@@ -86,7 +86,7 @@ - float alpha = - baseAlpha * - (1.0f - min(1.0f, float(age + globalRendering->timeOffset) / (float) ttl)) * -- (1.0f - fabs(y + ybase - 8.0f) / 8.0f * 1.0f); -+ (1.0f - math::fabs(y + ybase - 8.0f) / 8.0f * 1.0f); - - col[0] = (unsigned char) (color.x * 255.0f * alpha); - col[1] = (unsigned char) (color.y * 255.0f * alpha); -@@ -94,7 +94,7 @@ - col[3] = ((unsigned char) (40 * alpha)) + 1; - va->AddVertexQTC(centerPos + vectors[y*5 + x] * interSize, texx, texy, col); - va->AddVertexQTC(centerPos + vectors[y*5 + x + 1] * interSize, texx, texy, col); -- alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f); -+ alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - math::fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f); - - col[0] = (unsigned char) (color.x * 255.0f * alpha); - col[1] = (unsigned char) (color.y * 255.0f * alpha); -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -79,7 +79,7 @@ - float interSize = size + sizeExpansion * globalRendering->timeOffset; - float interRot = rotation + rotSpeed * globalRendering->timeOffset; - -- const float3 dir1 = float3(cos(interRot), 0, sin(interRot)) * interSize; -+ const float3 dir1 = float3(math::cos(interRot), 0, math::sin(interRot)) * interSize; - const float3 dir2 = dir1.cross(UpVector); - - #define wt projectileDrawer->waketex -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -96,7 +96,7 @@ - drawRadius = radius + maxSpeed * 8; - - float3 camDir = (pos - camera->pos).ANormalize(); -- if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) < 200) { -+ if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) < 200) { - drawTrail = false; - } - -@@ -229,8 +229,8 @@ - // is too close or height difference too large) - const float horDiff = (targPos - pos).Length2D() + 0.01f; - const float verDiff = (targPos.y - pos.y) + 0.01f; -- const float dirDiff = fabs(targetDir.y - dir.y); -- const float ratio = fabs(verDiff / horDiff); -+ const float dirDiff = math::fabs(targetDir.y - dir.y); -+ const float ratio = math::fabs(verDiff / horDiff); - - dir.y -= (dirDiff * ratio); - } else { -@@ -295,7 +295,7 @@ - if (!drawTrail) { - const float3 camDir = (pos - camera->pos).ANormalize(); - -- if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) > 300) { -+ if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) > 300) { - drawTrail = true; - } - } -@@ -343,7 +343,7 @@ - dir2.ANormalize(); - - float a1 = (1.0f / (SMOKE_TIME)) * 255; -- a1 *= 0.7f + fabs(dif.dot(dir)); -+ a1 *= 0.7f + math::fabs(dif.dot(dir)); - const float alpha1 = std::min(255.0f, std::max(0.0f, a1)); - col[0] = (unsigned char) (color * alpha1); - col[1] = (unsigned char) (color * alpha1); -@@ -357,7 +357,7 @@ - a2 = 0; - } - -- a2 *= 0.7f + fabs(dif2.dot(oldDir)); -+ a2 *= 0.7f + math::fabs(dif2.dot(oldDir)); - const float alpha2 = std::min(255.0f, std::max(0.0f, a2)); - col2[0] = (unsigned char) (color * alpha2); - col2[1] = (unsigned char) (color * alpha2); -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -90,13 +90,13 @@ - } - } - -- maxGoodDif = cos(tracking * 0.6f); -+ maxGoodDif = math::cos(tracking * 0.6f); - curSpeed = speed.Length(); - dir = speed / curSpeed; - oldSmokeDir = dir; - - const float3 camDir = (pos - camera->pos).ANormalize(); -- const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - fabs(camDir.dot(dir))) * 3000); -+ const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - math::fabs(camDir.dot(dir))) * 3000); - - drawTrail = (camDist >= 200.0f); - drawRadius = maxSpeed * 8.0f; -@@ -304,7 +304,7 @@ - - if (!drawTrail) { - const float3 camDir = (pos - camera->pos).ANormalize(); -- const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000); -+ const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000); - - drawTrail = (camDist > 300.0f); - } -@@ -335,11 +335,11 @@ - - const float a1 = - ((1.0f - (0.0f / SMOKE_TIME)) * 255) * -- (0.7f + fabs(dif1.dot(dir))); -+ (0.7f + math::fabs(dif1.dot(dir))); - const float a2 = - (age < 8)? 0.0f: - ((1.0f - (age2 / SMOKE_TIME)) * 255) * -- (0.7f + fabs(dif2.dot(oldSmokeDir))); -+ (0.7f + math::fabs(dif2.dot(oldSmokeDir))); - const int alpha1 = std::min(255, (int) std::max(0.0f, a1)); - const int alpha2 = std::min(255, (int) std::max(0.0f, a2)); - -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp 2012-07-13 06:34:43.249393836 +0200 -@@ -252,8 +252,8 @@ - const float dot = speed.dot(normal); - - pos -= speed; -- speed -= (speed + normal * fabs(dot)) * (1 - weaponDef->bounceSlip); -- speed += (normal * (fabs(dot))) * (1 + weaponDef->bounceRebound); -+ speed -= (speed + normal * math::fabs(dot)) * (1 - weaponDef->bounceSlip); -+ speed += (normal * (math::fabs(dot))) * (1 + weaponDef->bounceRebound); - pos += speed; - - if (weaponDef->bounceExplosionGenerator) { -diff -ru spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp ---- spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp 2012-07-13 06:34:43.079393827 +0200 -@@ -770,7 +770,7 @@ - b2 = w->TryTargetRotate(orderTarget, c.GetID() == CMD_MANUALFIRE); - b3 = Square(w->range - (w->relWeaponPos).Length()) > (orderTarget->pos.SqDistance(owner->pos)); - b4 = w->TryTargetHeading(GetHeadingFromVector(-diff.x, -diff.z), orderTarget->pos, orderTarget != NULL, orderTarget); -- edgeFactor = fabs(w->targetBorder); -+ edgeFactor = math::fabs(w->targetBorder); - } - - const float diffLength2D = diff.Length2D(); -diff -ru spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp ---- spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp 2012-07-13 06:34:43.079393827 +0200 -@@ -349,7 +349,7 @@ - if (rx <= spread) - continue; - -- rx = sqrt(rx); -+ rx = math::sqrt(rx); - - const float minx = std::max( spread, center.x - rx); - const float maxx = std::min(float(gs->mapx * SQUARE_SIZE - spread), center.x + rx); -@@ -676,7 +676,7 @@ - am->ForceHeading(unloadHeading); - am->maxDrift = 1; - if ((owner->pos.SqDistance(pos) < 64) && -- (owner->updir.dot(UpVector) > 0.99f) && fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) { -+ (owner->updir.dot(UpVector) > 0.99f) && math::fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) { - if (!SpotIsClearIgnoreSelf(pos, unit)) { - // chosen spot is no longer clear to land, choose a new one - // if a new spot cannot be found, don't unload at all -diff -ru spring_89.0/rts/Sim/Units/UnitDef.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp ---- spring_89.0/rts/Sim/Units/UnitDef.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -399,9 +399,9 @@ - selfDCountdown = udTable.GetInt("selfDestructCountdown", 5); - - speed = udTable.GetFloat("maxVelocity", 0.0f) * GAME_SPEED; -- speed = fabs(speed); -+ speed = math::fabs(speed); - rSpeed = udTable.GetFloat("maxReverseVelocity", 0.0f) * GAME_SPEED; -- rSpeed = fabs(rSpeed); -+ rSpeed = math::fabs(rSpeed); - - fireState = udTable.GetInt("fireState", canFireControl? FIRESTATE_NONE: FIRESTATE_FIREATWILL); - fireState = std::min(fireState, int(FIRESTATE_FIREATWILL)); -@@ -462,8 +462,8 @@ - useSmoothMesh = udTable.GetBool("useSmoothMesh", true); - - -- maxAcc = fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values -- maxDec = fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values -+ maxAcc = math::fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values -+ maxDec = math::fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values - - turnRate = udTable.GetFloat("turnRate", 0.0f); - turnInPlace = udTable.GetBool("turnInPlace", true); -@@ -709,7 +709,7 @@ - seismicSignature = udTable.GetFloat("seismicSignature", -1.0f); - if (seismicSignature == -1.0f) { - if (!canFloat && !canHover && !canfly) { -- seismicSignature = sqrt(mass / 100.0f); -+ seismicSignature = math::sqrt(mass / 100.0f); - } else { - seismicSignature = 0.0f; - } -diff -ru spring_89.0/rts/Sim/Units/UnitHandler.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp ---- spring_89.0/rts/Sim/Units/UnitHandler.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp 2012-07-13 06:34:43.076060493 +0200 -@@ -419,8 +419,8 @@ - // look for a nearby geothermal feature if we need one - for (std::vector<CFeature*>::const_iterator fi = features.begin(); fi != features.end(); ++fi) { - if ((*fi)->def->geoThermal -- && fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4) -- && fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) { -+ && math::fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4) -+ && math::fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) { - canBuild = BUILDSQUARE_OPEN; - break; - } -@@ -589,7 +589,7 @@ - BuildInfo bi(cmd); - tempF1 = pos + dir * ((bi.pos.y - pos.y) / dir.y) - bi.pos; - -- if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > fabs(tempF1.z)) { -+ if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.z)) { - return cmd; - } - } -diff -ru spring_89.0/rts/Sim/Weapons/BombDropper.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp ---- spring_89.0/rts/Sim/Weapons/BombDropper.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -62,7 +62,7 @@ - const float s = -owner->speed.y; - const float sq = (s - 2*d) / -((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)); - if (sq > 0) { -- predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + sqrt(sq); -+ predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + math::sqrt(sq); - } else { - predict = 0; - } -diff -ru spring_89.0/rts/Sim/Weapons/Cannon.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp ---- spring_89.0/rts/Sim/Weapons/Cannon.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -169,7 +169,7 @@ - - int ttl = 0; - float sqSpeed2D = dir.SqLength2D() * projectileSpeed * projectileSpeed; -- int predict = (int)ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity) -+ int predict = (int)math::ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity) - : math::sqrt(diff.SqLength2D() / sqSpeed2D)); - if(weaponDef->flighttime > 0) { - ttl = weaponDef->flighttime; -@@ -216,9 +216,9 @@ - // try to cache results, sacrifice some (not much too much even for a pewee) accuracy - // it saves a dozen or two expensive calculations per second when 5 guardians - // are shooting at several slow- and fast-moving targets -- if (fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) && -- fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) && -- fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) { -+ if (math::fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) && -+ math::fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) && -+ math::fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) { - return lastDir; - } - -@@ -237,7 +237,7 @@ - // FIXME: temporary safeguards against FP overflow - // (introduced by extreme off-map unit positions; the term - // DFsq * Dsq * ... * dy should never even approach 1e38) -- if (Dsq < 1e12f && fabs(dy) < 1e6f) { -+ if (Dsq < 1e12f && math::fabs(dy) < 1e6f) { - const float root1 = v*v*v*v + 2.0f*v*v*g*dy - g*g*DFsq; - - if (root1 >= 0.0f) { -diff -ru spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp ---- spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -126,9 +126,9 @@ - - // should really be tan but TA seem to cap it somehow - // should also be 7fff or ffff theoretically but neither seems good -- wd.accuracy = sin((accuracy) * PI / 0xafff); -- wd.sprayAngle = sin((sprayAngle) * PI / 0xafff); -- wd.movingAccuracy = sin((movingAccuracy) * PI / 0xafff); -+ wd.accuracy = math::sin((accuracy) * PI / 0xafff); -+ wd.sprayAngle = math::sin((sprayAngle) * PI / 0xafff); -+ wd.movingAccuracy = math::sin((movingAccuracy) * PI / 0xafff); - - wd.targetMoveError = wdTable.GetFloat("targetMoveError", 0.0f); - wd.leadLimit = wdTable.GetFloat("leadLimit", -1.0f); -@@ -375,7 +375,7 @@ - - - const float gd = max(30.0f, wd.damages[0] / 20.0f); -- const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (sqrt(gd) * 0.7f)) * 0.5f; -+ const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (math::sqrt(gd) * 0.7f)) * 0.5f; - wd.explosionSpeed = wdTable.GetFloat("explosionSpeed", defExpSpeed); - - // Dynamic Damage -@@ -461,7 +461,7 @@ - wd.hitSound.setVolume(0, 5.0f); - wd.hitSound.setVolume(1, 5.0f); - } else { -- float fireSoundVolume = sqrt(wd.damages[0] * 0.5f); -+ float fireSoundVolume = math::sqrt(wd.damages[0] * 0.5f); - - if (wd.type == "LaserCannon") { - fireSoundVolume *= 0.5f; -@@ -472,7 +472,7 @@ - if ((fireSoundVolume > 100.0f) && - ((wd.type == "MissileLauncher") || - (wd.type == "StarburstLauncher"))) { -- fireSoundVolume = 10.0f * sqrt(hitSoundVolume); -+ fireSoundVolume = 10.0f * math::sqrt(hitSoundVolume); - } - - if (wd.damageAreaOfEffect > 8.0f) { -@@ -564,7 +564,7 @@ - - if (inverted == true) { - for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) { -- dynDamages[i] = damages[i] - (1 - pow(1 / range * travDist, exp)) * damages[i]; -+ dynDamages[i] = damages[i] - (1 - math::pow(1 / range * travDist, exp)) * damages[i]; - - if (damageMin > 0) - dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]); -@@ -577,7 +577,7 @@ - } - else { - for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) { -- dynDamages[i] = (1 - pow(1 / range * travDist, exp)) * damages[i]; -+ dynDamages[i] = (1 - math::pow(1 / range * travDist, exp)) * damages[i]; - - if (damageMin > 0) - dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]); -diff -ru spring_89.0/rts/System/Matrix44f.cpp /home/svenstaro/src/spring/rts/System/Matrix44f.cpp ---- spring_89.0/rts/System/Matrix44f.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Matrix44f.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -72,8 +72,8 @@ - - *this=Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[4]; - m[4] = cr*a - sr*m[8]; -@@ -107,8 +107,8 @@ - - *this = Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[0]; - m[0] = cr*a + sr*m[8]; -@@ -142,8 +142,8 @@ - - *this = Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[0]; - m[0] = cr*a - sr*m[4]; -@@ -165,8 +165,8 @@ - - void CMatrix44f::Rotate(float rad, const float3& axis) - { -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - for(int a=0;a<3;++a){ - float3 v(m[a*4],m[a*4+1],m[a*4+2]); -diff -ru spring_89.0/rts/System/myMath.cpp /home/svenstaro/src/spring/rts/System/myMath.cpp ---- spring_89.0/rts/System/myMath.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/myMath.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -44,7 +44,7 @@ - } - - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif -@@ -58,7 +58,7 @@ - #pragma omp parallel - { - //good_fpu_control_registers("OMP-Init"); -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif -@@ -77,8 +77,8 @@ - for (int a = 0; a < NUM_HEADINGS; ++a) { - float ang = (a - (NUM_HEADINGS / 2)) * 2 * PI / NUM_HEADINGS; - float2 v; -- v.x = sin(ang); -- v.y = cos(ang); -+ v.x = math::sin(ang); -+ v.y = math::cos(ang); - headingToVectorTable[a] = v; - } - -@@ -107,9 +107,9 @@ - float3 ret; - float h = heading * TAANG2RAD; - float p = pitch * TAANG2RAD; -- ret.x = sin(h) * cos(p); -- ret.y = sin(p); -- ret.z = cos(h) * cos(p); -+ ret.x = math::sin(h) * math::cos(p); -+ ret.y = math::sin(p); -+ ret.z = math::cos(h) * math::cos(p); - return ret; - } - -@@ -138,7 +138,7 @@ - float3 dir(l2-l1); - float3 pdir(p-l1); - float length = dir.Length(); -- if (fabs(length) < 1e-4f) -+ if (math::fabs(length) < 1e-4f) - return l1; - float c = dir.dot(pdir) / length; - if (c < 0) c = 0; -diff -ru spring_89.0/rts/System/Net/Socket.cpp /home/svenstaro/src/spring/rts/System/Net/Socket.cpp ---- spring_89.0/rts/System/Net/Socket.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Net/Socket.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -73,7 +73,7 @@ - //! (date of note: 08/05/10) - //! something in from_string() is invalidating the FPU flags - //! tested on win2k and linux (not happening there) -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - return addr; -@@ -94,7 +94,7 @@ - #ifdef STREFLOP_H - //! (date of note: 08/22/10) - //! something in resolve() is invalidating the FPU flags -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - return resolveIt; -diff -ru spring_89.0/rts/System/OffscreenGLContext.cpp /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp ---- spring_89.0/rts/System/OffscreenGLContext.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -259,7 +259,7 @@ - #ifdef STREFLOP_H - // init streflop to make it available for synced computations, too - // redundant? threads copy the FPU state of their parent. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - try { -diff -ru spring_89.0/rts/System/Sound/SoundSource.h /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h ---- spring_89.0/rts/System/Sound/SoundSource.h 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h 2012-07-13 06:34:42.836060480 +0200 -@@ -7,7 +7,6 @@ - - #include <al.h> - #include <boost/noncopyable.hpp> --#include <boost/thread/recursive_mutex.hpp> - - class IAudioChannel; - class float3; -diff -ru spring_89.0/rts/System/SpringApp.cpp /home/svenstaro/src/spring/rts/System/SpringApp.cpp ---- spring_89.0/rts/System/SpringApp.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/SpringApp.cpp 2012-07-13 06:34:42.982727155 +0200 -@@ -385,7 +385,7 @@ - #ifdef STREFLOP_H - //! Something in SDL_SetVideoMode (OpenGL drivers?) messes with the FPU control word. - //! Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - //! setup GL smoothing -@@ -1009,7 +1009,7 @@ - SDL_Event event; - - while (SDL_PollEvent(&event)) { -- streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags -+ streflop::streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags - input.PushEvent(event); - } - } -diff -ru spring_89.0/rts/System/Sync/FPUCheck.cpp /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp ---- spring_89.0/rts/System/Sync/FPUCheck.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -85,7 +85,7 @@ - LOG_L(L_WARNING, "[%s] Sync warning: (env.x87_mode) FPUCW 0x%04X instead of 0x%04X or 0x%04X (\"%s\")", __FUNCTION__, fenv.x87_mode, x87_a, x87_b, text); - - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif diff --git a/community/spring/gcc48.patch b/community/spring/gcc48.patch deleted file mode 100644 index ea69a42c4..000000000 --- a/community/spring/gcc48.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/rts/System/Sound/EFX.cpp b/rts/System/Sound/EFX.cpp -index 08fe9f4..3b197f0 100644 ---- a/rts/System/Sound/EFX.cpp -+++ b/rts/System/Sound/EFX.cpp -@@ -83,7 +83,7 @@ CEFX::CEFX(ALCdevice* device) - ALuint alFx; - alGenEffects(1, &alFx); - if (alGetError() == AL_NO_ERROR) { -- for(size_t i = 0; i < sizeof(effects); i++) { -+ for(size_t i = 0; i < sizeof(effects)/sizeof(effects[0]); i++) { - const ALuint fx = effects[i]; - alEffecti(alFx, AL_EFFECT_TYPE, fx); - effectsSupported[fx] = (alGetError() == AL_NO_ERROR); -@@ -103,7 +103,7 @@ CEFX::CEFX(ALCdevice* device) - ALuint alFilter; - alGenFilters(1, &alFilter); - if (alGetError() == AL_NO_ERROR) { -- for(size_t i = 0; i < sizeof(filters); i++) { -+ for(size_t i = 0; i < sizeof(filters)/sizeof(filters[0]); i++) { - const ALuint filter = filters[i]; - alFilteri(alFilter, AL_FILTER_TYPE, filter); - filtersSupported[filter] = (alGetError() == AL_NO_ERROR); diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 9e67151e4..5f8e9a69a 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 102280 2013-12-07 10:37:12Z bpiotrowski $ +# $Id: PKGBUILD 103804 2014-01-11 20:08:38Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby pkgver=0.180 -pkgrel=1 +pkgrel=2 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64') url="http://springlobby.info/" license=('GPL2') -depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs' 'alure') +depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs' + 'alure' 'libsm') optdepends=('sdl' 'sdl_sound' 'sdl_mixer') makedepends=('boost' 'asio' 'cmake') install=springlobby.install diff --git a/community/vbam/PKGBUILD b/community/vbam/PKGBUILD index 3ea2ab4e0..6a182124d 100755 --- a/community/vbam/PKGBUILD +++ b/community/vbam/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 98482 2013-10-11 16:52:10Z alucryd $ +# $Id: PKGBUILD 103805 2014-01-11 20:08:39Z eric $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=vbam pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx') pkgver=1.8.0.1202 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://vba-m.com" license=('GPL2') -makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk' 'zip') +makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk2.8' 'zip') [[ $CARCH == i686 ]] && makedepends+=('nasm') source=("http://downloads.sourceforge.net/project/vbam/vbam-src/vbam-r${pkgver##*.}-src.tar.bz2" 'http://downloads.sourceforge.net/sfml/SFML-1.6-sdk-linux-64.tar.gz' @@ -25,6 +25,7 @@ sha256sums=('148d866c08d7a810be5c845247d212f1d1d07395f2ccdecef10ad81a76072877' prepare() { patch -Np0 -i soil.patch patch -Np0 -i sfml.patch + sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt} } build() { @@ -47,6 +48,7 @@ build() { mkdir build && cd build local _cmakeargs="-DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include -DENABLE_GTK='ON' -DENABLE_WX='ON' \ + -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' -DSFML_INCLUDE_DIR='../staging/usr/include/SFML' \ -DSFML_AUDIO_INCLUDE_DIR='../staging/usr/include/SFML/Audio' \ -DSFML_AUDIO_LIBRARY='../staging/usr/lib/libsfml-audio-s.a' \ @@ -91,7 +93,7 @@ install='vbam-gtk.install' package_vbam-wx() { pkgdesc="Nintendo GameBoy Advance emulator - wx version" -depends=('wxgtk') +depends=('wxgtk2.8') conflicts=('vbam-gtk') options=('!emptydirs') install='vbam-wx.install' diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index ec8bd87b6..e113ddbc8 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103140 2013-12-27 12:02:56Z foutrelis $ +# $Id: PKGBUILD 103819 2014-01-11 20:13:42Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.3.6 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/wxcam/PKGBUILD b/community/wxcam/PKGBUILD index 4364dd27a..0ee0b0a8d 100644 --- a/community/wxcam/PKGBUILD +++ b/community/wxcam/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=wxcam pkgver=1.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=(GPL) pkgdesc="Webcam application for linux" diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD deleted file mode 100644 index 428403d1d..000000000 --- a/community/wxgtk2.9/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 96072 2013-08-19 20:07:32Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=wxgtk2.9 -pkgver=2.9.5 -pkgrel=1 -pkgdesc="GTK+ implementation of wxWidgets API for GUI" -arch=('i686' 'x86_64') -url="http://wxwidgets.org" -license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2') -optdepends=('webkitgtk2: for webview support') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 - wxGTK-2.9.5-collision.patch) -sha1sums=('0bab57ecd6d065a3672ec5fbb09d287456727ea4' - '22f21e91d847779f17cace8cfde553ab1ffac279') - -prepare() { - cd wxWidgets-${pkgver} - patch -p1 -i ../wxGTK-2.9.5-collision.patch -} - -build() { - cd wxWidgets-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make - make -C locale allmo -} - -package() { - cd wxWidgets-${pkgver} - make DESTDIR="${pkgdir}" install - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/wxgtk2.9/wxGTK-2.9.5-collision.patch b/community/wxgtk2.9/wxGTK-2.9.5-collision.patch deleted file mode 100644 index 4d7090581..000000000 --- a/community/wxgtk2.9/wxGTK-2.9.5-collision.patch +++ /dev/null @@ -1,88 +0,0 @@ -Prevent file collisions between multiple installed SLOTs. - - - Don't install wxwin.m4. It is installed with app-admin/eselect-wxwidgets. - - Version the bakefile preset filenames. Unversioned symlinks to these files - are handled by eselect. - - Version wx-config and wxrc. The unversioned forms are wrapper scripts - installed with eselect-wxwidgets. - - Version wxstd.mo and modify AddStdCatalog to use it. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ - all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) - - install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) -- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) - $(DYLIB_RPATH_INSTALL) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - for f in setup.h $(RCDEFS_H); do \ -@@ -14964,15 +14964,16 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -- -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ -+ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale - for l in $(LOCALE_LINGUAS) ; do \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \ -+ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - ---- a/build/bakefiles/wx.bkl -+++ b/build/bakefiles/wx.bkl -@@ -138,7 +138,7 @@ - <using module="gettext"/> - <gettext-catalogs id="locale"> - <srcdir>$(SRCDIR)/locale</srcdir> -- <catalog-name>wxstd</catalog-name> -+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> - <linguas> - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW ---- a/src/common/translation.cpp -+++ b/src/common/translation.cpp -@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not ---- a/utils/wxrc/Makefile.in -+++ b/utils/wxrc/Makefile.in -@@ -124,7 +124,6 @@ distclean: clean - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) ---- a/Makefile.in 2013-07-17 18:32:11.705720544 -0400 -+++ b/Makefile.in 2013-07-17 18:39:24.134286555 -0400 -@@ -16124,7 +16124,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/msw/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - diff --git a/community/xchm/PKGBUILD b/community/xchm/PKGBUILD index 03e29537a..78949a3f8 100644 --- a/community/xchm/PKGBUILD +++ b/community/xchm/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 102193 2013-12-06 12:52:51Z giovanni $ +# $Id: PKGBUILD 103807 2014-01-11 20:08:41Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=xchm pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform GUI front-end to chmlib" arch=('i686' 'x86_64') url="http://xchm.sourceforge.net/" license=('GPL') -depends=('chmlib' 'wxgtk' 'desktop-file-utils') +depends=('chmlib' 'wxgtk2.8' 'desktop-file-utils') install=xchm.install source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz" 'xchm.desktop' @@ -21,7 +21,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - ./configure --prefix=/usr + #export WX_CONFIG_PATH=/usr/bin/wx-config-2.8 + ./configure --prefix=/usr --with-wx-config=wx-config-2.8 make } diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 947b841d3..f41d6245c 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203346 2014-01-08 13:17:00Z giovanni $ + $Id: PKGBUILD 203489 2014-01-11 20:07:05Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> @@ -6,8 +6,8 @@ # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com> pkgname=amule -pkgver=10830 -pkgrel=1 +pkgver=10832 +pkgrel=2 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') url="http://www.amule.org" @@ -17,7 +17,7 @@ install=amule.install source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" 'amuled.systemd' 'amuleweb.systemd') -md5sums=('8ba572ed1c87909ee24652d96f93dc40' +md5sums=('6ffd3a308a4f8802b3fc035ae2d0d3e5' '59772c41860e238f1c822feb8ca8d47f' '05975c5d94bfc41fddb894d98b1115d5') diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD index 444a3763c..8c541c759 100644 --- a/extra/audacity/PKGBUILD +++ b/extra/audacity/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 197206 2013-10-23 23:57:14Z eric $ +# $Id: PKGBUILD 203490 2014-01-11 20:07:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=audacity pkgver=2.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64') url="http://audacity.sourceforge.net/" license=('GPL') -depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme' +depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'hicolor-icon-theme' 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg-compat') makedepends=('cmake') options=('!makeflags') @@ -18,7 +18,7 @@ sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33') build() { cd ${pkgname}-src-${pkgver} - PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ + WX_CONFIG=/usr/bin/wx-config-2.8 PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ ./configure --prefix=/usr make } diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD index f36a819e0..c44b32106 100644 --- a/extra/fribidi/PKGBUILD +++ b/extra/fribidi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 197964 2013-10-30 11:57:39Z allan $ +# $Id: PKGBUILD 203466 2014-01-11 09:29:09Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Nezmer <Nezmer@gmail.com> pkgname=fribidi -pkgver=0.19.5 +pkgver=0.19.6 pkgrel=1 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" arch=('i686' 'x86_64') license=('LGPL') url="http://fribidi.org" -depends=('glibc') +depends=('glib2') source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('925bafb97afee8a2fc2d0470c072a155') +md5sums=('ce93d862344991173dabb609bf93ca1d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index b0549dded..7196972d2 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 200325 2013-11-25 21:47:00Z eric $ +# $Id: PKGBUILD 203491 2014-01-11 20:07:07Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot pkgver=4.6.4 -pkgrel=2 +pkgrel=4 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" license=('custom') -depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt4') +depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt4' 'gnutls') makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra') options=('!makeflags') install=gnuplot.install diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 4ecd76aea..1cc75c60f 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 201259 2013-12-07 10:34:58Z bpiotrowski $ +# $Id: PKGBUILD 203492 2014-01-11 20:07:08Z eric $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,14 +6,15 @@ pkgname=hugin pkgver=2013.0.0 -pkgrel=3 +pkgrel=4 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64') +optdepends=('python2: bindings and plugins') +makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig') depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13' 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils') -makedepends=('cmake' 'boost' 'tclap' 'mesa') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d') @@ -24,8 +25,7 @@ build() { cmake . \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_LAPACK=yes \ - -DBUILD_HSI=no + -DENABLE_LAPACK=yes make } diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 428acd0f5..0a8ad5462 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 203380 2014-01-09 06:32:23Z fyan $ +# $Id: PKGBUILD 203458 2014-01-11 02:11:21Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgbase=ibus pkgname=(ibus libibus) pkgver=1.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') url="http://ibus.googlecode.com" @@ -31,7 +31,7 @@ build() { } package_ibus() { - depends+=("libibus=$pkgver") + depends+=("libibus=$pkgver" 'python2-gobject') install=ibus.install cd ${pkgbase}-${pkgver} diff --git a/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch b/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch new file mode 100644 index 000000000..e4857e7ad --- /dev/null +++ b/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch @@ -0,0 +1,163 @@ +From 51bf0ead89df5c1ddaa22d2f7fc0e04cedbdc590 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Thu, 26 Dec 2013 18:58:23 -0800 +Subject: [PATCH] Revert "Drop deprecated functions" + +This reverts commit 7a38f4abc3ed1df368d5bad32a1d72559acdc234. It is incorrect and dangerous to drop functions without an soname bump. This broke GNOME. +--- + libevdev/libevdev.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + libevdev/libevdev.h | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 79 insertions(+) + +diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c +index 8a37204..02e4f78 100644 +--- a/libevdev/libevdev.c ++++ b/libevdev/libevdev.c +@@ -162,6 +162,14 @@ libevdev_free(struct libevdev *dev) + free(dev); + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT void ++libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) ++{ ++ /* Can't be backwards compatible to this yet, so don't even try */ ++ fprintf(stderr, "libevdev: ABI change. Log function will not be honored.\n"); ++} ++ + LIBEVDEV_EXPORT void + libevdev_set_log_function(libevdev_log_func_t logfunc, void *data) + { +@@ -1244,6 +1252,12 @@ libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigned in + } + + LIBEVDEV_EXPORT int ++libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) ++{ ++ return libevdev_kernel_set_abs_info(dev, code, abs); ++} ++ ++LIBEVDEV_EXPORT int + libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) + { + int rc; +@@ -1296,12 +1310,22 @@ libevdev_grab(struct libevdev *dev, enum libevdev_grab_mode grab) + return rc < 0 ? -errno : 0; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT int ++libevdev_is_event_type(const struct input_event *ev, unsigned int type) ++ALIAS(libevdev_event_is_type); ++ + LIBEVDEV_EXPORT int + libevdev_event_is_type(const struct input_event *ev, unsigned int type) + { + return type < EV_CNT && ev->type == type; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT int ++libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) ++ALIAS(libevdev_event_is_code); ++ + LIBEVDEV_EXPORT int + libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned int code) + { +@@ -1314,6 +1338,11 @@ libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned + return (max > -1 && code <= (unsigned int)max && ev->code == code); + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const char* ++libevdev_get_event_type_name(unsigned int type) ++ALIAS(libevdev_event_type_get_name); ++ + LIBEVDEV_EXPORT const char* + libevdev_event_type_get_name(unsigned int type) + { +@@ -1323,6 +1352,11 @@ libevdev_event_type_get_name(unsigned int type) + return ev_map[type]; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const char* ++libevdev_get_event_code_name(unsigned int type, unsigned int code) ++ALIAS(libevdev_event_code_get_name); ++ + LIBEVDEV_EXPORT const char* + libevdev_event_code_get_name(unsigned int type, unsigned int code) + { +@@ -1334,6 +1368,16 @@ libevdev_event_code_get_name(unsigned int type, unsigned int code) + return event_type_map[type][code]; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const char* ++libevdev_get_input_prop_name(unsigned int prop) ++ALIAS(libevdev_property_get_name); ++ ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const char* ++libevdev_get_property_name(unsigned int prop) ++ALIAS(libevdev_property_get_name); ++ + LIBEVDEV_EXPORT const char* + libevdev_property_get_name(unsigned int prop) + { +@@ -1343,6 +1387,11 @@ libevdev_property_get_name(unsigned int prop) + return input_prop_map[prop]; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT int ++libevdev_get_event_type_max(unsigned int type) ++ALIAS(libevdev_event_type_get_max); ++ + LIBEVDEV_EXPORT int + libevdev_event_type_get_max(unsigned int type) + { +diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h +index 37ca2f4..c89f4ad 100644 +--- a/libevdev/libevdev.h ++++ b/libevdev/libevdev.h +@@ -1642,6 +1642,36 @@ int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period); + #define LIBEVDEV_DEPRECATED + #endif + ++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_SYNC; ++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_NORMAL; ++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC; ++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING; ++ ++/* replacement: libevdev_kernel_set_abs_info */ ++int libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) LIBEVDEV_DEPRECATED; ++ ++ ++/* replacement: libevdev_set_log_function */ ++void libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_event_type_get_max */ ++int libevdev_get_event_type_max(unsigned int type) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_property_get_name */ ++const char* libevdev_get_property_name(unsigned int prop) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_event_type_get_name */ ++const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED; ++/** replacement: libevdev_event_code_get_name */ ++const char * libevdev_get_event_code_name(unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_event_is_type */ ++int libevdev_is_event_type(const struct input_event *ev, unsigned int type) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_event_is_code */ ++int libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; ++/**************************************/ ++ + #ifdef __cplusplus + } + #endif +-- +1.8.5.2 + diff --git a/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch b/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch new file mode 100644 index 000000000..250be8505 --- /dev/null +++ b/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch @@ -0,0 +1,30 @@ +From 9ee61912a356bb8c1995cf262428196e5e4f179d Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri, 3 Jan 2014 08:30:04 +1000 +Subject: [PATCH libevdev] Revert "Drop some leftover deprecated constants." + +This reverts commit a612ee753e8c40d2d1fff6da516d278064e27d86. +--- + libevdev/libevdev.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c +index 8a37204..432aeff 100644 +--- a/libevdev/libevdev.c ++++ b/libevdev/libevdev.c +@@ -36,6 +36,12 @@ + + #define MAXEVENTS 64 + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_SYNC = LIBEVDEV_READ_FLAG_SYNC; ++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_NORMAL = LIBEVDEV_READ_FLAG_NORMAL; ++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC = LIBEVDEV_READ_FLAG_FORCE_SYNC; ++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING = LIBEVDEV_READ_FLAG_BLOCKING; ++ + static int sync_mt_state(struct libevdev *dev, int create_events); + + static int +-- +1.8.4.2 + diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD index 551f90a53..8f669ce1a 100644 --- a/extra/libevdev/PKGBUILD +++ b/extra/libevdev/PKGBUILD @@ -2,19 +2,29 @@ # Maintainer: Jan de Groot pkgname=libevdev -pkgver=0.4 -pkgrel=2 +pkgver=0.6 +pkgrel=1 pkgdesc="Wrapper library for evdev devices" arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/libevdev/" license=(custom:X11) depends=('glibc') makedepends=('python') -source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42') +source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz + 0001-Revert-Drop-deprecated-functions.patch + 0001-Revert-Drop-some-leftover-deprecated-constants.patch) +sha256sums=('1c562ed32252ef9c14aa61e03b38acb886cb3edbbdafbb5181762ff16e010d93' + '783ba5edf7c9525e8cac46c8c4c981c98395ff3c68ed7a162190ef9e8f13b149' + '24d52811732b3335eb363416e4862c6152bfe6ebc8c372a298126221f754f041') build() { cd $pkgname-$pkgver + + # Fix libevdev 0.6 missing symbol that breaks clutter, patches from Fedora + # https://bugzilla.redhat.com/show_bug.cgi?id=1046426 + patch -Np1 -i ../0001-Revert-Drop-deprecated-functions.patch + patch -Np1 -i ../0001-Revert-Drop-some-leftover-deprecated-constants.patch + ./configure --prefix=/usr --disable-static --disable-gcov make } diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD index 7b6ed5843..87ede8fa3 100644 --- a/extra/libotr/PKGBUILD +++ b/extra/libotr/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 198216 2013-10-30 13:31:00Z allan $ +# $Id: PKGBUILD 203477 2014-01-11 10:56:47Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Bug <Bug2000@gmail.com> pkgname=libotr pkgver=4.0.0 -pkgrel=1 +pkgrel=4 pkgdesc='Off-the-Record Messaging Library and Toolkit' url='http://www.cypherpunks.ca/otr/' license=('GPL' 'LGPL') arch=('i686' 'x86_64') depends=('libgcrypt') -source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc') +source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz" + 'kopete.patch') +sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc' + '55988c4f11b6852491a758ea7a5b7071e8959c55') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../kopete.patch # FS#38326 +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --disable-static + ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/extra/libotr/kopete.patch b/extra/libotr/kopete.patch new file mode 100644 index 000000000..110e4eec2 --- /dev/null +++ b/extra/libotr/kopete.patch @@ -0,0 +1,12 @@ +diff -Naur old/src/message.c new/src/message.c +--- old/src/message.c 2012-08-31 02:15:35.000000000 -1000 ++++ new/src/message.c 2014-01-06 01:22:43.316831758 -1000 +@@ -441,7 +441,7 @@ + /* Fragment and send according to policy */ + if (!err && messagep && *messagep) { + if (context) { +- err = fragment_and_send(ops, NULL, context, *messagep, ++ err = fragment_and_send(ops, opdata, context, *messagep, + fragPolicy, messagep); + } + } diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index 401156852..4a288f8fe 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200788 2013-12-05 08:49:59Z giovanni $ +# $Id: PKGBUILD 203468 2014-01-11 09:48:53Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.8.2 +pkgver=4.8.5 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('57eb0738c57a177e2e76f0b398af811d') +md5sums=('2059342ce25d610428dfda6c8f65a06f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 287b4824b..c51f92acc 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200849 2013-12-06 11:57:53Z giovanni $ +# $Id: PKGBUILD 203470 2014-01-11 09:55:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.12.05 +pkgver=2014.01.07 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://live555.com/liveMedia" depends=('gcc-libs') options=('staticlibs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('7f3d0e17b6d894a3140c35f9091a8a70') +md5sums=('691421f4c3c6c8a40bd6045d76103e98') build() { cd ${srcdir}/live diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index b1f2a3602..60851eb7b 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 201265 2013-12-07 10:35:05Z bpiotrowski $ +# $Id: PKGBUILD 203493 2014-01-11 20:07:09Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=6.6.0 -pkgrel=3 +pkgver=6.7.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") -md5sums=('1e952a3196b0c43150801eeaecba68ed') +md5sums=('27bb6b0a10b3bb2fcf1c3e520c300207') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 4259a905c..34997d0cb 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191962 2013-08-02 03:24:15Z bisson $ +# $Id: PKGBUILD 203483 2014-01-11 16:49:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=17 +pkgrel=18 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -19,7 +19,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntpdate.service') sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' 'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b' - 'ff8370719f003f184563b7d6068c03086678482f' + 'dd24216e8333e12d5080965696602591c72537b1' 'e1c48cba549b7d21501aadf513926e463884c090' ) diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service index 45239877f..cfd965a6b 100644 --- a/extra/ntp/ntpd.service +++ b/extra/ntp/ntpd.service @@ -5,7 +5,8 @@ After=network.target nss-lookup.target [Service] Type=forking PrivateTmp=true -ExecStart=/usr/bin/ntpd -g -u ntp:ntp +PIDFile=/run/ntpd.pid +ExecStart=/usr/bin/ntpd -g -u ntp:ntp -p /run/ntpd.pid Restart=always [Install] diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 2af6b4d09..626cd3c9d 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 202666 2013-12-23 21:05:04Z ronald $ +# $Id: PKGBUILD 203485 2014-01-11 17:11:51Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.6.4 -pkgrel=5 +pkgrel=6 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" @@ -36,7 +36,7 @@ build() { ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-shared --disable-static \ - --with-quantum-depth=32 \ + --with-quantum-depth=16 \ --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html LANG=C make diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD index bfa2c97c1..5380ff276 100644 --- a/extra/openbabel/PKGBUILD +++ b/extra/openbabel/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 198351 2013-10-30 14:20:21Z allan $ +# $Id: PKGBUILD 203494 2014-01-11 20:07:10Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=openbabel pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library designed to interconvert between many file formats used in molecular modeling and computational chemistry" arch=('i686' 'x86_64') url="http://openbabel.org/wiki/Main_Page" license=('GPL') -depends=('gcc-libs' 'libxml2') +depends=('gcc-libs' 'libxml2' 'libsm') makedepends=('cmake' 'eigen2' 'wxgtk') optdepends=('eigen2: to use bindings' - 'wxgtk: GUI interface') + 'wxgtk: GUI interface') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('9b0007560d9d838b40ab4ad06daf5610') diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 00938d9d0..0beb2d676 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198600 2013-10-30 17:27:07Z giovanni $ +# $Id: PKGBUILD 203472 2014-01-11 10:10:43Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.55 -pkgrel=2 +pkgver=1.56 +pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') license=('custom:BSD') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('473b8d66ca69d5784bb0e428721f58e0') +md5sums=('1a5258167ad0ac6a2b695a6fdc0c6e60') prepare() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 14d0125d6..84c40b675 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 199073 2013-11-08 10:00:05Z giovanni $ +# $Id: PKGBUILD 203474 2014-01-11 10:30:22Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.9 +pkgver=1.1.0 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7a27698842663c6197228ff3c282a079') +md5sums=('2ccd1f4eda732654460ff03b77738a96') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD index 0b8c6fcf9..4c539c847 100644 --- a/extra/wxgtk/PKGBUILD +++ b/extra/wxgtk/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 184450 2013-05-06 19:40:13Z foutrelis $ +# $Id: PKGBUILD 203497 2014-01-11 20:07:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk -pkgver=2.8.12.1 -pkgrel=5 +pkgver=3.0.0 +pkgrel=2 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64') url="http://wxwidgets.org" license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'sdl') -makedepends=('gstreamer0.10-base-plugins' 'gconf') -#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') +depends=('gtk2' 'gstreamer0.10-base') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu') +optdepends=('webkitgtk2: for webview support') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2) +sha1sums=('756a9c54d1f411e262f03bacb78ccef085a9880a') build() { - cd wx*-${pkgver} + cd wxWidgets-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --enable-stl --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --with-sdl --disable-precomp-headers + --disable-precomp-headers make make -C locale allmo - make -C contrib/src } package() { - cd wx*-${pkgver} + cd wxWidgets-${pkgver} make DESTDIR="${pkgdir}" install - make -C contrib/src DESTDIR="${pkgdir}" install install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/wxgtk2.8/PKGBUILD b/extra/wxgtk2.8/PKGBUILD new file mode 100644 index 000000000..a10905131 --- /dev/null +++ b/extra/wxgtk2.8/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 203498 2014-01-11 20:07:14Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=wxgtk2.8 +pkgver=2.8.12.1 +pkgrel=1 +pkgdesc="GTK+ implementation of wxWidgets API for GUI" +arch=('i686' 'x86_64') +url="http://wxwidgets.org" +license=('custom:wxWindows') +depends=('gtk2' 'gstreamer0.10-base' 'sdl') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'glu') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxGTK-collision.patch) +sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' + '575fb4688051c246777988332f55703df403d6b9') + +prepare() { + cd wx*-${pkgver} + patch -p1 -i ../wxGTK-collision.patch +} + +build() { + cd wx*-${pkgver} + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ + --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --with-sdl --disable-precomp-headers + make + make -C locale allmo + make -C contrib/src +} + +package() { + cd wx*-${pkgver} + make DESTDIR="${pkgdir}" install + make -C contrib/src DESTDIR="${pkgdir}" install + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/wxgtk2.8/wxGTK-collision.patch b/extra/wxgtk2.8/wxGTK-collision.patch new file mode 100644 index 000000000..f6e02d876 --- /dev/null +++ b/extra/wxgtk2.8/wxGTK-collision.patch @@ -0,0 +1,82 @@ +diff -Naur wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl wxPython-src-2.8.12.1/build/bakefiles/wx.bkl +--- wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl 2014-01-04 22:28:16.491774907 -0500 ++++ wxPython-src-2.8.12.1/build/bakefiles/wx.bkl 2014-01-04 22:37:39.610020870 -0500 +@@ -128,7 +128,7 @@ + <using module="gettext"/> + <gettext-catalogs id="locale"> + <srcdir>$(SRCDIR)/locale</srcdir> +- <catalog-name>wxstd</catalog-name> ++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> + <linguas> + ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk + zh zh_CN zh_TW +diff -Naur wxPython-src-2.8.12.1.orig/Makefile.in wxPython-src-2.8.12.1/Makefile.in +--- wxPython-src-2.8.12.1.orig/Makefile.in 2014-01-04 22:28:16.545107766 -0500 ++++ wxPython-src-2.8.12.1/Makefile.in 2014-01-04 22:40:27.191813403 -0500 +@@ -11695,10 +11695,11 @@ + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + + install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) +- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal +- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) ++ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets +- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) ++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ ++ for i in wx.bkl wx_unix.bkl wx_win32.bkl ; do \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx + for f in setup.h $(RCDEFS_H); do \ + if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ +@@ -12455,7 +12456,8 @@ + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config + $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ ++ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale +@@ -12463,7 +12465,8 @@ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ + if test -f $(srcdir)/locale/$$l.mo ; then \ +- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ ++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \ ++ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ + fi ; \ + done + +@@ -12480,7 +12483,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ + if test -f $(srcdir)/locale/msw/$$l.mo ; then \ +- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ ++ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ + fi ; \ + done + +diff -Naur wxPython-src-2.8.12.1.orig/src/common/intl.cpp wxPython-src-2.8.12.1/src/common/intl.cpp +--- wxPython-src-2.8.12.1.orig/src/common/intl.cpp 2014-01-04 22:28:16.675106608 -0500 ++++ wxPython-src-2.8.12.1/src/common/intl.cpp 2014-01-04 22:47:49.523526232 -0500 +@@ -1597,7 +1597,7 @@ + bool bOk = true; + if ( bLoadDefault ) + { +- bOk = AddCatalog(wxT("wxstd")); ++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))); + + // there may be a catalog with toolkit specific overrides, it is not + // an error if this does not exist +diff -Naur wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in wxPython-src-2.8.12.1/utils/wxrc/Makefile.in +--- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in 2014-01-04 22:28:16.335109635 -0500 ++++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in 2014-01-04 22:37:34.410068493 -0500 +@@ -120,7 +120,6 @@ + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) + @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) + @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) +-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) + + @COND_USE_XRC_1@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index c6102c3ba..3c4a112ce 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -5,18 +5,19 @@ pkgname=wxmaxima pkgver=13.04.2 -pkgrel=1 +pkgrel=2 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64') url="http://wxmaxima.sourceforge.net/" license=('GPL2') -depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils') +depends=('maxima' 'libxml2' 'wxgtk2.8' 'shared-mime-info' 'desktop-file-utils') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) install=wxmaxima.install sha1sums=('9508d3badb6c339f34e73e01c5065f679329a17c') build() { cd "${srcdir}/wxMaxima-${pkgver}" + export WX_CONFIG_PATH=/usr/bin/wx-config-2.8 ./configure --prefix=/usr make } diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index af7659559..c15f815e1 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 168112 2012-10-06 03:24:39Z eric $ +# $Id: PKGBUILD 203500 2014-01-11 20:07:15Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxpython -pkgver=2.8.12.1 -pkgrel=4 +pkgver=3.0.0.0 +_editraver=0.7.20 +pkgrel=1 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64') license=('custom:wxWindows') url="http://www.wxpython.org" depends=('wxgtk' 'python2') -makedepends=('mesa') -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 - wxpython-cairo.patch wxpython-fpb_default_style.patch) -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' - '420700b0a216b853352ffafd054f406a82a30bb3' - 'b832d628b8ff38ea598f404d133899f40d687a22') +makedepends=('mesa' 'glu') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 + http://editra.org/uploads/src/Editra-${_editraver}.tar.gz) +sha1sums=('48451763275cfe4e5bbec49ccd75bc9652cba719' + 'f439f4aa2cb90b8348cebb1670df9cf47ba341ab') + +prepare() { + cd "${srcdir}" + find . -type f -exec sed -i 's/env python/env python2/' {} \; + sed -i 's/sys.exit(1)//' Editra-${_editraver}/setup.py +} build() { cd "${srcdir}/wxPython-src-${pkgver}" - find . -type f -exec sed -i 's/env python/env python2/' {} \; - mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --disable-optimize --enable-mediactrl \ - --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - cd "${srcdir}/wxPython-src-${pkgver}/wxPython" - patch -p2 -i "${srcdir}/wxpython-cairo.patch" - patch -p1 -i "${srcdir}/wxpython-fpb_default_style.patch" + --enable-graphics_ctx --enable-mediactrl --disable-precomp-headers \ + --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys + cd wxPython python2 setup.py WXPORT=gtk2 UNICODE=1 build } @@ -34,4 +35,8 @@ package() { cd "${srcdir}/wxPython-src-${pkgver}/wxPython" python2 setup.py WXPORT=gtk2 UNICODE=1 install --root="${pkgdir}" install -D -m644 ../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + cd "${srcdir}/Editra-${_editraver}" + python2 setup.py install --root="${pkgdir}" + rm -r "${pkgdir}/usr/lib/python2.7/site-packages/wx-3.0-gtk2/wx/tools/Editra" } diff --git a/extra/wxpython/wxpython-cairo.patch b/extra/wxpython/wxpython-cairo.patch deleted file mode 100644 index f3fc6fba0..000000000 --- a/extra/wxpython/wxpython-cairo.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- wxPython/trunk/wx/lib/wxcairo.py 2011/08/25 18:50:02 68894 -+++ wxPython/trunk/wx/lib/wxcairo.py 2011/09/22 00:30:25 69181 -@@ -401,6 +401,48 @@ - ctypes.py_object)), - ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] - -+ # This structure is known good with pycairo 1.10.0. The keep adding stuff -+ # to the middle of the structure instead of only adding to the end! -+ elif cairo.version_info < (1,11): -+ _fields_ = [ -+ ('Context_Type', ctypes.py_object), -+ ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object, -+ ctypes.c_void_p, -+ ctypes.py_object, -+ ctypes.py_object)), -+ ('FontFace_Type', ctypes.py_object), -+ ('ToyFontFace_Type', ctypes.py_object), #** new in 1.8.4 -+ ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('FontOptions_Type', ctypes.py_object), -+ ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('Matrix_Type', ctypes.py_object), -+ ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('Path_Type', ctypes.py_object), -+ ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('Pattern_Type', ctypes.py_object), -+ ('SolidPattern_Type', ctypes.py_object), -+ ('SurfacePattern_Type', ctypes.py_object), -+ ('Gradient_Type', ctypes.py_object), -+ ('LinearGradient_Type', ctypes.py_object), -+ ('RadialGradient_Type', ctypes.py_object), -+ ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p, -+ ctypes.py_object)), #** changed in 1.8.4 -+ ('ScaledFont_Type', ctypes.py_object), -+ ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('Surface_Type', ctypes.py_object), -+ ('ImageSurface_Type', ctypes.py_object), -+ ('PDFSurface_Type', ctypes.py_object), -+ ('PSSurface_Type', ctypes.py_object), -+ ('SVGSurface_Type', ctypes.py_object), -+ ('Win32Surface_Type', ctypes.py_object), -+ ('Win32PrintingSurface_Type', ctypes.py_object), -+ ('XCBSurface_Type', ctypes.py_object), -+ ('XlibSurface_Type', ctypes.py_object), -+ ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object, -+ ctypes.c_void_p, -+ ctypes.py_object)), -+ ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] -+ - - def _loadPycairoAPI(): - global pycairoAPI diff --git a/extra/wxpython/wxpython-fpb_default_style.patch b/extra/wxpython/wxpython-fpb_default_style.patch deleted file mode 100644 index 906d3444d..000000000 --- a/extra/wxpython/wxpython-fpb_default_style.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 50185) -+++ wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 69431) -@@ -18,5 +18,4 @@ - self.AddWindowStyles() - # Custom styles -- self.AddStyle('FPB_DEFAULT_STYLE', fpb.FPB_DEFAULT_STYLE) - self.AddStyle('FPB_SINGLE_FOLD', fpb.FPB_SINGLE_FOLD) - self.AddStyle('FPB_COLLAPSE_TO_BOTTOM', fpb.FPB_COLLAPSE_TO_BOTTOM) ---- wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 57250) -+++ wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 69431) -@@ -20,5 +20,5 @@ - implicit_attributes=['label', 'collapsed'], - implicit_params={'collapsed': params.ParamBool}) --c.addStyles('FPB_DEFAULT_STYLE', 'FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM', -+c.addStyles('FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM', - 'FPB_EXCLUSIVE_FOLD', 'FPB_HORIZONTAL', 'FPB_VERTICAL') - component.Manager.register(c) diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 75d6d8b63..799e57b23 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103342 2014-01-03 12:23:23Z jelle $ +# $Id: PKGBUILD 103745 2014-01-11 10:18:19Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.18.0 +pkgver=1.19.0 pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('6a89229787a8ca63ece9c905df304222' +md5sums=('5ce57bf48ed7f534fe9d5c55157dd15a' '95ca4eb3afa7c737c8371708a23bdad9' '675cd87d41342119827ef706055491e7') diff --git a/libre/grub/09_parabola b/libre/grub/09_parabola new file mode 100644 index 000000000..49cbad4ba --- /dev/null +++ b/libre/grub/09_parabola @@ -0,0 +1,178 @@ +#!/usr/bin/env bash + +## +## grub-mkconfig helper script specific to Parabola GNU/Linux-libre +## Contributed by "Keshav Padram Amburay" <the ddoott ridikulus ddoott rat aatt geemmayil ddoott ccoomm> +## Rebranded for Parabola by "André Silva" <emulatorman@parabola.nu> +## +## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script +## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream +## +## This script can be freely distributed and/or modified +## under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This script is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +_FUNC_GRUB_FILE_PRESENT() { + + [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86" + + if [[ "${GRUB_PLATFORM}" == "x86" ]]; then + check="--is-x86-linux32" + elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then + check="--is-i386-xen-pae-domu" + elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then + check="--is-x86_64-xen-domu" + else + check="--is-${GRUB_PLATFORM}-linux" + fi + + case "${GRUB_PLATFORM}" in + x86) + list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do + if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi + done)" ;; + *) + list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do + if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi + done)" ;; + esac +} + +set -e + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="/usr/share" +datadir="${datarootdir}" +sysconfdir="/etc" + +. "${datarootdir}/grub/grub-mkconfig_lib" + +. "${sysconfdir}/default/grub" + +export TEXTDOMAIN="grub" +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class parabola --class gnu-linux --class gnu --class os" + +[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT + +BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)" +BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null)" +BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)" + +ROOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/" 2>/dev/null)" +ROOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/" 2>/dev/null)" +ROOT_PART_FS="$(${grub_probe} --target="fs" "/" 2>/dev/null)" + +if [[ "${ROOT_PART_FS_UUID}" == "${BOOT_PART_FS_UUID}" ]]; then + SUBDIR="/boot" +else + SUBDIR="" +fi + +if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then + if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \ + [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \ + [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \ + uses_abstraction "${GRUB_DEVICE}" lvm ; then + GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}" + else + GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}" + fi +fi + +[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + +for _KERNEL_ in ${list} ; do + + echo "Found linux image: ${_KERNEL_}" >&2 + + _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')" + _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')" + + _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img" + + if [[ -e "/boot/${_INITRAMFS_}" ]]; then + + echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2 + +cat << EOF + +menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} { + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' + linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...' + initrd ${SUBDIR}/${_INITRAMFS_} +} + +EOF + fi + + _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img" + + if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then + + echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2 + +cat << EOF + +menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} { + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' + linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...' + initrd ${SUBDIR}/${_INITRAMFS_FALLBACK_} +} + +EOF + fi + + if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then +cat << EOF + +menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} { + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' + linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} +} + +EOF + fi + +done diff --git a/libre/grub/10_linux.in.patch b/libre/grub/10_linux.in.patch new file mode 100644 index 000000000..c9285e699 --- /dev/null +++ b/libre/grub/10_linux.in.patch @@ -0,0 +1,31 @@ +diff -Nur grub.orig/util/grub.d/10_linux.in grub/util/grub.d/10_linux.in +--- grub.orig/util/grub.d/10_linux.in 2014-01-11 06:07:40.750886565 -0200 ++++ grub/util/grub.d/10_linux.in 2014-01-11 06:14:19.032955542 -0200 +@@ -30,8 +30,25 @@ + + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux +-else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ else ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ fi + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" + fi + diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index a4a17b4c8..c82b41a13 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -4,18 +4,18 @@ # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> # Contributor (Parabola): Márcio Silva <coadde@parabola.nu> -_pkgver="2.00" -_GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953" +_pkgver="2.02" +_GRUB_GIT_TAG="grub-2.02-beta2" -## grub-extras gpxe is not needed +_UNIFONT_VER="6.3.20131217" [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" -pkgver=2.00.1282.g5ae5c54 -pkgrel=1.3 +pkgver=2.02.beta2 +pkgrel=1 epoch="1" url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') @@ -28,9 +28,8 @@ conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy') replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") -makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' - 'python2' 'autogen' 'texinfo' 'help2man' - 'gettext' 'device-mapper' 'fuse') +makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' 'fuse: For grub-mount usage' @@ -40,59 +39,62 @@ optdepends=('freetype2: For grub-mkfont usage' 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' 'mtools: For grub-mkrescue FAT FS support') -# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" -source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}" - 'http://unifoundry.com/unifont-5.1.20080820.bdf.gz' - 'parabola_grub_mkconfig_fixes.patch' +source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}" + "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#branch=master" + "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz" + "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig" + 'grub-add-GRUB_COLOR_variables.patch' + '09_parabola' '60_memtest86+' - 'grub.default') - + 'grub.default' + '10_linux.in.patch') md5sums=('SKIP' - '6b8263ceccef33bd633aa019d74b7943' - 'aec37e36ba7806217be33d12a7eed062' - 'be55eabc102f2c60b38ed35c203686d6' - 'a9ef0067f6824944fa1ae22a5162d7d4' 'SKIP' + '728b7439ac733a7c0d56049adec364c7' 'SKIP' - 'SKIP') - -for _DIR_ in 915resolution lua ntldr-img ; do - source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") -done + 'e506ae4a9f9f7d1b765febfa84e10d48' + 'd272e5fa811859838cfb60cc656d66ed' + 'be55eabc102f2c60b38ed35c203686d6' + '52d374e0194e3f2e39ff7c92ecd58a6c' + 'b23a144b7001c88734b79ed3bec491c4') pkgver() { cd "${srcdir}/grub-${_pkgver}/" - echo "$(git describe --tags)" | sed -e 's|-|\.|g' + echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g' } prepare() { cd "${srcdir}/grub-${_pkgver}/" - msg "Patch to enable grub-mkconfig detect Parabola kernels and initramfs" - patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" + msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig" + ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html + patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch" + echo msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme" sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac" + msg "Rebranding for some free distros" + patch -Np1 -i "${srcdir}/10_linux.in.patch" + echo + msg "Fix mkinitcpio 'rw' FS#36275" sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" - msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3" - sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh" + # msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3" + # sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh" msg "Pull in latest language files" ./linguas.sh echo - msg "Remove non working langs which need LC_ALL=C.UTF-8" + msg "Remove not working langs which need LC_ALL=C.UTF-8" sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS" msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847" - cp "${srcdir}/unifont-5.1.20080820.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf" + cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf" - msg "Fix freetype header path file" - sed 's|freetype/ftsynth[.]h|freetype2/ftsynth.h|g' -i "${srcdir}/grub-${_pkgver}/util/grub-"{gen-{asciih,widthspec},mkfont}.c } _build_grub-common_and_bios() { @@ -104,16 +106,14 @@ _build_grub-common_and_bios() { _EFIEMU="--disable-efiemu" fi - msg "Copy the source for building the bios package" + msg "Copy the source for building the bios part" cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios" cd "${srcdir}/grub-${_pkgver}-bios/" msg "Add the grub-extra sources for bios build" install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras" - for _DIR_ in 915resolution ntldr-img ; do - cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-bios/grub-extras/${_DIR_}" - done - export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/" + cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution" + export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-bios/grub-extras/" msg "Unset all compiler FLAGS for bios build" unset CFLAGS @@ -161,31 +161,24 @@ _build_grub-common_and_bios() { _build_grub-efi() { - msg "Copy the source for building the efi package" - cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi" - cd "${srcdir}/grub-${_pkgver}-efi/" - - msg "Add the grub-extra sources for efi build" - install -d "${srcdir}/grub-${_pkgver}-efi/grub-extras/" - for _DIR_ in lua ; do - cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-efi/grub-extras/${_DIR_}" - done - # export GRUB_CONTRIB="${srcdir}/grub-efi/grub-extras/" + msg "Copy the source for building the ${_EFI_ARCH} efi part" + cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}" + cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - msg "Unset all compiler FLAGS for efi build" + msg "Unset all compiler FLAGS for ${_EFI_ARCH} efi build" unset CFLAGS unset CPPFLAGS unset CXXFLAGS unset LDFLAGS unset MAKEFLAGS - cd "${srcdir}/grub-${_pkgver}-efi/" + cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - msg "Run autogen.sh for efi build" + msg "Run autogen.sh for ${_EFI_ARCH} efi build" ./autogen.sh echo - msg "Run ./configure for efi build" + msg "Run ./configure for ${_EFI_ARCH} efi build" ./configure \ --with-platform="efi" \ --target="${_EFI_ARCH}" \ @@ -211,7 +204,7 @@ _build_grub-efi() { --disable-werror echo - msg "Run make for efi build" + msg "Run make for ${_EFI_ARCH} efi build" make echo @@ -225,7 +218,7 @@ build() { _build_grub-common_and_bios echo - msg "Build grub efi stuff" + msg "Build grub ${_EFI_ARCH} efi stuff" _build_grub-efi echo @@ -244,38 +237,36 @@ _package_grub-common_and_bios() { rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true + msg "Install 09_parabola helper script for grub-mkconfig" + install -D -m0755 "${srcdir}/09_parabola" "${pkgdir}/etc/grub.d/09_parabola" + msg "Install extra /etc/grub.d/ files" install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" msg "Install /etc/default/grub (used by grub-mkconfig)" install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - msg "Add msdos.mod symlink" - ln -s "msdospart.mod" "${pkgdir}/usr/lib/grub/i386-pc/msdos.mod" || true } _package_grub-efi() { - cd "${srcdir}/grub-${_pkgver}-efi/" + cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - msg "Run make install for efi build" + msg "Run make install for ${_EFI_ARCH} efi build" make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo - msg "Remove gdb debugging related files for efi build" + msg "Remove gdb debugging related files for ${_EFI_ARCH} efi build" rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true - msg "Add msdos.mod symlink" - ln -s "msdospart.mod" "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi/msdos.mod" || true - } package() { - msg "Package grub efi stuff" + msg "Package grub ${_EFI_ARCH} efi stuff" _package_grub-efi msg "Package grub bios stuff" diff --git a/libre/grub/grub-add-GRUB_COLOR_variables.patch b/libre/grub/grub-add-GRUB_COLOR_variables.patch new file mode 100644 index 000000000..c113a81d5 --- /dev/null +++ b/libre/grub/grub-add-GRUB_COLOR_variables.patch @@ -0,0 +1,32 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 3390ba9..c416489 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -218,6 +218,8 @@ export GRUB_DEFAULT \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index d2e7252..8259f45 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -125,6 +125,14 @@ cat <<EOF + + EOF + ++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then ++ cat << EOF ++set menu_color_normal=$GRUB_COLOR_NORMAL ++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT ++ ++EOF ++fi ++ + serial=0; + gfxterm=0; + for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do diff --git a/libre/grub/grub.default b/libre/grub/grub.default index 38bb4a57f..8455b67dd 100644 --- a/libre/grub/grub.default +++ b/libre/grub/grub.default @@ -45,6 +45,3 @@ GRUB_COLOR_HIGHLIGHT="white/magenta" #GRUB_INIT_TUNE="480 440 1" #GRUB_SAVEDEFAULT="true" - -# Disable advanced submenu, due 10_linux script file generates submenu without closing bracket with grub-mkconfig -GRUB_DISABLE_SUBMENU="y" diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 76bca922a..7172dbc05 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 203283 2014-01-07 12:58:21Z heftig $ +# $Id: PKGBUILD 203419 2014-01-10 16:09:41Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=gst-plugins-bad pkgname=$_pkgname-libre pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls' 'wildmidi') -makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi' - 'gobject-introspection') +makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi' 'librsvg' + 'gobject-introspection' 'gtk-doc') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname @@ -24,7 +24,7 @@ build() { cd $_pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ + --disable-static --enable-experimental --enable-gtk-doc \ --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \ --with-package-origin="https://parabolagnulinux.org/" \ --with-gtk=3.0 diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 301ecb4a1..bfbb1e633 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103300 2014-01-02 22:41:39Z spupykin $ +# $Id: PKGBUILD 103700 2014-01-10 10:25:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.10 +pkgver=2.6.8.11 pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('0029627acf4d8e838b24e04eb01c948e') +md5sums=('ba1d61d4abbf664f9f04689710d895c1') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index f6d46a656..5c0c84158 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103300 2014-01-02 22:41:39Z spupykin $ +# $Id: PKGBUILD 103700 2014-01-10 10:25:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.10 +pkgver=2.6.8.11 pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('0029627acf4d8e838b24e04eb01c948e') +md5sums=('ba1d61d4abbf664f9f04689710d895c1') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD index 338fc5d7a..77bd49440 100644 --- a/libre/stuntrally-data-libre/PKGBUILD +++ b/libre/stuntrally-data-libre/PKGBUILD @@ -10,16 +10,18 @@ arch=('any') license=('GPL3' 'custom') url="http://code.google.com/p/vdrift-ogre" makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-theme' 'libxcursor') -source=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz" - "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz" - libre.patch ) +mksource=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz" + "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz" + libre.patch ) +source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver.tar.gz") replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver -sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51' - '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565' - '89eed28f625758a22460f2cea67547d2ea6cffa2bef8133083077b1753cf2b64') -prepare() { +mksha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51' + '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565' + '89eed28f625758a22460f2cea67547d2ea6cffa2bef8133083077b1753cf2b64') +sha256sums=('3159f8e2b33d5685fb3e7320ab8ce4a60a35830a4dac7b9c3c8aeebf9a38f8d5') +mksource() { # patch some data files and remove nonfree data files cd "${srcdir}/stuntrally-${pkgver}/" diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 6bd33d769..af4881e7e 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -25,7 +25,9 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core') provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver") replaces=('tetex' 'texlive-latex3' 'texlive-core') url='http://tug.org/texlive/' -source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" +mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip") +noextract=("$_pkgname-$pkgver-src.zip") +source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps" "texmf.cnf" "09-texlive-fonts.conf") @@ -43,60 +45,79 @@ backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/web2c/mktex.cnf \ etc/texmf/xdvi/XDvi) -md5sums=('80c7fa3db1b468f9043c6acdd941a526' +mkmd5sums=('80c7fa3db1b468f9043c6acdd941a526') +md5sums=('a005881089830e47c8502849055e866e' '306ab28bb9b070fc3e40d86d28ea7e8e' 'd5a3f442ec3b7aa1518170f64f9d006b' '393a4bf67adc7ca5df2b386759d1a637') -build() { - cd "$srcdir" +mksource() { + mkdir $_pkgname-$pkgver + pushd $_pkgname-$pkgver + bsdtar xfv ../$_pkgname-$pkgver-src.zip # remove nonfree packages # MeX licensed packages. - rm {cc-pl,cs,ec,mex,pl}.tar.xz + rm -v {cc-pl,cs,ec,mex,pl}.tar.xz # Public domain, will be relicensed. - rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz + rm -v context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz # No specific free license. - rm euro-ce.tar.xz - # Remove them from package list. + rm -v euro-ce.tar.xz + # Remove their references from package list. sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS - echo -n " --> extracting all packages... " - for p in *.tar.xz; do - bsdtar -xf $p - done - echo "done" - rm -rf {tlpkg,doc,source,omega} || true + # remove nonfree packages references from updmap.cfg + tar xvpf tetex.tar.xz + rm -v tetex.tar.xz - # remove nonfree packages from updmap.cfg sed -i '/ccpl.map/d' texmf-dist/web2c/updmap.cfg sed -i '/cs-charter.map/d' texmf-dist/web2c/updmap.cfg sed -i '/csfonts.map/d' texmf-dist/web2c/updmap.cfg sed -i '/plother.map/d' texmf-dist/web2c/updmap.cfg - sed -i '/pltext.map/d' texmf-dist/web2c/updmap.cfg + sed -i '/pltext.map/d' texmf-dist/web2c/updmap.cfg - # remove nonfree packages from texlive-core.maps - sed -i '/ccpl.map/d' texlive-core.maps - sed -i '/cs-charter.map/d' texlive-core.maps - sed -i '/csfonts.map/d' texlive-core.maps - sed -i '/plother.map/d' texlive-core.maps - sed -i '/pltext.map/d' texlive-core.maps + tar cvJf tetex.tar.xz texmf-dist tlpkg + rm -rv texmf-dist tlpkg + + # remove nonfree packages references from fmtutil.cnf + tar xvpf kpathsea.tar.xz + rm -v kpathsea.tar.xz - # remove nonfree packages from fmtutil.cnf sed -i '/cslatex/d' texmf-dist/web2c/fmtutil.cnf sed -i '/csplain/d' texmf-dist/web2c/fmtutil.cnf sed -i '/from mex/d' texmf-dist/web2c/fmtutil.cnf sed -i '/mexconf.tex/d' texmf-dist/web2c/fmtutil.cnf + + tar cvJf kpathsea.tar.xz texmf-dist tlpkg + rm -rv texmf-dist tlpkg + + popd } -package() { - cd "$srcdir" +build() { + cd $srcdir/$_pkgname-$pkgver + echo -n " --> extracting all packages... " + for p in *.tar.xz; do + bsdtar -xf $p + done + echo "done" + rm -rf {tlpkg,doc,source,omega} || true + # remove nonfree packages from texlive-core.maps + sed -i '/ccpl.map/d' $srcdir/$_pkgname.maps + sed -i '/cs-charter.map/d' $srcdir/$_pkgname.maps + sed -i '/csfonts.map/d' $srcdir/$_pkgname.maps + sed -i '/plother.map/d' $srcdir/$_pkgname.maps + sed -i '/pltext.map/d' $srcdir/$_pkgname.maps +} + +package() { + cd $srcdir/$_pkgname-$pkgver # Install packages. install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ + install -m644 $srcdir/$_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ install -m755 -d $pkgdir/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index 7d3fc7d20..55a117c79 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -16,20 +16,32 @@ replaces=('texlive-fontsextra') conflicts=('texlive-fontsextra') provides=('texlive-fontsextra') url='http://tug.org/texlive/' -source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") +mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip") +noextract=("$_pkgname-$pkgver-src.zip") +source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('3f519371dd2e22e5b32daa461b89aea2' +mkmd5sums=('3f519371dd2e22e5b32daa461b89aea2') +md5sums=('e6b12e482913169f44c54172316416bc' 'f489cc5f762dcdbe6acb11624de7e138') -build() { - cd "$srcdir" +mksource() { + mkdir $_pkgname-$pkgver + pushd $_pkgname-$pkgver + bsdtar xfv ../$_pkgname-$pkgver-src.zip + # remove nonfree packages # No specific free license. - rm ogham.tar.xz + rm -v ogham.tar.xz # Remove them from package list. sed -ri '/^ogham /d' CONTENTS + + popd +} + +build() { + cd $srcdir/$_pkgname-$pkgver for p in *.tar.xz; do bsdtar -xf $p done @@ -37,11 +49,11 @@ build() { } package() { - cd "$srcdir" + cd $srcdir/$_pkgname-$pkgver install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ + install -m644 $srcdir/$_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ install -m755 -d $pkgdir/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index ba22b53be..dce3903aa 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -25,29 +25,42 @@ replaces=('texlive-latexextra') conflicts=('texlive-latexextra') groups=('texlive-most') url='http://tug.org/texlive/' -source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") +mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip") +noextract=("$_pkgname-$pkgver-src.zip") +source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('7c9755ca4e104089fab816d805990f6f' +mkmd5sums=('7c9755ca4e104089fab816d805990f6f') +md5sums=('7e6ff7b61faf268fe2b814c4949ab364' '9e4825f47dac663dd62c4bfa67899e84') -build() { +mksource() { + mkdir $_pkgname-$pkgver + pushd $_pkgname-$pkgver + bsdtar xfv ../$_pkgname-$pkgver-src.zip + # remove nonfree packages # No specific free license. - rm {authoraftertitle,clock,fnpara}.tar.xz + rm -v {authoraftertitle,clock,fnpara}.tar.xz # Remove them from package list. sed -ri '/^(authoraftertitle|fnpara) /d' CONTENTS + + popd +} +build() { + cd $srcdir/$_pkgname-$pkgver for p in *.tar.xz; do bsdtar -xf $p done rm -rf {tlpkg,doc,source} || true } package() { + cd $srcdir/$_pkgname-$pkgver install -m755 -d "$pkgdir"/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 $_pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/ + install -m644 $srcdir/$_pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/ install -m755 -d "$pkgdir"/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD index 020740313..b9e4550a4 100644 --- a/libre/unzip-libre/PKGBUILD +++ b/libre/unzip-libre/PKGBUILD @@ -15,16 +15,22 @@ depends=('bzip2' 'bash') provides=("${_pkgname}=${pkgver}") conflicts=("${_pkgname}") replaces=("${_pkgname}") -source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' - 'match.patch') -md5sums=('62b490407489521db863b523a7f86375' - 'e6d9f0c204c2abe6a57dc5e1637d5140') - -build() { +mksource=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' + 'match.patch') +source=('https://repo.parabolagnulinux.org/sources/unzip60-libre.tar.gz') +mkmd5sums=('62b490407489521db863b523a7f86375' + 'e6d9f0c204c2abe6a57dc5e1637d5140') +md5sums=('bbe4b7f4d48b2f939b5e43fde0ac7762') + +mksource() { cd ${srcdir}/${_pkgname}${pkgver/./} # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch patch -Np0 -i ${srcdir}/match.patch +} + +build() { + cd ${srcdir}/${_pkgname}${pkgver/./} # set CFLAGS -- from Debian export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index c2eddaafc..1a63f6f79 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -17,20 +17,26 @@ replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') -source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \ +mksource=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz) +source=(https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz \ xscreensaver-add-electricsheep.diff LICENSE) -sha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc' +mksha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc') +sha1sums=('f041ac860f52fab79c438012ebf58a021ef9bfea' 'e8dc57b6471fb3867ee099304ac6bf628351cb98' '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2') -prepare() { +mksource() { cd ${_pkgname}-${pkgver} - patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff" # Deleting dmsc.asm file due which don't have source code supplied rm -v hacks/images/m6502/dmsc.asm } +prepare() { + cd ${_pkgname}-${pkgver} + patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff" +} + build() { cd ${_pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ diff --git a/pcr/nppangband-libre/PKGBUILD b/pcr/nppangband-libre/PKGBUILD deleted file mode 100644 index eeb59f6fc..000000000 --- a/pcr/nppangband-libre/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Israfel <israfel@lavabit.com> -# Original PKGBUILD by James Rayner <iphitus@gmail.com> -# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit for sound.patch - -_pkgname=nppangband -pkgname=nppangband-libre -pkgver=6.1.2 -pkgrel=1 -pkgdesc="A variant of Angband that attempts to take popular ideas from other variants, without nonfree sound effects" -url="http://forum.nppangband.org/" -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname -depends=('sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libx11' 'freetype2') -source=(http://download.nppangband.org/npp-6.1.2-src.zip sound.patch) -license=('GPLv2 custom') -arch=('i686' 'x86_64') - -build() { - cd $srcdir/npp-6.1.2-src/ - patch -Np1 -i ../sound.patch - sh autogen.sh - ./configure --enable-sdl - make -} - -package() { - cd $srcdir/npp-6.1.2-src/ - make DESTDIR="$pkgdir/" install -} - -sha512sums=('e12e05fd8944bb1d7e43b883416009a8e77198ee1ad0ea87480eaafb5f46ecdb218ef0b68876fb77cc2ab490a99f9b9303e02c7db385db6eb8d1d01a48cffdd0' - '820f4e678543b8f4d5092d6654bb3d4006e039fbc119d9ff5f468c01176497c25579ca2b0d6f6d302b11a3fbfaa6cfcdf89029ff586cda31d97e413cb8b91040') diff --git a/pcr/nppangband-libre/sound.patch b/pcr/nppangband-libre/sound.patch deleted file mode 100644 index 9de2b0177..000000000 --- a/pcr/nppangband-libre/sound.patch +++ /dev/null @@ -1,241 +0,0 @@ -# Made by Israfel <israfel@lavabit.com> for the Parabola GNU/Linux-Libre "nppangband-libre" package -# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit -diff -crB npp-6.1.2-src/COPYING npp-6.1.2-src-libre/COPYING -*** npp-6.1.2-src/COPYING 2013-03-29 14:37:32.000000000 -0400 ---- npp-6.1.2-src-libre/COPYING 2013-06-29 16:22:09.154804370 -0400 -*************** -*** 13,20 **** - * David Gervais' (32x32) graphics, including modifications and additional tiles by Jeff Greene, Thacker and Rob Fiala for NPPAngband may be redistributed, - modified, and used only under the terms of the Creative Commons Attribution 3.0 licence: http://creativecommons.org/licenses/by/3.0/ - -- * the sounds are freeware, whatever that means. -- - * the font files are under the licences noted in lib/xtra/font/copying.txt, - all of which are OSI-compliant. - ---- 13,18 ---- -Only in npp-6.1.2-src/lib/xtra/sound: breath.wav -Only in npp-6.1.2-src/lib/xtra/sound: clunk.wav -Only in npp-6.1.2-src/lib/xtra/sound: death.wav -Only in npp-6.1.2-src/lib/xtra/sound: destroy.wav -Only in npp-6.1.2-src/lib/xtra/sound: drop.wav -Only in npp-6.1.2-src/lib/xtra/sound: eat.wav -Only in npp-6.1.2-src/lib/xtra/sound: flee.wav -Only in npp-6.1.2-src/lib/xtra/sound: hallu.wav -Only in npp-6.1.2-src/lib/xtra/sound: hit1.wav -Only in npp-6.1.2-src/lib/xtra/sound: hit.wav -Only in npp-6.1.2-src/lib/xtra/sound: kill1.wav -Only in npp-6.1.2-src/lib/xtra/sound: kill.wav -Only in npp-6.1.2-src/lib/xtra/sound: level.wav -diff -crB npp-6.1.2-src/lib/xtra/sound/Makefile npp-6.1.2-src-libre/lib/xtra/sound/Makefile -*** npp-6.1.2-src/lib/xtra/sound/Makefile 2013-03-29 14:37:36.000000000 -0400 ---- npp-6.1.2-src-libre/lib/xtra/sound/Makefile 2013-06-29 16:21:53.525414705 -0400 -*************** -*** 1,10 **** - MKPATH=../../../mk/ - include $(MKPATH)buildsys.mk - -! LIBDATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav \ -! drop.wav eat.wav flee.wav hallu.wav hit.wav hit1.wav kill.wav \ -! kill1.wav level.wav miss.wav miss1.wav money.wav opendoor.wav \ -! shutdoor.wav thump.wav vomit.wav \ - - PACKAGE = xtra/sound - ---- 1,7 ---- - MKPATH=../../../mk/ - include $(MKPATH)buildsys.mk - -! LIBDATA = sound.cfg - - PACKAGE = xtra/sound - -Only in npp-6.1.2-src/lib/xtra/sound: miss1.wav -Only in npp-6.1.2-src/lib/xtra/sound: miss.wav -Only in npp-6.1.2-src/lib/xtra/sound: money.wav -Only in npp-6.1.2-src/lib/xtra/sound: opendoor.wav -Only in npp-6.1.2-src/lib/xtra/sound: shutdoor.wav -diff -crB npp-6.1.2-src/lib/xtra/sound/sound.cfg npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg -*** npp-6.1.2-src/lib/xtra/sound/sound.cfg 2013-03-29 14:37:38.000000000 -0400 ---- npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg 2013-06-29 16:20:47.241336459 -0400 -*************** -*** 41,59 **** - # - - # The shopkeep bought a worthless item. -! store1 = money.wav - - # The shopkeep paid too much for an item. -! store2 = money.wav - - # The shopkeep got away with a good bargain. -! store3 = money.wav - - # The shopkeep got away with a great bargain. -! store4 = money.wav - - # You make a normal transaction (buying or selling). -! store5 = money.wav - - # You enter a store. - store_enter = ---- 41,59 ---- - # - - # The shopkeep bought a worthless item. -! store1 = - - # The shopkeep paid too much for an item. -! store2 = - - # The shopkeep got away with a good bargain. -! store3 = - - # The shopkeep got away with a great bargain. -! store4 = - - # You make a normal transaction (buying or selling). -! store5 = - - # You enter a store. - store_enter = -*************** -*** 69,75 **** - # - - # You succeed in a melee attack against a monster. -! hit = hit.wav drop.wav hit1.wav - - # It was a good hit! - hit_good = ---- 69,75 ---- - # - - # You succeed in a melee attack against a monster. -! hit = - - # It was a good hit! - hit_good = -*************** -*** 87,93 **** - hit_hi_superb = - - # You miss a melee attack against a monster. -! miss = miss.wav miss1.wav - - # You fire a missile. - shoot = ---- 87,93 ---- - hit_hi_superb = - - # You miss a melee attack against a monster. -! miss = - - # You fire a missile. - shoot = -*************** -*** 99,105 **** - hitpoint_warn = - - # You die. -! death = death.wav - - # - # Player sounds - status changes ---- 99,105 ---- - hitpoint_warn = - - # You die. -! death = - - # - # Player sounds - status changes -*************** -*** 197,206 **** - money3 = - - # You (or a monster) drop something on the ground. -! drop = clunk.wav - - # You gain (or regain) a level. -! level = level.wav - - # You successfully study a spell or prayer. - study = ---- 197,206 ---- - money3 = - - # You (or a monster) drop something on the ground. -! drop = - - # You gain (or regain) a level. -! level = - - # You successfully study a spell or prayer. - study = -*************** -*** 224,242 **** - hitwall = - - # You eat something. -! eat = eat.wav - - # You successfully dig through something. -! dig = thump.wav - - # You open a door. -! opendoor = opendoor.wav - - # You shut a door. -! shutdoor = shutdoor.wav - - # You teleport from a level (including via recall). -! tplevel = teleport.wav - - # Default "bell" sound for system messages. - bell = ---- 224,242 ---- - hitwall = - - # You eat something. -! eat = - - # You successfully dig through something. -! dig = - - # You open a door. -! opendoor = - - # You shut a door. -! shutdoor = - - # You teleport from a level (including via recall). -! tplevel = - - # Default "bell" sound for system messages. - bell = -*************** -*** 291,300 **** - # - - # A monster flees in terror. -! flee = flee.wav - - # A monster is killed. -! kill = kill.wav destroy.wav kill1.wav - - # A unique is killed. - kill_unique = ---- 291,300 ---- - # - - # A monster flees in terror. -! flee = - - # A monster is killed. -! kill = - - # A unique is killed. - kill_unique = -Only in npp-6.1.2-src/lib/xtra/sound: thump.wav -Only in npp-6.1.2-src/lib/xtra/sound: vomit.wav |