From d1b27abc7698690ab2f1f1106ddcd1955c7584cd Mon Sep 17 00:00:00 2001 From: grauehaare Date: Fri, 9 May 2014 17:57:03 +0200 Subject: [PATCH] Updated template for wxWidgets, now using sdl and opengl Updated shlibs for new wxWidgets revision 4 --- common/shlibs | 35 ++++++++++++++++++----------------- srcpkgs/wxWidgets/template | 7 ++++--- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/common/shlibs b/common/shlibs index c26d6c64d4f..7ba8fdb4b66 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1482,13 +1482,13 @@ libaio.so.1 libaio-0.3.109_1 libofx.so.6 libofx-0.9.9_2 libsigsegv.so.2 libsigsegv-2.10_2 libfprint.so.0 libfprint-0.5.1_1 -libwx_gtk2_adv-2.8.so.0 wxWidgets-2.8.12_3 -libwx_base_xml-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2_html-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2_aui-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2_core-2.8.so.0 wxWidgets-2.8.12_3 -libwx_base_net-2.8.so.0 wxWidgets-2.8.12_3 -libwx_base-2.8.so.0 wxWidgets-2.8.12_3 +libwx_gtk2_adv-2.8.so.0 wxWidgets-2.8.12_4 +libwx_base_xml-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2_html-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2_aui-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2_core-2.8.so.0 wxWidgets-2.8.12_4 +libwx_base_net-2.8.so.0 wxWidgets-2.8.12_4 +libwx_base-2.8.so.0 wxWidgets-2.8.12_4 libmspack.so.0 libmspack-0.4alpha_1 libslim.so.1.3.6 slim-1.3.6_1 libmozjs-24.so mozjs24-24.2.0_1 @@ -1538,16 +1538,16 @@ libOgreRTShaderSystem.so.1.9.0 libogre-1.9.0_1 libOgreVolume.so.1.9.0 libogre-1.9.0_1 libOgreOverlay.so.1.9.0 libogre-1.9.0_1 libglut.so.3 libfreeglut-2.8.1_1 -libwx_baseu_xml-2.8.so.0 wxWidgets-2.8.12_3 -libwx_baseu-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2u_richtext-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2u_html-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2u_aui-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2u_adv-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2u_xrc-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2u_qa-2.8.so.0 wxWidgets-2.8.12_3 -libwx_baseu_net-2.8.so.0 wxWidgets-2.8.12_3 -libwx_gtk2u_core-2.8.so.0 wxWidgets-2.8.12_3 +libwx_baseu_xml-2.8.so.0 wxWidgets-2.8.12_4 +libwx_baseu-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2u_richtext-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2u_html-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2u_aui-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2u_adv-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2u_xrc-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2u_qa-2.8.so.0 wxWidgets-2.8.12_4 +libwx_baseu_net-2.8.so.0 wxWidgets-2.8.12_4 +libwx_gtk2u_core-2.8.so.0 wxWidgets-2.8.12_4 libogmrip-gtk.so.1 ogmrip-1.0.0_1 libogmdvd.so.1 ogmrip-1.0.0_1 libogmjob.so.1 ogmrip-1.0.0_1 @@ -1609,3 +1609,4 @@ libmitlm.so.0 mitlm-0.4.1_1 libextractor.so.3 libextractor-1.1_1 libextractor_common.so.1 libextractor-1.1_1 libpano13.so.3 libpano13-2.9.19_1 +libwx_gtk2u_gl-2.8.so.0 wxWidgets-2.8.12_4 diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template index ccff1d6b520..7291dad152c 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,17 +1,18 @@ + # Template file for 'wxWidgets' pkgname="wxWidgets" version="2.8.12" -revision=3 +revision=4 build_style=gnu-configure short_desc="Cross-Platform GUI Library" maintainer="Martin Riese " license="wxWindows Library Licence" homepage="http://www.wxwidgets.org/" hostmakedepends="pkg-config" -makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libXinerama-devel libmspack-devel" +makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libXinerama-devel libmspack-devel SDL-devel glu-devel" distfiles="${SOURCEFORGE_SITE}/wxwindows/${version}/${pkgname}-${version}.tar.bz2" checksum="3b0ac1d2d017683851841501c8e1b744b97242d684a1668ded61809b0504f707" -configure_args="--enable-unicode" +configure_args="--enable-unicode --with-opengl --with-sdl" wxWidgets-devel_package() { conflicts="wxGTK-devel>=0"