Sun Feb 12 23:15:07 UTC 2012

8 files changed, 161 insertions, 11 deletions

diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD
index 24695d4a6..f6fddd954 100644
--- a/multilib/lib32-glib2/PKGBUILD
+++ b/multilib/lib32-glib2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 62205 2012-01-18 10:47:06Z heftig $
+# $Id: PKGBUILD 64368 2012-02-11 23:28:27Z allan $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
@@ -6,7 +6,7 @@
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
 pkgver=2.30.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
 url="http://www.gtk.org/"
 arch=('x86_64')
diff --git a/multilib/lib32-pcre/PKGBUILD b/multilib/lib32-pcre/PKGBUILD
index b798dc530..4cb74f13e 100644
--- a/multilib/lib32-pcre/PKGBUILD
+++ b/multilib/lib32-pcre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60943 2011-12-19 18:57:19Z bluewind $
+# $Id: PKGBUILD 64369 2012-02-11 23:28:29Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 _pkgbasename=pcre
 pkgname=lib32-$_pkgbasename
-pkgver=8.21
+pkgver=8.30
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)"
 arch=('x86_64')
@@ -12,8 +12,9 @@ license=('custom')
 depends=('lib32-gcc-libs' $_pkgbasename)
 makedepends=('gcc-multilib')
 options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2)
-md5sums=('0a7b592bea64b7aa7f4011fc7171a730')
+source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2{,.sig})
+md5sums=('98e8928cccc945d04279581e778fbdff'
+         '01eee0333fa71687e0b6756db77f94ad')
 
 build() {
   cd "${srcdir}"/${_pkgbasename}-${pkgver}
@@ -22,7 +23,7 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-utf8 --enable-unicode-properties
+    --enable-utf8 --enable-unicode-properties --enable-pcre16 --enable-jit
   make
 }
 
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index b6c269b76..bd2f00175 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 63493 2012-02-05 11:45:46Z ibiru $
+# $Id: PKGBUILD 64372 2012-02-11 23:56:01Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.4rc2
-pkgrel=2
+pkgver=1.4rc3
+pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('41e1a9c293cfab5e8ada6e908eebf534')
+md5sums=('cbbf30fe43de9676abbb8ea88b1b5cde')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
diff --git a/multilib/zsnes/PKGBUILD b/multilib/zsnes/PKGBUILD
new file mode 100644
index 000000000..e2c5d0da9
--- /dev/null
+++ b/multilib/zsnes/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 63494 2012-02-05 11:45:54Z ibiru $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Frank Tetzel <frank.tetzel@mailbox.tu-dresden.de>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=zsnes
+pkgver=1.51
+pkgrel=11
+pkgdesc="Super Nintendo emulator"
+url="http://www.zsnes.com/"
+arch=('i686' 'x86_64')
+license=('GPL')
+options=(!buildflags)
+
+if [[ $CARCH == "x86_64" ]]; then
+	depends=('gcc-libs-multilib' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa')
+	makedepends=('nasm' 'gcc-multilib')
+else
+	depends=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses' 'mesa')
+	makedepends=('nasm' 'gcc')
+fi
+
+source=(http://downloads.sourceforge.net/${pkgname}/zsnes151src.tar.bz2
+	zsnes.patch
+	zsnes-1.51-libpng15.patch
+	zsnes.desktop
+	zsnes_icon.png)
+md5sums=('7071186bf80632ae88a153239498d8c9'
+         'aa250af3ef8dbf8a44e095d4cd132db2'
+         'ea82b4dbf31c87dbcc6c67d02ddfb299'
+         'b100b2aa342c551167d7c5dcdcde9dd4'
+         'b5260c02adfc3b7ff725041214b00bfd')
+
+build() {
+  cd ${srcdir}/${pkgname}_1_51/
+  patch -p1 -i ../zsnes.patch
+  patch -p0 -i ../zsnes-1.51-libpng15.patch
+  
+  cd ${srcdir}/${pkgname}_1_51/src
+if [ $CARCH == "x86_64" ]; then
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+fi
+  ./autogen.sh --prefix=/usr \
+    x_libraries=/usr/lib \
+    force_arch=i686 \
+    --enable-release
+  
+  make
+  make DESTDIR=${pkgdir} install
+  
+  # adding --mandir= to autoconf line fails
+  install -dm755 ${pkgdir}/usr/share
+
+  install -Dm644 ${srcdir}/zsnes.desktop ${pkgdir}/usr/share/applications/zsnes.desktop
+  install -Dm644 ${srcdir}/zsnes_icon.png ${pkgdir}/usr/share/pixmaps/zsnes_icon.png
+
+  mv ${pkgdir}/usr/man ${pkgdir}/usr/share
+}
diff --git a/multilib/zsnes/zsnes-1.51-libpng15.patch b/multilib/zsnes/zsnes-1.51-libpng15.patch
new file mode 100644
index 000000000..b32c30967
--- /dev/null
+++ b/multilib/zsnes/zsnes-1.51-libpng15.patch
@@ -0,0 +1,12 @@
+Use existing png_set_IHDR() and stop accessing PNG structure members directly
+
+--- src/zip/zpng.c
++++ src/zip/zpng.c
+@@ -129,7 +129,6 @@
+         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
+                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+ 
+         //Allocate an array of scanline pointers
+         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
diff --git a/multilib/zsnes/zsnes.desktop b/multilib/zsnes/zsnes.desktop
new file mode 100644
index 000000000..db13ada4c
--- /dev/null
+++ b/multilib/zsnes/zsnes.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Zsnes
+Comment=Super Nintendo emulator
+Exec=/usr/bin/zsnes
+Icon=/usr/share/pixmaps/zsnes_icon.png
+Terminal=false
+Type=Application
+Categories=Application;Game
+StartupNotify=false
diff --git a/multilib/zsnes/zsnes.patch b/multilib/zsnes/zsnes.patch
new file mode 100644
index 000000000..1be5d96ea
--- /dev/null
+++ b/multilib/zsnes/zsnes.patch
@@ -0,0 +1,68 @@
+diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
+--- zsnes_1_51//src/Makefile.in	2007-01-24 21:54:12.000000000 +0100
++++ zsnes_1_51_new//src/Makefile.in	2010-09-06 00:03:04.715810431 +0200
+@@ -95,7 +95,7 @@
+ %.o: %.cpp
+ 	@CXX@ @CXXFLAGS@ -o $@ -c $<
+ %.o %.h: %.psr $(PSR)
+-	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
++	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1 -D_FORTIFY_SOURCE=0" -cheader $*.h -fname $* $*.o $<
+ 
+ default: main
+ all: main tools
+@@ -133,7 +133,7 @@
+ 
+ include makefile.dep
+ makefile.dep: $(TOOL_D)/depbuild Makefile
+-	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
++	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep
+ 
+ Makefile: Makefile.in config.status
+ 	./config.status
+diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
+--- zsnes_1_51//src/parsegen.cpp	2007-10-31 05:30:26.000000000 +0100
++++ zsnes_1_51_new//src/parsegen.cpp	2010-09-05 15:48:36.903333444 +0200
+@@ -19,6 +19,9 @@
+ Config file handler creator by Nach (C) 2005-2007
+ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ #if !defined(__GNUC__) && !defined(_MSC_VER)
+ #error You are using an unsupported compiler
+ #endif
+@@ -1822,7 +1825,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   const char *cheader_file = 0;
+   bool compile = false;
+diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp
+--- zsnes_1_51//src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
++++ zsnes_1_51_new//src/tools/depbuild.cpp	2010-09-05 15:48:36.903333444 +0200
+@@ -183,7 +183,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   if (argc < 5)
+   {
+diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
+--- zsnes_1_51//src/tools/strutil.h	2006-12-27 12:04:05.000000000 +0100
++++ zsnes_1_51_new//src/tools/strutil.h	2010-09-05 15:48:36.903333444 +0200
+@@ -15,6 +15,9 @@
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ /*
+ This is part of a toolkit used to assist in ZSNES development
+ */
diff --git a/multilib/zsnes/zsnes_icon.png b/multilib/zsnes/zsnes_icon.png
new file mode 100644
index 000000000..31608ba06
--- /dev/null
+++ b/multilib/zsnes/zsnes_icon.png