From f944490c481c2665eb788d6b985bf5046407b870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Wed, 11 Jul 2012 16:50:55 -0300 Subject: spacenavd: adding package to artistic repo --- artistic/spacenavd/PKGBUILD | 23 +++++++++++++++++++++++ artistic/spacenavd/spacenavd | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 artistic/spacenavd/PKGBUILD create mode 100644 artistic/spacenavd/spacenavd diff --git a/artistic/spacenavd/PKGBUILD b/artistic/spacenavd/PKGBUILD new file mode 100644 index 000000000..1c117b804 --- /dev/null +++ b/artistic/spacenavd/PKGBUILD @@ -0,0 +1,23 @@ +# Contributor: Jan Hambrecht +# Maintainer (Parabola): Márcio Silva + +pkgname=spacenavd +pkgver=0.5 +pkgrel=1 +pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)." +arch=('i686' 'x86_64' 'mips64el') +url="http://spacenav.sourceforge.net/" +license=('GPL') +depends=('libx11') +backup=('etc/spnavrc') +source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz spacenavd ) + +md5sums=('0bb21da5315bd376aa508157a9455aaa' + '27a739300d4de07920879af2d2bdd47f') +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=$pkgdir/usr + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1 +} diff --git a/artistic/spacenavd/spacenavd b/artistic/spacenavd/spacenavd new file mode 100644 index 000000000..61946197c --- /dev/null +++ b/artistic/spacenavd/spacenavd @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON=/usr/bin/spacenavd + +PID=`pidof -o %PPID $DAEMON` +case "$1" in + start) + stat_busy "Starting Spacenavigator Daemon" + [ -z "$PID" ] && $DAEMON + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon spacenavd + stat_done + fi + ;; + stop) + stat_busy "Stopping Spacenavigator Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon spacenavd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 -- cgit v1.2.3-2-g168b From 9c2b79f31e212ff4c4a7f3b58673168288562835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 12 Jul 2012 22:42:55 -0300 Subject: foomatic-filters-libre-4.0.17_20120712-1: update version --- libre/foomatic-filters-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD index 87b155c0c..73a7af6c4 100644 --- a/libre/foomatic-filters-libre/PKGBUILD +++ b/libre/foomatic-filters-libre/PKGBUILD @@ -5,8 +5,8 @@ pkgbase="foomatic" pkgname=('foomatic-filters-libre') arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20120626 -_filtersver=4.0.16 +_snapdate=20120712 +_filtersver=4.0.17 pkgver=${_filtersver}_${_snapdate} pkgrel=1 epoch=1 @@ -14,7 +14,7 @@ makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') source=(http://www.openprinting.org/download/foomatic/$pkgbase-filters-${_filtersver}.tar.gz) url="http://www.linuxprinting.org/foomatic.html" options=('!emptydirs') -md5sums=('ec907d9ea17e03bccb91db66e9470586') +md5sums=('b05f5dcbfe359f198eef3df5b283d896') package_foomatic-filters-libre() { -- cgit v1.2.3-2-g168b From de9ab185a1c49d54b0ab5cee79f016d663d90b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sat, 14 Jul 2012 17:40:19 -0300 Subject: initscript: updating package --- ...emove-run-nologin-before-leaving-rc.multi.patch | 28 ++++++++++++++++++++++ libre/initscripts/PKGBUILD | 13 +++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch new file mode 100644 index 000000000..3dc75df1c --- /dev/null +++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch @@ -0,0 +1,28 @@ +From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Tue, 3 Jul 2012 22:28:05 -0400 +Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi +To: arch-projects@archlinux.org + +systemd-186 writes this file when running systemd-tmpfiles, but +initscripts never removes it. This disallows all non-root logins. + +Reported-by: Dan McGee +Signed-off-by: Dave Reisner +--- + rc.multi | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/rc.multi b/rc.multi +index daf2372..7d4acaa 100755 +--- a/rc.multi ++++ b/rc.multi +@@ -31,4 +31,6 @@ run_hook multi_end + + bootlogd_stop + ++rm -f /run/nologin ++ + # vim: set ts=2 sw=2 noet: +-- +1.7.11.1 diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index aee2585d9..a25daabe2 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2012.06.28 -pkgrel=1 +pkgver=2012.07.5 +pkgrel=2 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') url="https://parabolagnulinux.org" @@ -21,12 +21,19 @@ optdepends=('bridge-utils: Network bridging support' makedepends=(asciidoc) install=initscripts.install source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" + 0001-remove-run-nologin-before-leaving-rc.multi.patch 'wireless.conf.d') +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch" +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -md5sums=('21651eaba1fd34542c78f39c755cd171' +md5sums=('c95c3cd09975414fbb6719e4222ff74b' + '87f02d111e0c613dd9fc61a9613f9c92' '027576534885b8d5dded9be546057b12') -- cgit v1.2.3-2-g168b From d1c720e0d937ab956225ca4ce869066cdcec325e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sat, 14 Jul 2012 18:07:12 -0300 Subject: libre/initscripts-2012.07.5 --- libre/initscripts/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index aee2585d9..ac9d98d27 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2012.06.28 +pkgver=2012.07.5 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -28,5 +28,5 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -md5sums=('21651eaba1fd34542c78f39c755cd171' +md5sums=('c95c3cd09975414fbb6719e4222ff74b' '027576534885b8d5dded9be546057b12') -- cgit v1.2.3-2-g168b From a4d72c480892aecc4f2d61fb1887b1a67a3378f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sat, 14 Jul 2012 18:13:14 -0300 Subject: libre/initscripts-2012.07.14 --- .../0001-remove-run-nologin-before-leaving-rc.multi.patch | 7 ++++--- libre/initscripts/PKGBUILD | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch index 3dc75df1c..a9b7a2423 100644 --- a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch +++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch @@ -18,11 +18,12 @@ index daf2372..7d4acaa 100755 --- a/rc.multi +++ b/rc.multi @@ -31,4 +31,6 @@ run_hook multi_end - + bootlogd_stop - + +rm -f /run/nologin + # vim: set ts=2 sw=2 noet: --- +-- 1.7.11.1 + diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 85ada99ca..cc509fdd3 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2012.07.5 +pkgver=2012.07.14 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -26,7 +26,7 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch" +# patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch" } package() { @@ -34,3 +34,6 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } +md5sums=('15e2f373be03b25b0033fd4fb4820d30' + 'ba32b9d723c20b38487669fb3c00d3d5' + '027576534885b8d5dded9be546057b12') -- cgit v1.2.3-2-g168b From 327339bc77c1312de217fac4fb9b060e713acc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sat, 14 Jul 2012 18:14:56 -0300 Subject: ~fauno/pandoc-1.9.4.2 --- ~fauno/pandoc/PKGBUILD | 8 ++++---- ~fauno/pandoc/SRCBUILD | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD index b577f0cf1..410a3dd2b 100644 --- a/~fauno/pandoc/PKGBUILD +++ b/~fauno/pandoc/PKGBUILD @@ -4,7 +4,7 @@ # Run `makepkg -srp SRCBUILD` if you want to update the source tarball pkgname=pandoc -pkgver=1.9.4 +pkgver=1.9.4.2 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -57,6 +57,6 @@ package() { find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; } -md5sums=('dbf83bc5fae25877f8f1444c67fcc706' - '179a9b8a716e1de8e6afba3d43c3ebef' - 'ec809a0c1f787dc53c896c391d32ef6e') +md5sums=('3a9191e729a4547370f756ba831cad77' + 'a8da851ee560ce54c7c5044dfb5042f0' + '8dab4575128cf33941a577bfb500c417') diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD index c8b13d906..68939a103 100644 --- a/~fauno/pandoc/SRCBUILD +++ b/~fauno/pandoc/SRCBUILD @@ -2,7 +2,7 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.9.4 +pkgver=1.9.4.2 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' -- cgit v1.2.3-2-g168b From a8a2c7388922e286a6aa4bbd388a128aef9c720b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 15 Jul 2012 15:45:11 -0300 Subject: blender-libre: updating package --- libre/blender-libre/PKGBUILD | 23 +++++++------------- libre/blender-libre/boost-1.50.patch | 42 ++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 libre/blender-libre/boost-1.50.patch diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 5dd14405d..b4ba9f827 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=blender pkgname=blender-libre pkgver=2.63a -pkgrel=2.1 +pkgrel=3 epoch=4 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)" arch=('i686' 'x86_64' 'mips64el') @@ -18,15 +18,19 @@ makedepends=('cmake' 'boost') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") -options=(!strip) install=${_pkgname}.install -source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch) -md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217') +source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz + ffmpeg-0.11.patch + boost-1.50.patch) +md5sums=('31a60b3ce5466d965cb7e2648995e092' + '9e5649403e51654615d30b10bc460217' + '0bab80da07d980c47b8ce3cb998edaef') build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch + patch -Np1 < "${srcdir}"/boost-1.50.patch sed -i "//d" intern/ffmpeg/ffmpeg_compat.h sed -i "//d" source/blender/blenkernel/intern/writeffmpeg.c @@ -60,10 +64,6 @@ build() { make $MAKEFLAGS -# cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \ -# "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/ -# cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi -# chmod 755 bmake make } @@ -71,11 +71,4 @@ package() { cd "${srcdir}/${_pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins -# install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} -# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \ -# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ -# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \ -# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ } diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch new file mode 100644 index 000000000..fa698a3a6 --- /dev/null +++ b/libre/blender-libre/boost-1.50.patch @@ -0,0 +1,42 @@ +diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp +--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300 +@@ -26,8 +26,6 @@ + #include "util_path.h" + #include "util_types.h" + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -117,7 +115,7 @@ + boost::filesystem::directory_iterator it(dir), it_end; + + for(; it != it_end; it++) { +- string filename = it->path().filename(); ++ string filename = it->path().filename().string(); + + if(boost::starts_with(filename, name)) + if(except.find(filename) == except.end()) +diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp +--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300 +@@ -26,8 +26,6 @@ + + #include + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -60,7 +58,7 @@ + + string path_filename(const string& path) + { +- return boost::filesystem::path(path).filename(); ++ return boost::filesystem::path(path).filename().string(); + } + + string path_dirname(const string& path) -- cgit v1.2.3-2-g168b From 3a1e846b8bdc5fa860ff7e56300ddc72702c3602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 15 Jul 2012 15:45:54 -0300 Subject: blender-spacenav-libre: updating package --- artistic/blender-spacenav-libre/PKGBUILD | 23 +++++-------- artistic/blender-spacenav-libre/boost-1.50.patch | 42 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 artistic/blender-spacenav-libre/boost-1.50.patch diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD index 2c11b4d30..f8fc7fd46 100644 --- a/artistic/blender-spacenav-libre/PKGBUILD +++ b/artistic/blender-spacenav-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=blender pkgname=blender-spacenav-libre pkgver=2.63a -pkgrel=2.1 +pkgrel=3 epoch=4 pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)" arch=('i686' 'x86_64' 'mips64el') @@ -18,15 +18,19 @@ makedepends=('cmake' 'boost') replaces=("${_pkgname}") conflicts=("${_pkgname}" "${_pkgname}-libre") provides=("${_pkgname}=${pkgver}" "${_pkgname}-libre=${pkgver}") -options=(!strip) install=${_pkgname}.install -source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch) -md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217') +source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz + ffmpeg-0.11.patch + boost-1.50.patch) +md5sums=('31a60b3ce5466d965cb7e2648995e092' + '9e5649403e51654615d30b10bc460217' + '0bab80da07d980c47b8ce3cb998edaef') build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch + patch -Np1 < "${srcdir}"/boost-1.50.patch sed -i "//d" intern/ffmpeg/ffmpeg_compat.h sed -i "//d" source/blender/blenkernel/intern/writeffmpeg.c @@ -60,10 +64,6 @@ build() { make $MAKEFLAGS -# cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \ -# "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/ -# cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi -# chmod 755 bmake make } @@ -71,11 +71,4 @@ package() { cd "${srcdir}/${_pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins -# install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} -# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \ -# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ -# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \ -# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ } diff --git a/artistic/blender-spacenav-libre/boost-1.50.patch b/artistic/blender-spacenav-libre/boost-1.50.patch new file mode 100644 index 000000000..fa698a3a6 --- /dev/null +++ b/artistic/blender-spacenav-libre/boost-1.50.patch @@ -0,0 +1,42 @@ +diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp +--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300 +@@ -26,8 +26,6 @@ + #include "util_path.h" + #include "util_types.h" + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -117,7 +115,7 @@ + boost::filesystem::directory_iterator it(dir), it_end; + + for(; it != it_end; it++) { +- string filename = it->path().filename(); ++ string filename = it->path().filename().string(); + + if(boost::starts_with(filename, name)) + if(except.find(filename) == except.end()) +diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp +--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300 +@@ -26,8 +26,6 @@ + + #include + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -60,7 +58,7 @@ + + string path_filename(const string& path) + { +- return boost::filesystem::path(path).filename(); ++ return boost::filesystem::path(path).filename().string(); + } + + string path_dirname(const string& path) -- cgit v1.2.3-2-g168b From 718af6e3e7f3d39d288257ebe37d0cb8a7c2338e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 15 Jul 2012 18:14:05 -0300 Subject: luxrender-libre: adding package to libre-testing repo --- libre-testing/luxrender-libre/PKGBUILD | 54 +++++++++ libre-testing/luxrender-libre/boost_1.50_fix.diff | 131 ++++++++++++++++++++++ 2 files changed, 185 insertions(+) create mode 100644 libre-testing/luxrender-libre/PKGBUILD create mode 100644 libre-testing/luxrender-libre/boost_1.50_fix.diff diff --git a/libre-testing/luxrender-libre/PKGBUILD b/libre-testing/luxrender-libre/PKGBUILD new file mode 100644 index 000000000..44df6f3c2 --- /dev/null +++ b/libre-testing/luxrender-libre/PKGBUILD @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Lukas Jirkovsky +# Initial contributor: flixie <69one@gmx.net> +# Contributor: Imanol Celaya +# Maintainer (Parabola): Márcio Silva +pkgname=luxrender-libre +pkgver=1.0rc2 +_pkgver=008805644181 +pkgrel=2 +pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.luxrender.net/" +license=('GPL') +depends=('boost-libs' 'freeimage' 'openexr') +optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ + 'python: Python interface (pylux)') +makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python') +replaces=('luxrender') +conflicts=('luxrender') +provides=("luxrender=$pkgver") +source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ + boost_1.50_fix.diff) +md5sums=('1922ccce6f70e7d707b340e2415875cd' + '8c7774bb0c97aadd77d9e665d8fa4aab') + +build() { + cd "$srcdir"/luxrender-lux-$_pkgver + + # fix for boost 1.50 + # the boost::TIME_UTC has been renamed due to the conflict with C++11 + patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true + + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + -DPYTHON_CUSTOM=ON \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ + . + make +} + +package() { + cd "$srcdir"/luxrender-lux-$_pkgver + make DESTDIR="$pkgdir" install + + # fix library path on x86_64 + [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + + #install pylux + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so +} + +# vim:set ts=2 sw=2 et: diff --git a/libre-testing/luxrender-libre/boost_1.50_fix.diff b/libre-testing/luxrender-libre/boost_1.50_fix.diff new file mode 100644 index 000000000..c1aa0a8e2 --- /dev/null +++ b/libre-testing/luxrender-libre/boost_1.50_fix.diff @@ -0,0 +1,131 @@ +diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp +--- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 +@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte + int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth); + samplePerPass = xRealWidth * yRealHeight; + +- boost::xtime_get(&creationTime, boost::TIME_UTC); ++ boost::xtime_get(&creationTime, boost::TIME_UTC_); + + //Queryable parameters + AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution); +@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) { + if (haltTime > 0) { + // Check if we have met the enough rendering time condition + boost::xtime t; +- boost::xtime_get(&t, boost::TIME_UTC); ++ boost::xtime_get(&t, boost::TIME_UTC_); + if (t.sec - creationTime.sec > haltTime) + enoughSamplesPerPixel = true; + } +diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp +--- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 +@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen + + boost::xtime photonShootingStartTime; + boost::xtime lastUpdateTime; +- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC); +- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC); ++ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_); ++ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_); + u_int nshot = 0; + while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) { + // Dade - print some progress information + boost::xtime currentTime; +- boost::xtime_get(¤tTime, boost::TIME_UTC); ++ boost::xtime_get(¤tTime, boost::TIME_UTC_); + if (currentTime.sec - lastUpdateTime.sec > 5) { + ss.str(""); + ss << "Photon shooting progress: Direct[" << directPhotons.size(); +@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen + return; + + boost::xtime photonShootingEndTime; +- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC); ++ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_); + LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)"; + + if (computeRadianceMap) { +@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen + for (u_int i = 0; i < radiancePhotons.size(); ++i) { + // Dade - print some progress info + boost::xtime currentTime; +- boost::xtime_get(¤tTime, boost::TIME_UTC); ++ boost::xtime_get(¤tTime, boost::TIME_UTC_); + if (currentTime.sec - lastUpdateTime.sec > 5) { + LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)"; + +@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen + + + boost::xtime radianceComputeEndTime; +- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC); ++ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_); + LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)"; + } + +diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp +--- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 +@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU + // Dade - thread to update the film with data from servers + + boost::xtime reft; +- boost::xtime_get(&reft, boost::TIME_UTC); ++ boost::xtime_get(&reft, boost::TIME_UTC_); + + while (filmUpdaterThread->signal == SIG_NONE) { + // Dade - check signal every 1 sec +@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU + for(;;) { + // Dade - sleep for 1 sec + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 1; + boost::thread::sleep(xt); + +diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp +--- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 +@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres, + m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != ""; + + // init timer +- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC); ++ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_); + lastWriteFLMTime = lastWriteImageTime; + } + +@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter + { + // Check write output interval + boost::xtime currentTime; +- boost::xtime_get(¤tTime, boost::TIME_UTC); ++ boost::xtime_get(¤tTime, boost::TIME_UTC_); + bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval); + bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval); + +@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter + // WriteImage can take a very long time to be executed (i.e. by saving + // the film. It is better to refresh timestamps after the + // execution of WriteImage instead than before. +- boost::xtime_get(¤tTime, boost::TIME_UTC); ++ boost::xtime_get(¤tTime, boost::TIME_UTC_); + + if (timeToWriteImage) + lastWriteImageTime = currentTime; +diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h +--- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 +@@ -126,7 +126,7 @@ public: + { + while (state == PAUSE && !boost::this_thread::interruption_requested()) { + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 1; + boost::thread::sleep(xt); + } -- cgit v1.2.3-2-g168b From 5e92143b58bc8552319151b87c531fa5a66005e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 16 Jul 2012 18:37:52 -0300 Subject: d0_blind_id-git: add new package to pcr repo --- pcr/d0_blind_id-git/PKGBUILD | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pcr/d0_blind_id-git/PKGBUILD diff --git a/pcr/d0_blind_id-git/PKGBUILD b/pcr/d0_blind_id-git/PKGBUILD new file mode 100644 index 000000000..bfda13205 --- /dev/null +++ b/pcr/d0_blind_id-git/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: MrBougo +pkgname=d0_blind_id-git +pkgver=20120716 +pkgrel=1 +pkgdesc="Cryptographic library for identification with Schnorr ID scheme and Blind RSA Signatures" +arch=('i686' 'x86_64') +url="http://github.com/divVerent/d0_blind_id" +license=('BSD') +depends=('gmp') +makedepends=('git') +conflicts=() +options=('!libtool') + +_gitroot="git://git.xonotic.org/xonotic/d0_blind_id.git" +_gitname="d0_blind_id" + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + sh autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_gitname-build" + make DESTDIR="$pkgdir/" install + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} -- cgit v1.2.3-2-g168b From cd68c83ecc1faa97e0d2f3a86a058765cdd3eb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 17 Jul 2012 15:44:39 -0300 Subject: linux-libre-3.4.5-1: updating version --- libre/linux-libre/PKGBUILD | 29 +++++++++++++++-------------- libre/linux-libre/linux-libre.install | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 08a32eae0..250ec13ef 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,10 +12,10 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.4 -_sublevel=4 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -34,18 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' '3.4.4-fix-backlight-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - 'e9bb311ab329555a61696b1a18df2d34' - '669c3f9d5c6a2109bad8e511287826c3' - '454231e14419e56a5281eb7bc6fde83e' - 'e49ac236dfeef709f91a3d993ea7b62c' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - '80a46681386bb87813989faeb92bdd9a' - '86910efeadb5d1e5d5416ff1a9dacb33') + if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -385,3 +374,15 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } +md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' + '0882e254b12df2c8d73df29de85223a7' + '669c3f9d5c6a2109bad8e511287826c3' + '454231e14419e56a5281eb7bc6fde83e' + 'e49ac236dfeef709f91a3d993ea7b62c' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + '80a46681386bb87813989faeb92bdd9a' + '86910efeadb5d1e5d5416ff1a9dacb33') \ No newline at end of file diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 44850230f..7d7e7a1db 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.4-3-LIBRE +KERNEL_VERSION=3.4.5-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-2-g168b From 0f30930e8efdf56b42d1418b5b14ae44afd4a38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 17 Jul 2012 15:49:58 -0300 Subject: linux-libre-3.4.5-1: adding a new line at the end on PKGBUILD file --- libre/linux-libre/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 250ec13ef..59ea3ba2c 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -385,4 +385,5 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' '80a46681386bb87813989faeb92bdd9a' - '86910efeadb5d1e5d5416ff1a9dacb33') \ No newline at end of file + '86910efeadb5d1e5d5416ff1a9dacb33') + -- cgit v1.2.3-2-g168b From 7d8a07367c221dc4f04f0fa4735c82b95842f4ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 17 Jul 2012 16:10:57 -0300 Subject: linux-libre-3.4.5-1: coming back md5sums to the original place due that contains mips patch and variables to enable it on PKGBUILD --- libre/linux-libre/PKGBUILD | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 59ea3ba2c..e3116046b 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -34,6 +34,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' '3.4.4-fix-backlight-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") +md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' + '0882e254b12df2c8d73df29de85223a7' + '669c3f9d5c6a2109bad8e511287826c3' + '454231e14419e56a5281eb7bc6fde83e' + 'e49ac236dfeef709f91a3d993ea7b62c' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + '80a46681386bb87813989faeb92bdd9a' + '86910efeadb5d1e5d5416ff1a9dacb33') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -374,16 +386,3 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } -md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - '0882e254b12df2c8d73df29de85223a7' - '669c3f9d5c6a2109bad8e511287826c3' - '454231e14419e56a5281eb7bc6fde83e' - 'e49ac236dfeef709f91a3d993ea7b62c' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - '80a46681386bb87813989faeb92bdd9a' - '86910efeadb5d1e5d5416ff1a9dacb33') - -- cgit v1.2.3-2-g168b From 120fb2912d957d87aeaa59665a70f35a079484fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 17 Jul 2012 16:13:52 -0300 Subject: linux-libre-3.4.5-1: deleting blank spaces --- libre/linux-libre/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e3116046b..d36ba4da2 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -46,7 +46,6 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '263725f20c0b9eb9c353040792d644e5' '80a46681386bb87813989faeb92bdd9a' '86910efeadb5d1e5d5416ff1a9dacb33') - if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-2-g168b From 661bd5e9553921c40bbdb66fc29d10dc12a271a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 17 Jul 2012 17:10:13 -0300 Subject: linux-libre-lts-3.0.37-1: updating version --- libre/linux-libre-lts/PKGBUILD | 6 +++--- libre/linux-libre-lts/linux-libre-lts.install | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 17651ce1e..9793f599e 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,10 +9,10 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=36 +_sublevel=37 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.36 # nearly always the same as pkgver -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -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' - '150413437fe54d4822e9e43189e37319' + '5fbdf641fc8962f875d1e9e8ce8f2969' '9cfcf3807201ce44aa720571232a10ce' '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 8a688091d..12b654f19 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.36-2-LIBRE-LTS +KERNEL_VERSION=3.0.37-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-2-g168b From 561d5f2c9502a8a8f13a20f8d0fa5498b20cc357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 17 Jul 2012 17:12:48 -0300 Subject: xonotic-git: add new package to pcr repo --- pcr/xonotic-git/PKGBUILD | 197 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 pcr/xonotic-git/PKGBUILD diff --git a/pcr/xonotic-git/PKGBUILD b/pcr/xonotic-git/PKGBUILD new file mode 100644 index 000000000..2a032cd4a --- /dev/null +++ b/pcr/xonotic-git/PKGBUILD @@ -0,0 +1,197 @@ +# Maintainer: MrBougo +# Contributor: wido +# Contributor: Alexander Suhoverhov + +pkgname=xonotic-git +pkgver=20120718 +pkgrel=1 +pkgdesc="A free, fast-paced crossplatform first-person shooter" +arch=('i686' 'x86_64') +url="http://xonotic.org" +license=('GPL') +depends=( + 'd0_blind_id-git' + 'libxpm' + 'libjpeg>=8' + 'libpng>=1.4.0' + 'libmodplug' + 'libvorbis' + 'libxxf86dga' + 'libxxf86vm' + 'alsa-lib' + 'sdl' + 'curl' +) +makedepends=('git' 'p7zip' 'zip' 'unzip' 'vorbis-tools' 'sdl' 'mesa' 'imagemagick') +optdepends=( + 'libtheora: recording in ogv' + #'d0_blind_id-git: crypto libraries for player authentification' +) +provides=('xonotic' 'xonotic-data') +conflicts=('xonotic' 'xonotic-data') + +_gitroot="git://git.xonotic.org/xonotic/xonotic.git" +_gitname="xonotic" +_releasename="git-AUR" +_compression=5 + +# the jpeg and ogg variables can be modified, the function may also be skipped for raw data +# the values here are also used in the official -low builds +_compress() { + find $1 -type f -print0 | + git_src_repo=$2 \ + CACHEDIR="$srcdir"/datacache \ + do_jpeg=true \ + jpeg_qual_rgb=80 \ + jpeg_qual_a=97 \ + do_dds=false \ + do_ogg=true \ + ogg_qual=1 \ + del_src=true \ + xargs -0 "$srcdir"/$_gitname/misc/tools/cached-converter.sh +} + +_git_extract() { + _from=$1 + _to=$2 + shift 2 + { cd "$_from"; git archive --format=tar HEAD -- "$@"; } \ + | { + cd "$_to" + tar xvf - + } +} + +# 7z compresses nicely but can't deal with flags and symlinks +_mkzip() { + _archive=$1 + shift + _ziplist=`mktemp` + find "$@" -xtype f \( -executable -or -type l \) -print > "$_ziplist" + 7za a -tzip -mx=$_compression -x@"$_ziplist" "$_archive" "$@" || true + zip -$_compression -y -@<"$_ziplist" "$_archive" || true + rm -f "$_ziplist" +} + +#credit goes to omgwizard for the shallow clone idea +_update() { + cd "$srcdir"/$_gitname + sed 's/git clone/git clone --depth 1/g' --in-place=".PKGBUILD_BU" ./all + ./all update + mv -f ./all.PKGBUILD_BU ./all + cd "$OLDPWD" +} + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + #future updates might introduce new subrepos, use shallow cloning anyway + cd $_gitname && _update + msg "The local files are updated." + else + git clone --depth 1 $_gitroot $_gitname + cd $_gitname + touch d0_blind_id.no + touch netradiant.no + _update + fi + + msg "GIT checkout done or server timeout" + + # BUILD + + msg "Copying sources..." + + rm -rf "$srcdir"/src + mkdir -p "$srcdir"/src/darkplaces "$srcdir"/src/fteqcc + _git_extract "$srcdir"/$_gitname/fteqcc "$srcdir"/src/fteqcc + _git_extract "$srcdir"/$_gitname/darkplaces "$srcdir"/src/darkplaces + _git_extract "$srcdir"/$_gitname/data/xonotic-data.pk3dir "$srcdir"/src \ + qcsrc Makefile check-cvars.sh + + msg "Fetching map binaries..." + cd "$srcdir"/$_gitname + ./all update-maps + + msg "Compiling the engine..." + cd "$srcdir"/src/darkplaces + CC="${CC:-gcc} -g -DSUPPORTIPV6" make release + + msg "Compiling fteqcc..." + cd "$srcdir"/src/fteqcc + make all + + msg "Compiling the game code" + cd "$srcdir"/src/ + make FTEQCC="../../fteqcc/fteqcc.bin" # relative to the directories containing progs.src + + msg "Building data pk3's..." + rm -rf "$srcdir"/temp # just in case it was interrupted previously + mkdir "$srcdir"/temp + cd "$srcdir"/temp + for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do + mkdir $_subrepo + _git_extract "$srcdir"/$_gitname/data/$_subrepo.pk3dir "$srcdir"/temp/$_subrepo + done + + rm -rf "$srcdir"/temp/xonotic-data/qcsrc + mv "$srcdir"/src/progs.dat "$srcdir"/src/csprogs.dat "$srcdir"/src/menu.dat "$srcdir"/temp/xonotic-data + + cd "$srcdir"/temp/xonotic-maps + #2x40 question marks. That's as many as eight tens. And that's terrible. + for X in "$srcdir"/$_gitname/data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do + if [ -f "$X" ]; then + unzip "$X" + rm -f maps/*.log maps/*.irc maps/*.lin + fi + done + + msg "Compressing data..." + cd "$srcdir"/temp/ + # don't compress the font files + for _subrepo in xonotic-data xonotic-music xonotic-maps; do + _compress $_subrepo "$srcdir"/$_gitname/data/$_subrepo.pk3dir + done + + msg "Packing data..." + for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do + cd "$srcdir"/temp/$_subrepo + _mkzip "$srcdir"/$_subrepo.pk3 * # this wildcard excludes dot files + done + + msg "Removing temporary files..." + rm -rf "$srcdir"/temp +} + +package() { + msg "Installing..." + mkdir -p "$pkgdir"/opt/$pkgname/ + _git_extract "$srcdir"/$_gitname/ "$pkgdir"/opt/$pkgname \ + Docs \ + server \ + xonotic-linux-glx.sh xonotic-linux-sdl.sh \ + key_0.d0pk + chmod 755 "$pkgdir"/opt/$pkgname/xonotic-linux-glx.sh \ + "$pkgdir"/opt/$pkgname/xonotic-linux-sdl.sh + + # Binaries -- those names are needed by the launcher script + case "$CARCH" in + x86_64) _arch="linux64" ;; + *) _arch="linux32" ;; + esac + install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-glx + install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-sdl + install -m755 "$srcdir"/src/darkplaces/darkplaces-dedicated "$pkgdir"/opt/$pkgname/xonotic-$_arch-dedicated + + mkdir -p "$pkgdir"/opt/$pkgname/data/ + mv -f "$srcdir"/*.pk3 "$pkgdir"/opt/$pkgname/data || true # those files are too big to be copied + + # Launch scripts + mkdir -p "$pkgdir"/usr/bin + mv -f "$pkgdir"/opt/$pkgname/server/server_linux.sh "$pkgdir"/opt/$pkgname/ + ln -sf /opt/$pkgname/xonotic-linux-glx.sh "$pkgdir"/usr/bin/xonotic-glx + ln -sf /opt/$pkgname/xonotic-linux-sdl.sh "$pkgdir"/usr/bin/xonotic-sdl + ln -sf /opt/$pkgname/server_linux.sh "$pkgdir"/usr/bin/xonotic-dedicated +} -- cgit v1.2.3-2-g168b From 98e9dda466e303d77d6f58932cf60c940b5e533c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 18 Jul 2012 01:55:00 -0300 Subject: iceweasel-libre-14.0.1.1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 204 ++++++++++++--------- libre/iceweasel-libre/PKGBUILD | 12 +- libre/iceweasel-libre/libre.patch | 14 +- 3 files changed, 133 insertions(+), 97 deletions(-) diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 3e7149308..4a0507271 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -1,17 +1,21 @@ +From: Mike Hommey +Date: Tue, 5 Jun 2012 08:57:06 +0200 +Subject: Bug 756390 - Make the "Reset Firefox" feature more generic + diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js -index ffb0c34..442a5ff 100644 +index 0e8ccf5..fa46c08 100644 --- a/browser/components/migration/content/migration.js +++ b/browser/components/migration/content/migration.js -@@ -314,7 +314,7 @@ var MigrationWizard = { +@@ -249,7 +249,7 @@ var MigrationWizard = { } - var bundle = document.getElementById("brandBundle"); + var brandBundle = document.getElementById("brandBundle"); - // These strings don't exist when not using official branding. If that's + // These strings may not exist when not using official branding. If that's // the case, just skip this page. try { - var pageTitle = bundle.getString("homePageMigrationPageTitle"); -@@ -346,8 +346,8 @@ var MigrationWizard = { + var pageTitle = brandBundle.getString("homePageMigrationPageTitle"); +@@ -281,8 +281,8 @@ var MigrationWizard = { case "chrome": source = "sourceNameChrome"; break; @@ -22,75 +26,107 @@ index ffb0c34..442a5ff 100644 break; } -@@ -357,8 +357,13 @@ var MigrationWizard = { +@@ -292,7 +292,12 @@ var MigrationWizard = { var oldHomePageURL = this._migrator.sourceHomePageURL; if (oldHomePageURL && source) { -- var bundle2 = document.getElementById("bundle"); -- var appName = bundle2.getString(source); +- var appName = MigrationUtils.getLocalizedString(source); + var appName; + if (source == "brand") { -+ appName = bundle.GetStringFromName("brandFullName"); ++ appName = brandBundle.GetStringFromName("brandFullName"); + } else { -+ var bundle2 = document.getElementById("bundle"); -+ appName = bundle2.getString(source); ++ appName = MigrationUtils.getLocalizedString(source); + } - var oldHomePageLabel = bundle.getFormattedString("homePageImport", - [appName]); + var oldHomePageLabel = + brandBundle.getFormattedString("homePageImport", [appName]); var oldHomePage = document.getElementById("oldHomePage"); diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul -index f8653b1..f3ac62a 100644 +index 4bcc1d9..c4db956 100644 --- a/browser/components/migration/content/migration.xul +++ b/browser/components/migration/content/migration.xul -@@ -76,7 +76,7 @@ - #endif - #endif +@@ -74,7 +74,7 @@ + #elifdef XP_UNIX + #endif - +