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

8 files changed, 64 insertions, 54 deletions

diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index badb6d2c6..9f8bda31f 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $
+# $Id: PKGBUILD 192042 2013-08-05 08:13:15Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-pkgver=${_basekernel}.3
+pkgver=${_basekernel}.5
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '4741e325185acae5498cfc77a5e8f55b'
-         'ead29a0206b79cc56ab97930e5d517ae'
+         'f4810ea4bd977321d76edcde8dc756c9'
+         '25d73446f6071d0d1482822ae0072203'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c')
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index ea4a90c1f..600ed6b5e 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -764,8 +764,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 5583ffba0..bf7fa223d 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $
+# $Id: PKGBUILD 192042 2013-08-05 08:13:15Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-pkgver=${_basekernel}.3
+pkgver=${_basekernel}.5
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '4741e325185acae5498cfc77a5e8f55b'
-         'e2cb9d4092685c2a4216de9bbe8b72f1'
+         'f4810ea4bd977321d76edcde8dc756c9'
+         '98b1a0fb0eaf6075a9dea34ca691dbf8'
          'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c')
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index 0c5724fc9..444cdc490 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -416,12 +416,9 @@ CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_MICROCODE_INTEL_LIB=y
-CONFIG_MICROCODE_INTEL_EARLY=y
-CONFIG_MICROCODE_EARLY=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
@@ -774,8 +771,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
@@ -2520,17 +2517,8 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
@@ -4349,7 +4337,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index af128c250..1d08b5634 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94576 2013-07-27 12:09:03Z jelle $
+# $Id: PKGBUILD 95317 2013-08-09 09:19:46Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,8 +9,8 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.41
-pkgrel=1
+pkgver=0.9.43
+pkgrel=2
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
@@ -30,9 +30,10 @@ install=calibre.install
 source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('2037b44c90a66e97823a637edfa194ca'
+md5sums=('63e78929c62ae838b767c95b0830eb31'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
+
 prepare(){
   cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
index 52e5783bf..fd5d175be 100644
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -3,49 +3,70 @@
 
 pkgname=stuntrally-data-libre
 _pkgname=stuntrally-data
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
 pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files"
 arch=('any')
 license=('GPL3' 'custom')
 url="http://code.google.com/p/vdrift-ogre"
+makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-theme' 'libxcursor')
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz"
+        "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz"
+        libre.patch )
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor')
-source=(StuntRally-$pkgver-sources.tar.xz::http://sourceforge.net/projects/stuntrally/files/$pkgver/StuntRally-$pkgver-sources.tar.xz/download
-        libre.patch )
-md5sums=('22eb331c4401a0ed03e7a9e916fdb60c'
-         'e96df3ba70d6fd0949bb92f4dd609497')
+sha256sums=('d987e8c05ed1f3f54468e75e2c1f68a9a4c59ceefa7429130d4f800b28821ae0'
+            'a1ab9b11d9f5b6c4aa8e5a9028f5994e21446d96fda5762e427365e21cfe3d0e'
+            '8cf24da76bed18fd03a3166ba8b8da93be87a7e49b8aebe4135b8e0b1a36eb8a')
 prepare() {
   # patch some data files and remove nonfree data files
-  cd $srcdir/StuntRally-$pkgver-sources
+  cd "${srcdir}/stuntrally-${pkgver}/"
+
+  patch -Np1 -i "${srcdir}/libre.patch"
 
-  patch -Np1 -i $srcdir/libre.patch
+  rm -rv "data/"{grass/grassJungle.png,sounds/{0{1,2,3,4,5,6,7,8,9},1{0,1,2},boost,dirt{1,2},mud{1,_cont},scrap,screech,terrain{1,2,3,4,5},water{1,2,3,_cont}}.wav,terrain,trees2,cars/{3S,CT,M3,NS,TC6,XM}}
 
-  rm -rv "data/"{grass/grassJungle.png,sounds/{0{1,2,3,4,5,6,7,8,9},1{0,1,2},boost,dirt{1,2},mud{1,_cont},scrap,screech,terrain{1,2,3,4,5},water{1,2,3,_cont}}.wav,terrain,trees2,cars/{3S,CT,M3,NS,TC6,XM},tracks/{detroit,ruudskogen,virginia,weekend}}
+  cd "${srcdir}/tracks-${pkgver}/"
+
+  rm -rv {detroit,ruudskogen,virginia,weekend}
 }
 
 build() {
   # build the sources
-  cd $srcdir/StuntRally-$pkgver-sources
+  cd "${srcdir}/stuntrally-${pkgver}/"
 
+  rm -rf build
   mkdir build && cd build
 
   cmake .. \
       -DCMAKE_INSTALL_PREFIX="/usr" \
       -DSHARE_INSTALL="share/stuntrally"
   make
+
+  # build the tracks
+  cd "${srcdir}/tracks-${pkgver}/"
+
+  rm -rf build
+  mkdir build && cd build
+
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX="/usr"
+  make
 }
 
 package() {
   #install the sources
-  cd $srcdir/StuntRally-$pkgver-sources/build
-  make DESTDIR="$pkgdir" install
+  cd "${srcdir}/stuntrally-${pkgver}/build/"
+  make DESTDIR="${pkgdir}" install
+
+  # install the tracks
+  cd "${srcdir}/tracks-${pkgver}/build"
+  make DESTDIR="${pkgdir}/usr/share/stuntrally/" install
 
   # clean up
-  rm -rf "$pkgdir/usr/share/stuntrally/tracks/build"
-  rm -rf "$pkgdir/usr/share/icons"
-  rm -rf "$pkgdir/usr/share/applications"
-  rm -rf "$pkgdir/usr/bin"
+  rm -rf "${pkgdir}/usr/share/stuntrally/tracks/build"
+  rm -rf "${pkgdir}/usr/share/icons"
+  rm -rf "${pkgdir}/usr/share/applications"
+  rm -rf "${pkgdir}/usr/bin"
 }
diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch
index 642188f05..f7f176a77 100644
--- a/libre/stuntrally-data-libre/libre.patch
+++ b/libre/stuntrally-data-libre/libre.patch
@@ -1,13 +1,13 @@
 diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index e01fc1b..853ebf7 100644
+index eb7fc89..d1b670f 100644
 --- a/data/CMakeLists.txt
 +++ b/data/CMakeLists.txt
 @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
  
  # Install data files
  # TODO: make this use all data/* subdirs without tracks, not entered by hand ..
--foreach(datadir  cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2)
-+foreach(datadir  cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees)
+-foreach(datadir  cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2)
++foreach(datadir  cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees)
  	install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL})
  endforeach()
  
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 106fa1340..57e30c88f 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.08.08
+pkgver=2013.08.09
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('7383c9818f37e5d5842f68a529a6bd17'
+md5sums=('ae245c6ef518cdeb7f099a1c0d5a64ba'
           'SKIP')
 
 prepare() {