haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allegro: fix hybrid build.

Browse Source 
Fixes #75.
This commit is contained in:
Adrien Destugues
2014-09-25 11:19:07 +02:00
parent 964f871d16
commit 81f3f8c9c3
2 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
media-libs/allegro/allegro-4.4.2.recipe
View File

@@ -34,6 +34,8 @@ REQUIRES="
lib:libz$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libstdc++$secondaryArchSuffix
lib:libgcc_s$secondaryArchSuffix
"
BUILD_REQUIRES="
@@ -56,7 +58,8 @@ PATCHES="allegro-4.4.2.patchset"
BUILD()
{
cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir -DMANDIR=$manDir
cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir -DMANDIR=$manDir \
-DLIB_SUFFIX=$secondaryArchSubDir
make $jobArgs
}
@@ -72,20 +75,20 @@ INSTALL()
PROVIDES_devel="
allegro${secondaryArchSuffix}_devel = $portVersion compat >= 4.4
devel:liballeg$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:allegro_config = $portVersion compat >= 4.4
cmd:colormap = $portVersion compat >= 4.4
cmd:dat = $portVersion compat >= 4.4
cmd:dat2c = $portVersion compat >= 4.4
cmd:dat2s = $portVersion compat >= 4.4
cmd:exedat = $portVersion compat >= 4.4
cmd:grabber = $portVersion compat >= 4.4
cmd:pack = $portVersion compat >= 4.4
cmd:pat2dat = $portVersion compat >= 4.4
cmd:rgbmap = $portVersion compat >= 4.4
cmd:textconv = $portVersion compat >= 4.4
devel:libjpgalleg = $portVersion compat >= 4.4
devel:liblogg = $portVersion compat >= 4.4
devel:libloadpng = $portVersion compat >= 4.4
cmd:allegro_config$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:colormap$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:dat$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:dat2c$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:dat2s$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:exedat$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:grabber$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:pack$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:pat2dat$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:rgbmap$secondaryArchSuffix = $portVersion compat >= 4.4
cmd:textconv$secondaryArchSuffix = $portVersion compat >= 4.4
devel:libjpgalleg$secondaryArchSuffix = $portVersion compat >= 4.4
devel:liblogg$secondaryArchSuffix = $portVersion compat >= 4.4
devel:libloadpng$secondaryArchSuffix = $portVersion compat >= 4.4
"
REQUIRES_devel="

47
media-libs/allegro/patches/allegro-4.4.2.patchset
View File

@@ -1,4 +1,4 @@
From 3f9d50e146abb2e937adf2d6e0fc7dad9634b20e Mon Sep 17 00:00:00 2001
From 77ba77a7ef990fe61c8e2f9674e6d61183660c08 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 30 Nov 2013 12:14:54 +0100
Subject: Import Allegro 4.4.1.1 fixes that were not upstreamed.
@@ -75,3 +75,48 @@ index c6e4dad..a7c9d46 100644
--
1.8.3.4
From 3600b5bd60d00734b54c270485f63a97e1dbad18 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 25 Sep 2014 11:09:14 +0200
Subject: Hack install dirfor binaries.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08a2a32..b841cf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -893,7 +893,7 @@ if(UNIX) # including MACOSX
)
install(PROGRAMS ${CMAKE_BINARY_DIR}/allegro-config
- DESTINATION bin
+ DESTINATION bin${LIB_SUFFIX}
)
endif(UNIX)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 170c3b4..572317e 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -48,7 +48,7 @@ target_link_libraries(aldat allegro ${ALDAT_JPGALLEG})
function(add_our_tool nm)
add_our_executable(${nm} ${nm}.c ${ARGN})
install(TARGETS ${nm}
- DESTINATION bin
+ DESTINATION bin${LIB_SUFFIX}
)
endfunction()
@@ -69,7 +69,7 @@ target_link_libraries(pat2dat aldat)
add_our_executable(grabber WIN32 grabber.c)
target_link_libraries(grabber aldat)
install(TARGETS grabber
- DESTINATION bin
+ DESTINATION bin${LIB_SUFFIX}
)
#-----------------------------------------------------------------------------#
--
1.8.3.4