Irrlicht: bump version, fix SDL deps (#1381)

This commit is contained in:
miqlas
2017-06-03 19:06:28 +02:00
committed by Jérôme Duval
parent bc533bbd7b
commit 4b4b47d3e7
2 changed files with 17 additions and 17 deletions

View File

@@ -8,12 +8,12 @@ enhancements for Irrlicht all over the web, like alternative terrain \
renderers, portal renderers, world layers, tutorials, editors, bindings for \
perl, ruby, python, and so on. And best of all: It's completely free."
HOMEPAGE="http://irrlicht.sourceforge.net"
COPYRIGHT="2002-2015 Nikolaus Gebhardt"
COPYRIGHT="2002-2016 Nikolaus Gebhardt"
LICENSE="Zlib"
REVISION="1"
SOURCE_URI="http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.3.zip"
CHECKSUM_SHA256="9e7be44277bf2004d73580a8585e7bd3c9ce9a3c801691e4f4aed030ac68931c"
PATCHES="irrlicht-1.8.3.patchset"
SOURCE_URI="http://downloads.sourceforge.net/irrlicht/irrlicht-$portVersion.zip"
CHECKSUM_SHA256="f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433"
PATCHES="irrlicht-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -24,12 +24,12 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libGLU$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
@@ -43,12 +43,12 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libsdl$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libGLU$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
@@ -60,7 +60,7 @@ BUILD()
{
cd source
cd Irrlicht
make sharedlib
make sharedlib NDEBUG=1
}
INSTALL()
@@ -70,8 +70,8 @@ INSTALL()
mkdir -p $includeDir/irrlicht
mkdir -p $libDir
cp ../../include/*.h $includeDir/irrlicht/
cp libIrrlicht.so.1.8.3 $libDir
ln -s -f $libDir/libIrrlicht.so.1.8.3 $libDir/libIrrlicht.so.1.8
cp libIrrlicht.so.$portVersion $libDir
ln -s -f $libDir/libIrrlicht.so.$portVersion $libDir/libIrrlicht.so.1.8
ln -s -f $libDir/libIrrlicht.so.1.8 $libDir/libIrrlicht.so
prepareInstalledDevelLibs libIrrlicht

View File

@@ -124,10 +124,10 @@ index 6f8aa45..91f2491 100644
INSTALL_DIR = /usr/local/lib
sharedlib install: SHARED_LIB = libIrrlicht.so
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lSDL -lGL
staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
#OSX specific options
--
--
2.2.2