[arch-commits] Commit in (5 files)
Maxime Gauduin
alucryd at archlinux.org
Fri Jan 30 11:05:32 UTC 2015
Date: Friday, January 30, 2015 @ 12:05:31
Author: alucryd
Revision: 126783
Add lib32-wxgtk
Added:
lib32-wxgtk/
lib32-wxgtk/trunk/
lib32-wxgtk/trunk/PKGBUILD
lib32-wxgtk/trunk/wxGTK-collision.patch
Modified:
pcsx2/trunk/PKGBUILD
-----------------------------------------+
lib32-wxgtk/trunk/PKGBUILD | 60 ++++++++++++++++++++++++++++
lib32-wxgtk/trunk/wxGTK-collision.patch | 27 ++++++++++++
pcsx2/trunk/PKGBUILD | 64 +++++++++++++++++++-----------
3 files changed, 128 insertions(+), 23 deletions(-)
Added: lib32-wxgtk/trunk/PKGBUILD
===================================================================
--- lib32-wxgtk/trunk/PKGBUILD (rev 0)
+++ lib32-wxgtk/trunk/PKGBUILD 2015-01-30 11:05:31 UTC (rev 126783)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=lib32-wxgtk
+pkgver=3.0.2
+pkgrel=3
+pkgdesc='GTK+ implementation of wxWidgets API for GUI'
+arch=('x86_64')
+url='http://wxwidgets.org'
+license=('custom:wxWindows')
+depends=('lib32-gtk2' 'lib32-libsm' "wxgtk=${pkgver}")
+makedepends=('gcc-multilib' 'lib32-glu')
+options=('!emptydirs')
+source=("http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2"
+ 'wxGTK-collision.patch')
+sha256sums=('346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d'
+ 'c73c51f4b65a779462a4e0923a7e3bc7fe28457258fc8bfb5d843d87df119364')
+
+prepare() {
+ cd wx*-${pkgver}
+
+ patch -Np1 -i ../wxGTK-collision.patch
+}
+
+
+build() {
+ cd wxWidgets-${pkgver}
+
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+ ./configure \
+ --prefix='/usr' \
+ --libdir='/usr/lib32' \
+ --enable-graphics_ctx \
+ --enable-unicode \
+ --disable-{mediactrl,webview} \
+ --disable-precomp-headers \
+ --with-gtk='2' \
+ --with-lib{jpeg,png,tiff,xpm}='sys' \
+ --with-opengl \
+ --with-regex='builtin' \
+ --without-libnotify
+ make
+ make -C locale allmo
+}
+
+package() {
+ cd wxWidgets-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}"/usr/{include,share}
+
+ install -dm 755 "${pkgdir}"/usr/share/licenses
+ ln -s wxgtk "${pkgdir}"/usr/share/licenses/lib32-wxgtk
+}
+
+# vim: ts=2 sw=2 et:
Property changes on: lib32-wxgtk/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: lib32-wxgtk/trunk/wxGTK-collision.patch
===================================================================
--- lib32-wxgtk/trunk/wxGTK-collision.patch (rev 0)
+++ lib32-wxgtk/trunk/wxGTK-collision.patch 2015-01-30 11:05:31 UTC (rev 126783)
@@ -0,0 +1,27 @@
+diff -rupN wxWidgets-3.0.1.orig/Makefile.in wxWidgets-3.0.1/Makefile.in
+--- wxWidgets-3.0.1.orig/Makefile.in 2014-07-30 00:40:09.604520200 +0200
++++ wxWidgets-3.0.1/Makefile.in 2014-07-30 00:43:08.131765800 +0200
+@@ -16140,7 +16140,8 @@ install-wxconfig:
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config32-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config32-$(WX_RELEASE))
++ (cd $(DESTDIR)$(bindir) && $(LN_S) wx-config32-$(WX_RELEASE) wx-config32$(EXEEXT))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+diff -rupN wxWidgets-3.0.1.orig/utils/wxrc/Makefile.in wxWidgets-3.0.1/utils/wxrc/Makefile.in
+--- wxWidgets-3.0.1.orig/utils/wxrc/Makefile.in 2014-07-30 00:40:10.712676300 +0200
++++ wxWidgets-3.0.1/utils/wxrc/Makefile.in 2014-07-30 00:47:04.729183400 +0200
+@@ -124,8 +124,8 @@ distclean: clean
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+- at COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+- at COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
++ at COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc32-$(WX_RELEASE)
++ at COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc32-$(WX_RELEASE) wxrc32$(EXEEXT))
+
+ @COND_USE_XRC_1 at uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
Modified: pcsx2/trunk/PKGBUILD
===================================================================
--- pcsx2/trunk/PKGBUILD 2015-01-30 10:45:38 UTC (rev 126782)
+++ pcsx2/trunk/PKGBUILD 2015-01-30 11:05:31 UTC (rev 126783)
@@ -1,27 +1,31 @@
# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
# Contributor: josephgbr <rafael.f.f1 at gmail.com>
# Contributor: vEX <vex at niechift.com>
pkgname=pcsx2
-pkgver=1.2.2
-pkgrel=3
+pkgver=1.3.1
+pkgrel=1
pkgdesc='A Sony PlayStation 2 emulator'
arch=('i686' 'x86_64')
url='http://www.pcsx2.net'
license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
-makedepends=('cmake' 'sparsehash')
-if [[ $CARCH == "i686" ]]; then
- depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' 'portaudio' 'soundtouch' 'wxgtk2.8')
-elif [[ $CARCH == "x86_64" ]]; then
- makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-libgl' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8')
-fi
+depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit'
+ 'portaudio' 'sdl' 'soundtouch' 'wxgtk')
+depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra'
+ 'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit'
+ 'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk')
+makedepends=('cmake')
+makedepends_x86_64=('gcc-multilib')
+optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support'
+ 'lib32-gtk-engine-murrine: Murrine GTK3 engine support'
+ 'lib32-gtk-engine-unico: Unico GTK2 engine support')
options=('!emptydirs')
source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz")
-sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23')
+sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9')
build() {
- cd ${pkgname}-${pkgver}
+ cd pcsx2-${pkgver}
if [[ -d build ]]; then
rm -rf build
@@ -28,13 +32,31 @@
fi
mkdir build && cd build
- if [[ $CARCH == "i686" ]]; then
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
- elif [[ $CARCH == "x86_64" ]]; then
- export CC='gcc -m32'
- export CXX='g++ -m32'
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32'
+ if [[ $CARCH == i686 ]]; then
+ cmake .. \
+ -DCMAKE_BUILD_TYPE='Release' \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DCMAKE_LIBRARY_PATH='/usr/lib' \
+ -DPLUGIN_DIR='/usr/lib/pcsx2' \
+ -DGAMEINDEX_DIR='/usr/share/pcsx2' \
+ -DEXTRA_PLUGINS='TRUE' \
+ -DREBUILD_SHADER='TRUE' \
+ -DGLSL_API='TRUE' \
+ -DPACKAGE_MODE='TRUE' \
+ -DXDG_STD='TRUE'
+ elif [[ $CARCH == x86_64 ]]; then
+ cmake .. \
+ -DCMAKE_BUILD_TYPE='Release' \
+ -DCMAKE_TOOLCHAIN_FILE='cmake/linux-compiler-i386-multilib.cmake' \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DCMAKE_LIBRARY_PATH='/usr/lib32' \
+ -DPLUGIN_DIR='/usr/lib32/pcsx2' \
+ -DGAMEINDEX_DIR='/usr/share/pcsx2' \
+ -DEXTRA_PLUGINS='TRUE' \
+ -DREBUILD_SHADER='TRUE' \
+ -DGLSL_API='TRUE' \
+ -DPACKAGE_MODE='TRUE' \
+ -DXDG_STD='TRUE'
fi
make
@@ -41,12 +63,8 @@
}
package() {
- cd ${pkgname}-${pkgver}/build
+ cd pcsx2-${pkgver}/build
- if [[ $CARCH == "x86_64" ]]; then
- depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8')
- fi
-
make DESTDIR="${pkgdir}" install
}
More information about the arch-commits
mailing list