fifechan, fix references to libSDL*, bump version (#3951)

This commit is contained in:
Schrijvers Luc
2019-11-26 15:16:42 +01:00
committed by GitHub
parent a450054229
commit f94d2a01d6
4 changed files with 229 additions and 14 deletions

View File

@@ -5,13 +5,13 @@ graphics and capturing user input."
HOMEPAGE="http://fifengine.github.com/fifechan/"
COPYRIGHT="2004-2014 fifechan developers"
LICENSE="GNU LGPL v2.1"
REVISION="3"
SOURCE_URI="https://github.com/fifengine/fifechan/archive/0.1.2.tar.gz"
REVISION="4"
SOURCE_URI="https://github.com/fifengine/fifechan/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="4a4239314ae33c5413e4d7d3e5f2f1a7e53fb596fd1480ea7443ee78041e6b2d"
SOURCE_FILENAME="$portName-$portVersion.tar.gz"
PATCHES="fifechan-$portVersion.patchset"
ARCHITECTURES="x86 x86_64"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -22,9 +22,9 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libgl$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libsdl_image$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libSDL_1.2$secondaryArchSuffix
lib:libSDL_image_1.2$secondaryArchSuffix
"
PROVIDES_devel="
@@ -38,12 +38,12 @@ REQUIRES_devel="
"
BUILD_REQUIRES="
devel:libgl$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix
devel:libsdl_image$secondaryArchSuffix
haiku${secondaryArchSuffix}_devel
devel:libGL$secondaryArchSuffix
devel:libSDL$secondaryArchSuffix
devel:libSDL_image$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
@@ -52,24 +52,24 @@ BUILD_PREREQUIRES="
BUILD()
{
mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DLIB_INSTALL_DIR=$libDir \
-DINCLUDE_INSTALL_DIR=$includeDir \
.
..
make $jobArgs
}
INSTALL()
{
cd build
make install
prepareInstalledDevelLibs \
libfifechan libfifechan_opengl libfifechan_sdl
fixPkgconfig
packageEntries devel \
$developDir
}

View File

@@ -0,0 +1,92 @@
SUMMARY="A C++ GUI library designed for games"
DESCRIPTION="Fifechan is a C++ GUI library designed for games. It comes with a \
standard set of 'widgets' and can use several different objects for displaying \
graphics and capturing user input."
HOMEPAGE="http://fifengine.github.com/fifechan/"
COPYRIGHT="2004-2019 fifechan developers"
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://github.com/fifengine/fifechan/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="29be5ff4b379e2fc4f88ef7d8bc172342130dd3e77a3061f64c8a75efe4eba73"
SOURCE_FILENAME="fifechan-$portVersion.tar.gz"
PATCHES="fifechan-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86"
PROVIDES="
fifechan$secondaryArchSuffix = $portVersion
lib:libfifechan$secondaryArchSuffix = $portVersion
lib:libfifechan_allegro$secondaryArchSuffix = $portVersion
lib:libfifechan_irrlicht$secondaryArchSuffix = $portVersion
lib:libfifechan_opengl$secondaryArchSuffix = $portVersion
lib:libfifechan_sdl$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:liballeg$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libGLU$secondaryArchSuffix
lib:libirrlicht$secondaryArchSuffix
lib:libSDL2_2.0$secondaryArchSuffix
lib:libSDL2_image_2.0$secondaryArchSuffix
"
PROVIDES_devel="
fifechan${secondaryArchSuffix}_devel = $portVersion
devel:libfifechan$secondaryArchSuffix = $portVersion
devel:libfifechan_allegro$secondaryArchSuffix = $portVersion
devel:libfifechan_irrlicht$secondaryArchSuffix = $portVersion
devel:libfifechan_opengl$secondaryArchSuffix = $portVersion
devel:libfifechan_sdl$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
fifechan$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:liballeg$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libirrlicht$secondaryArchSuffix
devel:libSDL2$secondaryArchSuffix
devel:libSDL2_image$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DLIB_INSTALL_DIR=$libDir \
-DINCLUDE_INSTALL_DIR=$includeDir \
-DBUILD_FIFECHAN_ALLEGRO_SHARED=ON \
-DENABLE_ALLEGRO=ON \
-DBUILD_FIFECHAN_IRRLICHT_SHARED=ON \
-DENABLE_IRRLICHT=ON \
..
make $jobArgs
}
INSTALL()
{
cd build
make install
prepareInstalledDevelLibs \
libfifechan \
libfifechan_allegro \
libfifechan_irrlicht \
libfifechan_opengl \
libfifechan_sdl
fixPkgconfig
packageEntries devel \
$developDir
}

View File

@@ -55,7 +55,7 @@ index c6d638e..7fed177 100644
- INSTALL(FILES ${FIFECHAN_ALLEGRO_CONTRIB_HEADERS} DESTINATION include/fifechan/contrib/allegro/)
+ INSTALL(FILES ${FIFECHAN_ALLEGRO_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/)
+ INSTALL(FILES ${FIFECHAN_ALLEGRO_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/allegro/)
+ INSTALL(FILES ${FIFECHAN_ALLEGRO_CONTRIB_HEADERS} DESTINATION i${INCLUDE_INSTALL_DIR}/fifechan/contrib/allegro/)
+ INSTALL(FILES ${FIFECHAN_ALLEGRO_CONTRIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/contrib/allegro/)
ENDIF(ENABLE_ALLEGRO AND ALLEGRO_FOUND)
# The Fifechan Irrlicht extension library

View File

@@ -0,0 +1,123 @@
From 7dd865864f5b31c2aa2757b3c4ae28ff3ca1d55d Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Fri, 21 Jun 2019 10:28:34 +0200
Subject: Add LIB_INSTALL_DIR and INCLUDE_INSTALL_DIR in build
system.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18b6fb0..ee64789 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ SET(PATCH_VERSION 5)
SET(FIFECHAN_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
SET(LIB_SUFFIX "" CACHE STRING "Suffix to append to the system lib folder")
+SET(LIB_INSTALL_DIR lib CACHE STRING "Library install directory")
+SET(INCLUDE_INSTALL_DIR include CACHE STRING "Include install directory")
#------------------------------------------------------------------------------
# Options
@@ -186,16 +188,16 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
COMPILE_DEFINITIONS "FIFECHAN_BUILD"
)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib${LIB_SUFFIX} PERMISSIONS
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
)
-INSTALL(FILES ${FIFECHAN_HEADER} DESTINATION include/)
-INSTALL(FILES ${FIFECHAN_HEADERS} DESTINATION include/fifechan/)
-INSTALL(FILES ${FIFECHAN_WIDGET_HEADERS} DESTINATION include/fifechan/widgets/)
-INSTALL(FILES ${FIFECHAN_UTIL_HEADERS} DESTINATION include/fifechan/util/)
+INSTALL(FILES ${FIFECHAN_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR})
+INSTALL(FILES ${FIFECHAN_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/)
+INSTALL(FILES ${FIFECHAN_WIDGET_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/widgets/)
+INSTALL(FILES ${FIFECHAN_UTIL_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/util/)
#REMOVE_DEFINITIONS("-DFIFECHAN_BUILD")
#ADD_DEFINITIONS("-DFIFECHAN_EXTENSION_BUILD")
@@ -246,15 +248,15 @@ IF(ENABLE_ALLEGRO AND ALLEGRO_FOUND)
COMPILE_DEFINITIONS "FIFECHAN_EXTENSION_BUILD"
)
- INSTALL(TARGETS ${PROJECT_NAME}_allegro DESTINATION lib${LIB_SUFFIX} PERMISSIONS
+ INSTALL(TARGETS ${PROJECT_NAME}_allegro DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
)
- INSTALL(FILES ${FIFECHAN_ALLEGRO_HEADER} DESTINATION include/fifechan/)
- INSTALL(FILES ${FIFECHAN_ALLEGRO_HEADERS} DESTINATION include/fifechan/allegro/)
- INSTALL(FILES ${FIFECHAN_ALLEGRO_CONTRIB_HEADERS} DESTINATION include/fifechan/contrib/allegro/)
+ INSTALL(FILES ${FIFECHAN_ALLEGRO_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/)
+ INSTALL(FILES ${FIFECHAN_ALLEGRO_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/allegro/)
+ INSTALL(FILES ${FIFECHAN_ALLEGRO_CONTRIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/contrib/allegro/)
ENDIF(ENABLE_ALLEGRO AND ALLEGRO_FOUND)
@@ -300,14 +302,14 @@ IF(ENABLE_IRRLICHT AND IRRLICHT_FOUND)
COMPILE_DEFINITIONS "FIFECHAN_EXTENSION_BUILD"
)
- INSTALL(TARGETS ${PROJECT_NAME}_irrlicht DESTINATION lib${LIB_SUFFIX} PERMISSIONS
+ INSTALL(TARGETS ${PROJECT_NAME}_irrlicht DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
)
- INSTALL(FILES ${FIFECHAN_IRRLICHT_HEADER} DESTINATION include/fifechan/)
- INSTALL(FILES ${FIFECHAN_IRRLICHT_HEADERS} DESTINATION include/fifechan/irrlicht/)
+ INSTALL(FILES ${FIFECHAN_IRRLICHT_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/)
+ INSTALL(FILES ${FIFECHAN_IRRLICHT_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/irrlicht/)
ENDIF(ENABLE_IRRLICHT AND IRRLICHT_FOUND)
@@ -380,15 +382,15 @@ IF(ENABLE_OPENGL AND OPENGL_FOUND)
COMPILE_DEFINITIONS "FIFECHAN_EXTENSION_BUILD"
)
- INSTALL(TARGETS ${PROJECT_NAME}_opengl DESTINATION lib${LIB_SUFFIX} PERMISSIONS
+ INSTALL(TARGETS ${PROJECT_NAME}_opengl DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
)
- INSTALL(FILES ${FIFECHAN_OPENGL_HEADER} DESTINATION include/fifechan/)
- INSTALL(FILES ${FIFECHAN_OPENGL_HEADERS} DESTINATION include/fifechan/opengl/)
- INSTALL(FILES ${FIFECHAN_OPENGL_CONTRIB_HEADERS} DESTINATION include/fifechan/contrib/opengl/)
+ INSTALL(FILES ${FIFECHAN_OPENGL_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/)
+ INSTALL(FILES ${FIFECHAN_OPENGL_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/opengl/)
+ INSTALL(FILES ${FIFECHAN_OPENGL_CONTRIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/contrib/opengl/)
ENDIF(ENABLE_OPENGL AND OPENGL_FOUND)
@@ -466,15 +468,15 @@ IF(ENABLE_SDL AND SDL2_FOUND AND SDL2_IMAGE_FOUND)
COMPILE_DEFINITIONS "FIFECHAN_EXTENSION_BUILD"
)
- INSTALL(TARGETS ${PROJECT_NAME}_sdl DESTINATION lib${LIB_SUFFIX} PERMISSIONS
+ INSTALL(TARGETS ${PROJECT_NAME}_sdl DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
)
- INSTALL(FILES ${FIFECHAN_SDL_HEADER} DESTINATION include/fifechan/)
- INSTALL(FILES ${FIFECHAN_SDL_HEADERS} DESTINATION include/fifechan/sdl/)
- INSTALL(FILES ${FIFECHAN_SDL_CONTRIB_HEADERS} DESTINATION include/fifechan/contrib/sdl/)
+ INSTALL(FILES ${FIFECHAN_SDL_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/)
+ INSTALL(FILES ${FIFECHAN_SDL_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/sdl/)
+ INSTALL(FILES ${FIFECHAN_SDL_CONTRIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/fifechan/contrib/sdl/)
ENDIF(ENABLE_SDL AND SDL2_FOUND AND SDL2_IMAGE_FOUND)
--
2.21.0