From 262675d2d70f187f805cd1afa28079587798dcbc Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 10 Jan 2023 02:50:24 -0500 Subject: libraries/CEGUI0.7: Resolve conflict with CEGUI. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- libraries/CEGUI0.7/CEGUI-OPENGL.pc | 12 ++++++++ libraries/CEGUI0.7/CEGUI.pc | 11 +++++++ libraries/CEGUI0.7/CEGUI0.7.SlackBuild | 52 +++++++++++++++++++++------------- libraries/CEGUI0.7/CEGUI0.7.info | 2 +- libraries/CEGUI0.7/README | 5 ++-- 5 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 libraries/CEGUI0.7/CEGUI-OPENGL.pc create mode 100644 libraries/CEGUI0.7/CEGUI.pc diff --git a/libraries/CEGUI0.7/CEGUI-OPENGL.pc b/libraries/CEGUI0.7/CEGUI-OPENGL.pc new file mode 100644 index 0000000000..79ef4898ea --- /dev/null +++ b/libraries/CEGUI0.7/CEGUI-OPENGL.pc @@ -0,0 +1,12 @@ +prefix=/opt/CEGUI0.7 +exec_prefix=${prefix} +libdir=/opt/CEGUI0.7/lib64 +includedir=${prefix}/include +datafiles=${prefix}/share/CEGUI + +Name: CEGUI OpenGL Renderer +Description: OpenGL based renderer module for CEGUI. +Version: 0.7.9 +Requires: CEGUI = 0.7.9 +Libs: -L${libdir} -Wl,-rpath,${libdir} -lCEGUIOpenGLRenderer +Cflags: -I${includedir} -I${includedir}/CEGUI diff --git a/libraries/CEGUI0.7/CEGUI.pc b/libraries/CEGUI0.7/CEGUI.pc new file mode 100644 index 0000000000..00eff2e155 --- /dev/null +++ b/libraries/CEGUI0.7/CEGUI.pc @@ -0,0 +1,11 @@ +prefix=/opt/CEGUI0.7 +exec_prefix=${prefix} +libdir=/opt/CEGUI0.7/lib64 +includedir=${prefix}/include +datafiles=${prefix}/share/CEGUI + +Name: CEGUI +Description: The free GUI library for games and multi-media development. +Version: 0.7.9 +Libs: -L${libdir} -Wl,-rpath,${libdir} -lCEGUIBase +Cflags: -I${includedir} -I${includedir}/CEGUI diff --git a/libraries/CEGUI0.7/CEGUI0.7.SlackBuild b/libraries/CEGUI0.7/CEGUI0.7.SlackBuild index 39b167d3db..25985aed59 100644 --- a/libraries/CEGUI0.7/CEGUI0.7.SlackBuild +++ b/libraries/CEGUI0.7/CEGUI0.7.SlackBuild @@ -22,12 +22,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20230110 bkw: modified by SlackBuilds.org, BUILD=5. +# - Install to /opt/CEGUI0.7, not /usr. Resolves the conflict with +# CEGUI. Apps that depend on this will have to be modified to +# use /opt/CEGUI0.7 (only games/smc depends on this, though). +# - Disable irrlicht renderer (unneeded). +# - Disable ogre renderer (fails to build with modern ogre). +# - Add FreeImage to REQUIRES. Our one dependee (smc) requires +# a CEGUI0.7 that was built with FreeImage support. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=CEGUI0.7 SRCNAM=CEGUI VERSION=${VERSION:-0.7.9} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +48,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -74,38 +80,46 @@ rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +OPT=/opt/$PRGNAM +OPTLIB=$OPT/lib$LIBDIRSUFFIX +PKGOPT=$PKG/$OPT +PKGOPTLIB=$PKG/$OPTLIB +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION patch -p1 < $CWD/CEGUI.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --prefix=$OPT \ + --libdir=$OPT/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ + --mandir=$OPT/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-null-renderer \ --disable-python-module \ + --disable-ogre-renderer \ + --disable-irrlicht-renderer \ --with-default-image-codec=FreeImageImageCodec \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# 20230110 bkw: .pc files contain -Wl,-rpath... +# this way, anything that needs to link with CEGUI0.7 can simply: +# export PKG_CONFIG_PATH=/opt/CEGUI0.7/lib$LIBDIRSUFFIX/pkgconfig +# example: games/smc +install -m0644 -oroot -groot $CWD/CEGUI*.pc $PKGOPTLIB/pkgconfig -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKGDOC +cp -a doc/* $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild -rm -f $PKG/usr/lib*/*.la +rm -f $PKGOPTLIB/*.la mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/libraries/CEGUI0.7/CEGUI0.7.info b/libraries/CEGUI0.7/CEGUI0.7.info index c78355edfb..5c200e4430 100644 --- a/libraries/CEGUI0.7/CEGUI0.7.info +++ b/libraries/CEGUI0.7/CEGUI0.7.info @@ -5,6 +5,6 @@ DOWNLOAD="http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.7.9.tar.gz" MD5SUM="a8b682daf82e383edc169c2e6eb2b321" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="FreeImage" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/libraries/CEGUI0.7/README b/libraries/CEGUI0.7/README index 1105ffa453..7e78fdbb50 100644 --- a/libraries/CEGUI0.7/README +++ b/libraries/CEGUI0.7/README @@ -14,5 +14,6 @@ particular, pay attention to the image codecs because you might want to disable the others to ensure that the one you want to use is the default codec. -NOTE: This package conflict with CEGUI=> 0.8. Only install one of -them, NOT both. +NOTE: This package does not conflict with CEGUI => 0.8. It's safe +to install both. CEGUI0.7 get installed to /opt/CEGUI0.7; if you're +trying to build with it, see games/smc for an example. -- cgit v1.2.3-79-gdb01