Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 105 insertions, 8 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index def346093..3803b520c 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -5,11 +5,11 @@
 pkgbase=linux-libre-tools
 _pkgname=('perf' 'cpupower' 'x86_energy_perf_policy')
 pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre')
-_basekernel=3.4
+_basekernel=3.5
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=3
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'cpupower.rc'
         'cpupower.conf'
         'cpupower.service')
-md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
+md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
          '73dbc931e86b3b73d6e2338dcbee81a4'
          '18d5aa9e4c6bb23bb02bf65e155e0f0e'
          '20870541e88109d2f153be3c58a277f1')
@@ -37,8 +37,9 @@ build() {
   msg2 'Build perf'
   pushd linux-$pkgver/tools/perf
   make \
+    WERROR=0 \
     DESTDIR="$pkgdir/usr" \
-    perfexecdir="lib/$_pkgname" \
+    perfexecdir='lib/perf' \
     PYTHON=python2 \
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
@@ -67,8 +68,9 @@ package_perf-libre() {
 
   cd linux-$pkgver/tools/perf
   make \
+    WERROR=0 \
     DESTDIR="$pkgdir/usr" \
-    perfexecdir="lib/$_pkgname" \
+    perfexecdir='lib/perf' \
     PYTHON=python2 \
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
new file mode 100644
index 000000000..d3d077d4f
--- /dev/null
+++ b/pcr/ryzom-client/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname=('ryzom-client')
+pkgver=0.8.0
+pkgrel=1
+arch=('x86_64' 'i686')
+url="http://www.ryzom.com"
+license=('AGPL3')
+pkgdesc="An awesome free software 3D MMORPG game"
+depends=('ryzom-data' 'ryzom-nel')
+conflicts=('ryzom-client')
+groups=('ryzom')
+options=(!strip)
+makedepends=('kervala_libsquish-hg' 'cmake' 'bison'  
+             'lua' 'luabind' 'curl' 'libpng' 'libwww'
+             'boost' 'ryzom-nel')
+
+auser="shackra"
+achangeset="3222b96eed75"
+
+source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
+
+build() {
+  cd "$srcdir/$auser-ryzom-$achangeset/code"
+  if [[ -d "ryzom-client" ]]; then
+     rm -rf "ryzom-client"
+     mkdir "ryzom-client"
+  else
+     mkdir "ryzom-client"
+  fi
+  
+  cd "ryzom-client"
+  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/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin -DWITH_SYMBOLS=ON
+
+  make -j3
+}
+
+package() {
+  cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD
index 272db5c07..dfb8a116c 100644
--- a/pcr/ryzom-data/PKGBUILD
+++ b/pcr/ryzom-data/PKGBUILD
@@ -9,9 +9,10 @@ license=('CCPL:by-sa')
 makedepends=('rsync' 'p7zip-libre')
 conflicts=('ryzom-data')
 pkgdesc="An awesome free software 3D MMORPG game. Game data."
-source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download")
+source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download" "updateryzomdata")
 noextract=("download")
-sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f')
+sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f'
+            'b42f74fd21cdbf6734214e5576dbbe7e4cf171bf5d712011fbea6529bd0123fd')
 
 package() {
   cd "$srcdir/"
@@ -33,11 +34,12 @@ package() {
 
   # creating directories
   install -d -m 755 "${pkgdir}/usr/share/ryzom/data/fonts/"
+  install -d -m 755 "${pkgdir}/etc/cron.d/"
 
   # installing files
   install -m 644 fonts/* "${pkgdir}/usr/share/ryzom/data/fonts/"
   rm -rf fonts
 
   install -m 644 * "${pkgdir}/usr/share/ryzom/data/"
+  install -m 644 ${srcdir}/updateryzomdata "${pkgdir}/etc/cron.d/"
 }
-
diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
new file mode 100644
index 000000000..aff8ec5e4
--- /dev/null
+++ b/pcr/ryzom-nel/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname='ryzom-nel'
+pkgver=0.8.0
+pkgrel=7
+arch=('x86_64' 'i686')
+conflicts=('ryzom-nel')
+groups=('ryzom')
+options=(!strip)
+pkgdesc="An awesome free software 3D MMORPG game, NeL engine"
+url="http://www.ryzom.com"
+license=('AGPL3')
+depends=('freetype2'
+         'libx11' 
+         'mesa' 
+         'libxxf86vm' 
+         'openal' 
+         'freealut' 
+         'libogg' 
+         'libvorbis' 
+         'libxml2' 
+         'libjpeg' 
+         'rrdtool' )
+makedepends=('cmake' 'bison' 'kervala_libsquish-hg')
+
+auser="shackra"
+achangeset="3222b96eed75"
+
+source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+
+build() {
+  cd "$srcdir/$auser-ryzom-$achangeset/code"
+ 
+  if [[ -d $pkgname ]]; then
+     rm -rf $pkgname
+     mkdir $pkgname
+  else
+     mkdir $pkgname
+  fi
+
+  cd $pkgname
+
+  #CMAKE_USE_RELATIVE_PATHS=true
+  cmake .. -Wno-dev -DWITH_LIBWWW_STATIC=ON -DWITH_RYZOM=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON
+
+  make -j3
+}
+
+package() {
+  cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+  make DESTDIR="$pkgdir" install
+}
+sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')