Merge branch 'master' of ssh://gparabola/abslibre

6 files changed, 16 insertions, 18 deletions

diff --git a/libre/linux-libre-lts/.directory b/libre/linux-libre-lts/.directory
index 60156bc93..89e875be9 100644
--- a/libre/linux-libre-lts/.directory
+++ b/libre/linux-libre-lts/.directory
@@ -1,2 +1,2 @@
 [Dolphin]
-Timestamp=2012,3,15,16,10,14
+Timestamp=2012,4,16,17,55,34
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 790ea5e0b..5fe592460 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE-LTS
 _basekernel=3.0
-_sublevel=27
+_sublevel=28
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.26 # nearly always the same as pkgver
 pkgrel=1
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '365d490f97b1960c8880eb22257d5ef0'
+         '150cef79eaa9a41cd5ccd65c696e7f10'
          'c7acde811ca6808b294dc06480048c61'
          '792766d6d403cc967977f6a46aa95d1d'
          'd2c0701480bce49fd4b40dc46b9863f1'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index acb2b71f5..5f32392c0 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.27-1-LIBRE-LTS
+KERNEL_VERSION=3.0.28-1-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index c813946c7..564ca267d 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -3,9 +3,9 @@
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 _pkgname=luxrays
 pkgname=luxrays-libre
-pkgver=0.8
-_pkgver=ed424ec77571
-pkgrel=7
+pkgver=1.0rc1
+_pkgver=396d39b06aa6
+pkgrel=1
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
 arch=('i686' 'x86_64')
@@ -17,14 +17,11 @@ replaces=('luxrays')
 conflicts=('luxrays')
 provides=("luxrays=$pkgver")
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('2ac9c588675c5971c57f473ef10ac67d')
+md5sums=('a96ac693ec2900d8d1b209f88edd7e94')
 
 build() {
   cd "$srcdir/luxrender-$_pkgname-$_pkgver"
 
-  # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail'
-  sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h
-
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 38021313d..f4684ee7f 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 pkgname=luxrender-libre
-pkgver=0.8
-_pkgver=45d3e13eb94c
-pkgrel=13
+pkgver=1.0rc1
+_pkgver=08ae99830f8e
+pkgrel=1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
@@ -18,14 +18,12 @@ makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
 replaces=('luxrender')
 conflicts=('luxrender')
 provides=("luxrender=$pkgver")
-source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
-md5sums=('0f2d856385db72131f51e44a7ee527fa')
+source=(https://bitbucket.org/luxrender/lux/get/"$_pkgver".tar.bz2)
+md5sums=('738616b55ac58c98de431b98f90a05fb')
 
 build() {
   cd "$srcdir"/luxrender-lux-$_pkgver
 
-  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
-
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=ON \
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 4d39c9116..0b66880dc 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -68,6 +68,9 @@ if [ $NOEXTRACT -eq 0 ]; then
 
   cp "$srcdir/mozconfig" .mozconfig
 
+  # Fails, claiming the page size to have changed.
+  [ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig
+
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
   patch -Np1 -i "$srcdir/gcc47.patch"