Merge remote-tracking branch 'upstream/master'

This commit is contained in:
wertyi48 2013-07-02 00:39:47 -03:00
commit 4b36343c85
17 changed files with 120 additions and 110 deletions

View file

@ -563,27 +563,27 @@ libnm-util.so.2 libnm-0.9.1.90_1
libnm-glib.so.4 libnm-0.9.1.90_1
libnm-glib-vpn.so.1 libnm-0.9.1.90_1
libpanel-applet-4.so.0 gnome-panel-3.3.92_1
libboost_date_time.so.1.50.0 boost-1.50<1.51_1
libboost_math_tr1f.so.1.50.0 boost-1.50<1.51_1
libboost_serialization.so.1.50.0 boost-1.50<1.51_1
libboost_filesystem.so.1.50.0 boost-1.50<1.51_1
libboost_math_tr1l.so.1.50.0 boost-1.50<1.51_1
libboost_signals.so.1.50.0 boost-1.50<1.51_1
libboost_graph.so.1.50.0 boost-1.50<1.51_1
libboost_math_tr1.so.1.50.0 boost-1.50<1.51_1
libboost_system.so.1.50.0 boost-1.50<1.51_1
libboost_iostreams.so.1.50.0 boost-1.50<1.51_1
libboost_prg_exec_monitor.so.1.50.0 boost-1.50<1.51_1
libboost_thread.so.1.50.0 boost-1.50<1.51_1
libboost_math_c99f.so.1.50.0 boost-1.50<1.51_1
libboost_program_options.so.1.50.0 boost-1.50<1.51_1
libboost_unit_test_framework.so.1.50.0 boost-1.50<1.51_1
libboost_math_c99l.so.1.50.0 boost-1.50<1.51_1
libboost_python.so.1.50.0 boost-python-1.44<1.51_1
libboost_wave.so.1.50.0 boost-1.50<1.51_1
libboost_math_c99.so.1.50.0 boost-1.50<1.51_1
libboost_regex.so.1.50.0 boost-1.50<1.51_1
libboost_wserialization.so.1.50.0 boost-1.50<1.51_1
libboost_date_time.so.1.53.0 boost-1.53<1.54_1
libboost_math_tr1f.so.1.53.0 boost-1.53<1.54_1
libboost_serialization.so.1.53.0 boost-1.53<1.54_1
libboost_filesystem.so.1.53.0 boost-1.53<1.54_1
libboost_math_tr1l.so.1.53.0 boost-1.53<1.54_1
libboost_signals.so.1.53.0 boost-1.53<1.54_1
libboost_graph.so.1.53.0 boost-1.53<1.54_1
libboost_math_tr1.so.1.53.0 boost-1.53<1.54_1
libboost_system.so.1.53.0 boost-1.53<1.54_1
libboost_iostreams.so.1.53.0 boost-1.53<1.54_1
libboost_prg_exec_monitor.so.1.53.0 boost-1.53<1.54_1
libboost_thread.so.1.53.0 boost-1.53<1.54_1
libboost_math_c99f.so.1.53.0 boost-1.53<1.54_1
libboost_program_options.so.1.53.0 boost-1.53<1.54_1
libboost_unit_test_framework.so.1.53.0 boost-1.53<1.54_1
libboost_math_c99l.so.1.53.0 boost-1.53<1.54_1
libboost_python.so.1.53.0 boost-python-1.44<1.51_1
libboost_wave.so.1.53.0 boost-1.53<1.54_1
libboost_math_c99.so.1.53.0 boost-1.53<1.54_1
libboost_regex.so.1.53.0 boost-1.53<1.54_1
libboost_wserialization.so.1.53.0 boost-1.53<1.54_1
libexempi.so.3 exempi-2.1.1_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2.so.2 libsgutils-1.28_1
@ -989,8 +989,8 @@ libkeyutils.so.1 libkeyutils-1.5.5_1
libiptcdata.so.0 libiptcdata-1.0.4_1
libutempter.so.0 libutempter-1.1.5_1
libxatracker.so.1 MesaLib-7.11_1
libdricore9.1.3.so.1 MesaLib-9.1.3_1
libllvmradeon9.1.3.so MesaLib-9.1.3_2
libdricore9.1.4.so.1 MesaLib-9.1.4_1
libllvmradeon9.1.4.so MesaLib-9.1.4_1
libtumbler-1.so.0 tumbler-4.9.2_1
libwebrtc_audio_processing.so.0 webrtc-audio-processing-0.1_1
libcupsmime.so.1 libcups-1.5.3_1

View file

@ -5,34 +5,6 @@ Upstream Status: Fixed upstream
Origin: Upstream
Description: Fixes building with LLVM 3.3.
--- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp 2013-02-16 02:32:00.000000000 +0100
+++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp 2013-05-15 12:53:51.605926357 +0200
@@ -55,6 +55,10 @@
#include <llvm/MC/MCRegisterInfo.h>
#endif /* HAVE_LLVM >= 0x0301 */
+#if HAVE_LLVM >= 0x0303
+#include <llvm/ADT/OwningPtr.h>
+#endif
+
#include "util/u_math.h"
#include "util/u_debug.h"
--- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 2013-02-26 21:00:02.000000000 +0100
+++ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 2013-05-15 12:53:51.605926357 +0200
@@ -60,6 +60,12 @@
#include <llvm/Target/TargetSelect.h>
#endif /* HAVE_LLVM < 0x0300 */
+#if HAVE_LLVM >= 0x0303
+#include <llvm/IR/IRBuilder.h>
+#include <llvm/IR/Module.h>
+#include <llvm/Support/CBindingWrapping.h>
+#endif
+
#include "pipe/p_config.h"
#include "util/u_debug.h"
#include "util/u_cpu_detect.h"
--- src/gallium/drivers/r600/llvm_wrapper.cpp 2013-03-05 23:54:28.000000000 +0100
+++ src/gallium/drivers/r600/llvm_wrapper.cpp 2013-05-15 12:53:51.605926357 +0200
@@ -1,8 +1,16 @@

View file

@ -1,7 +1,7 @@
# Template build file for 'MesaLib'.
pkgname=MesaLib
version=9.1.3
revision=2
version=9.1.4
revision=1
wrksrc="Mesa-${version}"
build_style=gnu-configure
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.mesa3d.org/"
license="MIT, LGPL-2.1"
distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
checksum=8d5dac2202d0355bff5cfd183582ec8167d1d1227b7bb7a669acecbeaa52d766
checksum=6e858786e9e68e79aa245037d351a664f3a5c05ccdbdc2519307bc06f8ee68da
hostmakedepends="automake libtool flex pkg-config llvm>=3.3"
makedepends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel

View file

@ -0,0 +1,27 @@
From: Sergio Martins <iamsergio@gmail.com>
Date: Tue, 28 May 2013 20:22:11 +0000
Subject: Compile with boost-1.53
X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=fe3f49cbd21a634c3257903a229b7d5357ee194a
---
Compile with boost-1.53
The bug isn't going to be fixed in Qt4, so we need the ifdef.
CCMAIL: vkrause@kde.org
---
--- shared/akapplication.h
+++ shared/akapplication.h
@@ -23,7 +23,9 @@
#include <QtCore/QObject>
#ifndef _WIN32_WCE
-#include <boost/program_options.hpp>
+# ifndef Q_MOC_RUN
+# include <boost/program_options.hpp>
+# endif
#endif
class QCoreApplication;

View file

@ -1,7 +1,7 @@
# Template file for 'akonadi'
pkgname=akonadi
version=1.9.2
revision=2
revision=3
short_desc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@ -15,7 +15,8 @@ configure_args="-DAKONADI_BUILD_TESTS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
# XXX mysql/pgsql backends.
hostmakedepends="cmake automoc4 pkg-config"
makedepends="shared-mime-info boost-devel qt-devel phonon-devel soprano-devel>=2.9.2_4"
makedepends="shared-mime-info sqlite-devel boost-devel>=1.53 qt-devel
phonon-devel soprano-devel>=2.9.2_4"
akonadi-devel_package() {
short_desc+=" - development files"

View file

@ -1,10 +1,10 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=0.8.3
revision=1
revision=2
wrksrc="${pkgname}-${version}-linux"
hostmakedepends="which"
makedepends="db-devel>=5.3 openssl-devel qt-devel boost-devel automoc4 miniupnpc-devel"
makedepends="db-devel>=5.3 openssl-devel qt-devel boost-devel>=1.53 automoc4 miniupnpc-devel"
short_desc="Bitcoin is a peer-to-peer network based digital currency"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"

View file

@ -1,36 +1,41 @@
# Template file for 'boost'
pkgname=boost
version=1.50.0
revision=2
version=1.53.0
revision=1
_boostver="$(echo $version|sed 's|\.|_|g')"
wrksrc="${pkgname}_${_boostver}"
makedepends="zlib-devel icu-devel>=49.1 python-devel"
makedepends="zlib-devel bzip2-devel icu-devel>=49.1"
short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.boost.org/"
license="Boost Software License 1.0"
distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${_boostver}.tar.bz2"
checksum=c9ace2b8c81fa6703d1d17c7e478de3bc51101c5adbdeb3f6cb72cf3045a8529
checksum=f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196
long_desc="
The Boost web site provides free peer-reviewed portable C++ source libraries.
The emphasis is on libraries which work well with the C++ Standard Library.
The libraries are intended to be widely useful, and are in regular use by
thousands of programmers across a broad spectrum of applications."
disable_debug=yes
if [ "$CROSS_BUILD" ]; then
if [ -z "$CROSS_BUILD" ]; then
# XXX boost-jam and boost-python subpkgs.
makedepends="zlib-devel icu-devel>=49.1"
makedepends+=" python-devel"
fi
do_build() {
if [ "$CROSS_BUILD" ]; then
echo "using gcc : arm : ${XBPS_CROSS_TRIPLET}-g++ ;" > \
case "$XBPS_TARGET_MACHINE" in
arm*) _arch=arm; _toolset="gcc-arm";;
mips*) _arch=mips; _toolset="gcc-mips";;
esac
echo "using gcc : ${_arch} : ${XBPS_CROSS_TRIPLET}-g++ ${CXXFLAGS} ;" > \
tools/build/v2/user-config.jam
else
_toolset=gcc
echo "using gcc : : g++ ${CXXFLAGS} ;" > tools/build/v2/user-config.jam
fi
./bootstrap.sh -prefix=${DESTDIR}/usr
./bjam toolset=gcc-arm cflags="-fno-strict-aliasing $CFLAGS" ${makejobs}
./bjam --toolset=${_toolset} ${makejobs}
}
do_install() {
@ -65,15 +70,15 @@ do_install() {
if [ -z "$CROSS_BUILD" ]; then
boost-jam_package() {
short_desc="${short_desc} - Boost.Jam utility"
short_desc+=" - Boost.Jam utility"
pkg_install() {
vmove usr/bin/bjam
}
}
boost-python_package() {
depends="boost>=${version} python"
short_desc="${short_desc} - python bindings"
depends="boost-${version}_${revision} python"
short_desc+=" - python bindings"
pkg_install() {
vmove "usr/lib/libboost_python*"
}
@ -85,7 +90,7 @@ boost-build_package() {
noarch=yes
conf_files="/etc/site-config.jam"
depends="boost-jam>=$version boost-devel>=$version"
short_desc="${short_desc} - Boost.Build framework"
short_desc+=" - Boost.Build framework"
pkg_install() {
vmove usr/share/boost-build
vmove etc
@ -94,10 +99,11 @@ boost-build_package() {
boost-devel_package() {
depends="boost-${version}_${revision}"
short_desc="${short_desc} - development files"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}

View file

@ -1,9 +1,10 @@
# Template file for 'encfs'
pkgname=encfs
version=1.7.4
revision=1
revision=2
build_style=gnu-configure
makedepends="pkg-config perl fuse-devel openssl-devel librlog-devel boost-devel"
hostmakedepends="pkg-config perl"
makedepends="fuse-devel openssl-devel librlog-devel boost-devel>=1.53"
short_desc="Encrypted filesystem in user-space"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"

View file

@ -1,27 +1,28 @@
# Template file for 'giflib'
pkgname=giflib
version=5.0.3
revision=3
version=5.0.4
revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="xmlto"
short_desc="Library for GIF images"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://sourceforge.net/projects/giflib/"
license="MIT"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a0c03db63bec4a6d636084ff9ce3241313191a4053629fc4962646c8fbe84638
checksum=a1dac882f5a442e15c1bc692602c0fc388b40f3ac682cb8685a7d0822c620e0b
giflib-devel_package() {
depends="giflib-${version}_${revision}"
short_desc="${short_desc} -- development files"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
giflib-tools_package() {
short_desc="${short_desc} -- utilities"
short_desc+=" - utilities"
pkg_install() {
vmove usr/bin
vmove usr/share

View file

@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.40
revision=2
revision=3
build_style=gnu-configure
configure_args="--enable-ttf-font-dir=/usr/share/fonts/TTF"
short_desc="Software version control visualization"
@ -11,8 +11,9 @@ homepage="https://code.google.com/p/gource/"
distfiles="https://gource.googlecode.com/files/gource-${version}.tar.gz"
checksum=9c890a926bb3bab8ea3e546c1357488e5a5034d1ea9402afc654cb7e00ccd112
makedepends="pkg-config SDL-devel SDL_image-devel glew-devel>=1.9.0
freetype-devel boost-devel glm pcre-devel freefont-ttf"
hostmakedepends="pkg-config"
makedepends="SDL-devel SDL_image-devel glew-devel>=1.9.0
freetype-devel boost-devel>=1.53 glm pcre-devel freefont-ttf"
pre_configure() {
sed -i "s/filesystem3/filesystem/g" src/logmill.cpp

View file

@ -1,16 +1,15 @@
# Template build file for 'lcms2'.
pkgname=lcms2
version=2.4
revision=4
version=2.5
revision=1
build_style=gnu-configure
configure_args="--disable-static"
makedepends="tiff-devel"
short_desc="Small-footprint color management engine, version 2"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.littlecms.com"
license="MIT"
distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-$version.tar.gz"
checksum=2a514d10eff26901505c191a15c2588c751eb7fb86577118f6c235aff0be37e8
checksum=6727772b44470a2111dba53b9ce4c952b87e7d1b72a31c5ebdf44ba6eb0aa72b
long_desc="
LCMS2 is the Little Color Management System, a Color Matching Method
(CMM) library which implements fast transforms between ICC profiles.
@ -21,18 +20,20 @@ long_desc="
lcms2-devel_package() {
depends="tiff-devel lcms2>=${version}"
short_desc+=" -- development files"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
lcms2-tools_package() {
short_desc+=" -- bundled tools"
short_desc+=" - bundled tools"
pkg_install() {
vmove usr/bin
vmove usr/share/man/man1
vmove usr/share/man
}
}

View file

@ -1,15 +1,14 @@
# Template build file for 'libgpg-error'.
pkgname=libgpg-error
version=1.11
revision=2
version=1.12
revision=1
build_style=gnu-configure
configure_args="--disable-static"
short_desc="Library for error values used by GnuPG component"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnupg.org"
license="LGPL-2.1"
distfiles="ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$version.tar.bz2"
checksum=ae3376480a073b120c7add08f1e6cfcc08500648ccf22461cd42db6224a218c0
checksum=cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f
post_install() {
rm -rf ${DESTDIR}/usr/share/common-lisp
@ -17,11 +16,12 @@ post_install() {
libgpg-error-devel_package() {
depends="libgpg-error>=${version}"
short_desc="${short_desc} - development files"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/gpg-error-config
vmove usr/include
vmove usr/share/aclocal
vmove "usr/lib/*.so"
}
}

View file

@ -1,16 +1,16 @@
# Template file for 'lightspark'
pkgname=lightspark
version=0.7.2
revision=2
revision=3
patch_args="-Np1"
build_style=cmake
configure_args="-DAUDIO_BACKEND=pulse -DENABLE_CURL=1 -DCOMPILE_PLUGIN=1
-DCMAKE_SKIP_RPATH=OFF"
makedepends="pkg-config cmake nasm pcre-devel>=8.30 libffi-devel libX11-devel
libpng-devel>=1.6 fontconfig-devel boost-devel SDL-devel ffmpeg-devel>=1.2 libcurl-devel
libpng-devel>=1.6 fontconfig-devel boost-devel>=1.53 SDL-devel ffmpeg-devel>=1.2
MesaLib-devel ftgl-devel glew-devel>=1.9.0 libxml2-devel libxml++-devel
glibmm-devel gtk+-devel libjpeg-turbo-devel pulseaudio-devel llvm>=3.2
librtmp-devel liblzma-devel"
librtmp-devel liblzma-devel libcurl-devel"
short_desc="Modern, free, open-source flash player implementation"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://lightspark.github.com/"

View file

@ -1,10 +1,10 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.6.3c
revision=3
revision=4
wrksrc="${pkgname}-${version}"
hostmakedepends="which"
makedepends="db-devel>=5.3 openssl-devel boost-devel automoc4 miniupnpc-devel"
makedepends="db-devel>=5.3 openssl-devel boost-devel>=1.53 automoc4 miniupnpc-devel"
short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
maintainer="pancake <pancake@nopcode.org>"
license="MIT"

View file

@ -1,7 +1,7 @@
#!/bin/sh
HD=~/.minecraft
HDJ=$HD/minecraft.jar
HDJ=$HD/minecraft16.jar
[ ! -d ${HD} ] && mkdir $HD
[ ! -f ${HDJ} ] && wget -O $HDJ https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar
[ ! -f ${HDJ} ] && wget -O $HDJ https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar
wmname LG3D
java -jar $HDJ

View file

@ -1,7 +1,7 @@
# Template build file for 'minecraft'
pkgname=minecraft
version=0.2
revision=1
version=0.3
revision=2
short_desc="Launcher for the famous Minecraft game"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://www.minecraft.net/"

View file

@ -1,16 +1,16 @@
# Template file for 'scummvm'
pkgname=scummvm
version=1.5.0
version=1.6.0
revision=1
makedepends="pkg-config nasm zlib-devel libpng-devel SDL-devel libmad-devel
fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel faad2-devel
freetype-devel"
hostmakedepends="pkg-config nasm"
makedepends="zlib-devel libpng-devel SDL-devel libmad-devel faad2-devel
fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel freetype-devel"
short_desc="Free implementation of LucasArts' SCUMM interpreter"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.scummvm.org/"
license="GPL-2"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
checksum=81831cd878a8daad2976f65c92139a2102233082c7d2770579d7e425b19cea2e
checksum=396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4
long_desc="
ScummVM is a 'virtual machine' for several classic graphical point-and-click
adventure games. It is designed to run Adventure Soft's Simon the Sorcerer