aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/wxGTK/README13
-rw-r--r--libraries/wxGTK/wxGTK.SlackBuild14
2 files changed, 13 insertions, 14 deletions
diff --git a/libraries/wxGTK/README b/libraries/wxGTK/README
index 3f96e57ee9c15..00c8f5ecdba48 100644
--- a/libraries/wxGTK/README
+++ b/libraries/wxGTK/README
@@ -1,9 +1,12 @@
-wxGTK is part of wxWidgets, a cross-platform API for writing GUI applications
-on multiple platforms that still utilize the native platform's controls and
-utilities.
+wxGTK is part of wxWidgets, a cross-platform API for writing GUI
+applications on multiple platforms that still utilize the native platform's
+controls and utilities.
This is a unicode shared build. If you do not want the unicode build, use:
UNICODE=NO ./wxGTK.SlackBuild
-This package conflicts with wxPython because wxGTK is already included there.
-Both cannot be installed at the same time!
+If you want to include the media library, which provides bindings for
+gstreamer, you will need to install GConf first.
+
+This package conflicts with wxPython because wxGTK is already included
+there. Both cannot be installed at the same time!
diff --git a/libraries/wxGTK/wxGTK.SlackBuild b/libraries/wxGTK/wxGTK.SlackBuild
index 3bce50ab5f4b3..5d066669a3268 100644
--- a/libraries/wxGTK/wxGTK.SlackBuild
+++ b/libraries/wxGTK/wxGTK.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for wxGTK
# Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
+# Copyright 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,12 +25,11 @@
# Lots of key help from Eric Hameleers and the SBo admins.
-# Versions >= 2.8.10 by Niels Horn <niels.horn@gmail.com>
-# revision date: 2011/04/01
+# revision date: 2011/12/23
PRGNAM=wxGTK
VERSION=${VERSION:-2.8.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -52,23 +52,18 @@ UNICODE=${UNICODE:-YES}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
- ARCHQUADLET=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
- ARCHQUADLET=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
- ARCHQUADLET=""
elif [ "$ARCH" = "arm" ]; then
SLKCFLAGS="-O2 -march=armv4t"
LIBDIRSUFFIX=""
- ARCHQUADLET="-gnueabi"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
- ARCHQUADLET=""
fi
set -e
@@ -100,9 +95,10 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--enable-shared \
+ --enable-mediactrl \
--with-opengl \
--${_do_unicode}able-unicode \
- --build=$ARCH-slackware-linux$ARCHQUADLET
+ --build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG