From 9780d07c31b22125ad7ecba4e281ff41194f95be Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Wed, 4 May 2011 12:58:32 +0000
Subject: Wed May  4 12:58:31 UTC 2011

---
 multilib/nspluginwrapper/PKGBUILD | 20 ++++++--------------
 multilib/wine/PKGBUILD            | 10 ++++++++--
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'multilib')

diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD
index 250d70829..d35da9633 100644
--- a/multilib/nspluginwrapper/PKGBUILD
+++ b/multilib/nspluginwrapper/PKGBUILD
@@ -1,34 +1,26 @@
-# $Id: PKGBUILD 26767 2010-09-15 23:06:22Z bluewind $
+# $Id: PKGBUILD 46102 2011-05-03 15:47:24Z bluewind $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=nspluginwrapper
-pkgver=1.3.0
-pkgrel=4
+pkgver=1.3.2
+pkgrel=1
 pkgdesc="Cross-platform NPAPI compatible plugin viewer"
 arch=('x86_64')
 url="http://freshmeat.net/projects/nspluginwrapper/"
 license=('GPL')
 depends=('curl' 'lib32-libxt' 'lib32-gcc-libs' 'gtk2' 'lib32-gtk2')
 makedepends=('gcc-multilib')
-source=(ftp://ftp.archlinux.org/other/nspluginwrapper/$pkgname-$pkgver.tar.gz
-        npw-viewer.c.patch
-        nspluginwrapper-20090625-fix-npident-array-sending.patch
+source=(http://web.mit.edu/davidben/Public/$pkgname/$pkgname-$pkgver.tar.gz
         nspluginwrapper-native-windows.patch)
-sha256sums=('0af7e2ae4c6258d5c17addbcc4658b84c979860da843873f0d15d90ee9a8259d'
-            '4b216cca327ae76e6e2ab6dc6bbaf3efe1123c63a09b0e7e45c964531fcbdeb0'
-            '8bb55b845017b60912c62c4abadc50a3f0397ddf470599b8453b97d9e69f8cd5'
+sha256sums=('f3a40d160601520d36b6f5c342e1e9751b2bdc70dff5e2e880e1d18ed8830201'
             '3796b66f53448f4668e70aec97a3d74db2b2fcd308b36f87373405547cae38b1')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix build
-  patch -p1 -i "$srcdir/npw-viewer.c.patch"
-  # See http://web.archiveorange.com/archive/v/tptsHOJYbGKIfNFz9xHz
-  patch -p0 -i "$srcdir/nspluginwrapper-20090625-fix-npident-array-sending.patch"
   # Patch taken from the openSuSE src.rpm
   patch -p0 -i "$srcdir/nspluginwrapper-native-windows.patch"
 
   ./configure --with-lib32=lib32 --with-lib64=lib
-  make
+  make -j1
 }
 
 package() {
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index 9c733328b..12546df28 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45826 2011-04-29 19:49:25Z svenstaro $
+# $Id: PKGBUILD 46051 2011-05-02 23:40:05Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=wine
 pkgver=1.3.19
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
@@ -49,6 +49,7 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink
   libcups         lib32-libcups
   gnutls          lib32-gnutls
   v4l-utils       lib32-v4l-utils
+  oss
 )
   
 optdepends=(
@@ -63,6 +64,7 @@ optdepends=(
   libcups         lib32-libcups
   gnutls          lib32-gnutls
   v4l-utils       lib32-v4l-utils
+  oss
 )
 
 if [[ $CARCH == i686 ]]; then
@@ -87,6 +89,10 @@ build() {
   rm -rf $pkgname-{32,64}-build
   mkdir $pkgname-32-build
 
+  # hacky hax for ossv4 being "too old"
+  sed -i "s|<sys/soundcard.h>|</usr/lib/oss/include/sys/soundcard.h>|g" $pkgname/configure
+  sed -i "s|<sys/soundcard.h>|</usr/lib/oss/include/sys/soundcard.h>|g" $pkgname/dlls/wineoss.drv/*.c
+
   if [[ $CARCH == x86_64 ]]; then
     msg2 "Building Wine-64..."
 
-- 
cgit v1.2.3-54-g00ecf