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

4 files changed, 102 insertions, 6 deletions

diff --git a/pcr/libixp-hg/PKGBUILD b/pcr/libixp-hg/PKGBUILD
new file mode 100644
index 000000000..3642535d1
--- /dev/null
+++ b/pcr/libixp-hg/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname="libixp-hg"
+pkgver=148
+pkgdesc="A 9p client/server library"
+url="http://libs.suckless.org/libixp"
+license=("MIT")
+
+provides=("libixp")
+conflicts=("libixp")
+
+pkgrel=1
+arch=("i686" "x86_64")
+makedepends=("txt2tags")
+options=(staticlibs)
+
+source=("libre://${pkgname}-${pkgver}.tar.gz")
+md5sums=('5a2fd075108558b39988610d2bb184d9')
+
+mkdepends=("mercurial")
+mksource=("$pkgname-$pkgver::hg+https://code.google.com/p/libixp/#revision=${pkgver}")
+mkmd5sums=('SKIP')
+mksource() {
+	# don't include this precompiled binary (probably included by accident)
+	rm "${srcdir}/${pkgname}-${pkgver}/test/o.client"
+}
+
+_makeflags=("PREFIX=/usr" "ETC=/etc")
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make "${_makeflags[@]}"
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make "${_makeflags[@]}" DESTDIR="$pkgdir" install
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index b391e70fa..2aa501159 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname='ryzom-hg'
 _hgver=923522b
-pkgver=20131213
-pkgrel=2
+pkgver=20131215
+pkgrel=3
 pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
@@ -19,12 +19,14 @@ mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=
 mksource() {
   rm -rf "$srcdir/$pkgname-$pkgver"
   cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
+  # some patching required...
+  sed -i 's|<freetype/|<freetype2/|g' "${srcdir}/${pkgname}-${pkgver}/nel/src/3d/font_generator.cpp"
 }
 
 build() {
   mkdir -p "$srcdir/build"
   cd "$srcdir/build"
-  cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON  -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -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
+  cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON  -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -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 -DFREETYPE_INCLUDE_DIRS="/usr/include;/usr/include/freetype2"
   
   make all
 }
@@ -47,4 +49,4 @@ package() {
 }
 
 mksha256sums=('SKIP')
-sha256sums=('c65c716ec6436f6844ba18e1f908d60298ee53aa0e691ee44b18d15457a66859')
+sha256sums=('187e9a508be4c3c07f768fc98497941ac4946caf2202d24311aac81d73cff5a5')
diff --git a/pcr/wmii-hg/PKGBUILD b/pcr/wmii-hg/PKGBUILD
new file mode 100644
index 000000000..c556a1b88
--- /dev/null
+++ b/pcr/wmii-hg/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+# Maintainer (AUR): N30N <archlinux@alunamation.com>
+# Contributor: Anthony Martin <ality@pbrane.org>
+# Contributer: thomasd <thdahms@gmx.de>
+# Contributer: karnath <karnath@pop3.ru>
+# Contributer: MrBougo <bougospam@gmail.com>
+# Contributor: Wolf Ramovsky <wolf.ramovsky@gmail.com>
+
+pkgname=wmii-hg
+pkgver=2813
+pkgdesc="A small, dynamic window manager for X11"
+url="https://code.google.com/p/wmii/"
+license=("MIT")
+
+provides=("wmii")
+conflicts=("wmii")
+
+pkgrel=1
+arch=("i686" "x86_64")
+depends=('libxft' 'libxrandr' 'libxinerama')
+makedepends=('txt2tags' 'libixp') # libixp is statically linked
+
+source=("libre://${pkgname}-${pkgver}.tar.gz")
+md5sums=('74eb9f91000321b587e7826be999d4de')
+
+mkdepends=('mercurial')
+mksource=("$pkgname-$pkgver::hg+https://code.google.com/p/wmii/#revision=${pkgver}")
+mkmd5sums=('SKIP')
+mksource() {
+	# don't include this precompiled binary (probably included by accident)
+	rm "${srcdir}/${pkgname}-${pkgver}/lib/libutf/libutf.a"
+}
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	export LDFLAGS+=',--no-as-needed'
+	sed -i 's|PREFIX = /usr/local|PREFIX = /usr|' config.mk
+	sed -i 's|ETC = $(PREFIX)/etc|ETC = /etc|' config.mk
+	sed -i 's|PYTHON = .*|PYTHON = python2|' config.mk
+	echo 'CFLAGS += -O2' >> config.mk
+	sed -i 's# !=#!=#' mk/hdr.mk
+
+	export MAKEFLAGS="-j1"
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+
+	install -Dm644 img/wmii.png "${pkgdir}"/usr/share/pixmaps/wmii.png
+	install -Dm644 debian/file/wmii.desktop "${pkgdir}"/usr/share/xsessions/wmii.desktop
+	install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index d0fa533d7..05ee1c2d1 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.12.11.2
+pkgver=2013.12.16.4
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -28,5 +28,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('9ba12ec6e9174b564069a72db7582563'
+md5sums=('69045bace442aa925296c57a52bb8a65'
          'SKIP')