diff --git a/media-libs/lib3ds/lib3ds-2.0.0.recipe b/media-libs/lib3ds/lib3ds-2.0.0.recipe index 73f52d9a3..8943ed012 100644 --- a/media-libs/lib3ds/lib3ds-2.0.0.recipe +++ b/media-libs/lib3ds/lib3ds-2.0.0.recipe @@ -9,24 +9,27 @@ was changed to GNU Lesser General Public License (LGPL)." HOMEPAGE="http://lib3ds.org" COPYRIGHT="2000-2010 Jan Eric Kyprianidis" LICENSE="GNU LGPL v2" -REVISION="1" -SOURCE_URI="git://github.com/AdrianArroyoCalle/lib3ds#d477b7dc451ec88a739cc28e6d9a7564123569d0" -PATCHES="lib3ds-2.0.0.patchset" +REVISION="2" +gitCommit="d477b7dc451ec88a739cc28e6d9a7564123569d0" +SOURCE_URI="https://github.com/AdrianArroyoCalle/lib3ds/archive/$gitCommit.tar.gz" +CHECKSUM_SHA256="04e28c09b9b1905a401686f9c27ffc520104801fb1353ed89ac6ec7f50f1104e" +SOURCE_DIR="lib3ds-$gitCommit" +PATCHES="lib3ds-$portVersion.patchset" -ARCHITECTURES="?x86 x86_gcc2 ?x86_64" +ARCHITECTURES="?x86 x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - lib3ds$secondaryArchSuffix = $portVersion compat >= 2.0 - lib:lib3ds$secondaryArchSuffix = $portVersion compat >= 2.0 + lib3ds$secondaryArchSuffix = $portVersion + lib:lib3ds$secondaryArchSuffix = 2.0 compat >= 2.0 " REQUIRES=" haiku$secondaryArchSuffix " PROVIDES_devel=" - lib3ds${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 - devel:lib3ds$secondaryArchSuffix = $portVersion compat >= 2.0 + lib3ds${secondaryArchSuffix}_devel = $portVersion + devel:lib3ds$secondaryArchSuffix = 2.0 compat >= 2.0 " REQUIRES_devel=" lib3ds$secondaryArchSuffix == $portVersion @@ -44,17 +47,15 @@ BUILD_PREREQUIRES=" BUILD() { - cmake . $cmakeDirArgs + cmake . make } INSTALL() { - mkdir -p $libDir - cp bin/liblib3ds.so.2.0 $libDir/lib3ds.so.2.0 - ln -s $libDir/lib3ds.so.2.0 $libDir/lib3ds.so - - mkdir -p $includeDir + mkdir -p $libDir $includeDir + cp bin/lib3ds.so.2.0 $libDir/ + ln -sr $libDir/lib3ds.so.2.0 $libDir/lib3ds.so cp src/*.h $includeDir/ prepareInstalledDevelLibs lib3ds diff --git a/media-libs/lib3ds/patches/lib3ds-2.0.0.patchset b/media-libs/lib3ds/patches/lib3ds-2.0.0.patchset index 651255a13..f325550bd 100644 --- a/media-libs/lib3ds/patches/lib3ds-2.0.0.patchset +++ b/media-libs/lib3ds/patches/lib3ds-2.0.0.patchset @@ -1,4 +1,4 @@ -From cb0a0e266f99aab2da7b4ca1897adc28cf94e1af Mon Sep 17 00:00:00 2001 +From 49cbf369797ebc3fc09cfe2e885283d6a9ae0636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 11 Sep 2015 12:18:29 +0000 @@ -15,5 +15,49 @@ index 37cafd7..133252e 100644 ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(examples) -- -2.2.2 +2.11.0 + + +From 81ea9416307264b04d611a83e27570d3dd54a38e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 12 Apr 2017 19:01:56 +0200 +Subject: SONAME should be lib3ds instead of liblib3ds. + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 133252e..cf7d16e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +-PROJECT(lib3ds) ++PROJECT(3ds) + + SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b8f73db..a3118b5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -2,7 +2,7 @@ IF(MSVC) + ADD_DEFINITIONS(-DLIB3DS_EXPORTS) + ENDIF(MSVC) + +-ADD_LIBRARY(lib3ds SHARED ++ADD_LIBRARY(3ds SHARED + lib3ds.h + lib3ds_impl.h + lib3ds_atmosphere.c +@@ -32,6 +32,6 @@ IF(WIN32) + DEBUG_POSTFIX "d") + ENDIF(WIN32) + +-SET_TARGET_PROPERTIES(lib3ds ++SET_TARGET_PROPERTIES(3ds + PROPERTIES VERSION 2.0) +- +\ No newline at end of file ++ +-- +2.11.0