strigi rebuild, removing ffmpeg support, trying to fix desktop-setting crash

catalyst-utils/PKGBUILD

@@ -9,7 +9,7 @@ pkgver=12.12
 pkgrel=1
 _amdver=9.01
 pkgdesc="AMD/ATI Catalyst drivers utilities and libraries."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.amd.com/us/Pages/AMDHomePage.aspx"
 license=('custom')
 depends=('xorg-server>=1.11.0' 'xorg-server<1.13.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'libxinerama')

catalyst/PKGBUILD

@@ -10,7 +10,7 @@ pkgver=12.12
 pkgrel=1
 _amdver=9.01
 arch=('x86_64')
-url="http://www.ati.amd.com"
+url="http://www.amd.com/us/Pages/AMDHomePage.aspx"
 license=('custom')
 makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.6' 'linux<=3.7' 'catalyst-utils')
 

strigi/PKGBUILD

@@ -2,37 +2,31 @@
 # Chakra Packages for Chakra, part of chakra-project.org
 #
 # Maintainer: Fabian Kosmale <0inkane@googlemail.com>
-# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# contributor: Giuseppe Calà <jiveaxe@gmail.com>
 
 pkgname=strigi
 pkgver=0.7.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.vandenoever.info/software/strigi/"
 license=('GPL2')
-depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs' 'ffmpeg')
+depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs')
 makedepends=('qt' 'cmake' 'pkgconfig' 'boost')
 provides=('strigi-git')
 replaces=('strigi-git')
 conflicts=('strigi-git')
 source=("http://chakra-linux.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        "new_ffmpeg.patch")
+        'gcc47.patch')
 md5sums=('ca0a0fd5c2b99879f6330837aeede996'
-         '86f8d736f21daab6a3b666cf00037099')
+         '1acb9b31a4859dc427fc4d387fd8aa2f')
 options=('!libtool')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  sed -i '/stdio/a #include <unistd.h>' strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp 
-  cd "${srcdir}"/${pkgname}-${pkgver}/libstreamanalyzer
+  pushd ${pkgname}-${pkgver}/strigidaemon
+  patch -p1 -i "${srcdir}"/gcc47.patch
+  popd
 
-  mv "${srcdir}"/new_ffmpeg.patch .
-  patch -p1 < new_ffmpeg.patch
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -43,20 +37,24 @@ build() {
     -DENABLE_FAM=OFF \
     -DENABLE_CLUCENE=OFF \
     -DENABLE_CLUCENE_NG=OFF \
-    -DENABLE_FFMPEG=ON
+    -DENABLE_FFMPEG=OFF
   make
 }
 
 package() {
-  cd "${srcdir}/build/libstreams"
+  pushd build/libstreams
   make DESTDIR="${pkgdir}" install
+  popd
 
-  cd "${srcdir}/build/libstreamanalyzer"
+  pushd build/libstreamanalyzer
   make DESTDIR="${pkgdir}" install
+  popd
 
-  cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus"
+  pushd build/strigiclient/lib/searchclient/qtdbus
   make DESTDIR="${pkgdir}" install
+  popd
   
-  cd "${srcdir}/build/strigiutils"
+  pushd build/strigiutils
   make DESTDIR="${pkgdir}" install
+  popd
 }

strigi/gcc47.patch

@@ -0,0 +1,22 @@
+From: Rex Dieter <rdieter@fedoraproject.org>
+Date: Mon, 09 Jan 2012 17:13:25 +0000
+Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep'
+X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&amp;a=commitdiff&amp;h=a8e97f672325557b3fbc84b987299350ec5ac10b
+---
+gcc47 fix, unistd.h header required unconditionally for 'sleep'
+---
+
+
+--- a/bin/daemon/eventlistener/eventlistenerqueue.cpp
++++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp
+@@ -27,9 +27,7 @@
+ #include <iostream>
+ #include <stdio.h>
+ 
+-#if defined(__SUNPRO_CC)
+ #include <unistd.h>
+-#endif
+ 
+ using namespace std;
+ 
+