diff options
Diffstat (limited to 'multilib')
| -rw-r--r-- | multilib/lib32-glibc/PKGBUILD | 10 | ||||
| -rw-r--r-- | multilib/zsnes/PKGBUILD | 48 | ||||
| -rw-r--r-- | multilib/zsnes/zsnes.patch | 12 | ||||
| -rw-r--r-- | multilib/zsnes/zsnes.png | bin | 0 -> 7301 bytes |
4 files changed, 46 insertions, 24 deletions
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 4dc4444f4..d741bae12 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73283 2012-07-05 13:48:49Z allan $ +# $Id: PKGBUILD 73695 2012-07-14 13:05:07Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,12 +9,11 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') -depends=("glibc>=$pkgver") makedepends=('gcc-multilib>=4.7') options=('!strip' '!emptydirs') source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} @@ -48,6 +47,7 @@ build() { export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" export CC="gcc -m32" + export CXX="g++ -m32" echo "slibdir=/usr/lib32" >> configparms # remove hardening options from CFLAGS for building libraries @@ -111,8 +111,8 @@ package() { usr/lib32/{pt_chown,{audit,gconv}/*.so} # Dynamic linker - mkdir ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ + mkdir ${pkgdir}/usr/lib + ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/lib/ # Add lib32 paths to the default library search path install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" diff --git a/multilib/zsnes/PKGBUILD b/multilib/zsnes/PKGBUILD index e2c5d0da9..bb6efb9cc 100644 --- a/multilib/zsnes/PKGBUILD +++ b/multilib/zsnes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63494 2012-02-05 11:45:54Z ibiru $ +# $Id: PKGBUILD 73720 2012-07-14 14:32:44Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Frank Tetzel <frank.tetzel@mailbox.tu-dresden.de> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,7 +6,7 @@ pkgname=zsnes pkgver=1.51 -pkgrel=11 +pkgrel=13 pkgdesc="Super Nintendo emulator" url="http://www.zsnes.com/" arch=('i686' 'x86_64') @@ -14,47 +14,57 @@ 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') + depends=('lib32-gcc-libs' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa') + makedepends=('nasm' 'gcc-multilib' 'gendesk') else - depends=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses' 'mesa') - makedepends=('nasm' 'gcc') + depends=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses' 'mesa') + makedepends=('nasm' 'gcc' 'gendesk') fi source=(http://downloads.sourceforge.net/${pkgname}/zsnes151src.tar.bz2 - zsnes.patch - zsnes-1.51-libpng15.patch - zsnes.desktop - zsnes_icon.png) + zsnes.patch + zsnes-1.51-libpng15.patch + zsnes.png) md5sums=('7071186bf80632ae88a153239498d8c9' - 'aa250af3ef8dbf8a44e095d4cd132db2' + 'fd13769c13de49601a234b46fb802a75' 'ea82b4dbf31c87dbcc6c67d02ddfb299' - 'b100b2aa342c551167d7c5dcdcde9dd4' 'b5260c02adfc3b7ff725041214b00bfd') build() { - cd ${srcdir}/${pkgname}_1_51/ + 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 + cd 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 +} + +package() { + cd "$srcdir" + + gendesk + + cd "${pkgname}_1_51/src" + 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 + install -Dm644 ${srcdir}/zsnes.png ${pkgdir}/usr/share/pixmaps/zsnes.png mv ${pkgdir}/usr/man ${pkgdir}/usr/share } + +# vim:set ts=2 sw=2 et: diff --git a/multilib/zsnes/zsnes.patch b/multilib/zsnes/zsnes.patch index 1be5d96ea..d5d681ae6 100644 --- a/multilib/zsnes/zsnes.patch +++ b/multilib/zsnes/zsnes.patch @@ -66,3 +66,15 @@ diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h /* This is part of a toolkit used to assist in ZSNES development */ +diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp +--- zsnes_1_51/src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100 ++++ zsnes_1_51-fix/src/tools/depbuild.cpp 2012-07-14 16:20:17.759886250 +0200 +@@ -26,6 +26,8 @@ + #include <cstdio> + using namespace std; + ++#include <unistd.h> ++ + #include "fileutil.h" + #include "strutil.h" + diff --git a/multilib/zsnes/zsnes.png b/multilib/zsnes/zsnes.png Binary files differnew file mode 100644 index 000000000..31608ba06 --- /dev/null +++ b/multilib/zsnes/zsnes.png |
