From 4b4b47d3e7d66383078f6bf27f2cbbfd662997ca Mon Sep 17 00:00:00 2001 From: miqlas Date: Sat, 3 Jun 2017 19:06:28 +0200 Subject: [PATCH] Irrlicht: bump version, fix SDL deps (#1381) --- ...cht-1.8.3.recipe => irrlicht-1.8.4.recipe} | 30 +++++++++---------- ...1.8.3.patchset => irrlicht-1.8.4.patchset} | 4 +-- 2 files changed, 17 insertions(+), 17 deletions(-) rename dev-games/irrlicht/{irrlicht-1.8.3.recipe => irrlicht-1.8.4.recipe} (84%) rename dev-games/irrlicht/patches/{irrlicht-1.8.3.patchset => irrlicht-1.8.4.patchset} (96%) diff --git a/dev-games/irrlicht/irrlicht-1.8.3.recipe b/dev-games/irrlicht/irrlicht-1.8.4.recipe similarity index 84% rename from dev-games/irrlicht/irrlicht-1.8.3.recipe rename to dev-games/irrlicht/irrlicht-1.8.4.recipe index 2f0bf15b1..509b5c15f 100644 --- a/dev-games/irrlicht/irrlicht-1.8.3.recipe +++ b/dev-games/irrlicht/irrlicht-1.8.4.recipe @@ -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 diff --git a/dev-games/irrlicht/patches/irrlicht-1.8.3.patchset b/dev-games/irrlicht/patches/irrlicht-1.8.4.patchset similarity index 96% rename from dev-games/irrlicht/patches/irrlicht-1.8.3.patchset rename to dev-games/irrlicht/patches/irrlicht-1.8.4.patchset index aebf7f877..e794fd3c0 100644 --- a/dev-games/irrlicht/patches/irrlicht-1.8.3.patchset +++ b/dev-games/irrlicht/patches/irrlicht-1.8.4.patchset @@ -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