Merge branch 'master' of https://github.com/archlinuxarm/PKGBUILDs

aur/gmrender-resurrect-git/PKGBUILD

@@ -0,0 +1,41 @@
+# Original Author: Henner Zeller <h.zeller at acm dot org>
+# Maintainer: Drew DeVore <w.drew.devore at gmail dot com>
+
+pkgname=gmrender-resurrect-git
+_gitname=gmrender-resurrect
+pkgver=203.a9b225f
+pkgrel=1
+pkgdesc="Application to stream music from a UPnP server using gstreamer."
+arch=('any')
+url="https://github.com/hzeller/gmrender-resurrect"
+license=('GPL2')
+conflicts=('gmediarender')
+depends=('gnome-icon-theme' 'gstreamer0.10-ffmpeg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-ugly-plugins')
+makedepends=('git' 'autoconf' 'automake' 'libtool' 'libxml2' 'libupnp')
+install='gmrender-resurrect.install'
+source=('git+https://github.com/hzeller/gmrender-resurrect.git'
+'gmediarender.service'
+'gmediarender')
+md5sums=('SKIP'
+'cff2c939ff9fbe0a3d378a0f73d3fecd'
+'ad13cb236cb59696d0b0aafc20ecb2cf')
+
+
+pkgver() {
+	cd $_gitname
+	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+	cd $_gitname
+	./autogen.sh
+	./configure
+	make
+}
+
+package() {
+	cd $_gitname
+	make DESTDIR=$pkgdir install
+	install -D -m 644 $srcdir/gmediarender.service "$pkgdir/usr/lib/systemd/system/gmediarender.service"
+	install -D -m 644 $srcdir/gmediarender "$pkgdir/etc/conf.d/gmediarender"
+}

aur/gmrender-resurrect-git/gmediarender

@@ -0,0 +1,2 @@
+#Friendly Name to display to network devices
+friendly=gMedia UPnP Renderer

aur/gmrender-resurrect-git/gmediarender.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=UPnP renderer using gstreamer
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/gmediarender
+ExecStart=/usr/local/bin/gmediarender -f "${friendly}" -d
+
+[Install]
+WantedBy=multi-user.target

aur/gmrender-resurrect-git/gmrender-resurrect.install

@@ -0,0 +1,22 @@
+post_install() {
+	gtk-update-icon-cache -f -t /usr/share/icons/hicolor
+	echo ""
+	echo "	-----------------------------------------------------------------------"
+	echo "	Please edit the "Friendly Name" in /etc/conf.d/gmediarender"
+	echo "	-----------------------------------------------------------------------"
+	echo "	start the service by running (as root):"
+	echo "		systemctl start gmediarender"
+	echo "	-----------------------------------------------------------------------"
+	echo "	enable the service by running (as root):" 
+	echo "		systemctl enable gmediarender"
+	echo "	-----------------------------------------------------------------------"
+	echo ""
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

aur/monkey/PKGBUILD

@@ -4,12 +4,12 @@
 #ALARM: moonman
 #      -added .service file for systemd
 #      -changed default port to 80 (required by .service)
-#      -changed pid file dir from /var/log/monkey to /var/run
-#      -added fastcgi support
+#      -changed pid file dir from /var/log to /var/run
+#      -changed default User from nobody to http (for compatibility)
 
 pkgname=monkey
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A very small and fast open source web server for Linux"
 arch=('arm')
 url="http://www.monkey-project.com/"
@@ -41,11 +41,14 @@ package() {
 
   make DESTDIR=$pkgdir install
 
-  msg2 "Change default pid file location from /var/log to /var/run/monkey"
+  msg2 "Changing default pid file location from /var/log to /var/run"
   sed -i -e "s/\/var\/log\/monkey\/monkey.pid/\/var\/run\/monkey.pid/" $pkgdir/etc/monkey/monkey.conf
 
-  msg2 "change default port to 80"
+  msg2 "Changing default port to 80"
   sed -i -e "s/Port\ 2001/Port\ 80/" $pkgdir/etc/monkey/monkey.conf
+
+  msg2 "Changing default user to http"
+  sed -i -e "s/User\ nobody/User\ http/" $pkgdir/etc/monkey/monkey.conf
  
   install -Dm 755 "$srcdir/monkey" "$pkgdir/etc/rc.d/monkey"
   install -Dm 644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"

core/linux-am33x/PKGBUILD

@@ -1,9 +1,6 @@
+# am33x Beaglebone and Beaglebone Black kernel and headers
 # Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
 
-# am33x kernel and headers
-#  - note: any other kernel packages should include headers for that march
-#  - there will be no v7 kernel26 package, each march will be tagged individually
-
 buildarch=4
 
 pkgbase=linux-am33x
@@ -12,8 +9,8 @@ pkgname=('linux-am33x' 'linux-headers-am33x')
 _kernelname=${pkgname#linux}
 _basekernel=3.8
 pkgver=${_basekernel}.13
-pkgrel=2
-bonerel=20
+pkgrel=3
+bonerel=21
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -27,8 +24,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
         'aufs3-3.8.patch.xz')
 md5sums=('1c738edfc54e7c65faeb90c436104e2f'
          '412da22dabe4d7fcb78b3c14e53cd892'
-         'b42f5c723470c04729f05f099cc5d7bf'
-         '216d770c43e35651777927a9df1bd3a4'
+         'b3c0e8532e50893f6b7f502fed99f447'
+         '8b5b7fbec3d124448e083debe6ccdd77'
          '9d3c56a4b999c8bfbd4018089a62f662'
          'd819af0969e0726cbf9ae6be5e044a75')
 

core/linux-am33x/config

@@ -2181,11 +2181,13 @@ CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_OF_HELPER=y
+CONFIG_GPIO_GENERIC=m
 
 #
 # Memory mapped GPIO drivers:
 #
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
+CONFIG_GPIO_GENERIC_PLATFORM=m
 # CONFIG_GPIO_EM is not set
 # CONFIG_GPIO_TS5500 is not set
 
@@ -3957,6 +3959,7 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ADIS16480=m
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
+# CONFIG_INV_MPU6050_IIO is not set
 
 #
 # Light sensors

extra/ruby/PKGBUILD

@@ -0,0 +1,70 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Jeramy Rutley <jrutley@gmail.com>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - rebuild, remove when bumped upstream
+
+pkgname=('ruby' 'ruby-docs')
+pkgver=2.0.0_p195
+pkgrel=1.1
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+options=('!emptydirs' '!makeflags')
+source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
+        'gemrc')
+md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6'
+         '6fb8e7a09955e0f64be3158fb4a27e7a')
+
+build() {
+  cd ruby-${pkgver//_/-}
+
+  PKG_CONFIG=/usr/bin/pkg-config ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-pthread \
+    --disable-rpath
+
+  make
+}
+
+check() {
+  cd ruby-${pkgver//_/-}
+
+  make test
+}
+
+package_ruby() {
+  pkgdesc='An object-oriented language for quick and easy programming'
+  depends=('openssl' 'libffi' 'libyaml')
+  optdepends=('tk: for Ruby/TK'
+              'ruby-docs: Ruby documentation')
+  provides=('rubygems' 'rake')
+  conflicts=('rake')
+  backup=('etc/gemrc')
+  install='ruby.install'
+
+  cd ruby-${pkgver//_/-}
+
+  make DESTDIR="${pkgdir}" install-nodoc
+
+  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
+
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
+}
+
+package_ruby-docs() {
+  pkgdesc='Documentation files for ruby'
+
+  cd ruby-${pkgver//_/-}
+
+  make DESTDIR="${pkgdir}" install-doc install-capi
+
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
+}

extra/ruby/gemrc

@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+#                pacman installed gems and gem installed gems
+gem: --user-install

extra/ruby/ruby.install

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+print_gem_default_target() {
+  echo 'The default location of gem installs is $HOME/.gem/ruby'
+  echo 'Add the following line to your PATH if you plan to install using gem'
+  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+  echo 'If you want to install to the system wide location, you must either:'
+  echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+}
+
+# arg 1:  the new package version
+post_install() {
+  print_gem_default_target
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
+    print_gem_default_target
+  fi
+}