diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-09-02 23:29:21 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-09-02 23:29:21 -0300 |
commit | e19513e92d38a19ce1d1d11f4e1c488a2a551e72 (patch) | |
tree | f594d2b8c3b1b659ff9731149717409a6edd9e0c /libre-multilib | |
parent | 10abf269ca1c3eda8334e515cc7d3f0f92c999dd (diff) | |
parent | 4cbcea3c1078e754ad555410d2fad0d3ed0e3bd3 (diff) | |
download | abslibre-e19513e92d38a19ce1d1d11f4e1c488a2a551e72.tar.gz abslibre-e19513e92d38a19ce1d1d11f4e1c488a2a551e72.tar.bz2 abslibre-e19513e92d38a19ce1d1d11f4e1c488a2a551e72.zip |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'libre-multilib')
-rw-r--r-- | libre-multilib/lib32-mesa-demos/PKGBUILD (renamed from libre-multilib/lib32-mesa-demos-libre/PKGBUILD) | 17 | ||||
-rw-r--r-- | libre-multilib/lib32-mesa-demos/libre.patch (renamed from libre-multilib/lib32-mesa-demos-libre/libre.patch) | 0 | ||||
-rw-r--r-- | libre-multilib/lib32-sdl/PKGBUILD (renamed from libre-multilib/lib32-sdl-libre/PKGBUILD) | 39 | ||||
-rw-r--r-- | libre-multilib/lib32-sdl/X11_KeyToUnicode.patch | 52 | ||||
-rw-r--r-- | libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff (renamed from libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff) | 0 | ||||
-rw-r--r-- | libre-multilib/lib32-sdl/libre.patch (renamed from libre-multilib/lib32-sdl-libre/libre.patch) | 0 | ||||
-rw-r--r-- | libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch (renamed from libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch) | 0 | ||||
-rw-r--r-- | libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch (renamed from libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch) | 0 | ||||
-rw-r--r-- | libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch (renamed from libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch) | 0 | ||||
-rw-r--r-- | libre-multilib/lib32-sdl/sdl_x11sym.patch | 12 | ||||
-rw-r--r-- | libre-multilib/pcsx2/PKGBUILD (renamed from libre-multilib/pcsx2-libre/PKGBUILD) | 20 |
11 files changed, 105 insertions, 35 deletions
diff --git a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD b/libre-multilib/lib32-mesa-demos/PKGBUILD index badab3a2e..07230a3d7 100644 --- a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD +++ b/libre-multilib/lib32-mesa-demos/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 115314 2014-07-08 15:30:12Z bluewind $ +# $Id: PKGBUILD 117596 2014-08-19 02:28:18Z fyan $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> -_pkgbasename=mesa-demos-libre +_pkgbasename=mesa-demos pkgname=lib32-$_pkgbasename pkgver=8.2.0 -pkgrel=2 +pkgrel=2.parabola1 arch=(x86_64) pkgdesc="Mesa demos and tools (32-bit), without nonfree demos" url="http://mesa3d.sourceforge.net" license=('custom') -provides=("lib32-mesa-demos=$pkgver") -replaces=('lib32-mesa-demos') -conflicts=('lib32-mesa-demos') -depends=('lib32-libgl' 'lib32-glew' 'mesa-demos-libre') +replaces=('lib32-mesa-demos-libre') +conflicts=('lib32-mesa-demos-libre') +depends=('lib32-libgl' 'lib32-glew' 'mesa-demos') makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew') source=(https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2 libre.patch) @@ -39,7 +38,7 @@ build() { } package() { - depends=('lib32-glew' mesa-demos-libre) + depends=('lib32-glew' mesa-demos) cd "${srcdir}/mesa-demos-${pkgver}" make DESTDIR="${pkgdir}" install @@ -51,5 +50,5 @@ package() { rm -r "$pkgdir/usr/share/mesa-demos" mkdir -p "$pkgdir/usr/share/licenses" - ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/libre-multilib/lib32-mesa-demos-libre/libre.patch b/libre-multilib/lib32-mesa-demos/libre.patch index 43e2d1e37..43e2d1e37 100644 --- a/libre-multilib/lib32-mesa-demos-libre/libre.patch +++ b/libre-multilib/lib32-mesa-demos/libre.patch diff --git a/libre-multilib/lib32-sdl-libre/PKGBUILD b/libre-multilib/lib32-sdl/PKGBUILD index 1b294adf0..4bb815cfe 100644 --- a/libre-multilib/lib32-sdl-libre/PKGBUILD +++ b/libre-multilib/lib32-sdl/PKGBUILD @@ -1,35 +1,48 @@ -# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ +# $Id: PKGBUILD 114755 2014-07-03 20:47:41Z heftig $ # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor (Arch): Allan McRae <allan@archlinux.org> # Contributor (Arch): dorphell <dorphell@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> -_pkgbasename=sdl-libre +_pkgbasename=sdl pkgname=lib32-$_pkgbasename pkgver=1.2.15 -pkgrel=3 +pkgrel=6.parabola1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit), without nonfree riva_mmio.h file" arch=('x86_64') url="http://www.libsdl.org" license=('LGPL') -provides=("lib32-sdl=${pkgver}") -conflicts=('lib32-sdl') -replaces=('lib32-sdl') +conflicts=('lib32-sdl-libre') +replaces=('lib32-sdl-libre') depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) +makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' 'lib32-glu' gcc-multilib) optdepends=('lib32-alsa-lib: ALSA audio driver' 'lib32-libpulse: PulseAudio audio driver') -options=('!libtool') -source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz +options=('staticlibs') +source=(https://repo.parabolagnulinux.org/other/sdl-libre/SDL-libre-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch fix_joystick_misc_axes.diff - libsdl-1.2.15-resizing.patch) + libsdl-1.2.15-resizing.patch + sdl_x11sym.patch + X11_KeyToUnicode.patch) md5sums=('c6e53ef16fa347ed066c3d68fe93c378' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' '687586a108b597a2a6b73070c1d37e51' - '3dd50347d8856160a9cbd7f80383a1f8') + '3dd50347d8856160a9cbd7f80383a1f8' + '148b285bccee9d21bb96db807363b962' + 'edea272dff4698470877c016d818918d') + +prepare() { + cd SDL-$pkgver + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + patch -Np0 -i ../sdl_x11sym.patch + patch -Np1 -i ../X11_KeyToUnicode.patch +} build() { export CC="gcc -m32" @@ -37,10 +50,6 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd SDL-$pkgver - patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch - patch -Np1 -i ../fix_joystick_misc_axes.diff - patch -Np1 -i ../libsdl-1.2.15-resizing.patch ./configure --prefix=/usr --disable-nasm --enable-alsa \ --with-x --disable-rpath --disable-static --libdir=/usr/lib32 make diff --git a/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch b/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch new file mode 100644 index 000000000..5f0f325b1 --- /dev/null +++ b/libre-multilib/lib32-sdl/X11_KeyToUnicode.patch @@ -0,0 +1,52 @@ + +# HG changeset patch +# User Sam Lantinga <slouken@libsdl.org> +# Date 1327258041 18000 +# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf +# Parent 5273dfd19a5e8c5736a0d417bd441f704c5355f8 +Fixed bug 1390 - X11_KeyToUnicode + +manuel.montezelo 2012-01-22 08:56:18 PST + +We had the following bug report at Debian: +http://bugs.debian.org/376560 + +Same one in Ubuntu: +https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217 + +We've been including a patch since then (attached) to actually export the +symbol, since 2006. In the last release the function seems to be there, alive +and kicking. + +It's affecting other people too: +http://www.garagegames.com/community/forums/viewthread/52287 + +diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Sat Jan 21 12:06:51 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Sun Jan 22 13:47:21 2012 -0500 +@@ -1246,8 +1246,11 @@ + * sequences (dead accents, compose key sequences) will not work since the + * state has been irrevocably lost. + */ ++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod); ++ + Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers) + { ++ static int warning = 0; + struct SDL_VideoDevice *this = current_video; + char keybuf[32]; + int i; +@@ -1255,6 +1258,12 @@ + XKeyEvent xkey; + Uint16 unicode; + ++ if ( warning ) { ++ warning = 0; ++ fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n"); ++ fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n"); ++ } ++ + if ( !this || !SDL_Display ) { + return 0; + } + diff --git a/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff index 75e3755c9..75e3755c9 100644 --- a/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff +++ b/libre-multilib/lib32-sdl/fix_joystick_misc_axes.diff diff --git a/libre-multilib/lib32-sdl-libre/libre.patch b/libre-multilib/lib32-sdl/libre.patch index 72f7da56a..72f7da56a 100644 --- a/libre-multilib/lib32-sdl-libre/libre.patch +++ b/libre-multilib/lib32-sdl/libre.patch diff --git a/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch index 0655a13e1..0655a13e1 100644 --- a/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch +++ b/libre-multilib/lib32-sdl/libsdl-1.2.15-resizing.patch diff --git a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch index 1bb6e0e47..1bb6e0e47 100644 --- a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch +++ b/libre-multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch diff --git a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch index 7d3e5acfc..7d3e5acfc 100644 --- a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch +++ b/libre-multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch diff --git a/libre-multilib/lib32-sdl/sdl_x11sym.patch b/libre-multilib/lib32-sdl/sdl_x11sym.patch new file mode 100644 index 000000000..9aaa2353b --- /dev/null +++ b/libre-multilib/lib32-sdl/sdl_x11sym.patch @@ -0,0 +1,12 @@ +--- src/video/x11/SDL_x11sym.h-orig 2013-07-16 23:56:46.718523385 -0600 ++++ src/video/x11/SDL_x11sym.h 2013-07-16 23:58:27.025186485 -0600 +@@ -165,7 +165,8 @@ + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) +-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++ ++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + diff --git a/libre-multilib/pcsx2-libre/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD index 3fb9571a9..462310975 100644 --- a/libre-multilib/pcsx2-libre/PKGBUILD +++ b/libre-multilib/pcsx2/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 105941 2014-02-19 17:17:38Z alucryd $ +# $Id: PKGBUILD 117536 2014-08-18 21:27:02Z alucryd $ # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com> # Contributor (Arch): josephgbr <rafael.f.f1@gmail.com> # Contributor (Arch): vEX <vex@niechift.com> -_pkgname=pcsx2 -pkgname=$_pkgname-libre +pkgname=pcsx2 pkgver=1.2.2 -pkgrel=3 +pkgrel=3.parabola1 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' arch=('i686' 'x86_64' 'mips64el') url='http://www.pcsx2.net' @@ -15,23 +14,22 @@ makedepends=('cmake' 'sparsehash') if [[ $CARCH == "i686" ]]; then depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk2.8') elif [[ $CARCH == "x86_64" ]]; then - makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') + makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') fi -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=("$_pkgname") +conflicts=("${pkgname}-libre") +replaces=("${pkgname}-libre") options=('!emptydirs') source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz") sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23') prepare() { - cd ${_pkgname}-${pkgver} + cd ${pkgname}-${pkgver} # remove Cg shader on ZZogl plugin sed -i '\|zzogl-pg-cg| s|^|#|' plugins/CMakeLists.txt } build() { - cd ${_pkgname}-${pkgver} + cd ${pkgname}-${pkgver} if [[ -d build ]]; then rm -rf build @@ -51,7 +49,7 @@ build() { } package() { - cd ${_pkgname}-${pkgver}/build + cd ${pkgname}-${pkgver}/build if [[ $CARCH == "x86_64" ]]; then depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') |