updates & rebuilds to these lib32 packages: nss, nspr, sdl_net, sdl_mixer, sdl_image, sdl_ttf, mpg123

lib32-mpg123/PKGBUILD

@@ -6,7 +6,7 @@
 _pkgbasename=mpg123
 pkgname=lib32-$_pkgbasename
 pkgver=1.12.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (32-bit)"
 arch=('x86_64')
 url="http://sourceforge.net/projects/mpg123"
@@ -24,7 +24,7 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  
+
   ./configure --prefix=/usr --with-audio="alsa sdl" --with-cpu=i586 --libdir=/usr/lib32
   make
 }

lib32-nspr/PKGBUILD

@@ -5,7 +5,7 @@
 
 _pkgbasename=nspr
 pkgname=lib32-$_pkgbasename
-pkgver=4.8.6
+pkgver=4.9
 pkgrel=1
 pkgdesc="Netscape Portable Runtime (32-bit)"
 arch=('x86_64')
@@ -16,7 +16,7 @@ makedepends=('zip' 'gcc-multilib')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('592c275728c29d193fdba8009165990b'
+md5sums=('aa0c960b23a9d66a3c30c3e6ba80a99a'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {

lib32-nss/PKGBUILD

@@ -5,13 +5,13 @@
 
 _pkgbasename=nss
 pkgname=lib32-$_pkgbasename
-pkgver=3.12.8
+pkgver=3.13.3
 pkgrel=1
 pkgdesc="Mozilla's Netscape Security Services Library that implements PKI support (32-bit)"
 arch=('x86_64')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.8.6
+_nsprver=4.9
 depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "$_pkgbasename" 'lib32-zlib')
 makedepends=('gcc-multilib' 'perl')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
@@ -20,7 +20,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
 options=('!strip')
-md5sums=('40bf1bb0c7567827d3768d1fc6081100'
+md5sums=('006cb82fa900e9e664b4b14a9b7810ca'
          'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '7f39c19b1dfd62d7db7d8bf19f156fed'
@@ -35,8 +35,11 @@ build() {
   # Removes rpath
   patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
 
+  # copy linux 2.6 to linux 3.0
+ #  cp mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk
+
   make -C mozilla/security/nss/lib/ckfw/builtins generate
-  
+
   unset CFLAGS
   unset CXXFLAGS
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig

lib32-nss/nss.pc.in

@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}

lib32-sdl_image/PKGBUILD

@@ -6,7 +6,7 @@
 _pkgbasename=sdl_image
 pkgname=lib32-$_pkgbasename
 pkgver=1.2.10
-pkgrel=1
+pkgrel=3
 pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)"
 arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_image/"

lib32-sdl_mixer/PKGBUILD

@@ -0,0 +1,44 @@
+# Lib32 Packages for Chakra, part of chakra-project.org
+#
+# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
+# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
+
+_pkgbasename=sdl_mixer
+pkgname=lib32-$_pkgbasename
+pkgver=1.2.11
+pkgrel=2
+pkgdesc="A simple multi-channel audio mixer (32-bit)"
+arch=('x86_64')
+url="http://www.libsdl.org/projects/SDL_mixer/"
+license=('LGPL' 'GPL')
+depends=("$_pkgbasename" 'lib32-sdl>=1.2.12' 'lib32-libvorbis' 'lib32-libmikmod' 'lib32-smpeg')
+makedepends=('gcc-multilib')
+options=('!libtool')
+source=("http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz")
+md5sums=('65ada3d997fe85109191a5fb083f248c')
+
+build() {
+  export CC='gcc -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  cd "${srcdir}/SDL_mixer-${pkgver}"
+
+  sed -e "/CONFIG_FILE_ETC/s/\/etc\/timidity.cfg/\/etc\/timidity++\/timidity.cfg/" \
+      -e "/DEFAULT_PATH/s/\/etc\/timidity/\/etc\/timidity++/" \
+      -e "/DEFAULT_PATH2/s/\/usr\/local\/lib\/timidity/\/usr\/lib\/timidity/" \
+      -i timidity/config.h
+
+  ./configure \
+	--prefix=/usr \
+	--libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd ${srcdir}/SDL_mixer-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "$pkgdir/usr/include"
+  cd "$pkgdir/usr/lib32/" || return 1
+  ln -sf libSDL_mixer-1.2.so.10.1 libSDL_mixer-1.2.so.0
+}

lib32-sdl_net/PKGBUILD

@@ -0,0 +1,30 @@
+# Lib32 Packages for Chakra, part of chakra-project.org
+#
+# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
+# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
+
+_pkgbasename=sdl_net
+pkgname=lib32-$_pkgbasename
+pkgver=1.2.7
+pkgrel=3
+pkgdesc="A small sample cross-platform networking library (32 bit)"
+arch=('x86_64')
+url="http://www.libsdl.org/projects/SDL_net/"
+license=('LGPL')
+depends=('lib32-sdl' $_pkgbasename)
+makedepends=('gcc-multilib')
+options=('!libtool')
+source=(http://www.libsdl.org/projects/SDL_net/release/SDL_net-${pkgver}.tar.gz)
+md5sums=('6bd4662d1423810f3140d4da21b6d912')
+
+build() {
+  cd ${srcdir}/SDL_net-${pkgver}
+  ./configure --libdir=/usr/lib32 CC='gcc -m32' CXX='g++ -m32'
+  make
+}
+package() {
+  cd ${srcdir}/SDL_net-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm -rf ${pkgdir}/usr/local
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING
+}

lib32-sdl_ttf/PKGBUILD

@@ -5,8 +5,8 @@
 
 _pkgbasename=sdl_ttf
 pkgname=lib32-$_pkgbasename
-pkgver=2.0.9
-pkgrel=1
+pkgver=2.0.10
+pkgrel=2
 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (32-bit)"
 arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_ttf/"
@@ -15,7 +15,7 @@ options=('!libtool')
 depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename)
 makedepends=('gcc-multilib')
 source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz)
-md5sums=('6dd5a85e4924689a35a5fb1cb3336156')
+md5sums=('814e6e17e8879254208d23b3b7e0354b')
 
 build() {
   cd "${srcdir}"/SDL_ttf-${pkgver}

lib32-smpeg/PKGBUILD

@@ -0,0 +1,43 @@
+# Lib32 Packages for Chakra, part of chakra-project.org
+#
+# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
+# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
+
+_pkgbasename=smpeg
+pkgname=lib32-${_pkgbasename}
+pkgver=0.4.4
+pkgrel=3
+pkgdesc="SDL MPEG Player Library (32-bit)"
+arch=('x86_64')
+url="http://icculus.org/smpeg/"
+license=('LGPL')
+depends=('lib32-sdl')
+options=('!libtool' '!makeflags')
+source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${_pkgbasename}-${pkgver}.tar.gz smpeg-0.4.4-gcc41.patch)
+md5sums=('59c76ac704088ef5539210190c4e1fe3'
+		 '8b979a58307d7196655758bd3d2466c4')
+
+build() {
+  export CC='gcc -m32'
+  export CXX="g++ -m32"
+  export LIBS=-L/usr/lib32
+  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+  patch -p1 < ../smpeg-0.4.4-gcc41.patch
+
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make LDFLAGS+=-lstdc++
+}
+
+package() {
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  #fix aclocal warnings
+  sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4
+
+  rm -rf "${pkgdir}"/usr/{bin,include,share,man,info}
+}
+
+

lib32-smpeg/smpeg-0.4.4-gcc41.patch

@@ -0,0 +1,41 @@
+Index: MPEGaudio.h
+===================================================================
+RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
+retrieving revision 1.23
+diff -u -p -r1.23 MPEGaudio.h
+--- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
++++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
+@@ -151,12 +151,6 @@ private:
+ /* The actual MPEG audio class */
+ class MPEGaudio : public MPEGerror, public MPEGaudioaction {
+ 
+-    friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+-    friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
+-#ifdef THREADED_AUDIO
+-    friend int Decode_MPEGaudio(void *udata);
+-#endif
+-
+ public:
+     MPEGaudio(MPEGstream *stream, bool initSDL = true);
+     virtual ~MPEGaudio();
+@@ -367,6 +361,20 @@ public:
+ #define N_TIMESTAMPS 5
+ 
+   double timestamp[N_TIMESTAMPS];
++
++  /* Functions which access MPEGaudio internals */
++  friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++  friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
++#ifdef THREADED_AUDIO
++  friend int Decode_MPEGaudio(void *udata);
++#endif
+ };
+ 
++/* Need to duplicate the prototypes, this is not a typo :) */
++void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
++#ifdef THREADED_AUDIO
++int Decode_MPEGaudio(void *udata);
++#endif
++
+ #endif /* _MPEGAUDIO_H_ */