Merge branch 'master' of https://projects.parabolagnulinux.org/abslibre

4 files changed, 19 insertions, 17 deletions

diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
index a14f8d877..ef0fc1202 100644
--- a/libre/ogmrip-libre/PKGBUILD
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89460 2013-04-29 13:17:27Z jelle $
+# $Id: PKGBUILD 103017 2013-12-25 16:56:14Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Daenyth
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -8,7 +8,7 @@
 _pkgname=ogmrip
 pkgname=ogmrip-libre
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support"
 arch=('i686' 'x86_64')
 url="http://ogmrip.sourceforge.net/"
@@ -27,7 +27,7 @@ optdepends=('lame: support for the MP3 audio codec'
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 changelog=$_pkgname.changelog
 install=$_pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
index 27114b508..f1927f864 100644
--- a/libre/ogmrip-libre/ogmrip.changelog
+++ b/libre/ogmrip-libre/ogmrip.changelog
@@ -1,3 +1,6 @@
+2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* ogmrip 1.0.0-3 static libraries removed
+
 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* ogmrip 1.0.0-1
 
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 134246917..b5639d522 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102502 2013-12-12 12:59:28Z foutrelis $
+# $Id: PKGBUILD 102970 2013-12-25 07:48:12Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -13,7 +13,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 pkgver=0.41
-pkgrel=20
+pkgrel=21
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 1caf395fc..2809f8248 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102069 2013-12-04 16:20:28Z spupykin $
+# $Id: PKGBUILD 103051 2013-12-25 20:34:37Z idevolder $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -9,13 +9,14 @@ _prefix=/usr
 
 _pkgname=xbmc
 pkgname=xbmc-libre
-pkgver=12.2
-pkgrel=9
+pkgver=12.3
+_codename=Frodo
+pkgrel=1
 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
-depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
+depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
 	 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate'
 	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
 	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
@@ -24,7 +25,6 @@ depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff'
 makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
 	     'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
 optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
-	    'pulseaudio: pulseaudio support'
 	    'lirc-libre: remote controller support'
 	    'udisks: automount external drives'
 	    'upower: used to trigger suspend functionality'
@@ -38,13 +38,13 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
 	"xbmc.service"
 	"polkit.rules"
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
-md5sums=('489f3877decae4e265ece54f9eaef0ba'
+md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
          '8312d6d4ac5d7c3d9eed40ab08a17d3b'
          'd4cbb6609c8e7b713c714241f529000e'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
 prepare() {
-  cd "${srcdir}/xbmc-$pkgver"
+  cd "${srcdir}/xbmc-$pkgver-$_codename"
 
   patch -p0 <$srcdir/libass.patch
 
@@ -54,7 +54,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/xbmc-$pkgver"
+  cd "${srcdir}/xbmc-$pkgver-$_codename"
 
   # Bootstrapping XBMC
   ./bootstrap
@@ -74,7 +74,6 @@ build() {
     --enable-rsxs \
     --enable-projectm \
     --enable-x11 \
-    --enable-pulse \
     --enable-rtmp \
     --enable-samba \
     --enable-nfs \
@@ -99,7 +98,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/xbmc-$pkgver"
+  cd "${srcdir}/xbmc-$pkgver-$_codename"
   # Running make install
   make DESTDIR="${pkgdir}" install
 
@@ -111,8 +110,8 @@ package() {
   sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
 
   # Tools
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
 
   # Licenses
   install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}"