diff options
-rw-r--r-- | libre/blender-addon-luxrender/PKGBUILD | 35 | ||||
-rw-r--r-- | libre/luxblend25/PKGBUILD | 35 | ||||
-rw-r--r-- | libre/luxrender-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/luxrender-libre/boost-1.53-shared_array_constructor.diff | 62 | ||||
-rw-r--r-- | pcr/python-sfml2/PKGBUILD | 32 | ||||
-rw-r--r-- | pcr/python2-sfml2/PKGBUILD | 34 | ||||
-rw-r--r-- | pcr/ruby-headers/PKGBUILD | 15 | ||||
-rw-r--r-- | pcr/ruby-mustache/PKGBUILD (renamed from ~fauno/ruby-mustache/PKGBUILD) | 5 | ||||
-rw-r--r-- | pcr/ryzom-client/PKGBUILD | 63 | ||||
-rw-r--r-- | pcr/ryzom-hg/PKGBUILD | 116 | ||||
-rw-r--r-- | pcr/ryzom-hg/ryzom.desktop | 11 | ||||
-rw-r--r-- | pcr/ryzom-hg/ryzom.sh | 9 | ||||
-rw-r--r-- | pcr/ryzom-nel/PKGBUILD | 68 | ||||
-rw-r--r-- | pcr/transmission-remote-cli/PKGBUILD (renamed from ~fauno/transmission-remote-cli/PKGBUILD) | 0 | ||||
-rw-r--r-- | pcr/transmission-remote-cli/python2.patch (renamed from ~fauno/transmission-remote-cli/python2.patch) | 0 | ||||
-rw-r--r-- | pcr/xcftools/xcftools.patch | 27 | ||||
-rw-r--r-- | pcr/yafaray-git/PKGBUILD | 115 |
17 files changed, 356 insertions, 279 deletions
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD new file mode 100644 index 000000000..97a1b4f12 --- /dev/null +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=blender-addon-luxrender +_pkgname=${pkgname:14:3}${pkgname::5}25 +_srcver=c9deae0646d0 +pkgver=1.2.1.v2.66 +_pkgver=${pkgver::5} +_reqname=${pkgname::7} +_reqver=${pkgver:7} +_reqep=7 +pkgrel=2 +pkgdesc="$_pkgname: A addon for the ${_reqname^} which allows render and export with LuxRender (built for the $_reqname-libre package)" +arch=any +url=http://www.${pkgname:14}.net/ +license=GPL +depends=( + ${pkgname:14}=$_pkgver + "$_reqname>=$(($_reqep-1)):$_reqver" + "$_reqname<$_reqep:${_reqver::2}$((${_reqver:2:4}+1))" +) +provides=($_pkgname=$_pkgver) +conflicts=$_pkgname +replaces=$_pkgname +source=http://src.${pkgname:14}.net/$_pkgname/archive/$_srcver.tar.bz2 +sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92 + +package() { + a=$srcdir/$_pkgname-$_srcver/src/${pkgname:14} + b=$pkgdir/usr/share/$_reqname/$_reqver/scripts/addons + install -d -m755 $b && cp -a $a $b + # change the search path in exporter so it finds pylux in its new location + sed -i 's|from.*import pylux|import pylux|' $b/${pkgname:14}/outputs/pure_api.py +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD deleted file mode 100644 index 2af861641..000000000 --- a/libre/luxblend25/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgbase=luxrender -pkgname=luxblend25 -srcver=c9deae0646d0 -pkgver=1.2.1.v2.66 -_pkgver=${pkgver::5} -reqname=blender -reqver=${pkgver:7} -reqep=7 -pkgrel=1 -pkgdesc="LuxRender exporter for ${reqname^}." -arch=any -url=http://www.$pkgbase.net/ -license=GPL -depends=( - $pkgbase=$_pkgver - "$reqname>=$(($reqep-1)):$reqver" - "$reqname<$reqep:${reqver::2}$((${reqver:2:4}+1))" -) -provides=($pkgname=$_pkgver) -conflicts=$pkgname -replaces=$pkgname -source=http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2 -sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92 - -package() { - a=$pkgname-$srcver/src/$pkgbase - b=usr/share/$reqname/$reqver/scripts/addons - install -d -m755 $pkgdir/$b - cp -a $srcdir/$a $pkgdir/$b - # change the search path in exporter so it finds pylux in its new location - sed -i 's|from.*import pylux|import pylux|' $pkgdir/$b/$pkgbase/outputs/pure_api.py -} diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 15bc771ed..3e9ae0e9e 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -7,7 +7,7 @@ pkgname=luxrender-libre _pkgflag=libre pkgver=1.2.1 _pkgver=3066b2161439 -pkgrel=1 +pkgrel=2 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.${pkgname%-$_pkgflag}.net/" @@ -34,18 +34,18 @@ build() { patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ . - make + setarch $CARCH make } package() { cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver - make DESTDIR="$pkgdir" install + setarch $CARCH make DESTDIR="$pkgdir" install # fix library path on x86_64 [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib diff --git a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff new file mode 100644 index 000000000..a6a8d532b --- /dev/null +++ b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff @@ -0,0 +1,62 @@ +diff -rup luxrender-lux-3066b2161439/cmake/luxrender.cmake luxrender-lux-3066b2161439.new/cmake/luxrender.cmake +--- luxrender-lux-3066b2161439/cmake/luxrender.cmake 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/cmake/luxrender.cmake 2013-03-26 18:26:46.194520697 +0000 +@@ -98,7 +98,7 @@ IF(QT4_FOUND) + + QT4_ADD_RESOURCES( LUXQTGUI_RC_SRCS ${LUXQTGUI_RCS}) + QT4_WRAP_UI( LUXQTGUI_UI_HDRS ${LUXQTGUI_UIS} ) +- QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} ) ++ QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) + + #file (GLOB TRANSLATIONS_FILES qtgui/translations/*.ts) + #qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES}) +diff -rup luxrender-lux-3066b2161439/core/film.cpp luxrender-lux-3066b2161439.new/core/film.cpp +--- luxrender-lux-3066b2161439/core/film.cpp 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/core/film.cpp 2013-03-26 18:03:02.828222310 +0000 +@@ -890,8 +890,8 @@ Film::Film(u_int xres, u_int yres, Filte + filename(filename1), + colorSpace(0.63f, 0.34f, 0.31f, 0.595f, 0.155f, 0.07f, 0.314275f, 0.329411f), // default is SMPTE + convTest(NULL), varianceBuffer(NULL), +- noiseAwareMap(NULL), noiseAwareMapVersion(0), +- userSamplingMapFileName(samplingmapfilename), userSamplingMap(NULL), userSamplingMapVersion(0), ++ noiseAwareMapVersion(0), ++ userSamplingMapFileName(samplingmapfilename), userSamplingMapVersion(0), + ZBuffer(NULL), use_Zbuf(useZbuffer), + debug_mode(debugmode), premultiplyAlpha(premult), + writeResumeFlm(w_resume_FLM), restartResumeFlm(restart_resume_FLM), writeFlmDirect(write_FLM_direct), +diff -rup luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp +--- luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp 2013-03-26 18:03:02.828222310 +0000 +@@ -29,7 +29,7 @@ + using namespace lux; + + LDSampler::LDData::LDData(const Sampler &sampler, int xPixelStart, int yPixelStart, u_int pixelSamples) : +- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) { ++ noiseAwareMapVersion(0), userSamplingMapVersion(0) { + xPos = xPixelStart - 1; + yPos = yPixelStart; + samplePos = pixelSamples - 1; +diff -rup luxrender-lux-3066b2161439/samplers/metrosampler.cpp luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp +--- luxrender-lux-3066b2161439/samplers/metrosampler.cpp 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp 2013-03-26 18:13:13.146702871 +0000 +@@ -39,7 +39,7 @@ static const u_int rngA = 884; + MetropolisSampler::MetropolisData::MetropolisData(const MetropolisSampler &sampler) : + consecRejects(0), stamp(0), currentStamp(0), weight(0.f), + LY(0.f), alpha(0.f), totalLY(0.f), sampleCount(0.f), +- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0), ++ noiseAwareMapVersion(0), userSamplingMapVersion(0), + large(true), cooldown(sampler.cooldownTime > 0) + { + u_int i; +diff -rup luxrender-lux-3066b2161439/samplers/random.cpp luxrender-lux-3066b2161439.new/samplers/random.cpp +--- luxrender-lux-3066b2161439/samplers/random.cpp 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/samplers/random.cpp 2013-03-26 18:12:34.378868365 +0000 +@@ -30,7 +30,7 @@ using namespace lux; + + RandomSampler::RandomData::RandomData(const Sampler &sampler, int xPixelStart, + int yPixelStart, u_int pixelSamples) : +- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) ++ noiseAwareMapVersion(0), userSamplingMapVersion(0) + { + xPos = xPixelStart; + yPos = yPixelStart; diff --git a/pcr/python-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD index 48a8e4d30..41df1a9d0 100644 --- a/pcr/python-sfml2/PKGBUILD +++ b/pcr/python-sfml2/PKGBUILD @@ -1,33 +1,37 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname=python-sfml2 -pkgver=1.1.0 -pkgrel=2 -pkgdesc="A Python 3 binding for SFML 2, written with Cython." +pkgver=1.2 +pkgrel=0 +pkgdesc="Python 3 binding for SFML 2, written with Cython." arch=('i686' 'x86_64') url="http://openhelbreath.net/python-sfml2" -license=('GPL3') +license=('LGPL3') depends=('sfml' 'python3') makedepends=('sfml' 'cython') -conflicts=('python-sfml2') -source=('http://openhelbreath.net/python-sfml2/downloads/python-sfml2-1.1.tar.gz') +conflicts=('python-sfml2' 'python-pysfml2' 'python-pysfml2-git') +source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip') optdepends=('pyqt: To use pysfml with Qt') build() { - cd "$srcdir/pysfml2-$pkgver" - python3 setup.py build + cd "$srcdir/python-sfml-$pkgver" + python3 setup.py build } package() { - cd "$srcdir/pysfml2-$pkgver" - python3 setup.py install --root="${pkgdir}" --prefix=/usr + cd "$srcdir/python-sfml-$pkgver" + python3 setup.py install --root="${pkgdir}" --prefix=/usr - # Copying the examples + # Copying the examples install -d -m755 "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples" cp -R examples/ "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/" # fixing permission problems find "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +; - # Copying the License file - install -D -m644 "$srcdir/pysfml2-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Copying the License file + LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + if [ ! -e $LICENSEFILE ] + then + install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE + fi } -sha256sums=('111af2ead2a7c1f2a44145059889ecbb91c08bad21dd18764391b60256b92af1') +sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29') diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD index 263097e50..b612997f3 100644 --- a/pcr/python2-sfml2/PKGBUILD +++ b/pcr/python2-sfml2/PKGBUILD @@ -1,36 +1,40 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname=python2-sfml2 -pkgver=1.1.0 -pkgrel=2 -pkgdesc="A Python 2 binding for SFML 2, written with Cython." +pkgver=1.2 +pkgrel=0 +pkgdesc="Python 2 binding for SFML 2, written with Cython." arch=('i686' 'x86_64') url="http://openhelbreath.net/python-sfml2" -license=('GPL3') +license=('LGPL3') depends=('sfml' 'python2') makedepends=('sfml' 'cython2') conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2') -source=('http://openhelbreath.net/python-sfml2/downloads/python-sfml2-1.1.tar.gz') +source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip') optdepends=('pyqt-common: To use pysfml with Qt') build() { - cd "$srcdir/pysfml2-$pkgver" - python2 setup.py build + cd "$srcdir/python-sfml-$pkgver" + python2 setup.py build } package() { - cd "$srcdir/pysfml2-$pkgver" - python2 setup.py install --root="${pkgdir}" --prefix=/usr + cd "$srcdir/python-sfml-$pkgver" + python2 setup.py install --root="${pkgdir}" --prefix=/usr - # Copying the examples + # Copying the examples install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples" - - cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" + + cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" cp -R examples/pyqt4 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" cp -R examples/sound "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" find "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +; - # Copying the License file - install -D -m644 "$srcdir/pysfml2-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Copying the License file + LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + if [ ! -e $LICENSEFILE ] + then + install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE + fi } -sha256sums=('111af2ead2a7c1f2a44145059889ecbb91c08bad21dd18764391b60256b92af1') +sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29') diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD index 855c7ff38..074205e79 100644 --- a/pcr/ruby-headers/PKGBUILD +++ b/pcr/ruby-headers/PKGBUILD @@ -3,29 +3,24 @@ pkgname=ruby-headers _pkgname=ruby -pkgver=1.9.3_p385 -_pkgver=1.9.3-p385 +pkgver=2.0.0_p0 +_pkgver=2.0.0-p0 pkgrel=1 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug." arch=('any') url="http://www.ruby-lang.org/en/" license=('GPL2' 'custom:Ruby') depends=("ruby=$pkgver") -source=("http://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2") - -build() { - /bin/true -} +source=("http://ftp.ruby-lang.org/pub/ruby/2.0/$_pkgname-$_pkgver.tar.bz2") package() { cd "$srcdir/$_pkgname-$_pkgver" - # Just to make sure, since currently we have /usr/include/ruby-1.9.1 for ruby 1.9.2 - _hdrdir=`ruby -e "require 'rbconfig'; puts Config::CONFIG['rubyhdrdir']"` + _hdrdir=`ruby -e "require 'rbconfig'; puts RbConfig::CONFIG['rubyhdrdir']"` install -d "$pkgdir$_hdrdir/$_pkgname-$_pkgver" install -m644 *.{h,inc} "$pkgdir$_hdrdir/$_pkgname-$_pkgver" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c') +md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a') diff --git a/~fauno/ruby-mustache/PKGBUILD b/pcr/ruby-mustache/PKGBUILD index 8c8d924c1..ddb5215d3 100644 --- a/~fauno/ruby-mustache/PKGBUILD +++ b/pcr/ruby-mustache/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: David Campbell <davekong@archlinux.us> pkgname=ruby-mustache pkgver=0.99.4 -pkgrel=2 +pkgrel=3 pkgdesc="A framework-agnostic way to render logic-free views." arch=('any') url="http://github.com/defunkt/mustache" license=(MIT) -depends=('ruby') +depends=('ruby>=2') makedepends=('rubygems') source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem" "https://raw.github.com/defunkt/mustache/master/LICENSE") @@ -18,6 +18,7 @@ build() { cd $srcdir local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" gem install \ + --no-user-install \ --ignore-dependencies \ -i "$pkgdir$_gemdir" mustache-$pkgver.gem \ -n "$pkgdir/usr/bin" diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD deleted file mode 100644 index fce700054..000000000 --- a/pcr/ryzom-client/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=ryzom-client-hg -pkgver=2691 -pkgrel=3 -pkgdesc='An awesome free software 3D MMORPG game' -arch=('x86_64' 'i686') -url="http://www.ryzom.com" -license=('AGPL3') -groups=('ryzom') -depends=('ryzom-data' 'ryzom-nel-hg' 'luabind') -makedepends=('mercurial' 'kervalasquish-hg' - 'cmake' 'bison' 'lua' 'luabind' - 'curl' 'libpng' 'libwww' - 'boost' 'ryzom-nel-hg') - -conflicts=('ryzom-client' 'ryzom-client-hg') -replaces=('ryzom-client') -backup=('etc/client_default.cfg') -source=('ftp://ftp.ryzom.com/1210062202_client_default.cfg') -noextract=() - -_hgroot=http://ryzom.hg.sourceforge.net:8000/hgroot/ryzom/ryzom -_hgrepo=ryzom - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_hgrepo-build" - cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" - mkdir "$srcdir/$_hgrepo-build/code/ryzom-client" - cd "$srcdir/$_hgrepo-build/code/ryzom-client" - - # - # BUILD HERE - # - cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc -DRYZOM_GAMES_PREFIX=bin - - make -j3 - - # Replacing client_default.cfg file - cp "$srcdir/1210062202_client_default.cfg" "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" - sed -i s/"data"/"\/usr\/share\/ryzom\/data"/ "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" - sed -i 's/= 1\.33333;/= 1\.7777;/' "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" -} - -package() { - cd "$srcdir/$_hgrepo-build/code/ryzom-client" - make DESTDIR="$pkgdir" install -} - -sha256sums=('0753c04dd7d61c43ec88d59428752b609d65f439eb1de9018bf922294e65966f') diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD new file mode 100644 index 000000000..e01f42ef0 --- /dev/null +++ b/pcr/ryzom-hg/PKGBUILD @@ -0,0 +1,116 @@ +# Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com +# Maintainer:Jorge Araya Navarro <jorgean@lavabit.com> +#_gui_toolkit=qt # qt or gtk +_build_server=false # set true to build server (default:false) +_build_client=true # set false to don't build client (default:true) +_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client +_CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server +_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client + +if [ $_build_client = true ] ; then + true && pkgname=( 'ryzom-client-hg' ) +fi + +if [ $_build_server = true ] ; then + true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg') +fi + + +case $_gui_toolkit in + qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;; + gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;; +esac + + +_hg_root='https://bitbucket.org/ryzom/ryzomcore' +_hg_name='ryzomcore' + +prepare() { + if [ -d "$_hg_name" ] ; then # fetch sources + cd "$_hg_name" + hg pull && hg update + cd .. + else + hg clone "$_hg_root" + fi + + msg2 "hg clone done or server timeout" +} +build() { + cd $_hg_name + + if [ $_build_client = true ] ; then + + mkdir -p "$srcdir/build-client" + cd "$srcdir/build-client" + msg "client is $_build_client, building client" + cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin + msg "Starting make, to build client" + make + + fi + + if [ $_build_server = true ] ; then + mkdir -p "$srcdir/build-server" + cd "$srcdir/build-server" + msg "client is $_build_server, building server" + cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin + msg "Starting make, to build server" + make + + fi + +} +if [ $_build_client = true ] ; then + + package_ryzom-client-hg() { + pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server" + depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql' 'ryzom-data' ) + cd "$srcdir/build-client" + make DESTDIR="$pkgdir/" install + install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications + sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script + cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom + chmod +x ${pkgdir}/usr/bin/ryzom + mkdir -p ${pkgdir}/usr/bin + + } + +fi + +if [ $_build_server = true ] ; then + + package_ryzom-server-hg() { + pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server" + cd "$srcdir/build-server" + make DESTDIR="$pkgdir/" install + # install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications + # sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script + # cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom + #chmod +x ${pkgdir}/usr/bin/ryzom + mkdir -p ${pkgdir}/usr/bin + + } + +fi + + + + + +pkgname=ryzom-hg +pkgbase=ryzom-hg +pkgver=20130331 +pkgrel=1 +pkgdesc="An awesome free software 3D MMORPG game" +arch=('i686' 'x86_64') +url="http://www.ryzom.com/" +license=('AGPL3') +depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51') #'lua51-sql-mysql') +conflicts=('ryzom-client-latest-hg' 'ryzom-client' 'ryzom-hg') +groups=('ryzom') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison') +provides=('ryzom') +source=( 'ryzom.sh' 'ryzom.desktop' ) +md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' + '71d5136d40ec4e76c2ac2b0c9e506aef') diff --git a/pcr/ryzom-hg/ryzom.desktop b/pcr/ryzom-hg/ryzom.desktop new file mode 100644 index 000000000..d90063593 --- /dev/null +++ b/pcr/ryzom-hg/ryzom.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=Ryzom +Type=Application +GenericName=ryzom +Comment=Ryzom +Exec=/usr/bin/ryzom +Icon=/usr/share/ryzom/data/ryzom.png +Terminal=false +Hidden=false +Categories=Game;RolePlaying; diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh new file mode 100644 index 000000000..e3cff2c64 --- /dev/null +++ b/pcr/ryzom-hg/ryzom.sh @@ -0,0 +1,9 @@ +#!/bin/sh +if groups | grep games > /dev/null 2>&1 ; then + ryzom_sync + exec ryzom_client + +else + echo "you need to be in games group to run ryzom" + exit 1 +fi diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD deleted file mode 100644 index bc9fa3199..000000000 --- a/pcr/ryzom-nel/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=ryzom-nel-hg -pkgver=2687 -pkgrel=3 -pkgdesc='An awesome free software 3D MMORPG game, NeL engine' -arch=('x86_64' 'i686') -url="http://www.ryzom.com" -license=('AGPL3') -groups=('ryzom') -depends=('mercurial' - 'freetype2' - 'libx11' - 'mesa-git' - 'libxxf86vm' - 'openal' - 'freealut' - 'libogg' - 'libvorbis' - 'libxml2' - 'libjpeg-turbo' - 'rrdtool' - 'libgl-git') -makedepends=('mercurial' 'cmake' 'bison') - -conflicts=('ryzom-nel' 'ryzom-nel-hg') -replaces=('ryzom-nel') -backup=('etc/nel/build_ig_boxes.cfg' - 'etc/nel/build_indoor_rbank.cfg' - 'etc/nel/build_rbank.cfg' - 'etc/nel/make_sheet_id.cfg' - 'etc/nel/zviewer.cfg') - -_hgroot=http://ryzom.hg.sourceforge.net/hgroot/ryzom/ryzom -_hgrepo=ryzom - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_hgrepo-build" - cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" - mkdir "$srcdir/$_hgrepo-build/code/ryzom-nel" - cd "$srcdir/$_hgrepo-build/code/ryzom-nel" - - # - # BUILD HERE - # - cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel - - make -j3 -} - -package() { - cd "$srcdir/$_hgrepo-build/code/ryzom-nel" - make DESTDIR="$pkgdir" install -} - diff --git a/~fauno/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD index 5e3699bce..5e3699bce 100644 --- a/~fauno/transmission-remote-cli/PKGBUILD +++ b/pcr/transmission-remote-cli/PKGBUILD diff --git a/~fauno/transmission-remote-cli/python2.patch b/pcr/transmission-remote-cli/python2.patch index 256b676f0..256b676f0 100644 --- a/~fauno/transmission-remote-cli/python2.patch +++ b/pcr/transmission-remote-cli/python2.patch diff --git a/pcr/xcftools/xcftools.patch b/pcr/xcftools/xcftools.patch new file mode 100644 index 000000000..1a2d88c14 --- /dev/null +++ b/pcr/xcftools/xcftools.patch @@ -0,0 +1,27 @@ +diff -rupN xcftools-1.0.7.old/Makefile.in xcftools-1.0.7/Makefile.in +--- xcftools-1.0.7.old/Makefile.in 2009-07-03 11:31:56.000000000 +0100 ++++ xcftools-1.0.7/Makefile.in 2012-01-03 13:03:51.152358830 +0000 +@@ -79,7 +79,7 @@ xcf2pnm$e: xcf2pnm.$o $(FILEIO).$o enums + + xcf2png$e: xcf2png.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o \ + pixels.$o flatten.$o flatspec.$o scaletab.$o table.$o palette.$o +- $(CC) $(LDFLAGS) $(LIBS) -lpng $^ -o $@ ++ $(CC) $(LDFLAGS) $(LIBS) $^ -lpng -o $@ + + xcfview: xcfview.in Makefile + sed '1s,/usr/bin/perl,@PERL@,' < $< > $@ +diff -rupN xcftools-1.0.7.old/xcf2png.c xcftools-1.0.7/xcf2png.c +--- xcftools-1.0.7.old/xcf2png.c 2009-07-03 11:31:52.000000000 +0100 ++++ xcftools-1.0.7/xcf2png.c 2012-01-03 13:03:36.262509165 +0000 +@@ -71,9 +71,9 @@ init_output(void) + + outfile = openout(flatspec.output_filename); + libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, ++ (png_voidp)NULL, + my_error_callback, +- png_error_ptr_NULL); ++ (png_voidp)NULL); + if( !libpng ) + FatalUnexpected(_("Couldn't initialize libpng library")); + diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray-git/PKGBUILD index 22465488c..1d4b3436c 100644 --- a/pcr/yafaray-git/PKGBUILD +++ b/pcr/yafaray-git/PKGBUILD @@ -1,16 +1,18 @@ -# $Id$ # Maintainer: Márcio Silva <coadde@lavabit.com> -pkgbase=yafaray pkgname=( yafaray-git - yafaray-blender-exporter-git + blender-addon-yafaray-git ) _pkgflag=git +_pkgname=${pkgname[0]%-$_pkgflag} +_bldname=${pkgname[1]::7} +_gitname=Core +_addname=${_bldname^}-Exporter pkgver=$(LC_ALL=C date -u +%Y%m%d) _pkgver=1.2 _bldver=2.66 -_bldepoch=6 +_bldep=7 _pyver=3.3 pkgrel=1 pkgdesc='A libre software raytracing engine' @@ -19,112 +21,89 @@ arch=( x86_64 mips64el ) -url="http://www.$pkgbase.org" +url="http://www.$_pkgname.org" license=LGPL2.1 depends=( freetype2 libjpeg libxml2 - openexr + 'openexr=2.0.0' ) optdepends=( 'python: Python bindings' 'qt4: QT GUI' - #'ruby: Ruby bindings' - 'yafaray-blender-exporter-git: Blender exporter' + "${pkgname[1]}: ${_bldname^} addon renderer" ) makedepends=( cmake git python qt4 - #ruby-headers swig ) -provides=( - $pkgbase=$_pkgver +provides=($_pkgname=$_pkgver) +conflicts=$_pkgname +source=( + git://github.com/YafaRay/$_gitname.$_pkgflag + git://github.com/YafaRay/$_addname.$_pkgflag ) -conflicts=$pkgbase +sha512sums=(SKIP SKIP) -_gitroot="https://github.com/YafaRay/Core.git" -_gitname=$pkgbase -_gitrootexport="https://github.com/YafaRay/Blender-Exporter.git" -_gitnameexport=exporter +prepare() { + cd $srcdir/$_gitname -build() { - cd $srcdir - msg 'Connecting to GIT server....' - - # core - if [[ -d $_gitname ]]; then - cd $_gitname && git pull origin - cd .. - msg 'The local files are updated.' - else - git clone $_gitroot $_gitname - fi - # exporter - if [[ -d $_gitnameexport ]]; then - cd $_gitnameexport && git pull origin - cd .. - msg 'The local files are updated.' - else - git clone $_gitrootexport $_gitnameexport - fi - - msg 'GIT checkout done or server timeout' - msg 'Starting build...' + [[ -d build ]] && rm -r build + mkdir build +} - if [ -e $srcdir/$_gitname-build ]; then - rm -rf $srcdir/$_gitname-build - fi - mkdir $srcdir/$_gitname-build - cd $srcdir/$_gitname-build +build() { + cd $srcdir/$_gitname/build - setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr\ + setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ -DYAF_PY_VERSION=$_pyver\ - -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver\ - ../$_gitname - - #-DWITH_YAF_PY_BINDINGS=ON\ - #-DBLENDER_ADDON=ON\ - #-DBLENDER_EXPORTER_BRANCH=master\ - #-DWITH_YAF_RUBY_BINDINGS=ON\ - #-DYAF_USER_INCLUDE_DIRS=/usr/include/ruby-1.9.1/$CARCH-linux\ + -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver setarch $CARCH make } package_yafaray-git() { - cd $srcdir/$_gitname-build + cd $srcdir/$_gitname/build setarch $CARCH make DESTDIR=$pkgdir install } -package_yafaray-blender-exporter-git() { +package_blender-addon-yafaray-git() { pkgver=$pkgver.v$_bldver - pkgdesc='YafaRay exporter for Blender' + pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)" arch=any depends=( - ${pkgname[0]}=$pkgver - "blender>=$_bldepoch:$_bldver" + ${pkgname:14}=${pkgver%.v$_bldver} + "$_bldname>=$(($_bldep-1)):$_bldver" + "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" ) - optdepends="" + optdepends='' provides=( - ${pkgname[1]%-$_pkgflag}=$_pkgver.v$_bldver + ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver + $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver + $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver + ) + conflicts=( + ${pkgname%-$_pkgflag} + $_pkgname-$_bldname-exporter + $_pkgname-$_bldname-exporter-$_pkgflag ) - conflicts=${pkgname[1]%-$_pkgflag} + replaces=$_pkgname-$_bldname-exporter-$_pkgflag - cd $srcdir/$_gitnameexport + cd $srcdir/$_addname a=/usr/lib - b=usr/share/blender/$_bldver/scripts/addons/$pkgbase/bin + b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin - git checkout-index -a -f --prefix=$pkgdir/${b%bin} + git checkout-index -a -f --prefix=${b%bin} - install -d -m755 $pkgdir/$b - ln -sf $a/lib${pkgbase}core.so $pkgdir/$b/lib${pkgbase}core.so - ln -sf $a/lib${pkgbase}plugin.so $pkgdir/$b/lib${pkgbase}plugin.so - ln -sf $a/$pkgbase $pkgdir/$b/plugins + install -d $b + ln -sf $a/lib${_pkgname}core.so $b/lib${_pkgname}core.so + ln -sf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so + ln -sf $a/$_pkgname $b/plugins } # vim:set ts=2 sw=2 et: |