haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 13:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

lensfun: bump version.

Browse Source 
* doesn"t build on gcc2
This commit is contained in:
Jerome Duval
2015-11-29 14:31:21 +00:00
parent 97963f2cb6
commit 9cc8d999a5
2 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
media-libs/lensfun/lensfun-0.2.8.recipe → media-libs/lensfun/lensfun-0.3.2.recipe
View File

@@ -15,24 +15,20 @@ COPYRIGHT="
LICENSE="GNU LGPL v3" LICENSE="GNU LGPL v3"
REVISION="1" REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/lensfun/files/$portVersion/lensfun-$portVersion.tar.gz" SOURCE_URI="http://sourceforge.net/projects/lensfun/files/$portVersion/lensfun-$portVersion.tar.gz"
CHECKSUM_SHA256="fc02350ea8572ec3a7e9a94c6c1fce7598dbfed22573a5b01f7abe2c9e5232a4" CHECKSUM_SHA256="ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
PATCHES="lensfun-$portVersion.patchset"
PROVIDES=" PROVIDES="
lensfun$secondaryArchSuffix = $portVersion compat >= 0.2 lensfun$secondaryArchSuffix = $portVersion compat >= 0.2
lib:liblensfun$secondaryArchSuffix = $portVersion compat >= 0 lib:liblensfun$secondaryArchSuffix = $portVersion compat >= 0
lib:libauxfun$secondaryArchSuffix = $portVersion compat >= 0
" "
PROVIDES_devel=" PROVIDES_devel="
lensfun${secondaryArchSuffix}_devel = $portVersion compat >= 0.2 lensfun${secondaryArchSuffix}_devel = $portVersion compat >= 0.2
cmd:tfun$secondaryArchSuffix cmd:g_lensfun_update_data$secondaryArchSuffix
cmd:tmod$secondaryArchSuffix cmd:lensfun_add_adapter$secondaryArchSuffix
cmd:trwxml$secondaryArchSuffix cmd:lensfun_update_data$secondaryArchSuffix
devel:liblensfun$secondaryArchSuffix = $portVersion compat >= 0 devel:liblensfun$secondaryArchSuffix = $portVersion compat >= 0
devel:libauxfun$secondaryArchSuffix = $portVersion compat >= 0
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
@@ -53,7 +49,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
devel:libpng16$secondaryArchSuffix devel:libpng16$secondaryArchSuffix
devel:libz$secondaryArchSuffix devel:libz$secondaryArchSuffix
devel:libglib_2.0${secondaryArchSuffix} devel:libglib_2.0${secondaryArchSuffix} >= 0.4000
devel:libintl$secondaryArchSuffix devel:libintl$secondaryArchSuffix
" "
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
@@ -69,7 +65,7 @@ BUILD()
mkdir -p cmake_build mkdir -p cmake_build
cd cmake_build cd cmake_build
cmake -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir \ cmake -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir \
-DBUILD_AUXFUN=ON -DINCLUDEDIR=$includeDir -DDATADIR=$dataDir/lensfun .. -DINCLUDEDIR=$includeDir -DDATADIR=$dataDir/lensfun ..
make $jobArgs make $jobArgs
} }
@@ -78,9 +74,21 @@ INSTALL()
cd cmake_build cd cmake_build
make install make install
mkdir -p $includeDir
mv $prefix/include/* $includeDir
rmdir $prefix/include
if [ -n "$secondaryArchSuffix" ]; then
mv $prefix/bin $prefix/bin2
mv $prefix/lib $prefix/lib2
mkdir -p $binDir $libDir
mv $prefix/bin2/* $binDir
mv $prefix/lib2/* $libDir
rmdir $prefix/bin2 $prefix/lib2
fi
rm -f $binDir/example rm -f $binDir/example
prepareInstalledDevelLibs liblensfun libauxfun prepareInstalledDevelLibs liblensfun
fixPkgconfig fixPkgconfig
# devel package # devel package

24
media-libs/lensfun/patches/lensfun-0.2.8.patchset
View File

@@ -1,24 +0,0 @@
From 557f20507a99d69dda73ea72ae15e04590b73265 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 10 Nov 2015 15:18:26 +0000
Subject: we set these variables ourselves
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eddb819..4a26c08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,8 +75,8 @@ ENDIF()
# define destination dirs (relative to prefix)
SET(BINDIR bin CACHE PATH "Directory for library example programs")
SET(LIBDIR lib${LIB_SUFFIX} CACHE PATH "Directory for library itself")
-SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
-SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
+#SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
+#SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
IF(BUILD_DOC)
SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE PATH "Directory to put library documentation in")
--
2.2.2